Mercurial > vim

changeset 398:d5dbe17efce2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.0105
author vimboss
date Fri, 08 Jul 2005 22:17:29 +0000
parents 0f390d720227
children 797041cd1c66
files runtime/doc/gui.txt runtime/syntax/pod.vim src/ex_docmd.c src/gui_kde.cc src/proto/gui_w16.pro src/proto/gui_w32.pro src/spell.c
diffstat 7 files changed, 34 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/runtime/doc/gui.txt
+++ b/runtime/doc/gui.txt
@@ -1,4 +1,4 @@
-*gui.txt*       For Vim version 7.0aa.  Last change: 2005 Apr 11
+*gui.txt*       For Vim version 7.0aa.  Last change: 2005 Jul 07
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -897,9 +897,13 @@ it behaves in a strange way.
 				appear on the menu-bar (see |hidden-menus|).
 				{only available for Win32 and GTK GUI}
 
+:popu[p]! {name}		Like above, but use the position of the mouse
+				pointer instead of the cursor.
+
 Example: >
 	:popup File
-will make the "File" menu (if there is one) appear at the text cursor. >
+will make the "File" menu (if there is one) appear at the text cursor (mouse
+pointer if ! was used). >
 
 	:amenu ]Toolbar.Make	:make<CR>
 	:popup ]Toolbar
--- a/runtime/syntax/pod.vim
+++ b/runtime/syntax/pod.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	Perl POD format
 " Maintainer:	Scott Bigham <dsb@killerbunnies.org>
-" Last Change:	2004 Oct 05
+" Last Change:	2005 Jul 05
 
 " To add embedded POD documentation highlighting to your syntax file, add
 " the commands:
@@ -25,38 +25,38 @@ elseif exists("b:current_syntax")
 endif
 
 " POD commands
-syn match podCommand	"^=head[1234]"	nextgroup=podCmdText
-syn match podCommand	"^=item"	nextgroup=podCmdText
-syn match podCommand	"^=over"	nextgroup=podOverIndent skipwhite
-syn match podCommand	"^=back"
-syn match podCommand	"^=cut"
-syn match podCommand	"^=pod"
-syn match podCommand	"^=for"		nextgroup=podForKeywd skipwhite
-syn match podCommand	"^=begin"	nextgroup=podForKeywd skipwhite
-syn match podCommand	"^=end"		nextgroup=podForKeywd skipwhite
+syn match podCommand	"^=head[1234]"	nextgroup=podCmdText contains=@NoSpell
+syn match podCommand	"^=item"	nextgroup=podCmdText contains=@NoSpell
+syn match podCommand	"^=over"	nextgroup=podOverIndent skipwhite contains=@NoSpell
+syn match podCommand	"^=back" contains=@NoSpell
+syn match podCommand	"^=cut" contains=@NoSpell
+syn match podCommand	"^=pod" contains=@NoSpell
+syn match podCommand	"^=for"		nextgroup=podForKeywd skipwhite contains=@NoSpell
+syn match podCommand	"^=begin"	nextgroup=podForKeywd skipwhite contains=@NoSpell
+syn match podCommand	"^=end"		nextgroup=podForKeywd skipwhite contains=@NoSpell
 
 " Text of a =head1, =head2 or =item command
-syn match podCmdText	".*$" contained contains=podFormat
+syn match podCmdText	".*$" contained contains=podFormat,@NoSpell
 
 " Indent amount of =over command
-syn match podOverIndent	"\d\+" contained
+syn match podOverIndent	"\d\+" contained contains=@NoSpell
 
 " Formatter identifier keyword for =for, =begin and =end commands
-syn match podForKeywd	"\S\+" contained
+syn match podForKeywd	"\S\+" contained contains=@NoSpell
 
 " An indented line, to be displayed verbatim
-syn match podVerbatimLine	"^\s.*$"
+syn match podVerbatimLine	"^\s.*$" contains=@NoSpell
 
 " Inline textual items handled specially by POD
