Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1398

9 files changed, 83 insertions, 61 deletions

diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server
index d16d07a6af9..a1a7445e0c9 100644
--- a/admin/nt/README-ftp-server
+++ b/admin/nt/README-ftp-server
@@ -5,16 +5,17 @@ See the end of the file for license conditions.
                       Precompiled Distributions of
                            Emacs for Windows
 
-                              Version 22.2
+                          PRETEST Version 22.2.91
 
-                             March 26, 2008
+                             August 27, 2008
                 
-  This directory contains source and precompiled distributions for GNU
-  Emacs on Windows NT/2000/XP and Windows 95/98/Me.  This port is a
+  This directory contains precompiled distributions for GNU Emacs
+  on Windows NT/2000/XP/Vista and Windows 95/98/Me.  This port is a
   part of the standard GNU Emacs distribution from the Free Software
   Foundation; the precompiled distributions are provided here for
   convenience since the majority of Windows users are not accustomed
-  to compiling programs themselves.
+  to compiling programs themselves.  Corresponding source can be found
+  in the parent directory in emacs-22.2.91.tar.gz.
 
   If you have access to the World Wide Web, I would recommend pointing
   your favorite web browser to the following document (if you haven't
@@ -22,17 +23,13 @@ See the end of the file for license conditions.
 
         http://www.gnu.org/software/emacs/windows/ntemacs.html
 
-  The above web document is a far more complete version of this README
-  file.  If you don't have access to the Web, however, then read on.
-
-
 * IMPORTANT LEGAL REMINDER
 
   If you want to redistribute any of the precompiled distributions of
   Emacs, be careful to check the implications of the GPL.  For instance,
-  if you put the emacs-22.2-bin-i386.tar.gz file from this directory on
+  if you put the emacs-22.2.91-bin-i386.tar.gz file from this directory on
   an Internet site, you must arrange to distribute the source files of
-  the SAME version (i.e. ../emacs-22.2.tar.gz).
+  the SAME version (i.e. ../emacs-22.2.91.tar.gz).
 
   Making a link to our copy of the source is NOT sufficient, since we
   might upgrade to a new version while you are still distributing the
@@ -41,8 +38,8 @@ See the end of the file for license conditions.
 
 * Files in this directory
 
-  + emacs-22.2-bin-i386.zip
-    Windows binaries of Emacs-22.2, with all lisp code and documentation
+  + emacs-22.2.91-bin-i386.zip
+    Windows binaries of Emacs-22.2.91, with all lisp code and documentation
     included.
 
     Download this file if you want a single installation package, and
@@ -53,8 +50,8 @@ See the end of the file for license conditions.
     If you need the C source code at a later date, it will be safe to
     unpack the source distribution on top of this installation.
 
-  + emacs-22.2-barebin-i386.zip
-    Windows binaries of Emacs-22.2, without lisp code or documentation.
+  + emacs-22.2.91-barebin-i386.zip
+    Windows binaries of Emacs-22.2.91, without lisp code or documentation.
 
     Download this file if you already have the source distribution, or
     if you need to redump the emacs.exe executable.
@@ -69,28 +66,12 @@ See the end of the file for license conditions.
     a basic Makefile for compiling with mingw32 and a .def file for
     generating a DLL with the appropriate exports in addition to the
     source code to provide the subset of functionality Emacs uses from
-    libXpm. This corresponds to the libXpm.dll in emacs-22.2-bin-i386.zip
-    and emacs-22.2-barebin-i386.zip.
-
-
-    The following are provided for users who require older versions.
-
-  + emacs-22.1-bin-i386.zip
-  + emacs-22-1-barebin-i386.zip
-    Windows binaries of Emacs 22.1, contents as above.
-
-  + emacs-21.3-bin-i386.tar.gz
-    Windows binaries of Emacs 21.3, with compiled lisp code and some
-    documentation included.
-
-  + emacs-21.3-leim.tar.gz
-    Compiled lisp input methods. This optional addition to Emacs-21.3
-    is required if you want to enter languages that are not directly
-    supported by your keyboard.
+    libXpm. This corresponds to the libXpm.dll in emacs-22.2.91-bin-i386.zip
+    and emacs-22.2.91-barebin-i386.zip.
 
 * Image support
 
-  Emacs 22.2 contains support for images, however for most image formats
+  Emacs 22.2.91 contains support for images, however for most image formats
   supporting libraries are required.  This distribution has been tested
   with the libraries that are distributed with GTK for Windows, and the
   libraries found at http://gnuwin32.sourceforge.net/. The following image
@@ -120,23 +101,24 @@ See the end of the file for license conditions.
 
 * Distributions in .tar.gz and .zip format
 
-  Emacs is distributed primarily as source code in a large gzipped tar file
-  (*.tar.gz).  Because Emacs is quite large and therefore difficult to
-  download over unreliable connections, the Windows binaries are provided
-  in several combinations, ranging from the complete source plus executables,
-  to just the minimal amount needed to run without any source, plus a
-  couple of optional packages.  Formerly, we used the same .tar.gz format
-  but since there are no longer legal problems with .zip files, and the
-  latest versions of Windows support these natively, the Windows binaries
-  of Emacs are now distributed as .zip files.
+  Emacs is distributed primarily as source code in a large gzipped tar
+  file (*.tar.gz).  Because Emacs is quite large and therefore
+  difficult to download over unreliable connections, the Windows
+  binaries are provided in two combinations. The complete lisp source
+  plus executables (bin), and executables only (barebin) for unpacking
+  over the top of the source distribution.  Formerly, we used the same
+  .tar.gz format but since there are no longer legal problems with
+  .zip files, and the latest versions of Windows support these
+  natively, the Windows binaries of Emacs are now distributed as .zip
+  files.
 
 * Distributions for non-x86 platforms
 
   Distributions for non-x86 platforms are no longer supplied. Older
   platforms supported by Windows NT no longer seem to be in demand,
-  and Emacs is yet to be ported to 64bit Windows platforms. If you are
-  willing to help port Emacs 23 to 64bit versions of Windows, your
-  contribution will be welcome on the emacs-devel mailing list.
+  and Emacs is yet to be ported to 64 bit Windows platforms. If you
+  are willing to help port Emacs 23 to 64 bit versions of Windows,
+  your contribution will be welcome on the emacs-devel mailing list.
 
 * Unpacking distributions
 
@@ -148,7 +130,8 @@ See the end of the file for license conditions.
     GnuWin32: http://gnuwin32.sourceforge.net/
 
   Many other popular file compression utilities for Windows are also
-  able to handle gzipped tar files.
+  able to handle gzipped tar files. 7zip is one free Windows graphical
+  program that is able to handle many archive formats.
 
   Open a command prompt (MSDOS) window.  Decide on a directory in which
   to place Emacs.  Move the distribution to that directory, and then
@@ -206,6 +189,11 @@ See the end of the file for license conditions.
     abbrevli.el, your distribution has been corrupted while unpacking
     and Emacs will not start.
 
+  + Check that filenames were not changed by your web-browser.  Some
+    proprietary web-browsers save .tar.gz files as .tar.tar. You might
+    like to consider switching to a Free modern browser if your browser
+    has this bug.
+
   + I've also had reports that some older "gnuwin32" port of tar
     corrupts the executables.  Use the latest version from the gnuwin32
     site or another port of tar instead.
@@ -220,11 +208,10 @@ See the end of the file for license conditions.
   If you would like to compile Emacs from source, download the source
   distribution, unpack it in the same manner as a precompiled
   distribution, and look in the file nt/INSTALL for detailed
-  directions.  You can either use the Microsoft compiler included with
-  Visual C++ 2003 or earlier, or GCC 2.95 or later with MinGW support,
-  to compile the source.  The port of GCC included in Cygwin is
-  supported, but check the nt/INSTALL file if you have trouble since
-  some builds of GNU make aren't supported.
+  directions.  It is recommended to use GCC 2.95 or later with MinGW
+  support to compile the source.  The port of GCC included in Cygwin
+  is supported, but check the nt/INSTALL file if you have trouble
+  since some builds of GNU make aren't supported.
 
 
 * Further information
@@ -239,7 +226,7 @@ See the end of the file for license conditions.
   about the Windows port and related software packages. Note that as
   of writing, most of the information in that FAQ was for Emacs-21.3
   and earlier versions, so some information may not be relevant to
-  Emacs-22.2.
+  Emacs-22.2.91.
 
   In addition to the FAQ, there is a mailing list for discussing issues
   related to the Windows port of Emacs.  For information about the
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2bf5de6f14b..86f7aa4f57b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,22 @@
+2008-09-02  Chong Yidong  <cyd@stupidchicken.com>
+
+        * image-mode.el (image-mode): Fix 2008-07-19 change.
+
+2008-09-02  Juanma Barranquero  <lekktu@gmail.com>
+
+        * tool-bar.el (tool-bar-add-item): Fix typo in docstring.
+
+        * emulation/tpu-edt.el (tpu-match-beginning, tpu-match-end)
+        (tpu-check-match, tpu-goto-breadcrumb, tpu-reset-screen-size)
+        (tpu-toggle-overwrite-mode, tpu-include, tpu-get, tpu-what-line)
+        (tpu-insert-escape, tpu-insert-formfeed, tpu-end-define-macro-key)
+        (tpu-check-search-case, tpu-select, tpu-unselect, tpu-trim-line-ends)
+        (tpu-toggle-control-keys): Fix typos in docstrings.
+        (tpu-kill-buffer): Doc fix.
+        (tpu-make-file-buffer-list, tpu-toggle-regexp, tpu-cut)
+        (tpu-append-region, tpu-delete-current-char, tpu-emacs-replace):
+        Reflow docstrings.
+
 2008-09-02  Glenn Morris  <rgm@gnu.org>
 
         * emacs-lisp/lucid.el (try-face-font): Remove dead alias.
diff --git a/lisp/emulation/tpu-edt.el b/lisp/emulation/tpu-edt.el
index 7aea44c11d9..8f1e9e36c3e 100644
--- a/lisp/emulation/tpu-edt.el
+++ b/lisp/emulation/tpu-edt.el
@@ -1246,8 +1246,9 @@ and the total number of lines in the buffer."
 ;;;  Buffers and Windows
 ;;;
 (defun tpu-kill-buffer nil
-  "Kill the current buffer.  If tpu-kill-buffers-silently is non-nil,
-kills modified buffers without asking."
+  "Kill the current buffer.
+If `tpu-kill-buffers-silently' is non-nil,
+kill modified buffers without asking."
   (interactive)
   (if tpu-kill-buffers-silently (set-buffer-modified-p nil))
   (kill-buffer (current-buffer)))
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 6687ed3fed4..ec3a66e0dc1 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -332,7 +332,7 @@ to toggle between display as an image and display as text."
 
   (add-hook 'change-major-mode-hook 'image-toggle-display-text nil t)
   (if (display-images-p)
-      (if (not (image-get-display-property))
+      (if (not (get-text-property (point-min) 'display))
           (image-toggle-display)
         ;; Set next vars when image is already displayed but local
         ;; variables were cleared by kill-all-local-variables
diff --git a/lisp/tool-bar.el b/lisp/tool-bar.el
index 14cbc57f029..85d3ba5b705 100644
--- a/lisp/tool-bar.el
+++ b/lisp/tool-bar.el
@@ -133,7 +133,7 @@ PROPS are additional items to add to the menu item specification.  See
 Info node `(elisp)Tool Bar'.  Items are added from left to right.
 
 ICON is the base name of a file containing the image to use.  The
-function will first try to use low-color/ICON.xpm if display-color-cells
+function will first try to use low-color/ICON.xpm if `display-color-cells'
 is less or equal to 256, then ICON.xpm, then ICON.pbm, and finally
 ICON.xbm, using `find-image'.
 
diff --git a/src/ChangeLog b/src/ChangeLog
index b6b6be212a5..e8e50319c12 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2008-09-02  Eli Zaretskii  <eliz@gnu.org>
+
+        * fileio.c (Fexpand_file_name): Copy argument `name' into local
+        storage on all platforms, not just on DOS_NT.
+
+2008-09-02  Jason Rumney  <jasonr@gnu.org>
+
+        * w32menu.c (Fx_popup_menu, Fx_popup_dialog, w32_menu_show): Ensure
+        mouse is not grabbed after menu is finished.
+
 2008-09-01  Chong Yidong  <cyd@stupidchicken.com>
 
         * xfaces.c (Finternal_set_alternative_font_family_alist)
diff --git a/src/fileio.c b/src/fileio.c
index 02c41243cb6..ad8f7d7a538 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -932,12 +932,11 @@ See also the function `substitute-in-file-name'.  */)
   nm = SDATA (name);
   nm_in_name = 1;
 
-#ifdef DOS_NT
-  /* We will force directory separators to be either all \ or /, so make
-     a local copy to modify, even if there ends up being no change. */
+  /* Make a local copy of nm[] to protect it from GC in DECODE_FILE below. */
   nm = strcpy (alloca (strlen (nm) + 1), nm);
   nm_in_name = 0;
 
+#ifdef DOS_NT
   /* Note if special escape prefix is present, but remove for now.  */
   if (nm[0] == '/' && nm[1] == ':')
     {
@@ -1038,7 +1037,7 @@ See also the function `substitute-in-file-name'.  */)
             }
           return name;
 #else /* not DOS_NT */
-          if (nm == SDATA (name))
+          if (strcmp (nm, SDATA (name)) == 0)
             return name;
           return make_specified_string (nm, -1, strlen (nm), multibyte);
 #endif /* not DOS_NT */
diff --git a/src/w32menu.c b/src/w32menu.c
index fb54caf8806..067049808ad 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -342,6 +342,7 @@ cached information about equivalent key sequences.  */)
   if (NILP (position))
     {
       discard_menu_items ();
+      FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
       UNGCPRO;
       return Qnil;
     }
@@ -355,6 +356,7 @@ cached information about equivalent key sequences.  */)
   if (current_popup_menu)
     {
       discard_menu_items ();
+      FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
       UNGCPRO;
       return Qnil;
     }
@@ -367,6 +369,7 @@ cached information about equivalent key sequences.  */)
   UNBLOCK_INPUT;
 
   discard_menu_items ();
+  FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
 
 #endif /* HAVE_MENUS */
 
@@ -495,6 +498,7 @@ otherwise it is "Question". */)
     UNBLOCK_INPUT;
 
     discard_menu_items ();
+    FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
 
     if (error_name) error (error_name);
     return selection;
@@ -1165,6 +1169,7 @@ w32_menu_show (f, x, y, for_click, keymaps, title, error)
   /* Clean up extraneous mouse events which might have been generated
      during the call. */
   discard_mouse_events ();
+  FRAME_X_DISPLAY_INFO (f)->grabbed = 0;
 
   /* Free the widget_value objects we used to specify the contents.  */
   free_menubar_widget_value_tree (first_wv);
diff --git a/src/xterm.c b/src/xterm.c
index 88fb04d665e..603ec993af2 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10516,6 +10516,7 @@ x_delete_display (dpyinfo)
   /* Xt and GTK do this themselves.  */
 #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK)
 #ifndef AIX             /* On AIX, XCloseDisplay calls this.  */
+  /* Xt and GTK does this themselves. */
   XrmDestroyDatabase (dpyinfo->xrdb);
 #endif
 #endif