updated for version 7.0f04

2006-04-28 22:38:25 +00:00
parent bd2ac7ec09
commit 5a30542f1e
9 changed files with 88 additions and 34 deletions
--- a/runtime/autoload/netrw.vim
+++ b/runtime/autoload/netrw.vim
@@ -1,7 +1,7 @@
 " netrw.vim: Handles file transfer and remote directory listing across a network
 "            AUTOLOAD PORTION
-" Date:		Apr 26, 2006
-" Version:	94
+" Date:		Apr 28, 2006
+" Version:	95
 " Maintainer:	Charles E Campbell, Jr <drchipNOSPAM at campbellfamily dot biz>
 " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
 " Copyright:    Copyright (C) 1999-2005 Charles E. Campbell, Jr. {{{1
@@ -23,7 +23,7 @@
 if &cp || exists("g:loaded_netrw")
  finish
 endif
-let g:loaded_netrw = "v94"
+let g:loaded_netrw = "v95"
 if v:version < 700
 echohl WarningMsg | echo "***netrw*** you need vim version 7.0 or later for version ".g:loaded_netrw." of netrw" | echohl None
 finish
@@ -322,7 +322,9 @@ fun! netrw#NetRead(mode,...)

  " get name of a temporary file and set up shell-quoting character {{{3
  let tmpfile= tempname()
