upstream

37 files changed, 515 insertions, 282 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 57c623df56a..d748c1a967c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,151 @@
+2011-09-19  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-inline-compress-commands): Add "xz".
+        Suggested by Liam Stitt <stittl@cuug.ab.ca>.
+
+2011-09-18  Juri Linkov  <juri@jurta.org>
+
+        * buff-menu.el (Buffer-menu-mode-map):
+        * dired.el (dired-mode-map):
+        * emacs-lisp/lisp-mode.el (emacs-lisp-mode-map)
+        (lisp-interaction-mode-map):
+        * emacs-lisp/package.el (package-menu-mode-map):
+        * epa.el (epa-key-list-mode-map):
+        * menu-bar.el (menu-bar-showhide-tool-bar-menu)
+        (menu-bar-options-menu):
+        * outline.el (outline-mode-menu-bar-map):
+        * vc/vc-bzr.el (vc-bzr-shelve-menu-map, vc-bzr-extra-menu-map):
+        * vc/vc-dir.el (vc-dir-menu-map):
+        * vc/vc-git.el (vc-git-stash-menu-map, vc-git-extra-menu-map):
+        Capitalize non-function content words in menu item strings.
+
+        * dired.el (dired-mode-map): Add menu item for
+        `image-dired-dired-toggle-marked-thumbs'.
+
+2011-09-18  Juri Linkov  <juri@jurta.org>
+
+        * isearch.el (isearch-edit-string): Bind `isearch-new-case-fold'
+        to `isearch-case-fold-search' and restore its original value
+        after the `isearch-mode' call.
+
+2011-09-18  Juri Linkov  <juri@jurta.org>
+
+        * progmodes/grep.el (grep-process-setup): Don't check code for 1
+        because `zgrep' returns 1 for successful matches (bug#9226).
+
+2011-09-18  Juri Linkov  <juri@jurta.org>
+
+        * info.el (Info-extract-menu-node-name): Check the second match
+        for empty string (second test-case of bug#9528).
+        (Info-last-preorder): Let-bind `Info-history' to nil to not add
+        intermediate nodes to the history (first test-case of bug#9528).
+
+2011-09-18  Juri Linkov  <juri@jurta.org>
+
+        * info.el (Info-mode-syntax-table): New variable.
+        (Info-mode): Set `:syntax-table' to `Info-mode-syntax-table'.  (Bug#3312)
+
+2011-09-18  Juri Linkov  <juri@jurta.org>
+
+        * info.el (Info-file-supports-index-cookies): Increment
+        line-beginning-position's arg from 3 to 4 because makeinfo outputs
+        one more line for long file names (bug#4142).
+
+2011-09-18  Chong Yidong  <cyd@stupidchicken.com>
+
+        * newcomment.el (comment-normalize-vars): If prompting for
+        comment-start, set comment-start-skip too (Bug#8424).
+
+2011-09-18  Johan Bockgård  <bojohan@gnu.org>
+
+        * icomplete.el: Fix previous fix of Bug#5849.
+        (icomplete-mode): Don't set completion-show-inline-help.
+        (icomplete-minibuffer-setup): Set completion-show-inline-help
+        locally during icompletion.
+
+2011-09-18  Chong Yidong  <cyd@stupidchicken.com>
+
+        * woman.el (woman2-process-escapes): Don't delete unrecognized
+        escapes (Bug#7843).
+
+        * files.el (inhibit-first-line-modes-regexps): Add image files.
+        (hack-local-variables-prop-line): Return nil for malformed
+        prop-lines (Bug#9044).
+
+2011-09-18  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (top): Don't require 'shell.
+        (tramp-methods): Fix docstring.
+        (tramp-get-remote-tmpdir): New defun, moved from tramp-sh.el.
+        Return complete remote file name.  Handle "smb" case.  Use
+        `tramp-tmpdir', if defined for the respective method.
+        (tramp-make-tramp-temp-file): Adapt call of `tramp-get-remote-tmpdir'.
+
+        * net/tramp-compat.el (top): Require 'shell.
+
+        * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band)
+        (tramp-maybe-open-connection): Use `tramp-file-name-real-host' for
+        `tramp-current-host'.
+        (tramp-get-remote-tmpdir): Remove.
+
+        * net/tramp-smb.el (tramp-methods): Add `tramp-remote-shell' and
+        `tramp-tmpdir' entries.
+        (tramp-smb-errors): Add "NT_STATUS_IMAGE_ALREADY_LOADED".
+        (tramp-smb-handle-file-attributes): Ignore errors.
+        (tramp-smb-wait-for-output): Check also for process end.
+
+2011-09-18  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * mail/smtpmail.el (smtpmail-via-smtp): Ignore errors that arise
+        when sending QUIT (bug#9312).
+
+2011-09-17  Chong Yidong  <cyd@stupidchicken.com>
+
+        * replace.el (occur-mode-map): Rebind occur-edit-mode to "e" (Bug#8463).
+        (occur-edit-mode-map): Bind C-c C-c to occur-cease-edit and C-o to
+        occur-mode-display-occurrence.
+        (occur-edit-mode): Add usage message.
+        (occur-cease-edit): New command.
+        (occur-after-change-function): Use text properties to find the
+        position of the prefix text.
+        (occur-engine): Set stickiness of prefix text properties.
+
+2011-09-17  Glenn Morris  <rgm@gnu.org>
+
+        * progmodes/etags.el (complete-tag):
+        Fix call to completion-in-region.  (Bug#9526)
+
+2011-09-17  Juri Linkov  <juri@jurta.org>
+
+        * textmodes/ispell.el (ispell-word): Add to the error message
+        the word, ispell program name and current dictionary (bug#9121).
+        (ispell-tex-arg-end): Capitalize "error" in the error message.
+
+2011-09-17  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * emacs-lisp/bytecomp.el (byte-compile-lapcode): Fix overflow
+        check.  (Bug#4251)
+
+2011-09-17  Juri Linkov  <juri@jurta.org>
+
+        * window.el (window-safe-min-height, window-safe-min-width):
+        Fix typos (followup to bug#9522).
+
+2011-09-17  Sven Joachim  <svenjoac@gmx.de>
+
+        * window.el (window-min-width, window-state-put): Fix typos (bug#9522).
+
+2011-09-16  Eli Zaretskii  <eliz@gnu.org>
+
+        * simple.el (line-move): If goal-column is set, move by logical
+        lines, not by display lines.  (Bug#971)
+        (next-line, previous-line, goal-column, line-move-visual): Doc fix
+        to reflect the above change.
+
+2011-09-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * image.el (imagemagick-register-types): Use regexp-opt.
+
 2011-09-15  Chong Yidong  <cyd@stupidchicken.com>
 
         * window.el (display-buffer-base-action): Rename from
@@ -13,8 +161,8 @@
         with an older version, remove it.
         (package-menu-mark-delete, package-menu-mark-install)
         (package-menu-mark-unmark): Make unused args optional.
-        (package-menu-mark-obsolete-for-deletion): Use
-        package-menu-get-status instead of a regexp search.
+        (package-menu-mark-obsolete-for-deletion):
+        Use package-menu-get-status instead of a regexp search.
         (package-menu-get-status): Use tabulated-list-entry.
         (package-menu-mark-upgrades): New command.
         (package-menu-mode-map): Bind it to U.  Add it to menu bar.
@@ -296,7 +444,8 @@
 
 2011-09-10  Reuben Thomas  <rrt@sc3d.org>
 
-        * simple.el (count-words-region): Use buffer if there's no region.
+        * simple.el (count-words-region): Use buffer if there's no region
+        (bug#9429).
 
 2011-09-09  Juri Linkov  <juri@jurta.org>
 
diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index d757453c051..291430d4393 100644
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -167,53 +167,53 @@ Auto Revert Mode.")
                  :help ,(purecopy "Refresh the *Buffer List* buffer contents")))
     (define-key menu-map [s0] menu-bar-separator)
     (define-key menu-map [tf]
-      `(menu-item ,(purecopy "Show only file buffers") Buffer-menu-toggle-files-only
+      `(menu-item ,(purecopy "Show Only File Buffers") Buffer-menu-toggle-files-only
                   :button (:toggle . Buffer-menu-files-only)
                   :help ,(purecopy "Toggle whether the current buffer-menu displays only file buffers")))
     (define-key menu-map [s1] menu-bar-separator)
     ;; FIXME: The "Select" entries could use better names...
     (define-key menu-map [sel]
-      `(menu-item ,(purecopy "Select marked") Buffer-menu-select
+      `(menu-item ,(purecopy "Select Marked") Buffer-menu-select
                  :help ,(purecopy "Select this line's buffer; also display buffers marked with `>'")))
     (define-key menu-map [bm2]
-      `(menu-item ,(purecopy "Select two") Buffer-menu-2-window
+      `(menu-item ,(purecopy "Select Two") Buffer-menu-2-window
                  :help ,(purecopy "Select this line's buffer, with previous buffer in second window")))
     (define-key menu-map [bm1]
-      `(menu-item ,(purecopy "Select current") Buffer-menu-1-window
+      `(menu-item ,(purecopy "Select Current") Buffer-menu-1-window
                  :help ,(purecopy "Select this line's buffer, alone, in full frame")))
     (define-key menu-map [ow]
-      `(menu-item ,(purecopy "Select in other window") Buffer-menu-other-window
+      `(menu-item ,(purecopy "Select in Other Window") Buffer-menu-other-window
                  :help ,(purecopy "Select this line's buffer in other window, leaving buffer menu visible")))
     (define-key menu-map [tw]
-      `(menu-item ,(purecopy "Select in current window") Buffer-menu-this-window
+      `(menu-item ,(purecopy "Select in Current Window") Buffer-menu-this-window
                  :help ,(purecopy "Select this line's buffer in this window")))
     (define-key menu-map [s2] menu-bar-separator)
     (define-key menu-map [is]
-      `(menu-item ,(purecopy "Regexp Isearch marked buffers") Buffer-menu-isearch-buffers-regexp
+      `(menu-item ,(purecopy "Regexp Isearch Marked Buffers...") Buffer-menu-isearch-buffers-regexp
                  :help ,(purecopy "Search for a regexp through all marked buffers using Isearch")))
     (define-key menu-map [ir]
-      `(menu-item ,(purecopy "Isearch marked buffers") Buffer-menu-isearch-buffers
+      `(menu-item ,(purecopy "Isearch Marked Buffers...") Buffer-menu-isearch-buffers
                  :help ,(purecopy "Search for a string through all marked buffers using Isearch")))
     (define-key menu-map [s3] menu-bar-separator)
     (define-key menu-map [by]
       `(menu-item ,(purecopy "Bury") Buffer-menu-bury
                  :help ,(purecopy "Bury the buffer listed on this line")))
     (define-key menu-map [vt]
-      `(menu-item ,(purecopy "Set unmodified") Buffer-menu-not-modified
+      `(menu-item ,(purecopy "Set Unmodified") Buffer-menu-not-modified
                  :help ,(purecopy "Mark buffer on this line as unmodified (no changes to save)")))
     (define-key menu-map [ex]
       `(menu-item ,(purecopy "Execute") Buffer-menu-execute
                  :help ,(purecopy "Save and/or delete buffers marked with s or k commands")))
     (define-key menu-map [s4] menu-bar-separator)
     (define-key menu-map [delb]
-      `(menu-item ,(purecopy "Mark for delete and move backwards") Buffer-menu-delete-backwards
+      `(menu-item ,(purecopy "Mark for Delete and Move Backwards") Buffer-menu-delete-backwards
                  :help ,(purecopy "Mark buffer on this line to be deleted by x command and move up one line")))
     (define-key menu-map [del]
-      `(menu-item ,(purecopy "Mark for delete") Buffer-menu-delete
+      `(menu-item ,(purecopy "Mark for Delete") Buffer-menu-delete
                  :help ,(purecopy "Mark buffer on this line to be deleted by x command")))
 
     (define-key menu-map [sv]
-      `(menu-item ,(purecopy "Mark for save") Buffer-menu-save
+      `(menu-item ,(purecopy "Mark for Save") Buffer-menu-save
                  :help ,(purecopy "Mark buffer on this line to be saved by x command")))
     (define-key menu-map [umk]
       `(menu-item ,(purecopy "Unmark") Buffer-menu-unmark
diff --git a/lisp/dired.el b/lisp/dired.el
index f01e195f9ec..60ba14ade84 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1552,6 +1552,10 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST."
       [menu-bar immediate image-dired-dired-display-image]
       '(menu-item "Display Image" image-dired-dired-display-image
                   :help "Display sized image in a separate window"))
+    (define-key map
+      [menu-bar immediate image-dired-dired-toggle-marked-thumbs]
+      '(menu-item "Toggle Image Thumbnails in This Buffer" image-dired-dired-toggle-marked-thumbs
+                  :help "Add or remove image thumbnails in front of marked file names"))
 
     (define-key map [menu-bar immediate revert-buffer]
       '(menu-item "Refresh" revert-buffer
@@ -1708,7 +1712,7 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST."
                   :help "Add image comment to current or marked files"))
     (define-key map
       [menu-bar operate image-dired-display-thumbs]
-      '(menu-item "Display image thumbnails" image-dired-display-thumbs
+      '(menu-item "Display Image Thumbnails" image-dired-display-thumbs
                   :help "Display image thumbnails for current or marked image files"))
 
     (define-key map [menu-bar operate dashes-4]
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 127f93c6858..fae402d4215 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -834,7 +834,7 @@ CONST2 may be evaulated multiple times."
       (setcar (cdr bytes-tail) (logand pc 255))
       (setcar bytes-tail (lsh pc -8))
       ;; FIXME: Replace this by some workaround.
-      (if (> (car bytes) 255) (error "Bytecode overflow")))
+      (if (> (car bytes-tail) 255) (error "Bytecode overflow")))
 
     (apply 'unibyte-string (nreverse bytes))))
 
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index f2bea30ea39..9408c0a3c9d 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -297,7 +297,7 @@ font-lock keywords will not be case sensitive."
       `(menu-item ,(purecopy "Untrace All") untrace-all
                   :help ,(purecopy "Untrace all currently traced functions")))
     (define-key tracing-map [tr-uf]
-      `(menu-item ,(purecopy "Untrace function...") untrace-function
+      `(menu-item ,(purecopy "Untrace Function...") untrace-function
                   :help ,(purecopy "Untrace function, and possibly activate all remaining advice")))
     (define-key tracing-map [tr-sep] menu-bar-separator)
     (define-key tracing-map [tr-q]
@@ -358,7 +358,7 @@ font-lock keywords will not be case sensitive."
       `(menu-item ,(purecopy "Byte-compile and Load") emacs-lisp-byte-compile-and-load
                   :help ,(purecopy "Byte-compile the current file (if it has changed), then load compiled code")))
     (define-key menu-map [byte-compile]
-      `(menu-item ,(purecopy "Byte-compile this File") emacs-lisp-byte-compile
+      `(menu-item ,(purecopy "Byte-compile This File") emacs-lisp-byte-compile
                   :help ,(purecopy "Byte compile the file containing the current buffer")))
     (define-key menu-map [separator-eval] menu-bar-separator)
     (define-key menu-map [ielm]
@@ -509,7 +509,7 @@ if that value is non-nil."
       `(menu-item ,(purecopy "Evaluate Defun") eval-defun
                   :help ,(purecopy "Evaluate the top-level form containing point, or after point")))
     (define-key menu-map [eval-print-last-sexp]
-      `(menu-item ,(purecopy "Evaluate and print") eval-print-last-sexp
+      `(menu-item ,(purecopy "Evaluate and Print") eval-print-last-sexp
                   :help ,(purecopy "Evaluate sexp before point; print value into current buffer")))
     (define-key menu-map [edebug-defun-lisp-interaction]
       `(menu-item ,(purecopy "Instrument Function for Debugging") edebug-defun
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index f0b1537e2b3..4cab8f43480 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1297,30 +1297,30 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages."
       '(menu-item "Unmark" package-menu-mark-unmark
                   :help "Clear any marks on a package and move to the next line"))
     (define-key menu-map [munm]
-      '(menu-item "Unmark backwards" package-menu-backup-unmark
+      '(menu-item "Unmark Backwards" package-menu-backup-unmark
                   :help "Back up one line and clear any marks on that package"))
     (define-key menu-map [md]
-      '(menu-item "Mark for deletion" package-menu-mark-delete
+      '(menu-item "Mark for Deletion" package-menu-mark-delete
                   :help "Mark a package for deletion and move to the next line"))
     (define-key menu-map [mi]
-      '(menu-item "Mark for install" package-menu-mark-install
+      '(menu-item "Mark for Install" package-menu-mark-install
                   :help "Mark a package for installation and move to the next line"))
     (define-key menu-map [mupgrades]
-      '(menu-item "Mark upgradable packages" package-menu-mark-upgrades
+      '(menu-item "Mark Upgradable Packages" package-menu-mark-upgrades
                   :help "Mark packages that have a newer version for upgrading"))
     (define-key menu-map [s3] '("--"))
     (define-key menu-map [mg]
-      '(menu-item "Update package list" revert-buffer
+      '(menu-item "Update Package List" revert-buffer
                   :help "Update the list of packages"))
     (define-key menu-map [mr]
-      '(menu-item "Refresh package list" package-menu-refresh
+      '(menu-item "Refresh Package List" package-menu-refresh
                   :help "Download the ELPA archive"))
     (define-key menu-map [s4] '("--"))
     (define-key menu-map [mt]
-      '(menu-item "Mark obsolete packages" package-menu-mark-obsolete-for-deletion
+      '(menu-item "Mark Obsolete Packages" package-menu-mark-obsolete-for-deletion
                   :help "Mark all obsolete packages for deletion"))
     (define-key menu-map [mx]
-      '(menu-item "Execute actions" package-menu-execute
+      '(menu-item "Execute Actions" package-menu-execute
                   :help "Perform all the marked actions"))
     (define-key menu-map [s5] '("--"))
     (define-key menu-map [mh]
diff --git a/lisp/epa.el b/lisp/epa.el
index f0ec1ece0d1..5164181454a 100644
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -239,7 +239,7 @@ You should bind this variable with `let', but do not set it globally.")
                   :help "Encrypt FILE for RECIPIENTS"))
     (define-key menu-map [separator-epa-key-list] '(menu-item "--"))
     (define-key menu-map [epa-key-list-delete-keys]
-      '(menu-item "Delete keys" epa-delete-keys
+      '(menu-item "Delete Keys" epa-delete-keys
                   :help "Delete Marked Keys"))
     (define-key menu-map [epa-key-list-import-keys]
       '(menu-item "Import Keys" epa-import-keys
diff --git a/lisp/files.el b/lisp/files.el
index 5ca9af6783d..b29c0596d7b 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2461,7 +2461,9 @@ of a script, mode MODE is enabled.
 
 See also `auto-mode-alist'.")
 
-(defvar inhibit-first-line-modes-regexps (mapcar 'purecopy '("\\.tar\\'" "\\.tgz\\'"))
+(defvar inhibit-first-line-modes-regexps
+  (mapcar 'purecopy '("\\.tar\\'" "\\.tgz\\'" "\\.tiff?\\'"
+                      "\\.gif\\'" "\\.png\\'" "\\.jpe?g\\'"))
   "List of regexps; if one matches a file name, don't look for `-*-'.")
 
 (defvar inhibit-first-line-modes-suffixes nil
@@ -2952,60 +2954,62 @@ Returns an alist of elements (VAR . VAL), where VAR is a variable
 and VAL is the specified value.  Ignores any specification for
 `mode:' and `coding:' (which should have already been handled
 by `set-auto-mode' and `set-auto-coding', respectively).
-Throws an error if the -*- line is malformed.
+Return nil if the -*- line is malformed.
 
 If MODE-ONLY is non-nil, just returns the symbol specifying the
 mode, if there is one, otherwise nil."
-  (save-excursion
-    (goto-char (point-min))
-    (let ((end (set-auto-mode-1))
-          result)
-      (cond ((not end)
-             nil)
-            ((looking-at "[ \t]*\\([^ \t\n\r:;]+\\)\\([ \t]*-\\*-\\)")
-             ;; Simple form: "-*- MODENAME -*-".
-             (if mode-only
-                 (intern (concat (match-string 1) "-mode"))))
-            (t
-             ;; Hairy form: '-*-' [ <variable> ':' <value> ';' ]* '-*-'
-             ;; (last ";" is optional).
-             ;; If MODE-ONLY, just check for `mode'.
-             ;; Otherwise, parse the -*- line into the RESULT alist.
-             (while (and (or (not mode-only)
-                             (not result))
-                         (< (point) end))
-               (or (looking-at "[ \t]*\\([^ \t\n:]+\\)[ \t]*:[ \t]*")
-                   (error "Malformed -*- line"))
-               (goto-char (match-end 0))
-               ;; There used to be a downcase here,
-               ;; but the manual didn't say so,
-               ;; and people want to set var names that aren't all lc.
-               (let* ((key (intern (match-string 1)))
-                      (val (save-restriction
-                             (narrow-to-region (point) end)
-                             (let ((read-circle nil))
-                               (read (current-buffer)))))
-                      ;; It is traditional to ignore
-                      ;; case when checking for `mode' in set-auto-mode,
-                      ;; so we must do that here as well.
-                      ;; That is inconsistent, but we're stuck with it.
-                      ;; The same can be said for `coding' in set-auto-coding.
-                      (keyname (downcase (symbol-name key))))
-                 (if mode-only
-                     (and (equal keyname "mode")
-                          (setq result
-                                (intern (concat (downcase (symbol-name val))
-                                                "-mode"))))
-                   (or (equal keyname "coding")
-                       (condition-case nil
-                           (push (cons (cond ((eq key 'eval) 'eval)
-                                             ;; Downcase "Mode:".
-                                             ((equal keyname "mode") 'mode)
-                                             (t (indirect-variable key)))
-                                       val) result)
-                         (error nil))))
-                 (skip-chars-forward " \t;")))
-             result)))))
+  (catch 'malformed-line
+    (save-excursion
+      (goto-char (point-min))
+      (let ((end (set-auto-mode-1))
+            result)
+        (cond ((not end)
+               nil)
+              ((looking-at "[ \t]*\\([^ \t\n\r:;]+\\)\\([ \t]*-\\*-\\)")
+               ;; Simple form: "-*- MODENAME -*-".
+               (if mode-only
+                   (intern (concat (match-string 1) "-mode"))))
+              (t
+               ;; Hairy form: '-*-' [ <variable> ':' <value> ';' ]* '-*-'
+               ;; (last ";" is optional).
+               ;; If MODE-ONLY, just check for `mode'.
+               ;; Otherwise, parse the -*- line into the RESULT alist.
+               (while (and (or (not mode-only)
+                               (not result))
+                           (< (point) end))
+                 (unless (looking-at "[ \t]*\\([^ \t\n:]+\\)[ \t]*:[ \t]*")
+                   (message "Malformed mode-line")
+                   (throw 'malformed-line nil))
+                 (goto-char (match-end 0))
+                 ;; There used to be a downcase here,
+                 ;; but the manual didn't say so,
+                 ;; and people want to set var names that aren't all lc.
+                 (let* ((key (intern (match-string 1)))
+                        (val (save-restriction
+                               (narrow-to-region (point) end)
+                               (let ((read-circle nil))
+                                 (read (current-buffer)))))
+                        ;; It is traditional to ignore
+                        ;; case when checking for `mode' in set-auto-mode,
+                        ;; so we must do that here as well.
+                        ;; That is inconsistent, but we're stuck with it.
+                        ;; The same can be said for `coding' in set-auto-coding.
+                        (keyname (downcase (symbol-name key))))
+                   (if mode-only
+                       (and (equal keyname "mode")
+                            (setq result
+                                  (intern (concat (downcase (symbol-name val))
+                                                  "-mode"))))
+                     (or (equal keyname "coding")
+                         (condition-case nil
+                             (push (cons (cond ((eq key 'eval) 'eval)
+                                               ;; Downcase "Mode:".
+                                               ((equal keyname "mode") 'mode)
+                                               (t (indirect-variable key)))
+                                         val) result)
+                           (error nil))))
+                   (skip-chars-forward " \t;")))
+               result))))))
 
 (defun hack-local-variables-filter (variables dir-name)
   "Filter local variable settings, querying the user if necessary.
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 211c4455717..fa22d1a5ea1 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * mm-decode.el (mm-inline-media-tests): Support imagemagick images.
+
 2011-09-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnus-sum.el (gnus-summary-read-group-1): Bump the "Retrieving"
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 692175d471f..6e56213c327 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -195,7 +195,7 @@ before the external MIME handler is invoked."
     ("image/tiff"
      mm-inline-image
      (lambda (handle)
-       (mm-valid-and-fit-image-p 'tiff handle)) )
+       (mm-valid-and-fit-image-p 'tiff handle)))
     ("image/xbm"
      mm-inline-image
      (lambda (handle)
@@ -265,6 +265,20 @@ before the external MIME handler is invoked."
     ("multipart/alternative" ignore identity)
     ("multipart/mixed" ignore identity)
     ("multipart/related" ignore identity)
+    ("image/*"
+     mm-inline-image
+     (lambda (handle)
+       (and (mm-valid-image-format-p 'imagemagick)
+            (mm-with-unibyte-buffer
+              (mm-insert-part handle)
+              (let ((image
+                     (ignore-errors
+                       (if (fboundp 'create-image)
+                           (create-image (buffer-string) 'imagemagick 'data-p)
+                         (mm-create-image-xemacs type)))))
+                (when image
+                  (setcar (cdr handle) (list "image/imagemagick"))
+                  (mm-image-fit-p handle)))))))
     ;; Disable audio and image
     ("audio/.*" ignore ignore)
     ("image/.*" ignore ignore)
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index 5a90f015aed..926422865c7 100644
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -90,13 +90,14 @@
     (put-image
      (let ((image (mm-get-image handle)))
        (if (eq mm-inline-large-images 'resize)
-           (gnus-rescale-image image
-                               (let ((edges (gnus-window-inside-pixel-edges
-                                             (get-buffer-window (current-buffer)))))
-                                 (cons (truncate (* mm-inline-large-images-proportion
-                                                    (- (nth 2 edges) (nth 0 edges))))
-                                       (truncate (* mm-inline-large-images-proportion
-                                                    (- (nth 3 edges) (nth 1 edges)))))))
+           (gnus-rescale-image
+            image
+            (let ((edges (gnus-window-inside-pixel-edges
+                          (get-buffer-window (current-buffer)))))
+              (cons (truncate (* mm-inline-large-images-proportion
+                                 (- (nth 2 edges) (nth 0 edges))))
+                    (truncate (* mm-inline-large-images-proportion
+                                 (- (nth 3 edges) (nth 1 edges)))))))
          image))
      b)
     (insert "\n\n")
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 5f3680630f4..bdd19194c22 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -179,11 +179,8 @@ otherwise turn it off."
   (if icomplete-mode
       ;; The following is not really necessary after first time -
       ;; no great loss.
-      (progn
-        (setq completion-show-inline-help nil)
-        (add-hook 'minibuffer-setup-hook 'icomplete-minibuffer-setup))
-    (remove-hook 'minibuffer-setup-hook 'icomplete-minibuffer-setup)
-    (setq completion-show-inline-help t)))
+      (add-hook 'minibuffer-setup-hook 'icomplete-minibuffer-setup)
+    (remove-hook 'minibuffer-setup-hook 'icomplete-minibuffer-setup)))
 
 ;;;_ > icomplete-simple-completing-p ()
 (defun icomplete-simple-completing-p ()
@@ -209,6 +206,7 @@ Conditions are:
   "Run in minibuffer on activation to establish incremental completion.
 Usually run by inclusion in `minibuffer-setup-hook'."
   (when (and icomplete-mode (icomplete-simple-completing-p))
+    (set (make-local-variable 'completion-show-inline-help) nil)
     (add-hook 'pre-command-hook
               (lambda () (run-hooks 'icomplete-pre-command-hook))
               nil t)
diff --git a/lisp/image.el b/lisp/image.el
index 30362251664..c150f4239dd 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -695,16 +695,14 @@ Emacs visits them in Image mode.
 
 If Emacs is compiled without ImageMagick support, do nothing."
   (when (fboundp 'imagemagick-types)
-    (let ((im-types (imagemagick-types)))
-      (dolist (im-inhibit imagemagick-types-inhibit)
-        (setq im-types (delq im-inhibit im-types)))
-      (dolist (im-type im-types)
-        (let ((extension
-               (concat "\\." (downcase (symbol-name im-type))
-                       "\\'")))
-          (push (cons extension 'image-mode) auto-mode-alist)
-          (push (cons extension 'imagemagick)
-                image-type-file-name-regexps))))))
+    (let ((im-types '()))
+      (dolist (im-type (imagemagick-types))
+        (unless (memq im-type imagemagick-types-inhibit)
+          (push (downcase (symbol-name im-type)) im-types)))
+      (let ((extension (concat "\\." (regexp-opt im-types) "\\'")))
+        (push (cons extension 'image-mode) auto-mode-alist)
+        (push (cons extension 'imagemagick)
+              image-type-file-name-regexps)))))
 
 (provide 'image)
 
diff --git a/lisp/info.el b/lisp/info.el
index 40959885edb..e79e4b1195e 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -540,7 +540,7 @@ in `Info-file-supports-index-cookies-list'."
           (condition-case ()
               (if (and (re-search-forward
                         "makeinfo[ \n]version[ \n]\\([0-9]+.[0-9]+\\)"
-                        (line-beginning-position 3) t)
+                        (line-beginning-position 4) t)
                        (not (version< (match-string 1) "4.7")))
                   (setq found t))
             (error nil))
@@ -2440,7 +2440,8 @@ Because of ambiguities, this should be concatenated with something like
       )
     (replace-regexp-in-string
      "[ \n]+" " "
-     (or (match-string-no-properties 2)
+     (or (and (not (equal (match-string-no-properties 2) ""))
+              (match-string-no-properties 2))
          ;; If the node name is the menu entry name (using `entry::').
          (buffer-substring-no-properties
           (match-beginning 0) (1- (match-beginning 1)))))))
@@ -2765,22 +2766,24 @@ N is the digit argument used to invoke this command."
           ;; so we can scroll back through it.
           (goto-char (point-max)))
          ;; Keep going down, as long as there are nested menu nodes.
-         (while (Info-no-error
-                 (Info-last-menu-item)
-                 ;; If we go down a menu item, go to the end of the node
-                 ;; so we can scroll back through it.
-                 (goto-char (point-max))))
+         (let (Info-history) ; Don't add intermediate nodes to the history.
+           (while (Info-no-error
+                   (Info-last-menu-item)
+                   ;; If we go down a menu item, go to the end of the node
+                   ;; so we can scroll back through it.
+                   (goto-char (point-max)))))
          (recenter -1))
         ((and (Info-no-error (Info-extract-pointer "prev"))
               (not (equal (Info-extract-pointer "up")
                           (Info-extract-pointer "prev"))))
          (Info-no-error (Info-prev))
          (goto-char (point-max))
-         (while (Info-no-error
-                 (Info-last-menu-item)
-                 ;; If we go down a menu item, go to the end of the node
-                 ;; so we can scroll back through it.
-                 (goto-char (point-max))))
+         (let (Info-history) ; Don't add intermediate nodes to the history.
+           (while (Info-no-error
+                   (Info-last-menu-item)
+                   ;; If we go down a menu item, go to the end of the node
+                   ;; so we can scroll back through it.
+                   (goto-char (point-max)))))
          (recenter -1))
         ((Info-no-error (Info-up t))
          (goto-char (point-min))
@@ -3887,6 +3890,14 @@ With a zero prefix arg, put the name inside a function call to `info'."
 (defvar tool-bar-map)
 (defvar bookmark-make-record-function)
 
+(defvar Info-mode-syntax-table
+  (let ((st (copy-syntax-table text-mode-syntax-table)))
+    ;; Use punctuation syntax for apostrophe because of
+    ;; extensive use of quotes like `this' in Info manuals.
+    (modify-syntax-entry ?' "." st)
+    st)
+  "Syntax table used in `Info-mode'.")
+
 ;; Autoload cookie needed by desktop.el
 ;;;###autoload
 (define-derived-mode Info-mode nil "Info"
@@ -3951,7 +3962,7 @@ Advanced commands:
 \\[clone-buffer]        Select a new cloned Info buffer in another window.
 \\[universal-argument] \\[info] Move to new Info file with completion.
 \\[universal-argument] N \\[info]       Select Info buffer with prefix number in the name *info*<N>."
-  :syntax-table text-mode-syntax-table
+  :syntax-table Info-mode-syntax-table
   :abbrev-table text-mode-abbrev-table
   (setq tab-width 8)
   (add-hook 'activate-menubar-hook 'Info-menu-update nil t)
diff --git a/lisp/isearch.el b/lisp/isearch.el
index e07f1429119..81e0b4bf3b7 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1110,6 +1110,7 @@ The following additional command keys are active while editing.
               (isearch-new-message isearch-message)
               (isearch-new-forward isearch-forward)
               (isearch-new-word isearch-word)
+              (isearch-new-case-fold isearch-case-fold-search)
 
               (isearch-regexp isearch-regexp)
               (isearch-op-fun isearch-op-fun)
@@ -1203,7 +1204,8 @@ The following additional command keys are active while editing.
             (setq isearch-string isearch-new-string
                   isearch-message isearch-new-message
                   isearch-forward isearch-new-forward
-                  isearch-word isearch-new-word))
+                  isearch-word isearch-new-word
+                  isearch-case-fold-search isearch-new-case-fold))
 
           ;; Empty isearch-string means use default.
           (when (= 0 (length isearch-string))
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 9fe19581e81..1c6f2c7b7ed 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -773,8 +773,12 @@ The list is in preference order.")
                      (eq (car result) 530))
                 ;; We got a "530 auth required", so we close and try
                 ;; again, this time asking the user for a password.
-                (smtpmail-send-command process "QUIT")
-                (smtpmail-read-response process)
+                ;; We ignore any errors here, because some MTAs just
+                ;; close the connection immediately after giving the
+                ;; error message.
+                (ignore-errors
+                  (smtpmail-send-command process "QUIT")
+                  (smtpmail-read-response process))
                 (delete-process process)
                 (setq process nil)
                 (throw 'done
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index caae40ed8c5..eceb3afc147 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -985,7 +985,7 @@ by \"Save Options\" in Custom buffers.")
     (let ((menu (make-sparse-keymap "Tool-bar")))
 
       (define-key menu [showhide-tool-bar-left]
-        `(menu-item ,(purecopy "On the left")
+        `(menu-item ,(purecopy "On the Left")
                     menu-bar-showhide-tool-bar-menu-customize-enable-left
                     :help ,(purecopy "Tool-bar at the left side")
                     :visible (display-graphic-p)
@@ -997,7 +997,7 @@ by \"Save Options\" in Custom buffers.")
                                        'left)))))
 
       (define-key menu [showhide-tool-bar-right]
-        `(menu-item ,(purecopy "On the right")
+        `(menu-item ,(purecopy "On the Right")
                     menu-bar-showhide-tool-bar-menu-customize-enable-right
                     :help ,(purecopy "Tool-bar at the right side")
                     :visible (display-graphic-p)
@@ -1009,7 +1009,7 @@ by \"Save Options\" in Custom buffers.")
                                        'right)))))
 
       (define-key menu [showhide-tool-bar-bottom]
-        `(menu-item ,(purecopy "On the bottom")
+        `(menu-item ,(purecopy "On the Bottom")
                     menu-bar-showhide-tool-bar-menu-customize-enable-bottom
                     :help ,(purecopy "Tool-bar at the bottom")
                     :visible (display-graphic-p)
@@ -1021,7 +1021,7 @@ by \"Save Options\" in Custom buffers.")
                                        'bottom)))))
 
       (define-key menu [showhide-tool-bar-top]
-        `(menu-item ,(purecopy "On the top")
+        `(menu-item ,(purecopy "On the Top")
                     menu-bar-showhide-tool-bar-menu-customize-enable-top
                     :help ,(purecopy "Tool-bar at the top")
                     :visible (display-graphic-p)
@@ -1200,7 +1200,7 @@ mail status in mode line"))
         (define-key menu [menu-system-font]
           (menu-bar-make-toggle
            toggle-use-system-font font-use-system-font
-           "Use system font"
+           "Use System Font"
            "Use system font: %s"
            "Use the monospaced font defined by the system")))
 
@@ -1304,7 +1304,7 @@ mail status in mode line"))
                              (eq 'turn-on-auto-fill text-mode-hook)))))
 
     (define-key menu [line-wrapping]
-      `(menu-item ,(purecopy "Line Wrapping in this Buffer")
+      `(menu-item ,(purecopy "Line Wrapping in This Buffer")
                   ,menu-bar-line-wrapping-menu))
 
 
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index a45cc5500c2..1fa57dbfe3e 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -632,9 +632,10 @@ an alist of attribute/value pairs."
             (setq record (cons (list name value)
                                record))
             (forward-line 1))
-          (push (if withdn
-                    (cons dn (nreverse record))
-                  (nreverse record)) result)
+          (cond (withdn
+                 (push (cons dn (nreverse record)) result))
+                (record
+                 (push (nreverse record) result)))
           (setq record nil)
           (skip-chars-forward " \t\n")
           (message "Parsing results... %d" numres)
diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el
index 460c9f0e118..5054f1d232d 100644
--- a/lisp/net/tramp-compat.el
+++ b/lisp/net/tramp-compat.el
@@ -41,6 +41,7 @@
   (require 'advice)
   (require 'custom)
   (require 'format-spec)
+  (require 'shell)
 
   ;; As long as password.el is not part of (X)Emacs, it shouldn't be
   ;; mandatory.
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 1fa358e9277..e94581392fa 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2280,7 +2280,7 @@ The method used must be an out-of-band method."
         ;; password.
         (setq tramp-current-method (tramp-file-name-method v)
               tramp-current-user   (tramp-file-name-user v)
-              tramp-current-host   (tramp-file-name-host v))
+              tramp-current-host   (tramp-file-name-real-host v))
 
         ;; Expand hops.  Might be necessary for gateway methods.
         (setq v (car (tramp-compute-multi-hops v)))
@@ -4025,6 +4025,7 @@ means discard it)."
 (defconst tramp-inline-compress-commands
   '(("gzip" "gzip -d")
     ("bzip2" "bzip2 -d")
+    ("xz" "xz -d")
     ("compress" "compress -d"))
   "List of compress and decompress commands for inline transfer.
 Each item is a list that looks like this:
@@ -4292,7 +4293,7 @@ connection if a previous connection has died for some reason."
                      (gw (tramp-get-file-property hop "" "gateway" nil))
                      (g-method (and gw (tramp-file-name-method gw)))
                      (g-user (and gw (tramp-file-name-user gw)))
-                     (g-host (and gw (tramp-file-name-host gw)))
+                     (g-host (and gw (tramp-file-name-real-host gw)))
                      (command login-program)
                      ;; We don't create the temporary file.  In fact,
                      ;; it is just a prefix for the ControlPath option
@@ -4721,16 +4722,6 @@ This is used internally by `tramp-file-mode-from-int'."
            x))
         remote-path)))))
 
-(defun tramp-get-remote-tmpdir (vec)
-  (with-connection-property vec "tmp-directory"
-    (let ((dir (tramp-shell-quote-argument "/tmp")))
-      (if (and (tramp-send-command-and-check
-                vec (format "%s -d %s" (tramp-get-test-command vec) dir))
-               (tramp-send-command-and-check
-                vec (format "%s -w %s" (tramp-get-test-command vec) dir)))
-          dir
-        (tramp-error vec 'file-error "Directory %s not accessible" dir)))))
-
 (defun tramp-get-ls-command (vec)
   (with-connection-property vec "ls"
     (tramp-message vec 5 "Finding a suitable `ls' command")
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index eb456298c1a..150ef18be52 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -38,7 +38,15 @@
 ;; ... and add it to the method list.
 ;;;###tramp-autoload
 (unless (memq system-type '(cygwin windows-nt))
-  (add-to-list 'tramp-methods (cons tramp-smb-method nil)))
+  (add-to-list 'tramp-methods
+    `(,tramp-smb-method
+      ;; We define an empty command, because `tramp-smb-call-winexe'
+      ;; opens already the powershell.  Used in `tramp-handle-shell-command'.
+      (tramp-remote-shell "")
+      ;; This is just a guess.  We don't know whether the share "$C"
+      ;; is available for public use, and whether the user has write
+      ;; access.
+      (tramp-tmpdir "/C$/Temp"))))
 
 ;; Add a default for `tramp-default-method-alist'. Rule: If there is
 ;; a domain in USER, it must be the SMB method.
@@ -98,7 +106,8 @@ call, letting the SMB client use the default one."
          "ERRnomem"
          "ERRnosuchshare"
          ;; Windows 4.0 (Windows NT), Windows 5.0 (Windows 2000),
-         ;; Windows 5.1 (Windows XP), Windows 5.2 (Windows Server 2003).
+         ;; Windows 5.1 (Windows XP), Windows 5.2 (Windows Server 2003),
+         ;; Windows 6.0 (Windows Vista), Windows 6.1 (Windows 7).
          "NT_STATUS_ACCESS_DENIED"
          "NT_STATUS_ACCOUNT_LOCKED_OUT"
          "NT_STATUS_BAD_NETWORK_NAME"
@@ -107,6 +116,7 @@ call, letting the SMB client use the default one."
          "NT_STATUS_DIRECTORY_NOT_EMPTY"
          "NT_STATUS_DUPLICATE_NAME"
          "NT_STATUS_FILE_IS_A_DIRECTORY"
+         "NT_STATUS_IMAGE_ALREADY_LOADED"
          "NT_STATUS_IO_TIMEOUT"
          "NT_STATUS_LOGON_FAILURE"
          "NT_STATUS_NETWORK_ACCESS_DENIED"
@@ -490,39 +500,40 @@ PRESERVE-UID-GID and PRESERVE-SELINUX-CONTEXT are completely ignored."
 (defun tramp-smb-handle-file-attributes (filename &optional id-format)
   "Like `file-attributes' for Tramp files."
   (unless id-format (setq id-format 'integer))
-  (with-parsed-tramp-file-name filename nil
-    (with-file-property v localname (format "file-attributes-%s" id-format)
-      (if (and (tramp-smb-get-share v) (tramp-smb-get-stat-capability v))
-          (tramp-smb-do-file-attributes-with-stat v id-format)
-        ;; Reading just the filename entry via "dir localname" is not
-        ;; possible, because when filename is a directory, some
-        ;; smbclient versions return the content of the directory, and
-        ;; other versions don't.  Therefore, the whole content of the
-        ;; upper directory is retrieved, and the entry of the filename
-        ;; is extracted from.
-        (let* ((entries (tramp-smb-get-file-entries
-                         (file-name-directory filename)))
-               (entry (assoc (file-name-nondirectory filename) entries))
-               (uid (if (equal id-format 'string) "nobody" -1))
-               (gid (if (equal id-format 'string) "nogroup" -1))
-               (inode (tramp-get-inode v))
-               (device (tramp-get-device v)))
-
-          ;; Check result.
-          (when entry
-            (list (and (string-match "d" (nth 1 entry))
-                       t)       ;0 file type
-                  -1            ;1 link count
-                  uid           ;2 uid
-                  gid           ;3 gid
-                  '(0 0)        ;4 atime
-                  (nth 3 entry) ;5 mtime
-                  '(0 0)        ;6 ctime
-                  (nth 2 entry) ;7 size
-                  (nth 1 entry) ;8 mode
-                  nil           ;9 gid weird
-                  inode         ;10 inode number
-                  device))))))) ;11 file system number
+  (ignore-errors
+    (with-parsed-tramp-file-name filename nil
+      (with-file-property v localname (format "file-attributes-%s" id-format)
+        (if (and (tramp-smb-get-share v) (tramp-smb-get-stat-capability v))
+            (tramp-smb-do-file-attributes-with-stat v id-format)
+          ;; Reading just the filename entry via "dir localname" is not
+          ;; possible, because when filename is a directory, some
+          ;; smbclient versions return the content of the directory, and
+          ;; other versions don't.  Therefore, the whole content of the
+          ;; upper directory is retrieved, and the entry of the filename
+          ;; is extracted from.
+          (let* ((entries (tramp-smb-get-file-entries
+                           (file-name-directory filename)))
+                 (entry (assoc (file-name-nondirectory filename) entries))
+                 (uid (if (equal id-format 'string) "nobody" -1))
+                 (gid (if (equal id-format 'string) "nogroup" -1))
+                 (inode (tramp-get-inode v))
+                 (device (tramp-get-device v)))
+
+            ;; Check result.
+            (when entry
+              (list (and (string-match "d" (nth 1 entry))
+                         t)        ;0 file type
+                    -1             ;1 link count
+                    uid            ;2 uid
+                    gid            ;3 gid
+                    '(0 0)         ;4 atime
+                    (nth 3 entry)  ;5 mtime
+                    '(0 0)         ;6 ctime
+                    (nth 2 entry)  ;7 size
+                    (nth 1 entry)  ;8 mode
+                    nil            ;9 gid weird
+                    inode          ;10 inode number
+                    device)))))))) ;11 file system number
 
 (defun tramp-smb-do-file-attributes-with-stat (vec &optional id-format)
   "Implement `file-attributes' for Tramp files using stat command."
@@ -1352,12 +1363,13 @@ Returns nil if an error message has appeared."
           (found (progn (goto-char (point-min))
                         (re-search-forward tramp-smb-prompt nil t)))
           (err   (progn (goto-char (point-min))
-                        (re-search-forward tramp-smb-errors nil t))))
+                        (re-search-forward tramp-smb-errors nil t)))
+          buffer-read-only)
 
       ;; Algorithm: get waiting output.  See if last line contains
-      ;; tramp-smb-prompt sentinel or tramp-smb-errors strings.
+      ;; `tramp-smb-prompt' sentinel or `tramp-smb-errors' strings.
       ;; If not, wait a bit and again get waiting output.
-      (while (and (not found) (not err))
+      (while (and (not found) (not err) (memq (process-status p) '(run open)))
 
         ;; Accept pending output.
         (tramp-accept-process-output p)
@@ -1393,12 +1405,11 @@ Returns nil if an error message has appeared."
 ;;; TODO:
 
 ;; * Error handling in case password is wrong.
-;; * Read password from "~/.netrc".
 ;; * Return more comprehensive file permission string.
 ;; * Try to remove the inclusion of dummy "" directory.  Seems to be at
 ;;   several places, especially in `tramp-smb-handle-insert-directory'.
 ;; * (RMS) Use unwind-protect to clean up the state so as to make the state
 ;;   regular again.
-;; * Make it multi-hop capable.
+;; * Ignore case in file names.
 
 ;;; tramp-smb.el ends here
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 6475ea42ec8..3384a6d776b 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -58,7 +58,6 @@
 ;;; Code:
 
 (require 'tramp-compat)
-(require 'shell)
 
 ;;; User Customizable Internal Variables:
 
@@ -192,15 +191,16 @@ This is a list of entries of the form (NAME PARAM1 PARAM2 ...).
 Each NAME stands for a remote access method.  Each PARAM is a
 pair of the form (KEY VALUE).  The following KEYs are defined:
   * `tramp-remote-shell'
-    This specifies the Bourne shell to use on the remote host.  This
-    MUST be a Bourne-like shell.  It is normally not necessary to set
-    this to any value other than \"/bin/sh\": Tramp wants to use a shell
-    which groks tilde expansion, but it can search for it.  Also note
-    that \"/bin/sh\" exists on all Unixen, this might not be true for
-    the value that you decide to use.  You Have Been Warned.
+    This specifies the shell to use on the remote host.  This
+    MUST be a Bourne-like shell.  It is normally not necessary to
+    set this to any value other than \"/bin/sh\": Tramp wants to
+    use a shell which groks tilde expansion, but it can search
+    for it.  Also note that \"/bin/sh\" exists on all Unixen,
+    this might not be true for the value that you decide to use.
+    You Have Been Warned.
   * `tramp-remote-shell-args'
     For implementation of `shell-command', this specifies the
-    argument to let `tramp-remote-shell' run a command.
+    arguments to let `tramp-remote-shell' run a single command.
   * `tramp-login-program'
     This specifies the name of the program to use for logging in to the
     remote host.  This may be the name of rsh or a workalike program,
@@ -255,6 +255,9 @@ pair of the form (KEY VALUE).  The following KEYs are defined:
     not have to be newline or carriage return characters.  Other login
     programs are happy with just one character, the newline character.
     We use \"xy\" as the value for methods using \"plink\".
+  * `tramp-tmpdir'
+    A directory on the remote host for temporary files.  If not
+    specified, \"/tmp\" is taken as default.
 
 What does all this mean?  Well, you should specify `tramp-login-program'
 for all methods; this program is used to log in to the remote site.  Then,
@@ -3531,20 +3534,26 @@ If the `tramp-methods' entry does not exist, return nil."
          ;; loaded already.
          (zerop (tramp-compat-funcall 'tramp-get-remote-uid vec 'integer))))))
 
+(defun tramp-get-remote-tmpdir (vec)
+  "Return directory for temporary files on the remote host identified by VEC."
+  (with-connection-property vec "tmpdir"
+    (let ((dir (tramp-make-tramp-file-name
+                (tramp-file-name-method vec)
+                (tramp-file-name-user vec)
+                (tramp-file-name-host vec)
+                (or
+                 (tramp-get-method-parameter
+                  (tramp-file-name-method vec) 'tramp-tmpdir)
+                 "/tmp"))))
+      (if (and (file-directory-p dir) (file-writable-p dir))
+          dir
+        (tramp-error vec 'file-error "Directory %s not accessible" dir)))))
+
 (defun tramp-make-tramp-temp-file (vec)
   "Create a temporary file on the remote host identified by VEC.
 Return the local name of the temporary file."
-  (let ((prefix
-         (tramp-make-tramp-file-name
-          (tramp-file-name-method vec)
-          (tramp-file-name-user vec)
-          (tramp-file-name-host vec)
-          (tramp-drop-volume-letter
-           (expand-file-name
-            tramp-temp-name-prefix
-            ;; This is defined in tramp-sh.el.  Let's assume this is
-            ;; loaded already.
-            (tramp-compat-funcall 'tramp-get-remote-tmpdir vec)))))
+  (let ((prefix (expand-file-name
+                 tramp-temp-name-prefix (tramp-get-remote-tmpdir vec)))
         result)
     (while (not result)
       ;; `make-temp-file' would be the natural choice for
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 8c0d7b25939..3f2338b3a4c 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -316,7 +316,8 @@ the variables are properly set."
       (let ((cs (read-string "No comment syntax is defined.  Use: ")))
         (if (zerop (length cs))
             (error "No comment syntax defined")
-          (set (make-local-variable 'comment-start) cs))))
+          (set (make-local-variable 'comment-start) cs)
+          (set (make-local-variable 'comment-start-skip) cs))))
     ;; comment-use-syntax
     (when (eq comment-use-syntax 'undecided)
       (set (make-local-variable 'comment-use-syntax)
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index d63929d794e..1c320f20e51 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-17  Juanma Barranquero  <lekktu@gmail.com>
+
+        * org.el (org-toggle-pretty-entities): Fix typo in message.
+
 2011-09-02  Chong Yidong  <cyd@stupidchicken.com>
 
         * org-compat.el (org-pop-to-buffer-same-window): Deleted.
diff --git a/lisp/org/org.el b/lisp/org/org.el
index d494bdb28fa..419ff022cf6 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -5660,7 +5660,7 @@ needs to be inserted at a specific position in the font-lock sequence.")
   (org-set-local 'org-pretty-entities (not org-pretty-entities))
   (org-restart-font-lock)
   (if org-pretty-entities
-      (message "Entities are displayed as UTF8 characers")
+      (message "Entities are displayed as UTF8 characters")
     (save-restriction
       (widen)
       (org-decompose-region (point-min) (point-max))
diff --git a/lisp/outline.el b/lisp/outline.el
index 2f84e7d93ea..f864058c6fc 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -137,24 +137,23 @@ in the file it applies to."
       (cons "Headings" (make-sparse-keymap "Headings")))
 
     (define-key map [headings demote-subtree]
-      '(menu-item "Demote subtree" outline-demote
+      '(menu-item "Demote Subtree" outline-demote
                   :help "Demote headings lower down the tree"))
     (define-key map [headings promote-subtree]
-      '(menu-item "Promote subtree" outline-promote
+      '(menu-item "Promote Subtree" outline-promote
                   :help "Promote headings higher up the tree"))
     (define-key map [headings move-subtree-down]
-      '(menu-item "Move subtree down" outline-move-subtree-down
+      '(menu-item "Move Subtree Down" outline-move-subtree-down
                   :help "Move the currrent subtree down past arg headlines of the same level"))
     (define-key map [headings move-subtree-up]
-      '(menu-item "Move subtree up" outline-move-subtree-up
+      '(menu-item "Move Subtree Up" outline-move-subtree-up
                   :help "Move the currrent subtree up past arg headlines of the same level"))
     (define-key map [headings copy]
-      '(menu-item "Copy to kill ring" outline-headers-as-kill
+      '(menu-item "Copy to Kill Ring" outline-headers-as-kill
                   :enable mark-active
                   :help "Save the visible outline headers in region at the start of the kill ring"))
     (define-key map [headings outline-insert-heading]
-
-      '(menu-item "New heading" outline-insert-heading
+      '(menu-item "New Heading" outline-insert-heading
                   :help "Insert a new heading at same depth at point"))
     (define-key map [headings outline-backward-same-level]
 
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index 1178a8a0b7e..fd817e3b4f4 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -290,7 +290,7 @@
           res))))
 
   (defun c-make-font-lock-search-form (regexp highlights)
-    ;; Return a lisp form which will fontify every occurence of REGEXP
+    ;; Return a lisp form which will fontify every occurrence of REGEXP
     ;; (a regular expression, NOT a function) between POINT and `limit'
     ;; with HIGHLIGHTS, a list of highlighters as specified on page
     ;; "Search-based Fontification" in the elisp manual.
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index a3300077909..d321e9c1388 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -2070,7 +2070,9 @@ for \\[find-tag] (which see)."
   (let ((comp-data (tags-completion-at-point-function)))
     (if (null comp-data)
         (error "Nothing to complete")
-      (apply 'completion-in-region comp-data))))
+      (completion-in-region (car comp-data) (cadr comp-data)
+                            (nth 2 comp-data)
+                            (plist-get (nthcdr 3 comp-data) :predicate)))))
 
 (dolist (x '("^No tags table in use; use .* to select one$"
              "^There is no default tag$"
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 000243b05df..2c68a29dd00 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -476,7 +476,7 @@ Set up `compilation-exit-message-function' and run `grep-setup-hook'."
              ;; so the buffer is still unmodified if there is no output.
              (cond ((and (zerop code) (buffer-modified-p))
                     '("finished (matches found)\n" . "matched"))
-                   ((or (= code 1) (not (buffer-modified-p)))
+                   ((not (buffer-modified-p))
                     '("finished with no matches found\n" . "no match"))
                    (t
                     (cons msg code)))
diff --git a/lisp/replace.el b/lisp/replace.el
index 70175cf205c..455e1a511e8 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -810,7 +810,7 @@ a previously found match."
     ;; We use this alternative name, so we can use \\[occur-mode-mouse-goto].
     (define-key map [mouse-2] 'occur-mode-mouse-goto)
     (define-key map "\C-c\C-c" 'occur-mode-goto-occurrence)
-    (define-key map "\C-x\C-q" 'occur-edit-mode)
+    (define-key map "e" 'occur-edit-mode)
     (define-key map "\C-m" 'occur-mode-goto-occurrence)
     (define-key map "o" 'occur-mode-goto-occurrence-other-window)
     (define-key map "\C-o" 'occur-mode-display-occurrence)
@@ -864,8 +864,8 @@ Alternatively, click \\[occur-mode-mouse-goto] on an item to go to it.
   (let ((map (make-sparse-keymap)))
     (set-keymap-parent map text-mode-map)
     (define-key map [mouse-2] 'occur-mode-mouse-goto)
-    (define-key map "\C-c\C-c" 'occur-mode-goto-occurrence)
-    (define-key map "\C-x\C-q" 'occur-mode)
+    (define-key map "\C-c\C-c" 'occur-cease-edit)
+    (define-key map "\C-o" 'occur-mode-display-occurrence)
     (define-key map "\C-c\C-f" 'next-error-follow-minor-mode)
     (define-key map [menu-bar occur] (cons (purecopy "Occur") occur-menu-map))
     map)
@@ -878,40 +878,54 @@ the originating buffer.
 
 To return to ordinary Occur mode, use \\[occur-mode]."
   (setq buffer-read-only nil)
-  (add-hook 'after-change-functions 'occur-after-change-function nil t))
+  (add-hook 'after-change-functions 'occur-after-change-function nil t)
+  (message (substitute-command-keys
+            "Editing: Type \\[occur-cease-edit] to return to Occur mode.")))
+
+(defun occur-cease-edit ()
+  "Switch from Occur Edit mode to Occur mode."
+  (interactive)
+  (when (derived-mode-p 'occur-edit-mode)
+    (occur-mode)
+    (message "Switching to Occur mode.")))
 
 (defun occur-after-change-function (beg end length)
   (save-excursion
     (goto-char beg)
-    (let* ((m (get-text-property (line-beginning-position) 'occur-target))
+    (let* ((line-beg (line-beginning-position))
+           (m (get-text-property line-beg 'occur-target))
            (buf (marker-buffer m))
-           (col (current-column)))
-      (when (= length 0)
-        ;; Apply occur-target property to inserted (e.g. yanked) text.
-        (put-text-property beg end 'occur-target m)
-        ;; Did we insert a newline?  Occur Edit mode can't create new
-        ;; Occur entries; just discard everything after the newline.
-        (save-excursion
-          (and (search-forward "\n" end t)
-               (delete-region (1- (point)) end))))
-      (let ((line (- (line-number-at-pos)
-                     (line-number-at-pos (window-start))))
-            (readonly (with-current-buffer buf buffer-read-only))
-            (win (or (get-buffer-window buf)
-                     (display-buffer buf t)))
-            (text (save-excursion
-                    (forward-line 0)
-                    (search-forward ":" nil t)
-                    (setq col (- col (current-column)))
-                    (buffer-substring-no-properties (point) (line-end-position)))))
-        (with-selected-window win
-          (goto-char m)
-          (recenter line)
-          (if readonly
-              (message "Buffer `%s' is read only." buf)
-            (delete-region (line-beginning-position) (line-end-position))
-            (insert text))
-          (move-to-column col))))))
+           col)
+      (when (and (get-text-property line-beg 'occur-prefix)
+                 (not (get-text-property end 'occur-prefix)))
+        (when (= length 0)
+          ;; Apply occur-target property to inserted (e.g. yanked) text.
+          (put-text-property beg end 'occur-target m)
+          ;; Did we insert a newline?  Occur Edit mode can't create new
+          ;; Occur entries; just discard everything after the newline.
+          (save-excursion
+            (and (search-forward "\n" end t)
+                 (delete-region (1- (point)) end))))
+        (let* ((line (- (line-number-at-pos)
+                        (line-number-at-pos (window-start))))
+               (readonly (with-current-buffer buf buffer-read-only))
+               (win (or (get-buffer-window buf)
+                        (display-buffer buf t)))
+               (line-end (line-end-position))
+               (text (save-excursion
+                       (goto-char (next-single-property-change
+                                   line-beg 'occur-prefix nil
+                                   line-end))
+                       (setq col (- (point) line-beg))
+                       (buffer-substring-no-properties (point) line-end))))
+          (with-selected-window win
+            (goto-char m)
+            (recenter line)
+            (if readonly
+                (message "Buffer `%s' is read only." buf)
+              (delete-region (line-beginning-position) (line-end-position))
+              (insert text))
+            (move-to-column col)))))))
 
 
 (defun occur-revert-function (_ignore1 _ignore2)
@@ -1336,9 +1350,12 @@ See also `multi-occur'."
                                     (when prefix-face
                                       `(font-lock-face prefix-face))
                                     `(occur-prefix t mouse-face (highlight)
-                                                   occur-target ,marker follow-link t
-                                                   read-only t
-                                                   help-echo "mouse-2: go to this occurrence"))))
+                                      ;; Allow insertion of text at
+                                      ;; the end of the prefix (for
+                                      ;; Occur Edit mode).
+                                      front-sticky t rear-nonsticky t
+                                      occur-target ,marker follow-link t
+                                      help-echo "mouse-2: go to this occurrence"))))
                            (match-str
                             ;; We don't put `mouse-face' on the newline,
                             ;; because that loses.  And don't put it
diff --git a/lisp/simple.el b/lisp/simple.el
index 74343496c72..4db0aae25ad 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4134,7 +4134,9 @@ a semipermanent goal column for this command.
 Then instead of trying to move exactly vertically (or as close as possible),
 this command moves to the specified goal column (or as close as possible).
 The goal column is stored in the variable `goal-column', which is nil
-when there is no goal column.
+when there is no goal column.  Note that setting `goal-column'
+overrides `line-move-visual' and causes this command to move by buffer
+lines rather than by display lines.
 
 If you are thinking of using this in a Lisp program, consider
 using `forward-line' instead.  It is usually easier to use
@@ -4172,7 +4174,9 @@ a semipermanent goal column for this command.
 Then instead of trying to move exactly vertically (or as close as possible),
 this command moves to the specified goal column (or as close as possible).
 The goal column is stored in the variable `goal-column', which is nil
-when there is no goal column.
+when there is no goal column.  Note that setting `goal-column'
+overrides `line-move-visual' and causes this command to move by buffer
+lines rather than by display lines.
 
 If you are thinking of using this in a Lisp program, consider using
 `forward-line' with a negative argument instead.  It is usually easier
@@ -4196,7 +4200,8 @@ This has no effect when `line-move-visual' is non-nil."
   :group 'editing-basics)
 
 (defcustom goal-column nil
-  "Semipermanent goal column for vertical motion, as set by \\[set-goal-column], or nil."
+  "Semipermanent goal column for vertical motion, as set by \\[set-goal-column], or nil.
+A non-nil setting overrides `line-move-visual', which see."
   :type '(choice integer
                  (const :tag "None" nil))
   :group 'editing-basics)
@@ -4226,7 +4231,9 @@ Outline mode sets this."
 This movement is based on where the cursor is displayed on the
 screen, instead of relying on buffer contents alone.  It takes
 into account variable-width characters and line continuation.
-If nil, `line-move' moves point by logical lines."
+If nil, `line-move' moves point by logical lines.
+A non-nil setting of `goal-column' overrides the value of this variable
+and forces movement by logical lines."
   :type 'boolean
   :group 'editing-basics
   :version "23.1")
@@ -4303,7 +4310,7 @@ If nil, `line-move' moves point by logical lines."
                (not executing-kbd-macro)
                (line-move-partial arg noerror to-end))
     (set-window-vscroll nil 0 t)
-    (if line-move-visual
+    (if (and line-move-visual (not goal-column))
         (line-move-visual arg noerror)
       (line-move-1 arg noerror to-end))))
 
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 5521cfd3de8..b76b0a303df 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -1723,7 +1723,11 @@ quit          spell session exited."
                   (extent-at start)
                   (and (fboundp 'delete-extent)
                        (delete-extent (extent-at start)))))
-            ((null poss) (message "Error in ispell process"))
+            ((null poss)
+             (message "Error checking word %s using %s with %s dictionary"
+                      (funcall ispell-format-word-function word)
+                      (file-name-nondirectory ispell-program-name)
+                      (or ispell-current-dictionary "default")))
             (ispell-check-only        ; called from ispell minor mode.
              (if (fboundp 'make-extent)
                  (if (fboundp 'set-extent-property)
@@ -3034,7 +3038,7 @@ Must call after `ispell-buffer-local-parsing' due to dependence on mode."
         (while (looking-at "[ \t\n]*\\[") (forward-sexp))
         (forward-sexp (or arg 1)))
     (error
-     (message "error skipping s-expressions at point %d." (point))
+     (message "Error skipping s-expressions at point %d." (point))
      (beep)
      (sit-for 2))))
 
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index 4eff3244cdc..3ab1caf2864 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -964,23 +964,23 @@ stream.  Standard error output is discarded."
 (defvar vc-bzr-shelve-menu-map
   (let ((map (make-sparse-keymap "Bzr Shelve")))
     (define-key map [de]
-      '(menu-item "Delete shelf" vc-bzr-shelve-delete-at-point
+      '(menu-item "Delete Shelf" vc-bzr-shelve-delete-at-point
                   :help "Delete the current shelf"))
     (define-key map [ap]
-      '(menu-item "Apply and keep shelf" vc-bzr-shelve-apply-and-keep-at-point
+      '(menu-item "Apply and Keep Shelf" vc-bzr-shelve-apply-and-keep-at-point
                   :help "Apply the current shelf and keep it"))
     (define-key map [po]
-      '(menu-item "Apply and remove shelf (pop)" vc-bzr-shelve-apply-at-point
+      '(menu-item "Apply and Remove Shelf (Pop)" vc-bzr-shelve-apply-at-point
                   :help "Apply the current shelf and remove it"))
     (define-key map [sh]
-      '(menu-item "Show shelve" vc-bzr-shelve-show-at-point
+      '(menu-item "Show Shelve" vc-bzr-shelve-show-at-point
                   :help "Show the contents of the current shelve"))
     map))
 
 (defvar vc-bzr-extra-menu-map
   (let ((map (make-sparse-keymap)))
     (define-key map [bzr-sn]
-      '(menu-item "Shelve a snapshot" vc-bzr-shelve-snapshot
+      '(menu-item "Shelve a Snapshot" vc-bzr-shelve-snapshot
                   :help "Shelve the current state of the tree and keep the current state"))
     (define-key map [bzr-sh]
       '(menu-item "Shelve..." vc-bzr-shelve
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index 5f3a9a21b59..ed16ee9f6f8 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -125,15 +125,15 @@ See `run-hooks'."
                   :enable (not (vc-dir-busy))
                   :help "Refresh the contents of the directory buffer"))
     (define-key map [remup]
-      '(menu-item "Hide up-to-date" vc-dir-hide-up-to-date
+      '(menu-item "Hide Up-to-date" vc-dir-hide-up-to-date
                   :help "Hide up-to-date items from display"))
     ;; Movement.
     (define-key map [sepmv] '("--"))
     (define-key map [next-line]
-      '(menu-item "Next line" vc-dir-next-line
+      '(menu-item "Next Line" vc-dir-next-line
                   :help "Go to the next line" :keys "n"))
     (define-key map [previous-line]
-      '(menu-item "Previous line" vc-dir-previous-line
+      '(menu-item "Previous Line" vc-dir-previous-line
                   :help "Go to the previous line"))
     ;; Marking.
     (define-key map [sepmrk] '("--"))
@@ -142,7 +142,7 @@ See `run-hooks'."
                   :help "Unmark all files that are in the same state as the current file\
 \nWith prefix argument unmark all files"))
     (define-key map [unmark-previous]
-      '(menu-item "Unmark previous " vc-dir-unmark-file-up
+      '(menu-item "Unmark Previous " vc-dir-unmark-file-up
                   :help "Move to the previous line and unmark the file"))
 
     (define-key map [mark-all]
@@ -171,10 +171,10 @@ See `run-hooks'."
       '(menu-item "Isearch Files..." vc-dir-isearch
                   :help "Incremental search a string in the marked files"))
     (define-key map [open-other]
-      '(menu-item "Open in other window" vc-dir-find-file-other-window
+      '(menu-item "Open in Other Window" vc-dir-find-file-other-window
                   :help "Find the file on the current line, in another window"))
     (define-key map [open]
-      '(menu-item "Open file" vc-dir-find-file
+      '(menu-item "Open File" vc-dir-find-file
                   :help "Find the file on the current line"))
     (define-key map [sepvcdet] '("--"))
     ;; FIXME: This needs a key binding.  And maybe a better name
@@ -203,10 +203,10 @@ See `run-hooks'."
     ;; VC commands.
     (define-key map [sepvccmd] '("--"))
     (define-key map [update]
-      '(menu-item "Update to latest version" vc-update
+      '(menu-item "Update to Latest Version" vc-update
                   :help "Update the current fileset's files to their tip revisions"))
     (define-key map [revert]
-      '(menu-item "Revert to base version" vc-revert
+      '(menu-item "Revert to Base Version" vc-revert
                   :help "Revert working copies of the selected fileset to their repository contents."))
     (define-key map [next-action]
       ;; FIXME: This really really really needs a better name!
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 1bb246fea0b..e9cbeeeb40a 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -486,16 +486,16 @@ or an empty string if none."
 (defvar vc-git-stash-menu-map
   (let ((map (make-sparse-keymap "Git Stash")))
     (define-key map [de]
-      '(menu-item "Delete stash" vc-git-stash-delete-at-point
+      '(menu-item "Delete Stash" vc-git-stash-delete-at-point
                   :help "Delete the current stash"))
     (define-key map [ap]
-      '(menu-item "Apply stash" vc-git-stash-apply-at-point
+      '(menu-item "Apply Stash" vc-git-stash-apply-at-point
                   :help "Apply the current stash and keep it in the stash list"))
     (define-key map [po]
-      '(menu-item "Apply and remove stash (pop)" vc-git-stash-pop-at-point
+      '(menu-item "Apply and Remove Stash (Pop)" vc-git-stash-pop-at-point
                   :help "Apply the current stash and remove it"))
     (define-key map [sh]
-      '(menu-item "Show stash" vc-git-stash-show-at-point
+      '(menu-item "Show Stash" vc-git-stash-show-at-point
                   :help "Show the contents of the current stash"))
     map))
 
@@ -933,7 +933,7 @@ or BRANCH^ (where \"^\" can be repeated)."
       '(menu-item "Git grep..." vc-git-grep
                   :help "Run the `git grep' command"))
     (define-key map [git-sn]
-      '(menu-item "Stash a snapshot" vc-git-stash-snapshot
+      '(menu-item "Stash a Snapshot" vc-git-stash-snapshot
                   :help "Stash the current state of the tree and keep the current state"))
     (define-key map [git-st]
       '(menu-item "Create Stash..." vc-git-stash
diff --git a/lisp/window.el b/lisp/window.el
index c0e8781aab0..e0be98d5bd1 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -158,7 +158,7 @@ An application may bind this to a non-nil value around calls to
 these functions to inhibit processing of window parameters.")
 
 (defconst window-safe-min-height 1
-  "The absolut minimum number of lines of a window.
+  "The absolute minimum number of lines of a window.
 Anything less might crash Emacs.")
 
 (defcustom window-min-height 4
@@ -177,12 +177,12 @@ shorter, explictly specify the SIZE argument of that function."
   :group 'windows)
 
 (defconst window-safe-min-width 2
-  "The absolut minimum number of columns of a window.
+  "The absolute minimum number of columns of a window.
 Anything less might crash Emacs.")
 
 (defcustom window-min-width 10
   "The minimum number of columns of any window.
-The value has to accomodate margins, fringes, or scrollbars if
+The value has to accommodate margins, fringes, or scrollbars if
 present.  A value less than `window-safe-min-width' is ignored.
 The value of this variable is honored when windows are resized or
 split.
@@ -3772,7 +3772,7 @@ subwindows can get as small as `window-safe-min-height' and
         ;; issues - so IGNORE equal 'safe might not always produce the
         ;; minimum possible state.  But such configurations hardly make
         ;; sense anyway.
-        (error "Window %s too small to accomodate state" window)
+        (error "Window %s too small to accommodate state" window)
       (setq state (cdr state))
       (setq window-state-put-list nil)
       ;; Work on the windows of a temporary buffer to make sure that
diff --git a/lisp/woman.el b/lisp/woman.el
index 75a36d6ac36..7b530d1004f 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -3954,6 +3954,8 @@ Optional argument NUMERIC, if non-nil, means the argument is numeric."
     ;; Done like this to preserve any text properties of the `\'
     (while (search-forward "\\" to t)
       (let ((c (following-char)))
+        ;; Some other escapes, such as \f, are handled in
+        ;; `woman0-process-escapes'.
         (cond ((eq c ?')                ; \' -> '
                (delete-char -1)
                (cond (numeric           ; except in numeric args, \' -> `
@@ -3967,12 +3969,7 @@ Optional argument NUMERIC, if non-nil, means the argument is numeric."
                (insert "\t"))
               ((and numeric
                     (memq c '(?w ?n ?h)))) ; leave \w, \n, \h (?????)
-              ((eq c ?l) (woman-horizontal-line))
-              (t
-               ;; \? -> ? where ? is any remaining character
-               (WoMan-warn "Escape ignored: \\%c -> %c" c c)
-               (delete-char -1))
-              )))
+              ((eq c ?l) (woman-horizontal-line)))))
     (goto-char from)
     ;; Process non-default tab settings:
     (cond (tab-stop-list