upstream

66 files changed, 827 insertions, 377 deletions

diff --git a/.dir-locals.el b/.dir-locals.el
index f098f3e7460..4da890f92ab 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -5,7 +5,7 @@
  ;; You must set bugtracker_debbugs_url in your bazaar.conf for this to work.
  ;; See admin/notes/bugtracker.
  (log-edit-mode . ((log-edit-rewrite-fixes
-                    " (bug#\\([0-9]+\\))" . "debbugs:\\1")))
+                    "[ \n](bug#\\([0-9]+\\))" . "debbugs:\\1")))
  (change-log-mode . ((add-log-time-zone-rule . t)
                      (fill-column . 74)
                      (bug-reference-url-format . "http://debbugs.gnu.org/%s")
diff --git a/ChangeLog b/ChangeLog
index abaa7c6eb88..7c7bff452ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * .dir-locals.el: Change the debbugs regexp to allow having the
+        bug number as the first thing on a line.
+
 2011-09-15  Glenn Morris  <rgm@gnu.org>
 
         * configure.in: Make configure work with recent GNUsteps.
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index d87493d57b3..163eabed2a6 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,10 @@
+2011-09-18  Chong Yidong  <cyd@stupidchicken.com>
+
+        * cmdargs.texi (Icons X): Fix description of Emacs icon.
+
+        * xresources.texi (Table of Resources): Fix documentation of
+        bitmapIcon.
+
 2011-09-15  Chong Yidong  <cyd@stupidchicken.com>
 
         * package.texi (Package Menu): Add package-menu-mark-upgrades.
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi
index 2a19e1b009d..07cca53ce4d 100644
--- a/doc/emacs/cmdargs.texi
+++ b/doc/emacs/cmdargs.texi
@@ -1107,7 +1107,7 @@ Start Emacs in an iconified (``minimized'') state.
 @itemx --no-bitmap-icon
 @opindex --no-bitmap-icon
 @cindex Emacs icon, a gnu
-Do not use a picture of a gnu as the Emacs icon.
+Do not display the Emacs icon.
 @end table
 
   Most window managers allow you to ``iconify'' (or ``minimize'') an
diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi
index d30f7e42254..c2e65268d1b 100644
--- a/doc/emacs/xresources.texi
+++ b/doc/emacs/xresources.texi
@@ -169,11 +169,10 @@ with the class that it belongs to:
 @item @code{background} (class @code{Background})
 Background color name.
 
-@ifnottex
 @item @code{bitmapIcon} (class @code{BitmapIcon})
-Use a bitmap icon (a picture of a gnu) if @samp{on}, let the window
-manager choose an icon if @samp{off}.
-@end ifnottex
+Tell the window manager to display the Emacs icon if @samp{on}; don't
+do so if @samp{off}.  (The icon is usually shown in the ``taskbar'' on
+a graphical desktop.)
 
 @item @code{borderColor} (class @code{BorderColor})
 Color name for the external border.
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 71dc8a8ff89..09958f6b7e0 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,23 @@
+2011-09-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * errors.texi (Standard Errors): Remove apparent placeholder text
+        (bug#9491).
+
+2011-09-18  Chong Yidong  <cyd@stupidchicken.com>
+
+        * frames.texi (Management Parameters): Fix description of
+        icon-type parameter.
+
+2011-09-17  Chong Yidong  <cyd@stupidchicken.com>
+
+        * tips.texi (Key Binding Conventions): Don't bind a key sequence
+        ending in C-g.  Suggested by Edward O'Connor.
+
+2011-09-17  Eli Zaretskii  <eliz@gnu.org>
+
+        * numbers.texi (Integer Basics): Add indexing for
+        most-positive-fixnum and most-negative-fixnum.  (Bug#9525)
+
 2011-09-14  Dani Moncayo  <dmoncayo@gmail.com>  (tiny change)
 
         * lists.texi (Sets And Lists): Fix typo.  (Bug#9393)
diff --git a/doc/lispref/errors.texi b/doc/lispref/errors.texi
index 2c7549d0443..98967b708b3 100644
--- a/doc/lispref/errors.texi
+++ b/doc/lispref/errors.texi
@@ -28,9 +28,6 @@ condition @code{error}, because quitting is not considered an error.
 handled.
 
 @table @code
-@item @var{symbol}
-@var{string}; @var{reference}.
-
 @item error
 @code{"error"}@*
 @xref{Errors}.
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index e799cfa6b7f..d619b92e4d3 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -779,10 +779,10 @@ Whether deselecting the frame lowers it (non-@code{nil} means yes).
 
 @vindex icon-type, a frame parameter
 @item icon-type
-The type of icon to use for this frame when it is iconified.  If the
-value is a string, that specifies a file containing a bitmap to use.
-Any other non-@code{nil} value specifies the default bitmap icon (a
-picture of a gnu); @code{nil} specifies a text icon.
+The type of icon to use for this frame.  If the value is a string,
+that specifies a file containing a bitmap to use; @code{nil} specifies
+no icon (in which case the window manager decides what to show); any
+other non-@code{nil} value specifies the default Emacs icon.
 
 @vindex icon-name, a frame parameter
 @item icon-name
diff --git a/doc/lispref/numbers.texi b/doc/lispref/numbers.texi
index 65921f444e0..3efddebffb4 100644
--- a/doc/lispref/numbers.texi
+++ b/doc/lispref/numbers.texi
@@ -148,11 +148,15 @@ arguments to such functions may be either numbers or markers, we often
 give these arguments the name @var{number-or-marker}.  When the argument
 value is a marker, its position value is used and its buffer is ignored.
 
+@cindex largest Lisp integer number
+@cindex maximum Lisp integer number
 @defvar most-positive-fixnum
 The value of this variable is the largest integer that Emacs Lisp
 can handle.
 @end defvar
 
+@cindex smallest Lisp integer number
+@cindex minimum Lisp integer number
 @defvar most-negative-fixnum
 The value of this variable is the smallest integer that Emacs Lisp can
 handle.  It is negative.
diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi
index be37eb2034b..fd875b45be9 100644
--- a/doc/lispref/tips.texi
+++ b/doc/lispref/tips.texi
@@ -320,6 +320,10 @@ any context prevents recognition of escape sequences as function keys in
 that context.
 
 @item
+Similarly, don't bind a key sequence ending in @key{C-g}, since that
+is commonly used to cancel a key sequence.
+
+@item
 Anything which acts like a temporary mode or state which the user can
 enter and leave should define @kbd{@key{ESC} @key{ESC}} or
 @kbd{@key{ESC} @key{ESC} @key{ESC}} as a way to escape.
diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index 0735e0593f9..a5146be9175 100644
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-17  Sven Joachim  <svenjoac@gmx.de>
+
+        * emacs.1: Escape a dash.
+
 2011-07-12  Chong Yidong  <cyd@stupidchicken.com>
 
         * emacsclient.1: Document exit status.
diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index 10fcc186fdd..aef5bd402a2 100644
--- a/doc/man/emacs.1
+++ b/doc/man/emacs.1
@@ -407,7 +407,7 @@ The value can be one of
 .IR fullwidth ,
 or
 .IR fullheight ,
-which correspond to the command-line options `\-fs', `-mm', `\-fw',
+which correspond to the command-line options `\-fs', `\-mm', `\-fw',
 and `\-fh', respectively.
 Note that this applies to the initial frame only.
 .TP
diff --git a/etc/NEWS b/etc/NEWS
index 9f5595a6341..f61adebe2a0 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -814,7 +814,7 @@ They are superseded by shift-select-mode enabled by default in 23.1.
 * New Modes and Packages in Emacs 24.1
 
 ** Occur Edit mode applies edits made in *Occur* buffers to the
-original buffers.  It is bound to C-x C-q in Occur mode.
+original buffers.  It is bound to "e" in Occur mode.
 
 ** New global minor modes electric-pair-mode, electric-indent-mode,
 and electric-layout-mode.
diff --git a/etc/images/icons/allout-widgets/light-bg/leaf.png b/etc/images/icons/allout-widgets/light-bg/leaf.png
index e2d7b189e84..e2d7b189e84 100755..100644
--- a/etc/images/icons/allout-widgets/light-bg/leaf.png
+++ b/etc/images/icons/allout-widgets/light-bg/leaf.png
diff --git a/etc/images/icons/allout-widgets/light-bg/leaf.xpm b/etc/images/icons/allout-widgets/light-bg/leaf.xpm
index f25bf40a258..f25bf40a258 100755..100644
--- a/etc/images/icons/allout-widgets/light-bg/leaf.xpm
+++ b/etc/images/icons/allout-widgets/light-bg/leaf.xpm
diff --git a/etc/images/icons/allout-widgets/light-bg/locked-encrypted.png b/etc/images/icons/allout-widgets/light-bg/locked-encrypted.png
index a6bc3e99a7a..a6bc3e99a7a 100755..100644
--- a/etc/images/icons/allout-widgets/light-bg/locked-encrypted.png
+++ b/etc/images/icons/allout-widgets/light-bg/locked-encrypted.png
diff --git a/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.png b/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.png
index e70d075690a..e70d075690a 100755..100644
--- a/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.png
+++ b/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.png
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
diff --git a/src/.gdbinit b/src/.gdbinit
index 0f51a00ea76..b908ef005d6 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -483,83 +483,83 @@ end
 define pgx
   set $g = $arg0
   # CHAR_GLYPH
-  if ($g->type == 0)
-    if ($g->u.ch >= ' ' && $g->u.ch < 127)
-      printf "CHAR[%c]", $g->u.ch
+  if ($g.type == 0)
+    if ($g.u.ch >= ' ' && $g.u.ch < 127)
+      printf "CHAR[%c]", $g.u.ch
     else
-      printf "CHAR[0x%x]", $g->u.ch
+      printf "CHAR[0x%x]", $g.u.ch
     end
   end
   # COMPOSITE_GLYPH
-  if ($g->type == 1)
-    printf "COMP[%d (%d..%d)]", $g->u.cmp.id, $g->slice.cmp.from, $g->slice.cmp.to
+  if ($g.type == 1)
+    printf "COMP[%d (%d..%d)]", $g.u.cmp.id, $g.slice.cmp.from, $g.slice.cmp.to
   end
   # GLYPHLESS_GLYPH
-  if ($g->type == 2)
+  if ($g.type == 2)
     printf "GLYPHLESS["
-    if ($g->u.glyphless.method == 0)
+    if ($g.u.glyphless.method == 0)
       printf "THIN]"
     end
-    if ($g->u.glyphless.method == 1)
+    if ($g.u.glyphless.method == 1)
       printf "EMPTY]"
     end
-    if ($g->u.glyphless.method == 2)
+    if ($g.u.glyphless.method == 2)
       printf "ACRO]"
     end
-    if ($g->u.glyphless.method == 3)
+    if ($g.u.glyphless.method == 3)
       printf "HEX]"
     end
   end
   # IMAGE_GLYPH
-  if ($g->type == 3)
-    printf "IMAGE[%d]", $g->u.img_id
+  if ($g.type == 3)
+    printf "IMAGE[%d]", $g.u.img_id
   end
   # STRETCH_GLYPH
-  if ($g->type == 4)
-    printf "STRETCH[%d+%d]", $g->u.stretch.height, $g->u.stretch.ascent
+  if ($g.type == 4)
+    printf "STRETCH[%d+%d]", $g.u.stretch.height, $g.u.stretch.ascent
   end
-  xgettype ($g->object)
+  xgettype ($g.object)
   if ($type == Lisp_String)
-    printf " str=%x[%d]", $g->object, $g->charpos
+    printf " str=%x[%d]", $g.object, $g.charpos
   else
-    printf " pos=%d", $g->charpos
+    printf " pos=%d", $g.charpos
   end
   # For characters, print their resolved level and bidi type
-  if ($g->type == 0)
-    printf " blev=%d,btyp=", $g->resolved_level
-    pbiditype $g->bidi_type
+  if ($g.type == 0)
+    printf " blev=%d,btyp=", $g.resolved_level
+    pbiditype $g.bidi_type
   end
-  printf " w=%d a+d=%d+%d", $g->pixel_width, $g->ascent, $g->descent
+  printf " w=%d a+d=%d+%d", $g.pixel_width, $g.ascent, $g.descent
   # If not DEFAULT_FACE_ID
-  if ($g->face_id != 0)
-    printf " face=%d", $g->face_id
+  if ($g.face_id != 0)
+    printf " face=%d", $g.face_id
   end
-  if ($g->voffset)
-    printf " vof=%d", $g->voffset
+  if ($g.voffset)
+    printf " vof=%d", $g.voffset
   end
-  if ($g->multibyte_p)
+  if ($g.multibyte_p)
     printf " MB"
   end
-  if ($g->padding_p)
+  if ($g.padding_p)
     printf " PAD"
   end
-  if ($g->glyph_not_available_p)
+  if ($g.glyph_not_available_p)
     printf " N/A"
   end
-  if ($g->overlaps_vertically_p)
+  if ($g.overlaps_vertically_p)
     printf " OVL"
   end
-  if ($g->avoid_cursor_p)
+  if ($g.avoid_cursor_p)
     printf " AVOID"
   end
-  if ($g->left_box_line_p)
+  if ($g.left_box_line_p)
     printf " ["
   end
-  if ($g->right_box_line_p)
+  if ($g.right_box_line_p)
     printf " ]"
   end
-  if ($g->slice.img.x || $g->slice.img.y || $g->slice.img.width || $g->slice.img.height)
-    printf " slice=%d,%d,%d,%d" ,$g->slice.img.x, $g->slice.img.y, $g->slice.img.width, $g->slice.img.height
+  if ($g.slice.img.x || $g.slice.img.y || $g.slice.img.width || $g.slice.img.height)
+    printf " slice=%d,%d,%d,%d" ,$g.slice.img.x, $g.slice.img.y, $g.slice.img.width, $g.slice.img.height
   end
   printf "\n"
 end
diff --git a/src/ChangeLog b/src/ChangeLog
index 15281f47438..12a45918e87 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,94 @@
+2011-09-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * lread.c (Fread_from_string): Document what FINAL-STRING-INDEX is
+        (bug#9493).
+
+2011-09-18  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xfns.c (Fx_create_frame): Handle the bitmapIcon resource as
+        boolean (Bug#9154).
+
+2011-09-18  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (display_line): Record maximum and minimum buffer
+        positions even if no glyphs were produced (e.g., by a zero-width
+        stretch).  Fixes bug#9530 on a TTY.  Under word-wrap, don't record
+        buffer positions that will be removed from the glyph row because
+        they don't fit.
+        (produce_stretch_glyph): Fix a bug in :align-to on a TTY when the
+        column is beyond frame width: don't subtract 1 "pixel" when
+        computing width of the stretch.
+        (reseat_at_next_visible_line_start): Undo the change made on
+        2011-09-17 that saved paragraph information and restored it after
+        the call to `reseat'.  (Bug#9545)
+
+2011-09-18  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * xdisp.c (expose_window): Save original value of phys_cursor_on_p
+        and turn window cursor on if cleared (Bug#9415).
+
+2011-09-18  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * search.c (boyer_moore): Take unibyte characters from pattern
+        literally.  (Bug#9458)
+
+2011-09-18  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (reseat_at_next_visible_line_start): Fix last change.
+
+2011-09-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix minor problem found by static checking.
+        * xdisp.c (reseat_at_next_visible_line_start): Mark locals as
+        initialized, to pacify gcc -Wuninitialized.
+
+        * fileio.c: Report proper errno when syscall falls.
+        (Finsert_file_contents): Save and restore errno,
+        so that report_file_error outputs the correct diagnostic.
+        (Fwrite_region) [CLASH_DETECTION]: Likewise.
+
+2011-09-18  Eli Zaretskii  <eliz@gnu.org>
+
+        * .gdbinit (pgx): Fix references to fields of `struct glyph'.
+
+2011-09-17  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (produce_stretch_glyph): Another fix for changes made on
+        2011-08-30T17:32:44Z!eliz@gnu.org.  (Bug#9530)
+
+2011-09-17  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (reseat_at_next_visible_line_start): Keep information
+        about the current paragraph and restore it after the call to
+        reseat.
+
+        * bidi.c (MAX_PARAGRAPH_SEARCH): New macro.
+        (bidi_find_paragraph_start): Search back for paragraph beginning
+        at most MAX_PARAGRAPH_SEARCH lines; if not found, return BEGV_BYTE.
+        (bidi_move_to_visually_next): Only trigger paragraph-related
+        computations when the last character is a newline or at EOB, not
+        just any NEUTRAL_B.  (Bug#9470)
+
+        * xdisp.c (set_cursor_from_row): Don't invoke special treatment of
+        truncated lines if point is covered by a display string.  (Bug#9524)
+
+2011-09-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * xselect.c: Relax test for outgoing X longs (Bug#9498).
+        (cons_to_x_long): New function.
+        (lisp_data_to_selection_data): Use it.  Correct the test for
+        short-versus-long data; it was negated.  Break out of vector
+        loop, for efficiency, when a long datum is discovered.
+
+2011-09-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * eval.c (Fquote): Document its non-consing behavior (bug#9482).
+
+2011-09-16  Eli Zaretskii  <eliz@gnu.org>
+
+        * image.c (tiff_handler): Work around a bug in MinGW GCC 3.x (see
+        GCC PR/17406) by declaring this function with external scope.
+
 2011-09-15  Paul Eggert  <eggert@cs.ucla.edu>
 
         * editfns.c (Fformat): Fix bug in text-property fix (Bug#9514).
@@ -1281,7 +1372,7 @@
         underline, overline, and strike-through.
         (ns_dumpglyphs_image, ns_dumpglyphs_stretch): Add call to
         ns_draw_text_decoration.  Change treatment of cursor drawing to
-        accomodate underlining, etc.
+        accommodate underlining, etc.
 
 2011-07-28  Eli Zaretskii  <eliz@gnu.org>
 
diff --git a/src/bidi.c b/src/bidi.c
index bb29647ea88..3efdc1590df 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -1071,15 +1071,25 @@ bidi_at_paragraph_end (EMACS_INT charpos, EMACS_INT bytepos)
   return val;
 }
 
+/* On my 2005-vintage machine, searching back for paragraph start
+   takes ~1 ms per line.  And bidi_paragraph_init is called 4 times
+   when user types C-p.  The number below limits each call to
+   bidi_paragraph_init to about 10 ms.  */
+#define MAX_PARAGRAPH_SEARCH 7500
+
 /* Find the beginning of this paragraph by looking back in the buffer.
-   Value is the byte position of the paragraph's beginning.  */
+   Value is the byte position of the paragraph's beginning, or
+   BEGV_BYTE if paragraph_start_re is still not found after looking
+   back MAX_PARAGRAPH_SEARCH lines in the buffer.  */
 static EMACS_INT
 bidi_find_paragraph_start (EMACS_INT pos, EMACS_INT pos_byte)
 {
   Lisp_Object re = paragraph_start_re;
   EMACS_INT limit = ZV, limit_byte = ZV_BYTE;
+  EMACS_INT n = 0;
 
   while (pos_byte > BEGV_BYTE
+         && n++ < MAX_PARAGRAPH_SEARCH
          && fast_looking_at (re, pos, pos_byte, limit, limit_byte, Qnil) < 0)
     {
       /* FIXME: What if the paragraph beginning is covered by a
@@ -1089,6 +1099,8 @@ bidi_find_paragraph_start (EMACS_INT pos, EMACS_INT pos_byte)
       pos = find_next_newline_no_quit (pos - 1, -1);
       pos_byte = CHAR_TO_BYTE (pos);
     }
+  if (n >= MAX_PARAGRAPH_SEARCH)
+    pos_byte = BEGV_BYTE;
   return pos_byte;
 }
 
@@ -2239,7 +2251,8 @@ bidi_move_to_visually_next (struct bidi_it *bidi_it)
     GCPRO1 (bidi_it->string.lstring);
 
   /* If we just passed a newline, initialize for the next line.  */
-  if (!bidi_it->first_elt && bidi_it->orig_type == NEUTRAL_B)
+  if (!bidi_it->first_elt
+      && (bidi_it->ch == '\n' || bidi_it->ch == BIDI_EOB))
     bidi_line_init (bidi_it);
 
   /* Prepare the sentinel iterator state, and cache it.  When we bump
@@ -2320,7 +2333,8 @@ bidi_move_to_visually_next (struct bidi_it *bidi_it)
      reordering, whereas we _must_ know the paragraph base direction
      _before_ we process the paragraph's text, since the base
      direction affects the reordering.  */
-  if (bidi_it->scan_dir == 1 && bidi_it->orig_type == NEUTRAL_B)
+  if (bidi_it->scan_dir == 1
+      && (bidi_it->ch == '\n' || bidi_it->ch == BIDI_EOB))
     {
       /* The paragraph direction of the entire string, once
          determined, is in effect for the entire string.  Setting the
diff --git a/src/eval.c b/src/eval.c
index 57a273cd4aa..32b9d366fc3 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -475,6 +475,14 @@ usage: (setq [SYM VAL]...)  */)
 
 DEFUN ("quote", Fquote, Squote, 1, UNEVALLED, 0,
        doc: /* Return the argument, without evaluating it.  `(quote x)' yields `x'.
+Warning: `quote' does not construct its return value, but just returns
+the value that was pre-constructed by the Lisp reader (see info node
+`(elisp)Printed Representation').
+This means that '(a . b) is not identical to (cons 'a 'b): the former
+does not cons.  Quoting should be reserved for constants that will
+never be modified by side-effects, unless you like self-modifying code.
+See the common pitfall in info node `(elisp)Rearrangement' for an example
+of unexpected results when a quoted object is modified.
 usage: (quote ARG)  */)
   (Lisp_Object args)
 {
diff --git a/src/fileio.c b/src/fileio.c
index 08be41f9fe4..e335dcf027f 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3187,6 +3187,7 @@ variable `last-coding-system-used' to the coding system actually used.  */)
   Lisp_Object p;
   EMACS_INT total = 0;
   int not_regular = 0;
+  int save_errno = 0;
   char read_buf[READ_BUF_SIZE];
   struct coding_system coding;
   char buffer[1 << 14];
@@ -3250,6 +3251,7 @@ variable `last-coding-system-used' to the coding system actually used.  */)
 #endif /* WINDOWSNT */
     {
     badopen:
+      save_errno = errno;
       if (NILP (visit))
         report_file_error ("Opening input file", Fcons (orig_filename, Qnil));
       st.st_mtime = -1;
@@ -4281,6 +4283,7 @@ variable `last-coding-system-used' to the coding system actually used.  */)
       && current_buffer->modtime == -1)
     {
       /* If visiting nonexistent file, return nil.  */
+      errno = save_errno;
       report_file_error ("Opening input file", Fcons (orig_filename, Qnil));
     }
 
@@ -4618,7 +4621,9 @@ This calls `write-region-annotate-functions' at the start, and
       if (ret < 0)
         {
 #ifdef CLASH_DETECTION
+          save_errno = errno;
           if (!auto_saving) unlock_file (lockname);
+          errno = save_errno;
 #endif /* CLASH_DETECTION */
           UNGCPRO;
           report_file_error ("Lseek error", Fcons (filename, Qnil));
diff --git a/src/image.c b/src/image.c
index db201d5a831..ef72745a72f 100644
--- a/src/image.c
+++ b/src/image.c
@@ -6745,10 +6745,20 @@ tiff_size_of_memory (thandle_t data)
   return ((tiff_memory_source *) data)->len;
 }
 
+/* GCC 3.x on x86 Windows targets has a bug that triggers an internal
+   compiler error compiling tiff_handler, see Bugzilla bug #17406
+   (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=17406).  Declaring
+   this function as external works around that problem.  */
+#if defined (__MINGW32__) && __GNUC__ == 3
+# define MINGW_STATIC
+#else
+# define MINGW_STATIC static
+#endif
 
-static void tiff_handler (const char *, const char *, const char *, va_list)
+MINGW_STATIC void
+tiff_handler (const char *, const char *, const char *, va_list)
   ATTRIBUTE_FORMAT_PRINTF (3, 0);
-static void
+MINGW_STATIC void
 tiff_handler (const char *log_format, const char *title,
               const char *format, va_list ap)
 {
@@ -6762,6 +6772,7 @@ tiff_handler (const char *log_format, const char *title,
   add_to_log (log_format, build_string (title),
               make_string (buf, max (0, min (len, sizeof buf - 1))));
 }
+#undef MINGW_STATIC
 
 static void tiff_error_handler (const char *, const char *, va_list)
   ATTRIBUTE_FORMAT_PRINTF (2, 0);
diff --git a/src/lread.c b/src/lread.c
index 11c4cf8c8f4..2b1b49ab2fe 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1965,6 +1965,8 @@ STREAM or the value of `standard-input' may be:
 DEFUN ("read-from-string", Fread_from_string, Sread_from_string, 1, 3, 0,
        doc: /* Read one Lisp expression which is represented as text by STRING.
 Returns a cons: (OBJECT-READ . FINAL-STRING-INDEX).
+FINAL-STRING-INDEX is an integer giving the position of the next
+ remaining chararacter in STRING.
 START and END optionally delimit a substring of STRING from which to read;
  they default to 0 and (length STRING) respectively.  */)
   (Lisp_Object string, Lisp_Object start, Lisp_Object end)
diff --git a/src/search.c b/src/search.c
index b3d67e6c431..a3b4e1dcbce 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1760,7 +1760,7 @@ boyer_moore (EMACS_INT n, unsigned char *base_pat,
                 ch = -1;
             }
 
-          if (ch >= 0200)
+          if (ch >= 0200 && multibyte)
             j = (ch & 0x3F) | 0200;
           else
             j = *ptr;
@@ -1779,7 +1779,7 @@ boyer_moore (EMACS_INT n, unsigned char *base_pat,
               while (1)
                 {
                   TRANSLATE (ch, inverse_trt, ch);
-                  if (ch >= 0200)
+                  if (ch >= 0200 && multibyte)
                     j = (ch & 0x3F) | 0200;
                   else
                     j = ch;
diff --git a/src/xdisp.c b/src/xdisp.c
index ddbbcbb1278..e83ad96b6c8 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13698,15 +13698,17 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
                /* A truncated row may not include PT among its
                   character positions.  Setting the cursor inside the
                   scroll margin will trigger recalculation of hscroll
-                  in hscroll_window_tree.  */
-               || (row->truncated_on_left_p && pt_old < bpos_min)
-               || (row->truncated_on_right_p && pt_old > bpos_max)
-               /* Zero-width characters produce no glyphs.  */
+                  in hscroll_window_tree.  But if a display string
+                  covers point, defer to the string-handling code
+                  below to figure this out.  */
                || (!string_seen
-                   && !empty_line_p
-                   && (row->reversed_p
-                       ? glyph_after > glyphs_end
-                       : glyph_after < glyphs_end)))
+                   && ((row->truncated_on_left_p && pt_old < bpos_min)
+                       || (row->truncated_on_right_p && pt_old > bpos_max)
+                       /* Zero-width characters produce no glyphs.  */
+                       || (!empty_line_p
+                           && (row->reversed_p
+                               ? glyph_after > glyphs_end
+                               : glyph_after < glyphs_end)))))
         {
           cursor = glyph_after;
           x = -1;
@@ -18766,11 +18768,6 @@ display_line (struct it *it)
                       it->current_x = new_x;
                       it->continuation_lines_width += new_x;
                       ++it->hpos;
-                      /* Record the maximum and minimum buffer
-                         positions seen so far in glyphs that will be
-                         displayed by this row.  */
-                      if (it->bidi_p)
-                        RECORD_MAX_MIN_POS (it);
                       if (i == nglyphs - 1)
                         {
                           /* If line-wrap is on, check if a previous
@@ -18785,6 +18782,11 @@ display_line (struct it *it)
                                   || IT_DISPLAYING_WHITESPACE (it)))
                             goto back_to_wrap;
 
+                          /* Record the maximum and minimum buffer
+                             positions seen so far in glyphs that will be
+                             displayed by this row.  */
+                          if (it->bidi_p)
+                            RECORD_MAX_MIN_POS (it);
                           set_iterator_to_next (it, 1);
                           if (IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
                             {
@@ -18802,6 +18804,8 @@ display_line (struct it *it)
                                 }
                             }
                         }
+                      else if (it->bidi_p)
+                        RECORD_MAX_MIN_POS (it);
                     }
                   else if (CHAR_GLYPH_PADDING_P (*glyph)
                            && !FRAME_WINDOW_P (it->f))
@@ -18932,6 +18936,10 @@ display_line (struct it *it)
                   xassert (it->first_visible_x <= it->last_visible_x);
                 }
             }
+          /* Even if this display element produced no glyphs at all,
+             we want to record its position.  */
+          if (it->bidi_p && nglyphs == 0)
+            RECORD_MAX_MIN_POS (it);
 
           row->ascent = max (row->ascent, it->max_ascent);
           row->height = max (row->height, it->max_ascent + it->max_descent);
@@ -23472,7 +23480,14 @@ produce_stretch_glyph (struct it *it)
 
   if (width > 0 && it->line_wrap != TRUNCATE
       && it->current_x + width > it->last_visible_x)
-    width = it->last_visible_x - it->current_x - 1;
+    {
+      width = it->last_visible_x - it->current_x;
+#ifdef HAVE_WINDOW_SYSTEM
+      /* Subtact one more pixel from the stretch width, but only on
+         GUI frames, since on a TTY each glyph is one "pixel" wide.  */
+      width -= FRAME_WINDOW_P (it->f);
+#endif
+    }
 
   if (width > 0 && height > 0 && it->glyph_row)
     {
@@ -23484,14 +23499,7 @@ produce_stretch_glyph (struct it *it)
         object = it->w->buffer;
 #ifdef HAVE_WINDOW_SYSTEM
       if (FRAME_WINDOW_P (it->f))
-        {
-          append_stretch_glyph (it, object, width, height, ascent);
-          it->pixel_width = width;
-          it->ascent = it->phys_ascent = ascent;
-          it->descent = it->phys_descent = height - it->ascent;
-          it->nglyphs = width > 0 && height > 0 ? 1 : 0;
-          take_vertical_position_into_account (it);
-        }
+        append_stretch_glyph (it, object, width, height, ascent);
       else
 #endif
         {
@@ -23503,6 +23511,19 @@ produce_stretch_glyph (struct it *it)
           it->object = o_object;
         }
     }
+
+  it->pixel_width = width;
+#ifdef HAVE_WINDOW_SYSTEM
+  if (FRAME_WINDOW_P (it->f))
+    {
+      it->ascent = it->phys_ascent = ascent;
+      it->descent = it->phys_descent = height - it->ascent;
+      it->nglyphs = width > 0 && height > 0 ? 1 : 0;
+      take_vertical_position_into_account (it);
+    }
+  else
+#endif
+    it->nglyphs = width;
 }
 
 #ifdef HAVE_WINDOW_SYSTEM
@@ -27450,7 +27471,7 @@ expose_window (struct window *w, XRectangle *fr)
     {
       int yb = window_text_bottom_y (w);
       struct glyph_row *row;
-      int cursor_cleared_p;
+      int cursor_cleared_p, phys_cursor_on_p;
       struct glyph_row *first_overlapping_row, *last_overlapping_row;
 
       TRACE ((stderr, "expose_window (%d, %d, %d, %d)\n",
@@ -27470,6 +27491,13 @@ expose_window (struct window *w, XRectangle *fr)
       else
         cursor_cleared_p = 0;
 
+      /* If the row containing the cursor extends face to end of line,
+         then expose_area might overwrite the cursor outside the
+         rectangle and thus notice_overwritten_cursor might clear
+         w->phys_cursor_on_p.  We remember the original value and
+         check later if it is changed.  */
+      phys_cursor_on_p = w->phys_cursor_on_p;
+
       /* Update lines intersecting rectangle R.  */
       first_overlapping_row = last_overlapping_row = NULL;
       for (row = w->current_matrix->rows;
@@ -27536,7 +27564,8 @@ expose_window (struct window *w, XRectangle *fr)
           x_draw_vertical_border (w);
 
           /* Turn the cursor on again.  */
-          if (cursor_cleared_p)
+          if (cursor_cleared_p
+              || (phys_cursor_on_p && !w->phys_cursor_on_p))
             update_window_cursor (w, 1);
         }
     }
diff --git a/src/xfns.c b/src/xfns.c
index 998c803a7ad..913cde75d91 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3369,7 +3369,7 @@ This function is an internal primitive--use `make-frame' instead.  */)
   /* We need to do this after creating the X window, so that the
      icon-creation functions can say whose icon they're describing.  */
   x_default_parameter (f, parms, Qicon_type, Qt,
-                       "bitmapIcon", "BitmapIcon", RES_TYPE_SYMBOL);
+                       "bitmapIcon", "BitmapIcon", RES_TYPE_BOOLEAN);
 
   x_default_parameter (f, parms, Qauto_raise, Qnil,
                        "autoRaise", "AutoRaiseLower", RES_TYPE_BOOLEAN);
diff --git a/src/xmenu.c b/src/xmenu.c
index cf58e85af10..7fcd2ad3724 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -742,7 +742,7 @@ menu_highlight_callback (GtkWidget *widget, gpointer call_data)
   /* If popup_activated_flag is greater than 1 we are in a popup menu.
      Don't pass the frame to show_help_event for those.
      Passing frame creates an Emacs event.  As we are looping in
-     popup_widget_loop, it won't be handeled.  Passing NULL shows the tip
+     popup_widget_loop, it won't be handled.  Passing NULL shows the tip
      directly without using an Emacs event.  This is what the Lucid code
      does below.  */
   show_help_event (popup_activated_flag <= 1 ? cb_data->cl_data->f : NULL,
diff --git a/src/xselect.c b/src/xselect.c
index 29e8552bb9c..adee1872dba 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -116,6 +116,7 @@ static Lisp_Object Qx_lost_selection_functions, Qx_sent_selection_functions;
 #define X_SHRT_MIN (-1 - X_SHRT_MAX)
 #define X_LONG_MAX 0x7fffffff
 #define X_LONG_MIN (-1 - X_LONG_MAX)
+#define X_ULONG_MAX 0xffffffffUL
 
 /* If this is a smaller number than the max-request-size of the display,
    emacs will use INCR selection transfer when the selection is larger
@@ -378,7 +379,8 @@ x_own_selection (Lisp_Object selection_name, Lisp_Object selection_value,
 
 /* Given a selection-name and desired type, look up our local copy of
    the selection value and convert it to the type.
-   The value is nil or a string.
+   Return nil, a string, a vector, a symbol, an integer, or a cons
+   that CONS_TO_INTEGER could plausibly handle.
    This function is used both for remote requests (LOCAL_REQUEST is zero)
    and for local x-get-selection-internal (LOCAL_REQUEST is nonzero).
 
@@ -1718,6 +1720,21 @@ selection_data_to_lisp_data (Display *display, const unsigned char *data,
     }
 }
 
+/* Convert OBJ to an X long value, and return it as unsigned long.
+   OBJ should be an integer or a cons representing an integer.
+   Treat values in the range X_LONG_MAX + 1 .. X_ULONG_MAX as X
+   unsigned long values: in theory these values are supposed to be
+   signed but in practice unsigned 32-bit data are communicated via X
+   selections and we need to support that.  */
+static unsigned long
+cons_to_x_long (Lisp_Object obj)
+{
+  if (X_ULONG_MAX <= INTMAX_MAX
+      || XINT (INTEGERP (obj) ? obj : XCAR (obj)) < 0)
+    return cons_to_signed (obj, X_LONG_MIN, min (X_ULONG_MAX, INTMAX_MAX));
+  else
+    return cons_to_unsigned (obj, X_ULONG_MAX);
+}
 
 /* Use xfree, not XFree, to free the data obtained with this function.  */
 
@@ -1783,11 +1800,11 @@ lisp_data_to_selection_data (Display *display, Lisp_Object obj,
                    || (CONSP (XCDR (obj))
                        && INTEGERP (XCAR (XCDR (obj)))))))
     {
-      *data_ret = (unsigned char *) xmalloc (sizeof (long) + 1);
+      *data_ret = (unsigned char *) xmalloc (sizeof (unsigned long) + 1);
       *format_ret = 32;
       *size_ret = 1;
-      (*data_ret) [sizeof (long)] = 0;
-      (*(long **) data_ret) [0] = cons_to_signed (obj, X_LONG_MIN, X_LONG_MAX);
+      (*data_ret) [sizeof (unsigned long)] = 0;
+      (*(unsigned long **) data_ret) [0] = cons_to_x_long (obj);
       if (NILP (type)) type = QINTEGER;
     }
   else if (VECTORP (obj))
@@ -1822,15 +1839,15 @@ lisp_data_to_selection_data (Display *display, Lisp_Object obj,
           if (NILP (type)) type = QINTEGER;
           for (i = 0; i < size; i++)
             {
-              intmax_t v = cons_to_signed (XVECTOR (obj)->contents[i],
-                                           X_LONG_MIN, X_LONG_MAX);
-              if (X_SHRT_MIN <= v && v <= X_SHRT_MAX)
+              if (! RANGED_INTEGERP (X_SHRT_MIN, XVECTOR (obj)->contents[i],
+                                     X_SHRT_MAX))
                 {
                   /* Use sizeof (long) even if it is more than 32 bits.
                      See comment in x_get_window_property and
                      x_fill_property_data.  */
                   data_size = sizeof (long);
                   format = 32;
+                  break;
                 }
             }
           *data_ret = xnmalloc (size, data_size);
@@ -1838,12 +1855,12 @@ lisp_data_to_selection_data (Display *display, Lisp_Object obj,
           *size_ret = size;
           for (i = 0; i < size; i++)
             {
-              long v = cons_to_signed (XVECTOR (obj)->contents[i],
-                                       X_LONG_MIN, X_LONG_MAX);
               if (format == 32)
-                (*((long **) data_ret)) [i] = v;
+                (*((unsigned long **) data_ret)) [i] =
+                  cons_to_x_long (XVECTOR (obj)->contents[i]);
               else
-                (*((short **) data_ret)) [i] = v;
+                (*((short **) data_ret)) [i] =
+                  XINT (XVECTOR (obj)->contents[i]);
             }
         }
     }