packages: vim/vim.spec, vim/7.2.263 (NEW), vim/7.2.264 (NEW), vim/7.2.265 (...
glen
glen at pld-linux.org
Wed Oct 7 22:11:18 CEST 2009
Author: glen Date: Wed Oct 7 20:11:18 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 7.2.267
---- Files affected:
packages/vim:
vim.spec (1.483 -> 1.484) , 7.2.263 (NONE -> 1.1) (NEW), 7.2.264 (NONE -> 1.1) (NEW), 7.2.265 (NONE -> 1.1) (NEW), 7.2.266 (NONE -> 1.1) (NEW), 7.2.267 (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/vim/vim.spec
diff -u packages/vim/vim.spec:1.483 packages/vim/vim.spec:1.484
--- packages/vim/vim.spec:1.483 Mon Sep 21 21:12:19 2009
+++ packages/vim/vim.spec Wed Oct 7 22:11:12 2009
@@ -14,7 +14,7 @@
%bcond_without home_etc # without home_etc support
%define ver 7.2
-%define patchlevel 262
+%define patchlevel 267
Summary: Vi IMproved - a Vi clone
Summary(de.UTF-8): VIsual editor iMproved
Summary(es.UTF-8): Editor visual incrementado
@@ -1351,6 +1351,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.484 2009/10/07 20:11:12 glen
+- up to 7.2.267
+
Revision 1.483 2009/09/21 19:12:19 glen
- up to 7.2.262
================================================================
Index: packages/vim/7.2.263
diff -u /dev/null packages/vim/7.2.263:1.1
--- /dev/null Wed Oct 7 22:11:18 2009
+++ packages/vim/7.2.263 Wed Oct 7 22:11:12 2009
@@ -0,0 +1,87 @@
+To: vim-dev at vim.org
+Subject: Patch 7.2.263
+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.263
+Problem: GTK2: when using the -geom argument with an offset from the right
+ edge and the size is smaller than the default, the Vim window is
+ not positioned properly.
+Solution: Use another function to set the size. (Vitaly Minko)
+Files: src/gui_gtk_x11.c
+
+
+*** ../vim-7.2.262/src/gui_gtk_x11.c 2009-09-11 15:46:20.000000000 +0200
+--- src/gui_gtk_x11.c 2009-09-23 15:43:52.000000000 +0200
+***************
+*** 4066,4071 ****
+--- 4066,4073 ----
+ {
+ guicolor_T fg_pixel = INVALCOLOR;
+ guicolor_T bg_pixel = INVALCOLOR;
++ guint pixel_width;
++ guint pixel_height;
+
+ #ifdef HAVE_GTK2
+ /*
+***************
+*** 4106,4113 ****
+ unsigned int w, h;
+ int x = 0;
+ int y = 0;
+- guint pixel_width;
+- guint pixel_height;
+
+ mask = XParseGeometry((char *)gui.geom, &x, &y, &w, &h);
+
+--- 4108,4113 ----
+***************
+*** 4160,4168 ****
+ }
+ }
+
+! gtk_form_set_size(GTK_FORM(gui.formwin),
+! (guint)(gui_get_base_width() + Columns * gui.char_width),
+! (guint)(gui_get_base_height() + Rows * gui.char_height));
+ update_window_manager_hints(0, 0);
+
+ if (foreground_argument != NULL)
+--- 4160,4175 ----
+ }
+ }
+
+! pixel_width = (guint)(gui_get_base_width() + Columns * gui.char_width);
+! pixel_height = (guint)(gui_get_base_height() + Rows * gui.char_height);
+! #ifdef HAVE_GTK2
+! /* For GTK2 changing the size of the form widget doesn't cause window
+! * resizing. */
+! if (gtk_socket_id == 0)
+! gtk_window_resize(GTK_WINDOW(gui.mainwin), pixel_width, pixel_height);
+! #else
+! gtk_form_set_size(GTK_FORM(gui.formwin), pixel_width, pixel_height);
+! #endif
+ update_window_manager_hints(0, 0);
+
+ if (foreground_argument != NULL)
+*** ../vim-7.2.262/src/version.c 2009-09-18 17:24:54.000000000 +0200
+--- src/version.c 2009-09-23 17:34:08.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+ { /* Add new patch number below this line */
++ /**/
++ 263,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+267. You get an extra phone line so you can get phone calls.
+
+ /// 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.264
diff -u /dev/null packages/vim/7.2.264:1.1
--- /dev/null Wed Oct 7 22:11:18 2009
+++ packages/vim/7.2.264 Wed Oct 7 22:11:12 2009
@@ -0,0 +1,168 @@
+To: vim-dev at vim.org
+Subject: Patch 7.2.264
+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.264
+Problem: GTK2: When the Vim window is maximized setting 'columns' or
+ 'lines' doesn't work.
+Solution: Unmaximize the window before setting the size. (Vitaly Minko)
+Files: src/gui.c, src/gui_gtk_x11.c, src/proto/gui_gtk_x11.pro
+
+
+*** ../vim-7.2.263/src/gui.c 2009-07-29 11:10:31.000000000 +0200
+--- src/gui.c 2009-09-23 16:28:09.000000000 +0200
+***************
+*** 1386,1391 ****
+--- 1386,1395 ----
+ int min_height;
+ int screen_w;
+ int screen_h;
++ #ifdef HAVE_GTK2
++ int un_maximize = mustset;
++ int did_adjust = 0;
++ #endif
+
+ if (!gui.shell_created)
+ return;
+***************
+*** 1425,1446 ****
+ if (Columns < MIN_COLUMNS)
+ Columns = MIN_COLUMNS;
+ width = Columns * gui.char_width + base_width;
+ }
+ if ((direction & RESIZE_VERT) && height > screen_h)
+ {
+ Rows = (screen_h - base_height) / gui.char_height;
+ check_shellsize();
+ height = Rows * gui.char_height + base_height;
+ }
+ }
+ gui.num_cols = Columns;
+ gui.num_rows = Rows;
+
+ min_width = base_width + MIN_COLUMNS * gui.char_width;
+ min_height = base_height + MIN_LINES * gui.char_height;
+! # ifdef FEAT_WINDOWS
+ min_height += tabline_height() * gui.char_height;
+! # endif
+
+ gui_mch_set_shellsize(width, height, min_width, min_height,
+ base_width, base_height, direction);
+--- 1429,1475 ----
+ if (Columns < MIN_COLUMNS)
+ Columns = MIN_COLUMNS;
+ width = Columns * gui.char_width + base_width;
++ #ifdef HAVE_GTK2
++ ++did_adjust;
++ #endif
+ }
+ if ((direction & RESIZE_VERT) && height > screen_h)
+ {
+ Rows = (screen_h - base_height) / gui.char_height;
+ check_shellsize();
+ height = Rows * gui.char_height + base_height;
++ #ifdef HAVE_GTK2
++ ++did_adjust;
++ #endif
+ }
++ #ifdef HAVE_GTK2
++ if (did_adjust == 2 || (width + gui.char_width >= screen_w
++ && height + gui.char_height >= screen_h))
++ /* don't unmaximize if at maximum size */
++ un_maximize = FALSE;
++ #endif
+ }
+ gui.num_cols = Columns;
+ gui.num_rows = Rows;
+
+ min_width = base_width + MIN_COLUMNS * gui.char_width;
+ min_height = base_height + MIN_LINES * gui.char_height;
+! #ifdef FEAT_WINDOWS
+ min_height += tabline_height() * gui.char_height;
+! #endif
+!
+! #ifdef HAVE_GTK2
+! if (un_maximize)
+! {
+! /* If the window size is smaller than the screen unmaximize the
+! * window, otherwise resizing won't work. */
+! gui_mch_get_screen_dimensions(&screen_w, &screen_h);
+! if ((width + gui.char_width < screen_w
+! || height + gui.char_height * 2 < screen_h)
+! && gui_mch_maximized())
+! gui_mch_unmaximize();
+! }
+! #endif
+
+ gui_mch_set_shellsize(width, height, min_width, min_height,
+ base_width, base_height, direction);
+*** ../vim-7.2.263/src/gui_gtk_x11.c 2009-09-23 17:35:17.000000000 +0200
+--- src/gui_gtk_x11.c 2009-09-23 15:43:52.000000000 +0200
+***************
+*** 4376,4381 ****
+--- 4376,4404 ----
+ #endif
+ #endif /* HAVE_GTK2 */
+
++ #if defined(HAVE_GTK2) || defined(PROTO)
++ /*
++ * Return TRUE if the main window is maximized.
++ */
++ int
++ gui_mch_maximized()
++ {
++ return (gui.mainwin != NULL && gui.mainwin->window != NULL
++ && (gdk_window_get_state(gui.mainwin->window)
++ & GDK_WINDOW_STATE_MAXIMIZED));
++ }
++
++ /*
++ * Unmaximize the main window
++ */
++ void
++ gui_mch_unmaximize()
++ {
++ if (gui.mainwin != NULL)
++ gtk_window_unmaximize(GTK_WINDOW(gui.mainwin));
++ }
++ #endif
++
+ /*
+ * Set the windows size.
+ */
+*** ../vim-7.2.263/src/proto/gui_gtk_x11.pro 2007-05-05 19:18:54.000000000 +0200
+--- src/proto/gui_gtk_x11.pro 2009-09-23 15:43:45.000000000 +0200
+***************
+*** 16,21 ****
+--- 16,23 ----
+ void gui_mch_exit __ARGS((int rc));
+ int gui_mch_get_winpos __ARGS((int *x, int *y));
+ void gui_mch_set_winpos __ARGS((int x, int y));
++ int gui_mch_maximized __ARGS((void));
++ void gui_mch_unmaximize __ARGS((void));
+ void gui_mch_set_shellsize __ARGS((int width, int height, int min_width, int min_height, int base_width, int base_height, int direction));
+ void gui_mch_get_screen_dimensions __ARGS((int *screen_w, int *screen_h));
+ void gui_mch_settitle __ARGS((char_u *title, char_u *icon));
+*** ../vim-7.2.263/src/version.c 2009-09-23 17:35:17.000000000 +0200
+--- src/version.c 2009-09-23 18:12:21.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+ { /* Add new patch number below this line */
++ /**/
++ 264,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+268. You get up in the morning and go online before getting your coffee.
+
+ /// 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.265
diff -u /dev/null packages/vim/7.2.265:1.1
--- /dev/null Wed Oct 7 22:11:18 2009
+++ packages/vim/7.2.265 Wed Oct 7 22:11:12 2009
@@ -0,0 +1,56 @@
+To: vim-dev at vim.org
+Subject: Patch 7.2.265
+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.265
+Problem: When using ":silent broken" inside try/catch silency may persist.
+ (dr-dr xp)
+Solution: Set msg_silent when there is an error and it's bigger than the
+ saved value.
+Files: src/ex_docmd.c
+
+
+*** ../vim-7.2.264/src/ex_docmd.c 2009-07-09 20:13:59.000000000 +0200
+--- src/ex_docmd.c 2009-09-30 11:40:53.000000000 +0200
+***************
+*** 2695,2701 ****
+ {
+ /* messages could be enabled for a serious error, need to check if the
+ * counters don't become negative */
+! if (!did_emsg)
+ msg_silent = save_msg_silent;
+ emsg_silent -= did_esilent;
+ if (emsg_silent < 0)
+--- 2695,2701 ----
+ {
+ /* messages could be enabled for a serious error, need to check if the
+ * counters don't become negative */
+! if (!did_emsg || msg_silent > save_msg_silent)
+ msg_silent = save_msg_silent;
+ emsg_silent -= did_esilent;
+ if (emsg_silent < 0)
+*** ../vim-7.2.264/src/version.c 2009-09-23 18:14:13.000000000 +0200
+--- src/version.c 2009-09-30 13:22:47.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+ { /* Add new patch number below this line */
++ /**/
++ 265,
+ /**/
+
+--
+FIRST HEAD: Oh! quick! get the sword out I want to cut his head off.
+THIRD HEAD: Oh, cut your own head off.
+SECOND HEAD: Yes - do us all a favour.
+ "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.266
diff -u /dev/null packages/vim/7.2.266:1.1
--- /dev/null Wed Oct 7 22:11:18 2009
+++ packages/vim/7.2.266 Wed Oct 7 22:11:12 2009
@@ -0,0 +1,244 @@
+To: vim-dev at vim.org
+Subject: Patch 7.2.266
+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.266
+Problem: When an expression abbreviation is triggered, the typed character
+ is unknown.
+Solution: Make the typed character available in v:char.
+Files: runtime/doc/map.txt, src/eval.c, src/getchar.c, src/ops.c,
+ src/proto/eval.pro
+
+
+*** ../vim-7.2.265/runtime/doc/map.txt 2008-08-09 19:36:49.000000000 +0200
+--- runtime/doc/map.txt 2009-09-23 19:39:19.000000000 +0200
+***************
+*** 224,229 ****
+--- 224,233 ----
+ The result of the InsertDot() function will be inserted. It could check the
+ text before the cursor and start omni completion when some condition is met.
+
++ For abbreviations |v:char| is set to the character that was typed to trigger
++ the abbreviation. You can use this to decide how to expand the {lhs}. You
++ can't change v:char and you should not insert it.
++
+ Be very careful about side effects! The expression is evaluated while
+ obtaining characters, you may very well make the command dysfunctional.
+ For this reason the following is blocked:
+*** ../vim-7.2.265/src/eval.c 2009-06-03 14:25:47.000000000 +0200
+--- src/eval.c 2009-09-23 19:36:32.000000000 +0200
+***************
+*** 18101,18106 ****
+--- 18101,18131 ----
+ }
+
+ /*
++ * Set v:char to character "c".
++ */
++ void
++ set_vim_var_char(c)
++ int c;
++ {
++ #ifdef FEAT_MBYTE
++ char_u buf[MB_MAXBYTES];
++ #else
++ char_u buf[2];
++ #endif
++
++ #ifdef FEAT_MBYTE
++ if (has_mbyte)
++ buf[(*mb_char2bytes)(c, buf)] = NUL;
++ else
++ #endif
++ {
++ buf[0] = c;
++ buf[1] = NUL;
++ }
++ set_vim_var_string(VV_CHAR, buf, -1);
++ }
++
++ /*
+ * Set v:count to "count" and v:count1 to "count1".
+ * When "set_prevcount" is TRUE first set v:prevcount from v:count.
+ */
+*** ../vim-7.2.265/src/getchar.c 2009-07-14 13:44:43.000000000 +0200
+--- src/getchar.c 2009-09-23 19:35:54.000000000 +0200
+***************
+*** 129,135 ****
+ static void validate_maphash __ARGS((void));
+ static void showmap __ARGS((mapblock_T *mp, int local));
+ #ifdef FEAT_EVAL
+! static char_u *eval_map_expr __ARGS((char_u *str));
+ #endif
+
+ /*
+--- 129,135 ----
+ static void validate_maphash __ARGS((void));
+ static void showmap __ARGS((mapblock_T *mp, int local));
+ #ifdef FEAT_EVAL
+! static char_u *eval_map_expr __ARGS((char_u *str, int c));
+ #endif
+
+ /*
+***************
+*** 2446,2452 ****
+ if (tabuf.typebuf_valid)
+ {
+ vgetc_busy = 0;
+! s = eval_map_expr(mp->m_str);
+ vgetc_busy = save_vgetc_busy;
+ }
+ else
+--- 2446,2452 ----
+ if (tabuf.typebuf_valid)
+ {
+ vgetc_busy = 0;
+! s = eval_map_expr(mp->m_str, NUL);
+ vgetc_busy = save_vgetc_busy;
+ }
+ else
+***************
+*** 4367,4375 ****
+ * abbreviation, but is not inserted into the input stream.
+ */
+ j = 0;
+- /* special key code, split up */
+ if (c != Ctrl_RSB)
+ {
+ if (IS_SPECIAL(c) || c == K_SPECIAL)
+ {
+ tb[j++] = K_SPECIAL;
+--- 4367,4375 ----
+ * abbreviation, but is not inserted into the input stream.
+ */
+ j = 0;
+ if (c != Ctrl_RSB)
+ {
++ /* special key code, split up */
+ if (IS_SPECIAL(c) || c == K_SPECIAL)
+ {
+ tb[j++] = K_SPECIAL;
+***************
+*** 4398,4404 ****
+ }
+ #ifdef FEAT_EVAL
+ if (mp->m_expr)
+! s = eval_map_expr(mp->m_str);
+ else
+ #endif
+ s = mp->m_str;
+--- 4398,4404 ----
+ }
+ #ifdef FEAT_EVAL
+ if (mp->m_expr)
+! s = eval_map_expr(mp->m_str, c);
+ else
+ #endif
+ s = mp->m_str;
+***************
+*** 4434,4441 ****
+ * special characters.
+ */
+ static char_u *
+! eval_map_expr(str)
+ char_u *str;
+ {
+ char_u *res;
+ char_u *p;
+--- 4434,4442 ----
+ * special characters.
+ */
+ static char_u *
+! eval_map_expr(str, c)
+ char_u *str;
++ int c; /* NUL or typed character for abbreviation */
+ {
+ char_u *res;
+ char_u *p;
+***************
+*** 4452,4457 ****
+--- 4453,4459 ----
+ #ifdef FEAT_EX_EXTRA
+ ++ex_normal_lock;
+ #endif
++ set_vim_var_char(c); /* set v:char to the typed character */
+ save_cursor = curwin->w_cursor;
+ p = eval_to_string(str, NULL, FALSE);
+ --textlock;
+*** ../vim-7.2.265/src/ops.c 2009-07-01 18:04:30.000000000 +0200
+--- src/ops.c 2009-09-23 19:11:40.000000000 +0200
+***************
+*** 4473,4483 ****
+ int use_sandbox = was_set_insecurely((char_u *)"formatexpr",
+ OPT_LOCAL);
+ int r;
+- #ifdef FEAT_MBYTE
+- char_u buf[MB_MAXBYTES];
+- #else
+- char_u buf[2];
+- #endif
+
+ /*
+ * Set v:lnum to the first line number and v:count to the number of lines.
+--- 4473,4478 ----
+***************
+*** 4485,4501 ****
+ */
+ set_vim_var_nr(VV_LNUM, lnum);
+ set_vim_var_nr(VV_COUNT, count);
+!
+! #ifdef FEAT_MBYTE
+! if (has_mbyte)
+! buf[(*mb_char2bytes)(c, buf)] = NUL;
+! else
+! #endif
+! {
+! buf[0] = c;
+! buf[1] = NUL;
+! }
+! set_vim_var_string(VV_CHAR, buf, -1);
+
+ /*
+ * Evaluate the function.
+--- 4480,4486 ----
+ */
+ set_vim_var_nr(VV_LNUM, lnum);
+ set_vim_var_nr(VV_COUNT, count);
+! set_vim_var_char(c);
+
+ /*
+ * Evaluate the function.
+*** ../vim-7.2.265/src/proto/eval.pro 2008-11-20 16:11:03.000000000 +0100
+--- src/proto/eval.pro 2009-09-23 19:36:30.000000000 +0200
+***************
+*** 61,66 ****
+--- 61,67 ----
+ long get_vim_var_nr __ARGS((int idx));
+ char_u *get_vim_var_str __ARGS((int idx));
+ list_T *get_vim_var_list __ARGS((int idx));
++ void set_vim_var_char __ARGS((int c));
+ void set_vcount __ARGS((long count, long count1, int set_prevcount));
+ void set_vim_var_string __ARGS((int idx, char_u *val, int len));
+ void set_vim_var_list __ARGS((int idx, list_T *val));
+*** ../vim-7.2.265/src/version.c 2009-09-30 13:23:57.000000000 +0200
+--- src/version.c 2009-09-30 15:11:29.000000000 +0200
+***************
+*** 678,679 ****
+--- 678,681 ----
+ { /* Add new patch number below this line */
++ /**/
++ 266,
+ /**/
+
+--
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vim/vim.spec?r1=1.483&r2=1.484&f=u
More information about the pld-cvs-commit
mailing list