• R/O
  • SSH

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim


Commit MetaInfo

Revisiónbf5ba8a0cdee590c0841391f9a8b65c456ed06bb (tree)
Tiempo2005-08-13 04:59:19
Autorvimboss
Commitervimboss

Log Message

updated for version 7.0129

Cambiar Resumen

Diferencia incremental

diff -r 147da3983fca -r bf5ba8a0cdee runtime/doc/options.txt
--- a/runtime/doc/options.txt Fri Aug 12 19:48:49 2005 +0000
+++ b/runtime/doc/options.txt Fri Aug 12 19:59:19 2005 +0000
@@ -1,4 +1,4 @@
1-*options.txt* For Vim version 7.0aa. Last change: 2005 Aug 11
1+*options.txt* For Vim version 7.0aa. Last change: 2005 Aug 12
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -5701,6 +5701,8 @@
57015701 Only used when 'spell' is set.
57025702 Be careful with special characters, see |option-backslash| about
57035703 including spaces and backslashes.
5704+ To set this option automatically depending on the language, see
5705+ |set-spc-auto|.
57045706
57055707 *'spellfile'* *'spf'*
57065708 'spellfile' 'spf' string (default empty)
@@ -5757,6 +5759,11 @@
57575759 files twice.
57585760 How the related spell files are found is explained here: |spell-load|.
57595761
5762+ After this option has been set successfully, Vim will source the files
5763+ "spell/LANG.vim" in 'runtimepath'. "LANG" is the value of 'spelllang'
5764+ up to the first comma, dot or underscore. See |set-spc-auto|.
5765+
5766+
57605767 *'spellsuggest'* *'sps'*
57615768 'spellsuggest' 'sps' string (default "best")
57625769 global
diff -r 147da3983fca -r bf5ba8a0cdee runtime/doc/pi_netrw.txt
--- a/runtime/doc/pi_netrw.txt Fri Aug 12 19:48:49 2005 +0000
+++ b/runtime/doc/pi_netrw.txt Fri Aug 12 19:59:19 2005 +0000
@@ -1,4 +1,4 @@
1-*pi_netrw.txt* For Vim version 7.0. Last change: Aug 09, 2005
1+*pi_netrw.txt* For Vim version 7.0. Last change: Aug 11, 2005
22
33
44 VIM REFERENCE MANUAL by Charles E. Campbell, Jr.
@@ -80,19 +80,19 @@
8080 want it ignored, then set this variable as shown. Its mere
8181 existence is enough to cause <.netrc> to be ignored.
8282
83- Controlling External Applications
83+ Controlling External Applications *netrw-externapp*
8484
8585 Protocol Variable Default Value
8686 -------- ---------------- -------------
87- dav: g:netrw_dav_cmd = "cadaver"
88- fetch: g:netrw_fetch_cmd = "fetch -o"
89- ftp: g:netrw_ftp_cmd = "ftp"
90- http: g:netrw_http_cmd = "fetch -o" if fetch is available
91- http: g:netrw_http_cmd = "wget -q -O" If wget is available
92- rcp: g:netrw_rcp_cmd = "rcp"
93- rsync: g:netrw_rsync_cmd = "rsync -a"
94- scp: g:netrw_scp_cmd = "scp -q"
95- sftp: g:netrw_sftp_cmd = "sftp"
87+ dav: *g:netrw_dav_cmd* = "cadaver"
88+ fetch: *g:netrw_fetch_cmd* = "fetch -o"
89+ ftp: *g:netrw_ftp_cmd* = "ftp"
90+ http: *g:netrw_http_cmd* = "fetch -o" if fetch is available
91+ http: g:netrw_http_cmd = "wget -q -O" If wget is available
92+ rcp: *g:netrw_rcp_cmd* = "rcp"
93+ rsync: *g:netrw_rsync_cmd* = "rsync -a"
94+ scp: *g:netrw_scp_cmd* = "scp -q"
95+ sftp: *g:netrw_sftp_cmd* = "sftp"
9696
9797 READING *netrw-read* *netrw-nread*
9898 :Nread ? give help
@@ -136,31 +136,41 @@
136136 :call NetUserPass("uid","password") -- sets global uid and password
137137
138138 VARIABLES *netrw-variables*
139- b:netrw_lastfile last file Network-read/written retained on
139+ *b:netrw_lastfile*
140+ last file Network-read/written retained on
140141 a per-buffer basis (supports plain :Nw )
141- s:netrw_line during Nw/NetWrite, holds current line number
142- s:netrw_col during Nw/NetWrite, holds current column number
142+ *s:netrw_line*
143+ during :Nw/NetWrite, holds current line number
144+ *s:netrw_col*
145+ during :Nw/NetWrite, holds current column number
143146 s:netrw_line and s:netrw_col are used to
144147 restore the cursor position on writes
145- g:netrw_ftp if it doesn't exist, use default ftp
148+ *g:netrw_ftp*
149+ if it doesn't exist, use default ftp
146150 =0 use default ftp (uid password)
147151 =1 use alternate ftp method (user uid password)
148- g:netrw_ftpmode ="binary" (default)
152+ *g:netrw_ftpmode*
153+ ="binary" (default)
149154 ="ascii"
150- g:netrw_uid (ftp) user-id, retained on a per-session basis
151- g:netrw_passwd (ftp) password, retained on a per-session basis
152- g:netrw_win95ftp =1 if using Win95, will remove four trailing blank
155+ *g:netrw_uid*
156+ (ftp) user-id, retained on a per-session basis
157+ *g:netrw_passwd*
158+ (ftp) password, retained on a per-session basis
159+ *g:netrw_win95ftp*
160+ =1 if using Win95, will remove four trailing blank
153161 lines that o/s's ftp "provides" on transfers
154162 =0 force normal ftp behavior (no trailing line
155163 removal)
156- g:netrw_cygwin =1 assume scp under windows is from cygwin
164+ *g:netrw_cygwin*
165+ =1 assume scp under windows is from cygwin
157166 Also permits network browsing to use
158167 ls with time and size sorting
159168 (default if windows)
160169 =0 assume Windows' scp accepts windows-style paths
161170 Network browsing uses dir instead of ls
162171 This option is ignored if you're using unix
163- g:netrw_use_nt_rcp=0 don't use the rcp of WinNT, Win2000 and WinXP
172+ *g:netrw_use_nt_rcp*
173+ =0 don't use the rcp of WinNT, Win2000 and WinXP
164174 =1 use WinNT's rcp in binary mode (default)
165175
166176 PATHS *netrw-path*
@@ -620,17 +630,17 @@
620630 --- -----------
621631 Var Explanation
622632 --- -----------
623-< g:netrw_alto change from above splitting to
633+< *g:netrw_alto* change from above splitting to
624634 below splitting by setting this
625635 variable (see |netrw-o|)
626636 default: =0
627637
628- g:netrw_altv change from left splitting to
638+ *g:netrw_altv* change from left splitting to
629639 right splitting by setting this
630640 variable (see |netrw-v|)
631641 default: =0
632642
633- g:netrw_ftp_browse_reject ftp can produce a number of errors
643+ *g:netrw_ftp_browse_reject* ftp can produce a number of errors
634644 and warnings that can show up as
635645 "directories" and "files" in the
636646 listing. This pattern is used to
@@ -644,7 +654,7 @@
644654 : connect to address [0-9a-fA-F:]*
645655 : No route to host$'
646656
647- g:netrw_ssh_browse_reject ssh can sometimes produce unwanted
657+ *g:netrw_ssh_browse_reject* ssh can sometimes produce unwanted
648658 lines/messages/banners/and whatnot
649659 that one doesn't want masquerading
650660 as "directories" and "files". Use
@@ -652,71 +662,71 @@
652662 messages. By default its value is:
653663 '^total\s\+\d\+$'
654664
655- g:netrw_keepdir =1 (default) keep current directory
665+ *g:netrw_keepdir* =1 (default) keep current directory
656666 immune from the browsing directory.
657667 =0 keep the current directory the
658668 same as the browsing directory.
659669 The browsing directory is contained in
660670 b:netrw_curdir
661671
662- g:netrw_list_cmd command for listing remote directories
672+ *g:netrw_list_cmd* command for listing remote directories
663673 default: (if ssh is executable)
664674 "ssh HOSTNAME ls -FLa"
665675
666- g:netrw_longlist if =1, then long listing will be default
676+ *g:netrw_longlist* if =1, then long listing will be default
667677
668- g:netrw_ftp_list_cmd options for passing along to ftp for
678+ *g:netrw_ftp_list_cmd* options for passing along to ftp for
669679 directory listing. Defaults:
670680 unix or g:netrw_cygwin set: : "ls -lF"
671681 otherwise "dir"
672682
673- g:netrw_list_hide comma separated list of patterns for
683+ *g:netrw_list_hide* comma separated list of patterns for
674684 hiding files
675685 default: ""
676686
677- g:netrw_local_mkdir command for making a local directory
687+ *g:netrw_local_mkdir* command for making a local directory
678688 default: "ssh HOSTNAME mkdir"
679689
680- g:netrw_local_rmdir remove directory command (rmdir)
690+ *g:netrw_local_rmdir* remove directory command (rmdir)
681691 default: "rmdir"
682692
683- g:netrw_maxfilenamelen =32 by default, selected so as to make
693+ *g:netrw_maxfilenamelen* =32 by default, selected so as to make
684694 long listings fit on 80 column displays.
685695 If your screen is wider, and you have
686696 file/directory names longer than 32 bytes,
687697 you may set this option to keep listings
688698 columnar.
689699
690- g:netrw_mkdir_cmd command for making a remote directory
700+ *g:netrw_mkdir_cmd* command for making a remote directory
691701 default: "ssh HOSTNAME mkdir"
692702
693- g:netrw_rm_cmd command for removing files
703+ *g:netrw_rm_cmd* command for removing files
694704 default: "ssh HOSTNAME rm"
695705
696- g:netrw_rmdir_cmd command for removing directories
706+ *g:netrw_rmdir_cmd* command for removing directories
697707 default: "ssh HOSTNAME rmdir"
698708
699- g:netrw_rmf_cmd command for removing softlinks
709+ *g:netrw_rmf_cmd* command for removing softlinks
700710 default: "ssh HOSTNAME rm -f"
701711
702- g:netrw_hide if true, the hiding list is used
712+ *g:netrw_hide* if true, the hiding list is used
703713 default: =0
704714
705- g:netrw_sort_by sort by "name", "time", or "size"
715+ *g:netrw_sort_by* sort by "name", "time", or "size"
706716 default: "name"
707717
708- g:netrw_sort_direction sorting direction: "normal" or "reverse"
718+ *g:netrw_sort_direction* sorting direction: "normal" or "reverse"
709719 default: "normal"
710720
711- g:netrw_sort_sequence when sorting by name, first sort by the
721+ *g:netrw_sort_sequence* when sorting by name, first sort by the
712722 comma-separated pattern sequence
713723 default: '[\/]$,*,\.bak$,\.o$,\.h$,
714724 \.info$,\.swp$,\.obj$'
715725
716- g:netrw_timefmt specify format string to strftime() (%c)
726+ *g:netrw_timefmt* specify format string to strftime() (%c)
717727 default: "%c"
718728
719- g:netrw_winsize specify initial size of new o/v windows
729+ *g:netrw_winsize* specify initial size of new o/v windows
720730 default: ""
721731
722732 INTRODUCTION TO DIRECTORY BROWSING *netrw-browse-intro*
@@ -815,7 +825,7 @@
815825 To go up a directory, press - or his the <cr> when atop the ../ directory
816826 entry in the listing.
817827
818-Netrw will modify the command in *g:netrw_list_cmd* to perform the directory
828+Netrw will modify the command in |g:netrw_list_cmd| to perform the directory
819829 listing operation. By default the command is:
820830
821831 ssh HOSTNAME ls -FLa
@@ -862,20 +872,17 @@
862872 You may select a range of lines with the "V" command (visual selection),
863873 and then pressing "D".
864874
865- *g:netrw_rm_cmd*
866875 The g:netrw_rm_cmd, g:netrw_rmf_cmd, and g:netrw_rmdir_cmd variables are used
867876 to control the attempts to remove files and directories. The g:netrw_rm_cmd
868877 is used with files, and its default value is:
869878
870879 g:netrw_rm_cmd: ssh HOSTNAME rm
871880
872- *g:netrw_rmdir_cmd*
873881 The g:netrw_rmdir_cmd variable is used to support the removal of directories.
874882 Its default value is:
875883
876884 g:netrw_rmdir_cmd: ssh HOSTNAME rmdir
877885
878- *g:netrw_rmf_cmd*
879886 If removing a directory fails with g:netrw_rmdir_cmd, netrw then will attempt
880887 to remove it again using the g:netrw_rmf_cmd variable. Its default value is:
881888
@@ -898,7 +905,7 @@
898905 the V (|linewise-visual|).
899906
900907
901-HIDING FILES OR DIRECTORIES *g:netrw-a* *g:netrw_list_hide*
908+HIDING FILES OR DIRECTORIES *g:netrw-a*
902909
903910 Netrw's browsing facility allows one to use the hiding list in one of
904911 three ways: ignore it, hide files which match, and show only those files
@@ -1188,6 +1195,11 @@
11881195 ==============================================================================
11891196 10. History *netrw-history*
11901197
1198+ v61: * document upgrade -- netrw variable-based settings all should
1199+ have tags. Supports NetrwSettings command.
1200+ * several important variables are window-oriented. Netrw has
1201+ to transfer these across a window split. See s:BufWinVars()
1202+ and s:UseBufWinVars().
11911203 v60: * when using the i map to switch between long and short listings,
11921204 netrw will now keep cursor on same line
11931205 * "Match # of #" now uses status line
diff -r 147da3983fca -r bf5ba8a0cdee runtime/doc/spell.txt
--- a/runtime/doc/spell.txt Fri Aug 12 19:48:49 2005 +0000
+++ b/runtime/doc/spell.txt Fri Aug 12 19:59:19 2005 +0000
@@ -1,4 +1,4 @@
1-*spell.txt* For Vim version 7.0aa. Last change: 2005 Aug 11
1+*spell.txt* For Vim version 7.0aa. Last change: 2005 Aug 12
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -155,7 +155,8 @@
155155 The 'spellcapcheck' option is used to check the first word of a sentence
156156 starts with a capital. This doesn't work for the first word in the file.
157157 When there is a line break right after a sentence the highlighting of the next
158-line may be postponed. Use |CTRL-L| when needed.
158+line may be postponed. Use |CTRL-L| when needed. Also see |set-spc-auto| for
159+how it can be set automatically when 'spelllang' is set.
159160
160161 ==============================================================================
161162 2. Remarks on spell checking *spell-remarks*
@@ -319,6 +320,21 @@
319320 spellsuggest() get list of spelling suggestions
320321 soundfold() get the sound-a-like version of a word
321322
323+
324+SETTING 'spellcapcheck' AUTOMATICALLY *set-spc-auto*
325+
326+After the 'spelllang' option has been set successfully, Vim will source the
327+files "spell/LANG.vim" in 'runtimepath'. "LANG" is the value of 'spelllang'
328+up to the first comma, dot or underscore. This can be used to set options
329+specifically for the language, especially 'spellcapcheck'.
330+
331+The distribution includes a few of these files. Use this command to see what
332+they do: >
333+ :next $VIMRUNTIME/spell/*.vim
334+
335+Note that the default scripts don't set 'spellcapcheck' if it was changed from
336+the default value. This assumes the user prefers another value then.
337+
322338 ==============================================================================
323339 3. Generating a spell file *spell-mkspell*
324340
diff -r 147da3983fca -r bf5ba8a0cdee runtime/doc/tags
--- a/runtime/doc/tags Fri Aug 12 19:48:49 2005 +0000
+++ b/runtime/doc/tags Fri Aug 12 19:59:19 2005 +0000
@@ -1640,12 +1640,18 @@
16401640 :@ repeat.txt /*:@*
16411641 :@: repeat.txt /*:@:*
16421642 :@@ repeat.txt /*:@@*
1643+:Explore pi_netrw.txt /*:Explore*
1644+:Hexplore pi_netrw.txt /*:Hexplore*
16431645 :Man filetype.txt /*:Man*
16441646 :N editing.txt /*:N*
1647+:Nexplore pi_netrw.txt /*:Nexplore*
16451648 :Next editing.txt /*:Next*
16461649 :P various.txt /*:P*
1650+:Pexplore pi_netrw.txt /*:Pexplore*
16471651 :Print various.txt /*:Print*
1652+:Sexplore pi_netrw.txt /*:Sexplore*
16481653 :TOhtml syntax.txt /*:TOhtml*
1654+:Vexplore pi_netrw.txt /*:Vexplore*
16491655 :X editing.txt /*:X*
16501656 :\bar cmdline.txt /*:\\bar*
16511657 :_! cmdline.txt /*:_!*
@@ -4222,6 +4228,7 @@
42224228 b motion.txt /*b*
42234229 b:changedtick-variable eval.txt /*b:changedtick-variable*
42244230 b:current_syntax-variable syntax.txt /*b:current_syntax-variable*
4231+b:netrw_lastfile pi_netrw.txt /*b:netrw_lastfile*
42254232 b:var eval.txt /*b:var*
42264233 backslash intro.txt /*backslash*
42274234 backspace intro.txt /*backspace*
@@ -4984,11 +4991,43 @@
49844991 g0 motion.txt /*g0*
49854992 g8 various.txt /*g8*
49864993 g:netrw-a pi_netrw.txt /*g:netrw-a*
4994+g:netrw_alto pi_netrw.txt /*g:netrw_alto*
4995+g:netrw_altv pi_netrw.txt /*g:netrw_altv*
4996+g:netrw_cygwin pi_netrw.txt /*g:netrw_cygwin*
4997+g:netrw_dav_cmd pi_netrw.txt /*g:netrw_dav_cmd*
4998+g:netrw_fetch_cmd pi_netrw.txt /*g:netrw_fetch_cmd*
4999+g:netrw_ftp pi_netrw.txt /*g:netrw_ftp*
5000+g:netrw_ftp_browse_reject pi_netrw.txt /*g:netrw_ftp_browse_reject*
5001+g:netrw_ftp_cmd pi_netrw.txt /*g:netrw_ftp_cmd*
5002+g:netrw_ftp_list_cmd pi_netrw.txt /*g:netrw_ftp_list_cmd*
5003+g:netrw_ftpmode pi_netrw.txt /*g:netrw_ftpmode*
5004+g:netrw_hide pi_netrw.txt /*g:netrw_hide*
5005+g:netrw_http_cmd pi_netrw.txt /*g:netrw_http_cmd*
5006+g:netrw_keepdir pi_netrw.txt /*g:netrw_keepdir*
49875007 g:netrw_list_cmd pi_netrw.txt /*g:netrw_list_cmd*
49885008 g:netrw_list_hide pi_netrw.txt /*g:netrw_list_hide*
5009+g:netrw_local_mkdir pi_netrw.txt /*g:netrw_local_mkdir*
5010+g:netrw_local_rmdir pi_netrw.txt /*g:netrw_local_rmdir*
5011+g:netrw_longlist pi_netrw.txt /*g:netrw_longlist*
5012+g:netrw_maxfilenamelen pi_netrw.txt /*g:netrw_maxfilenamelen*
5013+g:netrw_mkdir_cmd pi_netrw.txt /*g:netrw_mkdir_cmd*
5014+g:netrw_passwd pi_netrw.txt /*g:netrw_passwd*
5015+g:netrw_rcp_cmd pi_netrw.txt /*g:netrw_rcp_cmd*
49895016 g:netrw_rm_cmd pi_netrw.txt /*g:netrw_rm_cmd*
49905017 g:netrw_rmdir_cmd pi_netrw.txt /*g:netrw_rmdir_cmd*
49915018 g:netrw_rmf_cmd pi_netrw.txt /*g:netrw_rmf_cmd*
5019+g:netrw_rsync_cmd pi_netrw.txt /*g:netrw_rsync_cmd*
5020+g:netrw_scp_cmd pi_netrw.txt /*g:netrw_scp_cmd*
5021+g:netrw_sftp_cmd pi_netrw.txt /*g:netrw_sftp_cmd*
5022+g:netrw_sort_by pi_netrw.txt /*g:netrw_sort_by*
5023+g:netrw_sort_direction pi_netrw.txt /*g:netrw_sort_direction*
5024+g:netrw_sort_sequence pi_netrw.txt /*g:netrw_sort_sequence*
5025+g:netrw_ssh_browse_reject pi_netrw.txt /*g:netrw_ssh_browse_reject*
5026+g:netrw_timefmt pi_netrw.txt /*g:netrw_timefmt*
5027+g:netrw_uid pi_netrw.txt /*g:netrw_uid*
5028+g:netrw_use_nt_rcp pi_netrw.txt /*g:netrw_use_nt_rcp*
5029+g:netrw_win95ftp pi_netrw.txt /*g:netrw_win95ftp*
5030+g:netrw_winsize pi_netrw.txt /*g:netrw_winsize*
49925031 g:var eval.txt /*g:var*
49935032 g; motion.txt /*g;*
49945033 g< message.txt /*g<*
@@ -5762,6 +5801,7 @@
57625801 netrw-ex pi_netrw.txt /*netrw-ex*
57635802 netrw-explore pi_netrw.txt /*netrw-explore*
57645803 netrw-explore-cmds pi_netrw.txt /*netrw-explore-cmds*
5804+netrw-externapp pi_netrw.txt /*netrw-externapp*
57655805 netrw-file pi_netrw.txt /*netrw-file*
57665806 netrw-fixup pi_netrw.txt /*netrw-fixup*
57675807 netrw-ftp pi_netrw.txt /*netrw-ftp*
@@ -5784,6 +5824,12 @@
57845824 netrw-o pi_netrw.txt /*netrw-o*
57855825 netrw-options pi_netrw.txt /*netrw-options*
57865826 netrw-p pi_netrw.txt /*netrw-p*
5827+netrw-p1 pi_netrw.txt /*netrw-p1*
5828+netrw-p2 pi_netrw.txt /*netrw-p2*
5829+netrw-p3 pi_netrw.txt /*netrw-p3*
5830+netrw-p4 pi_netrw.txt /*netrw-p4*
5831+netrw-p5 pi_netrw.txt /*netrw-p5*
5832+netrw-p6 pi_netrw.txt /*netrw-p6*
57875833 netrw-passwd pi_netrw.txt /*netrw-passwd*
57885834 netrw-path pi_netrw.txt /*netrw-path*
57895835 netrw-pexplore pi_netrw.txt /*netrw-pexplore*
@@ -6226,6 +6272,8 @@
62266272 s/\t change.txt /*s\/\\t*
62276273 s/\u change.txt /*s\/\\u*
62286274 s/\~ change.txt /*s\/\\~*
6275+s:netrw_col pi_netrw.txt /*s:netrw_col*
6276+s:netrw_line pi_netrw.txt /*s:netrw_line*
62296277 s:var eval.txt /*s:var*
62306278 s<CR> change.txt /*s<CR>*
62316279 sandbox eval.txt /*sandbox*
@@ -6274,6 +6322,7 @@
62746322 servername-variable eval.txt /*servername-variable*
62756323 session-file starting.txt /*session-file*
62766324 set-option options.txt /*set-option*
6325+set-spc-auto spell.txt /*set-spc-auto*
62776326 setbufvar() eval.txt /*setbufvar()*
62786327 setcmdpos() eval.txt /*setcmdpos()*
62796328 setline() eval.txt /*setline()*
@@ -6683,6 +6732,12 @@
66836732 terminal-options term.txt /*terminal-options*
66846733 terminfo term.txt /*terminfo*
66856734 termresponse-variable eval.txt /*termresponse-variable*
6735+tex-error syntax.txt /*tex-error*
6736+tex-folding syntax.txt /*tex-folding*
6737+tex-math syntax.txt /*tex-math*
6738+tex-runon syntax.txt /*tex-runon*
6739+tex-slow syntax.txt /*tex-slow*
6740+tex-style syntax.txt /*tex-style*
66866741 tex-syntax syntax.txt /*tex-syntax*
66876742 tex.vim syntax.txt /*tex.vim*
66886743 text-objects motion.txt /*text-objects*
diff -r 147da3983fca -r bf5ba8a0cdee runtime/doc/todo.txt
--- a/runtime/doc/todo.txt Fri Aug 12 19:48:49 2005 +0000
+++ b/runtime/doc/todo.txt Fri Aug 12 19:59:19 2005 +0000
@@ -1,4 +1,4 @@
1-*todo.txt* For Vim version 7.0aa. Last change: 2005 Aug 11
1+*todo.txt* For Vim version 7.0aa. Last change: 2005 Aug 12
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -30,11 +30,6 @@
3030 *known-bugs*
3131 -------------------- Known bugs and current work -----------------------
3232
33-Spell checking: default value for 'spellcapcheck' in spell file?
34-For Hebrew and Yiddish it should be empty.
35-
36-Using "@:" has two problems (Tim Chase, 2005 Aug 9)
37-
3833 Mac unicode patch (Da Woon Jung):
3934 - selecting proportional font breaks display
4035 - UTF-8 text causes display problems. Font replacement causes this.
diff -r 147da3983fca -r bf5ba8a0cdee runtime/doc/version7.txt
--- a/runtime/doc/version7.txt Fri Aug 12 19:48:49 2005 +0000
+++ b/runtime/doc/version7.txt Fri Aug 12 19:59:19 2005 +0000
@@ -1,4 +1,4 @@
1-*version7.txt* For Vim version 7.0aa. Last change: 2005 Aug 11
1+*version7.txt* For Vim version 7.0aa. Last change: 2005 Aug 12
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -761,6 +761,9 @@
761761 pattern matches. In the example a ":" not followed by a line number is
762762 included in the file name. (suggested by Emanuele Giaquinta)
763763
764+For command-line completion the matches for various types of arguments are now
765+sorted: user commands, variables, syntax names, etc.
766+
764767 ==============================================================================
765768 COMPILE TIME CHANGES *compile-changes-7*
766769
@@ -848,7 +851,8 @@
848851 ignored. ":echo '-05' + 0" resulted in 5 instead of -5.
849852
850853 Using "@:" to repeat a command line didn't work when it contains control
851-characters.
854+characters. Also remove "'<,'>" when in Visual mode to avoid that it appears
855+twice.
852856
853857 When using file completion for a user command, it would not expand environment
854858 variables like for a regular command with a file argument.
diff -r 147da3983fca -r bf5ba8a0cdee runtime/plugin/netrw.vim
--- a/runtime/plugin/netrw.vim Fri Aug 12 19:48:49 2005 +0000
+++ b/runtime/plugin/netrw.vim Fri Aug 12 19:59:19 2005 +0000
@@ -1,7 +1,7 @@
11 " netrw.vim: Handles file transfer and remote directory listing across a network
2-" Last Change: Aug 10, 2005
2+" Last Change: Aug 12, 2005
33 " Maintainer: Charles E Campbell, Jr <drchipNOSPAM at campbellfamily dot biz>
4-" Version: 60
4+" Version: 61
55 " License: Vim License (see vim's :help license)
66 " Copyright: Copyright (C) 1999-2005 Charles E. Campbell, Jr.
77 " Permission is hereby granted to use and distribute this code,
@@ -22,7 +22,7 @@
2222 if exists("g:loaded_netrw") || &cp
2323 finish
2424 endif
25-let g:loaded_netrw = "v60"
25+let g:loaded_netrw = "v61"
2626 if v:version < 700
2727 let loaded_explorer = 1
2828 endif
@@ -1079,6 +1079,9 @@
10791079 return
10801080 endif
10811081
1082+ " use buffer-oriented WinVars if buffer ones exist but window ones don't
1083+ call s:UseBufWinVars()
1084+
10821085 " make this buffer modifiable
10831086 setlocal ma nonu nowrap
10841087
@@ -1161,6 +1164,9 @@
11611164 exe "silent doau BufReadPost ".fname
11621165 keepjumps 1d
11631166
1167+ " save certain window-oriented variables into buffer-oriented variables
1168+ call s:BufWinVars()
1169+
11641170 setlocal nonu nomod noma
11651171
11661172 " call Dret("NetBrowse : file<".fname.">")
@@ -1429,6 +1435,8 @@
14291435 " NetGetWord: it gets the directory named under the cursor
14301436 fun! <SID>NetGetWord()
14311437 " call Dfunc("NetGetWord() line#".line("."))
1438+ call s:UseBufWinVars()
1439+
14321440 if exists("w:netrw_bannercnt") && line(".") < w:netrw_bannercnt
14331441 let dirname= "./"
14341442 let curline= getline(".")
@@ -2166,6 +2174,9 @@
21662174 set noautochdir
21672175 endif
21682176
2177+ " use buffer-oriented WinVars if buffer ones exist but window ones don't
2178+ call s:UseBufWinVars()
2179+
21692180 " find buffer number of buffer named precisely the same as a:dirname
21702181 let bufnum= bufnr(a:dirname)
21712182 " call Decho("findbuf: bufnum=".bufnum)
@@ -2380,6 +2391,9 @@
23802391 " record previous current directory
23812392 let w:netrw_prvdir= b:netrw_curdir
23822393
2394+ " save certain window-oriented variables into buffer-oriented variables
2395+ call s:BufWinVars()
2396+
23832397 setlocal noma nomod nonu bh=hide nobl
23842398 if has("netbeans_intg") || has("sun_workshop")
23852399 let &autochdir= keep_autochdir
@@ -3299,6 +3313,7 @@
32993313 if exists("w:netrw_explore_mtchcnt")|let s:explore_mtchcnt = w:netrw_explore_mtchcnt|endif
33003314 if exists("w:netrw_explore_bufnr") |let s:explore_bufnr = w:netrw_explore_bufnr |endif
33013315 if exists("w:netrw_explore_line") |let s:explore_line = w:netrw_explore_line |endif
3316+ if exists("w:netrw_explore_list") |let s:explore_list = w:netrw_explore_list |endif
33023317 " call Dret("SaveWinVars")
33033318 endfun
33043319
@@ -3314,9 +3329,48 @@
33143329 if exists("s:explore_mtchcnt")|let w:netrw_explore_mtchcnt = s:explore_mtchcnt|unlet s:explore_mtchcnt|endif
33153330 if exists("s:explore_bufnr") |let w:netrw_explore_bufnr = s:explore_bufnr |unlet s:explore_bufnr |endif
33163331 if exists("s:explore_line") |let w:netrw_explore_line = s:explore_line |unlet s:explore_line |endif
3332+ if exists("s:explore_list") |let w:netrw_explore_list = s:explore_list |unlet s:explore_list |endif
33173333 " call Dret("CopyWinVars")
33183334 endfun
33193335
3336+" ---------------------------------------------------------------------
3337+" BufWinVars: (used by NetBrowse() and LocalBrowse()) {{{1
3338+" To allow separate windows to have their own activities, such as
3339+" Explore **/pattern, several variables have been made window-oriented.
3340+" However, when the user splits a browser window (ex: ctrl-w s), these
3341+" variables are not inherited by the new window. BufWinVars() and
3342+" UseBufWinVars() get around that.
3343+fun! s:BufWinVars()
3344+" call Dfunc("BufWinVars()")
3345+ if exists("w:netrw_bannercnt") |let b:netrw_bannercnt = w:netrw_bannercnt |endif
3346+ if exists("w:netrw_method") |let b:netrw_method = w:netrw_method |endif
3347+ if exists("w:netrw_prvdir") |let b:netrw_prvdir = w:netrw_prvdir |endif
3348+ if exists("w:netrw_explore_indx") |let b:netrw_explore_indx = w:netrw_explore_indx |endif
3349+ if exists("w:netrw_explore_listlen")|let b:netrw_explore_listlen = w:netrw_explore_listlen|endif
3350+ if exists("w:netrw_explore_mtchcnt")|let b:netrw_explore_mtchcnt = w:netrw_explore_mtchcnt|endif
3351+ if exists("w:netrw_explore_bufnr") |let b:netrw_explore_bufnr = w:netrw_explore_bufnr |endif
3352+ if exists("w:netrw_explore_line") |let b:netrw_explore_line = w:netrw_explore_line |endif
3353+ if exists("w:netrw_explore_list") |let b:netrw_explore_list = w:netrw_explore_list |endif
3354+" call Dret("BufWinVars")
3355+endfun
3356+
3357+" ---------------------------------------------------------------------
3358+" UseBufWinVars: (used by NetBrowse() and LocalBrowse() {{{1
3359+" Matching function to BufferWinVars()
3360+fun! s:UseBufWinVars()
3361+" call Dfunc("UseBufWinVars()")
3362+ if exists("b:netrw_bannercnt") && !exists("w:netrw_bannercnt") |let w:netrw_bannercnt = b:netrw_bannercnt |endif
3363+ if exists("b:netrw_method") && !exists("w:netrw_method") |let w:netrw_method = b:netrw_method |endif
3364+ if exists("b:netrw_prvdir") && !exists("w:netrw_prvdir") |let w:netrw_prvdir = b:netrw_prvdir |endif
3365+ if exists("b:netrw_explore_indx") && !exists("w:netrw_explore_indx") |let w:netrw_explore_indx = b:netrw_explore_indx |endif
3366+ if exists("b:netrw_explore_listlen") && !exists("w:netrw_explore_listlen")|let w:netrw_explore_listlen = b:netrw_explore_listlen|endif
3367+ if exists("b:netrw_explore_mtchcnt") && !exists("w:netrw_explore_mtchcnt")|let w:netrw_explore_mtchcnt = b:netrw_explore_mtchcnt|endif
3368+ if exists("b:netrw_explore_bufnr") && !exists("w:netrw_explore_bufnr") |let w:netrw_explore_bufnr = b:netrw_explore_bufnr |endif
3369+ if exists("b:netrw_explore_line") && !exists("w:netrw_explore_line") |let w:netrw_explore_line = b:netrw_explore_line |endif
3370+ if exists("b:netrw_explore_list") && !exists("w:netrw_explore_list") |let w:netrw_explore_list = b:netrw_explore_list |endif
3371+" call Dret("UseBufWinVars")
3372+endfun
3373+
33203374 let &cpo= s:keepcpo
33213375 unlet s:keepcpo
33223376 " ------------------------------------------------------------------------
diff -r 147da3983fca -r bf5ba8a0cdee src/digraph.c
--- a/src/digraph.c Fri Aug 12 19:48:49 2005 +0000
+++ b/src/digraph.c Fri Aug 12 19:59:19 2005 +0000
@@ -2367,12 +2367,12 @@
23672367 # ifdef FEAT_MBYTE
23682368 /* try finding "keymap/'keymap'_'encoding'.vim" in 'runtimepath' */
23692369 sprintf((char *)buf, "keymap/%s_%s.vim", curbuf->b_p_keymap, p_enc);
2370- if (cmd_runtime(buf, FALSE) == FAIL)
2370+ if (source_runtime(buf, FALSE) == FAIL)
23712371 # endif
23722372 {
23732373 /* try finding "keymap/'keymap'.vim" in 'runtimepath' */
23742374 sprintf((char *)buf, "keymap/%s.vim", curbuf->b_p_keymap);
2375- if (cmd_runtime(buf, FALSE) == FAIL)
2375+ if (source_runtime(buf, FALSE) == FAIL)
23762376 {
23772377 vim_free(buf);
23782378 return (char_u *)N_("E544: Keymap file not found");
diff -r 147da3983fca -r bf5ba8a0cdee src/eval.c
--- a/src/eval.c Fri Aug 12 19:48:49 2005 +0000
+++ b/src/eval.c Fri Aug 12 19:59:19 2005 +0000
@@ -17775,7 +17775,7 @@
1777517775 }
1777617776
1777717777 /* Try loading the package from $VIMRUNTIME/autoload/<name>.vim */
17778- if (cmd_runtime(scriptname, FALSE) == OK)
17778+ if (source_runtime(scriptname, FALSE) == OK)
1777917779 ret = TRUE;
1778017780 }
1778117781
diff -r 147da3983fca -r bf5ba8a0cdee src/ex_cmds2.c
--- a/src/ex_cmds2.c Fri Aug 12 19:48:49 2005 +0000
+++ b/src/ex_cmds2.c Fri Aug 12 19:59:19 2005 +0000
@@ -2391,7 +2391,7 @@
23912391 do_unlet((char_u *)"b:current_compiler", TRUE);
23922392
23932393 sprintf((char *)buf, "compiler/%s.vim", eap->arg);
2394- if (cmd_runtime(buf, TRUE) == FAIL)
2394+ if (source_runtime(buf, TRUE) == FAIL)
23952395 EMSG2(_("E666: compiler not supported: %s"), eap->arg);
23962396 vim_free(buf);
23972397
@@ -2426,7 +2426,7 @@
24262426 ex_runtime(eap)
24272427 exarg_T *eap;
24282428 {
2429- cmd_runtime(eap->arg, eap->forceit);
2429+ source_runtime(eap->arg, eap->forceit);
24302430 }
24312431
24322432 static void source_callback __ARGS((char_u *fname, void *cookie));
@@ -2447,7 +2447,7 @@
24472447 * return FAIL when no file could be sourced, OK otherwise.
24482448 */
24492449 int
2450-cmd_runtime(name, all)
2450+source_runtime(name, all)
24512451 char_u *name;
24522452 int all;
24532453 {
diff -r 147da3983fca -r bf5ba8a0cdee src/ex_getln.c
--- a/src/ex_getln.c Fri Aug 12 19:48:49 2005 +0000
+++ b/src/ex_getln.c Fri Aug 12 19:59:19 2005 +0000
@@ -4151,14 +4151,14 @@
41514151 {
41524152 int i;
41534153 int count = 0;
4154- int loop;
4154+ int round;
41554155 char_u *str;
41564156
41574157 /* do this loop twice:
4158- * loop == 0: count the number of matching names
4159- * loop == 1: copy the matching names into allocated memory
4158+ * round == 0: count the number of matching names
4159+ * round == 1: copy the matching names into allocated memory
41604160 */
4161- for (loop = 0; loop <= 1; ++loop)
4161+ for (round = 0; round <= 1; ++round)
41624162 {
41634163 for (i = 0; ; ++i)
41644164 {
@@ -4170,7 +4170,7 @@
41704170
41714171 if (vim_regexec(regmatch, str, (colnr_T)0))
41724172 {
4173- if (loop)
4173+ if (round)
41744174 {
41754175 str = vim_strsave_escaped(str, (char_u *)" \t\\.");
41764176 (*file)[count] = str;
@@ -4187,7 +4187,7 @@
41874187 ++count;
41884188 }
41894189 }
4190- if (loop == 0)
4190+ if (round == 0)
41914191 {
41924192 if (count == 0)
41934193 return OK;
@@ -4201,6 +4201,10 @@
42014201 count = 0;
42024202 }
42034203 }
4204+
4205+ /* Sort the results. */
4206+ sort_strings(*file, *num_file);
4207+
42044208 return OK;
42054209 }
42064210
diff -r 147da3983fca -r bf5ba8a0cdee src/main.c
--- a/src/main.c Fri Aug 12 19:48:49 2005 +0000
+++ b/src/main.c Fri Aug 12 19:59:19 2005 +0000
@@ -550,7 +550,7 @@
550550 */
551551 if (p_lpl)
552552 {
553- cmd_runtime((char_u *)"plugin/*.vim", TRUE);
553+ source_runtime((char_u *)"plugin/*.vim", TRUE);
554554 TIME_MSG("loading plugins");
555555 }
556556 #endif
diff -r 147da3983fca -r bf5ba8a0cdee src/ops.c
--- a/src/ops.c Fri Aug 12 19:48:49 2005 +0000
+++ b/src/ops.c Fri Aug 12 19:59:19 2005 +0000
@@ -1160,7 +1160,14 @@
11601160 p = vim_strsave_escaped_ext(last_cmdline,
11611161 (char_u *)"\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037", Ctrl_V, FALSE);
11621162 if (p != NULL)
1163- retval = put_in_typebuf(p, TRUE);
1163+ {
1164+ /* When in Visual mode "'<,'>" will be prepended to the command.
1165+ * Remove it when it's already there. */
1166+ if (VIsual_active && STRNCMP(p, "'<,'>", 5) == 0)
1167+ retval = put_in_typebuf(p + 5, TRUE);
1168+ else
1169+ retval = put_in_typebuf(p, TRUE);
1170+ }
11641171 vim_free(p);
11651172 }
11661173 #endif
diff -r 147da3983fca -r bf5ba8a0cdee src/option.c
--- a/src/option.c Fri Aug 12 19:48:49 2005 +0000
+++ b/src/option.c Fri Aug 12 19:59:19 2005 +0000
@@ -5793,25 +5793,6 @@
57935793 }
57945794 #endif
57955795
5796-#ifdef FEAT_AUTOCMD
5797-# ifdef FEAT_SYN_HL
5798- /* When 'syntax' is set, load the syntax of that name */
5799- else if (varp == &(curbuf->b_p_syn))
5800- {
5801- apply_autocmds(EVENT_SYNTAX, curbuf->b_p_syn,
5802- curbuf->b_fname, TRUE, curbuf);
5803- }
5804-# endif
5805-
5806- /* When 'filetype' is set, trigger the FileType autocommands of that name */
5807- else if (varp == &(curbuf->b_p_ft))
5808- {
5809- did_filetype = TRUE;
5810- apply_autocmds(EVENT_FILETYPE, curbuf->b_p_ft,
5811- curbuf->b_fname, TRUE, curbuf);
5812- }
5813-#endif
5814-
58155796 #ifdef FEAT_QUICKFIX
58165797 /* When 'bufhidden' is set, check for valid value. */
58175798 else if (gvarp == &p_bh)
@@ -6159,6 +6140,46 @@
61596140 /* May set global value for local option. */
61606141 else if (!(opt_flags & OPT_LOCAL) && opt_flags != OPT_GLOBAL)
61616142 set_string_option_global(opt_idx, varp);
6143+
6144+#ifdef FEAT_AUTOCMD
6145+ /*
6146+ * Trigger the autocommand only after setting the flags.
6147+ */
6148+# ifdef FEAT_SYN_HL
6149+ /* When 'syntax' is set, load the syntax of that name */
6150+ if (varp == &(curbuf->b_p_syn))
6151+ {
6152+ apply_autocmds(EVENT_SYNTAX, curbuf->b_p_syn,
6153+ curbuf->b_fname, TRUE, curbuf);
6154+ }
6155+# endif
6156+ else if (varp == &(curbuf->b_p_ft))
6157+ {
6158+ /* 'filetype' is set, trigger the FileType autocommand */
6159+ did_filetype = TRUE;
6160+ apply_autocmds(EVENT_FILETYPE, curbuf->b_p_ft,
6161+ curbuf->b_fname, TRUE, curbuf);
6162+ }
6163+#endif
6164+#ifdef FEAT_SYN_HL
6165+ if (varp == &(curbuf->b_p_spl))
6166+ {
6167+ char_u fname[200];
6168+
6169+ /*
6170+ * Source the spell/LANG.vim in 'runtimepath'.
6171+ * They could set 'spellcapcheck' depending on the language.
6172+ * Use the first name in 'spelllang' up to '_region' or
6173+ * '.encoding'.
6174+ */
6175+ for (p = curbuf->b_p_spl; *p != NUL; ++p)
6176+ if (vim_strchr((char_u *)"_.,", *p) != NULL)
6177+ break;
6178+ vim_snprintf((char *)fname, 200, "spell/%.*s.vim",
6179+ (int)(p - curbuf->b_p_spl), curbuf->b_p_spl);
6180+ source_runtime(fname, TRUE);
6181+ }
6182+#endif
61626183 }
61636184
61646185 #ifdef FEAT_MOUSE
diff -r 147da3983fca -r bf5ba8a0cdee src/po/it.po
--- a/src/po/it.po Fri Aug 12 19:48:49 2005 +0000
+++ b/src/po/it.po Fri Aug 12 19:59:19 2005 +0000
@@ -605,7 +605,7 @@
605605 msgstr "E742: Non riesco a cambiare il valore di %s"
606606
607607 msgid "E698: variable nested too deep for making a copy"
608-msgstr "E698 Variabile troppo nidificata per poterla copiare"
608+msgstr "E698: Variabile troppo nidificata per poterla copiare"
609609
610610 #, c-format
611611 msgid "E124: Missing '(': %s"
diff -r 147da3983fca -r bf5ba8a0cdee src/proto/ex_cmds2.pro
--- a/src/proto/ex_cmds2.pro Fri Aug 12 19:48:49 2005 +0000
+++ b/src/proto/ex_cmds2.pro Fri Aug 12 19:59:19 2005 +0000
@@ -53,7 +53,7 @@
5353 void ex_listdo __ARGS((exarg_T *eap));
5454 void ex_compiler __ARGS((exarg_T *eap));
5555 void ex_runtime __ARGS((exarg_T *eap));
56-int cmd_runtime __ARGS((char_u *name, int all));
56+int source_runtime __ARGS((char_u *name, int all));
5757 int do_in_runtimepath __ARGS((char_u *name, int all, void (*callback)(char_u *fname, void *ck), void *cookie));
5858 void ex_options __ARGS((exarg_T *eap));
5959 void ex_source __ARGS((exarg_T *eap));
diff -r 147da3983fca -r bf5ba8a0cdee src/syntax.c
--- a/src/syntax.c Fri Aug 12 19:48:49 2005 +0000
+++ b/src/syntax.c Fri Aug 12 19:59:19 2005 +0000
@@ -4421,7 +4421,7 @@
44214421 prev_toplvl_grp = curbuf->b_syn_topgrp;
44224422 curbuf->b_syn_topgrp = sgl_id;
44234423 if (source ? do_source(eap->arg, FALSE, FALSE) == FAIL
4424- : cmd_runtime(eap->arg, TRUE) == FAIL)
4424+ : source_runtime(eap->arg, TRUE) == FAIL)
44254425 EMSG2(_(e_notopen), eap->arg);
44264426 curbuf->b_syn_topgrp = prev_toplvl_grp;
44274427 current_syn_inc_tag = prev_syn_inc_tag;
@@ -6174,7 +6174,7 @@
61746174 else
61756175 {
61766176 ++recursive;
6177- (void)cmd_runtime((char_u *)"syntax/syncolor.vim", TRUE);
6177+ (void)source_runtime((char_u *)"syntax/syncolor.vim", TRUE);
61786178 --recursive;
61796179 }
61806180 }
@@ -6204,7 +6204,7 @@
62046204 if (buf != NULL)
62056205 {
62066206 sprintf((char *)buf, "colors/%s.vim", name);
6207- retval = cmd_runtime(buf, FALSE);
6207+ retval = source_runtime(buf, FALSE);
62086208 vim_free(buf);
62096209 #ifdef FEAT_AUTOCMD
62106210 apply_autocmds(EVENT_COLORSCHEME, NULL, NULL, FALSE, curbuf);
diff -r 147da3983fca -r bf5ba8a0cdee src/version.h
--- a/src/version.h Fri Aug 12 19:48:49 2005 +0000
+++ b/src/version.h Fri Aug 12 19:59:19 2005 +0000
@@ -36,5 +36,5 @@
3636 #define VIM_VERSION_NODOT "vim70aa"
3737 #define VIM_VERSION_SHORT "7.0aa"
3838 #define VIM_VERSION_MEDIUM "7.0aa ALPHA"
39-#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Aug 11)"
40-#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Aug 11, compiled "
39+#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2005 Aug 12)"
40+#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2005 Aug 12, compiled "
Show on old repository browser