r733 - in /trunk/packages/vim: debian/README debian/changelog
upstream/patches/7.0.038 upstream/patches/7.0.039
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Wed Jul 19 14:08:07 UTC 2006
Author: jamessan
Date: Wed Jul 19 14:08:01 2006
New Revision: 733
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=733
Log:
Upstream patches 038 and 039
Added:
trunk/packages/vim/upstream/patches/7.0.038
trunk/packages/vim/upstream/patches/7.0.039
Modified:
trunk/packages/vim/debian/README
trunk/packages/vim/debian/changelog
Modified: trunk/packages/vim/debian/README
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/README?rev=733&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Wed Jul 19 14:08:01 2006
@@ -62,3 +62,5 @@
5905 7.0.035 repeating Insert mode completion doesn't work properly
3990 7.0.036 can't compile with small features and syntax HL
1880 7.0.037 crash when resizing Vim window when a line doesn't fit
+ 3236 7.0.038 complete() can be used from expr. mapping after inserting text
+ 3240 7.0.039 third argument for inputdialog() doesn't work in the console
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=733&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Wed Jul 19 14:08:01 2006
@@ -1,9 +1,9 @@
-vim (1:7.0-037+1) UNRELEASED; urgency=low
+vim (1:7.0-039+1) UNRELEASED; urgency=low
[ Debian Vim Maintainers ]
- * New upstream patches (036 - 037), see README.gz for details.
-
- -- James Vega <jamessan at debian.org> Tue, 11 Jul 2006 20:27:07 -0400
+ * New upstream patches (036 - 039), see README.gz for details.
+
+ -- James Vega <jamessan at debian.org> Wed, 19 Jul 2006 10:07:23 -0400
vim (1:7.0-035+1) unstable; urgency=low
Added: trunk/packages/vim/upstream/patches/7.0.038
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.038?rev=733&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.038 (added)
+++ trunk/packages/vim/upstream/patches/7.0.038 Wed Jul 19 14:08:01 2006
@@ -1,0 +1,95 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.038
+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.0.038
+Problem: When calling complete() from an Insert mode expression mapping
+ text could be inserted in an improper way.
+Solution: Make undo_allowed() global and use it in complete().
+Files: src/undo.c, src/proto/undo.pro, src/eval.c
+
+
+*** ../vim-7.0.037/src/undo.c Sat Apr 22 00:01:05 2006
+--- src/undo.c Mon Jul 3 22:23:22 2006
+***************
+*** 84,90 ****
+ static void u_unch_branch __ARGS((u_header_T *uhp));
+ static u_entry_T *u_get_headentry __ARGS((void));
+ static void u_getbot __ARGS((void));
+- static int undo_allowed __ARGS((void));
+ static int u_savecommon __ARGS((linenr_T, linenr_T, linenr_T));
+ static void u_doit __ARGS((int count));
+ static void u_undoredo __ARGS((int undo));
+--- 84,89 ----
+***************
+*** 196,202 ****
+ * Return TRUE when undo is allowed. Otherwise give an error message and
+ * return FALSE.
+ */
+! static int
+ undo_allowed()
+ {
+ /* Don't allow changes when 'modifiable' is off. */
+--- 195,201 ----
+ * Return TRUE when undo is allowed. Otherwise give an error message and
+ * return FALSE.
+ */
+! int
+ undo_allowed()
+ {
+ /* Don't allow changes when 'modifiable' is off. */
+*** ../vim-7.0.037/src/proto/undo.pro Mon Apr 10 16:38:50 2006
+--- src/proto/undo.pro Mon Jul 3 22:25:07 2006
+***************
+*** 4,9 ****
+--- 4,10 ----
+ extern int u_savesub __ARGS((linenr_T lnum));
+ extern int u_inssub __ARGS((linenr_T lnum));
+ extern int u_savedel __ARGS((linenr_T lnum, long nlines));
++ extern int undo_allowed __ARGS((void));
+ extern void u_undo __ARGS((int count));
+ extern void u_redo __ARGS((int count));
+ extern void undo_time __ARGS((long step, int sec, int absolute));
+*** ../vim-7.0.037/src/eval.c Thu Jun 22 21:01:19 2006
+--- src/eval.c Mon Jul 10 23:03:13 2006
+***************
+*** 8252,8257 ****
+--- 8252,8263 ----
+ EMSG(_("E785: complete() can only be used in Insert mode"));
+ return;
+ }
++
++ /* Check for undo allowed here, because if something was already inserted
++ * the line was already saved for undo and this check isn't done. */
++ if (!undo_allowed())
++ return;
++
+ if (argvars[1].v_type != VAR_LIST || argvars[1].vval.v_list == NULL)
+ {
+ EMSG(_(e_invarg));
+*** ../vim-7.0.037/src/version.c Tue Jul 11 22:59:04 2006
+--- src/version.c Wed Jul 12 20:31:49 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 38,
+ /**/
+
+--
+If someone questions your market projections, simply point out that your
+target market is "People who are nuts" and "People who will buy any damn
+thing". Nobody is going to tell you there aren't enough of those people
+to go around.
+ (Scott Adams - The Dilbert principle)
+
+ /// 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 ///
Added: trunk/packages/vim/upstream/patches/7.0.039
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.039?rev=733&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.039 (added)
+++ trunk/packages/vim/upstream/patches/7.0.039 Wed Jul 19 14:08:01 2006
@@ -1,0 +1,129 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.039
+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.0.039
+Problem: Calling inputdialog() with a third argument in the console doesn't
+ work.
+Solution: Make a separate function for input() and inputdialog(). (Yegappan
+ Lakshmanan)
+Files: src/eval.c
+
+
+*** ../vim-7.0.038/src/eval.c Wed Jul 12 21:48:56 2006
+--- src/eval.c Mon Jul 10 23:03:13 2006
+***************
+*** 11321,11334 ****
+
+ static int inputsecret_flag = 0;
+
+ /*
+! * "input()" function
+! * Also handles inputsecret() when inputsecret is set.
+ */
+ static void
+! f_input(argvars, rettv)
+ typval_T *argvars;
+ typval_T *rettv;
+ {
+ char_u *prompt = get_tv_string_chk(&argvars[0]);
+ char_u *p = NULL;
+--- 11321,11339 ----
+
+ static int inputsecret_flag = 0;
+
++ static void get_user_input __ARGS((typval_T *argvars, typval_T *rettv, int inputdialog));
++
+ /*
+! * This function is used by f_input() and f_inputdialog() functions. The third
+! * argument to f_input() specifies the type of completion to use at the
+! * prompt. The third argument to f_inputdialog() specifies the value to return
+! * when the user cancels the prompt.
+ */
+ static void
+! get_user_input(argvars, rettv, inputdialog)
+ typval_T *argvars;
+ typval_T *rettv;
++ int inputdialog;
+ {
+ char_u *prompt = get_tv_string_chk(&argvars[0]);
+ char_u *p = NULL;
+***************
+*** 11378,11384 ****
+ if (defstr != NULL)
+ stuffReadbuffSpec(defstr);
+
+! if (argvars[2].v_type != VAR_UNKNOWN)
+ {
+ char_u *xp_name;
+ int xp_namelen;
+--- 11383,11389 ----
+ if (defstr != NULL)
+ stuffReadbuffSpec(defstr);
+
+! if (!inputdialog && argvars[2].v_type != VAR_UNKNOWN)
+ {
+ char_u *xp_name;
+ int xp_namelen;
+***************
+*** 11413,11418 ****
+--- 11418,11435 ----
+ }
+
+ /*
++ * "input()" function
++ * Also handles inputsecret() when inputsecret is set.
++ */
++ static void
++ f_input(argvars, rettv)
++ typval_T *argvars;
++ typval_T *rettv;
++ {
++ get_user_input(argvars, rettv, FALSE);
++ }
++
++ /*
+ * "inputdialog()" function
+ */
+ static void
+***************
+*** 11452,11458 ****
+ }
+ else
+ #endif
+! f_input(argvars, rettv);
+ }
+
+ /*
+--- 11469,11475 ----
+ }
+ else
+ #endif
+! get_user_input(argvars, rettv, TRUE);
+ }
+
+ /*
+*** ../vim-7.0.038/src/version.c Wed Jul 12 21:48:56 2006
+--- src/version.c Wed Jul 12 21:56:30 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 39,
+ /**/
+
+--
+A consultant is a person who takes your money and annoys your employees while
+tirelessly searching for the best way to extend the consulting contract.
+ (Scott Adams - The Dilbert principle)
+
+ /// 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 ///
More information about the pkg-vim-maintainers
mailing list