updated for version 7.0105

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 4a6142ce1cc59dd7e9f686d83b267bf873544c1b..aba8c5fb8a04f0c4a2736b14425cec34810d1745 100644 (file)
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Jul 06
+*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Jul 07
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -6470,7 +6470,7 @@ These items are not allowed in the sandbox:
 This is not guaranteed 100% secure, but it should block most attacks.
 
                                                        *:san* *:sandbox*
-:san[dbox] {cmd                Execute {cmd} in the sandbox.  Useful to evaluate an
+:san[dbox] {cmd}       Execute {cmd} in the sandbox.  Useful to evaluate an
                        option that may have been set from a modeline, e.g.
                        'foldexpr'.
 

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 6c6a8dc99c304322f73d91d72e987d655d40aeaa..800983422ae6f527580caaf9e2748389d9c78f03 100644 (file)
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*  For Vim version 7.0aa.  Last change: 2005 Jul 04
+*options.txt*  For Vim version 7.0aa.  Last change: 2005 Jul 08
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -5662,7 +5662,8 @@ A jump table for the options with a short description can be found at |Q_op|.
                        {not available when compiled without the |+syntax|
                        feature}
        Name of the word list file where words are added for the |zg| and |zw|
-       commands.  It must end in ".{encoding}.add".
+       commands.  It must end in ".{encoding}.add".  You need to include the
+       path, otherwise the file is placed in the current directory.
                                                                *E765*
        It may also be a comma separated list of names.  A count before the
        |zg| and |zw| commands can be used to access each.  This allows using

diff --git a/runtime/menu.vim b/runtime/menu.vim
index 584af54b4e431dd59295f19516f6dfffcc549329..7239f58b8da4b2d6e1ab9dbe56923c3afd8f5030 100644 (file)
--- a/runtime/menu.vim
+++ b/runtime/menu.vim
@@ -2,7 +2,7 @@
 " You can also use this as a start for your own set of menus.
 "
 " Maintainer:  Bram Moolenaar <Bram@vim.org>
-" Last Change: 2005 Jul 06
+" Last Change: 2005 Jul 08
 
 " 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.
@@ -571,7 +571,7 @@ while strlen(s:n) > 0
   endif
   " Ignore case for VMS and windows
   let s:name = substitute(s:name, '\c.*[/\\:\]]\([^/\\:]*\)\.vim', '\1', '')
-  exe "an 30.440." . s:idx . ' &Tools.se&T\ Compiler.' . s:name . " :compiler " . s:name . "<CR>"
+  exe "an 30.440." . s:idx . ' &Tools.Se&T\ Compiler.' . s:name . " :compiler " . s:name . "<CR>"
   unlet s:name
   unlet s:i
   let s:idx = s:idx + 10

diff --git a/runtime/spell/pl/pl_PL.diff b/runtime/spell/pl/pl_PL.diff
index 562d59a58bb16380fc3b70faf3dc6b4fb363bd74..a53ead3df78adc2acb65e9a3e66daf33b6e91442 100644 (file)
--- a/runtime/spell/pl/pl_PL.diff
+++ b/runtime/spell/pl/pl_PL.diff
@@ -1,5 +1,5 @@
-*** pl_PL.orig.aff     Wed Mar 30 06:50:02 2005
---- pl_PL.aff  Sat Jun 18 19:45:45 2005
+*** pl_PL.orig.aff     Fri Jul  8 06:50:06 2005
+--- pl_PL.aff  Fri Jul  8 23:03:48 2005
 ***************
 *** 3,4 ****
 --- 3,7 ----
@@ -8,24 +8,3 @@
 + LOW ±¢³µ¶¨¹º»¼¾¿±²³´µ¶·¸¹º»¼½¾¿àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþßÿ
 + UPP ¡¢£¥¦¨©ª«¬®¯±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßÿ
   
-***************
-*** 6614 ****
---- 6617,6634 ----
-  SFX y   y         ie        jmy
-+ 
-+ # REP entries proposed by Mikolaj Machowski:
-+ REP 14
-+ REP b   p
-+ REP p   b
-+ REP ¿   rz
-+ REP rz  ¿
-+ REP w   f
-+ REP f   w
-+ REP ó   u
-+ REP u   ó
-+ REP ci  æ
-+ REP æ   ci
-+ REP si  ¶
-+ REP ¶   si
-+ REP ni  ñ
-+ REP ñ   ni

diff --git a/src/gui_gtk.c b/src/gui_gtk.c
index cd7d6bbc533251b852f0a7d7a7d843dc500d2776..5bde7913c87179424f5dd88685837d3a3f3b31b0 100644 (file)
--- a/src/gui_gtk.c
+++ b/src/gui_gtk.c
@@ -2411,6 +2411,10 @@ gui_mch_show_popupmenu(vimmenu_T *menu)
                   3U, (guint32)GDK_CURRENT_TIME);
 }
 
