SOURCES: 7.1.101 (NEW), 7.1.102 (NEW), 7.1.103 (NEW), 7.1.104 (NEW...
glen
glen at pld-linux.org
Thu Sep 20 09:56:34 CEST 2007
Author: glen Date: Thu Sep 20 07:56:34 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- from upstream
---- Files affected:
SOURCES:
7.1.101 (NONE -> 1.1) (NEW), 7.1.102 (NONE -> 1.1) (NEW), 7.1.103 (NONE -> 1.1) (NEW), 7.1.104 (NONE -> 1.1) (NEW), 7.1.105 (NONE -> 1.1) (NEW), 7.1.106 (NONE -> 1.1) (NEW), 7.1.107 (NONE -> 1.1) (NEW), 7.1.108 (NONE -> 1.1) (NEW), 7.1.109 (NONE -> 1.1) (NEW), 7.1.110 (NONE -> 1.1) (NEW), 7.1.111 (NONE -> 1.1) (NEW), 7.1.112 (NONE -> 1.1) (NEW), 7.1.113 (NONE -> 1.1) (NEW), 7.1.114 (NONE -> 1.1) (NEW), 7.1.115 (NONE -> 1.1) (NEW), 7.1.116 (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/7.1.101
diff -u /dev/null SOURCES/7.1.101:1.1
--- /dev/null Thu Sep 20 09:56:34 2007
+++ SOURCES/7.1.101 Thu Sep 20 09:56:29 2007
@@ -0,0 +1,53 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.101
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.101
+Problem: Ruby: The Buffer.line= method does not work.
+Solution: Add the "self" argument to set_current_line(). (Jonathan Hankins)
+Files: src/if_ruby.c
+
+
+*** ../vim-7.1.100/src/if_ruby.c Sat May 12 15:01:49 2007
+--- src/if_ruby.c Mon Sep 10 10:40:38 2007
+***************
+*** 789,795 ****
+ return get_buffer_line(curbuf, curwin->w_cursor.lnum);
+ }
+
+! static VALUE set_current_line(VALUE str)
+ {
+ return set_buffer_line(curbuf, curwin->w_cursor.lnum, str);
+ }
+--- 789,795 ----
+ return get_buffer_line(curbuf, curwin->w_cursor.lnum);
+ }
+
+! static VALUE set_current_line(VALUE self, VALUE str)
+ {
+ return set_buffer_line(curbuf, curwin->w_cursor.lnum, str);
+ }
+*** ../vim-7.1.100/src/version.c Thu Sep 6 17:38:06 2007
+--- src/version.c Thu Sep 13 14:59:47 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 101,
+ /**/
+
+--
+The question is: What do you do with your life?
+The wrong answer is: Become the richest guy in the graveyard.
+ (billionaire and Oracle founder Larry Ellison)
+
+ /// 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: SOURCES/7.1.102
diff -u /dev/null SOURCES/7.1.102:1.1
--- /dev/null Thu Sep 20 09:56:34 2007
+++ SOURCES/7.1.102 Thu Sep 20 09:56:29 2007
@@ -0,0 +1,103 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.102
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.102
+Problem: Perl interface doesn't compile with new version of Perl.
+Solution: Add two variables to the dynamic library loading. (Suresh
+ Govindachar)
+Files: src/if_perl.xs
+
+
+*** ../vim-7.1.101/src/if_perl.xs Wed Aug 16 19:33:57 2006
+--- src/if_perl.xs Wed Sep 5 22:00:36 2007
+***************
+*** 40,45 ****
+--- 40,65 ----
+ # define PERL_SUBVERSION SUBVERSION
+ #endif
+
++ /*
++ * Quoting Jan Dubois of Active State:
++ * ActivePerl build 822 still identifies itself as 5.8.8 but already
++ * contains many of the changes from the upcoming Perl 5.8.9 release.
++ *
++ * The changes include addition of two symbols (Perl_sv_2iv_flags,
++ * Perl_newXS_flags) not present in earlier releases.
++ *
++ * Jan Dubois suggested the following guarding scheme:
++ */
++ #if (ACTIVEPERL_VERSION >= 822)
++ # define PERL589_OR_LATER
++ #endif
++ #if (PERL_REVISION == 5) && (PERL_VERSION == 8) && (PERL_SUBVERSION >= 9)
++ # define PERL589_OR_LATER
++ #endif
++ #if (PERL_REVISION == 5) && (PERL_VERSION >= 9)
++ # define PERL589_OR_LATER
++ #endif
++
+ #ifndef pTHX
+ # define pTHX void
+ # define pTHX_
+***************
+*** 109,114 ****
+--- 129,138 ----
+ # else
+ # define Perl_sv_catpvn dll_Perl_sv_catpvn
+ # endif
++ #ifdef PERL589_OR_LATER
++ # define Perl_sv_2iv_flags dll_Perl_sv_2iv_flags
++ # define Perl_newXS_flags dll_Perl_newXS_flags
++ #endif
+ # define Perl_sv_free dll_Perl_sv_free
+ # define Perl_sv_isa dll_Perl_sv_isa
+ # define Perl_sv_magic dll_Perl_sv_magic
+***************
+*** 192,197 ****
+--- 216,225 ----
+ #else
+ static void (*Perl_sv_catpvn)(pTHX_ SV*, const char*, STRLEN);
+ #endif
++ #ifdef PERL589_OR_LATER
++ static IV (*Perl_sv_2iv_flags)(pTHX_ SV* sv, I32 flags);
++ static CV * (*Perl_newXS_flags)(pTHX_ const char *name, XSUBADDR_t subaddr, const char *const filename, const char *const proto, U32 flags);
++ #endif
+ static void (*Perl_sv_free)(pTHX_ SV*);
+ static int (*Perl_sv_isa)(pTHX_ SV*, const char*);
+ static void (*Perl_sv_magic)(pTHX_ SV*, SV*, int, const char*, I32);
+***************
+*** 266,271 ****
+--- 294,303 ----
+ {"Perl_sv_2pv_nolen", (PERL_PROC*)&Perl_sv_2pv_nolen},
+ #else
+ {"Perl_sv_2pv", (PERL_PROC*)&Perl_sv_2pv},
++ #endif
++ #ifdef PERL589_OR_LATER
++ {"Perl_sv_2iv_flags", (PERL_PROC*)&Perl_sv_2iv_flags},
++ {"Perl_newXS_flags", (PERL_PROC*)&Perl_newXS_flags},
+ #endif
+ {"Perl_sv_bless", (PERL_PROC*)&Perl_sv_bless},
+ #if (PERL_REVISION == 5) && (PERL_VERSION >= 8)
+*** ../vim-7.1.101/src/version.c Thu Sep 13 15:00:28 2007
+--- src/version.c Thu Sep 13 15:18:36 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 102,
+ /**/
+
+--
+Witches prefer brooms: vacuum-cleaners need extension cords!
+
+ /// 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: SOURCES/7.1.103
diff -u /dev/null SOURCES/7.1.103:1.1
--- /dev/null Thu Sep 20 09:56:34 2007
+++ SOURCES/7.1.103 Thu Sep 20 09:56:29 2007
@@ -0,0 +1,57 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.103
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.103
+Problem: Using "dw" with the cursor past the end of the last line (using
+ CTRL-\ CTRL-O from Insert mode) deletes a character. (Tim Chase)
+Solution: Don't move the cursor back when the movement failed.
+Files: src/normal.c
+
+
+*** ../vim-7.1.102/src/normal.c Tue Aug 14 22:54:00 2007
+--- src/normal.c Tue Sep 11 19:32:42 2007
+***************
+*** 8364,8370 ****
+ n = fwd_word(cap->count1, cap->arg, cap->oap->op_type != OP_NOP);
+
+ /* Don't leave the cursor on the NUL past a line */
+! if (curwin->w_cursor.col && gchar_cursor() == NUL)
+ {
+ --curwin->w_cursor.col;
+ cap->oap->inclusive = TRUE;
+--- 8364,8370 ----
+ n = fwd_word(cap->count1, cap->arg, cap->oap->op_type != OP_NOP);
+
+ /* Don't leave the cursor on the NUL past a line */
+! if (n != FAIL && curwin->w_cursor.col > 0 && gchar_cursor() == NUL)
+ {
+ --curwin->w_cursor.col;
+ cap->oap->inclusive = TRUE;
+*** ../vim-7.1.102/src/version.c Thu Sep 13 15:19:32 2007
+--- src/version.c Thu Sep 13 15:32:05 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 103,
+ /**/
+
+--
+ARTHUR: Then who is your lord?
+WOMAN: We don't have a lord.
+ARTHUR: What?
+DENNIS: I told you. We're an anarcho-syndicalist commune. We take it in
+ turns to act as a sort of executive officer for the week.
+ The Quest for the Holy Grail (Monty Python)
+
+ /// 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: SOURCES/7.1.104
diff -u /dev/null SOURCES/7.1.104:1.1
--- /dev/null Thu Sep 20 09:56:34 2007
+++ SOURCES/7.1.104 Thu Sep 20 09:56:29 2007
@@ -0,0 +1,538 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.104
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.104 (after 7.1.095)
+Problem: When 'lazyredraw' is set a focus event causes redraw to be
+ postponed until a key is pressed.
+Solution: Instead of not returning from vgetc() when a focus event is
+ encountered return K_IGNORE. Add plain_vgetc() for when the
+ caller doesn't want to get K_IGNORE.
+Files: src/digraph.c, src/edit.c, src/ex_cmds.c, src/ex_getln.c,
+ src/getchar.c, src/normal.c, src/proto/getchar.pro, src/window.c
+
+
+*** ../vim-7.1.103/src/digraph.c Sat Jul 7 13:57:39 2007
+--- src/digraph.c Thu Sep 13 16:11:54 2007
+***************
+*** 2028,2034 ****
+
+ ++no_mapping;
+ ++allow_keys;
+! c = safe_vgetc();
+ --no_mapping;
+ --allow_keys;
+ if (c != ESC) /* ESC cancels CTRL-K */
+--- 2028,2034 ----
+
+ ++no_mapping;
+ ++allow_keys;
+! c = plain_vgetc();
+ --no_mapping;
+ --allow_keys;
+ if (c != ESC) /* ESC cancels CTRL-K */
+***************
+*** 2050,2056 ****
+ #endif
+ ++no_mapping;
+ ++allow_keys;
+! cc = safe_vgetc();
+ --no_mapping;
+ --allow_keys;
+ if (cc != ESC) /* ESC cancels CTRL-K */
+--- 2050,2056 ----
+ #endif
+ ++no_mapping;
+ ++allow_keys;
+! cc = plain_vgetc();
+ --no_mapping;
+ --allow_keys;
+ if (cc != ESC) /* ESC cancels CTRL-K */
+***************
+*** 2350,2356 ****
+ if (*curbuf->b_p_keymap == NUL)
+ {
+ /* Stop any active keymap and clear the table. Also remove
+! * b:keymap_unload, as no keymap is active now. */
+ keymap_unload();
+ do_cmdline_cmd((char_u *)"unlet! b:keymap_name");
+ }
+--- 2350,2356 ----
+ if (*curbuf->b_p_keymap == NUL)
+ {
+ /* Stop any active keymap and clear the table. Also remove
+! * b:keymap_name, as no keymap is active now. */
+ keymap_unload();
+ do_cmdline_cmd((char_u *)"unlet! b:keymap_name");
+ }
+*** ../vim-7.1.103/src/edit.c Sun Aug 12 16:38:03 2007
+--- src/edit.c Thu Sep 13 16:17:54 2007
+***************
+*** 788,794 ****
+ ins_redraw(FALSE);
+ ++no_mapping;
+ ++allow_keys;
+! c = safe_vgetc();
+ --no_mapping;
+ --allow_keys;
+ if (c != Ctrl_N && c != Ctrl_G && c != Ctrl_O)
+--- 788,794 ----
+ ins_redraw(FALSE);
+ ++no_mapping;
+ ++allow_keys;
+! c = plain_vgetc();
+ --no_mapping;
+ --allow_keys;
+ if (c != Ctrl_N && c != Ctrl_G && c != Ctrl_O)
+***************
+*** 981,987 ****
+ #ifdef FEAT_NETBEANS_INTG
+ case K_F21: /* NetBeans command */
+ ++no_mapping; /* don't map the next key hits */
+! i = safe_vgetc();
+ --no_mapping;
+ netbeans_keycommand(i);
+ break;
+--- 981,987 ----
+ #ifdef FEAT_NETBEANS_INTG
+ case K_F21: /* NetBeans command */
+ ++no_mapping; /* don't map the next key hits */
+! i = plain_vgetc();
+ --no_mapping;
+ netbeans_keycommand(i);
+ break;
+***************
+*** 5224,5233 ****
+ i = 0;
+ for (;;)
+ {
+! do
+! nc = safe_vgetc();
+! while (nc == K_IGNORE || nc == K_VER_SCROLLBAR
+! || nc == K_HOR_SCROLLBAR);
+ #ifdef FEAT_CMDL_INFO
+ if (!(State & CMDLINE)
+ # ifdef FEAT_MBYTE
+--- 5224,5230 ----
+ i = 0;
+ for (;;)
+ {
+! nc = plain_vgetc();
+ #ifdef FEAT_CMDL_INFO
+ if (!(State & CMDLINE)
+ # ifdef FEAT_MBYTE
+***************
+*** 7575,7581 ****
+ * deleted when ESC is hit.
+ */
+ ++no_mapping;
+! regname = safe_vgetc();
+ #ifdef FEAT_LANGMAP
+ LANGMAP_ADJUST(regname, TRUE);
+ #endif
+--- 7572,7578 ----
+ * deleted when ESC is hit.
+ */
+ ++no_mapping;
+! regname = plain_vgetc();
+ #ifdef FEAT_LANGMAP
+ LANGMAP_ADJUST(regname, TRUE);
+ #endif
+***************
+*** 7586,7592 ****
+ #ifdef FEAT_CMDL_INFO
+ add_to_showcmd_c(literally);
+ #endif
+! regname = safe_vgetc();
+ #ifdef FEAT_LANGMAP
+ LANGMAP_ADJUST(regname, TRUE);
+ #endif
+--- 7583,7589 ----
+ #ifdef FEAT_CMDL_INFO
+ add_to_showcmd_c(literally);
+ #endif
+! regname = plain_vgetc();
+ #ifdef FEAT_LANGMAP
+ LANGMAP_ADJUST(regname, TRUE);
+ #endif
+***************
+*** 7677,7683 ****
+ * deleted when ESC is hit.
+ */
+ ++no_mapping;
+! c = safe_vgetc();
+ --no_mapping;
+ switch (c)
+ {
+--- 7674,7680 ----
+ * deleted when ESC is hit.
+ */
+ ++no_mapping;
+! c = plain_vgetc();
+ --no_mapping;
+ switch (c)
+ {
+***************
+*** 9356,9362 ****
+ * mode message to be deleted when ESC is hit */
+ ++no_mapping;
+ ++allow_keys;
+! c = safe_vgetc();
+ --no_mapping;
+ --allow_keys;
+ if (IS_SPECIAL(c) || mod_mask) /* special key */
+--- 9353,9359 ----
+ * mode message to be deleted when ESC is hit */
+ ++no_mapping;
+ ++allow_keys;
+! c = plain_vgetc();
+ --no_mapping;
+ --allow_keys;
+ if (IS_SPECIAL(c) || mod_mask) /* special key */
+***************
+*** 9388,9394 ****
+ }
+ ++no_mapping;
+ ++allow_keys;
+! cc = safe_vgetc();
+ --no_mapping;
+ --allow_keys;
+ if (cc != ESC)
+--- 9385,9391 ----
+ }
+ ++no_mapping;
+ ++allow_keys;
+! cc = plain_vgetc();
+ --no_mapping;
+ --allow_keys;
+ if (cc != ESC)
+*** ../vim-7.1.103/src/ex_cmds.c Tue Aug 21 15:28:32 2007
+--- src/ex_cmds.c Thu Sep 13 16:19:40 2007
+***************
+*** 4498,4504 ****
+ *
+ * The new text is built up in new_start[]. It has some extra
+ * room to avoid using alloc()/free() too often. new_start_len is
+! * the lenght of the allocated memory at new_start.
+ *
+ * Make a copy of the old line, so it won't be taken away when
+ * updating the screen or handling a multi-line match. The "old_"
+--- 4499,4505 ----
+ *
+ * The new text is built up in new_start[]. It has some extra
+ * room to avoid using alloc()/free() too often. new_start_len is
+! * the length of the allocated memory at new_start.
+ *
+ * Make a copy of the old line, so it won't be taken away when
+ * updating the screen or handling a multi-line match. The "old_"
+***************
+*** 4669,4675 ****
+ #endif
+ ++no_mapping; /* don't map this key */
+ ++allow_keys; /* allow special keys */
+! i = safe_vgetc();
+ --allow_keys;
+ --no_mapping;
+
+--- 4670,4676 ----
+ #endif
+ ++no_mapping; /* don't map this key */
+ ++allow_keys; /* allow special keys */
+! i = plain_vgetc();
+ --allow_keys;
+ --no_mapping;
+
+*** ../vim-7.1.103/src/ex_getln.c Mon Aug 6 22:27:12 2007
+--- src/ex_getln.c Thu Sep 13 16:20:49 2007
+***************
+*** 641,647 ****
+ {
+ ++no_mapping;
+ ++allow_keys;
+! c = safe_vgetc();
+ --no_mapping;
+ --allow_keys;
+ /* CTRL-\ e doesn't work when obtaining an expression. */
+--- 641,647 ----
+ {
+ ++no_mapping;
+ ++allow_keys;
+! c = plain_vgetc();
+ --no_mapping;
+ --allow_keys;
+ /* CTRL-\ e doesn't work when obtaining an expression. */
+***************
+*** 1091,1101 ****
+ #endif
+ putcmdline('"', TRUE);
+ ++no_mapping;
+! i = c = safe_vgetc(); /* CTRL-R <char> */
+ if (i == Ctrl_O)
+ i = Ctrl_R; /* CTRL-R CTRL-O == CTRL-R CTRL-R */
+ if (i == Ctrl_R)
+! c = safe_vgetc(); /* CTRL-R CTRL-R <char> */
+ --no_mapping;
+ #ifdef FEAT_EVAL
+ /*
+--- 1091,1101 ----
+ #endif
+ putcmdline('"', TRUE);
+ ++no_mapping;
+! i = c = plain_vgetc(); /* CTRL-R <char> */
+ if (i == Ctrl_O)
+ i = Ctrl_R; /* CTRL-R CTRL-O == CTRL-R CTRL-R */
+ if (i == Ctrl_R)
+! c = plain_vgetc(); /* CTRL-R CTRL-R <char> */
+ --no_mapping;
+ #ifdef FEAT_EVAL
+ /*
+*** ../vim-7.1.103/src/getchar.c Wed Sep 5 21:45:54 2007
+--- src/getchar.c Thu Sep 13 16:16:53 2007
+***************
+*** 1597,1608 ****
+ }
+ #endif
+ #ifdef FEAT_GUI
+! /* The caller doesn't need to know that the focus event is delayed
+! * until getting a character. */
+ if (c == K_FOCUSGAINED || c == K_FOCUSLOST)
+ {
+ ui_focus_change(c == K_FOCUSGAINED);
+! continue;
+ }
+
+ /* Translate K_CSI to CSI. The special key is only used to avoid
+--- 1597,1609 ----
+ }
+ #endif
+ #ifdef FEAT_GUI
+! /* Handle focus event here, so that the caller doesn't need to
+! * know about it. Return K_IGNORE so that we loop once (needed if
+! * 'lazyredraw' is set). */
+ if (c == K_FOCUSGAINED || c == K_FOCUSLOST)
+ {
+ ui_focus_change(c == K_FOCUSGAINED);
+! c = K_IGNORE;
+ }
+
+ /* Translate K_CSI to CSI. The special key is only used to avoid
+***************
+*** 1744,1749 ****
+--- 1745,1766 ----
+ c = vgetc();
+ if (c == NUL)
+ c = get_keystroke();
++ return c;
++ }
++
++ /*
++ * Like safe_vgetc(), but loop to handle K_IGNORE.
++ * Also ignore scrollbar events.
++ */
++ int
++ plain_vgetc()
++ {
++ int c;
++
++ do
++ {
++ c = safe_vgetc();
++ } while (c == K_IGNORE || c == K_VER_SCROLLBAR || c == K_HOR_SCROLLBAR);
+ return c;
+ }
+
+*** ../vim-7.1.103/src/normal.c Thu Sep 13 15:33:18 2007
+--- src/normal.c Thu Sep 13 16:24:51 2007
+***************
+*** 696,702 ****
+ ++allow_keys; /* no mapping for nchar, but keys */
+ }
+ ++no_zero_mapping; /* don't map zero here */
+! c = safe_vgetc();
+ #ifdef FEAT_LANGMAP
+ LANGMAP_ADJUST(c, TRUE);
+ #endif
+--- 696,702 ----
<<Diff was trimmed, longer than 597 lines>>
More information about the pld-cvs-commit
mailing list