Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-353
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-354
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-355
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-356
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-183

19 files changed, 527 insertions, 201 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 28f6d394230..bf08d2643f3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,158 @@
+2004-05-30  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * replace.el (query-replace-interactive): Convert defvar into
+        defcustom.
+
+        * autorevert.el: Update `Commentary' section.
+
+2004-05-30  Juanma Barranquero  <lektu@terra.es>
+
+        * dos-fns.el (convert-standard-filename):
+        * files.el (convert-standard-filename):
+        * w32-fns.el (convert-standard-filename):
+        Rework docstring (wording by Eli Zaretskii and Kai Grossjohann).
+
+2004-05-30  Kai Grossjohann  <kai.grossjohann@gmx.net>
+
+        Sync with Tramp.
+
+        * net/tramp.el (tramp-let-maybe): Reverse args of `get'.
+        (tramp-let-maybe): Move to an earlier spot in the file.  Patch by
+        Andreas Schwab.
+
+2004-05-30  Andreas Schwab  <schwab@suse.de>
+
+        * dired.el (dired-get-filename): Don't use dired-re-dot.
+
+2004-05-30  Richard M. Stallman  <rms@gnu.org>
+
+        * files.el (find-file): Doc fix.
+
+        * font-lock.el (lisp-font-lock-keywords-2): Add multiple-value-bind.
+
+2004-05-30  Nick Roberts  <nickrob@gnu.org>
+
+        * progmodes/gdb-ui.el (gdb-current-frame, gud-watch)
+        (gdb-locals-mode, gdb-frame-handler): Display current frame in the
+        modeline of the locals buffer.
+        (gdb-goto-breakpoint): Handle gdbmi.
+        (gdb-get-frame-number): Change for gdbmi.
+
+2004-05-30  Michael Albinus  <michael.albinus@gmx.de>
+
+        * files.el (file-remote-p): Apply file name handler for operation
+        `file-remote-p'.  It isn' a property any longer.
+        (file-relative-name): `fh' and `fd' get the required value via
+        `find-file-name-handler' already.
+
+        * ange-ftp.el (ange-ftp-file-remote-p): New defun.
+        (top): Remove setting of `file-remote-p' property for
+        `ange-ftp-hook-function'.  Add `ange-ftp' property to
+        `file-remote-p'.
+
+2004-05-29  Michael Albinus  <michael.albinus@gmx.de>
+
+        Version 2.0.41 of Tramp released.
+
+        * tramp.el (tramp-wait-for-regexp, tramp-wait-for-output): Throw
+        away if process has died.  Reported by Luc Teirlinck
+        <teirllm@dms.auburn.edu>.
+        (tramp-out-of-band-prompt-regexp): Renamed to
+        `tramp-process-alive-regexp', because its usage is widen.
+        (tramp-actions-copy-out-of-band): Apply it.
+        (tramp-actions-before-shell, tramp-multi-actions): Add
+        `tramp-action-process-alive' action.
+        (tramp-action-process-alive): New defun.
+        (tramp-file-name-handler-alist, tramp-file-name-for-operation):
+        Add entry for `file-remote-p'.
+        (tramp-handle-file-remote-p): New defun.
+        (top): Remove setting of `file-remote-p'.  Don't set
+        `inhibit-file-name-handlers' and `inhibit-file-name-operation'.
+
+        * tramp-smb.el (tramp-smb-file-name-handler-alist): Add entry for
+        `file-remote-p'.
+
+        * tramp-uu.el (tramp-uuencode-region): Padding characters aren't
+        counted for (last) line.  Reported by Aaron Ucko
+        <ucko@ncbi.nlm.nih.gov>.
+
+2004-05-29  Kai Grossjohann  <kai.grossjohann@gmx.net>
+
+        * tramp.el (tramp-initial-commands): Add "unset HISTFILE"; this is
+        not really necessary but seems to keep the shell history smaller
+        in some cases.  It is no substitute for setting HISTFILE and
+        HISTSIZE from tramp-open-connection-setup-interactive-shell,
+        though.  Suggested by Luc Teirlinck.
+        (tramp-open-connection-setup-interactive-shell): Export variables
+        HISTFILE and HISTSIZE, do not just set them.  From Luc Teirlinck.
+        (tramp-set-process-query-on-exit-flag): New compat function.
+        (tramp-open-connection-multi, tramp-open-connection-su)
+        (tramp-open-connection-rsh, tramp-open-connection-telnet)
+        (tramp-do-copy-or-rename-file-out-of-band): Use it.
+        (tramp-let-maybe): New macro, let-binds a variable only if it
+        isn't obsolete.
+        (tramp-check-ls-commands, tramp-handle-expand-file-name)
+        (tramp-handle-file-truename): Use it.
+        (tramp-completion-file-name-regexp-unified): Avoid matching
+        filenames starting with "/:" -- those are reserved for
+        file-name-non-special.
+
+        * tramp-smb.el (tramp-smb-open-connection): Use
+        tramp-set-process-query-on-exit-flag compat function.
+
+2004-05-29  Richard M. Stallman  <rms@gnu.org>
+
+        * net/browse-url.el (browse-url-interactive-arg): Doc fix.
+
+        * emacs-lisp/lisp-mode.el (prin1-char): Catch errors from `string'.
+        (eval-last-sexp-print-value): Print char equivalent regardless
+        of standard-output value.
+
+        * thumbs.el (thumbs-subst-char-in-string): Deleted.
+        (thumbs-thumbname): Use subst-char-in-string.
+        (thumbs-resize-image): Use condition-case, not ignore-errors.
+        (thumbs-kill-buffer): Likewise.
+
+        * thumbs.el: Don't include cl.  Don't bother with old Emacs versions.
+        (thumbs-mode): Make buffer read-only.
+        (thumbs-make-thumb): Unconditionally accept an existing file.
+        (thumbs-insert-thumb): Add thumb-image-file property to the image.
+        (thumbs-do-thumbs-insertion): Be smarter about where to put newlines.
+        (thumbs-show-thumbs-list): Error if images not supported.
+        (thumbs-save-current-image): Improve prompt string.
+        (thumbs-mode-map): Define u, R, x.
+        (thumbs-unmark): New command.
+        (thumbs-emboss-image): Minor cleanup.
+        (thumbs-forward-char, thumbs-backward-char): Skip chars with no image.
+        (thumbs-rename-images): New command.
+        (thumbs-show-image-num): Rewrite.  Don't rename the buffer.
+
+        * thumbs.el (thumbs-current-image): New function.
+        (thumbs-file-list, thumbs-file-alist): New functions.
+        (thumbs-find-image): Delete arg L.
+        Don't set up thumbs-fileL as buffer-local global var.
+        (thumbs-find-image-at-point): Use thumbs-current-image.
+        (thumbs-set-image-at-point-to-root-window): Likewise.
+        (thumbs-delete-images): Use thumbs-current-image, thumbs-file-alist.
+        Record and warn about errors.  Update thumbs-markedL for deletions.
+        (thumbs-next-image, thumbs-previous-image): Use thumbs-file-alist.
+        (thumbs-redraw-buffer): Use thumbs-file-list.
+        (thumbs-mark): Use thumbs-current-image.
+        (thumbs-show-name): Use thumbs-current-image.
+
+        * imenu.el (imenu--menubar-select): Set imenu-menubar-modified-tick
+        and imenu--last-menubar-index-alist.
+
+        * subr.el (with-selected-window): Undo previous change.
+
+2004-05-29  John Paul Wallington  <jpw@gnu.org>
+
+        * thumbs.el (thumbs-show-name): Do nothing if no image at point.
+        (thumbs-mouse-find-image): New command.
+        (thumbs-mode-map): Bind it to mouse-2.
+        (thumbs-mode):  Make mode-class special.
+        (thumbs-view-image-mode): Likewise.
+
 2004-05-29  Pavel Kobiakov  <pk_at_work@yahoo.com>
 
         * flymake.el: New file.
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index 1ba48a54236..7987e880ec1 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -36,8 +36,12 @@
 ;; Auto-Revert Mode.  Both modes automatically revert buffers
 ;; whenever the corresponding files have been changed on disk.
 ;;
