- _with_gtk1 bcond description

[packages/vim.git] / vim-gtk2-20030207.patch

Index: runtime/menu.vim
===================================================================
RCS file: /cvsroot/vim/vim/runtime/menu.vim,v
retrieving revision 1.76
diff -u -3 -p -r1.76 menu.vim
--- runtime/menu.vim	19 Nov 2002 23:53:46 -0000	1.76
+++ runtime/menu.vim	7 Feb 2003 19:39:03 -0000
@@ -695,6 +695,7 @@ func! s:BMMunge(fname, bnum)
   endif
   let name = name2 . "\t" . <SID>BMTruncName(fnamemodify(name,':h'))
   let name = escape(name, "\\. \t|")
+  let name = substitute(name, "&", "&&", "g")
   let name = substitute(name, "\n", "^@", "g")
   return name
 endfunc
Index: runtime/doc/gui.txt
===================================================================
RCS file: /cvsroot/vim/vim/runtime/doc/gui.txt,v
retrieving revision 1.58
diff -u -3 -p -r1.58 gui.txt
--- runtime/doc/gui.txt	13 May 2002 15:35:02 -0000	1.58
+++ runtime/doc/gui.txt	7 Feb 2003 19:39:03 -0000
@@ -493,7 +493,8 @@ which when selected, performs the operat
 Special characters in a menu name:
 
 	&	The next character is the shortcut key.  Make sure each
-		shortcut key is only used once in a (sub)menu.
+		shortcut key is only used once in a (sub)menu.  If you want to
+		insert a literal "&" in the menu name use "&&".
 	<Tab>	Separates the menu name from right-aligned text.  This can be
 		used to show the equivalent typed command.  The text "<Tab>"
 		can be used here for convenience.  If you are using a real
@@ -576,7 +577,8 @@ When no or zero priority is given, 500 i
 The priority for the PopUp menu is not used.
 
 The Help menu will be placed on the far right side of the menu bar on systems
-which support this (Motif and GTK+).
+which support this (Motif and GTK+).  For GTK+ 2, this is not done anymore
+because right-aligning the Help menu is now discouraged UI design.
 
 You can use a priority higher than 9999, to make it go after the Help menu,
 but that is non-standard and is discouraged.  The highest possible priority is
@@ -644,8 +646,10 @@ level.  Vim interprets the items in this
     toolbar button image.  Note that the exact filename is OS-specific: For
     example, under Win32 the command >
 	:amenu ToolBar.Hello :echo "hello"<CR>
-<   would find the file 'hello.bmp'.  Under GTK+/X11 it is 'Hello.xpm'.
-    For MS-Windows the bitmap is scaled to fit the button.
+<   would find the file 'hello.bmp'.  Under GTK+/X11 it is 'Hello.xpm'.  With
+    GTK+ 2 the files 'Hello.png', 'Hello.xpm' and 'Hello.bmp' are checked for
+    existence, and the first one found would be used.
+    For MS-Windows and GTK+ 2 the bitmap is scaled to fit the button.
     For others the size of the default pixmaps used is 20 by 20 pixels.
     For MS-Windows the bitmap should have 16 colors with the standard pallete.
     The light grey pixels will be changed to the Window frame color and the
@@ -826,8 +830,10 @@ The tip is defined like this: >
 And delete it with: >
 	:tunmenu MyMenu.Hello
 
-When using the GTK GUI, and Vim has already opened the GUI window, the tooltip
-must be defined before the ToolBar menu.  Otherwise it won't show up.
+When using the GTK+ 1.2 GUI, and Vim has already opened the GUI window, the
+tooltip must be defined before the ToolBar menu.  Otherwise it won't show up.
+In the GTK+ 2 port the tooltip is now updated on the fly, so this is no longer
+necessary.
 
 Tooltips are currently only supported for the X11 and Win32 GUI. However, they
 should appear for the other gui platforms in the not too distant future.
Index: runtime/doc/gui_x11.txt
===================================================================
RCS file: /cvsroot/vim/vim/runtime/doc/gui_x11.txt,v
retrieving revision 1.57
diff -u -3 -p -r1.57 gui_x11.txt
--- runtime/doc/gui_x11.txt	25 Mar 2002 17:00:32 -0000	1.57
+++ runtime/doc/gui_x11.txt	7 Feb 2003 19:39:04 -0000
@@ -315,14 +315,15 @@ internally.  Look in the GTK documentati
 	--sync
 	--gdk-debug
 	--gdk-no-debug
-	--no-xshm
-	--xim-preedit
-	--xim-status
+	--no-xshm	(not in GTK+ 2)
+	--xim-preedit	(not in GTK+ 2)
+	--xim-status	(not in GTK+ 2)
 	--gtk-debug
 	--gtk-no-debug
 	--g-fatal-warnings
 	--gtk-module
 	--display	(GTK+ counterpart of -display; works the same way.)
+	--screen	(The screen number; for GTK+ 2.2 multihead support.)
 
 As for colors, vim's color settings (for syntax highlighting) is still
 done the traditional vim way.  See |:highlight| for more help.
@@ -365,7 +366,8 @@ application to spawn the Vim correctly. 
 http://www.gtk.org/api/
 
 Note that this feature requires the latest GTK version.  GTK 1.2.10 still has
-a small problem.
+a small problem.  The socket feature has not yet been tested with GTK+ 2 --
+feel free to volunteer.
 
 ==============================================================================
 6. GNOME version				*gui-gnome* *Gnome* *GNOME*
