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

Patch 7.1.295

Expand Messages
  • Bram Moolenaar
    Patch 7.1.295 Problem: Vimtutor only works with vim, not gvim. Solution: Add the -g flag to vimtutor. (Dominique Pelle) Add gvimtutor. Files:
    Message 1 of 7 , May 7, 2008
    View Source
    • 0 Attachment
      Patch 7.1.295
      Problem: Vimtutor only works with vim, not gvim.
      Solution: Add the -g flag to vimtutor. (Dominique Pelle) Add gvimtutor.
      Files: src/Makefile, src/gvimtutor, src/vimtutor, runtime/doc/vimtutor.1


      *** ../vim-7.1.294/src/Makefile Wed May 7 13:09:17 2008
      --- src/Makefile Wed May 7 17:34:31 2008
      ***************
      *** 1867,1872 ****
      --- 1872,1879 ----
      installtutorbin: $(DEST_VIM)
      $(INSTALL_DATA) vimtutor $(DEST_BIN)/$(VIMNAME)tutor
      chmod $(SCRIPTMOD) $(DEST_BIN)/$(VIMNAME)tutor
      + $(INSTALL_DATA) gvimtutor $(DEST_BIN)/$(GVIMNAME)tutor
      + chmod $(SCRIPTMOD) $(DEST_BIN)/$(GVIMNAME)tutor

      installtutor: $(DEST_RT) $(DEST_TUTOR)
      -$(INSTALL_DATA) $(TUTORSOURCE)/README* $(TUTORSOURCE)/tutor* $(DEST_TUTOR)
      ***************
      *** 2075,2080 ****
      --- 2082,2088 ----
      uninstall: uninstall_runtime
      -rm -f $(DEST_BIN)/$(VIMTARGET)
      -rm -f $(DEST_BIN)/vimtutor
      + -rm -f $(DEST_BIN)/gvimtutor
      -rm -f $(DEST_BIN)/$(EXTARGET) $(DEST_BIN)/$(VIEWTARGET)
      -rm -f $(DEST_BIN)/$(GVIMTARGET) $(DEST_BIN)/$(GVIEWTARGET)
      -rm -f $(DEST_BIN)/$(RVIMTARGET) $(DEST_BIN)/$(RVIEWTARGET)
      ***************
      *** 2171,2177 ****

      shadow: runtime pixmaps
      mkdir $(SHADOWDIR)
      ! cd $(SHADOWDIR); ln -s ../*.[ch] ../*.in ../*.sh ../*.xs ../*.xbm ../toolcheck ../proto ../vimtutor ../mkinstalldirs .
      mkdir $(SHADOWDIR)/auto
      cd $(SHADOWDIR)/auto; ln -s ../../auto/configure .
      cd $(SHADOWDIR); rm -f auto/link.sed
      --- 2179,2185 ----

      shadow: runtime pixmaps
      mkdir $(SHADOWDIR)
      ! cd $(SHADOWDIR); ln -s ../*.[ch] ../*.in ../*.sh ../*.xs ../*.xbm ../toolcheck ../proto ../vimtutor ../gvimtutor ../mkinstalldirs .
      mkdir $(SHADOWDIR)/auto
      cd $(SHADOWDIR)/auto; ln -s ../../auto/configure .
      cd $(SHADOWDIR); rm -f auto/link.sed
      *** ../vim-7.1.294/src/gvimtutor Wed May 7 17:38:10 2008
      --- src/gvimtutor Wed May 7 17:29:35 2008
      ***************
      *** 0 ****
      --- 1,8 ----
      + #!/bin/sh
      +
      + # Start GUI Vim on a copy of the tutor file.
      +
      + # Usage: gvimtutor [xx]
      + # See vimtutor for usage.
      +
      + exec `dirname $0`/vimtutor -g "$@"
      *** ../vim-7.1.294/src/vimtutor Tue Jul 17 14:32:07 2007
      --- src/vimtutor Sat Apr 5 12:21:11 2008
      ***************
      *** 2,12 ****

      # Start Vim on a copy of the tutor file.

      ! # Usage: vimtutor [xx], where xx is a language code like "es" or "nl".
      # When an argument is given, it tries loading that tutor.
      # When this fails or no argument was given, it tries using 'v:lang'
      # When that also fails, it uses the English version.

      xx=$1
      export xx

      --- 2,25 ----

      # Start Vim on a copy of the tutor file.

      ! # Usage: vimtutor [-g] [xx]
      ! # Where optional argument -g starts vimtutor in gvim (GUI) instead of vim.
      ! # and xx is a language code like "es" or "nl".
      # When an argument is given, it tries loading that tutor.
      # When this fails or no argument was given, it tries using 'v:lang'
      # When that also fails, it uses the English version.

      + # Vim could be called "vim" or "vi". Also check for "vimN", for people who
      + # have Vim installed with its version number.
      + # We anticipate up to a future Vim 8 version :-).
      + seq="vim vim8 vim75 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi"
      + if test "$1" = "-g"; then
      + # Try to use the GUI version of Vim if possible, it will fall back
      + # on Vim if Gvim is not installed.
      + seq="gvim gvim8 gvim75 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq"
      + shift
      + fi
      +
      xx=$1
      export xx

      ***************
      *** 39,48 ****
      # remove the copy of the tutor on exit
      trap "rm -rf $TODELETE" 0 1 2 3 9 11 13 15

      - # Vim could be called "vim" or "vi". Also check for "vimN", for people who
      - # have Vim installed with its version number.
      - # We anticipate up to a future Vim 8 version :-).
      - seq="vim vim8 vim75 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi"
      for i in $seq; do
      testvim=`which $i 2>/dev/null`
      if test -f "$testvim"; then
      --- 52,57 ----
      ***************
      *** 59,65 ****

      # Use Vim to copy the tutor, it knows the value of $VIMRUNTIME
      # The script tutor.vim tells Vim which file to copy
      ! $VIM -u NONE -c 'so $VIMRUNTIME/tutor/tutor.vim'

      # Start vim without any .vimrc, set 'nocompatible'
      ! $VIM -u NONE -c "set nocp" $TUTORCOPY
      --- 68,74 ----

      # Use Vim to copy the tutor, it knows the value of $VIMRUNTIME
      # The script tutor.vim tells Vim which file to copy
      ! $VIM -f -u NONE -c 'so $VIMRUNTIME/tutor/tutor.vim'

      # Start vim without any .vimrc, set 'nocompatible'
      ! $VIM -f -u NONE -c "set nocp" $TUTORCOPY
      *** ../vim-7.1.294/runtime/doc/vimtutor.1 Sun Jun 13 18:50:18 2004
      --- runtime/doc/vimtutor.1 Sat Apr 5 12:21:11 2008
      ***************
      *** 3,9 ****
      vimtutor \- the Vim tutor
      .SH SYNOPSIS
      .br
      ! .B vimtutor [language]
      .SH DESCRIPTION
      .B Vimtutor
      starts the
      --- 3,9 ----
      vimtutor \- the Vim tutor
      .SH SYNOPSIS
      .br
      ! .B vimtutor [-g] [language]
      .SH DESCRIPTION
      .B Vimtutor
      starts the
      ***************
      *** 18,23 ****
      --- 18,26 ----
      .B Vim
      commands.
      .PP
      + The optional argument -g starts vimtutor with gvim rather than vim, if the
      + GUI version of vim is available, or falls back to Vim if gvim is not found.
      + .PP
      The optional [language] argument is the two-letter name of a language, like
      "it" or "es".
      If the [language] argument is missing, the language of the current locale will
      *** ../vim-7.1.294/src/version.c Wed May 7 13:09:12 2008
      --- src/version.c Wed May 7 17:12:43 2008
      ***************
      *** 668,669 ****
      --- 673,676 ----
      { /* Add new patch number below this line */
      + /**/
      + 295,
      /**/

      --
      Time flies like an arrow.
      Fruit flies like a banana.

      /// Bram Moolenaar -- Bram@... -- http://www.Moolenaar.net \\\
      /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
      \\\ download, build and distribute -- http://www.A-A-P.org ///
      \\\ help me help AIDS victims -- http://ICCF-Holland.org ///

      --~--~---------~--~----~------------~-------~--~----~
      You received this message from the "vim_dev" maillist.
      For more information, visit http://www.vim.org/maillist.php
      -~----------~----~----~----~------~----~------~--~---
    • Chris Sutcliffe
      ... In the CVS repository, src/gvimtutor is missing: cp gvimtutor /usr/bin/gvimtutor cp: cannot stat `gvimtutor : No such file or directory make[1]: ***
      Message 2 of 7 , May 7, 2008
      View Source
      • 0 Attachment
        > Patch 7.1.295
        > Problem: Vimtutor only works with vim, not gvim.
        > Solution: Add the -g flag to vimtutor. (Dominique Pelle) Add gvimtutor.
        > Files: src/Makefile, src/gvimtutor, src/vimtutor, runtime/doc/vimtutor.1

        In the CVS repository, src/gvimtutor is missing:

        cp gvimtutor /usr/bin/gvimtutor
        cp: cannot stat `gvimtutor': No such file or directory
        make[1]: *** [installtutorbin] Error 1
        make[1]: Leaving directory `/usr/src/vim/vim7/src'
        make: *** [install] Error 2

        Chris

        --
        Chris Sutcliffe
        http://emergedesktop.org

        --~--~---------~--~----~------------~-------~--~----~
        You received this message from the "vim_dev" maillist.
        For more information, visit http://www.vim.org/maillist.php
        -~----------~----~----~----~------~----~------~--~---
      • Tony Mechelynck
        ... gvimtutor is new. Maybe the CVS repository is slightly out-of-date? What does its version.h mention as applied patches (at line 669 or thereabouts)?
        Message 3 of 7 , May 7, 2008
        View Source
        • 0 Attachment
          On 08/05/08 04:39, Chris Sutcliffe wrote:
          >> Patch 7.1.295
          >> Problem: Vimtutor only works with vim, not gvim.
          >> Solution: Add the -g flag to vimtutor. (Dominique Pelle) Add gvimtutor.
          >> Files: src/Makefile, src/gvimtutor, src/vimtutor, runtime/doc/vimtutor.1
          >
          > In the CVS repository, src/gvimtutor is missing:
          >
          > cp gvimtutor /usr/bin/gvimtutor
          > cp: cannot stat `gvimtutor': No such file or directory
          > make[1]: *** [installtutorbin] Error 1
          > make[1]: Leaving directory `/usr/src/vim/vim7/src'
          > make: *** [install] Error 2
          >
          > Chris
          >

          gvimtutor is new. Maybe the CVS repository is slightly out-of-date? What
          does its version.h mention as "applied patches" (at line 669 or
          thereabouts)? Applying this patch (respecting patch sequence) ought to
          create the gvimtutor file.

          Best regards,
          Tony.
          --
          I have learned
          To spell hors d'oeuvres
          Which still grates on
          Some people's n'oeuvres.
          -- Warren Knox

          --~--~---------~--~----~------------~-------~--~----~
          You received this message from the "vim_dev" maillist.
          For more information, visit http://www.vim.org/maillist.php
          -~----------~----~----~----~------~----~------~--~---
        • Dominique Pelle
          On Thu, May 8, 2008 at 5:00 AM, Tony Mechelynck ... I get the same error after downloading latest vim from CVS and trying to install it:
          Message 4 of 7 , May 8, 2008
          View Source
          • 0 Attachment
            On Thu, May 8, 2008 at 5:00 AM, Tony Mechelynck
            <antoine.mechelynck@...> wrote:
            >
            > On 08/05/08 04:39, Chris Sutcliffe wrote:
            >>> Patch 7.1.295
            >>> Problem: Vimtutor only works with vim, not gvim.
            >>> Solution: Add the -g flag to vimtutor. (Dominique Pelle) Add gvimtutor.
            >>> Files: src/Makefile, src/gvimtutor, src/vimtutor, runtime/doc/vimtutor.1
            >>
            >> In the CVS repository, src/gvimtutor is missing:
            >>
            >> cp gvimtutor /usr/bin/gvimtutor
            >> cp: cannot stat `gvimtutor': No such file or directory
            >> make[1]: *** [installtutorbin] Error 1
            >> make[1]: Leaving directory `/usr/src/vim/vim7/src'
            >> make: *** [install] Error 2
            >>
            >> Chris
            >>
            >
            > gvimtutor is new. Maybe the CVS repository is slightly out-of-date? What
            > does its version.h mention as "applied patches" (at line 669 or
            > thereabouts)? Applying this patch (respecting patch sequence) ought to
            > create the gvimtutor file.
            >
            > Best regards,
            > Tony.


            I get the same error after downloading latest vim from CVS
            and trying to install it:

            pel@pel-laptop:~/sb/vim7$ sudo make install
            [sudo] password for pel:
            Starting make in the src directory.
            If there are problems, cd to the src directory and run make there
            cd src && make install
            make[1]: Entering directory `/home/pel/sb/vim7/src'
            if test -f /usr/local/bin/vim; then \
            mv -f /usr/local/bin/vim /usr/local/bin/vim.rm; \
            rm -f /usr/local/bin/vim.rm; \
            fi
            cp vim /usr/local/bin
            #strip /usr/local/bin/vim
            chmod 755 /usr/local/bin/vim
            cp vimtutor /usr/local/bin/vimtutor
            chmod 755 /usr/local/bin/vimtutor
            cp gvimtutor /usr/local/bin/gvimtutor
            cp: cannot stat 'gvimtutor': No such file or directory
            make[1]: *** [installtutorbin] Error 1
            make[1]: Leaving directory `/home/pel/sb/vim7/src'
            make: *** [install] Error 2


            I did "sudo make -k install" as a workaround which
            installed vim-7.1.297 (which is the latest vim according
            to www.vim.org) but somehow gvimtutor is missing
            from CVS.

            -- Dominique

            --~--~---------~--~----~------------~-------~--~----~
            You received this message from the "vim_dev" maillist.
            For more information, visit http://www.vim.org/maillist.php
            -~----------~----~----~----~------~----~------~--~---
          • Dominique Pelle
            On Fri, May 9, 2008 at 8:14 AM, Dominique Pelle ... I also see in the link below that someone gets the same problem when building from debian/Ubunutu source
            Message 5 of 7 , May 8, 2008
            View Source
            • 0 Attachment
              On Fri, May 9, 2008 at 8:14 AM, Dominique Pelle
              <dominique.pelle@...> wrote:
              > On Thu, May 8, 2008 at 5:00 AM, Tony Mechelynck
              > <antoine.mechelynck@...> wrote:
              >>
              >> On 08/05/08 04:39, Chris Sutcliffe wrote:
              >>>> Patch 7.1.295
              >>>> Problem: Vimtutor only works with vim, not gvim.
              >>>> Solution: Add the -g flag to vimtutor. (Dominique Pelle) Add gvimtutor.
              >>>> Files: src/Makefile, src/gvimtutor, src/vimtutor, runtime/doc/vimtutor.1
              >>>
              >>> In the CVS repository, src/gvimtutor is missing:
              >>>
              >>> cp gvimtutor /usr/bin/gvimtutor
              >>> cp: cannot stat `gvimtutor': No such file or directory
              >>> make[1]: *** [installtutorbin] Error 1
              >>> make[1]: Leaving directory `/usr/src/vim/vim7/src'
              >>> make: *** [install] Error 2
              >>>
              >>> Chris
              >>>
              >>
              >> gvimtutor is new. Maybe the CVS repository is slightly out-of-date? What
              >> does its version.h mention as "applied patches" (at line 669 or
              >> thereabouts)? Applying this patch (respecting patch sequence) ought to
              >> create the gvimtutor file.
              >>
              >> Best regards,
              >> Tony.
              >
              >
              > I get the same error after downloading latest vim from CVS
              > and trying to install it:
              >
              > pel@pel-laptop:~/sb/vim7$ sudo make install
              > [sudo] password for pel:
              > Starting make in the src directory.
              > If there are problems, cd to the src directory and run make there
              > cd src && make install
              > make[1]: Entering directory `/home/pel/sb/vim7/src'
              > if test -f /usr/local/bin/vim; then \
              > mv -f /usr/local/bin/vim /usr/local/bin/vim.rm; \
              > rm -f /usr/local/bin/vim.rm; \
              > fi
              > cp vim /usr/local/bin
              > #strip /usr/local/bin/vim
              > chmod 755 /usr/local/bin/vim
              > cp vimtutor /usr/local/bin/vimtutor
              > chmod 755 /usr/local/bin/vimtutor
              > cp gvimtutor /usr/local/bin/gvimtutor
              > cp: cannot stat 'gvimtutor': No such file or directory
              > make[1]: *** [installtutorbin] Error 1
              > make[1]: Leaving directory `/home/pel/sb/vim7/src'
              > make: *** [install] Error 2
              >
              >
              > I did "sudo make -k install" as a workaround which
              > installed vim-7.1.297 (which is the latest vim according
              > to www.vim.org) but somehow gvimtutor is missing
              > from CVS.
              >
              > -- Dominique
              >


              I also see in the link below that someone gets the same
              problem when building from debian/Ubunutu source package
              apparently:

              https://bugs.launchpad.net/ubuntu/+source/vim/+bug/219546/comments/13

              # Generate language-specific sections of
              # vim-{runtime,common,gui-common}.install files
              dh_installman
              dh_install -X.svn --fail-missing
              dh_install: usr/bin/gvimtutor exists in debian/tmp but is not
              installed to anywhere
              dh_install: missing files, aborting
              make: *** [install-stamp-vim-basic] Error 1
              dpkg-buildpackage: failure: fakeroot debian/rules binary gave error
              exit status 2

              -- Dominique

              --~--~---------~--~----~------------~-------~--~----~
              You received this message from the "vim_dev" maillist.
              For more information, visit http://www.vim.org/maillist.php
              -~----------~----~----~----~------~----~------~--~---
            • Tony Mechelynck
              On 09/05/08 08:14, Dominique Pelle wrote: [...] ... I suspect a bug in a CVS commit script. I don t get my Vim sources from CVS but from ftp+patch, and
              Message 6 of 7 , May 9, 2008
              View Source
              • 0 Attachment
                On 09/05/08 08:14, Dominique Pelle wrote:
                [...]
                > cp vimtutor /usr/local/bin/vimtutor
                > chmod 755 /usr/local/bin/vimtutor
                > cp gvimtutor /usr/local/bin/gvimtutor
                > cp: cannot stat 'gvimtutor': No such file or directory
                > make[1]: *** [installtutorbin] Error 1
                > make[1]: Leaving directory `/home/pel/sb/vim7/src'
                > make: *** [install] Error 2
                >
                >
                > I did "sudo make -k install" as a workaround which
                > installed vim-7.1.297 (which is the latest vim according
                > to www.vim.org) but somehow gvimtutor is missing
                > from CVS.
                >
                > -- Dominique

                I suspect a bug in a CVS commit script.

                I don't get my Vim sources from CVS but from ftp+patch, and gvimtutor
                got created. I'm appending it to this post: drop it into <builddir>/src/
                and /usr/local/bin/

                Best regards,
                Tony.
                --
                I'm proud to be paying taxes in the United States. The only thing is
                -- I could be just as proud for half the money.
                -- Arthur Godfrey

                --~--~---------~--~----~------------~-------~--~----~
                You received this message from the "vim_dev" maillist.
                For more information, visit http://www.vim.org/maillist.php
                -~----------~----~----~----~------~----~------~--~---
              • James Vega
                ... Actually, that s an error that usr/bin/gvimtutor exists but hasn t been installed into the resulting package. -- James GPG Key: 1024D/61326D40 2003-09-02
                Message 7 of 7 , May 9, 2008
                View Source
                • 0 Attachment
                  On Fri, May 09, 2008 at 08:21:29AM +0200, Dominique Pelle wrote:
                  > I also see in the link below that someone gets the same
                  > problem when building from debian/Ubunutu source package
                  > apparently:
                  >
                  > https://bugs.launchpad.net/ubuntu/+source/vim/+bug/219546/comments/13
                  >
                  > # Generate language-specific sections of
                  > # vim-{runtime,common,gui-common}.install files
                  > dh_installman
                  > dh_install -X.svn --fail-missing
                  > dh_install: usr/bin/gvimtutor exists in debian/tmp but is not

                  Actually, that's an error that usr/bin/gvimtutor exists but hasn't been
                  installed into the resulting package.

                  --
                  James
                  GPG Key: 1024D/61326D40 2003-09-02 James Vega <jamessan@...>
                Your message has been successfully submitted and would be delivered to recipients shortly.