• R/O
  • SSH

vim: Commit

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


Commit MetaInfo

Revision4102fb4ea78127b1a95b2df3274a55d9bfba68c2 (tree)
Time2004-06-20 21:51:53
Authorvimboss
Commitervimboss

Log Message

updated for version 7.0002

Change Summary

Incremental Difference

diff -r 7edf9b6e4c36 -r 4102fb4ea781 runtime/doc/change.txt
--- a/runtime/doc/change.txt Wed Jun 16 11:19:22 2004 +0000
+++ b/runtime/doc/change.txt Sun Jun 20 12:51:53 2004 +0000
@@ -1,4 +1,4 @@
1-*change.txt* For Vim version 7.0aa. Last change: 2004 Jun 15
1+*change.txt* For Vim version 7.0aa. Last change: 2004 Jun 16
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1048,7 +1048,7 @@
10481048 filled in and the <Drop> pseudo key is sent for notification. You can remap
10491049 this key if you want; the default action (for all modes) is to insert the
10501050 contents of the "~ register at the cursor position. {not in Vi}
1051-{only available when compiled with the |+dnd| feature, curently only with the
1051+{only available when compiled with the |+dnd| feature, currently only with the
10521052 GTK GUI}
10531053
10541054 Note: The "~ register is only used when dropping plain text onto Vim.
@@ -1138,6 +1138,13 @@
11381138 the text. However, 'formatprg' is not used.
11391139 {not in Vi}
11401140
1141+gwgw *gwgw* *gww*
1142+gww Format the current line as with "gw". {not in Vi}
1143+
1144+ *v_gw*
1145+{Visual}gw Format the highlighted text as with "gw". (for
1146+ {Visual} see |Visual-mode|). {not in Vi}
1147+
11411148 Example: To format the current paragraph use: *gqap* >
11421149 gqap
11431150
diff -r 7edf9b6e4c36 -r 4102fb4ea781 runtime/doc/editing.txt
--- a/runtime/doc/editing.txt Wed Jun 16 11:19:22 2004 +0000
+++ b/runtime/doc/editing.txt Sun Jun 20 12:51:53 2004 +0000
@@ -1,4 +1,4 @@
1-*editing.txt* For Vim version 7.0aa. Last change: 2004 Jun 14
1+*editing.txt* For Vim version 7.0aa. Last change: 2004 Jun 17
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -340,10 +340,11 @@
340340
341341 *`=*
342342 You can have the backticks expanded as a Vim expression, instead of
343-an external command, by using the syntax `={expr}` e.g. >
343+an external command, by using the syntax `={expr}` e.g.: >
344344 :let foo='bar'
345345 :e `=foo . ".c" `
346-edits "bar.c". Note that the expression cannot contain a backtick.
346+This will edit "bar.c". The expression can contain just about anything, thus
347+this can also be used to avoid the special meaning of '"', '|', '%' and '#'.
347348
348349 *++opt* *[++opt]*
349350 The [++opt] argument can be used to force the value of 'fileformat' or
diff -r 7edf9b6e4c36 -r 4102fb4ea781 runtime/doc/eval.txt
--- a/runtime/doc/eval.txt Wed Jun 16 11:19:22 2004 +0000
+++ b/runtime/doc/eval.txt Sun Jun 20 12:51:53 2004 +0000
@@ -1,4 +1,4 @@
1-*eval.txt* For Vim version 7.0aa. Last change: 2004 May 18
1+*eval.txt* For Vim version 7.0aa. Last change: 2004 Jun 20
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -515,7 +515,7 @@
515515 command Tick let s:counter = s:counter + 1 | echo s:counter
516516
517517 When calling a function and invoking a user-defined command, the context for
518-script varialbes is set to the script where the function or command was
518+script variables is set to the script where the function or command was
519519 defined.
520520
521521 The script variables are also available when a function is defined inside a
@@ -972,9 +972,13 @@
972972 bufexists({expr}) *bufexists()*
973973 The result is a Number, which is non-zero if a buffer called
974974 {expr} exists.
975+ If the {expr} argument is a number, buffer numbers are used.
975976 If the {expr} argument is a string it must match a buffer name
976- exactly.
977- If the {expr} argument is a number buffer numbers are used.
977+ exactly. The name can be:
978+ - Relative to the current directory.
979+ - A full path.
980+ - The name of a buffer with 'filetype' set to "nofile".
981+ - A URL name.
978982 Unlisted buffers will be found.
979983 Note that help files are listed by their short name in the
980984 output of |:buffers|, but bufexists() requires using their
@@ -987,12 +991,12 @@
987991 buflisted({expr}) *buflisted()*
988992 The result is a Number, which is non-zero if a buffer called
989993 {expr} exists and is listed (has the 'buflisted' option set).
990- The {expr} argument is used like with bufexists().
994+ The {expr} argument is used like with |bufexists()|.
991995
992996 bufloaded({expr}) *bufloaded()*
993997 The result is a Number, which is non-zero if a buffer called
994998 {expr} exists and is loaded (shown in a window or hidden).
995- The {expr} argument is used like with bufexists().
999+ The {expr} argument is used like with |bufexists()|.
9961000
9971001 bufname({expr}) *bufname()*
9981002 The result is the name of a buffer, as it is displayed by the
@@ -1233,6 +1237,9 @@
12331237 This function checks if an executable with the name {expr}
12341238 exists. {expr} must be the name of the program without any
12351239 arguments. executable() uses the normal $PATH.
1240+ On MS-DOS and MS-Windows the ".exe", ".bat", etc. must be
1241+ included. It only checks if the file exists and is not a
1242+ directory, not if it's really executable.
12361243 The result is a Number:
12371244 1 exists
12381245 0 does not exist
@@ -1910,7 +1917,7 @@
19101917 This autocommand jumps to the last known position in a file
19111918 just after opening it, if the '" mark is set: >
19121919 :au BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal g'\"" | endif
1913-<
1920+
19141921 line2byte({lnum}) *line2byte()*
19151922 Return the byte count from the start of the buffer for line
19161923 {lnum}. This includes the end-of-line character, depending on
@@ -2746,7 +2753,7 @@
27462753 gettext Compiled with message translation |multi-lang|
27472754 gui Compiled with GUI enabled.
27482755 gui_athena Compiled with Athena GUI.
2749-gui_beos Compiled with BeOs GUI.
2756+gui_beos Compiled with BeOS GUI.
27502757 gui_gtk Compiled with GTK+ GUI (any version).
27512758 gui_gtk2 Compiled with GTK+ 2 GUI (gui_gtk is also defined).
27522759 gui_mac Compiled with Macintosh GUI.
@@ -2801,7 +2808,7 @@
28012808 showcmd Compiled with 'showcmd' support.
28022809 signs Compiled with |:sign| support.
28032810 smartindent Compiled with 'smartindent' support.
2804-sniff Compiled with SniFF interface support.
2811+sniff Compiled with SNiFF interface support.
28052812 statusline Compiled with support for 'statusline', 'rulerformat'
28062813 and special formats of 'titlestring' and 'iconstring'.
28072814 sun_workshop Compiled with support for Sun |workshop|.
diff -r 7edf9b6e4c36 -r 4102fb4ea781 runtime/doc/farsi.txt
--- a/runtime/doc/farsi.txt Wed Jun 16 11:19:22 2004 +0000
+++ b/runtime/doc/farsi.txt Sun Jun 20 12:51:53 2004 +0000
@@ -1,4 +1,4 @@
1-*farsi.txt* For Vim version 7.0aa. Last change: 2002 Oct 29
1+*farsi.txt* For Vim version 7.0aa. Last change: 2004 Jun 16
22
33
44 VIM REFERENCE MANUAL by Mortaza Ghassab Shiran
@@ -66,7 +66,7 @@
6666 subdirectories of the '$VIM/farsi' directory:
6767
6868 + far-a01.pcf X Windows fonts for Unix including Linux systems
69- + far-a01.bf X Windows fonts for SunOs
69+ + far-a01.bf X Windows fonts for SunOS
7070 + far-a01.f16 a screen fonts for Unix including Linux systems
7171 + far-a01.fon a monospaced fonts for Windows NT/95/98
7272 + far-a01.com a screen fonts for DOS
@@ -92,7 +92,7 @@
9292 > mkfontdir
9393 > xset +fp path_name_of_farsi_fonts_directory
9494
95-o Installation of fonts for X Window systems (SunOs)
95+o Installation of fonts for X Window systems (SunOS)
9696
9797 Copy far-a01.bf font into a directory of your choice.
9898 Change to the directory containing the far-a01.fb fonts and
diff -r 7edf9b6e4c36 -r 4102fb4ea781 runtime/doc/index.txt
--- a/runtime/doc/index.txt Wed Jun 16 11:19:22 2004 +0000
+++ b/runtime/doc/index.txt Sun Jun 20 12:51:53 2004 +0000
@@ -1,4 +1,4 @@
1-*index.txt* For Vim version 7.0aa. Last change: 2004 May 24
1+*index.txt* For Vim version 7.0aa. Last change: 2004 Jun 16
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -130,8 +130,8 @@
130130 |i_<C-Home>| <C-Home> cursor to start of file
131131 |i_<End>| <End> cursor past end of line
132132 |i_<C-End>| <C-End> cursor past end of file
133-|i_<PageUp>| <PageUp> one screenfull backward
134-|i_<PageDown>| <PageDown> one screenfull forward
133+|i_<PageUp>| <PageUp> one screenful backward
134+|i_<PageDown>| <PageDown> one screenful forward
135135 |i_<F1>| <F1> same as <Help>
136136 |i_<Help>| <Help> stop insert mode and display help window
137137 |i_<Insert>| <Insert> toggle Insert/Replace mode
diff -r 7edf9b6e4c36 -r 4102fb4ea781 runtime/doc/insert.txt
--- a/runtime/doc/insert.txt Wed Jun 16 11:19:22 2004 +0000
+++ b/runtime/doc/insert.txt Sun Jun 20 12:51:53 2004 +0000
@@ -1,4 +1,4 @@
1-*insert.txt* For Vim version 7.0aa. Last change: 2004 Apr 09
1+*insert.txt* For Vim version 7.0aa. Last change: 2004 Jun 16
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -908,7 +908,7 @@
908908 The position is corrected for inserted/deleted lines,
909909 but NOT for inserted/deleted characters.
910910 When the |:keepjumps| command modifier is used the |'^|
911- mark wont be changed.
911+ mark won't be changed.
912912 {not in Vi}
913913
914914 *o*
diff -r 7edf9b6e4c36 -r 4102fb4ea781 runtime/doc/mbyte.txt
--- a/runtime/doc/mbyte.txt Wed Jun 16 11:19:22 2004 +0000
+++ b/runtime/doc/mbyte.txt Sun Jun 20 12:51:53 2004 +0000
@@ -1,4 +1,4 @@
1-*mbyte.txt* For Vim version 7.0aa. Last change: 2004 Jun 07
1+*mbyte.txt* For Vim version 7.0aa. Last change: 2004 Jun 16
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar et al.
@@ -141,7 +141,7 @@
141141 - For all systems keymaps can be used. See |mbyte-keymap|.
142142
143143 The options 'iminsert', 'imsearch' and 'imcmdline' can be used to chose
144-the different input medhods or disable them temporarily.
144+the different input methods or disable them temporarily.
145145
146146 ==============================================================================
147147 2. Locale *mbyte-locale*
@@ -906,7 +906,7 @@
906906 This works on not only insert-normal mode, but also search-command input and
907907 replace mode.
908908 The options 'iminsert', 'imsearch' and 'imcmdline' can be used to chose
909-the different input medhods or disable them temporarily.
909+the different input methods or disable them temporarily.
910910
911911 WHAT IS IME
912912 IME is a part of East asian version Windows. That helps you to input
diff -r 7edf9b6e4c36 -r 4102fb4ea781 runtime/doc/motion.txt
--- a/runtime/doc/motion.txt Wed Jun 16 11:19:22 2004 +0000
+++ b/runtime/doc/motion.txt Sun Jun 20 12:51:53 2004 +0000
@@ -1,4 +1,4 @@
1-*motion.txt* For Vim version 7.0aa. Last change: 2004 May 13
1+*motion.txt* For Vim version 7.0aa. Last change: 2004 Jun 17
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -672,11 +672,12 @@
672672 the cursor, this is not a motion command).
673673
674674 *:ma* *:mark* *E191*
675-:[range]ma[rk] {a-zA-Z} Set mark {a-zA-Z} at last line number in [range],
675+:[range]ma[rk] {a-zA-Z'}
676+ Set mark {a-zA-Z'} at last line number in [range],
676677 column 0. Default is cursor line.
677678
678679 *:k*
679-:[range]k{a-zA-Z} Same as :mark, but the space before the mark name can
680+:[range]k{a-zA-Z'} Same as :mark, but the space before the mark name can
680681 be omitted.
681682
682683 *'* *'a* *`* *`a*
@@ -692,7 +693,9 @@
692693 jumping within the current buffer. Example: >
693694 g`"
694695 < jumps to the last known position in a file. See
695- $VIMRUNTIME/vimrc_example.vim. {not in Vi}
696+ $VIMRUNTIME/vimrc_example.vim.
697+ Also see |:keepjumps|.
698+ {not in Vi}
696699
697700 *:marks*
698701 :marks List all the current marks (not a motion command).
@@ -868,7 +871,7 @@
868871 or larger than before, all marks are kept at the
869872 same line number.
870873 - When the number of lines decreases, the marks in the
871- ilnes that disappeared are deleted.
874+ lines that disappeared are deleted.
872875 In any case the marks below the filtered text have
873876 their line numbers adjusted, thus stick to the text,
874877 as usual.
@@ -877,12 +880,22 @@
877880
878881 *:keepj* *:keepjumps*
879882 :keepj[umps] {command}
880- Do not change the |''|, |'.| and |'^| marks, the
881- |jumplist| or the |changelist|. Useful when making a
882- change or inserting text automatically and the user
883- doesn't want to go to this position. E.g., when
884- updating a "Last change" timestamp: >
885- autocmd BufWritePre,FileWritePre *.abc keepjumps call SetLastChange()
883+ Moving around in {command} does not change the |''|,
884+ |'.| and |'^| marks, the |jumplist| or the
885+ |changelist|.
886+ Useful when making a change or inserting text
887+ automatically and the user doesn't want to go to this
888+ position. E.g., when updating a "Last change"
889+ timestamp in the first line: >
890+
891+ :let lnum = getline(".")
892+ :keepjumps normal gg
893+ :call SetLastChange()
894+ :keepjumps exe "normal " . lnum . "G"
895+<
896+ Note that ":keepjumps" must be used for every command.
897+ When invoking a function the commands in that function
898+ can still change the jumplist.
886899
887900 ==============================================================================
888901 8. Jumps *jump-motions*
diff -r 7edf9b6e4c36 -r 4102fb4ea781 runtime/doc/netbeans.txt
--- a/runtime/doc/netbeans.txt Wed Jun 16 11:19:22 2004 +0000
+++ b/runtime/doc/netbeans.txt Sun Jun 20 12:51:53 2004 +0000
@@ -1,4 +1,4 @@
1-*netbeans.txt* For Vim version 7.0aa. Last change: 2004 May 01
1+*netbeans.txt* For Vim version 7.0aa. Last change: 2004 Jun 16
22
33
44 VIM REFERENCE MANUAL by Gordon Prieur
@@ -180,7 +180,7 @@
180180 change.
181181
182182 *E656*
183-NetBeans dissallows writes of unmodified buffers
183+NetBeans disallows writes of unmodified buffers
184184 NetBeans does not support writes of unmodified buffers that
185185 were opened from NetBeans.
186186
@@ -245,7 +245,7 @@
245245 command. In protocol version 2.1 and earlier this was incorrectly interpreted
246246 as a notification that a write had taken place. In reality, it told NetBeans
247247 to save the file so multiple writes were being done. This caused various
248-problems and has been fixed in 2.2. To decrease the likelyhood of this
248+problems and has been fixed in 2.2. To decrease the likelihood of this
249249 confusion happening again, netbeans_saved() has been renamed to
250250 netbeans_save_buffer().
251251
diff -r 7edf9b6e4c36 -r 4102fb4ea781 runtime/doc/os_mac.txt
--- a/runtime/doc/os_mac.txt Wed Jun 16 11:19:22 2004 +0000
+++ b/runtime/doc/os_mac.txt Sun Jun 20 12:51:53 2004 +0000
@@ -1,4 +1,4 @@
1-*os_mac.txt* For Vim version 7.0aa. Last change: 2004 Apr 27
1+*os_mac.txt* For Vim version 7.0aa. Last change: 2004 Jun 19
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar et al.
@@ -74,11 +74,16 @@
7474 ==============================================================================
7575 4. Mac Lack *mac-lack*
7676
77--The filenames containing both ":" and "/" are sometimes misinterpreted.
78- (just re-execute the command)
79--Scrollbar are not scrolling live, and when only the arrow or scroll area,
80- a limit of 32 line or page is scrolled.
81--Syntax highlighting works on 68k Macs but is _really_ slow.
77+The filenames containing both ":" and "/" are sometimes misinterpreted. (just
78+re-execute the command)
79+
80+Scrollbar are not scrolling live, and when only the arrow or scroll area, a
81+limit of 32 line or page is scrolled.
82+
83+Syntax highlighting works on 68k Macs but is _really_ slow.
84+
85+In a terminal CTRL-^ needs to be entered as Shift-Control-6. CTRL-@ as
86+Shift-Control-2.
8287
8388 ==============================================================================
8489 5. Mac Bug Report *mac-bug*
diff -r 7edf9b6e4c36 -r 4102fb4ea781 runtime/doc/os_vms.txt
--- a/runtime/doc/os_vms.txt Wed Jun 16 11:19:22 2004 +0000
+++ b/runtime/doc/os_vms.txt Sun Jun 20 12:51:53 2004 +0000
@@ -1,4 +1,4 @@
1-*os_vms.txt* For Vim version 7.0aa. Last change: 2004 May 16
1+*os_vms.txt* For Vim version 7.0aa. Last change: 2004 Jun 16
22
33
44 VIM REFERENCE MANUAL
@@ -280,7 +280,7 @@
280280 You need to set up one X server and run Vim as in point 2.
281281 For MS Windows there are available free X servers as MIX , Omni X etc.
282282 as well as excellent commercial products as eXcursion or ReflectionX with
283- buit in DEC support.
283+ built in DEC support.
284284
285285 Please note, that executables without GUI are slightly faster during startup
286286 then with enabled GUI in character mode. Therefore, if you do not use GUI
diff -r 7edf9b6e4c36 -r 4102fb4ea781 runtime/doc/pi_netrw.txt
--- a/runtime/doc/pi_netrw.txt Wed Jun 16 11:19:22 2004 +0000
+++ b/runtime/doc/pi_netrw.txt Sun Jun 20 12:51:53 2004 +0000
@@ -1,11 +1,11 @@
1-*pi_netrw.txt* For Vim version 7.0aa. Last change: Apr 21, 2004
1+*pi_netrw.txt* For Vim version 6.2. Last change: Jun 15, 2004
22
33
44 VIM REFERENCE MANUAL by Charles E. Campbell, Jr.
55
6-*dav* *http* *network* *rcp* *scp*
7-*fetch* *netrw* *Nread* *rsync* *sftp*
8-*ftp* *netrw.vim* *Nwrite* *netrw-file*
6+*dav* *http* *network* *rcp* *scp*
7+*fetch* *netrw* *Nread* *rsync* *sftp*
8+*ftp* *netrw.vim* *Nwrite* *netrw-file*
99
1010 ==============================================================================
1111 0. Contents *netrw-contents*
@@ -16,15 +16,16 @@
1616 4. Transparent File Transfer...........................|netrw-transparent|
1717 5. Ex Commands.........................................|netrw-ex|
1818 6. Variables and Options...............................|netrw-var|
19-7. Debugging...........................................|netrw-debug|
20-8. New Stuff...........................................|netrw-new|
21-9. Credits.............................................|netrw-credits|
19+7. Remote Directory Listing............................|netrw-dir|
20+8. Debugging...........................................|netrw-debug|
21+9. History.............................................|netrw-history|
22+10. Credits.............................................|netrw-credits|
2223
2324 The functionality mentioned here is done via using |standard-plugin|
2425 techniques. This plugin is only available if
2526
26- set nocp " 'compatible' is not set
27- filetype plugin on " plugins are enabled
27+ set nocp " 'compatible' is not set
28+ filetype plugin on " plugins are enabled
2829
2930 You can avoid loading this plugin by setting the "loaded_netrw" variable
3031 in your <.vimrc> file: >
@@ -49,16 +50,16 @@
4950
5051 Controlling External Applications
5152
52- Protocol Variable Default Value
53- -------- ---------------- -------------
54- dav: g:netrw_dav_cmd = "cadaver"
55- fetch: g:netrw_fetch_cmd = "fetch -o"
56- ftp: g:netrw_ftp_cmd = "ftp"
57- http: g:netrw_http_cmd = "fetch -o" else if fetch is available
58- http: g:netrw_http_cmd = "wget -q -O" If wget is available
59- rcp: g:netrw_rcp_cmd = "rcp"
60- rsync: g:netrw_rsync_cmd = "rsync -a"
61- scp: g:netrw_scp_cmd = "scp -q"
53+ Protocol Variable Default Value
54+ -------- ---------------- -------------
55+ dav: g:netrw_dav_cmd = "cadaver"
56+ fetch: g:netrw_fetch_cmd = "fetch -o"
57+ ftp: g:netrw_ftp_cmd = "ftp"
58+ http: g:netrw_http_cmd = "fetch -o" if fetch is available
59+ http: g:netrw_http_cmd = "wget -q -O" If wget is available
60+ rcp: g:netrw_rcp_cmd = "rcp"
61+ rsync: g:netrw_rsync_cmd = "rsync -a"
62+ scp: g:netrw_scp_cmd = "scp -q"
6263 sftp: g:netrw_sftp_cmd = "sftp"
6364
6465 READING
@@ -76,7 +77,7 @@
7677 :Nread "sftp://[user@]machine/file" uses sftp
7778
7879 WRITING
79- :Nwrite ? give help
80+ :Nwrite ? give help
8081 :Nwrite "machine:file" uses rcp
8182 :Nwrite "machine file" uses ftp with <.netrc>
8283 :Nwrite "machine id password file" uses ftp
@@ -88,6 +89,9 @@
8889 :Nwrite "sftp://[user@]machine/file" uses sftp
8990 http: not supported!
9091
92+ DIRECTORY LISTING
93+ :Nread [protocol]://[user]@hostname/path/
94+
9195 USER AND PASSWORD CHANGING
9296 Attempts to use ftp will prompt you for a user-id and a password.
9397 These will be saved in g:netrw_uid and g:netrw_passwd Subsequent uses
@@ -148,7 +152,7 @@
148152 clean up.
149153
150154 One may modify any protocol's implementing external application
151-by setting a variable (ex. scp uses the variable g:netrw_scp_cmd,
155+by settinbg a variable (ex. scp uses the variable g:netrw_scp_cmd,
152156 which is defaulted to "scp -q").
153157
154158 Ftp, an old protocol, seems to be blessed by numerous implementations.
@@ -181,57 +185,57 @@
181185
182186 *netrw-urls*
183187 +=================================+============================+============+
184- | Reading | Writing | Uses |
188+ | Reading | Writing | Uses |
185189 +=================================+============================+============+
186- | DAV: | | |
187- | dav://host/path | | cadaver |
188- | :Nread dav://host/path | :Nwrite dav://host/path | cadaver |
189- +---------------------------------+----------------------------+------------+
190- | FETCH: | | |
191- | fetch://[user@]host/path | | |
192- | fetch://[user@]host:http/path | Not Available | fetch |
193- | :Nread fetch://[user@]host/path| | |
194- +---------------------------------+----------------------------+------------+
195- | FILE: | | |
196- | file:///* | file:///* | |
197- | file://localhost/* | file://localhost/* | |
198- +---------------------------------+----------------------------+------------+
199- | FTP: (*3) | (*3) | |
200- | ftp://[user@]host/path | ftp://[user@]host/path | ftp (*2) |
201- | :Nread ftp://host/path | :Nwrite ftp://host/path | ftp+.netrc |
202- | :Nread host path | :Nwrite host path | ftp+.netrc |
203- | :Nread host uid pass path | :Nwrite host uid pass path | ftp |
190+ | DAV: | | |
191+ | dav://host/path | | cadaver |
192+ | :Nread dav://host/path | :Nwrite dav://host/path | cadaver |
204193 +---------------------------------+----------------------------+------------+
205- | HTTP: wget is executable: (*4) | | |
206- | http://[user@]host/path | Not Available | wget |
207- +---------------------------------+----------------------------+------------+
208- | HTTP: fetch is executable (*4) | | |
209- | http://[user@]host/path | Not Available | fetch |
210- +---------------------------------+----------------------------+------------+
211- | RCP: | | |
212- | rcp://[user@]host/path | rcp://[user@]host/path | rcp |
194+ | FETCH: | | |
195+ | fetch://[user@]host/path | | |
196+ | fetch://[user@]host:http/path | Not Available | fetch |
197+ | :Nread fetch://[user@]host/path| | |
213198 +---------------------------------+----------------------------+------------+
214- | RSYNC: | | |
215- | rsync://[user@]host/path | rsync://[user@]host/path | rsync |
216- | :Nread rsync://host/path | :Nwrite rsync://host/path | rsync |
217- | :Nread rcp://host/path | :Nwrite rcp://host/path | rcp |
199+ | FILE: | | |
200+ | file:///* | file:///* | |
201+ | file://localhost/* | file://localhost/* | |
218202 +---------------------------------+----------------------------+------------+
219- | SCP: | | |
220- | scp://[user@]host/path | scp://[user@]host/path | scp |
221- | :Nread scp://host/path | :Nwrite scp://host/path | scp (*1) |
203+ | FTP: (*3) | (*3) | |
204+ | ftp://[user@]host/path | ftp://[user@]host/path | ftp (*2) |
205+ | :Nread ftp://host/path | :Nwrite ftp://host/path | ftp+.netrc |
206+ | :Nread host path | :Nwrite host path | ftp+.netrc |
207+ | :Nread host uid pass path | :Nwrite host uid pass path | ftp |
222208 +---------------------------------+----------------------------+------------+
223- | SFTP: | | |
224- | sftp://[user@]host/path | sftp://[user@]host/path | sftp |
225- | :Nread sftp://host/path | :Nwrite sftp://host/path | sftp (*1) |
209+ | HTTP: wget is executable: (*4) | | |
210+ | http://[user@]host/path | Not Available | wget |
211+ +---------------------------------+----------------------------+------------+
212+ | HTTP: fetch is executable (*4) | | |
213+ | http://[user@]host/path | Not Available | fetch |
214+ +---------------------------------+----------------------------+------------+
215+ | RCP: | | |
216+ | rcp://[user@]host/path | rcp://[user@]host/path | rcp |
217+ +---------------------------------+----------------------------+------------+
218+ | RSYNC: | | |
219+ | rsync://[user@]host/path | rsync://[user@]host/path | rsync |
220+ | :Nread rsync://host/path | :Nwrite rsync://host/path | rsync |
221+ | :Nread rcp://host/path | :Nwrite rcp://host/path | rcp |
222+ +---------------------------------+----------------------------+------------+
223+ | SCP: | | |
224+ | scp://[user@]host/path | scp://[user@]host/path | scp |
225+ | :Nread scp://host/path | :Nwrite scp://host/path | scp (*1) |
226+ +---------------------------------+----------------------------+------------+
227+ | SFTP: | | |
228+ | sftp://[user@]host/path | sftp://[user@]host/path | sftp |
229+ | :Nread sftp://host/path | :Nwrite sftp://host/path | sftp (*1) |
226230 +=================================+============================+============+
227231
228232 (*1) For an absolute path use scp://machine//path.
229233
230234 (*2) if <.netrc> is present, it is assumed that it will
231235 work with your ftp client. Otherwise the script will
232- prompt for user-id and password.
236+ prompt for user-id and pasword.
233237
234- (*3) for ftp, "machine" may be machine#port or machine:port
238+ (*3) for ftp, "machine" may be machine#port or machine:port
235239 if a different port is needed than the standard ftp port
236240
237241 (*4) for http:..., if wget is available it will be used. Otherwise,
@@ -327,67 +331,88 @@
327331
328332
329333 ==============================================================================
330-6. Variables and Options *netrw-options* *netrw-var*
334+6. Variables and Options *netrw-options* *netrw-var*
331335
332336 The script <netrw.vim> uses several variables which can affect <netrw.vim>'s
333337 behavior. These variables typically may be set in the user's <.vimrc> file:
334-
335- g:netrw_uid Holds current user-id for ftp.
336- g:netrw_passwd Holds current password for ftp.
337- b:netrw_lastfile Holds latest method/machine/path.
338- b:netrw_line Holds current line number (during NetWrite)
339- b:netrw_col Holds current cursor position (during NetWrite)
340- g:netrw_ftp =0 use default ftp (uid password)
341- =1 use alternate ftp (user uid password)
342- (see |netrw-options|)
343- g:netrw_ftpmode ="binary" (default)
344- ="ascii" (your choice)
345- g:netrw_ignorenetrc =1 (default)
346- if you have a <.netrc> file but you don't
338+>
339+ -------------
340+ Netrw Options
341+ -------------
342+ Option Meaning
343+ -------------- -----------------------------------------------
344+<
345+ b:netrw_col Holds current cursor position (during NetWrite)
346+ g:netrw_cygwin =1 assume scp under windows is from cygwin
347+ (default/windows)
348+ =0 assume scp under windows accepts windows
349+ style paths (default/else)
350+ g:netrw_ftp =0 use default ftp (uid password)
351+ g:netrw_ftpmode ="binary" (default)
352+ ="ascii" (your choice)
353+ g:netrw_ignorenetrc =1 (default)
354+ if you have a <.netrc> file but you don't
347355 want it used, then set this variable. Its
348356 mere existence is enough to cause <.netrc>
349357 to be ignored.
350- g:netrw_win95ftp =0 use unix-style ftp even if win95/98/ME/etc
351- =1 use default method to do ftp
352- g:netrw_cygwin =1 assume scp under windows is from cygwin
353- (default/windows)
354- =0 assume scp under windows accepts windows
355- style paths (default/else)
356- g:netrw_use_nt_rcp =0 don't use WinNT/2K/XP's rcp (default)
357- =1 use WinNT/2K/XP's rcp, binary mode
358-
359-
358+ b:netrw_lastfile Holds latest method/machine/path.
359+ b:netrw_line Holds current line number (during NetWrite)
360+ g:netrw_passwd Holds current password for ftp.
361+ g:netrw_silent =0 transfers done normally
362+ =1 transfers done silently
363+ g:netrw_uid Holds current user-id for ftp.
364+ =1 use alternate ftp (user uid password)
365+ (see |netrw-options|)
366+ g:netrw_use_nt_rcp =0 don't use WinNT/2K/XP's rcp (default)
367+ =1 use WinNT/2K/XP's rcp, binary mode
368+ g:netrw_win95ftp =0 use unix-style ftp even if win95/98/ME/etc
369+ =1 use default method to do ftp >
370+ -----------------------------------------------------------------------
371+<
360372 The script will also make use of the following variables internally, albeit
361373 temporarily.
362-
374+>
375+ -------------------
376+ Temporary Variables
377+ -------------------
378+ Variable Meaning
379+ -------- ------------------------------------
380+<
363381 g:netrw_method Index indicating rcp/ftp+.netrc/ftp
364382 g:netrw_machine Holds machine name parsed from input
365- g:netrw_fname Holds filename being accessed
383+ g:netrw_fname Holds filename being accessed >
384+ ------------------------------------------------------------
385+<
386+ *netrw-protocol*
366387
367- *netrw-protocol*
388+Netrw supports a number of protocols. These protocols are invoked using the
389+variables listed below, and may be modified by the user.
368390 >
369391 ------------------------
370- Protocol Control Options
392+ Protocol Control Options
371393 ------------------------
372- Option Type Setting Meaning ~
373- --------- -------- -------------- --------------------------- >
374- netrw_ftp variable =doesn't exist userid set by "user userid"
375- =0 userid set by "user userid"
376- =1 userid set by "userid"
377- NetReadFixup function =doesn't exist no change
378- =exists Allows user to have files
379- read via ftp automatically
380- transformed however they wish
381- by NetReadFixup()
394+ Option Type Setting Meaning
395+ --------- -------- -------------- ---------------------------
396+<
397+ netrw_ftp variable =doesn't exist userid set by "user userid"
398+ =0 userid set by "user userid"
399+ =1 userid set by "userid"
400+ NetReadFixup function =doesn't exist no change
401+ =exists Allows user to have files
402+ read via ftp automatically
403+ transformed however they wish
404+ by NetReadFixup()
382405 g:netrw_dav_cmd variable ="cadaver"
383406 g:netrw_fetch_cmd variable ="fetch -o"
384407 g:netrw_ftp_cmd variable ="ftp"
385408 g:netrw_http_cmd variable ="fetch -o" else if fetch is executable
386409 g:netrw_http_cmd variable ="wget -O" if wget is executable
410+ g:netrw_list_cmd variable ="ssh HOSTNAME ls -Fa"
387411 g:netrw_rcp_cmd variable ="rcp"
388412 g:netrw_rsync_cmd variable ="rsync -a"
389413 g:netrw_scp_cmd variable ="scp -q"
390- g:netrw_sftp_cmd variable ="sftp"
414+ g:netrw_sftp_cmd variable ="sftp" >
415+ -------------------------------------------------------------------------
391416 <
392417 The first two options both help with certain ftp's that give trouble otherwise.
393418 In order to best understand how to use these options if ftp is giving you
@@ -396,16 +421,21 @@
396421 The g:netrw_..._cmd variables specify the external program to use handle
397422 the associated protocol (rcp, ftp, etc), plus any options.
398423
399-Netrw typically builds up lines of one of the following formats in a
424+The g:netrw_list_cmd's HOSTNAME entry will be changed via substitution with
425+whatever the current request is for a hostname.
426+
427+For ftp, netrw typically builds up lines of one of the following formats in a
400428 temporary file:
401429 >
402430 IF g:netrw_ftp !exists or is not 1 IF g:netrw_ftp exists and is 1
403431 ---------------------------------- ------------------------------
404- open machine [port] open machine [port]
405- user userid password userid password
406- [g:netrw_ftpmode] password
407- get filename tempfile [g:netrw_ftpmode]
408- get filename tempfile
432+<
433+ open machine [port] open machine [port]
434+ user userid password userid password
435+ [g:netrw_ftpmode] password
436+ get filename tempfile [g:netrw_ftpmode]
437+ get filename tempfile >
438+ ---------------------------------------------------------------------
409439 <
410440 Netrw then executes the lines above by use of a filter:
411441 >
@@ -418,14 +448,14 @@
418448 -n means don't use netrc and is used for Method #3 (ftp w/o <.netrc>)
419449
420450 If <.netrc> exists it will be used to avoid having to query the user for
421-userid and password). The transferred file is put into a temporary file.
451+userid and password. The transferred file is put into a temporary file.
422452 The temporary file is then read into the main editing session window that
423453 requested it and the temporary file deleted.
424454
425455 If your ftp doesn't accept the "user" command and immediately just demands
426456 a userid, then try putting "let netrw_ftp=1" in your <.vimrc>.
427457
428- *netrw-fixup*
458+ *netrw-fixup*
429459 If your ftp for whatever reason generates unwanted lines (such as AUTH
430460 messages) you may write a NetReadFixup(tmpfile) function:
431461 >
@@ -441,7 +471,7 @@
441471 elseif a:method == 7 "rsync
442472 elseif a:method == 8 "fetch
443473 elseif a:method == 9 "sftp
444- else " complain
474+ else " complain
445475 endif
446476 endfunction
447477 >
@@ -453,17 +483,42 @@
453483 from <netrw.vim> itself:
454484 >
455485 if has("win95") && g:netrw_win95ftp
456- fu! NetReadFixup(method, line1, line2)
486+ fun! NetReadFixup(method, line1, line2)
457487 if method == 3 " ftp (no <.netrc>)
458- let fourblanklines= line2 - 3
459- silent fourblanklines.",".line2."g/^\s*/d"
488+ let fourblanklines= line2 - 3
489+ silent fourblanklines.",".line2."g/^\s*/d"
460490 endif
461491 endfunction
462492 endif
463493 >
464494
465495 ==============================================================================
466-7. Debugging *netrw-debug*
496+7. Remote Directory Listing *netrw-dir* *netrw-list*
497+
498+Netrw supports listing (browsing) directories on remote hosts; simply attempt
499+to read a "file" with a trailing slash and it will be interpreted as a
500+request to browse a directory:
501+
502+ vim [protocol]://[user@]hostname/path/
503+
504+Netrw will modify the command in g:netrw_list to perform the directory listing
505+operation. By default the command is:
506+
507+ ssh HOSTNAME ls -Fa
508+
509+where the HOSTNAME becomes the hostname as requested by the attempted
510+read. Naturally, the user may override this command with whatever is
511+preferred. The NetList function which implements remote directory
512+browsing expects that directories will be flagged by a trailing slash.
513+
514+Browsing is simple: move the cursor onto a file or directory of interest.
515+Hitting the <cr> (the return key) will select the file or directory. Directories
516+will themselves be listed, and files will be opened using the protocol given
517+in the original read request.
518+
519+
520+==============================================================================
521+8. Debugging *netrw-debug*
467522
468523 The <netrw.vim> script is typically available as:
469524
@@ -494,31 +549,40 @@
494549 drchipNOSPAM at campbellfamily.biz - NOSPAM
495550
496551 ==============================================================================
497-8. New Stuff *netrw-new* *netrw-newstuff*
552+9. History *netrw-history*
498553
499- v43: * moved "Explanation" comments to <pi_netrw.txt> help file
500- as "Network Reference" (|netrw-ref|)
501- * <netrw.vim> now uses Dfunc() Decho() and Dret() for debugging
502- * removed superfluous NetRestorePosn() calls
503- v42: * now does BufReadPre and BufReadPost events on file:///*
504- and file://localhost/*
505- v41: * installed file:///* and file://localhost/* handling
506- v40: * prevents redraw when a protocol error occurs so that the
507- user may see it
508- v39: * sftp support
509- v38: * Now uses NetRestorePosn() calls with Nread/Nwrite commands
510- * Temporary files now removed via bwipe! instead of bwipe
511- (thanks to Dave Roberts)
512- v37: * Claar's modifications which test if ftp is successful, otherwise
513- give an error message
514- * After a read, the alternate file was pointing to the temp file.
515- The temp file buffer is now wiped out.
516- * removed silent from transfer methods so user can see what's
517- happening
554+ v46: * now handles remote directory browsing
555+ * g:netrw_silent (if 1) will cause all transfers to be silent'd
556+ v45: * made the [user@]hostname:path form a bit more restrictive
557+ to better handle errors in using protocols
558+ (e.g. scp:usr@host:file was being recognized as an rcp request)
559+ v44: * changed from "rsync -a" to just "rsync"
560+ * somehow an editing error messed up the test to recognize
561+ use of the fetch method for NetRead.
562+ * more debugging statements included
563+ v43: * moved "Explanation" comments to <pi_netrw.txt> help file
564+ as "Network Reference" (|netrw-ref|)
565+ * <netrw.vim> now uses Dfunc() Decho() and Dret() for debugging
566+ * removed superfluous NetRestorePosn() calls
567+ v42: * now does BufReadPre and BufReadPost events on file:///*
568+ and file://localhost/*
569+ v41: * installed file:///* and file://localhost/* handling
570+ v40: * prevents redraw when a protocol error occurs so that the
571+ user may see it
572+ v39: * sftp support
573+ v38: * Now uses NetRestorePosn() calls with Nread/Nwrite commands
574+ * Temporary files now removed via bwipe! instead of bwipe
575+ (thanks to Dave Roberts)
576+ v37: * Claar's modifications which test if ftp is successful, otherwise
577+ give an error message
578+ * After a read, the alternate file was pointing to the temp file.
579+ The temp file buffer is now wiped out.
580+ * removed silent from transfer methods so user can see what's
581+ happening
518582
519583
520584 ==============================================================================
521-9. Credits *netrw-credits*
585+10. Credits *netrw-credits*
522586
523587 Vim editor by Bram Moolenaar (Thanks, Bram!)
524588 dav support by C Campbell
diff -r 7edf9b6e4c36 -r 4102fb4ea781 runtime/doc/quickfix.txt
--- a/runtime/doc/quickfix.txt Wed Jun 16 11:19:22 2004 +0000
+++ b/runtime/doc/quickfix.txt Sun Jun 20 12:51:53 2004 +0000
@@ -1,4 +1,4 @@
1-*quickfix.txt* For Vim version 7.0aa. Last change: 2004 May 20
1+*quickfix.txt* For Vim version 7.0aa. Last change: 2004 Jun 16
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -795,7 +795,7 @@
795795
796796 Maintaining the correct directory is more complicated if you don't use
797797 GNU-make. AIX-make for example doesn't print any information about its working
798-directory. Then you need to enhance the makefile. In the makefile of lesstiff
798+directory. Then you need to enhance the makefile. In the makefile of LessTif
799799 there is a command which echoes "Making {target} in {dir}". The special
800800 problem here is that it doesn't print informations on leaving the directory
801801 and that it doesn't print the absolute path.
diff -r 7edf9b6e4c36 -r 4102fb4ea781 runtime/doc/recover.txt
--- a/runtime/doc/recover.txt Wed Jun 16 11:19:22 2004 +0000
+++ b/runtime/doc/recover.txt Sun Jun 20 12:51:53 2004 +0000
@@ -1,4 +1,4 @@
1-*recover.txt* For Vim version 7.0aa. Last change: 2004 Apr 16
1+*recover.txt* For Vim version 7.0aa. Last change: 2004 Jun 16
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -61,7 +61,7 @@
6161 directories (although Vim tries to avoid that by comparing the path name).
6262 This will result in bogus ATTENTION warning messages.
6363 - When you use your home directory, and somebody else tries to edit the same
64- file, he will not see your swap file and will not get the ATTENTION waring
64+ file, he will not see your swap file and will not get the ATTENTION warning
6565 message.
6666 On the Amiga you can also use a recoverable ram disk, but there is no 100%
6767 guarantee that this works. Putting swap files in a normal ram disk (like RAM:
diff -r 7edf9b6e4c36 -r 4102fb4ea781 runtime/doc/sponsor.txt
--- a/runtime/doc/sponsor.txt Wed Jun 16 11:19:22 2004 +0000
+++ b/runtime/doc/sponsor.txt Sun Jun 20 12:51:53 2004 +0000
@@ -1,4 +1,4 @@
1-*sponsor.txt* For Vim version 7.0aa. Last change: 2004 Apr 23
1+*sponsor.txt* For Vim version 7.0aa. Last change: 2004 Jun 16
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -83,9 +83,10 @@
8383 show others you are a registered Vim user or sponsor.
8484
8585 Cash Small amounts can be send with ordinary mail. Put something
86- around the money, so that it's not noticable from the outside.
87- Mention your e-mail address if you want to vote for features
88- and show others you are a registered Vim user or sponsor.
86+ around the money, so that it's not noticeable from the
87+ outside. Mention your e-mail address if you want to vote for
88+ features and show others you are a registered Vim user or
89+ sponsor.
8990
9091 This is Bram's address: Bram Moolenaar
9192 Clematisstraat 30
diff -r 7edf9b6e4c36 -r 4102fb4ea781 runtime/doc/starting.txt
--- a/runtime/doc/starting.txt Wed Jun 16 11:19:22 2004 +0000
+++ b/runtime/doc/starting.txt Sun Jun 20 12:51:53 2004 +0000
@@ -1,4 +1,4 @@
1-*starting.txt* For Vim version 7.0aa. Last change: 2004 Jun 15
1+*starting.txt* For Vim version 7.0aa. Last change: 2004 Jun 18
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1222,7 +1222,7 @@
12221222 - They don't restore everything. For example, defined functions, autocommands
12231223 and ":syntax on" are not included. Things like register contents and
12241224 command line history are in viminfo, not in Sessions or Views.
1225-- Global option values are only set when the differ from the default value.
1225+- Global option values are only set when they differ from the default value.
12261226 When the current value is not the default value, loading a Session will not
12271227 set it back to the default value. Local options will be set back to the
12281228 default value though.
diff -r 7edf9b6e4c36 -r 4102fb4ea781 runtime/doc/syntax.txt
--- a/runtime/doc/syntax.txt Wed Jun 16 11:19:22 2004 +0000
+++ b/runtime/doc/syntax.txt Sun Jun 20 12:51:53 2004 +0000
@@ -1,4 +1,4 @@
1-*syntax.txt* For Vim version 7.0aa. Last change: 2004 Jun 15
1+*syntax.txt* For Vim version 7.0aa. Last change: 2004 Jun 16
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -739,7 +739,7 @@
739739 CYNLIB *cynlib.vim* *cynlib-syntax*
740740
741741 Cynlib files are C++ files that use the Cynlib class library to enable
742-hardware modeling and simulation using C++. Typically Cynlib files have a .cc
742+hardware modelling and simulation using C++. Typically Cynlib files have a .cc
743743 or a .cpp extension, which makes it very difficult to distinguish them from a
744744 normal C++ file. Thus, to enable Cynlib highlighting for .cc files, add this
745745 line to your .vimrc file: >
@@ -1664,7 +1664,7 @@
16641664
16651665 let b:preprocs_as_sections = 1
16661666
1667-As well, the syntax file adds an extra paragraph marker for the exdented
1667+As well, the syntax file adds an extra paragraph marker for the extended
16681668 paragraph macro (.XP) in the ms package.
16691669
16701670 Finally, there is a |groff.vim| syntax file that can be used for enabling
diff -r 7edf9b6e4c36 -r 4102fb4ea781 runtime/doc/todo.txt
--- a/runtime/doc/todo.txt Wed Jun 16 11:19:22 2004 +0000
+++ b/runtime/doc/todo.txt Sun Jun 20 12:51:53 2004 +0000
@@ -1,4 +1,4 @@
1-*todo.txt* For Vim version 7.0aa. Last change: 2004 Jun 16
1+*todo.txt* For Vim version 7.0aa. Last change: 2004 Jun 20
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -30,19 +30,10 @@
3030 *known-bugs*
3131 -------------------- Known bugs and current work -----------------------
3232
33-This example doesn't work:
34- :e `=foo . ".c" `
35-Inside `` don't use " as the start of a comment.
36-Also don't expand % or #.
37-
38-Corrections for docs from A3. Skip ones already done.
39-
40-
4133 For version 7.0:
4234 - Include many PATCHES:
43- 9 Win32 GuI: The print dialog uses a font which doesn't display multi-byte
44- messages. Include patch from Vipin Aravind? Update from Yasuhiro
45- Matsumoto.
35+ 9 Merge in ideas from tutor.txt (Gabriel Zachmann)
36+ New version 2004 June 16.
4637 8 ":winpos" doesn't work. Patch from Vipin Aravind.
4738 8 Add GTK 2.3 file dialog support. Patch by Grahame Bowland, 2004 Mar 15,
4839 but it doesn't use "initdir" or "dflt". (will update patch)
@@ -51,7 +42,7 @@
5142 8 Add file locking. Lock a file when starting to edit it with flock() or
5243 fcntl(). This patch has advisory file locking while reading/writing
5344 the file: ~/vim/patches/kahn_file_locking .
54- Do we still want this/
45+ Do we still want this? Andy doesn't have time to work on it.
5546 8 Add buffer-local autocommands? Reduces overhead for autocommands that
5647 trigger often (inserting a character, switching mode).
5748 :au Event <buffer> do-something
@@ -64,10 +55,79 @@
6455 VimResized - When the Vim window has been resized (SIGWINCH)
6556 patch from Yakov Lerner, 2003 July 24.
6657 He'll write documentation and send updated patch.
58+ InsmodEnter
59+ InsmodLeave Taro Muraoka, 2004 Jun 16
6760 - Include the kvim patch. http://freenux.org/vim/ (Mickael Marchand)
6861 Do not add Qtopia yet, it doesn't work very well.
6962 Mickael will update the patch before 21st.
70- --- responses above
63+ 8 Unix: When libcall() fails there is no clear error message. Johannes
64+ Zellner has a patch for this.
65+ updated patch 2004 June 16.
66+ 7 Add the MzScheme interface. Patch on http://iamphet.nm.ru/scheme/
67+ (Sergey Khorev)
68+ Alt URL: http://cyber.miem.edu.ru/~iamphet/scheme/mzvim-0.560.tar.gz
69+ 8 Add patch from Muraoka Taro (Mar 16) to support input method on Mac?
70+ New patch 2004 Jun 16
71+ 8 Add expression-expansion, so that the user can define his own kind of
72+ completion. Patch from Taro Muraoka, 2003 Aug 26.
73+ New patch 2004 Jun 16
74+ 8 Text objects: Add "a'" and 'a"': a single or double quoted string.
75+ (Tim Chase) Patch from Taro Muraoka (2003 Dec 16).
76+ New patch 2004 Jun 16
77+ 7 Add "nbsp" in 'listchars'? Patch from David Blanchet, 2003 Jul 28.
78+ again 2004 Jun 16
79+ 8 Add ":n" to fnamemodify(): normalize path, remove "../" when possible.
80+ Aric Blumer has a patch for this.
81+ He will update the patch for 6.3.
82+ 9 Add cursor-column highlighting. Enable it with 'cursorcolumn' option,
83+ set highlighting with "CursorColumn" group. Useful for aligning text.
84+ Also cursor-row highlighting. Patch from Yasuhiro Matsumoto for
85+ underlining the cursor line, 2004 Mar 24. Update 2004 Jun 17
86+ Alternatie: when 'number' is set highlight the number of the current
87+ line.
88+ 7 Completion of network shares, patch by Yasuhiro Matsumoto.
89+ Update 2004 Jun 17.
90+ 8 Patches from Peter "Rain Dog" Cucka:
91+ - guifont selector (2002 Dec 15) will send update
92+ 7 Add an option to set the width of the 'number' column. Eight
93+ positions is often more than needed. Or adjust the width to the
94+ length of the file?
95+ Add patch that adds 'numberlen' option. (James Harvey)
96+ Other patch with min and max from Emmanuel Renieris (2002 Jul 24)
97+ Other patch without an option by Gilles Roy (2002 Jul 25)
98+ New patch from Emmanuel Renieris, 2004 Jun 17
99+ Needs more work: use one option with one or two numbers
100+ 7 Be able to call a function while passing on a variable number of
101+ arguments:
102+ :function Foo(abc, ...)
103+ : call Bar(a:abc, a:*)
104+ Charles Campbell has a patch for this
105+ He lost the patch himself.
106+ 7 Make ":startinsert" command work directly for functions and scripts?
107+ Also make it possible to append (it's difficult at end of line).
108+ And add ":startreplace" (patch by Charles Campbell, 2004 Jan 9,
109+ http://www.erols.com/astronaut/vim/index.html#Patch)
110+ Update 2004 June 18
111+ 8 Add patch from Charles Campbell to have ":0file!" remove the name of
112+ the current buffer. (2003 June 17)
113+ Lost the patch himself.
114+ 8 Make it possible to delete marks. Charles Campbell has a patch that
115+ does this with the markclear() function (2004 Jan 9). And the
116+ ":delmark" command (2004 Feb 9)
117+ Update 2004 June 18
118+ 8 ":hardcopy":
119+ - Patch to append CTRL-D to PostScript output (Mike Williams, 2004 Jun
120+ 14)
121+ - support printing multi-byte characters. Patch from Motonobu
122+ Ichimura. New (better) patch from Mike Williams (2004 Jan 20)
123+ Updated patch: http://www.eandem.co.uk/mrw/vim/special/index.html
124+ 7 Add patch from Wall for this one ( ~/Mail/oldmail/wall/in.00019 ):
125+ 'flipcase' variable: upper/lowercase pairs.
126+ Insert comma's between pairs and allow a range, make it look like
127+ 'isfname'. E.g. ":set flipcase=a-zA-Z,xX,23-33:143-153". The colon to
128+ separate the from and to part is optional.
129+ Resp: no time now.
130+ --- responses above --
71131 7 Make "5dd" on last-but-one-line not delete anything (Vi compatible).
72132 Add flag in 'cpoptions' for this. When not present, "2dd" in the last
73133 line should delete the last line. Patch from greenx 2002 Apr 11.
@@ -77,30 +137,10 @@
77137 Martin Dalecki 2002 Jan 11.
78138 8 Add a few more command names to the menus. Patch from Jiri Brezina
79139 (28 feb 2002).
80- 8 Patch to add 'transparency' option. Disadvantage: it's slow. (Eckehard
81- Berns, 2004 May 9) http://ecki.to/vim-icns/TransBack.diff
82- 8 Patches from "Rain Dog" Cucka:
83- - guifont selector (2002 Dec 15)
84- - scrollbar (2002 Dec 8)
85- - Quartz fonts (2002 Dec 8)
86140 7 ATTENTION dialog choices are more logical when "Delete it' appears
87141 before "Quit". Patch by Robert Webb, 2004 May 3.
88- 8 Unix: When libcall() fails there is no clear error message. Johannes
89- Zellner has a patch for this.
90- 8 ":hardcopy":
91- - Patch to append CTRL-D to PostScript output (Mike Williams, 2004 Jun
92- 14)
93- - support printing multi-byte characters. Patch from Motonobu
94- Ichimura. New (better) patch from Mike Williams (2004 Jan 20)
95- 9 Merge in ideas from ~/vim/patches/tutor.txt (Gabriel Zachmann)
96- 8 Add patch from Muraoka Taro (Mar 16) to support input method on Mac?
97142 - Include flipcase patch: ~/vim/patches/wall.flipcase2 ? Make it work
98143 for multi-byte characters.
99- 7 Add patch from Wall for this one ( ~/Mail/oldmail/wall/in.00019 ):
100- 'flipcase' variable: upper/lowercase pairs.
101- Insert comma's between pairs and allow a range, make it look like
102- 'isfname'. E.g. ":set flipcase=a-zA-Z,xX,23-33:143-153". The colon to
103- separate the from and to part is optional.
104144 - Win32: add options to print dialog. Patch from Vipin Aravind.
105145 - Patch to add highlighting for whitespace. (Tom Schumm, 2003 Jul 5)
106146 use the patch that keeps using HLF_8 if HLF_WS has not
@@ -113,19 +153,6 @@
113153 - Add possibility to highlight specific columns (for Fortran). Or put a
114154 line in between columns (e.g. for 'textwidth').
115155 Patch to add 'hlcolumn' from Vit Stradal, 2004 May 20.
116- 9 Add cursor-column highlighting. Enable it with 'cursorcolumn' option,
117- set highlighting with "CursorColumn" group. Useful for aligning text.
118- Also cursor-row highlighting. Patch from Yasuhiro Matsumoto for
119- underlining the cursor line, 2004 Mar 24.
120- Alternatie: when 'number' is set highlight the number of the current
121- line.
122- 7 Be able to call a function while passing on a variable number of
123- arguments:
124- :function Foo(abc, ...)
125- : call Bar(a:abc, a:*)
126- Charles Campbell has a patch for this
127- 8 Add ":n" to fnamemodify(): normalize path, remove "../" when possible.
128- Aric Blumer has a patch for this.
129156 8 Add functions:
130157 tr(expr, from, to) translate chars (Patch from Ron Aaron, Apr 8
131158 2004)
@@ -136,9 +163,9 @@
136163 Presser)
137164 He will send a new patch.
138165 Is this really useful?
139- ---
140166 multibyteidx(string, idx) Byte index in multi-byte character.
141167 Patch by Ilya Sher, 2004 Feb 25
168+ Update June 18 (third one).
142169 menuprop({name}, {idx}, {what})
143170 Get menu property of menu {name} item {idx}.
144171 menuprop("", 1, "name") returns "File".
@@ -148,9 +175,15 @@
148175 mapname({idx}, mode) return the name of the idx'th mapping.
149176 Patch by Ilya Sher, 2004 Mar 4.
150177 match({pat}, {string} [,start] [,count]) get index of count'th match
151- Patch by Ilya Sher, 2004 Mar 31
178+ Patch by Ilya Sher, 2004 Jun 19
152179 find() find file in 'path' (patch from Johannes
153180 Zellner 2001 Dec 20)
181+ Update 2004 Jun 16.
182+ gettext() Translate a message. (Patch from Yasuhiro
183+ Matsumoto) How to get the messages into the
184+ .po files?
185+ Update 2004 Jun 17
186+ ---
154187 realname() Get user name (first, last, full)
155188 user_fullname() patch by Nikolai Weibull, Nov
156189 3 2002)
@@ -175,10 +208,6 @@
175208 (Patch from Yegappan Lakshmanan)
176209 raisewin() raise gvim window (see HierAssist patch for
177210 Tcl implementation ~/vim/HierAssist/ )
178- gettext() Translate a message. (Patch from Yasuhiro
179- Matsumoto) How to get the messages into the
180- .po files?
181- 7 Add "nbsp" in 'listchars'? Patch from David Blanchet, 2003 Jul 28.
182211 7 Add patch from Benoit Cerrina to integrate Vim and Perl functions
183212 better. Now also works for Ruby (2001 Nov 10)
184213 7 Add 'taglistfiles' option, show file name and type when listing matching
@@ -186,37 +215,20 @@
186215 7 Motif: use the menu font consistently. Patch from Martin Dalecki 2002
187216 Jan 11.
188217 - Motif: add 3D shading for the menu entries? Patch from Martin Dalecki.
189- 8 Add expression-expansion, so that the user can define his own kind of
190- completion. Patch from Taro Muraoka, 2003 Aug 26.
191- 7 Completion of network shares, patch by Yasuhiro Matsumoto.
192218 9 When 'autoindent' is set, hitting <CR> twice, while there is text after
193219 the cursor, doesn't delete the autoindent in the resulting blank line.
194220 (Rich Wales) This is Vi compatible, but it looks like a bug. Rich has
195221 a suggestion for a patch to fix this.
196222 e-mail to Rich bounced.
197- 7 Make ":startinsert" command work directly for functions and scripts?
198- Also make it possible to append (it's difficult at end of line).
199- And add ":startreplace" (patch by Charles Campbell, 2004 Jan 9,
200- http://www.erols.com/astronaut/vim/index.html#Patch)
201- 8 Text objects: Add "a'" and 'a"': a single or double quoted string.
202- (Tim Chase) Patch from Taro Muraoka (2003 Dec 16).
203223 7 For Visual mode: Command to do a search for the string in the marked
204224 area. Only when fewer than two lines. Use "g/" and "gb". Patch from
205225 Yegappan Lakshmanan.
206226 7 When 'rightleft' is set, the search pattern should be displayed right
207227 to left as well? See patch of Dec 26. (Nadim Shaikli)
208- 8 Add patch from Charles Campbell to have ":0file!" remove the name of
209- the current buffer. (2003 June 17)
210- 8 Make it possible to delete marks. Charles Campbell has a patch that
211- does this with the markclear() function (2004 Jan 9). And the
212- ":delmark" command (2004 Feb 9)
213- 7 Win32: Add patch for 5-button mouse. (Michael Geddes 2001 Nov 26)
214228 8 Lock all used memory so that it doesn't get swapped to disk (uncrypted).
215229 Patch by Jason Holt, 2003 May 23.
216230 7 Support a stronger encryption. Jason Holt implemented AES (May 6 2003).
217231 7 Add ! register, for shell commands. (patch from Grenie)
218- 7 Add the MzScheme interface. Patch on http://iamphet.nm.ru/scheme/
219- (Sergey Khorev)
220232 8 Make 'statusline' local, so that each window can have a different
221233 value. But should it also be local to a buffer? (Yegappan Lakshmanan
222234 has a patch, 2002 feb 15)
@@ -233,21 +245,10 @@
233245 8 Include a connection to an external program through a pipe? See
234246 patches from Felbinger for a mathematica interface.
235247 Or use emacs server kind of thing?
236- 7 Add an option to set the width of the 'number' column. Eight
237- positions is often more than needed. Or adjust the width to the
238- length of the file?
239- Add patch that adds 'numberlen' option. (James Harvey)
240- Other patch with min and max from Emmanuel Renieris (2002 Jul 24)
241- Other patch without an option by Gilles Roy (2002 Jul 25)
242248 7 Add ":justify" command. Patch from Vit Stradal 2002 Nov 25.
243249 - findmatch() should be adjusted for Lisp. See remark at
244250 get_lisp_indent(). Esp. \( and \) should be skipped. (Dorai Sitaram,
245251 incomplete patch Mar 18)
246- 8 Sorting of filenames for completion is wrong on systems that ignore
247- case of filenames. Add 'ignorefncase' option. When set, case in
248- filenames is ignored for sorting them. Patch by Mike Williams:
249- ~/vim/patches/ignorefncase. Also change what matches? Or use another
250- option name.
251252 - Change ga_room into ga_maxlen, so that it doesn't need to be
252253 incremented/decremented each time.
253254 - new DATA TYPES: lists, dictionaries and function references.
@@ -716,8 +717,9 @@
716717
717718
718719 Macintosh:
719-9 Mac: The motion type is not stored on the clipboard. Using ":set
720- clipboard=unnamed" makes "yyp" work characterwise. (Michael DeMoney)
720+7 Patch to add 'transparency' option. Disadvantage: it's slow. (Eckehard
721+ Berns, 2004 May 9) http://ecki.to/vim/TransBack-2004-05-09.diff
722+ Needs more work. Add when someone really wants it.
721723 7 Loading the Perl library only works on OS/X 10.2 or 10.3, never on both.
722724 Load the Perl library dynamically see Python sources file dynload_mac
723725 (Jack)
@@ -1745,7 +1747,7 @@
17451747 bound windows.
17461748 - Add 'search' option to 'scrollopt' to allow 'scrollbind' windows to
17471749 be bound by regexp searches
1748-- Add "z>" and "z<": scroll sideways one screenfull. (Campbell)
1750+- Add "z>" and "z<": scroll sideways one screenful. (Campbell)
17491751 - Add option to set the number of lines when not to scroll, instead of the
17501752 fixed number used now (for terminals that scroll slow with a large number
17511753 of lines but not with a single line).
@@ -2971,7 +2973,7 @@
29712973 Debug mode:
29722974 7 Add something to enable debugging when a remote message is received.
29732975 8 Add breakpoints for setting an option
2974-8 Add breakpoits for assigning to a variable.
2976+8 Add breakpoints for assigning to a variable.
29752977 7 Add a watchpoint in the debug mode: An expression that breaks execution
29762978 when evaluating to non-zero.
29772979 7 Store the history from debug mode in viminfo.
@@ -3361,6 +3363,11 @@
33613363 - Support mapping for replace mode and "r" command (Vi doesn't do this)?
33623364 5 Add 'ignorefilecase' option: Ignore case when expanding file names.
33633365 ":e ma<Tab>" would also find "Makefile" on Unix.
3366+8 Sorting of filenames for completion is wrong on systems that ignore
3367+ case of filenames. Add 'ignorefncase' option. When set, case in
3368+ filenames is ignored for sorting them. Patch by Mike Williams:
3369+ ~/vim/patches/ignorefncase. Also change what matches? Or use another
3370+ option name.
33643371 8 Should be able to compile Vim in another directory, with $(srcdir) set to
33653372 where the sources are. Add $(srcdir) in the Makefile in a lot of places.
33663373 (Netherton)
diff -r 7edf9b6e4c36 -r 4102fb4ea781 runtime/doc/usr_21.txt
--- a/runtime/doc/usr_21.txt Wed Jun 16 11:19:22 2004 +0000
+++ b/runtime/doc/usr_21.txt Sun Jun 20 12:51:53 2004 +0000
@@ -1,4 +1,4 @@
1-*usr_21.txt* For Vim version 7.0aa. Last change: 2004 Mar 29
1+*usr_21.txt* For Vim version 7.0aa. Last change: 2004 Jun 16
22
33 VIM USER MANUAL - by Bram Moolenaar
44
@@ -65,7 +65,7 @@
6565 :w !{program} execute {program} and send text to its input
6666 :[range]!{program} filter text through {program}
6767
68-Notice that the precense of a range before "!{program}" makes a big
68+Notice that the presense of a range before "!{program}" makes a big
6969 difference. Without it executes the program normally, with the range a number
7070 of text lines is filtered through the program.
7171
diff -r 7edf9b6e4c36 -r 4102fb4ea781 runtime/doc/usr_22.txt
--- a/runtime/doc/usr_22.txt Wed Jun 16 11:19:22 2004 +0000
+++ b/runtime/doc/usr_22.txt Sun Jun 20 12:51:53 2004 +0000
@@ -1,4 +1,4 @@
1-*usr_22.txt* For Vim version 7.0aa. Last change: 2003 Mar 17
1+*usr_22.txt* For Vim version 7.0aa. Last change: 2004 Jun 16
22
33 VIM USER MANUAL - by Bram Moolenaar
44
@@ -95,7 +95,7 @@
9595 s Use the field the cursor is in to sort on. First
9696 display the size and date with i. Then Move the
9797 cursor to the size of any file and press s. The files
98- will now be sorted on size. Press s wile the cursor
98+ will now be sorted on size. Press s while the cursor
9999 is on a date and the items will be sorted on date.
100100 r reverse the sorting order (either size or date)
101101
diff -r 7edf9b6e4c36 -r 4102fb4ea781 runtime/doc/various.txt
--- a/runtime/doc/various.txt Wed Jun 16 11:19:22 2004 +0000
+++ b/runtime/doc/various.txt Sun Jun 20 12:51:53 2004 +0000
@@ -1,4 +1,4 @@
1-*various.txt* For Vim version 7.0aa. Last change: 2004 Jun 14
1+*various.txt* For Vim version 7.0aa. Last change: 2004 Jun 18
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -571,9 +571,11 @@
571571 current file. See |help-translated|.
572572
573573 *:helpg* *:helpgrep*
574-:helpg[rep] {pattern}
574+:helpg[rep] {pattern}[@xx]
575575 Search all help text files and make a list of lines
576576 in which {pattern} matches. Jumps to the first match.
577+ The optional [@xx] specifies that only matches in the
578+ "xx" language are to be found.
577579 You can navigate through the matches with the
578580 |quickfix| commands, e.g., |:cnext| to jump to the
579581 next one. Or use |:cwindow| to get the list of
@@ -584,6 +586,8 @@
584586 :helpgrep Uganda
585587 < Example for case ignoring search: >
586588 :helpgrep uganda\c
589+< Example for searching in French help: >
590+ :helpgrep backspace@fr
587591 < Cannot be followed by another command, everything is
588592 used as part of the pattern. But you can use
589593 |:execute| when needed.
diff -r 7edf9b6e4c36 -r 4102fb4ea781 runtime/doc/version5.txt
--- a/runtime/doc/version5.txt Wed Jun 16 11:19:22 2004 +0000
+++ b/runtime/doc/version5.txt Sun Jun 20 12:51:53 2004 +0000
@@ -1,4 +1,4 @@
1-*version5.txt* For Vim version 7.0aa. Last change: 2004 Jan 17
1+*version5.txt* For Vim version 7.0aa. Last change: 2004 Jun 16
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1517,7 +1517,7 @@
15171517
15181518 Crash when pasting with the mouse in insert mode.
15191519
1520-Crash whith ":unmenu *" in .gvimrc for Athena.
1520+Crash with ":unmenu *" in .gvimrc for Athena.
15211521
15221522 "5>>" shifted 5 lines 5 times, instead of 1 time.
15231523
@@ -2026,7 +2026,7 @@
20262026 either begin in the current directory, or that of the current buffer. (Negri
20272027 and Kahn)
20282028 Added the 'browsedir' option, with value "current", "last" or "buffer". Tells
2029-wether a browse dialog starts in last used dir, dir of current buffer, or
2029+whether a browse dialog starts in last used dir, dir of current buffer, or
20302030 current dir. ":browse w" is unaffected.
20312031 The default menus have been changed to use the ":browse" command.
20322032
@@ -3667,8 +3667,8 @@
36673667 In the output of ":clist" the current entry is highlighted, with the 'i'
36683668 highlighting (same as used for 'incsearch').
36693669
3670-For the ":clist" command, you can scroll backwards with "b" (one screenfull),
3671-"u" (half a screenfull) and "k" (one line).
3670+For the ":clist" command, you can scroll backwards with "b" (one screenful),
3671+"u" (half a screenful) and "k" (one line).
36723672
36733673 Multi-byte support:
36743674 - X-input method for multi-byte characters. And various fixes for multi-byte
@@ -4582,7 +4582,7 @@
45824582 Dos and Win32 console: Setting t_me didn't work to get another color. Made
45834583 this works backwards compatible.
45844584
4585-For turkish (LANG = "tr") uppercase 'i' is not an 'I'. Use ASCII uppercase
4585+For Turkish (LANG = "tr") uppercase 'i' is not an 'I'. Use ASCII uppercase
45864586 translation in vim_strup() to avoid language problems. (Komur)
45874587
45884588 Unix: Use usleep() or nanosleep() for mch_delay() when available. Hopefully
@@ -7578,7 +7578,7 @@
75787578
75797579 optwin.vim gave an error when used in Vi compatible mode ('cpo' contains 'C').
75807580
7581-Tcl interpreter: "buffer" command didn't check for precense of an argument.
7581+Tcl interpreter: "buffer" command didn't check for presense of an argument.
75827582 (Dave Bodenstab)
75837583
75847584 dosinst.c: Added checks for too long file name.
diff -r 7edf9b6e4c36 -r 4102fb4ea781 runtime/doc/version6.txt
--- a/runtime/doc/version6.txt Wed Jun 16 11:19:22 2004 +0000
+++ b/runtime/doc/version6.txt Sun Jun 20 12:51:53 2004 +0000
@@ -1,4 +1,4 @@
1-*version6.txt* For Vim version 7.0aa. Last change: 2004 Jun 07
1+*version6.txt* For Vim version 7.0aa. Last change: 2004 Jun 16
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1764,7 +1764,7 @@
17641764 - Use XPM bitmaps for the icon when possible. Use the Solaris XpmP.h include
17651765 file when it's available.
17661766 - Change the shadow of the toolbar items to get a visual feedback of it being
1767- pressed on non-LessTiff.
1767+ pressed on non-LessTif.
17681768 - Use gadgets instead of windows for some items for speed.
17691769
17701770 Command line completion:
@@ -6645,7 +6645,7 @@
66456645 Files: src/getchar.c
66466646
66476647 Patch 6.1.031
6648-Problem: Cygwin: Xxd could read a file in text mode intead of binary mode.
6648+Problem: Cygwin: Xxd could read a file in text mode instead of binary mode.
66496649 Solution: Use "rb" or "rt" when needed. (Pavol Juhas)
66506650 Files: src/xxd/xxd.c
66516651
@@ -6947,7 +6947,7 @@
69476947 Files: src/edit.c, src/feature.h, src/gui_mac.c, src/os_mac.c
69486948
69496949 Patch 6.1.077
6950-Problem: On a Debian systEm wht ACL linking fails. (Lubomir Host)
6950+Problem: On a Debian system with ACL linking fails. (Lubomir Host)
69516951 Solution: When the "acl" library is used, check if the "attr" library is
69526952 present and use it.
69536953 Files: src/auto/configure, src/configure.in, src/link.sh
@@ -7229,7 +7229,7 @@
72297229
72307230 Patch 6.1.121 (depends on 6.1.098)
72317231 Problem: When starting Select mode from Insert mode, then using the Paste
7232- menu entry, the cursor is left before the laste pasted character.
7232+ menu entry, the cursor is left before the last pasted character.
72337233 (Mario Schweigler)
72347234 Solution: Set the cursor for Insert mode one character to the right.
72357235 Files: runtime/menu.vim
@@ -7963,7 +7963,7 @@
79637963 Problem: Double clicking with the mouse to select a word does not work for
79647964 multi-byte characters.
79657965 Solution: Use vim_iswordc() instead of vim_isIDc(). This means 'iskeyword'
7966- is used intead of 'isident'. Also fix that mixing ASCII with
7966+ is used instead of 'isident'. Also fix that mixing ASCII with
79677967 multi-byte word characters doesn't work, the mouse class for
79687968 punctuation and word characters was mixed up.
79697969 Files: src/normal.c
@@ -10262,7 +10262,7 @@
1026210262
1026310263 Patch 6.2.053
1026410264 Problem: Prototype for bzero() doesn't match most systems.
10265-Solution: Use "void *" instead of "char *" and "size_t" intead of "int".
10265+Solution: Use "void *" instead of "char *" and "size_t" instead of "int".
1026610266 Files: src/osdef1.h.in
1026710267
1026810268 Patch 6.2.054
@@ -10534,7 +10534,7 @@
1053410534 Patch 6.2.096
1053510535 Problem: Win32: ":let @* = ''" put a newline on the clipboard. (Klaus
1053610536 Bosau)
10537-Solution: Put zero bytes on the clibpoard for an empty string.
10537+Solution: Put zero bytes on the clipboard for an empty string.
1053810538 Files: src/ops.c
1053910539
1054010540 Patch 6.2.097
@@ -11339,7 +11339,7 @@
1133911339 runtime/doc/netbeans.txt, runtime/doc/tags
1134011340
1134111341 Patch 6.2.216 (after 6.2.206)
11342-Problem: Multi-byte characters stil cannot be used as hotkeys in a console
11342+Problem: Multi-byte characters still cannot be used as hotkeys in a console
1134311343 dialog. (Mattias Erkisson)
1134411344 Solution: Make get_keystroke() handle multi-byte characters.
1134511345 Files: src/misc1.c
@@ -11376,7 +11376,7 @@
1137611376 Patch 6.2.222
1137711377 Problem: Using "--remote" several times on a row only opens some of the
1137811378 files. (Dany St-Amant)
11379-Solution: Don't delete all typehead when the server receives a command from
11379+Solution: Don't delete all typeahead when the server receives a command from
1138011380 a client, only delete typed characters.
1138111381 Files: src/main.c
1138211382
@@ -11874,7 +11874,7 @@
1187411874 causes a crash. Evaluating an expression causes Vim to wait for
1187511875 "cont" to be typed, without a prompt. (Hari Krishna Dara)
1187611876 Solution: Disable debugging when evaluating an expression for a client.
11877- (Michael Geddes) Don't try reading into the typehead buffer when
11877+ (Michael Geddes) Don't try reading into the typeahead buffer when
1187811878 it may have been filled in another way.
1187911879 Files: src/ex_getln.c, src/getchar.c, src/if_xcmdsrv.c, src/main.c,
1188011880 src/misc1.c, src/proto/getchar.pro, src/proto/main.pro,
@@ -12556,7 +12556,7 @@
1255612556 Problem: Win32 console: no extra key modifiers are supported.
1255712557 Solution: Encode the modifiers into the input stream. Also fix that special
1255812558 keys are converted and stop working when 'tenc' is set. Also fix
12559- that when 'tenc' is intialized the input and output conversion is
12559+ that when 'tenc' is initialized the input and output conversion is
1256012560 not setup properly until 'enc' or 'tenc' is set.
1256112561 Files: src/getchar.c, src/option.c, src/os_win32.c
1256212562
@@ -13081,7 +13081,7 @@
1308113081 Problem: When reloading a hidden buffer changed outside of Vim and the
1308213082 current buffer is read-only, the reloaded buffer becomes
1308313083 read-only. (Hari Krishna Dara)
13084-Solution: Save the 'readonly' flag of the realoaded buffer instead of the
13084+Solution: Save the 'readonly' flag of the reloaded buffer instead of the
1308513085 current buffer.
1308613086 Files: src/fileio.c
1308713087
diff -r 7edf9b6e4c36 -r 4102fb4ea781 runtime/indent/vb.vim
--- a/runtime/indent/vb.vim Wed Jun 16 11:19:22 2004 +0000
+++ b/runtime/indent/vb.vim Sun Jun 20 12:51:53 2004 +0000
@@ -1,7 +1,7 @@
11 " Vim indent file
22 " Language: VisualBasic (ft=vb) / Basic (ft=basic) / SaxBasic (ft=vb)
33 " Author: Johannes Zellner <johannes@zellner.org>
4-" Last Change: Tue, 27 Apr 2004 14:54:59 CEST
4+" Last Change: Fri, 18 Jun 2004 07:22:42 CEST
55
66 if exists("b:did_indent")
77 finish
@@ -10,7 +10,7 @@
1010
1111 setlocal indentexpr=VbGetIndent(v:lnum)
1212 setlocal indentkeys&
13-setlocal indentkeys+==~else,=~elseif,=~end,=~wend,=~case,=~next,=~select,~=loop,<:>
13+setlocal indentkeys+==~else,=~elseif,=~end,=~wend,=~case,=~next,=~select,=~loop,<:>
1414
1515 " Only define the function once.
1616 if exists("*VbGetIndent")
diff -r 7edf9b6e4c36 -r 4102fb4ea781 runtime/plugin/netrw.vim
--- a/runtime/plugin/netrw.vim Wed Jun 16 11:19:22 2004 +0000
+++ b/runtime/plugin/netrw.vim Sun Jun 20 12:51:53 2004 +0000
@@ -1,7 +1,7 @@
11 " netrw.vim: (global plugin) Handles file transfer across a network
2-" Last Change: Jun 04, 2004
2+" Last Change: Jun 18, 2004
33 " Maintainer: Charles E. Campbell, Jr. PhD <drchipNOSPAM at campbellfamily.biz>
4-" Version: 44
4+" Version: 46
55 " License: Vim License (see vim's :help license)
66 "
77 " But be doers of the word, and not only hearers, deluding your own selves
@@ -12,7 +12,7 @@
1212 if exists("loaded_netrw") || &cp
1313 finish
1414 endif
15-let loaded_netrw = "v44"
15+let loaded_netrw = "v46"
1616 let s:save_cpo = &cpo
1717 set cpo&vim
1818
@@ -68,6 +68,20 @@
6868 let g:netrw_fetch_cmd = ""
6969 endif
7070 endif
71+if !exists("g:netrw_list_cmd")
72+ if executable("ssh")
73+ let g:netrw_list_cmd= "ssh HOSTNAME ls -Fa"
74+ else
75+" call Decho("ssh is not executable, can't do netlist")
76+ let g:netrw_list_cmd= ""
77+ endif
78+endif
79+if exists("g:netrw_silent") && g:netrw_silent != 0
80+ let g:netrw_silentxfer= "silent "
81+else
82+ let g:netrw_silentxfer= ""
83+endif
84+
7185
7286 if has("win32")
7387 \ && exists("g:netrw_use_nt_rcp")
@@ -97,7 +111,7 @@
97111 endif
98112 au BufReadCmd ftp://*,rcp://*,scp://*,http://*,dav://*,rsync://*,sftp://* exe "doau BufReadPre ".expand("<afile>")|exe "Nread 0r ".expand("<afile>")|exe "doau BufReadPost ".expand("<afile>")
99113 au FileReadCmd ftp://*,rcp://*,scp://*,http://*,dav://*,rsync://*,sftp://* exe "doau BufReadPre ".expand("<afile>")|exe "Nread " .expand("<afile>")|exe "doau BufReadPost ".expand("<afile>")
100- au BufWriteCmd ftp://*,rcp://*,scp://*,dav://*,rsync://*,sftp://* exe "Nwrite " .expand("<afile>")|call <SID>NetRestorePosn()
114+ au BufWriteCmd ftp://*,rcp://*,scp://*,dav://*,rsync://*,sftp://* exe "Nwrite " .expand("<afile>")|call <SID>NetRestorePosn()
101115 augroup END
102116 endif
103117
@@ -151,9 +165,6 @@
151165 " save options
152166 call s:NetOptionSave()
153167
154- " get name of a temporary file
155- let tmpfile= tempname()
156-
157168 " Special Exception: if a file is named "0r", then
158169 " "0r" will be used to read the
159170 " following files instead of "r"
@@ -168,6 +179,10 @@
168179 let ichoice = 1
169180 endif
170181
182+ " get name of a temporary file
183+ let tmpfile= tempname()
184+
185+" call Decho("ichoice=".ichoice." readcmd<".readcmd.">")
171186 while ichoice <= a:0
172187
173188 " attempt to repeat with previous host-file-etc
@@ -178,7 +193,7 @@
178193
179194 else
180195 exe "let choice= a:" . ichoice
181-" call Decho("NetRead1: choice<" . choice . ">")
196+" call Decho("no lastfile: choice<" . choice . ">")
182197
183198 " Reconstruct Choice if choice starts with '"'
184199 if match(choice,"?") == 0
@@ -219,13 +234,13 @@
219234 endif
220235 endif
221236 endif
222-" call Decho("NetRead2: choice<" . choice . ">")
237+" call Decho("choice<" . choice . ">")
223238 let ichoice= ichoice + 1
224239
225240 " fix up windows urls
226241 if has("win32")
227242 let choice = substitute(choice,'\\','/','ge')
228-" call Decho("fixing up windows url to <".choice.">")
243+" call Decho("fixing up windows url to <".choice."> tmpfile<".tmpfile)
229244 exe 'lcd ' . fnamemodify(tmpfile,':h')
230245 let tmpfile = fnamemodify(tmpfile,':t')
231246 endif
@@ -233,12 +248,24 @@
233248 " Determine method of read (ftp, rcp, etc)
234249 call s:NetMethod(choice)
235250
251+ " Check if NetList() should be handling this request
252+" call Decho("checking if netlist: choice<".choice."> netrw_list_cmd<".g:netrw_list_cmd.">")
253+ if choice =~ "^.*/$"
254+ if strlen(g:netrw_list_cmd) > 0
255+ call s:NetList(choice)
256+" call Dret("NetRead")
257+ else
258+ echoerr "sorry, can't do a remote listing; ssh isn't executable"
259+ endif
260+ return
261+ endif
262+
236263 " ============
237264 " Perform Read
238265 " ============
239266
240267 ".........................................
241- " rcp: Method #1
268+ " rcp: NetRead Method #1
242269 if b:netrw_method == 1 " read with rcp
243270 " call Decho("read via rcp (method #1)")
244271 " ER: noting done with g:netrw_uid yet?
@@ -260,12 +287,12 @@
260287 endif
261288 endif
262289 " call Decho("executing: !".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".uid_machine.":".escape(b:netrw_fname,' ?&')." ".tmpfile)
263- exe "!".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".uid_machine.":".escape(b:netrw_fname,' ?&')." ".tmpfile
264- let result = s:NetGetFile(readcmd, tmpfile, b:netrw_method)
290+ exe g:netrw_silentxfer."!".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".uid_machine.":".escape(b:netrw_fname,' ?&')." ".tmpfile
291+ let result = s:NetGetFile(readcmd, tmpfile, b:netrw_method)
265292 let b:netrw_lastfile = choice
266293
267294 ".........................................
268- " ftp + <.netrc>: Method #2
295+ " ftp + <.netrc>: NetRead Method #2
269296 elseif b:netrw_method == 2 " read with ftp + <.netrc>
270297 " call Decho("read via ftp+.netrc (method #2)")
271298 let netrw_fname= b:netrw_fname
@@ -275,10 +302,10 @@
275302 exe "put ='get ".netrw_fname." ".tmpfile."'"
276303 if exists("g:netrw_port") && g:netrw_port != ""
277304 " call Decho("executing: %!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port)
278- exe "%!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port
305+ exe g:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port
279306 else
280307 " call Decho("executing: %!".g:netrw_ftp_cmd." -i ".g:netrw_machine)
281- exe "%!".g:netrw_ftp_cmd." -i ".g:netrw_machine
308+ exe g:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine
282309 endif
283310 " If the result of the ftp operation isn't blank, show an error message (tnx to Doug Claar)
284311 if getline(1) !~ "^$"
@@ -289,7 +316,7 @@
289316 let b:netrw_lastfile = choice
290317
291318 ".........................................
292- " ftp + machine,id,passwd,filename: Method #3
319+ " ftp + machine,id,passwd,filename: NetRead Method #3
293320 elseif b:netrw_method == 3 " read with ftp + machine, id, passwd, and fname
294321 " Construct execution string (four lines) which will be passed through filter
295322 " call Decho("read via ftp+mipf (method #3)")
@@ -321,7 +348,7 @@
321348 " call Decho('performing ftp -i -n')
322349 norm 1Gdd
323350 " call Decho("executing: %!".g:netrw_ftp_cmd." -i -n")
324- exe "%!".g:netrw_ftp_cmd." -i -n"
351+ exe g:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i -n"
325352 " If the result of the ftp operation isn't blank, show an error message (tnx to Doug Claar)
326353 if getline(1) !~ "^$"
327354 echoerr getline(1)
@@ -331,7 +358,7 @@
331358 let b:netrw_lastfile = choice
332359
333360 ".........................................
334- " scp: Method #4
361+ " scp: NetRead Method #4
335362 elseif b:netrw_method == 4 " read with scp
336363 " call Decho("read via scp (method #4)")
337364 if exists("g:netrw_port") && g:netrw_port != ""
@@ -342,10 +369,10 @@
342369 if g:netrw_cygwin == 1
343370 let cygtmpfile=substitute(tmpfile,'^\(\a\):','/cygdrive/\1/','e')
344371 " call Decho("executing: !".g:netrw_scp_cmd.useport." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".cygtmpfile)
345- exe "!".g:netrw_scp_cmd.useport." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".cygtmpfile
372+ exe g:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".cygtmpfile
346373 else
347374 " call Decho("executing: !".g:netrw_scp_cmd.useport." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".tmpfile)
348- exe "!".g:netrw_scp_cmd.useport." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".tmpfile
375+ exe g:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".tmpfile
349376 endif
350377 let result = s:NetGetFile(readcmd, tmpfile, b:netrw_method)
351378 let b:netrw_lastfile = choice
@@ -361,7 +388,7 @@
361388 if match(b:netrw_fname,"#") == -1
362389 " simple wget
363390 " call Decho("executing: !".g:netrw_http_cmd." ".tmpfile." http://".g:netrw_machine.escape(b:netrw_fname,' ?&'))
364- exe "!".g:netrw_http_cmd." ".tmpfile." http://".g:netrw_machine.escape(b:netrw_fname,' ?&')
391+ exe g:netrw_silentxfer."!".g:netrw_http_cmd." ".tmpfile." http://".g:netrw_machine.escape(b:netrw_fname,' ?&')
365392 let result = s:NetGetFile(readcmd, tmpfile, b:netrw_method)
366393
367394 else
@@ -371,7 +398,7 @@
371398 " call Decho("netrw_html<".netrw_html.">")
372399 " call Decho("netrw_tag <".netrw_tag.">")
373400 " call Decho("executing: !".g:netrw_http_cmd." ".tmpfile." http://".g:netrw_machine.netrw_html)
374- exe "!".g:netrw_http_cmd." ".tmpfile." http://".g:netrw_machine.netrw_html
401+ exe g:netrw_silentxfer."!".g:netrw_http_cmd." ".tmpfile." http://".g:netrw_machine.netrw_html
375402 let result = s:NetGetFile(readcmd, tmpfile, b:netrw_method)
376403 " call Decho('<\s*a\s*name=\s*"'.netrw_tag.'"/')
377404 exe 'norm! 1G/<\s*a\s*name=\s*"'.netrw_tag.'"/'."\<CR>"
@@ -379,7 +406,7 @@
379406 let b:netrw_lastfile = choice
380407
381408 ".........................................
382- " cadaver: Method #6
409+ " cadaver: NetRead Method #6
383410 elseif b:netrw_method == 6 " read with cadaver
384411 " call Decho("read via cadaver (method #6)")
385412
@@ -404,28 +431,28 @@
404431 " perform cadaver operation:
405432 norm 1Gdd
406433 " call Decho("executing: %!".g:netrw_dav_cmd)
407- exe "%!".g:netrw_dav_cmd
434+ exe g:netrw_silentxfer."%!".g:netrw_dav_cmd
408435 bd!
409436 let result = s:NetGetFile(readcmd, tmpfile, b:netrw_method)
410437 let b:netrw_lastfile = choice
411438
412439 ".........................................
413- " rsync: Method #7
440+ " rsync: NetRead Method #7
414441 elseif b:netrw_method == 7 " read with rsync
415442 " call Decho("read via rsync (method #7)")
416443 if g:netrw_cygwin == 1
417444 let cygtmpfile=substitute(tmpfile,'^\(\a\):','/cygdrive/\1/','e')
418445 " call Decho("executing: !".g:netrw_rsync_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".cygtmpfile)
419- exe "!".g:netrw_rsync_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".cygtmpfile
446+ exe g:netrw_silentxfer."!".g:netrw_rsync_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".cygtmpfile
420447 else
421448 " call Decho("executing: !".g:netrw_rsync_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".tmpfile)
422- exe "!".g:netrw_rsync_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".tmpfile
449+ exe g:netrw_silentxfer."!".g:netrw_rsync_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".tmpfile
423450 endif
424451 let result = s:NetGetFile(readcmd,tmpfile, b:netrw_method)
425452 let b:netrw_lastfile = choice
426453
427454 ".........................................
428- " fetch: Method #8
455+ " fetch: NetRead Method #8
429456 " fetch://[user@]host[:http]/path
430457 elseif b:netrw_method == 8 " read with fetch
431458 if g:netrw_fetch_cmd == ""
@@ -441,17 +468,17 @@
441468
442469 if exists("g:netrw_uid") && g:netrw_uid != "" && exists("g:netrw_passwd") && g:netrw_passwd != ""
443470 " call Decho("executing: !".g:netrw_fetch_cmd." ".tmpfile." ".netrw_option."://".g:netrw_uid.':'.g:netrw_passwd.'@'.g:netrw_machine."/".escape(b:netrw_fname,' ?&'))
444- exe "!".g:netrw_fetch_cmd." ".tmpfile." ".netrw_option."://".g:netrw_uid.':'.g:netrw_passwd.'@'.g:netrw_machine."/".escape(b:netrw_fname,' ?&')
471+ exe g:netrw_silentxfer."!".g:netrw_fetch_cmd." ".tmpfile." ".netrw_option."://".g:netrw_uid.':'.g:netrw_passwd.'@'.g:netrw_machine."/".escape(b:netrw_fname,' ?&')
445472 else
446473 " call Decho("executing: !".g:netrw_fetch_cmd." ".tmpfile." ".netrw_option."://".g:netrw_machine."/".escape(b:netrw_fname,' ?&'))
447- exe "!".g:netrw_fetch_cmd." ".tmpfile." ".netrw_option."://".g:netrw_machine."/".escape(b:netrw_fname,' ?&')
474+ exe g:netrw_silentxfer."!".g:netrw_fetch_cmd." ".tmpfile." ".netrw_option."://".g:netrw_machine."/".escape(b:netrw_fname,' ?&')
448475 endif
449476
450477 let result = s:NetGetFile(readcmd,tmpfile, b:netrw_method)
451478 let b:netrw_lastfile = choice
452479
453480 ".........................................
454- " sftp: Method #9
481+ " sftp: NetRead Method #9
455482 elseif b:netrw_method == 9 " read with sftp
456483 " call Decho("read via sftp (method #4)")
457484 if g:netrw_cygwin == 1
@@ -461,7 +488,7 @@
461488 exe "!".g:netrw_sftp_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".cygtmpfile
462489 else
463490 " call Decho("executing: !".g:netrw_sftp_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".tmpfile)
464- exe "!".g:netrw_sftp_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".tmpfile
491+ exe g:netrw_silentxfer."!".g:netrw_sftp_cmd." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')." ".tmpfile
465492 endif
466493 let result = s:NetGetFile(readcmd, tmpfile, b:netrw_method)
467494 let b:netrw_lastfile = choice
@@ -488,7 +515,7 @@
488515 " ------------------------------------------------------------------------
489516 " NetGetFile: Function to read file "fname" with command "readcmd". {{{1
490517 fun! s:NetGetFile(readcmd, fname, method)
491-" call Dfunc("NetGetFile(readcmd<".a:readcmd.">,fname<".a:fname."> method<".a:method.">)")
518+"" call Dfunc("NetGetFile(readcmd<".a:readcmd.">,fname<".a:fname."> method<".a:method.">)")
492519
493520 if exists("*NetReadFixup")
494521 " for the use of NetReadFixup (not otherwise used internally)
@@ -499,14 +526,14 @@
499526 if &term == "win32"
500527 if &shell == "bash"
501528 let fname=a:fname
502-" call Decho("(win32 && bash) fname<".fname.">")
529+"" call Decho("(win32 && bash) fname<".fname.">")
503530 else
504531 let fname=substitute(a:fname,'/','\\\\','ge')
505-" call Decho("(win32 && !bash) fname<".fname.">")
532+"" call Decho("(win32 && !bash) fname<".fname.">")
506533 endif
507534 else
508535 let fname= a:fname
509-" call Decho("(copied) fname<".fname.">")
536+"" call Decho("(copied) fname<".fname.">")
510537 endif
511538
512539 " get the file, but disable undo when reading a new buffer
@@ -576,21 +603,21 @@
576603 else
577604 let line2= line("$") - line2
578605 endif
579-" call Decho("calling NetReadFixup(method<".a:method."> line1=".line1." line2=".line2.")")
606+"" call Decho("calling NetReadFixup(method<".a:method."> line1=".line1." line2=".line2.")")
580607 call NetReadFixup(a:method, line1, line2)
581608 endif
582-" call Decho("readcmd<".a:readcmd."> cmdarg<".v:cmdarg."> fname<".a:fname."> readable=".filereadable(a:fname))
609+"" call Decho("readcmd<".a:readcmd."> cmdarg<".v:cmdarg."> fname<".a:fname."> readable=".filereadable(a:fname))
583610
584611 " insure that we have the right filetype and that its being displayed
585612 filetype detect
586613 redraw!
587-" call Dret("NetGetFile")
614+"" call Dret("NetGetFile")
588615 endfun
589616
590617 " ------------------------------------------------------------------------
591618 " NetWrite: responsible for writing a file over the net {{{1
592619 fun! s:NetWrite(...) range
593-" call Dfunc("NetWrite(a:0=".a:0.")")
620+"" call Dfunc("NetWrite(a:0=".a:0.")")
594621
595622 " option handling
596623 let mod= 0
@@ -612,7 +639,7 @@
612639
613640 " attempt to repeat with previous host-file-etc
614641 if exists("b:netrw_lastfile") && a:0 == 0
615-" call Decho("using b:netrw_lastfile<" . b:netrw_lastfile . ">")
642+"" call Decho("using b:netrw_lastfile<" . b:netrw_lastfile . ">")
616643 let choice = b:netrw_lastfile
617644 let ichoice= ichoice + 1
618645 else
@@ -647,7 +674,7 @@
647674 let ichoice = ichoice + 1
648675 if choice > a:0
649676 echoerr "Unbalanced string in filename '". wholechoice ."'"
650-" call Dret("NetWrite")
677+"" call Dret("NetWrite")
651678 return
652679 endif
653680 let choice= a:{ichoice}
@@ -656,7 +683,7 @@
656683 endif
657684 endif
658685 endif
659-" call Decho("choice<" . choice . ">")
686+"" call Decho("choice<" . choice . ">")
660687 let ichoice= ichoice + 1
661688
662689 " fix up windows urls
@@ -675,9 +702,9 @@
675702 " =============
676703
677704 ".........................................
678- " rcp: Method #1
705+ " rcp: NetWrite Method #1
679706 if b:netrw_method == 1 " write with rcp
680-" Decho "write via rcp (method #1)"
707+"" Decho "write via rcp (method #1)"
681708 if s:netrw_has_nt_rcp == 1
682709 if exists("g:netrw_uid") && ( g:netrw_uid != "" )
683710 let uid_machine = g:netrw_machine .'.'. g:netrw_uid
@@ -691,26 +718,26 @@
691718 let uid_machine = g:netrw_machine
692719 endif
693720 endif
694-" call Decho("executing: !".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".tmpfile." ".uid_machine.":".escape(b:netrw_fname,' ?&'))
695- exe "!".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".tmpfile." ".uid_machine.":".escape(b:netrw_fname,' ?&')
721+"" call Decho("executing: !".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".tmpfile." ".uid_machine.":".escape(b:netrw_fname,' ?&'))
722+ exe g:netrw_silentxfer."!".g:netrw_rcp_cmd." ".s:netrw_rcpmode." ".tmpfile." ".uid_machine.":".escape(b:netrw_fname,' ?&')
696723 let b:netrw_lastfile = choice
697724
698725 ".........................................
699- " ftp + <.netrc>: Method #2
726+ " ftp + <.netrc>: NetWrite Method #2
700727 elseif b:netrw_method == 2 " write with ftp + <.netrc>
701728 let netrw_fname = b:netrw_fname
702729 new
703730 set ff=unix
704731 exe "put ='".g:netrw_ftpmode."'"
705-" call Decho(" NetWrite: put ='".g:netrw_ftpmode."'")
732+"" call Decho(" NetWrite: put ='".g:netrw_ftpmode."'")
706733 exe "put ='put ".tmpfile." ".netrw_fname."'"
707-" call Decho("put ='put ".tmpfile." ".netrw_fname."'")
734+"" call Decho("put ='put ".tmpfile." ".netrw_fname."'")
708735 if exists("g:netrw_port") && g:netrw_port != ""
709-" call Decho("executing: %!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port)
710- exe "%!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port
736+"" call Decho("executing: %!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port)
737+ exe g:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine." ".g:netrw_port
711738 else
712-" call Decho("executing: %!".g:netrw_ftp_cmd." -i ".g:netrw_machine)
713- exe "%!".g:netrw_ftp_cmd." -i ".g:netrw_machine
739+"" call Decho("executing: %!".g:netrw_ftp_cmd." -i ".g:netrw_machine)
740+ exe g:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i ".g:netrw_machine
714741 endif
715742 " If the result of the ftp operation isn't blank, show an error message (tnx to Doug Claar)
716743 if getline(1) !~ "^$"
@@ -721,7 +748,7 @@
721748 let b:netrw_lastfile = choice
722749
723750 ".........................................
724- " ftp + machine, id, passwd, filename: Method #3
751+ " ftp + machine, id, passwd, filename: NetWrite Method #3
725752 elseif b:netrw_method == 3 " write with ftp + machine, id, passwd, and fname
726753 let netrw_fname= b:netrw_fname
727754 new
@@ -745,10 +772,10 @@
745772 " -i : turns off interactive prompting from ftp
746773 " -n unix : DON'T use <.netrc>, even though it exists
747774 " -n win32: quit being obnoxious about password
748-" call Decho('performing ftp -i -n')
775+"" call Decho('performing ftp -i -n')
749776 norm 1Gdd
750-" call Decho("executing: %!".g:netrw_ftp_cmd." -i -n")
751- exe "%!".g:netrw_ftp_cmd." -i -n"
777+"" call Decho("executing: %!".g:netrw_ftp_cmd." -i -n")
778+ exe g:netrw_silentxfer."%!".g:netrw_ftp_cmd." -i -n"
752779 " If the result of the ftp operation isn't blank, show an error message (tnx to Doug Claar)
753780 if getline(1) !~ "^$"
754781 echoerr getline(1)
@@ -757,7 +784,7 @@
757784 bd!
758785
759786 ".........................................
760- " scp: Method #4
787+ " scp: NetWrite Method #4
761788 elseif b:netrw_method == 4 " write with scp
762789 if exists("g:netrw_port") && g:netrw_port != ""
763790 let useport= " -P ".g:netrw_port
@@ -766,23 +793,23 @@
766793 endif
767794 if g:netrw_cygwin == 1
768795 let cygtmpfile=substitute(tmpfile,'^\(\a\):','/cygdrive/\1/','e')
769-" call Decho("executing: !".g:netrw_scp_cmd.useport." ".cygtmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&'))
770- exe "!".g:netrw_scp_cmd.useport." ".cygtmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')
796+"" call Decho("executing: !".g:netrw_scp_cmd.useport." ".cygtmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&'))
797+ exe g:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".cygtmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')
771798 else
772-" call Decho("executing: !".g:netrw_scp_cmd.useport." ".tmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&'))
773- exe "!".g:netrw_scp_cmd.useport." ".tmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')
799+"" call Decho("executing: !".g:netrw_scp_cmd.useport." ".tmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&'))
800+ exe g:netrw_silentxfer."!".g:netrw_scp_cmd.useport." ".tmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')
774801 endif
775802 let b:netrw_lastfile = choice
776803
777804 ".........................................
778- " http: Method #5
805+ " http: NetWrite Method #5
779806 elseif b:netrw_method == 5
780807 echoerr "***warning*** currently <netrw.vim> does not support writing using http:"
781808
782809 ".........................................
783- " dav: Method #6
810+ " dav: NetWrite Method #6
784811 elseif b:netrw_method == 6 " write with cadaver
785-" call Decho("write via cadaver (method #6)")
812+"" call Decho("write via cadaver (method #6)")
786813
787814 " Construct execution string (four lines) which will be passed through filter
788815 let netrw_fname= b:netrw_fname
@@ -804,26 +831,26 @@
804831
805832 " perform cadaver operation:
806833 norm 1Gdd
807-" call Decho("executing: %!".g:netrw_dav_cmd)
808- exe "%!".g:netrw_dav_cmd
834+"" call Decho("executing: %!".g:netrw_dav_cmd)
835+ exe g:netrw_silentxfer."%!".g:netrw_dav_cmd
809836 bd!
810837 let b:netrw_lastfile = choice
811838
812839 ".........................................
813- " rsync: Method #7
840+ " rsync: NetWrite Method #7
814841 elseif b:netrw_method == 7 " write with rsync
815842 if g:netrw_cygwin == 1
816843 let cygtmpfile=substitute(tmpfile,'^\(\a\):','/cygdrive/\1/','e')
817-" call Decho("executing: !".g:netrw_rsync_cmd." ".cygtmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&'))
818- exe "!".g:netrw_rsync_cmd." ".cygtmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')
844+"" call Decho("executing: !".g:netrw_rsync_cmd." ".cygtmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&'))
845+ exe g:netrw_silentxfer."!".g:netrw_rsync_cmd." ".cygtmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')
819846 else
820-" call Decho("executing: !".g:netrw_rsync_cmd." ".tmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&'))
821- exe "!".g:netrw_rsync_cmd." ".tmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')
847+"" call Decho("executing: !".g:netrw_rsync_cmd." ".tmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&'))
848+ exe g:netrw_silentxfer."!".g:netrw_rsync_cmd." ".tmpfile." ".g:netrw_machine.":".escape(b:netrw_fname,' ?&')
822849 endif
823850 let b:netrw_lastfile = choice
824851
825852 ".........................................
826- " scp: Method #9
853+ " scp: NetWrite Method #9
827854 elseif b:netrw_method == 9 " write with sftp
828855 let netrw_fname= b:netrw_fname
829856 if exists("g:netrw_uid") && ( g:netrw_uid != "" )
@@ -835,8 +862,8 @@
835862 set ff=unix
836863 put ='put '.tmpfile.' '.netrw_fname
837864 norm 1Gdd
838-" call Decho("executing: %!".g:netrw_sftp_cmd.' '.uid_machine)
839- exe "%!".g:netrw_sftp_cmd.' '.uid_machine
865+"" call Decho("executing: %!".g:netrw_sftp_cmd.' '.uid_machine)
866+ exe g:netrw_silentxfer."%!".g:netrw_sftp_cmd.' '.uid_machine
840867 bd!
841868 let b:netrw_lastfile= choice
842869
@@ -847,7 +874,7 @@
847874 endwhile
848875
849876 " cleanup
850-" call Decho("cleanup")
877+"" call Decho("cleanup")
851878 let result=delete(tmpfile)
852879 call s:NetOptionRestore()
853880
@@ -855,11 +882,146 @@
855882 let &mod= mod " usually equivalent to set nomod
856883 endif
857884
858-" call Dret("NetWrite")
885+"" call Dret("NetWrite")
859886 endfun
860887 " end of NetWrite
861888
862889 " ------------------------------------------------------------------------
890+" NetList: This function uses the command in g:netrw_list_cmd to get a list {{{1
891+" of the contents of a remote directory. It is assumed that the
892+" g:netrw_list_cmd has a string, HOSTNAME, that needs to be substituted
893+" with the requested remote hostname first.
894+fun! <SID>NetList(dirname)
895+"" call Dfunc("NetList(dirname<".a:dirname.">)")
896+
897+ " sanity maintenance
898+ let dirname= a:dirname
899+ if dirname !~ '/$' && (!exists("g:netrw_machine") || !exists("b:netlist_method") || !exists("b:netlist_path"))
900+ let dirname= dirname."/"
901+ endif
902+ set ma
903+
904+ if dirname !~ '/$' && dirname !~ '^"'
905+ " looks like a regular file, attempt transfer
906+"" call Decho("attempt transfer with regular file<".dirname.">")
907+"" call Decho("netlist method<".b:netlist_method."> cmd<".b:netlist_cmd."> path<".b:netlist_path.">")
908+ %d
909+
910+ " remove any filetype indicator from end of dirname, except for the
911+ " "this is a directory" indicator (/)
912+ let dirname= substitute(dirname,"[*=@|]$","","e")
913+"" call Decho("modified dirname<".dirname.">")
914+
915+ " remote-read the requested file into current buffer
916+ let machine= g:netrw_machine
917+ let method = b:netlist_method
918+ let path = b:netlist_path
919+ enew!
920+ exe "file ".method."://".machine."/".path.dirname
921+ exe "doau BufReadPre ".dirname
922+ silent call s:NetRead(method."://".machine."/".path.dirname)
923+ exe "doau BufReadPost ".dirname
924+ 1d
925+ set nomod noma
926+
927+ silent! unlet b:netlist_method
928+ silent! unlet b:netlist_cmd
929+ silent! unlet b:netlist_path
930+"" call Dret("NetList")
931+ return
932+
933+ elseif dirname == './'
934+ " refresh the directory list
935+"" call Decho("refresh directory listing")
936+"" call Decho("netlist method<".b:netlist_method."> cmd<".b:netlist_cmd."> path<".b:netlist_path.">")
937+ %d
938+
939+ elseif dirname == '../'
940+ " go up one directory
941+
942+ if b:netlist_path !~ '/' && strlen(b:netlist_path) > 0
943+ " go to top (rltv) directory
944+"" call Decho("go up one directory : 1 path<".b:netlist_path.">")
945+ let b:netlist_path= ""
946+
947+ elseif b:netlist_path !~ '^[./]\+$' && strlen(b:netlist_path) > 0
948+ " remove a directory from the netlist_path
949+"" call Decho("go up one directory : 2 path<".b:netlist_path.">")
950+ if b:netlist_path =~ '^[^/]*/$'
951+ let b:netlist_path= ""
952+ else
953+ let b:netlist_path= substitute(b:netlist_path,'^\(.*/\)[^/]*/$','\1','')
954+ endif
955+
956+ else
957+ " append ../
958+"" call Decho("go up one directory : 3 path<".b:netlist_path.">")
959+ let b:netlist_path= b:netlist_path.'../'
960+ endif
961+"" call Decho("netlist method<".b:netlist_method."> cmd<".b:netlist_cmd."> path<".b:netlist_path.">")
962+ %d
963+
964+ elseif dirname !~ '^\w\+:' && dirname =~ '/$'
965+ " go down one directory
966+"" call Decho("go down one directory<".dirname.">")
967+ let b:netlist_path=b:netlist_path.dirname
968+"" call Decho("netlist method<".b:netlist_method."> cmd<".b:netlist_cmd."> path<".b:netlist_path.">")
969+ %d
970+
971+ else
972+ " normal initial directory listing
973+"" call Decho("normal initial directory listing")
974+
975+ let listcmd = substitute(g:netrw_list_cmd,'\<HOSTNAME\>',g:netrw_machine,'')
976+ let method = substitute(dirname,'^\(\w\+\):.*$','\1','')
977+ let fname = b:netrw_fname
978+"" call Decho("set up listcmd<".listcmd.">")
979+"" call Decho("set up method <".method.">")
980+"" call Decho("set up fname <".fname.">")
981+
982+ " set up window
983+ if &mod == 1
984+ wincmd s
985+ endif
986+ enew!
987+ if v:version >= 602
988+ setlocal bh=wipe
989+ endif
990+
991+ " set up buffer-local variables
992+ let b:netlist_method = method
993+ let b:netlist_cmd = listcmd
994+ let b:netlist_path = fname
995+
996+ " set up buffer-local map
997+ nnoremap <buffer> <cr> :call <SID>NetList(expand("<cWORD>"))<cr>
998+
999+"" call Decho("netlist method<".b:netlist_method."> cmd<".b:netlist_cmd."> path<".b:netlist_path.">")
1000+ endif
1001+
1002+"" call Decho("executing: r! ".b:netlist_cmd." '".b:netlist_path."'")
1003+ put ='\" =============================='
1004+ put ='\" Netrw Remote Directory Listing'
1005+ put ='\" '.g:netrw_machine.':'.b:netlist_path
1006+ put ='\" =============================='
1007+ exe "silent r! ".b:netlist_cmd." '".b:netlist_path."'"
1008+ 1d
1009+ set ft=netrwlist
1010+ silent 5,$s/^\(.*\)\/$/ \1/e
1011+ silent 5,$call s:NetSort()
1012+ silent 5,$s/^ \(.*\)$/\1\//e
1013+ 5
1014+ exe 'file ['.g:netrw_machine.':'.b:netlist_path.']'
1015+ if v:version >= 602
1016+ setlocal nomod bh=wipe bt=nofile nobl noma
1017+ else
1018+ setlocal nomod
1019+ endif
1020+
1021+"" call Dret("NetList")
1022+endfun
1023+
1024+" ------------------------------------------------------------------------
8631025 " NetMethod: determine method of transfer {{{1
8641026 " method == 1: rcp
8651027 " 2: ftp + <.netrc>
@@ -871,7 +1033,7 @@
8711033 " 8: fetch
8721034 " 9: sftp
8731035 fun! s:NetMethod(choice) " globals: method machine id passwd fname
874-" call Dfunc("NetMethod(a:choice<".a:choice.">)")
1036+"" call Dfunc("NetMethod(a:choice<".a:choice.">)")
8751037
8761038 " initialization
8771039 let b:netrw_method = 0
@@ -891,23 +1053,23 @@
8911053 " rsyncurm : rsync://host[:port]/path Use rsync
8921054 " fetchurm : fetch://[user@]host[:http]/filename Use fetch (defaults to ftp, override for http)
8931055 " sftpurm : sftp://[user@]host/filename Use scp
894- let mipf = '\(\S\+\)\s\+\(\S\+\)\s\+\(\S\+\)\s\+\(\S\+\)'
895- let mf = '\(\S\+\)\s\+\(\S\+\)'
896- let ftpurm = 'ftp://\(\([^/@]\{-}\)@\)\=\([^/#:]\{-}\)\([#:]\d\+\)\=/\(.*\)$'
897- let rcpurm = 'rcp://\(\([^/@]\{-}\)@\)\=\([^/]\{-}\)/\(.*\)$'
898- let rcphf = '\(\([^@]\{-}\)@\)\=\(\I\i*\):\(\S\+\)'
899- let scpurm = 'scp://\([^/]\{-}\)\([#:]\d\+\)\=/\(.*\)$'
900- let httpurm = 'http://\([^/]\{-}\)\(/.*\)\=$'
901- let davurm = 'dav://\([^/]\{-}\)/\(.*\)\=$'
902- let rsyncurm = 'rsync://\([^/]\{-}\)/\(.*\)\=$'
903- let fetchurm = 'fetch://\(\([^/@]\{-}\)@\)\=\([^/#:]\{-}\)\(:http\)\=/\(.*\)$'
904- let sftpurm = 'sftp://\([^/]\{-}\)/\(.*\)\=$'
1056+ let mipf = '^\(\S\+\)\s\+\(\S\+\)\s\+\(\S\+\)\s\+\(\S\+\)$'
1057+ let mf = '^\(\S\+\)\s\+\(\S\+\)$'
1058+ let ftpurm = '^ftp://\(\([^/@]\{-}\)@\)\=\([^/#:]\{-}\)\([#:]\d\+\)\=/\(.*\)$'
1059+ let rcpurm = '^rcp://\(\([^/@]\{-}\)@\)\=\([^/]\{-}\)/\(.*\)$'
1060+ let rcphf = '^\(\(\h\w*\)@\)\=\(\h\w*\):\([^@]\+\)$'
1061+ let scpurm = '^scp://\([^/]\{-}\)\([#:]\d\+\)\=/\(.*\)$'
1062+ let httpurm = '^http://\([^/]\{-}\)\(/.*\)\=$'
1063+ let davurm = '^dav://\([^/]\{-}\)/\(.*\)\=$'
1064+ let rsyncurm = '^rsync://\([^/]\{-}\)/\(.*\)\=$'
1065+ let fetchurm = '^fetch://\(\([^/@]\{-}\)@\)\=\([^/#:]\{-}\)\(:http\)\=/\(.*\)$'
1066+ let sftpurm = '^sftp://\([^/]\{-}\)/\(.*\)\=$'
9051067
906-" call Decho("determine method:")
1068+"" call Decho("determine method:")
9071069 " Determine Method
9081070 " rcp://user@hostname/...path-to-file
9091071 if match(a:choice,rcpurm) == 0
910-" call Decho("rcp://...")
1072+"" call Decho("rcp://...")
9111073 let b:netrw_method = 1
9121074 let userid = substitute(a:choice,rcpurm,'\2',"")
9131075 let g:netrw_machine= substitute(a:choice,rcpurm,'\3',"")
@@ -918,7 +1080,7 @@
9181080
9191081 " scp://user@hostname/...path-to-file
9201082 elseif match(a:choice,scpurm) == 0
921-" call Decho("scp://...")
1083+"" call Decho("scp://...")
9221084 let b:netrw_method = 4
9231085 let g:netrw_machine= substitute(a:choice,scpurm,'\1',"")
9241086 let b:netrw_port = substitute(a:choice,scpurm,'\2',"")
@@ -926,28 +1088,28 @@
9261088
9271089 " http://user@hostname/...path-to-file
9281090 elseif match(a:choice,httpurm) == 0
929-" call Decho("http://...")
1091+"" call Decho("http://...")
9301092 let b:netrw_method = 5
9311093 let g:netrw_machine= substitute(a:choice,httpurm,'\1',"")
9321094 let b:netrw_fname = substitute(a:choice,httpurm,'\2',"")
9331095
9341096 " dav://hostname[:port]/..path-to-file..
9351097 elseif match(a:choice,davurm) == 0
936-" call Decho("dav://...")
1098+"" call Decho("dav://...")
9371099 let b:netrw_method= 6
9381100 let g:netrw_machine= substitute(a:choice,davurm,'\1',"")
9391101 let b:netrw_fname = substitute(a:choice,davurm,'\2',"")
9401102
9411103 " rsync://user@hostname/...path-to-file
9421104 elseif match(a:choice,rsyncurm) == 0
943-" call Decho("rsync://...")
1105+"" call Decho("rsync://...")
9441106 let b:netrw_method = 7
9451107 let g:netrw_machine= substitute(a:choice,rsyncurm,'\1',"")
9461108 let b:netrw_fname = substitute(a:choice,rsyncurm,'\2',"")
9471109
9481110 " ftp://[user@]hostname[[:#]port]/...path-to-file
9491111 elseif match(a:choice,ftpurm) == 0
950-" call Decho("ftp://...")
1112+"" call Decho("ftp://...")
9511113 let userid = substitute(a:choice,ftpurm,'\2',"")
9521114 let g:netrw_machine= substitute(a:choice,ftpurm,'\3',"")
9531115 let g:netrw_port = substitute(a:choice,ftpurm,'\4',"")
@@ -975,7 +1137,7 @@
9751137 endif
9761138
9771139 elseif match(a:choice,fetchurm) == 0
978-" call Decho("fetch://...")
1140+"" call Decho("fetch://...")
9791141 let b:netrw_method = 8
9801142 let g:netrw_userid = substitute(a:choice,fetchurm,'\2',"")
9811143 let g:netrw_machine= substitute(a:choice,fetchurm,'\3',"")
@@ -984,7 +1146,7 @@
9841146
9851147 " Issue an ftp : "machine id password [path/]filename"
9861148 elseif match(a:choice,mipf) == 0
987-" call Decho("(ftp) host id pass file")
1149+"" call Decho("(ftp) host id pass file")
9881150 let b:netrw_method = 3
9891151 let g:netrw_machine = substitute(a:choice,mipf,'\1',"")
9901152 let g:netrw_uid = substitute(a:choice,mipf,'\2',"")
@@ -993,7 +1155,7 @@
9931155
9941156 " Issue an ftp: "hostname [path/]filename"
9951157 elseif match(a:choice,mf) == 0
996-" call Decho("(ftp) host file")
1158+"" call Decho("(ftp) host file")
9971159 if exists("g:netrw_uid") && exists("g:netrw_passwd")
9981160 let b:netrw_method = 3
9991161 let g:netrw_machine = substitute(a:choice,mf,'\1',"")
@@ -1007,18 +1169,22 @@
10071169
10081170 " sftp://user@hostname/...path-to-file
10091171 elseif match(a:choice,sftpurm) == 0
1010-" call Decho("sftp://...")
1172+"" call Decho("sftp://...")
10111173 let b:netrw_method = 9
10121174 let g:netrw_machine= substitute(a:choice,sftpurm,'\1',"")
10131175 let b:netrw_fname = substitute(a:choice,sftpurm,'\2',"")
10141176
10151177 " Issue an rcp: hostname:filename" (this one should be last)
10161178 elseif match(a:choice,rcphf) == 0
1017-" call Decho("(rcp) host:file)")
1179+"" call Decho("(rcp) [user@]host:file) rcphf<".rcphf.">")
10181180 let b:netrw_method = 1
10191181 let userid = substitute(a:choice,rcphf,'\2',"")
10201182 let g:netrw_machine= substitute(a:choice,rcphf,'\3',"")
10211183 let b:netrw_fname = substitute(a:choice,rcphf,'\4',"")
1184+"" call Decho('\1<'.substitute(a:choice,rcphf,'\1',"").">")
1185+"" call Decho('\2<'.substitute(a:choice,rcphf,'\2',"").">")
1186+"" call Decho('\3<'.substitute(a:choice,rcphf,'\3',"").">")
1187+"" call Decho('\4<'.substitute(a:choice,rcphf,'\4',"").">")
10221188 if userid != ""
10231189 let g:netrw_uid= userid
10241190 endif
@@ -1032,18 +1198,18 @@
10321198 let b:netrw_method = -1
10331199 endif
10341200
1035-" call Decho("a:choice <".a:choice.">")
1036-" call Decho("b:netrw_method <".b:netrw_method.">")
1037-" call Decho("g:netrw_machine<".g:netrw_machine.">")
1038-" call Decho("g:netrw_port <".g:netrw_port.">")
1039-" if exists("g:netrw_uid") "Decho
1040-" call Decho("g:netrw_uid <".g:netrw_uid.">")
1041-" endif "Decho
1042-" if exists("g:netrw_passwd") "Decho
1043-" call Decho("g:netrw_passwd <".g:netrw_passwd.">")
1044-" endif "Decho
1045-" call Decho("b:netrw_fname <".b:netrw_fname.">")
1046-" call Dret("NetMethod")
1201+"" call Decho("a:choice <".a:choice.">")
1202+"" call Decho("b:netrw_method <".b:netrw_method.">")
1203+"" call Decho("g:netrw_machine<".g:netrw_machine.">")
1204+"" call Decho("g:netrw_port <".g:netrw_port.">")
1205+"" if exists("g:netrw_uid") "Decho
1206+"" call Decho("g:netrw_uid <".g:netrw_uid.">")
1207+"" endif "Decho
1208+"" if exists("g:netrw_passwd") "Decho
1209+"" call Decho("g:netrw_passwd <".g:netrw_passwd.">")
1210+"" endif "Decho
1211+"" call Decho("b:netrw_fname <".b:netrw_fname.">")
1212+"" call Dret("NetMethod")
10471213 endfun
10481214 " end of NetMethod
10491215
@@ -1056,32 +1222,32 @@
10561222
10571223 " get/set userid
10581224 if a:0 == 0
1059-" call Dfunc("NetUserPass(a:0<".a:0.">)")
1225+"" call Dfunc("NetUserPass(a:0<".a:0.">)")
10601226 if !exists("g:netrw_uid") || g:netrw_uid == ""
10611227 " via prompt
10621228 let g:netrw_uid= input('Enter username: ')
10631229 endif
10641230 else " from command line
1065-" call Dfunc("NetUserPass(a:1<".a:1.">) {")
1231+"" call Dfunc("NetUserPass(a:1<".a:1.">) {")
10661232 let g:netrw_uid= a:1
10671233 endif
10681234
10691235 " get password
10701236 if a:0 <= 1 " via prompt
1071-" call Decho("a:0=".a:0." case <=1:")
1237+"" call Decho("a:0=".a:0." case <=1:")
10721238 let g:netrw_passwd= inputsecret("Enter Password: ")
10731239 else " from command line
1074-" call Decho("a:0=".a:0." case >1: a:2<".a:2.">")
1240+"" call Decho("a:0=".a:0." case >1: a:2<".a:2.">")
10751241 let g:netrw_passwd=a:2
10761242 endif
1077-" call Dret("NetUserPass")
1243+"" call Dret("NetUserPass")
10781244 endfun
10791245 " end NetUserPass
10801246
10811247 " ------------------------------------------------------------------------
10821248 " NetOptionSave: save options and set to "standard" form {{{1
10831249 fun!s:NetOptionSave()
1084-" call Dfunc("NetOptionSave()")
1250+"" call Dfunc("NetOptionSave()")
10851251
10861252 " Get Temporary Filename
10871253 let s:aikeep = &ai
@@ -1100,16 +1266,16 @@
11001266 if has("win32") && !has("win95")
11011267 let s:swfkeep= &swf
11021268 set noswf
1103-" call Decho("setting s:swfkeep to <".&swf.">")
1269+"" call Decho("setting s:swfkeep to <".&swf.">")
11041270 endif
11051271
1106-" call Dret("NetOptionSave")
1272+"" call Dret("NetOptionSave")
11071273 endfun
11081274
11091275 " ------------------------------------------------------------------------
11101276 " NetOptionRestore: restore options {{{1
11111277 fun! s:NetOptionRestore()
1112-" call Dfunc("NetOptionRestore()")
1278+"" call Dfunc("NetOptionRestore()")
11131279
11141280 let &ai = s:aikeep
11151281 let &cin = s:cinkeep
@@ -1132,27 +1298,55 @@
11321298 unlet s:twkeep
11331299 unlet s:dirkeep
11341300
1135-" call Dret("NetOptionRestore")
1301+"" call Dret("NetOptionRestore")
11361302 endfun
11371303
11381304 " ------------------------------------------------------------------------
11391305 " NetReadFixup: this sort of function is typically written by the user {{{1
1140-" to handle extra junk that their system's ftp dumps
1141-" into the transfer. This function is provided as an
1142-" example and as a fix for a Windows 95 problem: in my
1143-" experience, win95's ftp always dumped four blank lines
1144-" at the end of the transfer.
1306+" to handle extra junk that their system's ftp dumps
1307+" into the transfer. This function is provided as an
1308+" example and as a fix for a Windows 95 problem: in my
1309+" experience, win95's ftp always dumped four blank lines
1310+" at the end of the transfer.
11451311 if has("win95") && g:netrw_win95ftp
11461312 fun! NetReadFixup(method, line1, line2)
1147-" call Dfunc("NetReadFixup(method<".a:method."> line1=".a:line1." line2=".a:line2.")")
1313+"" call Dfunc("NetReadFixup(method<".a:method."> line1=".a:line1." line2=".a:line2.")")
11481314 if method == 3 " ftp (no <.netrc>)
11491315 let fourblanklines= line2 - 3
11501316 silent fourblanklines.",".line2."g/^\s*/d"
11511317 endif
1152-" call Dret("NetReadFixup")
1318+"" call Dret("NetReadFixup")
11531319 endfun
11541320 endif
11551321
1322+" ---------------------------------------------------------------------
1323+" NetSort: Piet Delport's BISort2() function, modified to take a range
1324+fun! <SID>NetSort() range
1325+ let i = a:firstline + 1
1326+ while i <= a:lastline
1327+ " find insertion point via binary search
1328+ let i_val = getline(i)
1329+ let lo = a:firstline
1330+ let hi = i
1331+ while lo < hi
1332+ let mid = (lo + hi) / 2
1333+ let mid_val = getline(mid)
1334+ if i_val < mid_val
1335+ let hi = mid
1336+ else
1337+ let lo = mid + 1
1338+ if i_val == mid_val | break | endif
1339+ endif
1340+ endwhile
1341+ " do insert
1342+ if lo < i
1343+ exec i.'d_'
1344+ call append(lo - 1, i_val)
1345+ endif
1346+ let i = i + 1
1347+ endwhile
1348+endfun
1349+
11561350 " ------------------------------------------------------------------------
11571351 " Restore {{{1
11581352 let &cpo= s:save_cpo
diff -r 7edf9b6e4c36 -r 4102fb4ea781 runtime/syntax/netrwlist.vim
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/runtime/syntax/netrwlist.vim Sun Jun 20 12:51:53 2004 +0000
@@ -0,0 +1,29 @@
1+" Language : Netrw Remote-Directory Listing Syntax
2+" Maintainer : Charles E. Campbell, Jr.
3+" Last change: Jun 10, 2004
4+" Version : 1
5+
6+" Syntax Clearing: {{{1
7+if version < 600
8+ syntax clear
9+elseif exists("b:current_syntax")
10+ finish
11+endif
12+
13+" Directory List Syntax Highlighting: {{{1
14+syn match netrwDir "^.*/$" contains=netrwSpecial
15+syn match netrwSpecial "[*=@|/]$"
16+syn match netrwSlash contained "/"
17+syn match netrwComment '".*$'
18+
19+" Highlighting Links: {{{1
20+if !exists("did_drchip_dbg_syntax")
21+ let did_drchip_netrwlist_syntax= 1
22+ hi link netrwComment Comment
23+ hi link netrwDir Directory
24+ hi link netrwSpecial Function
25+endif
26+
27+" Current Syntax: {{{1
28+let b:current_syntax = "netrwlist"
29+" vim: ts=8 fdm=marker
diff -r 7edf9b6e4c36 -r 4102fb4ea781 runtime/syntax/po.vim
--- a/runtime/syntax/po.vim Wed Jun 16 11:19:22 2004 +0000
+++ b/runtime/syntax/po.vim Sun Jun 20 12:51:53 2004 +0000
@@ -19,6 +19,8 @@
1919 syn match poFormat "%%" contained
2020 syn region poString start=+"+ skip=+\\\\\|\\"+ end=+"+
2121 \ contains=poSpecial,poFormat
22+syn region poFuzzy start=+^#,\sfuzzy+ end=+^$+
23+syn match poUntranslated +^msgstr\s""\n\n+
2224
2325 " Define the default highlighting.
2426 " For version 5.7 and earlier: only when not done already
@@ -37,6 +39,8 @@
3739 HiLink poSpecial Special
3840 HiLink poFormat poSpecial
3941 HiLink poString String
42+ HiLink poFuzzy Todo
43+ HiLink poUntranslated Todo
4044
4145 delcommand HiLink
4246 endif
diff -r 7edf9b6e4c36 -r 4102fb4ea781 src/Makefile
--- a/src/Makefile Wed Jun 16 11:19:22 2004 +0000
+++ b/src/Makefile Sun Jun 20 12:51:53 2004 +0000
@@ -432,7 +432,7 @@
432432 #CONF_OPT_FEAT = --with-features=small
433433 #CONF_OPT_FEAT = --with-features=normal
434434 #CONF_OPT_FEAT = --with-features=big
435-CONF_OPT_FEAT = --with-features=huge
435+#CONF_OPT_FEAT = --with-features=huge
436436
437437 # COMPILED BY - For including a specific e-mail address for ":version".
438438 #CONF_OPT_COMPBY = "--with-compiledby=John Doe <JohnDoe@yahoo.com>"
@@ -493,7 +493,7 @@
493493
494494 # Often used for GCC: mixed optimizing, lot of optimizing, debugging
495495 #CFLAGS = -g -O2 -fno-strength-reduce -Wall -Wshadow -Wmissing-prototypes
496-CFLAGS = -g -O2 -fno-strength-reduce -Wall -Wmissing-prototypes
496+#CFLAGS = -g -O2 -fno-strength-reduce -Wall -Wmissing-prototypes
497497 #CFLAGS = -O6 -fno-strength-reduce -Wall -Wshadow -Wmissing-prototypes
498498 #CFLAGS = -g -DDEBUG -Wall -Wshadow -Wmissing-prototypes
499499 #CFLAGS = -g -O2 -DSTARTUPTIME=\"vimstartup\" -fno-strength-reduce -Wall -Wmissing-prototypes
diff -r 7edf9b6e4c36 -r 4102fb4ea781 src/buffer.c
--- a/src/buffer.c Wed Jun 16 11:19:22 2004 +0000
+++ b/src/buffer.c Sun Jun 20 12:51:53 2004 +0000
@@ -4579,7 +4579,7 @@
45794579 }
45804580 #endif
45814581 if (buf->b_fname == NULL)
4582- return _("[No File]");
4582+ return _("[No Name]");
45834583 return NULL;
45844584 }
45854585
diff -r 7edf9b6e4c36 -r 4102fb4ea781 src/eval.c
--- a/src/eval.c Wed Jun 16 11:19:22 2004 +0000
+++ b/src/eval.c Sun Jun 20 12:51:53 2004 +0000
@@ -599,6 +599,20 @@
599599 }
600600
601601 /*
602+ * Skip over an expression at "*pp".
603+ * Return FAIL for an error, OK otherwise.
604+ */
605+ int
606+skip_expr(pp)
607+ char_u **pp;
608+{
609+ var retvar;
610+
611+ *pp = skipwhite(*pp);
612+ return eval1(pp, &retvar, FALSE);
613+}
614+
615+/*
602616 * Top level evaluation function, returning a string.
603617 * Return pointer to allocated memory, or NULL for failure.
604618 */
@@ -3375,6 +3389,20 @@
33753389 buf = buflist_findname(name);
33763390 vim_free(name);
33773391 }
3392+ if (buf == NULL)
3393+ {
3394+ /* No full path name match, try a match with a URL or a "nofile"
3395+ * buffer, these don't use the full path. */
3396+ for (buf = firstbuf; buf != NULL; buf = buf->b_next)
3397+ if (buf->b_fname != NULL
3398+ && (path_with_url(buf->b_fname)
3399+#ifdef FEAT_QUICKFIX
3400+ || bt_nofile(buf)
3401+#endif
3402+ )
3403+ && STRCMP(buf->b_fname, avar->var_val.var_string) == 0)
3404+ break;
3405+ }
33783406 }
33793407 return buf;
33803408 }
diff -r 7edf9b6e4c36 -r 4102fb4ea781 src/ex_cmds.c
--- a/src/ex_cmds.c Wed Jun 16 11:19:22 2004 +0000
+++ b/src/ex_cmds.c Sun Jun 20 12:51:53 2004 +0000
@@ -4573,7 +4573,7 @@
45734573 buf_T *buf;
45744574 #ifdef FEAT_MULTI_LANG
45754575 int len;
4576- char_u *lang = NULL;
4576+ char_u *lang;
45774577 #endif
45784578
45794579 if (eap != NULL)
@@ -4613,13 +4613,7 @@
46134613
46144614 #ifdef FEAT_MULTI_LANG
46154615 /* Check for a specified language */
4616- len = STRLEN(arg);
4617- if (len >= 3 && arg[len - 3] == '@' && ASCII_ISALPHA(arg[len - 2])
4618- && ASCII_ISALPHA(arg[len - 1]))
4619- {
4620- lang = arg + len - 2;
4621- lang[-1] = NUL; /* remove the '@' */
4622- }
4616+ lang = check_help_lang(arg);
46234617 #endif
46244618
46254619 /* When no argument given go to the index. */
@@ -4748,6 +4742,28 @@
47484742 }
47494743
47504744
4745+#if defined(FEAT_MULTI_LANG) || defined(PROTO)
4746+/*
4747+ * In an argument search for a language specifiers in the form "@xx".
4748+ * Changes the "@" to NUL if found, and returns a pointer to "xx".
4749+ * Returns NULL if not found.
4750+ */
4751+ char_u *
4752+check_help_lang(arg)
4753+ char_u *arg;
4754+{
4755+ int len = STRLEN(arg);
4756+
4757+ if (len >= 3 && arg[len - 3] == '@' && ASCII_ISALPHA(arg[len - 2])
4758+ && ASCII_ISALPHA(arg[len - 1]))
4759+ {
4760+ arg[len - 3] = NUL; /* remove the '@' */
4761+ return arg + len - 2;
4762+ }
4763+ return NULL;
4764+}
4765+#endif
4766+
47514767 /*
47524768 * Return a heuristic indicating how well the given string matches. The
47534769 * smaller the number, the better the match. This is the order of priorities,
@@ -5180,7 +5196,9 @@
51805196 garray_T ga;
51815197 int i, j;
51825198 int len;
5199+#ifdef FEAT_MULTI_LANG
51835200 char_u lang[2];
5201+#endif
51845202 char_u ext[5];
51855203 char_u fname[8];
51865204 int filecount;
diff -r 7edf9b6e4c36 -r 4102fb4ea781 src/ex_docmd.c
--- a/src/ex_docmd.c Wed Jun 16 11:19:22 2004 +0000
+++ b/src/ex_docmd.c Sun Jun 20 12:51:53 2004 +0000
@@ -2319,8 +2319,8 @@
23192319 }
23202320 }
23212321 /* no arguments allowed */
2322- if (!ni && !(ea.argt & EXTRA) && *ea.arg != NUL &&
2323- vim_strchr((char_u *)"|\"", *ea.arg) == NULL)
2322+ if (!ni && !(ea.argt & EXTRA) && *ea.arg != NUL
2323+ && vim_strchr((char_u *)"|\"", *ea.arg) == NULL)
23242324 {
23252325 errormsg = (char_u *)_(e_trailing);
23262326 goto doend;
@@ -3885,6 +3885,17 @@
38853885 has_wildcards = mch_has_wildcard(eap->arg);
38863886 for (p = eap->arg; *p; )
38873887 {
3888+#ifdef FEAT_EVAL
3889+ /* Skip over `=expr`, wildcards in it are not expanded. */
3890+ if (p[0] == '`' && p[1] == '=')
3891+ {
3892+ p += 2;
3893+ (void)skip_expr(&p);
3894+ if (*p == '`')
3895+ ++p;
3896+ continue;
3897+ }
3898+#endif
38883899 /*
38893900 * Quick check if this cannot be the start of a special string.
38903901 * Also removes backslash before '%', '#' and '<'.
@@ -4157,6 +4168,18 @@
41574168 if (*p == NUL) /* stop at NUL after CTRL-V */
41584169 break;
41594170 }
4171+
4172+#ifdef FEAT_EVAL
4173+ /* Skip over `=expr` when wildcards are expanded. */
4174+ else if (p[0] == '`' && p[1] == '=')
4175+ {
4176+ p += 2;
4177+ (void)skip_expr(&p);
4178+ if (*p == '`')
4179+ ++p;
4180+ }
4181+#endif
4182+
41604183 /* Check for '"': start of comment or '|': next command */
41614184 /* :@" and :*" do not start a comment!
41624185 * :redir @" doesn't either. */
diff -r 7edf9b6e4c36 -r 4102fb4ea781 src/fileio.c
--- a/src/fileio.c Wed Jun 16 11:19:22 2004 +0000
+++ b/src/fileio.c Sun Jun 20 12:51:53 2004 +0000
@@ -5290,8 +5290,11 @@
52905290 }
52915291 if (p == NULL || buf->b_fname == NULL)
52925292 buf->b_fname = buf->b_ffname;
5293- mf_fullname(buf->b_ml.ml_mfp);
5294- }
5293+ }
5294+
5295+ /* Always make the swap file name a full path, a "nofile" buffer may
5296+ * also have a swap file. */
5297+ mf_fullname(buf->b_ml.ml_mfp);
52955298 }
52965299 #ifdef FEAT_WINDOWS
52975300 status_redraw_all();
diff -r 7edf9b6e4c36 -r 4102fb4ea781 src/gui_mac.c
--- a/src/gui_mac.c Wed Jun 16 11:19:22 2004 +0000
+++ b/src/gui_mac.c Sun Jun 20 12:51:53 2004 +0000
@@ -74,6 +74,9 @@
7474 # endif
7575 #endif
7676
77+/* Vim's Scrap flavor. */
78+#define VIMSCRAPFLAVOR 'VIM!'
79+
7780 /* CARBON version only tested with Project Builder under MacOS X */
7881 #undef USE_CARBONIZED
7982 #if (defined(__APPLE_CC__) || defined(__MRC__)) && defined(TARGET_API_MAC_CARBON)
@@ -326,7 +329,7 @@
326329 */
327330
328331 #ifdef USE_AEVENT
329-OSErr HandleUnusedParms (const AppleEvent *theAEvent);
332+OSErr HandleUnusedParms(const AppleEvent *theAEvent);
330333 #endif
331334
332335 /*
@@ -511,7 +514,7 @@
511514 if (*error)
512515 {
513516 #ifdef USE_SIOUX
514- printf ("fname_from_AEDesc: AECountItems error: %d\n", error);
517+ printf("fname_from_AEDesc: AECountItems error: %d\n", error);
515518 #endif
516519 return(fnames);
517520 }
@@ -535,13 +538,13 @@
535538 /* Caller is able to clean up */
536539 /* TODO: Should be clean up or not? For safety. */
537540 #ifdef USE_SIOUX
538- printf ("aevt_odoc: AEGetNthPtr error: %d\n", newError);
541+ printf("aevt_odoc: AEGetNthPtr error: %d\n", newError);
539542 #endif
540543 return(fnames);
541544 }
542545
543546 /* Convert the FSSpec to a pathname */
544- fnames[fileCount - 1] = FullPathFromFSSpec_save (fileToOpen);
547+ fnames[fileCount - 1] = FullPathFromFSSpec_save(fileToOpen);
545548 }
546549
547550 return (fnames);
@@ -574,7 +577,7 @@
574577 * When the editor receives this event, determine whether the specified
575578 * file is open. If it is, return the modification date/time for that file
576579 * in the appropriate location specified in the structure. If the file is
577- * not opened, put the value fnfErr (file not found) in that location.
580+ * not opened, put the value fnfErr(file not found) in that location.
578581 *
579582 */
580583
@@ -591,7 +594,8 @@
591594 # pragma options align=reset
592595 #endif
593596
594-pascal OSErr Handle_KAHL_SRCH_AE (const AppleEvent *theAEvent, AppleEvent *theReply, long refCon)
597+ pascal OSErr
598+Handle_KAHL_SRCH_AE(const AppleEvent *theAEvent, AppleEvent *theReply, long refCon)
595599 {
596600 OSErr error = noErr;
597601 buf_T *buf;
@@ -604,16 +608,16 @@
604608 if (error)
605609 {
606610 #ifdef USE_SIOUX
607- printf ("KAHL_SRCH: AEGetParamPtr error: %d\n", error);
611+ printf("KAHL_SRCH: AEGetParamPtr error: %d\n", error);
608612 #endif
609613 return(error);
610614 }
611615
612- error = HandleUnusedParms (theAEvent);
616+ error = HandleUnusedParms(theAEvent);
613617 if (error)
614618 {
615619 #ifdef USE_SIOUX
616- printf ("KAHL_SRCH: HandleUnusedParms error: %d\n", error);
620+ printf("KAHL_SRCH: HandleUnusedParms error: %d\n", error);
617621 #endif
618622 return(error);
619623 }
@@ -634,10 +638,10 @@
634638 *SearchData.theDate = buf->b_mtime;
635639
636640 #ifdef USE_SIOUX
637- printf ("KAHL_SRCH: file \"%#s\" {%d}", SearchData.theFile.name,SearchData.theFile.parID);
641+ printf("KAHL_SRCH: file \"%#s\" {%d}", SearchData.theFile.name,SearchData.theFile.parID);
638642 if (foundFile == false)
639- printf (" NOT");
640- printf (" found. [date %lx, %lx]\n", *SearchData.theDate, buf->b_mtime_read);
643+ printf(" NOT");
644+ printf(" found. [date %lx, %lx]\n", *SearchData.theDate, buf->b_mtime_read);
641645 #endif
642646
643647 return error;
@@ -684,7 +688,8 @@
684688 # pragma options align=reset
685689 #endif
686690
687-pascal OSErr Handle_KAHL_MOD_AE (const AppleEvent *theAEvent, AppleEvent *theReply, long refCon)
691+ pascal OSErr
692+Handle_KAHL_MOD_AE(const AppleEvent *theAEvent, AppleEvent *theReply, long refCon)
688693 {
689694 OSErr error = noErr;
690695 AEDescList replyList;
@@ -694,11 +699,11 @@
694699
695700 theFile.saved = 0;
696701
697- error = HandleUnusedParms (theAEvent);
702+ error = HandleUnusedParms(theAEvent);
698703 if (error)
699704 {
700705 #ifdef USE_SIOUX
701- printf ("KAHL_MOD: HandleUnusedParms error: %d\n", error);
706+ printf("KAHL_MOD: HandleUnusedParms error: %d\n", error);
702707 #endif
703708 return(error);
704709 }
@@ -712,7 +717,7 @@
712717 if (error)
713718 {
714719 #ifdef USE_SIOUX
715- printf ("KAHL_MOD: AECreateList error: %d\n", error);
720+ printf("KAHL_MOD: AECreateList error: %d\n", error);
716721 #endif
717722 return(error);
718723 }
@@ -720,12 +725,12 @@
720725 #if 0
721726 error = AECountItems(&replyList, &numFiles);
722727 #ifdef USE_SIOUX
723- printf ("KAHL_MOD ReplyList: %x %x\n", replyList.descriptorType, replyList.dataHandle);
724- printf ("KAHL_MOD ItemInList: %d\n", numFiles);
725-#endif
726-
727- /* AEPutKeyDesc (&replyList, keyAEPnject, &aDesc)
728- * AEPutKeyPtr (&replyList, keyAEPosition, typeChar, (Ptr)&theType,
728+ printf("KAHL_MOD ReplyList: %x %x\n", replyList.descriptorType, replyList.dataHandle);
729+ printf("KAHL_MOD ItemInList: %d\n", numFiles);
730+#endif
731+
732+ /* AEPutKeyDesc(&replyList, keyAEPnject, &aDesc)
733+ * AEPutKeyPtr(&replyList, keyAEPosition, typeChar, (Ptr)&theType,
729734 * sizeof(DescType))
730735 */
731736
@@ -739,37 +744,37 @@
739744 /* Add this file to the list */
740745 theFile.theFile = buf->b_FSSpec;
741746 theFile.theDate = buf->b_mtime;
742-/* theFile.theDate = time (NULL) & (time_t) 0xFFFFFFF0; */
743- error = AEPutPtr (&replyList, numFiles, typeChar, (Ptr) &theFile, sizeof(theFile));
747+/* theFile.theDate = time(NULL) & (time_t) 0xFFFFFFF0; */
748+ error = AEPutPtr(&replyList, numFiles, typeChar, (Ptr) &theFile, sizeof(theFile));
744749 #ifdef USE_SIOUX
745750 if (numFiles == 0)
746- printf ("KAHL_MOD: ");
751+ printf("KAHL_MOD: ");
747752 else
748- printf (", ");
749- printf ("\"%#s\" {%d} [date %lx, %lx]", theFile.theFile.name, theFile.theFile.parID, theFile.theDate, buf->b_mtime_read);
753+ printf(", ");
754+ printf("\"%#s\" {%d} [date %lx, %lx]", theFile.theFile.name, theFile.theFile.parID, theFile.theDate, buf->b_mtime_read);
750755 if (error)
751- printf (" (%d)", error);
756+ printf(" (%d)", error);
752757 numFiles++;
753758 #endif
754759 };
755760
756761 #ifdef USE_SIOUX
757- printf ("\n");
762+ printf("\n");
758763 #endif
759764
760765 #if 0
761766 error = AECountItems(&replyList, &numFiles);
762767 #ifdef USE_SIOUX
763- printf ("KAHL_MOD ItemInList: %d\n", numFiles);
768+ printf("KAHL_MOD ItemInList: %d\n", numFiles);
764769 #endif
765770 #endif
766771
767772 /* We can add data only if something to reply */
768- error = AEPutParamDesc (theReply, keyDirectObject, &replyList);
773+ error = AEPutParamDesc(theReply, keyDirectObject, &replyList);
769774
770775 #ifdef USE_SIOUX
771776 if (error)
772- printf ("KAHL_MOD: AEPutParamDesc error: %d\n", error);
777+ printf("KAHL_MOD: AEPutParamDesc error: %d\n", error);
773778 #endif
774779
775780 if (replyList.dataHandle)
@@ -819,7 +824,8 @@
819824 # pragma options align=reset
820825 #endif
821826
822-pascal OSErr Handle_KAHL_GTTX_AE (const AppleEvent *theAEvent, AppleEvent *theReply, long refCon)
827+ pascal OSErr
828+Handle_KAHL_GTTX_AE(const AppleEvent *theAEvent, AppleEvent *theReply, long refCon)
823829 {
824830 OSErr error = noErr;
825831 buf_T *buf;
@@ -839,7 +845,7 @@
839845 if (error)
840846 {
841847 #ifdef USE_SIOUX
842- printf ("KAHL_GTTX: AEGetParamPtr error: %d\n", error);
848+ printf("KAHL_GTTX: AEGetParamPtr error: %d\n", error);
843849 #endif
844850 return(error);
845851 }
@@ -854,7 +860,7 @@
854860
855861 if (foundFile)
856862 {
857- BufferSize = 0; /* GetHandleSize (GetTextData.theText); */
863+ BufferSize = 0; /* GetHandleSize(GetTextData.theText); */
858864 for (lineno = 0; lineno <= buf->b_ml.ml_line_count; lineno++)
859865 {
860866 /* Must use the right buffer */
@@ -863,48 +869,48 @@
863869 lineStart = BufferSize;
864870 BufferSize += linesize;
865871 /* Resize handle to linesize+1 to include the linefeed */
866- SetHandleSize (GetTextData.theText, BufferSize);
867- if (GetHandleSize (GetTextData.theText) != BufferSize)
872+ SetHandleSize(GetTextData.theText, BufferSize);
873+ if (GetHandleSize(GetTextData.theText) != BufferSize)
868874 {
869875 #ifdef USE_SIOUX
870- printf ("KAHL_GTTX: SetHandleSize increase: %d, size %d\n",
876+ printf("KAHL_GTTX: SetHandleSize increase: %d, size %d\n",
871877 linesize, BufferSize);
872878 #endif
873879 break; /* Simple handling for now */
874880 }
875881 else
876882 {
877- HLock (GetTextData.theText);
883+ HLock(GetTextData.theText);
878884 fullbuffer = (char_u *) *GetTextData.theText;
879- STRCPY ((char_u *) (fullbuffer + lineStart), line);
885+ STRCPY((char_u *)(fullbuffer + lineStart), line);
880886 fullbuffer[BufferSize-1] = '\r';
881- HUnlock (GetTextData.theText);
887+ HUnlock(GetTextData.theText);
882888 }
883889 }
884890 if (fullbuffer != NULL)
885891 {
886- HLock (GetTextData.theText);
892+ HLock(GetTextData.theText);
887893 fullbuffer[BufferSize-1] = 0;
888- HUnlock (GetTextData.theText);
894+ HUnlock(GetTextData.theText);
889895 }
890896 if (foundFile == false)
891897 *GetTextData.theDate = fnfErr;
892898 else
893-/* *GetTextData.theDate = time (NULL) & (time_t) 0xFFFFFFF0;*/
899+/* *GetTextData.theDate = time(NULL) & (time_t) 0xFFFFFFF0;*/
894900 *GetTextData.theDate = buf->b_mtime;
895901 }
896902 #ifdef USE_SIOUX
897- printf ("KAHL_GTTX: file \"%#s\" {%d} [date %lx, %lx]", GetTextData.theFile.name, GetTextData.theFile.parID, *GetTextData.theDate, buf->b_mtime_read);
903+ printf("KAHL_GTTX: file \"%#s\" {%d} [date %lx, %lx]", GetTextData.theFile.name, GetTextData.theFile.parID, *GetTextData.theDate, buf->b_mtime_read);
898904 if (foundFile == false)
899- printf (" NOT");
900- printf (" found. (BufferSize = %d)\n", BufferSize);
901-#endif
902-
903- error = HandleUnusedParms (theAEvent);
905+ printf(" NOT");
906+ printf(" found. (BufferSize = %d)\n", BufferSize);
907+#endif
908+
909+ error = HandleUnusedParms(theAEvent);
904910 if (error)
905911 {
906912 #ifdef USE_SIOUX
907- printf ("KAHL_GTTX: HandleUnusedParms error: %d\n", error);
913+ printf("KAHL_GTTX: HandleUnusedParms error: %d\n", error);
908914 #endif
909915 return(error);
910916 }
@@ -917,48 +923,45 @@
917923 */
918924
919925 /* Taken from MoreAppleEvents:ProcessHelpers*/
920-pascal OSErr FindProcessBySignature( const OSType targetType,
926+pascal OSErr FindProcessBySignature(const OSType targetType,
921927 const OSType targetCreator,
922- ProcessSerialNumberPtr psnPtr )
928+ ProcessSerialNumberPtr psnPtr)
923929 {
924930 OSErr anErr = noErr;
925931 Boolean lookingForProcess = true;
926932
927933 ProcessInfoRec infoRec;
928934
929- infoRec.processInfoLength = sizeof( ProcessInfoRec );
935+ infoRec.processInfoLength = sizeof(ProcessInfoRec);
930936 infoRec.processName = nil;
931937 infoRec.processAppSpec = nil;
932938
933939 psnPtr->lowLongOfPSN = kNoProcess;
934940 psnPtr->highLongOfPSN = kNoProcess;
935941
936- while ( lookingForProcess )
942+ while (lookingForProcess)
937943 {
938- anErr = GetNextProcess( psnPtr );
939- if ( anErr != noErr )
940- {
944+ anErr = GetNextProcess(psnPtr);
945+ if (anErr != noErr)
941946 lookingForProcess = false;
942- }
943947 else
944948 {
945- anErr = GetProcessInformation( psnPtr, &infoRec );
946- if ( ( anErr == noErr )
947- && ( infoRec.processType == targetType )
948- && ( infoRec.processSignature == targetCreator ) )
949- {
949+ anErr = GetProcessInformation(psnPtr, &infoRec);
950+ if ((anErr == noErr)
951+ && (infoRec.processType == targetType)
952+ && (infoRec.processSignature == targetCreator))
950953 lookingForProcess = false;
951- }
952954 }
953955 }
954956
955957 return anErr;
956958 }//end FindProcessBySignature
957959
958-void Send_KAHL_MOD_AE (buf_T *buf)
960+ void
961+Send_KAHL_MOD_AE(buf_T *buf)
959962 {
960- OSErr anErr = noErr;
961- AEDesc targetAppDesc = { typeNull, nil };
963+ OSErr anErr = noErr;
964+ AEDesc targetAppDesc = { typeNull, nil };
962965 ProcessSerialNumber psn = { kNoProcess, kNoProcess };
963966 AppleEvent theReply = { typeNull, nil };
964967 AESendMode sendMode;
@@ -967,48 +970,48 @@
967970 ModificationInfo ModData;
968971
969972
970- anErr = FindProcessBySignature( 'APPL', 'CWIE', &psn );
973+ anErr = FindProcessBySignature('APPL', 'CWIE', &psn);
971974 #ifdef USE_SIOUX
972- printf ("CodeWarrior is");
975+ printf("CodeWarrior is");
973976 if (anErr != noErr)
974- printf (" NOT");
975- printf (" running\n");
976-#endif
977- if ( anErr == noErr )
977+ printf(" NOT");
978+ printf(" running\n");
979+#endif
980+ if (anErr == noErr)
978981 {
979- anErr = AECreateDesc (typeProcessSerialNumber, &psn,
980- sizeof( ProcessSerialNumber ), &targetAppDesc);
981-
982- if ( anErr == noErr )
982+ anErr = AECreateDesc(typeProcessSerialNumber, &psn,
983+ sizeof(ProcessSerialNumber), &targetAppDesc);
984+
985+ if (anErr == noErr)
983986 {
984987 anErr = AECreateAppleEvent( 'KAHL', 'MOD ', &targetAppDesc,
985988 kAutoGenerateReturnID, kAnyTransactionID, &theEvent);
986989 }
987990
988- AEDisposeDesc( &targetAppDesc );
991+ AEDisposeDesc(&targetAppDesc);
989992
990993 /* Add the parms */
991994 ModData.theFile = buf->b_FSSpec;
992995 ModData.theDate = buf->b_mtime;
993996
994997 if (anErr == noErr)
995- anErr =AEPutParamPtr (&theEvent, keyDirectObject, typeChar, &ModData, sizeof(ModData));
996-
997- if ( idleProcUPP == nil )
998+ anErr = AEPutParamPtr(&theEvent, keyDirectObject, typeChar, &ModData, sizeof(ModData));
999+
1000+ if (idleProcUPP == nil)
9981001 sendMode = kAENoReply;
9991002 else
10001003 sendMode = kAEWaitReply;
10011004
1002- if ( anErr == noErr )
1003- anErr = AESend( &theEvent, &theReply, sendMode, kAENormalPriority, kNoTimeOut, idleProcUPP, nil );
1004- if ( anErr == noErr && sendMode == kAEWaitReply )
1005+ if (anErr == noErr)
1006+ anErr = AESend(&theEvent, &theReply, sendMode, kAENormalPriority, kNoTimeOut, idleProcUPP, nil);
1007+ if (anErr == noErr && sendMode == kAEWaitReply)
10051008 {
10061009 #ifdef USE_SIOUX
1007- printf ("KAHL_MOD: Send error: %d\n", anErr);
1008-#endif
1009-/* anErr = AEHGetHandlerError( &theReply );*/
1010+ printf("KAHL_MOD: Send error: %d\n", anErr);
1011+#endif
1012+/* anErr = AEHGetHandlerError(&theReply);*/
10101013 }
1011- (void) AEDisposeDesc( &theReply );
1014+ (void) AEDisposeDesc(&theReply);
10121015 }
10131016 }
10141017 #endif /* FEAT_CW_EDITOR */
@@ -1024,7 +1027,8 @@
10241027 * Handle the Unused parms of an AppleEvent
10251028 */
10261029
1027-OSErr HandleUnusedParms (const AppleEvent *theAEvent)
1030+ OSErr
1031+HandleUnusedParms(const AppleEvent *theAEvent)
10281032 {
10291033 OSErr error;
10301034 long actualSize;
@@ -1086,7 +1090,8 @@
10861090 endRange are all negative, there is no selection range specified.
10871091 */
10881092
1089-pascal OSErr HandleODocAE (const AppleEvent *theAEvent, AppleEvent *theReply, long refCon)
1093+ pascal OSErr
1094+HandleODocAE(const AppleEvent *theAEvent, AppleEvent *theReply, long refCon)
10901095 {
10911096 /*
10921097 * TODO: Clean up the code with convert the AppleEvent into
@@ -1107,7 +1112,7 @@
11071112 long lnum;
11081113
11091114 #ifdef USE_SIOUX
1110- printf ("aevt_odoc:\n");
1115+ printf("aevt_odoc:\n");
11111116 #endif
11121117
11131118 /* the direct object parameter is the list of aliases to files (one or more) */
@@ -1115,7 +1120,7 @@
11151120 if (error)
11161121 {
11171122 #ifdef USE_SIOUX
1118- printf ("aevt_odoc: AEGetParamDesc error: %d\n", error);
1123+ printf("aevt_odoc: AEGetParamDesc error: %d\n", error);
11191124 #endif
11201125 return(error);
11211126 }
@@ -1129,13 +1134,13 @@
11291134 if (error)
11301135 {
11311136 #ifdef USE_SIOUX
1132- printf ("aevt_odoc: AEGetParamPtr error: %d\n", error);
1137+ printf("aevt_odoc: AEGetParamPtr error: %d\n", error);
11331138 #endif
11341139 return(error);
11351140 }
11361141
11371142 #ifdef USE_SIOUX
1138- printf ("aevt_odoc: lineNum: %d, startRange %d, endRange %d, [date %lx]\n",
1143+ printf("aevt_odoc: lineNum: %d, startRange %d, endRange %d, [date %lx]\n",
11391144 thePosition.lineNum, thePosition.startRange, thePosition.endRange,
11401145 thePosition.theDate);
11411146 #endif
@@ -1216,11 +1221,11 @@
12161221 finished:
12171222 AEDisposeDesc(&theList); /* dispose what we allocated */
12181223
1219- error = HandleUnusedParms (theAEvent);
1224+ error = HandleUnusedParms(theAEvent);
12201225 if (error)
12211226 {
12221227 #ifdef USE_SIOUX
1223- printf ("aevt_odoc: HandleUnusedParms error: %d\n", error);
1228+ printf("aevt_odoc: HandleUnusedParms error: %d\n", error);
12241229 #endif
12251230 return(error);
12261231 }
@@ -1231,15 +1236,16 @@
12311236 *
12321237 */
12331238
1234-pascal OSErr Handle_aevt_oapp_AE (const AppleEvent *theAEvent, AppleEvent *theReply, long refCon)
1239+ pascal OSErr
1240+Handle_aevt_oapp_AE(const AppleEvent *theAEvent, AppleEvent *theReply, long refCon)
12351241 {
12361242 OSErr error = noErr;
12371243
12381244 #ifdef USE_SIOUX
1239- printf ("aevt_oapp:\n");
1240-#endif
1241-
1242- error = HandleUnusedParms (theAEvent);
1245+ printf("aevt_oapp:\n");
1246+#endif
1247+
1248+ error = HandleUnusedParms(theAEvent);
12431249 if (error)
12441250 {
12451251 return(error);
@@ -1252,15 +1258,16 @@
12521258 *
12531259 */
12541260
1255-pascal OSErr Handle_aevt_quit_AE (const AppleEvent *theAEvent, AppleEvent *theReply, long refCon)
1261+ pascal OSErr
1262+Handle_aevt_quit_AE(const AppleEvent *theAEvent, AppleEvent *theReply, long refCon)
12561263 {
12571264 OSErr error = noErr;
12581265
12591266 #ifdef USE_SIOUX
1260- printf ("aevt_quit\n");
1261-#endif
1262-
1263- error = HandleUnusedParms (theAEvent);
1267+ printf("aevt_quit\n");
1268+#endif
1269+
1270+ error = HandleUnusedParms(theAEvent);
12641271 if (error)
12651272 {
12661273 return(error);
@@ -1276,15 +1283,16 @@
12761283 *
12771284 */
12781285
1279-pascal OSErr Handle_aevt_pdoc_AE (const AppleEvent *theAEvent, AppleEvent *theReply, long refCon)
1286+ pascal OSErr
1287+Handle_aevt_pdoc_AE(const AppleEvent *theAEvent, AppleEvent *theReply, long refCon)
12801288 {
12811289 OSErr error = noErr;
12821290
12831291 #ifdef USE_SIOUX
1284- printf ("aevt_pdoc:\n");
1285-#endif
1286-
1287- error = HandleUnusedParms (theAEvent);
1292+ printf("aevt_pdoc:\n");
1293+#endif
1294+
1295+ error = HandleUnusedParms(theAEvent);
12881296 if (error)
12891297 {
12901298 return(error);
@@ -1298,15 +1306,16 @@
12981306 *
12991307 * (Just get rid of all the parms)
13001308 */
1301-pascal OSErr Handle_unknown_AE (const AppleEvent *theAEvent, AppleEvent *theReply, long refCon)
1309+ pascal OSErr
1310+Handle_unknown_AE(const AppleEvent *theAEvent, AppleEvent *theReply, long refCon)
13021311 {
13031312 OSErr error = noErr;
13041313
13051314 #ifdef USE_SIOUX
1306- printf ("Unknown Event: %x\n", theAEvent->descriptorType);
1307-#endif
1308-
1309- error = HandleUnusedParms (theAEvent);
1315+ printf("Unknown Event: %x\n", theAEvent->descriptorType);
1316+#endif
1317+
1318+ error = HandleUnusedParms(theAEvent);
13101319 if (error)
13111320 {
13121321 return(error);
@@ -1324,7 +1333,8 @@
13241333 /*
13251334 * Install the various AppleEvent Handlers
13261335 */
1327-OSErr InstallAEHandlers (void)
1336+ OSErr
1337+InstallAEHandlers(void)
13281338 {
13291339 OSErr error;
13301340
@@ -1438,7 +1448,7 @@
14381448 * Returns the index inside the menu wher
14391449 */
14401450 short /* Shoulde we return MenuItemIndex? */
1441-gui_mac_get_menu_item_index (pMenu)
1451+gui_mac_get_menu_item_index(pMenu)
14421452 vimmenu_T *pMenu;
14431453 {
14441454 short index;
@@ -1475,7 +1485,7 @@
14751485 }
14761486
14771487 static vimmenu_T *
1478-gui_mac_get_vim_menu (menuID, itemIndex, pMenu)
1488+gui_mac_get_vim_menu(menuID, itemIndex, pMenu)
14791489 short menuID;
14801490 short itemIndex;
14811491 vimmenu_T *pMenu;
@@ -1529,7 +1539,7 @@
15291539 */
15301540 pascal
15311541 void
1532-gui_mac_drag_thumb (ControlHandle theControl, short partCode)
1542+gui_mac_drag_thumb(ControlHandle theControl, short partCode)
15331543 {
15341544 scrollbar_T *sb;
15351545 int value, dragging;
@@ -1538,13 +1548,13 @@
15381548
15391549 theControlToUse = dragged_sb;
15401550
1541- sb = gui_find_scrollbar((long) GetControlReference (theControlToUse));
1551+ sb = gui_find_scrollbar((long) GetControlReference(theControlToUse));
15421552
15431553 if (sb == NULL)
15441554 return;
15451555
15461556 /* Need to find value by diff between Old Poss New Pos */
1547- value = GetControl32BitValue (theControlToUse);
1557+ value = GetControl32BitValue(theControlToUse);
15481558 dragging = (partCode != 0);
15491559
15501560 /* When "allow_scrollbar" is FALSE still need to remember the new
@@ -1556,7 +1566,7 @@
15561566
15571567 pascal
15581568 void
1559-gui_mac_scroll_action (ControlHandle theControl, short partCode)
1569+gui_mac_scroll_action(ControlHandle theControl, short partCode)
15601570 {
15611571 /* TODO: have live support */
15621572 scrollbar_T *sb, *sb_info;
@@ -1566,7 +1576,7 @@
15661576 int dragging = FALSE;
15671577 int dont_scroll_save = dont_scroll;
15681578
1569- sb = gui_find_scrollbar((long) GetControlReference (theControl));
1579+ sb = gui_find_scrollbar((long)GetControlReference(theControl));
15701580
15711581 if (sb == NULL)
15721582 return;
@@ -1648,7 +1658,7 @@
16481658 * TODO: Add support for potential TOOLBAR
16491659 */
16501660 void
1651-gui_mac_doInContentClick (theEvent, whichWindow)
1661+gui_mac_doInContentClick(theEvent, whichWindow)
16521662 EventRecord *theEvent;
16531663 WindowPtr whichWindow;
16541664 {
@@ -1660,10 +1670,10 @@
16601670 short dblClick;
16611671
16621672 thePoint = theEvent->where;
1663- GlobalToLocal (&thePoint);
1664- SelectWindow (whichWindow);
1665-
1666- thePortion = FindControl (thePoint, whichWindow, &theControl);
1673+ GlobalToLocal(&thePoint);
1674+ SelectWindow(whichWindow);
1675+
1676+ thePortion = FindControl(thePoint, whichWindow, &theControl);
16671677
16681678 if (theControl != NUL)
16691679 {
@@ -1685,7 +1695,7 @@
16851695 #endif
16861696 /* pass 0 as the part to tell gui_mac_drag_thumb, that the mouse
16871697 * button has been released */
1688- gui_mac_drag_thumb (theControl, 0); /* Should it be thePortion ? (Dany) */
1698+ gui_mac_drag_thumb(theControl, 0); /* Should it be thePortion ? (Dany) */
16891699 dragged_sb = NULL;
16901700 }
16911701 }
@@ -1731,7 +1741,7 @@
17311741 #endif
17321742 #endif
17331743 {
1734- SetRect (&dragRect, FILL_X(X_2_COL(thePoint.h)),
1744+ SetRect(&dragRect, FILL_X(X_2_COL(thePoint.h)),
17351745 FILL_Y(Y_2_ROW(thePoint.v)),
17361746 FILL_X(X_2_COL(thePoint.h)+1),
17371747 FILL_Y(Y_2_ROW(thePoint.v)+1));
@@ -1746,7 +1756,7 @@
17461756 * Handle the click in the titlebar (to move the window)
17471757 */
17481758 void
1749-gui_mac_doInDragClick (where, whichWindow)
1759+gui_mac_doInDragClick(where, whichWindow)
17501760 Point where;
17511761 WindowPtr whichWindow;
17521762 {
@@ -1755,11 +1765,11 @@
17551765
17561766 /* TODO: may try to prevent move outside screen? */
17571767 #ifdef USE_CARBONIZED
1758- movingLimitsPtr = GetRegionBounds ( GetGrayRgn(), &movingLimits );
1768+ movingLimitsPtr = GetRegionBounds(GetGrayRgn(), &movingLimits);
17591769 #else
17601770 movingLimitsPtr = &(*GetGrayRgn())->rgnBBox;
17611771 #endif
1762- DragWindow (whichWindow, where, movingLimitsPtr);
1772+ DragWindow(whichWindow, where, movingLimitsPtr);
17631773 }
17641774
17651775 /*
@@ -1779,7 +1789,7 @@
17791789 #ifdef USE_CARBONIZED
17801790 Rect NewContentRect;
17811791
1782- resizeLimitsPtr = GetRegionBounds ( GetGrayRgn(), &resizeLimits );
1792+ resizeLimitsPtr = GetRegionBounds(GetGrayRgn(), &resizeLimits);
17831793 #else
17841794 resizeLimits = qd.screenBits.bounds;
17851795 #endif
@@ -1919,17 +1929,17 @@
19191929 whichWindow = (WindowPtr) event->message;
19201930
19211931 /* Save Current Port */
1922- GetPort (&savePort);
1932+ GetPort(&savePort);
19231933
19241934 /* Select the Window's Port */
19251935 #ifdef USE_CARBONIZED
1926- SetPortWindowPort (whichWindow);
1936+ SetPortWindowPort(whichWindow);
19271937 #else
1928- SetPort (whichWindow);
1938+ SetPort(whichWindow);
19291939 #endif
19301940
19311941 /* Let's update the window */
1932- BeginUpdate (whichWindow);
1942+ BeginUpdate(whichWindow);
19331943 /* Redraw the biggest rectangle covering the area
19341944 * to be updated.
19351945 */
@@ -1945,9 +1955,9 @@
19451955 updateRgn = whichWindow->visRgn;
19461956 #endif
19471957 /* Use the HLock useless in Carbon? Is it harmful?*/
1948- HLock ((Handle) updateRgn);
1958+ HLock((Handle) updateRgn);
19491959 #ifdef USE_CARBONIZED
1950- updateRectPtr = GetRegionBounds ( updateRgn, &updateRect );
1960+ updateRectPtr = GetRegionBounds(updateRgn, &updateRect);
19511961 # if 0
19521962 /* Code from original Carbon Port (using GetWindowRegion.
19531963 * I believe the UpdateRgn is already in local (Dany)
@@ -1966,33 +1976,33 @@
19661976 gui_mch_set_bg_color(gui.back_pixel);
19671977 if (updateRectPtr->left < FILL_X(0))
19681978 {
1969- SetRect (&rc, 0, 0, FILL_X(0), FILL_Y(Rows));
1970- EraseRect (&rc);
1979+ SetRect(&rc, 0, 0, FILL_X(0), FILL_Y(Rows));
1980+ EraseRect(&rc);
19711981 }
19721982 if (updateRectPtr->top < FILL_Y(0))
19731983 {
1974- SetRect (&rc, 0, 0, FILL_X(Columns), FILL_Y(0));
1975- EraseRect (&rc);
1984+ SetRect(&rc, 0, 0, FILL_X(Columns), FILL_Y(0));
1985+ EraseRect(&rc);
19761986 }
19771987 if (updateRectPtr->right > FILL_X(Columns))
19781988 {
1979- SetRect (&rc, FILL_X(Columns), 0,
1989+ SetRect(&rc, FILL_X(Columns), 0,
19801990 FILL_X(Columns) + gui.border_offset, FILL_Y(Rows));
1981- EraseRect (&rc);
1991+ EraseRect(&rc);
19821992 }
19831993 if (updateRectPtr->bottom > FILL_Y(Rows))
19841994 {
1985- SetRect (&rc, 0, FILL_Y(Rows), FILL_X(Columns) + gui.border_offset,
1995+ SetRect(&rc, 0, FILL_Y(Rows), FILL_X(Columns) + gui.border_offset,
19861996 FILL_Y(Rows) + gui.border_offset);
1987- EraseRect (&rc);
1997+ EraseRect(&rc);
19881998 }
1989- HUnlock ((Handle) updateRgn);
1999+ HUnlock((Handle) updateRgn);
19902000 #ifdef USE_CARBONIZED
1991- DisposeRgn (updateRgn);
2001+ DisposeRgn(updateRgn);
19922002 #endif
19932003
19942004 /* Update scrollbars */
1995- DrawControls (whichWindow);
2005+ DrawControls(whichWindow);
19962006
19972007 /* Update the GrowBox */
19982008 /* Taken from FAQ 33-27 */
@@ -2004,15 +2014,15 @@
20042014 growRect.top = growRect.bottom - 15;
20052015 growRect.left = growRect.right - 15;
20062016 #endif
2007- GetClip (saveRgn);
2008- ClipRect (&growRect);
2009- DrawGrowIcon (whichWindow);
2010- SetClip (saveRgn);
2011- DisposeRgn (saveRgn);
2012- EndUpdate (whichWindow);
2017+ GetClip(saveRgn);
2018+ ClipRect(&growRect);
2019+ DrawGrowIcon(whichWindow);
2020+ SetClip(saveRgn);
2021+ DisposeRgn(saveRgn);
2022+ EndUpdate(whichWindow);
20132023
20142024 /* Restore original Port */
2015- SetPort (savePort);
2025+ SetPort(savePort);
20162026 }
20172027
20182028 /*
@@ -2040,8 +2050,8 @@
20402050
20412051 #if 0 /* Removed by Dany as per above June 2001 */
20422052 a_bool = false;
2043- SetPreserveGlyph (a_bool);
2044- SetOutlinePreferred (a_bool);
2053+ SetPreserveGlyph(a_bool);
2054+ SetOutlinePreferred(a_bool);
20452055 #endif
20462056 }
20472057 }
@@ -2099,8 +2109,20 @@
20992109
21002110 /* Intercept CTRL-C */
21012111 if (theEvent->modifiers & controlKey)
2112+ {
21022113 if (key_char == Ctrl_C && ctrl_c_interrupts)
21032114 got_int = TRUE;
2115+ else if ((theEvent->modifiers & ~(controlKey|shiftKey)) == 0
2116+ && (key_char == '2' || key_char == '6'))
2117+ {
2118+ /* CTRL-^ and CTRL-@ don't work in the normal way. */
2119+ if (key_char == '2')
2120+ key_char = Ctrl_AT;
2121+ else
2122+ key_char = Ctrl_HAT;
2123+ theEvent->modifiers = 0;
2124+ }
2125+ }
21042126
21052127 /* Intercept CMD-. */
21062128 if (theEvent->modifiers & cmdKey)
@@ -2143,8 +2165,8 @@
21432165 key_char = special_keys[i].vim_code0;
21442166 else
21452167 # endif
2146- key_char = TO_SPECIAL( special_keys[i].vim_code0,
2147- special_keys[i].vim_code1 );
2168+ key_char = TO_SPECIAL(special_keys[i].vim_code0,
2169+ special_keys[i].vim_code1);
21482170 key_char = simplify_key(key_char,&modifiers);
21492171 break;
21502172 }
@@ -2162,36 +2184,38 @@
21622184 {
21632185 #if 1
21642186 /* Clear modifiers when only one modifier is set */
2165- if( (modifiers == MOD_MASK_SHIFT) ||
2166- (modifiers == MOD_MASK_CTRL) ||
2167- (modifiers == MOD_MASK_ALT))
2187+ if ((modifiers == MOD_MASK_SHIFT)
2188+ || (modifiers == MOD_MASK_CTRL)
2189+ || (modifiers == MOD_MASK_ALT))
21682190 modifiers = 0;
21692191 #else
2170- if( modifiers & MOD_MASK_CTRL)
2192+ if (modifiers & MOD_MASK_CTRL)
21712193 modifiers = modifiers & ~MOD_MASK_CTRL;
2172- if( modifiers & MOD_MASK_ALT)
2194+ if (modifiers & MOD_MASK_ALT)
21732195 modifiers = modifiers & ~MOD_MASK_ALT;
2174- if( modifiers & MOD_MASK_SHIFT)
2196+ if (modifiers & MOD_MASK_SHIFT)
21752197 modifiers = modifiers & ~MOD_MASK_SHIFT;
21762198 #endif
21772199 }
2178- if( modifiers )
2200+ if (modifiers)
21792201 {
2180- string[ len++ ] = CSI;
2181- string[ len++ ] = KS_MODIFIER;
2182- string[ len++ ] = modifiers;
2202+ string[len++] = CSI;
2203+ string[len++] = KS_MODIFIER;
2204+ string[len++] = modifiers;
21832205 }
21842206
2185- if( IS_SPECIAL( key_char ) )
2207+ if (IS_SPECIAL(key_char))
21862208 {
2187- string[ len++ ] = CSI;
2188- string[ len++ ] = K_SECOND( key_char );
2189- string[ len++ ] = K_THIRD( key_char );
2209+ string[len++] = CSI;
2210+ string[len++] = K_SECOND(key_char);
2211+ string[len++] = K_THIRD(key_char);
21902212 }
21912213 else
21922214 {
21932215 #ifdef FEAT_MBYTE
2194- if (input_conv.vc_type != CONV_NONE)
2216+ /* Convert characters when needed (e.g., from MacRoman to latin1).
2217+ * This doesn't work for the NUL byte. */
2218+ if (input_conv.vc_type != CONV_NONE && key_char > 0)
21952219 {
21962220 char_u from[2], *to;
21972221 int l;
@@ -2236,13 +2260,13 @@
22362260 * Handle MouseClick
22372261 */
22382262 void
2239-gui_mac_doMouseDownEvent (theEvent)
2263+gui_mac_doMouseDownEvent(theEvent)
22402264 EventRecord *theEvent;
22412265 {
22422266 short thePart;
22432267 WindowPtr whichWindow;
22442268
2245- thePart = FindWindow (theEvent->where, &whichWindow);
2269+ thePart = FindWindow(theEvent->where, &whichWindow);
22462270
22472271 switch (thePart)
22482272 {
@@ -2251,19 +2275,19 @@
22512275 break;
22522276
22532277 case (inMenuBar):
2254- gui_mac_handle_menu(MenuSelect (theEvent->where));
2278+ gui_mac_handle_menu(MenuSelect(theEvent->where));
22552279 break;
22562280
22572281 case (inContent):
2258- gui_mac_doInContentClick (theEvent, whichWindow);
2282+ gui_mac_doInContentClick(theEvent, whichWindow);
22592283 break;
22602284
22612285 case (inDrag):
2262- gui_mac_doInDragClick (theEvent->where, whichWindow);
2286+ gui_mac_doInDragClick(theEvent->where, whichWindow);
22632287 break;
22642288
22652289 case (inGrow):
2266- gui_mac_doInGrowClick (theEvent->where, whichWindow);
2290+ gui_mac_doInGrowClick(theEvent->where, whichWindow);
22672291 break;
22682292
22692293 case (inGoAway):
@@ -2285,18 +2309,18 @@
22852309 * [this event is a moving in and out of a region]
22862310 */
22872311 void
2288-gui_mac_doMouseMovedEvent (event)
2312+gui_mac_doMouseMovedEvent(event)
22892313 EventRecord *event;
22902314 {
22912315 Point thePoint;
22922316 int_u vimModifiers;
22932317
22942318 thePoint = event->where;
2295- GlobalToLocal (&thePoint);
2319+ GlobalToLocal(&thePoint);
22962320 vimModifiers = EventModifiers2VimMouseModifiers(event->modifiers);
22972321
22982322 if (!Button())
2299- gui_mouse_moved (thePoint.h, thePoint.v);
2323+ gui_mouse_moved(thePoint.h, thePoint.v);
23002324 else
23012325 #ifdef USE_CTRLCLICKMENU
23022326 if (!clickIsPopup)
@@ -2305,7 +2329,7 @@
23052329 thePoint.v, FALSE, vimModifiers);
23062330
23072331 /* Reset the region from which we move in and out */
2308- SetRect (&dragRect, FILL_X(X_2_COL(thePoint.h)),
2332+ SetRect(&dragRect, FILL_X(X_2_COL(thePoint.h)),
23092333 FILL_Y(Y_2_ROW(thePoint.v)),
23102334 FILL_X(X_2_COL(thePoint.h)+1),
23112335 FILL_Y(Y_2_ROW(thePoint.v)+1));
@@ -2319,7 +2343,7 @@
23192343 * Handle the mouse release
23202344 */
23212345 void
2322-gui_mac_doMouseUpEvent (theEvent)
2346+gui_mac_doMouseUpEvent(theEvent)
23232347 EventRecord *theEvent;
23242348 {
23252349 Point thePoint;
@@ -2331,7 +2355,7 @@
23312355 dragRectEnbl = FALSE;
23322356 dragRectControl = kCreateEmpty;
23332357 thePoint = theEvent->where;
2334- GlobalToLocal (&thePoint);
2358+ GlobalToLocal(&thePoint);
23352359
23362360 vimModifiers = EventModifiers2VimMouseModifiers(theEvent->modifiers);
23372361 #ifdef USE_CTRLCLICKMENU
@@ -2341,8 +2365,7 @@
23412365 clickIsPopup = FALSE;
23422366 }
23432367 #endif
2344- gui_send_mouse_event
2345- (MOUSE_RELEASE, thePoint.h, thePoint.v, FALSE, vimModifiers);
2368+ gui_send_mouse_event(MOUSE_RELEASE, thePoint.h, thePoint.v, FALSE, vimModifiers);
23462369 }
23472370
23482371 #ifdef USE_MOUSEWHEEL
@@ -2431,7 +2454,7 @@
24312454 /* Handle the menu CntxMenuID, CntxMenuItem */
24322455 /* The submenu can be handle directly by gui_mac_handle_menu */
24332456 /* But what about the current menu, is the meny changed by ContextualMenuSelect */
2434- gui_mac_handle_menu ((CntxMenuID << 16) + CntxMenuItem);
2457+ gui_mac_handle_menu((CntxMenuID << 16) + CntxMenuItem);
24352458 }
24362459 else if (CntxMenuID == kCMShowHelpSelected)
24372460 {
@@ -2464,9 +2487,9 @@
24642487 {
24652488 #ifndef USE_CARBONIZED
24662489 /* Desk Accessory doesn't exist in Carbon */
2467- appleMenu = GetMenuHandle (menu);
2468- GetMenuItemText (appleMenu, item, itemName);
2469- (void) OpenDeskAcc (itemName);
2490+ appleMenu = GetMenuHandle(menu);
2491+ GetMenuItemText(appleMenu, item, itemName);
2492+ (void) OpenDeskAcc(itemName);
24702493 #endif
24712494 }
24722495 }
@@ -2477,7 +2500,7 @@
24772500 if (theVimMenu)
24782501 gui_menu_cb(theVimMenu);
24792502 }
2480- HiliteMenu (0);
2503+ HiliteMenu(0);
24812504 }
24822505
24832506 /*
@@ -2485,7 +2508,7 @@
24852508 */
24862509
24872510 void
2488-gui_mac_handle_event (event)
2511+gui_mac_handle_event(event)
24892512 EventRecord *event;
24902513 {
24912514 OSErr error;
@@ -2509,7 +2532,7 @@
25092532 {
25102533 case (keyDown):
25112534 case (autoKey):
2512- gui_mac_doKeyEvent (event);
2535+ gui_mac_doKeyEvent(event);
25132536 break;
25142537
25152538 case (keyUp):
@@ -2525,7 +2548,7 @@
25252548 break;
25262549
25272550 case (updateEvt):
2528- gui_mac_doUpdateEvent (event);
2551+ gui_mac_doUpdateEvent(event);
25292552 break;
25302553
25312554 case (diskEvt):
@@ -2533,17 +2556,17 @@
25332556 break;
25342557
25352558 case (activateEvt):
2536- gui_mac_doActivateEvent (event);
2559+ gui_mac_doActivateEvent(event);
25372560 break;
25382561
25392562 case (osEvt):
25402563 switch ((event->message >> 24) & 0xFF)
25412564 {
25422565 case (0xFA): /* mouseMovedMessage */
2543- gui_mac_doMouseMovedEvent (event);
2566+ gui_mac_doMouseMovedEvent(event);
25442567 break;
25452568 case (0x01): /* suspendResumeMessage */
2546- gui_mac_doSuspendEvent (event);
2569+ gui_mac_doSuspendEvent(event);
25472570 break;
25482571 }
25492572 break;
@@ -2565,7 +2588,7 @@
25652588
25662589
25672590 GuiFont
2568-gui_mac_find_font (font_name)
2591+gui_mac_find_font(font_name)
25692592 char_u *font_name;
25702593 {
25712594 char_u c;
@@ -2590,12 +2613,12 @@
25902613 pFontName[0] = STRLEN(font_name);
25912614 *p = c;
25922615
2593- GetFNum (pFontName, &font_id);
2616+ GetFNum(pFontName, &font_id);
25942617 #else
25952618 /* name = C2Pascal_save(menu->dname); */
25962619 fontNamePtr = C2Pascal_save_and_remove_backslash(font_name);
25972620
2598- GetFNum (fontNamePtr, &font_id);
2621+ GetFNum(fontNamePtr, &font_id);
25992622 #endif
26002623
26012624
@@ -2603,7 +2626,7 @@
26032626 {
26042627 /* Oups, the system font was it the one the user want */
26052628
2606- GetFontName (0, systemFontname);
2629+ GetFontName(0, systemFontname);
26072630 if (!EqualString(pFontName, systemFontname, false, false))
26082631 return NOFONT;
26092632 }
@@ -2709,36 +2732,36 @@
27092732 SIOUXSettings.showstatusline = true;
27102733 SIOUXSettings.toppixel = 300;
27112734 SIOUXSettings.leftpixel = 10;
2712- InstallConsole (1); /* fileno(stdout) = 1, on page 430 of MSL C */
2713- printf ("Debugging console enabled\n");
2714- /* SIOUXSetTitle ((char_u *) "Vim Stdout"); */
2715-#endif
2716-
2717- pomme = NewMenu (256, "\p\024"); /* 0x14= = Apple Menu */
2718-
2719- AppendMenu (pomme, "\pAbout VIM");
2735+ InstallConsole(1); /* fileno(stdout) = 1, on page 430 of MSL C */
2736+ printf("Debugging console enabled\n");
2737+ /* SIOUXSetTitle((char_u *) "Vim Stdout"); */
2738+#endif
2739+
2740+ pomme = NewMenu(256, "\p\024"); /* 0x14= = Apple Menu */
2741+
2742+ AppendMenu(pomme, "\pAbout VIM");
27202743 #ifndef USE_CARBONIZED
2721- AppendMenu (pomme, "\p-");
2722- AppendResMenu (pomme, 'DRVR');
2723-#endif
2724-
2725- InsertMenu (pomme, 0);
2744+ AppendMenu(pomme, "\p-");
2745+ AppendResMenu(pomme, 'DRVR');
2746+#endif
2747+
2748+ InsertMenu(pomme, 0);
27262749
27272750 DrawMenuBar();
27282751
27292752
27302753 #ifndef USE_OFFSETED_WINDOW
2731- SetRect (&windRect, 10, 48, 10+80*7 + 16, 48+24*11);
2754+ SetRect(&windRect, 10, 48, 10+80*7 + 16, 48+24*11);
27322755 #else
2733- SetRect (&windRect, 300, 40, 300+80*7 + 16, 40+24*11);
2756+ SetRect(&windRect, 300, 40, 300+80*7 + 16, 40+24*11);
27342757 #endif
27352758
27362759
27372760 #ifdef USE_CARBONIZED
27382761 CreateNewWindow(kDocumentWindowClass,
27392762 kWindowResizableAttribute | kWindowCollapseBoxAttribute,
2740- &windRect, &gui.VimWindow );
2741- SetPortWindowPort ( gui.VimWindow );
2763+ &windRect, &gui.VimWindow);
2764+ SetPortWindowPort(gui.VimWindow);
27422765 #else
27432766 gui.VimWindow = NewCWindow(nil, &windRect, "\pgVim on Macintosh", true, documentProc,
27442767 (WindowPtr) -1L, false, 0);
@@ -2753,11 +2776,11 @@
27532776 gui.in_focus = TRUE; /* For the moment -> syn. of front application */
27542777
27552778 #if TARGET_API_MAC_CARBON
2756- gScrollAction = NewControlActionUPP (gui_mac_scroll_action);
2757- gScrollDrag = NewControlActionUPP (gui_mac_drag_thumb);
2779+ gScrollAction = NewControlActionUPP(gui_mac_scroll_action);
2780+ gScrollDrag = NewControlActionUPP(gui_mac_drag_thumb);
27582781 #else
2759- gScrollAction = NewControlActionProc (gui_mac_scroll_action);
2760- gScrollDrag = NewControlActionProc (gui_mac_drag_thumb);
2782+ gScrollAction = NewControlActionProc(gui_mac_scroll_action);
2783+ gScrollDrag = NewControlActionProc(gui_mac_drag_thumb);
27612784 #endif
27622785
27632786 /* Getting a handle to the Help menu */
@@ -2769,7 +2792,7 @@
27692792 # endif
27702793
27712794 if (gui.MacOSHelpMenu != nil)
2772- gui.MacOSHelpItems = CountMenuItems (gui.MacOSHelpMenu);
2795+ gui.MacOSHelpItems = CountMenuItems(gui.MacOSHelpMenu);
27732796 else
27742797 gui.MacOSHelpItems = 0;
27752798 #endif
@@ -2781,25 +2804,25 @@
27812804 #endif
27822805 #ifdef USE_EXE_NAME
27832806 # ifndef USE_FIND_BUNDLE_PATH
2784- HGetVol (volName, &applVRefNum, &applDirID);
2807+ HGetVol(volName, &applVRefNum, &applDirID);
27852808 /* TN2015: mention a possible bad VRefNum */
2786- FSMakeFSSpec (applVRefNum, applDirID, "\p", &applDir);
2809+ FSMakeFSSpec(applVRefNum, applDirID, "\p", &applDir);
27872810 # else
27882811 /* OSErr GetApplicationBundleFSSpec(FSSpecPtr theFSSpecPtr)
27892812 * of TN2015
27902813 * This technic remove the ../Contents/MacOS/etc part
27912814 */
2792- (void) GetCurrentProcess(&psn);
2815+ (void)GetCurrentProcess(&psn);
27932816 /* if (err != noErr) return err; */
27942817
2795- (void) GetProcessBundleLocation(&psn, &applFSRef);
2818+ (void)GetProcessBundleLocation(&psn, &applFSRef);
27962819 /* if (err != noErr) return err; */
27972820
2798- (void) FSGetCatalogInfo(&applFSRef, kFSCatInfoNone, NULL, NULL, &applDir, NULL);
2821+ (void)FSGetCatalogInfo(&applFSRef, kFSCatInfoNone, NULL, NULL, &applDir, NULL);
27992822
28002823 /* This technic return NIL when we disallow_gui */
28012824 # endif
2802- exe_name = FullPathFromFSSpec_save (applDir);
2825+ exe_name = FullPathFromFSSpec_save(applDir);
28032826 #endif
28042827
28052828 #ifdef USE_VIM_CREATOR_ID
@@ -2925,28 +2948,28 @@
29252948 SIOUXSettings.showstatusline = true;
29262949 SIOUXSettings.toppixel = 300;
29272950 SIOUXSettings.leftpixel = 10;
2928- InstallConsole (1); /* fileno(stdout) = 1, on page 430 of MSL C */
2929- printf ("Debugging console enabled\n");
2930- /* SIOUXSetTitle ((char_u *) "Vim Stdout"); */
2931-#endif
2932-
2933- pomme = NewMenu (256, "\p\024"); /* 0x14= = Apple Menu */
2934-
2935- AppendMenu (pomme, "\pAbout VIM");
2951+ InstallConsole(1); /* fileno(stdout) = 1, on page 430 of MSL C */
2952+ printf("Debugging console enabled\n");
2953+ /* SIOUXSetTitle((char_u *) "Vim Stdout"); */
2954+#endif
2955+
2956+ pomme = NewMenu(256, "\p\024"); /* 0x14= = Apple Menu */
2957+
2958+ AppendMenu(pomme, "\pAbout VIM");
29362959 #ifndef USE_CARBONIZED
2937- AppendMenu (pomme, "\p-");
2938- AppendResMenu (pomme, 'DRVR');
2939-#endif
2940-
2941- InsertMenu (pomme, 0);
2960+ AppendMenu(pomme, "\p-");
2961+ AppendResMenu(pomme, 'DRVR');
2962+#endif
2963+
2964+ InsertMenu(pomme, 0);
29422965
29432966 DrawMenuBar();
29442967
29452968
29462969 #ifndef USE_OFFSETED_WINDOW
2947- SetRect (&windRect, 10, 48, 10+80*7 + 16, 48+24*11);
2970+ SetRect(&windRect, 10, 48, 10+80*7 + 16, 48+24*11);
29482971 #else
2949- SetRect (&windRect, 300, 40, 300+80*7 + 16, 40+24*11);
2972+ SetRect(&windRect, 300, 40, 300+80*7 + 16, 40+24*11);
29502973 #endif
29512974
29522975 gui.VimWindow = NewCWindow(nil, &windRect, "\pgVim on Macintosh", true,
@@ -2959,7 +2982,7 @@
29592982 InstallReceiveHandler((DragReceiveHandlerUPP)receiveHandler,
29602983 gui.VimWindow, NULL);
29612984 #ifdef USE_CARBONIZED
2962- SetPortWindowPort ( gui.VimWindow );
2985+ SetPortWindowPort(gui.VimWindow);
29632986 #else
29642987 SetPort(gui.VimWindow);
29652988 #endif
@@ -2972,11 +2995,11 @@
29722995 gui.in_focus = TRUE; /* For the moment -> syn. of front application */
29732996
29742997 #if TARGET_API_MAC_CARBON
2975- gScrollAction = NewControlActionUPP (gui_mac_scroll_action);
2976- gScrollDrag = NewControlActionUPP (gui_mac_drag_thumb);
2998+ gScrollAction = NewControlActionUPP(gui_mac_scroll_action);
2999+ gScrollDrag = NewControlActionUPP(gui_mac_drag_thumb);
29773000 #else
2978- gScrollAction = NewControlActionProc (gui_mac_scroll_action);
2979- gScrollDrag = NewControlActionProc (gui_mac_drag_thumb);
3001+ gScrollAction = NewControlActionProc(gui_mac_scroll_action);
3002+ gScrollDrag = NewControlActionProc(gui_mac_drag_thumb);
29803003 #endif
29813004
29823005 /* Getting a handle to the Help menu */
@@ -2988,7 +3011,7 @@
29883011 # endif
29893012
29903013 if (gui.MacOSHelpMenu != nil)
2991- gui.MacOSHelpItems = CountMenuItems (gui.MacOSHelpMenu);
3014+ gui.MacOSHelpItems = CountMenuItems(gui.MacOSHelpMenu);
29923015 else
29933016 gui.MacOSHelpItems = 0;
29943017 #endif
@@ -3123,7 +3146,7 @@
31233146 OSStatus status;
31243147
31253148 /* Carbon >= 1.0.2, MacOS >= 8.5 */
3126- status = GetWindowBounds (gui.VimWindow, kWindowStructureRgn, &bounds);
3149+ status = GetWindowBounds(gui.VimWindow, kWindowStructureRgn, &bounds);
31273150
31283151 if (status != noErr)
31293152 return FAIL;
@@ -3164,10 +3187,10 @@
31643187 if (gui.which_scrollbars[SBAR_LEFT])
31653188 {
31663189 #ifdef USE_CARBONIZED
3167- VimPort = GetWindowPort ( gui.VimWindow );
3168- GetPortBounds (VimPort, &VimBound);
3190+ VimPort = GetWindowPort(gui.VimWindow);
3191+ GetPortBounds(VimPort, &VimBound);
31693192 VimBound.left = -gui.scrollbar_width; /* + 1;*/
3170- SetPortBounds (VimPort, &VimBound);
3193+ SetPortBounds(VimPort, &VimBound);
31713194 /* GetWindowBounds(gui.VimWindow, kWindowGlobalPortRgn, &winPortRect); ??*/
31723195 #else
31733196 gui.VimWindow->portRect.left = -gui.scrollbar_width; /* + 1;*/
@@ -3177,10 +3200,10 @@
31773200 else
31783201 {
31793202 #ifdef USE_CARBONIZED
3180- VimPort = GetWindowPort ( gui.VimWindow );
3181- GetPortBounds (VimPort, &VimBound);
3203+ VimPort = GetWindowPort(gui.VimWindow);
3204+ GetPortBounds(VimPort, &VimBound);
31823205 VimBound.left = 0;
3183- SetPortBounds (VimPort, &VimBound);
3206+ SetPortBounds(VimPort, &VimBound);
31843207 #else
31853208 gui.VimWindow->portRect.left = 0;
31863209 #endif;
@@ -3241,20 +3264,20 @@
32413264 }
32423265 else
32433266 {
3244- font = gui_mac_find_font (font_name);
3267+ font = gui_mac_find_font(font_name);
32453268
32463269 if (font == NOFONT)
32473270 return FAIL;
32483271 }
32493272 gui.norm_font = font;
32503273
3251- TextSize (font >> 16);
3252- TextFont (font & 0xFFFF);
3253-
3254- GetFontInfo (&font_info);
3274+ TextSize(font >> 16);
3275+ TextFont(font & 0xFFFF);
3276+
3277+ GetFontInfo(&font_info);
32553278
32563279 gui.char_ascent = font_info.ascent;
3257- gui.char_width = CharWidth ('_');
3280+ gui.char_width = CharWidth('_');
32583281 gui.char_height = font_info.ascent + font_info.descent + p_linespace;
32593282
32603283 return OK;
@@ -3266,7 +3289,7 @@
32663289 {
32673290 FontInfo font_info;
32683291
3269- GetFontInfo (&font_info);
3292+ GetFontInfo(&font_info);
32703293 gui.char_height = font_info.ascent + font_info.descent + p_linespace;
32713294 gui.char_ascent = font_info.ascent + p_linespace / 2;
32723295 return OK;
@@ -3425,10 +3448,10 @@
34253448 }
34263449 else
34273450 {
3428- if (STRICMP (name, "hilite") == 0)
3451+ if (STRICMP(name, "hilite") == 0)
34293452 {
3430- LMGetHiliteRGB (&MacColor);
3431- return (RGB (MacColor.red >> 8, MacColor.green >> 8, MacColor.blue >> 8));
3453+ LMGetHiliteRGB(&MacColor);
3454+ return (RGB(MacColor.red >> 8, MacColor.green >> 8, MacColor.blue >> 8));
34323455 }
34333456 /* Check if the name is one of the colors we know */
34343457 for (i = 0; i < sizeof(table) / sizeof(table[0]); i++)
@@ -3504,7 +3527,7 @@
35043527 TheColor.green = Green(color) * 0x0101;
35053528 TheColor.blue = Blue(color) * 0x0101;
35063529
3507- RGBForeColor (&TheColor);
3530+ RGBForeColor(&TheColor);
35083531 }
35093532
35103533 /*
@@ -3520,7 +3543,7 @@
35203543 TheColor.green = Green(color) * 0x0101;
35213544 TheColor.blue = Blue(color) * 0x0101;
35223545
3523- RGBBackColor (&TheColor);
3546+ RGBBackColor(&TheColor);
35243547 }
35253548
35263549 void
@@ -3597,31 +3620,31 @@
35973620 #endif
35983621 {
35993622 /* Use old-style, non-antialiased QuickDraw text rendering. */
3600- TextMode (srcCopy);
3601- TextFace (normal);
3623+ TextMode(srcCopy);
3624+ TextFace(normal);
36023625
36033626 /* SelectFont(hdc, gui.currFont); */
36043627
36053628 if (flags & DRAW_TRANSP)
36063629 {
3607- TextMode (srcOr);
3630+ TextMode(srcOr);
36083631 }
36093632
3610- MoveTo (TEXT_X(col), TEXT_Y(row));
3611- DrawText ((char *)s, 0, len);
3633+ MoveTo(TEXT_X(col), TEXT_Y(row));
3634+ DrawText((char *)s, 0, len);
36123635
36133636
36143637 if (flags & DRAW_BOLD)
36153638 {
3616- TextMode (srcOr);
3617- MoveTo (TEXT_X(col) + 1, TEXT_Y(row));
3618- DrawText ((char *)s, 0, len);
3639+ TextMode(srcOr);
3640+ MoveTo(TEXT_X(col) + 1, TEXT_Y(row));
3641+ DrawText((char *)s, 0, len);
36193642 }
36203643
36213644 if (flags & DRAW_UNDERL)
36223645 {
3623- MoveTo (FILL_X(col), FILL_Y(row + 1) - 1);
3624- LineTo (FILL_X(col + len) - 1, FILL_Y(row + 1) - 1);
3646+ MoveTo(FILL_X(col), FILL_Y(row + 1) - 1);
3647+ LineTo(FILL_X(col + len) - 1, FILL_Y(row + 1) - 1);
36253648 }
36263649 }
36273650
@@ -3649,7 +3672,7 @@
36493672 void
36503673 gui_mch_beep()
36513674 {
3652- SysBeep (1); /* Should this be 0? (????) */
3675+ SysBeep(1); /* Should this be 0? (????) */
36533676 }
36543677
36553678 void
@@ -3740,7 +3763,7 @@
37403763
37413764 gui_mch_set_fg_color(color);
37423765
3743- FrameRect (&rc);
3766+ FrameRect(&rc);
37443767 }
37453768
37463769 /*
@@ -3767,7 +3790,7 @@
37673790
37683791 gui_mch_set_fg_color(color);
37693792
3770- PaintRect (&rc);
3793+ PaintRect(&rc);
37713794 }
37723795
37733796
@@ -3791,7 +3814,7 @@
37913814 */
37923815 EventRecord theEvent;
37933816
3794- if (EventAvail (everyEvent, &theEvent))
3817+ if (EventAvail(everyEvent, &theEvent))
37953818 if (theEvent.what != nullEvent)
37963819 gui_mch_wait_for_chars(0);
37973820 }
@@ -3806,7 +3829,7 @@
38063829 #endif
38073830 pascal
38083831 Boolean
3809-WaitNextEventWrp (EventMask eventMask, EventRecord *theEvent, UInt32 sleep, RgnHandle mouseRgn)
3832+WaitNextEventWrp(EventMask eventMask, EventRecord *theEvent, UInt32 sleep, RgnHandle mouseRgn)
38103833 {
38113834 if (((long) sleep) < -1)
38123835 sleep = 32767;
@@ -3857,7 +3880,7 @@
38573880 else*/ if (dragRectControl == kCreateRect)
38583881 {
38593882 dragRgn = cursorRgn;
3860- RectRgn (dragRgn, &dragRect);
3883+ RectRgn(dragRgn, &dragRect);
38613884 dragRectControl = kNothing;
38623885 }
38633886 /*
@@ -3871,12 +3894,12 @@
38713894 sleeppyTick = 60*wtime/1000;
38723895 else
38733896 sleeppyTick = 32767;
3874- if (WaitNextEventWrp (mask, &event, sleeppyTick, dragRgn))
3897+ if (WaitNextEventWrp(mask, &event, sleeppyTick, dragRgn))
38753898 {
38763899 #ifdef USE_SIOUX
38773900 if (!SIOUXHandleOneEvent(&event))
38783901 #endif
3879- gui_mac_handle_event (&event);
3902+ gui_mac_handle_event(&event);
38803903 if (input_available())
38813904 {
38823905 allow_scrollbar = FALSE;
@@ -3929,7 +3952,7 @@
39293952 rc.bottom = FILL_Y(row2 + 1);
39303953
39313954 gui_mch_set_bg_color(gui.back_pixel);
3932- EraseRect (&rc);
3955+ EraseRect(&rc);
39333956 }
39343957
39353958 /*
@@ -3970,7 +3993,7 @@
39703993 rc.bottom = FILL_Y(gui.scroll_region_bot + 1);
39713994
39723995 gui_mch_set_bg_color(gui.back_pixel);
3973- ScrollRect (&rc, 0, -num_lines * gui.char_height, (RgnHandle) nil);
3996+ ScrollRect(&rc, 0, -num_lines * gui.char_height, (RgnHandle) nil);
39743997
39753998 gui_clear_block(gui.scroll_region_bot - num_lines + 1,
39763999 gui.scroll_region_left,
@@ -3995,7 +4018,7 @@
39954018
39964019 gui_mch_set_bg_color(gui.back_pixel);
39974020
3998- ScrollRect (&rc, 0, gui.char_height * num_lines, (RgnHandle) nil);
4021+ ScrollRect(&rc, 0, gui.char_height * num_lines, (RgnHandle) nil);
39994022
40004023 /* Update gui.cursor_row if the cursor scrolled or copied over */
40014024 if (gui.cursor_row >= gui.row
@@ -4028,6 +4051,7 @@
40284051 ScrapFlavorFlags scrapFlags;
40294052 ScrapRef scrap = nil;
40304053 OSStatus error;
4054+ int flavor;
40314055 #else
40324056 long scrapOffset;
40334057 long scrapSize;
@@ -4038,19 +4062,31 @@
40384062
40394063
40404064 #ifdef USE_CARBONIZED
4041- error = GetCurrentScrap (&scrap);
4065+ error = GetCurrentScrap(&scrap);
40424066 if (error != noErr)
40434067 return;
40444068
4045- error = GetScrapFlavorFlags(scrap, kScrapFlavorTypeText, &scrapFlags);
4046- if (error != noErr)
4047- return;
4048-
4049- error = GetScrapFlavorSize (scrap, kScrapFlavorTypeText, &scrapSize);
4050- if (error != noErr)
4051- return;
4052-
4053- ReserveMem (scrapSize);
4069+ flavor = 0;
4070+ error = GetScrapFlavorFlags(scrap, VIMSCRAPFLAVOR, &scrapFlags);
4071+ if (error == noErr)
4072+ {
4073+ error = GetScrapFlavorSize(scrap, VIMSCRAPFLAVOR, &scrapSize);
4074+ if (error == noErr && scrapSize > 1)
4075+ flavor = 1;
4076+ }
4077+
4078+ if (flavor == 0)
4079+ {
4080+ error = GetScrapFlavorFlags(scrap, kScrapFlavorTypeText, &scrapFlags);
4081+ if (error != noErr)
4082+ return;
4083+
4084+ error = GetScrapFlavorSize(scrap, kScrapFlavorTypeText, &scrapSize);
4085+ if (error != noErr)
4086+ return;
4087+ }
4088+
4089+ ReserveMem(scrapSize);
40544090 #else
40554091 /* Call to LoadScrap seem to avoid problem with crash on first paste */
40564092 scrapSize = LoadScrap();
@@ -4061,23 +4097,28 @@
40614097 {
40624098 #ifdef USE_CARBONIZED
40634099 /* In CARBON we don't need a Handle, a pointer is good */
4064- textOfClip = NewHandle (scrapSize);
4100+ textOfClip = NewHandle(scrapSize);
40654101 /* tempclip = lalloc(scrapSize+1, TRUE); */
40664102 #else
40674103 textOfClip = NewHandle(0);
40684104 #endif
4069- HLock (textOfClip);
4105+ HLock(textOfClip);
40704106 #ifdef USE_CARBONIZED
4071- error = GetScrapFlavorData (scrap, kScrapFlavorTypeText, &scrapSize, *textOfClip);
4107+ error = GetScrapFlavorData(scrap,
4108+ flavor ? VIMSCRAPFLAVOR : kScrapFlavorTypeText,
4109+ &scrapSize, *textOfClip);
40724110 #else
40734111 scrapSize = GetScrap(textOfClip, 'TEXT', &scrapOffset);
40744112 #endif
40754113
4076- type = (strchr(*textOfClip, '\r') != NULL) ? MLINE : MCHAR;
4114+ if (flavor)
4115+ type = **textOfClip;
4116+ else
4117+ type = (strchr(*textOfClip, '\r') != NULL) ? MLINE : MCHAR;
40774118
40784119 tempclip = lalloc(scrapSize+1, TRUE);
4079- STRNCPY(tempclip, *textOfClip, scrapSize);
4080- tempclip[scrapSize] = 0;
4120+ STRNCPY(tempclip, *textOfClip + flavor, scrapSize - flavor);
4121+ tempclip[scrapSize - flavor] = 0;
40814122
40824123 searchCR = (char *)tempclip;
40834124 while (searchCR != NULL)
@@ -4184,15 +4225,23 @@
41844225 ZeroScrap();
41854226 #endif
41864227
4228+#ifdef USE_CARBONIZED
4229+ textOfClip = NewHandle(scrapSize + 1);
4230+#else
41874231 textOfClip = NewHandle(scrapSize);
4232+#endif
41884233 HLock(textOfClip);
41894234
4235+#ifdef USE_CARBONIZED
4236+ **textOfClip = type;
4237+ STRNCPY(*textOfClip + 1, str, scrapSize);
4238+ GetCurrentScrap(&scrap);
4239+ PutScrapFlavor(scrap, kScrapFlavorTypeText, kScrapFlavorMaskNone,
4240+ scrapSize, *textOfClip + 1);
4241+ PutScrapFlavor(scrap, VIMSCRAPFLAVOR, kScrapFlavorMaskNone,
4242+ scrapSize + 1, *textOfClip);
4243+#else
41904244 STRNCPY(*textOfClip, str, scrapSize);
4191-#ifdef USE_CARBONIZED
4192- GetCurrentScrap (&scrap);
4193- PutScrapFlavor(scrap, kScrapFlavorTypeText, kScrapFlavorMaskNone,
4194- scrapSize, *textOfClip);
4195-#else
41964245 PutScrap(scrapSize, 'TEXT', *textOfClip);
41974246 #endif
41984247 HUnlock(textOfClip);
@@ -4211,7 +4260,7 @@
42114260 {
42124261 Rect VimBound;
42134262
4214-/* HideWindow (gui.VimWindow); */
4263+/* HideWindow(gui.VimWindow); */
42154264 #ifdef USE_CARBONIZED
42164265 GetWindowBounds(gui.VimWindow, kWindowGlobalPortRgn, &VimBound);
42174266 #else
@@ -4231,7 +4280,7 @@
42314280 SetWindowBounds(gui.VimWindow, kWindowGlobalPortRgn, &VimBound);
42324281 #endif
42334282
4234- ShowWindow (gui.VimWindow);
4283+ ShowWindow(gui.VimWindow);
42354284 }
42364285
42374286 /*
@@ -4321,11 +4370,11 @@
43214370 #endif
43224371 {
43234372 /* Carbon suggest use of
4324- * OSStatus CreateNewMenu ( MenuID, MenuAttributes, MenuRef *);
4325- * OSStatus SetMenuTitle ( MenuRef, ConstStr255Param title );
4373+ * OSStatus CreateNewMenu(MenuID, MenuAttributes, MenuRef *);
4374+ * OSStatus SetMenuTitle(MenuRef, ConstStr255Param title);
43264375 */
43274376 menu->submenu_id = next_avail_id;
4328- menu->submenu_handle = NewMenu (menu->submenu_id, name);
4377+ menu->submenu_handle = NewMenu(menu->submenu_id, name);
43294378 next_avail_id++;
43304379 }
43314380
@@ -4341,7 +4390,7 @@
43414390 #ifdef USE_HELPMENU
43424391 if (menu->submenu_id != kHMHelpMenuID)
43434392 #endif
4344- InsertMenu (menu->submenu_handle, menu_after_me); /* insert before */
4393+ InsertMenu(menu->submenu_handle, menu_after_me); /* insert before */
43454394 #if 1
43464395 /* Vim should normally update it. TODO: verify */
43474396 DrawMenuBar();
@@ -4351,7 +4400,7 @@
43514400 {
43524401 /* Adding as a submenu */
43534402
4354- index = gui_mac_get_menu_item_index (menu);
4403+ index = gui_mac_get_menu_item_index(menu);
43554404
43564405 /* Call InsertMenuItem followed by SetMenuItemText
43574406 * to avoid special character recognition by InsertMenuItem
@@ -4363,7 +4412,7 @@
43634412 InsertMenu(menu->submenu_handle, hierMenu);
43644413 }
43654414
4366- vim_free (name);
4415+ vim_free(name);
43674416
43684417 #if 0
43694418 /* Done by Vim later on */
@@ -4502,7 +4551,7 @@
45024551 gui_mch_destroy_menu(menu)
45034552 vimmenu_T *menu;
45044553 {
4505- short index = gui_mac_get_menu_item_index (menu);
4554+ short index = gui_mac_get_menu_item_index(menu);
45064555
45074556 if (index > 0)
45084557 {
@@ -4513,20 +4562,20 @@
45134562 #endif
45144563 {
45154564 /* For now just don't delete help menu items. (Huh? Dany) */
4516- DeleteMenuItem (menu->parent->submenu_handle, index);
4565+ DeleteMenuItem(menu->parent->submenu_handle, index);
45174566
45184567 /* Delete the Menu if it was a hierarchical Menu */
45194568 if (menu->submenu_id != 0)
45204569 {
4521- DeleteMenu (menu->submenu_id);
4522- DisposeMenu (menu->submenu_handle);
4570+ DeleteMenu(menu->submenu_id);
4571+ DisposeMenu(menu->submenu_handle);
45234572 }
45244573 }
45254574 #ifdef USE_HELPMENU
45264575 # ifdef DEBUG_MAC_MENU
45274576 else
45284577 {
4529- printf ("gmdm 1\n");
4578+ printf("gmdm 1\n");
45304579 }
45314580 # endif
45324581 #endif
@@ -4534,7 +4583,7 @@
45344583 #ifdef DEBUG_MAC_MENU
45354584 else
45364585 {
4537- printf ("gmdm 2\n");
4586+ printf("gmdm 2\n");
45384587 }
45394588 #endif
45404589 }
@@ -4545,8 +4594,8 @@
45454594 if (menu->submenu_id != kHMHelpMenuID)
45464595 #endif
45474596 {
4548- DeleteMenu (menu->submenu_id);
4549- DisposeMenu (menu->submenu_handle);
4597+ DeleteMenu(menu->submenu_id);
4598+ DisposeMenu(menu->submenu_handle);
45504599 }
45514600 }
45524601 /* Shouldn't this be already done by Vim. TODO: Check */
@@ -4562,7 +4611,7 @@
45624611 int grey;
45634612 {
45644613 /* TODO: Check if menu really exists */
4565- short index = gui_mac_get_menu_item_index (menu);
4614+ short index = gui_mac_get_menu_item_index(menu);
45664615 /*
45674616 index = menu->index;
45684617 */
@@ -4593,7 +4642,7 @@
45934642 int hidden;
45944643 {
45954644 /* There's no hidden mode on MacOS */
4596- gui_mch_menu_grey (menu, hidden);
4645+ gui_mch_menu_grey(menu, hidden);
45974646 }
45984647
45994648
@@ -4622,7 +4671,7 @@
46224671 HideControl(sb->id);
46234672
46244673 #ifdef DEBUG_MAC_SB
4625- printf ("enb_sb (%x) %x\n",sb->id, flag);
4674+ printf("enb_sb (%x) %x\n",sb->id, flag);
46264675 #endif
46274676 }
46284677
@@ -4637,7 +4686,7 @@
46374686 SetControl32BitMinimum (sb->id, 0);
46384687 SetControl32BitValue (sb->id, val);
46394688 #ifdef DEBUG_MAC_SB
4640- printf ("thumb_sb (%x) %x, %x,%x\n",sb->id, val, size, max);
4689+ printf("thumb_sb (%x) %x, %x,%x\n",sb->id, val, size, max);
46414690 #endif
46424691 }
46434692
@@ -4652,13 +4701,13 @@
46524701 gui_mch_set_bg_color(gui.back_pixel);
46534702 /* if (gui.which_scrollbars[SBAR_LEFT])
46544703 {
4655- MoveControl (sb->id, x-16, y);
4656- SizeControl (sb->id, w + 1, h);
4704+ MoveControl(sb->id, x-16, y);
4705+ SizeControl(sb->id, w + 1, h);
46574706 }
46584707 else
46594708 {
4660- MoveControl (sb->id, x, y);
4661- SizeControl (sb->id, w + 1, h);
4709+ MoveControl(sb->id, x, y);
4710+ SizeControl(sb->id, w + 1, h);
46624711 }*/
46634712 if (sb == &gui.bottom_sbar)
46644713 h += 1;
@@ -4668,10 +4717,10 @@
46684717 if (gui.which_scrollbars[SBAR_LEFT])
46694718 x -= 15;
46704719
4671- MoveControl (sb->id, x, y);
4672- SizeControl (sb->id, w, h);
4720+ MoveControl(sb->id, x, y);
4721+ SizeControl(sb->id, w, h);
46734722 #ifdef DEBUG_MAC_SB
4674- printf ("size_sb (%x) %x, %x, %x, %x\n",sb->id, x, y, w, h);
4723+ printf("size_sb (%x) %x, %x, %x, %x\n",sb->id, x, y, w, h);
46754724 #endif
46764725 }
46774726
@@ -4687,7 +4736,7 @@
46874736 bounds.right = -10;
46884737 bounds.left = -16;
46894738
4690- sb->id = NewControl (gui.VimWindow,
4739+ sb->id = NewControl(gui.VimWindow,
46914740 &bounds,
46924741 "\pScrollBar",
46934742 TRUE,
@@ -4701,7 +4750,7 @@
47014750 #endif
47024751 (long) sb->ident);
47034752 #ifdef DEBUG_MAC_SB
4704- printf ("create_sb (%x) %x\n",sb->id, orient);
4753+ printf("create_sb (%x) %x\n",sb->id, orient);
47054754 #endif
47064755 }
47074756
@@ -4710,9 +4759,9 @@
47104759 scrollbar_T *sb;
47114760 {
47124761 gui_mch_set_bg_color(gui.back_pixel);
4713- DisposeControl (sb->id);
4762+ DisposeControl(sb->id);
47144763 #ifdef DEBUG_MAC_SB
4715- printf ("dest_sb (%x) \n",sb->id);
4764+ printf("dest_sb (%x) \n",sb->id);
47164765 #endif
47174766 }
47184767
@@ -4818,7 +4867,7 @@
48184867 OSErr error;
48194868
48204869 /* Get Navigation Service Defaults value */
4821- NavGetDefaultDialogOptions (&navOptions);
4870+ NavGetDefaultDialogOptions(&navOptions);
48224871
48234872
48244873 /* TODO: If we get a :browse args, set the Multiple bit. */
@@ -4828,8 +4877,8 @@
48284877 /* | kNavAllowMultipleFiles */
48294878 | kNavAllowStationery;
48304879
4831- (void) C2PascalString (title, &navOptions.message);
4832- (void) C2PascalString (dflt, &navOptions.savedFileName);
4880+ (void) C2PascalString(title, &navOptions.message);
4881+ (void) C2PascalString(dflt, &navOptions.savedFileName);
48334882 /* Could set clientName?
48344883 * windowTitle? (there's no title bar?)
48354884 */
@@ -4837,7 +4886,7 @@
48374886 if (saving)
48384887 {
48394888 /* Change first parm AEDesc (typeFSS) *defaultLocation to match dflt */
4840- NavPutFile (NULL, &reply, &navOptions, NULL, 'TEXT', 'VIM!', NULL);
4889+ NavPutFile(NULL, &reply, &navOptions, NULL, 'TEXT', 'VIM!', NULL);
48414890 if (!reply.validRecord)
48424891 return NULL;
48434892 }
@@ -4851,7 +4900,7 @@
48514900
48524901 fnames = new_fnames_from_AEDesc(&reply.selection, &numFiles, &error);
48534902
4854- NavDisposeReply (&reply);
4903+ NavDisposeReply(&reply);
48554904
48564905 if (fnames)
48574906 {
@@ -4870,26 +4919,26 @@
48704919
48714920 /* TODO: split dflt in path and filename */
48724921
4873- (void) C2PascalString (title, &Prompt);
4874- (void) C2PascalString (dflt, &DefaultName);
4875- (void) C2PascalString (initdir, &Directory);
4922+ (void) C2PascalString(title, &Prompt);
4923+ (void) C2PascalString(dflt, &DefaultName);
4924+ (void) C2PascalString(initdir, &Directory);
48764925
48774926 if (saving)
48784927 {
48794928 /* Use a custon filter instead of nil FAQ 9-4 */
4880- StandardPutFile (Prompt, DefaultName, &reply);
4929+ StandardPutFile(Prompt, DefaultName, &reply);
48814930 if (!reply.sfGood)
48824931 return NULL;
48834932 }
48844933 else
48854934 {
4886- StandardGetFile (nil, -1, fileTypes, &reply);
4935+ StandardGetFile(nil, -1, fileTypes, &reply);
48874936 if (!reply.sfGood)
48884937 return NULL;
48894938 }
48904939
48914940 /* Work fine but append a : for new file */
4892- return (FullPathFromFSSpec_save (reply.sfFile));
4941+ return (FullPathFromFSSpec_save(reply.sfFile));
48934942
48944943 /* Shorten the file name if possible */
48954944 /* mch_dirname(IObuff, IOSIZE);
@@ -4943,9 +4992,9 @@
49434992 {
49444993 #if 0 /* USE_CARBONIZED */
49454994 /* Untested */
4946- MoveDialogItem (theDialog, itemNumber, X, Y);
4995+ MoveDialogItem(theDialog, itemNumber, X, Y);
49474996 if (inBox != nil)
4948- GetDialogItem (theDialog, itemNumber, &itemType, &itemHandle, inBox);
4997+ GetDialogItem(theDialog, itemNumber, &itemType, &itemHandle, inBox);
49494998 #else
49504999 short itemType;
49515000 Handle itemHandle;
@@ -4955,14 +5004,14 @@
49555004 if (inBox != nil)
49565005 itemBox = inBox;
49575006
4958- GetDialogItem (theDialog, itemNumber, &itemType, &itemHandle, itemBox);
4959- OffsetRect (itemBox, -itemBox->left, -itemBox->top);
4960- OffsetRect (itemBox, X, Y);
5007+ GetDialogItem(theDialog, itemNumber, &itemType, &itemHandle, itemBox);
5008+ OffsetRect(itemBox, -itemBox->left, -itemBox->top);
5009+ OffsetRect(itemBox, X, Y);
49615010 /* To move a control (like a button) we need to call both
49625011 * MoveControl and SetDialogItem. FAQ 6-18 */
49635012 if (1) /*(itemType & kControlDialogItem) */
4964- MoveControl ((ControlRef) itemHandle, X, Y);
4965- SetDialogItem (theDialog, itemNumber, itemType, itemHandle, itemBox);
5013+ MoveControl((ControlRef) itemHandle, X, Y);
5014+ SetDialogItem(theDialog, itemNumber, itemType, itemHandle, itemBox);
49665015 #endif
49675016 }
49685017
@@ -4977,7 +5026,7 @@
49775026 Handle itemHandle;
49785027 Rect itemBox;
49795028
4980- GetDialogItem (theDialog, itemNumber, &itemType, &itemHandle, &itemBox);
5029+ GetDialogItem(theDialog, itemNumber, &itemType, &itemHandle, &itemBox);
49815030
49825031 /* When width or height is zero do not change it */
49835032 if (width == 0)
@@ -4986,7 +5035,7 @@
49865035 height = itemBox.bottom - itemBox.top;
49875036
49885037 #if 0 /* USE_CARBONIZED */
4989- SizeDialogItem (theDialog, itemNumber, width, height); /* Untested */
5038+ SizeDialogItem(theDialog, itemNumber, width, height); /* Untested */
49905039 #else
49915040 /* Resize the bounding box */
49925041 itemBox.right = itemBox.left + width;
@@ -4995,10 +5044,10 @@
49955044 /* To resize a control (like a button) we need to call both
49965045 * SizeControl and SetDialogItem. (deducted from FAQ 6-18) */
49975046 if (itemType & kControlDialogItem)
4998- SizeControl ((ControlRef) itemHandle, width, height);
5047+ SizeControl((ControlRef) itemHandle, width, height);
49995048
50005049 /* Configure back the item */
5001- SetDialogItem (theDialog, itemNumber, itemType, itemHandle, &itemBox);
5050+ SetDialogItem(theDialog, itemNumber, itemType, itemHandle, &itemBox);
50025051 #endif
50035052 }
50045053
@@ -5012,12 +5061,12 @@
50125061 Handle itemHandle;
50135062 Rect itemBox;
50145063
5015- GetDialogItem (theDialog, itemNumber, &itemType, &itemHandle, &itemBox);
5064+ GetDialogItem(theDialog, itemNumber, &itemType, &itemHandle, &itemBox);
50165065
50175066 if (itemType & kControlDialogItem)
5018- SetControlTitle ((ControlRef) itemHandle, itemName);
5067+ SetControlTitle((ControlRef) itemHandle, itemName);
50195068 else
5020- SetDialogItemText (itemHandle, itemName);
5069+ SetDialogItemText(itemHandle, itemName);
50215070 }
50225071
50235072 int
@@ -5072,7 +5121,7 @@
50725121 vertical = (vim_strchr(p_go, GO_VERTICAL) != NULL);
50735122
50745123 /* Create a new Dialog Box from template. */
5075- theDialog = GetNewDialog (129, nil, (WindowRef) -1);
5124+ theDialog = GetNewDialog(129, nil, (WindowRef) -1);
50765125
50775126 /* Get the WindowRef */
50785127 theWindow = GetDialogWindow(theDialog);
@@ -5083,15 +5132,15 @@
50835132 * within a visible window. (non-Carbon MacOS 9)
50845133 * Could be avoided by changing the resource.
50855134 */
5086- HideWindow (theWindow);
5135+ HideWindow(theWindow);
50875136
50885137 /* Change the graphical port to the dialog,
50895138 * so we can measure the text with the proper font */
5090- GetPort (&oldPort);
5139+ GetPort(&oldPort);
50915140 #ifdef USE_CARBONIZED
5092- SetPortDialogPort (theDialog);
5141+ SetPortDialogPort(theDialog);
50935142 #else
5094- SetPort (theDialog);
5143+ SetPort(theDialog);
50955144 #endif
50965145
50975146 /* Get the info about the default text,
@@ -5102,12 +5151,12 @@
51025151 /* Set the dialog title */
51035152 if (title != NULL)
51045153 {
5105- (void) C2PascalString (title, &PascalTitle);
5106- SetWTitle (theWindow, PascalTitle);
5154+ (void) C2PascalString(title, &PascalTitle);
5155+ SetWTitle(theWindow, PascalTitle);
51075156 }
51085157
51095158 /* Creates the buttons and add them to the Dialog Box. */
5110- buttonDITL = GetResource ('DITL', 130);
5159+ buttonDITL = GetResource('DITL', 130);
51115160 buttonChar = buttons;
51125161 button = 0;
51135162
@@ -5126,30 +5175,30 @@
51265175 name[0] = len;
51275176
51285177 /* Add the button */
5129- AppendDITL (theDialog, buttonDITL, overlayDITL); /* appendDITLRight); */
5178+ AppendDITL(theDialog, buttonDITL, overlayDITL); /* appendDITLRight); */
51305179
51315180 /* Change the button's name */
5132- macSetDialogItemText (theDialog, button, name);
5181+ macSetDialogItemText(theDialog, button, name);
51335182
51345183 /* Resize the button to fit its name */
5135- width = StringWidth (name) + 2 * dfltButtonEdge;
5184+ width = StringWidth(name) + 2 * dfltButtonEdge;
51365185 /* Limite the size of any button to an acceptable value. */
51375186 /* TODO: Should be based on the message width */
51385187 if (width > maxButtonWidth)
51395188 width = maxButtonWidth;
5140- macSizeDialogItem (theDialog, button, width, 0);
5189+ macSizeDialogItem(theDialog, button, width, 0);
51415190
51425191 totalButtonWidth += width;
51435192
51445193 if (width > widestButton)
51455194 widestButton = width;
51465195 }
5147- ReleaseResource (buttonDITL);
5196+ ReleaseResource(buttonDITL);
51485197 lastButton = button;
51495198
51505199 /* Add the icon to the Dialog Box. */
51515200 iconItm.idx = lastButton + 1;
5152- iconDITL = GetResource ('DITL', 131);
5201+ iconDITL = GetResource('DITL', 131);
51535202 switch (type)
51545203 {
51555204 case VIM_GENERIC: useIcon = kNoteIcon;
@@ -5159,41 +5208,41 @@
51595208 case VIM_QUESTION: useIcon = kNoteIcon;
51605209 default: useIcon = kStopIcon;
51615210 };
5162- AppendDITL (theDialog, iconDITL, overlayDITL);
5163- ReleaseResource (iconDITL);
5164- GetDialogItem (theDialog, iconItm.idx, &itemType, &itemHandle, &box);
5211+ AppendDITL(theDialog, iconDITL, overlayDITL);
5212+ ReleaseResource(iconDITL);
5213+ GetDialogItem(theDialog, iconItm.idx, &itemType, &itemHandle, &box);
51655214 /* TODO: Should the item be freed? */
5166- iconHandle = GetIcon (useIcon);
5167- SetDialogItem (theDialog, iconItm.idx, itemType, iconHandle, &box);
5215+ iconHandle = GetIcon(useIcon);
5216+ SetDialogItem(theDialog, iconItm.idx, itemType, iconHandle, &box);
51685217
51695218 /* Add the message to the Dialog box. */
51705219 messageItm.idx = lastButton + 2;
5171- messageDITL = GetResource ('DITL', 132);
5172- AppendDITL (theDialog, messageDITL, overlayDITL);
5173- ReleaseResource (messageDITL);
5174- GetDialogItem (theDialog, messageItm.idx, &itemType, &itemHandle, &box);
5175- (void) C2PascalString (message, &name);
5176- SetDialogItemText (itemHandle, name);
5177- messageItm.width = StringWidth (name);
5220+ messageDITL = GetResource('DITL', 132);
5221+ AppendDITL(theDialog, messageDITL, overlayDITL);
5222+ ReleaseResource(messageDITL);
5223+ GetDialogItem(theDialog, messageItm.idx, &itemType, &itemHandle, &box);
5224+ (void) C2PascalString(message, &name);
5225+ SetDialogItemText(itemHandle, name);
5226+ messageItm.width = StringWidth(name);
51785227
51795228 /* Add the input box if needed */
51805229 if (textfield != NULL)
51815230 {
51825231 /* Cheat for now reuse the message and convet to text edit */
51835232 inputItm.idx = lastButton + 3;
5184- inputDITL = GetResource ('DITL', 132);
5185- AppendDITL (theDialog, inputDITL, overlayDITL);
5186- ReleaseResource (inputDITL);
5187- GetDialogItem (theDialog, inputItm.idx, &itemType, &itemHandle, &box);
5188-/* SetDialogItem (theDialog, inputItm.idx, kEditTextDialogItem, itemHandle, &box);*/
5189- (void) C2PascalString (textfield, &name);
5190- SetDialogItemText (itemHandle, name);
5191- inputItm.width = StringWidth (name);
5233+ inputDITL = GetResource('DITL', 132);
5234+ AppendDITL(theDialog, inputDITL, overlayDITL);
5235+ ReleaseResource(inputDITL);
5236+ GetDialogItem(theDialog, inputItm.idx, &itemType, &itemHandle, &box);
5237+/* SetDialogItem(theDialog, inputItm.idx, kEditTextDialogItem, itemHandle, &box);*/
5238+ (void) C2PascalString(textfield, &name);
5239+ SetDialogItemText(itemHandle, name);
5240+ inputItm.width = StringWidth(name);
51925241 }
51935242
51945243 /* Set the <ENTER> and <ESC> button. */
5195- SetDialogDefaultItem (theDialog, dfltbutton);
5196- SetDialogCancelItem (theDialog, 0);
5244+ SetDialogDefaultItem(theDialog, dfltbutton);
5245+ SetDialogCancelItem(theDialog, 0);
51975246
51985247 /* Reposition element */
51995248
@@ -5202,26 +5251,26 @@
52025251 vertical = TRUE;
52035252
52045253 /* Place icon */
5205- macMoveDialogItem (theDialog, iconItm.idx, dfltIconSideSpace, dfltElementSpacing, &box);
5254+ macMoveDialogItem(theDialog, iconItm.idx, dfltIconSideSpace, dfltElementSpacing, &box);
52065255 iconItm.box.right = box.right;
52075256 iconItm.box.bottom = box.bottom;
52085257
52095258 /* Place Message */
52105259 messageItm.box.left = iconItm.box.right + dfltIconSideSpace;
5211- macSizeDialogItem (theDialog, messageItm.idx, 0, messageLines * (textFontInfo.ascent + textFontInfo.descent));
5212- macMoveDialogItem (theDialog, messageItm.idx, messageItm.box.left, dfltElementSpacing, &messageItm.box);
5260+ macSizeDialogItem(theDialog, messageItm.idx, 0, messageLines * (textFontInfo.ascent + textFontInfo.descent));
5261+ macMoveDialogItem(theDialog, messageItm.idx, messageItm.box.left, dfltElementSpacing, &messageItm.box);
52135262
52145263 /* Place Input */
52155264 if (textfield != NULL)
52165265 {
52175266 inputItm.box.left = messageItm.box.left;
52185267 inputItm.box.top = messageItm.box.bottom + dfltElementSpacing;
5219- macSizeDialogItem (theDialog, inputItm.idx, 0, textFontInfo.ascent + textFontInfo.descent);
5220- macMoveDialogItem (theDialog, inputItm.idx, inputItm.box.left, inputItm.box.top, &inputItm.box);
5268+ macSizeDialogItem(theDialog, inputItm.idx, 0, textFontInfo.ascent + textFontInfo.descent);
5269+ macMoveDialogItem(theDialog, inputItm.idx, inputItm.box.left, inputItm.box.top, &inputItm.box);
52215270 /* Convert the static text into a text edit.
52225271 * For some reason this change need to be done last (Dany) */
5223- GetDialogItem (theDialog, inputItm.idx, &itemType, &itemHandle, &inputItm.box);
5224- SetDialogItem (theDialog, inputItm.idx, kEditTextDialogItem, itemHandle, &inputItm.box);
5272+ GetDialogItem(theDialog, inputItm.idx, &itemType, &itemHandle, &inputItm.box);
5273+ SetDialogItem(theDialog, inputItm.idx, kEditTextDialogItem, itemHandle, &inputItm.box);
52255274 SelectDialogItemText(theDialog, inputItm.idx, 0, 32767);
52265275 }
52275276
@@ -5240,12 +5289,12 @@
52405289 for (button=1; button <= lastButton; button++)
52415290 {
52425291
5243- macMoveDialogItem (theDialog, button, buttonItm.box.left, buttonItm.box.top, &box);
5292+ macMoveDialogItem(theDialog, button, buttonItm.box.left, buttonItm.box.top, &box);
52445293 /* With vertical, it's better to have all button the same lenght */
52455294 if (vertical)
52465295 {
5247- macSizeDialogItem (theDialog, button, widestButton, 0);
5248- GetDialogItem (theDialog, button, &itemType, &itemHandle, &box);
5296+ macSizeDialogItem(theDialog, button, widestButton, 0);
5297+ GetDialogItem(theDialog, button, &itemType, &itemHandle, &box);
52495298 }
52505299 /* Calculate position of next button */
52515300 if (vertical)
@@ -5260,7 +5309,7 @@
52605309
52615310 #ifdef USE_CARBONIZED
52625311 /* Magic resize */
5263- AutoSizeDialog (theDialog);
5312+ AutoSizeDialog(theDialog);
52645313 /* Need a horizontal resize anyway so not that useful */
52655314 #endif
52665315
@@ -5269,27 +5318,27 @@
52695318 /* BringToFront(theWindow); */
52705319 SelectWindow(theWindow);
52715320
5272-/* DrawDialog (theDialog); */
5321+/* DrawDialog(theDialog); */
52735322 #if 0
5274- GetPort (&oldPort);
5323+ GetPort(&oldPort);
52755324 #ifdef USE_CARBONIZED
5276- SetPortDialogPort (theDialog);
5325+ SetPortDialogPort(theDialog);
52775326 #else
5278- SetPort (theDialog);
5327+ SetPort(theDialog);
52795328 #endif
52805329 #endif
52815330
52825331 /* Hang until one of the button is hit */
52835332 do
52845333 {
5285- ModalDialog (nil, &itemHit);
5334+ ModalDialog(nil, &itemHit);
52865335 } while ((itemHit < 1) || (itemHit > lastButton));
52875336
52885337 /* Copy back the text entered by the user into the param */
52895338 if (textfield != NULL)
52905339 {
5291- GetDialogItem (theDialog, inputItm.idx, &itemType, &itemHandle, &box);
5292- GetDialogItemText (itemHandle, (char_u *) &name);
5340+ GetDialogItem(theDialog, inputItm.idx, &itemType, &itemHandle, &box);
5341+ GetDialogItemText(itemHandle, (char_u *) &name);
52935342 #if IOSIZE < 256
52945343 /* Truncate the name to IOSIZE if needed */
52955344 if (name[0] > IOSIZE)
@@ -5300,10 +5349,10 @@
53005349 }
53015350
53025351 /* Restore the original graphical port */
5303- SetPort (oldPort);
5352+ SetPort(oldPort);
53045353
53055354 /* Get ride of th edialog (free memory) */
5306- DisposeDialog (theDialog);
5355+ DisposeDialog(theDialog);
53075356
53085357 return itemHit;
53095358 /*
@@ -5339,8 +5388,8 @@
53395388 pError[0] = STRLEN(p);
53405389
53415390 STRNCPY(&pError[1], p, pError[0]);
5342- ParamText (pError, nil, nil, nil);
5343- Alert (128, nil);
5391+ ParamText(pError, nil, nil, nil);
5392+ Alert(128, nil);
53445393 break;
53455394 /* TODO: handled message longer than 256 chars
53465395 * use auto-sizeable alert
@@ -5388,8 +5437,8 @@
53885437 CursorDevicePtr myMouse;
53895438 Point where;
53905439
5391- if ( NGetTrapAddress (_CursorDeviceDispatch, ToolTrap)
5392- != NGetTrapAddress (_Unimplemented, ToolTrap) )
5440+ if ( NGetTrapAddress(_CursorDeviceDispatch, ToolTrap)
5441+ != NGetTrapAddress(_Unimplemented, ToolTrap))
53935442 {
53945443 /* New way */
53955444
@@ -5407,9 +5456,9 @@
54075456 /* Get the next cursor device */
54085457 CursorDeviceNextDevice(&myMouse);
54095458 }
5410- while ( (myMouse != nil) && (myMouse->cntButtons != 1) );
5411-
5412- CursorDeviceMoveTo (myMouse, x, y);
5459+ while ((myMouse != nil) && (myMouse->cntButtons != 1));
5460+
5461+ CursorDeviceMoveTo(myMouse, x, y);
54135462 }
54145463 else
54155464 {
@@ -5445,10 +5494,10 @@
54455494 GrafPtr savePort;
54465495
54475496 /* Save Current Port: On MacOS X we seem to lose the port */
5448- GetPort (&savePort); /*OSX*/
5449-
5450- GetMouse (&where);
5451- LocalToGlobal (&where); /*OSX*/
5497+ GetPort(&savePort); /*OSX*/
5498+
5499+ GetMouse(&where);
5500+ LocalToGlobal(&where); /*OSX*/
54525501 CntxMenu = menu->submenu_handle;
54535502
54545503 /* TODO: Get the text selection from Vim */
@@ -5463,7 +5512,7 @@
54635512 /* Handle the menu CntxMenuID, CntxMenuItem */
54645513 /* The submenu can be handle directly by gui_mac_handle_menu */
54655514 /* But what about the current menu, is the menu changed by ContextualMenuSelect */
5466- gui_mac_handle_menu ((CntxMenuID << 16) + CntxMenuItem);
5515+ gui_mac_handle_menu((CntxMenuID << 16) + CntxMenuItem);
54675516 }
54685517 else if (CntxMenuID == kCMShowHelpSelected)
54695518 {
@@ -5472,7 +5521,7 @@
54725521 }
54735522
54745523 /* Restore original Port */
5475- SetPort (savePort); /*OSX*/
5524+ SetPort(savePort); /*OSX*/
54765525 #endif
54775526 }
54785527
@@ -5482,10 +5531,10 @@
54825531 mch_post_buffer_write(buf_T *buf)
54835532 {
54845533 # ifdef USE_SIOUX
5485- printf ("Writing Buf...\n");
5534+ printf("Writing Buf...\n");
54865535 # endif
5487- GetFSSpecFromPath (buf->b_ffname, &buf->b_FSSpec);
5488- Send_KAHL_MOD_AE (buf);
5536+ GetFSSpecFromPath(buf->b_ffname, &buf->b_FSSpec);
5537+ Send_KAHL_MOD_AE(buf);
54895538 }
54905539 #endif
54915540
@@ -5521,7 +5570,7 @@
55215570 */
55225571
55235572 int
5524-C2PascalString (CString, PascalString)
5573+C2PascalString(CString, PascalString)
55255574 char_u *CString;
55265575 Str255 *PascalString;
55275576 {
@@ -5546,7 +5595,7 @@
55465595 }
55475596
55485597 int
5549-GetFSSpecFromPath (file, fileFSSpec)
5598+GetFSSpecFromPath(file, fileFSSpec)
55505599 char_u *file;
55515600 FSSpec *fileFSSpec;
55525601 {
@@ -5555,17 +5604,17 @@
55555604 CInfoPBRec myCPB;
55565605 OSErr err;
55575606
5558- (void) C2PascalString (file, &filePascal);
5607+ (void) C2PascalString(file, &filePascal);
55595608
55605609 myCPB.dirInfo.ioNamePtr = filePascal;
55615610 myCPB.dirInfo.ioVRefNum = 0;
55625611 myCPB.dirInfo.ioFDirIndex = 0;
55635612 myCPB.dirInfo.ioDrDirID = 0;
55645613
5565- err= PBGetCatInfo (&myCPB, false);
5614+ err= PBGetCatInfo(&myCPB, false);
55665615
55675616 /* vRefNum, dirID, name */
5568- FSMakeFSSpec (0, 0, filePascal, fileFSSpec);
5617+ FSMakeFSSpec(0, 0, filePascal, fileFSSpec);
55695618
55705619 /* TODO: Use an error code mechanism */
55715620 return 0;
@@ -5575,7 +5624,7 @@
55755624 * Convert a FSSpec to a fuill path
55765625 */
55775626
5578-char_u *FullPathFromFSSpec_save (FSSpec file)
5627+char_u *FullPathFromFSSpec_save(FSSpec file)
55795628 {
55805629 /*
55815630 * TODO: Add protection for 256 char max.
@@ -5603,7 +5652,7 @@
56035652 #ifdef USE_UNIXFILENAME
56045653 /* Get the default volume */
56055654 /* TODO: Remove as this only work if Vim is on the Boot Volume*/
5606- error=HGetVol ( NULL, &dfltVol_vRefNum, &dfltVol_dirID );
5655+ error=HGetVol(NULL, &dfltVol_vRefNum, &dfltVol_dirID);
56075656
56085657 if (error)
56095658 return NULL;
@@ -5622,7 +5671,7 @@
56225671
56235672 /* As ioFDirIndex = 0, get the info of ioNamePtr,
56245673 which is relative to ioVrefNum, ioDirID */
5625- error = PBGetCatInfo (&theCPB, false);
5674+ error = PBGetCatInfo(&theCPB, false);
56265675
56275676 /* If we are called for a new file we expect fnfErr */
56285677 if ((error) && (error != fnfErr))
@@ -5671,20 +5720,20 @@
56715720 {
56725721 /* If the file to be saved already exists, we can get its full path
56735722 by converting its FSSpec into an FSRef. */
5674- error=FSpMakeFSRef (&file, &refFile);
5723+ error=FSpMakeFSRef(&file, &refFile);
56755724 if (error)
56765725 return NULL;
56775726
5678- status=FSRefMakePath (&refFile, (UInt8 *) path, pathSize);
5727+ status=FSRefMakePath(&refFile, (UInt8 *) path, pathSize);
56795728 if (status)
56805729 return NULL;
56815730 }
56825731
56835732 /* Add a slash at the end if needed */
56845733 if (folder)
5685- STRCAT (path, "/");
5686-
5687- return (vim_strsave (path));
5734+ STRCAT(path, "/");
5735+
5736+ return (vim_strsave(path));
56885737 #else
56895738 /* TODO: Get rid of all USE_UNIXFILENAME below */
56905739 /* Set ioNamePtr, it's the same area which is always reused. */
@@ -5695,7 +5744,7 @@
56955744 theCPB.dirInfo.ioDrParID = file.parID;
56965745 theCPB.dirInfo.ioDrDirID = file.parID;
56975746
5698- if ((TRUE) && (file.parID != fsRtDirID /*fsRtParID*/ ))
5747+ if ((TRUE) && (file.parID != fsRtDirID /*fsRtParID*/))
56995748 do
57005749 {
57015750 theCPB.dirInfo.ioFDirIndex = -1;
@@ -5706,7 +5755,7 @@
57065755
57075756 /* As ioFDirIndex = -1, get the info of ioDrDirID, */
57085757 /* *ioNamePtr[0 TO 31] will be updated */
5709- error = PBGetCatInfo (&theCPB,false);
5758+ error = PBGetCatInfo(&theCPB,false);
57105759
57115760 if (error)
57125761 return NULL;
@@ -5734,7 +5783,7 @@
57345783
57355784 /* As ioFDirIndex = -1, get the info of ioDrDirID, */
57365785 /* *ioNamePtr[0 TO 31] will be updated */
5737- error = PBGetCatInfo (&theCPB,false);
5786+ error = PBGetCatInfo(&theCPB,false);
57385787
57395788 if (error)
57405789 return NULL;
@@ -5763,7 +5812,7 @@
57635812
57645813 /* Append final path separator if it's a folder */
57655814 if (folder)
5766- STRCAT (fname, ":");
5815+ STRCAT(fname, ":");
57675816
57685817 /* As we use Unix File Name for MacOS X convert it */
57695818 #ifdef USE_UNIXFILENAME
@@ -5780,7 +5829,7 @@
57805829 }
57815830 #endif
57825831
5783- return (vim_strsave (fname));
5832+ return (vim_strsave(fname));
57845833 #endif
57855834 }
57865835
diff -r 7edf9b6e4c36 -r 4102fb4ea781 src/gui_w32.c
--- a/src/gui_w32.c Wed Jun 16 11:19:22 2004 +0000
+++ b/src/gui_w32.c Sun Jun 20 12:51:53 2004 +0000
@@ -818,9 +818,11 @@
818818 {
819819 if (strstr(buf, title) != NULL)
820820 {
821- /* Found it. Store the window ref. and quit searching. */
821+ /* Found it. Store the window ref. and quit searching if MDI
822+ * works. */
822823 vim_parent_hwnd = FindWindowEx(hwnd, NULL, "MDIClient", NULL);
823- return FALSE;
824+ if (vim_parent_hwnd != NULL)
825+ return FALSE;
824826 }
825827 }
826828 return TRUE; /* continue searching */
diff -r 7edf9b6e4c36 -r 4102fb4ea781 src/memline.c
--- a/src/memline.c Wed Jun 16 11:19:22 2004 +0000
+++ b/src/memline.c Sun Jun 20 12:51:53 2004 +0000
@@ -1518,7 +1518,7 @@
15181518 {
15191519 MSG_PUTS(_(" file name: "));
15201520 if (b0.b0_fname[0] == NUL)
1521- MSG_PUTS(_("[No File]"));
1521+ MSG_PUTS(_("[No Name]"));
15221522 else
15231523 msg_outtrans(b0.b0_fname);
15241524
@@ -3781,7 +3781,7 @@
37813781 * Change the ".swp" extension to find another file that can be used.
37823782 * First decrement the last char: ".swo", ".swn", etc.
37833783 * If that still isn't enough decrement the last but one char: ".svz"
3784- * Can happen when editing many "No File" buffers.
3784+ * Can happen when editing many "No Name" buffers.
37853785 */
37863786 if (fname[n - 1] == 'a') /* ".s?a" */
37873787 {
diff -r 7edf9b6e4c36 -r 4102fb4ea781 src/normal.c
--- a/src/normal.c Wed Jun 16 11:19:22 2004 +0000
+++ b/src/normal.c Sun Jun 20 12:51:53 2004 +0000
@@ -5186,7 +5186,23 @@
51865186 if (cap->count1 - 1 >= curwin->w_cursor.lnum)
51875187 curwin->w_cursor.lnum = 1;
51885188 else
5189- curwin->w_cursor.lnum -= cap->count1 - 1;
5189+ {
5190+#ifdef FEAT_FOLDING
5191+ if (hasAnyFolding(curwin))
5192+ {
5193+ /* Count a fold for one screen line. */
5194+ for (n = cap->count1 - 1; n > 0
5195+ && curwin->w_cursor.lnum > curwin->w_topline; --n)
5196+ {
5197+ (void)hasFolding(curwin->w_cursor.lnum,
5198+ &curwin->w_cursor.lnum, NULL);
5199+ --curwin->w_cursor.lnum;
5200+ }
5201+ }
5202+ else
5203+#endif
5204+ curwin->w_cursor.lnum -= cap->count1 - 1;
5205+ }
51905206 }
51915207 else
51925208 {
@@ -5222,8 +5238,23 @@
52225238 if (n > 0 && used > curwin->w_height)
52235239 --n;
52245240 }
5225- else
5241+ else /* (cap->cmdchar == 'H') */
5242+ {
52265243 n = cap->count1 - 1;
5244+#ifdef FEAT_FOLDING
5245+ if (hasAnyFolding(curwin))
5246+ {
5247+ /* Count a fold for one screen line. */
5248+ lnum = curwin->w_topline;
5249+ while (n-- > 0 && lnum < curwin->w_botline - 1)
5250+ {
5251+ hasFolding(lnum, NULL, &lnum);
5252+ ++lnum;
5253+ }
5254+ n = lnum - curwin->w_topline;
5255+ }
5256+#endif
5257+ }
52275258 curwin->w_cursor.lnum = curwin->w_topline + n;
52285259 if (curwin->w_cursor.lnum > curbuf->b_ml.ml_line_count)
52295260 curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count;
diff -r 7edf9b6e4c36 -r 4102fb4ea781 src/os_mac.c
--- a/src/os_mac.c Wed Jun 16 11:19:22 2004 +0000
+++ b/src/os_mac.c Sun Jun 20 12:51:53 2004 +0000
@@ -527,7 +527,7 @@
527527 */
528528 EventRecord theEvent;
529529
530- if (EventAvail (keyDownMask, &theEvent))
530+ if (EventAvail(keyDownMask, &theEvent))
531531 if ((theEvent.message & charCodeMask) == Ctrl_C && ctrl_c_interrupts)
532532 got_int = TRUE;
533533 #if 0
diff -r 7edf9b6e4c36 -r 4102fb4ea781 src/os_msdos.c
--- a/src/os_msdos.c Wed Jun 16 11:19:22 2004 +0000
+++ b/src/os_msdos.c Sun Jun 20 12:51:53 2004 +0000
@@ -2987,7 +2987,12 @@
29872987 mch_can_exe(name)
29882988 char_u *name;
29892989 {
2990- return (searchpath(name) != NULL);
2990+ char *p;
2991+
2992+ p = searchpath(name);
2993+ if (p == NULL || mch_isdir(p))
2994+ return FALSE;
2995+ return TRUE;
29912996 }
29922997 #endif
29932998
diff -r 7edf9b6e4c36 -r 4102fb4ea781 src/os_win32.c
--- a/src/os_win32.c Wed Jun 16 11:19:22 2004 +0000
+++ b/src/os_win32.c Sun Jun 20 12:51:53 2004 +0000
@@ -1519,29 +1519,45 @@
15191519 # include <shellapi.h> /* required for FindExecutable() */
15201520 #endif
15211521
1522+/*
1523+ * Return TRUE if "name" is in $PATH.
1524+ * TODO: Should also check if it's really executable.
1525+ */
15221526 static int
15231527 executable_exists(char *name)
15241528 {
1525- char location[2 * _MAX_PATH + 2];
1526- char widename[2 * _MAX_PATH];
1527-
1528- /* There appears to be a bug in FindExecutableA() on Windows NT.
1529- * Use FindExecutableW() instead... */
1530- if (g_PlatformId == VER_PLATFORM_WIN32_NT)
1529+ char *dum;
1530+ char fname[_MAX_PATH];
1531+
1532+#ifdef FEAT_MBYTE
1533+ if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
15311534 {
1532- MultiByteToWideChar(CP_ACP, 0, (LPCTSTR)name, -1,
1533- (LPWSTR)widename, _MAX_PATH);
1534- if (FindExecutableW((LPCWSTR)widename, (LPCWSTR)"",
1535- (LPWSTR)location) > (HINSTANCE)32)
1536- return TRUE;
1535+ WCHAR *p = enc_to_ucs2(name, NULL);
1536+ WCHAR fnamew[_MAX_PATH];
1537+ WCHAR *dumw;
1538+ long n;
1539+
1540+ if (p != NULL)
1541+ {
1542+ n = (long)SearchPathW(NULL, p, NULL, _MAX_PATH, fnamew, &dumw);
1543+ vim_free(p);
1544+ if (n > 0 || GetLastError() != ERROR_CALL_NOT_IMPLEMENTED)
1545+ {
1546+ if (n == 0)
1547+ return FALSE;
1548+ if (GetFileAttributesW(fnamew) & FILE_ATTRIBUTE_DIRECTORY)
1549+ return FALSE;
1550+ return TRUE;
1551+ }
1552+ /* Retry with non-wide function (for Windows 98). */
1553+ }
15371554 }
1538- else
1539- {
1540- if (FindExecutableA((LPCTSTR)name, (LPCTSTR)"",
1541- (LPTSTR)location) > (HINSTANCE)32)
1542- return TRUE;
1543- }
1544- return FALSE;
1555+#endif
1556+ if (SearchPath(NULL, name, NULL, _MAX_PATH, fname, &dum) == 0)
1557+ return FALSE;
1558+ if (mch_isdir(fname))
1559+ return FALSE;
1560+ return TRUE;
15451561 }
15461562
15471563 #ifdef FEAT_GUI_W32
diff -r 7edf9b6e4c36 -r 4102fb4ea781 src/po/Makefile
--- a/src/po/Makefile Wed Jun 16 11:19:22 2004 +0000
+++ b/src/po/Makefile Sun Jun 20 12:51:53 2004 +0000
@@ -97,8 +97,8 @@
9797 # Convert ru.po to create ru.cp1251.po.
9898 ru.cp1251.po: ru.po
9999 rm -f ru.cp1251.po
100- iconv -f koi8-r -t cp1251 ru.po | \
101- sed -e 's/charset=koi8-r/charset=cp1251/' -e 's/# Original translations/# Generated from ru.po, DO NOT EDIT/' > ru.cp1251.po
100+ iconv -f utf-8 -t cp1251 ru.po | \
101+ sed -e 's/charset=utf-8/charset=cp1251/' -e 's/# Original translations/# Generated from ru.po, DO NOT EDIT/' > ru.cp1251.po
102102
103103 check:
104104 @if test "x" = "x$(prefix)"; then \
diff -r 7edf9b6e4c36 -r 4102fb4ea781 src/po/ru.cp1251.po
--- a/src/po/ru.cp1251.po Wed Jun 16 11:19:22 2004 +0000
+++ b/src/po/ru.cp1251.po Sun Jun 20 12:51:53 2004 +0000
@@ -9,10 +9,10 @@
99 #
1010 msgid ""
1111 msgstr ""
12-"Project-Id-Version: Vim 6.3a\n"
12+"Project-Id-Version: Vim 6.3\n"
1313 "Report-Msgid-Bugs-To: \n"
14-"POT-Creation-Date: 2004-05-10 21:37+0400\n"
15-"PO-Revision-Date: 2004-05-10 21:37+0400\n"
14+"POT-Creation-Date: 2004-06-15 09:39+0400\n"
15+"PO-Revision-Date: 2004-05-19 00:23+0400\n"
1616 "Last-Translator: vassily ragosin <vrr@users.sourceforge.net>\n"
1717 "Language-Team: vassily ragosin <vrr@users.sourceforge.net>\n"
1818 "MIME-Version: 1.0\n"
@@ -27,172 +27,172 @@
2727 msgid "E83: Cannot allocate buffer, using other one..."
2828 msgstr "E83: Íåâîçìîæíî âûäåëèòü ïàìÿòü äëÿ áóôåðà, èñïîëüçóåì äðóãîé áóôåð..."
2929
30-#: buffer.c:805
30+#: buffer.c:808
3131 #, c-format
3232 msgid "E515: No buffers were unloaded"
3333 msgstr "E515: Íè îäèí áóôåð íå áûë âûãðóæåí èç ïàìÿòè"
3434
35-#: buffer.c:807
35+#: buffer.c:810
3636 #, c-format
3737 msgid "E516: No buffers were deleted"
3838 msgstr "E516: Íè îäèí áóôåð íå áûë óäàë¸í"
3939
40-#: buffer.c:809
40+#: buffer.c:812
4141 #, c-format
4242 msgid "E517: No buffers were wiped out"
4343 msgstr "E517: Íè îäèí áóôåð íå áûë î÷èùåí"
4444
45-#: buffer.c:817
45+#: buffer.c:820
4646 msgid "1 buffer unloaded"
4747 msgstr "Îäèí áóôåð âûãðóæåí èç ïàìÿòè"
4848
49-#: buffer.c:819
49+#: buffer.c:822
5050 #, c-format
5151 msgid "%d buffers unloaded"
5252 msgstr "Âñåãî âûãðóæåíî áóôåðîâ èç ïàìÿòè: %d"
5353
54-#: buffer.c:824
54+#: buffer.c:827
5555 msgid "1 buffer deleted"
5656 msgstr "Îäèí áóôåð óäàë¸í"
5757
58-#: buffer.c:826
58+#: buffer.c:829
5959 #, c-format
6060 msgid "%d buffers deleted"
6161 msgstr "Âñåãî óäàëåíî áóôåðîâ: %d"
6262
63-#: buffer.c:831
63+#: buffer.c:834
6464 msgid "1 buffer wiped out"
6565 msgstr "Îäèí áóôåð î÷èùåí"
6666
67-#: buffer.c:833
67+#: buffer.c:836
6868 #, c-format
6969 msgid "%d buffers wiped out"
7070 msgstr "Âñåãî î÷èùåíî áóôåðîâ: %d"
7171
72-#: buffer.c:894
72+#: buffer.c:897
7373 msgid "E84: No modified buffer found"
7474 msgstr "E84: Èçìåí¸ííûõ áóôåðîâ íå îáíàðóæåíî"
7575
7676 #. back where we started, didn't find anything.
77-#: buffer.c:933
77+#: buffer.c:936
7878 msgid "E85: There is no listed buffer"
7979 msgstr "E85: Áóôåðû â ñïèñêå îòñóòñòâóþò"
8080
81-#: buffer.c:945
81+#: buffer.c:948
8282 #, c-format
8383 msgid "E86: Buffer %ld does not exist"
8484 msgstr "E86: Áóôåð %ld íå ñóùåñòâóåò"
8585
86-#: buffer.c:948
86+#: buffer.c:951
8787 msgid "E87: Cannot go beyond last buffer"
8888 msgstr "E87: Ýòî ïîñëåäíèé áóôåð"
8989
90-#: buffer.c:950
90+#: buffer.c:953
9191 msgid "E88: Cannot go before first buffer"
9292 msgstr "E88: Ýòî ïåðâûé áóôåð"
9393
94-#: buffer.c:988
94+#: buffer.c:991
9595 #, c-format
9696 msgid "E89: No write since last change for buffer %ld (add ! to override)"
9797 msgstr "E89: Èçìåíåíèÿ â áóôåðå %ld íå ñîõðàíåíû (!, ÷òîáû îáîéòè ïðîâåðêó)"
9898
99-#: buffer.c:1005
99+#: buffer.c:1008
100100 msgid "E90: Cannot unload last buffer"
101101 msgstr "E90: Íåâîçìîæíî âûãðóçèòü èç ïàìÿòè ïîñëåäíèé áóôåð"
102102
103-#: buffer.c:1538
103+#: buffer.c:1544
104104 msgid "W14: Warning: List of file names overflow"
105105 msgstr "W14: Ïðåäóïðåæäåíèå: ïåðåïîëíåíèå ñïèñêà èì¸í ôàéëîâ"
106106
107-#: buffer.c:1709
107+#: buffer.c:1716
108108 #, c-format
109109 msgid "E92: Buffer %ld not found"
110110 msgstr "E92: Áóôåð %ld íå íàéäåí"
111111
112-#: buffer.c:1940
112+#: buffer.c:1947
113113 #, c-format
114114 msgid "E93: More than one match for %s"
115115 msgstr "E93: Íåñêîëüêî ñîîòâåòñòâèé äëÿ %s"
116116
117-#: buffer.c:1942
117+#: buffer.c:1949
118118 #, c-format
119119 msgid "E94: No matching buffer for %s"
120120 msgstr "E94: Íåò ñîîòâåòñòâóþùåãî %s áóôåðà"
121121
122-#: buffer.c:2337
122+#: buffer.c:2344
123123 #, c-format
124124 msgid "line %ld"
125125 msgstr "ñòðîêà %ld"
126126
127-#: buffer.c:2420
127+#: buffer.c:2429
128128 msgid "E95: Buffer with this name already exists"
129129 msgstr "E95: Áóôåð ñ òàêèì èìåíåì óæå ñóùåñòâóåò"
130130
131-#: buffer.c:2713
131+#: buffer.c:2724
132132 msgid " [Modified]"
133133 msgstr " [Èçìåí¸í]"
134134
135-#: buffer.c:2718
135+#: buffer.c:2729
136136 msgid "[Not edited]"
137137 msgstr "[Íå ðåäàêòèðîâàëñÿ]"
138138
139-#: buffer.c:2723
139+#: buffer.c:2734
140140 msgid "[New file]"
141141 msgstr "[Íîâûé ôàéë]"
142142
143-#: buffer.c:2724
143+#: buffer.c:2735
144144 msgid "[Read errors]"
145145 msgstr "[Îøèáêè ÷òåíèÿ]"
146146
147-#: buffer.c:2726 fileio.c:2112
147+#: buffer.c:2737 fileio.c:2124
148148 msgid "[readonly]"
149149 msgstr "[òîëüêî äëÿ ÷òåíèÿ]"
150150
151-#: buffer.c:2747
151+#: buffer.c:2758
152152 #, c-format
153153 msgid "1 line --%d%%--"
154154 msgstr "Îäíà ñòðîêà --%d%%--"
155155
156-#: buffer.c:2749
156+#: buffer.c:2760
157157 #, c-format
158158 msgid "%ld lines --%d%%--"
159159 msgstr "%ld ñòð. --%d%%--"
160160
161-#: buffer.c:2756
161+#: buffer.c:2767
162162 #, c-format
163163 msgid "line %ld of %ld --%d%%-- col "
164164 msgstr "ñòð. %ld èç %ld --%d%%-- êîë. "
165165
166-#: buffer.c:2864
166+#: buffer.c:2875
167167 msgid "[No file]"
168168 msgstr "[Íåò ôàéëà]"
169169
170170 #. must be a help buffer
171-#: buffer.c:2904
171+#: buffer.c:2915
172172 msgid "help"
173173 msgstr "ñïðàâêà"
174174
175-#: buffer.c:3463 screen.c:5075
175+#: buffer.c:3474 screen.c:5079
176176 msgid "[help]"
177177 msgstr "[ñïðàâêà]"
178178
179-#: buffer.c:3495 screen.c:5081
179+#: buffer.c:3506 screen.c:5085
180180 msgid "[Preview]"
181181 msgstr "[Ïðåäïðîñìîòð]"
182182
183-#: buffer.c:3775
183+#: buffer.c:3786
184184 msgid "All"
185185 msgstr "Âåñü"
186186
187-#: buffer.c:3775
187+#: buffer.c:3786
188188 msgid "Bot"
189189 msgstr "Âíèçó"
190190
191-#: buffer.c:3777
191+#: buffer.c:3788
192192 msgid "Top"
193193 msgstr "Íàâåðõó"
194194
195-#: buffer.c:4523
195+#: buffer.c:4536
196196 #, c-format
197197 msgid ""
198198 "\n"
@@ -201,15 +201,15 @@
201201 "\n"
202202 "# Ñïèñîê áóôåðîâ:\n"
203203
204-#: buffer.c:4556
204+#: buffer.c:4569
205205 msgid "[Error List]"
206206 msgstr "[Ñïèñîê îøèáîê]"
207207
208-#: buffer.c:4569 memline.c:1520
208+#: buffer.c:4582 memline.c:1521
209209 msgid "[No File]"
210210 msgstr "[Íåò ôàéëà]"
211211
212-#: buffer.c:4882
212+#: buffer.c:4895
213213 msgid ""
214214 "\n"
215215 "--- Signs ---"
@@ -217,12 +217,12 @@
217217 "\n"
218218 "--- Çíà÷êè ---"
219219
220-#: buffer.c:4901
220+#: buffer.c:4914
221221 #, c-format
222222 msgid "Signs for %s:"
223223 msgstr "Çíà÷êè äëÿ %s:"
224224
225-#: buffer.c:4907
225+#: buffer.c:4920
226226 #, c-format
227227 msgid " line=%ld id=%d name=%s"
228228 msgstr " ñòðîêà=%ld id=%d èìÿ=%s"
@@ -473,7 +473,7 @@
473473 #. * this way has the compelling advantage that translations need not to
474474 #. * be touched at all. See below what 'ok' and 'ync' are used for.
475475 #.
476-#: eval.c:3687 gui.c:4382 gui_gtk.c:2059
476+#: eval.c:3687 gui.c:4385 gui_gtk.c:2059
477477 msgid "&Ok"
478478 msgstr "&Ok"
479479
@@ -498,121 +498,121 @@
498498 msgid "E655: Too many symbolic links (cycle?)"
499499 msgstr "E656: Ñëèøêîì ìíîãî ñèìâîëè÷åñêèõ ññûëîê (öèêë?)"
500500
501-#: eval.c:6609
501+#: eval.c:6626
502502 msgid "E240: No connection to Vim server"
503503 msgstr "E240: Íåò ñâÿçè ñ ñåðâåðîì Vim"
504504
505-#: eval.c:6706
505+#: eval.c:6724
506506 msgid "E277: Unable to read a server reply"
507507 msgstr "E227: Ñåðâåð íå îòâå÷àåò"
508508
509-#: eval.c:6734
509+#: eval.c:6752
510510 msgid "E258: Unable to send to client"
511511 msgstr "E258: Íå ìîãó îòâåòèòü êëèåíòó"
512512
513-#: eval.c:6782
513+#: eval.c:6800
514514 #, c-format
515515 msgid "E241: Unable to send to %s"
516516 msgstr "E241: Íå ìîãó îòïðàâèòü ñîîáùåíèå äëÿ %s"
517517
518-#: eval.c:6882
518+#: eval.c:6900
519519 msgid "(Invalid)"
520520 msgstr "(Íåïðàâèëüíî)"
521521
522-#: eval.c:8060
522+#: eval.c:8078
523523 #, c-format
524524 msgid "E121: Undefined variable: %s"
525525 msgstr "E121: Íåîïðåäåëåííàÿ ïåðåìåííàÿ: %s"
526526
527-#: eval.c:8492
527+#: eval.c:8510
528528 #, c-format
529529 msgid "E461: Illegal variable name: %s"
530530 msgstr "E461: Íåäîïóñòèìîå èìÿ ïåðåìåííîé: %s"
531531
532-#: eval.c:8784
532+#: eval.c:8802
533533 #, c-format
534534 msgid "E122: Function %s already exists, add ! to replace it"
535535 msgstr "E122: Ôóíêöèÿ %s óæå ñóùåñòâóåò. Äîáàâüòå !, ÷òîáû çàìåíèòü å¸."
536536
537-#: eval.c:8857
537+#: eval.c:8875
538538 #, c-format
539539 msgid "E123: Undefined function: %s"
540540 msgstr "E123: Íåîïðåäåëåííàÿ ôóíêöèÿ: %s"
541541
542-#: eval.c:8870
542+#: eval.c:8888
543543 #, c-format
544544 msgid "E124: Missing '(': %s"
545545 msgstr "E124: Ïðîïóùåíà '(': %s"
546546
547-#: eval.c:8903
547+#: eval.c:8921
548548 #, c-format
549549 msgid "E125: Illegal argument: %s"
550550 msgstr "E125: Íåäîïóñòèìûé ïàðàìåòð: %s"
551551
552-#: eval.c:8982
552+#: eval.c:9000
553553 msgid "E126: Missing :endfunction"
554554 msgstr "E126: Ïðîïóùåíà êîìàíäà :endfunction"
555555
556-#: eval.c:9089
556+#: eval.c:9107
557557 #, c-format
558558 msgid "E127: Cannot redefine function %s: It is in use"
559559 msgstr "E127: Íåâîçìîæíî ïåðåîïðåäåëèòü ôóíêöèþ %s, îíà èñïîëüçóåòñÿ"
560560
561-#: eval.c:9159
561+#: eval.c:9177
562562 msgid "E129: Function name required"
563563 msgstr "E129: Òðåáóåòñÿ èìÿ ôóíêöèè"
564564
565-#: eval.c:9210
565+#: eval.c:9228
566566 #, c-format
567567 msgid "E128: Function name must start with a capital: %s"
568568 msgstr "E128: Èìÿ ôóíêöèè äîëæíî íà÷èíàòüñÿ ñ ïðîïèñíîé áóêâû: %s"
569569
570-#: eval.c:9402
570+#: eval.c:9420
571571 #, c-format
572572 msgid "E130: Undefined function: %s"
573573 msgstr "E130: Ôóíêöèÿ %s íå îïðåäåëåíà"
574574
575-#: eval.c:9407
575+#: eval.c:9425
576576 #, c-format
577577 msgid "E131: Cannot delete function %s: It is in use"
578578 msgstr "E131: Íåâîçìîæíî óäàëèòü ôóíêöèþ %s, îíà èñïîëüçóåòñÿ"
579579
580-#: eval.c:9455
580+#: eval.c:9473
581581 msgid "E132: Function call depth is higher than 'maxfuncdepth'"
582582 msgstr "E132: Ãëóáèíà âûçîâà ôóíêöèè áîëüøå, ÷åì çíà÷åíèå 'maxfuncdepth'"
583583
584584 #. always scroll up, don't overwrite
585-#: eval.c:9508
585+#: eval.c:9526
586586 #, c-format
587587 msgid "calling %s"
588588 msgstr "âûçîâ %s"
589589
590-#: eval.c:9570
590+#: eval.c:9588
591591 #, c-format
592592 msgid "%s aborted"
593593 msgstr "%s ïðåðâàíà"
594594
595-#: eval.c:9572
595+#: eval.c:9590
596596 #, c-format
597597 msgid "%s returning #%ld"
598598 msgstr "%s âîçâðàùàåò #%ld"
599599
600-#: eval.c:9579
600+#: eval.c:9597
601601 #, c-format
602602 msgid "%s returning \"%s\""
603603 msgstr "%s âîçâðàùàåò \"%s\""
604604
605605 #. always scroll up, don't overwrite
606-#: eval.c:9595 ex_cmds2.c:2365
606+#: eval.c:9613 ex_cmds2.c:2370
607607 #, c-format
608608 msgid "continuing in %s"
609609 msgstr "ïðîäîëæåíèå â %s"
610610
611-#: eval.c:9621
611+#: eval.c:9639
612612 msgid "E133: :return not inside a function"
613613 msgstr "E133: êîìàíäà :return âíå ôóíêöèè"
614614
615-#: eval.c:9952
615+#: eval.c:9970
616616 #, c-format
617617 msgid ""
618618 "\n"
@@ -728,7 +728,7 @@
728728 msgid "Illegal starting char"
729729 msgstr "Íåäîïóñòèìûé íà÷àëüíûé ñèìâîë"
730730
731-#: ex_cmds.c:2097 ex_cmds.c:2362 ex_cmds2.c:763
731+#: ex_cmds.c:2097 ex_cmds2.c:761
732732 msgid "Save As"
733733 msgstr "Ñîõðàíèòü êàê"
734734
@@ -756,11 +756,11 @@
756756 msgid "E141: No file name for buffer %ld"
757757 msgstr "E141: Áóôåð %ld íå ñâÿçàí ñ èìåíåì ôàéëà"
758758
759-#: ex_cmds.c:2405
759+#: ex_cmds.c:2406
760760 msgid "E142: File not written: Writing is disabled by 'write' option"
761761 msgstr "E142: Ôàéë íå ñîõðàí¸í: çàïèñü îòêëþ÷åíà îïöèåé 'write'"
762762
763-#: ex_cmds.c:2425
763+#: ex_cmds.c:2426
764764 #, c-format
765765 msgid ""
766766 "'readonly' option is set for \"%.*s\".\n"
@@ -769,68 +769,68 @@
769769 "Äëÿ \"%.*s\" âêëþ÷åíà îïöèÿ 'readonly'.\n"
770770 "Çàïèñàòü?"
771771
772-#: ex_cmds.c:2597
772+#: ex_cmds.c:2599
773773 msgid "Edit File"
774774 msgstr "Ðåäàêòèðîâàíèå ôàéëà"
775775
776-#: ex_cmds.c:3205
776+#: ex_cmds.c:3206
777777 #, c-format
778778 msgid "E143: Autocommands unexpectedly deleted new buffer %s"
779779 msgstr "E143: Àâòîêîìàíäû íåîæèäàííî óáèëè íîâûé áóôåð %s"
780780
781-#: ex_cmds.c:3339
781+#: ex_cmds.c:3340
782782 msgid "E144: non-numeric argument to :z"
783783 msgstr "E144: Ïàðàìåòð êîìàíäû :z äîëæåí áûòü ÷èñëîì"
784784
785-#: ex_cmds.c:3424
785+#: ex_cmds.c:3425
786786 msgid "E145: Shell commands not allowed in rvim"
787787 msgstr "E145: Èñïîëüçîâàíèå êîìàíä îáîëî÷êè íå äîïóñêàåòñÿ â rvim."
788788
789-#: ex_cmds.c:3531
789+#: ex_cmds.c:3532
790790 msgid "E146: Regular expressions can't be delimited by letters"
791791 msgstr "E146: Ðåãóëÿðíûå âûðàæåíèÿ íå ìîãóò ðàçäåëÿòüñÿ áóêâàìè"
792792
793-#: ex_cmds.c:3877
793+#: ex_cmds.c:3878
794794 #, c-format
795795 msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
796796 msgstr "çàìåíèòü íà %s? (y/n/a/q/l/^E/^Y)"
797797
798-#: ex_cmds.c:4270
798+#: ex_cmds.c:4271
799799 msgid "(Interrupted) "
800800 msgstr "(Ïðåðâàíî)"
801801
802-#: ex_cmds.c:4274
802+#: ex_cmds.c:4275
803803 msgid "1 substitution"
804804 msgstr "Îäíà çàìåíà"
805805
806-#: ex_cmds.c:4276
806+#: ex_cmds.c:4277
807807 #, c-format
808808 msgid "%ld substitutions"
809809 msgstr "%ld çàìåí"
810810
811-#: ex_cmds.c:4279
811+#: ex_cmds.c:4280
812812 msgid " on 1 line"
813813 msgstr " â îäíîé ñòðîêå"
814814
815-#: ex_cmds.c:4281
815+#: ex_cmds.c:4282
816816 #, c-format
817817 msgid " on %ld lines"
818818 msgstr " â %ld ñòð."
819819
820-#: ex_cmds.c:4332
820+#: ex_cmds.c:4333
821821 msgid "E147: Cannot do :global recursive"
822822 msgstr "E147: Êîìàíäà :global íå ìîæåò áûòü ðåêóðñèâíîé"
823823
824-#: ex_cmds.c:4367
824+#: ex_cmds.c:4368
825825 msgid "E148: Regular expression missing from global"
826826 msgstr "E148: Â êîìàíäå :global ïðîïóùåíî ðåãóëÿðíîå âûðàæåíèå"
827827
828-#: ex_cmds.c:4416
828+#: ex_cmds.c:4417
829829 #, c-format
830830 msgid "Pattern found in every line: %s"
831831 msgstr "Ñîîòâåòñòâèå øàáëîíó íàéäåíî íà êàæäîé ñòðîêå: %s"
832832
833-#: ex_cmds.c:4497
833+#: ex_cmds.c:4498
834834 #, c-format
835835 msgid ""
836836 "\n"
@@ -841,96 +841,96 @@
841841 "# Ïîñëåäíÿÿ ñòðîêà äëÿ çàìåíû:\n"
842842 "$"
843843
844-#: ex_cmds.c:4598
844+#: ex_cmds.c:4599
845845 msgid "E478: Don't panic!"
846846 msgstr "E478: Ñïîêîéñòâèå, òîëüêî ñïîêîéñòâèå!"
847847
848-#: ex_cmds.c:4650
848+#: ex_cmds.c:4651
849849 #, c-format
850850 msgid "E661: Sorry, no '%s' help for %s"
851851 msgstr "E661: ê ñîæàëåíèþ, ñïðàâêà '%s' äëÿ %s îòñóòñòâóåò"
852852
853-#: ex_cmds.c:4653
853+#: ex_cmds.c:4654
854854 #, c-format
855855 msgid "E149: Sorry, no help for %s"
856856 msgstr "E149: Ê ñîæàëåíèþ ñïðàâêà äëÿ %s îòñóòñòâóåò"
857857
858-#: ex_cmds.c:4687
858+#: ex_cmds.c:4688
859859 #, c-format
860860 msgid "Sorry, help file \"%s\" not found"
861861 msgstr "Èçâèíèòå, ôàéë ñïðàâêè \"%s\" íå íàéäåí"
862862
863-#: ex_cmds.c:5170
863+#: ex_cmds.c:5191
864864 #, c-format
865865 msgid "E150: Not a directory: %s"
866866 msgstr "E150: %s íå ÿâëÿåòñÿ êàòàëîãîì"
867867
868-#: ex_cmds.c:5309
868+#: ex_cmds.c:5330
869869 #, c-format
870870 msgid "E152: Cannot open %s for writing"
871871 msgstr "E152: Íåâîçìîæíî îòêðûòü %s äëÿ çàïèñè"
872872
873-#: ex_cmds.c:5345
873+#: ex_cmds.c:5366
874874 #, c-format
875875 msgid "E153: Unable to open %s for reading"
876876 msgstr "E153: Íåâîçìîæíî îòêðûòü %s äëÿ ÷òåíèÿ"
877877
878-#: ex_cmds.c:5367
878+#: ex_cmds.c:5388
879879 #, c-format
880880 msgid "E670: Mix of help file encodings within a language: %s"
881881 msgstr "E670: Ôàéëû ñïðàâêè èñïîëüçóþò ðàçíûå êîäèðîâêè äëÿ îäíîãî ÿçûêà: %s"
882882
883-#: ex_cmds.c:5445
883+#: ex_cmds.c:5466
884884 #, c-format
885885 msgid "E154: Duplicate tag \"%s\" in file %s"
886886 msgstr "E154: Ïîâòîðÿþùàÿñÿ ìåòêà \"%s\" â ôàéëå %s"
887887
888-#: ex_cmds.c:5557
888+#: ex_cmds.c:5578
889889 #, c-format
890890 msgid "E160: Unknown sign command: %s"
891891 msgstr "E160: Íåèçâåñòíàÿ êîìàíäà çíà÷êà %s"
892892
893-#: ex_cmds.c:5577
893+#: ex_cmds.c:5598
894894 msgid "E156: Missing sign name"
895895 msgstr "E156: Ïðîïóùåíî èìÿ çíà÷êà"
896896
897-#: ex_cmds.c:5623
897+#: ex_cmds.c:5644
898898 msgid "E612: Too many signs defined"
899899 msgstr "E612: Îïðåäåëåíî ñëèøêîì ìíîãî çíà÷êîâ"
900900
901-#: ex_cmds.c:5691
901+#: ex_cmds.c:5712
902902 #, c-format
903903 msgid "E239: Invalid sign text: %s"
904904 msgstr "E239: Íåïðàâèëüíûé òåêñò çíà÷êà: %s"
905905
906-#: ex_cmds.c:5722 ex_cmds.c:5913
906+#: ex_cmds.c:5743 ex_cmds.c:5934
907907 #, c-format
908908 msgid "E155: Unknown sign: %s"
909909 msgstr "E155: Íåèçâåñòíûé çíà÷îê: %s"
910910
911-#: ex_cmds.c:5771
911+#: ex_cmds.c:5792
912912 msgid "E159: Missing sign number"
913913 msgstr "E159: Ïðîïóùåí íîìåð çíà÷êà"
914914
915-#: ex_cmds.c:5853
915+#: ex_cmds.c:5874
916916 #, c-format
917917 msgid "E158: Invalid buffer name: %s"
918918 msgstr "E158: Íåïðàâèëüíîå èìÿ áóôåðà: %s"
919919
920-#: ex_cmds.c:5892
920+#: ex_cmds.c:5913
921921 #, c-format
922922 msgid "E157: Invalid sign ID: %ld"
923923 msgstr "E157: Íåïðàâèëüíûé ID çíà÷êà: %ld"
924924
925-#: ex_cmds.c:5962
925+#: ex_cmds.c:5983
926926 msgid " (NOT FOUND)"
927927 msgstr " (ÍÅ ÍÀÉÄÅÍÎ)"
928928
929-#: ex_cmds.c:5964
929+#: ex_cmds.c:5985
930930 msgid " (not supported)"
931931 msgstr " (íå ïîääåðæèâàåòñÿ)"
932932
933-#: ex_cmds.c:6063
933+#: ex_cmds.c:6084
934934 msgid "[Deleted]"
935935 msgstr "[Óäàëåíî]"
936936
@@ -938,7 +938,7 @@
938938 msgid "Entering Debug mode. Type \"cont\" to continue."
939939 msgstr "Âêëþ÷¸í ðåæèì îòëàäêè. Äëÿ ïðîäîëæåíèÿ íàáåðèòå \"cont\""
940940
941-#: ex_cmds2.c:96 ex_docmd.c:966
941+#: ex_cmds2.c:96 ex_docmd.c:968
942942 #, c-format
943943 msgid "line %ld: %s"
944944 msgstr "ñòðîêà %ld: %s"
@@ -972,7 +972,7 @@
972972 msgid "Save changes to \"%.*s\"?"
973973 msgstr "Ñîõðàíèòü èçìåíåíèÿ â \"%.*s\"?"
974974
975-#: ex_cmds2.c:788 ex_docmd.c:9378
975+#: ex_cmds2.c:788 ex_docmd.c:9398
976976 msgid "Untitled"
977977 msgstr "Áåç èìåíè"
978978
@@ -1003,168 +1003,168 @@
10031003 msgid "E666: compiler not supported: %s"
10041004 msgstr "E666: êîìïèëÿòîð íå ïîääåðæèâàåòñÿ: %s"
10051005
1006-#: ex_cmds2.c:1897
1006+#: ex_cmds2.c:1901
10071007 #, c-format
10081008 msgid "Searching for \"%s\" in \"%s\""
10091009 msgstr "Ïîèñê \"%s\" â \"%s\""
10101010
1011-#: ex_cmds2.c:1919
1011+#: ex_cmds2.c:1923
10121012 #, c-format
10131013 msgid "Searching for \"%s\""
10141014 msgstr "Ïîèñê \"%s\""
10151015
1016-#: ex_cmds2.c:1940
1016+#: ex_cmds2.c:1945
10171017 #, c-format
10181018 msgid "not found in 'runtimepath': \"%s\""
10191019 msgstr "íå íàéäåíî â 'runtimepath': \"%s\""
10201020
1021-#: ex_cmds2.c:1974
1021+#: ex_cmds2.c:1979
10221022 msgid "Source Vim script"
10231023 msgstr "Âûïîëíèòü ñöåíàðèé Vim"
10241024
1025-#: ex_cmds2.c:2164
1025+#: ex_cmds2.c:2169
10261026 #, c-format
10271027 msgid "Cannot source a directory: \"%s\""
10281028 msgstr "Íåëüçÿ ñ÷èòàòü êàòàëîã: \"%s\""
10291029
1030-#: ex_cmds2.c:2202
1030+#: ex_cmds2.c:2207
10311031 #, c-format
10321032 msgid "could not source \"%s\""
10331033 msgstr "íåâîçìîæíî ñ÷èòàòü \"%s\""
10341034
1035-#: ex_cmds2.c:2204
1035+#: ex_cmds2.c:2209
10361036 #, c-format
10371037 msgid "line %ld: could not source \"%s\""
10381038 msgstr "ñòðîêà %ld: íåâîçìîæíî ñ÷èòàòü \"%s\""
10391039
1040-#: ex_cmds2.c:2218
1040+#: ex_cmds2.c:2223
10411041 #, c-format
10421042 msgid "sourcing \"%s\""
10431043 msgstr "ñ÷èòûâàíèå ñöåíàðèÿ \"%s\""
10441044
1045-#: ex_cmds2.c:2220
1045+#: ex_cmds2.c:2225
10461046 #, c-format
10471047 msgid "line %ld: sourcing \"%s\""
10481048 msgstr "ñòðîêà %ld: ñ÷èòûâàíèå \"%s\""
10491049
1050-#: ex_cmds2.c:2363
1050+#: ex_cmds2.c:2368
10511051 #, c-format
10521052 msgid "finished sourcing %s"
10531053 msgstr "ñ÷èòûâàíèå ñöåíàðèÿ %s çàâåðøåíî"
10541054
1055-#: ex_cmds2.c:2707
1055+#: ex_cmds2.c:2712
10561056 msgid "W15: Warning: Wrong line separator, ^M may be missing"
10571057 msgstr ""
10581058 "W15: Ïðåäóïðåæäåíèå: íåïðàâèëüíûé ðàçäåëèòåëü ñòðîêè. Âîçìîæíî ïðîïóùåíî ^M"
10591059
1060-#: ex_cmds2.c:2756
1060+#: ex_cmds2.c:2761
10611061 msgid "E167: :scriptencoding used outside of a sourced file"
10621062 msgstr "E167: Êîìàíäà :scriptencoding èñïîëüçóåòñÿ âíå ôàéëà ñöåíàðèÿ"
10631063
1064-#: ex_cmds2.c:2789
1064+#: ex_cmds2.c:2794
10651065 msgid "E168: :finish used outside of a sourced file"
10661066 msgstr "E168: Êîìàíäà :finish èñïîëüçóåòñÿ âíå ôàéëà ñöåíàðèÿ"
10671067
1068-#: ex_cmds2.c:3238
1068+#: ex_cmds2.c:3243
10691069 #, c-format
10701070 msgid "Page %d"
10711071 msgstr "Ñòðàíèöà %d"
10721072
1073-#: ex_cmds2.c:3394
1073+#: ex_cmds2.c:3399
10741074 msgid "No text to be printed"
10751075 msgstr "Ïå÷àòàòü íå÷åãî"
10761076
1077-#: ex_cmds2.c:3472
1077+#: ex_cmds2.c:3477
10781078 #, c-format
10791079 msgid "Printing page %d (%d%%)"
10801080 msgstr "Ïå÷àòü ñòð. %d (%d%%)"
10811081
1082-#: ex_cmds2.c:3484
1082+#: ex_cmds2.c:3489
10831083 #, c-format
10841084 msgid " Copy %d of %d"
10851085 msgstr " Êîïèÿ %d èç %d"
10861086
1087-#: ex_cmds2.c:3542
1087+#: ex_cmds2.c:3547
10881088 #, c-format
10891089 msgid "Printed: %s"
10901090 msgstr "Íàïå÷àòàíî: %s"
10911091
1092-#: ex_cmds2.c:3549
1092+#: ex_cmds2.c:3554
10931093 #, c-format
10941094 msgid "Printing aborted"
10951095 msgstr "Ïå÷àòü ïðåêðàùåíà"
10961096
1097-#: ex_cmds2.c:3914
1097+#: ex_cmds2.c:3919
10981098 msgid "E455: Error writing to PostScript output file"
10991099 msgstr "E455: Îøèáêà çàïèñè â ôàéë PostScript"
11001100
1101-#: ex_cmds2.c:4189
1101+#: ex_cmds2.c:4194
11021102 #, c-format
11031103 msgid "E624: Can't open file \"%s\""
11041104 msgstr "E624: Íåâîçìîæíî îòêðûòü ôàéë \"%s\""
11051105
1106-#: ex_cmds2.c:4199 ex_cmds2.c:4824
1106+#: ex_cmds2.c:4204 ex_cmds2.c:4829
11071107 #, c-format
11081108 msgid "E457: Can't read PostScript resource file \"%s\""
11091109 msgstr "E457: Íåâîçìîæíî ïðî÷èòàòü ôàéë ðåñóðñîâ PostScript \"%s\""
11101110
1111-#: ex_cmds2.c:4207
1111+#: ex_cmds2.c:4212
11121112 #, c-format
11131113 msgid "E618: file \"%s\" is not a PostScript resource file"
11141114 msgstr "E618: ôàéë \"%s\" íå ÿâëÿåòñÿ ôàéëîì ðåñóðñîâ PostScript"
11151115
1116-#: ex_cmds2.c:4222 ex_cmds2.c:4242 ex_cmds2.c:4257 ex_cmds2.c:4279
1116+#: ex_cmds2.c:4227 ex_cmds2.c:4247 ex_cmds2.c:4262 ex_cmds2.c:4284
11171117 #, c-format
11181118 msgid "E619: file \"%s\" is not a supported PostScript resource file"
11191119 msgstr "E619: ôàéë \"%s\" íå ÿâëÿåòñÿ äîïóñòèìûì ôàéëîì ðåñóðñîâ PostScript"
11201120
1121-#: ex_cmds2.c:4309
1121+#: ex_cmds2.c:4314
11221122 #, c-format
11231123 msgid "E621: \"%s\" resource file has wrong version"
11241124 msgstr "E621: ôàéë ðåñóðñîâ \"%s\" íåèçâåñòíîé âåðñèè"
11251125
1126-#: ex_cmds2.c:4776
1126+#: ex_cmds2.c:4781
11271127 msgid "E324: Can't open PostScript output file"
11281128 msgstr "E324: Íåâîçìîæíî îòêðûòü ôàéë PostScript"
11291129
1130-#: ex_cmds2.c:4809
1130+#: ex_cmds2.c:4814
11311131 #, c-format
11321132 msgid "E456: Can't open file \"%s\""
11331133 msgstr "E456: Íåâîçìîæíî îòêðûòü ôàéë \"%s\""
11341134
1135-#: ex_cmds2.c:4928
1135+#: ex_cmds2.c:4933
11361136 msgid "E456: Can't find PostScript resource file \"prolog.ps\""
11371137 msgstr "E456: Ôàéë ðåñóðñîâ PostScript \"prolog.ps\" íå íàéäåí"
11381138
1139-#: ex_cmds2.c:4959
1139+#: ex_cmds2.c:4964
11401140 #, c-format
11411141 msgid "E456: Can't find PostScript resource file \"%s.ps\""
11421142 msgstr "E456: Ôàéë ðåñóðñîâ PostScript \"%s.ps\" íå íàéäåí"
11431143
1144-#: ex_cmds2.c:4977
1144+#: ex_cmds2.c:4982
11451145 #, c-format
11461146 msgid "E620: Unable to convert from multi-byte to \"%s\" encoding"
11471147 msgstr ""
11481148 "E620: Ïðåîáðàçîâàíèå èç ìóëüòèáàéòíûõ ñèìâîëîâ â êîäèðîâêó \"%s\" íåâîçìîæíî"
11491149
1150-#: ex_cmds2.c:5102
1150+#: ex_cmds2.c:5107
11511151 msgid "Sending to printer..."
11521152 msgstr "Îòïðàâêà íà ïå÷àòü..."
11531153
1154-#: ex_cmds2.c:5106
1154+#: ex_cmds2.c:5111
11551155 msgid "E365: Failed to print PostScript file"
11561156 msgstr "E365: Íå óäàëîñü âûïîëíèòü ïå÷àòü ôàéëà PostScript"
11571157
1158-#: ex_cmds2.c:5108
1158+#: ex_cmds2.c:5113
11591159 msgid "Print job sent."
11601160 msgstr "Çàäàíèå íà ïå÷àòü îòïðàâëåíî."
11611161
1162-#: ex_cmds2.c:5618
1162+#: ex_cmds2.c:5623
11631163 #, c-format
11641164 msgid "Current %slanguage: \"%s\""
11651165 msgstr "Àêòèâíûé %sÿçûê: \"%s\""
11661166
1167-#: ex_cmds2.c:5629
1167+#: ex_cmds2.c:5634
11681168 #, c-format
11691169 msgid "E197: Cannot set language to \"%s\""
11701170 msgstr "E197: Íåâîçìîæíî ñìåíèòü ÿçûê íà \"%s\""
@@ -1178,74 +1178,74 @@
11781178 msgid "E501: At end-of-file"
11791179 msgstr "E501: Â êîíöå ôàéëà"
11801180
1181-#: ex_docmd.c:669
1181+#: ex_docmd.c:670
11821182 msgid "E169: Command too recursive"
11831183 msgstr "E169: Cëèøêîì ðåêóðñèâíàÿ êîìàíäà"
11841184
1185-#: ex_docmd.c:1229
1185+#: ex_docmd.c:1232
11861186 #, c-format
11871187 msgid "E605: Exception not caught: %s"
11881188 msgstr "E605: Èñêëþ÷èòåëüíàÿ ñèòóàöèÿ íå îáðàáîòàíà: %s"
11891189
1190-#: ex_docmd.c:1317
1190+#: ex_docmd.c:1320
11911191 msgid "End of sourced file"
11921192 msgstr "Êîíåö ñ÷èòàííîãî ôàéëà"
11931193
1194-#: ex_docmd.c:1318
1194+#: ex_docmd.c:1321
11951195 msgid "End of function"
11961196 msgstr "Êîíåö ôóíêöèè"
11971197
1198-#: ex_docmd.c:1907
1198+#: ex_docmd.c:1910
11991199 msgid "E464: Ambiguous use of user-defined command"
12001200 msgstr "E464: Íåîäíîçíà÷íîå èñïîëüçîâàíèå êîìàíäû ïîëüçîâàòåëÿ"
12011201
1202-#: ex_docmd.c:1921
1202+#: ex_docmd.c:1924
12031203 msgid "E492: Not an editor command"
12041204 msgstr "E492: Ýòî íå êîìàíäà ðåäàêòîðà"
12051205
1206-#: ex_docmd.c:2028
1206+#: ex_docmd.c:2031
12071207 msgid "E493: Backwards range given"
12081208 msgstr "E493: Çàäàí îáðàòíûé äèàïàçîí"
12091209
1210-#: ex_docmd.c:2037
1210+#: ex_docmd.c:2040
12111211 msgid "Backwards range given, OK to swap"
12121212 msgstr "Çàäàí îáðàòíûé äèàïàçîí, ìåíÿåì ãðàíèöû ìåñòàìè"
12131213
1214-#: ex_docmd.c:2160
1214+#: ex_docmd.c:2163
12151215 msgid "E494: Use w or w>>"
12161216 msgstr "E494: Èñïîëüçóéòå w èëè w>>"
12171217
1218-#: ex_docmd.c:3786
1218+#: ex_docmd.c:3789
12191219 msgid "E319: Sorry, the command is not available in this version"
12201220 msgstr "E319: Èçâèíèòå, ýòà êîìàíäà íåäîñòóïíà â äàííîé âåðñèè"
12211221
1222-#: ex_docmd.c:3989
1222+#: ex_docmd.c:3992
12231223 msgid "E172: Only one file name allowed"
12241224 msgstr "E172: Ðàçðåøåíî èñïîëüçîâàòü òîëüêî îäíî èìÿ ôàéëà"
12251225
1226-#: ex_docmd.c:4569
1226+#: ex_docmd.c:4572
12271227 msgid "1 more file to edit. Quit anyway?"
12281228 msgstr "1 ôàéë îæèäàåò ðåäàêòèðîâàíèÿ. Âûéòè?"
12291229
1230-#: ex_docmd.c:4572
1230+#: ex_docmd.c:4575
12311231 #, c-format
12321232 msgid "%d more files to edit. Quit anyway?"
12331233 msgstr "Åñòü íåîòðåäàêòèðîâàííûå ôàéëû (%d). Âûéòè?"
12341234
1235-#: ex_docmd.c:4579
1235+#: ex_docmd.c:4582
12361236 msgid "E173: 1 more file to edit"
12371237 msgstr "E173: 1 ôàéë îæèäàåò ðåäàêòèðîâàíèÿ."
12381238
1239-#: ex_docmd.c:4581
1239+#: ex_docmd.c:4584
12401240 #, c-format
12411241 msgid "E173: %ld more files to edit"
12421242 msgstr "E173: Åñòü íåîòðåäàêòèðîâàííûå ôàéëû (%d)."
12431243
1244-#: ex_docmd.c:4676
1244+#: ex_docmd.c:4679
12451245 msgid "E174: Command already exists: add ! to replace it"
12461246 msgstr "E174: Êîìàíäà óæå ñóùåñòâóåò. Äîáàâüòå ! äëÿ çàìåíû."
12471247
1248-#: ex_docmd.c:4787
1248+#: ex_docmd.c:4790
12491249 msgid ""
12501250 "\n"
12511251 " Name Args Range Complete Definition"
@@ -1253,177 +1253,177 @@
12531253 "\n"
12541254 " Èìÿ Ïàðàì. Äèàï. Äîïîëí. Îïðåäåëåíèå"
12551255
1256-#: ex_docmd.c:4876
1256+#: ex_docmd.c:4879
12571257 msgid "No user-defined commands found"
12581258 msgstr "Êîìàíäû, îïðåäåë¸ííûå ïîëüçîâàòåëåì, íå îáíàðóæåíû."
12591259
1260-#: ex_docmd.c:4908
1260+#: ex_docmd.c:4911
12611261 msgid "E175: No attribute specified"
12621262 msgstr "E175: ïàðàìåòð íå çàäàí"
12631263
1264-#: ex_docmd.c:4960
1264+#: ex_docmd.c:4963
12651265 msgid "E176: Invalid number of arguments"
12661266 msgstr "E176: Íåïðàâèëüíîå êîëè÷åñòâî ïàðàìåòðîâ"
12671267
1268-#: ex_docmd.c:4975
1268+#: ex_docmd.c:4978
12691269 msgid "E177: Count cannot be specified twice"
12701270 msgstr "E177: ×èñëî-ïðèñòàâêó íåëüçÿ óêàçûâàòü äâàæäû"
12711271
1272-#: ex_docmd.c:4985
1272+#: ex_docmd.c:4988
12731273 msgid "E178: Invalid default value for count"
12741274 msgstr "E178: Íåïðàâèëüíîå çíà÷åíèå ÷èñëà-ïðèñòàâêè ïî óìîë÷àíèþ"
12751275
1276-#: ex_docmd.c:5016
1276+#: ex_docmd.c:5019
12771277 msgid "E179: argument required for complete"
12781278 msgstr "E179: äëÿ çàâåðøåíèÿ òðåáóåòñÿ óêàçàòü ïàðàìåòð"
12791279
1280-#: ex_docmd.c:5048
1280+#: ex_docmd.c:5051
12811281 #, c-format
12821282 msgid "E180: Invalid complete value: %s"
12831283 msgstr "E180: Íåïðàâèëüíîå çíà÷åíèå äîïîëíåíèÿ: %s"
12841284
1285-#: ex_docmd.c:5057
1285+#: ex_docmd.c:5060
12861286 msgid "E468: Completion argument only allowed for custom completion"
12871287 msgstr ""
12881288 "E468: Ïàðàìåòð àâòîäîïîëíåíèÿ ìîæíî èñïîëüçîâàòü òîëüêî ñ îñîáûì äîïîëíåíèåì"
12891289
1290-#: ex_docmd.c:5063
1290+#: ex_docmd.c:5066
12911291 msgid "E467: Custom completion requires a function argument"
12921292 msgstr "E467: Îñîáîå äîïîëíåíèå òðåáóåò óêàçàíèÿ ïàðàìåòðà ôóíêöèè"
12931293
1294-#: ex_docmd.c:5074
1294+#: ex_docmd.c:5077
12951295 #, c-format
12961296 msgid "E181: Invalid attribute: %s"
12971297 msgstr "E181: Íåïðàâèëüíûé àòðèáóò: %s"
12981298
1299-#: ex_docmd.c:5117
1299+#: ex_docmd.c:5120
13001300 msgid "E182: Invalid command name"
13011301 msgstr "E182: Íåïðàâèëüíîå èìÿ êîìàíäû"
13021302
1303-#: ex_docmd.c:5132
1303+#: ex_docmd.c:5135
13041304 msgid "E183: User defined commands must start with an uppercase letter"
13051305 msgstr "E183: Êîìàíäà ïîëüçîâàòåëÿ äîëæíà íà÷èíàòüñÿ ñ çàãëàâíîé áóêâû"
13061306
1307-#: ex_docmd.c:5203
1307+#: ex_docmd.c:5206
13081308 #, c-format
13091309 msgid "E184: No such user-defined command: %s"
13101310 msgstr "E184: Íåò òàêîé êîìàíäû ïîëüçîâàòåëÿ: %s"
13111311
1312-#: ex_docmd.c:5664
1312+#: ex_docmd.c:5667
13131313 #, c-format
13141314 msgid "E185: Cannot find color scheme %s"
13151315 msgstr "E185: Öâåòîâàÿ ñõåìà %s íå íàéäåíà"
13161316
1317-#: ex_docmd.c:5672
1317+#: ex_docmd.c:5675
13181318 msgid "Greetings, Vim user!"
13191319 msgstr "Ïðèâåò, ïîëüçîâàòåëü Vim!"
13201320
1321-#: ex_docmd.c:6389
1321+#: ex_docmd.c:6393
13221322 msgid "Edit File in new window"
13231323 msgstr "Ðåäàêòèðîâàòü ôàéë â íîâîì îêíå"
13241324
1325-#: ex_docmd.c:6684
1325+#: ex_docmd.c:6688
13261326 msgid "No swap file"
13271327 msgstr "Áåç ñâîï-ôàéëà"
13281328
1329-#: ex_docmd.c:6788
1329+#: ex_docmd.c:6792
13301330 msgid "Append File"
13311331 msgstr "Äîáàâèòü ôàéë"
13321332
1333-#: ex_docmd.c:6852
1333+#: ex_docmd.c:6856
13341334 msgid "E186: No previous directory"
13351335 msgstr "E186: Íåò ïðåäûäóùåãî êàòàëîãà"
13361336
1337-#: ex_docmd.c:6934
1337+#: ex_docmd.c:6938
13381338 msgid "E187: Unknown"
13391339 msgstr "E187: Íåèçâåñòíî"
13401340
1341-#: ex_docmd.c:7019
1341+#: ex_docmd.c:7023
13421342 msgid "E465: :winsize requires two number arguments"
13431343 msgstr "E465: êîìàíäà :winsize òðåáóåò óêàçàíèÿ äâóõ ÷èñëîâûõ ïàðàìåòðîâ"
13441344
1345-#: ex_docmd.c:7075
1345+#: ex_docmd.c:7079
13461346 #, c-format
13471347 msgid "Window position: X %d, Y %d"
13481348 msgstr "Ïîëîæåíèå îêíà: X %d, Y %d"
13491349
1350-#: ex_docmd.c:7080
1350+#: ex_docmd.c:7084
13511351 msgid "E188: Obtaining window position not implemented for this platform"
13521352 msgstr "E188: Â äàííîé ñèñòåìå îïðåäåëåíèå ïîëîæåíèÿ îêíà íå ðàáîòàåò"
13531353
1354-#: ex_docmd.c:7090
1354+#: ex_docmd.c:7094
13551355 msgid "E466: :winpos requires two number arguments"
13561356 msgstr "E466: êîìàíäà :winpos òðåáóåò óêàçàíèÿ äâóõ ÷èñëîâûõ ïàðàìåòðîâ"
13571357
1358-#: ex_docmd.c:7368
1358+#: ex_docmd.c:7372
13591359 msgid "Save Redirection"
13601360 msgstr "Ïåðåíàïðàâëåíèå çàïèñè"
13611361
1362-#: ex_docmd.c:7558
1362+#: ex_docmd.c:7562
13631363 msgid "Save View"
13641364 msgstr "Ñîõðàíåíèå âèäà"
13651365
1366-#: ex_docmd.c:7559
1366+#: ex_docmd.c:7563
13671367 msgid "Save Session"
13681368 msgstr "Ñîõðàíåíèå ñåàíñà"
13691369
1370-#: ex_docmd.c:7561
1370+#: ex_docmd.c:7565
13711371 msgid "Save Setup"
13721372 msgstr "Ñîõðàíåíèå íàñòðîåê"
13731373
1374-#: ex_docmd.c:7713
1374+#: ex_docmd.c:7717
13751375 #, c-format
13761376 msgid "E189: \"%s\" exists (add ! to override)"
13771377 msgstr "E189: \"%s\" ñóùåñòâóåò (!, ÷òîáû îáîéòè ïðîâåðêó)"
13781378
1379-#: ex_docmd.c:7718
1379+#: ex_docmd.c:7722
13801380 #, c-format
13811381 msgid "E190: Cannot open \"%s\" for writing"
13821382 msgstr "E190: Íåâîçìîæíî îòêðûòü äëÿ çàïèñè \"%s\""
13831383
13841384 #. set mark
1385-#: ex_docmd.c:7742
1385+#: ex_docmd.c:7746
13861386 msgid "E191: Argument must be a letter or forward/backward quote"
13871387 msgstr "E191: Ïàðàìåòð äîëæåí áûòü ïðÿìîé/îáðàòíîé êàâû÷êîé èëè áóêâîé"
13881388
1389-#: ex_docmd.c:7784
1389+#: ex_docmd.c:7788
13901390 msgid "E192: Recursive use of :normal too deep"
13911391 msgstr "E192: Ñëèøêîì ãëóáîêàÿ ðåêóðñèÿ ïðè èñïîëüçîâàíèè êîìàíäû :normal"
13921392
1393-#: ex_docmd.c:8302
1393+#: ex_docmd.c:8306
13941394 msgid "E194: No alternate file name to substitute for '#'"
13951395 msgstr "E194: Íåò ñîñåäíåãî èìåíè ôàéëà äëÿ çàìåíû '#'"
13961396
1397-#: ex_docmd.c:8333
1397+#: ex_docmd.c:8337
13981398 msgid "E495: no autocommand file name to substitute for \"<afile>\""
13991399 msgstr "E495: Íåò àâòîêîìàíäíîãî èìåíè ôàéëà äëÿ çàìåíû \"<afile>\""
14001400
1401-#: ex_docmd.c:8341
1401+#: ex_docmd.c:8345
14021402 msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
14031403 msgstr "E496: Íåò àâòîêîìàíäíîãî íîìåðà áóôåðà äëÿ çàìåíû \"<abuf>\""
14041404
1405-#: ex_docmd.c:8352
1405+#: ex_docmd.c:8356
14061406 msgid "E497: no autocommand match name to substitute for \"<amatch>\""
14071407 msgstr "E497: Íåò àâòîêîìàíäíîãî èìåíè ñîîòâåòñòâèÿ äëÿ çàìåíû \"<amatch>\""
14081408
1409-#: ex_docmd.c:8362
1409+#: ex_docmd.c:8366
14101410 msgid "E498: no :source file name to substitute for \"<sfile>\""
14111411 msgstr "E498: íåò èìåíè ôàéëà :source äëÿ çàìåíû \"<sfile>\""
14121412
1413-#: ex_docmd.c:8403
1413+#: ex_docmd.c:8407
14141414 #, no-c-format
14151415 msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
14161416 msgstr "E499: Ïóñòîå èìÿ ôàéëà äëÿ '%' èëè '#', âîçìîæíî òîëüêî c \":p:h\""
14171417
1418-#: ex_docmd.c:8405
1418+#: ex_docmd.c:8409
14191419 msgid "E500: Evaluates to an empty string"
14201420 msgstr "E500: Ðåçóëüòàòîì âûðàæåíèÿ ÿâëÿåòñÿ ïóñòàÿ ñòðîêà"
14211421
1422-#: ex_docmd.c:9360
1422+#: ex_docmd.c:9380
14231423 msgid "E195: Cannot open viminfo file for reading"
14241424 msgstr "E195: Íåâîçìîæíî îòêðûòü ôàéë viminfo äëÿ ÷òåíèÿ"
14251425
1426-#: ex_docmd.c:9533
1426+#: ex_docmd.c:9553
14271427 msgid "E196: No digraphs in this version"
14281428 msgstr "E196: Â ýòîé âåðñèè äèãðàôû íå ðàáîòàþò"
14291429
@@ -1482,7 +1482,7 @@
14821482 msgid "Error and interrupt"
14831483 msgstr "Îøèáêà è ïðåðûâàíèå"
14841484
1485-#: ex_eval.c:754 gui.c:4381
1485+#: ex_eval.c:754 gui.c:4384
14861486 msgid "Error"
14871487 msgstr "Îøèáêà"
14881488
@@ -1558,19 +1558,19 @@
15581558 msgid "E193: :endfunction not inside a function"
15591559 msgstr "E193: êîìàíäà :endfunction ìîæåò èñïîëüçîâàòüñÿ òîëüêî âíóòðè ôóíêöèè"
15601560
1561-#: ex_getln.c:3296
1561+#: ex_getln.c:3299
15621562 msgid "tagname"
15631563 msgstr "èìÿ ìåòêè"
15641564
1565-#: ex_getln.c:3299
1565+#: ex_getln.c:3302
15661566 msgid " kind file\n"
15671567 msgstr " òèï ôàéëà\n"
15681568
1569-#: ex_getln.c:4752
1569+#: ex_getln.c:4768
15701570 msgid "'history' option is zero"
15711571 msgstr "çíà÷åíèå îïöèè 'history' ðàâíî íóëþ"
15721572
1573-#: ex_getln.c:5023
1573+#: ex_getln.c:5039
15741574 #, c-format
15751575 msgid ""
15761576 "\n"
@@ -1579,259 +1579,259 @@
15791579 "\n"
15801580 "# %s, èñòîðèÿ (íà÷èíàÿ îò ñâåæåãî ê ñòàðîìó):\n"
15811581
1582-#: ex_getln.c:5024
1582+#: ex_getln.c:5040
15831583 msgid "Command Line"
15841584 msgstr "Êîìàíäíàÿ ñòðîêà"
15851585
1586-#: ex_getln.c:5025
1586+#: ex_getln.c:5041
15871587 msgid "Search String"
15881588 msgstr "Ñòðîêà ïîèñêà"
15891589
1590-#: ex_getln.c:5026
1590+#: ex_getln.c:5042
15911591 msgid "Expression"
15921592 msgstr "Âûðàæåíèå"
15931593
1594-#: ex_getln.c:5027
1594+#: ex_getln.c:5043
15951595 msgid "Input Line"
15961596 msgstr "Ñòðîêà ââîäà"
15971597
1598-#: ex_getln.c:5065
1598+#: ex_getln.c:5081
15991599 msgid "E198: cmd_pchar beyond the command length"
16001600 msgstr "E198: cmd_pchar áîëüøå äëèíû êîìàíäû"
16011601
1602-#: ex_getln.c:5242
1602+#: ex_getln.c:5258
16031603 msgid "E199: Active window or buffer deleted"
16041604 msgstr "E199: Óäàëåíî àêòèâíîå îêíî èëè áóôåð"
16051605
1606-#: fileio.c:377
1606+#: fileio.c:378
16071607 msgid "Illegal file name"
16081608 msgstr "Íåäîïóñòèìîå èìÿ ôàéëà"
16091609
1610-#: fileio.c:401 fileio.c:535 fileio.c:2913 fileio.c:2954
1610+#: fileio.c:402 fileio.c:540 fileio.c:2925 fileio.c:2966
16111611 msgid "is a directory"
16121612 msgstr "ÿâëÿåòñÿ êàòàëîãîì"
16131613
1614-#: fileio.c:403
1614+#: fileio.c:404
16151615 msgid "is not a file"
16161616 msgstr "íå ÿâëÿåòñÿ ôàéëîì"
16171617
1618-#: fileio.c:557 fileio.c:4131
1618+#: fileio.c:562 fileio.c:4143
16191619 msgid "[New File]"
16201620 msgstr "[Íîâûé ôàéë]"
16211621
1622-#: fileio.c:590
1622+#: fileio.c:595
16231623 msgid "[Permission Denied]"
16241624 msgstr "[Äîñòóï çàïðåù¸í]"
16251625
1626-#: fileio.c:694
1626+#: fileio.c:706
16271627 msgid "E200: *ReadPre autocommands made the file unreadable"
16281628 msgstr "E200:  ðåçóëüòàòå âûïîëíåíèÿ àâòîêîìàíä *ReadPre ôàéë ñòàë íå÷èòàåìûì"
16291629
1630-#: fileio.c:696
1630+#: fileio.c:708
16311631 msgid "E201: *ReadPre autocommands must not change current buffer"
16321632 msgstr "E201: àâòîêîìàíäû *ReadPre íå äîëæíû èçìåíÿòü àêòèâíûé áóôåð"
16331633
1634-#: fileio.c:717
1634+#: fileio.c:729
16351635 msgid "Vim: Reading from stdin...\n"
16361636 msgstr "Vim: âûïîëíÿåòñÿ ÷òåíèå èç ñòàíäàðòíîãî ïîòîêà ââîäà stdin...\n"
16371637
1638-#: fileio.c:723
1638+#: fileio.c:735
16391639 msgid "Reading from stdin..."
16401640 msgstr "Âûïîëíÿåòñÿ ÷òåíèå èç ñòàíäàðòíîãî ïîòîêà ââîäà stdin..."
16411641
16421642 #. Re-opening the original file failed!
1643-#: fileio.c:1000
1643+#: fileio.c:1012
16441644 msgid "E202: Conversion made file unreadable!"
16451645 msgstr "E202:  ðåçóëüòàòå ïðåîáðàçîâàíèÿ ôàéë ñòàë íå÷èòàåìûì!"
16461646
1647-#: fileio.c:2090
1647+#: fileio.c:2102
16481648 msgid "[fifo/socket]"
16491649 msgstr "[fifo/ãíåçäî]"
16501650
1651-#: fileio.c:2097
1651+#: fileio.c:2109
16521652 msgid "[fifo]"
16531653 msgstr "[fifo]"
16541654
1655-#: fileio.c:2104
1655+#: fileio.c:2116
16561656 msgid "[socket]"
16571657 msgstr "[ãíåçäî]"
16581658
1659-#: fileio.c:2112
1659+#: fileio.c:2124
16601660 msgid "[RO]"
16611661 msgstr "[RO]"
16621662
1663-#: fileio.c:2122
1663+#: fileio.c:2134
16641664 msgid "[CR missing]"
16651665 msgstr "[ïðîïóùåíû ñèìâîëû CR]"
16661666
1667-#: fileio.c:2127
1667+#: fileio.c:2139
16681668 msgid "[NL found]"
16691669 msgstr "[Îáíàðóæåíû ñèìâîëû NL]"
16701670
1671-#: fileio.c:2132
1671+#: fileio.c:2144
16721672 msgid "[long lines split]"
16731673 msgstr "[äëèííûå ñòðîêè ðàçáèòû]"
16741674
1675-#: fileio.c:2138 fileio.c:4115
1675+#: fileio.c:2150 fileio.c:4127
16761676 msgid "[NOT converted]"
16771677 msgstr "[ÁÅÇ ïðåîáðàçîâàíèé]"
16781678
1679-#: fileio.c:2143 fileio.c:4120
1679+#: fileio.c:2155 fileio.c:4132
16801680 msgid "[converted]"
16811681 msgstr "[ïåðåêîäèðîâàíî]"
16821682
1683-#: fileio.c:2150 fileio.c:4145
1683+#: fileio.c:2162 fileio.c:4157
16841684 msgid "[crypted]"
16851685 msgstr "[çàøèôðîâàíî]"
16861686
1687-#: fileio.c:2157
1687+#: fileio.c:2169
16881688 msgid "[CONVERSION ERROR]"
16891689 msgstr "[ÎØÈÁÊÀ ÏÐÅÎÁÐÀÇÎÂÀÍÈß]"
16901690
1691-#: fileio.c:2163
1691+#: fileio.c:2175
16921692 #, c-format
16931693 msgid "[ILLEGAL BYTE in line %ld]"
16941694 msgstr "[ÍÅÄÎÏÓÑÒÈÌÛÉ ÁÀÉÒ â ñòðîêå %ld]"
16951695
1696-#: fileio.c:2170
1696+#: fileio.c:2182
16971697 msgid "[READ ERRORS]"
16981698 msgstr "[ÎØÈÁÊÈ ×ÒÅÍÈß]"
16991699
1700-#: fileio.c:2386
1700+#: fileio.c:2398
17011701 msgid "Can't find temp file for conversion"
17021702 msgstr "Âðåìåííûé ôàéë äëÿ ïåðåêîäèðîâàíèÿ íå íàéäåí"
17031703
1704-#: fileio.c:2393
1704+#: fileio.c:2405
17051705 msgid "Conversion with 'charconvert' failed"
17061706 msgstr "Ïðåîáðàçîâàíèå ñ ïîìîùüþ 'charconvert' íå âûïîëíåíî"
17071707
1708-#: fileio.c:2396
1708+#: fileio.c:2408
17091709 msgid "can't read output of 'charconvert'"
17101710 msgstr "íåâîçìîæíî ïðî÷èòàòü âûâîä 'charconvert'"
17111711
1712-#: fileio.c:2796
1712+#: fileio.c:2808
17131713 msgid "E203: Autocommands deleted or unloaded buffer to be written"
17141714 msgstr ""
17151715 "E203: Áóôåð, êîòîðûé òðåáîâàëîñü çàïèñàòü, óäàë¸í èëè âûãðóæåí àâòîêîìàíäîé"
17161716
1717-#: fileio.c:2819
1717+#: fileio.c:2831
17181718 msgid "E204: Autocommand changed number of lines in unexpected way"
17191719 msgstr "E204: Êîëè÷åñòâî ñòðîê èçìåíåíî àâòîêîìàíäîé íåîæèäàííûì îáðàçîì"
17201720
1721-#: fileio.c:2857
1721+#: fileio.c:2869
17221722 msgid "NetBeans dissallows writes of unmodified buffers"
17231723 msgstr "NetBeans íå ïîçâîëÿåò âûïîëíÿòü çàïèñü íåèçìåí¸ííûõ áóôåðîâ"
17241724
1725-#: fileio.c:2865
1725+#: fileio.c:2877
17261726 msgid "Partial writes disallowed for NetBeans buffers"
17271727 msgstr "×àñòè÷íàÿ çàïèñü áóôåðîâ NetBeans íå äîïóñêàåòñÿ"
17281728
1729-#: fileio.c:2919 fileio.c:2937
1729+#: fileio.c:2931 fileio.c:2949
17301730 msgid "is not a file or writable device"
17311731 msgstr "íå ÿâëÿåòñÿ ôàéëîì èëè óñòðîéñòâîì, äîñòóïíûì äëÿ çàïèñè"
17321732
1733-#: fileio.c:2989
1733+#: fileio.c:3001
17341734 msgid "is read-only (add ! to override)"
17351735 msgstr "îòêðûò òîëüêî äëÿ ÷òåíèÿ (!, ÷òîáû îáîéòè ïðîâåðêó)"
17361736
1737-#: fileio.c:3335
1737+#: fileio.c:3347
17381738 msgid "E506: Can't write to backup file (add ! to override)"
17391739 msgstr "E506: Çàïèñü â ðåçåðâíûé ôàéë íåâîçìîæíà (!, ÷òîáû îáîéòè ïðîâåðêó)"
17401740
1741-#: fileio.c:3347
1741+#: fileio.c:3359
17421742 msgid "E507: Close error for backup file (add ! to override)"
17431743 msgstr "E507: Îøèáêà çàêðûòèÿ ðåçåðâíîãî ôàéëà (!, ÷òîáû îáîéòè ïðîâåðêó)"
17441744
1745-#: fileio.c:3349
1745+#: fileio.c:3361
17461746 msgid "E508: Can't read file for backup (add ! to override)"
17471747 msgstr "E508: Íåâîçìîæíî ïðî÷èòàòü ðåçåðâíûé ôàéë (!, ÷òîáû îáîéòè ïðîâåðêó)"
17481748
1749-#: fileio.c:3365
1749+#: fileio.c:3377
17501750 msgid "E509: Cannot create backup file (add ! to override)"
17511751 msgstr "E509: Íåâîçìîæíî ñîçäàòü ðåçåðâíûé ôàéë (!, ÷òîáû îáîéòè ïðîâåðêó)"
17521752
1753-#: fileio.c:3468
1753+#: fileio.c:3480
17541754 msgid "E510: Can't make backup file (add ! to override)"
17551755 msgstr "E510: Íåâîçìîæíî ñîçäàòü ðåçåðâíûé ôàéë (!, ÷òîáû îáîéòè ïðîâåðêó)"
17561756
1757-#: fileio.c:3530
1757+#: fileio.c:3542
17581758 msgid "E460: The resource fork would be lost (add ! to override)"
17591759 msgstr "E460: Âèëêà ðåñóðñà áóäåò ïîòåðÿíà (!, ÷òîáû îáîéòè ïðîâåðêó)"
17601760
1761-#: fileio.c:3640
1761+#: fileio.c:3652
17621762 msgid "E214: Can't find temp file for writing"
17631763 msgstr "E214: Âðåìåííûé ôàéë äëÿ çàïèñè íå íàéäåí"
17641764
1765-#: fileio.c:3658
1765+#: fileio.c:3670
17661766 msgid "E213: Cannot convert (add ! to write without conversion)"
17671767 msgstr "E213: Ïåðåêîäèðîâêà íåâîçìîæíà (! äëÿ çàïèñè áåç ïåðåêîäèðîâêè)"
17681768
1769-#: fileio.c:3693
1769+#: fileio.c:3705
17701770 msgid "E166: Can't open linked file for writing"
17711771 msgstr "E166: Íåâîçìîæíî îòêðûòü ñâÿçàííûé ôàéë äëÿ çàïèñè"
17721772
1773-#: fileio.c:3697
1773+#: fileio.c:3709
17741774 msgid "E212: Can't open file for writing"
17751775 msgstr "E212: Íåâîçìîæíî îòêðûòü ôàéë äëÿ çàïèñè"
17761776
1777-#: fileio.c:3959
1777+#: fileio.c:3971
17781778 msgid "E667: Fsync failed"
17791779 msgstr "E667: Íå óäàëîñü âûïîëíèòü ôóíêöèþ fsync()"
17801780
1781-#: fileio.c:3966
1781+#: fileio.c:3978
17821782 msgid "E512: Close failed"
17831783 msgstr "E512: Îïåðàöèÿ çàêðûòèÿ íå óäàëàñü"
17841784
1785-#: fileio.c:4037
1785+#: fileio.c:4049
17861786 msgid "E513: write error, conversion failed"
17871787 msgstr "E513: Îøèáêà çàïèñè, ïðåîáðàçîâàíèå íå óäàëîñü"
17881788
1789-#: fileio.c:4043
1789+#: fileio.c:4055
17901790 msgid "E514: write error (file system full?)"
17911791 msgstr "E514: îøèáêà çàïèñè (íåò ñâîáîäíîãî ìåñòà?)"
17921792
1793-#: fileio.c:4110
1793+#: fileio.c:4122
17941794 msgid " CONVERSION ERROR"
17951795 msgstr " ÎØÈÁÊÀ ÏÐÅÎÁÐÀÇÎÂÀÍÈß"
17961796
1797-#: fileio.c:4126
1797+#: fileio.c:4138
17981798 msgid "[Device]"
17991799 msgstr "[Óñòðîéñòâî]"
18001800
1801-#: fileio.c:4131
1801+#: fileio.c:4143
18021802 msgid "[New]"
18031803 msgstr "[Íîâûé]"
18041804
1805-#: fileio.c:4153
1805+#: fileio.c:4165
18061806 msgid " [a]"
18071807 msgstr " [a]"
18081808
1809-#: fileio.c:4153
1809+#: fileio.c:4165
18101810 msgid " appended"
18111811 msgstr " äîáàâëåíî"
18121812
1813-#: fileio.c:4155
1813+#: fileio.c:4167
18141814 msgid " [w]"
18151815 msgstr " [w]"
18161816
1817-#: fileio.c:4155
1817+#: fileio.c:4167
18181818 msgid " written"
18191819 msgstr " çàïèñàíî"
18201820
1821-#: fileio.c:4205
1821+#: fileio.c:4217
18221822 msgid "E205: Patchmode: can't save original file"
18231823 msgstr "E205: Ðåæèì çàïëàòêè: íåâîçìîæíî ñîõðàíåíèå èñõîäíîãî ôàéëà"
18241824
1825-#: fileio.c:4227
1825+#: fileio.c:4239
18261826 msgid "E206: patchmode: can't touch empty original file"
18271827 msgstr ""
18281828 "E206: Ðåæèì çàïëàòêè: íåâîçìîæíî ñìåíèòü ïàðàìåòðû ïóñòîãî èñõîäíîãî ôàéëà"
18291829
1830-#: fileio.c:4242
1830+#: fileio.c:4254
18311831 msgid "E207: Can't delete backup file"
18321832 msgstr "E207: Íåâîçìîæíî óäàëèòü ðåçåðâíûé ôàéë"
18331833
1834-#: fileio.c:4306
1834+#: fileio.c:4318
18351835 msgid ""
18361836 "\n"
18371837 "WARNING: Original file may be lost or damaged\n"
@@ -1839,96 +1839,96 @@
18391839 "\n"
18401840 "ÏÐÅÄÓÏÐÅÆÄÅÍÈÅ: Èñõîäíûé ôàéë ìîæåò áûòü óòðà÷åí èëè ïîâðåæä¸í\n"
18411841
1842-#: fileio.c:4308
1842+#: fileio.c:4320
18431843 msgid "don't quit the editor until the file is successfully written!"
18441844 msgstr "íå âûõîäèòå èç ðåäàêòîðà, ïîêà ôàéë íå áóäåò óñïåøíî çàïèñàí!"
18451845
1846-#: fileio.c:4397
1846+#: fileio.c:4409
18471847 msgid "[dos]"
18481848 msgstr "[dos]"
18491849
1850-#: fileio.c:4397
1850+#: fileio.c:4409
18511851 msgid "[dos format]"
18521852 msgstr "[ôîðìàò dos]"
18531853
1854-#: fileio.c:4404
1854+#: fileio.c:4416
18551855 msgid "[mac]"
18561856 msgstr "[mac]"
18571857
1858-#: fileio.c:4404
1858+#: fileio.c:4416
18591859 msgid "[mac format]"
18601860 msgstr "[ôîðìàò mac]"
18611861
1862-#: fileio.c:4411
1862+#: fileio.c:4423
18631863 msgid "[unix]"
18641864 msgstr "[unix]"
18651865
1866-#: fileio.c:4411
1866+#: fileio.c:4423
18671867 msgid "[unix format]"
18681868 msgstr "[ôîðìàò unix]"
18691869
1870-#: fileio.c:4438
1870+#: fileio.c:4450
18711871 msgid "1 line, "
18721872 msgstr "1 ñòðîêà, "
18731873
1874-#: fileio.c:4440
1874+#: fileio.c:4452
18751875 #, c-format
18761876 msgid "%ld lines, "
18771877 msgstr "ñòðîê: %ld, "
18781878
1879-#: fileio.c:4443
1879+#: fileio.c:4455
18801880 msgid "1 character"
18811881 msgstr "1 ñèìâîë"
18821882
1883-#: fileio.c:4445
1883+#: fileio.c:4457
18841884 #, c-format
18851885 msgid "%ld characters"
18861886 msgstr "ñèìâîëîâ: %ld"
18871887
1888-#: fileio.c:4455
1888+#: fileio.c:4467
18891889 msgid "[noeol]"
18901890 msgstr "[noeol]"
18911891
1892-#: fileio.c:4455
1892+#: fileio.c:4467
18931893 msgid "[Incomplete last line]"
18941894 msgstr "[Íåçàâåðø¸ííàÿ ïîñëåäíÿÿ ñòðîêà]"
18951895
18961896 #. don't overwrite messages here
18971897 #. must give this prompt
18981898 #. don't use emsg() here, don't want to flush the buffers
1899-#: fileio.c:4474
1899+#: fileio.c:4486
19001900 msgid "WARNING: The file has been changed since reading it!!!"
19011901 msgstr "ÏÐÅÄÓÏÐÅÆÄÅÍÈÅ: Ôàéë èçìåí¸í ñ ìîìåíòà ÷òåíèÿ!!!"
19021902
1903-#: fileio.c:4476
1903+#: fileio.c:4488
19041904 msgid "Do you really want to write to it"
19051905 msgstr "Ñåðü¸çíî õîòèòå çàïèñàòü â ýòîò ôàéë"
19061906
1907-#: fileio.c:5726
1907+#: fileio.c:5738
19081908 #, c-format
19091909 msgid "E208: Error writing to \"%s\""
19101910 msgstr "E208: Îøèáêà çàïèñè â \"%s\""
19111911
1912-#: fileio.c:5733
1912+#: fileio.c:5745
19131913 #, c-format
19141914 msgid "E209: Error closing \"%s\""
19151915 msgstr "E209: Îøèáêà çàêðûòèÿ \"%s\""
19161916
1917-#: fileio.c:5736
1917+#: fileio.c:5748
19181918 #, c-format
19191919 msgid "E210: Error reading \"%s\""
19201920 msgstr "E210: Îøèáêà ÷òåíèÿ \"%s\""
19211921
1922-#: fileio.c:5970
1922+#: fileio.c:5982
19231923 msgid "E246: FileChangedShell autocommand deleted buffer"
19241924 msgstr "E246: Áóôåð óäàë¸í ïðè âûïîëíåíèè àâòîêîìàíäû FileChangedShell"
19251925
1926-#: fileio.c:5977
1926+#: fileio.c:5989
19271927 #, c-format
19281928 msgid "E211: Warning: File \"%s\" no longer available"
19291929 msgstr "E211: Ïðåäóïðåæäåíèå: ôàéë \"%s\" áîëüøå íå äîñòóïåí"
19301930
1931-#: fileio.c:5991
1931+#: fileio.c:6003
19321932 #, c-format
19331933 msgid ""
19341934 "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
@@ -1937,34 +1937,34 @@
19371937 "W12: Ïðåäóïðåæäåíèå: ôàéë \"%s\" è áóôåð Vim áûëè èçìåíåíû íåçàâèñèìî äðóã "
19381938 "îò äðóãà"
19391939
1940-#: fileio.c:5994
1940+#: fileio.c:6006
19411941 #, c-format
19421942 msgid "W11: Warning: File \"%s\" has changed since editing started"
19431943 msgstr ""
19441944 "W11: Ïðåäóïðåæäåíèå: ôàéë \"%s\" áûë èçìåí¸í ïîñëå íà÷àëà ðåäàêòèðîâàíèÿ"
19451945
1946-#: fileio.c:5996
1946+#: fileio.c:6008
19471947 #, c-format
19481948 msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
19491949 msgstr ""
19501950 "W16: Ïðåäóïðåæäåíèå: ðåæèì äîñòóïà ê ôàéëó \"%s\" áûë èçìåí¸í ïîñëå íà÷àëà "
19511951 "ðåäàêòèðîâàíèÿ"
19521952
1953-#: fileio.c:6006
1953+#: fileio.c:6018
19541954 #, c-format
19551955 msgid "W13: Warning: File \"%s\" has been created after editing started"
19561956 msgstr ""
19571957 "W13: Ïðåäóïðåæäåíèå: ôàéë \"%s\" áûë ñîçäàí ïîñëå íà÷àëà ðåäàêòèðîâàíèÿ"
19581958
1959-#: fileio.c:6019
1959+#: fileio.c:6031
19601960 msgid "See \":help W11\" for more info."
19611961 msgstr "Ñì. äîïîëíèòåëüíóþ èíôîðìàöèþ â \":help W11\"."
19621962
1963-#: fileio.c:6033
1963+#: fileio.c:6045
19641964 msgid "Warning"
19651965 msgstr "Ïðåäóïðåæäåíèå"
19661966
1967-#: fileio.c:6034
1967+#: fileio.c:6046
19681968 msgid ""
19691969 "&OK\n"
19701970 "&Load File"
@@ -1972,43 +1972,43 @@
19721972 "&OK\n"
19731973 "&Çàãðóçèòü ôàéë"
19741974
1975-#: fileio.c:6140
1975+#: fileio.c:6152
19761976 #, c-format
19771977 msgid "E462: Could not prepare for reloading \"%s\""
19781978 msgstr "E462: Íåâîçìîæíî ïîäãîòîâèòüñÿ ê ïåðåçàãðóçêå \"%s\""
19791979
1980-#: fileio.c:6159
1980+#: fileio.c:6171
19811981 #, c-format
19821982 msgid "E321: Could not reload \"%s\""
19831983 msgstr "E321: Íåâîçìîæíî âûïîëíèòü ïåðåçàãðóçêó \"%s\""
19841984
1985-#: fileio.c:6740
1985+#: fileio.c:6752
19861986 msgid "--Deleted--"
19871987 msgstr "--Óäàëåíî--"
19881988
19891989 #. the group doesn't exist
1990-#: fileio.c:6900
1990+#: fileio.c:6912
19911991 #, c-format
19921992 msgid "E367: No such group: \"%s\""
19931993 msgstr "E367: Ãðóïïà \"%s\" íå ñóùåñòâóåò"
19941994
1995-#: fileio.c:7026
1995+#: fileio.c:7038
19961996 #, c-format
19971997 msgid "E215: Illegal character after *: %s"
19981998 msgstr "E215: Íåäîïóñòèìûå ñèìâîëû ïîñëå *: %s"
19991999
2000-#: fileio.c:7038
2000+#: fileio.c:7050
20012001 #, c-format
20022002 msgid "E216: No such event: %s"
20032003 msgstr "E216: Íåñóùåñòâóþùåå ñîáûòèå: %s"
20042004
2005-#: fileio.c:7040
2005+#: fileio.c:7052
20062006 #, c-format
20072007 msgid "E216: No such group or event: %s"
20082008 msgstr "E216: Íåñóùåñòâóþùàÿ ãðóïïà èëè ñîáûòèå: %s"
20092009
20102010 #. Highlight title
2011-#: fileio.c:7198
2011+#: fileio.c:7210
20122012 msgid ""
20132013 "\n"
20142014 "--- Auto-Commands ---"
@@ -2016,39 +2016,39 @@
20162016 "\n"
20172017 "--- Àâòîêîìàíäû ---"
20182018
2019-#: fileio.c:7469
2019+#: fileio.c:7481
20202020 msgid "E217: Can't execute autocommands for ALL events"
20212021 msgstr "E217: Íåâîçìîæíî âûïîëíèòü àâòîêîìàíäû äëÿ ÂÑÅÕ ñîáûòèé"
20222022
2023-#: fileio.c:7492
2023+#: fileio.c:7504
20242024 msgid "No matching autocommands"
20252025 msgstr "Íåò ïîäõîäÿùèõ àâòîêîìàíä"
20262026
2027-#: fileio.c:7813
2027+#: fileio.c:7825
20282028 msgid "E218: autocommand nesting too deep"
20292029 msgstr "E218: ñëèøêîì ãëóáîêî âëîæåííûå àâòîêîìàíäû"
20302030
2031-#: fileio.c:8088
2031+#: fileio.c:8100
20322032 #, c-format
20332033 msgid "%s Auto commands for \"%s\""
20342034 msgstr "%s Àâòîêîìàíäû äëÿ \"%s\""
20352035
2036-#: fileio.c:8096
2036+#: fileio.c:8108
20372037 #, c-format
20382038 msgid "Executing %s"
20392039 msgstr "Âûïîëíåíèå %s"
20402040
20412041 #. always scroll up, don't overwrite
2042-#: fileio.c:8164
2042+#: fileio.c:8176
20432043 #, c-format
20442044 msgid "autocommand %s"
20452045 msgstr "àâòîêîìàíäà %s"
20462046
2047-#: fileio.c:8731
2047+#: fileio.c:8743
20482048 msgid "E219: Missing {."
20492049 msgstr "E219: Ïðîïóùåíà {."
20502050
2051-#: fileio.c:8733
2051+#: fileio.c:8745
20522052 msgid "E220: Missing }."
20532053 msgstr "E220: Ïðîïóùåíà }."
20542054
@@ -2070,39 +2070,39 @@
20702070 msgid "E222: Add to read buffer"
20712071 msgstr "E222: Äîáàâëåíèå â áóôåð ÷òåíèÿ"
20722072
2073-#: getchar.c:2198
2073+#: getchar.c:2208
20742074 msgid "E223: recursive mapping"
20752075 msgstr "E223: ðåêóðñèâíàÿ ïðèâÿçêà"
20762076
2077-#: getchar.c:3077
2077+#: getchar.c:3087
20782078 #, c-format
20792079 msgid "E224: global abbreviation already exists for %s"
20802080 msgstr "E224: óæå åñòü ãëîáàëüíîå ñîêðàùåíèå äëÿ %s"
20812081
2082-#: getchar.c:3080
2082+#: getchar.c:3090
20832083 #, c-format
20842084 msgid "E225: global mapping already exists for %s"
20852085 msgstr "E225: óæå åñòü ãëîáàëüíàÿ ïðèâÿçêà äëÿ %s"
20862086
2087-#: getchar.c:3212
2087+#: getchar.c:3222
20882088 #, c-format
20892089 msgid "E226: abbreviation already exists for %s"
20902090 msgstr "E226: óæå åñòü ñîêðàùåíèå äëÿ %s"
20912091
2092-#: getchar.c:3215
2092+#: getchar.c:3225
20932093 #, c-format
20942094 msgid "E227: mapping already exists for %s"
20952095 msgstr "E227: óæå åñòü ïðèâÿçêà äëÿ %s"
20962096
2097-#: getchar.c:3279
2097+#: getchar.c:3289
20982098 msgid "No abbreviation found"
20992099 msgstr "Ñîêðàùåíèÿ íå íàéäåíû"
21002100
2101-#: getchar.c:3281
2101+#: getchar.c:3291
21022102 msgid "No mapping found"
21032103 msgstr "Ïðèâÿçêè íå íàéäåíû"
21042104
2105-#: getchar.c:4173
2105+#: getchar.c:4183
21062106 msgid "E228: makemap: Illegal mode"
21072107 msgstr "E228: makemap: íåäîïóñòèìûé ðåæèì"
21082108
@@ -2128,7 +2128,7 @@
21282128 msgid "E599: Value of 'imactivatekey' is invalid"
21292129 msgstr "E599: íåïðàâèëüíîå çíà÷åíèå îïöèè 'imactivatekey'"
21302130
2131-#: gui.c:4061
2131+#: gui.c:4064
21322132 #, c-format
21332133 msgid "E254: Cannot allocate color %s"
21342134 msgstr "E254: Íåâîçìîæíî íàçíà÷èòü öâåò %s"
@@ -2170,7 +2170,7 @@
21702170 msgid "Vim dialog"
21712171 msgstr "Äèàëîãîâîå îêíî Vim"
21722172
2173-#: gui_beval.c:101 gui_w32.c:3829
2173+#: gui_beval.c:101 gui_w32.c:3978
21742174 msgid "E232: Cannot create BalloonEval with both message and callback"
21752175 msgstr ""
21762176 "E232: \"Ïóçûðü\" äëÿ âû÷èñëåíèé, âêëþ÷àþùèé è ñîîáùåíèå, è îáðàòíûé âûçîâ, "
@@ -2180,7 +2180,7 @@
21802180 msgid "Vim dialog..."
21812181 msgstr "Äèàëîãîâîå îêíî Vim..."
21822182
2183-#: gui_gtk.c:2060 message.c:2993
2183+#: gui_gtk.c:2060 message.c:2999
21842184 msgid ""
21852185 "&Yes\n"
21862186 "&No\n"
@@ -2303,16 +2303,24 @@
23032303 "\n"
23042304 "Îòïðàâêà ñîîáùåíèÿ äëÿ óíè÷òîæåíèÿ ïðîöåññà-ïîòîìêà.\n"
23052305
2306-#: gui_w32.c:829
2306+#: gui_w32.c:839
2307+msgid "E671: Cannot find window title \"%s\""
2308+msgstr "E671: Îêíî ñ çàãîëîâêîì \"%s\" íå îáíàðóæåíî"
2309+
2310+#: gui_w32.c:847
23072311 #, c-format
23082312 msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
23092313 msgstr "E243: Ïàðàìåòð íå ïîääåðæèâàåòñÿ: \"-%s\"; èñïîëüçóéòå âåðñèþ OLE."
23102314
2311-#: gui_w48.c:2090
2315+#: gui_w32.c:1100
2316+msgid "E672: Unable to open window inside MDI application"
2317+msgstr "E672: Íåâîçìîæíî îòêðûòü îêíî âíóòðè ïðèëîæåíèÿ MDI"
2318+
2319+#: gui_w48.c:2163
23122320 msgid "Find string (use '\\\\' to find a '\\')"
23132321 msgstr "Ïîèñê ñòðîêè (èñïîëüçóéòå '\\\\' äëÿ ïîèñêà '\\')"
23142322
2315-#: gui_w48.c:2115
2323+#: gui_w48.c:2188
23162324 msgid "Find & Replace (use '\\\\' to find a '\\')"
23172325 msgstr "Ïîèñê è çàìåíà (èñïîëüçóéòå '\\\\' äëÿ ïîèñêà '\\')"
23182326
@@ -2353,6 +2361,7 @@
23532361 msgstr "Font1: %s\n"
23542362
23552363 #: gui_x11.c:2184
2364+#, c-format
23562365 msgid "Font%ld width is not twice that of font0\n"
23572366 msgstr "Øèðèíà øðèôòà font%ld äîëæíà áûòü âäâîå áîëüøå øèðèíû øðèôòà font0\n"
23582367
@@ -2933,47 +2942,47 @@
29332942 msgid "Invalid argument for"
29342943 msgstr "Íåäîïóñòèìûå àðãóìåíòû äëÿ"
29352944
2936-#: main.c:466
2945+#: main.c:469
29372946 msgid "This Vim was not compiled with the diff feature."
29382947 msgstr ""
29392948 "Äàííûé Vim áûë ñêîìïèëèðîâàí ñ âûêëþ÷åííîé îñîáåííîñòüþ ïðîñìîòðà îòëè÷èé"
29402949
2941-#: main.c:932
2950+#: main.c:935
29422951 msgid "Attempt to open script file again: \""
29432952 msgstr "Ïîïûòêà ïîâòîðíîãî îòêðûòèÿ ôàéëà ñöåíàðèÿ: \""
29442953
2945-#: main.c:941
2954+#: main.c:944
29462955 msgid "Cannot open for reading: \""
29472956 msgstr "Íåâîçìîæíî îòêðûòü äëÿ ÷òåíèÿ: \""
29482957
2949-#: main.c:985
2958+#: main.c:988
29502959 msgid "Cannot open for script output: \""
29512960 msgstr "Íåâîçìîæíî îòêðûòü äëÿ âûâîäà ñöåíàðèÿ: \""
29522961
2953-#: main.c:1132
2962+#: main.c:1135
29542963 #, c-format
29552964 msgid "%d files to edit\n"
29562965 msgstr "Ôàéëîâ äëÿ ðåäàêòèðîâàíèÿ: %d\n"
29572966
2958-#: main.c:1233
2967+#: main.c:1236
29592968 msgid "Vim: Warning: Output is not to a terminal\n"
29602969 msgstr "Vim: Ïðåäóïðåæäåíèå: Âûâîä îñóùåñòâëÿåòñÿ íå íà òåðìèíàë\n"
29612970
2962-#: main.c:1235
2971+#: main.c:1238
29632972 msgid "Vim: Warning: Input is not from a terminal\n"
29642973 msgstr "Vim: Ïðåäóïðåæäåíèå: Ââîä ïðîèñõîäèò íå ñ òåðìèíàëà\n"
29652974
29662975 #. just in case..
2967-#: main.c:1297
2976+#: main.c:1306
29682977 msgid "pre-vimrc command line"
29692978 msgstr "êîìàíäíàÿ ñòðîêà ïåðåä âûïîëíåíèåì vimrc"
29702979
2971-#: main.c:1338
2980+#: main.c:1347
29722981 #, c-format
29732982 msgid "E282: Cannot read from \"%s\""
29742983 msgstr "E282: Íåâîçìîæíî âûïîëíèòü ÷òåíèå èç \"%s\""
29752984
2976-#: main.c:2411
2985+#: main.c:2420
29772986 msgid ""
29782987 "\n"
29792988 "More info with: \"vim -h\"\n"
@@ -2981,23 +2990,23 @@
29812990 "\n"
29822991 "Äîïîëíèòåëüíàÿ èíôîðìàöèÿ: \"vim -h\"\n"
29832992
2984-#: main.c:2444
2993+#: main.c:2453
29852994 msgid "[file ..] edit specified file(s)"
29862995 msgstr "[ôàéë ..] ðåäàêòèðîâàíèå óêàçàííûõ ôàéëîâ"
29872996
2988-#: main.c:2445
2997+#: main.c:2454
29892998 msgid "- read text from stdin"
29902999 msgstr "- ÷òåíèå òåêñòà èç ïîòîêà ââîäà stdin"
29913000
2992-#: main.c:2446
3001+#: main.c:2455
29933002 msgid "-t tag edit file where tag is defined"
29943003 msgstr "-t ìåòêà ðåäàêòèðîâàíèå ôàéëà ñ óêàçàííîé ìåòêîé"
29953004
2996-#: main.c:2448
3005+#: main.c:2457
29973006 msgid "-q [errorfile] edit file with first error"
29983007 msgstr "-q [ôàéë îøèáîê] ðåäàêòèðîâàíèå ôàéëà ñ ïåðâîé îøèáêîé"
29993008
3000-#: main.c:2457
3009+#: main.c:2466
30013010 msgid ""
30023011 "\n"
30033012 "\n"
@@ -3007,11 +3016,11 @@
30073016 "\n"
30083017 "Èñïîëüçîâàíèå:"
30093018
3010-#: main.c:2460
3019+#: main.c:2469
30113020 msgid " vim [arguments] "
30123021 msgstr " vim [àðãóìåíòû] "
30133022
3014-#: main.c:2464
3023+#: main.c:2473
30153024 msgid ""
30163025 "\n"
30173026 " or:"
@@ -3019,7 +3028,7 @@
30193028 "\n"
30203029 " èëè:"
30213030
3022-#: main.c:2467
3031+#: main.c:2476
30233032 msgid ""
30243033 "\n"
30253034 "\n"
@@ -3029,244 +3038,244 @@
30293038 "\n"
30303039 "Àðãóìåíòû:\n"
30313040
3032-#: main.c:2468
3041+#: main.c:2477
30333042 msgid "--\t\t\tOnly file names after this"
30343043 msgstr "--\t\t\tÄàëåå óêàçûâàþòñÿ òîëüêî èìåíà ôàéëîâ"
30353044
3036-#: main.c:2470
3045+#: main.c:2479
30373046 msgid "--literal\t\tDon't expand wildcards"
30383047 msgstr "--literal\t\tÍå âûïîëíÿòü ïîäñòàíîâêó ïî ìàñêå"
30393048
3040-#: main.c:2473
3049+#: main.c:2482
30413050 msgid "-register\t\tRegister this gvim for OLE"
30423051 msgstr "-register\t\tÇàðåãèñòðèðîâàòü ýòîò gvim äëÿ OLE"
30433052
3044-#: main.c:2474
3053+#: main.c:2483
30453054 msgid "-unregister\t\tUnregister gvim for OLE"
30463055 msgstr "-unregister\t\tÎòêëþ÷èòü ðåãèñòðàöèþ äàííîãî gvim äëÿ OLE"
30473056
3048-#: main.c:2477
3057+#: main.c:2486
30493058 msgid "-g\t\t\tRun using GUI (like \"gvim\")"
30503059 msgstr "-g\t\t\tÇàïóñòèòü ñ ãðàôè÷åñêèì èíòåðôåéñîì (êàê \"gvim\")"
30513060
3052-#: main.c:2478
3061+#: main.c:2487
30533062 msgid "-f or --nofork\tForeground: Don't fork when starting GUI"
30543063 msgstr "-f èëè --nofork\t àêòèâíîé çàäà÷å: Íå âûïîëíÿòü fork ïðè çàïóñêå GUI"
30553064
3056-#: main.c:2480
3065+#: main.c:2489
30573066 msgid "-v\t\t\tVi mode (like \"vi\")"
30583067 msgstr "-v\t\t\tÐåæèì Vi (êàê \"vi\")"
30593068
3060-#: main.c:2481
3069+#: main.c:2490
30613070 msgid "-e\t\t\tEx mode (like \"ex\")"
30623071 msgstr "-e\t\t\tÐåæèì Ex (êàê \"ex\")"
30633072
3064-#: main.c:2482
3073+#: main.c:2491
30653074 msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
30663075 msgstr "-s\t\t\tÒèõèé (ïàêåòíûé) ðåæèì (òîëüêî äëÿ \"ex\")"
30673076
3068-#: main.c:2484
3077+#: main.c:2493
30693078 msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
30703079 msgstr "-d\t\t\tÐåæèì îòëè÷èé (êàê \"vimdiff\")"
30713080
3072-#: main.c:2486
3081+#: main.c:2495
30733082 msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
30743083 msgstr "-y\t\t\tÏðîñòîé ðåæèì (êàê \"evim\", áåçðåæèìíûé)"
30753084
3076-#: main.c:2487
3085+#: main.c:2496
30773086 msgid "-R\t\t\tReadonly mode (like \"view\")"
30783087 msgstr "-R\t\t\tÒîëüêî äëÿ ÷òåíèÿ (êàê \"view\")"
30793088
3080-#: main.c:2488
3089+#: main.c:2497
30813090 msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
30823091 msgstr "-Z\t\t\tÎãðàíè÷åííûé ðåæèì (êàê \"rvim\")"
30833092
3084-#: main.c:2489
3093+#: main.c:2498
30853094 msgid "-m\t\t\tModifications (writing files) not allowed"
30863095 msgstr "-m\t\t\tÁåç âîçìîæíîñòè ñîõðàíåíèÿ èçìåíåíèé (çàïèñè ôàéëîâ)"
30873096
3088-#: main.c:2490
3097+#: main.c:2499
30893098 msgid "-M\t\t\tModifications in text not allowed"
30903099 msgstr "-M\t\t\tÁåç âîçìîæíîñòè âíåñåíèÿ èçìåíåíèé â òåêñò"
30913100
3092-#: main.c:2491
3101+#: main.c:2500
30933102 msgid "-b\t\t\tBinary mode"
30943103 msgstr "-b\t\t\tÁèíàðíûé ðåæèì"
30953104
3096-#: main.c:2493
3097-msgid "-l\t\t\tLisp mode"
3098-msgstr "-l\t\t\tÐåæèì Lisp"
3099-
3100-#: main.c:2495
3101-msgid "-C\t\t\tCompatible with Vi: 'compatible'"
3102-msgstr "-C\t\t\tÐåæèì ñîâìåñòèìîñòè ñ Vi: 'compatible'"
3103-
3104-#: main.c:2496
3105-msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
3106-msgstr "-N\t\t\tÐåæèì íåïîëíîé ñîâìåñòèìîñòè ñ Vi: 'nocompatible'"
3107-
3108-#: main.c:2497
3109-msgid "-V[N]\t\tVerbose level"
3110-msgstr "-V[N]\t\tÓðîâåíü ïîäðîáíîñòè ñîîáùåíèé"
3111-
3112-#: main.c:2498
3113-msgid "-D\t\t\tDebugging mode"
3114-msgstr "-D\t\t\tÐåæèì îòëàäêè"
3115-
3116-#: main.c:2499
3117-msgid "-n\t\t\tNo swap file, use memory only"
3118-msgstr "-n\t\t\tÁåç ñâîï-ôàéëà, èñïîëüçóåòñÿ òîëüêî ïàìÿòü"
3119-
3120-#: main.c:2500
3121-msgid "-r\t\t\tList swap files and exit"
3122-msgstr "-r\t\t\tÂûâåñòè ñïèñîê ñâîï-ôàéëîâ è çàâåðøèòü ðàáîòó"
3123-
3124-#: main.c:2501
3125-msgid "-r (with file name)\tRecover crashed session"
3126-msgstr "-r (ñ èìåíåì ôàéëà)\tÂîññòàíîâèòü àâàðèéíî çàâåðø¸ííûé ñåàíñ"
3127-
31283105 #: main.c:2502
3129-msgid "-L\t\t\tSame as -r"
3130-msgstr "-L\t\t\tÒî æå, ÷òî è -r"
3106+msgid "-l\t\t\tLisp mode"
3107+msgstr "-l\t\t\tÐåæèì Lisp"
31313108
31323109 #: main.c:2504
3110+msgid "-C\t\t\tCompatible with Vi: 'compatible'"
3111+msgstr "-C\t\t\tÐåæèì ñîâìåñòèìîñòè ñ Vi: 'compatible'"
3112+
3113+#: main.c:2505
3114+msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
3115+msgstr "-N\t\t\tÐåæèì íåïîëíîé ñîâìåñòèìîñòè ñ Vi: 'nocompatible'"
3116+
3117+#: main.c:2506
3118+msgid "-V[N]\t\tVerbose level"
3119+msgstr "-V[N]\t\tÓðîâåíü ïîäðîáíîñòè ñîîáùåíèé"
3120+
3121+#: main.c:2507
3122+msgid "-D\t\t\tDebugging mode"
3123+msgstr "-D\t\t\tÐåæèì îòëàäêè"
3124+
3125+#: main.c:2508
3126+msgid "-n\t\t\tNo swap file, use memory only"
3127+msgstr "-n\t\t\tÁåç ñâîï-ôàéëà, èñïîëüçóåòñÿ òîëüêî ïàìÿòü"
3128+
3129+#: main.c:2509
3130+msgid "-r\t\t\tList swap files and exit"
3131+msgstr "-r\t\t\tÂûâåñòè ñïèñîê ñâîï-ôàéëîâ è çàâåðøèòü ðàáîòó"
3132+
3133+#: main.c:2510
3134+msgid "-r (with file name)\tRecover crashed session"
3135+msgstr "-r (ñ èìåíåì ôàéëà)\tÂîññòàíîâèòü àâàðèéíî çàâåðø¸ííûé ñåàíñ"
3136+
3137+#: main.c:2511
3138+msgid "-L\t\t\tSame as -r"
3139+msgstr "-L\t\t\tÒî æå, ÷òî è -r"
3140+
3141+#: main.c:2513
31333142 msgid "-f\t\t\tDon't use newcli to open window"
31343143 msgstr "-f\t\t\tÍå èñïîëüçîâàòü newcli äëÿ îòêðûòèÿ îêíà"
31353144
3136-#: main.c:2505
3145+#: main.c:2514
31373146 msgid "-dev <device>\t\tUse <device> for I/O"
31383147 msgstr "-dev <óñòðîéñòâî>\t\tÈñïîëüçîâàòü äëÿ I/O óêàçàííîå <óñòðîéñòâî>"
31393148
3140-#: main.c:2508
3149+#: main.c:2517
31413150 msgid "-A\t\t\tstart in Arabic mode"
31423151 msgstr "-A\t\t\tÇàïóñê â Àðàáñêîì ðåæèìå"
31433152
3144-#: main.c:2511
3153+#: main.c:2520
31453154 msgid "-H\t\t\tStart in Hebrew mode"
31463155 msgstr "-H\t\t\tÇàïóñê â ðåæèìå \"Èâðèò\""
31473156
3148-#: main.c:2514
3157+#: main.c:2523
31493158 msgid "-F\t\t\tStart in Farsi mode"
31503159 msgstr "-F\t\t\tÇàïóñê â ðåæèìå \"Ôàðñè\""
31513160
3152-#: main.c:2516
3161+#: main.c:2525
31533162 msgid "-T <terminal>\tSet terminal type to <terminal>"
31543163 msgstr "-T <òåðìèíàë>\tÍàçíà÷èòü óêàçàííûé òèï <òåðìèíàëà>"
31553164
3156-#: main.c:2517
3165+#: main.c:2526
31573166 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
31583167 msgstr "-u <vimrc>\t\tÈñïîëüçîâàòü <vimrc> âìåñòî ëþáûõ ôàéëîâ .vimrc"
31593168
3160-#: main.c:2519
3169+#: main.c:2528
31613170 msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
31623171 msgstr "-U <gvimrc>\t\tÈñïîëüçîâàòü <gvimrc> âìåñòî ëþáûõ ôàéëîâ .gvimrc"
31633172
3164-#: main.c:2521
3173+#: main.c:2530
31653174 msgid "--noplugin\t\tDon't load plugin scripts"
31663175 msgstr "--noplugin\t\tÍå çàãðóæàòü ñöåíàðèè ìîäóëåé"
31673176
3168-#: main.c:2522
3177+#: main.c:2531
31693178 msgid "-o[N]\t\tOpen N windows (default: one for each file)"
31703179 msgstr "-o[N]\t\tÎòêðûòü N îêîí (ïî óìîë÷àíèþ: ïî îäíîìó íà êàæäûé ôàéë)"
31713180
3172-#: main.c:2523
3181+#: main.c:2532
31733182 msgid "-O[N]\t\tLike -o but split vertically"
31743183 msgstr "-O[N]\t\tÒî æå, ÷òî è -o, íî ñ âåðòèêàëüíûì ðàçäåëåíèåì îêîí"
31753184
3176-#: main.c:2524
3185+#: main.c:2533
31773186 msgid "+\t\t\tStart at end of file"
31783187 msgstr "+\t\t\tÍà÷àòü ðåäàêòèðîâàíèå â êîíöå ôàéëà"
31793188
3180-#: main.c:2525
3189+#: main.c:2534
31813190 msgid "+<lnum>\t\tStart at line <lnum>"
31823191 msgstr "+<lnum>\t\tÍà÷àòü ðåäàêòèðîâàíèå â ñòðîêå ñ íîìåðîì <lnum>"
31833192
3184-#: main.c:2527
3193+#: main.c:2536
31853194 msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
31863195 msgstr "--cmd <êîìàíäà>\tÂûïîëíèòü <êîìàíäó> ïåðåä çàãðóçêîé ôàéëà vimrc"
31873196
3188-#: main.c:2529
3197+#: main.c:2538
31893198 msgid "-c <command>\t\tExecute <command> after loading the first file"
31903199 msgstr "-c <êîìàíäà>\t\tÂûïîëíèòü <êîìàíäó> ïîñëå çàãðóçêè ïåðâîãî ôàéëà"
31913200
3192-#: main.c:2530
3201+#: main.c:2539
31933202 msgid "-S <session>\t\tSource file <session> after loading the first file"
31943203 msgstr "-S <ñåàíñ>\t\tÏðî÷èòàòü ñöåíàðèé <ñåàíñà> ïîñëå çàãðóçêè ïåðâîãî ôàéëà"
31953204
3196-#: main.c:2531
3205+#: main.c:2540
31973206 msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
31983207 msgstr "-s <ñöåíàðèé>\tÏðî÷èòàòü êîìàíäû Îáû÷íîãî ðåæèìà èç ôàéëà <ñöåíàðèÿ>"
31993208
3200-#: main.c:2532
3209+#: main.c:2541
32013210 msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
32023211 msgstr "-w <ñöåíàðèé>\tÄîáàâëÿòü âñå ââåä¸ííûå êîìàíäû â ôàéë <ñöåíàðèÿ>"
32033212
3204-#: main.c:2533
3213+#: main.c:2542
32053214 msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
32063215 msgstr "-W <ñöåíàðèé>\tÇàïèñàòü âñå ââåä¸ííûå êîìàíäû â ôàéë <ñöåíàðèÿ>"
32073216
3208-#: main.c:2535
3217+#: main.c:2544
32093218 msgid "-x\t\t\tEdit encrypted files"
32103219 msgstr "-x\t\t\tÐåäàêòèðîâàíèå çàøèôðîâàííûõ ôàéëîâ"
32113220
3212-#: main.c:2539
3221+#: main.c:2548
32133222 msgid "-display <display>\tConnect vim to this particular X-server"
32143223 msgstr "-display <ýêðàí>\tÏîäñîåäèíèòü vim ê óêàçàííîìó ñåðâåðó X"
32153224
3216-#: main.c:2541
3225+#: main.c:2550
32173226 msgid "-X\t\t\tDo not connect to X server"
32183227 msgstr "-X\t\t\tÍå âûïîëíÿòü ñîåäèíåíèå ñ ñåðâåðîì X"
32193228
3220-#: main.c:2544
3229+#: main.c:2553
32213230 msgid "--remote <files>\tEdit <files> in a Vim server if possible"
32223231 msgstr "--remote <ôàéëû>\tÏî âîçìîæíîñòè ðåäàêòèðîâàòü <ôàéëû> íà ñåðâåðå Vim"
32233232
3224-#: main.c:2545
3233+#: main.c:2554
32253234 msgid "--remote-silent <files> Same, don't complain if there is no server"
32263235 msgstr "--remote-silent <ôàéëû> Òî æå, íî áåç æàëîá íà îòñóòñòâèå ñåðâåðà"
32273236
3228-#: main.c:2546
3237+#: main.c:2555
32293238 msgid ""
32303239 "--remote-wait <files> As --remote but wait for files to have been edited"
32313240 msgstr ""
32323241 "--remote-wait <ôàéëû> Òî æå, ÷òî è --remote, íî ñ îæèäàíèåì çàâåðøåíèÿ"
32333242
3234-#: main.c:2547
3243+#: main.c:2556
32353244 msgid ""
32363245 "--remote-wait-silent <files> Same, don't complain if there is no server"
32373246 msgstr ""
32383247 "--remote-wait-silent <ôàéëû> Òî æå, íî áåç æàëîá íà îòñóòñòâèå ñåðâåðà"
32393248
3240-#: main.c:2548
3249+#: main.c:2557
32413250 msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
32423251 msgstr "--remote-send <êíîïêè>\tÎòïðàâèòü <êíîïêè> íà ñåðâåð Vim è âûéòè"
32433252
3244-#: main.c:2549
3253+#: main.c:2558
32453254 msgid "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
32463255 msgstr "--remote-expr <âûðàæ>\tÂû÷èñëèòü <âûðàæ> íà ñåðâåðå Vim è íàïå÷àòàòü"
32473256
3248-#: main.c:2550
3257+#: main.c:2559
32493258 msgid "--serverlist\t\tList available Vim server names and exit"
32503259 msgstr "--serverlist\t\tÏîêàçàòü ñïèñîê èì¸í ñåðâåðîâ Vim è çàâåðøèòü ðàáîòó"
32513260
3252-#: main.c:2551
3261+#: main.c:2560
32533262 msgid "--servername <name>\tSend to/become the Vim server <name>"
32543263 msgstr ""
32553264 "--servername <èìÿ>\tÎòïðàâèòü íà/ñòàòü ñåðâåðîì Vim ñ óêàçàííûì <èìåíåì>"
32563265
3257-#: main.c:2554
3266+#: main.c:2563
32583267 msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
32593268 msgstr "-i <viminfo>\t\tÈñïîëüçîâàòü âìåñòî .viminfo ôàéë <viminfo>"
32603269
3261-#: main.c:2556
3270+#: main.c:2565
32623271 msgid "-h or --help\tPrint Help (this message) and exit"
32633272 msgstr "-h èëè --help\tÂûâåñòè ñïðàâêó (ýòî ñîîáùåíèå) è çàâåðøèòü ðàáîòó"
32643273
3265-#: main.c:2557
3274+#: main.c:2566
32663275 msgid "--version\t\tPrint version information and exit"
32673276 msgstr "--version\t\tÂûâåñòè èíôîðìàöèþ î âåðñèè Vim è çàâåðøèòü ðàáîòó"
32683277
3269-#: main.c:2561
3278+#: main.c:2570
32703279 msgid ""
32713280 "\n"
32723281 "Arguments recognised by gvim (Motif version):\n"
@@ -3274,7 +3283,7 @@
32743283 "\n"
32753284 "Àðãóìåíòû äëÿ gvim (âåðñèÿ Motif):\n"
32763285
3277-#: main.c:2565
3286+#: main.c:2574
32783287 msgid ""
32793288 "\n"
32803289 "Arguments recognised by gvim (neXtaw version):\n"
@@ -3282,7 +3291,7 @@
32823291 "\n"
32833292 "Àðãóìåíòû äëÿ gvim (âåðñèÿ neXtaw):\n"
32843293
3285-#: main.c:2567
3294+#: main.c:2576
32863295 msgid ""
32873296 "\n"
32883297 "Arguments recognised by gvim (Athena version):\n"
@@ -3290,75 +3299,75 @@
32903299 "\n"
32913300 "Àðãóìåíòû äëÿ gvim (âåðñèÿ Athena):\n"
32923301
3293-#: main.c:2571
3302+#: main.c:2580
32943303 msgid "-display <display>\tRun vim on <display>"
32953304 msgstr "-display <äèñïëåé>\tÇàïóñòèòü vim íà óêàçàííîì <äèñïëåå>"
32963305
3297-#: main.c:2572
3306+#: main.c:2581
32983307 msgid "-iconic\t\tStart vim iconified"
32993308 msgstr "-iconic\t\tÇàïóñòèòü vim â ñâ¸ðíóòîì âèäå"
33003309
3301-#: main.c:2574
3310+#: main.c:2583
33023311 msgid "-name <name>\t\tUse resource as if vim was <name>"
33033312 msgstr "-name <èìÿ>\t\tÈñïîëüçîâàòü ðåñóðñ, êàê åñëè áû vim áûë <èìåíåì>"
33043313
3305-#: main.c:2575
3314+#: main.c:2584
33063315 msgid "\t\t\t (Unimplemented)\n"
33073316 msgstr "\t\t\t (Íå ðåàëèçîâàíî)\n"
33083317
3309-#: main.c:2577
3318+#: main.c:2586
33103319 msgid "-background <color>\tUse <color> for the background (also: -bg)"
33113320 msgstr ""
33123321 "-background <öâåò>\tÈñïîëüçîâàòü óêàçàííûé <öâåò> äëÿ ôîíà (òàêæå: -bg)"
33133322
3314-#: main.c:2578
3323+#: main.c:2587
33153324 msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
33163325 msgstr ""
33173326 "-foreground <öâåò>\tÈñïîëüçîâàòü <öâåò> äëÿ îáû÷íîãî òåêñòà (òàêæå: -fg)"
33183327
3319-#: main.c:2579 main.c:2599
3328+#: main.c:2588 main.c:2608
33203329 msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
33213330 msgstr "-font <øðèôò>\t\tÈñïîëüçîâàòü <øðèôò> äëÿ îáû÷íîãî òåêñòà (òàêæå: -fn)"
33223331
3323-#: main.c:2580
3332+#: main.c:2589
33243333 msgid "-boldfont <font>\tUse <font> for bold text"
33253334 msgstr "-boldfont <øðèôò>\tÈñïîëüçîâàòü <øðèôò> äëÿ æèðíîãî òåêñòà"
33263335
3327-#: main.c:2581
3336+#: main.c:2590
33283337 msgid "-italicfont <font>\tUse <font> for italic text"
33293338 msgstr "-italicfont <øðèôò>\tÈñïîëüçîâàòü <øðèôò> äëÿ íàêëîííîãî òåêñòà"
33303339
3331-#: main.c:2582 main.c:2600
3340+#: main.c:2591 main.c:2609
33323341 msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
33333342 msgstr ""
33343343 "-geometry <ãåîìåòðèÿ>\tÈñïîëüçîâàòü íà÷àëüíóþ <ãåîìåòðèþ> (òàêæå: -geom)"
33353344
3336-#: main.c:2583
3345+#: main.c:2592
33373346 msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
33383347 msgstr "-borderwidth <øèðèíà>\tÈñïîëüçîâàòü <øèðèíó> áîðäþðà (òàêæå: -bw)"
33393348
3340-#: main.c:2584
3349+#: main.c:2593
33413350 msgid "-scrollbarwidth <width> Use a scrollbar width of <width> (also: -sw)"
33423351 msgstr ""
33433352 "-scrollbarwidth <øèðèíà> Èñïîëüçîâàòü øèðèíó ïîëîñû ïðîêðóòêè (òàêæå: -sw)"
33443353
3345-#: main.c:2586
3354+#: main.c:2595
33463355 msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
33473356 msgstr "-menuheight <âûñîòà>\tÈñïîëüçîâàòü <âûñîòó> ìåíþ (òàêæå: -mh)"
33483357
3349-#: main.c:2588 main.c:2601
3358+#: main.c:2597 main.c:2610
33503359 msgid "-reverse\t\tUse reverse video (also: -rv)"
33513360 msgstr "-reverse\t\tÈñïîëüçîâàòü èíâåðñíûé âèäåîðåæèì (òàêæå: -rv)"
33523361
3353-#: main.c:2589
3362+#: main.c:2598
33543363 msgid "+reverse\t\tDon't use reverse video (also: +rv)"
33553364 msgstr "+reverse\t\tÍå èñïîëüçîâàòü èíâåðñíûé âèäåîðåæèì (òàêæå: +rv)"
33563365
3357-#: main.c:2590
3366+#: main.c:2599
33583367 msgid "-xrm <resource>\tSet the specified resource"
33593368 msgstr "-xrm <ðåñóðñ>\tÓñòàíîâèòü óêàçàííûé <ðåñóðñ>"
33603369
3361-#: main.c:2593
3370+#: main.c:2602
33623371 msgid ""
33633372 "\n"
33643373 "Arguments recognised by gvim (RISC OS version):\n"
@@ -3366,15 +3375,15 @@
33663375 "\n"
33673376 "Àðãóìåíòû äëÿ gvim (âåðñèÿ RISC OS):\n"
33683377
3369-#: main.c:2594
3378+#: main.c:2603
33703379 msgid "--columns <number>\tInitial width of window in columns"
33713380 msgstr "--columns <÷èñëî>\tÏåðâîíà÷àëüíàÿ øèðèíà îêíà â êîëîíêàõ"
33723381
3373-#: main.c:2595
3382+#: main.c:2604
33743383 msgid "--rows <number>\tInitial height of window in rows"
33753384 msgstr "--rows <÷èñëî>\tÏåðâîíà÷àëüíàÿ âûñîòà îêíà â ñòðîêàõ"
33763385
3377-#: main.c:2598
3386+#: main.c:2607
33783387 msgid ""
33793388 "\n"
33803389 "Arguments recognised by gvim (GTK+ version):\n"
@@ -3382,48 +3391,48 @@
33823391 "\n"
33833392 "Àðãóìåíòû äëÿ gvim (âåðñèÿ GTK+):\n"
33843393
3385-#: main.c:2602
3394+#: main.c:2611
33863395 msgid "-display <display>\tRun vim on <display> (also: --display)"
33873396 msgstr ""
33883397 "-display <äèñïëåé>\tÇàïóñòèòü vim íà óêàçàííîì <äèñïëåå> (òàêæå: --display)"
33893398
3390-#: main.c:2604
3399+#: main.c:2613
33913400 msgid "--role <role>\tSet a unique role to identify the main window"
33923401 msgstr ""
33933402 "--role <ðîëü>\tÓñòàíîâèòü óíèêàëüíóþ <ðîëü> äëÿ èäåíòèôèêàöèè ãëàâíîãî îêíà"
33943403
3395-#: main.c:2606
3404+#: main.c:2615
33963405 msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
33973406 msgstr "--socketid <xid>\tÎòêðûòü Vim âíóòðè äðóãîãî êîìïîíåíòà GTK"
33983407
3399-#: main.c:2609
3408+#: main.c:2618
34003409 msgid "-P <parent title>\tOpen Vim inside parent application"
34013410 msgstr "-P <çàãîëîâîê ðîäèòåëÿ>\tÎòêðûòü Vim â ðîäèòåëüñêîì ïðèëîæåíèè"
34023411
3403-#: main.c:2847
3412+#: main.c:2856
34043413 msgid "No display"
34053414 msgstr "Íåò äèñïëåÿ"
34063415
34073416 #. Failed to send, abort.
3408-#: main.c:2862
3417+#: main.c:2871
34093418 msgid ": Send failed.\n"
34103419 msgstr ": Îòïðàâêà íå óäàëàñü.\n"
34113420
34123421 #. Let vim start normally.
3413-#: main.c:2868
3422+#: main.c:2877
34143423 msgid ": Send failed. Trying to execute locally\n"
34153424 msgstr ": Îòïðàâêà íå óäàëàñü. Ïîïûòêà ìåñòíîãî âûïîëíåíèÿ\n"
34163425
3417-#: main.c:2906 main.c:2927
3426+#: main.c:2915 main.c:2936
34183427 #, c-format
34193428 msgid "%d of %d edited"
34203429 msgstr "îòðåäàêòèðîâàíî %d èç %d"
34213430
3422-#: main.c:2949
3431+#: main.c:2958
34233432 msgid "No display: Send expression failed.\n"
34243433 msgstr "Íåò äèñïëåÿ: îòïðàâêà âûðàæåíèÿ íå óäàëàñü.\n"
34253434
3426-#: main.c:2961
3435+#: main.c:2970
34273436 msgid ": Send expression failed.\n"
34283437 msgstr ": Îòïðàâêà âûðàæåíèÿ íå óäàëàñü.\n"
34293438
@@ -3543,23 +3552,23 @@
35433552 msgid "E293: block was not locked"
35443553 msgstr "E293: áëîê íå çàáëîêèðîâàí"
35453554
3546-#: memfile.c:1005
3555+#: memfile.c:1010
35473556 msgid "E294: Seek error in swap file read"
35483557 msgstr "E294: Îøèáêà ïîèñêà ïðè ÷òåíèè ñâîï-ôàéëà"
35493558
3550-#: memfile.c:1010
3559+#: memfile.c:1015
35513560 msgid "E295: Read error in swap file"
35523561 msgstr "E295: Îøèáêà ÷òåíèÿ ñâîï-ôàéëà"
35533562
3554-#: memfile.c:1062
3563+#: memfile.c:1067
35553564 msgid "E296: Seek error in swap file write"
35563565 msgstr "E296: Îøèáêà ïîèñêà ïðè çàïèñè ñâîï-ôàéëà"
35573566
3558-#: memfile.c:1080
3567+#: memfile.c:1085
35593568 msgid "E297: Write error in swap file"
35603569 msgstr "E297: Îøèáêà ïðè çàïèñè ñâîï-ôàéëà"
35613570
3562-#: memfile.c:1277
3571+#: memfile.c:1282
35633572 msgid "E300: Swap file already exists (symlink attack?)"
35643573 msgstr ""
35653574 "E300: Ñâîï-ôàéë óæå ñóùåñòâóåò (àòàêà ñ èñïîëüçîâàíèåì ñèìâîëüíîé ññûëêè?)"
@@ -3577,44 +3586,44 @@
35773586 msgstr "E298: Íå ïîëó÷åí áëîê íîìåð 2?"
35783587
35793588 #. could not (re)open the swap file, what can we do????
3580-#: memline.c:443
3589+#: memline.c:444
35813590 msgid "E301: Oops, lost the swap file!!!"
35823591 msgstr "E301: Îé, ïîòåðÿëñÿ ñâîï-ôàéë!!!"
35833592
3584-#: memline.c:448
3593+#: memline.c:449
35853594 msgid "E302: Could not rename swap file"
35863595 msgstr "E302: Íåâîçìîæíî ïåðåèìåíîâàòü ñâîï-ôàéë"
35873596
3588-#: memline.c:518
3597+#: memline.c:519
35893598 #, c-format
35903599 msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
35913600 msgstr ""
35923601 "E303: Íå óäàëîñü îòêðûòü ñâîï-ôàéë äëÿ \"%s\", âîññòàíîâëåíèå íåâîçìîæíî"
35933602
3594-#: memline.c:617
3603+#: memline.c:618
35953604 msgid "E304: ml_timestamp: Didn't get block 0??"
35963605 msgstr "E304: ml_timestamp: Íå ïîëó÷åí áëîê 0??"
35973606
3598-#: memline.c:757
3607+#: memline.c:758
35993608 #, c-format
36003609 msgid "E305: No swap file found for %s"
36013610 msgstr "E305: Ñâîï-ôàéë äëÿ %s íå íàéäåí"
36023611
3603-#: memline.c:767
3612+#: memline.c:768
36043613 msgid "Enter number of swap file to use (0 to quit): "
36053614 msgstr ""
36063615 "Ââåäèòå íîìåð ñâîï-ôàéëà, êîòîðûé ñëåäóåò èñïîëüçîâàòü (0 äëÿ âûõîäà): "
36073616
3608-#: memline.c:812
3617+#: memline.c:813
36093618 #, c-format
36103619 msgid "E306: Cannot open %s"
36113620 msgstr "E306: Íå ìîãó îòêðûòü %s"
36123621
3613-#: memline.c:834
3622+#: memline.c:835
36143623 msgid "Unable to read block 0 from "
36153624 msgstr "Íåâîçìîæíî ïðî÷èòàòü áëîê 0 èç "
36163625
3617-#: memline.c:837
3626+#: memline.c:838
36183627 msgid ""
36193628 "\n"
36203629 "Maybe no changes were made or Vim did not update the swap file."
@@ -3622,28 +3631,28 @@
36223631 "\n"
36233632 "Íåò èçìåíåíèé, èëè Vim íå ñìîã îáíîâèòü ñâîï-ôàéë"
36243633
3625-#: memline.c:847 memline.c:864
3634+#: memline.c:848 memline.c:865
36263635 msgid " cannot be used with this version of Vim.\n"
36273636 msgstr " íåëüçÿ èñïîëüçîâàòü â äàííîé âåðñèè Vim.\n"
36283637