@@ -373,17 +375,31 @@ a small problem.
 The Gnome GUI works just like the GTK version.  It only looks a bit different.
 See |GTK| above for how it works.
 
+On the other hand, the GNOME 2 GUI looks barely different from the GTK+ 2
+version but implements an important feature that is not available in plain
+GTK+ 2:  Interaction with the session manager.
+
+On logout, Vim will show the usual exit confirmation dialog if any buffers are
+still modified.  Clicking [Cancel] will stop the logout process.  Otherwise
+the current session is stored to disk by using the |:mksession| command, and
+restored the next time you log in.
+
+Note that the Session.vim file is written to a separate sub-directory of
+$HOME/.gnome2 (the exact filename is based on a per-save unique key).  Your
+own session files will not be touched at all.
+
 These are the different looks:
-- Uses GNOME dialogs.
+- Uses GNOME dialogs (GNOME 1 only).  The GNOME 2 GUI uses the same nice
+  dialogs as the GTK+ 2 version.
 - Uses the GNOME dock, so that the toolbar and menubar can be moved to
   different locations other than the top (e.g., the toolbar can be placed on
-  the left, right, top, or bottom).  The positioning of the menubar and
-  toolbar isn't saved right now; I think that's for GNOME session management
-  which isn't supported (yet).
+  the left, right, top, or bottom).  The placement of the menubar and
+  toolbar is only saved in the GNOME 2 version.
 - That means the menubar and toolbar handles are back!  Yeah!  And the
   resizing grid still works too.
 
 Gnome is automatically compiled with if it was found by configure.
+(FIXME: Is this still true?  Use --enable-gnome-check to force it to.)
 
 ==============================================================================
 7. Compiling						*gui-x11-compiling*
@@ -399,6 +415,12 @@ you can already successful compile, buil
 reason for this is because the compiler flags (CFLAGS) and link flags
 (LDFLAGS) are obtained through the 'gtk-config' shell script.
 
+If you want to build with GTK+ 2 support pass the --enable-gtk2-check argument
+to ./configure.  Optionally, support for GNOME 2 will be compiled if the
+--enable-gnome-check option is also given.  Note that the support for GTK+ 2
+is still experimental.  However, many people have reported that it works just
+fine for them.
+
 Otherwise, if you are using Motif or Athena, when you have the Motif or Athena
 files in a directory where configure doesn't look, edit the Makefile to enter
 the names of the directories.  Search for "GUI_INC_LOC" for an example to set
@@ -411,8 +433,15 @@ if using v1.0.6.  For instance, there ar
 Using a version from GTK+'s CVS tree may or may not work, and is therefore not
 supported and not recommended.
 
+For the experimental GTK+ 2 GUI, using the latest release in the GTK+ 2.0 or
+GTK+ 2.2 series is recommended.  CVS HEAD seems to work fine most of time as
+well.
+
 Lastly, although GTK+ has supposedly been ported to the Win32 platform, this
-has not been tested with Vim and is also unsupported.
+has not been tested with Vim and is also unsupported.  Also, it's unlikely to
+even compile since GTK+ GUI uses parts of the generic X11 code.  This might
+change in distant future; particularly because getting rid of the X11 centric
+code parts is also required for GTK+ framebuffer support.
 
 							*gui-x11-motif*
 For Motif, you need at least Motif version 1.2 and/or X11R5.  Motif 2.0 and
Index: runtime/doc/mbyte.txt
===================================================================
RCS file: /cvsroot/vim/vim/runtime/doc/mbyte.txt,v
retrieving revision 1.7
diff -u -3 -p -r1.7 mbyte.txt
--- runtime/doc/mbyte.txt	25 Mar 2002 17:00:33 -0000	1.7
+++ runtime/doc/mbyte.txt	7 Feb 2003 19:39:05 -0000
@@ -105,6 +105,12 @@ is the difficult part.  It depends on th
 a few other things.  See the chapters on fonts: |mbyte-fonts-X11| for
 X-Windows and |mbyte-fonts-MSwin| for MS-Windows.
 
+For GTK+ 2, you can skip the rest of this section.  The options 'guifontset'
+and 'guifontwide' do no longer exist.  You only need to set 'guifont' and
+everything should "just work".  If your system comes with Xft2 and fontconfig
+and the current font does not contain a certain glyph, a different font will
+be used automatically if available.
+
 For X11 you can set the 'guifontset' option to a list of fonts that together
 cover the characters that are used.  Example for Korean: >
 
@@ -493,6 +499,11 @@ For Vim you may need to set 'encoding' t
 Unfortunately, using fonts in X11 is complicated.  The name of a single-byte
 font is a long string.  For multi-byte fonts we need several of these...
 
+Note: Most of this is no longer relevant for GTK+ 2.  Selecting a font via
+its XLFD is not supported anymore; see |'guifont'| for an example of how to
+set the font.  Do yourself a favour and ignore the |XLFD| and |fontset|
+sections below.
+
 First of all, Vim only accepts fixed-width fonts for displaying text.  You
 cannot use proportionally spaced fonts.  This excludes many of the available
 (and nicer looking) fonts.  However, for menus and tooltips any font can be
@@ -991,7 +1002,7 @@ The length of the two items together mus
 
 It's possible to have more than one character in the first column.  This works
 like a dead key.  Example: >