r769 - in /trunk/packages/vim: debian/ upstream/patches/
zack at users.alioth.debian.org
zack at users.alioth.debian.org
Sat Sep 16 11:23:09 UTC 2006
Author: zack
Date: Sat Sep 16 11:23:08 2006
New Revision: 769
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=769
Log:
upstream patches up to 109
Added:
trunk/packages/vim/upstream/patches/7.0.102
trunk/packages/vim/upstream/patches/7.0.103
trunk/packages/vim/upstream/patches/7.0.104
trunk/packages/vim/upstream/patches/7.0.105
trunk/packages/vim/upstream/patches/7.0.106
trunk/packages/vim/upstream/patches/7.0.107
trunk/packages/vim/upstream/patches/7.0.108
trunk/packages/vim/upstream/patches/7.0.109
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=769&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Sat Sep 16 11:23:08 2006
@@ -126,3 +126,11 @@
2189 7.0.099 GUI: scrolling causes problems for the popup menu
2086 7.0.100 "zug" may report the wrong filename
2732 7.0.101 "zw" mostly doesn't work; "zg" may create wrong directory
+ 1634 7.0.102 redraw problem in cmdline when using SCIM
+ 1617 7.0.103 (after 7.0.101) compiler warning for uninitialized variable
+ 2522 7.0.104 CursorHold[I] may trigger when it is not wanted
+ 1513 7.0.105 during incremental search the ruler is not updated
+ 5102 7.0.106 spell popup menu may have side effects
+ 1805 7.0.107 tab pages line was not redrawn when using 'incsearch'
+ 2583 7.0.108 (extra) Amiga: compilation error for mch_mkdir()
+ 1923 7.0.109 Lisp indenting gets confused by an escaped quote in a string
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=769&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Sat Sep 16 11:23:08 2006
@@ -1,9 +1,9 @@
-vim (1:7.0-101+1) unstable; urgency=low
+vim (1:7.0-109+1) UNRELEASED; urgency=low
[ Debian Vim Maintainers ]
- * New upstream patches (095 - 101), see README.gz for details.
-
- -- James Vega <jamessan at debian.org> Wed, 13 Sep 2006 10:16:44 -0400
+ * New upstream patches (095 - 109), see README.gz for details.
+
+ -- Stefano Zacchiroli <zack at debian.org> Sat, 16 Sep 2006 13:23:13 +0200
vim (1:7.0-094+1) unstable; urgency=medium
Added: trunk/packages/vim/upstream/patches/7.0.102
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.102?rev=769&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.102 (added)
+++ trunk/packages/vim/upstream/patches/7.0.102 Sat Sep 16 11:23:08 2006
@@ -1,0 +1,54 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.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.0.102
+Problem: Redrawing cmdline is not correct when using SCIM.
+Solution: Don't call im_get_status(). (Yukihiro Nakadaira)
+Files: src/ex_getln.c
+
+
+*** ../vim-7.0.101/src/ex_getln.c Sun Sep 10 21:05:39 2006
+--- src/ex_getln.c Tue Sep 12 20:52:51 2006
+***************
+*** 2363,2369 ****
+ {
+ if ((State & CMDLINE)
+ && xic != NULL
+! && im_get_status()
+ && !p_imdisable
+ && im_is_preediting())
+ {
+--- 2363,2369 ----
+ {
+ if ((State & CMDLINE)
+ && xic != NULL
+! /* && im_get_status() doesn't work when using SCIM */
+ && !p_imdisable
+ && im_is_preediting())
+ {
+*** ../vim-7.0.101/src/version.c Tue Sep 12 22:24:48 2006
+--- src/version.c Thu Sep 14 10:23:45 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 102,
+ /**/
+
+--
+TIM: That is not an ordinary rabbit ... 'tis the most foul cruel and
+ bad-tempered thing you ever set eyes on.
+ROBIN: You tit. I soiled my armour I was so scared!
+ "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 ///
Added: trunk/packages/vim/upstream/patches/7.0.103
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.103?rev=769&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.103 (added)
+++ trunk/packages/vim/upstream/patches/7.0.103 Sat Sep 16 11:23:08 2006
@@ -1,0 +1,53 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.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.0.103 (after 7.0.101)
+Problem: Compiler warning for uninitialized variable. (Tony Mechelynck)
+Solution: Init variable.
+Files: src/spell.c
+
+
+*** ../vim-7.0.102/src/spell.c Tue Sep 12 22:24:48 2006
+--- src/spell.c Wed Sep 13 20:46:22 2006
+***************
+*** 9251,9257 ****
+ 'spellfile' */
+ int undo; /* TRUE for "zug", "zuG", "zuw" and "zuW" */
+ {
+! FILE *fd;
+ buf_T *buf = NULL;
+ int new_spf = FALSE;
+ char_u *fname;
+--- 9251,9257 ----
+ 'spellfile' */
+ int undo; /* TRUE for "zug", "zuG", "zuw" and "zuW" */
+ {
+! FILE *fd = NULL;
+ buf_T *buf = NULL;
+ int new_spf = FALSE;
+ char_u *fname;
+*** ../vim-7.0.102/src/version.c Thu Sep 14 10:25:34 2006
+--- src/version.c Thu Sep 14 10:47:39 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 103,
+ /**/
+
+--
+ARTHUR: Go on, Bors, chop its head off.
+BORS: Right. Silly little bleeder. One rabbit stew coming up.
+ "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 ///
Added: trunk/packages/vim/upstream/patches/7.0.104
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.104?rev=769&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.104 (added)
+++ trunk/packages/vim/upstream/patches/7.0.104 Sat Sep 16 11:23:08 2006
@@ -1,0 +1,89 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.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.0.104
+Problem: The CursorHoldI event only triggers once in Insert mode. It also
+ triggers after CTRL-V and other two-key commands.
+Solution: Set "did_cursorhold" before getting a second key. Reset
+ "did_cursorhold" after handling a command.
+Files: src/edit.c, src/fileio.c
+
+
+*** ../vim-7.0.103/src/edit.c Tue Aug 29 18:36:55 2006
+--- src/edit.c Tue Sep 12 21:12:10 2006
+***************
+*** 707,712 ****
+--- 707,717 ----
+ lastc = c; /* remember previous char for CTRL-D */
+ c = safe_vgetc();
+
++ #ifdef FEAT_AUTOCMD
++ /* Don't want K_CURSORHOLD for the second key, e.g., after CTRL-V. */
++ did_cursorhold = TRUE;
++ #endif
++
+ #ifdef FEAT_RIGHTLEFT
+ if (p_hkmap && KeyTyped)
+ c = hkmap(c); /* Hebrew mode mapping */
+***************
+*** 1388,1393 ****
+--- 1393,1404 ----
+ #endif
+ break;
+ } /* end of switch (c) */
++
++ #ifdef FEAT_AUTOCMD
++ /* If typed something may trigger CursorHoldI again. */
++ if (c != K_CURSORHOLD)
++ did_cursorhold = FALSE;
++ #endif
+
+ /* If the cursor was moved we didn't just insert a space */
+ if (arrow_used)
+*** ../vim-7.0.103/src/fileio.c Sat Sep 9 14:51:43 2006
+--- src/fileio.c Tue Sep 12 20:58:55 2006
+***************
+*** 8289,8295 ****
+ {
+ int state;
+
+! if (!did_cursorhold && has_cursorhold() && !Recording)
+ {
+ state = get_real_state();
+ if (state == NORMAL_BUSY || (state & INSERT) != 0)
+--- 8289,8299 ----
+ {
+ int state;
+
+! if (!did_cursorhold && has_cursorhold() && !Recording
+! #ifdef FEAT_INS_EXPAND
+! && !ins_compl_active()
+! #endif
+! )
+ {
+ state = get_real_state();
+ if (state == NORMAL_BUSY || (state & INSERT) != 0)
+*** ../vim-7.0.103/src/version.c Thu Sep 14 10:48:00 2006
+--- src/version.c Thu Sep 14 11:05:33 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 104,
+ /**/
+
+--
+A hamburger walks into a bar, and the bartender says: "I'm sorry,
+but we don't serve food here."
+
+ /// 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.105
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.105?rev=769&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.105 (added)
+++ trunk/packages/vim/upstream/patches/7.0.105 Sat Sep 16 11:23:08 2006
@@ -1,0 +1,50 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.105
+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.105
+Problem: When using incremental search the statusline ruler isn't updated.
+ (Christoph Koegl)
+Solution: Update the statusline when it contains the ruler.
+Files: src/ex_getln.c
+
+
+*** ../vim-7.0.104/src/ex_getln.c Thu Sep 14 10:25:34 2006
+--- src/ex_getln.c Thu Sep 14 10:42:24 2006
+***************
+*** 1756,1761 ****
+--- 1756,1766 ----
+ end_pos = curwin->w_cursor; /* shutup gcc 4 */
+
+ validate_cursor();
++ # ifdef FEAT_WINDOWS
++ /* May redraw the status line to show the cursor position. */
++ if (p_ru && curwin->w_status_height > 0)
++ curwin->w_redr_status = TRUE;
++ # endif
+
+ save_cmdline(&save_ccline);
+ update_screen(SOME_VALID);
+*** ../vim-7.0.104/src/version.c Thu Sep 14 11:07:08 2006
+--- src/version.c Thu Sep 14 11:25:37 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 105,
+ /**/
+
+--
+An indication you must be a manager:
+You feel sorry for Dilbert's boss.
+
+ /// 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.106
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.106?rev=769&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.106 (added)
+++ trunk/packages/vim/upstream/patches/7.0.106 Sat Sep 16 11:23:08 2006
@@ -1,0 +1,150 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.106
+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.106
+Problem: The spell popup menu uses ":amenu", triggering mappings. Other
+ PopupMenu autocommands are removed. (John Little)
+Solution: Use ":anoremenu" and use an autocmd group.
+Files: runtime/menu.vim
+
+
+*** ../vim-7.0.105/runtime/menu.vim Tue Apr 18 00:06:31 2006
+--- runtime/menu.vim Thu Sep 14 13:14:25 2006
+***************
+*** 2,8 ****
+ " You can also use this as a start for your own set of menus.
+ "
+ " Maintainer: Bram Moolenaar <Bram at vim.org>
+! " Last Change: 2006 Apr 17
+
+ " Note that ":an" (short for ":anoremenu") is often used to make a menu work
+ " in all modes and avoid side effects from mappings defined by the user.
+--- 2,8 ----
+ " You can also use this as a start for your own set of menus.
+ "
+ " Maintainer: Bram Moolenaar <Bram at vim.org>
+! " Last Change: 2006 Sep 14
+
+ " Note that ":an" (short for ":anoremenu") is often used to make a menu work
+ " in all modes and avoid side effects from mappings defined by the user.
+***************
+*** 885,890 ****
+--- 885,892 ----
+ if exists("s:changeitem") && s:changeitem != ''
+ call <SID>SpellDel()
+ endif
++
++ " Return quickly if spell checking is not enabled.
+ if !&spell || &spelllang == ''
+ return
+ endif
+***************
+*** 908,925 ****
+ let s:fromword = w
+ let pri = 1
+ for sug in s:suglist
+! exe 'amenu 1.5.' . pri . ' PopUp.' . s:changeitem . '.' . escape(sug, ' .')
+ \ . ' :call <SID>SpellReplace(' . pri . ')<CR>'
+ let pri += 1
+ endfor
+
+ let s:additem = 'add\ "' . escape(w, ' .') . '"\ to\ word\ list'
+! exe 'amenu 1.6 PopUp.' . s:additem . ' :spellgood ' . w . '<CR>'
+
+ let s:ignoreitem = 'ignore\ "' . escape(w, ' .') . '"'
+! exe 'amenu 1.7 PopUp.' . s:ignoreitem . ' :spellgood! ' . w . '<CR>'
+
+! amenu 1.8 PopUp.-SpellSep- :
+ endif
+ endif
+ endfunc
+--- 910,927 ----
+ let s:fromword = w
+ let pri = 1
+ for sug in s:suglist
+! exe 'anoremenu 1.5.' . pri . ' PopUp.' . s:changeitem . '.' . escape(sug, ' .')
+ \ . ' :call <SID>SpellReplace(' . pri . ')<CR>'
+ let pri += 1
+ endfor
+
+ let s:additem = 'add\ "' . escape(w, ' .') . '"\ to\ word\ list'
+! exe 'anoremenu 1.6 PopUp.' . s:additem . ' :spellgood ' . w . '<CR>'
+
+ let s:ignoreitem = 'ignore\ "' . escape(w, ' .') . '"'
+! exe 'anoremenu 1.7 PopUp.' . s:ignoreitem . ' :spellgood! ' . w . '<CR>'
+
+! anoremenu 1.8 PopUp.-SpellSep- :
+ endif
+ endif
+ endfunc
+***************
+*** 938,944 ****
+ let s:changeitem = ''
+ endfun
+
+! au! MenuPopup * call <SID>SpellPopup()
+ endif
+
+ " The GUI toolbar (for MS-Windows and GTK)
+--- 940,948 ----
+ let s:changeitem = ''
+ endfun
+
+! augroup SpellPopupMenu
+! au! MenuPopup * call <SID>SpellPopup()
+! augroup END
+ endif
+
+ " The GUI toolbar (for MS-Windows and GTK)
+***************
+*** 1013,1021 ****
+ tmenu ToolBar.FindPrev Find Previous
+ tmenu ToolBar.Replace Find / Replace...
+ endif
+! tmenu ToolBar.LoadSesn Chose a session to load
+ tmenu ToolBar.SaveSesn Save current session
+! tmenu ToolBar.RunScript Chose a Vim Script to run
+ tmenu ToolBar.Make Make current project (:make)
+ tmenu ToolBar.RunCtags Build tags in current directory tree (!ctags -R .)
+ tmenu ToolBar.TagJump Jump to tag under cursor
+--- 1017,1025 ----
+ tmenu ToolBar.FindPrev Find Previous
+ tmenu ToolBar.Replace Find / Replace...
+ endif
+! tmenu ToolBar.LoadSesn Choose a session to load
+ tmenu ToolBar.SaveSesn Save current session
+! tmenu ToolBar.RunScript Choose a Vim Script to run
+ tmenu ToolBar.Make Make current project (:make)
+ tmenu ToolBar.RunCtags Build tags in current directory tree (!ctags -R .)
+ tmenu ToolBar.TagJump Jump to tag under cursor
+*** ../vim-7.0.105/src/version.c Thu Sep 14 11:27:12 2006
+--- src/version.c Thu Sep 14 13:24:44 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 106,
+ /**/
+
+--
+BROTHER MAYNARD: Armaments Chapter Two Verses Nine to Twenty One.
+ANOTHER MONK: And St. Attila raised his hand grenade up on high saying "O
+ Lord bless this thy hand grenade that with it thou mayest
+ blow thine enemies to tiny bits, in thy mercy. "and the Lord
+ did grin and people did feast upon the lambs and sloths and
+ carp and anchovies and orang-utans and breakfast cereals and
+ fruit bats and...
+BROTHER MAYNARD: Skip a bit brother ...
+ "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 ///
Added: trunk/packages/vim/upstream/patches/7.0.107
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.107?rev=769&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.107 (added)
+++ trunk/packages/vim/upstream/patches/7.0.107 Sat Sep 16 11:23:08 2006
@@ -1,0 +1,58 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.107
+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.107
+Problem: Incremental search doesn't redraw the text tabline. (Ilya Bobir)
+ Also happens in other situations with one window in a tab page.
+Solution: Redraw the tabline after clearing the screen.
+Files: src/screen.c
+
+
+*** ../vim-7.0.106/src/screen.c Tue Aug 29 17:28:56 2006
+--- src/screen.c Thu Sep 14 21:00:32 2006
+***************
+*** 1228,1234 ****
+--- 1228,1241 ----
+ {
+ mid_end = wp->w_height;
+ if (lastwin == firstwin)
++ {
+ screenclear();
++ #ifdef FEAT_WINDOWS
++ /* The screen was cleared, redraw the tab pages line. */
++ if (redraw_tabline)
++ draw_tabline();
++ #endif
++ }
+ }
+ }
+ else
+*** ../vim-7.0.106/src/version.c Thu Sep 14 13:35:17 2006
+--- src/version.c Thu Sep 14 21:03:40 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 107,
+ /**/
+
+--
+VOICE OVER: As the horrendous Black Beast lunged forward, escape for Arthur
+ and his knights seemed hopeless, when, suddenly ... the animator
+ suffered a fatal heart attack.
+ANIMATOR: Aaaaagh!
+VOICE OVER: The cartoon peril was no more ... The Quest for Holy Grail could
+ continue.
+ "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 ///
Added: trunk/packages/vim/upstream/patches/7.0.108
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.108?rev=769&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.108 (added)
+++ trunk/packages/vim/upstream/patches/7.0.108 Sat Sep 16 11:23:08 2006
@@ -1,0 +1,88 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.108 (extra)
+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.108 (extra)
+Problem: Amiga: Compilation problem.
+Solution: Have mch_mkdir() return a failure flag. (Willy Catteau)
+Files: src/os_amiga.c, src/proto/os_amiga.pro
+
+
+*** ../vim-7.0.107/src/os_amiga.c Tue Mar 7 23:38:27 2006
+--- src/os_amiga.c Thu Sep 14 21:29:03 2006
+***************
+*** 799,805 ****
+ /*
+ * Create directory "name".
+ */
+! void
+ mch_mkdir(name)
+ char_u *name;
+ {
+--- 799,805 ----
+ /*
+ * Create directory "name".
+ */
+! int
+ mch_mkdir(name)
+ char_u *name;
+ {
+***************
+*** 807,813 ****
+--- 807,817 ----
+
+ lock = CreateDir(name);
+ if (lock != NULL)
++ {
+ UnLock(lock);
++ return 0;
++ }
++ return -1;
+ }
+
+ /*
+*** ../vim-7.0.107/src/proto/os_amiga.pro Fri Mar 24 22:41:43 2006
+--- src/proto/os_amiga.pro Thu Sep 14 21:29:32 2006
+***************
+*** 25,31 ****
+ extern int mch_setperm __ARGS((char_u *name, long perm));
+ extern void mch_hide __ARGS((char_u *name));
+ extern int mch_isdir __ARGS((char_u *name));
+! extern void mch_mkdir __ARGS((char_u *name));
+ extern int mch_can_exe __ARGS((char_u *name));
+ extern int mch_nodetype __ARGS((char_u *name));
+ extern void mch_early_init __ARGS((void));
+--- 25,31 ----
+ extern int mch_setperm __ARGS((char_u *name, long perm));
+ extern void mch_hide __ARGS((char_u *name));
+ extern int mch_isdir __ARGS((char_u *name));
+! extern int mch_mkdir __ARGS((char_u *name));
+ extern int mch_can_exe __ARGS((char_u *name));
+ extern int mch_nodetype __ARGS((char_u *name));
+ extern void mch_early_init __ARGS((void));
+*** ../vim-7.0.107/src/version.c Thu Sep 14 21:04:09 2006
+--- src/version.c Thu Sep 14 21:34:33 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 108,
+ /**/
+
+--
+BEDEVERE: Look! It's the old man from scene 24 - what's he Doing here?
+ARTHUR: He is the keeper of the Bridge. He asks each traveler five
+ questions ...
+GALAHAD: Three questions.
+ "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 ///
Added: trunk/packages/vim/upstream/patches/7.0.109
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.109?rev=769&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.109 (added)
+++ trunk/packages/vim/upstream/patches/7.0.109 Sat Sep 16 11:23:08 2006
@@ -1,0 +1,70 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.109
+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.109
+Problem: Lisp indenting is confused by escaped quotes in strings. (Dorai
+ Sitaram)
+Solution: Check for backslash inside strings. (Sergey Khorev)
+Files: src/misc1.c
+
+
+*** ../vim-7.0.108/src/misc1.c Tue Sep 5 20:56:11 2006
+--- src/misc1.c Wed Sep 13 20:13:57 2006
+***************
+*** 8074,8082 ****
+ }
+ if (*that == '"' && *(that + 1) != NUL)
+ {
+! that++;
+! while (*that && (*that != '"' || *(that - 1) == '\\'))
+! ++that;
+ }
+ if (*that == '(' || *that == '[')
+ ++parencount;
+--- 8074,8093 ----
+ }
+ if (*that == '"' && *(that + 1) != NUL)
+ {
+! while (*++that && *that != '"')
+! {
+! /* skipping escaped characters in the string */
+! if (*that == '\\')
+! {
+! if (*++that == NUL)
+! break;
+! if (that[1] == NUL)
+! {
+! ++that;
+! break;
+! }
+! }
+! }
+ }
+ if (*that == '(' || *that == '[')
+ ++parencount;
+*** ../vim-7.0.108/src/version.c Thu Sep 14 21:36:35 2006
+--- src/version.c Fri Sep 15 20:15:40 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 109,
+ /**/
+
+--
+ARTHUR: No, hang on! Just answer the five questions ...
+GALAHAD: Three questions ...
+ARTHUR: Three questions ... And we shall watch ... and pray.
+ "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 ///
More information about the pkg-vim-maintainers
mailing list