+"  call Decho("tmpfile<".tmpfile.">")
  let tmpfile= escape(substitute(tmpfile,'\','/','ge'),g:netrw_tmpfile_escape)
+"  call Decho("tmpfile<".tmpfile.">")
  if !isdirectory(substitute(tmpfile,'[^/]\+$','','e'))
   echohl Error | echo "***netrw*** your <".substitute(tmpfile,'[^/]\+$','','e')."> directory is missing!" | echohl None
   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
@@ -806,9 +808,12 @@ fun! netrw#NetWrite(...) range
  call s:NetOptionSave()

  " Get Temporary Filename {{{3
-  let tmpfile= escape(tempname(),g:netrw_tmpfile_escape)
+  let tmpfile= tempname()
+"  call Decho("tmpfile<".tmpfile."> (raw)")
+  let tmpfile= escape(substitute(tmpfile,'\','/','ge'),g:netrw_tmpfile_escape)
+"  call Decho("tmpfile<".tmpfile."> (escaped)")
  if !isdirectory(substitute(tmpfile,'[^/]\+$','','e'))
-   echohl Error | echo "***netrw*** your ".substitute(tmpfile,'[^/]\+$','','e')." directory is missing!"
+   echohl Error | echo "***netrw*** your <".substitute(tmpfile,'[^/]\+$','','e')."> directory is missing!"
   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
 "   call Dret("NetWrite")
   return
@@ -2023,7 +2028,12 @@ endfun
 fun! s:NetrwListHide()
 "  call Dfunc("NetrwListHide() hide=".g:netrw_hide." listhide<".g:netrw_list_hide.">")

+  " find a character not in the "hide" string to used as a separator
+  " for :g and :v commands
  let listhide= g:netrw_list_hide
+  let sep     = strpart(substitute('~!@#$%^&*{};:,<.>/?|abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890','['.escape(listhide,'-]^\').']','','ge'),1,1)
+"  call Decho("sep=".sep)
+
  while listhide != ""
   if listhide =~ ','
    let hide     = substitute(listhide,',.*$','','e')
@@ -2036,14 +2046,16 @@ fun! s:NetrwListHide()
   " Prune the list by hiding any files which match
   if g:netrw_hide == 1
 "    call Decho("hiding<".hide."> listhide<".listhide.">")
-"    call Decho('exe silent keepjumps '.w:netrw_bannercnt.',$g~'.hide.'~d')
-    exe 'silent keepjumps '.w:netrw_bannercnt.',$g~'.hide.'~d'
+    exe 'silent keepjumps '.w:netrw_bannercnt.',$g'.sep.hide.sep.'d'
   elseif g:netrw_hide == 2
 "    call Decho("showing<".hide."> listhide<".listhide.">")
-"    call Decho('exe silent keepjumps '.w:netrw_bannercnt.',$v~'.hide.'~d')
-    exe 'silent keepjumps '.w:netrw_bannercnt.',$v~'.hide.'~d'
+    exe 'silent keepjumps '.w:netrw_bannercnt.',$g'.sep.hide.sep.'s@^@ /-KEEP-/ @'
   endif
  endwhile
+  if g:netrw_hide == 2
+   exe 'silent keepjumps '.w:netrw_bannercnt.',$v@^ /-KEEP-/ @d'
+   exe 'silent keepjumps '.w:netrw_bannercnt.',$s@^\%( /-KEEP-/ \)\+@@e'
+  endif

 "  call Dret("NetrwListHide")
 endfun
@@ -2759,7 +2771,7 @@ endfun
 " DirBrowse: supports local file/directory browsing {{{2
 fun! netrw#DirBrowse(dirname)
  if !exists("w:netrw_longlist")|let w:netrw_longlist= g:netrw_longlist|endif
-"  call Dfunc("DirBrowse(dirname<".a:dirname.">) buf#".bufnr("%")." winnr=".winnr()." sortby=".g:netrw_sort_by)
+"  call Dfunc("DirBrowse(dirname<".a:dirname.">) buf#".bufnr("%")." winnr=".winnr()." sortby=".g:netrw_sort_by." hide=".g:netrw_hide)
 "  call Dredir("ls!")

  if exists("s:netrw_skipbrowse")
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -1,4 +1,4 @@
-*motion.txt*    For Vim version 7.0f.  Last change: 2006 Apr 25
+*motion.txt*    For Vim version 7.0f.  Last change: 2006 Apr 28


 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -629,8 +629,9 @@ a"							*v_aquote* *aquote*
 a'							*v_a'* *a'*
 a`							*v_a`* *a`*
 			"a quoted string".  Selects the text from the previous
-			quote until the next quote.  The 'quoteescape' is used
-			to skip escaped quotes.
+			quote until the next quote.  The 'quoteescape' option
+			is used to skip escaped quotes.
+			Only works within one line.
 			When the cursor starts on a quote, Vim will figure out
 			which quote pairs form a string by searching from the
 			start of the line.
--- a/runtime/doc/pi_netrw.txt
+++ b/runtime/doc/pi_netrw.txt
@@ -1,4 +1,4 @@
-*pi_netrw.txt*  For Vim version 7.0f.  Last change: 2006 Apr 26
+*pi_netrw.txt*  For Vim version 7.0f.  Last change: 2006 Apr 28

 		VIM REFERENCE MANUAL    by Charles E. Campbell, Jr.

@@ -1473,6 +1473,12 @@ which is loaded automatically at startup (assuming :set nocp).
 ==============================================================================
 11. History						*netrw-history* {{{1

+	v95: * bugfix - Hiding mode worked correctly (don't show any file
+	       matching any of the g:netrw_hide patterns), but
+	       but showing mode was showing only those files that didn't
+	       match any of the g:netrw_hide patterns.  Instead, it now
+	       shows all files that match any of the g:netrw_hide patterns
+	       (the difference between a logical and and logical or).
 	v94: * bugfix - a Decho() had a missing quote; only affects things
 	       when debugging was enabled.
 	v93: * bugfix - removed FocusGained event from causing a slow-browser
--- a/src/Makefile
+++ b/src/Makefile
@@ -1719,6 +1719,9 @@ test check:
 	-if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \
 		cd $(PODIR); $(MAKE) -f Makefile check VIM=../$(VIMTARGET); \
 	fi
+	-if test $(VIMTARGET) != vim -a ! -e vim; then \
+		ln -s $(VIMTARGET) vim; \
+	fi
 	cd testdir; $(MAKE) -f Makefile $(GUI_TESTTARGET) VIMPROG=../$(VIMTARGET) $(GUI_TESTARG)

 testclean:
@@ -2148,7 +2151,7 @@ uninstall_runtime:
 # Clean up all the files that have been produced, except configure's.
 # We support common typing mistakes for Juergen! :-)
 clean celan: testclean
-	-rm -f *.o objects/* core $(VIMTARGET).core $(VIMTARGET) xxd/*.o
+	-rm -f *.o objects/* core $(VIMTARGET).core $(VIMTARGET) vim xxd/*.o
 	-rm -f $(TOOLS) auto/osdef.h auto/pathdef.c auto/if_perl.c
 	-rm -f conftest* *~ auto/link.sed
 	-rm -rf $(APPDIR)
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -2841,6 +2841,38 @@ restore_cmdline(ccp)
    prev_ccline = *ccp;
 }

+#if defined(FEAT_EVAL) || defined(PROTO)
+/*
+ * Save the command line into allocated memory.  Returns a pointer to be
+ * passed to restore_cmdline_alloc() later.
+ * Returns NULL when failed.
+ */
+    char_u *
+save_cmdline_alloc()
+{
+    struct cmdline_info *p;
+
+    p = (struct cmdline_info *)alloc((unsigned)sizeof(struct cmdline_info));
+    if (p != NULL)
+	save_cmdline(p);
+    return (char_u *)p;
+}
+
+/*
+ * Restore the command line from the return value of save_cmdline_alloc().
+ */
+    void
+restore_cmdline_alloc(p)
+    char_u  *p;
+{
+    if (p != NULL)
+    {
+	restore_cmdline((struct cmdline_info *)p);
+	vim_free(p);
+    }
+}
+#endif
+
 /*
 * paste a yank register into the command line.
 * used by CTRL-R command in command-line mode
--- a/src/po/pl.cp1250.po
+++ b/src/po/pl.cp1250.po
@@ -910,7 +910,7 @@ msgstr ""

 #, c-format
 msgid "# Value of 'encoding' when this file was written\n"
-msgstr "# Warto<74><6F> 'encoding' w czasie zapsu tego pliku\n"
+msgstr "# Warto<74><6F> 'encoding' w czasie zapisu tego pliku\n"

 msgid "Illegal starting char"
 msgstr "Niedopuszczalny pocz<63>tkowy znak"
@@ -1483,7 +1483,7 @@ msgstr "Wczytywanie ze stdin..."

 #. Re-opening the original file failed!
 msgid "E202: Conversion made file unreadable!"
-msgstr "E202: Plik stworzony poprzez przemian<61> jest nieodczytywalny!"
+msgstr "E202: Nie mo<6D>na otworzy<7A> pliku utworzonego przez przemian<61>!"

 msgid "[fifo/socket]"
 msgstr "[fifo/socket]"
@@ -1648,13 +1648,13 @@ msgid "[mac]"
 msgstr "[mac]"

 msgid "[mac format]"
-msgstr "[format mac-a]"
+msgstr "[format maca]"

 msgid "[unix]"
 msgstr "[unix]"

 msgid "[unix format]"
-msgstr "[format unix-a]"
+msgstr "[format unixa]"

 msgid "1 line, "
 msgstr "1 wiersz, "
@@ -1928,7 +1928,7 @@ msgid "Input _Methods"
 msgstr "Input _Methods"

 msgid "VIM - Search and Replace..."
-msgstr "VIM - Szukaj i Zamieniaj..."
+msgstr "VIM - Szukaj i Zamie<EFBFBD>..."

 msgid "VIM - Search..."
 msgstr "VIM - Szukaj..."
@@ -1967,7 +1967,7 @@ msgid "Replace All"
 msgstr "Zamie<69> wszystkie"

 msgid "Vim: Received \"die\" request from session manager\n"
-msgstr "Vim: otrzymano <20><>danie \"die\" od manad<EFBFBD>era sesji\n"
+msgstr "Vim: otrzymano <20><>danie \"die\" od mened<EFBFBD>era sesji\n"

 msgid "Close"
 msgstr "Zamknij"
@@ -2463,7 +2463,7 @@ msgid "writelines() requires list of strings"
 msgstr "writelines() wymaga listy ci<63>g<EFBFBD>w"

 msgid "E264: Python: Error initialising I/O objects"
-msgstr "E264: Python: B<><42>d w inicjalizacji obiekt<6B>w I/O"
+msgstr "E264: Python: B<><42>d w uruchomieniu obiekt<6B>w I/O"

 msgid "attempt to refer to deleted buffer"
 msgstr "pr<70>ba odniesienia do skasowanego bufora"
@@ -2542,7 +2542,7 @@ msgid "Show base class of"
 msgstr "Poka<6B> baz<61> klasy"

 msgid "Show overridden member function"
-msgstr "Poka<6B> przepisan<61> funkcj<63> cz<63>onkow<EFBFBD>"
+msgstr "Poka<6B> przepisan<61> funkcj<63> cz<63>onow<6F>"

 msgid "Retrieve from file"
 msgstr "Pobieraj z pliku"
@@ -2587,7 +2587,7 @@ msgid "Show docu of"
 msgstr "Poka<6B> dokumentacj<63> dla"

 msgid "Generate docu for"
-msgstr "Wygeneruj dokumentacj<63> dla"
+msgstr "Utw<EFBFBD>rz dokumentacj<63> dla"

 msgid ""
 "Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
--- a/src/screen.c
+++ b/src/screen.c
@@ -463,6 +463,12 @@ update_screen(type)
 		))
 	curwin->w_redr_type = type;

+#ifdef FEAT_WINDOWS
+    /* Redraw the tab pages line if needed. */
+    if (redraw_tabline || type >= NOT_VALID)
+	draw_tabline();
+#endif
+
 #ifdef FEAT_SYN_HL
    /*
     * Correct stored syntax highlighting info for changes in each displayed
@@ -490,12 +496,6 @@ update_screen(type)
    }
 #endif

-#ifdef FEAT_WINDOWS
-    /* Redraw the tab pages line if needed. */
-    if (redraw_tabline || type >= NOT_VALID)
-	draw_tabline();
-#endif
-
    /*
     * Go from top to bottom through the windows, redrawing the ones that need
     * it.
--- a/src/testdir/test49.vim
+++ b/src/testdir/test49.vim
@@ -1,6 +1,6 @@
 " Vim script language tests
 " Author:	Servatius Brandt <Servatius.Brandt@fujitsu-siemens.com>
-" Last Change:	2006 Feb 28
+" Last Change:	2006 Apr 28

 "-------------------------------------------------------------------------------
 " Test environment							    {{{1
--- a/src/version.h
+++ b/src/version.h
@@ -35,6 +35,6 @@
 */
 #define VIM_VERSION_NODOT	"vim70f"
 #define VIM_VERSION_SHORT	"7.0f"
-#define VIM_VERSION_MEDIUM	"7.0f03 BETA"
-#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0f03 BETA (2006 Apr 27)"
-#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0f03 BETA (2006 Apr 27, compiled "
+#define VIM_VERSION_MEDIUM	"7.0f04 BETA"
+#define VIM_VERSION_LONG	"VIM - Vi IMproved 7.0f04 BETA (2006 Apr 28)"
+#define VIM_VERSION_LONG_DATE	"VIM - Vi IMproved 7.0f04 BETA (2006 Apr 28, compiled "