+/* Ugly global variable to pass "mouse_pos" flag from gui_make_popup() to
+ * popup_menu_position_func(). */
+static int popup_mouse_pos;
+
 /*
  * Menu position callback; used by gui_make_popup() to place the menu
  * at the current text cursor position.
@@ -2427,10 +2431,18 @@ popup_menu_position_func(GtkMenu *menu,
 # endif
                         gpointer user_data)
 {
-    if (curwin != NULL && gui.drawarea != NULL && gui.drawarea->window != NULL)
+    gdk_window_get_origin(gui.drawarea->window, x, y);
+
+    if (popup_mouse_pos)
     {
-       gdk_window_get_origin(gui.drawarea->window, x, y);
+       int     mx, my;
 
+       gui_mch_getmouse(&mx, &my);
+       *x += mx;
+       *y += my;
+    }
+    else if (curwin != NULL && gui.drawarea != NULL && gui.drawarea->window != NULL)
+    {
        /* Find the cursor position in the current window */
        *x += FILL_X(W_WINCOL(curwin) + curwin->w_wcol + 1) + 1;
        *y += FILL_Y(W_WINROW(curwin) + curwin->w_wrow + 1) + 1;
@@ -2438,10 +2450,12 @@ popup_menu_position_func(GtkMenu *menu,
 }
 
     void
-gui_make_popup(char_u *path_name)
+gui_make_popup(char_u *path_name, int mouse_pos)
 {
     vimmenu_T *menu;
 
+    popup_mouse_pos = mouse_pos;
+
     menu = gui_find_menu(path_name);
 
     if (menu != NULL && menu->submenu_id != NULL)

diff --git a/src/gui_w32.c b/src/gui_w32.c
index c4d8e4841ca98ad59bac040451ff8811bd7fd6aa..11d0281a62864a7942c9ef27b38bfd3876d94989 100644 (file)
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -2206,7 +2206,7 @@ gui_mch_show_popupmenu(vimmenu_T *menu)
 }
 
     void
-gui_make_popup(char_u *path_name)
+gui_make_popup(char_u *path_name, int mouse_pos)
 {
     vimmenu_T  *menu = gui_find_menu(path_name);
 
@@ -2216,7 +2216,15 @@ gui_make_popup(char_u *path_name)
 
        /* Find the position of the current cursor */
        GetDCOrgEx(s_hdc, &p);
-       if (curwin != NULL)
+       if (mouse_pos)
+       {
+           int mx, my;
+
+           gui_mch_getmouse(&mx, &my);
+           p.x += mx;
+           p.y += my;
+       }
+       else if (curwin != NULL)
        {
            p.x += TEXT_X(W_WINCOL(curwin) + curwin->w_wcol + 1);
            p.y += TEXT_Y(W_WINROW(curwin) + curwin->w_wrow + 1);

diff --git a/src/proto/gui_gtk.pro b/src/proto/gui_gtk.pro
index 818d12c784d8a7bfdb2ab1d939771844748963ba..960d631b9917e74e9f83f3583769962aabe6d799 100644 (file)
--- a/src/proto/gui_gtk.pro
+++ b/src/proto/gui_gtk.pro
@@ -15,7 +15,7 @@ char_u *gui_mch_browse __ARGS((int saving, char_u *title, char_u *dflt, char_u *
 char_u *gui_mch_browsedir __ARGS((char_u *title, char_u *initdir));
 int gui_mch_dialog __ARGS((int type, char_u *title, char_u *message, char_u *buttons, int def_but, char_u *textfield));
 void gui_mch_show_popupmenu __ARGS((vimmenu_T *menu));
-void gui_make_popup __ARGS((char_u *path_name));
+void gui_make_popup __ARGS((char_u *path_name, int mouse_pos));
 void gui_mch_find_dialog __ARGS((exarg_T *eap));
 void gui_mch_replace_dialog __ARGS((exarg_T *eap));
 void gui_gtk_synch_fonts __ARGS((void));

diff --git a/src/version.h b/src/version.h
index 7082204663f662be69ecf1c4c0a86f759354de56..833182209f78b8c517731c34af894bb15634d730 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -36,5 +36,5 @@
 #define VIM_VERSION_NODOT      "vim70aa"
 #define VIM_VERSION_SHORT      "7.0aa"
 #define VIM_VERSION_MEDIUM     "7.0aa ALPHA"
-#define VIM_VERSION_LONG       "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 6)"
-#define VIM_VERSION_LONG_DATE  "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 6, compiled "
+#define VIM_VERSION_LONG       "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 8)"
+#define VIM_VERSION_LONG_DATE  "VIM - Vi IMproved 7.0aa ALPHA (2005 Jul 8, compiled "