-syn match podSpecial	"\(\<\|&\)\I\i*\(::\I\i*\)*([^)]*)"
-syn match podSpecial	"[$@%]\I\i*\(::\I\i*\)*\>"
+syn match podSpecial	"\(\<\|&\)\I\i*\(::\I\i*\)*([^)]*)" contains=@NoSpell
+syn match podSpecial	"[$@%]\I\i*\(::\I\i*\)*\>" contains=@NoSpell
 
 " Special formatting sequences
-syn region podFormat	start="[IBSCLFX]<[^<]"me=e-1 end=">" oneline contains=podFormat
+syn region podFormat	start="[IBSCLFX]<[^<]"me=e-1 end=">" oneline contains=podFormat,@NoSpell
 syn match  podFormat	"Z<>"
-syn match  podFormat	"E<\(\d\+\|\I\i*\)>" contains=podEscape,podEscape2
-syn match  podEscape	"\I\i*>"me=e-1 contained
-syn match  podEscape2	"\d\+>"me=e-1 contained
+syn match  podFormat	"E<\(\d\+\|\I\i*\)>" contains=podEscape,podEscape2,@NoSpell
+syn match  podEscape	"\I\i*>"me=e-1 contained contains=@NoSpell
+syn match  podEscape2	"\d\+>"me=e-1 contained contains=@NoSpell
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -7043,7 +7043,7 @@ ex_tearoff(eap)
 ex_popup(eap)
     exarg_T	*eap;
 {
-    gui_make_popup(eap->arg);
+    gui_make_popup(eap->arg, eap->forceit);
 }
 #endif
 
--- a/src/gui_kde.cc
+++ b/src/gui_kde.cc
@@ -612,8 +612,9 @@ gui_mch_show_popupmenu(vimmenu_T *menu)/
     menu->widget->popup(QCursor::pos());
 }//}}}
 
+/* TODO: use mouse_pos */
 void
-gui_make_popup (char_u *pathname)//{{{
+gui_make_popup (char_u *pathname, int mouse_pos)//{{{
 {
     vimmenu_T *menu = gui_find_menu(pathname);
 
--- a/src/proto/gui_w16.pro
+++ b/src/proto/gui_w16.pro
@@ -66,7 +66,7 @@ void gui_mch_draw_string __ARGS((int row
 void gui_mch_flush __ARGS((void));
 void gui_mch_add_menu __ARGS((vimmenu_T *menu, int pos));
 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_add_menu_item __ARGS((vimmenu_T *menu, int idx));
 void gui_mch_destroy_menu __ARGS((vimmenu_T *menu));
 void gui_mch_menu_grey __ARGS((vimmenu_T *menu, int grey));
--- a/src/proto/gui_w32.pro
+++ b/src/proto/gui_w32.pro
@@ -72,7 +72,7 @@ void gui_mch_draw_string __ARGS((int row
 void gui_mch_flush __ARGS((void));
 void gui_mch_add_menu __ARGS((vimmenu_T *menu, int pos));
 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_make_tearoff __ARGS((char_u *path_name));
 void gui_mch_add_menu_item __ARGS((vimmenu_T *menu, int idx));
 void gui_mch_destroy_menu __ARGS((vimmenu_T *menu));
--- a/src/spell.c
+++ b/src/spell.c
@@ -6143,7 +6143,7 @@ spell_suggest()
     if (curbuf->b_cap_prog != NULL)
     {
 	endcol = 0;
-	if (skipwhite(line) - line == curwin->w_cursor.col)
+	if ((int)(skipwhite(line) - line) == (int)curwin->w_cursor.col)
 	{
 	    /* At start of line, check if previous line is empty or sentence
 	     * ends there. */
@@ -9622,10 +9622,10 @@ spell_edit_score(badword, goodword)
 	 * int array for easy access. */
 	for (p = badword, badlen = 0; *p != NUL; )
 	    wbadword[badlen++] = mb_ptr2char_adv(&p);
-	++badlen;
+	wbadword[badlen++] = 0;
 	for (p = goodword, goodlen = 0; *p != NUL; )
 	    wgoodword[goodlen++] = mb_ptr2char_adv(&p);
-	++goodlen;
+	wgoodword[goodlen++] = 0;
     }
     else
 #endif