Loading ...
Sorry, an error occurred while loading the content.

[PATCH] 6.2b Multiple syntax views, conceal, cursorbind

Expand Messages
  • Vince Negri
    ... 6.2b sources (as obtained from CVS) is ... New in this version is an improvement to cursorbind which makes it work better in diff mode. If you cursorbind
    Message 1 of 3 , May 1, 2003
    View Source
    • 0 Attachment
      > The latest release of the combined patch, against
      6.2b sources (as obtained from CVS) is
      > available here:
      >
      > http://www.bulbous.freeserve.co.uk/conceal-ownsyntax-62b.diff.gz
      >
      New in this version is an improvement to "cursorbind"
      which makes it work better in diff mode. If you
      cursorbind two diff windows, then as you move through
      one file the cursor position in the other is updated
      to the logically equivalent line, i.e. taking
      insertions/deletions into account.

      > The patch implements three things:
      > (Anyone new to this topic should check the archives
      > for my message "[screenshot] RE: Multiple syntax views
      > on one file" of 2nd April.)
      >
      > 1) 'cursorbind' option - with improvements
      to cursorbind so that it works nicely in diff mode.

      > 2) Latest "conceal" functionality, including some
      > cosmetic fixes, new customisable-per-match placeholder
      > characters, a new 'conceallevel' setting, and
      > enhancements to make adding conceal functionality to
      > existing syntax files easier.
      >
      > 3) The ":ownsyntax" command for having multiple
      > syntax views on one file.
      >
      > The docs are at the end of the diff, so for fuller
      > details read the diff ;)
      >
      > Vince
      >
      >
      >
      Legal Disclaimer: Any views expressed by the sender of this message are
      not necessarily those of Application Solutions Ltd. Information in this
      e-mail may be confidential and is for the use of the intended recipient
      only, no mistake in transmission is intended to waive or compromise such
      privilege. Please advise the sender if you receive this e-mail by mistake.
    • Walter Briscoe
      In message of Thu, 1 May 2003 08:31:31 in , Vince Negri
      Message 2 of 3 , May 2, 2003
      View Source
      • 0 Attachment
        In message <35C843B8EC93D511844500306E0029B349759C@...-
        electronics.co.uk> of Thu, 1 May 2003 08:31:31 in , Vince Negri
        <vnegri@...> writes
        >> The latest release of the combined patch, against
        >6.2b sources (as obtained from CVS) is
        >> available here:
        >>
        >> http://www.bulbous.freeserve.co.uk/conceal-ownsyntax-62b.diff.gz
        >>
        >New in this version is an improvement to "cursorbind"
        >which makes it work better in diff mode. If you
        >cursorbind two diff windows, then as you move through
        >one file the cursor position in the other is updated
        >to the logically equivalent line, i.e. taking
        >insertions/deletions into account.
        If this is what I think it is, I say WOW!! Almost as much of an
        enhancement as vim -d when that happened.

        Boring detail. I get vim from ftp. I hit the following discrepancies
        with a plain vanilla vim62b.
        C:\wfb\vim\bld> rename vim62b 3vim62b

        C:\wfb\vim\bld> vim /wfb/bin/makevim.bat

        C:\wfb\vim\bld> makevim 6.2b
        Unpacking archives

        C:\wfb\vim\bld> cd vim62b

        C:\wfb\vim\bld\vim62b> gzip -cd c:\wfb\url\http\www.bulbous.freeserve.co.uk\conceal-ownsyntax-62b.diff.gz | patch --binary -p 0 -b
        patching file src/buffer.c
        [snipped successful messages]
        patching file runtime/doc/eval.txt
        Hunk #1 succeeded at 463 (offset 4 lines).
        patching file runtime/doc/options.txt
        Hunk #1 succeeded at 1471 (offset 79 lines).
        Hunk #2 succeeded at 2862 (offset 49 lines).
        Hunk #3 succeeded at 2924 (offset 79 lines).
        Hunk #4 FAILED at 3621.
        1 out of 4 hunks FAILED -- saving rejects to file runtime/doc/options.txt.rej
        patching file runtime/doc/syntax.txt
        Hunk #2 succeeded at 2453 (offset 228 lines).
        Hunk #3 succeeded at 2518 (offset 1 line).
        Hunk #4 succeeded at 3501 (offset 228 lines).
        Hunk #5 succeeded at 3533 with fuzz 1 (offset 3 lines).
        patching file runtime/optwin.vim

        C:\wfb\vim\bld\vim62b>

        I hit the following diagnostics with
        nmake /f make_ivc.mak cfg="Vim - Win32 Debug vim"

        cl.exe /nologo /MT /W3 /GX /I ".\proto" /D "WIN32" /c /Zi /Od /D "_DEBUG" /Fd.\Dbg/ /Fo.\Dbg/ .\move.c
        move.c
        .\move.c(2819) : warning C4013: 'diff_get_corresponding_line' undefined; assuming extern returning int

        link.exe oldnames.lib ...
        move.obj : error LNK2001: unresolved external symbol _diff_get_corresponding_line
        .\vimd.exe : fatal error LNK1120: 1 unresolved externals
        NMAKE : fatal error U1077: 'link.exe' : return code '0x460'
        Stop.

        C:\wfb\vim\bld\vim62b\src> grep diff_get_corresponding_line *.c
        move.c: = diff_get_corresponding_line(old_curbuf,

        C:\wfb\vim\bld\vim62b\src>

        No coconut yet!
        --
        Walter Briscoe
      • Vince Negri
        ... I haven t tried diffing against the 62b tarball. (I always get cvs.) It sounds like there may be a discrepancy in the docs area? Ahh.. my fault, i hadn t
        Message 3 of 3 , May 2, 2003
        View Source
        • 0 Attachment
          > Boring detail. I get vim from ftp. I hit the following discrepancies
          > with a plain vanilla vim62b.
          I haven't tried diffing against the 62b tarball.
          (I always get cvs.) It sounds like there may
          be a discrepancy in the docs area? Ahh.. my fault,
          i hadn't done a cvs update in the docs folder
          (blush)

          > I hit the following diagnostics with
          > nmake /f make_ivc.mak cfg="Vim - Win32 Debug vim"

          > cl.exe /nologo /MT /W3 /GX /I ".\proto" /D "WIN32" /c /Zi /Od /D
          "_DEBUG" /Fd.\Dbg/ >/Fo.\Dbg/ .\move.c
          >move.c
          >.\move.c(2819) : warning C4013: 'diff_get_corresponding_line' undefined;
          assuming extern returning int

          > link.exe oldnames.lib ...
          >move.obj : error LNK2001: unresolved external symbol
          _diff_get_corresponding_line
          >.\vimd.exe : fatal error LNK1120: 1 unresolved externals
          >NMAKE : fatal error U1077: 'link.exe' : return code '0x460'
          >Stop.

          Gah, the patch file is missing a diff against diff.c and diff.pro.
          I'll create and upload a new patch file. However I can't
          upload it from here so I'll send you a copy directly,
          Walter.

          Vince

          Legal Disclaimer: Any views expressed by the sender of this message are
          not necessarily those of Application Solutions Ltd. Information in this
          e-mail may be confidential and is for the use of the intended recipient
          only, no mistake in transmission is intended to waive or compromise such
          privilege. Please advise the sender if you receive this e-mail by mistake.
        Your message has been successfully submitted and would be delivered to recipients shortly.