jkunstle / rpms / vim

Forked from rpms/vim 3 years ago
Clone
073263
To: vim_dev@googlegroups.com
073263
Subject: Patch 7.4.340
073263
Fcc: outbox
073263
From: Bram Moolenaar <Bram@moolenaar.net>
073263
Mime-Version: 1.0
073263
Content-Type: text/plain; charset=UTF-8
073263
Content-Transfer-Encoding: 8bit
073263
------------
073263
073263
Patch 7.4.340
073263
Problem:    Error from sed about illegal bytes when installing Vim.
073263
Solution:   Prepend LC_ALL=C. (Itchyny)
073263
Files:	    src/installman.sh
073263
073263
073263
*** ../vim-7.4.339/src/installman.sh	2010-05-15 13:04:07.000000000 +0200
073263
--- src/installman.sh	2014-06-25 14:54:11.742381748 +0200
073263
***************
073263
*** 43,52 ****
073263
     fi
073263
  fi
073263
  
073263
  if test $what = "install"; then
073263
     # vim.1
073263
     echo installing $destdir/$exename.1
073263
!    sed -e s+/usr/local/lib/vim+$vimloc+ \
073263
  	   -e s+$vimloc/doc+$helpsubloc+ \
073263
  	   -e s+$vimloc/print+$printsubloc+ \
073263
  	   -e s+$vimloc/syntax+$synsubloc+ \
073263
--- 43,55 ----
073263
     fi
073263
  fi
073263
  
073263
+ # Note: setting LC_ALL to C is required to avoid illegal byte errors from sed
073263
+ # on some systems.
073263
+ 
073263
  if test $what = "install"; then
073263
     # vim.1
073263
     echo installing $destdir/$exename.1
073263
!    LC_ALL=C sed -e s+/usr/local/lib/vim+$vimloc+ \
073263
  	   -e s+$vimloc/doc+$helpsubloc+ \
073263
  	   -e s+$vimloc/print+$printsubloc+ \
073263
  	   -e s+$vimloc/syntax+$synsubloc+ \
073263
***************
073263
*** 64,70 ****
073263
  
073263
     # vimtutor.1
073263
     echo installing $destdir/$exename""tutor.1
073263
!    sed -e s+/usr/local/lib/vim+$vimloc+ \
073263
  	   -e s+$vimloc/tutor+$tutorsubloc+ \
073263
  	   $helpsource/vimtutor$langadd.1 > $destdir/$exename""tutor.1
073263
     chmod $manmod $destdir/$exename""tutor.1
073263
--- 67,73 ----
073263
  
073263
     # vimtutor.1
073263
     echo installing $destdir/$exename""tutor.1
073263
!    LC_ALL=C sed -e s+/usr/local/lib/vim+$vimloc+ \
073263
  	   -e s+$vimloc/tutor+$tutorsubloc+ \
073263
  	   $helpsource/vimtutor$langadd.1 > $destdir/$exename""tutor.1
073263
     chmod $manmod $destdir/$exename""tutor.1
073263
***************
073263
*** 76,82 ****
073263
  
073263
     # evim.1
073263
     echo installing $destdir/$evimname.1
073263
!    sed -e s+/usr/local/lib/vim+$vimloc+ \
073263
  	   -e s+$vimloc/evim.vim+$scriptloc/evim.vim+ \
073263
  	   $helpsource/evim$langadd.1 > $destdir/$evimname.1
073263
     chmod $manmod $destdir/$evimname.1
073263
--- 79,85 ----
073263
  
073263
     # evim.1
073263
     echo installing $destdir/$evimname.1
073263
!    LC_ALL=C sed -e s+/usr/local/lib/vim+$vimloc+ \
073263
  	   -e s+$vimloc/evim.vim+$scriptloc/evim.vim+ \
073263
  	   $helpsource/evim$langadd.1 > $destdir/$evimname.1
073263
     chmod $manmod $destdir/$evimname.1
073263
*** ../vim-7.4.339/src/version.c	2014-06-25 14:44:04.458358774 +0200
073263
--- src/version.c	2014-06-25 14:55:14.198384111 +0200
073263
***************
073263
*** 736,737 ****
073263
--- 736,739 ----
073263
  {   /* Add new patch number below this line */
073263
+ /**/
073263
+     340,
073263
  /**/
073263
073263
-- 
073263
DEAD PERSON:  I'm getting better!
073263
CUSTOMER:     No, you're not -- you'll be stone dead in a moment.
073263
MORTICIAN:    Oh, I can't take him like that -- it's against regulations.
073263
                                  The Quest for the Holy Grail (Monty Python)
073263
073263
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
073263
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
073263
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
073263
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///