-;; Auto-Revert Mode can be activated for individual buffers.
-;; Global Auto-Revert Mode applies to all file buffers.
+;; Auto-Revert Mode can be activated for individual buffers.  Global
+;; Auto-Revert Mode applies to all file buffers. (If the user option
+;; `global-auto-revert-non-file-buffers' is non-nil, it also applies
+;; to some non-file buffers.  This option is disabled by default.)
+;; Since checking a remote file is too slow, these modes do not check
+;; or revert remote files.
 ;;
 ;; Both modes operate by checking the time stamp of all files at
 ;; intervals of `auto-revert-interval'.  The default is every five
diff --git a/lisp/dired.el b/lisp/dired.el
index 8bdfe1befce..3d4491cc819 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1634,9 +1634,7 @@ Otherwise, an error occurs in these cases."
      ((eq localp 'verbatim)
       file)
      ((and (not no-error-if-not-filep)
-           (save-excursion
-             (beginning-of-line)
-             (looking-at dired-re-dot)))
+           (member file '("." "..")))
       (error "Cannot operate on `.' or `..'"))
      ((and (eq localp 'no-dir) already-absolute)
       (file-name-nondirectory file))
diff --git a/lisp/dos-fns.el b/lisp/dos-fns.el
index 65b6c0063c0..1253b7b5811 100644
--- a/lisp/dos-fns.el
+++ b/lisp/dos-fns.el
@@ -31,9 +31,13 @@
 ;; This overrides a trivial definition in files.el.
 (defun convert-standard-filename (filename)
   "Convert a standard file's name to something suitable for the current OS.
-This function's standard definition is trivial; it just returns the argument.
-However, on some systems, the function is redefined
-with a definition that really does change some file names."
+This means to guarantee valid names and perhaps to canonicalize
+certain patterns.
+
+On Windows and DOS, replace invalid characters.  On DOS, make
+sure to obey the 8.3 limitations.  On Windows, turn Cygwin names
+into native names, and also turn slashes into backslashes if the
+shell requires it (see `w32-shell-dos-semantics')."
   (if (or (not (stringp filename))
           ;; This catches the case where FILENAME is "x:" or "x:/" or
           ;; "/", thus preventing infinite recursion.
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 1f53d9e630f..d6ac05642ba 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -470,7 +470,10 @@ If CHAR is not a character, return nil."
           (cond
            ((memq c '(?\; ?\( ?\) ?\{ ?\} ?\[ ?\] ?\" ?\' ?\\)) (string ?\\ c))
            ((eq c 127) "\\C-?")
-           (t (string c)))))))
+           (t
+            (condition-case nil
+                (string c)
+              (error nil))))))))
 
 (defun eval-last-sexp-1 (eval-last-sexp-arg-internal)
   "Evaluate sexp before point; print value in minibuffer.
@@ -538,9 +541,8 @@ With argument, print output into current buffer."
         end)
     (prog1
         (prin1 value)
-      (if (eq standard-output t)
-          (let ((str (eval-expression-print-format value)))
-            (if str (princ str))))
+      (let ((str (eval-expression-print-format value)))
+        (if str (princ str)))
       (setq end (point))
       (when (and (bufferp standard-output)
                  (or (not (null print-length))
diff --git a/lisp/files.el b/lisp/files.el
index 27e0ded28e2..81e014d2283 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -481,10 +481,15 @@ Runs the usual ange-ftp hook, but only for completion operations."
 
 (defun convert-standard-filename (filename)
   "Convert a standard file's name to something suitable for the current OS.
-This function's standard definition is trivial; it just returns the argument.
-However, on some systems, the function is redefined with a definition
-that really does change some file names to canonicalize certain
-patterns and to guarantee valid names."
+This means to guarantee valid names and perhaps to canonicalize
+certain patterns.
+
+This function's standard definition is trivial; it just returns
+the argument.  However, on Windows and DOS, replace invalid
+characters.  On DOS, make sure to obey the 8.3 limitations.  On
+Windows, turn Cygwin names into native names, and also turn
+slashes into backslashes if the shell requires it (see
+`w32-shell-dos-semantics')."
   filename)
 
 (defun read-directory-name (prompt &optional dir default-dirname mustmatch initial)
@@ -642,9 +647,10 @@ This is an interface to the function `load'."
 
 (defun file-remote-p (file)
   "Test whether FILE specifies a location on a remote system."
-  (let ((handler (find-file-name-handler file 'file-local-copy)))
+  (let ((handler (find-file-name-handler file 'file-remote-p)))
     (if handler
-        (get handler 'file-remote-p))))
+        (funcall handler 'file-remote-p file)
+      nil)))
 
 (defun file-local-copy (file)
   "Copy the file FILE into a temporary file on this machine.
@@ -905,8 +911,11 @@ but the visited file name is available through the minibuffer history:
 type M-n to pull it into the minibuffer.
 
 Interactively, or if WILDCARDS is non-nil in a call from Lisp,
-expand wildcards (if any) and visit multiple files.  Wildcard expansion
-can be suppressed by setting `find-file-wildcards'."
+expand wildcards (if any) and visit multiple files.  You can
+suppress wildcard expansion by setting `find-file-wildcards'.
+
+To visit a file without any kind of conversion and without
+automatically choosing a major mode, use \\[find-file-literally]."
   (interactive
    (find-file-read-args "Find file: " nil))
   (let ((value (find-file-noselect filename nil nil wildcards)))
@@ -2903,10 +2912,8 @@ on a DOS/Windows machine, it returns FILENAME on expanded form."
           (file-name-as-directory (expand-file-name (or directory
                                                         default-directory))))
     (setq filename (expand-file-name filename))
-    (let ((hf (find-file-name-handler filename 'file-local-copy))
-          (hd (find-file-name-handler directory 'file-local-copy)))
-      (when (and hf (not (get hf 'file-remote-p))) (setq hf nil))
-      (when (and hd (not (get hd 'file-remote-p))) (setq hd nil))
+    (let ((hf (find-file-name-handler filename 'file-remote-p))
+          (hd (find-file-name-handler directory 'file-remote-p)))
       (if ;; Conditions for separate trees
           (or
            ;; Test for different drives on DOS/Windows
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 96caba543c7..89e403f7502 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1910,6 +1910,7 @@ This function could be MATCHER in a MATCH-ANCHORED `font-lock-keywords' item."
                     "proclaim" "declaim" "declare" "symbol-macrolet"
                     "lexical-let" "lexical-let*" "flet" "labels" "compiler-let"
                     "destructuring-bind" "macrolet" "tagbody" "block"
+                    "multiple-value-bind"
                     "return" "return-from"
                     "with-accessors" "with-compilation-unit"
                     "with-condition-restarts" "with-hash-table-iterator"
diff --git a/lisp/imenu.el b/lisp/imenu.el
index 42f50fba3a4..e0b57440fd8 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -890,6 +890,7 @@ Returns t for rescan and otherwise a position number."
       (setq name (completing-read prompt
                                   prepared-index-alist
                                   nil t nil 'imenu--history-list name)))
+
     (cond ((not (stringp name)) nil)
           ((string= name (car imenu--rescan-item)) t)
           (t
@@ -1015,7 +1016,10 @@ This value becomes local in every buffer when it is set.")
   (if (equal item imenu--rescan-item)
       (progn
         (imenu--cleanup)
+        ;; Make sure imenu-update-menubar redoes everything.
+        (setq imenu-menubar-modified-tick -1)
         (setq imenu--index-alist nil)
+        (setq imenu--last-menubar-index-alist nil)
         (imenu-update-menubar)
         t)
     (imenu item)
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 8e1068a5bed..09448e87329 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -4116,6 +4116,9 @@ directory, so that Emacs will know its current contents."
                                        (format "Getting %s" fn1))
           tmp1))))
 
+(defun ange-ftp-file-remote-p (file)
+  (when (ange-ftp-ftp-name file) t))
+
 (defun ange-ftp-load (file &optional noerror nomessage nosuffix)
   (if (ange-ftp-ftp-name file)
       (let ((tryfiles (if nosuffix
@@ -4257,9 +4260,6 @@ NEWNAME should be the name to give the new compressed or uncompressed file.")
   (let ((fn (get operation 'ange-ftp)))
     (if fn (save-match-data (apply fn args))
       (ange-ftp-run-real-handler operation args))))
-;;;###autoload
-;;; These file names are remote file names.
-(put 'ange-ftp-hook-function 'file-remote-p t)
 
 ;; The following code is commented out because Tramp now deals with
 ;; Ange-FTP filenames, too.
@@ -4327,6 +4327,7 @@ NEWNAME should be the name to give the new compressed or uncompressed file.")
 (put 'file-name-completion 'ange-ftp 'ange-ftp-file-name-completion)
 (put 'insert-directory 'ange-ftp 'ange-ftp-insert-directory)
 (put 'file-local-copy 'ange-ftp 'ange-ftp-file-local-copy)
+(put 'file-remote-p 'ange-ftp 'ange-ftp-file-remote-p)
 (put 'unhandled-file-name-directory 'ange-ftp
      'ange-ftp-unhandled-file-name-directory)
 (put 'file-name-sans-versions 'ange-ftp 'ange-ftp-file-name-sans-versions)
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index e98b3d815ab..1dbd97f0073 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -578,11 +578,12 @@ down (this *won't* always work)."
 (defun browse-url-interactive-arg (prompt)
   "Read a URL from the minibuffer, prompting with PROMPT.
 If `transient-mark-mode' is non-nil and the mark is active,
-defaults to the current region, else to the URL at or before
-point.  If invoked with a mouse button, set point to the
-position clicked first.  Return a list for use in `interactive'
-containing the URL and `browse-url-new-window-flag' or its
-negation if a prefix argument was given."
+it defaults to the current region, else to the URL at or before
+point.  If invoked with a mouse button, it moves point to the
+position clicked before acting.
+
+This function returns a list (URL NEW-WINDOW-FLAG)
+for use in `interactive'."
   (let ((event (elt (this-command-keys) 0)))
     (and (listp event) (mouse-set-point event)))
   (list (read-string prompt (or (and transient-mark-mode mark-active
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index 781814a9d55..cca01d169b6 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -144,6 +144,7 @@ This variable is local to each buffer.")
     (file-executable-p . tramp-smb-handle-file-exists-p)
     (file-exists-p . tramp-smb-handle-file-exists-p)
     (file-local-copy . tramp-smb-handle-file-local-copy)
+    (file-remote-p . tramp-handle-file-remote-p)
     (file-modes . tramp-handle-file-modes)
     (file-name-all-completions . tramp-smb-handle-file-name-all-completions)
     ;; `file-name-as-directory' performed by default handler
@@ -1003,7 +1004,7 @@ Domain names in USER and port numbers in HOST are acknowledged."
                        tramp-smb-program args)))
 
         (tramp-message 9 "Started process %s" (process-command p))
-        (process-kill-without-query p)
+        (tramp-set-process-query-on-exit-flag p nil)
         (set-buffer buffer)
         (setq tramp-smb-share share)
 
diff --git a/lisp/net/tramp-uu.el b/lisp/net/tramp-uu.el
index 1047e62a3cb..d18af101c48 100644
--- a/lisp/net/tramp-uu.el
+++ b/lisp/net/tramp-uu.el
@@ -1,7 +1,7 @@
 ;;; -*- coding: iso-2022-7bit; -*-
 ;;; tramp-uu.el --- uuencode in Lisp
 
-;; Copyright (C) 2002  Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 ;; Author: Kai Gro,A_(Bjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 ;; Keywords: comm, terminals
@@ -63,10 +63,10 @@
         (setq c (char-after (point)))
         (delete-char 1)
         (if (equal c ?=)
-            ;; "=" means padding.  Insert "`" instead.
-            (insert "`")
-          (insert (tramp-uu-byte-to-uu-char (tramp-uu-b64-char-to-byte c))))
-        (setq i (1+ i))
+            ;; "=" means padding.  Insert "`" instead.  Not counted for length.
+            (progn (insert "`") (setq len (1- len)))
+          (insert (tramp-uu-byte-to-uu-char (tramp-uu-b64-char-to-byte c)))
+          (setq i (1+ i)))
         ;; Every 60 characters, add "M" at beginning of line (as
         ;; length byte) and insert a newline.
         (when (zerop (% i 60))
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 0fd955b27bc..769ad3f51f6 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -911,12 +911,13 @@ The answer will be provided by `tramp-action-terminal', which see."
   :group 'tramp
   :type 'regexp)
 
-(defcustom tramp-out-of-band-prompt-regexp
+(defcustom tramp-process-alive-regexp
   ""
-  "Regular expression indicating an out-of-band copy has finished.
+  "Regular expression indicating a process has finished.
 In fact this expression is empty by intention, it will be used only to
 check regularly the status of the associated process.
-The answer will be provided by `tramp-action-out-of-band', which see."
+The answer will be provided by `tramp-action-process-alive' and
+`tramp-action-out-of-band', which see."
   :group 'tramp
   :type 'regexp)
 
@@ -1146,7 +1147,7 @@ Also see `tramp-file-name-structure'."
 
 ;;;###autoload
 (defconst tramp-completion-file-name-regexp-unified
-  "^/[^/]*$"
+  "^/$\\|^/[^/:][^/]*$"
   "Value for `tramp-completion-file-name-regexp' for unified remoting.
 Emacs (not XEmacs) uses a unified filename syntax for Ange-FTP and
 Tramp.  See `tramp-file-name-structure-unified' for more explanations.")
@@ -1288,7 +1289,8 @@ but it might be slow on large directories."
     (tramp-wrong-passwd-regexp tramp-action-permission-denied)
     (tramp-yesno-prompt-regexp tramp-action-yesno)
     (tramp-yn-prompt-regexp tramp-action-yn)
-    (tramp-terminal-prompt-regexp tramp-action-terminal))
+    (tramp-terminal-prompt-regexp tramp-action-terminal)
+    (tramp-process-alive-regexp tramp-action-process-alive))
   "List of pattern/action pairs.
 Whenever a pattern matches, the corresponding action is performed.
 Each item looks like (PATTERN ACTION).
@@ -1306,7 +1308,7 @@ corresponding PATTERN matches, the ACTION function is called."
 (defcustom tramp-actions-copy-out-of-band
   '((tramp-password-prompt-regexp tramp-action-password)
     (tramp-wrong-passwd-regexp tramp-action-permission-denied)
-    (tramp-out-of-band-prompt-regexp tramp-action-out-of-band))
+    (tramp-process-alive-regexp tramp-action-out-of-band))
   "List of pattern/action pairs.
 This list is used for copying/renaming with out-of-band methods.
 See `tramp-actions-before-shell' for more info."
@@ -1318,7 +1320,8 @@ See `tramp-actions-before-shell' for more info."
     (tramp-login-prompt-regexp tramp-multi-action-login)
     (shell-prompt-pattern tramp-multi-action-succeed)
     (tramp-shell-prompt-pattern tramp-multi-action-succeed)
-    (tramp-wrong-passwd-regexp tramp-multi-action-permission-denied))
+    (tramp-wrong-passwd-regexp tramp-multi-action-permission-denied)
+    (tramp-process-alive-regexp tramp-action-process-alive))
   "List of pattern/action pairs.
 This list is used for each hop in multi-hop connections.
 See `tramp-actions-before-shell' for more info."
@@ -1326,7 +1329,8 @@ See `tramp-actions-before-shell' for more info."
   :type '(repeat (list variable function)))
 
 (defcustom tramp-initial-commands
-  '("unset correct"
+  '("unset HISTORY"
+    "unset correct"
     "unset autocorrect")
   "List of commands to send to the first remote shell that we see.
 These commands will be sent to any shell, and thus they should be
@@ -1768,6 +1772,7 @@ on the FILENAME argument, even if VISIT was a string.")
     (insert-directory . tramp-handle-insert-directory)
     (expand-file-name . tramp-handle-expand-file-name)
     (file-local-copy . tramp-handle-file-local-copy)
+    (file-remote-p . tramp-handle-file-remote-p)
     (insert-file-contents . tramp-handle-insert-file-contents)
     (write-region . tramp-handle-write-region)
     (find-backup-file-name . tramp-handle-find-backup-file-name)
@@ -1880,6 +1885,16 @@ If VAR is nil, then we bind `v' to the structure and `multi-method',
 ;; To be activated for debugging containing this macro
 (def-edebug-spec with-parsed-tramp-file-name t)
 
+(defmacro tramp-let-maybe (variable value &rest body)
+  "Let-bind VARIABLE to VALUE in BODY, but only if VARIABLE is not obsolete.
+BODY is executed whether or not the variable is obsolete.
+The intent is to protect against `obsolete variable' warnings."
+  `(if (get ',variable 'byte-obsolete-variable)
+       (progn ,@body)
+     (let ((,variable ,value))
+       ,@body)))
+(put 'tramp-let-maybe 'lisp-indent-function 2)
+
 ;;; Config Manipulation Functions:
 
 (defun tramp-set-completion-function (method function-list)
@@ -2042,8 +2057,8 @@ target of the symlink differ."
   "Like `file-truename' for tramp files."
   (with-parsed-tramp-file-name filename nil
     (let* ((steps        (tramp-split-string localname "/"))
-           (localnamedir (let ((directory-sep-char ?/))
-                      (file-name-as-directory localname)))
+           (localnamedir (tramp-let-maybe directory-sep-char ?/ ;for XEmacs
+                           (file-name-as-directory localname)))
            (is-dir (string= localname localnamedir))
            (thisstep nil)
            (numchase 0)
@@ -2984,7 +2999,7 @@ be a local filename.  The method used must be an out-of-band method."
       ;; Use rcp-like program for file transfer.
       (let ((p (apply 'start-process (buffer-name trampbuf) trampbuf
                       copy-program copy-args)))
-        (process-kill-without-query p)
+        (tramp-set-process-query-on-exit-flag p nil)
         (tramp-process-actions p multi-method method user host
                                tramp-actions-copy-out-of-band))
       (kill-buffer trampbuf)
@@ -3297,7 +3312,7 @@ the result will be a local, non-Tramp, filename."
         ;; expand-file-name (this does "/./" and "/../").  We bind
         ;; directory-sep-char here for XEmacs on Windows, which
         ;; would otherwise use backslash.
-        (let ((directory-sep-char ?/))
+        (tramp-let-maybe directory-sep-char ?/
           (tramp-make-tramp-file-name
            multi-method (or method (tramp-find-default-method user host))
            user host
@@ -3525,6 +3540,9 @@ This will break if COMMAND prints a newline, followed by the value of
             (t (error "Wrong method specification for `%s'" method)))
       tmpfil)))
 
+(defun tramp-handle-file-remote-p (filename)
+  "Like `file-remote-p' for tramp files."
+  (when (tramp-tramp-file-p filename) t))
 
 (defun tramp-handle-insert-file-contents
   (filename &optional visit beg end replace)
@@ -3845,10 +3863,10 @@ pass to the OPERATION."
 
 ;; We handle here all file primitives.  Most of them have the file
 ;; name as first parameter; nevertheless we check for them explicitly
-;; in order to be be signalled if a new primitive appears.  This
+;; in order to be signalled if a new primitive appears.  This
 ;; scenario is needed because there isn't a way to decide by
 ;; syntactical means whether a foreign method must be called.  It would
-;; ease the live if `file-name-handler-alist' would support a decision
+;; ease the life if `file-name-handler-alist' would support a decision
 ;; function as well but regexp only.
 (defun tramp-file-name-for-operation (operation &rest args)
   "Return file name related to OPERATION file primitive.
@@ -3862,16 +3880,16 @@ ARGS are the arguments OPERATION has been called with."
                   'dired-compress-file 'dired-uncache
                   'file-accessible-directory-p 'file-attributes
                   'file-directory-p 'file-executable-p 'file-exists-p
-                  'file-local-copy 'file-modes 'file-name-as-directory
-                  'file-name-directory 'file-name-nondirectory
-                  'file-name-sans-versions 'file-ownership-preserved-p
-                  'file-readable-p 'file-regular-p 'file-symlink-p
-                  'file-truename 'file-writable-p 'find-backup-file-name
-                  'find-file-noselect 'get-file-buffer 'insert-directory
-                  'insert-file-contents 'load 'make-directory
-                  'make-directory-internal 'set-file-modes
-                  'substitute-in-file-name 'unhandled-file-name-directory
-                  'vc-registered
+                  'file-local-copy 'file-remote-p 'file-modes
+                  'file-name-as-directory 'file-name-directory
+                  'file-name-nondirectory 'file-name-sans-versions
+                  'file-ownership-preserved-p 'file-readable-p
+                  'file-regular-p 'file-symlink-p 'file-truename
+                  'file-writable-p 'find-backup-file-name 'find-file-noselect
+                  'get-file-buffer 'insert-directory 'insert-file-contents
+                  'load 'make-directory 'make-directory-internal
+                  'set-file-modes 'substitute-in-file-name
+                  'unhandled-file-name-directory 'vc-registered
                   ; XEmacs only
                   'abbreviate-file-name 'create-file-buffer
                   'dired-file-modtime 'dired-make-compressed-filename
@@ -3940,9 +3958,6 @@ Falls back to normal file name handler if no tramp file name handler exists."
        (foreign (apply foreign operation args))
        (t (tramp-run-real-handler operation args))))))
 
-;;;###autoload
-(put 'tramp-file-name-handler 'file-remote-p t) ;for file-remote-p
-
 (defun tramp-sh-file-name-handler (operation &rest args)
   "Invoke remote-shell Tramp file name handler.
 Fall back to normal file name handler if no Tramp handler exists."
@@ -4887,16 +4902,16 @@ otherwise."
   "Checks whether the given `ls' executable in one of the dirs groks `-n'.
 Returns nil if none was found, else the command is returned."
   (let ((dl dirlist)
-        (result nil)
-        (directory-sep-char ?/))        ;for XEmacs
-    ;; It would be better to use the CL function `find', but
-    ;; we don't want run-time dependencies on CL.
-    (while (and dl (not result))
-      (let ((x (concat (file-name-as-directory (car dl)) cmd)))
-        (when (tramp-check-ls-command multi-method method user host x)
-          (setq result x)))
-      (setq dl (cdr dl)))
-    result))
+        (result nil))
+    (tramp-let-maybe directory-sep-char ?/ ;for XEmacs
+      ;; It would be better to use the CL function `find', but
+      ;; we don't want run-time dependencies on CL.
+      (while (and dl (not result))
+        (let ((x (concat (file-name-as-directory (car dl)) cmd)))
+          (when (tramp-check-ls-command multi-method method user host x)
+            (setq result x)))
+        (setq dl (cdr dl)))
+      result)))
 
 (defun tramp-find-ls-command (multi-method method user host)
   "Finds an `ls' command which groks the `-n' option, returning nil if failed.
@@ -4976,6 +4991,11 @@ The terminal type can be configured with `tramp-terminal-type'."
   (process-send-string nil (concat tramp-terminal-type
                                    tramp-rsh-end-of-line)))
 
+(defun tramp-action-process-alive (p multi-method method user host)
+  "Check whether a process has finished."
+  (unless (memq (process-status p) '(run open))
+    (throw 'tramp-action 'process-died)))
+
 (defun tramp-action-out-of-band (p multi-method method user host)
   "Check whether an out-of-band copy has finished."
   (cond ((and (memq (process-status p) '(stop exit))
@@ -5165,7 +5185,7 @@ Maybe the different regular expressions need to be tuned.
                         user host 'tramp-login-args)))
              (found nil)
              (pw nil))
-        (process-kill-without-query p)
+        (tramp-set-process-query-on-exit-flag p nil)
         (set-buffer (tramp-get-buffer multi-method method user host))
         (erase-buffer)
         (tramp-process-actions p multi-method method user host
@@ -5232,7 +5252,7 @@ arguments, and xx will be used as the host name to connect to.
                   (apply #'start-process bufnam buf login-program 
                          host login-args)))
              (found nil))
-        (process-kill-without-query p)
+        (tramp-set-process-query-on-exit-flag p nil)
 
         (set-buffer buf)
         (tramp-process-actions p multi-method method user host
@@ -5293,7 +5313,7 @@ prompt than you do, so it is not at all unlikely that the variable
                          user host 'tramp-login-args))))
              (found nil)
              (pw nil))
-        (process-kill-without-query p)
+        (tramp-set-process-query-on-exit-flag p nil)
         (set-buffer (tramp-get-buffer multi-method method user host))
         (tramp-process-actions p multi-method method user host
                                tramp-actions-before-shell)
@@ -5346,7 +5366,7 @@ log in as u2 to h2."
                                tramp-multi-sh-program))
              (num-hops (length method))
              (i 0))
-        (process-kill-without-query p)
+        (tramp-set-process-query-on-exit-flag p nil)
         (tramp-message 9 "Waiting 60s for local shell to come up...")
         (unless (tramp-wait-for-regexp
                  p 60 (format "\\(%s\\)\\'\\|\\(%s\\)\\'"
@@ -5466,12 +5486,16 @@ nil."
              (with-timeout (timeout)
                (while (not found)
                  (accept-process-output proc 1)
+                 (unless (memq (process-status proc) '(run open))
+                   (error "Process has died"))
                  (goto-char (point-min))
                  (setq found (when (re-search-forward regexp nil t)
                                (tramp-match-string-list)))))))
           (t
            (while (not found)
              (accept-process-output proc 1)
+             (unless (memq (process-status proc) '(run open))
+               (error "Process has died"))
              (goto-char (point-min))
              (setq found (when (re-search-forward regexp nil t)
                            (tramp-match-string-list))))))
@@ -5526,7 +5550,7 @@ Uses PROMPT as a prompt and sends the password to process P."
 
 ;; HHH: Not Changed.  This might handle the case where USER is not
 ;;      given in the "File name" very poorly.  Then, the local
-;;      variable tramp-current user will be set to nil.
+;;      variable tramp-current-user will be set to nil.
 (defun tramp-pre-connection (multi-method method user host)
   "Do some setup before actually logging in.
 METHOD, USER and HOST specify the connection."
@@ -5621,9 +5645,10 @@ to set up.  METHOD, USER and HOST specify the connection."
                                      "stty -onlcr"))))
   (erase-buffer)
   (tramp-message
-   9 "Waiting 30s for `HISTFILE=$HOME/.tramp_history; HISTSIZE=1'")
-  (tramp-send-command-internal multi-method method user host
-                               "HISTFILE=$HOME/.tramp_history; HISTSIZE=1")
+   9 "Waiting 30s for `HISTFILE=$HOME/.tramp_history; HISTSIZE=1; export HISTFILE; export HISTSIZE'")
+  (tramp-send-command-internal
+   multi-method method user host
+   "HISTFILE=$HOME/.tramp_history; HISTSIZE=1; export HISTFILE; export HISTSIZE")
   (erase-buffer)
   (tramp-message 9 "Waiting 30s for `set +o vi +o emacs'")
   (tramp-send-command-internal multi-method method user host
@@ -6079,12 +6104,16 @@ Sends COMMAND, then waits 30 seconds for shell prompt."
                (with-timeout (timeout)
                  (while (not found)
                    (accept-process-output proc 1)
+                   (unless (memq (process-status proc) '(run open))
+                     (error "Process has died"))
                    (goto-char (point-max))
                    (forward-line -1)
                    (setq found (looking-at end-of-output))))))
             (t
              (while (not found)
                (accept-process-output proc 1)
+               (unless (memq (process-status proc) '(run open))
+                 (error "Process has died"))
                (goto-char (point-max))
                (forward-line -1)
                (setq found (looking-at end-of-output))))))
@@ -6762,6 +6791,16 @@ If you want to use it for something else, you'll have to check whether
 it does the right thing."
   (delete "" (split-string string pattern)))
 
+(defun tramp-set-process-query-on-exit-flag (process flag)
+  "Specify if query is needed for process when Emacs is exited.
+If the second argument flag is non-nil, Emacs will query the user before
+exiting if process is running."
+  (if (fboundp 'set-process-query-on-exit-flag)
+      (set-process-query-on-exit-flag process flag)
+    (funcall (symbol-function 'process-kill-without-query)
+             process flag)))
+
+
 ;; ------------------------------------------------------------ 
 ;; -- Kludges section -- 
 ;; ------------------------------------------------------------ 
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 6fce273f6ee..2f267787707 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -40,8 +40,15 @@
 ;; Kingdon and uses GDB's annotation interface. You don't need to know about
 ;; annotations to use this mode as a debugger, but if you are interested
 ;; developing the mode itself, then see the Annotations section in the GDB
-;; info manual. Some GDB/MI commands are also used through th CLI command
-;; 'interpreter mi <mi-command>'.
+;; info manual. 
+;;
+;; GDB developers plan to make the annotation interface obsolete. A new
+;; interface called GDB/MI (machine interface) has been designed to replace
+;; it. Some GDB/MI commands are used in this file through the CLI command
+;; 'interpreter mi <mi-command>'. A file called gdb-mi.el is included in the
+;; GDB repository for future releases (6.2 onwards) that uses GDB/MI as the
+;; primary interface to GDB. It is still under development and is part of a
+;; process to migrate Emacs from annotations to GDB/MI.
 ;;
 ;; Known Bugs:
 ;;
@@ -53,7 +60,7 @@
 (defvar gdb-current-address "main" "Initialisation for Assembler buffer.")
 (defvar gdb-previous-address nil)
 (defvar gdb-previous-frame nil)
-(defvar gdb-current-frame "main")
+(defvar gdb-current-frame nil)
 (defvar gdb-current-language nil)
 (defvar gdb-view-source t "Non-nil means that source code can be viewed.")
 (defvar gdb-selected-view 'source "Code type that user wishes to view.")
@@ -175,7 +182,7 @@ detailed description of this mode.
   (setq gdb-current-address "main")
   (setq gdb-previous-address nil)
   (setq gdb-previous-frame nil)
-  (setq gdb-current-frame "main")
+  (setq gdb-current-frame nil)
   (setq gdb-view-source t)
   (setq gdb-selected-view 'source)
   (setq gdb-var-list nil)
@@ -214,7 +221,7 @@ speedbar."
   (require 'tooltip)
   (let ((expr (tooltip-identifier-from-point (point))))
     (if (and (string-equal gdb-current-language "c")
-             gdb-use-colon-colon-notation)
+             gdb-use-colon-colon-notation gdb-current-frame)
         (setq expr (concat gdb-current-frame "::" expr)))
     (catch 'already-watched
       (dolist (var gdb-var-list)
@@ -1219,8 +1226,10 @@ static char *magick[] = {
   (interactive)
   (save-excursion
     (beginning-of-line 1)
-    (re-search-forward "in\\s-+\\S-+\\s-+at\\s-+" nil t)
-    (looking-at "\\(\\S-*\\):\\([0-9]+\\)"))
+    (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdbmi))
+        (looking-at "[0-9]*\\s-*\\S-*\\s-*\\S-*\\s-*.\\s-*\\S-*\\s-*\\(\\S-*\\):\\([0-9]+\\)")
+      (re-search-forward "in\\s-+\\S-+\\s-+at\\s-+" nil t)
+      (looking-at "\\(\\S-*\\):\\([0-9]+\\)")))
   (if (match-string 2)
       (let ((line (match-string 2))
             (file (match-string 1)))
@@ -1311,7 +1320,7 @@ static char *magick[] = {
 
 (defun gdb-get-frame-number ()
   (save-excursion
-    (let* ((pos (re-search-backward "^#\\([0-9]*\\)" nil t))
+    (let* ((pos (re-search-backward "^#*\\([0-9]*\\)" nil t))
            (n (or (and pos (match-string-no-properties 1)) "0")))
       n)))
 
@@ -1502,7 +1511,7 @@ static char *magick[] = {
 
 \\{gdb-locals-mode-map}"
   (setq major-mode 'gdb-locals-mode)
-  (setq mode-name "Locals")
+  (setq mode-name (concat "Locals:" gdb-current-frame))
   (setq buffer-read-only t)
   (use-local-map gdb-locals-mode-map)
   (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
@@ -1999,6 +2008,9 @@ BUFFER nil or omitted means use the current buffer."
     (if (looking-at ".*=\\s-+0x\\(\\S-*\\)\\s-+in\\s-+\\(\\S-*?\\);? ")
         (progn
           (setq gdb-current-frame (match-string 2))
+          (if (gdb-get-buffer 'gdb-locals-buffer)
+              (with-current-buffer (gdb-get-buffer 'gdb-locals-buffer)
+                (setq mode-name (concat "Locals:" gdb-current-frame))))
           (let ((address (match-string 1)))
             ;; remove leading 0s from output of info frame command.
             (if (string-match "^0+\\(.*\\)" address)
diff --git a/lisp/replace.el b/lisp/replace.el
index e14e1314352..f7afcd594cf 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -36,9 +36,11 @@
 
 (defvar query-replace-history nil)
 
-(defvar query-replace-interactive nil
+(defcustom query-replace-interactive nil
   "Non-nil means `query-replace' uses the last search string.
-That becomes the \"string to replace\".")
+That becomes the \"string to replace\"."
+  :type 'boolean
+  :group 'matching)
 
 (defcustom query-replace-from-history-variable 'query-replace-history
   "History list to use for the FROM argument of `query-replace' commands.
diff --git a/lisp/subr.el b/lisp/subr.el
index 59620d1bb7e..cd52efcebde 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1796,10 +1796,21 @@ The value returned is the value of the last form in BODY.
 This does not alter the buffer list ordering.
 See also `with-temp-buffer'."
   (declare (indent 1) (debug t))
-  `(let ((save-selected-window-window (selected-window)))
+  ;; Most of this code is a copy of save-selected-window.
+  `(let ((save-selected-window-window (selected-window))
+         ;; It is necessary to save all of these, because calling
+         ;; select-window changes frame-selected-window for whatever
+         ;; frame that window is in.
+         (save-selected-window-alist
+          (mapcar (lambda (frame) (list frame (frame-selected-window frame)))
+                  (frame-list))))
      (unwind-protect
          (progn (select-window ,window 'norecord)
                 ,@body)
+       (dolist (elt save-selected-window-alist)
+         (and (frame-live-p (car elt))
+              (window-live-p (cadr elt))
+              (set-frame-selected-window (car elt) (cadr elt))))
        (if (window-live-p save-selected-window-window)
            (select-window save-selected-window-window 'norecord)))))
 
diff --git a/lisp/thumbs.el b/lisp/thumbs.el
index 206492dee08..1fbf2d224a2 100644
--- a/lisp/thumbs.el
+++ b/lisp/thumbs.el
@@ -1,15 +1,10 @@
 ;;; thumbs.el --- Thumbnails previewer for images files
-;;;
+
+;; Copyright 2004 Free Software Foundation, Inc
+
 ;; Author: Jean-Philippe Theberge <jphiltheberge@videotron.ca>
-;;
-;; Thanks: Alex Schroeder <alex@gnu.org> for maintaining the package at some time
-;;         The peoples at #emacs@freenode.net for numerous help
-;;         RMS for emacs and the GNU project.
-;;
 ;; Keywords: Multimedia
 
-(defconst thumbs-version "2.0")
-
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
@@ -26,6 +21,11 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
+;;              
+;; Thanks: Alex Schroeder <alex@gnu.org> for maintaining the package at some time
+;;         The peoples at #emacs@freenode.net for numerous help
+;;         RMS for emacs and the GNU project.
+;;
 
 ;;; Commentary:
 
@@ -56,19 +56,8 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'cl))
 (require 'dired)
 
-;; Abort if in-line imaging isn't supported (i.e. Emacs-20.7)
-
-(when (not (display-images-p))
-  (error "Your Emacs version (%S) doesn't support in-line images,
-was not compiled with image support or is run in console mode.
-Upgrade to Emacs 21.1 or newer, compile it with image support
-or use a window-system"
-         emacs-version))
-
 ;; CUSTOMIZATIONS
 
 (defgroup thumbs nil
@@ -212,9 +201,9 @@ reached."
          (dirsize (apply '+ (mapcar (lambda (x) (cadr x)) filesL))))
     (while (> dirsize thumbs-thumbsdir-max-size)
       (progn
-        (message "Deleting file %s" (caddar filesL)))
-      (delete-file (caddar filesL))
-      (setq dirsize (- dirsize (cadar filesL)))
+        (message "Deleting file %s" (cadr (cdar filesL))))
+      (delete-file (cadr (cdar filesL)))
+      (setq dirsize (- dirsize (car (cdar filesL))))
       (setq filesL (cdr filesL)))))
 
 ;; Check the thumbsnail directory size and clean it if necessary.
@@ -272,11 +261,12 @@ if INCREMENT is set, make the image bigger, else smaller.
 Or, alternatively, a SIZE may be specified."
   (interactive)
   ;; cleaning of old temp file
-  (ignore-errors
+  (condition-case nil
     (apply 'delete-file
            (directory-files
             thumbs-temp-dir t
-            thumbs-temp-prefix)))
+            thumbs-temp-prefix))
+    (error nil))
   (let ((buffer-read-only nil)
         (x (if size
                size
@@ -309,22 +299,10 @@ Or, alternatively, a SIZE may be specified."
   (interactive)
   (thumbs-resize-image t))
 
-(defun thumbs-subst-char-in-string (orig rep string)
-  "Replace occurrences of character ORIG with character REP in STRING.
-Return the resulting (new) string.  -- (defun borowed to Dave Love)"
-  (let ((string (copy-sequence string))
-        (l (length string))
-        (i 0))
-    (while (< i l)
-      (if (= (aref string i) orig)
-          (aset string i rep))
-      (setq i (1+ i)))
-    string))
-
 (defun thumbs-thumbname (img)
   "Return a thumbnail name for the image IMG."
   (concat thumbs-thumbsdir "/"
-          (thumbs-subst-char-in-string
+          (subst-char-in-string
            ?\  ?\_
            (apply
             'concat
@@ -336,7 +314,11 @@ Return the resulting (new) string.  -- (defun borowed to Dave Love)"
   (let* ((fn (expand-file-name img))
          (tn (thumbs-thumbname img)))
     (if (or (not (file-exists-p tn))
-            (not (equal (thumbs-file-size tn) thumbs-geometry)))
+            ;;  This is not the right fix, but I don't understand
+            ;;  the external program or why it produces a geometry
+            ;;  unequal to the one requested -- rms.
+;;;         (not (equal (thumbs-file-size tn) thumbs-geometry))
+            )
         (thumbs-call-convert fn tn "sample" thumbs-geometry))
     tn))
 
@@ -380,30 +362,28 @@ if MARKED is non-nil, the image is marked."
   "Insert the thumbnail for IMG at point.
 if MARKED is non-nil, the image is marked"
   (thumbs-insert-image
-   (thumbs-make-thumb img) 'jpeg thumbs-relief marked))
+   (thumbs-make-thumb img) 'jpeg thumbs-relief marked)
+  (put-text-property (1- (point)) (point)
+                     'thumb-image-file img))
 
 (defun thumbs-do-thumbs-insertion (L)
   "Insert all thumbs in list L."
-  (setq thumbs-fileL nil)
   (let ((i 0))
-    (while L
+    (dolist (img L)
+      (thumbs-insert-thumb img
+                           (member img thumbs-markedL))
       (when (= 0 (mod (setq i (1+ i)) thumbs-per-line))
-        (newline))
-      (setq thumbs-fileL (cons (cons (point)
-                                     (car L))
-                               thumbs-fileL))
-      (thumbs-insert-thumb (car L)
-                           (member (car L) thumbs-markedL))
-      (setq L (cdr L)))))
+        (newline)))
+    (unless (bobp) (newline))))
 
 (defun thumbs-show-thumbs-list (L &optional buffer-name same-window)
+  (when (not (display-images-p))
+    (error "Images are not supported in this Emacs session"))
   (funcall (if same-window 'switch-to-buffer 'pop-to-buffer)
            (or buffer-name "*THUMB-View*"))
   (let ((inhibit-read-only t))
     (erase-buffer)
     (thumbs-mode)
-    (make-variable-buffer-local 'thumbs-fileL)
-    (setq thumbs-fileL nil)
     (thumbs-do-thumbs-insertion L)
     (goto-char (point-min))
     (setq thumbs-current-dir default-directory)
@@ -435,8 +415,8 @@ and SAME-WINDOW to show thumbs in the same window."
 ;;;###autoload
 (defalias 'thumbs 'thumbs-show-all-from-dir)
 
-(defun thumbs-find-image (img L &optional num otherwin)
-  (funcall
+(defun thumbs-find-image (img &optional num otherwin)
+  (funcall 
    (if otherwin 'switch-to-buffer-other-window 'switch-to-buffer)
    (concat "*Image: " (file-name-nondirectory img) " - "
            (number-to-string (or num 0)) "*"))
@@ -449,8 +429,6 @@ and SAME-WINDOW to show thumbs in the same window."
     (make-variable-buffer-local 'thumbs-current-tmp-filename)
     (make-variable-buffer-local 'thumbs-current-image-size)
     (make-variable-buffer-local 'thumbs-image-num)
-    (make-variable-buffer-local 'thumbs-fileL)
-    (setq thumbs-fileL L)
     (delete-region (point-min)(point-max))
     (thumbs-insert-image img (thumbs-image-type img) 0)))
 
@@ -458,10 +436,8 @@ and SAME-WINDOW to show thumbs in the same window."
   "Display image IMG for thumbnail at point.
 use another window it OTHERWIN is t."
   (interactive)
-  (let* ((L thumbs-fileL)
-         (n (point))
-         (i (or img (cdr (assoc n L)))))
-    (thumbs-find-image i L n otherwin)))
+  (let* ((i (or img (thumbs-current-image))))
+    (thumbs-find-image i (point) otherwin)))
 
 (defun thumbs-find-image-at-point-other-window ()
   "Display image for thumbnail at point in the preview buffer.
@@ -469,6 +445,12 @@ Open another window."
   (interactive)
   (thumbs-find-image-at-point nil t))
 
+(defun thumbs-mouse-find-image (event)
+  "Display image for thumbnail at mouse click EVENT."
+  (interactive "e")
+  (mouse-set-point event)
+  (thumbs-find-image-at-point))
+
 (defun thumbs-call-setroot-command (img)
   "Call the setroot program for IMG."
   (run-hooks 'thumbs-before-setroot-hook)
@@ -481,7 +463,8 @@ Open another window."
 (defun thumbs-set-image-at-point-to-root-window ()
   "Set the image at point as the desktop wallpaper."
   (interactive)
-  (thumbs-call-setroot-command (cdr (assoc (point) thumbs-fileL))))
+  (thumbs-call-setroot-command
+   (thumbs-current-image)))
 
 (defun thumbs-set-root ()
   "Set the current image as root."
@@ -490,36 +473,102 @@ Open another window."
    (or thumbs-current-tmp-filename
        thumbs-current-image-filename)))
 
+(defun thumbs-file-alist ()
+  "Make an alist of elements (POS . FILENAME) for all images in thumb buffer."
+  (save-excursion
+    (let (list)
+      (goto-char (point-min))
+      (while (not (eobp))
+        (if (thumbs-current-image)
+            (push (cons (point-marker)
+                        (thumbs-current-image))
+                  list))
+        (forward-char 1))
+      list)))
+
+(defun thumbs-file-list ()
+  "Make a list of file names for all images in thumb buffer."
+  (save-excursion
+    (let (list)
+      (goto-char (point-min))
+      (while (not (eobp))
+        (if (thumbs-current-image)
+            (push (thumbs-current-image) list))
+        (forward-char 1))
+      (nreverse list))))
+
 (defun thumbs-delete-images ()
   "Delete the image at point (and it's thumbnail) (or marked files if any)."
   (interactive)
-  (let ((f (or thumbs-markedL (list (cdr (assoc (point) thumbs-fileL))))))
-    (if (yes-or-no-p (format "Really delete %d files? " (length f)))
-        (progn
-          (mapcar (lambda (x)
-                    (setq thumbs-fileL (delete (rassoc x thumbs-fileL) thumbs-fileL))
+  (let ((files (or thumbs-markedL (list (thumbs-current-image)))))
+    (if (yes-or-no-p (format "Really delete %d files? " (length files)))
+        (let ((thumbs-fileL (thumbs-file-alist))
+              (inhibit-read-only t))
+          (dolist (x files)
+            (let (failure)
+              (condition-case ()
+                  (progn
                     (delete-file x)
-                    (delete-file (thumbs-thumbname x))) f)
-          (thumbs-redraw-buffer)))))
+                    (delete-file (thumbs-thumbname x)))
+                (file-error (setq failure t)))
+              (unless failure
+                (when (rassoc x thumbs-fileL)
+                  (goto-char (car (rassoc x thumbs-fileL)))
+                  (delete-region (point) (1+ (point))))
+                (setq thumbs-markedL
+                      (delq x thumbs-markedL)))))))))
+
+(defun thumbs-rename-images (newfile)
+  "Rename the image at point (and it's thumbnail) (or marked files if any)."
+  (interactive "FRename to file or directory: ")
+  (let ((files (or thumbs-markedL (list (thumbs-current-image))))
+        failures)
+    (if (and (not (file-directory-p newfile))
+             thumbs-markedL)
+        (if (file-exists-p newfile)
+            (error "Renaming marked files to file name `%s'" newfile)
+          (make-directory newfile t)))
+    (if (yes-or-no-p (format "Really rename %d files? " (length files)))
+        (let ((thumbs-fileL (thumbs-file-alist))
+              (inhibit-read-only t))
+          (dolist (file files)
+            (let (failure)
+              (condition-case ()
+                  (if (file-directory-p newfile)
+                      (rename-file file
+                                   (expand-file-name
+                                    (file-name-nondirectory file)
+                                    newfile))
+                    (rename-file file newfile))
+                (file-error (setq failure t)
+                            (push file failures)))
+              (unless failure
+                (when (rassoc file thumbs-fileL)
+                  (goto-char (car (rassoc file thumbs-fileL)))
+                  (delete-region (point) (1+ (point))))
+                (setq thumbs-markedL
+                      (delq file thumbs-markedL)))))))
+    (if failures
+        (display-warning 'file-error
+                         (format "Rename failures for %s into %s"
+                                 failures newfile)
+                         :error))))
 
 (defun thumbs-kill-buffer ()
   "Kill the current buffer."
   (interactive)
   (let ((buffer (current-buffer)))
-    (ignore-errors (delete-window (selected-window)))
+    (condition-case nil
+        (delete-window (selected-window))
+      (error nil))
     (kill-buffer buffer)))
 
 (defun thumbs-show-image-num (num)
   "Show the image with number NUM."
-  (let ((inhibit-read-only t))
-    (delete-region (point-min)(point-max))
-    (let ((i (cdr (assoc num thumbs-fileL))))
-      (thumbs-insert-image i (thumbs-image-type i) 0)
-      (sleep-for 2)
-      (rename-buffer (concat "*Image: "
-                             (file-name-nondirectory i)
-                             " - "
-                             (number-to-string num) "*"))
+  (let ((image-buffer (get-buffer-create "*Image*")))
+    (let ((i (thumbs-current-image)))
+      (with-current-buffer image-buffer
+        (thumbs-insert-image i (thumbs-image-type i) 0))
       (setq thumbs-image-num num
             thumbs-current-image-filename i))))
 
@@ -527,40 +576,54 @@ Open another window."
   "Show next image."
   (interactive)
   (let* ((i (1+ thumbs-image-num))
-         (l (caar thumbs-fileL))
-         (num
-          (cond ((assoc i thumbs-fileL) i)
-                ((>= i l) 1)
-                (t (1+ i)))))
-    (thumbs-show-image-num num)))
+         (list (thumbs-file-alist))
+         (l (caar list)))
+    (while (and (/= i thumbs-image-num) (not (assoc i list)))
+      (setq i (if (>= i l) 1 (1+ i))))
+    (thumbs-show-image-num i)))
 
 (defun thumbs-previous-image ()
   "Show the previous image."
   (interactive)
   (let* ((i (- thumbs-image-num 1))
-         (l (caar thumbs-fileL))
-         (num
-          (cond ((assoc i thumbs-fileL) i)
-                ((<= i 1) l)
-                (t (- i 1)))))
-    (thumbs-show-image-num num)))
+         (list (thumbs-file-alist))
+         (l (caar list)))
+    (while (and (/= i thumbs-image-num) (not (assoc i list)))
+      (setq i (if (<= i 1) l (1- i))))
+    (thumbs-show-image-num i)))
 
 (defun thumbs-redraw-buffer ()
   "Redraw the current thumbs buffer."
   (let ((p (point))
-        (inhibit-read-only t))
-    (delete-region (point-min)(point-max))
-    (thumbs-do-thumbs-insertion (reverse (mapcar 'cdr thumbs-fileL)))
-    (goto-char (1+ p))))
+        (inhibit-read-only t)
+        (files (thumbs-file-list)))
+    (erase-buffer)
+    (thumbs-do-thumbs-insertion files)
+    (goto-char p)))
 
 (defun thumbs-mark ()
   "Mark the image at point."
   (interactive)
-  (setq thumbs-markedL (cons (cdr (assoc (point) thumbs-fileL)) thumbs-markedL))
-  (let ((inhibit-read-only t))
-    (delete-char 1)
-    (thumbs-insert-thumb (cdr (assoc (point) thumbs-fileL)) t))
-  (when (eolp)(forward-char)))
+  (let ((elt (thumbs-current-image)))
+    (unless elt
+      (error "No image here"))
+    (push elt thumbs-markedL)
+    (let ((inhibit-read-only t))
+      (delete-char 1)
+      (thumbs-insert-thumb elt t)))
+  (when (eolp) (forward-char)))
+
+(defun thumbs-unmark ()
+  "Unmark the image at point."
+  (interactive)
+  (let ((elt (thumbs-current-image)))
+    (unless elt
+      (error "No image here"))
+    (setq thumbs-markedL (delete elt thumbs-markedL))
+    (let ((inhibit-read-only t))
+      (delete-char 1)
+      (thumbs-insert-thumb elt nil)))
+  (when (eolp) (forward-char)))
 
 ;; Image modification routines
 
@@ -587,8 +650,8 @@ ACTION and ARG should be legal convert command."
 (defun thumbs-emboss-image (emboss)
   "Emboss the image with value EMBOSS."
   (interactive "nEmboss value: ")
-  (if (or (< emboss 3) (> emboss 31) (zerop (logand emboss 1)))
-      (error "Arg must be a odd number between 3 and 31"))
+  (if (or (< emboss 3) (> emboss 31) (zerop (% emboss 2)))
+      (error "Arg must be an odd number between 3 and 31"))
   (thumbs-modify-image "emboss" (number-to-string emboss)))
 
 (defun thumbs-monochrome-image ()
@@ -611,17 +674,24 @@ ACTION and ARG should be legal convert command."
   (interactive)
   (thumbs-modify-image "rotate" "90"))
 
+(defun thumbs-current-image ()
+  "Return the name of the image file name at point."
+  (get-text-property (point) 'thumb-image-file))
+
 (defun thumbs-forward-char ()
   "Move forward one image."
   (interactive)
   (forward-char)
-  (when (eolp)(forward-char))
+  (while (and (not (eobp)) (not (thumbs-current-image)))
+    (forward-char))
   (thumbs-show-name))
 
 (defun thumbs-backward-char ()
   "Move backward one image."
   (interactive)
   (forward-char -1)
+  (while (and (not (bobp)) (not (thumbs-current-image)))
+    (forward-char -1))
   (thumbs-show-name))
 
 (defun thumbs-forward-line ()
@@ -639,15 +709,15 @@ ACTION and ARG should be legal convert command."
 (defun thumbs-show-name ()
   "Show the name of the current file."
   (interactive)
-  (let ((f (cdr (assoc (point) thumbs-fileL))))
-    (message "%s [%s]" f (thumbs-file-size f))))
+  (let ((f (thumbs-current-image)))
+    (and f (message "%s [%s]" f (thumbs-file-size f)))))
 
 (defun thumbs-save-current-image ()
   "Save the current image."
   (interactive)
   (let ((f (or thumbs-current-tmp-filename
                thumbs-current-image-filename))
-        (sa (read-from-minibuffer "save file as: "
+        (sa (read-from-minibuffer "Save image file as: "
                                   thumbs-current-image-filename)))
     (copy-file f sa)))
 
@@ -661,6 +731,7 @@ ACTION and ARG should be legal convert command."
 (defvar thumbs-mode-map
   (let ((map (make-sparse-keymap)))
     (define-key map [return] 'thumbs-find-image-at-point)
+    (define-key map [mouse-2] 'thumbs-mouse-find-image)
     (define-key map [(meta return)] 'thumbs-find-image-at-point-other-window)
     (define-key map [(control return)] 'thumbs-set-image-at-point-to-root-window)
     (define-key map [delete] 'thumbs-delete-images)
@@ -670,15 +741,20 @@ ACTION and ARG should be legal convert command."
     (define-key map [down] 'thumbs-forward-line)
     (define-key map "d" 'thumbs-dired)
     (define-key map "m" 'thumbs-mark)
+    (define-key map "u" 'thumbs-unmark)
+    (define-key map "R" 'thumbs-rename-images)
+    (define-key map "x" 'thumbs-delete-images)
     (define-key map "s" 'thumbs-show-name)
     (define-key map "q" 'thumbs-kill-buffer)
     map)
   "Keymap for `thumbs-mode'.")
 
+(put 'thumbs-mode 'mode-class 'special)
 (define-derived-mode thumbs-mode
   fundamental-mode "thumbs"
   "Preview images in a thumbnails buffer"
   (make-variable-buffer-local 'thumbs-markedL)
+  (setq buffer-read-only t)
   (setq thumbs-markedL nil))
 
 (defvar thumbs-view-image-mode-map
@@ -698,6 +774,7 @@ ACTION and ARG should be legal convert command."
   "Keymap for `thumbs-view-image-mode'.")
 
 ;; thumbs-view-image-mode
+(put 'thumbs-view-image-mode 'mode-class 'special)
 (define-derived-mode thumbs-view-image-mode
   fundamental-mode "image-view-mode")
 
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index 4a485414d7a..86703a3b9b5 100644
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -230,9 +230,13 @@ You should set this to t when using a non-system shell.\n\n"))))
 
 (defun convert-standard-filename (filename)
   "Convert a standard file's name to something suitable for the current OS.
-This function's standard definition is trivial; it just returns the argument.
-However, on some systems, the function is redefined
-with a definition that really does change some file names."
+This means to guarantee valid names and perhaps to canonicalize
+certain patterns.
+
+On Windows and DOS, replace invalid characters.  On DOS, make
+sure to obey the 8.3 limitations.  On Windows, turn Cygwin names
+into native names, and also turn slashes into backslashes if the
+shell requires it (see `w32-shell-dos-semantics')."
   (let ((name
          (save-match-data
            (if (string-match "\\`/cygdrive/\\([a-zA-Z]\\)/" filename)
diff --git a/lisp/window.el b/lisp/window.el
index 2b5a4ab161d..188b3acf311 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -36,6 +36,9 @@ of this construct.
 However, if a window has become dead, don't get an error,
 just refrain from reselecting it."
   `(let ((save-selected-window-window (selected-window))
+         ;; It is necessary to save all of these, because calling
+         ;; select-window changes frame-selected-window for whatever
+         ;; frame that window is in.
          (save-selected-window-alist
           (mapcar (lambda (frame) (list frame (frame-selected-window frame)))
                   (frame-list))))