r755 - in /trunk/packages/vim: debian/README debian/changelog
upstream/patches/7.0.067
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Tue Aug 29 14:19:25 UTC 2006
Author: jamessan
Date: Tue Aug 29 14:19:24 2006
New Revision: 755
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=755
Log:
Upstream patch 67
Added:
trunk/packages/vim/upstream/patches/7.0.067
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=755&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Tue Aug 29 14:19:24 2006
@@ -91,3 +91,4 @@
1818 7.0.064 compiler warnings for unused variables
1750 7.0.065 (extra) Mac: horizontal scroll wheel caused vertical scroll
1407 7.0.066 tab pages line not redrawn after removing the popup menu
+ 3038 7.0.067 undo problems when using input method
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=755&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Tue Aug 29 14:19:24 2006
@@ -1,7 +1,7 @@
-vim (1:7.0-066+1) UNRELEASED; urgency=medium
+vim (1:7.0-067+1) UNRELEASED; urgency=medium
[ Debian Vim Maintainers ]
- * New upstream patches (036 - 066), see README.gz for details.
+ * New upstream patches (036 - 067), see README.gz for details.
* Urgency medium because of the fix to vim-lesstif's crash bug.
[ James Vega ]
@@ -23,7 +23,7 @@
better recognition of tex vs plaintex filetype (namely it recognizes as
latex files containing sectioning commands). (closes: #384479)
- -- James Vega <jamessan at debian.org> Mon, 28 Aug 2006 20:26:13 -0400
+ -- James Vega <jamessan at debian.org> Tue, 29 Aug 2006 10:19:26 -0400
vim (1:7.0-035+1) unstable; urgency=low
Added: trunk/packages/vim/upstream/patches/7.0.067
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.067?rev=755&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.067 (added)
+++ trunk/packages/vim/upstream/patches/7.0.067 Tue Aug 29 14:19:24 2006
@@ -1,0 +1,95 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.067
+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.067
+Problem: Undo doesn't always work properly when using "scim" input method.
+ Undo is split up when using preediting.
+Solution: Reset xim_has_preediting also when preedit_start_col is not
+ MAXCOL. Don't split undo when <Left> is used while preediting.
+ (Yukihiro Nakadaira)
+Files: src/edit.c, src/mbyte.c
+
+
+*** ../vim-7.0.066/src/edit.c Tue Aug 22 19:58:22 2006
+--- src/edit.c Tue Aug 29 14:57:46 2006
+***************
+*** 8597,8603 ****
+ tpos = curwin->w_cursor;
+ if (oneleft() == OK)
+ {
+! start_arrow(&tpos);
+ #ifdef FEAT_RIGHTLEFT
+ /* If exit reversed string, position is fixed */
+ if (revins_scol != -1 && (int)curwin->w_cursor.col >= revins_scol)
+--- 8597,8608 ----
+ tpos = curwin->w_cursor;
+ if (oneleft() == OK)
+ {
+! #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
+! /* Only call start_arrow() when not busy with preediting, it will
+! * break undo. K_LEFT is inserted in im_correct_cursor(). */
+! if (!im_is_preediting())
+! #endif
+! start_arrow(&tpos);
+ #ifdef FEAT_RIGHTLEFT
+ /* If exit reversed string, position is fixed */
+ if (revins_scol != -1 && (int)curwin->w_cursor.col >= revins_scol)
+*** ../vim-7.0.066/src/mbyte.c Wed Aug 16 18:05:36 2006
+--- src/mbyte.c Tue Aug 29 14:41:45 2006
+***************
+*** 3514,3519 ****
+--- 3514,3524 ----
+ add_to_input_buf(delkey, (int)sizeof(delkey));
+ }
+
++ /*
++ * Move the cursor left by "num_move_back" characters.
++ * Note that ins_left() checks im_is_preediting() to avoid breaking undo for
++ * these K_LEFT keys.
++ */
+ static void
+ im_correct_cursor(int num_move_back)
+ {
+***************
+*** 3741,3748 ****
+ }
+ else if (cursor_index == 0 && preedit_string[0] == '\0')
+ {
+! if (preedit_start_col == MAXCOL)
+! xim_has_preediting = FALSE;
+
+ /* If at the start position (after typing backspace)
+ * preedit_start_col must be reset. */
+--- 3746,3752 ----
+ }
+ else if (cursor_index == 0 && preedit_string[0] == '\0')
+ {
+! xim_has_preediting = FALSE;
+
+ /* If at the start position (after typing backspace)
+ * preedit_start_col must be reset. */
+*** ../vim-7.0.066/src/version.c Tue Aug 22 21:51:18 2006
+--- src/version.c Tue Aug 29 16:09:35 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 67,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+265. Your reason for not staying in touch with family is that
+ they do not have e-mail addresses.
+
+ /// 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