packages: vim/7.2.189 (NEW), vim/7.2.190 (NEW), vim/7.2.191 (NEW), vim/7.2....
adamg
adamg at pld-linux.org
Fri Jun 26 22:45:39 CEST 2009
Author: adamg Date: Fri Jun 26 20:45:39 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- new
---- Files affected:
packages/vim:
7.2.189 (NONE -> 1.1) (NEW), 7.2.190 (NONE -> 1.1) (NEW), 7.2.191 (NONE -> 1.1) (NEW), 7.2.192 (NONE -> 1.1) (NEW), 7.2.193 (NONE -> 1.1) (NEW), 7.2.194 (NONE -> 1.1) (NEW), 7.2.195 (NONE -> 1.1) (NEW), 7.2.196 (NONE -> 1.1) (NEW), 7.2.197 (NONE -> 1.1) (NEW), 7.2.198 (NONE -> 1.1) (NEW), 7.2.199 (NONE -> 1.1) (NEW), 7.2.200 (NONE -> 1.1) (NEW), 7.2.201 (NONE -> 1.1) (NEW), 7.2.202 (NONE -> 1.1) (NEW), 7.2.203 (NONE -> 1.1) (NEW), 7.2.204 (NONE -> 1.1) (NEW), 7.2.205 (NONE -> 1.1) (NEW), 7.2.206 (NONE -> 1.1) (NEW), 7.2.207 (NONE -> 1.1) (NEW), 7.2.208 (NONE -> 1.1) (NEW), 7.2.209 (NONE -> 1.1) (NEW), 7.2.210 (NONE -> 1.1) (NEW), 7.2.211 (NONE -> 1.1) (NEW), 7.2.212 (NONE -> 1.1) (NEW), 7.2.213 (NONE -> 1.1) (NEW), 7.2.214 (NONE -> 1.1) (NEW), 7.2.215 (NONE -> 1.1) (NEW), 7.2.216 (NONE -> 1.1) (NEW), 7.2.217 (NONE -> 1.1) (NEW), 7.2.218 (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/vim/7.2.189
diff -u /dev/null packages/vim/7.2.189:1.1
--- /dev/null Fri Jun 26 22:45:39 2009
+++ packages/vim/7.2.189 Fri Jun 26 22:45:32 2009
@@ -0,0 +1,86 @@
+To: vim-dev at vim.org
+Subject: Patch 7.2.189
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.189
+Problem: Possible hang for deleting auto-indent. (Dominique Pelle)
+Solution: Make sure the position is not beyond the end of the line.
+Files: src/edit.c
+
+
+*** ../vim-7.2.188/src/edit.c 2009-05-16 16:36:25.000000000 +0200
+--- src/edit.c 2009-05-26 10:53:05.000000000 +0200
+***************
+*** 6420,6432 ****
+
+ /* If we just did an auto-indent, remove the white space from the end
+ * of the line, and put the cursor back.
+! * Do this when ESC was used or moving the cursor up/down. */
+ if (did_ai && (esc || (vim_strchr(p_cpo, CPO_INDENT) == NULL
+! && curwin->w_cursor.lnum != end_insert_pos->lnum)))
+ {
+ pos_T tpos = curwin->w_cursor;
+
+ curwin->w_cursor = *end_insert_pos;
+ for (;;)
+ {
+ if (gchar_cursor() == NUL && curwin->w_cursor.col > 0)
+--- 6420,6436 ----
+
+ /* If we just did an auto-indent, remove the white space from the end
+ * of the line, and put the cursor back.
+! * Do this when ESC was used or moving the cursor up/down.
+! * Check for the old position still being valid, just in case the text
+! * got changed unexpectedly. */
+ if (did_ai && (esc || (vim_strchr(p_cpo, CPO_INDENT) == NULL
+! && curwin->w_cursor.lnum != end_insert_pos->lnum))
+! && end_insert_pos->lnum <= curbuf->b_ml.ml_line_count)
+ {
+ pos_T tpos = curwin->w_cursor;
+
+ curwin->w_cursor = *end_insert_pos;
++ check_cursor_col(); /* make sure it is not past the line */
+ for (;;)
+ {
+ if (gchar_cursor() == NUL && curwin->w_cursor.col > 0)
+***************
+*** 6434,6440 ****
+ cc = gchar_cursor();
+ if (!vim_iswhite(cc))
+ break;
+! (void)del_char(TRUE);
+ }
+ if (curwin->w_cursor.lnum != tpos.lnum)
+ curwin->w_cursor = tpos;
+--- 6438,6445 ----
+ cc = gchar_cursor();
+ if (!vim_iswhite(cc))
+ break;
+! if (del_char(TRUE) == FAIL)
+! break; /* should not happen */
+ }
+ if (curwin->w_cursor.lnum != tpos.lnum)
+ curwin->w_cursor = tpos;
+*** ../vim-7.2.188/src/version.c 2009-05-24 13:40:17.000000000 +0200
+--- src/version.c 2009-05-26 10:50:53.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+ { /* Add new patch number below this line */
++ /**/
++ 189,
+ /**/
+
+--
+FIRST VILLAGER: We have found a witch. May we burn her?
+ "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
================================================================
Index: packages/vim/7.2.190
diff -u /dev/null packages/vim/7.2.190:1.1
--- /dev/null Fri Jun 26 22:45:39 2009
+++ packages/vim/7.2.190 Fri Jun 26 22:45:32 2009
@@ -0,0 +1,182 @@
+To: vim-dev at vim.org
+Subject: Patch 7.2.190
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.190
+Problem: The register executed by @@ isn't restored.
+Solution: Mark the executable register in the viminfo file.
+Files: src/ops.c
+
+
+*** ../vim-7.2.189/src/ops.c 2009-05-13 12:46:36.000000000 +0200
+--- src/ops.c 2009-05-26 18:05:23.000000000 +0200
+***************
+*** 1143,1148 ****
+--- 1143,1150 ----
+ return OK;
+ }
+
++ static int execreg_lastc = NUL;
++
+ /*
+ * execute a yank register: copy it into the stuff buffer
+ *
+***************
+*** 1155,1161 ****
+ int addcr; /* always add '\n' to end of line */
+ int silent; /* set "silent" flag in typeahead buffer */
+ {
+- static int lastc = NUL;
+ long i;
+ char_u *p;
+ int retval = OK;
+--- 1157,1162 ----
+***************
+*** 1163,1174 ****
+
+ if (regname == '@') /* repeat previous one */
+ {
+! if (lastc == NUL)
+ {
+ EMSG(_("E748: No previously used register"));
+ return FAIL;
+ }
+! regname = lastc;
+ }
+ /* check for valid regname */
+ if (regname == '%' || regname == '#' || !valid_yank_reg(regname, FALSE))
+--- 1164,1175 ----
+
+ if (regname == '@') /* repeat previous one */
+ {
+! if (execreg_lastc == NUL)
+ {
+ EMSG(_("E748: No previously used register"));
+ return FAIL;
+ }
+! regname = execreg_lastc;
+ }
+ /* check for valid regname */
+ if (regname == '%' || regname == '#' || !valid_yank_reg(regname, FALSE))
+***************
+*** 1176,1182 ****
+ emsg_invreg(regname);
+ return FAIL;
+ }
+! lastc = regname;
+
+ #ifdef FEAT_CLIPBOARD
+ regname = may_get_selection(regname);
+--- 1177,1183 ----
+ emsg_invreg(regname);
+ return FAIL;
+ }
+! execreg_lastc = regname;
+
+ #ifdef FEAT_CLIPBOARD
+ regname = may_get_selection(regname);
+***************
+*** 5337,5347 ****
+--- 5338,5351 ----
+
+ /* We only get here (hopefully) if line[0] == '"' */
+ str = virp->vir_line + 1;
++
++ /* If the line starts with "" this is the y_previous register. */
+ if (*str == '"')
+ {
+ set_prev = TRUE;
+ str++;
+ }
++
+ if (!ASCII_ISALNUM(*str) && *str != '-')
+ {
+ if (viminfo_error("E577: ", _("Illegal register name"), virp->vir_line))
+***************
+*** 5351,5356 ****
+--- 5355,5368 ----
+ get_yank_register(*str++, FALSE);
+ if (!force && y_current->y_array != NULL)
+ do_it = FALSE;
++
++ if (*str == '@')
++ {
++ /* "x@: register x used for @@ */
++ if (force || execreg_lastc == NUL)
++ execreg_lastc = str[-1];
++ }
++
+ size = 0;
+ limit = 100; /* Optimized for registers containing <= 100 lines */
+ if (do_it)
+***************
+*** 5360,5366 ****
+ vim_free(y_current->y_array);
+ array = y_current->y_array =
+ (char_u **)alloc((unsigned)(limit * sizeof(char_u *)));
+! str = skipwhite(str);
+ if (STRNCMP(str, "CHAR", 4) == 0)
+ y_current->y_type = MCHAR;
+ #ifdef FEAT_VISUAL
+--- 5372,5378 ----
+ vim_free(y_current->y_array);
+ array = y_current->y_array =
+ (char_u **)alloc((unsigned)(limit * sizeof(char_u *)));
+! str = skipwhite(skiptowhite(str));
+ if (STRNCMP(str, "CHAR", 4) == 0)
+ y_current->y_type = MCHAR;
+ #ifdef FEAT_VISUAL
+***************
+*** 5443,5448 ****
+--- 5455,5461 ----
+ max_kbyte = get_viminfo_parameter('s');
+ if (max_kbyte == 0)
+ return;
++
+ for (i = 0; i < NUM_REGISTERS; i++)
+ {
+ if (y_regs[i].y_array == NULL)
+***************
+*** 5497,5503 ****
+ if (y_previous == &y_regs[i])
+ fprintf(fp, "\"");
+ c = get_register_name(i);
+! fprintf(fp, "\"%c\t%s\t%d\n", c, type,
+ #ifdef FEAT_VISUAL
+ (int)y_regs[i].y_width
+ #else
+--- 5510,5519 ----
+ if (y_previous == &y_regs[i])
+ fprintf(fp, "\"");
+ c = get_register_name(i);
+! fprintf(fp, "\"%c", c);
+! if (c == execreg_lastc)
+! fprintf(fp, "@");
+! fprintf(fp, "\t%s\t%d\n", type,
+ #ifdef FEAT_VISUAL
+ (int)y_regs[i].y_width
+ #else
+*** ../vim-7.2.189/src/version.c 2009-05-26 11:01:43.000000000 +0200
+--- src/version.c 2009-05-26 18:10:13.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+ { /* Add new patch number below this line */
++ /**/
++ 190,
+ /**/
+
+--
+If you had to identify, in one word, the reason why the
+human race has not achieved, and never will achieve, its
+full potential, that word would be "meetings."
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
================================================================
Index: packages/vim/7.2.191
diff -u /dev/null packages/vim/7.2.191:1.1
--- /dev/null Fri Jun 26 22:45:39 2009
+++ packages/vim/7.2.191 Fri Jun 26 22:45:32 2009
@@ -0,0 +1,3705 @@
+To: vim-dev at vim.org
+Subject: Patch 7.2.191
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.191
+Problem: Mzscheme interface doesn't work on Ubuntu.
+Solution: Change autoconf rules. Define missing macro. Some changes to
+ avoid gcc warnings. Remove per-buffer namespace. (Sergey Khorev)
+Files: runtime/doc/if_mzsch.txt, src/Makefile, src/Make_ming.mak,
+ src/Make_mvc.mak, src/auto/configure, src/configure.in,
+ src/config.mk.in, src/eval.c, src/if_mzsch.c, src/if_mzsch.h,
+ src/main.c, src/proto/if_mzsch.pro
+
+
+*** ../vim-7.2.190/runtime/doc/if_mzsch.txt 2008-08-09 19:36:48.000000000 +0200
+--- runtime/doc/if_mzsch.txt 2009-05-26 18:49:53.000000000 +0200
+***************
+*** 1,4 ****
+! *if_mzsch.txt* For Vim version 7.2. Last change: 2008 Jun 28
+
+
+ VIM REFERENCE MANUAL by Sergey Khorev
+--- 1,4 ----
+! *if_mzsch.txt* For Vim version 7.2. Last change: 2009 May 26
+
+
+ VIM REFERENCE MANUAL by Sergey Khorev
+***************
+*** 42,51 ****
+
+ *:mzfile* *:mzf*
+ :[range]mzf[ile] {file} Execute the MzScheme script in {file}. {not in Vi}
+- All statements are executed in the namespace of the
+- buffer that was current during :mzfile start.
+- If you want to access other namespaces, use
+- 'parameterize'.
+
+ All of these commands do essentially the same thing - they execute a piece of
+ MzScheme code, with the "current range" set to the given line
+--- 42,47 ----
+***************
+*** 54,61 ****
+ In the case of :mzscheme, the code to execute is in the command-line.
+ In the case of :mzfile, the code to execute is the contents of the given file.
+
+- Each buffer has its own MzScheme namespace. Global namespace is bound to
+- the "global-namespace" value from the 'vimext' module.
+ MzScheme interface defines exception exn:vim, derived from exn.
+ It is raised for various Vim errors.
+
+--- 50,55 ----
+***************
+*** 79,118 ****
+ e.g.: >
+ :mzscheme (require (prefix vim- vimext))
+ <
+! All the examples below assume this naming scheme. Note that you need to do
+! this again for every buffer.
+
+- The auto-instantiation can be achieved with autocommands, e.g. you can put
+- something like this in your .vimrc (EOFs should not have indentation): >
+- function s:MzRequire()
+- if has("mzscheme")
+- :mz << EOF
+- (require (prefix vim- vimext))
+- (let ((buf (vim-get-buff-by-name (vim-eval "expand(\"<afile>\")"))))
+- (when (and buf (not (eq? buf (vim-curr-buff))))
+- (parameterize ((current-namespace (vim-get-buff-namespace buf)))
+- (namespace-attach-module vim-global-namespace 'vimext)
+- (namespace-require '(prefix vim vimext)))))
+- EOF
+- endif
+- endfunction
+-
+- function s:MzStartup()
+- if has("mzscheme")
+- au BufNew,BufNewFile,BufAdd,BufReadPre * :call s:MzRequire()
+- :mz << EOF
+- (current-library-collection-paths
+- (cons
+- (build-path (find-system-path 'addon-dir) (version) "collects")
+- (current-library-collection-paths)))
+- EOF
+- endif
+- endfunction
+-
+- call s:MzStartup()
+- <
+-
+- The global namespace just instantiated this module with the prefix "vimext:".
+ *mzscheme-sandbox*
+ When executed in the |sandbox|, access to some filesystem and Vim interface
+ procedures is restricted.
+--- 73,80 ----
+ e.g.: >
+ :mzscheme (require (prefix vim- vimext))
+ <
+! All the examples below assume this naming scheme.
+
+ *mzscheme-sandbox*
+ When executed in the |sandbox|, access to some filesystem and Vim interface
+ procedures is restricted.
+***************
+*** 121,135 ****
+ 2. Examples *mzscheme-examples*
+ >
+ :mzscheme (display "Hello")
+ :mzscheme (vim-set-buff-line 10 "This is line #10")
+ <
+ Inline script usage: >
+ function! <SID>SetFirstLine()
+ :mz << EOF
+ (display "!!!")
+ (vim-set-buff-line 1 "This is line #1")
+ (vim-beep)
+! EOF
+ endfunction
+
+ nmap <F9> :call <SID>SetFirstLine() <CR>
+--- 83,102 ----
+ 2. Examples *mzscheme-examples*
+ >
+ :mzscheme (display "Hello")
++ :mz (display (string-append "Using MzScheme version " (version)))
++ :mzscheme (require (prefix vim- vimext)) ; for MzScheme < 4.x
++ :mzscheme (require (prefix-in vim- 'vimext)) ; MzScheme 4.x
+ :mzscheme (vim-set-buff-line 10 "This is line #10")
+ <
+ Inline script usage: >
+ function! <SID>SetFirstLine()
+ :mz << EOF
+ (display "!!!")
++ (require (prefix vim- vimext))
++ ; for newer versions (require (prefix-in vim- 'vimext))
+ (vim-set-buff-line 1 "This is line #1")
+ (vim-beep)
+! EOF
+ endfunction
+
+ nmap <F9> :call <SID>SetFirstLine() <CR>
+***************
+*** 137,153 ****
+ File execution: >
+ :mzfile supascript.scm
+ <
+! Accessing the current buffer namespace from an MzScheme program running in
+! another buffer within |:mzfile|-executed script : >
+! ; Move to the window below
+! (vim-command "wincmd j")
+! ; execute in the context of buffer, to which window belongs
+! ; assume that buffer has 'textstring' defined
+! (parameterize ((current-namespace
+! (vim-get-buff-namespace (vim-curr-buff))))
+! (eval '(vim-set-buff-line 1 textstring)))
+! <
+
+ ==============================================================================
+ 3. Threads *mzscheme-threads*
+
+--- 104,136 ----
+ File execution: >
+ :mzfile supascript.scm
+ <
+! Vim exception handling: >
+! :mz << EOF
+! (require (prefix vim- vimext))
+! ; for newer versions (require (prefix-in vim- 'vimext))
+! (with-handlers
+! ([exn:vim? (lambda (e) (display (exn-message e)))])
+! (vim-eval "nonsense-string"))
+! EOF
+! <
+! Auto-instantiation of vimext module (can be placed in your |vimrc|): >
+! function! MzRequire()
+! :redir => l:mzversion
+! :mz (version)
+! :redir END
+! if strpart(l:mzversion, 1, 1) < "4"
+! " MzScheme versions < 4.x:
+! :mz (require (prefix vim- vimext))
+! else
+! " newer versions:
+! :mz (require (prefix-in vim- 'vimext))
+! endif
+! endfunction
+
++ if has("mzscheme")
++ silent call MzRequire()
++ endif
++ <
+ ==============================================================================
+ 3. Threads *mzscheme-threads*
+
+***************
+*** 168,178 ****
+ Common
+ ------
+ (command {command-string}) Perform the vim ":Ex" style command.
+! (eval {expr-string}) Evaluate the vim expression to a string.
+! A |List| is turned into a string by
+! joining the items and inserting line
+! breaks.
+! NOTE clashes with MzScheme eval
+ (range-start) Start/End of the range passed with
+ (range-end) the Scheme command.
+ (beep) beep
+--- 151,161 ----
+ Common
+ ------
+ (command {command-string}) Perform the vim ":Ex" style command.
+! (eval {expr-string}) Evaluate the vim expression into
+! respective MzScheme object: |Lists| are
+! represented as Scheme lists,
+! |Dictionaries| as hash tables.
+! NOTE the name clashes with MzScheme eval
+ (range-start) Start/End of the range passed with
+ (range-end) the Scheme command.
+ (beep) beep
+***************
+*** 186,192 ****
+ be set. The symbol 'global can be passed
+ as {buffer-or-window}. Then |:setglobal|
+ will be used.
+- global-namespace The MzScheme main namespace.
+
+ Buffers *mzscheme-buffer*
+ -------
+--- 169,174 ----
+***************
+*** 228,234 ****
+ if there is no such buffer.
+ (get-buff-by-num {buffernum}) Get a buffer by its number (return #f if
+ there is no buffer with this number).
+- (get-buff-namespace [buffer]) Get buffer namespace.
+
+ Windows *mzscheme-window*
+ ------
+--- 210,215 ----
+***************
+*** 250,256 ****
+ (set-cursor (line . col) [window]) Set cursor position.
+
+ ==============================================================================
+! 5. Dynamic loading *mzscheme-dynamic*
+
+ On MS-Windows the MzScheme libraries can be loaded dynamically. The |:version|
+ output then includes |+mzscheme/dyn|.
+--- 231,237 ----
+ (set-cursor (line . col) [window]) Set cursor position.
+
+ ==============================================================================
+! 5. Dynamic loading *mzscheme-dynamic* *E812*
+
+ On MS-Windows the MzScheme libraries can be loaded dynamically. The |:version|
+ output then includes |+mzscheme/dyn|.
+*** ../vim-7.2.190/src/Makefile 2009-05-26 18:12:19.000000000 +0200
+--- src/Makefile 2009-05-26 22:54:48.000000000 +0200
+***************
+*** 536,542 ****
+ # Use this with GCC to check for mistakes, unused arguments, etc.
+ #CFLAGS = -g -Wall -Wextra -Wmissing-prototypes -Wunreachable-code
+ #PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers
+! #MZSCHEME_CFLAGS_EXTRA = -Wno-unreachable-code
+
+ # EFENCE - Electric-Fence malloc debugging: catches memory accesses beyond
+ # allocated memory (and makes every malloc()/free() very slow).
+--- 536,542 ----
+ # Use this with GCC to check for mistakes, unused arguments, etc.
+ #CFLAGS = -g -Wall -Wextra -Wmissing-prototypes -Wunreachable-code
+ #PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers
+! #MZSCHEME_CFLAGS_EXTRA = -Wno-unreachable-code -Wno-unused-parameter
+
+ # EFENCE - Electric-Fence malloc debugging: catches memory accesses beyond
+ # allocated memory (and makes every malloc()/free() very slow).
+***************
+*** 2200,2205 ****
+--- 2200,2206 ----
+ -rm -f $(TOOLS) auto/osdef.h auto/pathdef.c auto/if_perl.c
+ -rm -f conftest* *~ auto/link.sed
+ -rm -rf $(APPDIR)
++ -rm -rf mzscheme_base.c
+ if test -d $(PODIR); then \
+ cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) clean; \
+ fi
+***************
+*** 2433,2440 ****
+ objects/if_xcmdsrv.o: if_xcmdsrv.c
+ $(CCC) -o $@ if_xcmdsrv.c
+
+! objects/if_mzsch.o: if_mzsch.c
+ $(CCC) -o $@ $(MZSCHEME_CFLAGS_EXTRA) if_mzsch.c
+
+ objects/if_perl.o: auto/if_perl.c
+ $(CCC) -o $@ auto/if_perl.c
+--- 2434,2444 ----
+ objects/if_xcmdsrv.o: if_xcmdsrv.c
+ $(CCC) -o $@ if_xcmdsrv.c
+
+! objects/if_mzsch.o: if_mzsch.c $(MZSCHEME_EXTRA)
+ $(CCC) -o $@ $(MZSCHEME_CFLAGS_EXTRA) if_mzsch.c
++
++ mzscheme_base.c:
++ $(MZSCHEME_MZC) --c-mods mzscheme_base.c ++lib scheme/base
+
+ objects/if_perl.o: auto/if_perl.c
+ $(CCC) -o $@ auto/if_perl.c
<<Diff was trimmed, longer than 597 lines>>
More information about the pld-cvs-commit
mailing list