merge from upstream

190 files changed, 9029 insertions, 3729 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 29ea8dca53c..1b3e25da8e1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,1222 @@
+2011-07-15  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/debug.el (debug): Doc fix.  (Bug#8273)
+
+2011-07-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * man.el (Man-fontify-manpage): Fix message when formatting the
+        man page (bug#7929).
+
+2011-07-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * buff-menu.el (Buffer-menu-buffer+size): Accept an additional
+        argument LRM; if non-nil, append an invisible LRM character to the
+        buffer name.
+        (list-buffers-noselect): Call Buffer-menu-buffer+size with the
+        last argument non-nil, when formatting buffer names.
+        (Buffer-menu-mode, list-buffers-noselect): Force left-to-right
+        paragraph direction.
+
+2011-07-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * man.el (Man-bgproc-sentinel): Skip any arguments and only output
+        the man page name (bug#7929).
+
+        * image.el (put-image): Mention the `put-image' overlay property
+        (bug#7834).
+
+        * scroll-bar.el (set-scroll-bar-mode): Mention that
+        `scroll-bar-mode' lists the values (bug#7772).
+
+        * image-mode.el (image-mode-fit-frame): Mention that it's a toggle
+        command (bug#7729).
+
+        * rect.el (apply-on-rectangle): Return the point after the last
+        operation.
+        (string-rectangle): Go to the point after the last operation
+        (bug#7522).
+
+        * simple.el (current-kill): Clarify what
+        `interprogram-paste-function' does (bug#7500).
+
+        * printing.el (pr-toggle-region): Clarify the documentation
+        slightly (bug#7493).
+
+        * time.el (display-time-update): Allow
+        `display-time-mail-function' to return nil (bug#7158).  Fix
+        suggested by Detlev Zundel.
+
+        * vc/diff.el (diff): Clarify the order the file names are read
+        (bug#7111).
+
+        * mouse.el (mouse-set-region): Link to `mouse-drag-copy-region' in
+        the doc string (bug#7015).
+
+        * font-lock.el (font-lock-maximum-decoration): Mention what
+        numeric levels mean (bug#6935).
+
+        * startup.el (initial-buffer-choice): Don't mention the `none'
+        selection, which is against policy.
+
+2011-07-14  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (display-buffer-normalize-special): Replace
+        `dedicated' by `dedicate' to dedicate window (Bug#9072).
+
+2011-07-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * subr.el (version<, version<=, version=): Mention "-CVS" and
+        "-12345" alpha version numbers.
+
+2011-07-14  Chong Yidong  <cyd@stupidchicken.com>
+
+        * bindings.el: Add advertised binding for set-mark-command
+        (Bug#5772).
+
+2011-07-14  Chong Yidong  <cyd@stupidchicken.com>
+
+        * bindings.el (mode-line-other-buffer):
+        * bookmark.el (bookmark-bmenu-2-window):
+        * bs.el (bs-cycle-next, bs-cycle-previous):
+        * net/tramp-cmds.el (tramp-append-tramp-buffers): Revert to using
+        switch-to-buffer.
+
+        * net/tramp-compat.el (tramp-compat-pop-to-buffer-same-window):
+        Deleted.
+
+2011-07-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * follow.el (follow-debug-message, follow-redisplay):
+        * jka-cmpr-hook.el (with-auto-compression-mode):
+        Fix typos in docstrings.
+
+2011-07-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * subr.el (with-silent-modifications): Clarify somewhat what the
+        macro inhibits (bug#6525).
+
+        * simple.el (eval-expression): Note what it does if called
+        interactively (bug#6495).
+
+2011-07-13  Chong Yidong  <cyd@stupidchicken.com>
+
+        * window.el (switch-to-buffer): New arg FORCE-SAME-WINDOW.  Use
+        pop-to-buffer buffer-or-name if it is nil.
+
+        * emacs-lisp/bytecomp.el (byte-compile-interactive-only-functions):
+        Remove switch-to-buffer.
+
+2011-07-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * files.el (make-directory): Clarify that an error will be raised
+        if there's an error (bug#6397).
+
+        * startup.el (initial-buffer-choice): Add `none' as a choice
+        (bug#6234).
+
+        * subr.el (add-hook): Clarify section about buffer-local hooks
+        (bug#6218).
+
+        * dired.el (dired-flagged): Clarify doc string (bug#6117).
+
+2011-07-13  Juanma Barranquero  <lekktu@gmail.com>
+
+        * tabify.el (untabify): Preserve the current column so that point
+        doesn't move (bug#6032).
+
+2011-07-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * progmodes/cperl-mode.el (cperl-syntaxify-by-font-lock): Rewrite
+        to avoid awkward possessive "s" (bug#5986).
+
+2011-07-13  Glenn Morris  <rgm@gnu.org>
+
+        * dired.el (dired-use-ls-dired): Doc fix.  (Bug#9039).
+        (dired-insert-directory): Give a message the first time
+        if ls is found not to support --dired.
+
+2011-07-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * simple.el (toggle-truncate-lines): Clarify what is toggled
+        (bug#5580).  Text by Drew Adams.
+
+2011-07-13  Chong Yidong  <cyd@stupidchicken.com>
+
+        * simple.el (blink-matching-open): Make the error message from the
+        last change less verbose.
+
+2011-07-13  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * font-lock.el (font-lock-comment-face): Use the high contrast
+        "yellow" color for font-lock-comment-face on low color terminals
+        using a dark background color (bug#4221).
+
+2011-07-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * dired.el (dired-insert-set-properties): Make the doc string
+        reflect what it does now (bug#5325).
+
+        * simple.el (blink-matching-open): Say that we were unable to find
+        the match within the limit, if we're limited (bug#5122).
+
+        * international/mule-cmds.el (prefer-coding-system): Add an
+        example (bug#4869).
+
+        * progmodes/etags.el (tags-search): Document `file-list-form'
+        (bug#4731).
+
+2011-07-13  Lawrence Mitchell  <wence@gmx.li>
+
+        * net/browse-url.el (browse-url-default-browser)
+        (browse-url-browser-function): Make the default browser choice a
+        bit more logical (bug#4300).  Also clean up the doc string.
+
+2011-07-13  Juanma Barranquero  <lekktu@gmail.com>
+
+        * bindings.el (completion-ignored-extensions): Add OpenMCL/Clozure
+        binary endings (bug#4440).
+
+2011-07-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * info.el (info-insert-file-contents): Inhibit jka-compr messages,
+        which can be pretty annoying (bug#8971).
+
+        * jka-compr.el (jka-compr-verbose): New variable, and use
+        throughout (bug#8971).
+
+        * info.el (Info-find-file): Fall back on the installation
+        directory if we can't find the info node anywhere else.
+
+2011-07-13  Sergei Organov  <osv@javad.com>  (tiny change)
+
+        * vc/vc.el (vc-revert-file):
+        Don't set file time-stamp in the past.  (Bug#5181)
+
+2011-07-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * files.el (after-find-file): Give a better error message when
+        trying to find a symlink that points to a file that doesn't exist
+        (bug#4398).
+
+        * progmodes/cc-vars.el: Remove (probably) misleading comment
+        (bug#4396).
+
+2011-07-12  Johan Bockgård  <bojohan@gnu.org>
+
+        * mouse-sel.el (mouse-sel-primary-overlay): Use the `region' face.
+
+2011-07-12  Chong Yidong  <cyd@stupidchicken.com>
+
+        * mouse-sel.el: Hack restoring functionality, while keeping
+        compatibility with 2010-07-03 changes to mouse selection.
+        (mouse-sel-primary-overlay): New var.
+        (mouse-sel-selection-alist): Use it.
+        (mouse-sel-mode): Doc fix; remove points that are default features
+        of mouse.el.
+
+2011-07-12  Johan Bockgård  <bojohan@gnu.org>
+
+        * progmodes/compile.el (compilation-error-regexp-alist-alist):
+        Fix previous fix (bug#2490).
+
+2011-07-12  Roland Winkler  <winkler@gnu.org>
+
+        * textmodes/bibtex.el (bibtex-initialize): Use
+        pop-to-buffer-same-window.
+        (bibtex-search-entries): Fix interactive call.
+
+2011-07-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * progmodes/compile.el (compilation-error-regexp-alist-alist):
+        Fontise bytecomp Error lines more correctly (bug#2490).  Fix
+        suggested by Johan Bockgård.
+
+        * subr.el (remove-duplicates): Remove; `delete-dups' is sufficient.
+
+        * dired-x.el (dired-guess-default): Use `delete-dups'.
+
+2011-07-12  Chong Yidong  <cyd@stupidchicken.com>
+
+        * dired.el (dired-mark-prompt):
+        * dired-aux.el (dired-read-shell-command): Doc fix.
+
+2011-07-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * mail/sendmail.el (sendmail-query-once): Use
+        `customize-save-variable' unconditionally, now that it works under
+        emacs -Q.
+
+        * mail/smtpmail.el (smtpmail-query-smtp-server): Ditto.
+
+        * cus-edit.el (custom-file): Take an optional no-error variable.
+        (customize-save-variable): Set the variable, and give a warning if
+        running under "emacs -q".
+
+2011-07-11  Juanma Barranquero  <lekktu@gmail.com>
+
+        * loadhist.el (unload-feature-special-hooks):
+        Add `auto-coding-functions', `fill-nobreak-predicate' and
+        `find-directory-functions' (bug#5327).
+
+2011-07-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * vc/ediff.el (ediff-patch-file): Clarify doc string (bug#3138).
+
+        * cus-edit.el (custom-guess-name-alist): -alist variables should
+        use the `alist' type (bug#3120).  Suggested by Drew Adams.
+
+        * printing.el: Add documentation to all the `pr-toggle-' commands.
+
+2011-07-11  Leo  <sdl.web@gmail.com>  (tiny change)
+
+        * files.el (toggle-read-only): Only do the `C-x C-q' warning on VC
+        backends where it makes sense (bug#2623).
+
+2011-07-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * dired-x.el (dired-guess-default): Remove duplicate shell command
+        entries (bug#2028).
+        (dired-guess-default): Fix grammar in doc string (bug#2028).
+        (dired-guess-shell-alist-user): Clarify the example a bit (bug#2030).
+
+        * subr.el (remove-duplicates): New conveniency function.
+
+2011-07-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * tool-bar.el (tool-bar-mode): Clarify positive/negative arguments
+        (bug#1526).
+
+2011-07-10  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (display-buffer-normalize-default): Don't invert
+        meaning of even-window-heights.  Reported by Eli Zaretskii
+        <eliz@gnu.org>.
+
+2011-07-10  Bob Rogers  <rogers@rgrjr.dyndns.org>
+
+        * vc/vc.el (vc-diff-internal): Fix race condition (Bug#1256).
+
+2011-07-10  Chong Yidong  <cyd@stupidchicken.com>
+
+        * window.el (display-buffer): Fix arguments to
+        display-buffer-reuse-window in last change.
+
+        * faces.el (link): Use a less saturated blue on light backgrounds.
+
+        * startup.el (fancy-startup-text, fancy-about-text)
+        (fancy-startup-tail): Use font-lock faces, for background safety.
+
+2011-07-09  Bob Nnamtrop  <bobnnamtrop@gmail.com>  (tiny change)
+
+        * emulation/viper-cmd.el (viper-change-state-to-vi): Limit
+        triggering of abbrev expansion (Bug#9038).
+
+2011-07-09  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (display-buffer-default-specifiers): Remove.
+        (display-buffer-macro-specifiers): Remove default specifiers.
+        (display-buffer-alist): Default to nil.
+        (display-buffer-reuse-window): New optional argument
+        other-window.
+        (display-buffer-pop-up-window): Allow splitting internal
+        windows.  Check whether a live window was created.
+        (display-buffer-other-window-means-other-frame)
+        (display-buffer-normalize-arguments): Rename to
+        display-buffer-normalize-argument and rewrite.  Set the
+        other-window specifier.
+        (display-buffer-normalize-special): New function.
+        (display-buffer-normalize-options): Rename to
+        display-buffer-normalize-default and rewrite.
+        (display-buffer-normalize-options-inhibit): Remove.
+        (display-buffer-normalize-specifiers): Rewrite.
+        (display-buffer): Process other-window specifier and call
+        display-buffer-reuse-window with it.  Emulate Emacs 23 behavior
+        more faithfully.
+        (pop-up-windows, even-window-heights): Restore Emacs 23 default
+        values.
+        (display-buffer-alist-set): Don't handle 'unset default values.
+        (display-buffer-in-window, display-buffer-alist-set): Replace
+        symbol "dedicated" by "dedicate".  Reported by Tassilo Horn
+        <tassilo@member.fsf.org>.
+
+2011-07-09  Leo Liu  <sdl.web@gmail.com>
+
+        * register.el (insert-register): Restore accidental change on
+        2011-06-26.  (Bug#9028)
+
+2011-07-09  Glenn Morris  <rgm@gnu.org>
+
+        * subr.el (remq): Handle the empty list.  (Bug#9024)
+
+2011-07-08  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * mail/sendmail.el (send-mail-function): No longer delay custom
+        initialization.
+        * custom.el (custom-initialize-delay): Doc fix.
+
+2011-07-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * abbrev.el (expand-abbrev): Try to preserve point (bug#5805).
+
+2011-07-08  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-sh-handle-start-file-process): Use a
+        human-friendly prompt.
+
+2011-07-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * vc/vc-bzr.el (vc-bzr-revision-keywords): Remove svn, it's only
+        provided by a particular plugin.
+
+2011-07-08  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * mail/sendmail.el (sendmail-query-once): If we aren't allowed to
+        save customizations (with "emacs -Q"), just set the variable
+        instead of erroring out.
+
+        * mail/smtpmail.el (smtpmail-query-smtp-server): Ditto.
+
+2011-07-08  Juri Linkov  <juri@jurta.org>
+
+        * arc-mode.el (archive-zip-expunge, archive-zip-update)
+        (archive-zip-update-case): Use 7z if found by `executable-find'.
+        The order of searching the available programs is the same as in
+        `archive-zip-extract' (bug#8968).
+
+2011-07-07  Chong Yidong  <cyd@stupidchicken.com>
+
+        * menu-bar.el (menu-bar-line-wrapping-menu): Revert last change.
+        (menu-bar-options-menu): Tweak descriptions.
+
+2011-07-07  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * menu-bar.el (menu-bar-line-wrapping-menu): Make all the Options
+        menu items into verb phrases (bug#1421).  Also refill to fit under
+        80 columns.
+
+2011-07-07  Chong Yidong  <cyd@stupidchicken.com>
+
+        * info.el (info, Info-read-node-name-2, Info-read-node-name-1)
+        (Info-read-node-name): Doc fix (Bug#1084).
+
+        * thingatpt.el (forward-thing, bounds-of-thing-at-point)
+        (thing-at-point, beginning-of-thing, end-of-thing, in-string-p)
+        (end-of-sexp, beginning-of-sexp)
+        (thing-at-point-bounds-of-list-at-point, forward-whitespace)
+        (forward-symbol, forward-same-syntax, word-at-point)
+        (sentence-at-point): Doc fix (Bug#1144).
+
+2011-07-07  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * info.el (Info-mode-map): Remove S-TAB binding, since [backtab]
+        should cover it (bug#1281).
+
+        * cus-edit.el (custom-show): Mark as obsolete.
+
+        * net/network-stream.el (network-stream-open-starttls): If gnutls
+        negotiation fails, then possibly try again with a non-encrypted
+        connection (bug#9017).
+
+        * mail/smtpmail.el (smtpmail-stream-type): Note that `plain' can
+        be used.
+
+2011-07-07  Richard Stallman  <rms@gnu.org>
+
+        * mail/rmail.el (rmail-next-error-move): Use `compilation-message'
+        property, and handle its changed format.
+        Look for the correct line number.
+        Use file's line contents (but not past first =) to find
+        correct line in message.
+
+2011-07-07  Kenichi Handa  <handa@m17n.org>
+
+        * international/characters.el (build-unicode-category-table):
+        Delete it.
+        (unicode-category-table): Set it by unicode-property-table-internal.
+
+        * international/mule-cmds.el (char-code-property-alist): Move to
+        to src/chartab.c.
+        (get-char-code-property): Call unicode-property-table-internal to
+        load a file.  Call get-unicode-property-internal where necessary.
+        (put-char-code-property): Call unicode-property-table-internal to
+        load a file.  Call put-unicode-property-internal where necessary.
+        put-unicode-property-internal where necessary.
+        (char-code-property-description):
+        Call unicode-property-table-internal to load a file.
+
+        * international/charprop.el:
+        * international/uni-bidi.el:
+        * international/uni-category.el:
+        * international/uni-combining.el:
+        * international/uni-comment.el:
+        * international/uni-decimal.el:
+        * international/uni-decomposition.el:
+        * international/uni-digit.el:
+        * international/uni-lowercase.el:
+        * international/uni-mirrored.el:
+        * international/uni-name.el:
+        * international/uni-numeric.el:
+        * international/uni-old-name.el:
+        * international/uni-titlecase.el:
+        * international/uni-uppercase.el: Regenerate.
+
+        * loadup.el: Load international/charprop.el before
+        international/characters.
+
+2011-07-07  Chong Yidong  <cyd@stupidchicken.com>
+
+        * window.el (next-buffer, previous-buffer): Signal an error if
+        called from a minibuffer window.
+
+        * bindings.el: Revert 2011-07-04 change.
+
+2011-07-06  Richard Stallman  <rms@gnu.org>
+
+        * mail/rmailmm.el (rmail-mime-process): Use markers for buf positions.
+        (rmail-mime-insert-bulk, rmail-mime-insert-text):
+        Treat markers like ints.
+        (rmail-mime-entity): Doc fix.
+
+2011-07-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * mail/smtpmail.el (smtpmail-default-smtp-server): Made into a
+        defcustom again for backwards compatibility.
+
+        * simple.el (shell-command-on-region): Fill.
+
+        * dired-aux.el (dired-kill-line): Add a doc string.
+
+        * dabbrev.el (dabbrev-abbrev-char-regexp): Note that nil defaults
+        to "\\sw\\|\\s_" (bug#358).
+
+        * dired.el (dired-mode): Clarify "unmark or unflag" (bug#8770).
+        (dired-unmark-backward): Ditto.
+        (dired-flag-backup-files): Ditto.
+
+        * dired-x.el (dired-mark-sexp): Ditto.
+
+2011-07-06  Richard Stallman  <rms@gnu.org>
+
+        * mail/rmailmm.el: Give entity a new slot, TRUNCATED.
+        (rmail-mime-entity): New arg TRUNCATED.
+        (rmail-mime-entity-truncated, rmail-mime-entity-set-truncated):
+        New functions.
+        (rmail-mime-save): Warn if entity is truncated.
+        (rmail-mime-toggle-hidden): Likewise, for showing.
+        (rmail-mime-process-multipart): Record when an entity is truncated.
+
+        * mail/rmailmm.el (rmail-search-mime-message): Don't get confused
+        if ENTITY is a string.
+
+2011-07-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * emacs-lisp/lisp-mode.el (eval-defun-1): Update the documentation
+        of faces when `M-C-x'-ing their definitions (bug#8378).
+        Also clean up the code slightly.
+
+        * progmodes/grep.el (rgrep): Don't bind `process-connection-type',
+        because that makes the colours go away.
+
+        * mail/sendmail.el (send-mail-function): Change the default to
+        `sendmail-query-once'.
+        (sendmail-query-once): Add an autoload cookie.
+
+        * net/network-stream.el (network-stream-open-starttls): Try using
+        a plain connection even if the server offered STARTTLS, and we
+        kinda wanted to use it, if Emacs doesn't have any STARTTLS
+        capability.  This should make smtpmail.el work in slightly more
+        configurations.
+
+2011-07-06  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-compat.el (tramp-compat-pop-to-buffer-same-window):
+        New defun.
+        * net/tramp-cmds.el (tramp-append-tramp-buffers): Use it.
+
+2011-07-06  Michael R. Mauger  <mmaug@yahoo.com>
+
+        * progmodes/sql.el: Version 3.0
+        (sql-product-alist): Add product :completion-object,
+        :completion-column, and :statement attributes.
+        (sql-mode-menu, sql-interactive-mode-map): Fix List entries.
+        (sql-mode-syntax-table): Mark all punctuation.
+        (sql-font-lock-keywords-builder): Temporarily remove fallback on
+        ansi keywords.
+        (sql-regexp-abbrev, sql-regexp-abbrev-list): New functions.
+        (sql-mode-oracle-font-lock-keywords): Improve.
+        (sql-oracle-show-reserved-words): New function for development.
+        (sql-product-font-lock): Simplify for source code buffers.
+        (sql-product-syntax-table, sql-product-font-lock-syntax-alist):
+        New functions.
+        (sql-highlight-product): Set product specific syntax table.
+        (sql-mode-map): Add statement movement functions.
+        (sql-ansi-statement-starters, sql-oracle-statement-starters):
+        New variable.
+        (sql-statement-regexp, sql-beginning-of-statement)
+        (sql-end-of-statement, sql-signum): New functions.
+        (sql-buffer-live-p, sql=find-sqli-buffer): Add CONNECTION parameter.
+        (sql-show-sqli-buffer): Bug fix.
+        (sql-interactive-mode): Store connection data as buffer local.
+        (sql-connect): Add NEW-NAME parameter.  Redesign interaction
+        with sql-interactive-mode.
+        (sql-save-connection): Save buffer local settings.
+        (sql-connection-menu-filter): Change menu entry name.
+        (sql-product-interactive): Bug fix.
+        (sql-preoutput-hold): New variable.
+        (sql-interactive-remove-continuation-prompt): Bug fixes.
+        (sql-debug-redirect): New variable.
+        (sql-str-literal): New function.
+        (sql-redirect, sql-redirect-one, sql-redirect-value, sql-execute):
+        Redesign.
+        (sql-oracle-save-settings, sql-oracle-restore-settings)
+        (sql-oracle-list-all, sql-oracle-list-table): New functions.
+        (sql-completion-object, sql-completion-column)
+        (sql-completion-sqlbuf): New variables.
+        (sql-build-completions-1, sql-build-completions)
+        (sql-try-completion): New functions.
+        (sql-read-table-name): Use them.
+        (sql-contains-names): New buffer local variable.
+        (sql-list-all, sql-list-table): Use it.
+        (sql-oracle-completion-types): New variable.
+        (sql-oracle-completion-object, sql-sqlite-completion-object)
+        (sql-postgres-completion-object): New functions.
+
+2011-07-06  Glenn Morris  <rgm@gnu.org>
+
+        * window.el (pop-to-buffer): Doc fix.
+
+2011-07-06  Markus Heiser  <markus.heiser@darmarit.de>  (tiny change)
+
+        * progmodes/gud.el (gud-pdb-marker-regexp): Accept \r char (Bug#5653).
+
+2011-07-06  Chong Yidong  <cyd@stupidchicken.com>
+
+        * window.el (special-display-popup-frame): Doc fix (Bug#8853).
+
+        * info.el (Info-directory-toc-nodes): Minor doc fix (Bug#8833).
+
+2011-07-05  Chong Yidong  <cyd@stupidchicken.com>
+
+        * button.el (button): Inherit from link face.  Suggested by Dan
+        Nicolaescu.
+
+2011-07-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/gdb-mi.el: Fit in 80 columns.
+        (gdb-setup-windows, gdb-restore-windows): Avoid other-window and
+        switch-to-buffer.
+
+        * progmodes/which-func.el (which-func-ff-hook): Don't output a message
+        if imenu is simply not configured (bug#8941).
+
+2011-07-05  Ken Manheimer  <ken.manheimer@gmail.com>
+
+        * allout.el (allout-post-undo-hook): New allout outline-change
+        event hook to signal undo activity.
+        (allout-post-command-business): Run allout-post-undo-hook if an
+        undo just occurred.
+        (allout-after-copy-or-kill-hook, allout-mode): Minor docstring changes.
+        * allout-widgets.el (allout-widgets-after-undo-function):
+        Ensure the integrity of the current item's decoration after it has been
+        in the vicinity of an undo.
+        (allout-widgets-mode): Include allout-widgets-after-undo-function
+        on the new allout-post-undo-hook.
+
+2011-07-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/lisp-mode.el (lisp-interaction-mode-abbrev-table):
+        Let define-derived-mode define it.
+        * emacs-lisp/derived.el (define-derived-mode): Try to avoid creating
+        cycles of abbrev-table inheritance (bug#8998).
+
+2011-07-05  Roland Winkler  <winkler@gnu.org>
+
+        * textmodes/bibtex.el: Add support for biblatex.
+        (bibtex-BibTeX-entry-alist, bibtex-biblatex-entry-alist)
+        (bibtex-BibTeX-field-alist, bibtex-biblatex-field-alist)
+        (bibtex-dialect-list, bibtex-dialect, bibtex-no-opt-remove-re)
+        (bibtex-entry-alist, bibtex-field-alist): New variables.
+        (bibtex-entry-field-alist): Obsolete alias for
+        bibtex-BibTeX-entry-alist.
+        (bibtex-entry-alist, bibtex-field-alist): New widgets.
+        (bibtex-set-dialect): New command.
+        (bibtex-entry-type, bibtex-entry-head)
+        (bibtex-entry-maybe-empty-head, bibtex-any-valid-entry-type):
+        Bind via bibtex-set-dialect.
+        (bibtex-Article, bibtex-Book, bibtex-Booklet, bibtex-InBook)
+        (bibtex-InCollection, bibtex-InProceedings, bibtex-Manual)
+        (bibtex-MastersThesis, bibtex-Misc, bibtex-PhdThesis)
+        (bibtex-Proceedings, bibtex-TechReport, bibtex-Unpublished):
+        Define via bibtex-set-dialect.
+        (bibtex-name-in-field, bibtex-remove-OPT-or-ALT):
+        Obey bibtex-no-opt-remove-re.
+        (bibtex-vec-push, bibtex-vec-incr): New functions.
+        (bibtex-format-entry, bibtex-field-list)
+        (bibtex-print-help-message, bibtex-validate)
+        (bibtex-search-entries): Use new format of bibtex-entry-alist.
+
+2011-07-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/compile.el (compilation-goto-locus):
+        * net/tramp-cmds.el (tramp-append-tramp-buffers):
+        * bs.el (bs-cycle-next, bs-cycle-previous):
+        * bookmark.el (bookmark-bmenu-list, bookmark-bmenu-2-window):
+        * bindings.el (mode-line-other-buffer):
+        * autoinsert.el (auto-insert):
+        * arc-mode.el (archive-extract):
+        * abbrev.el (edit-abbrevs): Fix some uses of switch-to-buffer.
+
+2011-07-05  Juanma Barranquero  <lekktu@gmail.com>
+
+        * emacs-lock.el (emacs-lock-mode): Fix typo in variable name.
+        Fix check of `emacs-lock-unlockable-modes'.
+        Coerce true values of `emacs-lock--try-unlocking' to t.
+
+2011-07-05  Juanma Barranquero  <lekktu@gmail.com>
+
+        * obsolete/old-emacs-lock.el: Rename from emacs-lock.el.
+        * emacs-lock.el: New file.
+
+2011-07-05  Julien Danjou  <julien@danjou.info>
+
+        * textmodes/rst.el (rst-define-level-faces): Use `facep' rather
+        than `boundp' to check if face is set.
+
+2011-07-05  Juanma Barranquero  <lekktu@gmail.com>
+
+        * register.el (registerv-make):
+        * window.el (window-min-height): Fix typos in docstrings.
+
+2011-07-05  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * dynamic-setting.el (dynamic-setting-handle-config-changed-event):
+        Update doc string.
+
+2011-07-04  Juanma Barranquero  <lekktu@gmail.com>
+
+        * server.el (server-execute): Catch quit and call
+        `server-return-error' to pass the error back to emacsclient and
+        close the connection (bug#8942).
+
+2011-07-04  Ken Manheimer  <ken.manheimer@gmail.com>
+
+        * allout.el (allout-encrypt-unencrypted-on-saves): Do not provide
+        insecure exception for current topic.  Also note that auto-saves
+        are handled differently.
+
+        (allout-auto-save-temporarily-disabled), (allout-just-did-undo):
+        State variables for tracking auto-save inhibition situation.
+
+        (allout-write-contents-hook-handler): Rename from
+        'allout-write-file-hook-handler', and describe how it depends on
+        write-contents-functions sensitivity to non-nil value to prevent
+        file write.
+
+        (allout-auto-save-hook-handler): Remove.  auto-save does not check
+        this in individual buffers, only in the starting buffer, so this
+        is not the right way for us to inhibit auto-save in a buffer
+        according to its condition.
+
+        (allout-mode): Use new allout-write-contents-hook-handler, and
+        only with write-contents-functions.  Remove auto-save provisions -
+        they're implemented elsewhere.
+
+        (allout-before-change-handler): If undo is in progress, note that
+        for attention of allout-post-command-business.
+
+        (allout-post-command-business): If the command we're following was
+        an undo, check for change in the status of encrypted items and
+        adjust auto-save inhibitions accordingly.
+
+        (allout-toggle-subtree-encryption): Adjust auto-save inhibition
+        according to whether there are or aren't any plain-text topics
+        pending encryption.
+
+        (allout-inhibit-auto-save-info-for-decryption):
+        Adjust buffer-saved-size and some allout state to inhibit auto-saves if
+        there are plain-text topics pending encryption.
+
+        (allout-maybe-resume-auto-save-info-after-encryption): Adjust
+        buffer-saved-size and some allout state to not inhibit auto-saves
+        if there are no longer any plain-text topics pending encryption.
+
+        (allout-next-topic-pending-encryption, allout-encrypt-decrypted):
+        No longer provide for exemption of the current topic.
+
+2011-07-04  Juri Linkov  <juri@jurta.org>
+
+        Add 7z operations to delete and save changed members (bug#8968).
+        * arc-mode.el (archive-7z-expunge, archive-7z-update):
+        New defcustoms.
+        (archive-7z-write-file-member): New function.
+        (archive-7z-summarize): Fix the number of dashes in the
+        listing output.
+
+2011-07-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * pcmpl-linux.el (pcomplete-pare-list): Re-add, from pcomplete.el
+        (bug#8958).
+
+2011-07-04  Chong Yidong  <cyd@stupidchicken.com>
+
+        * bindings.el: Ignore next-buffer and previous-buffer in
+        minibuffer-local-map.
+
+        * font-lock.el (font-lock-builtin-face): Change light background
+        color to dark slate blue (Bug#6693).
+
+2011-07-04  Wang Diancheng  <dcwang@kingbase.com.cn>  (tiny change)
+
+        * progmodes/gdb-mi.el (gdb): Use completion-at-point.
+
+2011-07-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * files.el (find-file): Use pop-to-buffer-same-window (bug#8911).
+        * emacs-lisp/bytecomp.el (byte-compile-interactive-only-functions):
+        Add switch-to-buffer.
+
+2011-07-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * isearch.el (isearch-search-fun-function): Clarify further the
+        meaning of the function returned.
+
+2011-07-04  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-cmds.el (tramp-cleanup-this-connection): New command.
+
+        * net/tramp-sh.el (tramp-color-escape-sequence-regexp): New defconst.
+        (tramp-sh-handle-insert-directory, tramp-convert-file-attributes):
+        Use it.
+        (tramp-remote-path): Add "/bin" and "/usr/bin".  On busyboxes,
+        `tramp-default-remote-path' does not exist.
+        (tramp-send-command-and-read): New optional argument NOERROR.
+        (tramp-open-connection-setup-interactive-shell)
+        (tramp-get-remote-path, tramp-get-remote-stat): Use it.
+        (tramp-get-remote-readlink): Do not mask with `ignore-errors'.
+        (tramp-process-sentinel): Flush also process' connection property.
+        (tramp-sh-handle-start-file-process): Do not set process
+        sentinel.  It is done now ...
+        (tramp-maybe-open-connection): ... here.  (Bug#8929)
+
+2011-07-04  MON KEY  <monkey@sandpframing.com>
+
+        * play/animate.el (animate-string): Doc fixes and allow changing
+        the buffer name (bug#5417).
+
+2011-07-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * play/animate.el (animation-buffer-name): Rename from *animate*.
+
+2011-07-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * emacs-lisp/timer.el: Use time-date fns rather than rolling our own.
+        This is simpler and helps future-proof the code.
+        (timer-until): Use time-subtract and float-time.
+        (timer--time-less-p): Use time-less-p.
+
+2011-07-04  Juanma Barranquero  <lekktu@gmail.com>
+
+        * type-break.el (timep): Use the value of `float-time' to avoid a
+        byte-compiler warning.
+
+        * server.el (server-eval-and-print): Return any result, even nil.
+
+2011-07-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * type-break.el: Accept time formats that the builtins accept.
+        (timep, type-break-time-difference): Accept any format that
+        float-time accepts, rather than insisting on (HIGH LOW USECS) format.
+        This is simpler and helps future-proof the code.
+        (type-break-time-difference): Round rather than ignoring
+        subseconds components.
+
+2011-07-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * info.el (Info-apropos-matches): Make non-interactive, since it
+        doesn't seem to do anything useful as a command (bug#8829).
+
+2011-07-03  Chong Yidong  <cyd@stupidchicken.com>
+
+        * frame.el (frame-background-mode, frame-set-background-mode):
+        Move from faces.el.
+        (frame-default-terminal-background): New function.
+
+        * custom.el (custom-push-theme): Don't record faces in `changed'
+        theme; this doesn't work correctly for per-frame face settings.
+        (disable-theme): Use face-set-after-frame-default to reset faces.
+        (custom--frame-color-default): New function.
+
+2011-07-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * dired.el (dired-flagging-regexp): Remove unused variable
+        (bug#8769).
+
+2011-03-29  Kevin Ryde  <user42@zip.com.au>
+
+        * progmodes/compile.el (compilation-error-regexp-alist-alist):
+        `perl-Test2' extend to match possible "fail #N" rep count
+        (bug#8377).
+
+2011-07-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * mail/feedmail.el (feedmail-buffer-to-smtpmail):
+        `smtpmail-via-smtp' now returns the error instead of nil.
+
+        * isearch.el (isearch-search-fun-function): Clarify the doc string
+        (bug#8101).
+
+2011-07-03  Richard Kim  <emacs18@gmail.com>  (tiny change)
+
+        * textmodes/texnfo-upd.el (texinfo-insert-menu): Don't insert
+        unnecessary spaces (bug#8987).
+
+2011-07-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * net/network-stream.el (open-network-stream): Use the
+        :end-of-capability command thoughout.
+
+2011-07-03  Wolfgang Jenkner  <wjenkner@inode.at>  (tiny change)
+
+        * net/network-stream.el (open-network-stream): Add the
+        :end-of-capability command parameter, used by pop3.el.
+
+2011-07-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * dired.el (dired-map-over-marks): Refill the doc string (bug#6814).
+
+        * fringe.el (fringe-query-style): Remove redundant text " (type ?
+        for list)" (bug#6475).
+
+        * files.el (file-expand-wildcards): Ignore non-readable
+        sub-directories while trying to find matches instead of signalling
+        an error (bug#6297).
+
+        * man.el (Man-reference-regexp): Allow matching possible
+        word-wrapped references (bug#6289).
+
+        * vc/vc.el (vc-modify-change-comment): Change *VC-log* to *vc-log*
+        for consistency with the other vc buffers (bug#6197).
+        (vc-checkin): Ditto.
+
+        * vc/vc-arch.el: Fix comments to match the *VC-log* name change.
+
+        * longlines.el (longlines-mode): Document what ARG does (bug#6150).
+
+2011-07-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * custom.el (defcustom): Clarify that :set is only used in the
+        Customize user interface (bug#6089).
+
+        * progmodes/flymake.el (flymake-mode): If the buffer isn't
+        associated with a file, refuse to run instead of erroring out
+        (bug#6084).
+
+        * textmodes/fill.el (fill-region): Remove the "Ordinarily" from
+        the doc string, since it appears that using `fill-column' always
+        controls the width (bug#7845).
+
+        * simple.el (shell-command-on-region): Say where the error output
+        went if `shell-command-default-error-buffer' is set (bug#6857).
+
+2011-07-02  Ken Manheimer  <ken.manheimer@gmail.com>
+
+        * allout.el (allout-yank-processing): Adjust cursor position for
+        backwards-deleted space.
+
+        (allout-rebullet-heading): Register changes with
+        allout-exposure-changed-hook, so the modified topic is properly
+        decorated.
+
+2011-07-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * minibuffer.el (completion-in-region): Document PREDICATE
+        (bug#7136).
+
+        * info-look.el (info-lookup-add-help): Clarify that ARGS is a list
+        of keyword/argument pairs (bug#6904).
+
+        * replace.el (multi-occur):
+        Mention `multi-occur-in-matching-buffers' in the doc string (bug#7566).
+
+2011-07-02  Drew Adams  <drew.adams@oracle.com>
+
+        * dired.el (dired-mark-if): Make the message about whether it's
+        marking or unmarking clearer (bug#8523).
+
+2011-07-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * disp-table.el (display-table-print-array): New function.
+        (describe-display-table): Use it to print the vectors more pretty
+        (Bug#8859).
+
+2011-07-02  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (window-state-get-1): Don't assign clone numbers.
+        Add clone-of item to list of window parameters.
+        (window-state-put-2): Don't process clone numbers.
+        (display-buffer-alist): Fix doc-string.
+
+2011-07-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * subr.el (remq): Don't allocate if it's not needed.
+        (keymap--menu-item-binding, keymap--menu-item-with-binding)
+        (keymap--merge-bindings): New functions.
+        (keymap-canonicalize): Use them to refine the canonicalization.
+        * minibuffer.el (minibuffer-local-completion-map)
+        (minibuffer-local-must-match-map): Move initialization from C.
+        (minibuffer-local-filename-completion-map): Move initialization from C;
+        don't inherit from anything here.
+        (minibuffer-local-filename-must-match-map): Make obsolete.
+        (completing-read-default): Use make-composed-keymap to combine
+        minibuffer-local-filename-completion-map with either
+        minibuffer-local-must-match-map or
+        minibuffer-local-filename-completion-map.
+
+2011-07-01  Glenn Morris  <rgm@gnu.org>
+
+        * type-break.el (type-break-time-sum): Use dolist.
+
+        * textmodes/flyspell.el (flyspell-word-search-backward):
+        Replace CL function.
+
+2011-07-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * mouse.el (mouse--strip-first-event): New function.
+        (function-key-map): Use it to map fringe clicks to normal clicks
+        by default.
+
+        * vc/vc-bzr.el (vc-bzr-revision-keywords): Update.
+        (vc-bzr-revision-completion-table): Add support for annotate and date.
+
+        * emacs-lisp/derived.el (define-derived-mode): Make abbrev-table
+        inherit from parent.
+
+2011-07-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * dired-aux.el (dired-diff): Doc fixup (bug#8816).
+        (dired-show-file-type): Doc fixup (bug#8818).
+
+        * dired.el (dired-mode): Fix up the doc string as suggested by
+        Drew Adams (bug#8817).
+
+        * progmodes/flymake.el (flymake-find-file-hook): Add an `autoload'
+        cookie, since the manual says that it should be possible to add
+        this function to `find-file-hook' (bug#8709).
+
+2011-07-01  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * progmodes/cfengine.el: Moved all cfengine3.el functionality
+        here.  Noted Ted Zlatanov as the maintainer.
+        (cfengine-common-settings, cfengine-common-syntax): New functions
+        to set up common things between `cfengine-mode' and
+        `cfengine3-mode'.
+        (cfengine3-mode): New mode.
+        (cfengine3-defuns cfengine3-defuns-regex
+        (cfengine3-class-selector-regex cfengine3-category-regex)
+        (cfengine3-vartypes cfengine3-font-lock-keywords)
+        (cfengine3-beginning-of-defun, cfengine3-end-of-defun)
+        (cfengine3-indent-line): Add from cfengine3.el.
+
+2011-07-01  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-encoding-command-interactive): New defcustom.
+
+        * net/tramp-sh.el (tramp-maybe-open-connection): Use it.
+
+2011-07-01  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (same-window-buffer-names, same-window-regexps)
+        (same-window-p, special-display-frame-alist)
+        (special-display-popup-frame, special-display-function)
+        (special-display-buffer-names, special-display-regexps)
+        (special-display-p, pop-up-frame-alist, pop-up-frame-function)
+        (pop-up-frames, display-buffer-reuse-frames, pop-up-windows)
+        (split-window-preferred-function, split-height-threshold)
+        (split-width-threshold, even-window-heights)
+        (display-buffer-mark-dedicated, window-splittable-p)
+        (split-window-sensibly, window-safely-shrinkable-p):
+        Un-obsolete.
+        (display-buffer): Don't spread args with function specifier
+        because special-display-popup-frame won't like it.
+
+2011-07-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Time-stamp simplifications and fixes.
+        These improve accuracy slightly, and future-proof the code
+        against some potential changes to current-time format.
+
+        * woman.el (woman-decode-buffer, WoMan-log-end): Log fractional secs
+        by using time-since and float-time.
+
+        * vc/ediff-util.el (ediff-calc-command-time): Use time-since
+        and float-time.  Say "NNN.NNN seconds" rather than "NNN seconds
+        + NNN microseconds".
+
+        * type-break.el (type-break-time-sum): Rewrite using time-add.
+
+        * play/hanoi.el (hanoi-current-time-float): Remove.
+        All uses replaced by float-time.
+
+        * nxml/rng-maint.el (rng-time-function): Rewrite using time-subtract.
+        This yields a more-accurate answer.
+        (rng-time-to-float): Remove; no longer needed.
+
+        * emacs-lisp/timer.el (timer-relative-time): Use time-add.
+
+        * calendar/timeclock.el (timeclock-seconds-to-time):
+        Defalias to seconds-to-time, since they're the same thing.
+
+        * emacs-lisp/elp.el (elp-elapsed-time):
+        * emacs-lisp/benchmark.el (benchmark-elapse):
+        * allout-widgets.el (allout-elapsed-time-seconds): Use float-time.
+
+2011-07-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * window.el (bury-buffer): Don't iconify the only frame.
+        (switch-to-buffer): Revert to Emacs<23 behavior, i.e. do not fallback
+        to pop-to-buffer.  Use pop-to-buffer-same-frame if you don't like that.
+
+2011-07-01  Chong Yidong  <cyd@stupidchicken.com>
+
+        * eshell/em-smart.el (eshell-smart-display-navigate-list):
+        Add mouse-yank-primary.
+
+2011-07-01  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * progmodes/cfengine3.el: New file to support CFEngine 3.x.
+
+2011-07-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/find-func.el (find-library--load-name): New fun.
+        (find-library-name): Use it to find relative load names when provided
+        absolute file name (bug#8803).
+
+2011-06-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * textmodes/flyspell.el (flyspell-word): Consider words that
+        differ only in case as potential doublons (bug#5687).
+
+        * net/soap-client.el (soap-invoke, soap-wsdl-resolve-references):
+        Remove two rather uninteresting debugging-like messages to make
+        debbugs.el more silent.
+
+        * comint.el (comint-password-prompt-regexp): Accept "Response" as
+        a password-like phrase.
+
+2011-06-30  Mastake YAMATO  <yamato@redhat.com>
+
+        * progmodes/cc-guess.el: New file.
+
+        * progmodes/cc-langs.el (c-mode-menu): Add "Style..." submenu.
+
+        * progmodes/cc-styles.el (cc-choose-style-for-mode): New function
+        derived from `c-basic-common-init'.
+
+        * progmodes/cc-mode.el (top-level): Require cc-guess.
+        (c-basic-common-init): Use `cc-choose-style-for-mode'.
+
+2011-06-30  Lawrence Mitchell  <wence@gmx.li>
+
+        * progmodes/js.el (js-mode): Don't stomp on global settings (bug#8933).
+
+2011-06-30  Alan Mackenzie  <acm@muc.de>
+
+        * progmodes/cc-engine.el (c-guess-continued-construct):
+        Correct the handling of template-args-cont, particularly for when font
+        lock is disabled.  Name this case as "CASE G".
+
+2011-06-30  Ken Manheimer  <ken.manheimer@gmail.com>
+
+        * allout.el (allout-yank-processing): Fix injection of extra space
+        between bullet and non-whitespace character in first topic when
+        pasting, ensuring that the actual spacing in the pasted topic
+        following the bullet char is preserved.  This extra space was
+        causing pasted encrypted topics to get a decrypted status even
+        when the content was actually still encrypted.  Now the decryption
+        status from before the paste is preserved.
+
+        (allout-flag-region): Set all allout overlays so they evaporate
+        when reduced to zero length (evanescent), to prevent overlay
+        leakage.
+
+2011-06-30  Glenn Morris  <rgm@gnu.org>
+
+        * w32-fns.el (w32-charset-info-alist): Declare.
+
+        * find-dired.el (find-grep-options): Simplify.
+
+        * term/ns-win.el (ns-set-resource): Declare.
+
+        * ses.el (row, col): Declare dynamic variables honestly.
+
+        * textmodes/reftex-parse.el (index-tags): Declare.
+
+2011-06-30  Chong Yidong  <cyd@stupidchicken.com>
+
+        * cus-edit.el (customize-push-and-save): New function.
+
+        * files.el (hack-local-variables-confirm): Use it.
+
+        * custom.el (load-theme): New arg NO-CONFIRM.
+        Use customize-push-and-save (Bug#8720).
+        (custom-enabled-themes): Doc fix.
+
+        * cus-theme.el (customize-create-theme)
+        (custom-theme-merge-theme): Callers to load-theme changed.
+
+2011-06-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * thingatpt.el (thing-at-point-short-url-regexp): Require that
+        short URLs have at least one dot in them (bug #7614).
+
+        * progmodes/grep.el (rgrep): Bind `process-connection-type' to
+        nil, because using a pty is apparently too slow (bug #895).
+
+2011-06-29  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * mail/sendmail.el (sendmail-query-once): New function.
+        (sendmail-query-once-function): New variable.
+
+2011-06-29  Glenn Morris  <rgm@gnu.org>
+
+        * files.el (auto-mode-alist): Add .f03, .f08 for f90-mode.
+
+        * ses.el (top-level): Require cl when compiling.
+        (ses-set-localvars): Fix error statement.
+        Call it at compile time to silence a storm of warnings.
+
+2011-06-29  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (normalize-live-buffer): Rename to
+        window-normalize-buffer.
+        (normalize-live-frame): Rename to window-normalize-frame.
+        (normalize-any-window): Rename to window-normalize-any-window.
+        (normalize-live-window): Rename to window-normalize-live-window.
+        (make-window-atom): Rename to window-make-atom.
+        (window-resize-reset): Rename to window--resize-reset.
+        (window-resize-reset-1): Rename to window--resize-reset-1.
+        (resize-mini-window): Rename to window--resize-mini-window.
+        (resize-subwindows-skip-p): Rename to
+        window--resize-subwindows-skip-p.
+        (resize-subwindows-normal): Rename to
+        window--resize-subwindows-normal.
+        (resize-subwindows): Rename to window--resize-subwindows.
+        (resize-other-windows): Rename to window--resize-siblings.
+        (resize-this-window): Rename to window--resize-this-window.
+        (resize-root-window): Rename to window--resize-root-window.
+        (resize-root-window-vertically): Rename to
+        window--resize-root-window-vertically.
+        (normalize-buffer-to-display): Rename to
+        window-normalize-buffer-to-display.
+        (normalize-buffer-to-switch-to): Rename to
+        window-normalize-buffer-to-switch-to.
+        Correspondingly update all callers of the functions listed
+        above.
+        (display-buffer-alist, display-buffer-normalize-arguments)
+        (display-buffer-normalize-options, display-buffer)
+        (display-buffer-alist-set): Use "function" instead of
+        "fun-with-args".
+
 2011-06-28  Chong Yidong  <cyd@stupidchicken.com>
 
         * mail/emacsbug.el (report-emacs-bug): Handle non-gnu bug
@@ -23,8 +1242,8 @@
 
 2011-06-28  Deniz Dogan  <deniz@dogan.se>
 
-        * emacs-lisp/lisp-mode.el (emacs-lisp-mode-syntax-table): Unnest
-        `let'.
+        * emacs-lisp/lisp-mode.el (emacs-lisp-mode-syntax-table):
+        Unnest `let'.
 
         * textmodes/css-mode.el (css-font-lock-keywords): Fix grouped
         selectors (Bug#5732).
@@ -112,7 +1331,7 @@
         (ses-cell-symbol): Set macro as safe, so that it can be used in
         formulas.
 
-        * ses.el:  Update cycle detection algorithm.
+        * ses.el: Update cycle detection algorithm.
         (ses-localvars): Add ses--Dijkstra-attempt-nb and
         ses--Dijkstra-weight-bound, and initial values thereof when applicable.
         (ses-set-localvars): New function.
diff --git a/lisp/ChangeLog.14 b/lisp/ChangeLog.14
index c1313cfd16f..eeed5d7797c 100644
--- a/lisp/ChangeLog.14
+++ b/lisp/ChangeLog.14
@@ -4421,7 +4421,7 @@
 2008-12-06  Chong Yidong  <cyd@stupidchicken.com>
 
         * term/xterm.el (terminal-init-xterm): Discard pending input
-        before reading a reply to the terminal attributes query.
+        before reading a reply to the terminal attributes query.  (Bug#1495)
 
 2008-12-05  Andreas Schwab  <schwab@suse.de>
 
diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15
index 3cb6c00b6ee..190be56dd09 100644
--- a/lisp/ChangeLog.15
+++ b/lisp/ChangeLog.15
@@ -8424,7 +8424,7 @@
 
         * dabbrev.el (dabbrev-completion): Fix typo in docstring.
 
-2010-08-08  MON KEY  <monkey@sandpframing.com>  (tiny change)
+2010-08-08  MON KEY  <monkey@sandpframing.com>
 
         * emacs-lisp/syntax.el (syntax-ppss-toplevel-pos):
         Fix typo in docstring (bug#6747).
diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6
index 2f73c290231..7ba9261ccf0 100644
--- a/lisp/ChangeLog.6
+++ b/lisp/ChangeLog.6
@@ -6892,7 +6892,7 @@
         (find-file-noselect): Use it if new optional argument `rawfile' is
         non-nil.
 
-        * startup.el (command-line-1): Add option --eval to evalute an
+        * startup.el (command-line-1): Add option --eval to evaluate an
         expression on the command line and print the result.
 
 1995-08-14  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index 9445cf9675c..3795dd46010 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -159,7 +159,7 @@ where NAME and EXPANSION are strings with quotes,
 USECOUNT is an integer, and HOOK is any valid function
 or may be omitted (it is usually omitted)."
   (interactive)
-  (switch-to-buffer (prepare-abbrev-list-buffer)))
+  (pop-to-buffer-same-window (prepare-abbrev-list-buffer)))
 
 (defun edit-abbrevs-redefine ()
   "Redefine abbrevs according to current buffer contents."
@@ -814,19 +814,28 @@ Returns the abbrev symbol, if expansion took place."
     (destructuring-bind (&optional sym name wordstart wordend)
         (abbrev--before-point)
       (when sym
-        (unless (or ;; executing-kbd-macro
-                 noninteractive
-                 (window-minibuffer-p (selected-window)))
-          ;; Add an undo boundary, in case we are doing this for
-          ;; a self-inserting command which has avoided making one so far.
-          (undo-boundary))
-        ;; Now sym is the abbrev symbol.
-        (setq last-abbrev-text name)
-        (setq last-abbrev sym)
-        (setq last-abbrev-location wordstart)
-        ;; If this abbrev has an expansion, delete the abbrev
-        ;; and insert the expansion.
-        (abbrev-insert sym name wordstart wordend)))))
+        (let ((startpos (copy-marker (point) t))
+              (endmark (copy-marker wordend t)))
+          (unless (or ;; executing-kbd-macro
+                   noninteractive
+                   (window-minibuffer-p (selected-window)))
+            ;; Add an undo boundary, in case we are doing this for
+            ;; a self-inserting command which has avoided making one so far.
+            (undo-boundary))
+          ;; Now sym is the abbrev symbol.
+          (setq last-abbrev-text name)
+          (setq last-abbrev sym)
+          (setq last-abbrev-location wordstart)
+          ;; If this abbrev has an expansion, delete the abbrev
+          ;; and insert the expansion.
+          (prog1
+              (abbrev-insert sym name wordstart wordend)
+            ;; Yuck!!  If expand-abbrev is called with point slightly
+            ;; further than the end of the abbrev, move point back to
+            ;; where it started.
+            (if (and (> startpos endmark)
+                     (= (point) endmark)) ;Obey skeletons that move point.
+                (goto-char startpos))))))))
 
 (defun unexpand-abbrev ()
   "Undo the expansion of the last abbrev that expanded.
diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el
index 0f1fe850123..ef75e7157e6 100644
--- a/lisp/allout-widgets.el
+++ b/lisp/allout-widgets.el
@@ -561,6 +561,8 @@ outline hot-spot navigation \(see `allout-mode')."
                   'allout-widgets-shifts-recorder nil 'local)
         (add-hook 'allout-after-copy-or-kill-hook
                   'allout-widgets-after-copy-or-kill-function nil 'local)
+        (add-hook 'allout-post-undo-hook
+                  'allout-widgets-after-undo-function nil 'local)
 
         (add-hook 'before-change-functions 'allout-widgets-before-change-handler
                   nil 'local)
@@ -1130,6 +1132,14 @@ Dispatched by `allout-widgets-post-command-business' in response to
 Intended for use on allout-after-copy-or-kill-hook."
   (if (car kill-ring)
       (setcar kill-ring (allout-widgets-undecorate-text (car kill-ring)))))
+;;;_   > allout-widgets-after-undo-function ()
+(defun allout-widgets-after-undo-function ()
+  "Do allout-widgets processing of text after an undo.
+
+Intended for use on allout-post-undo-hook."
+  (save-excursion
+    (if (allout-goto-prefix)
+        (allout-redecorate-item (allout-get-or-create-item-widget)))))
 
 ;;;_   > allout-widgets-exposure-undo-recorder (widget from-state)
 (defun allout-widgets-exposure-undo-recorder (widget)
@@ -2324,9 +2334,7 @@ We use a caching strategy, so the caller doesn't need to do so."
 (defun allout-elapsed-time-seconds (end start)
   "Return seconds between `current-time' style time START/END triples."
   (let ((elapsed (time-subtract end start)))
-    (+ (* (car elapsed) (expt 2.0 16))
-       (cadr elapsed)
-       (/ (caddr elapsed) (expt 10.0 6)))))
+    (float-time elapsed)))
 ;;;_  > allout-frame-property (frame property)
 (defalias 'allout-frame-property
   (cond ((fboundp 'frame-parameter)
diff --git a/lisp/allout.el b/lisp/allout.el
index 1d4d4a20e11..592a64c647a 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -823,37 +823,32 @@ formatted copy."
   :group 'allout-encryption)
 ;;;_  = allout-encrypt-unencrypted-on-saves
 (defcustom allout-encrypt-unencrypted-on-saves t
-  "When saving, should topics pending encryption be encrypted?
-
-The idea is to prevent file-system exposure of any un-encrypted stuff, and
-mostly covers both deliberate file writes and auto-saves.
-
- - Yes: encrypt all topics pending encryption, even if it's the one
-        currently being edited.  (In that case, the currently edited topic
-        will be automatically decrypted before any user interaction, so they
-        can continue editing but the copy on the file system will be
-        encrypted.)
-        Auto-saves will use the \"All except current topic\" mode if this
-        one is selected, to avoid practical difficulties -- see below.
- - All except current topic: skip the topic currently being edited, even if
-       it's pending encryption.  This may expose the current topic on the
-       file sytem, but avoids the nuisance of prompts for the encryption
-       passphrase in the middle of editing for, eg, autosaves.
-       This mode is used for auto-saves for both this option and \"Yes\".
- - No: leave it to the user to encrypt any unencrypted topics.
-
-For practical reasons, auto-saves always use the 'except-current policy
-when auto-encryption is enabled.  (Otherwise, spurious passphrase prompts
-and unavoidable timing collisions are too disruptive.)  If security for a
-file requires that even the current topic is never auto-saved in the clear,
-disable auto-saves for that file."
-
-  :type '(choice (const :tag "Yes" t)
-                 (const :tag "All except current topic" except-current)
-                 (const :tag "No" nil))
-  :version "22.1"
+  "If non-nil, topics pending encryption are encrypted during buffer saves.
+
+This provents file-system exposure of un-encrypted contents of
+items marked for encryption.
+
+When non-nil, if the topic currently being edited is decrypted,
+it will be encrypted for saving but automatically decrypted
+before any subsequent user interaction, so it is once again clear
+text for editing though the file system copy is encrypted.
+
+\(Auto-saves are handled differently.  Buffers with plain-text
+exposed encrypted topics are exempted from auto saves until all
+such topics are encrypted.)"
+
+  :type 'boolean
+  :version "23.1"
   :group 'allout-encryption)
 (make-variable-buffer-local 'allout-encrypt-unencrypted-on-saves)
+(defvar allout-auto-save-temporarily-disabled nil
+  "True while topic encryption is pending and auto-saving was active.
+
+The value of buffer-saved-size at the time of decryption is used,
+for restoring when all encryptions are established.")
+(defvar allout-just-did-undo nil
+  "True just after undo commands, until allout-post-command-business.")
+(make-variable-buffer-local 'allout-just-did-undo)
 
 ;;;_ + Developer
 ;;;_  = allout-developer group
@@ -1466,7 +1461,15 @@ This hook might be invoked multiple times by a single command.")
 (defvar allout-after-copy-or-kill-hook nil
   "*Hook that's run after copying outline text.
 
-Functions on the hook should not take any arguments.")
+Functions on the hook should not require any arguments.")
+;;;_   = allout-post-undo-hook
+(defvar allout-post-undo-hook nil
+  "*Hook that's run after undo activity.
+
+The item that's current when the hook is run *may* be the one
+that was affected by the undo.
+
+Functions on the hook should not require any arguments.")
 ;;;_   = allout-outside-normal-auto-fill-function
 (defvar allout-outside-normal-auto-fill-function nil
   "Value of normal-auto-fill-function outside of allout mode.
@@ -1564,39 +1567,43 @@ See `allout-encryption-ciphertext-rejection-regexps' for rejection reasons.")
 (defmacro allout-mode-p ()
   "Return t if `allout-mode' is active in current buffer."
   'allout-mode)
-;;;_   > allout-write-file-hook-handler ()
-(defun allout-write-file-hook-handler ()
-  "Implement `allout-encrypt-unencrypted-on-saves' policy for file writes."
+;;;_   > allout-write-contents-hook-handler ()
+(defun allout-write-contents-hook-handler ()
+  "Implement `allout-encrypt-unencrypted-on-saves' for file writes
+
+Return nil if all goes smoothly, or else return an informative
+message if an error is encountered.  The message will serve as a
+non-nil return on `write-contents-functions' to prevent saving of
+the buffer while it has decrypted content.
+
+This behavior depends on emacs versions that implement the
+`write-contents-functions' hook."
 
   (if (or (not (allout-mode-p))
           (not (boundp 'allout-encrypt-unencrypted-on-saves))
           (not allout-encrypt-unencrypted-on-saves))
       nil
-    (let ((except-mark (and (equal allout-encrypt-unencrypted-on-saves
-                                   'except-current)
-                            (point-marker))))
-      (if (save-excursion (goto-char (point-min))
-                          (allout-next-topic-pending-encryption except-mark))
-          (progn
-            (message "auto-encrypting pending topics")
-            (sit-for 0)
-            (condition-case failure
+    (if (save-excursion (goto-char (point-min))
+                        (allout-next-topic-pending-encryption))
+        (progn
+          (message "auto-encrypting pending topics")
+          (sit-for 0)
+          (condition-case failure
+              (progn
                 (setq allout-after-save-decrypt
-                      (allout-encrypt-decrypted except-mark))
-              (error (message
-                      "allout-write-file-hook-handler suppressing error %s"
-                      failure)
-                     (sit-for 2)))))
-      ))
-  nil)
-;;;_   > allout-auto-save-hook-handler ()
-(defun allout-auto-save-hook-handler ()
-  "Implement `allout-encrypt-unencrypted-on-saves' policy for auto save."
-
-  (if (and (allout-mode-p) allout-encrypt-unencrypted-on-saves)
-      ;; Always implement 'except-current policy when enabled.
-      (let ((allout-encrypt-unencrypted-on-saves 'except-current))
-        (allout-write-file-hook-handler))))
+                      (allout-encrypt-decrypted))
+                ;; aok - return nil:
+                nil)
+            (error
+             ;; whoops - probably some still-decrypted items, return non-nil:
+             (let ((text (format (concat "%s contents write inhibited due to"
+                                         " encrypted topic encryption error:"
+                                         " %s")
+                                 (buffer-name (current-buffer))
+                                 failure)))
+               (message text)(sit-for 2)
+               text)))))
+    ))
 ;;;_   > allout-after-saves-handler ()
 (defun allout-after-saves-handler ()
   "Decrypt topic encrypted for save, if it's currently being edited.
@@ -1875,6 +1882,7 @@ without changes to the allout core.  Here are key ones:
 `allout-structure-deleted-hook'
 `allout-structure-shifted-hook'
 `allout-after-copy-or-kill-hook'
+`allout-post-undo-hook'
 
                             Terminology
 
@@ -1960,12 +1968,7 @@ OPEN:	A TOPIC that is not CLOSED, though its OFFSPRING or BODY may be."
   :lighter " Allout"
   :keymap 'allout-mode-map
 
-  (let ((write-file-hook-var-name (cond ((boundp 'write-file-functions)
-                                         'write-file-functions)
-                                        ((boundp 'write-file-hooks)
-                                         'write-file-hooks)
-                                        (t 'local-write-file-hooks)))
-        (use-layout (if (listp allout-layout)
+  (let ((use-layout (if (listp allout-layout)
                         allout-layout
                       allout-default-layout)))
 
@@ -1984,9 +1987,8 @@ OPEN:	A TOPIC that is not CLOSED, though its OFFSPRING or BODY may be."
           (remove-hook 'post-command-hook 'allout-post-command-business t)
           (remove-hook 'before-change-functions 'allout-before-change-handler t)
           (remove-hook 'isearch-mode-end-hook 'allout-isearch-end-handler t)
-          (remove-hook write-file-hook-var-name
-                       'allout-write-file-hook-handler t)
-          (remove-hook 'auto-save-hook 'allout-auto-save-hook-handler t)
+          (remove-hook 'write-contents-functions
+                       'allout-write-contents-hook-handler t)
 
           (remove-overlays (point-min) (point-max)
                            'category 'allout-exposure-category))
@@ -2019,9 +2021,8 @@ OPEN:	A TOPIC that is not CLOSED, though its OFFSPRING or BODY may be."
       (add-hook 'post-command-hook 'allout-post-command-business nil t)
       (add-hook 'before-change-functions 'allout-before-change-handler nil t)
       (add-hook 'isearch-mode-end-hook 'allout-isearch-end-handler nil t)
-      (add-hook write-file-hook-var-name 'allout-write-file-hook-handler
+      (add-hook 'write-contents-functions 'allout-write-contents-hook-handler
                 nil t)
-      (add-hook 'auto-save-hook 'allout-auto-save-hook-handler nil t)
 
       ;; Stash auto-fill settings and adjust so custom allout auto-fill
       ;; func will be used if auto-fill is active or activated.  (The
@@ -2154,8 +2155,10 @@ internal functions use this feature cohesively bunch changes."
 
 See `allout-overlay-interior-modification-handler' for details."
 
-  (when (and (allout-mode-p) undo-in-progress (allout-hidden-p))
-    (allout-show-children))
+  (when (and (allout-mode-p) undo-in-progress)
+    (setq allout-just-did-undo t)
+    (if (allout-hidden-p)
+        (allout-show-children)))
 
   ;; allout-overlay-interior-modification-handler on an overlay handles
   ;; this in other emacs, via `allout-exposure-category's 'modification-hooks.
@@ -3308,12 +3311,30 @@ coordinating with allout activity.")
 - Implement (and clear) `allout-post-goto-bullet', for hot-spot
   outline commands.
 
+- If the command we're following was an undo, check for change in
+  the status of encrypted items and adjust auto-save inhibitions
+  accordingly.
+
 - Decrypt topic currently being edited if it was encrypted for a save."
 
-                                        ; Apply any external change func:
   (if (not (allout-mode-p))             ; In allout-mode.
       nil
 
+    (when allout-just-did-undo
+      (setq allout-just-did-undo nil)
+      (run-hooks 'allout-post-undo-hook)
+      (cond ((and (= buffer-saved-size -1)
+                  allout-auto-save-temporarily-disabled)
+             ;; user possibly undid a decryption, deinhibit auto-save:
+             (allout-maybe-resume-auto-save-info-after-encryption))
+            ((save-excursion
+               (save-restriction
+                 (widen)
+                 (goto-char (point-min))
+                 (not (allout-next-topic-pending-encryption))))
+             ;; plain-text encrypted items are present, inhibit auto-save:
+             (allout-inhibit-auto-save-info-for-decryption (buffer-size)))))
+
     (if (and (boundp 'allout-after-save-decrypt)
              allout-after-save-decrypt)
         (allout-after-saves-handler))
@@ -4036,6 +4057,8 @@ this function."
                (not (allout-encrypted-topic-p)))
           (allout-reindent-body current-depth new-depth))
 
+      (run-hook-with-args 'allout-exposure-change-hook mb me nil)
+
       ;; Recursively rectify successive siblings of orig topic if
       ;; caller elected for it:
       (if do-successors
@@ -4605,8 +4628,9 @@ however, are left exactly like normal, non-allout-specific yanks."
                                         ; and delete residual subj
                                         ; prefix digits and space:
                      (while (looking-at "[0-9]") (delete-char 1))
-                     (if (looking-at " ")
-                         (delete-char 1))))
+                     (delete-char -1)
+                     (if (not (eolp))
+                         (forward-char))))
                   ;; Assert new topic's bullet - minimal effort if unchanged:
                   (allout-rebullet-heading (string-to-char prefix-bullet)))
               (exchange-point-and-mark))))
@@ -4736,6 +4760,7 @@ arguments as this function, after the exposure changes are made."
   (when flag
     (let ((o (make-overlay from to nil 'front-advance)))
       (overlay-put o 'category 'allout-exposure-category)
+      (overlay-put o 'evaporate t)
       (when (featurep 'xemacs)
         (let ((props (symbol-plist 'allout-exposure-category)))
           (while props
@@ -5895,6 +5920,8 @@ See `allout-toggle-current-subtree-encryption' for more details."
                        " shift it in to make it encryptable")))
 
     (let* ((allout-buffer (current-buffer))
+           ;; for use with allout-auto-save-temporarily-disabled, if necessary:
+           (was-buffer-saved-size buffer-saved-size)
            ;; Assess location:
            (bullet-pos allout-recent-prefix-beginning)
            (after-bullet-pos (point))
@@ -5974,6 +6001,12 @@ See `allout-toggle-current-subtree-encryption' for more details."
            ;; Add the is-encrypted bullet qualifier:
            (goto-char after-bullet-pos)
            (insert "*"))))
+
+      ;; adjust buffer's auto-save eligibility:
+      (if was-encrypted
+          (allout-inhibit-auto-save-info-for-decryption was-buffer-saved-size)
+        (allout-maybe-resume-auto-save-info-after-encryption))
+
       (run-hook-with-args 'allout-structure-added-hook
                           bullet-pos subtree-end))))
 ;;;_  > allout-encrypt-string (text decrypt allout-buffer keymode-cue
@@ -6025,6 +6058,7 @@ signal."
                         (epg-context-set-passphrase-callback
                          context #'epa-passphrase-callback-function)
                         context))
+
          (encoding (with-current-buffer allout-buffer
                      buffer-file-coding-system))
          (multibyte (with-current-buffer allout-buffer
@@ -6146,8 +6180,29 @@ signal."
                          result-text))
       (error (concat "Encryption produced non-armored text, which"
                      "conflicts with allout mode -- reconfigure!")))
-
      (t result-text))))
+;;;_  > allout-inhibit-auto-save-info-for-decryption
+(defun allout-inhibit-auto-save-info-for-decryption (was-buffer-saved-size)
+  "Temporarily prevent auto-saves in this buffer when an item is decrypted.
+
+WAS-BUFFER-SAVED-SIZE is the value of buffer-saved-size *before*
+the decryption."
+  (when (not (or (= buffer-saved-size -1) (= was-buffer-saved-size -1)))
+    (setq allout-auto-save-temporarily-disabled was-buffer-saved-size
+          buffer-saved-size -1)))
+;;;_  > allout-maybe-resume-auto-save-info-after-encryption ()
+(defun allout-maybe-resume-auto-save-info-after-encryption ()
+  "Restore auto-save info, *if* there are no topics pending encryption."
+  (when (and allout-auto-save-temporarily-disabled
+             (= buffer-saved-size -1)
+             (save-excursion
+               (save-restriction
+                 (widen)
+                 (goto-char (point-min))
+                 (not (allout-next-topic-pending-encryption)))))
+    (setq buffer-saved-size allout-auto-save-temporarily-disabled
+          allout-auto-save-temporarily-disabled nil)))
+
 ;;;_  > allout-encrypted-topic-p ()
 (defun allout-encrypted-topic-p ()
   "True if the current topic is encryptable and encrypted."
@@ -6158,14 +6213,10 @@ signal."
          (save-match-data (looking-at "\\*")))
     )
   )
-;;;_  > allout-next-topic-pending-encryption (&optional except-mark)
-(defun allout-next-topic-pending-encryption (&optional except-mark)
+;;;_  > allout-next-topic-pending-encryption ()
+(defun allout-next-topic-pending-encryption ()
   "Return the point of the next topic pending encryption, or nil if none.
 
-EXCEPT-MARK identifies a point whose containing topics should be excluded
-from encryption.  This supports 'except-current mode of
-`allout-encrypt-unencrypted-on-saves'.
-
 Such a topic has the `allout-topic-encryption-bullet' without an
 immediately following '*' that would mark the topic as being encrypted.  It
 must also have content."
@@ -6200,10 +6251,7 @@ must also have content."
                (setq content-beg (point))
                (backward-char 1)
                (allout-end-of-subtree)
-               (if (or (<= (point) content-beg)
-                       (and except-mark
-                            (<= content-beg except-mark)
-                            (>= (point) except-mark)))
+               (if (<= (point) content-beg)
                    ;; Continue looking
                    (setq got nil)
                  ;; Got it!
@@ -6215,14 +6263,10 @@ must also have content."
       )
     )
   )
-;;;_  > allout-encrypt-decrypted (&optional except-mark)
-(defun allout-encrypt-decrypted (&optional except-mark)
+;;;_  > allout-encrypt-decrypted ()
+(defun allout-encrypt-decrypted ()
   "Encrypt topics pending encryption except those containing exemption point.
 
-EXCEPT-MARK identifies a point whose containing topics should be excluded
-from encryption.  This supports the `except-current' mode of
-`allout-encrypt-unencrypted-on-saves'.
-
 If a topic that is currently being edited was encrypted, we return a list
 containing the location of the topic and the location of the cursor just
 before the topic was encrypted.  This can be used, eg, to decrypt the topic
@@ -6238,7 +6282,7 @@ save.  See `allout-encrypt-unencrypted-on-saves' for more info."
              bo-subtree
              editing-topic editing-point)
         (goto-char (point-min))
-        (while (allout-next-topic-pending-encryption except-mark)
+        (while (allout-next-topic-pending-encryption)
           (setq was-modified (buffer-modified-p))
           (when (save-excursion
                   (and (boundp 'allout-encrypt-unencrypted-on-saves)
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index 0d129856f1d..ea875b9989d 100644
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -55,9 +55,9 @@
 ;;                      --------------------------------------------
 ;; View listing         Intern  Intern  Intern  Intern  Y       Y
 ;; Extract member       Y       Y       Y       Y       Y       Y
-;; Save changed member  Y       Y       Y       Y       N       N
+;; Save changed member  Y       Y       Y       Y       N       Y
 ;; Add new member       N       N       N       N       N       N
-;; Delete member        Y       Y       Y       Y       N       N
+;; Delete member        Y       Y       Y       Y       N       Y
 ;; Rename member        Y       Y       N       N       N       N
 ;; Chmod                -       Y       Y       -       N       N
 ;; Chown                -       Y       -       -       N       N
@@ -216,10 +216,10 @@ Archive and member name will be added."
 ;; Zip archive configuration
 
 (defcustom archive-zip-extract
-  (cond ((executable-find "unzip") '("unzip" "-qq" "-c"))
-        ((executable-find "7z") '("7z" "x" "-so"))
+  (cond ((executable-find "unzip")   '("unzip" "-qq" "-c"))
+        ((executable-find "7z")      '("7z" "x" "-so"))
         ((executable-find "pkunzip") '("pkunzip" "-e" "-o-"))
-        (t '("unzip" "-qq" "-c")))
+        (t                           '("unzip" "-qq" "-c")))
   "Program and its options to run in order to extract a zip file member.
 Extraction should happen to standard output.  Archive and member name will
 be added."
@@ -235,44 +235,44 @@ be added."
 ;; names.
 
 (defcustom archive-zip-expunge
-  (if (and (not (executable-find "zip"))
-           (executable-find "pkzip"))
-      '("pkzip" "-d")
-    '("zip" "-d" "-q"))
+  (cond ((executable-find "zip")     '("zip" "-d" "-q"))
+        ((executable-find "7z")      '("7z" "d"))
+        ((executable-find "pkzip")   '("pkzip" "-d"))
+        (t                           '("zip" "-d" "-q")))
   "Program and its options to run in order to delete zip file members.
 Archive and member names will be added."
   :type '(list (string :tag "Program")
-                (repeat :tag "Options"
-                        :inline t
-                        (string :format "%v")))
+               (repeat :tag "Options"
+                       :inline t
+                       (string :format "%v")))
   :group 'archive-zip)
 
 (defcustom archive-zip-update
-  (if (and (not (executable-find "zip"))
-           (executable-find "pkzip"))
-      '("pkzip" "-u" "-P")
-    '("zip" "-q"))
+  (cond ((executable-find "zip")     '("zip" "-q"))
+        ((executable-find "7z")      '("7z" "u"))
+        ((executable-find "pkzip")   '("pkzip" "-u" "-P"))
+        (t                           '("zip" "-q")))
   "Program and its options to run in order to update a zip file member.
 Options should ensure that specified directory will be put into the zip
 file.  Archive and member name will be added."
   :type '(list (string :tag "Program")
-                (repeat :tag "Options"
-                        :inline t
-                        (string :format "%v")))
+               (repeat :tag "Options"
+                       :inline t
+                       (string :format "%v")))
   :group 'archive-zip)
 
 (defcustom archive-zip-update-case
-  (if (and (not (executable-find "zip"))
-           (executable-find "pkzip"))
-      '("pkzip" "-u" "-P")
-    '("zip" "-q" "-k"))
+  (cond ((executable-find "zip")     '("zip" "-q" "-k"))
+        ((executable-find "7z")      '("7z" "u"))
+        ((executable-find "pkzip")   '("pkzip" "-u" "-P"))
+        (t                           '("zip" "-q" "-k")))
   "Program and its options to run in order to update a case fiddled zip member.
 Options should ensure that specified directory will be put into the zip file.
 Archive and member name will be added."
   :type '(list (string :tag "Program")
-                (repeat :tag "Options"
-                        :inline t
-                        (string :format "%v")))
+               (repeat :tag "Options"
+                       :inline t
+                       (string :format "%v")))
   :group 'archive-zip)
 
 (defcustom archive-zip-case-fiddle t
@@ -323,9 +323,30 @@ Archive and member name will be added."
 Extraction should happen to standard output.  Archive and member name will
 be added."
   :type '(list (string :tag "Program")
-                (repeat :tag "Options"
-                        :inline t
-                        (string :format "%v")))
+               (repeat :tag "Options"
+                       :inline t
+                       (string :format "%v")))
+  :group 'archive-7z)
+
+(defcustom archive-7z-expunge
+  '("7z" "d")
+  "Program and its options to run in order to delete 7z file members.
+Archive and member names will be added."
+  :type '(list (string :tag "Program")
+               (repeat :tag "Options"
+                       :inline t
+                       (string :format "%v")))
+  :group 'archive-7z)
+
+(defcustom archive-7z-update
+  '("7z" "u")
+  "Program and its options to run in order to update a 7z file member.
+Options should ensure that specified directory will be put into the 7z
+file.  Archive and member name will be added."
+  :type '(list (string :tag "Program")
+               (repeat :tag "Options"
+                       :inline t
+                       (string :format "%v")))
   :group 'archive-7z)
 
 ;; -------------------------------------------------------------------------
@@ -1062,7 +1083,7 @@ using `make-temp-file', and the generated name is returned."
             (view-buffer buffer (and just-created 'kill-buffer-if-not-modified)))
            ((eq other-window-p 'display) (display-buffer buffer))
            (other-window-p (switch-to-buffer-other-window buffer))
-           (t (switch-to-buffer buffer))))))
+           (t (pop-to-buffer-same-window buffer))))))
 
 (defun archive-*-extract (archive name command)
   (let* ((default-directory (file-name-as-directory archive-tmpdir))
@@ -2037,7 +2058,9 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
     (with-temp-buffer
       (call-process "7z" nil t nil "l" "-slt" file)
       (goto-char (point-min))
-      (re-search-forward "^-+\n")
+      ;; Four dashes start the meta info section that should be skipped.
+      ;; Archive members start with more than four dashes.
+      (re-search-forward "^-----+\n")
       (while (re-search-forward "^Path = \\(.*\\)\n" nil t)
         (goto-char (match-end 0))
         (let ((name (match-string 1))
@@ -2084,6 +2107,12 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
           (message "%s" (buffer-string)))
         (delete-file tmpfile)))))
 
+(defun archive-7z-write-file-member (archive descr)
+  (archive-*-write-file-member
+   archive
+   descr
+   archive-7z-update))
+
 ;; -------------------------------------------------------------------------
 ;;; Section `ar' archives.
 
diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el
index 5793c3180be..3b849cece22 100644
--- a/lisp/autoinsert.el
+++ b/lisp/autoinsert.el
@@ -360,7 +360,7 @@ Matches the visited file name against the elements of `auto-insert-alist'."
                    (save-window-excursion
                      ;; make buffer visible before skeleton or function
                      ;; which might ask the user for something
-                     (switch-to-buffer (current-buffer))
+                     (pop-to-buffer-same-window (current-buffer))
                      (if (and (consp action)
                               (not (eq (car action) 'lambda)))
                          (skeleton-insert action)
diff --git a/lisp/bindings.el b/lisp/bindings.el
index a7b729a1ba3..c4f9369219a 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -471,7 +471,7 @@ Like `bury-buffer', but temporarily select EVENT's window."
 (defun mode-line-other-buffer () "\
 Switch to the most recently selected buffer other than the current one."
   (interactive)
-  (switch-to-buffer (other-buffer)))
+  (switch-to-buffer (other-buffer) nil t))
 
 (defun mode-line-next-buffer (event)
   "Like `next-buffer', but temporarily select EVENT's window."
@@ -593,9 +593,12 @@ is okay.  See `mode-line-format'.")
          ".fas" ".lib" ".mem"
          ;; CMUCL
          ".x86f" ".sparcf"
-         ;; Other CL implementations (Allegro, LispWorks, OpenMCL)
-         ".fasl" ".ufsl" ".fsl" ".dxl" ".pfsl" ".dfsl"
-         ".p64fsl" ".d64fsl" ".dx64fsl"
+         ;; OpenMCL / Clozure CL
+         ".dfsl" ".pfsl" ".d64fsl" ".p64fsl" ".lx64fsl" ".lx32fsl"
+         ".dx64fsl" ".dx32fsl" ".fx64fsl" ".fx32fsl" ".sx64fsl"
+         ".sx32fsl" ".wx64fsl" ".wx32fsl"
+         ;; Other CL implementations (Allegro, LispWorks)
+         ".fasl" ".ufsl" ".fsl" ".dxl"
          ;; Libtool
          ".lo" ".la"
          ;; Gettext
@@ -846,6 +849,8 @@ if `inhibit-field-text-motion' is non-nil."
 (define-key global-map "\C-@" 'set-mark-command)
 ;; Many people are used to typing C-SPC and getting C-@.
 (define-key global-map [?\C- ] 'set-mark-command)
+(put 'set-mark-command :advertised-binding [?\C- ])
+
 (define-key ctl-x-map "\C-x" 'exchange-point-and-mark)
 (define-key ctl-x-map "\C-@" 'pop-global-mark)
 (define-key ctl-x-map [?\C- ] 'pop-global-mark)
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 184cecb9e9c..bb7ad153e8b 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1539,9 +1539,7 @@ deletion, or > if it is flagged for displaying."
   (bookmark-maybe-load-default-file)
   (let ((buf (get-buffer-create "*Bookmark List*")))
     (if (called-interactively-p 'interactive)
-        (if (or (window-dedicated-p) (window-minibuffer-p))
-            (pop-to-buffer buf)
-          (switch-to-buffer buf))
+        (pop-to-buffer-same-window buf)
       (set-buffer buf)))
   (let ((inhibit-read-only t))
     (erase-buffer)
@@ -1843,7 +1841,7 @@ With a prefix arg, prompts for a file to save them in."
         (menu (current-buffer))
         (pop-up-windows t))
     (delete-other-windows)
-    (switch-to-buffer (other-buffer))
+    (switch-to-buffer (other-buffer) nil t)
     (bookmark--jump-via bmrk 'pop-to-buffer)
     (bury-buffer menu)))
 
diff --git a/lisp/bs.el b/lisp/bs.el
index 94fbd0e04f9..49ffb3f822c 100644
--- a/lisp/bs.el
+++ b/lisp/bs.el
@@ -1215,7 +1215,7 @@ by buffer configuration `bs-cycle-configuration-name'."
         ;; We don't want the frame iconified if the only window in the frame
         ;; happens to be dedicated.
         (bury-buffer (current-buffer))
-        (switch-to-buffer next)
+        (switch-to-buffer next nil t)
         (setq bs--cycle-list (append (cdr cycle-list)
                                      (list (car cycle-list))))
         (bs-message-without-log "Next buffers: %s"
@@ -1244,7 +1244,7 @@ by buffer configuration `bs-cycle-configuration-name'."
                                             bs--cycle-list)))
              (prev-buffer (car tupel))
              (cycle-list (cdr tupel)))
-        (switch-to-buffer prev-buffer)
+        (switch-to-buffer prev-buffer nil t)
         (setq bs--cycle-list (append (last cycle-list)
                                      (reverse (cdr (reverse cycle-list)))))
         (bs-message-without-log "Previous buffers: %s"
diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index 95f309e33b9..f0a44747378 100644
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -266,7 +266,10 @@ Letters do not insert themselves; instead, they are commands.
   (set (make-local-variable 'buffer-stale-function)
        (lambda (&optional _noconfirm) 'fast))
   (setq truncate-lines t)
-  (setq buffer-read-only t))
+  (setq buffer-read-only t)
+  ;; Force L2R direction, to avoid messing the display if the first
+  ;; buffer in the list happens to begin with a strong R2L character.
+  (setq bidi-paragraph-direction 'left-to-right))
 
 (define-obsolete-variable-alias 'buffer-menu-mode-hook
   'Buffer-menu-mode-hook "23.1")
@@ -663,7 +666,7 @@ For more information, see the function `buffer-menu'."
   ":" ;; (if (char-displayable-p ?…) "…" ":")
   )
 
-(defun Buffer-menu-buffer+size (name size &optional name-props size-props)
+(defun Buffer-menu-buffer+size (name size &optional name-props size-props lrm)
   (if (> (+ (string-width name) (string-width size) 2)
          Buffer-menu-buffer+size-width)
       (setq name
@@ -678,9 +681,17 @@ For more information, see the function `buffer-menu'."
                           (string-width tail)
                           2))
                       Buffer-menu-short-ellipsis
-                      tail)))
+                      tail
+                      ;; Append an invisible LRM character to the
+                      ;; buffer's name to avoid ugly display with the
+                      ;; buffer size to the left of the name, when the
+                      ;; name begins with R2L character.
+                      (if lrm (propertize (string ?\x200e) 'invisible t) ""))))
     ;; Don't put properties on (buffer-name).
-    (setq name (copy-sequence name)))
+    (setq name (concat (copy-sequence name)
+                       (if lrm
+                           (propertize (string ?\x200e) 'invisible t)
+                         ""))))
   (add-text-properties 0 (length name) name-props name)
   (add-text-properties 0 (length size) size-props size)
   (let ((name+space-width (- Buffer-menu-buffer+size-width
@@ -813,6 +824,10 @@ For more information, see the function `buffer-menu'."
       (setq buffer-read-only nil)
       (erase-buffer)
       (setq standard-output (current-buffer))
+      ;; Force L2R direction, to avoid messing the display if the
+      ;; first buffer in the list happens to begin with a strong R2L
+      ;; character.
+      (setq bidi-paragraph-direction 'left-to-right)
       (unless Buffer-menu-use-header-line
         ;; Use U+2014 (EM DASH) to underline if possible, else use ASCII
         ;; (i.e. U+002D, HYPHEN-MINUS).
@@ -914,7 +929,8 @@ For more information, see the function `buffer-menu'."
                                                    (max (length size) 3)
                                                    2))
                                             name
-                                          "mouse-2: select this buffer"))))
+                                          "mouse-2: select this buffer"))
+                         nil t))
                 "  "
                 (if (> (string-width (nth 4 buffer)) Buffer-menu-mode-width)
                     (truncate-string-to-width (nth 4 buffer)
diff --git a/lisp/button.el b/lisp/button.el
index 2e485547745..6ef79532ae7 100644
--- a/lisp/button.el
+++ b/lisp/button.el
@@ -54,10 +54,7 @@
 ;; Use color for the MS-DOS port because it doesn't support underline.
 ;; FIXME if MS-DOS correctly answers the (supports) question, it need
 ;; no longer be a special case.
-(defface button '((((type pc) (class color))
-                   (:foreground "lightblue"))
-                  (((supports :underline t)) :underline t)
-                  (t (:foreground "lightblue")))
+(defface button '((t :inherit link))
   "Default face used for buttons."
   :group 'basic-faces)
 
diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el
index 8fc3f762f29..1ec474e828e 100644
--- a/lisp/calendar/timeclock.el
+++ b/lisp/calendar/timeclock.el
@@ -545,11 +545,7 @@ non-nil, the amount returned will be relative to past time worked."
 (defalias 'timeclock-time-to-seconds (if (fboundp 'float-time) 'float-time
                                        'time-to-seconds))
 
-(defsubst timeclock-seconds-to-time (seconds)
-  "Convert SECONDS (a floating point number) to an Emacs time structure."
-  (list (floor seconds 65536)
-        (floor (mod seconds 65536))
-        (floor (* (- seconds (ffloor seconds)) 1000000))))
+(defalias 'timeclock-seconds-to-time 'seconds-to-time)
 
 ;; Should today-only be removed in favour of timeclock-relative? - gm
 (defsubst timeclock-when-to-leave (&optional today-only)
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 8c12806df1e..60d7690a3c8 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,13 @@
+2011-07-04  Darren Hoo  <darren.hoo@gmail.com>  (tiny change)
+
+        * semantic/db.el (semanticdb-file-table-object): Don't bug out on
+        unconfigured projects if `global-ede-mode' is on (bug#8092).
+
+2011-07-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * semantic.el (semantic-elapsed-time): Rewrite using
+        time-subtract and float-time.
+
 2011-05-11  Glenn Morris  <rgm@gnu.org>
 
         * semantic/wisent/javascript.el (semantic-get-local-variables):
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index c899988dc36..ce9af0e12b5 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -379,9 +379,7 @@ Do not set this yourself.  Call `semantic-debug'.")
 (defun semantic-elapsed-time (start end)
   "Copied from elp.el.  Was `elp-elapsed-time'.
 Argument START and END bound the time being calculated."
-  (+ (* (- (car end) (car start)) 65536.0)
-     (- (car (cdr end)) (car (cdr start)))
-     (/ (- (car (cdr (cdr end))) (car (cdr (cdr start)))) 1000000.0)))
+  (float-time (time-subtract end start)))
 
 (defun bovinate (&optional clear)
   "Parse the current buffer.  Show output in a temp buffer.
diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el
index fa8de392b62..dca1b3bafea 100644
--- a/lisp/cedet/semantic/db.el
+++ b/lisp/cedet/semantic/db.el
@@ -880,7 +880,7 @@ If file does not have tags available, and DONTLOAD is nil,
 then load the tags for FILE, and create a new table object for it.
 DONTLOAD does not affect the creation of new database objects."
   ;; (message "Object Translate: %s" file)
-  (when (file-exists-p file)
+  (when (and file (file-exists-p file))
     (let* ((default-directory (file-name-directory file))
            (tab (semanticdb-file-table-object-from-hash file))
            (fullfile nil))
diff --git a/lisp/comint.el b/lisp/comint.el
index 5548d19ad30..2349fc0edd9 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -347,7 +347,7 @@ This variable is buffer-local."
    " +\\)"
    (regexp-opt
     '("password" "Password" "passphrase" "Passphrase"
-      "pass phrase" "Pass phrase"))
+      "pass phrase" "Pass phrase" "Response"))
    "\\(?:\\(?:, try\\)? *again\\| (empty for no passphrase)\\| (again)\\)?\
 \\(?: for [^:]+\\)?:\\s *\\'")
   "Regexp matching prompts for passwords in the inferior process.
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 7c96b526f41..d443d6c160c 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -594,7 +594,7 @@ WIDGET is the widget to apply the filter entries of MENU on."
     ("-function\\'" function)
     ("-functions\\'" (repeat function))
     ("-list\\'" (repeat sexp))
-    ("-alist\\'" (repeat (cons sexp sexp))))
+    ("-alist\\'" (alist :key-type sexp :value-type sexp)))
   "Alist of (MATCH TYPE).
 
 MATCH should be a regexp matching the name of a symbol, and TYPE should
@@ -1033,9 +1033,36 @@ If given a prefix (or a COMMENT argument), also prompt for a comment."
          (put variable 'saved-variable-comment comment)))
   (put variable 'customized-value nil)
   (put variable 'customized-variable-comment nil)
-  (custom-save-all)
+  (if (custom-file t)
+      (custom-save-all)
+    (message "Setting `%s' temporarily since \"emacs -q\" would overwrite customizations"
+             variable)
+    (set variable value))
   value)
 
+;; Some parts of Emacs might prompt the user to save customizations,
+;; during startup before customizations are loaded.  This function
+;; handles this corner case by avoiding calling `custom-save-variable'
+;; too early, which could wipe out existing customizations.
+
+;;;###autoload
+(defun customize-push-and-save (list-var elts)
+  "Add ELTS to LIST-VAR and save for future sessions, safely.
+ELTS should be a list.  This function adds each entry to the
+value of LIST-VAR using `add-to-list'.
+
+If Emacs is initialized, call `customize-save-variable' to save
+the resulting list value now.  Otherwise, add an entry to
+`after-init-hook' to save it after initialization."
+  (dolist (entry elts)
+    (add-to-list list-var entry))
+  (if after-init-time
+      (let ((coding-system-for-read nil))
+        (customize-save-variable list-var (eval list-var)))
+    (add-hook 'after-init-hook
+              `(lambda ()
+                 (customize-push-and-save ',list-var ',elts)))))
+
 ;;;###autoload
 (defun customize ()
   "Select a customization buffer which you can use to set user options.
@@ -1806,6 +1833,7 @@ item in another window.\n\n"))
 ;; We want simple widgets to be displayed by default, but complex
 ;; widgets to be hidden.
 
+;; This widget type is obsolete as of Emacs 24.1.
 (widget-put (get 'item 'widget-type) :custom-show t)
 (widget-put (get 'editable-field 'widget-type)
             :custom-show (lambda (_widget value)
@@ -2234,6 +2262,7 @@ and `face'."
              (setq widget nil)))))
   (widget-setup))
 
+(make-obsolete 'custom-show "this widget type is no longer supported." "24.1")
 (defun custom-show (widget value)
   "Non-nil if WIDGET should be shown with VALUE by default."
   (let ((show (widget-get widget :custom-show)))
@@ -4378,23 +4407,27 @@ Click on \"More\" \(or position point there and press RETURN)
 if only the first line of the docstring is shown."))
   :group 'customize)
 
-(defun custom-file ()
+(defun custom-file (&optional no-error)
   "Return the file name for saving customizations."
-  (file-chase-links
-   (or custom-file
-       (let ((user-init-file user-init-file)
-             (default-init-file
-               (if (eq system-type 'ms-dos) "~/_emacs" "~/.emacs")))
-         (when (null user-init-file)
-           (if (or (file-exists-p default-init-file)
-                   (and (eq system-type 'windows-nt)
-                        (file-exists-p "~/_emacs")))
-               ;; Started with -q, i.e. the file containing
-               ;; Custom settings hasn't been read.  Saving
-               ;; settings there would overwrite other settings.
-               (error "Saving settings from \"emacs -q\" would overwrite existing customizations"))
-           (setq user-init-file default-init-file))
-         user-init-file))))
+  (let ((file
+         (or custom-file
+             (let ((user-init-file user-init-file)
+                   (default-init-file
+                     (if (eq system-type 'ms-dos) "~/_emacs" "~/.emacs")))
+               (when (null user-init-file)
+                 (if (or (file-exists-p default-init-file)
+                         (and (eq system-type 'windows-nt)
+                              (file-exists-p "~/_emacs")))
+                     ;; Started with -q, i.e. the file containing
+                     ;; Custom settings hasn't been read.  Saving
+                     ;; settings there would overwrite other settings.
+                     (if no-error
+                         nil
+                       (error "Saving settings from \"emacs -q\" would overwrite existing customizations"))
+                   (setq user-init-file default-init-file)))
+               user-init-file))))
+    (and file
+         (file-chase-links file))))
 
 ;; If recentf-mode is non-nil, this is defined.
 (declare-function recentf-expand-file-name "recentf" (name))
diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el
index 7f926c85e56..04a9e728b22 100644
--- a/lisp/cus-theme.el
+++ b/lisp/cus-theme.el
@@ -157,7 +157,7 @@ remove them from your saved Custom file.\n\n"))
     ;; Load the theme settings.
     (when theme
       (unless (eq theme 'user)
-        (load-theme theme t))
+        (load-theme theme nil t))
       (dolist (setting (get theme 'theme-settings))
         (if (eq (car setting) 'theme-value)
             (progn (push (nth 1 setting) vars)
@@ -326,7 +326,7 @@ SPEC, if non-nil, should be a face spec to which to set the widget."
   (unless (eq theme 'user)
     (unless (custom-theme-name-valid-p theme)
       (error "Invalid theme name `%s'" theme))
-    (load-theme theme t))
+    (load-theme theme nil t))
   (let ((settings (reverse (get theme 'theme-settings))))
     (dolist (setting settings)
       (funcall (if (eq (car setting) 'theme-value)
diff --git a/lisp/custom.el b/lisp/custom.el
index 8295777f1f1..4f69c741468 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -120,8 +120,10 @@ the :set function.
 For variables in preloaded files, you can simply use this
 function for the :initialize property.  For autoloaded variables,
 you will also need to add an autoload stanza calling this
-function, and another one setting the standard-value property.
-See `send-mail-function' in sendmail.el for an example."
+function, and another one setting the standard-value property."
+  ;; No longer true:
+  ;; "See `send-mail-function' in sendmail.el for an example."
+
   ;; Until the var is actually initialized, it is kept unbound.
   ;; This seemed to be at least as good as setting it to an arbitrary
   ;; value like nil (evaluating `value' is not an option because it
@@ -215,7 +217,8 @@ The following keywords are meaningful:
         variable.  It takes two arguments, the symbol and value
         given in the `defcustom' call.  The default is
         `custom-initialize-reset'.
-:set    VALUE should be a function to set the value of the symbol.
+:set    VALUE should be a function to set the value of the symbol
+        when using the Customize user interface.
         It takes two arguments, the symbol to set and the value to
         give it.  The default choice of function is `set-default'.
 :get    VALUE should be a function to extract the value of symbol.
@@ -854,25 +857,18 @@ See `custom-known-themes' for a list of known themes."
      ;; Add a new setting:
      (t
       (unless old
-        ;; If the user changed the value outside of Customize, we
-        ;; first save the current value to a fake theme, `changed'.
-        ;; This ensures that the user-set value comes back if the
-        ;; theme is later disabled.
-        (cond ((and (eq prop 'theme-value)
-                    (boundp symbol))
-               (let ((sv  (get symbol 'standard-value))
-                     (val (symbol-value symbol)))
-                 (unless (and sv (equal (eval (car sv)) val))
-                   (setq old `((changed ,(custom-quote val)))))))
-              ((and (facep symbol)
-                    (not (face-attr-match-p
-                          symbol
-                          (custom-fix-face-spec
-                           (face-spec-choose
-                            (get symbol 'face-defface-spec))))))
-               (setq old `((changed
-                            (,(append '(t) (custom-face-attributes-get
-                                            symbol nil)))))))))
+        ;; If the user changed a variable outside of Customize, save
+        ;; the value to a fake theme, `changed'.  If the theme is
+        ;; later disabled, we use this to bring back the old value.
+        ;;
+        ;; For faces, we just use `face-new-frame-defaults' to
+        ;; recompute when the theme is disabled.
+        (when (and (eq prop 'theme-value)
+                   (boundp symbol))
+          (let ((sv  (get symbol 'standard-value))
+                (val (symbol-value symbol)))
+            (unless (and sv (equal (eval (car sv)) val))
+              (setq old `((changed ,(custom-quote val))))))))
       (put symbol prop (cons (list theme value) old))
       (put theme 'theme-settings
            (cons (list prop symbol theme value) theme-settings))))))
@@ -1119,20 +1115,29 @@ Emacs theme directory (a directory named \"themes\" in
   :risky t
   :version "24.1")
 
-(defun load-theme (theme &optional no-enable)
+(defun load-theme (theme &optional no-confirm no-enable)
   "Load Custom theme named THEME from its file.
-Normally, this also enables THEME.  If optional arg NO-ENABLE is
-non-nil, load THEME but don't enable it.
-
 The theme file is named THEME-theme.el, in one of the directories
 specified by `custom-theme-load-path'.
 
+If THEME is not in `custom-safe-themes', prompt the user for
+confirmation, unless optional arg NO-CONFIRM is non-nil.
+
+Normally, this function also enables THEME; if optional arg
+NO-ENABLE is non-nil, load the theme but don't enable it.
+
+This function is normally called through Customize when setting
+`custom-enabled-themes'.  If used directly in your init file, it
+should be called with a non-nil NO-CONFIRM argument, or after
+`custom-safe-themes' has been loaded.
+
 Return t if THEME was successfully loaded, nil otherwise."
   (interactive
    (list
     (intern (completing-read "Load custom theme: "
                              (mapcar 'symbol-name
-                                     (custom-available-themes))))))
+                                     (custom-available-themes))))
+    nil nil))
   (unless (custom-theme-name-valid-p theme)
     (error "Invalid theme name `%s'" theme))
   ;; If reloading, clear out the old theme settings.
@@ -1152,7 +1157,8 @@ Return t if THEME was successfully loaded, nil otherwise."
       (setq hash (sha1 (current-buffer)))
       ;; Check file safety with `custom-safe-themes', prompting the
       ;; user if necessary.
-      (when (or (and (memq 'default custom-safe-themes)
+      (when (or no-confirm
+                (and (memq 'default custom-safe-themes)
                      (equal (file-name-directory fn)
                             (expand-file-name "themes/" data-directory)))
                 (member hash custom-safe-themes)
@@ -1211,10 +1217,7 @@ query also about adding HASH to `custom-safe-themes'."
           ;; Offer to save to `custom-safe-themes'.
           (and (or custom-file user-init-file)
                (y-or-n-p "Treat this theme as safe in future sessions? ")
-               (let ((coding-system-for-read nil))
-                 (push hash custom-safe-themes)
-                 (customize-save-variable 'custom-safe-themes
-                                          custom-safe-themes)))
+               (customize-push-and-save 'custom-safe-themes (list hash)))
           t)))))
 
 (defun custom-theme-name-valid-p (name)
@@ -1291,7 +1294,10 @@ This list does not include the `user' theme, which is set by
 Customize and always takes precedence over other Custom Themes.
 
 This variable cannot be defined inside a Custom theme; there, it
-is simply ignored."
+is simply ignored.
+
+Setting this variable through Customize calls `enable-theme' or
+`load-theme' for each theme in the list."
   :group 'customize
   :type  '(repeat symbol)
   :set-after '(custom-theme-directory custom-theme-load-path
@@ -1345,11 +1351,33 @@ See `custom-enabled-themes' for a list of enabled themes."
             ;; If the face spec specified by this theme is in the
             ;; saved-face property, reset that property.
             (when (equal (nth 3 s) (get symbol 'saved-face))
-              (put symbol 'saved-face (and val (cadr (car val)))))
-            (custom-theme-recalc-face symbol)))))
+              (put symbol 'saved-face (and val (cadr (car val)))))))))
+      ;; Recompute faces on all frames.
+      (dolist (frame (frame-list))
+        ;; We must reset the fg and bg color frame parameters, or
+        ;; `face-set-after-frame-default' will use the existing
+        ;; parameters, which could be from the disabled theme.
+        (set-frame-parameter frame 'background-color
+                             (custom--frame-color-default
+                              frame :background "background" "Background"
+                              "unspecified-bg" "white"))
+        (set-frame-parameter frame 'foreground-color
+                             (custom--frame-color-default
+                              frame :foreground "foreground" "Foreground"
+                              "unspecified-fg" "black"))
+        (face-set-after-frame-default frame))
       (setq custom-enabled-themes
             (delq theme custom-enabled-themes)))))
 
+(defun custom--frame-color-default (frame attribute resource-attr resource-class
+                                          tty-default x-default)
+  (let ((col (face-attribute 'default attribute t)))
+    (cond
+     ((and col (not (eq col 'unspecified))) col)
+     ((null (window-system frame)) tty-default)
+     ((setq col (x-get-resource resource-attr resource-class)) col)
+     (t x-default))))
+
 (defun custom-variable-theme-value (variable)
   "Return (list VALUE) indicating the custom theme value of VARIABLE.
 That is to say, it specifies what the value should be according to
@@ -1381,7 +1409,7 @@ This function returns nil if no custom theme specifies a value for VARIABLE."
     (face-spec-recalc face frame)))
 
 
-;;; XEmacs compability functions
+;;; XEmacs compatibility functions
 
 ;; In XEmacs, when you reset a Custom Theme, you have to specify the
 ;; theme to reset it to.  We just apply the next available theme, so
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index 00e2ec802e2..540b93faad8 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -206,7 +206,8 @@ starting with or containing `no-'.  If you set this variable to
 expanding `yes-or-no-' signals an error because `-' is not part of a word;
 but expanding `yes-or-no' looks for a word starting with `no'.
 
-The recommended value is \"\\\\sw\\\\|\\\\s_\"."
+The recommended value is nil, which will make dabbrev default to
+using \"\\\\sw\\\\|\\\\s_\"."
   :type '(choice (const nil)
                  regexp)
   :group 'dabbrev)
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 8e4b3b5c6a6..3103fbd5a7f 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -56,9 +56,9 @@ into this list; they also should call `dired-log' to log the errors.")
   "Compare file at point with file FILE using `diff'.
 FILE defaults to the file at the mark.  (That's the mark set by
 \\[set-mark-command], not by Dired's \\[dired-mark] command.)
-The prompted-for file is the first file given to `diff'.
+The prompted-for FILE is the first file given to `diff'.
 With prefix arg, prompt for second argument SWITCHES,
-which is options for `diff'."
+which is the string of command switches for `diff'."
   (interactive
    (let* ((current (dired-get-filename t))
           ;; Get the file at the mark.
@@ -514,22 +514,25 @@ to the end of the list of defaults just after the default value."
 
 ;; This is an extra function so that you can redefine it, e.g., to use gmhist.
 (defun dired-read-shell-command (prompt arg files)
-  "Read a dired shell command prompting with PROMPT.
-Passes the prefix argument ARG to `dired-mark-prompt', so that it
-can be used in the prompt to indicate which FILES are affected.
-Normally reads the command with `read-shell-command', but if the
-`dired-x' packages is loaded, uses `dired-guess-shell-command' to offer
-a smarter default choice of shell command."
+  "Read a dired shell command.
+PROMPT should be a format string with one \"%s\" format sequence,
+which is replaced by the value returned by `dired-mark-prompt',
+with ARG and FILES as its arguments.  FILES should be a list of
+file names.  The result is used as the prompt.
+
+This normally reads using `read-shell-command', but if the
+`dired-x' package is loaded, use `dired-guess-shell-command' to
+offer a smarter default choice of shell command."
   (minibuffer-with-setup-hook
       (lambda ()
         (set (make-local-variable 'minibuffer-default-add-function)
              'minibuffer-default-add-dired-shell-commands))
     (setq prompt (format prompt (dired-mark-prompt arg files)))
-    (if (featurep 'dired-x)
+    (if (functionp 'dired-guess-shell-command)
         (dired-mark-pop-up nil 'shell files
-                           #'dired-guess-shell-command prompt files)
+                           'dired-guess-shell-command prompt files)
       (dired-mark-pop-up nil 'shell files
-                         #'read-shell-command prompt nil nil))))
+                         'read-shell-command prompt nil nil))))
 
 ;;;###autoload
 (defun dired-do-async-shell-command (command &optional arg file-list)
@@ -699,6 +702,9 @@ can be produced by `dired-get-marked-files', for example."
 ;; Commands that delete or redisplay part of the dired buffer.
 
 (defun dired-kill-line (&optional arg)
+  "Kill the current line (not the files).
+With a prefix argument, kill that many lines starting with the current line.
+\(A negative argument kills backward.)"
   (interactive "P")
   (setq arg (prefix-numeric-value arg))
   (let (buffer-read-only file)
@@ -1008,7 +1014,7 @@ See Info node `(emacs)Subdir switches' for more details."
     (dired-uncache
      (if (consp dired-directory) (car dired-directory) dired-directory))
     (dired-map-over-marks (let ((fname (dired-get-filename))
-                                ;; Postphone readin hook till we map
+                                ;; Postpone readin hook till we map
                                 ;; over all marked files (Bug#6810).
                                 (dired-after-readin-hook nil))
                             (message "Redisplaying... %s" fname)
@@ -2493,8 +2499,9 @@ with the command \\[tags-loop-continue]."
 ;;;###autoload
 (defun dired-show-file-type (file &optional deref-symlinks)
   "Print the type of FILE, according to the `file' command.
-If FILE is a symbolic link and the optional argument DEREF-SYMLINKS is
-true then the type of the file linked to by FILE is printed instead."
+If you give a prefix to this command, and FILE is a symbolic
+link, then the type of the file linked to by FILE is printed
+instead."
   (interactive (list (dired-get-filename t) current-prefix-arg))
   (let (process-file-side-effects)
     (with-temp-buffer
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index ca89d07ea7f..0f2cfd4973f 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -1056,12 +1056,11 @@ You can set this variable in your ~/.emacs.  For example, to add rules for
 `.foo' and `.bar' files, write
 
  \(setq dired-guess-shell-alist-user
-       (list (list \"\\\\.foo\\\\'\" \"FOO-COMMAND\");; fixed rule
-              ;; possibly more rules ...
-              (list \"\\\\.bar\\\\'\";; rule with condition test
-                    '(if condition
-                          \"BAR-COMMAND-1\"
-                        \"BAR-COMMAND-2\")))\)"
+        '((\"\\\\.foo\\\\'\" \"FOO-COMMAND\")
+          (\"\\\\.bar\\\\'\"
+           (if condition
+              \"BAR-COMMAND-1\"
+            \"BAR-COMMAND-2\"))))"
   :group 'dired-x
   :type '(alist :key-type regexp :value-type (repeat sexp)))
 
@@ -1072,7 +1071,7 @@ You can set this variable in your ~/.emacs.  For example, to add rules for
   :type 'boolean)
 
 (defun dired-guess-default (files)
-  "Guess a shell commands for FILES.  Return command or list of commands.
+  "Return a shell command, or a list of commands, appropriate for FILES.
 See `dired-guess-shell-alist-user'."
 
   (let* ((case-fold-search dired-guess-shell-case-fold-search)
@@ -1104,8 +1103,8 @@ See `dired-guess-shell-alist-user'."
     ;; Return commands or nil if flist is still non-nil.
     ;; Evaluate the commands in order that any logical testing will be done.
     (if (cdr cmds)
-        (mapcar #'eval cmds)
-      (eval (car cmds))))) ; single command
+        (delete-dups (mapcar #'eval cmds))
+      (eval (car cmds)))))              ; single command
 
 (defun dired-guess-shell-command (prompt files)
   "Ask user with PROMPT for a shell command, guessing a default from FILES."
@@ -1406,7 +1405,7 @@ Considers buffers closer to the car of `buffer-list' to be more recent."
 
 (defun dired-mark-sexp (predicate &optional unflag-p)
   "Mark files for which PREDICATE returns non-nil.
-With a prefix arg, unflag those files instead.
+With a prefix arg, unmark or unflag those files instead.
 
 PREDICATE is a lisp expression that can refer to the following symbols:
 
diff --git a/lisp/dired.el b/lisp/dired.el
index 43b2170d13a..01d41bba27d 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -78,10 +78,22 @@ If nil, `dired-listing-switches' is used."
   :type 'file)
 
 (defcustom dired-use-ls-dired 'unspecified
-  "Non-nil means Dired should use \"ls --dired\".
+  "Non-nil means Dired should pass the \"--dired\" option to \"ls\".
 The special value of `unspecified' means to check explicitly, and
 save the result in this variable.  This is performed the first
-time `dired-insert-directory' is called."
+time `dired-insert-directory' is called.
+
+Note that if you set this option to nil, either through choice or
+because your \"ls\" program does not support \"--dired\", Dired
+will fail to parse some \"unusual\" file names, e.g. those with leading
+spaces.  You might want to install ls from GNU Coreutils, which does
+support this option.  Alternatively, you might want to use Emacs's
+own emulation of \"ls\", by using:
+  \(setq ls-lisp-use-insert-directory-program nil)
+  \(require 'ls-lisp)
+This is used by default on MS Windows, which does not have an \"ls\" program.
+Note that `ls-lisp' does not support as many options as GNU ls, though.
+For more details, see Info node `(emacs)ls in Lisp'."
   :group 'dired
   :type '(choice (const :tag "Check for --dired support" unspecified)
                  (const :tag "Do not use --dired" nil)
@@ -238,8 +250,6 @@ This is what the do-commands look for, and what the mark-commands store.")
 ;;  (> baud-rate search-slow-speed)
   "Non-nil means Dired shrinks the display buffer to fit the marked files.")
 
-(defvar dired-flagging-regexp nil);; Last regexp used to flag files.
-
 (defvar dired-file-version-alist)
 
 ;;;###autoload
@@ -341,11 +351,11 @@ Subexpression 2 must end right before the \\n or \\r.")
 
 (defface dired-flagged
   '((t (:inherit font-lock-warning-face)))
-  "Face used for flagged files."
+  "Face used for files flagged for deletion."
   :group 'dired-faces
   :version "22.1")
 (defvar dired-flagged-face 'dired-flagged
-  "Face name used for flagged files.")
+  "Face name used for files flagged for deletion.")
 
 (defface dired-warning
   ;; Inherit from font-lock-warning-face since with min-colors 8
@@ -485,7 +495,16 @@ Return value is the number of files marked, or nil if none were marked."
   `(let ((inhibit-read-only t) count)
     (save-excursion
       (setq count 0)
-      (if ,msg (message "Marking %ss..." ,msg))
+      (when ,msg
+        (message "%s %ss%s..."
+                 (cond ((eq dired-marker-char ?\040) "Unmarking")
+                       ((eq dired-del-marker dired-marker-char)
+                        "Flagging")
+                       (t "Marking"))
+                 ,msg
+                 (if (eq dired-del-marker dired-marker-char)
+                     " for deletion"
+                   "")))
       (goto-char (point-min))
       (while (not (eobp))
         (if ,predicate
@@ -506,24 +525,31 @@ Return value is the number of files marked, or nil if none were marked."
 (defmacro dired-map-over-marks (body arg &optional show-progress
                                      distinguish-one-marked)
   "Eval BODY with point on each marked line.  Return a list of BODY's results.
-If no marked file could be found, execute BODY on the current line.
-ARG, if non-nil, specifies the files to use instead of the marked files.
-  If ARG is an integer, use the next ARG (or previous -ARG, if
-   ARG<0) files.  In that case, point is dragged along.  This is
-   so that commands on the next ARG (instead of the marked) files
-   can be chained easily.
-  For any other non-nil value of ARG, use the current file.
+If no marked file could be found, execute BODY on the current
+line.  ARG, if non-nil, specifies the files to use instead of the
+marked files.
+
+If ARG is an integer, use the next ARG (or previous -ARG, if
+ARG<0) files.  In that case, point is dragged along.  This is so
+that commands on the next ARG (instead of the marked) files can
+be chained easily.
+For any other non-nil value of ARG, use the current file.
+
 If optional third arg SHOW-PROGRESS evaluates to non-nil,
-  redisplay the dired buffer after each file is processed.
-No guarantee is made about the position on the marked line.
-  BODY must ensure this itself if it depends on this.
-Search starts at the beginning of the buffer, thus the car of the list
-  corresponds to the line nearest to the buffer's bottom.  This
-  is also true for (positive and negative) integer values of ARG.
+redisplay the dired buffer after each file is processed.
+
+No guarantee is made about the position on the marked line.  BODY
+must ensure this itself if it depends on this.
+
+Search starts at the beginning of the buffer, thus the car of the
+list corresponds to the line nearest to the buffer's bottom.
+This is also true for (positive and negative) integer values of
+ARG.
+
 BODY should not be too long as it is expanded four times.
 
-If DISTINGUISH-ONE-MARKED is non-nil, then if we find just one marked file,
-return (t FILENAME) instead of (FILENAME)."
+If DISTINGUISH-ONE-MARKED is non-nil, then if we find just one
+marked file, return (t FILENAME) instead of (FILENAME)."
   ;;
   ;;Warning: BODY must not add new lines before point - this may cause an
   ;;endless loop.
@@ -696,7 +722,6 @@ shell wildcards appended to select certain files).  If DIRNAME is a cons,
 its first element is taken as the directory name and the rest as an explicit
 list of files to make directory entries for.
 \\<dired-mode-map>\
-You can move around in it with the usual commands.
 You can flag files for deletion with \\[dired-flag-file-deletion] and then
 delete them by typing \\[dired-do-flagged-delete].
 Type \\[describe-mode] after entering Dired for more info.
@@ -1106,9 +1131,13 @@ If HDR is non-nil, insert a header line with the directory name."
          (or (if (eq dired-use-ls-dired 'unspecified)
                  ;; Check whether "ls --dired" gives exit code 0, and
                  ;; save the answer in `dired-use-ls-dired'.
-                 (setq dired-use-ls-dired
-                       (eq (call-process insert-directory-program nil nil nil "--dired")
-                           0))
+                 (or (setq dired-use-ls-dired
+                           (eq 0 (call-process insert-directory-program
+                                             nil nil nil "--dired")))
+                     (progn
+                       (message "ls does not support --dired; \
+see `dired-use-ls-dired' for more details.")
+                       nil))
                dired-use-ls-dired)
              (file-remote-p dir)))
         (setq switches (concat "--dired " switches)))
@@ -1162,7 +1191,7 @@ If HDR is non-nil, insert a header line with the directory name."
         (insert "  wildcard " (file-name-nondirectory dir) "\n")))))
 
 (defun dired-insert-set-properties (beg end)
-  "Make the file names highlight when the mouse is on them."
+  "Add various text properties to the lines in the region."
   (save-excursion
     (goto-char beg)
     (while (< (point) end)
@@ -1789,8 +1818,8 @@ In Dired, you are \"editing\" a list of the files in a directory and
   files for later commands or \"flag\" them for deletion, either file
   by file or all files matching certain criteria.
 You can move using the usual cursor motion commands.\\<dired-mode-map>
-Letters no longer insert themselves.  Digits are prefix arguments.
-Instead, type \\[dired-flag-file-deletion] to flag a file for Deletion.
+The buffer is read-only.  Digits are prefix arguments.
+Type \\[dired-flag-file-deletion] to flag a file `D' for deletion.
 Type \\[dired-mark] to Mark a file or subdirectory for later commands.
   Most commands operate on the marked files and use the current file
   if no files are marked.  Use a numeric prefix argument to operate on
@@ -1798,9 +1827,9 @@ Type \\[dired-mark] to Mark a file or subdirectory for later commands.
   to operate on the current file only.  Prefix arguments override marks.
   Mark-using commands display a list of failures afterwards.  Type \\[dired-summary]
   to see why something went wrong.
-Type \\[dired-unmark] to Unmark a file or all files of a subdirectory.
-Type \\[dired-unmark-backward] to back up one line and unflag.
-Type \\[dired-do-flagged-delete] to eXecute the deletions requested.
+Type \\[dired-unmark] to Unmark a file or all files of an inserted subdirectory.
+Type \\[dired-unmark-backward] to back up one line and unmark or unflag.
+Type \\[dired-do-flagged-delete] to delete (eXecute) the files flagged `D'.
 Type \\[dired-find-file] to Find the current line's file
   (or dired it in another buffer, if it is a directory).
 Type \\[dired-find-file-other-window] to find file or dired directory in Other window.
@@ -1810,12 +1839,12 @@ Type \\[dired-do-copy] to Copy files.
 Type \\[dired-sort-toggle-or-edit] to toggle Sorting by name/date or change the `ls' switches.
 Type \\[revert-buffer] to read all currently expanded directories aGain.
   This retains all marks and hides subdirs again that were hidden before.
-SPC and DEL can be used to move down and up by lines.
+Use `SPC' and `DEL' to move down and up by lines.
 
 If Dired ever gets confused, you can either type \\[revert-buffer] \
 to read the
 directories again, type \\[dired-do-redisplay] \
-to relist a single or the marked files or a
+to relist the file at point or the marked files or a
 subdirectory, or type \\[dired-build-subdir-alist] to parse the buffer
 again for the directory tree.
 
@@ -2818,8 +2847,12 @@ also offers to kill buffers visiting deleted files and directories."
   (if (= 1 count) "" "s"))
 
 (defun dired-mark-prompt (arg files)
-  "Return a string for use in a prompt, either the current file
-name, or the marker and a count of marked files."
+  "Return a string suitable for use in a Dired prompt.
+ARG is normally the prefix argument for the calling command.
+FILES should be a list of file names.
+
+The return value has a form like \"foo.txt\", \"[next 3 files]\",
+or \"* [3 files]\"."
   ;; distinguish-one-marked can cause the first element to be just t.
   (if (eq (car files) t) (setq files (cdr files)))
   (let ((count (length files)))
@@ -3015,8 +3048,9 @@ If on a subdir headerline, mark all its files except `.' and `..'."
     (dired-mark arg)))
 
 (defun dired-unmark-backward (arg)
-  "In Dired, move up lines and remove deletion flag there.
-Optional prefix ARG says how many lines to unflag; default is one line."
+  "In Dired, move up lines and remove marks or deletion flags there.
+Optional prefix ARG says how many lines to unmark/unflag; default
+is one line."
   (interactive "p")
   (dired-unmark (- arg)))
 
@@ -3110,14 +3144,14 @@ The match is against the non-directory part of the filename.  Use `^'
 
 (defun dired-mark-symlinks (unflag-p)
   "Mark all symbolic links.
-With prefix argument, unflag all those files."
+With prefix argument, unmark or unflag all those files."
   (interactive "P")
   (let ((dired-marker-char (if unflag-p ?\040 dired-marker-char)))
     (dired-mark-if (looking-at dired-re-sym) "symbolic link")))
 
 (defun dired-mark-directories (unflag-p)
   "Mark all directory file lines except `.' and `..'.
-With prefix argument, unflag all those files."
+With prefix argument, unmark or unflag all those files."
   (interactive "P")
   (let ((dired-marker-char (if unflag-p ?\040 dired-marker-char)))
     (dired-mark-if (and (looking-at dired-re-dir)
@@ -3126,7 +3160,7 @@ With prefix argument, unflag all those files."
 
 (defun dired-mark-executables (unflag-p)
   "Mark all executable files.
-With prefix argument, unflag all those files."
+With prefix argument, unmark or unflag all those files."
   (interactive "P")
   (let ((dired-marker-char (if unflag-p ?\040 dired-marker-char)))
     (dired-mark-if (looking-at dired-re-exe) "executable file")))
@@ -3136,7 +3170,7 @@ With prefix argument, unflag all those files."
 
 (defun dired-flag-auto-save-files (&optional unflag-p)
   "Flag for deletion files whose names suggest they are auto save files.
-A prefix argument says to unflag those files instead."
+A prefix argument says to unmark or unflag those files instead."
   (interactive "P")
   (let ((dired-marker-char (if unflag-p ?\040 dired-del-marker)))
     (dired-mark-if
@@ -3176,7 +3210,7 @@ A prefix argument says to unflag those files instead."
 
 (defun dired-flag-backup-files (&optional unflag-p)
   "Flag all backup files (names ending with `~') for deletion.
-With prefix argument, unflag these files."
+With prefix argument, unmark or unflag these files."
   (interactive "P")
   (let ((dired-marker-char (if unflag-p ?\s dired-del-marker)))
     (dired-mark-if
@@ -3629,16 +3663,16 @@ Ask means pop up a menu for the user to select one of copy, move or link."
 ;;;;;;  dired-run-shell-command dired-do-shell-command dired-do-async-shell-command
 ;;;;;;  dired-clean-directory dired-do-print dired-do-touch dired-do-chown
 ;;;;;;  dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff
-;;;;;;  dired-diff) "dired-aux" "dired-aux.el" "7efcfe4f9e0913ae4a87be014010c27f")
+;;;;;;  dired-diff) "dired-aux" "dired-aux.el" "ab62f310329f404f96a29e4f0ab8df73")
 ;;; Generated autoloads from dired-aux.el
 
 (autoload 'dired-diff "dired-aux" "\
 Compare file at point with file FILE using `diff'.
 FILE defaults to the file at the mark.  (That's the mark set by
 \\[set-mark-command], not by Dired's \\[dired-mark] command.)
-The prompted-for file is the first file given to `diff'.
+The prompted-for FILE is the first file given to `diff'.
 With prefix arg, prompt for second argument SWITCHES,
-which is options for `diff'.
+which is the string of command switches for `diff'.
 
 \(fn FILE &optional SWITCHES)" t nil)
 
@@ -4081,15 +4115,16 @@ with the command \\[tags-loop-continue].
 
 (autoload 'dired-show-file-type "dired-aux" "\
 Print the type of FILE, according to the `file' command.
-If FILE is a symbolic link and the optional argument DEREF-SYMLINKS is
-true then the type of the file linked to by FILE is printed instead.
+If you give a prefix to this command, and FILE is a symbolic
+link, then the type of the file linked to by FILE is printed
+instead.
 
 \(fn FILE &optional DEREF-SYMLINKS)" t nil)
 
 ;;;***
 
 ;;;### (autoloads (dired-do-relsymlink dired-jump-other-window dired-jump)
-;;;;;;  "dired-x" "dired-x.el" "cdeb2935dc1d33819b12981ba5272073")
+;;;;;;  "dired-x" "dired-x.el" "219648338c42c7912fa336680b434db0")
 ;;; Generated autoloads from dired-x.el
 
 (autoload 'dired-jump "dired-x" "\
diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index 7a9043a6a0a..3befedac256 100644
--- a/lisp/disp-table.el
+++ b/lisp/disp-table.el
@@ -94,9 +94,27 @@ Valid symbols are `truncation', `wrap', `escape', `control',
         (while (< i 256)
           (aset vector i (aref dt i))
           (setq i (1+ i)))
-        (describe-vector vector))
+        (describe-vector
+         vector 'display-table-print-array))
       (help-mode))))
 
+(defun display-table-print-array (desc)
+  (insert "[")
+  (let ((column (current-column))
+        (width (window-width))
+        string)
+    (dotimes (i (length desc))
+      (setq string (format "%s" (aref desc i)))
+      (cond
+       ((>= (+ (current-column) (length string) 1)
+            width)
+        (insert "\n")
+        (insert (make-string column ? )))
+       ((> i 0)
+        (insert " ")))
+      (insert string)))
+  (insert "]\n"))
+
 ;;;###autoload
 (defun describe-current-display-table ()
   "Describe the display table in use in the selected window and buffer."
diff --git a/lisp/dynamic-setting.el b/lisp/dynamic-setting.el
index 81531c4a21f..167da69d1ca 100644
--- a/lisp/dynamic-setting.el
+++ b/lisp/dynamic-setting.el
@@ -86,7 +86,9 @@ current form for the frame (i.e. hinting or somesuch changed)."
 Changes can be
   The monospace font. If `font-use-system-font' is nil, the font
     is not changed.
+  The normal font.
   Xft parameters, like DPI and hinting.
+  The Gtk+ theme name.
   The tool bar style."
   (interactive "e")
   (let ((type (nth 1 event))
diff --git a/lisp/emacs-lisp/benchmark.el b/lisp/emacs-lisp/benchmark.el
index 86063c512c6..aa84a075b76 100644
--- a/lisp/emacs-lisp/benchmark.el
+++ b/lisp/emacs-lisp/benchmark.el
@@ -39,9 +39,8 @@
        (setq ,t1 (current-time))
        ,@forms
        (setq ,t2 (current-time))
-       (+ (* (- (car ,t2) (car ,t1)) 65536.0)
-          (- (nth 1 ,t2) (nth 1 ,t1))
-          (* (- (nth 2 ,t2) (nth 2 ,t1)) 1.0e-6)))))
+       (float-time (time-subtract ,t2 ,t1)))))
+
 (put 'benchmark-elapse 'edebug-form-spec t)
 (put 'benchmark-elapse 'lisp-indent-function 0)
 
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 2fa339e62fe..157749500e7 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -102,7 +102,7 @@ and `debugger-reenable' to temporarily disable debug-on-entry.")
 (setq debugger 'debug)
 ;;;###autoload
 (defun debug (&rest debugger-args)
-  "Enter debugger.  To return, type \\<debugger-mode-map>`\\[debugger-continue]'.
+  "Enter debugger.  \\<debugger-mode-map>`\\[debugger-continue]' returns from the debugger.
 Arguments are mainly for use when this is called from the internals
 of the evaluator.
 
diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el
index 1db98ac39c8..4fda2bf1d52 100644
--- a/lisp/emacs-lisp/derived.el
+++ b/lisp/emacs-lisp/derived.el
@@ -253,8 +253,14 @@ No problems result if this variable is not bound.
                    `(let ((parent (char-table-parent ,syntax)))
                       (unless (and parent
                                    (not (eq parent (standard-syntax-table))))
-                        (set-char-table-parent ,syntax (syntax-table)))))))
-
+                        (set-char-table-parent ,syntax (syntax-table)))))
+                ,(when declare-abbrev
+                   `(unless (or (abbrev-table-get ,abbrev :parents)
+                                ;; This can happen if the major mode defines
+                                ;; the abbrev-table to be its parent's.
+                                (eq ,abbrev local-abbrev-table))
+                      (abbrev-table-put ,abbrev :parents
+                                        (list local-abbrev-table))))))
           (use-local-map ,map)
           ,(when syntax `(set-syntax-table ,syntax))
           ,(when abbrev `(setq local-abbrev-table ,abbrev))
diff --git a/lisp/emacs-lisp/elp.el b/lisp/emacs-lisp/elp.el
index 73af3a5708f..b89b6decfc9 100644
--- a/lisp/emacs-lisp/elp.el
+++ b/lisp/emacs-lisp/elp.el
@@ -282,7 +282,7 @@ FUNSYM must be a symbol of a defined function."
     ;; the function so that non-local exists are still recorded. TBD:
     ;; I haven't tested non-local exits at all, so no guarantees.
     ;;
-    ;; The 1st element is the total amount of time in usecs that have
+    ;; The 1st element is the total amount of time in seconds that has
     ;; been spent inside this function.  This number is added to on
     ;; function exit.
     ;;
@@ -424,9 +424,7 @@ Use optional LIST if provided instead."
 
 
 (defsubst elp-elapsed-time (start end)
-  (+ (* (- (car end) (car start)) 65536.0)
-     (- (car (cdr end)) (car (cdr start)))
-     (/ (- (car (cdr (cdr end))) (car (cdr (cdr start)))) 1000000.0)))
+  (float-time (time-subtract end start)))
 
 (defun elp-wrapper (funsym interactive-p args)
   "This function has been instrumented for profiling by the ELP.
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index 9c4a3e9832c..0194af2e3a8 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -141,6 +141,15 @@ See the functions `find-function' and `find-variable'."
     (dolist (suffix (get-load-suffixes) (nreverse suffixes))
       (unless (string-match "elc" suffix) (push suffix suffixes)))))
 
+(defun find-library--load-name (library)
+  (let ((name library))
+    (dolist (dir load-path)
+      (let ((rel (file-relative-name library dir)))
+        (if (and (not (string-match "\\`\\.\\./" rel))
+                 (< (length rel) (length name)))
+            (setq name rel))))
+    (unless (equal name library) name)))
+
 (defun find-library-name (library)
   "Return the absolute file name of the Emacs Lisp source of LIBRARY.
 LIBRARY should be a string (the name of the library)."
@@ -148,13 +157,23 @@ LIBRARY should be a string (the name of the library)."
   ;; the same name.
   (if (string-match "\\.el\\(c\\(\\..*\\)?\\)\\'" library)
       (setq library (replace-match "" t t library)))
-  (or 
+  (or
    (locate-file library
                 (or find-function-source-path load-path)
                 (find-library-suffixes))
    (locate-file library
                 (or find-function-source-path load-path)
                 load-file-rep-suffixes)
+   (when (file-name-absolute-p library)
+     (let ((rel (find-library--load-name library)))
+       (when rel
+         (or
+          (locate-file rel
+                       (or find-function-source-path load-path)
+                       (find-library-suffixes))
+          (locate-file rel
+                       (or find-function-source-path load-path)
+                       load-file-rep-suffixes)))))
    (error "Can't find library %s" library)))
 
 (defvar find-function-C-source-directory
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 114e9755039..c8620aaa439 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -525,7 +525,6 @@ if that value is non-nil."
   "Keymap for Lisp Interaction mode.
 All commands in `lisp-mode-shared-map' are inherited by this map.")
 
-(defvar lisp-interaction-mode-abbrev-table lisp-mode-abbrev-table)
 (define-derived-mode lisp-interaction-mode emacs-lisp-mode "Lisp Interaction"
   "Major mode for typing and evaluating Lisp forms.
 Like Lisp mode except that \\[eval-print-last-sexp] evals the Lisp expression
@@ -790,25 +789,25 @@ Reinitialize the face according to the `defface' specification."
         ;; `defface' is macroexpanded to `custom-declare-face'.
         ((eq (car form) 'custom-declare-face)
          ;; Reset the face.
-         (setq face-new-frame-defaults
-               (assq-delete-all (eval (nth 1 form) lexical-binding)
-                                face-new-frame-defaults))
-         (put (eval (nth 1 form) lexical-binding) 'face-defface-spec nil)
-         ;; Setting `customized-face' to the new spec after calling
-         ;; the form, but preserving the old saved spec in `saved-face',
-         ;; imitates the situation when the new face spec is set
-         ;; temporarily for the current session in the customize
-         ;; buffer, thus allowing `face-user-default-spec' to use the
-         ;; new customized spec instead of the saved spec.
-         ;; Resetting `saved-face' temporarily to nil is needed to let
-         ;; `defface' change the spec, regardless of a saved spec.
-         (prog1 `(prog1 ,form
-                   (put ,(nth 1 form) 'saved-face
-                        ',(get (eval (nth 1 form) lexical-binding)
-                               'saved-face))
-                   (put ,(nth 1 form) 'customized-face
-                        ,(nth 2 form)))
-           (put (eval (nth 1 form) lexical-binding) 'saved-face nil)))
+         (let ((face-symbol (eval (nth 1 form) lexical-binding)))
+           (setq face-new-frame-defaults
+                 (assq-delete-all face-symbol face-new-frame-defaults))
+           (put face-symbol 'face-defface-spec nil)
+           (put face-symbol 'face-documentation (nth 3 form))
+           ;; Setting `customized-face' to the new spec after calling
+           ;; the form, but preserving the old saved spec in `saved-face',
+           ;; imitates the situation when the new face spec is set
+           ;; temporarily for the current session in the customize
+           ;; buffer, thus allowing `face-user-default-spec' to use the
+           ;; new customized spec instead of the saved spec.
+           ;; Resetting `saved-face' temporarily to nil is needed to let
+           ;; `defface' change the spec, regardless of a saved spec.
+           (prog1 `(prog1 ,form
+                     (put ,(nth 1 form) 'saved-face
+                          ',(get face-symbol 'saved-face))
+                     (put ,(nth 1 form) 'customized-face
+                          ,(nth 2 form)))
+             (put face-symbol 'saved-face nil))))
         ((eq (car form) 'progn)
          (cons 'progn (mapcar 'eval-defun-1 (cdr form))))
         (t form)))
diff --git a/lisp/emacs-lisp/testcover.el b/lisp/emacs-lisp/testcover.el
index 2f168180cf6..4c83e7e2e0d 100644
--- a/lisp/emacs-lisp/testcover.el
+++ b/lisp/emacs-lisp/testcover.el
@@ -28,7 +28,7 @@
 ;; * Use `testcover-mark-all' to add overlay "splotches" to the Lisp file's
 ;;   buffer to show where coverage is lacking.  Normally, a red splotch
 ;;   indicates the form was never evaluated; a brown splotch means it always
-;;   evaluted to the same value.
+;;   evaluated to the same value.
 ;; * Use `testcover-next-mark' (bind it to a key!) to jump to the next spot
 ;;   that has a splotch.
 
diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el
index 0a035175041..0e007ff7176 100644
--- a/lisp/emacs-lisp/timer.el
+++ b/lisp/emacs-lisp/timer.el
@@ -110,38 +110,16 @@ of SECS seconds since the epoch.  SECS may be a fraction."
 (defun timer-relative-time (time secs &optional usecs)
   "Advance TIME by SECS seconds and optionally USECS microseconds.
 SECS may be either an integer or a floating point number."
-  ;; FIXME: we should just use (time-add time (list 0 secs usecs))
-  (let ((high (car time))
-        (low (if (consp (cdr time)) (nth 1 time) (cdr time)))
-        (micro (if (numberp (car-safe (cdr-safe (cdr time))))
-                   (nth 2 time)
-                 0)))
-    ;; Add
-    (if usecs (setq micro (+ micro usecs)))
-    (if (floatp secs)
-        (setq micro (+ micro (floor (* 1000000 (- secs (floor secs)))))))
-    (setq low (+ low (floor secs)))
-
-    ;; Normalize
-    ;; `/' rounds towards zero while `mod' returns a positive number,
-    ;; so we can't rely on (= a (+ (* 100 (/ a 100)) (mod a 100))).
-    (setq low (+ low (/ micro 1000000) (if (< micro 0) -1 0)))
-    (setq micro (mod micro 1000000))
-    (setq high (+ high (/ low 65536) (if (< low 0) -1 0)))
-    (setq low (logand low 65535))
-
-    (list high low (and (/= micro 0) micro))))
+  (let ((delta (if (floatp secs)
+                   (seconds-to-time secs)
+                 (list (floor secs 65536) (mod secs 65536)))))
+    (if usecs
+        (setq delta (time-add delta (list 0 0 usecs))))
+    (time-add time delta)))
 
 (defun timer--time-less-p (t1 t2)
   "Say whether time value T1 is less than time value T2."
-  ;; FIXME just use time-less-p.
-  (destructuring-bind (high1 low1 micro1) (timer--time t1)
-    (destructuring-bind (high2 low2 micro2) (timer--time t2)
-      (or (< high1 high2)
-          (and (= high1 high2)
-               (or (< low1 low2)
-                   (and (= low1 low2)
-                        (< micro1 micro2))))))))
+  (time-less-p (timer--time t1) (timer--time t2)))
 
 (defun timer-inc-time (timer secs &optional usecs)
   "Increment the time set in TIMER by SECS seconds and USECS microseconds.
@@ -273,10 +251,7 @@ how many will really happen.")
   "Calculate number of seconds from when TIMER will run, until TIME.
 TIMER is a timer, and stands for the time when its next repeat is scheduled.
 TIME is a time-list."
-  ;; FIXME: (float-time (time-subtract (timer--time timer) time))
-  (let ((high (- (car time) (timer--high-seconds timer)))
-        (low (- (nth 1 time) (timer--low-seconds timer))))
-    (+ low (* high 65536))))
+  (float-time (time-subtract time (timer--time timer))))
 
 (defun timer-event-handler (timer)
   "Call the handler for the timer TIMER.
diff --git a/lisp/emacs-lock.el b/lisp/emacs-lock.el
index 1553aeae0d5..18411f7d2ef 100644
--- a/lisp/emacs-lock.el
+++ b/lisp/emacs-lock.el
@@ -1,9 +1,10 @@
-;;; emacs-lock.el --- prevents you from exiting Emacs if a buffer is locked
+;;; emacs-lock.el --- protect buffers against killing or exiting -*- lexical-binding: t -*-
 
-;; Copyright (C) 1994, 1997, 2001-2011 Free Software Foundation, Inc
+;; Copyright (C) 2011 Free Software Foundation, Inc
 
-;; Author: Tom Wurgler <twurgler@goodyear.com>
-;; Created: 12/8/94
+;; Author: Juanma Barranquero <lekktu@gmail.com>
+;; Inspired by emacs-lock.el by Tom Wurgler <twurgler@goodyear.com>
+;; Maintainer: FSF
 ;; Keywords: extensions, processes
 
 ;; This file is part of GNU Emacs.
@@ -23,78 +24,220 @@
 
 ;;; Commentary:
 
-;; This code sets a buffer-local variable to t if toggle-emacs-lock is run,
-;; then if the user attempts to exit Emacs, the locked buffer name will be
-;; displayed and the exit aborted.  This is just a way of protecting
-;; yourself from yourself.  For example, if you have a shell running a big
-;; program and exiting Emacs would abort that program, you may want to lock
-;; that buffer, then if you forget about it after a while, you won't
-;; accidentally exit Emacs.  To unlock the buffer, just goto the buffer and
-;; run toggle-emacs-lock again.
+;; This package defines a minor mode Emacs Lock to mark a buffer as
+;; protected against accidental killing, or exiting Emacs, or both.
+;; Buffers associated with inferior modes, like shell or telnet, can
+;; be treated specially, by auto-unlocking them if their interior
+;; processes are dead.
 
 ;;; Code:
 
-(defvar emacs-lock-from-exiting nil
-  "Whether Emacs is locked to prevent exiting.  See `check-emacs-lock'.")
-(make-variable-buffer-local 'emacs-lock-from-exiting)
-
-(defvar emacs-lock-buffer-locked nil
-  "Whether a shell or telnet buffer was locked when its process was killed.")
-(make-variable-buffer-local 'emacs-lock-buffer-locked)
-(put 'emacs-lock-buffer-locked 'permanent-local t)
+(defgroup emacs-lock nil
+  "Emacs-Lock mode."
+  :version "24.1"
+  :group 'convenience)
+
+(defcustom emacs-lock-default-locking-mode 'all
+  "Default locking mode of Emacs-Locked buffers.
+
+Its value is used as the default for `emacs-lock-mode' (which
+see) the first time that Emacs Lock mode is turned on in a buffer
+without passing an explicit locking mode.
+
+Possible values are:
+ exit   -- Emacs cannot exit while the buffer is locked
+ kill   -- the buffer cannot be killed, but Emacs can exit as usual
+ all    -- the buffer is locked against both actions
+ nil    -- the buffer is not locked"
+  :type '(choice
+          (const :tag "Do not allow Emacs to exit" exit)
+          (const :tag "Do not allow killing the buffer" kill)
+          (const :tag "Do not allow killing the buffer or exiting Emacs" all)
+          (const :tag "Do not lock the buffer" nil))
+  :group 'emacs-lock
+  :version "24.1")
+
+;; Note: as auto-unlocking can lead to data loss, it would be better
+;; to default to nil; but the value below is for compatibility with
+;; the old emacs-lock.el.
+(defcustom emacs-lock-unlockable-modes '((shell-mode . all)
+                                         (telnet-mode . all))
+  "Alist of auto-unlockable modes.
+Each element is a pair (MAJOR-MODE . ACTION), where ACTION is
+one of `kill', `exit' or `all'.  Buffers with matching major
+modes are auto-unlocked for the specific action if their
+inferior processes are not alive.  If this variable is t, all
+buffers associated to inferior processes are auto-unlockable
+for both actions (NOT RECOMMENDED)."
+  :type '(choice
+          (const :tag "All buffers with inferior processes" t)
+          (repeat :tag "Selected modes"
+           (cons :tag "Set auto-unlock for"
+            (symbol :tag "Major mode")
+            (radio
+             (const :tag "Allow exiting" exit)
+             (const :tag "Allow killing" kill)
+             (const :tag "Allow both" all)))))
+  :group 'emacs-lock
+  :version "24.1")
+
+(defvar emacs-lock-mode nil
+  "If non-nil, the current buffer is locked.
+It can be one of the following values:
+ exit   -- Emacs cannot exit while the buffer is locked
+ kill   -- the buffer cannot be killed, but Emacs can exit as usual
+ all    -- the buffer is locked against both actions
+ nil    -- the buffer is not locked")
+(make-variable-buffer-local 'emacs-lock-mode)
+(put 'emacs-lock-mode 'permanent-local t)
+
+(defvar emacs-lock--old-mode nil
+  "Most recent locking mode set on the buffer.
+Internal use only.")
+(make-variable-buffer-local 'emacs-lock--old-mode)
+(put 'emacs-lock--old-mode 'permanent-local t)
+
+(defvar emacs-lock--try-unlocking nil
+  "Non-nil if current buffer should be checked for auto-unlocking.
+Internal use only.")
+(make-variable-buffer-local 'emacs-lock--try-unlocking)
+(put 'emacs-lock--try-unlocking 'permanent-local t)
+
+(defun emacs-lock-live-process-p (buffer-or-name)
+  "Return t if BUFFER-OR-NAME is associated with a live process."
+  (let ((proc (get-buffer-process buffer-or-name)))
+    (and proc (process-live-p proc))))
+
+(defun emacs-lock--can-auto-unlock (action)
+  "Return t if the current buffer can auto-unlock for ACTION.
+ACTION must be one of `kill' or `exit'.
+See `emacs-lock-unlockable-modes'."
+  (and emacs-lock--try-unlocking
+       (not (emacs-lock-live-process-p (current-buffer)))
+       (or (eq emacs-lock-unlockable-modes t)
+           (let ((unlock (cdr (assq major-mode emacs-lock-unlockable-modes))))
+             (or (eq unlock 'all) (eq unlock action))))))
+
+(defun emacs-lock--exit-locked-buffer ()
+  "Return the name of the first exit-locked buffer found."
+  (save-current-buffer
+    (catch :found
+      (dolist (buffer (buffer-list))
+        (set-buffer buffer)
+        (unless (or (emacs-lock--can-auto-unlock 'exit)
+                    (memq emacs-lock-mode '(nil kill)))
+          (throw :found (buffer-name))))
+      nil)))
+
+(defun emacs-lock--kill-emacs-hook ()
+  "Signal an error if any buffer is exit-locked.
+Used from `kill-emacs-hook' (which see)."
+  (let ((buffer-name (emacs-lock--exit-locked-buffer)))
+    (when buffer-name
+      (error "Emacs cannot exit because buffer %S is locked" buffer-name))))
+
+(defun emacs-lock--kill-emacs-query-functions ()
+  "Display a message if any buffer is exit-locked.
+Return a value appropriate for `kill-emacs-query-functions' (which see)."
+  (let ((locked (emacs-lock--exit-locked-buffer)))
+    (or (not locked)
+        (progn
+          (message "Emacs cannot exit because buffer %S is locked" locked)
+          nil))))
+
+(defun emacs-lock--kill-buffer-query-functions ()
+  "Display a message if the current buffer is kill-locked.
+Return a value appropriate for `kill-buffer-query-functions' (which see)."
+  (or (emacs-lock--can-auto-unlock 'kill)
+      (memq emacs-lock-mode '(nil exit))
+      (progn
+        (message "Buffer %S is locked and cannot be killed" (buffer-name))
+        nil)))
+
+(defun emacs-lock--set-mode (mode arg)
+  "Setter function for `emacs-lock-mode'."
+  (setq emacs-lock-mode
+        (cond ((memq arg '(all exit kill))
+               ;; explicit locking mode arg, use it
+               arg)
+              ((and (eq arg current-prefix-arg) (consp current-prefix-arg))
+               ;; called with C-u M-x emacs-lock-mode, so ask the user
+               (intern (completing-read "Locking mode: "
+                                        '("all" "exit" "kill")
+                                        nil t nil nil
+                                        (symbol-name
+                                         emacs-lock-default-locking-mode))))
+              ((eq mode t)
+               ;; turn on, so use previous setting, or customized default
+               (or emacs-lock--old-mode emacs-lock-default-locking-mode))
+              (t
+               ;; anything else (turn off)
+               mode))))
+
+;;;###autoload
+(define-minor-mode emacs-lock-mode
+    "Toggle Emacs Lock mode in the current buffer.
+
+With \\[universal-argument], ask for the locking mode to be used.
+With other prefix ARG, turn mode on if ARG is positive, off otherwise.
+
+Initially, if the user does not pass an explicit locking mode, it defaults
+to `emacs-lock-default-locking-mode' (which see); afterwards, the locking
+mode most recently set on the buffer is used instead.
+
+When called from Elisp code, ARG can be any locking mode:
+
+ exit   -- Emacs cannot exit while the buffer is locked
+ kill   -- the buffer cannot be killed, but Emacs can exit as usual
+ all    -- the buffer is locked against both actions
+
+Other values are interpreted as usual."
+  :init-value nil
+  :lighter (""
+            (emacs-lock--try-unlocking " locked:" " Locked:")
+            (:eval (symbol-name emacs-lock-mode)))
+  :group 'emacs-lock
+  :variable (emacs-lock-mode .
+                             (lambda (mode)
+                               (emacs-lock--set-mode mode arg)))
+  (when emacs-lock-mode
+    (setq emacs-lock--old-mode emacs-lock-mode)
+    (setq emacs-lock--try-unlocking
+          (and (if (eq emacs-lock-unlockable-modes t)
+                   (emacs-lock-live-process-p (current-buffer))
+                 (assq major-mode emacs-lock-unlockable-modes))
+               t))))
 
-(defun check-emacs-lock ()
-  "Check if variable `emacs-lock-from-exiting' is t for any buffer.
-If any locked buffer is found, signal error and display the buffer's name."
-  (save-excursion
+(unless noninteractive
+  (add-hook 'kill-buffer-query-functions 'emacs-lock--kill-buffer-query-functions)
+  ;; We set a hook in both kill-emacs-hook and kill-emacs-query-functions because
+  ;; we really want to use k-e-q-f to stop as soon as possible, but don't want to
+  ;; be caught by surprise if someone calls `kill-emacs' instead.
+  (add-hook 'kill-emacs-hook 'emacs-lock--kill-emacs-hook)
+  (add-hook 'kill-emacs-query-functions 'emacs-lock--kill-emacs-query-functions))
+
+(defun emacs-lock-unload-function ()
+  "Unload the Emacs Lock library."
+  (catch :continue
     (dolist (buffer (buffer-list))
       (set-buffer buffer)
-      (when emacs-lock-from-exiting
-        (error "Emacs is locked from exit due to buffer: %s" (buffer-name))))))
+      (when emacs-lock-mode
+        (if (y-or-n-p (format "Buffer %S is locked, unlock it? " (buffer-name)))
+            (emacs-lock-mode -1)
+          (message "Unloading of feature `emacs-lock' aborted.")
+          (throw :continue t))))
+    ;; continue standard unloading
+    nil))
 
-(defun toggle-emacs-lock ()
-  "Toggle `emacs-lock-from-exiting' for the current buffer.
-See `check-emacs-lock'."
-  (interactive)
-  (setq emacs-lock-from-exiting (not emacs-lock-from-exiting))
-  (if emacs-lock-from-exiting
-      (message "Buffer is now locked")
-    (message "Buffer is now unlocked")))
-
-(defun emacs-lock-check-buffer-lock ()
-  "Check if variable `emacs-lock-from-exiting' is t for a buffer.
-If the buffer is locked, signal error and display its name."
-  (when emacs-lock-from-exiting
-    (error "Buffer `%s' is locked, can't delete it" (buffer-name))))
-
-; These next defuns make it so if you exit a shell that is locked,  the lock
-; is shut off for that shell so you can exit Emacs.  Same for telnet.
-; Also, if a shell or a telnet buffer was locked and the process killed,
-; turn the lock back on again if the process is restarted.
-
-(defun emacs-lock-shell-sentinel ()
-  (set-process-sentinel
-   (get-buffer-process (buffer-name)) (function emacs-lock-clear-sentinel)))
-
-(defun emacs-lock-clear-sentinel (_proc _str)
-  (if emacs-lock-from-exiting
-      (progn
-        (setq emacs-lock-from-exiting nil)
-        (setq emacs-lock-buffer-locked t)
-        (message "Buffer is now unlocked"))
-    (setq emacs-lock-buffer-locked nil)))
+;;; Compatibility
 
-(defun emacs-lock-was-buffer-locked ()
-  (if emacs-lock-buffer-locked
-      (setq emacs-lock-from-exiting t)))
+(define-obsolete-variable-alias 'emacs-lock-from-exiting 'emacs-lock-mode "24.1")
 
-(unless noninteractive
-  (add-hook 'kill-emacs-hook 'check-emacs-lock))
-(add-hook 'kill-buffer-hook 'emacs-lock-check-buffer-lock)
-(add-hook 'shell-mode-hook 'emacs-lock-was-buffer-locked)
-(add-hook 'shell-mode-hook 'emacs-lock-shell-sentinel)
-(add-hook 'telnet-mode-hook 'emacs-lock-was-buffer-locked)
-(add-hook 'telnet-mode-hook 'emacs-lock-shell-sentinel)
+(defun toggle-emacs-lock ()
+  "Toggle `emacs-lock-from-exiting' for the current buffer."
+  (interactive)
+  (call-interactively 'emacs-lock-mode))
+(make-obsolete 'toggle-emacs-lock 'emacs-lock-mode "24.1")
 
 (provide 'emacs-lock)
 
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index f06428d81eb..9d0eb6c0d14 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -617,7 +617,10 @@
     (or (viper-overlay-p viper-replace-overlay)
       (viper-set-replace-overlay (point-min) (point-min)))
     (viper-hide-replace-overlay)
-    (if abbrev-mode (expand-abbrev))
+    ;; Expand abbrevs iff the previous character has word syntax.
+    (and abbrev-mode
+         (eq (char-syntax (preceding-char)) ?w)
+         (expand-abbrev))
     (if (and auto-fill-function (> (current-column) fill-column))
         (funcall auto-fill-function))
     ;; don't leave whitespace lines around
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 3d9b0c8646f..1560f2a9049 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-04  Vivek Dasmohapatra  <vivek@etla.org>
+
+        * erc.el (erc-generate-new-buffer-name): Reuse old buffer names
+        when reconnecting (bug#5563).
+
 2011-06-23  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * erc.el (erc-ssl): Made into a synonym for erc-tls, which
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 36097cf0c12..a4040b239c1 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -1555,26 +1555,33 @@ symbol, it may have these values:
 (defun erc-generate-new-buffer-name (server port target &optional proc)
   "Create a new buffer name based on the arguments."
   (when (numberp port) (setq port (number-to-string port)))
-  (let* ((buf-name (or target
-                       (or (let ((name (concat server ":" port)))
-                             (when (> (length name) 1)
-                               name))
-                           ; This fallback should in fact never happen
-                           "*erc-server-buffer*"))))
+  (let ((buf-name (or target
+                      (or (let ((name (concat server ":" port)))
+                            (when (> (length name) 1)
+                              name))
+                          ;; This fallback should in fact never happen
+                          "*erc-server-buffer*")))
+        buffer-name)
     ;; Reuse existing buffers, but not if the buffer is a connected server
     ;; buffer and not if its associated with a different server than the
     ;; current ERC buffer.
-    (if (and erc-reuse-buffers
-             (get-buffer buf-name)
-             (or target
-                 (with-current-buffer (get-buffer buf-name)
-                   (and (erc-server-buffer-p)
-                        (not (erc-server-process-alive)))))
-             (with-current-buffer (get-buffer buf-name)
-               (and (string= erc-session-server server)
-                    (erc-port-equal erc-session-port port))))
-        buf-name
-      (generate-new-buffer-name buf-name))))
+    ;; if buf-name is taken by a different connection (or by something !erc)
+    ;; then see if "buf-name/server" meets the same criteria
+    (dolist (candidate (list buf-name (concat buf-name "/" server))) 
+      (if (and (not buffer-name)
+               erc-reuse-buffers
+               (get-buffer candidate)
+               (or target
+                   (with-current-buffer (get-buffer candidate)
+                     (and (erc-server-buffer-p)
+                          (not (erc-server-process-alive)))))
+               (with-current-buffer (get-buffer candidate)
+                 (and (string= erc-session-server server)
+                      (erc-port-equal erc-session-port port))))
+          (setq buffer-name candidate)))
+    ;; if buffer-name is unset, neither candidate worked out for us,
+    ;; fallback to the old <N> uniquification method:
+    (or buffer-name (generate-new-buffer-name buf-name)) ))
 
 (defun erc-get-buffer-create (server port target &optional proc)
   "Create a new buffer based on the arguments."
@@ -2362,7 +2369,7 @@ If STRING is nil, the function does nothing."
         (cond ((integerp elt)           ; POSITION
                (incf (car list) shift))
               ((or (atom elt)           ; nil, EXTENT
-                   ;; (eq t (car elt))  ; (t HIGH . LOW)
+                   ;; (eq t (car elt))  ; (t . TIME)
                    (markerp (car elt))) ; (MARKER . DISTANCE)
                nil)
               ((integerp (car elt))     ; (BEGIN . END)
@@ -6493,4 +6500,3 @@ Otherwise, connect to HOST:PORT as USER and /join CHANNEL."
 ;; indent-tabs-mode: t
 ;; tab-width: 8
 ;; End:
-
diff --git a/lisp/eshell/em-smart.el b/lisp/eshell/em-smart.el
index f08fec8f8fa..259072d9750 100644
--- a/lisp/eshell/em-smart.el
+++ b/lisp/eshell/em-smart.el
@@ -120,6 +120,7 @@ only if that output can be presented in its entirely in the Eshell window."
 (defcustom eshell-smart-display-navigate-list
   '(insert-parentheses
     mouse-yank-at-click
+    mouse-yank-primary
     mouse-yank-secondary
     yank-pop
     yank-rectangle
diff --git a/lisp/faces.el b/lisp/faces.el
index c29d8c9bfd8..302f8af35ac 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1821,109 +1821,6 @@ Return nil if it has no specified face."
            (cond ((memq 'background-color face) (cdr (memq 'background-color face)))
                  ((memq ':background face) (cadr (memq ':background face)))))
           (t nil))))                    ; Invalid face value.
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Background mode.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defcustom frame-background-mode nil
-  "The brightness of the background.
-Set this to the symbol `dark' if your background color is dark,
-`light' if your background is light, or nil (automatic by default)
-if you want Emacs to examine the brightness for you.  Don't set this
-variable with `setq'; this won't have the expected effect."
-  :group 'faces
-  :set #'(lambda (var value)
-           (set-default var value)
-           (mapc 'frame-set-background-mode (frame-list)))
-  :initialize 'custom-initialize-changed
-  :type '(choice (const dark)
-                 (const light)
-                 (const :tag "automatic" nil)))
-
-
-(declare-function x-get-resource "frame.c"
-                  (attribute class &optional component subclass))
-
-(defvar inhibit-frame-set-background-mode nil)
-
-(defun frame-set-background-mode (frame &optional keep-face-specs)
-  "Set up display-dependent faces on FRAME.
-Display-dependent faces are those which have different definitions
-according to the `background-mode' and `display-type' frame parameters.
-
-If optional arg KEEP-FACE-SPECS is non-nil, don't recalculate
-face specs for the new background mode."
-  (unless inhibit-frame-set-background-mode
-    (let* ((bg-resource
-            (and (window-system frame)
-                 (x-get-resource "backgroundMode" "BackgroundMode")))
-           (bg-color (frame-parameter frame 'background-color))
-           (terminal-bg-mode (terminal-parameter frame 'background-mode))
-           (tty-type (tty-type frame))
-           (default-bg-mode
-             (if (or (window-system frame)
-                     (and tty-type
-                          (string-match "^\\(xterm\\|\\rxvt\\|dtterm\\|eterm\\)"
-                                        tty-type)))
-                 'light
-               'dark))
-           (non-default-bg-mode (if (eq default-bg-mode 'light) 'dark 'light))
-           (bg-mode
-            (cond (frame-background-mode)
-                  (bg-resource (intern (downcase bg-resource)))
-                  (terminal-bg-mode)
-                  ((equal bg-color "unspecified-fg") ; inverted colors
-                   non-default-bg-mode)
-                  ((not (color-values bg-color frame))
-                   default-bg-mode)
-                  ((>= (apply '+ (color-values bg-color frame))
-                       ;; Just looking at the screen, colors whose
-                       ;; values add up to .6 of the white total
-                       ;; still look dark to me.
-                       (* (apply '+ (color-values "white" frame)) .6))
-                   'light)
-                  (t 'dark)))
-           (display-type
-            (cond ((null (window-system frame))
-                   (if (tty-display-color-p frame) 'color 'mono))
-                  ((display-color-p frame)
-                   'color)
-                  ((x-display-grayscale-p frame)
-                   'grayscale)
-                  (t 'mono)))
-           (old-bg-mode
-            (frame-parameter frame 'background-mode))
-           (old-display-type
-            (frame-parameter frame 'display-type)))
-
-      (unless (and (eq bg-mode old-bg-mode) (eq display-type old-display-type))
-        (let ((locally-modified-faces nil)
-              ;; Prevent face-spec-recalc from calling this function
-              ;; again, resulting in a loop (bug#911).
-              (inhibit-frame-set-background-mode t)
-              (params (list (cons 'background-mode bg-mode)
-                            (cons 'display-type display-type))))
-          (if keep-face-specs
-              (modify-frame-parameters frame params)
-            ;; If we are recomputing face specs, first collect a list
-            ;; of faces that don't match their face-specs.  These are
-            ;; the faces modified on FRAME, and we avoid changing them
-            ;; below.  Use a negative list to avoid consing (we assume
-            ;; most faces are unmodified).
-            (dolist (face (face-list))
-              (and (not (get face 'face-override-spec))
-                   (not (face-spec-match-p face
-                                           (face-user-default-spec face)
-                                           (selected-frame)))
-                   (push face locally-modified-faces)))
-            ;; Now change to the new frame parameters
-            (modify-frame-parameters frame params)
-            ;; For all unmodified named faces, choose face specs
-            ;; matching the new frame parameters.
-            (dolist (face (face-list))
-              (unless (memq face locally-modified-faces)
-                (face-spec-recalc face frame)))))))))
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -2020,7 +1917,8 @@ settings, X resources, and `face-new-frame-defaults'.
 Finally, apply any relevant face attributes found amongst the
 frame parameters in PARAMETERS."
   (let ((window-system-p (memq (window-system frame) '(x w32))))
-    (dolist (face (nreverse (face-list))) ;Why reverse?  --Stef
+    ;; The `reverse' is so that `default' goes first.
+    (dolist (face (nreverse (face-list)))
       (condition-case ()
           (progn
             ;; Initialize faces from face spec and custom theme.
@@ -2211,7 +2109,7 @@ terminal type to a different value."
 
 (defface link
   '((((class color) (min-colors 88) (background light))
-     :foreground "blue1" :underline t)
+     :foreground "RoyalBlue3" :underline t)
     (((class color) (background light))
      :foreground "blue" :underline t)
     (((class color) (min-colors 88) (background dark))
diff --git a/lisp/files.el b/lisp/files.el
index 7b97b730111..0b253fcc297 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1341,8 +1341,8 @@ automatically choosing a major mode, use \\[find-file-literally]."
                         (confirm-nonexistent-file-or-buffer)))
   (let ((value (find-file-noselect filename nil nil wildcards)))
     (if (listp value)
-        (mapcar 'switch-to-buffer (nreverse value))
-      (switch-to-buffer value))))
+        (mapcar #'pop-to-buffer-same-window (nreverse value))
+      (pop-to-buffer-same-window value))))
 
 (defun find-file-other-window (filename &optional wildcards)
   "Edit file FILENAME, in another window.
@@ -2060,7 +2060,11 @@ unless NOMODES is non-nil."
              ((not warn) nil)
              ((and error (file-attributes buffer-file-name))
               (setq buffer-read-only t)
-              "File exists, but cannot be read")
+              (if (and (file-symlink-p buffer-file-name)
+                       (not (file-exists-p
+                             (file-chase-links buffer-file-name))))
+                  "Symbolic link that points to nonexistent file"
+                "File exists, but cannot be read"))
              ((not buffer-read-only)
               (if (and warn
                        ;; No need to warn if buffer is auto-saved
@@ -2268,7 +2272,12 @@ since only a single case-insensitive search through the alist is made."
      ("\\.icn\\'" . icon-mode)
      ("\\.sim\\'" . simula-mode)
      ("\\.mss\\'" . scribe-mode)
+     ;; The Fortran standard does not say anything about file extensions.
+     ;; .f90 was widely used for F90, now we seem to be trapped into
+     ;; using a different extension for each language revision.
+     ;; Anyway, the following extensions are supported by gfortran.
      ("\\.f9[05]\\'" . f90-mode)
+     ("\\.f0[38]\\'" . f90-mode)
      ("\\.indent\\.pro\\'" . fundamental-mode) ; to avoid idlwave-mode
      ("\\.\\(pro\\|PRO\\)\\'" . idlwave-mode)
      ("\\.srt\\'" . srecode-template-mode)
@@ -2938,16 +2947,7 @@ n  -- to ignore the local variables list.")
             (setq char nil)))
         (kill-buffer buf)
         (when (and offer-save (= char ?!) unsafe-vars)
-          (dolist (elt unsafe-vars)
-            (add-to-list 'safe-local-variable-values elt))
-          ;; When this is called from desktop-restore-file-buffer,
-          ;; coding-system-for-read may be non-nil.  Reset it before
-          ;; writing to .emacs.
-          (if (or custom-file user-init-file)
-              (let ((coding-system-for-read nil))
-                (customize-save-variable
-                 'safe-local-variable-values
-                 safe-local-variable-values))))
+          (customize-push-and-save 'safe-local-variable-values unsafe-vars))
         (memq char '(?! ?\s ?y))))))
 
 (defun hack-local-variables-prop-line (&optional mode-only)
@@ -4698,7 +4698,7 @@ and `view-read-only' is non-nil, enter view mode."
       (view-mode-enter))
      (t (setq buffer-read-only (not buffer-read-only))
         (force-mode-line-update)))
-    (if (vc-backend buffer-file-name)
+    (if (memq (vc-backend buffer-file-name) '(RCS SCCS))
         (message "%s" (substitute-command-keys
                   (concat "File is under version-control; "
                           "use \\[vc-next-action] to check in/out"))))))
@@ -4778,7 +4778,10 @@ visited a file in a nonexistent directory.
 
 Noninteractively, the second (optional) argument PARENTS, if
 non-nil, says whether to create parent directories that don't
-exist.  Interactively, this happens by default."
+exist.  Interactively, this happens by default.
+
+If creating the directory or directories fail, an error will be
+raised."
   (interactive
    (list (read-file-name "Make directory: " default-directory default-directory
                          nil nil)
@@ -5564,7 +5567,8 @@ default directory.  However, if FULL is non-nil, they are absolute."
            contents)
       (while dirs
         (when (or (null (car dirs))     ; Possible if DIRPART is not wild.
-                  (file-directory-p (directory-file-name (car dirs))))
+                  (and (file-directory-p (directory-file-name (car dirs)))
+                       (file-readable-p (car dirs))))
           (let ((this-dir-contents
                  ;; Filter out "." and ".."
                  (delq nil
diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index a2b196dc029..491110bc898 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -86,8 +86,7 @@ them for `find-ls-option'."
 
 (defcustom find-grep-options
   (if (or (eq system-type 'berkeley-unix)
-          (string-match "solaris2" system-configuration)
-          (string-match "irix" system-configuration))
+          (string-match "solaris2\\|irix" system-configuration))
       "-s" "-q")
   "Option to grep to be as silent as possible.
 On Berkeley systems, this is `-s'; on Posix, and with GNU grep, `-q' does it.
diff --git a/lisp/follow.el b/lisp/follow.el
index 9bf472e547c..94a542f1016 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -118,7 +118,7 @@
 ;; (setq pixel-vertical-clip-threshold 30)
 
 
-;; The correct way to cofigurate Follow mode, or any other mode for
+;; The correct way to configurate Follow mode, or any other mode for
 ;; that matter, is to create one or more functions that do
 ;; whatever you would like to do.  These functions are then added to
 ;; a hook.
@@ -189,7 +189,7 @@
 ;; positions in the text? Here are two simple methods to use:
 ;;
 ;; 1) Use multiple frames; `follow' mode only affects windows displayed
-;;    in the same frame. (My apoligies to you who can't use frames.)
+;;    in the same frame. (My apologies to you who can't use frames.)
 ;;
 ;; 2) Bind `follow-mode' to key so you can turn it off whenever
 ;;    you want to view two locations.  Of course, `follow' mode can
@@ -209,15 +209,15 @@
 ;;
 ;; Follow mode does this in three places:
 ;; 1) After each user command.
-;; 2) After a process output has been perfomed.
+;; 2) After a process output has been performed.
 ;; 3) When a scrollbar has been moved.
 ;;
 ;; This will cover most situations. (Let me know if there are other
 ;; situations that should be covered.)
 ;;
 ;; Note that only the selected window is checked, for the reason of
-;; efficiency and code complexity. (I.e. it is possible to make a
-;; non-selected windows unaligned.  It will, however, pop right back
+;; efficiency and code complexity.  (I.e. it is possible to make a
+;; non-selected window unaligned.  It will, however, pop right back
 ;; when it is selected.)
 
 ;;}}}
@@ -244,7 +244,7 @@
 ;;      (funcall (symbol-function 'set) 'bar ...)
 ;;
 ;; Note: When this file is interpreted, `eval-when-compile' is
-;; evaluted.  Since it doesn't hurt to evaluate it, but it is a bit
+;; evaluated.  Since it doesn't hurt to evaluate it, but it is a bit
 ;; annoying, we test if the byte-compiler has been loaded.  This can,
 ;; of course, lead to some occasional unintended evaluation...
 ;;
@@ -456,7 +456,7 @@ Used by `follow-window-size-change'.")
 ;; the variable is not set.
 
 (defsubst follow-debug-message (&rest args)
-  "Like message, but only active when `follow-debug' is non-nil."
+  "Like `message', but only active when `follow-debug' is non-nil."
   (if (and (boundp 'follow-debug) follow-debug)
       (apply 'message args)))
 
@@ -1000,7 +1000,7 @@ Note that this handles the case when the cache has been set to nil."
     res))
 
 
-;; Make sure WIN always starts at the beginning of an whole screen
+;; Make sure WIN always starts at the beginning of a whole screen
 ;; line. If WIN is not aligned the start is updated which probably
 ;; will lead to a redisplay of the screen later on.
 ;;
@@ -1057,8 +1057,8 @@ Return the selected window."
     win))
 
 
-;; Lets select a window showing the end. Make sure we only select it if it
-;; it wasn't just moved here. (i.e. M-> shall not unconditionally place
+;; Lets select a window showing the end. Make sure we only select it if
+;; it wasn't just moved here. (I.e. M-> shall not unconditionally place
 ;; the point in the selected window.)
 ;;
 ;; (Compatibility cludge: in Emacs `window-end' is equal to `point-max';
@@ -1134,7 +1134,7 @@ Otherwise, return nil."
   "Reposition the WINDOWS around WIN.
 Should the point be too close to the roof we redisplay everything
 from the top.  WINDOWS should contain a list of windows to
-redisplay, it is assumed that WIN is a member of the list.
+redisplay; it is assumed that WIN is a member of the list.
 Should WINDOWS be nil, the windows displaying the
 same buffer as WIN, in the current frame, are used.
 Should WIN be nil, the selected window is used.
@@ -1231,7 +1231,7 @@ should be a member of WINDOWS, starts at position START."
                  (setq done t res (point)))
                 ((= win-start start)    ; Perfect match, use this value
                  (setq done t res (point)))
-                ((< win-start start)    ; Walked to far, use preious result
+                ((< win-start start)    ; Walked to far, use previous result
                  (setq done t))
                 (t                      ; Store result for next iteration
                  (setq res (point))))))
@@ -1241,12 +1241,12 @@ should be a member of WINDOWS, starts at position START."
 ;;{{{ Avoid tail recenter
 
 ;; This sets the window internal flag `force_start'. The effect is that
-;; windows only displaying the tail isn't recentered.
+;; windows only displaying the tail aren't recentered.
 ;; Has to be called before every redisplay... (Great isn't it?)
 ;;
 ;; XEmacs doesn't recenter the tail, GOOD!
 ;;
-;; A window displaying only the tail, is a windows whose
+;; A window displaying only the tail, is a window whose
 ;; window-start position is equal to (point-max) of the buffer it
 ;; displays.
 ;;
@@ -1487,12 +1487,12 @@ non-first windows in Follow mode."
 ;;;; Scroll-bar support code.
 
 ;; Why is it needed? Well, if the selected window is in follow mode,
-;; all its follower stick to it blindly. If one of them is scrolled,
+;; all its followers stick to it blindly. If one of them is scrolled,
 ;; it immediately returns to the original position when the mouse is
 ;; released. If the selected window is not a follower of the dragged
 ;; window the windows will be unaligned.
 
-;; The advices doesn't get compiled. Aestetically, this might be a
+;; The advices don't get compiled. Aesthetically, this might be a
 ;; problem but in practical life it isn't.
 
 ;; Discussion: Now when the other windows in the chain follow the
@@ -1700,8 +1700,8 @@ magic stuff before the real process filter is called."
 ;;}}}
 ;;{{{ Start/stop interception of processes.
 
-;; Normally, all new processed are intercepted by our `set-process-filter'.
-;; This is needed to intercept old processed that were started before we were
+;; Normally, all new processes are intercepted by our `set-process-filter'.
+;; This is needed to intercept old processes that were started before we were
 ;; loaded, and processes we have forgotten by calling
 ;; `follow-stop-intercept-process-output'.
 
@@ -1749,7 +1749,7 @@ report this using the `report-emacs-bug' function."
 
 ;; The following section is a naive method to make buffers with
 ;; process output to work with Follow mode. Whenever the start of the
-;; window displaying the buffer is moved, we moves it back to its
+;; window displaying the buffer is moved, we move it back to its
 ;; original position and try to select a new window.  (If we fail,
 ;; the normal redisplay functions of Emacs will scroll it right
 ;; back!)
@@ -1767,7 +1767,7 @@ report this using the `report-emacs-bug' function."
 
     ;; If input is pending, the `sit-for' below won't redraw the
     ;; display. In that case, calling `follow-avoid-tail-recenter' may
-    ;; provoke the process hadnling code to sceduling a redisplay.
+    ;; provoke the process handling code to schedule a redisplay.
     ;(or (input-pending-p)
     ; (follow-avoid-tail-recenter))
 
@@ -1788,7 +1788,7 @@ report this using the `report-emacs-bug' function."
               (inhibit-read-only t))
           (save-excursion
             (goto-char (process-mark proc))
-            ;; `insert-before-markers' just in case the users next
+            ;; `insert-before-markers' just in case the user's next
             ;; command is M-y.
             (insert-before-markers output)
             (set-marker (process-mark proc) (point)))
@@ -1848,7 +1848,7 @@ report this using the `report-emacs-bug' function."
                    (t
                     (follow-debug-message "filter: nothing")))
 
-                  ;; Here we have slected a window. Make sure the
+                  ;; Here we have selected a window. Make sure the
                   ;; windows are aligned and the point is visible
                   ;; in the selected window.
                   (if (and (not (follow-pos-visible
@@ -1866,7 +1866,7 @@ report this using the `report-emacs-bug' function."
     ;; return to the original window.
     (if return-to-orig-win
         (select-window orig-win))
-    ;; Restore the orignal buffer, unless the filter explicitly
+    ;; Restore the original buffer, unless the filter explicitly
     ;; changed buffer or killed the old buffer.
     (if (and (eq buf (current-buffer))
              (buffer-name old-buffer))
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index e4dc6f11479..6902ce98ab1 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -254,6 +254,7 @@ for buffers in Rmail mode, and size is irrelevant otherwise."
 If nil, use the default decoration (typically the minimum available).
 If t, use the maximum decoration available.
 If a number, use that level of decoration (or if not available the maximum).
+The higher the number, the more decoration is done.
 If a list, each element should be a cons pair of the form (MAJOR-MODE . LEVEL),
 where MAJOR-MODE is a symbol or t (meaning the default).  For example:
  ((c-mode . t) (c++-mode . 2) (t . 1))
@@ -1856,19 +1857,13 @@ Sets various variables using `font-lock-defaults' and
     (((class color) (min-colors 8) (background light))
      (:foreground "red"))
     (((class color) (min-colors 8) (background dark))
-     )
+     (:foreground "yellow"))
     (t (:weight bold :slant italic)))
   "Font Lock mode face used to highlight comments."
   :group 'font-lock-faces)
 
 (defface font-lock-comment-delimiter-face
-  '((default :inherit font-lock-comment-face)
-    (((class grayscale)))
-    (((class color) (min-colors 16)))
-    (((class color) (min-colors 8) (background light))
-     :foreground "red")
-    (((class color) (min-colors 8) (background dark))
-     :foreground "red1"))
+  '((default :inherit font-lock-comment-face))
   "Font Lock mode face used to highlight comment delimiters."
   :group 'font-lock-faces)
 
@@ -1904,7 +1899,7 @@ Sets various variables using `font-lock-defaults' and
 (defface font-lock-builtin-face
   '((((class grayscale) (background light)) (:foreground "LightGray" :weight bold))
     (((class grayscale) (background dark)) (:foreground "DimGray" :weight bold))
-    (((class color) (min-colors 88) (background light)) (:foreground "MediumOrchid4"))
+    (((class color) (min-colors 88) (background light)) (:foreground "dark slate blue"))
     (((class color) (min-colors 88) (background dark)) (:foreground "LightSteelBlue"))
     (((class color) (min-colors 16) (background light)) (:foreground "Orchid"))
     (((class color) (min-colors 16) (background dark)) (:foreground "LightSteelBlue"))
diff --git a/lisp/frame.el b/lisp/frame.el
index 3ceec2657e7..d6f82750347 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -847,6 +847,116 @@ If there is no frame by that name, signal an error."
     (if frame
         (select-frame-set-input-focus frame)
       (error "There is no frame named `%s'" name))))
+
+
+;;;; Background mode.
+
+(defcustom frame-background-mode nil
+  "The brightness of the background.
+Set this to the symbol `dark' if your background color is dark,
+`light' if your background is light, or nil (automatic by default)
+if you want Emacs to examine the brightness for you.  Don't set this
+variable with `setq'; this won't have the expected effect."
+  :group 'faces
+  :set #'(lambda (var value)
+           (set-default var value)
+           (mapc 'frame-set-background-mode (frame-list)))
+  :initialize 'custom-initialize-changed
+  :type '(choice (const dark)
+                 (const light)
+                 (const :tag "automatic" nil)))
+
+(declare-function x-get-resource "frame.c"
+                  (attribute class &optional component subclass))
+
+(defvar inhibit-frame-set-background-mode nil)
+
+(defun frame-set-background-mode (frame &optional keep-face-specs)
+  "Set up display-dependent faces on FRAME.
+Display-dependent faces are those which have different definitions
+according to the `background-mode' and `display-type' frame parameters.
+
+If optional arg KEEP-FACE-SPECS is non-nil, don't recalculate
+face specs for the new background mode."
+  (unless inhibit-frame-set-background-mode
+    (let* ((frame-default-bg-mode (frame-terminal-default-bg-mode frame))
+           (bg-color (frame-parameter frame 'background-color))
+           (tty-type (tty-type frame))
+           (default-bg-mode
+             (if (or (window-system frame)
+                     (and tty-type
+                          (string-match "^\\(xterm\\|\\rxvt\\|dtterm\\|eterm\\)"
+                                        tty-type)))
+                 'light
+               'dark))
+           (non-default-bg-mode (if (eq default-bg-mode 'light) 'dark 'light))
+           (bg-mode
+            (cond (frame-default-bg-mode)
+                  ((equal bg-color "unspecified-fg") ; inverted colors
+                   non-default-bg-mode)
+                  ((not (color-values bg-color frame))
+                   default-bg-mode)
+                  ((>= (apply '+ (color-values bg-color frame))
+                       ;; Just looking at the screen, colors whose
+                       ;; values add up to .6 of the white total
+                       ;; still look dark to me.
+                       (* (apply '+ (color-values "white" frame)) .6))
+                   'light)
+                  (t 'dark)))
+           (display-type
+            (cond ((null (window-system frame))
+                   (if (tty-display-color-p frame) 'color 'mono))
+                  ((display-color-p frame)
+                   'color)
+                  ((x-display-grayscale-p frame)
+                   'grayscale)
+                  (t 'mono)))
+           (old-bg-mode
+            (frame-parameter frame 'background-mode))
+           (old-display-type
+            (frame-parameter frame 'display-type)))
+
+      (unless (and (eq bg-mode old-bg-mode) (eq display-type old-display-type))
+        (let ((locally-modified-faces nil)
+              ;; Prevent face-spec-recalc from calling this function
+              ;; again, resulting in a loop (bug#911).
+              (inhibit-frame-set-background-mode t)
+              (params (list (cons 'background-mode bg-mode)
+                            (cons 'display-type display-type))))
+          (if keep-face-specs
+              (modify-frame-parameters frame params)
+            ;; If we are recomputing face specs, first collect a list
+            ;; of faces that don't match their face-specs.  These are
+            ;; the faces modified on FRAME, and we avoid changing them
+            ;; below.  Use a negative list to avoid consing (we assume
+            ;; most faces are unmodified).
+            (dolist (face (face-list))
+              (and (not (get face 'face-override-spec))
+                   (not (face-spec-match-p face
+                                           (face-user-default-spec face)
+                                           (selected-frame)))
+                   (push face locally-modified-faces)))
+            ;; Now change to the new frame parameters
+            (modify-frame-parameters frame params)
+            ;; For all unmodified named faces, choose face specs
+            ;; matching the new frame parameters.
+            (dolist (face (face-list))
+              (unless (memq face locally-modified-faces)
+                (face-spec-recalc face frame)))))))))
+
+(defun frame-terminal-default-bg-mode (frame)
+  "Return the default background mode of FRAME.
+This checks the `frame-background-mode' variable, the X resource
+named \"backgroundMode\" (if FRAME is an X frame), and finally
+the `background-mode' terminal parameter."
+  (or frame-background-mode
+      (let ((bg-resource
+             (and (window-system frame)
+                  (x-get-resource "backgroundMode" "BackgroundMode"))))
+        (if bg-resource
+            (intern (downcase bg-resource))))
+      (terminal-parameter frame 'background-mode)))
+
 
 ;;;; Frame configurations
 
diff --git a/lisp/fringe.el b/lisp/fringe.el
index ce24bb60100..fa5ebb6f0c6 100644
--- a/lisp/fringe.el
+++ b/lisp/fringe.el
@@ -192,7 +192,7 @@ frame parameter is used."
                 (concat
                  "Select fringe mode for "
                  (if all-frames "all frames" "selected frame")
-                 " (type ? for list): ")
+                 ": ")
                 fringe-styles nil t))
          (style (assoc (downcase mode) fringe-styles)))
     (if style (cdr style)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 839bd519d49..e3321ab30c5 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,314 @@
+2011-07-14  Andrew Cohen  <cohen@andy.bu.edu>
+
+        * nnimap.el (nnimap-request-thread): Ensure search is performed in
+        correct group.
+
+        * gnus-int.el (gnus-request-thread): Add group argument.
+
+        * gnus-sum.el (gnus-summary-refer-thread): Use it.
+
+2011-07-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-group.el (gnus-read-ephemeral-emacs-bug-group): `debbugs-*'
+        renamed to `debbugs-gnu-*'.
+
+2011-07-08  Daiki Ueno  <ueno@unixuser.org>
+
+        * plstore.el: Revert the editing feature since it is not urgent.
+        (plstore-mode, plstore-mode-toggle-display, plstore-mode-original)
+        (plstore-mode-decoded): Remove.
+
+2011-07-07  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-msg.el (gnus-bug): Don't insert user variables.  It usually
+        isn't very interesting any more, and it leaks potentially secret data.
+        (gnus-debug): Removed.
+
+        * gnus-art.el (gnus-ignored-headers): Removed obsolete and non-working
+        use of :custom-show.
+
+2011-07-07  Daiki Ueno  <ueno@unixuser.org>
+
+        * plstore.el: Add documentation.
+        (plstore-mode): New mode to edit plstore file.
+        (plstore-mode-toggle-display, plstore-mode-original)
+        (plstore-mode-decoded): New command.
+        (plstore--encode, plstore--decode, plstore--write-contents-functions)
+        (plstore--insert-buffer, plstore--make): New function.
+        (plstore-open, plstore-save): Simplify by using them.
+
+2011-07-06  Glenn Morris  <rgm@gnu.org>
+
+        * gnus-group.el (gnus-read-ephemeral-emacs-bug-group): Silence compiler.
+
+2011-07-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.el (gnus-refer-article-method): Remove mention of nnspool, which
+        no longer is much used.
+        (gnus-summary-line-format): Link to "Marking Articles" instead of "Read
+        Articles".
+
+2011-04-03  Kan-Ru Chen  <kanru@kanru.info>
+
+        * nnir.el (nnir-notmuch-program, nnir-notmuch-additional-switches)
+        (nnir-notmuch-remove-prefix, nnir-engines, nnir-run-notmuch): New nnir
+        `notmuch' backend.
+
+2011-07-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * mm-decode.el (mm-text-html-renderer): Doc fix.
+
+        * gnus-msg.el (gnus-bug): Fix the MML tag.
+
+        * pop3.el (pop3-open-server): -ERR is a valid response to CAPA.
+
+2011-07-05  Daiki Ueno  <ueno@unixuser.org>
+
+        * gnus-start.el (gnus-get-unread-articles): Don't connect to the
+        secondary methods if started with `gnus-no-server'.
+
+2011-07-05  Juanma Barranquero  <lekktu@gmail.com>
+
+        * message.el (message-return-action): Fix typo in docstring.
+
+2011-07-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-group.el (gnus-read-ephemeral-bug-group): Allow fetching several
+        bug reports at once.
+
+        * nnimap.el (nnimap-request-scan): Say that splitting has finished.
+
+2011-07-04  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * nndraft.el: Require gnus-group.
+        (nndraft-request-list): Declare.
+
+        * nndraft.el (nndraft-update-unread-articles): Don't show group having
+        no unread article unless it matches gnus-permanently-visible-groups.
+
+        * nndraft.el (nndraft-update-unread-articles): New function.
+        (nndraft-request-associate-buffer): Use it to update the number of
+        unread articles for the nndraft groups in the group buffer when saving
+        or killing a draft message.
+
+2011-07-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-group.el (gnus-read-ephemeral-bug-group): Bind the coding
+        systems to binary before writing and reading the mbox files.
+
+        * gnus.el (gnus-summary-line-format): Link to the info node for %U
+        instead of trying to list them all (bug#8978).
+
+2011-07-03  Wolfgang Jenkner  <wjenkner@inode.at>  (tiny change)
+
+        * pop3.el (pop3-open-server): Use :end-of-capability.
+
+2011-07-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-group.el (gnus-read-ephemeral-emacs-bug-group): Make sure that
+        the id is always a number.
+
+        * gnus-group.el (gnus-read-ephemeral-emacs-bug-group): Hook into
+        debbugs mode, if possible.
+
+2011-07-02  Daiki Ueno  <ueno@unixuser.org>
+
+        * auth-source.el (auth-source-token-passphrase-callback-function):
+        Reindent.
+        (epg-context-operation): Remove unnecessary autoload.
+
+2011-07-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.el (gnus-list-debbugs): New command.
+
+        * gnus-group.el (gnus-bug-group-download-format-alist): Get the
+        mboxstat instead of the maintbox, since the stat seems to be fuller.
+
+        * gnus-msg.el (gnus-configure-posting-styles): Don't try to select dead
+        summary buffers.
+
+        * message.el (message-get-reply-headers): Delete all duplicates,
+        instead of the first.
+        (message-get-reply-headers): Ensure that we have progress while
+        deleting duplicates.
+
+        * gnus-msg.el (gnus-configure-posting-styles): Get the local
+        gnus-posting-style value from the summary buffer to make it easier to
+        make that a per-buffer conf.
+
+2011-07-02  Andrew Cohen  <cohen@andy.bu.edu>
+
+        * nnir.el (nnir-run-imap): Allow halting a search when an article is
+        found by setting `shortcut' in 'query.
+        (nnir-request-article): Use `shortcut' setting when requesting article
+        by Message-ID.
+
+2011-07-02  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * gnus-msg.el (gnus-bug): Give the Version and Package headers to
+        debbugs with the X-Debbugs-Package and X-Debbugs-Version headers.
+        Bring the pseudo-headers back too.
+
+2011-07-01  Daiki Ueno  <ueno@unixuser.org>
+
+        * auth-source.el (auth-source-token-passphrase-callback-function):
+        Simplify and remove EPA dependency.
+
+2011-07-01  Andrew Cohen  <cohen@andy.bu.edu>
+
+        * nnir.el (nnir-request-article): Fix error message text.
+
+2011-07-01  Daiki Ueno  <ueno@unixuser.org>
+
+        * auth-source.el (plstore-delete): Autoload.
+        (auth-source-plstore-search): Support delete operation.
+        * plstore.el (plstore-delete): New function.
+
+2011-07-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-draft.el (gnus-draft-clear-marks): Revert last change;
+        mark actually existing articles as unread rather than the ones that
+        active asserts.
+
+2011-07-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * nntp.el (nntp-record-command):
+        * gnus-util.el (gnus-message-with-timestamp-1):
+        Use format-time-string rather than decoding time stamps by hand.
+        This is simpler and insulates the code from potential changes to
+        current-time format.
+
+2011-07-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-draft.el (gnus-draft-clear-marks): Mark deleted articles as read.
+
+2011-07-01  Daiki Ueno  <ueno@unixuser.org>
+
+        * plstore.el (plstore-select-keys, plstore-encrypt-to): New variable.
+        (plstore-save): Support public key encryption.
+        (plstore--init-from-buffer): New function.
+        (plstore-open): Use it; fix error when opening a non-existent file.
+        (plstore-revert): Use plstore--init-from-buffer.
+
+2011-07-01  Daiki Ueno  <ueno@unixuser.org>
+
+        * auth-source.el (auth-source-backend): Fix :initarg for data slot.
+
+2011-06-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mml2015.el (mml2015-use): Replace string-match-p with string-match
+        for old Emacsen.
+
+2011-06-30  Daiki Ueno  <ueno@unixuser.org>
+
+        * mml2015.el (mml2015-use): Don't try to load PGG on Emacs 24, when EPG
+        is not fully working.
+
+2011-06-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * dgnushack.el: Autoload sha1 on XEmacs.
+
+        * gnus-group.el (gnus-read-ephemeral-emacs-bug-group): Take an optional
+        quit window configuration.
+
+        * auth-source.el (epg-context-set-passphrase-callback): Remove
+        duplicate autoload.
+
+2011-06-30  Andrew Cohen  <cohen@andy.bu.edu>
+
+        * nnir.el (nnir-request-article): Allow requesting articles by
+        Message-ID with nnimap.
+
+        * gnus-sum.el (gnus-refer-article-methods): Allow (nnir) entry to use
+        current server.
+
+2011-06-30  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * auth-source.el: Autoload EPA/EPG functions.
+        (auth-source-netrc-use-gpg-tokens): Clarify that it should not be
+        changed when EPA/EPG is not available.
+        (auth-source-backend): Rename "arg" member to "data".
+        (auth-source-backend-parse, auth-source-plstore-search)
+        (auth-source-plstore-create): Use it.
+
+2011-06-30  Andrew Cohen  <cohen@andy.bu.edu>
+
+        * gnus-art.el (gnus-request-article-this-buffer): Use existing function
+        `gnus-refer-article-methods'.
+
+2011-06-30  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * auth-source.el: Require EPA and EPG.
+        (auth-source-passphrase-alist): New variable.
+        (auth-source-passphrase-callback-function)
+        (auth-source-token-passphrase-callback-function): Callbacks for the
+        netrc field encryption (GPG tokens).
+        (auth-source-epa-extract-gpg-token, auth-source-epa-make-gpg-token):
+        Symmetric encryption and decryption of the netrc GPG tokens.
+        (auth-source-netrc-normalize): Use them, simplifying the closure.
+
+2011-06-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * nnimap.el (nnimap-split-incoming-mail): If `nnimap-split-fancy' is
+        non-nil, and `nnimap-split-methods' is nil, use the former.
+
+2011-06-30  Daiki Ueno  <ueno@unixuser.org>
+
+        * plstore.el (plstore-revert): New function.
+        (plstore-open): Use it; hide the buffer from user.
+
+2011-06-30  Daiki Ueno  <ueno@unixuser.org>
+
+        * auth-source.el (auth-source-backend): New member "arg".
+        (auth-source-backend-parse): Handle new backend 'plstore.
+        * plstore.el: New file.
+
+2011-06-30  Glenn Morris  <rgm@gnu.org>
+
+        * gnus-fun.el (gnus-convert-image-to-x-face-command): Doc fix.
+
+        * mm-util.el (mm-charset-synonym-alist): Move definition before use.
+
+2011-06-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * nnimap.el (nnimap-process-expiry-targets): Say what target we're
+        expiring articles to.
+
+        * mm-util.el (mm-charset-to-coding-system): Recognise all ANSI.x3.4
+        variations as ASCII (bug#5458).
+
+2011-06-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * nnmh.el (nnmh-request-list-1): Work on MS Windows.
+
+2011-06-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * message.el (message-point-in-header-p): Tweak the function to default
+        to saying that we're not in the headers if there is no separator at
+        all.  This makes it possible to use the Message version of `M-q' in
+        buffers with no headers (bug#7987).
+        (message-point-in-header-p): Fix last checkin to work with an empty
+        mail-header-separator, too.
+
+        * auth-source.el (auth-source-netrc-saver): If the user says "don't ask
+        again, save the choice via customize.
+
+2011-06-29  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * message.el (message-send-mail-function): Add `sendmail-query-once'.
+
+        * nnimap.el (nnimap-finish-retrieve-group-infos): If the server has
+        ended the connection, bail out before waiting infinitely on a new
+        connection.
+
+2011-06-28  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * gnus-msg.el (gnus-bug): Add Package and Version pseudo-headers to bug
+        reports.
+
+        * gnus.el (gnus-bug-package): Use "gnus."
+        (gnus-maintainer): Direct bug reports to submit@debbugs.gnu.org.
+
 2011-06-26  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnus-art.el (gnus-article-stop-animations): New function to stop any
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2
index 4882032f284..779c84296f4 100644
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@ -9243,7 +9243,7 @@
         (nnmaildir--with-nntp-buffer, nnmaildir--with-work-buffer,
         nnmaildir--with-nov-buffer, nnmaildir--with-move-buffer,
         nnmaildir--group-ls): New macros/functions.  Use them.
-        (nnmaildir--unlink): Evalutate argument only once.
+        (nnmaildir--unlink): Evaluate argument only once.
 
 2002-03-27  Jesper Harder  <harder@ifa.au.dk>
 
diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el
index c9cfc14fc55..e249e97e826 100644
--- a/lisp/gnus/auth-source.el
+++ b/lisp/gnus/auth-source.el
@@ -43,6 +43,7 @@
 (require 'mm-util)
 (require 'gnus-util)
 (require 'assoc)
+
 (eval-when-compile (require 'cl))
 (require 'eieio)
 
@@ -56,6 +57,19 @@
 
 (autoload 'rfc2104-hash "rfc2104")
 
+(autoload 'plstore-open "plstore")
+(autoload 'plstore-find "plstore")
+(autoload 'plstore-put "plstore")
+(autoload 'plstore-delete "plstore")
+(autoload 'plstore-save "plstore")
+(autoload 'plstore-get-file "plstore")
+
+(autoload 'epg-make-context "epg")
+(autoload 'epg-context-set-passphrase-callback "epg")
+(autoload 'epg-decrypt-string "epg")
+(autoload 'epg-context-set-armor "epg")
+(autoload 'epg-encrypt-string "epg")
+
 (defvar secrets-enabled)
 
 (defgroup auth-source nil
@@ -75,6 +89,9 @@ let-binding."
                  (const :tag "30 Minutes" 1800)
                  (integer :tag "Seconds")))
 
+;;; The slots below correspond with the `auth-source-search' spec,
+;;; so a backend with :host set, for instance, would match only
+;;; searches for that host.  Normally they are nil.
 (defclass auth-source-backend ()
   ((type :initarg :type
          :initform 'netrc
@@ -100,6 +117,9 @@ let-binding."
          :type t
          :custom string
          :documentation "The backend protocol.")
+   (data :initarg :data
+         :initform nil
+         :documentation "Internal backend data.")
    (create-function :initarg :create-function
                     :initform ignore
                     :type function
@@ -159,7 +179,8 @@ let-binding."
 
 (defcustom auth-source-netrc-use-gpg-tokens 'never
   "Set this to tell auth-source when to create GPG password
-tokens in netrc files.  It's either an alist or `never'."
+tokens in netrc files.  It's either an alist or `never'.
+Note that if EPA/EPG is not available, this should NOT be used."
   :group 'auth-source
   :version "23.2" ;; No Gnus
   :type `(choice
@@ -264,9 +285,9 @@ can get pretty complex."
                                               (const :format "" :value :user)
                                               (choice
                                                :tag "Personality/Username"
-                                                      (const :tag "Any" t)
-                                                      (string
-                                                       :tag "Name")))))))))
+                                               (const :tag "Any" t)
+                                               (string
+                                                :tag "Name")))))))))
 
 (defcustom auth-source-gpg-encrypt-to t
   "List of recipient keys that `authinfo.gpg' encrypted to.
@@ -307,8 +328,8 @@ If the value is not a list, symmetric encryption will be used."
 
 (defun auth-source-do-warn (&rest msg)
   (apply
-    ;; set logger to either the function in auth-source-debug or 'message
-    ;; note that it will be 'message if auth-source-debug is nil
+   ;; set logger to either the function in auth-source-debug or 'message
+   ;; note that it will be 'message if auth-source-debug is nil
    (if (functionp auth-source-debug)
        auth-source-debug
      'message)
@@ -375,12 +396,20 @@ with \"[a/b/c] \" if CHOICES is '\(?a ?b ?c\)."
 
     ;; a file name with parameters
     ((stringp (plist-get entry :source))
-     (auth-source-backend
-      (plist-get entry :source)
-      :source (plist-get entry :source)
-      :type 'netrc
-      :search-function 'auth-source-netrc-search
-      :create-function 'auth-source-netrc-create))
+     (if (equal (file-name-extension (plist-get entry :source)) "plist")
+         (auth-source-backend
+          (plist-get entry :source)
+          :source (plist-get entry :source)
+          :type 'plstore
+          :search-function 'auth-source-plstore-search
+          :create-function 'auth-source-plstore-create
+          :data (plstore-open (plist-get entry :source)))
+       (auth-source-backend
+        (plist-get entry :source)
+        :source (plist-get entry :source)
+        :type 'netrc
+        :search-function 'auth-source-netrc-search
+        :create-function 'auth-source-netrc-create)))
 
     ;; the Secrets API.  We require the package, in order to have a
     ;; defined value for `secrets-enabled'.
@@ -654,7 +683,7 @@ must call it to obtain the actual value."
       (when auth-source-do-cache
         (auth-source-remember spec found)))
 
-      found))
+    found))
 
 (defun auth-source-search-backends (backends spec max create delete require)
   (let (matches)
@@ -776,7 +805,7 @@ while \(:host t) would find all host entries."
 
 (defun auth-source-specmatchp (spec stored)
   (let ((keys (loop for i below (length spec) by 2
-                   collect (nth i spec))))
+                    collect (nth i spec))))
     (not (eq
           (dolist (key keys)
             (unless (auth-source-search-collection (plist-get stored key)
@@ -811,10 +840,10 @@ while \(:host t) would find all host entries."
   (unless (listp values)
     (setq values (list values)))
   (mapcar (lambda (value)
-            (if (numberp value)
-                (format "%s" value)
-              value))
-          values))
+            (if (numberp value)
+                (format "%s" value)
+              value))
+          values))
 
 ;;; Backend specific parsing: netrc/authinfo backend
 
@@ -859,7 +888,7 @@ Note that the MAX parameter is used so we can exit the parse early."
                                                   (base64-encode-string
                                                    (buffer-string)))))
                                   (lambda () (base64-decode-string
-                                         (rot13-string v)))))))
+                                              (rot13-string v)))))))
           (goto-char (point-min))
           ;; Go through the file, line by line.
           (while (and (not (eobp))
@@ -926,7 +955,7 @@ Note that the MAX parameter is used so we can exit the parse early."
                         (null require)
                         ;; every element of require is in the normalized list
                         (let ((normalized (nth 0 (auth-source-netrc-normalize
-                                                 (list alist) file))))
+                                                  (list alist) file))))
                           (loop for req in require
                                 always (plist-get normalized req)))))
               (decf max)
@@ -962,56 +991,59 @@ Note that the MAX parameter is used so we can exit the parse early."
 
           (nreverse result))))))
 
-(defmacro with-auth-source-epa-overrides (&rest body)
-  `(let ((file-name-handler-alist
-          ',(if (boundp 'epa-file-handler)
-                (remove (symbol-value 'epa-file-handler)
-                        file-name-handler-alist)
-              file-name-handler-alist))
-         (,(if (boundp 'find-file-hook) 'find-file-hook 'find-file-hooks)
-          ',(remove
-             'epa-file-find-file-hook
-             (if (boundp 'find-file-hook)
-                 (symbol-value 'find-file-hook)
-               (symbol-value 'find-file-hooks))))
-         (auto-mode-alist
-          ',(if (boundp 'epa-file-auto-mode-alist-entry)
-                (remove (symbol-value 'epa-file-auto-mode-alist-entry)
-                        auto-mode-alist)
-              auto-mode-alist)))
-     ,@body))
-
+(defvar auth-source-passphrase-alist nil)
+
+(defun auth-source-token-passphrase-callback-function (context key-id file)
+  (let* ((file (file-truename file))
+         (entry (assoc file auth-source-passphrase-alist))
+         passphrase)
+    ;; return the saved passphrase, calling a function if needed
+    (or (copy-sequence (if (functionp (cdr entry))
+                           (funcall (cdr entry))
+                         (cdr entry)))
+        (progn
+          (unless entry
+            (setq entry (list file))
+            (push entry auth-source-passphrase-alist))
+          (setq passphrase
+                (read-passwd
+                 (format "Passphrase for %s tokens: " file)
+                 t))
+          (setcdr entry (lexical-let ((p (copy-sequence passphrase)))
+                          (lambda () p)))
+          passphrase))))
+
+;; (auth-source-epa-extract-gpg-token "gpg:LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tClZlcnNpb246IEdudVBHIHYxLjQuMTEgKEdOVS9MaW51eCkKCmpBMEVBd01DT25qMjB1ak9rZnRneVI3K21iNm9aZWhuLzRad3cySkdlbnVaKzRpeEswWDY5di9icDI1U1dsQT0KPS9yc2wKLS0tLS1FTkQgUEdQIE1FU1NBR0UtLS0tLQo=" "~/.netrc")
+(defun auth-source-epa-extract-gpg-token (secret file)
+  "Pass either the decoded SECRET or the gpg:BASE64DATA version.
+FILE is the file from which we obtained this token."
+  (when (string-match "^gpg:\\(.+\\)" secret)
+    (setq secret (base64-decode-string (match-string 1 secret))))
+  (let ((context (epg-make-context 'OpenPGP))
+        plain)
+    (epg-context-set-passphrase-callback
+     context
+     (cons #'auth-source-token-passphrase-callback-function
+           file))
+    (epg-decrypt-string context secret)))
+
+;; (insert (auth-source-epa-make-gpg-token "mysecret" "~/.netrc"))
 (defun auth-source-epa-make-gpg-token (secret file)
-  (require 'epa nil t)
-  (unless (featurep 'epa)
-    (error "EPA could not be loaded."))
-  (let* ((base (file-name-sans-extension file))
-         (passkey (format "gpg:-%s" base))
-         (stash (concat base ".gpg"))
-         ;; temporarily disable EPA
-         (stashfile
-          (with-auth-source-epa-overrides
-           (make-temp-file "gpg-token" nil
-                           stash)))
-         (epa-file-passphrase-alist
-          `((,stashfile
-             . ,(password-read
-                 (format
-                  "token pass for %s? "
-                  file)
-                 passkey)))))
-    (write-region secret nil stashfile)
-    ;; temporarily disable EPA
-    (unwind-protect
-        (with-auth-source-epa-overrides
-         (with-temp-buffer
-           (insert-file-contents stashfile)
-           (base64-encode-region (point-min) (point-max) t)
-           (concat "gpg:"
-                   (buffer-substring-no-properties
-                    (point-min)
-                    (point-max)))))
-      (delete-file stashfile))))
+  (let ((context (epg-make-context 'OpenPGP))
+        (pp-escape-newlines nil)
+        cipher)
+    (epg-context-set-armor context t)
+    (epg-context-set-passphrase-callback
+     context
+     (cons #'auth-source-token-passphrase-callback-function
+           file))
+    (setq cipher (epg-encrypt-string context secret nil))
+    (with-temp-buffer
+      (insert cipher)
+      (base64-encode-region (point-min) (point-max) t)
+      (concat "gpg:" (buffer-substring-no-properties
+                      (point-min)
+                      (point-max))))))
 
 (defun auth-source-netrc-normalize (alist filename)
   (mapcar (lambda (entry)
@@ -1029,65 +1061,27 @@ Note that the MAX parameter is used so we can exit the parse early."
 
                   ;; send back the secret in a function (lexical binding)
                   (when (equal k "secret")
-                    (setq v (lexical-let ((v v)
-                                          (filename filename)
-                                          (base (file-name-nondirectory
-                                                 filename))
-                                          (token-decoder nil)
-                                          (gpgdata nil)
-                                          (stash nil))
-                              (setq stash (concat base ".gpg"))
-                              (when (string-match "gpg:\\(.+\\)" v)
-                                (require 'epa nil t)
-                                (unless (featurep 'epa)
-                                  (error "EPA could not be loaded."))
-                                (setq gpgdata (base64-decode-string
-                                               (match-string 1 v)))
-                                ;; it's a GPG token
-                                (setq
-                                 token-decoder
-                                 (lambda (gpgdata)
-;;; FIXME: this relies on .gpg files being handled by EPA/EPG
-                                   (let* ((passkey (format "gpg:-%s" base))
-                                          ;; temporarily disable EPA
-                                          (stashfile
-                                           (with-auth-source-epa-overrides
-                                            (make-temp-file "gpg-token" nil
-                                                            stash)))
-                                          (epa-file-passphrase-alist
-                                           `((,stashfile
-                                              . ,(password-read
-                                                  (format
-                                                   "token pass for %s? "
-                                                   filename)
-                                                  passkey)))))
-                                     (unwind-protect
-                                         (progn
-                                           ;; temporarily disable EPA
-                                           (with-auth-source-epa-overrides
-                                            (write-region gpgdata
-                                                          nil
-                                                          stashfile))
-                                           (setq
-                                            v
-                                            (with-temp-buffer
-                                              (insert-file-contents stashfile)
-                                              (buffer-substring-no-properties
-                                               (point-min)
-                                               (point-max)))))
-                                       (delete-file stashfile)))
-                                   ;; clear out the decoder at end
-                                   (setq token-decoder nil
-                                         gpgdata nil))))
-                          (lambda ()
-                            (when token-decoder
-                              (funcall token-decoder gpgdata))
-                            v))))
-                (setq ret (plist-put ret
-                                     (intern (concat ":" k))
-                                     v))))
-            ret))
-  alist))
+                    (setq v (lexical-let ((lexv v)
+                                          (token-decoder nil))
+                              (when (string-match "^gpg:" lexv)
+                                ;; it's a GPG token: create a token decoder
+                                ;; which unsets itself once
+                                (setq token-decoder
+                                      (lambda (val)
+                                        (prog1
+                                            (auth-source-epa-extract-gpg-token
+                                             val
+                                             filename)
+                                          (setq token-decoder nil)))))
+                              (lambda ()
+                                (when token-decoder
+                                  (setq lexv (funcall token-decoder lexv)))
+                                lexv))))
+                  (setq ret (plist-put ret
+                                       (intern (concat ":" k))
+                                       v))))
+              ret))
+          alist))
 
 ;;; (setq secret (plist-get (nth 0 (auth-source-search :host t :type 'netrc :K 1 :max 1)) :secret))
 ;;; (funcall secret)
@@ -1097,7 +1091,7 @@ Note that the MAX parameter is used so we can exit the parse early."
                                   &key backend require create delete
                                   type max host user port
                                   &allow-other-keys)
-"Given a property list SPEC, return search matches from the :backend.
+  "Given a property list SPEC, return search matches from the :backend.
 See `auth-source-search' for details on SPEC."
   ;; just in case, check that the type is correct (null or same as the backend)
   (assert (or (null type) (eq type (oref backend type)))
@@ -1147,9 +1141,9 @@ See `auth-source-search' for details on SPEC."
          ;; we know (because of an assertion in auth-source-search) that the
          ;; :create parameter is either t or a list (which includes nil)
          (create-extra (if (eq t create) nil create))
-         (current-data (car (auth-source-search :max 1
-                                                :host host
-                                                :port port)))
+         (current-data (car (auth-source-search :max 1
+                                                :host host
+                                                :port port)))
          (required (append base-required create-extra))
          (file (oref backend source))
          (add "")
@@ -1185,8 +1179,8 @@ See `auth-source-search' for details on SPEC."
       (let* ((data (aget valist r))
              ;; take the first element if the data is a list
              (data (or (auth-source-netrc-element-or-first data)
-                       (plist-get current-data
-                                  (intern (format ":%s" r) obarray))))
+                       (plist-get current-data
+                                  (intern (format ":%s" r) obarray))))
              ;; this is the default to be offered
              (given-default (aget auth-source-creation-defaults r))
              ;; the default supplementals are simple:
@@ -1233,8 +1227,8 @@ See `auth-source-search' for details on SPEC."
               (cond
                ((and (null data) (eq r 'secret))
                 ;; Special case prompt for passwords.
-;; TODO: make the default (setq auth-source-netrc-use-gpg-tokens `((,(if (boundp 'epa-file-auto-mode-alist-entry) (car (symbol-value 'epa-file-auto-mode-alist-entry)) "\\.gpg\\'") nil) (t gpg)))
-;; TODO: or maybe leave as (setq auth-source-netrc-use-gpg-tokens 'never)
+                ;; TODO: make the default (setq auth-source-netrc-use-gpg-tokens `((,(if (boundp 'epa-file-auto-mode-alist-entry) (car (symbol-value 'epa-file-auto-mode-alist-entry)) "\\.gpg\\'") nil) (t gpg)))
+                ;; TODO: or maybe leave as (setq auth-source-netrc-use-gpg-tokens 'never)
                 (let* ((ep (format "Use GPG password tokens in %s?" file))
                        (gpg-encrypt
                         (cond
@@ -1251,7 +1245,7 @@ See `auth-source-search' for details on SPEC."
                                 (setq ret (cdr item))
                                 (setq check nil)))))
                          (t 'never)))
-                        (plain (read-passwd prompt)))
+                       (plain (read-passwd prompt)))
                   ;; ask if we don't know what to do (in which case
                   ;; auth-source-netrc-use-gpg-tokens must be a list)
                   (unless gpg-encrypt
@@ -1299,9 +1293,9 @@ See `auth-source-search' for details on SPEC."
                                      (secret "password")
                                      (port   "port") ; redundant but clearer
                                      (t (symbol-name r)))
-                                   (if (string-match "[\" ]" data)
-                                       (format "%S" data)
-                                     data)))))
+                                   (if (string-match "[\" ]" data)
+                                       (format "%S" data)
+                                     data)))))
             (setq add (concat add (funcall printer)))))))
 
     (plist-put
@@ -1363,9 +1357,10 @@ Respects `auth-source-save-behavior'.  Uses
                       (help-mode))))
               (?n (setq add ""
                         done t))
-              (?N (setq add ""
-                        done t
-                        auth-source-save-behavior nil))
+              (?N
+               (setq add ""
+                     done t)
+               (customize-save-variable 'auth-source-save-behavior nil))
               (?e (setq add (read-string "Line to add: " add)))
               (t nil)))
 
@@ -1456,11 +1451,11 @@ authentication tokens:
                                                 (eq t (plist-get spec k)))
                                             nil
                                           (list k (plist-get spec k))))
-                              search-keys)))
+                                      search-keys)))
          ;; needed keys (always including host, login, port, and secret)
          (returned-keys (mm-delete-duplicates (append
-                                               '(:host :login :port :secret)
-                                               search-keys)))
+                                               '(:host :login :port :secret)
+                                               search-keys)))
          (items (loop for item in (apply 'secrets-search-items coll search-spec)
                       unless (and (stringp label)
                                   (not (string-match label item)))
@@ -1502,6 +1497,210 @@ authentication tokens:
   ;; (apply 'secrets-create-item (auth-get-source entry) name passwd spec)
   (debug spec))
 
+;;; Backend specific parsing: PLSTORE backend
+
+(defun* auth-source-plstore-search (&rest
+                                    spec
+                                    &key backend create delete label
+                                    type max host user port
+                                    &allow-other-keys)
+  "Search the PLSTORE; spec is like `auth-source'."
+  (let* ((store (oref backend data))
+         (max (or max 5000))     ; sanity check: default to stop at 5K
+         (ignored-keys '(:create :delete :max :backend :require))
+         (search-keys (loop for i below (length spec) by 2
+                            unless (memq (nth i spec) ignored-keys)
+                            collect (nth i spec)))
+         ;; build a search spec without the ignored keys
+         ;; if a search key is nil or t (match anything), we skip it
+         (search-spec (apply 'append (mapcar
+                                      (lambda (k)
+                                        (let ((v (plist-get spec k)))
+                                          (if (or (null v)
+                                                  (eq t v))
+                                              nil
+                                            (if (stringp v)
+                                                (setq v (list v)))
+                                            (list k v))))
+                                      search-keys)))
+         ;; needed keys (always including host, login, port, and secret)
+         (returned-keys (mm-delete-duplicates (append
+                                               '(:host :login :port :secret)
+                                               search-keys)))
+         (items (plstore-find store search-spec))
+         (item-names (mapcar #'car items))
+         (items (butlast items (- (length items) max)))
+         ;; convert the item to a full plist
+         (items (mapcar (lambda (item)
+                          (let* ((plist (copy-tree (cdr item)))
+                                 (secret (plist-member plist :secret)))
+                            (if secret
+                                (setcar
+                                 (cdr secret)
+                                 (lexical-let ((v (car (cdr secret))))
+                                   (lambda () v))))
+                            plist))
+                        items))
+         ;; ensure each item has each key in `returned-keys'
+         (items (mapcar (lambda (plist)
+                          (append
+                           (apply 'append
+                                  (mapcar (lambda (req)
+                                            (if (plist-get plist req)
+                                                nil
+                                              (list req nil)))
+                                          returned-keys))
+                           plist))
+                        items)))
+    (cond
+     ;; if we need to create an entry AND none were found to match
+     ((and create
+           (not items))
+
+      ;; create based on the spec and record the value
+      (setq items (or
+                   ;; if the user did not want to create the entry
+                   ;; in the file, it will be returned
+                   (apply (slot-value backend 'create-function) spec)
+                   ;; if not, we do the search again without :create
+                   ;; to get the updated data.
+
+                   ;; the result will be returned, even if the search fails
+                   (apply 'auth-source-plstore-search
+                          (plist-put spec :create nil)))))
+     ((and delete
+           item-names)
+      (dolist (item-name item-names)
+        (plstore-delete store item-name))
+      (plstore-save store)))
+    items))
+
+(defun* auth-source-plstore-create (&rest spec
+                                          &key backend
+                                          secret host user port create
+                                          &allow-other-keys)
+  (let* ((base-required '(host user port secret))
+         (base-secret '(secret))
+         ;; we know (because of an assertion in auth-source-search) that the
+         ;; :create parameter is either t or a list (which includes nil)
+         (create-extra (if (eq t create) nil create))
+         (current-data (car (auth-source-search :max 1
+                                                :host host
+                                                :port port)))
+         (required (append base-required create-extra))
+         (file (oref backend source))
+         (add "")
+         ;; `valist' is an alist
+         valist
+         ;; `artificial' will be returned if no creation is needed
+         artificial
+         secret-artificial)
+
+    ;; only for base required elements (defined as function parameters):
+    ;; fill in the valist with whatever data we may have from the search
+    ;; we complete the first value if it's a list and use the value otherwise
+    (dolist (br base-required)
+      (when (symbol-value br)
+        (let ((br-choice (cond
+                          ;; all-accepting choice (predicate is t)
+                          ((eq t (symbol-value br)) nil)
+                          ;; just the value otherwise
+                          (t (symbol-value br)))))
+          (when br-choice
+            (aput 'valist br br-choice)))))
+
+    ;; for extra required elements, see if the spec includes a value for them
+    (dolist (er create-extra)
+      (let ((name (concat ":" (symbol-name er)))
+            (keys (loop for i below (length spec) by 2
+                        collect (nth i spec))))
+        (dolist (k keys)
+          (when (equal (symbol-name k) name)
+            (aput 'valist er (plist-get spec k))))))
+
+    ;; for each required element
+    (dolist (r required)
+      (let* ((data (aget valist r))
+             ;; take the first element if the data is a list
+             (data (or (auth-source-netrc-element-or-first data)
+                       (plist-get current-data
+                                  (intern (format ":%s" r) obarray))))
+             ;; this is the default to be offered
+             (given-default (aget auth-source-creation-defaults r))
+             ;; the default supplementals are simple:
+             ;; for the user, try `given-default' and then (user-login-name);
+             ;; otherwise take `given-default'
+             (default (cond
+                       ((and (not given-default) (eq r 'user))
+                        (user-login-name))
+                       (t given-default)))
+             (printable-defaults (list
+                                  (cons 'user
+                                        (or
+                                         (auth-source-netrc-element-or-first
+                                          (aget valist 'user))
+                                         (plist-get artificial :user)
+                                         "[any user]"))
+                                  (cons 'host
+                                        (or
+                                         (auth-source-netrc-element-or-first
+                                          (aget valist 'host))
+                                         (plist-get artificial :host)
+                                         "[any host]"))
+                                  (cons 'port
+                                        (or
+                                         (auth-source-netrc-element-or-first
+                                          (aget valist 'port))
+                                         (plist-get artificial :port)
+                                         "[any port]"))))
+             (prompt (or (aget auth-source-creation-prompts r)
+                         (case r
+                           (secret "%p password for %u@%h: ")
+                           (user "%p user name for %h: ")
+                           (host "%p host name for user %u: ")
+                           (port "%p port for %u@%h: "))
+                         (format "Enter %s (%%u@%%h:%%p): " r)))
+             (prompt (auth-source-format-prompt
+                      prompt
+                      `((?u ,(aget printable-defaults 'user))
+                        (?h ,(aget printable-defaults 'host))
+                        (?p ,(aget printable-defaults 'port))))))
+
+        ;; Store the data, prompting for the password if needed.
+        (setq data
+              (cond
+               ((and (null data) (eq r 'secret))
+                ;; Special case prompt for passwords.
+                (read-passwd prompt))
+               ((null data)
+                (when default
+                  (setq prompt
+                        (if (string-match ": *\\'" prompt)
+                            (concat (substring prompt 0 (match-beginning 0))
+                                    " (default " default "): ")
+                          (concat prompt "(default " default ") "))))
+                (read-string prompt nil nil default))
+               (t (or data default))))
+
+        (when data
+          (if (member r base-secret)
+              (setq secret-artificial
+                    (plist-put secret-artificial
+                               (intern (concat ":" (symbol-name r)))
+                               data))
+            (setq artificial (plist-put artificial
+                                        (intern (concat ":" (symbol-name r)))
+                                        data))))))
+    (plstore-put (oref backend data)
+                 (sha1 (format "%s@%s:%s"
+                               (plist-get artificial :user)
+                               (plist-get artificial :host)
+                               (plist-get artificial :port)))
+                 artificial secret-artificial)
+    (if (y-or-n-p (format "Save auth info to file %s? "
+                          (plstore-get-file (oref backend data))))
+        (plstore-save (oref backend data)))))
+
 ;;; older API
 
 ;;; (auth-source-user-or-password '("login" "password") "imap.myhost.com" t "tzz")
@@ -1576,14 +1775,14 @@ MODE can be \"login\" or \"password\"."
             (cond
              ((equal "password" m)
               (push (if (plist-get choice :secret)
-                      (funcall (plist-get choice :secret))
-                    nil) found))
+                        (funcall (plist-get choice :secret))
+                      nil) found))
              ((equal "login" m)
               (push (plist-get choice :user) found)))))
         (setq found (nreverse found))
         (setq found (if listy found (car-safe found)))))
 
-        found))
+    found))
 
 (provide 'auth-source)
 
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 6c3ad01eabf..7255be416eb 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -163,8 +163,7 @@
   "*All headers that start with this regexp will be hidden.
 This variable can also be a list of regexps of headers to be ignored.
 If `gnus-visible-headers' is non-nil, this variable will be ignored."
-  :type '(choice :custom-show nil
-                 regexp
+  :type '(choice regexp
                  (repeat regexp))
   :group 'gnus-article-hiding)
 
@@ -6832,23 +6831,16 @@ If given a prefix, show the hidden text instead."
                 (numberp article))
             (let ((gnus-override-method gnus-override-method)
                   (methods (and (stringp article)
-                                gnus-refer-article-method))
+                                (with-current-buffer gnus-summary-buffer
+                                  (gnus-refer-article-methods))))
                   (backend (car (gnus-find-method-for-group
                                  gnus-newsgroup-name)))
                   result
                   (inhibit-read-only t))
-              (if (or (not (listp methods))
-                      (and (symbolp (car methods))
-                           (assq (car methods) nnoo-definition-alist)))
-                  (setq methods (list methods)))
               (when (and (null gnus-override-method)
                          methods)
                 (setq gnus-override-method (pop methods)))
               (while (not result)
-                (when (eq gnus-override-method 'current)
-                  (setq gnus-override-method
-                        (with-current-buffer gnus-summary-buffer
-                          gnus-current-select-method)))
                 (erase-buffer)
                 (gnus-kill-all-overlays)
                 (let ((gnus-newsgroup-name group))
diff --git a/lisp/gnus/gnus-draft.el b/lisp/gnus/gnus-draft.el
index 1709b1c4a05..40f5abda4f8 100644
--- a/lisp/gnus/gnus-draft.el
+++ b/lisp/gnus/gnus-draft.el
@@ -327,8 +327,7 @@ If DONT-POP is nil, display the buffer after setting it up."
 (defun gnus-draft-clear-marks ()
   (setq gnus-newsgroup-reads nil
         gnus-newsgroup-marked nil
-        gnus-newsgroup-unreads
-        (gnus-uncompress-range (gnus-active gnus-newsgroup-name))))
+        gnus-newsgroup-unreads (nndraft-articles)))
 
 (provide 'gnus-draft)
 
diff --git a/lisp/gnus/gnus-fun.el b/lisp/gnus/gnus-fun.el
index cb495623af2..1cc11383893 100644
--- a/lisp/gnus/gnus-fun.el
+++ b/lisp/gnus/gnus-fun.el
@@ -54,10 +54,7 @@
   "convert -scale 48x48! %s xbm:- | xbm2xface.pl"
   "Command for converting an image to an X-Face.
 The command must take a image filename (use \"%s\") as input.
-The output must be the Face header data on stdout in PNG format.
-
-By default it takes a GIF filename and output the X-Face header data
-on stdout."
+The output must be the X-Face header data on stdout in PNG format."
   :version "22.1"
   :group 'gnus-fun
   :type '(choice (const :tag "giftopnm, netpbm (GIF input only)"
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 518f215a7ba..2ea2a5c9bc7 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -2415,7 +2415,7 @@ Valid input formats include:
     (gnus-read-ephemeral-gmane-group group start range)))
 
 (defcustom gnus-bug-group-download-format-alist
-  '((emacs . "http://debbugs.gnu.org/%s;mbox=yes;mboxmaint=yes")
+  '((emacs . "http://debbugs.gnu.org/%s;mboxstat=yes")
     (debian
      . "http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=%s&mbox=yes;mboxmaint=yes"))
   "Alist of symbols for bug trackers and the corresponding URL format string.
@@ -2428,23 +2428,28 @@ the bug number, and browsing the URL must return mbox output."
   :version "24.1"
   :type '(repeat (cons (symbol) (string :tag "URL format string"))))
 
-(defun gnus-read-ephemeral-bug-group (number mbox-url)
+(defun gnus-read-ephemeral-bug-group (ids mbox-url &optional window-conf)
   "Browse bug NUMBER as ephemeral group."
   (interactive (list (read-string "Enter bug number: "
                                   (thing-at-point 'word) nil)
                      ;; FIXME: Add completing-read from
                      ;; `gnus-emacs-bug-group-download-format' ...
                      (cdr (assoc 'emacs gnus-bug-group-download-format-alist))))
-  (when (stringp number)
-    (setq number (string-to-number number)))
-  (let ((tmpfile (mm-make-temp-file "gnus-temp-group-")))
+  (when (stringp ids)
+    (setq ids (string-to-number ids)))
+  (unless (listp ids)
+    (setq ids (list ids)))
+  (let ((tmpfile (mm-make-temp-file "gnus-temp-group-"))
+        (coding-system-for-write 'binary)
+        (coding-system-for-read 'binary))
     (with-temp-file tmpfile
-      (url-insert-file-contents (format mbox-url number))
+      (dolist (id ids)
+        (url-insert-file-contents (format mbox-url id)))
       (goto-char (point-min))
       ;; Add the debbugs address so that we can respond to reports easily.
       (while (re-search-forward "^To: " nil t)
         (end-of-line)
-        (insert (format ", %s@%s" number
+        (insert (format ", %s@%s" (car ids)
                         (gnus-replace-in-string
                          (gnus-replace-in-string mbox-url "^http://" "")
                          "/.*$" ""))))
@@ -2452,7 +2457,8 @@ the bug number, and browsing the URL must return mbox output."
       (gnus-group-read-ephemeral-group
        "gnus-read-ephemeral-bug"
        `(nndoc ,tmpfile
-               (nndoc-article-type mbox))))
+               (nndoc-article-type mbox))
+       nil window-conf))
     (delete-file tmpfile)))
 
 (defun gnus-read-ephemeral-debian-bug-group (number)
@@ -2463,13 +2469,23 @@ the bug number, and browsing the URL must return mbox output."
    number
    (cdr (assoc 'debian gnus-bug-group-download-format-alist))))
 
-(defun gnus-read-ephemeral-emacs-bug-group (number)
-  "Browse Emacs bug NUMBER as ephemeral group."
-  (interactive (list (read-string "Enter bug number: "
-                                  (thing-at-point 'word) nil)))
+(defvar debbugs-gnu-bug-number)         ; debbugs-gnu
+
+(defun gnus-read-ephemeral-emacs-bug-group (ids &optional window-conf)
+  "Browse Emacs bugs IDS as an ephemeral group."
+  (interactive (list (string-to-number
+                      (read-string "Enter bug number: "
+                                   (thing-at-point 'word) nil))))
+  (unless (listp ids)
+    (setq ids (list ids)))
   (gnus-read-ephemeral-bug-group
-   number
-   (cdr (assoc 'emacs gnus-bug-group-download-format-alist))))
+   ids
+   (cdr (assoc 'emacs gnus-bug-group-download-format-alist))
+   window-conf)
+  (when (fboundp 'debbugs-gnu-summary-mode)
+    (with-current-buffer (window-buffer (selected-window))
+      (debbugs-gnu-summary-mode 1)
+      (set (make-local-variable 'debbugs-gnu-bug-number) (car ids)))))
 
 (defun gnus-group-jump-to-group (group &optional prompt)
   "Jump to newsgroup GROUP.
diff --git a/lisp/gnus/gnus-int.el b/lisp/gnus/gnus-int.el
index ef15a479892..b9b191cd09c 100644
--- a/lisp/gnus/gnus-int.el
+++ b/lisp/gnus/gnus-int.el
@@ -516,11 +516,12 @@ If BUFFER, insert the article in that group."
              article (gnus-group-real-name group)
              (nth 1 gnus-command-method) buffer)))
 
-(defun gnus-request-thread (header)
+(defun gnus-request-thread (header group)
   "Request the headers in the thread containing the article specified by HEADER."
-  (let ((gnus-command-method (gnus-find-method-for-group gnus-newsgroup-name)))
+  (let ((gnus-command-method (gnus-find-method-for-group group)))
     (funcall (gnus-get-function gnus-command-method 'request-thread)
-             header)))
+             header
+             (gnus-group-real-name group))))
 
 (defun gnus-warp-to-article ()
   "Warps from an article in a virtual group to the article in its
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index e256446c016..9d3ec25c03a 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -1455,24 +1455,22 @@ If YANK is non-nil, include the original article."
         (goto-char (point-min)))
       (message-pop-to-buffer "*Gnus Bug*"))
     (let ((message-this-is-mail t))
-      (message-setup `((To . ,gnus-maintainer) (Subject . ""))))
+      (message-setup `((To . ,gnus-maintainer)
+                       (Subject . "")
+                       (X-Debbugs-Package
+                        . ,(format "%s" gnus-bug-package))
+                       (X-Debbugs-Version
+                        . ,(format "%s" (gnus-continuum-version))))))
     (when gnus-bug-create-help-buffer
       (push `(gnus-bug-kill-buffer) message-send-actions))
     (goto-char (point-min))
-    (re-search-forward (concat "^" (regexp-quote mail-header-separator) "$"))
-    (forward-line 1)
+    (message-goto-body)
+    (insert "\n\n\n\n\n")
     (insert (gnus-version) "\n"
             (emacs-version) "\n")
     (when (and (boundp 'nntp-server-type)
                (stringp nntp-server-type))
       (insert nntp-server-type))
-    (insert "\n\n\n\n\n")
-    (let (text)
-      (with-current-buffer (gnus-get-buffer-create " *gnus environment info*")
-        (erase-buffer)
-        (gnus-debug)
-        (setq text (buffer-string)))
-      (insert "<#part type=application/emacs-lisp disposition=inline description=\"User settings\">\n" text "\n<#/part>"))
     (goto-char (point-min))
     (search-forward "Subject: " nil t)
     (message "")))
@@ -1492,62 +1490,6 @@ If YANK is non-nil, include the original article."
     (with-current-buffer buffer
       (message-yank-buffer gnus-article-buffer))))
 
-(defun gnus-debug ()
-  "Attempts to go through the Gnus source file and report what variables have been changed.
-The source file has to be in the Emacs load path."
-  (interactive)
-  (let ((files gnus-debug-files)
-        (point (point))
-        file expr olist sym)
-    (gnus-message 4 "Please wait while we snoop your variables...")
-    (sit-for 0)
-    ;; Go through all the files looking for non-default values for variables.
-    (with-current-buffer (gnus-get-buffer-create " *gnus bug info*")
-      (while files
-        (erase-buffer)
-        (when (and (setq file (locate-library (pop files)))
-                   (file-exists-p file))
-          (insert-file-contents file)
-          (goto-char (point-min))
-          (if (not (re-search-forward "^;;* *Internal variables" nil t))
-              (gnus-message 4 "Malformed sources in file %s" file)
-            (narrow-to-region (point-min) (point))
-            (goto-char (point-min))
-            (while (setq expr (ignore-errors (read (current-buffer))))
-              (ignore-errors
-                (and (or (eq (car expr) 'defvar)
-                         (eq (car expr) 'defcustom))
-                     (stringp (nth 3 expr))
-                     (not (memq (nth 1 expr) gnus-debug-exclude-variables))
-                     (or (not (boundp (nth 1 expr)))
-                         (not (equal (eval (nth 2 expr))
-                                     (symbol-value (nth 1 expr)))))
-                     (push (nth 1 expr) olist)))))))
-      (kill-buffer (current-buffer)))
-    (when (setq olist (nreverse olist))
-      (insert "------------------ Environment follows ------------------\n\n"))
-    (while olist
-      (if (boundp (car olist))
-          (ignore-errors
-           (gnus-pp
-            `(setq ,(car olist)
-                   ,(if (or (consp (setq sym (symbol-value (car olist))))
-                            (and (symbolp sym)
-                                 (not (or (eq sym nil)
-                                          (eq sym t)))))
-                        (list 'quote (symbol-value (car olist)))
-                      (symbol-value (car olist))))))
-        (insert ";; (makeunbound '" (symbol-name (car olist)) ")\n"))
-      (setq olist (cdr olist)))
-    (insert "\n\n")
-    ;; Remove any control chars - they seem to cause trouble for some
-    ;; mailers.  (Byte-compiled output from the stuff above.)
-    (goto-char point)
-    (while (re-search-forward (mm-string-to-multibyte
-                               "[\000-\010\013-\037\200-\237]") nil t)
-      (replace-match (format "\\%03o" (string-to-char (match-string 0)))
-                     t t))))
-
 ;;; Treatment of rejected articles.
 ;;; Bounced mail.
 
@@ -1788,7 +1730,10 @@ this is a reply."
   "Configure posting styles according to `gnus-posting-styles'."
   (unless gnus-inhibit-posting-styles
     (let ((group (or group-name gnus-newsgroup-name ""))
-          (styles gnus-posting-styles)
+          (styles (if (gnus-buffer-live-p gnus-summary-buffer)
+                      (with-current-buffer gnus-summary-buffer
+                        gnus-posting-styles)
+                    gnus-posting-styles))
           style match attribute value v results
           filep name address element)
       ;; If the group has a posting-style parameter, add it at the end with a
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index aa9af012a1c..7c63d5e2653 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -1043,7 +1043,7 @@ If LEVEL is non-nil, the news will be set up at level LEVEL."
 
     ;; Find the number of unread articles in each non-dead group.
     (let ((gnus-read-active-file (and (not level) gnus-read-active-file)))
-      (gnus-get-unread-articles level))))
+      (gnus-get-unread-articles level dont-connect))))
 
 (defun gnus-call-subscribe-functions (method group)
   "Call METHOD to subscribe GROUP.
@@ -1606,7 +1606,7 @@ If SCAN, request a scan of that group as well."
 
 ;; Go though `gnus-newsrc-alist' and compare with `gnus-active-hashtb'
 ;; and compute how many unread articles there are in each group.
-(defun gnus-get-unread-articles (&optional level)
+(defun gnus-get-unread-articles (&optional level dont-connect)
   (setq gnus-server-method-cache nil)
   (require 'gnus-agent)
   (let* ((newsrc (cdr gnus-newsrc-alist))
@@ -1702,12 +1702,13 @@ If SCAN, request a scan of that group as well."
 
     ;; If we have primary/secondary select methods, but no groups from
     ;; them, we still want to issue a retrieval request from them.
-    (dolist (method (cons gnus-select-method
-                          gnus-secondary-select-methods))
-      (when (and (not (assoc method type-cache))
-                 (gnus-check-backend-function 'request-list (car method)))
-        (with-current-buffer nntp-server-buffer
-          (gnus-read-active-file-1 method nil))))
+    (unless dont-connect
+      (dolist (method (cons gnus-select-method
+                            gnus-secondary-select-methods))
+        (when (and (not (assoc method type-cache))
+                   (gnus-check-backend-function 'request-list (car method)))
+          (with-current-buffer nntp-server-buffer
+            (gnus-read-active-file-1 method nil)))))
 
     ;; Start early async retrieval of data.
     (let ((done-methods nil)
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 4c059e9332a..5a817e12104 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -8970,7 +8970,7 @@ variable."
            'list gnus-newsgroup-headers
            (if (gnus-check-backend-function
                 'request-thread gnus-newsgroup-name)
-               (gnus-request-thread header)
+               (gnus-request-thread header gnus-newsgroup-name)
              (let* ((last (if (numberp limit)
                               (min (+ (mail-header-number header)
                                       limit)
@@ -9050,7 +9050,12 @@ variable."
       (dolist (method gnus-refer-article-method)
         (push (if (eq 'current method)
                   gnus-current-select-method
-                method)
+                (if (eq 'nnir (car method))
+                    (list
+                     'nnir
+                     (or (cadr method)
+                         (gnus-method-to-server gnus-current-select-method)))
+                  method))
               out))
       (nreverse out)))
    ;; One single select method.
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 3f66b45aaab..7155c7f9607 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -540,8 +540,7 @@ but also to the ones displayed in the echo area."
 
 (eval-when-compile
   (defmacro gnus-message-with-timestamp-1 (format-string args)
-    (let ((timestamp '((format-time-string "%Y%m%dT%H%M%S" time)
-                       "." (format "%03d" (/ (nth 2 time) 1000)) "> ")))
+    (let ((timestamp '(format-time-string "%Y%m%dT%H%M%S.%3N> " time)))
       (if (featurep 'xemacs)
           `(let (str time)
              (if (or (and (null ,format-string) (null ,args))
@@ -554,10 +553,10 @@ but also to the ones displayed in the echo area."
                (cond ((eq gnus-add-timestamp-to-message 'log)
                       (setq time (current-time))
                       (display-message 'no-log str)
-                      (log-message 'message (concat ,@timestamp str)))
+                      (log-message 'message (concat ,timestamp str)))
                      (gnus-add-timestamp-to-message
                       (setq time (current-time))
-                      (display-message 'message (concat ,@timestamp str)))
+                      (display-message 'message (concat ,timestamp str)))
                      (t
                       (display-message 'message str))))
              str)
@@ -571,7 +570,7 @@ but also to the ones displayed in the echo area."
                     (setq time (current-time))
                     (with-current-buffer (get-buffer-create "*Messages*")
                       (goto-char (point-max))
-                      (insert ,@timestamp str "\n")
+                      (insert ,timestamp str "\n")
                       (forward-line (- message-log-max))
                       (delete-region (point-min) (point))
                       (goto-char (point-max))))
@@ -585,7 +584,7 @@ but also to the ones displayed in the echo area."
                           (and ,format-string str)
                         (message nil))
                     (setq time (current-time))
-                    (message "%s" (concat ,@timestamp str))
+                    (message "%s" (concat ,timestamp str))
                     str))
                  (t
                   (apply 'message ,format-string ,args))))))))
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 20986d25942..ac7db0e1d69 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -1423,10 +1423,6 @@ no need to set this variable."
 
 (defcustom gnus-refer-article-method 'current
   "Preferred method for fetching an article by Message-ID.
-If you are reading news from the local spool (with nnspool), fetching
-articles by Message-ID is painfully slow.  By setting this method to an
-nntp method, you might get acceptable results.
-
 The value of this variable must be a valid select method as discussed
 in the documentation of `gnus-select-method'.
 
@@ -2655,9 +2651,13 @@ such as a mark that says whether an article is stored in the cache
 (defvar gnus-have-read-active-file nil)
 
 (defconst gnus-maintainer
-  "bugs@gnus.org (The Gnus Bugfixing Girls + Boys)"
+  "submit@debbugs.gnu.org (The Gnus Bugfixing Girls + Boys)"
   "The mail address of the Gnus maintainers.")
 
+(defconst gnus-bug-package
+  "gnus"
+  "The package to use in the bug submission.")
+
 (defvar gnus-info-nodes
   '((gnus-group-mode "(gnus)Group Buffer")
     (gnus-summary-mode "(gnus)Summary Buffer")
@@ -2962,8 +2962,8 @@ with some simple extensions.
             on level one
 %R          \"A\" if this article has been replied to, \" \"
             otherwise (character)
-%U          Status of this article (character, \"R\", \"K\",
-            \"-\" or \" \")
+%U          \"Read\" status of this article.
+            See Info node `(gnus)Marking Articles'
 %[          Opening bracket (character, \"[\" or \"<\")
 %]          Closing bracket (character, \"]\" or \">\")
 %>          Spaces of length thread-level (string)
@@ -4381,6 +4381,13 @@ prompt the user for the name of an NNTP server to use."
     (gnus-1 arg dont-connect slave)
     (gnus-final-warning)))
 
+(autoload 'debbugs-emacs "debbugs-gnu")
+(defun gnus-list-debbugs ()
+  "List all open Gnus bug reports."
+  (interactive)
+  (debbugs-emacs '("important" "normal" "minor" "wishlist")
+                 "gnus"))
+
 ;; Allow redefinition of Gnus functions.
 
 (gnus-ems-redefine)
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 58740c32e9c..7d7cc01225b 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -659,6 +659,7 @@ Done before generating the new subject of a forward."
 (defcustom message-send-mail-function
   (cond ((eq send-mail-function 'smtpmail-send-it) 'message-smtpmail-send-it)
         ((eq send-mail-function 'feedmail-send-it) 'feedmail-send-it)
+        ((eq send-mail-function 'sendmail-query-once) 'sendmail-query-once)
         ((eq send-mail-function 'mailclient-send-it)
          'message-send-mail-with-mailclient)
         (t (message-send-mail-function)))
@@ -1184,7 +1185,7 @@ It is a vector of the following headers:
 (defvar message-send-actions nil
   "A list of actions to be performed upon successful sending of a message.")
 (defvar message-return-action nil
-  "Action to return to the caller after sending or postphoning a message.")
+  "Action to return to the caller after sending or postponing a message.")
 (defvar message-exit-actions nil
   "A list of actions to be performed upon exiting after sending a message.")
 (defvar message-kill-actions nil
@@ -3424,8 +3425,12 @@ Message buffers and is not meant to be called directly."
 (defun message-point-in-header-p ()
   "Return t if point is in the header."
   (save-excursion
-    (not (re-search-backward
-          (concat "^" (regexp-quote mail-header-separator) "\n") nil t))))
+    (and
+     (not
+      (re-search-backward
+       (concat "^" (regexp-quote mail-header-separator) "\n") nil t))
+     (re-search-forward
+      (concat "^" (regexp-quote mail-header-separator) "\n") nil t))))
 
 (defun message-do-auto-fill ()
   "Like `do-auto-fill', but don't fill in message header."
@@ -6744,10 +6749,13 @@ want to get rid of this query permanently.")))
                                   addr))
                  (cons (downcase (mail-strip-quoted-names addr)) addr)))
              (message-tokenize-header recipients)))
-      ;; Remove first duplicates.  (Why not all duplicates?  Is this a bug?)
+      ;; Remove all duplicates.
       (let ((s recipients))
         (while s
-          (setq recipients (delq (assoc (car (pop s)) s) recipients))))
+          (let ((address (car (pop s))))
+            (while (assoc address s)
+              (setq recipients (delq (assoc address s) recipients)
+                    s (delq (assoc address s) s))))))
 
       ;; Remove hierarchical lists that are contained within each other,
       ;; if message-hierarchical-addresses is defined.
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index f543920446b..a51c6630ac5 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -114,14 +114,14 @@
   "Render of HTML contents.
 It is one of defined renderer types, or a rendering function.
 The defined renderer types are:
-`shr': use Gnus simple HTML renderer;
-`gnus-w3m' : use Gnus renderer based on w3m;
-`w3m'  : use emacs-w3m;
-`w3m-standalone': use w3m;
+`shr': use the built-in Gnus HTML renderer;
+`gnus-w3m': use Gnus renderer based on w3m;
+`w3m': use emacs-w3m;
+`w3m-standalone': use plain w3m;
 `links': use links;
-`lynx' : use lynx;
-`w3'   : use Emacs/W3;
-`html2text' : use html2text;
+`lynx': use lynx;
+`w3': use Emacs/W3;
+`html2text': use html2text;
 nil    : use external viewer (default web browser)."
   :version "24.1"
   :type '(choice (const shr)
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index 435c3bba00f..d57b61dac83 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -300,34 +300,6 @@ system object in XEmacs."
       ;; no-MULE XEmacs:
       (car (memq cs (mm-get-coding-system-list))))))
 
-(defun mm-codepage-setup (number &optional alias)
-  "Create a coding system cpNUMBER.
-The coding system is created using `codepage-setup'.  If ALIAS is
-non-nil, an alias is created and added to
-`mm-charset-synonym-alist'.  If ALIAS is a string, it's used as
-the alias.  Else windows-NUMBER is used."
-  (interactive
-   (let ((completion-ignore-case t)
-         (candidates (if (fboundp 'cp-supported-codepages)
-                         (cp-supported-codepages)
-                       ;; Removed in Emacs 23 (unicode), so signal an error:
-                       (error "`codepage-setup' not present in this Emacs version"))))
-     (list (gnus-completing-read "Setup DOS Codepage" candidates
-                                 t nil nil "437"))))
-  (when alias
-    (setq alias (if (stringp alias)
-                    (intern alias)
-                  (intern (format "windows-%s" number)))))
-  (let* ((cp (intern (format "cp%s" number))))
-    (unless (mm-coding-system-p cp)
-      (if (fboundp 'codepage-setup)     ; silence compiler
-          (codepage-setup number)
-        (error "`codepage-setup' not present in this Emacs version")))
-    (when (and alias
-               ;; Don't add alias if setup of cp failed.
-               (mm-coding-system-p cp))
-      (add-to-list 'mm-charset-synonym-alist (cons alias cp)))))
-
 (defvar mm-charset-synonym-alist
   `(
     ;; Not in XEmacs, but it's not a proper MIME charset anyhow.
@@ -376,6 +348,34 @@ the alias.  Else windows-NUMBER is used."
 
 See `mm-codepage-iso-8859-list' and `mm-codepage-ibm-list'.")
 
+(defun mm-codepage-setup (number &optional alias)
+  "Create a coding system cpNUMBER.
+The coding system is created using `codepage-setup'.  If ALIAS is
+non-nil, an alias is created and added to
+`mm-charset-synonym-alist'.  If ALIAS is a string, it's used as
+the alias.  Else windows-NUMBER is used."
+  (interactive
+   (let ((completion-ignore-case t)
+         (candidates (if (fboundp 'cp-supported-codepages)
+                         (cp-supported-codepages)
+                       ;; Removed in Emacs 23 (unicode), so signal an error:
+                       (error "`codepage-setup' not present in this Emacs version"))))
+     (list (gnus-completing-read "Setup DOS Codepage" candidates
+                                 t nil nil "437"))))
+  (when alias
+    (setq alias (if (stringp alias)
+                    (intern alias)
+                  (intern (format "windows-%s" number)))))
+  (let* ((cp (intern (format "cp%s" number))))
+    (unless (mm-coding-system-p cp)
+      (if (fboundp 'codepage-setup)     ; silence compiler
+          (codepage-setup number)
+        (error "`codepage-setup' not present in this Emacs version")))
+    (when (and alias
+               ;; Don't add alias if setup of cp failed.
+               (mm-coding-system-p cp))
+      (add-to-list 'mm-charset-synonym-alist (cons alias cp)))))
+
 (defcustom mm-codepage-iso-8859-list
   (list 1250 ;; Windows-1250 is a variant of Latin-2 heavily used by Microsoft
         ;; Outlook users in Czech republic.  Use this to allow reading of
@@ -550,7 +550,8 @@ is not available."
          (let ((cs (cdr (assq charset mm-charset-override-alist))))
            (and cs (mm-coding-system-p cs) cs))))
    ;; ascii
-   ((eq charset 'us-ascii)
+   ((or (eq charset 'us-ascii)
+        (string-match "ansi.x3.4" (symbol-name charset)))
     'ascii)
    ;; Check to see whether we can handle this charset.  (This depends
    ;; on there being some coding system matching each `mime-charset'
diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el
index df106bb6de8..7d8a4119c0e 100644
--- a/lisp/gnus/mml2015.el
+++ b/lisp/gnus/mml2015.el
@@ -55,9 +55,15 @@
                            'epg)
                        (error))
                      (progn
-                       (ignore-errors (require 'pgg))
-                       (and (fboundp 'pgg-sign-region)
-                            'pgg))
+                       (let ((abs-file (locate-library "pgg")))
+                         ;; Don't load PGG if it is marked as obsolete
+                         ;; (Emacs 24).
+                         (when (and abs-file
+                                    (not (string-match "/obsolete/[^/]*\\'"
+                                                       abs-file)))
+                           (ignore-errors (require 'pgg))
+                           (and (fboundp 'pgg-sign-region)
+                                'pgg))))
                      (progn (ignore-errors
                               (load "mc-toplev"))
                             (and (fboundp 'mc-encrypt-generic)
diff --git a/lisp/gnus/nndraft.el b/lisp/gnus/nndraft.el
index 006348869ef..f528222dd16 100644
--- a/lisp/gnus/nndraft.el
+++ b/lisp/gnus/nndraft.el
@@ -24,14 +24,21 @@
 
 ;;; Code:
 
+;; For Emacs <22.2 and XEmacs.
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
+
 (require 'nnheader)
 (require 'nnmail)
 (require 'gnus-start)
+(require 'gnus-group)
 (require 'nnmh)
 (require 'nnoo)
 (require 'mm-util)
 (eval-when-compile (require 'cl))
 
+(declare-function nndraft-request-list "nnmh" (&rest args))
+
 (nnoo-declare nndraft
   nnmh)
 
@@ -161,6 +168,25 @@ are generated if and only if they are also in `message-draft-headers'.")
      (message-headers-to-generate
       nndraft-required-headers message-draft-headers nil))))
 
+(defun nndraft-update-unread-articles ()
+  "Update groups' unread articles in the group buffer."
+  (nndraft-request-list)
+  (with-current-buffer gnus-group-buffer
+    (let* ((groups (mapcar (lambda (elem)
+                             (gnus-group-prefixed-name (car elem)
+                                                       (list 'nndraft "")))
+                           (nnmail-get-active)))
+           (gnus-group-marked (copy-sequence groups))
+           (inhibit-read-only t))
+      (gnus-group-get-new-news-this-group nil t)
+      (dolist (group groups)
+        (unless (and gnus-permanently-visible-groups
+                     (string-match gnus-permanently-visible-groups
+                                   group))
+          (gnus-group-goto-group group)
+          (when (zerop (gnus-group-group-unread))
+            (gnus-delete-line)))))))
+
 (deffoo nndraft-request-associate-buffer (group)
   "Associate the current buffer with some article in the draft group."
   (nndraft-open-server "")
@@ -182,6 +208,10 @@ are generated if and only if they are also in `message-draft-headers'.")
                   'write-contents-hooks)))
       (gnus-make-local-hook hook)
       (add-hook hook 'nndraft-generate-headers nil t))
+    (gnus-make-local-hook 'after-save-hook)
+    (add-hook 'after-save-hook 'nndraft-update-unread-articles nil t)
+    (message-add-action '(nndraft-update-unread-articles)
+                        'exit 'postpone 'kill)
     article))
 
 (deffoo nndraft-request-group (group &optional server dont-check info)
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 2cfc88987f6..ef5bee71629 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -880,15 +880,18 @@ textual parts.")
           (with-temp-buffer
             (mm-disable-multibyte)
             (when (nnimap-request-article article group server (current-buffer))
-              (nnheader-message 7 "Expiring article %s:%d" group article)
               (when (functionp target)
                 (setq target (funcall target group)))
-              (when (and target
-                         (not (eq target 'delete)))
-                (if (or (gnus-request-group target t)
-                        (gnus-request-create-group target))
-                    (nnmail-expiry-target-group target group)
-                  (setq target nil)))
+              (if (and target
+                       (not (eq target 'delete)))
+                  (if (or (gnus-request-group target t)
+                          (gnus-request-create-group target))
+                      (progn
+                        (nnmail-expiry-target-group target group)
+                        (nnheader-message 7 "Expiring article %s:%d to %s"
+                                          group article target))
+                    (setq target nil))
+                (nnheader-message 7 "Expiring article %s:%d" group article))
               (when target
                 (push article deleted-articles))))))))
     ;; Change back to the current group again.
@@ -953,7 +956,8 @@ textual parts.")
              nnimap-inbox
              nnimap-split-methods)
     (nnheader-message 7 "nnimap %s splitting mail..." server)
-    (nnimap-split-incoming-mail)))
+    (nnimap-split-incoming-mail)
+    (nnheader-message 7 "nnimap %s splitting mail...done" server)))
 
 (defun nnimap-marks-to-flags (marks)
   (let (flags flag)
@@ -1227,6 +1231,10 @@ textual parts.")
 
 (deffoo nnimap-finish-retrieve-group-infos (server infos sequences)
   (when (and sequences
+             ;; Check that the process is still alive.
+             (get-buffer-process (nnimap-buffer))
+             (memq (process-status (get-buffer-process (nnimap-buffer)))
+                   '(open run))
              (nnimap-possibly-change-group nil server))
     (with-current-buffer (nnimap-buffer)
       ;; Wait for the final data to trickle in.
@@ -1557,8 +1565,9 @@ textual parts.")
 (declare-function gnus-fetch-headers "gnus-sum"
                   (articles &optional limit force-new dependencies))
 
-(deffoo nnimap-request-thread (header)
-  (let* ((id (mail-header-id header))
+(deffoo nnimap-request-thread (header &optional group server)
+  (when (nnimap-possibly-change-group group server)
+      (let* ((id (mail-header-id header))
          (refs (split-string
                 (or (mail-header-references header)
                     "")))
@@ -1576,7 +1585,7 @@ textual parts.")
       (gnus-fetch-headers
        (and (car result) (delete 0 (mapcar #'string-to-number
                                            (cdr (assoc "SEARCH" (cdr result))))))
-       nil t))))
+       nil t)))))
 
 (defun nnimap-possibly-change-group (group server)
   (let ((open-result t))
@@ -1798,9 +1807,14 @@ textual parts.")
 (defun nnimap-split-incoming-mail ()
   (with-current-buffer (nnimap-buffer)
     (let ((nnimap-incoming-split-list nil)
-          (nnmail-split-methods (if (eq nnimap-split-methods 'default)
-                                    nnmail-split-methods
-                                  nnimap-split-methods))
+          (nnmail-split-methods
+           (cond
+            ((eq nnimap-split-methods 'default)
+             nnmail-split-methods)
+            (nnimap-split-methods
+             nnimap-split-methods)
+            (nnimap-split-fancy
+             'nnmail-split-fancy)))
           (nnmail-split-fancy (or nnimap-split-fancy
                                   nnmail-split-fancy))
           (nnmail-inhibit-default-split-group t)
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index eaaac3f88ce..8099cc2a7cc 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -499,6 +499,31 @@ arrive at the correct group name, \"mail.misc\"."
   :type '(directory)
   :group 'nnir)
 
+(defcustom nnir-notmuch-program "notmuch"
+  "*Name of notmuch search executable."
+  :type '(string)
+  :group 'nnir)
+
+(defcustom nnir-notmuch-additional-switches '()
+  "*A list of strings, to be given as additional arguments to notmuch.
+
+Note that this should be a list.  Ie, do NOT use the following:
+    (setq nnir-notmuch-additional-switches \"-i -w\") ; wrong
+Instead, use this:
+    (setq nnir-notmuch-additional-switches '(\"-i\" \"-w\"))"
+  :type '(repeat (string))
+  :group 'nnir)
+
+(defcustom nnir-notmuch-remove-prefix (concat (getenv "HOME") "/Mail/")
+  "*The prefix to remove from each file name returned by notmuch
+in order to get a group name (albeit with / instead of .).  This is a
+regular expression.
+
+This variable is very similar to `nnir-namazu-remove-prefix', except
+that it is for notmuch, not Namazu."
+  :type '(regexp)
+  :group 'nnir)
+
 ;;; Developer Extension Variable:
 
 (defvar nnir-engines
@@ -519,6 +544,8 @@ arrive at the correct group name, \"mail.misc\"."
              ((group . "Swish-e Group spec: ")))
     (namazu  nnir-run-namazu
              ())
+    (notmuch nnir-run-notmuch
+             ())
     (hyrex   nnir-run-hyrex
              ((group . "Hyrex Group spec: ")))
     (find-grep nnir-run-find-grep
@@ -657,22 +684,40 @@ Add an entry here when adding a new search engine.")
       'nov)))
 
 (deffoo nnir-request-article (article &optional group server to-buffer)
-  (if (stringp article)
+  (if (and (stringp article)
+           (not (eq 'nnimap (car (gnus-server-to-method server)))))
       (nnheader-report
        'nnir
-       "nnir-retrieve-headers doesn't grok message ids: %s"
-       article)
+       "nnir-request-article only groks message ids for nnimap servers: %s"
+       server)
     (save-excursion
-      (let ((artfullgroup (nnir-article-group article))
-            (artno (nnir-article-number article)))
-        (message "Requesting article %d from group %s"
-                 artno artfullgroup)
-        (if to-buffer
-            (with-current-buffer to-buffer
-              (let ((gnus-article-decode-hook nil))
-                (gnus-request-article-this-buffer artno artfullgroup)))
-          (gnus-request-article artno artfullgroup))
-        (cons artfullgroup artno)))))
+      (let ((article article)
+            query)
+        (when (stringp article)
+          (setq gnus-override-method (gnus-server-to-method server))
+          (setq query
+                (list
+                 (cons 'query (format "HEADER Message-ID %s" article))
+                 (cons 'unique-id article)
+                 (cons 'criteria "")
+                 (cons 'shortcut t)))
+          (unless (and (equal query nnir-current-query)
+                       (equal server nnir-current-server))
+            (setq nnir-artlist (nnir-run-imap query server))
+            (setq nnir-current-query query)
+            (setq nnir-current-server server))
+          (setq article 1))
+        (unless (zerop (length nnir-artlist))
+          (let ((artfullgroup (nnir-article-group article))
+                (artno (nnir-article-number article)))
+            (message "Requesting article %d from group %s"
+                     artno artfullgroup)
+            (if to-buffer
+                (with-current-buffer to-buffer
+                  (let ((gnus-article-decode-hook nil))
+                    (gnus-request-article-this-buffer artno artfullgroup)))
+              (gnus-request-article artno artfullgroup))
+            (cons artfullgroup artno)))))))
 
 (deffoo nnir-request-move-article (article group server accept-form
                                            &optional last internal-move-group)
@@ -774,7 +819,7 @@ ready to be added to the list of search results."
 (defun nnir-run-imap (query srv &optional groups)
   "Run a search against an IMAP back-end server.
 This uses a custom query language parser; see `nnir-imap-make-query' for
-details on the language and supported extensions"
+details on the language and supported extensions."
   (save-excursion
     (let ((qstring (cdr (assq 'query query)))
           (server (cadr (gnus-server-to-method srv)))
@@ -787,33 +832,36 @@ details on the language and supported extensions"
       (message "Opening server %s" server)
       (apply
        'vconcat
-       (mapcar
-        (lambda (group)
-          (let (artlist)
-            (condition-case ()
-                (when (nnimap-possibly-change-group
-                       (gnus-group-short-name group) server)
-                  (with-current-buffer (nnimap-buffer)
-                    (message "Searching %s..." group)
-                    (let ((arts 0)
-                          (result (nnimap-command "UID SEARCH %s"
-                                                  (if (string= criteria "")
-                                                      qstring
-                                                    (nnir-imap-make-query
-                                                     criteria qstring)))))
-                      (mapc
-                       (lambda (artnum)
-                         (let ((artn (string-to-number artnum)))
-                           (when (> artn 0)
-                             (push (vector group artn 100)
-                                   artlist)
-                             (setq arts (1+ arts)))))
-                       (and (car result) (cdr (assoc "SEARCH" (cdr result)))))
-                      (message "Searching %s... %d matches" group arts)))
-                  (message "Searching %s...done" group))
-              (quit nil))
-            (nreverse artlist)))
-        groups)))))
+       (catch 'found
+         (mapcar
+          (lambda (group)
+            (let (artlist)
+              (condition-case ()
+                  (when (nnimap-possibly-change-group
+                         (gnus-group-short-name group) server)
+                    (with-current-buffer (nnimap-buffer)
+                      (message "Searching %s..." group)
+                      (let ((arts 0)
+                            (result (nnimap-command "UID SEARCH %s"
+                                                    (if (string= criteria "")
+                                                        qstring
+                                                      (nnir-imap-make-query
+                                                       criteria qstring)))))
+                        (mapc
+                         (lambda (artnum)
+                           (let ((artn (string-to-number artnum)))
+                             (when (> artn 0)
+                               (push (vector group artn 100)
+                                     artlist)
+                               (when (assq 'shortcut query)
+                                 (throw 'found (list artlist)))
+                               (setq arts (1+ arts)))))
+                         (and (car result) (cdr (assoc "SEARCH" (cdr result)))))
+                        (message "Searching %s... %d matches" group arts)))
+                    (message "Searching %s...done" group))
+                (quit nil))
+              (nreverse artlist)))
+          groups))))))
 
 (defun nnir-imap-make-query (criteria qstring)
   "Parse the query string and criteria into an appropriate IMAP search
@@ -1317,6 +1365,80 @@ Tested with Namazu 2.0.6 on a GNU/Linux system."
                                (> (nnir-artitem-rsv x)
                                   (nnir-artitem-rsv y)))))))))
 
+(defun nnir-run-notmuch (query server &optional group)
+  "Run QUERY against notmuch.
+Returns a vector of (group name, file name) pairs (also vectors,
+actually)."
+
+  ;; (when group
+  ;;   (error "The notmuch backend cannot search specific groups"))
+
+  (save-excursion
+    (let ( (qstring (cdr (assq 'query query)))
+           (groupspec (cdr (assq 'group query)))
+           (prefix (nnir-read-server-parm 'nnir-notmuch-remove-prefix server))
+           artlist
+           (article-pattern (if (string= (gnus-group-server server) "nnmaildir")
+                               ":[0-9]+"
+                             "^[0-9]+$"))
+           artno dirnam filenam)
+
+      (when (equal "" qstring)
+        (error "notmuch: You didn't enter anything"))
+
+      (set-buffer (get-buffer-create nnir-tmp-buffer))
+      (erase-buffer)
+
+      (if groupspec
+          (message "Doing notmuch query %s on %s..." qstring groupspec)
+        (message "Doing notmuch query %s..." qstring))
+
+      (let* ((cp-list `( ,nnir-notmuch-program
+                         nil            ; input from /dev/null
+                         t              ; output
+                         nil            ; don't redisplay
+                         "search"
+                         "--format=text"
+                         "--output=files"
+                         ,@(nnir-read-server-parm 'nnir-notmuch-additional-switches server)
+                         ,qstring       ; the query, in notmuch format
+                         ))
+             (exitstatus
+              (progn
+                (message "%s args: %s" nnir-notmuch-program
+                         (mapconcat 'identity (cddddr cp-list) " ")) ;; ???
+                (apply 'call-process cp-list))))
+        (unless (or (null exitstatus)
+                    (zerop exitstatus))
+          (nnheader-report 'nnir "Couldn't run notmuch: %s" exitstatus)
+          ;; notmuch failure reason is in this buffer, show it if
+          ;; the user wants it.
+          (when (> gnus-verbose 6)
+            (display-buffer nnir-tmp-buffer))))
+
+      ;; The results are output in the format of:
+      ;; absolute-path-name
+      (goto-char (point-min))
+      (while (not (eobp))
+        (setq filenam (buffer-substring-no-properties (line-beginning-position)
+                                                      (line-end-position))
+              artno (file-name-nondirectory filenam)
+              dirnam (file-name-directory filenam))
+        (forward-line 1)
+
+        ;; don't match directories
+        (when (string-match article-pattern artno)
+          (when (not (null dirnam))
+
+            ;; maybe limit results to matching groups.
+            (when (or (not groupspec)
+                      (string-match groupspec dirnam))
+              (nnir-add-result dirnam artno "" prefix server artlist)))))
+
+      (message "Massaging notmuch output...done")
+
+      artlist)))
+
 (defun nnir-run-find-grep (query server &optional grouplist)
   "Run find and grep to obtain matching articles."
   (let* ((method (gnus-server-to-method server))
diff --git a/lisp/gnus/nnmh.el b/lisp/gnus/nnmh.el
index 5fa1a89cf48..ec270eba2ce 100644
--- a/lisp/gnus/nnmh.el
+++ b/lisp/gnus/nnmh.el
@@ -210,7 +210,9 @@ as unread by Gnus.")
         (max 0)
         min rdir num subdirectoriesp file)
     ;; Recurse down directories.
-    (setq subdirectoriesp (> (nth 1 (file-attributes dir)) 2))
+    (setq subdirectoriesp
+          ;; nth 1 of file-attributes always 1 on MS Windows :(
+          (/= (nth 1 (file-attributes (file-truename dir))) 2))
     (dolist (rdir files)
       (if (or (not subdirectoriesp)
               (file-regular-p rdir))
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index a8ffc6576ca..986fd51a613 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -338,10 +338,8 @@ backend doesn't catch this error.")
   "Record the command STRING."
   (with-current-buffer (get-buffer-create "*nntp-log*")
     (goto-char (point-max))
-    (let ((time (current-time)))
-      (insert (format-time-string "%Y%m%dT%H%M%S" time)
-              "." (format "%03d" (/ (nth 2 time) 1000))
-              " " nntp-address " " string "\n"))))
+    (insert (format-time-string "%Y%m%dT%H%M%S.%3N")
+            " " nntp-address " " string "\n")))
 
 (defun nntp-report (&rest args)
   "Report an error from the nntp backend.  The first string in ARGS
diff --git a/lisp/gnus/plstore.el b/lisp/gnus/plstore.el
new file mode 100644
index 00000000000..5f9a61aa843
--- /dev/null
+++ b/lisp/gnus/plstore.el
@@ -0,0 +1,438 @@
+;;; plstore.el --- secure plist store -*- lexical-binding: t -*-
+;; Copyright (C) 2011 Free Software Foundation, Inc.
+
+;; Author: Daiki Ueno <ueno@unixuser.org>
+;; Keywords: PGP, GnuPG
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary
+
+;; Plist based data store providing search and partial encryption.
+;;
+;; Creating:
+;;
+;; ;; Open a new store associated with ~/.emacs.d/auth.plist.
+;; (setq store (plstore-open (expand-file-name "~/.emacs.d/auth.plist")))
+;; ;; Both `:host' and `:port' are public property.
+;; (plstore-put store "foo" '(:host "foo.example.org" :port 80) nil)
+;; ;; No encryption will be needed.
+;; (plstore-save store)
+;;
+;; ;; `:user' is marked as secret.
+;; (plstore-put store "bar" '(:host "bar.example.org") '(:user "test"))
+;; ;; `:password' is marked as secret.
+;; (plstore-put store "baz" '(:host "baz.example.org") '(:password "test"))
+;; ;; Those secret properties are encrypted together.
+;; (plstore-save store)
+;;
+;; ;; Kill the buffer visiting ~/.emacs.d/auth.plist.
+;; (plstore-close store)
+;;
+;; Searching:
+;;
+;; (setq store (plstore-open (expand-file-name "~/.emacs.d/auth.plist")))
+;;
+;; ;; As the entry "foo" associated with "foo.example.org" has no
+;; ;; secret properties, no need to decryption.
+;; (plstore-find store '(:host ("foo.example.org")))
+;;
+;; ;; As the entry "bar" associated with "bar.example.org" has a
+;; ;; secret property `:user', Emacs tries to decrypt the secret (and
+;; ;; thus you will need to input passphrase).
+;; (plstore-find store '(:host ("bar.example.org")))
+;;
+;; ;; While the entry "baz" associated with "baz.example.org" has also
+;; ;; a secret property `:password', it is encrypted together with
+;; ;; `:user' of "bar", so no need to decrypt the secret.
+;; (plstore-find store '(:host ("bar.example.org")))
+;;
+;; (plstore-close store)
+;;
+;; Editing:
+;;
+;; Currently not supported but in the future plstore will provide a
+;; major mode to edit PLSTORE files.
+
+;;; Code:
+
+(require 'epg)
+
+(defgroup plstore nil
+  "Searchable, partially encrypted, persistent plist store"
+  :version "24.1"
+  :group 'files)
+
+(defcustom plstore-select-keys 'silent
+  "Control whether or not to pop up the key selection dialog.
+
+If t, always asks user to select recipients.
+If nil, query user only when `plstore-encrypt-to' is not set.
+If neither t nor nil, doesn't ask user.  In this case, symmetric
+encryption is used."
+  :type '(choice (const :tag "Ask always" t)
+                 (const :tag "Ask when recipients are not set" nil)
+                 (const :tag "Don't ask" silent))
+  :group 'plstore)
+
+(defvar plstore-encrypt-to nil
+  "*Recipient(s) used for encrypting secret entries.
+May either be a string or a list of strings.")
+
+(put 'plstore-encrypt-to 'safe-local-variable
+     (lambda (val)
+       (or (stringp val)
+           (and (listp val)
+                (catch 'safe
+                  (mapc (lambda (elt)
+                          (unless (stringp elt)
+                            (throw 'safe nil)))
+                        val)
+                  t)))))
+
+(put 'plstore-encrypt-to 'permanent-local t)
+
+(defvar plstore-cache-passphrase-for-symmetric-encryption nil)
+(defvar plstore-passphrase-alist nil)
+
+(defun plstore-passphrase-callback-function (_context _key-id plstore)
+  (if plstore-cache-passphrase-for-symmetric-encryption
+      (let* ((file (file-truename (plstore--get-buffer plstore)))
+             (entry (assoc file plstore-passphrase-alist))
+             passphrase)
+        (or (copy-sequence (cdr entry))
+            (progn
+              (unless entry
+                (setq entry (list file)
+                      plstore-passphrase-alist
+                      (cons entry
+                            plstore-passphrase-alist)))
+              (setq passphrase
+                    (read-passwd (format "Passphrase for PLSTORE %s: "
+                                         (plstore--get-buffer plstore))))
+              (setcdr entry (copy-sequence passphrase))
+              passphrase)))
+    (read-passwd (format "Passphrase for PLSTORE %s: "
+                         (plstore--get-buffer plstore)))))
+
+(defun plstore-progress-callback-function (_context _what _char current total
+                                                    handback)
+  (if (= current total)
+      (message "%s...done" handback)
+    (message "%s...%d%%" handback
+             (if (> total 0) (floor (* (/ current (float total)) 100)) 0))))
+
+(defun plstore--get-buffer (this)
+  (aref this 0))
+
+(defun plstore--get-alist (this)
+  (aref this 1))
+
+(defun plstore--get-encrypted-data (this)
+  (aref this 2))
+
+(defun plstore--get-secret-alist (this)
+  (aref this 3))
+
+(defun plstore--get-merged-alist (this)
+  (aref this 4))
+
+(defun plstore--set-buffer (this buffer)
+  (aset this 0 buffer))
+
+(defun plstore--set-alist (this plist)
+  (aset this 1 plist))
+
+(defun plstore--set-encrypted-data (this encrypted-data)
+  (aset this 2 encrypted-data))
+
+(defun plstore--set-secret-alist (this secret-alist)
+  (aset this 3 secret-alist))
+
+(defun plstore--set-merged-alist (this merged-alist)
+  (aset this 4 merged-alist))
+
+(defun plstore-get-file (this)
+  (buffer-file-name (plstore--get-buffer this)))
+
+(defun plstore--make (&optional buffer alist encrypted-data secret-alist
+                                merged-alist)
+  (vector buffer alist encrypted-data secret-alist merged-alist))
+
+(defun plstore--init-from-buffer (plstore)
+  (goto-char (point-min))
+  (when (looking-at ";;; public entries")
+    (forward-line)
+    (plstore--set-alist plstore (read (point-marker)))
+    (forward-sexp)
+    (forward-char)
+    (when (looking-at ";;; secret entries")
+      (forward-line)
+      (plstore--set-encrypted-data plstore (read (point-marker))))
+    (plstore--merge-secret plstore)))
+
+;;;###autoload
+(defun plstore-open (file)
+  "Create a plstore instance associated with FILE."
+  (let* ((filename (file-truename file))
+         (buffer (or (find-buffer-visiting filename)
+                     (generate-new-buffer (format " plstore %s" filename))))
+         (store (plstore--make buffer)))
+    (with-current-buffer buffer
+      ;; In the future plstore will provide a major mode called
+      ;; `plstore-mode' to edit PLSTORE files.
+      (if (eq major-mode 'plstore-mode)
+          (error "%s is opened for editing; kill the buffer first" file))
+      (erase-buffer)
+      (condition-case nil
+          (insert-file-contents-literally file)
+        (error))
+      (setq buffer-file-name (file-truename file))
+      (set-buffer-modified-p nil)
+      (plstore--init-from-buffer store)
+      store)))
+
+(defun plstore-revert (plstore)
+  "Replace current data in PLSTORE with the file on disk."
+  (with-current-buffer (plstore--get-buffer plstore)
+    (revert-buffer t t)
+    (plstore--init-from-buffer plstore)))
+
+(defun plstore-close (plstore)
+  "Destroy a plstore instance PLSTORE."
+  (kill-buffer (plstore--get-buffer plstore)))
+
+(defun plstore--merge-secret (plstore)
+  (let ((alist (plstore--get-secret-alist plstore))
+        modified-alist
+        modified-plist
+        modified-entry
+        entry
+        plist
+        placeholder)
+    (plstore--set-merged-alist
+     plstore
+     (copy-tree (plstore--get-alist plstore)))
+    (setq modified-alist (plstore--get-merged-alist plstore))
+    (while alist
+      (setq entry (car alist)
+            alist (cdr alist)
+            plist (cdr entry)
+            modified-entry (assoc (car entry) modified-alist)
+            modified-plist (cdr modified-entry))
+      (while plist
+        (setq placeholder
+              (plist-member
+               modified-plist
+               (intern (concat ":secret-"
+                               (substring (symbol-name (car plist)) 1)))))
+        (if placeholder
+            (setcar placeholder (car plist)))
+        (setq modified-plist
+              (plist-put modified-plist (car plist) (car (cdr plist))))
+        (setq plist (nthcdr 2 plist)))
+      (setcdr modified-entry modified-plist))))
+
+(defun plstore--decrypt (plstore)
+  (if (plstore--get-encrypted-data plstore)
+      (let ((context (epg-make-context 'OpenPGP))
+            plain)
+        (epg-context-set-passphrase-callback
+         context
+         (cons #'plstore-passphrase-callback-function
+               plstore))
+        (epg-context-set-progress-callback
+         context
+         (cons #'plstore-progress-callback-function
+               (format "Decrypting %s" (plstore-get-file plstore))))
+        (setq plain
+              (epg-decrypt-string context
+                                  (plstore--get-encrypted-data plstore)))
+        (plstore--set-secret-alist plstore (car (read-from-string plain)))
+        (plstore--merge-secret plstore)
+        (plstore--set-encrypted-data plstore nil))))
+
+(defun plstore--match (entry keys skip-if-secret-found)
+  (let ((result t) key-name key-value prop-value secret-name)
+    (while keys
+      (setq key-name (car keys)
+            key-value (car (cdr keys))
+            prop-value (plist-get (cdr entry) key-name))
+        (unless (member prop-value key-value)
+          (if skip-if-secret-found
+              (progn
+                (setq secret-name
+                      (intern (concat ":secret-"
+                                      (substring (symbol-name key-name) 1))))
+                (if (plist-member (cdr entry) secret-name)
+                    (setq result 'secret)
+                  (setq result nil
+                        keys nil)))
+            (setq result nil
+                  keys nil)))
+        (setq keys (nthcdr 2 keys)))
+    result))
+
+(defun plstore-find (plstore keys)
+  "Perform search on PLSTORE with KEYS.
+KEYS is a plist."
+  (let (entries alist entry match decrypt plist)
+    ;; First, go through the merged plist alist and collect entries
+    ;; matched with keys.
+    (setq alist (plstore--get-merged-alist plstore))
+    (while alist
+      (setq entry (car alist)
+            alist (cdr alist)
+            match (plstore--match entry keys t))
+      (if (eq match 'secret)
+          (setq decrypt t)
+        (when match
+          (setq plist (cdr entry))
+          (while plist
+            (if (string-match "\\`:secret-" (symbol-name (car plist)))
+                (setq decrypt t
+                      plist nil))
+            (setq plist (nthcdr 2 plist)))
+          (setq entries (cons entry entries)))))
+    ;; Second, decrypt the encrypted plist and try again.
+    (when decrypt
+      (setq entries nil)
+      (plstore--decrypt plstore)
+      (setq alist (plstore--get-merged-alist plstore))
+      (while alist
+        (setq entry (car alist)
+              alist (cdr alist)
+              match (plstore--match entry keys nil))
+        (if match
+            (setq entries (cons entry entries)))))
+    (nreverse entries)))
+
+(defun plstore-get (plstore name)
+  "Get an entry with NAME in PLSTORE."
+  (let ((entry (assoc name (plstore--get-merged-alist plstore)))
+        plist)
+    (setq plist (cdr entry))
+    (while plist
+      (if (string-match "\\`:secret-" (symbol-name (car plist)))
+          (progn
+            (plstore--decrypt plstore)
+            (setq entry (assoc name (plstore--get-merged-alist plstore))
+                  plist nil))
+        (setq plist (nthcdr 2 plist))))
+    entry))
+
+(defun plstore-put (plstore name keys secret-keys)
+  "Put an entry with NAME in PLSTORE.
+KEYS is a plist containing non-secret data.
+SECRET-KEYS is a plist containing secret data."
+  (let (entry
+        plist
+        secret-plist
+        symbol)
+    (if secret-keys
+        (plstore--decrypt plstore))
+    (while secret-keys
+      (setq symbol
+            (intern (concat ":secret-"
+                            (substring (symbol-name (car secret-keys)) 1))))
+      (setq plist (plist-put plist symbol t)
+            secret-plist (plist-put secret-plist
+                                    (car secret-keys) (car (cdr secret-keys)))
+            secret-keys (nthcdr 2 secret-keys)))
+    (while keys
+      (setq symbol
+            (intern (concat ":secret-"
+                            (substring (symbol-name (car keys)) 1))))
+      (setq plist (plist-put plist (car keys) (car (cdr keys)))
+            keys (nthcdr 2 keys)))
+    (setq entry (assoc name (plstore--get-alist plstore)))
+    (if entry
+        (setcdr entry plist)
+      (plstore--set-alist
+       plstore
+       (cons (cons name plist) (plstore--get-alist plstore))))
+    (when secret-plist
+      (setq entry (assoc name (plstore--get-secret-alist plstore)))
+      (if entry
+          (setcdr entry secret-plist)
+        (plstore--set-secret-alist
+         plstore
+         (cons (cons name secret-plist) (plstore--get-secret-alist plstore)))))
+    (plstore--merge-secret plstore)))
+
+(defun plstore-delete (plstore name)
+  "Delete an entry with NAME from PLSTORE."
+  (let ((entry (assoc name (plstore--get-alist plstore))))
+    (if entry
+        (plstore--set-alist
+         plstore
+         (delq entry (plstore--get-alist plstore))))
+    (setq entry (assoc name (plstore--get-secret-alist plstore)))
+    (if entry
+        (plstore--set-secret-alist
+         plstore
+         (delq entry (plstore--get-secret-alist plstore))))
+    (setq entry (assoc name (plstore--get-merged-alist plstore)))
+    (if entry
+        (plstore--set-merged-alist
+         plstore
+         (delq entry (plstore--get-merged-alist plstore))))))
+
+(defvar pp-escape-newlines)
+(defun plstore--insert-buffer (plstore)
+  (insert ";;; public entries -*- mode: plstore -*- \n"
+          (pp-to-string (plstore--get-alist plstore)))
+  (if (plstore--get-secret-alist plstore)
+      (let ((context (epg-make-context 'OpenPGP))
+            (pp-escape-newlines nil)
+            (recipients
+             (cond
+              ((listp plstore-encrypt-to) plstore-encrypt-to)
+              ((stringp plstore-encrypt-to) (list plstore-encrypt-to))))
+            cipher)
+        (epg-context-set-armor context t)
+        (epg-context-set-passphrase-callback
+         context
+         (cons #'plstore-passphrase-callback-function
+               plstore))
+        (setq cipher (epg-encrypt-string
+                      context
+                      (pp-to-string
+                       (plstore--get-secret-alist plstore))
+                      (if (or (eq plstore-select-keys t)
+                              (and (null plstore-select-keys)
+                                   (not (local-variable-p 'plstore-encrypt-to
+                                                          (current-buffer)))))
+                          (epa-select-keys
+                           context
+                           "Select recipents for encryption.
+If no one is selected, symmetric encryption will be performed.  "
+                           recipients)
+                        (if plstore-encrypt-to
+                            (epg-list-keys context recipients)))))
+        (goto-char (point-max))
+        (insert ";;; secret entries\n" (pp-to-string cipher)))))
+
+(defun plstore-save (plstore)
+  "Save the contents of PLSTORE associated with a FILE."
+  (with-current-buffer (plstore--get-buffer plstore)
+    (erase-buffer)
+    (plstore--insert-buffer plstore)
+    (save-buffer)))
+
+(provide 'plstore)
+
+;;; plstore.el ends here
diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el
index 90e11b3ca8f..e29ddb0d44e 100644
--- a/lisp/gnus/pop3.el
+++ b/lisp/gnus/pop3.el
@@ -306,7 +306,8 @@ Returns the process associated with the connection."
                     (t
                      (or pop3-stream-type 'network)))
              :capability-command "CAPA\r\n"
-             :end-of-command "^\\.\r?\n\\|^\\(-ERR\\|+OK \\).*\n"
+             :end-of-command "^\\(-ERR\\|+OK \\).*\n"
+             :end-of-capability "^\\.\r?\n\\|^-ERR"
              :success "^\\+OK.*\n"
              :return-list t
              :starttls-function
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 7082cfc57ad..f75f4e20219 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -271,7 +271,7 @@ stopping if the top or bottom edge of the image is reached."
 ;; Adjust frame and image size.
 
 (defun image-mode-fit-frame ()
-  "Fit the frame to the current image.
+  "Toggle whether to fit the frame to the current image.
 This function assumes the current frame has only one window."
   ;; FIXME: This does not take into account decorations like mode-line,
   ;; minibuffer, header-line, ...
diff --git a/lisp/image.el b/lisp/image.el
index 91c0f3c9292..b67367ad436 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -389,6 +389,7 @@ IMAGE must be an image created with `create-image' or `defimage'.
 IMAGE is displayed by putting an overlay into the current buffer with a
 `before-string' STRING that has a `display' property whose value is the
 image.  STRING is defaulted if you omit it.
+The overlay created will have the `put-overlay' property set to t.
 POS may be an integer or marker.
 AREA is where to display the image.  AREA nil or omitted means
 display it in the text area, a value of `left-margin' means
diff --git a/lisp/info-look.el b/lisp/info-look.el
index 2cfaa81d4c7..13edc0269dd 100644
--- a/lisp/info-look.el
+++ b/lisp/info-look.el
@@ -127,9 +127,9 @@ OTHER-MODES is a list of cross references to other help modes.")
 
 (defun info-lookup-add-help (&rest arg)
   "Add or update a help specification.
-Function arguments are one or more options of the form
+Function arguments are specified as keyword/argument pairs:
 
-    KEYWORD ARGUMENT
+    \(KEYWORD . ARGUMENT)
 
 KEYWORD is either `:topic', `:mode', `:regexp', `:ignore-case',
  `:doc-spec', `:parse-rule', or `:other-modes'.
diff --git a/lisp/info.el b/lisp/info.el
index bca41c29d0f..cbdc8cc7ab3 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -464,6 +464,7 @@ be last in the list.")
   "Insert the contents of an Info file in the current buffer.
 Do the right thing if the file has been compressed or zipped."
   (let* ((tail Info-suffix-list)
+         (jka-compr-verbose nil)
          (lfn (if (fboundp 'msdos-long-file-names)
                   (msdos-long-file-names)
                 t))
@@ -621,7 +622,7 @@ in `Info-file-supports-index-cookies-list'."
 Optional argument FILE-OR-NODE specifies the file to examine;
 the default is the top-level directory of Info.
 Called from a program, FILE-OR-NODE may specify an Info node of the form
-`(FILENAME)NODENAME'.
+\"(FILENAME)NODENAME\".
 Optional argument BUFFER specifies the Info buffer name;
 the default buffer name is *info*.  If BUFFER exists,
 just switch to BUFFER.  Otherwise, create a new buffer
@@ -728,6 +729,11 @@ just return nil (no error)."
                           (append Info-directory-list
                                   Info-additional-directory-list)
                         Info-directory-list)))))
+        ;; Fall back on the installation directory if we can't find
+        ;; the info node anywhere else.
+        (when installation-directory
+          (setq dirs (append dirs (list (expand-file-name
+                                         "info" installation-directory)))))
         ;; Search the directory list for file FILENAME.
         (while (and dirs (not found))
           (setq temp (expand-file-name filename (car dirs)))
@@ -1572,7 +1578,12 @@ If FORK is a string, it is the name to use for the new buffer."
 (defvar Info-read-node-completion-table)
 
 (defun Info-read-node-name-2 (dirs suffixes string pred action)
-  "Virtual completion table for file names input in Info node names."
+  "Internal function used to complete Info node names.
+Return a completion table for Info files---the FILENAME part of a
+node named \"(FILENAME)NODENAME\".  DIRS is a list of Info
+directories to search if FILENAME is not absolute; SUFFIXES is a
+list of valid filename suffixes for Info files.  See
+`try-completion' for a description of the remaining arguments."
   (setq suffixes (remove "" suffixes))
   (when (file-name-absolute-p string)
     (setq dirs (list (file-name-directory string))))
@@ -1602,10 +1613,9 @@ If FORK is a string, it is the name to use for the new buffer."
             (push (if string-dir (concat string-dir file) file) names)))))
     (complete-with-action action names string pred)))
 
-;; This function is used as the "completion table" while reading a node name.
-;; It does completion using the alist in Info-read-node-completion-table
-;; unless STRING starts with an open-paren.
 (defun Info-read-node-name-1 (string predicate code)
+  "Internal function used by `Info-read-node-name'.
+See `completing-read' for a description of arguments and usage."
   (cond
    ;; First complete embedded file names.
    ((string-match "\\`([^)]*\\'" string)
@@ -1618,7 +1628,6 @@ If FORK is a string, it is the name to use for the new buffer."
      (substring string 1)
      predicate
      code))
-
    ;; If a file name was given, then any node is fair game.
    ((string-match "\\`(" string)
     (cond
@@ -1630,9 +1639,10 @@ If FORK is a string, it is the name to use for the new buffer."
        code Info-read-node-completion-table string predicate))))
 
 ;; Arrange to highlight the proper letters in the completion list buffer.
-
-
 (defun Info-read-node-name (prompt)
+  "Read an Info node name with completion, prompting with PROMPT.
+A node name can have the form \"NODENAME\", referring to a node
+in the current Info file, or \"(FILENAME)NODENAME\"."
   (let* ((completion-ignore-case t)
          (Info-read-node-completion-table (Info-build-node-completions))
          (nodename (completing-read prompt 'Info-read-node-name-1 nil t)))
@@ -2092,7 +2102,7 @@ If SAME-FILE is non-nil, do not move to a different Info file."
                ))
 
 (defun Info-directory-toc-nodes (filename)
-  "Directory-specific implementation of `Info-directory-toc-nodes'."
+  "Directory-specific implementation of `Info-toc-nodes'."
   `(,filename
     ("Top" nil nil nil)))
 
@@ -3281,7 +3291,6 @@ MATCHES is a list of index matches found by `Info-apropos-matches'.")
   "Collect STRING matches from all known Info files on your system.
 Return a list of matches where each element is in the format
 \((FILENAME INDEXTEXT NODENAME LINENUMBER))."
-  (interactive "sIndex apropos: ")
   (unless (string= string "")
     (let ((pattern (format "\n\\* +\\([^\n]*%s[^\n]*\\):[ \t]+\\([^\n]+\\)\\.\\(?:[ \t\n]*(line +\\([0-9]+\\))\\)?"
                            (regexp-quote string)))
@@ -3646,7 +3655,6 @@ If FORK is non-nil, it is passed to `Info-goto-node'."
     (define-key map "\C-m" 'Info-follow-nearest-node)
     (define-key map "\t" 'Info-next-reference)
     (define-key map "\e\t" 'Info-prev-reference)
-    (define-key map [(shift tab)] 'Info-prev-reference)
     (define-key map [backtab] 'Info-prev-reference)
     (define-key map "1" 'Info-nth-menu-item)
     (define-key map "2" 'Info-nth-menu-item)
diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index 455cbe697d6..a9657c17b9f 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -1206,22 +1206,8 @@ Setup char-width-table appropriate for non-CJK language environment."
 
 ;;; Setting unicode-category-table.
 
-;; This macro is to build unicode-category-table at compile time so
-;; that C code can access the table efficiently.
-(defmacro build-unicode-category-table ()
-  (let ((table (make-char-table 'unicode-category-table nil)))
-    (dotimes (i #x110000)
-      (if (or (< i #xD800)
-              (and (>= i #xF900) (< i #x30000))
-              (and (>= i #xE0000) (< i #xE0200)))
-          (aset table i (get-char-code-property i 'general-category))))
-    (set-char-table-range table '(#xE000 . #xF8FF) 'Co)
-    (set-char-table-range table '(#xF0000 . #xFFFFD) 'Co)
-    (set-char-table-range table '(#x100000 . #x10FFFD) 'Co)
-    (optimize-char-table table 'eq)
-    table))
-
-(setq unicode-category-table (build-unicode-category-table))
+(setq unicode-category-table
+      (unicode-property-table-internal 'general-category))
 (map-char-table #'(lambda (key val)
                     (if (and val
                              (or (and (/= (aref (symbol-name val) 0) ?M)
diff --git a/lisp/international/charprop.el b/lisp/international/charprop.el
index 5c3efcc9d07..919666010b1 100644
--- a/lisp/international/charprop.el
+++ b/lisp/international/charprop.el
@@ -1,8 +1,4 @@
-;; Copyright (C) 1991-2010 Unicode, Inc.
-;; This file was generated from the Unicode data file at
-;; http://www.unicode.org/Public/UNIDATA/UnicodeData.txt.
-;; See lisp/international/README for the copyright and permission notice.
-
+;; Automatically generated by unidata-gen.el.
 ;; FILE: uni-name.el
 (define-char-code-property 'name "uni-name.el"
   "Unicode character name.
@@ -45,7 +41,7 @@ Property value is an integer or a floating point.")
 ;; FILE: uni-mirrored.el
 (define-char-code-property 'mirrored "uni-mirrored.el"
   "Unicode bidi mirrored flag.
-Property value is a symbol `Y' or `N'.")
+Property value is a symbol `Y' or `N'.  See also the property `mirroring'.")
 ;; FILE: uni-old-name.el
 (define-char-code-property 'old-name "uni-old-name.el"
   "Unicode old names as published in Unicode 1.0.
@@ -66,6 +62,11 @@ Property value is a character.")
 (define-char-code-property 'titlecase "uni-titlecase.el"
   "Unicode simple titlecase mapping.
 Property value is a character.")
+;; FILE: uni-mirrored.el
+(define-char-code-property 'mirroring "uni-mirrored.el"
+  "Unicode bidi-mirroring characters.
+Property value is a character that has the corresponding mirroring image,
+or nil for non-mirrored character.")
 ;; Local Variables:
 ;; coding: utf-8
 ;; no-byte-compile: t
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index b3f17bb3fcf..6a73aaaa838 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -397,7 +397,11 @@ If CODING-SYSTEM specifies a certain type of EOL conversion, the coding
 systems set by this function will use that type of EOL conversion.
 
 A coding system that requires automatic detection of text+encoding
-\(e.g. undecided, unix) can't be preferred."
+\(e.g. undecided, unix) can't be preferred.
+
+To prefer, for instance, utf-8, say the following:
+
+  \(prefer-coding-system 'utf-8)"
   (interactive "zPrefer coding system: ")
   (if (not (and coding-system (coding-system-p coding-system)))
       (error "Invalid coding system `%s'" coding-system))
@@ -2709,16 +2713,6 @@ See also `locale-charset-language-names', `locale-language-names',
 
 ;;; Character property
 
-;; Each element has the form (PROP . TABLE).
-;; PROP is a symbol representing a character property.
-;; TABLE is a char-table containing the property value for each character.
-;; TABLE may be a name of file to load to build a char-table.
-;; Don't modify this variable directly but use `define-char-code-property'.
-
-(defvar char-code-property-alist nil
-  "Alist of character property name vs char-table containing property values.
-Internal use only.")
-
 (put 'char-code-property-table 'char-table-extra-slots 5)
 
 (defun define-char-code-property (name table &optional docstring)
@@ -2770,32 +2764,23 @@ See also the documentation of `get-char-code-property' and
 
 (defun get-char-code-property (char propname)
   "Return the value of CHAR's PROPNAME property."
-  (let ((slot (assq propname char-code-property-alist)))
-    (if slot
-        (let (table value func)
-          (if (stringp (cdr slot))
-              (load (cdr slot) nil t))
-          (setq table (cdr slot)
-                value (aref table char)
-                func (char-table-extra-slot table 1))
+  (let ((table (unicode-property-table-internal propname)))
+    (if table
+        (let ((func (char-table-extra-slot table 1)))
           (if (functionp func)
-              (setq value (funcall func char value table)))
-          value)
+              (funcall func char (aref table char) table)
+            (get-unicode-property-internal table char)))
       (plist-get (aref char-code-property-table char) propname))))
 
 (defun put-char-code-property (char propname value)
   "Store CHAR's PROPNAME property with VALUE.
 It can be retrieved with `(get-char-code-property CHAR PROPNAME)'."
-  (let ((slot (assq propname char-code-property-alist)))
-    (if slot
-        (let (table func)
-          (if (stringp (cdr slot))
-              (load (cdr slot) nil t))
-          (setq table (cdr slot)
-                func (char-table-extra-slot table 2))
+  (let ((table (unicode-property-table-internal propname)))
+    (if table
+        (let ((func (char-table-extra-slot table 2)))
           (if (functionp func)
               (funcall func char value table)
-            (aset table char value)))
+            (put-unicode-property-internal table char value)))
       (let* ((plist (aref char-code-property-table char))
              (x (plist-put plist propname value)))
         (or (eq x plist)
@@ -2805,13 +2790,9 @@ It can be retrieved with `(get-char-code-property CHAR PROPNAME)'."
 (defun char-code-property-description (prop value)
   "Return a description string of character property PROP's value VALUE.
 If there's no description string for VALUE, return nil."
-  (let ((slot (assq prop char-code-property-alist)))
-    (if slot
-        (let (table func)
-          (if (stringp (cdr slot))
-              (load (cdr slot) nil t))
-          (setq table (cdr slot)
-                func (char-table-extra-slot table 3))
+  (let ((table (unicode-property-table-internal prop)))
+    (if table
+        (let ((func (char-table-extra-slot table 3)))
           (if (functionp func)
               (funcall func value))))))
 
diff --git a/lisp/international/uni-bidi.el b/lisp/international/uni-bidi.el
index 9e571ef9d0d..e7682c6d8ff 100644
--- a/lisp/international/uni-bidi.el
+++ b/lisp/international/uni-bidi.el
diff --git a/lisp/international/uni-category.el b/lisp/international/uni-category.el
index 80538f7b416..a4455decc52 100644
--- a/lisp/international/uni-category.el
+++ b/lisp/international/uni-category.el
diff --git a/lisp/international/uni-combining.el b/lisp/international/uni-combining.el
index 2ee74d8b818..227b9d0af79 100644
--- a/lisp/international/uni-combining.el
+++ b/lisp/international/uni-combining.el
diff --git a/lisp/international/uni-comment.el b/lisp/international/uni-comment.el
index dcc717977c7..c9743064bd4 100644
--- a/lisp/international/uni-comment.el
+++ b/lisp/international/uni-comment.el
diff --git a/lisp/international/uni-decimal.el b/lisp/international/uni-decimal.el
index 22207a224b0..2c424ffb5de 100644
--- a/lisp/international/uni-decimal.el
+++ b/lisp/international/uni-decimal.el
diff --git a/lisp/international/uni-decomposition.el b/lisp/international/uni-decomposition.el
index f35bcebfed8..b0bf07bbe85 100644
--- a/lisp/international/uni-decomposition.el
+++ b/lisp/international/uni-decomposition.el
diff --git a/lisp/international/uni-digit.el b/lisp/international/uni-digit.el
index 692dea1edc8..fc52fd8c28c 100644
--- a/lisp/international/uni-digit.el
+++ b/lisp/international/uni-digit.el
diff --git a/lisp/international/uni-lowercase.el b/lisp/international/uni-lowercase.el
index 7cc601159f0..41890018204 100644
--- a/lisp/international/uni-lowercase.el
+++ b/lisp/international/uni-lowercase.el
diff --git a/lisp/international/uni-mirrored.el b/lisp/international/uni-mirrored.el
index 5129a93396d..006cf575591 100644
--- a/lisp/international/uni-mirrored.el
+++ b/lisp/international/uni-mirrored.el
diff --git a/lisp/international/uni-name.el b/lisp/international/uni-name.el
index 5b9e8323d21..7fac18b278d 100644
--- a/lisp/international/uni-name.el
+++ b/lisp/international/uni-name.el
diff --git a/lisp/international/uni-numeric.el b/lisp/international/uni-numeric.el
index 278ad683fe4..d16e8c00870 100644
--- a/lisp/international/uni-numeric.el
+++ b/lisp/international/uni-numeric.el
diff --git a/lisp/international/uni-old-name.el b/lisp/international/uni-old-name.el
index 2e283492408..4e704e5cdd0 100644
--- a/lisp/international/uni-old-name.el
+++ b/lisp/international/uni-old-name.el
diff --git a/lisp/international/uni-titlecase.el b/lisp/international/uni-titlecase.el
index 729a469d103..b8098c81876 100644
--- a/lisp/international/uni-titlecase.el
+++ b/lisp/international/uni-titlecase.el
diff --git a/lisp/international/uni-uppercase.el b/lisp/international/uni-uppercase.el
index 0714b14794f..899276eb725 100644
--- a/lisp/international/uni-uppercase.el
+++ b/lisp/international/uni-uppercase.el
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 7f018ab14c7..50e7b331c85 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -2226,10 +2226,13 @@ If there is no completion possible, say so and continue searching."
 ;; Searching
 
 (defvar isearch-search-fun-function nil
-  "Override `isearch-search-fun'.
-This function should return the search function for Isearch to use.
-It will call this function with three arguments
-as if it were `search-forward'.")
+  "Overrides the default `isearch-search-fun' behaviour.
+This variable's value should be a function, which will be called
+with no arguments, and should return a function that takes three
+arguments: STRING, BOUND, and NOERROR.
+
+This returned function will be used by `isearch-search-string' to
+search for the first occurrence of STRING or its translation.")
 
 (defun isearch-search-fun ()
   "Return the function to use for the search.
diff --git a/lisp/jka-cmpr-hook.el b/lisp/jka-cmpr-hook.el
index fda9804bbb8..e1cf2a661ed 100644
--- a/lisp/jka-cmpr-hook.el
+++ b/lisp/jka-cmpr-hook.el
@@ -340,7 +340,7 @@ Return the new status of auto compression (non-nil means on)."
      (t (jka-compr-uninstall)))))
 
 (defmacro with-auto-compression-mode (&rest body)
-  "Evalute BODY with automatic file compression and uncompression enabled."
+  "Evaluate BODY with automatic file compression and uncompression enabled."
   (declare (indent 0))
   (let ((already-installed (make-symbol "already-installed")))
     `(let ((,already-installed (jka-compr-installed-p)))
diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index 37c9d40ec65..1893e982bbb 100644
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -97,6 +97,11 @@ NOTE: Not used in MS-DOS and Windows systems."
   :type 'string
   :group 'jka-compr)
 
+(defcustom jka-compr-verbose t
+  "If non-nil, output messages whenever compressing or uncompressing files."
+  :type 'boolean
+  :group 'jka-compr)
+
 (defvar jka-compr-use-shell
   (not (memq system-type '(ms-dos windows-nt))))
 
@@ -309,6 +314,7 @@ There should be no more than seven characters after the final `/'."
 
           (and
            compress-message
+           jka-compr-verbose
            (message "%s %s..." compress-message base-name))
 
           (jka-compr-run-real-handler 'write-region
@@ -341,6 +347,7 @@ There should be no more than seven characters after the final `/'."
 
           (and
            compress-message
+           jka-compr-verbose
            (message "%s %s...done" compress-message base-name))
 
           (cond
@@ -404,6 +411,7 @@ There should be no more than seven characters after the final `/'."
 
               (and
                uncompress-message
+               jka-compr-verbose
                (message "%s %s..." uncompress-message base-name))
 
               (condition-case error-code
@@ -479,6 +487,7 @@ There should be no more than seven characters after the final `/'."
 
         (and
          uncompress-message
+         jka-compr-verbose
          (message "%s %s...done" uncompress-message base-name))
 
         (and
@@ -534,6 +543,7 @@ There should be no more than seven characters after the final `/'."
 
                 (and
                  uncompress-message
+                 jka-compr-verbose
                  (message "%s %s..." uncompress-message base-name))
 
                 ;; Here we must read the output of uncompress program
@@ -554,6 +564,7 @@ There should be no more than seven characters after the final `/'."
 
                   (and
                    uncompress-message
+                   jka-compr-verbose
                    (message "%s %s...done" uncompress-message base-name))
 
                   (write-region
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index bbf59e4e376..75de9a9f9b2 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -5,7 +5,7 @@
 
 ;;;### (autoloads (5x5-crack 5x5-crack-xor-mutate 5x5-crack-mutating-best
 ;;;;;;  5x5-crack-mutating-current 5x5-crack-randomly 5x5) "5x5"
-;;;;;;  "play/5x5.el" (19932 573))
+;;;;;;  "play/5x5.el" (19968 28627))
 ;;; Generated autoloads from play/5x5.el
 
 (autoload '5x5 "5x5" "\
@@ -16,18 +16,21 @@ squares you must fill the grid.
 
 5x5 keyboard bindings are:
 \\<5x5-mode-map>
-Flip                      \\[5x5-flip-current]
-Move up                   \\[5x5-up]
-Move down                 \\[5x5-down]
-Move left                 \\[5x5-left]
-Move right                \\[5x5-right]
-Start new game            \\[5x5-new-game]
-New game with random grid \\[5x5-randomize]
-Random cracker            \\[5x5-crack-randomly]
-Mutate current cracker    \\[5x5-crack-mutating-current]
-Mutate best cracker       \\[5x5-crack-mutating-best]
-Mutate xor cracker        \\[5x5-crack-xor-mutate]
-Quit current game         \\[5x5-quit-game]
+Flip                        \\[5x5-flip-current]
+Move up                     \\[5x5-up]
+Move down                   \\[5x5-down]
+Move left                   \\[5x5-left]
+Move right                  \\[5x5-right]
+Start new game              \\[5x5-new-game]
+New game with random grid   \\[5x5-randomize]
+Random cracker              \\[5x5-crack-randomly]
+Mutate current cracker      \\[5x5-crack-mutating-current]
+Mutate best cracker         \\[5x5-crack-mutating-best]
+Mutate xor cracker          \\[5x5-crack-xor-mutate]
+Solve with Calc             \\[5x5-solve-suggest]
+Rotate left Calc Solutions  \\[5x5-solve-rotate-left]
+Rotate right Calc Solutions \\[5x5-solve-rotate-right]
+Quit current game           \\[5x5-quit-game]
 
 \(fn &optional SIZE)" t nil)
 
@@ -486,7 +489,7 @@ A replacement function for `newline-and-indent', aligning as it goes.
 
 ;;;### (autoloads (outlineify-sticky allout-mode allout-mode-p allout-auto-activation
 ;;;;;;  allout-setup allout-auto-activation-helper) "allout" "allout.el"
-;;;;;;  (19931 11784))
+;;;;;;  (19981 40664))
 ;;; Generated autoloads from allout.el
 
 (autoload 'allout-auto-activation-helper "allout" "\
@@ -844,7 +847,7 @@ for details on preparing emacs for automatic allout activation.
 
 ;;;### (autoloads (allout-widgets-mode allout-widgets-auto-activation
 ;;;;;;  allout-widgets-setup allout-widgets) "allout-widgets" "allout-widgets.el"
-;;;;;;  (19931 11784))
+;;;;;;  (19981 40664))
 ;;; Generated autoloads from allout-widgets.el
 
 (let ((loads (get 'allout-widgets 'custom-loads))) (if (member '"allout-widgets" loads) nil (put 'allout-widgets 'custom-loads (cons '"allout-widgets" loads))))
@@ -903,7 +906,7 @@ outline hot-spot navigation (see `allout-mode').
 ;;;***
 
 ;;;### (autoloads (ange-ftp-hook-function ange-ftp-reread-dir) "ange-ftp"
-;;;;;;  "net/ange-ftp.el" (19931 11784))
+;;;;;;  "net/ange-ftp.el" (19977 43600))
 ;;; Generated autoloads from net/ange-ftp.el
 
 (defalias 'ange-ftp-re-read-dir 'ange-ftp-reread-dir)
@@ -1015,7 +1018,7 @@ Used in `antlr-mode'.  Also a useful function in `java-mode-hook'.
 ;;;***
 
 ;;;### (autoloads (appt-activate appt-add) "appt" "calendar/appt.el"
-;;;;;;  (19922 19303))
+;;;;;;  (19956 37456))
 ;;; Generated autoloads from calendar/appt.el
 
 (autoload 'appt-add "appt" "\
@@ -1469,7 +1472,7 @@ Special commands:
 ;;;***
 
 ;;;### (autoloads (auth-source-cache-expiry) "auth-source" "gnus/auth-source.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19981 40664))
 ;;; Generated autoloads from gnus/auth-source.el
 
 (defvar auth-source-cache-expiry 7200 "\
@@ -1759,7 +1762,7 @@ definition of \"random distance\".)
 ;;;***
 
 ;;;### (autoloads (display-battery-mode battery) "battery" "battery.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19976 22732))
 ;;; Generated autoloads from battery.el
  (put 'battery-mode-line-string 'risky-local-variable t)
 
@@ -1791,7 +1794,7 @@ seconds.
 ;;;***
 
 ;;;### (autoloads (benchmark benchmark-run-compiled benchmark-run)
-;;;;;;  "benchmark" "emacs-lisp/benchmark.el" (19845 45374))
+;;;;;;  "benchmark" "emacs-lisp/benchmark.el" (19981 40664))
 ;;; Generated autoloads from emacs-lisp/benchmark.el
 
 (autoload 'benchmark-run "benchmark" "\
@@ -1824,7 +1827,7 @@ For non-interactive use see also `benchmark-run' and
 ;;;***
 
 ;;;### (autoloads (bibtex-search-entry bibtex-mode bibtex-initialize)
-;;;;;;  "bibtex" "textmodes/bibtex.el" (19931 11784))
+;;;;;;  "bibtex" "textmodes/bibtex.el" (19971 4823))
 ;;; Generated autoloads from textmodes/bibtex.el
 
 (autoload 'bibtex-initialize "bibtex" "\
@@ -1903,8 +1906,10 @@ is limited to the current buffer.  Optional arg START is buffer position
 where the search starts.  If it is nil, start search at beginning of buffer.
 If DISPLAY is non-nil, display the buffer containing KEY.
 Otherwise, use `set-buffer'.
-When called interactively, GLOBAL is t if there is a prefix arg or the current
-mode is not `bibtex-mode', START is nil, and DISPLAY is t.
+When called interactively, START is nil, DISPLAY is t.
+Also, GLOBAL is t if the current mode is not `bibtex-mode'
+or `bibtex-search-entry-globally' is non-nil.
+A prefix arg negates the value of `bibtex-search-entry-globally'.
 
 \(fn KEY &optional GLOBAL START DISPLAY)" t nil)
 
@@ -2271,7 +2276,7 @@ Incremental search of bookmarks, hiding the non-matches as we go.
 ;;;;;;  browse-url-at-mouse browse-url-at-point browse-url browse-url-of-region
 ;;;;;;  browse-url-of-dired-file browse-url-of-buffer browse-url-of-file
 ;;;;;;  browse-url-browser-function) "browse-url" "net/browse-url.el"
-;;;;;;  (19911 48973))
+;;;;;;  (19973 46551))
 ;;; Generated autoloads from net/browse-url.el
 
 (defvar browse-url-browser-function (cond ((memq system-type '(windows-nt ms-dos cygwin)) 'browse-url-default-windows-browser) ((memq system-type '(darwin)) 'browse-url-default-macosx-browser) (t 'browse-url-default-browser)) "\
@@ -2593,7 +2598,7 @@ Return a vector containing the lines from `bruce-phrases-file'.
 ;;;***
 
 ;;;### (autoloads (bs-show bs-customize bs-cycle-previous bs-cycle-next)
-;;;;;;  "bs" "bs.el" (19870 57559))
+;;;;;;  "bs" "bs.el" (19976 22732))
 ;;; Generated autoloads from bs.el
 
 (autoload 'bs-cycle-next "bs" "\
@@ -2676,7 +2681,7 @@ Like `bug-reference-mode', but only buttonize in comments and strings.
 ;;;;;;  batch-byte-compile-if-not-done display-call-tree byte-compile
 ;;;;;;  compile-defun byte-compile-file byte-recompile-directory
 ;;;;;;  byte-force-recompile byte-compile-enable-warning byte-compile-disable-warning)
-;;;;;;  "bytecomp" "emacs-lisp/bytecomp.el" (19940 49234))
+;;;;;;  "bytecomp" "emacs-lisp/bytecomp.el" (19968 28627))
 ;;; Generated autoloads from emacs-lisp/bytecomp.el
 (put 'byte-compile-dynamic 'safe-local-variable 'booleanp)
 (put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp)
@@ -2834,8 +2839,8 @@ from the cursor position.
 
 ;;;### (autoloads (defmath calc-embedded-activate calc-embedded calc-grab-rectangle
 ;;;;;;  calc-grab-region full-calc-keypad calc-keypad calc-eval quick-calc
-;;;;;;  full-calc calc calc-dispatch) "calc" "calc/calc.el" (19845
-;;;;;;  45374))
+;;;;;;  full-calc calc calc-dispatch) "calc" "calc/calc.el" (19943
+;;;;;;  25429))
 ;;; Generated autoloads from calc/calc.el
  (define-key ctl-x-map "*" 'calc-dispatch)
 
@@ -2942,8 +2947,8 @@ See the documentation for `calculator-mode' for more information.
 
 ;;;***
 
-;;;### (autoloads (calendar) "calendar" "calendar/calendar.el" (19923
-;;;;;;  40175))
+;;;### (autoloads (calendar) "calendar" "calendar/calendar.el" (19956
+;;;;;;  37456))
 ;;; Generated autoloads from calendar/calendar.el
 
 (autoload 'calendar "calendar" "\
@@ -3048,7 +3053,7 @@ Obsoletes `c-forward-into-nomenclature'.
 ;;;***
 
 ;;;### (autoloads (c-guess-basic-syntax) "cc-engine" "progmodes/cc-engine.el"
-;;;;;;  (19893 19022))
+;;;;;;  (19981 40664))
 ;;; Generated autoloads from progmodes/cc-engine.el
 
 (autoload 'c-guess-basic-syntax "cc-engine" "\
@@ -3058,9 +3063,109 @@ Return the syntactic context of the current line.
 
 ;;;***
 
+;;;### (autoloads (c-guess-install c-guess-region-no-install c-guess-region
+;;;;;;  c-guess-buffer-no-install c-guess-buffer c-guess-no-install
+;;;;;;  c-guess) "cc-guess" "progmodes/cc-guess.el" (19981 40664))
+;;; Generated autoloads from progmodes/cc-guess.el
+
+(defvar c-guess-guessed-offsets-alist nil "\
+Currently guessed offsets-alist.")
+
+(defvar c-guess-guessed-basic-offset nil "\
+Currently guessed basic-offset.")
+
+(autoload 'c-guess "cc-guess" "\
+Guess the style in the region up to `c-guess-region-max', and install it.
+
+The style is given a name based on the file's absolute file name.
+
+If given a prefix argument (or if the optional argument ACCUMULATE is
+non-nil) then the previous guess is extended, otherwise a new guess is
+made from scratch.
+
+\(fn &optional ACCUMULATE)" t nil)
+
+(autoload 'c-guess-no-install "cc-guess" "\
+Guess the style in the region up to `c-guess-region-max'; don't install it.
+
+If given a prefix argument (or if the optional argument ACCUMULATE is
+non-nil) then the previous guess is extended, otherwise a new guess is
+made from scratch.
+
+\(fn &optional ACCUMULATE)" t nil)
+
+(autoload 'c-guess-buffer "cc-guess" "\
+Guess the style on the whole current buffer, and install it.
+
+The style is given a name based on the file's absolute file name.
+
+If given a prefix argument (or if the optional argument ACCUMULATE is
+non-nil) then the previous guess is extended, otherwise a new guess is
+made from scratch.
+
+\(fn &optional ACCUMULATE)" t nil)
+
+(autoload 'c-guess-buffer-no-install "cc-guess" "\
+Guess the style on the whole current buffer; don't install it.
+
+If given a prefix argument (or if the optional argument ACCUMULATE is
+non-nil) then the previous guess is extended, otherwise a new guess is
+made from scratch.
+
+\(fn &optional ACCUMULATE)" t nil)
+
+(autoload 'c-guess-region "cc-guess" "\
+Guess the style on the region and install it.
+
+The style is given a name based on the file's absolute file name.
+
+If given a prefix argument (or if the optional argument ACCUMULATE is
+non-nil) then the previous guess is extended, otherwise a new guess is
+made from scratch.
+
+\(fn START END &optional ACCUMULATE)" t nil)
+
+(autoload 'c-guess-region-no-install "cc-guess" "\
+Guess the style on the region; don't install it.
+
+Every line of code in the region is examined and values for the following two
+variables are guessed:
+
+* `c-basic-offset', and
+* the indentation values of the various syntactic symbols in
+  `c-offsets-alist'.
+
+The guessed values are put into `c-guess-guessed-basic-offset' and
+`c-guess-guessed-offsets-alist'.
+
+Frequencies of use are taken into account when guessing, so minor
+inconsistencies in the indentation style shouldn't produce wrong guesses.
+
+If given a prefix argument (or if the optional argument ACCUMULATE is
+non-nil) then the previous examination is extended, otherwise a new
+guess is made from scratch.
+
+Note that the larger the region to guess in, the slower the guessing.
+So you can limit the region with `c-guess-region-max'.
+
+\(fn START END &optional ACCUMULATE)" t nil)
+
+(autoload 'c-guess-install "cc-guess" "\
+Install the latest guessed style into the current buffer.
+\(This guessed style is a combination of `c-guess-guessed-basic-offset',
+`c-guess-guessed-offsets-alist' and `c-offsets-alist'.)
+
+The style is entered into CC Mode's style system by
+`c-add-style'.  Its name is either STYLE-NAME, or a name based on
+the absolute file name of the file if STYLE-NAME is nil.
+
+\(fn &optional STYLE-NAME)" t nil)
+
+;;;***
+
 ;;;### (autoloads (awk-mode pike-mode idl-mode java-mode objc-mode
 ;;;;;;  c++-mode c-mode c-initialize-cc-mode) "cc-mode" "progmodes/cc-mode.el"
-;;;;;;  (19938 7518))
+;;;;;;  (19981 40664))
 ;;; Generated autoloads from progmodes/cc-mode.el
 
 (autoload 'c-initialize-cc-mode "cc-mode" "\
@@ -3237,7 +3342,7 @@ Key bindings:
 ;;;***
 
 ;;;### (autoloads (c-set-offset c-add-style c-set-style) "cc-styles"
-;;;;;;  "progmodes/cc-styles.el" (19845 45374))
+;;;;;;  "progmodes/cc-styles.el" (19981 40664))
 ;;; Generated autoloads from progmodes/cc-styles.el
 
 (autoload 'c-set-style "cc-styles" "\
@@ -3298,7 +3403,7 @@ and exists only for compatibility reasons.
 
 ;;;### (autoloads (ccl-execute-with-args check-ccl-program define-ccl-program
 ;;;;;;  declare-ccl-program ccl-dump ccl-compile) "ccl" "international/ccl.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19943 25429))
 ;;; Generated autoloads from international/ccl.el
 
 (autoload 'ccl-compile "ccl" "\
@@ -3559,7 +3664,7 @@ See the documentation of `define-ccl-program' for the detail of CCL program.
 ;;;***
 
 ;;;### (autoloads (cconv-closure-convert) "cconv" "emacs-lisp/cconv.el"
-;;;;;;  (19869 36706))
+;;;;;;  (19943 25429))
 ;;; Generated autoloads from emacs-lisp/cconv.el
 
 (autoload 'cconv-closure-convert "cconv" "\
@@ -3573,10 +3678,19 @@ Returns a form where all lambdas don't have any free variables.
 
 ;;;***
 
-;;;### (autoloads (cfengine-mode) "cfengine" "progmodes/cfengine.el"
-;;;;;;  (19845 45374))
+;;;### (autoloads (cfengine-mode cfengine3-mode) "cfengine" "progmodes/cfengine.el"
+;;;;;;  (19981 40664))
 ;;; Generated autoloads from progmodes/cfengine.el
 
+(autoload 'cfengine3-mode "cfengine" "\
+Major mode for editing cfengine input.
+There are no special keybindings by default.
+
+Action blocks are treated as defuns, i.e. \\[beginning-of-defun] moves
+to the action header.
+
+\(fn)" t nil)
+
 (autoload 'cfengine-mode "cfengine" "\
 Major mode for editing cfengine input.
 There are no special keybindings by default.
@@ -4045,7 +4159,7 @@ If FRAME cannot display COLOR, return nil.
 ;;;### (autoloads (comint-redirect-results-list-from-process comint-redirect-results-list
 ;;;;;;  comint-redirect-send-command-to-process comint-redirect-send-command
 ;;;;;;  comint-run make-comint make-comint-in-buffer) "comint" "comint.el"
-;;;;;;  (19931 11784))
+;;;;;;  (19981 40664))
 ;;; Generated autoloads from comint.el
 
 (defvar comint-output-filter-functions '(comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt) "\
@@ -4177,8 +4291,8 @@ on third call it again advances points to the next difference and so on.
 ;;;;;;  compilation-shell-minor-mode compilation-mode compilation-start
 ;;;;;;  compile compilation-disable-input compile-command compilation-search-path
 ;;;;;;  compilation-ask-about-save compilation-window-height compilation-start-hook
-;;;;;;  compilation-mode-hook) "compile" "progmodes/compile.el" (19913
-;;;;;;  4309))
+;;;;;;  compilation-mode-hook) "compile" "progmodes/compile.el" (19968
+;;;;;;  28627))
 ;;; Generated autoloads from progmodes/compile.el
 
 (defvar compilation-mode-hook nil "\
@@ -4602,7 +4716,7 @@ If FIX is non-nil, run `copyright-fix-years' instead.
 ;;;***
 
 ;;;### (autoloads (cperl-perldoc-at-point cperl-perldoc cperl-mode)
-;;;;;;  "cperl-mode" "progmodes/cperl-mode.el" (19931 11784))
+;;;;;;  "cperl-mode" "progmodes/cperl-mode.el" (19975 1875))
 ;;; Generated autoloads from progmodes/cperl-mode.el
 (put 'cperl-indent-level 'safe-local-variable 'integerp)
 (put 'cperl-brace-offset 'safe-local-variable 'integerp)
@@ -4879,8 +4993,8 @@ INHERIT-INPUT-METHOD.
 
 ;;;***
 
-;;;### (autoloads (css-mode) "css-mode" "textmodes/css-mode.el" (19863
-;;;;;;  8742))
+;;;### (autoloads (css-mode) "css-mode" "textmodes/css-mode.el" (19978
+;;;;;;  37530))
 ;;; Generated autoloads from textmodes/css-mode.el
 
 (autoload 'css-mode "css-mode" "\
@@ -4947,10 +5061,10 @@ Enable CUA selection mode without the C-z/C-x/C-c/C-v bindings.
 ;;;;;;  customize-rogue customize-unsaved customize-face-other-window
 ;;;;;;  customize-face customize-changed-options customize-option-other-window
 ;;;;;;  customize-option customize-group-other-window customize-group
-;;;;;;  customize-mode customize customize-save-variable customize-set-variable
-;;;;;;  customize-set-value custom-menu-sort-alphabetically custom-buffer-sort-alphabetically
-;;;;;;  custom-browse-sort-alphabetically) "cus-edit" "cus-edit.el"
-;;;;;;  (19886 45771))
+;;;;;;  customize-mode customize customize-push-and-save customize-save-variable
+;;;;;;  customize-set-variable customize-set-value custom-menu-sort-alphabetically
+;;;;;;  custom-buffer-sort-alphabetically custom-browse-sort-alphabetically)
+;;;;;;  "cus-edit" "cus-edit.el" (19980 19797))
 ;;; Generated autoloads from cus-edit.el
 
 (defvar custom-browse-sort-alphabetically nil "\
@@ -5016,6 +5130,17 @@ If given a prefix (or a COMMENT argument), also prompt for a comment.
 
 \(fn VARIABLE VALUE &optional COMMENT)" t nil)
 
+(autoload 'customize-push-and-save "cus-edit" "\
+Add ELTS to LIST-VAR and save for future sessions, safely.
+ELTS should be a list.  This function adds each entry to the
+value of LIST-VAR using `add-to-list'.
+
+If Emacs is initialized, call `customize-save-variable' to save
+the resulting list value now.  Otherwise, add an entry to
+`after-init-hook' to save it after initialization.
+
+\(fn LIST-VAR ELTS)" nil nil)
+
 (autoload 'customize "cus-edit" "\
 Select a customization buffer which you can use to set user options.
 User options are structured into \"groups\".
@@ -5253,8 +5378,8 @@ The format is suitable for use with `easy-menu-define'.
 ;;;***
 
 ;;;### (autoloads (customize-themes describe-theme custom-theme-visit-theme
-;;;;;;  customize-create-theme) "cus-theme" "cus-theme.el" (19886
-;;;;;;  45771))
+;;;;;;  customize-create-theme) "cus-theme" "cus-theme.el" (19980
+;;;;;;  19797))
 ;;; Generated autoloads from cus-theme.el
 
 (autoload 'customize-create-theme "cus-theme" "\
@@ -5572,7 +5697,7 @@ There is some minimal font-lock support (see vars
 ;;;***
 
 ;;;### (autoloads (cancel-debug-on-entry debug-on-entry debug) "debug"
-;;;;;;  "emacs-lisp/debug.el" (19942 4565))
+;;;;;;  "emacs-lisp/debug.el" (19961 55377))
 ;;; Generated autoloads from emacs-lisp/debug.el
 
 (setq debugger 'debug)
@@ -5670,8 +5795,8 @@ START and END delimits the corners of text rectangle.
 
 ;;;***
 
-;;;### (autoloads (delphi-mode) "delphi" "progmodes/delphi.el" (19890
-;;;;;;  42850))
+;;;### (autoloads (delphi-mode) "delphi" "progmodes/delphi.el" (19965
+;;;;;;  52428))
 ;;; Generated autoloads from progmodes/delphi.el
 
 (autoload 'delphi-mode "delphi" "\
@@ -5718,7 +5843,7 @@ Coloring:
 Turning on Delphi mode calls the value of the variable `delphi-mode-hook'
 with no args, if that value is non-nil.
 
-\(fn &optional SKIP-INITIAL-PARSING)" t nil)
+\(fn)" t nil)
 
 ;;;***
 
@@ -6064,7 +6189,7 @@ Deuglify broken Outlook (Express) articles and redisplay.
 ;;;***
 
 ;;;### (autoloads (diary-mode diary-mail-entries diary) "diary-lib"
-;;;;;;  "calendar/diary-lib.el" (19923 40175))
+;;;;;;  "calendar/diary-lib.el" (19975 1875))
 ;;; Generated autoloads from calendar/diary-lib.el
 
 (autoload 'diary "diary-lib" "\
@@ -6191,7 +6316,7 @@ Optional arguments are passed to `dig-invoke'.
 ;;;***
 
 ;;;### (autoloads (dired-mode dired-noselect dired-other-frame dired-other-window
-;;;;;;  dired dired-listing-switches) "dired" "dired.el" (19927 37312))
+;;;;;;  dired dired-listing-switches) "dired" "dired.el" (19966 16984))
 ;;; Generated autoloads from dired.el
 
 (defvar dired-listing-switches (purecopy "-al") "\
@@ -6543,8 +6668,8 @@ Locate SOA record and increment the serial field.
 ;;;***
 
 ;;;### (autoloads (doc-view-bookmark-jump doc-view-minor-mode doc-view-mode-maybe
-;;;;;;  doc-view-mode doc-view-mode-p) "doc-view" "doc-view.el" (19913
-;;;;;;  4309))
+;;;;;;  doc-view-mode doc-view-mode-p) "doc-view" "doc-view.el" (19953
+;;;;;;  8437))
 ;;; Generated autoloads from doc-view.el
 
 (autoload 'doc-view-mode-p "doc-view" "\
@@ -7715,7 +7840,7 @@ Display Ediff's registry.
 ;;;***
 
 ;;;### (autoloads (ediff-toggle-use-toolbar ediff-toggle-multiframe)
-;;;;;;  "ediff-util" "vc/ediff-util.el" (19931 11784))
+;;;;;;  "ediff-util" "vc/ediff-util.el" (19981 40664))
 ;;; Generated autoloads from vc/ediff-util.el
 
 (autoload 'ediff-toggle-multiframe "ediff-util" "\
@@ -7989,8 +8114,8 @@ optional prefix argument REINIT is non-nil.
 ;;;***
 
 ;;;### (autoloads (elp-results elp-instrument-package elp-instrument-list
-;;;;;;  elp-instrument-function) "elp" "emacs-lisp/elp.el" (19845
-;;;;;;  45374))
+;;;;;;  elp-instrument-function) "elp" "emacs-lisp/elp.el" (19981
+;;;;;;  40664))
 ;;; Generated autoloads from emacs-lisp/elp.el
 
 (autoload 'elp-instrument-function "elp" "\
@@ -8025,7 +8150,7 @@ displayed.
 ;;;***
 
 ;;;### (autoloads (report-emacs-bug) "emacsbug" "mail/emacsbug.el"
-;;;;;;  (19942 4565))
+;;;;;;  (19978 37530))
 ;;; Generated autoloads from mail/emacsbug.el
 
 (autoload 'report-emacs-bug "emacsbug" "\
@@ -8454,7 +8579,7 @@ Look at CONFIG and try to expand GROUP.
 ;;;***
 
 ;;;### (autoloads (erc-handle-irc-url erc erc-select-read-args) "erc"
-;;;;;;  "erc/erc.el" (19903 54862))
+;;;;;;  "erc/erc.el" (19981 40664))
 ;;; Generated autoloads from erc/erc.el
 
 (autoload 'erc-select-read-args "erc" "\
@@ -9802,7 +9927,7 @@ This is used only in conjunction with `expand-add-abbrevs'.
 
 ;;;***
 
-;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (19931 11784))
+;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (19975 1875))
 ;;; Generated autoloads from progmodes/f90.el
 
 (autoload 'f90-mode "f90" "\
@@ -9829,6 +9954,10 @@ Variables controlling indentation style and extra features:
 `f90-program-indent'
   Extra indentation within program/module/subroutine/function blocks
   (default 2).
+`f90-associate-indent'
+  Extra indentation within associate blocks (default 2).
+`f90-critical-indent'
+  Extra indentation within critical/block blocks (default 2).
 `f90-continuation-indent'
   Extra indentation applied to continuation lines (default 5).
 `f90-comment-region'
@@ -10284,7 +10413,7 @@ result is a string that should be ready for the command line.
 ;;;***
 
 ;;;### (autoloads (find-grep-dired find-name-dired find-dired) "find-dired"
-;;;;;;  "find-dired.el" (19864 29553))
+;;;;;;  "find-dired.el" (19980 19797))
 ;;; Generated autoloads from find-dired.el
 
 (autoload 'find-dired "find-dired" "\
@@ -10418,7 +10547,7 @@ Visit the file you click on in another window.
 ;;;;;;  find-variable find-variable-noselect find-function-other-frame
 ;;;;;;  find-function-other-window find-function find-function-noselect
 ;;;;;;  find-function-search-for-symbol find-library) "find-func"
-;;;;;;  "emacs-lisp/find-func.el" (19845 45374))
+;;;;;;  "emacs-lisp/find-func.el" (19981 40664))
 ;;; Generated autoloads from emacs-lisp/find-func.el
 
 (autoload 'find-library "find-func" "\
@@ -10654,7 +10783,7 @@ to get the effect of a C-q.
 ;;;***
 
 ;;;### (autoloads (flymake-mode-off flymake-mode-on flymake-mode)
-;;;;;;  "flymake" "progmodes/flymake.el" (19890 42850))
+;;;;;;  "flymake" "progmodes/flymake.el" (19976 22732))
 ;;; Generated autoloads from progmodes/flymake.el
 
 (autoload 'flymake-mode "flymake" "\
@@ -10678,7 +10807,7 @@ Turn flymake mode off.
 
 ;;;### (autoloads (flyspell-buffer flyspell-region flyspell-mode-off
 ;;;;;;  turn-off-flyspell turn-on-flyspell flyspell-mode flyspell-prog-mode)
-;;;;;;  "flyspell" "textmodes/flyspell.el" (19931 11784))
+;;;;;;  "flyspell" "textmodes/flyspell.el" (19981 40664))
 ;;; Generated autoloads from textmodes/flyspell.el
 
 (autoload 'flyspell-prog-mode "flyspell" "\
@@ -10873,7 +11002,7 @@ Visit a file in Forms mode in other window.
 ;;;***
 
 ;;;### (autoloads (fortran-mode) "fortran" "progmodes/fortran.el"
-;;;;;;  (19905 10215))
+;;;;;;  (19956 37456))
 ;;; Generated autoloads from progmodes/fortran.el
 
 (autoload 'fortran-mode "fortran" "\
@@ -11208,7 +11337,7 @@ DEFAULT-MAP specifies the default key map for ICON-LIST.
 ;;;***
 
 ;;;### (autoloads (gnus gnus-other-frame gnus-slave gnus-no-server
-;;;;;;  gnus-slave-no-server) "gnus" "gnus/gnus.el" (19931 11784))
+;;;;;;  gnus-slave-no-server) "gnus" "gnus/gnus.el" (19978 37530))
 ;;; Generated autoloads from gnus/gnus.el
 (when (fboundp 'custom-autoload)
  (custom-autoload 'gnus-select-method "gnus"))
@@ -11261,7 +11390,7 @@ prompt the user for the name of an NNTP server to use.
 ;;;;;;  gnus-agent-get-undownloaded-list gnus-agent-delete-group
 ;;;;;;  gnus-agent-rename-group gnus-agent-possibly-save-gcc gnus-agentize
 ;;;;;;  gnus-slave-unplugged gnus-plugged gnus-unplugged) "gnus-agent"
-;;;;;;  "gnus/gnus-agent.el" (19903 54862))
+;;;;;;  "gnus/gnus-agent.el" (19953 61266))
 ;;; Generated autoloads from gnus/gnus-agent.el
 
 (autoload 'gnus-unplugged "gnus-agent" "\
@@ -11352,7 +11481,7 @@ If CLEAN, obsolete (ignore).
 ;;;***
 
 ;;;### (autoloads (gnus-article-prepare-display) "gnus-art" "gnus/gnus-art.el"
-;;;;;;  (19931 34253))
+;;;;;;  (19981 40664))
 ;;; Generated autoloads from gnus/gnus-art.el
 
 (autoload 'gnus-article-prepare-display "gnus-art" "\
@@ -11494,7 +11623,7 @@ Convenience method to turn on gnus-dired-mode.
 ;;;***
 
 ;;;### (autoloads (gnus-draft-reminder) "gnus-draft" "gnus/gnus-draft.el"
-;;;;;;  (19881 27850))
+;;;;;;  (19981 40664))
 ;;; Generated autoloads from gnus/gnus-draft.el
 
 (autoload 'gnus-draft-reminder "gnus-draft" "\
@@ -11506,8 +11635,8 @@ Reminder user if there are unsent drafts.
 
 ;;;### (autoloads (gnus-convert-png-to-face gnus-convert-face-to-png
 ;;;;;;  gnus-face-from-file gnus-x-face-from-file gnus-insert-random-x-face-header
-;;;;;;  gnus-random-x-face) "gnus-fun" "gnus/gnus-fun.el" (19845
-;;;;;;  45374))
+;;;;;;  gnus-random-x-face) "gnus-fun" "gnus/gnus-fun.el" (19980
+;;;;;;  19797))
 ;;; Generated autoloads from gnus/gnus-fun.el
 
 (autoload 'gnus-random-x-face "gnus-fun" "\
@@ -11570,7 +11699,7 @@ If gravatars are already displayed, remove them.
 ;;;***
 
 ;;;### (autoloads (gnus-fetch-group-other-frame gnus-fetch-group)
-;;;;;;  "gnus-group" "gnus/gnus-group.el" (19940 49234))
+;;;;;;  "gnus-group" "gnus/gnus-group.el" (19981 40664))
 ;;; Generated autoloads from gnus/gnus-group.el
 
 (autoload 'gnus-fetch-group "gnus-group" "\
@@ -11745,7 +11874,7 @@ Calling (gnus-group-split-fancy nil nil \"mail.others\") returns:
 ;;;***
 
 ;;;### (autoloads (gnus-button-reply gnus-button-mailto gnus-msg-mail)
-;;;;;;  "gnus-msg" "gnus/gnus-msg.el" (19845 45374))
+;;;;;;  "gnus-msg" "gnus/gnus-msg.el" (19978 37530))
 ;;; Generated autoloads from gnus/gnus-msg.el
 
 (autoload 'gnus-msg-mail "gnus-msg" "\
@@ -11866,7 +11995,7 @@ Add NUM into sorted LIST by side effect.
 ;;;***
 
 ;;;### (autoloads (gnus-registry-install-hooks gnus-registry-initialize)
-;;;;;;  "gnus-registry" "gnus/gnus-registry.el" (19942 4565))
+;;;;;;  "gnus-registry" "gnus/gnus-registry.el" (19976 22732))
 ;;; Generated autoloads from gnus/gnus-registry.el
 
 (autoload 'gnus-registry-initialize "gnus-registry" "\
@@ -11922,7 +12051,7 @@ Update the format specification near point.
 ;;;***
 
 ;;;### (autoloads (gnus-declare-backend) "gnus-start" "gnus/gnus-start.el"
-;;;;;;  (19906 31087))
+;;;;;;  (19953 61266))
 ;;; Generated autoloads from gnus/gnus-start.el
 
 (autoload 'gnus-declare-backend "gnus-start" "\
@@ -11933,7 +12062,7 @@ Declare back end NAME with ABILITIES as a Gnus back end.
 ;;;***
 
 ;;;### (autoloads (gnus-summary-bookmark-jump) "gnus-sum" "gnus/gnus-sum.el"
-;;;;;;  (19942 4565))
+;;;;;;  (19981 40664))
 ;;; Generated autoloads from gnus/gnus-sum.el
 
 (autoload 'gnus-summary-bookmark-jump "gnus-sum" "\
@@ -12056,7 +12185,7 @@ Retrieve MAIL-ADDRESS gravatar and returns it.
 
 ;;;### (autoloads (zrgrep rgrep lgrep grep-find grep grep-mode grep-compute-defaults
 ;;;;;;  grep-process-setup grep-setup-hook grep-find-command grep-command
-;;;;;;  grep-window-height) "grep" "progmodes/grep.el" (19930 13389))
+;;;;;;  grep-window-height) "grep" "progmodes/grep.el" (19980 19797))
 ;;; Generated autoloads from progmodes/grep.el
 
 (defvar grep-window-height nil "\
@@ -12332,7 +12461,7 @@ Variables: `handwrite-linespace'     (default 12)
 ;;;***
 
 ;;;### (autoloads (hanoi-unix-64 hanoi-unix hanoi) "hanoi" "play/hanoi.el"
-;;;;;;  (19889 21967))
+;;;;;;  (19981 40664))
 ;;; Generated autoloads from play/hanoi.el
 
 (autoload 'hanoi "hanoi" "\
@@ -12536,7 +12665,7 @@ different regions.  With numeric argument ARG, behaves like
 ;;;### (autoloads (doc-file-to-info doc-file-to-man describe-categories
 ;;;;;;  describe-syntax describe-variable variable-at-point describe-function-1
 ;;;;;;  find-lisp-object-file-name help-C-file-name describe-function)
-;;;;;;  "help-fns" "help-fns.el" (19938 7518))
+;;;;;;  "help-fns" "help-fns.el" (19977 43600))
 ;;; Generated autoloads from help-fns.el
 
 (autoload 'describe-function "help-fns" "\
@@ -12632,8 +12761,8 @@ gives the window that lists the options.")
 
 ;;;### (autoloads (help-xref-on-pp help-insert-xref-button help-xref-button
 ;;;;;;  help-make-xrefs help-buffer help-setup-xref help-mode-finish
-;;;;;;  help-mode-setup help-mode) "help-mode" "help-mode.el" (19886
-;;;;;;  45771))
+;;;;;;  help-mode-setup help-mode) "help-mode" "help-mode.el" (19958
+;;;;;;  33091))
 ;;; Generated autoloads from help-mode.el
 
 (autoload 'help-mode "help-mode" "\
@@ -13278,7 +13407,7 @@ argument VERBOSE non-nil makes the function verbose.
 ;;;***
 
 ;;;### (autoloads (global-hl-line-mode hl-line-mode) "hl-line" "hl-line.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19976 22732))
 ;;; Generated autoloads from hl-line.el
 
 (autoload 'hl-line-mode "hl-line" "\
@@ -13311,6 +13440,10 @@ or call the function `global-hl-line-mode'.")
 Global minor mode to highlight the line about point in the current window.
 With ARG, turn Global-Hl-Line mode on if ARG is positive, off otherwise.
 
+If `global-hl-line-sticky-flag' is non-nil, Global Hl-Line mode
+highlights the line about the current buffer's point in all
+windows.
+
 Global-Hl-Line mode uses the functions `global-hl-line-unhighlight' and
 `global-hl-line-highlight' on `pre-command-hook' and `post-command-hook'.
 
@@ -14215,12 +14348,12 @@ Toggle inline image minor mode.
 
 ;;;***
 
-;;;### (autoloads (imagemagick-register-types create-animated-image
-;;;;;;  defimage find-image remove-images insert-sliced-image insert-image
-;;;;;;  put-image create-image image-type-auto-detected-p image-type-available-p
+;;;### (autoloads (imagemagick-register-types defimage find-image
+;;;;;;  remove-images insert-sliced-image insert-image put-image
+;;;;;;  create-image image-type-auto-detected-p image-type-available-p
 ;;;;;;  image-type image-type-from-file-name image-type-from-file-header
 ;;;;;;  image-type-from-buffer image-type-from-data) "image" "image.el"
-;;;;;;  (19939 28373))
+;;;;;;  (19956 37456))
 ;;; Generated autoloads from image.el
 
 (autoload 'image-type-from-data "image" "\
@@ -14396,22 +14529,6 @@ Example:
 
 (put 'defimage 'doc-string-elt '3)
 
-(autoload 'create-animated-image "image" "\
-Create an animated image, and begin animating it.
-FILE-OR-DATA is an image file name or image data.
-Optional TYPE is a symbol describing the image type.  If TYPE is omitted
-or nil, try to determine the image type from its first few bytes
-of image data.  If that doesn't work, and FILE-OR-DATA is a file name,
-use its file extension as image type.
-Optional DATA-P non-nil means FILE-OR-DATA is a string containing image data.
-Optional PROPS are additional image attributes to assign to the image,
-like, e.g. `:mask MASK'.
-Value is the image created, or nil if images of type TYPE are not supported.
-
-Images should not be larger than specified by `max-image-size'.
-
-\(fn FILE-OR-DATA &optional TYPE DATA-P &rest PROPS)" nil nil)
-
 (autoload 'imagemagick-register-types "image" "\
 Register file types that can be handled by ImageMagick.
 This adds the file types returned by `imagemagick-types'
@@ -14632,7 +14749,7 @@ Image files are those whose name has an extension in
 ;;;***
 
 ;;;### (autoloads (image-bookmark-jump image-mode-as-text image-minor-mode
-;;;;;;  image-mode) "image-mode" "image-mode.el" (19939 28373))
+;;;;;;  image-mode) "image-mode" "image-mode.el" (19951 19539))
 ;;; Generated autoloads from image-mode.el
 
 (autoload 'image-mode "image-mode" "\
@@ -14890,7 +15007,7 @@ of `inferior-lisp-program').  Runs the hooks from
 ;;;;;;  Info-goto-emacs-key-command-node Info-goto-emacs-command-node
 ;;;;;;  Info-mode info-finder info-apropos Info-index Info-directory
 ;;;;;;  Info-on-current-buffer info-standalone info-emacs-manual
-;;;;;;  info info-other-window) "info" "info.el" (19867 52471))
+;;;;;;  info info-other-window) "info" "info.el" (19967 7755))
 ;;; Generated autoloads from info.el
 
 (autoload 'info-other-window "info" "\
@@ -15616,8 +15733,8 @@ You can bind this to the key C-c i in GNUS or mail by adding to
 
 ;;;***
 
-;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (19931
-;;;;;;  11784))
+;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (19946
+;;;;;;  29209))
 ;;; Generated autoloads from iswitchb.el
 
 (defvar iswitchb-mode nil "\
@@ -15743,7 +15860,7 @@ by `jka-compr-installed'.
 
 ;;;***
 
-;;;### (autoloads (js-mode) "js" "progmodes/js.el" (19914 25180))
+;;;### (autoloads (js-mode) "js" "progmodes/js.el" (19981 40664))
 ;;; Generated autoloads from progmodes/js.el
 
 (autoload 'js-mode "js" "\
@@ -16131,7 +16248,7 @@ use either \\[customize] or the function `latin1-display'.")
 ;;;***
 
 ;;;### (autoloads (ld-script-mode) "ld-script" "progmodes/ld-script.el"
-;;;;;;  (19917 1372))
+;;;;;;  (19961 55377))
 ;;; Generated autoloads from progmodes/ld-script.el
 
 (autoload 'ld-script-mode "ld-script" "\
@@ -16229,8 +16346,8 @@ See `linum-mode' for more information on Linum mode.
 
 ;;;***
 
-;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (19845
-;;;;;;  45374))
+;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (19975
+;;;;;;  1875))
 ;;; Generated autoloads from loadhist.el
 
 (autoload 'unload-feature "loadhist" "\
@@ -16341,8 +16458,8 @@ uses the current buffer.
 
 ;;;***
 
-;;;### (autoloads (log-view-mode) "log-view" "vc/log-view.el" (19863
-;;;;;;  8742))
+;;;### (autoloads (log-view-mode) "log-view" "vc/log-view.el" (19946
+;;;;;;  1612))
 ;;; Generated autoloads from vc/log-view.el
 
 (autoload 'log-view-mode "log-view" "\
@@ -16746,8 +16863,8 @@ matches may be returned from the message body.
 ;;;***
 
 ;;;### (autoloads (define-mail-abbrev build-mail-abbrevs mail-abbrevs-setup
-;;;;;;  mail-abbrevs-mode) "mailabbrev" "mail/mailabbrev.el" (19845
-;;;;;;  45374))
+;;;;;;  mail-abbrevs-mode) "mailabbrev" "mail/mailabbrev.el" (19968
+;;;;;;  28627))
 ;;; Generated autoloads from mail/mailabbrev.el
 
 (defvar mail-abbrevs-mode nil "\
@@ -16856,7 +16973,7 @@ The mail client is taken to be the handler of mailto URLs.
 
 ;;;### (autoloads (makefile-imake-mode makefile-bsdmake-mode makefile-makepp-mode
 ;;;;;;  makefile-gmake-mode makefile-automake-mode makefile-mode)
-;;;;;;  "make-mode" "progmodes/make-mode.el" (19890 42850))
+;;;;;;  "make-mode" "progmodes/make-mode.el" (19968 28627))
 ;;; Generated autoloads from progmodes/make-mode.el
 
 (autoload 'makefile-mode "make-mode" "\
@@ -17094,7 +17211,7 @@ Returns non-nil if the new state is enabled.
 ;;;;;;  message-forward-make-body message-forward message-recover
 ;;;;;;  message-supersede message-cancel-news message-followup message-wide-reply
 ;;;;;;  message-reply message-news message-mail message-mode) "message"
-;;;;;;  "gnus/message.el" (19940 49234))
+;;;;;;  "gnus/message.el" (19980 19797))
 ;;; Generated autoloads from gnus/message.el
 
 (define-mail-user-agent 'message-user-agent 'message-mail 'message-send-and-exit 'message-kill-buffer 'message-send-hook)
@@ -17260,7 +17377,7 @@ which specify the range to operate on.
 ;;;***
 
 ;;;### (autoloads (metapost-mode metafont-mode) "meta-mode" "progmodes/meta-mode.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19968 28627))
 ;;; Generated autoloads from progmodes/meta-mode.el
 
 (autoload 'metafont-mode "meta-mode" "\
@@ -17566,7 +17683,7 @@ Returns non-nil if the new state is enabled.
 ;;;***
 
 ;;;### (autoloads (list-dynamic-libraries butterfly) "misc" "misc.el"
-;;;;;;  (19913 4309))
+;;;;;;  (19968 28627))
 ;;; Generated autoloads from misc.el
 
 (autoload 'butterfly "misc" "\
@@ -17678,7 +17795,7 @@ whose file names match the specified wildcard.
 ;;;***
 
 ;;;### (autoloads (mixal-mode) "mixal-mode" "progmodes/mixal-mode.el"
-;;;;;;  (19931 11784))
+;;;;;;  (19961 55377))
 ;;; Generated autoloads from progmodes/mixal-mode.el
 
 (autoload 'mixal-mode "mixal-mode" "\
@@ -17776,7 +17893,7 @@ Assume text has been decoded if DECODED is non-nil.
 
 ;;;### (autoloads (mml2015-self-encrypt mml2015-sign mml2015-encrypt
 ;;;;;;  mml2015-verify-test mml2015-verify mml2015-decrypt-test mml2015-decrypt)
-;;;;;;  "mml2015" "gnus/mml2015.el" (19845 45374))
+;;;;;;  "mml2015" "gnus/mml2015.el" (19981 40664))
 ;;; Generated autoloads from gnus/mml2015.el
 
 (autoload 'mml2015-decrypt "mml2015" "\
@@ -17977,7 +18094,7 @@ primary selection and region.
 
 ;;;***
 
-;;;### (autoloads (mpc) "mpc" "mpc.el" (19863 8742))
+;;;### (autoloads (mpc) "mpc" "mpc.el" (19946 1612))
 ;;; Generated autoloads from mpc.el
 
 (autoload 'mpc "mpc" "\
@@ -18410,7 +18527,7 @@ listed in the PORTS list.
 ;;;***
 
 ;;;### (autoloads (open-network-stream) "network-stream" "net/network-stream.el"
-;;;;;;  (19906 31087))
+;;;;;;  (19976 22732))
 ;;; Generated autoloads from net/network-stream.el
 
 (autoload 'open-network-stream "network-stream" "\
@@ -18474,8 +18591,22 @@ values:
   capability command, and should return the command to switch on
   STARTTLS if the server supports STARTTLS, and nil otherwise.
 
+:always-query-capabilies says whether to query the server for
+  capabilities, even if we're doing a `plain' network connection.
+
+:client-certificate should either be a list where the first
+  element is the certificate key file name, and the second
+  element is the certificate file name itself, or `t', which
+  means that `auth-source' will be queried for the key and the
+  certificate.  This parameter will only be used when doing TLS
+  or STARTTLS connections.
+
+If :use-starttls-if-possible is non-nil, do opportunistic
+STARTTLS upgrades even if Emacs doesn't have built-in TLS
+functionality.
+
 :nowait is a boolean that says the connection should be made
-asynchronously, if possible.
+  asynchronously, if possible.
 
 \(fn NAME BUFFER HOST SERVICE &rest PARAMETERS)" nil nil)
 
@@ -19218,7 +19349,7 @@ exported source code blocks by language.
 ;;;***
 
 ;;;### (autoloads (inferior-octave) "octave-inf" "progmodes/octave-inf.el"
-;;;;;;  (19894 39890))
+;;;;;;  (19968 28627))
 ;;; Generated autoloads from progmodes/octave-inf.el
 
 (autoload 'inferior-octave "octave-inf" "\
@@ -19241,7 +19372,7 @@ startup file, `~/.emacs-octave'.
 ;;;***
 
 ;;;### (autoloads (octave-mode) "octave-mod" "progmodes/octave-mod.el"
-;;;;;;  (19894 39890))
+;;;;;;  (19968 28627))
 ;;; Generated autoloads from progmodes/octave-mod.el
 
 (autoload 'octave-mode "octave-mod" "\
@@ -20979,16 +21110,16 @@ unknown are returned as nil.
 
 ;;;***
 
-;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (19899
-;;;;;;  57784))
+;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (19968
+;;;;;;  28627))
 ;;; Generated autoloads from progmodes/pascal.el
 
 (autoload 'pascal-mode "pascal" "\
 Major mode for editing Pascal code. \\<pascal-mode-map>
 TAB indents for Pascal code.  Delete converts tabs to spaces as it moves back.
 
-\\[pascal-complete-word] completes the word around current point with respect to position in code
-\\[pascal-show-completions] shows all possible completions at this point.
+\\[completion-at-point] completes the word around current point with respect to position in code
+\\[completion-help-at-point] shows all possible completions at this point.
 
 Other useful functions are:
 
@@ -21174,8 +21305,8 @@ Completion for GNU/Linux `mount'.
 
 ;;;***
 
-;;;### (autoloads (pcomplete/rpm) "pcmpl-rpm" "pcmpl-rpm.el" (19845
-;;;;;;  45374))
+;;;### (autoloads (pcomplete/rpm) "pcmpl-rpm" "pcmpl-rpm.el" (19961
+;;;;;;  55377))
 ;;; Generated autoloads from pcmpl-rpm.el
 
 (autoload 'pcomplete/rpm "pcmpl-rpm" "\
@@ -21244,8 +21375,8 @@ Includes files as well as host names followed by a colon.
 
 ;;;### (autoloads (pcomplete-shell-setup pcomplete-comint-setup pcomplete-list
 ;;;;;;  pcomplete-help pcomplete-expand pcomplete-continue pcomplete-expand-and-complete
-;;;;;;  pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (19931
-;;;;;;  11784))
+;;;;;;  pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (19964
+;;;;;;  31562))
 ;;; Generated autoloads from pcomplete.el
 
 (autoload 'pcomplete "pcomplete" "\
@@ -21529,6 +21660,17 @@ they are not defaultly assigned to keys.
 
 ;;;***
 
+;;;### (autoloads (plstore-open) "plstore" "gnus/plstore.el" (19981
+;;;;;;  40664))
+;;; Generated autoloads from gnus/plstore.el
+
+(autoload 'plstore-open "plstore" "\
+Create a plstore instance associated with FILE.
+
+\(fn FILE)" nil nil)
+
+;;;***
+
 ;;;### (autoloads (po-find-file-coding-system) "po" "textmodes/po.el"
 ;;;;;;  (19845 45374))
 ;;; Generated autoloads from textmodes/po.el
@@ -22225,7 +22367,7 @@ are both set to t.
 
 ;;;***
 
-;;;### (autoloads (proced) "proced" "proced.el" (19886 45771))
+;;;### (autoloads (proced) "proced" "proced.el" (19975 1875))
 ;;; Generated autoloads from proced.el
 
 (autoload 'proced "proced" "\
@@ -22288,8 +22430,8 @@ The default value is '(\"/usr/local/share/emacs/fonts/bdf\").")
 
 ;;;***
 
-;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (19890
-;;;;;;  42850))
+;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (19961
+;;;;;;  55377))
 ;;; Generated autoloads from progmodes/ps-mode.el
 
 (autoload 'ps-mode "ps-mode" "\
@@ -22537,8 +22679,8 @@ If EXTENSION is any other symbol, it is ignored.
 
 ;;;***
 
-;;;### (autoloads (jython-mode python-mode run-python) "python" "progmodes/python.el"
-;;;;;;  (19931 11784))
+;;;### (autoloads (jython-mode python-mode python-after-info-look
+;;;;;;  run-python) "python" "progmodes/python.el" (19975 1875))
 ;;; Generated autoloads from progmodes/python.el
 
 (add-to-list 'interpreter-mode-alist (cons (purecopy "jython") 'jython-mode))
@@ -22570,6 +22712,12 @@ behavior, change `python-remove-cwd-from-path' to nil.
 
 \(fn &optional CMD NOSHOW NEW)" t nil)
 
+(autoload 'python-after-info-look "python" "\
+Set up info-look for Python.
+Used with `eval-after-load'.
+
+\(fn)" nil nil)
+
 (autoload 'python-mode "python" "\
 Major mode for editing Python files.
 Turns on Font Lock mode unconditionally since it is currently required
@@ -22641,7 +22789,7 @@ them into characters should be done separately.
 ;;;;;;  quail-defrule quail-install-decode-map quail-install-map
 ;;;;;;  quail-define-rules quail-show-keyboard-layout quail-set-keyboard-layout
 ;;;;;;  quail-define-package quail-use-package quail-title) "quail"
-;;;;;;  "international/quail.el" (19931 11784))
+;;;;;;  "international/quail.el" (19943 25429))
 ;;; Generated autoloads from international/quail.el
 
 (autoload 'quail-title "quail" "\
@@ -22945,7 +23093,7 @@ Display `quickurl-list' as a formatted list using `quickurl-list-mode'.
 ;;;***
 
 ;;;### (autoloads (rcirc-track-minor-mode rcirc-connect rcirc) "rcirc"
-;;;;;;  "net/rcirc.el" (19942 4565))
+;;;;;;  "net/rcirc.el" (19968 28627))
 ;;; Generated autoloads from net/rcirc.el
 
 (autoload 'rcirc "rcirc" "\
@@ -22993,7 +23141,7 @@ See \\[compile].
 ;;;***
 
 ;;;### (autoloads (re-builder) "re-builder" "emacs-lisp/re-builder.el"
-;;;;;;  (19938 7518))
+;;;;;;  (19975 1875))
 ;;; Generated autoloads from emacs-lisp/re-builder.el
 
 (defalias 'regexp-builder 're-builder)
@@ -23322,7 +23470,7 @@ Here are all local bindings.
 ;;;***
 
 ;;;### (autoloads (reftex-all-document-files) "reftex-parse" "textmodes/reftex-parse.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19980 19797))
 ;;; Generated autoloads from textmodes/reftex-parse.el
 
 (autoload 'reftex-all-document-files "reftex-parse" "\
@@ -23407,7 +23555,7 @@ Extract diary entries from the region.
 
 ;;;***
 
-;;;### (autoloads (repeat) "repeat" "repeat.el" (19845 45374))
+;;;### (autoloads (repeat) "repeat" "repeat.el" (19951 19539))
 ;;; Generated autoloads from repeat.el
 
 (autoload 'repeat "repeat" "\
@@ -23589,7 +23737,7 @@ variable.
 ;;;;;;  rmail-secondary-file-directory rmail-primary-inbox-list rmail-highlighted-headers
 ;;;;;;  rmail-retry-ignored-headers rmail-displayed-headers rmail-ignored-headers
 ;;;;;;  rmail-user-mail-address-regexp rmail-movemail-variant-p)
-;;;;;;  "rmail" "mail/rmail.el" (19845 45374))
+;;;;;;  "rmail" "mail/rmail.el" (19976 23054))
 ;;; Generated autoloads from mail/rmail.el
 
 (autoload 'rmail-movemail-variant-p "rmail" "\
@@ -23642,7 +23790,7 @@ If nil, display all header fields except those matched by
 
 (custom-autoload 'rmail-displayed-headers "rmail" t)
 
-(defvar rmail-retry-ignored-headers (purecopy "^x-authentication-warning:\\|^x-detected-operating-system:\\|^x-spam[-a-z]*:\\|content-type:\\|content-transfer-encoding:\\|mime-version:") "\
+(defvar rmail-retry-ignored-headers (purecopy "^x-authentication-warning:\\|^x-detected-operating-system:\\|^x-spam[-a-z]*:\\|content-type:\\|content-transfer-encoding:\\|mime-version:\\|message-id:") "\
 Headers that should be stripped when retrying a failed message.")
 
 (custom-autoload 'rmail-retry-ignored-headers "rmail" t)
@@ -24068,8 +24216,8 @@ In Ruler mode, Emacs displays a ruler in the header line.
 
 ;;;***
 
-;;;### (autoloads (rx rx-to-string) "rx" "emacs-lisp/rx.el" (19845
-;;;;;;  45374))
+;;;### (autoloads (rx rx-to-string) "rx" "emacs-lisp/rx.el" (19965
+;;;;;;  52428))
 ;;; Generated autoloads from emacs-lisp/rx.el
 
 (autoload 'rx-to-string "rx" "\
@@ -24299,6 +24447,11 @@ CHAR
      like `and', but makes the match accessible with `match-end',
      `match-beginning', and `match-string'.
 
+`(submatch-n N SEXP1 SEXP2 ...)'
+`(group-n N SEXP1 SEXP2 ...)'
+     like `group', but make it an explicitly-numbered group with
+     group number N.
+
 `(or SEXP1 SEXP2 ...)'
 `(| SEXP1 SEXP2 ...)'
      matches anything that matches SEXP1 or SEXP2, etc.  If all
@@ -24505,7 +24658,7 @@ during scrolling.
 ;;;***
 
 ;;;### (autoloads (semantic-mode semantic-default-submodes) "semantic"
-;;;;;;  "cedet/semantic.el" (19845 45374))
+;;;;;;  "cedet/semantic.el" (19981 40664))
 ;;; Generated autoloads from cedet/semantic.el
 
 (defvar semantic-default-submodes '(global-semantic-idle-scheduler-mode global-semanticdb-minor-mode) "\
@@ -24556,7 +24709,7 @@ Semantic mode.
 ;;;;;;  mail-yank-prefix mail-setup-hook mail-personal-alias-file
 ;;;;;;  mail-default-reply-to mail-archive-file-name mail-header-separator
 ;;;;;;  send-mail-function mail-interactive mail-self-blind mail-specify-envelope-from
-;;;;;;  mail-from-style) "sendmail" "mail/sendmail.el" (19935 31309))
+;;;;;;  mail-from-style) "sendmail" "mail/sendmail.el" (19980 19797))
 ;;; Generated autoloads from mail/sendmail.el
 
 (defvar mail-from-style 'default "\
@@ -24835,8 +24988,8 @@ Like `mail' command, but display mail buffer in another frame.
 ;;;***
 
 ;;;### (autoloads (server-save-buffers-kill-terminal server-mode
-;;;;;;  server-force-delete server-start) "server" "server.el" (19902
-;;;;;;  34006))
+;;;;;;  server-force-delete server-start) "server" "server.el" (19975
+;;;;;;  1875))
 ;;; Generated autoloads from server.el
 
 (put 'server-host 'risky-local-variable t)
@@ -24899,7 +25052,7 @@ only these files will be asked to be saved.
 
 ;;;***
 
-;;;### (autoloads (ses-mode) "ses" "ses.el" (19845 45374))
+;;;### (autoloads (ses-mode) "ses" "ses.el" (19980 19797))
 ;;; Generated autoloads from ses.el
 
 (autoload 'ses-mode "ses" "\
@@ -25139,7 +25292,7 @@ Set up file shadowing.
 ;;;***
 
 ;;;### (autoloads (shell shell-dumb-shell-regexp) "shell" "shell.el"
-;;;;;;  (19935 983))
+;;;;;;  (19964 31562))
 ;;; Generated autoloads from shell.el
 
 (defvar shell-dumb-shell-regexp (purecopy "cmd\\(proxy\\)?\\.exe") "\
@@ -25188,8 +25341,8 @@ Otherwise, one argument `-i' is passed to the shell.
 
 ;;;***
 
-;;;### (autoloads (shr-insert-document) "shr" "gnus/shr.el" (19942
-;;;;;;  4565))
+;;;### (autoloads (shr-insert-document) "shr" "gnus/shr.el" (19976
+;;;;;;  22732))
 ;;; Generated autoloads from gnus/shr.el
 
 (autoload 'shr-insert-document "shr" "\
@@ -25396,7 +25549,7 @@ symmetrical ones, and the same character twice for the others.
 ;;;***
 
 ;;;### (autoloads (smerge-start-session smerge-mode smerge-ediff)
-;;;;;;  "smerge-mode" "vc/smerge-mode.el" (19931 11784))
+;;;;;;  "smerge-mode" "vc/smerge-mode.el" (19946 1612))
 ;;; Generated autoloads from vc/smerge-mode.el
 
 (autoload 'smerge-ediff "smerge-mode" "\
@@ -25439,7 +25592,7 @@ interactively.  If there's no argument, do it at the current buffer.
 ;;;***
 
 ;;;### (autoloads (smtpmail-send-queued-mail smtpmail-send-it) "smtpmail"
-;;;;;;  "mail/smtpmail.el" (19940 49234))
+;;;;;;  "mail/smtpmail.el" (19978 37530))
 ;;; Generated autoloads from mail/smtpmail.el
 
 (autoload 'smtpmail-send-it "smtpmail" "\
@@ -25745,8 +25898,8 @@ From a program takes two point or marker arguments, BEG and END.
 
 ;;;***
 
-;;;### (autoloads (spam-initialize) "spam" "gnus/spam.el" (19867
-;;;;;;  52471))
+;;;### (autoloads (spam-initialize) "spam" "gnus/spam.el" (19976
+;;;;;;  22732))
 ;;; Generated autoloads from gnus/spam.el
 
 (autoload 'spam-initialize "spam" "\
@@ -27306,7 +27459,7 @@ Connect to the Emacs talk group from the current X display or tty frame.
 
 ;;;***
 
-;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (19886 45771))
+;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (19977 43600))
 ;;; Generated autoloads from tar-mode.el
 
 (autoload 'tar-mode "tar-mode" "\
@@ -27486,7 +27639,7 @@ subprocess started.
 ;;;***
 
 ;;;### (autoloads (testcover-this-defun) "testcover" "emacs-lisp/testcover.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19943 25429))
 ;;; Generated autoloads from emacs-lisp/testcover.el
 
 (autoload 'testcover-this-defun "testcover" "\
@@ -27984,7 +28137,7 @@ Compose Thai characters in the current buffer.
 
 ;;;### (autoloads (list-at-point number-at-point symbol-at-point
 ;;;;;;  sexp-at-point thing-at-point bounds-of-thing-at-point forward-thing)
-;;;;;;  "thingatpt" "thingatpt.el" (19918 22236))
+;;;;;;  "thingatpt" "thingatpt.el" (19980 19797))
 ;;; Generated autoloads from thingatpt.el
 
 (autoload 'forward-thing "thingatpt" "\
@@ -28402,7 +28555,7 @@ With ARG, turn time stamping on if and only if arg is positive.
 ;;;;;;  timeclock-workday-remaining-string timeclock-reread-log timeclock-query-out
 ;;;;;;  timeclock-change timeclock-status-string timeclock-out timeclock-in
 ;;;;;;  timeclock-modeline-display) "timeclock" "calendar/timeclock.el"
-;;;;;;  (19909 7240))
+;;;;;;  (19981 40664))
 ;;; Generated autoloads from calendar/timeclock.el
 
 (autoload 'timeclock-modeline-display "timeclock" "\
@@ -28808,7 +28961,7 @@ BUFFER defaults to `trace-buffer'.
 ;;;### (autoloads (tramp-unload-tramp tramp-completion-handle-file-name-completion
 ;;;;;;  tramp-completion-handle-file-name-all-completions tramp-unload-file-name-handlers
 ;;;;;;  tramp-file-name-handler tramp-syntax tramp-mode) "tramp"
-;;;;;;  "net/tramp.el" (19924 47209))
+;;;;;;  "net/tramp.el" (19981 40664))
 ;;; Generated autoloads from net/tramp.el
 
 (defvar tramp-mode t "\
@@ -28946,7 +29099,7 @@ Discard Tramp from loading remote files.
 ;;;***
 
 ;;;### (autoloads (tramp-ftp-enable-ange-ftp) "tramp-ftp" "net/tramp-ftp.el"
-;;;;;;  (19931 11784))
+;;;;;;  (19946 29209))
 ;;; Generated autoloads from net/tramp-ftp.el
 
 (autoload 'tramp-ftp-enable-ange-ftp "tramp-ftp" "\
@@ -29044,7 +29197,7 @@ First column's text    sSs  Second column's text
 ;;;;;;  type-break type-break-mode type-break-keystroke-threshold
 ;;;;;;  type-break-good-break-interval type-break-good-rest-interval
 ;;;;;;  type-break-interval type-break-mode) "type-break" "type-break.el"
-;;;;;;  (19919 43103))
+;;;;;;  (19981 40664))
 ;;; Generated autoloads from type-break.el
 
 (defvar type-break-mode nil "\
@@ -29805,7 +29958,7 @@ Setup variables that expose info about you and your system.
 ;;;***
 
 ;;;### (autoloads (url-queue-retrieve) "url-queue" "url/url-queue.el"
-;;;;;;  (19942 4565))
+;;;;;;  (19943 25429))
 ;;; Generated autoloads from url/url-queue.el
 
 (autoload 'url-queue-retrieve "url-queue" "\
@@ -30057,8 +30210,8 @@ If FILE-NAME is non-nil, save the result to FILE-NAME.
 ;;;;;;  vc-print-log vc-retrieve-tag vc-create-tag vc-merge vc-insert-headers
 ;;;;;;  vc-revision-other-window vc-root-diff vc-ediff vc-version-ediff
 ;;;;;;  vc-diff vc-version-diff vc-register vc-next-action vc-before-checkin-hook
-;;;;;;  vc-checkin-hook vc-checkout-hook) "vc" "vc/vc.el" (19888
-;;;;;;  1100))
+;;;;;;  vc-checkin-hook vc-checkout-hook) "vc" "vc/vc.el" (19976
+;;;;;;  22732))
 ;;; Generated autoloads from vc/vc.el
 
 (defvar vc-checkout-hook nil "\
@@ -30601,7 +30754,7 @@ Key bindings:
 ;;;***
 
 ;;;### (autoloads (verilog-mode) "verilog-mode" "progmodes/verilog-mode.el"
-;;;;;;  (19931 11784))
+;;;;;;  (19973 46551))
 ;;; Generated autoloads from progmodes/verilog-mode.el
 
 (autoload 'verilog-mode "verilog-mode" "\
@@ -31382,7 +31535,7 @@ Convert Vietnamese characters of the current buffer to `VIQR' mnemonics.
 ;;;;;;  view-mode view-buffer-other-frame view-buffer-other-window
 ;;;;;;  view-buffer view-file-other-frame view-file-other-window
 ;;;;;;  view-file kill-buffer-if-not-modified view-remove-frame-by-deleting)
-;;;;;;  "view" "view.el" (19886 45771))
+;;;;;;  "view" "view.el" (19958 33091))
 ;;; Generated autoloads from view.el
 
 (defvar view-remove-frame-by-deleting t "\
@@ -31469,15 +31622,16 @@ EXIT-ACTION to `kill-buffer-if-not-modified' avoids this.
 
 (autoload 'view-buffer-other-window "view" "\
 View BUFFER in View mode in another window.
-Return to previous buffer when done, unless optional NOT-RETURN is
-non-nil.  Emacs commands editing the buffer contents are not available;
-instead, a special set of commands (mostly letters and punctuation) are
-defined for moving around in the buffer.
+Emacs commands editing the buffer contents are not available;
+instead, a special set of commands (mostly letters and
+punctuation) are defined for moving around in the buffer.
 Space scrolls forward, Delete scrolls backward.
 For a list of all View commands, type H or h while viewing.
 
 This command runs the normal hook `view-mode-hook'.
 
+Optional argument NOT-RETURN is ignored.
+
 Optional argument EXIT-ACTION is either nil or a function with buffer as
 argument.  This function is called when finished viewing buffer.  Use
 this argument instead of explicitly setting `view-exit-action'.
@@ -31486,15 +31640,16 @@ this argument instead of explicitly setting `view-exit-action'.
 
 (autoload 'view-buffer-other-frame "view" "\
 View BUFFER in View mode in another frame.
-Return to previous buffer when done, unless optional NOT-RETURN is
-non-nil.  Emacs commands editing the buffer contents are not available;
-instead, a special set of commands (mostly letters and punctuation) are
-defined for moving around in the buffer.
+Emacs commands editing the buffer contents are not available;
+instead, a special set of commands (mostly letters and
+punctuation) are defined for moving around in the buffer.
 Space scrolls forward, Delete scrolls backward.
 For a list of all View commands, type H or h while viewing.
 
 This command runs the normal hook `view-mode-hook'.
 
+Optional argument NOT-RETURN is ignored.
+
 Optional argument EXIT-ACTION is either nil or a function with buffer as
 argument.  This function is called when finished viewing buffer.  Use
 this argument instead of explicitly setting `view-exit-action'.
@@ -31595,31 +31750,20 @@ entry for the selected window, purge that entry from
 
 (autoload 'view-mode-enter "view" "\
 Enter View mode and set up exit from view mode depending on optional arguments.
-RETURN-TO non-nil means add RETURN-TO as an element to the buffer
-local alist `view-return-to-alist'.  Save EXIT-ACTION in buffer
-local variable `view-exit-action'.  It should be either nil or a
+Optional argument QUIT-RESTORE if non-nil must specify a valid
+entry for quitting and restoring any window showing the current
+buffer.  This entry replaces any parameter installed by
+`display-buffer' and is used by `view-mode-exit'.
+
+Optional argument EXIT-ACTION, if non-nil, must specify a
 function that takes a buffer as argument.  This function will be
 called by `view-mode-exit'.
 
-RETURN-TO is either nil, meaning do nothing when exiting view
-mode, or must have the format (WINDOW OLD-WINDOW . OLD-BUF-INFO).
-WINDOW is the window used for viewing.  OLD-WINDOW is nil or the
-window to select after viewing.  OLD-BUF-INFO tells what to do
-with WINDOW when exiting.  It is one of:
-1) nil            Do nothing.
-2) t              Delete WINDOW or, if it is the only window and
-                  `view-remove-frame-by-deleting' is non-nil, its
-                  frame.
-3) (OLD-BUFF START POINT)  Display buffer OLD-BUFF with displayed text
-                  starting at START and point at POINT in WINDOW.
-4) quit-window    Do `quit-window' in WINDOW.
-5) keep-frame     Like case 2) but do not delete the frame.
-
 For a list of all View commands, type H or h while viewing.
 
 This function runs the normal hook `view-mode-hook'.
 
-\(fn &optional RETURN-TO EXIT-ACTION)" nil nil)
+\(fn &optional QUIT-RESTORE EXIT-ACTION)" nil nil)
 
 (autoload 'View-exit-and-edit "view" "\
 Exit View mode and make the current buffer editable.
@@ -32246,8 +32390,8 @@ With arg, turn widget mode on if and only if arg is positive.
 ;;;***
 
 ;;;### (autoloads (widget-setup widget-insert widget-delete widget-create
-;;;;;;  widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (19927
-;;;;;;  37225))
+;;;;;;  widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (19968
+;;;;;;  28627))
 ;;; Generated autoloads from wid-edit.el
 
 (autoload 'widgetp "wid-edit" "\
@@ -32363,7 +32507,7 @@ With arg, turn Winner mode on if and only if arg is positive.
 ;;;***
 
 ;;;### (autoloads (woman-bookmark-jump woman-find-file woman-dired-find-file
-;;;;;;  woman woman-locale) "woman" "woman.el" (19886 45771))
+;;;;;;  woman woman-locale) "woman" "woman.el" (19981 40664))
 ;;; Generated autoloads from woman.el
 
 (defvar woman-locale nil "\
@@ -32872,7 +33016,7 @@ Zone out, completely.
 ;;;;;;  "vc/ediff-ptch.el" "vc/ediff-vers.el" "vc/ediff-wind.el"
 ;;;;;;  "vc/pcvs-info.el" "vc/pcvs-parse.el" "vc/pcvs-util.el" "vc/vc-dav.el"
 ;;;;;;  "vcursor.el" "vt-control.el" "vt100-led.el" "w32-fns.el"
-;;;;;;  "w32-vars.el" "x-dnd.el") (19942 4644 183664))
+;;;;;;  "w32-vars.el" "x-dnd.el") (19981 41048 99944))
 
 ;;;***
 
diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index 943eac42b02..0b569199935 100644
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -115,20 +115,28 @@ from a file."
 (defvaralias 'loadhist-hook-functions 'unload-feature-special-hooks)
 (defvar unload-feature-special-hooks
   '(after-change-functions after-insert-file-functions
-    after-make-frame-functions auto-fill-function before-change-functions
+    after-make-frame-functions auto-coding-functions
+    auto-fill-function before-change-functions
     blink-paren-function buffer-access-fontify-functions
-    choose-completion-string-functions comint-output-filter-functions
-    command-line-functions comment-indent-function compilation-finish-functions
+    choose-completion-string-functions
+    comint-output-filter-functions command-line-functions
+    comment-indent-function compilation-finish-functions
     delete-frame-functions disabled-command-function
-    find-file-not-found-functions font-lock-beginning-of-syntax-function
-    font-lock-fontify-buffer-function font-lock-fontify-region-function
-    font-lock-mark-block-function font-lock-syntactic-face-function
-    font-lock-unfontify-buffer-function font-lock-unfontify-region-function
-    kill-buffer-query-functions kill-emacs-query-functions lisp-indent-function
-    mouse-position-function redisplaylay-end-trigger-functions
-    suspend-tty-functions temp-buffer-show-function window-scroll-functions
-    window-size-change-functions write-contents-functions write-file-functions
-    write-region-annotate-functions)
+    fill-nobreak-predicate find-directory-functions
+    find-file-not-found-functions
+    font-lock-beginning-of-syntax-function
+    font-lock-fontify-buffer-function
+    font-lock-fontify-region-function
+    font-lock-mark-block-function
+    font-lock-syntactic-face-function
+    font-lock-unfontify-buffer-function
+    font-lock-unfontify-region-function
+    kill-buffer-query-functions kill-emacs-query-functions
+    lisp-indent-function mouse-position-function
+    redisplaylay-end-trigger-functions suspend-tty-functions
+    temp-buffer-show-function window-scroll-functions
+    window-size-change-functions write-contents-functions
+    write-file-functions write-region-annotate-functions)
   "A list of special hooks from Info node `(elisp)Standard Hooks'.
 
 These are symbols with hooklike values whose names don't end in
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 4c677523689..792827dd913 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -123,11 +123,11 @@
 ;; multilingual text.
 (load "international/mule-cmds")
 (load "case-table")
-(load "international/characters")
-(load "composite")
 ;; This file doesn't exist when building a development version of Emacs
 ;; from the repository.  It is generated just after temacs is built.
 (load "international/charprop.el" t)
+(load "international/characters")
+(load "composite")
 
 ;; Load language-specific files.
 (load "language/chinese")
diff --git a/lisp/longlines.el b/lisp/longlines.el
index 387ce394f50..e81a235a17b 100644
--- a/lisp/longlines.el
+++ b/lisp/longlines.el
@@ -95,11 +95,15 @@ This is used when `longlines-show-hard-newlines' is on."
 
 ;;;###autoload
 (define-minor-mode longlines-mode
-  "Toggle Long Lines mode.
+  "Minor mode to wrap long lines.
 In Long Lines mode, long lines are wrapped if they extend beyond
 `fill-column'.  The soft newlines used for line wrapping will not
 show up when the text is yanked or saved to disk.
 
+With no argument, this command toggles Flyspell mode.
+With a prefix argument ARG, turn Flyspell minor mode on if ARG is positive,
+otherwise turn it off.
+
 If the variable `longlines-auto-wrap' is non-nil, lines are automatically
 wrapped whenever the buffer is changed.  You can always call
 `fill-paragraph' to fill individual paragraphs.
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index 934637ecbbd..f4b29958aab 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -351,7 +351,7 @@
 ;;           systems with non-classic /bin/[r]mail behavior
 ;;         guard against nil user-mail-address in generating MESSAGE-ID:
 ;;         feedmail-queue-slug-suspect-regexp is now a variable to
-;;           accomodate non-ASCII environments (thanks to
+;;           accommodate non-ASCII environments (thanks to
 ;;           Makoto.Nakagawa@jp.compaq.com for this suggestion)
 ;;         feedmail-buffer-to-smtp, to parallel feedmail-buffer-to-smtpmail
 ;; patchlevel 10, 22 April 2001
@@ -1633,22 +1633,21 @@ local gurus."
   ;; no evil.
   (feedmail-say-debug ">in-> feedmail-buffer-to-smtpmail %s" addr-listoid)
   (require 'smtpmail)
-  (if (not (smtpmail-via-smtp addr-listoid prepped))
-      (progn
-        (set-buffer errors-to)
-        (insert "Send via smtpmail failed.  Probable SMTP protocol error.\n")
-        (insert "Look for details below or in the *Messages* buffer.\n\n")
-        (let ((case-fold-search t)
-              ;; don't be overconfident about the name of the trace buffer
-              (tracer (concat "trace.*smtp.*" (regexp-quote smtpmail-smtp-server))))
-          (mapcar
-           (lambda (buffy)
-              (if (string-match tracer (buffer-name buffy))
-                  (progn
-                    (insert "SMTP Trace from " (buffer-name buffy) "\n---------------")
-                    (insert-buffer-substring buffy)
-                    (insert "\n\n"))))
-           (buffer-list))))))
+  (let ((result (smtpmail-via-smtp addr-listoid prepped)))
+    (when result
+      (set-buffer errors-to)
+      (insert "Send via smtpmail failed: %s" result)
+      (let ((case-fold-search t)
+            ;; don't be overconfident about the name of the trace buffer
+            (tracer (concat "trace.*smtp.*" (regexp-quote smtpmail-smtp-server))))
+        (mapcar
+         (lambda (buffy)
+           (if (string-match tracer (buffer-name buffy))
+               (progn
+                 (insert "SMTP Trace from " (buffer-name buffy) "\n---------------")
+                 (insert-buffer-substring buffy)
+                 (insert "\n\n"))))
+         (buffer-list))))))
 
 (declare-function smtp-via-smtp "ext:smtp" (sender recipients smtp-text-buffer))
 (defvar smtp-server)
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 02f78635e26..c43ec9e5611 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -3025,9 +3025,13 @@ or forward if N is negative."
 MSG-POS is a marker pointing at the error message in the grep buffer.
 BAD-MARKER is a marker that ought to point at where to move to,
 but probably is garbage."
-  (let* ((message (car (get-text-property msg-pos 'message (marker-buffer msg-pos))))
-         (column (car message))
-         (linenum (cadr message))
+
+  (let* ((message-loc (compilation--message->loc
+                       (get-text-property msg-pos 'compilation-message
+                                          (marker-buffer msg-pos))))
+         (column (car message-loc))
+         (linenum (cadr message-loc))
+         line-text
          pos
          msgnum msgbeg msgend
          header-field
@@ -3041,10 +3045,18 @@ but probably is garbage."
       (save-excursion
         ;; Find the line that the error message points at.
         (goto-char (point-min))
-        (forward-line linenum)
+        (forward-line (1- linenum))
         (setq pos (point))
 
-        ;; Find which message that's in,
+        ;; Find the text at the start of the line,
+        ;; before the first = sign.
+        ;; This text has a good chance of being also in the
+        ;; decoded message.
+        (save-excursion
+          (skip-chars-forward "^=\n")
+          (setq line-text (buffer-substring pos (point))))
+
+        ;; Find which message this position is in,
         ;; and the limits of that message.
         (setq msgnum (rmail-what-message pos))
         (setq msgbeg (rmail-msgbeg msgnum))
@@ -3071,11 +3083,23 @@ but probably is garbage."
     (rmail-show-message msgnum)
 
     ;; Move to the right position within the displayed message.
+    ;; Or at least try.  The decoded message's lines may not
+    ;; correspond to the lines in the inbox file.
+    (goto-char (point-min))
     (if header-field
-        (re-search-forward (concat "^" (regexp-quote header-field)) nil t)
-      (search-forward "\n\n" nil t))
-    (forward-line line-number-within)
-    (forward-char column)))
+        (progn 
+          (re-search-forward (concat "^" (regexp-quote header-field)) nil t)
+          (forward-line line-number-within))
+      (search-forward "\n\n" nil t)
+      (if (re-search-forward (concat "^" (regexp-quote line-text)) nil t)
+          (goto-char (match-beginning 0))))
+    (if (eobp)
+        ;; If the decoded message doesn't have enough lines,
+        ;; go to the beginning rather than the end.
+        (goto-char (point-min))
+      ;; Otherwise, go to the right column.
+      (if column
+          (forward-char column)))))
 
 (defun rmail-what-message (&optional pos)
   "Return message number POS (or point) is in."
@@ -4379,7 +4403,7 @@ With prefix argument N moves forward N messages with these labels.
 
 ;;;***
 
-;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "30ab95e291380f184dff5fa6cde75520")
+;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "a7d3e7205efa4e20ca9038c9b260ce83")
 ;;; Generated autoloads from rmailmm.el
 
 (autoload 'rmail-mime "rmailmm" "\
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index 651defeaf46..597068562b5 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -153,20 +153,21 @@ MIME entities.")
 ;;; MIME-entity object
 
 (defun rmail-mime-entity (type disposition transfer-encoding
-                               display header tagline body children handler)
+                               display header tagline body children handler
+                               &optional truncated)
   "Retrun a newly created MIME-entity object from arguments.
 
-A MIME-entity is a vector of 9 elements:
+A MIME-entity is a vector of 10 elements:
 
   [TYPE DISPOSITION TRANSFER-ENCODING DISPLAY HEADER TAGLINE BODY
-   CHILDREN HANDLER]
+   CHILDREN HANDLER TRUNCATED]
 
 TYPE and DISPOSITION correspond to MIME headers Content-Type and
-Cotent-Disposition respectively, and has this format:
+Content-Disposition respectively, and have this format:
 
   \(VALUE (ATTRIBUTE . VALUE) (ATTRIBUTE . VALUE) ...)
 
-VALUE is a string and ATTRIBUTE is a symbol.
+Each VALUE is a string and each ATTRIBUTE is a string.
 
 Consider the following header, for example:
 
@@ -192,8 +193,8 @@ has these values:
   raw: displayed by the raw MIME data (for the header and body only)
 
 HEADER and BODY are vectors [BEG END DISPLAY-FLAG], where BEG and
-END specify the region of the header or body lines in RMAIL's
-data (mbox) buffer, and DISPLAY-FLAG non-nil means that the
+END are markers that specify the region of the header or body lines
+in RMAIL's data (mbox) buffer, and DISPLAY-FLAG non-nil means that the
 header or body is, by default, displayed by the decoded
 presentation form.
 
@@ -208,9 +209,12 @@ entity have one or more children.  A \"message/rfc822\" entity
 has just one child.  Any other entity has no child.
 
 HANDLER is a function to insert the entity according to DISPLAY.
-It is called with one argument ENTITY."
+It is called with one argument ENTITY.
+
+TRUNCATED is non-nil if the text of this entity was truncated."
+
   (vector type disposition transfer-encoding
-          display header tagline body children handler))
+          display header tagline body children handler truncated))
 
 ;; Accessors for a MIME-entity object.
 (defsubst rmail-mime-entity-type (entity) (aref entity 0))
@@ -222,6 +226,9 @@ It is called with one argument ENTITY."
 (defsubst rmail-mime-entity-body (entity) (aref entity 6))
 (defsubst rmail-mime-entity-children (entity) (aref entity 7))
 (defsubst rmail-mime-entity-handler (entity) (aref entity 8))
+(defsubst rmail-mime-entity-truncated (entity) (aref entity 9))
+(defsubst rmail-mime-entity-set-truncated (entity truncated)
+  (aset entity 9 truncated))
 
 (defsubst rmail-mime-message-p ()
   "Non-nil if and only if the current message is a MIME."
@@ -237,6 +244,10 @@ It is called with one argument ENTITY."
          (directory (button-get button 'directory))
          (data (button-get button 'data))
          (ofilename filename))
+    (if (and (not (stringp data))
+             (rmail-mime-entity-truncated data))
+        (unless (y-or-n-p "This entity is truncated; save anyway? ")
+          (error "Aborted")))
     (setq filename (expand-file-name
                     (read-file-name (format "Save as (default: %s): " filename)
                                     directory
@@ -387,6 +398,11 @@ The value is a vector [ INDEX HEADER TAGLINE BODY END], where
             (if (and rmail-mime-mbox-buffer (= (aref segment 1) (point-min)))
                 (let ((new (aref (rmail-mime-entity-display entity) 1)))
                   (aset new 0 t))))
+        ;; Query as a warning before showing if truncated.
+        (if (and (not (stringp entity))
+                 (rmail-mime-entity-truncated entity))
+            (unless (y-or-n-p "This entity is truncated; show anyway? ")
+              (error "Aborted")))
         ;; Enter the shown mode.
         (rmail-mime-shown-mode entity)
         ;; Force this body shown.
@@ -531,7 +547,7 @@ HEADER is a header component of a MIME-entity object (see
         (beg (point))
         (segment (rmail-mime-entity-segment (point) entity)))
 
-    (or (integerp (aref body 0))
+    (or (integerp (aref body 0)) (markerp (aref body 0))
         (let ((data (buffer-string)))
           (aset body 0 data)
           (delete-region (point-min) (point-max))))
@@ -688,7 +704,7 @@ directly."
          (segment (rmail-mime-entity-segment (point) entity))
          beg data size)
 
-    (if (integerp (aref body 0))
+    (if (or (integerp (aref body 0)) (markerp (aref body 0)))
         (setq data entity
               size (car bulk-data))
       (if (stringp (aref body 0))
@@ -816,7 +832,7 @@ The other arguments are the same as `rmail-mime-multipart-handler'."
   (let ((boundary (cdr (assq 'boundary content-type)))
         (subtype (cadr (split-string (car content-type) "/")))
         (index 0)
-        beg end next entities)
+        beg end next entities truncated)
     (unless boundary
       (rmail-mm-get-boundary-error-message
        "No boundary defined" content-type content-disposition
@@ -845,7 +861,7 @@ The other arguments are the same as `rmail-mime-multipart-handler'."
     (setq beg (point-min))
 
     (while (or (and (search-forward boundary nil t)
-                    (setq end (match-beginning 0)))
+                    (setq truncated nil end (match-beginning 0)))
                ;; If the boundary does not appear at all,
                ;; the message was truncated.
                ;; Handle the rest of the truncated message
@@ -854,7 +870,7 @@ The other arguments are the same as `rmail-mime-multipart-handler'."
                (and (save-excursion
                       (skip-chars-forward "\n")
                       (> (point-max) (point)))
-                    (setq end (point-max))))
+                    (setq truncated t end (point-max))))
       ;; If this is the last boundary according to RFC 2046, hide the
       ;; epilogue, else hide the boundary only.  Use a marker for
       ;; `next' because `rmail-mime-show' may change the buffer.
@@ -862,7 +878,7 @@ The other arguments are the same as `rmail-mime-multipart-handler'."
              (setq next (point-max-marker)))
             ((looking-at "[ \t]*\n")
              (setq next (copy-marker (match-end 0) t)))
-            ((= end (point-max))
+            (truncated
              ;; We're handling what's left of a truncated message.
              (setq next (point-max-marker)))
             (t
@@ -886,6 +902,7 @@ The other arguments are the same as `rmail-mime-multipart-handler'."
                 ;; Display a tagline.
                 (aset (aref (rmail-mime-entity-display child) 1) 1
                       (aset (rmail-mime-entity-tagline child) 2 t))
+                (rmail-mime-entity-set-truncated child truncated)
                 (push child entities)))
 
           (delete-region end next)
@@ -1112,9 +1129,10 @@ modified."
 
     (if parse-tag
         (let* ((is-inline (string= (car content-disposition) "inline"))
-               (header (vector (point-min) end nil))
+               (hdr-end (copy-marker end))
+               (header (vector (point-min-marker) hdr-end nil))
                (tagline (vector parse-tag (cons nil nil) t))
-               (body (vector end (point-max) is-inline))
+               (body (vector hdr-end (point-max-marker) is-inline))
                (new (vector (aref header 2) (aref tagline 2) (aref body 2)))
                children handler entity)
           (cond ((string-match "multipart/.*" (car content-type))
@@ -1163,11 +1181,11 @@ modified."
       ;; Hide headers and handle the part.
       (put-text-property (point-min) (point-max) 'rmail-mime-entity
                          (rmail-mime-entity
-                         content-type content-disposition
-                         content-transfer-encoding
-                         (vector (vector 'raw nil 'raw) (vector 'raw nil 'raw))
-                         (vector nil nil 'raw) (vector "" (cons nil nil) nil)
-                         (vector nil nil 'raw) nil nil))
+                          content-type content-disposition
+                          content-transfer-encoding
+                          (vector (vector 'raw nil 'raw) (vector 'raw nil 'raw))
+                          (vector nil nil 'raw) (vector "" (cons nil nil) nil)
+                          (vector nil nil 'raw) nil nil))
       (save-restriction
         (cond ((string= (car content-type) "message/rfc822")
                (narrow-to-region end (point-max)))
@@ -1391,6 +1409,8 @@ This is the usual value of `rmail-insert-mime-forwarded-message-function'."
          (re-search-forward regexp nil t))
        ;; Next, search the body.
        (if (and entity
+                ;; RMS: I am not sure why, but sometimes this is a string.
+                (not (stringp entity))
                 (let* ((content-type (rmail-mime-entity-type entity))
                        (charset (cdr (assq 'charset (cdr content-type)))))
                   (or (not (string-match "text/.*" (car content-type)))
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index c1405ec5ff3..fe20ad921da 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -138,25 +138,9 @@ Otherwise, let mailer send back a message to report errors."
   :group 'sendmail
   :version "23.1")
 
-;; Prevent problems with `window-system' not having the correct value
-;; when loaddefs.el is loaded. `custom-reevaluate-setting' needs the
-;; standard value.
-;;;###autoload
-(put 'send-mail-function 'standard-value
-     ;; MS-Windows can access the clipboard even under -nw.
-     '((if (or (and window-system (eq system-type 'darwin))
-               (eq system-type 'windows-nt))
-           'mailclient-send-it
-         'sendmail-send-it)))
-
 ;; Useful to set in site-init.el
 ;;;###autoload
-(defcustom send-mail-function
-  (if (or (and window-system (eq system-type 'darwin))
-          ;; MS-Windows can access the clipboard even under -nw.
-          (eq system-type 'windows-nt))
-      'mailclient-send-it
-    'sendmail-send-it)
+(defcustom send-mail-function 'sendmail-query-once
   "Function to call to send the current buffer as mail.
 The headers should be delimited by a line which is
 not a valid RFC822 header or continuation line,
@@ -164,14 +148,56 @@ that matches the variable `mail-header-separator'.
 This is used by the default mail-sending commands.  See also
 `message-send-mail-function' for use with the Message package."
   :type '(radio (function-item sendmail-send-it :tag "Use Sendmail package")
+                (function-item sendmail-query-once :tag "Query the user")
                 (function-item smtpmail-send-it :tag "Use SMTPmail package")
                 (function-item feedmail-send-it :tag "Use Feedmail package")
                 (function-item mailclient-send-it :tag "Use Mailclient package")
                 function)
-  :initialize 'custom-initialize-delay
+  :version "24.1"
   :group 'sendmail)
 
-;;;###autoload(custom-initialize-delay 'send-mail-function nil)
+(defvar sendmail-query-once-function 'query
+  "Either a function to send email, or the symbol `query'.")
+
+;;;###autoload
+(defun sendmail-query-once ()
+  "Send an email via `sendmail-query-once-function'.
+If `sendmail-query-once-function' is `query', ask the user what
+function to use, and then save that choice."
+  (when (equal sendmail-query-once-function 'query)
+    (let* ((default
+             (cond
+              ((or (and window-system (eq system-type 'darwin))
+                   (eq system-type 'windows-nt))
+               'mailclient-send-it)
+              ((and sendmail-program
+                    (executable-find sendmail-program))
+               'sendmail-send-it)))
+           (function
+            (if (or (not default)
+                    ;; We have detected no OS-level mail senders, or we
+                    ;; have already configured smtpmail, so we use the
+                    ;; internal SMTP service.
+                    (and (boundp 'smtpmail-smtp-server)
+                         smtpmail-smtp-server))
+                'smtpmail-send-it
+              ;; Query the user.
+              (unwind-protect
+                  (progn
+                    (pop-to-buffer "*Mail Help*")
+                    (erase-buffer)
+                    (insert "Sending mail from Emacs hasn't been set up yet.\n\n"
+                            "Type `y' to configure outgoing SMTP, or `n' to use\n"
+                            "the default mail sender on your system.\n\n"
+                            "To change this again at a later date, customize the\n"
+                            "`send-mail-function' variable.\n")
+                    (goto-char (point-min))
+                    (if (y-or-n-p "Configure outgoing SMTP in Emacs? ")
+                        'smtpmail-send-it
+                      default))
+                (kill-buffer (current-buffer))))))
+      (customize-save-variable 'sendmail-query-once-function function)))
+  (funcall sendmail-query-once-function))
 
 ;;;###autoload
 (defcustom mail-header-separator (purecopy "--text follows this line--")
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 3fd2d9ddf21..073e2fa4a3c 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -71,9 +71,11 @@
   :group 'mail)
 
 
-(defvar smtpmail-default-smtp-server nil
+(defcustom smtpmail-default-smtp-server nil
   "Specify default SMTP server.
-This only has effect if you specify it before loading the smtpmail library.")
+This only has effect if you specify it before loading the smtpmail library."
+  :type '(choice (const nil) string)
+  :group 'smtpmail)
 
 (defcustom smtpmail-smtp-server
   (or (getenv "SMTPSERVER") smtpmail-default-smtp-server)
@@ -96,13 +98,14 @@ don't define this value."
 
 (defcustom smtpmail-stream-type nil
   "Connection type SMTP connections.
-This may be either nil (plain connection) or `starttls' (use the
-starttls mechanism to turn on TLS security after opening the
-stream)."
+This may be either nil (possibly upgraded to STARTTLS if
+possible), or `starttls' (refuse to send if STARTTLS isn't
+available), or `plain' (never use STARTTLS).."
   :version "24.1"
   :group 'smtpmail
-  :type '(choice (const :tag "Plain" nil)
-                 (const starttls)))
+  :type '(choice (const :tag "Possibly upgrade to STARTTLS" nil)
+                 (const :tag "Always use STARTTLS" starttls)
+                 (const :tag "Never use STARTTLS" plain)))
 
 (defcustom smtpmail-sendto-domain nil
   "Local domain name without a host name.
diff --git a/lisp/man.el b/lisp/man.el
index 7a9e6e3cca5..ed24e35f0ea 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -276,7 +276,9 @@ This regexp should not start with a `^' character.")
 This regular expression should start with a `^' character.")
 
 (defvar Man-reference-regexp
-  (concat "\\(" Man-name-regexp "\\)[ \t]*(\\(" Man-section-regexp "\\))")
+  (concat "\\(" Man-name-regexp
+          "\\(\n[ \t]+" Man-name-regexp "\\)*\\)[ \t]*(\\("
+          Man-section-regexp "\\))")
   "Regular expression describing a reference to another manpage.")
 
 (defvar Man-apropos-regexp
@@ -597,8 +599,8 @@ and the `Man-section-translations-alist' variables)."
     (cond
      ;; "chmod(2V)" case ?
      ((string-match (concat "^" Man-reference-regexp "$") ref)
-      (setq name (match-string 1 ref)
-            section (match-string 2 ref)))
+      (setq name (replace-regexp-in-string "[\n\t ]" "" (match-string 1 ref))
+            section (match-string 3 ref)))
      ;; "2v chmod" case ?
      ((string-match (concat "^\\(" Man-section-regexp
                             "\\) +\\(" Man-name-regexp "\\)$") ref)
@@ -1106,7 +1108,7 @@ Same for the ANSI bold and normal escape sequences."
       (put-text-property (match-beginning 0)
                          (match-end 0)
                          'face Man-overstrike-face)))
-  (message "%s man page formatted" Man-arguments))
+  (message "%s man page formatted" (Man-page-from-arguments Man-arguments)))
 
 (defun Man-highlight-references (&optional xref-man-type)
   "Highlight the references on mouse-over.
@@ -1255,12 +1257,11 @@ manpage command."
           (Man-mode)
 
           (if (not Man-page-list)
-              (let ((args Man-arguments))
+              (let ((args Man-arguments))
                 (kill-buffer (current-buffer))
-                (error "Can't find the %s manpage" args)))
-
-          (set-buffer-modified-p nil)
-          ))
+                (error "Can't find the %s manpage"
+                       (Man-page-from-arguments args)))
+            (set-buffer-modified-p nil))))
         ;; Restore case-fold-search before calling
         ;; Man-notify-when-ready because it may switch buffers.
 
@@ -1271,6 +1272,18 @@ manpage command."
             (error "%s" err-mess))
         ))))
 
+(defun Man-page-from-arguments (args)
+  ;; Skip arguments and only print the page name.
+  (mapconcat
+   'identity
+   (delete nil
+           (mapcar
+            (lambda (elem)
+              (and (not (string-match "^-" elem))
+                   elem))
+            (split-string args " ")))
+   " "))
+
 
 ;; ======================================================================
 ;; set up manual mode in buffer and build alists
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 437bd523841..caae40ed8c5 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1135,17 +1135,18 @@ mail status in mode line"))
   (let ((menu (make-sparse-keymap "Line Wrapping")))
 
     (define-key menu [word-wrap]
-      `(menu-item ,(purecopy "Word Wrap (Visual Line mode)")
-                  (lambda ()
-                    (interactive)
-                    (unless visual-line-mode
-                      (visual-line-mode 1))
-                    (message ,(purecopy "Visual-Line mode enabled")))
-                  :help ,(purecopy "Wrap long lines at word boundaries")
-                  :button (:radio . (and (null truncate-lines)
-                                         (not (truncated-partial-width-window-p))
-                                         word-wrap))
-                  :visible (menu-bar-menu-frame-live-and-visible-p)))
+      `(menu-item
+        ,(purecopy "Word Wrap (Visual Line mode)")
+        (lambda ()
+          (interactive)
+          (unless visual-line-mode
+            (visual-line-mode 1))
+          (message ,(purecopy "Visual-Line mode enabled")))
+        :help ,(purecopy "Wrap long lines at word boundaries")
+        :button (:radio . (and (null truncate-lines)
+                               (not (truncated-partial-width-window-p))
+                               word-wrap))
+        :visible (menu-bar-menu-frame-live-and-visible-p)))
 
     (define-key menu [truncate]
       `(menu-item ,(purecopy "Truncate Long Lines")
@@ -1238,78 +1239,88 @@ mail status in mode line"))
       menu-bar-separator)
 
     (define-key menu [blink-cursor-mode]
-      (menu-bar-make-mm-toggle blink-cursor-mode
-                               "Blinking Cursor"
-                               "Whether the cursor blinks (Blink Cursor mode)"))
+      (menu-bar-make-mm-toggle
+       blink-cursor-mode
+       "Blink Cursor"
+       "Whether the cursor blinks (Blink Cursor mode)"))
     (define-key menu [cursor-separator]
       menu-bar-separator)
 
     (define-key menu [save-place]
-      (menu-bar-make-toggle toggle-save-place-globally save-place
-                            "Save Place in Files between Sessions"
-                            "Saving place in files %s"
-                            "Visit files of previous session when restarting Emacs"
-                            (require 'saveplace)
-                            ;; Do it by name, to avoid a free-variable
-                            ;; warning during byte compilation.
-                            (set-default
-                             'save-place (not (symbol-value 'save-place)))))
+      (menu-bar-make-toggle
+       toggle-save-place-globally save-place
+       "Save Place in Files between Sessions"
+       "Saving place in files %s"
+       "Visit files of previous session when restarting Emacs"
+       (require 'saveplace)
+       ;; Do it by name, to avoid a free-variable
+       ;; warning during byte compilation.
+       (set-default
+        'save-place (not (symbol-value 'save-place)))))
 
     (define-key menu [uniquify]
-      (menu-bar-make-toggle toggle-uniquify-buffer-names uniquify-buffer-name-style
-                            "Use Directory Names in Buffer Names"
-                            "Directory name in buffer names (uniquify) %s"
-                            "Uniquify buffer names by adding parent directory names"
-                            (require 'uniquify)
-                            (setq uniquify-buffer-name-style
-                                  (if (not uniquify-buffer-name-style)
-                                      'forward))))
+      (menu-bar-make-toggle
+       toggle-uniquify-buffer-names uniquify-buffer-name-style
+       "Use Directory Names in Buffer Names"
+       "Directory name in buffer names (uniquify) %s"
+       "Uniquify buffer names by adding parent directory names"
+       (require 'uniquify)
+       (setq uniquify-buffer-name-style
+             (if (not uniquify-buffer-name-style)
+                 'forward))))
 
     (define-key menu [edit-options-separator]
       menu-bar-separator)
     (define-key menu [cua-mode]
-      (menu-bar-make-mm-toggle cua-mode
-                               "C-x/C-c/C-v Cut and Paste (CUA)"
-                               "Use C-z/C-x/C-c/C-v keys for undo/cut/copy/paste"
-                               (:visible (or (not (boundp 'cua-enable-cua-keys))
-                                             cua-enable-cua-keys))))
+      (menu-bar-make-mm-toggle
+       cua-mode
+       "Use CUA Keys (Cut/Paste with C-x/C-c/C-v)"
+       "Use C-z/C-x/C-c/C-v keys for undo/cut/copy/paste"
+       (:visible (or (not (boundp 'cua-enable-cua-keys))
+                     cua-enable-cua-keys))))
 
     (define-key menu [cua-emulation-mode]
-      (menu-bar-make-mm-toggle cua-mode
-                               "Shift movement mark region (CUA)"
-                               "Use shifted movement keys to set and extend the region"
-                               (:visible (and (boundp 'cua-enable-cua-keys)
-                                              (not cua-enable-cua-keys)))))
+      (menu-bar-make-mm-toggle
+       cua-mode
+       "Shift movement mark region (CUA)"
+       "Use shifted movement keys to set and extend the region"
+       (:visible (and (boundp 'cua-enable-cua-keys)
+                      (not cua-enable-cua-keys)))))
 
     (define-key menu [case-fold-search]
-      (menu-bar-make-toggle toggle-case-fold-search case-fold-search
-                            "Case-Insensitive Search"
-                            "Case-Insensitive Search %s"
-                            "Ignore letter-case in search commands"))
+      (menu-bar-make-toggle
+       toggle-case-fold-search case-fold-search
+       "Ignore Case for Search"
+       "Case-Insensitive Search %s"
+       "Ignore letter-case in search commands"))
 
     (define-key menu [auto-fill-mode]
-      `(menu-item ,(purecopy "Auto Fill in Text Modes")
-                  menu-bar-text-mode-auto-fill
-                  :help ,(purecopy "Automatically fill text while typing (Auto Fill mode)")
-                  :button (:toggle . (if (listp text-mode-hook)
-                                         (member 'turn-on-auto-fill text-mode-hook)
-                                       (eq 'turn-on-auto-fill text-mode-hook)))))
+      `(menu-item
+        ,(purecopy "Auto Fill in Text Modes")
+        menu-bar-text-mode-auto-fill
+        :help ,(purecopy "Automatically fill text while typing (Auto Fill mode)")
+        :button (:toggle . (if (listp text-mode-hook)
+                               (member 'turn-on-auto-fill text-mode-hook)
+                             (eq 'turn-on-auto-fill text-mode-hook)))))
 
     (define-key menu [line-wrapping]
-      `(menu-item ,(purecopy "Line Wrapping in this Buffer") ,menu-bar-line-wrapping-menu))
+      `(menu-item ,(purecopy "Line Wrapping in this Buffer")
+                  ,menu-bar-line-wrapping-menu))
 
 
     (define-key menu [highlight-separator]
       menu-bar-separator)
     (define-key menu [highlight-paren-mode]
-      (menu-bar-make-mm-toggle show-paren-mode
-                               "Paren Match Highlighting"
-                               "Highlight matching/mismatched parentheses at cursor (Show Paren mode)"))
+      (menu-bar-make-mm-toggle
+       show-paren-mode
+       "Highlight Matching Parentheses"
+       "Highlight matching/mismatched parentheses at cursor (Show Paren mode)"))
     (define-key menu [transient-mark-mode]
-      (menu-bar-make-mm-toggle transient-mark-mode
-                               "Active Region Highlighting"
-                               "Make text in active region stand out in color (Transient Mark mode)"
-                               (:enable (not cua-mode))))
+      (menu-bar-make-mm-toggle
+       transient-mark-mode
+       "Highlight Active Region"
+       "Make text in active region stand out in color (Transient Mark mode)"
+       (:enable (not cua-mode))))
     menu))
 
 
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 93e486adb0f..df4edcc75e1 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,86 @@
+2011-07-12  Bill Wohler  <wohler@newt.com>
+
+        Release MH-E version 8.2.91.
+
+        * mh-e.el (Version, mh-version): Update for release 8.2.91.
+
+        * mh-compat.el (mh-pop-to-buffer-same-window): Add compatibility
+        function to call switch-to-buffer on systems that lack
+        pop-to-buffer-same-window.
+        * mh-folder.el (mh-inc-folder, mh-modify, mh-scan-folder)
+        (mh-make-folder): Call mh-pop-to-buffer-same-window instead of
+        switch-to-buffer. The previous change which used pop-to-buffer
+        produced the wrong behavior.
+
+2011-07-12  Henrique Martins  <henrique@martins.cc>   (tiny change)
+
+        * mh-xface.el (mh-picon-get-image): Remove quote from block
+        argument.
+        * mh-mime.el (mh-mh-directive-present-p): Ditto.
+
+2011-07-10  Bill Wohler  <wohler@newt.com>
+
+        Release MH-E version 8.2.90.
+
+        * mh-e.el (Version, mh-version): Update for release 8.2.90.
+
+        * mh-utils.el (mh-sub-folders-actual): Remove FIXME question.
+
+        * mh-mime.el (mh-decode-message-subject): Fix case of Subject.
+
+        * mh-folder.el (mh-inc-folder, mh-modify, mh-scan-folder)
+        (mh-make-folder): Replace calls to switch-to-buffer with of
+        pop-to-buffer. The former is intended for interactive use only and
+        generates warnings in Emacs 24.
+
+2011-07-09  Bill Wohler  <wohler@newt.com>
+
+        * mh-speed.el (mh-speed-toggle,mh-speed-view): Document "ignored"
+        arguments to keep checkdoc happy.
+
+        * mh-search.el (mh-flists-execute): Ditto.
+
+        * mh-funcs.el (mh-undo-folder): Ditto.
+
+        * mh-comp.el (mh-user-agent-compose): Ditto.
+
+        * mh-xface.el (mh-face-to-png, mh-uncompface)
+        (mh-picon-file-contents): Only call set-buffer-multibyte if it
+        exists, which it doesn't in XEmacs.
+
+2011-07-04  Bill Wohler  <wohler@newt.com>
+
+        * mh-e.el: Just require mh-loaddefs since loading it in an
+        eval-and-compile block causes compilation errors in XEmacs.
+
+        * mh-acros.el,  mh-comp.el, mh-e.el, mh-folder.el, mh-letter.el:
+        * mh-mime.el, mh-search.el, mh-seq.el: Shush XEmacs compiler in
+        mh-do-in-xemacs block.
+
+        * mh-compat.el (mh-window-full-height-p): Add compatibility
+        function for XEmacs.
+        * mh-show.el (mh-show-msg): Use it, and avoid compiler warning on
+        XEmacs.
+
+        * mh-letter.el (mh-letter-mode-map, mh-letter-complete)
+        (mh-complete-word): Remove FIXME comments since these functions
+        are still needed in other Emacsen. However, they can probably
+        stand to be generalized like completion-at-point.
+        (mh-letter-complete-or-space): Remove unused variable.
+
+2011-07-03  Bill Wohler  <wohler@newt.com>
+
+        * mh-compat.el (mh-test-completion): Add compatibility function
+        for XEmacs.
+        * mh-alias.el (mh-alias-letter-expand-alias): Use it, and avoid
+        compiler warning on XEmacs.
+
+        * mh-utils.el:
+        * mh-mime.el: Shush XEmacs compiler in mh-do-in-xemacs block.
+
+        * mh-folder.el: Use boundp instead of fboundp when testing
+        existence of desktop-buffer-mode-handlers.
+
 2011-05-10  Jim Meyering  <meyering@redhat.com>
 
         Fix doubled-word typos.
diff --git a/lisp/mh-e/mh-acros.el b/lisp/mh-e/mh-acros.el
index c1964d5a4ea..2144eef7308 100644
--- a/lisp/mh-e/mh-acros.el
+++ b/lisp/mh-e/mh-acros.el
@@ -132,9 +132,10 @@ check if variable `transient-mark-mode' is active."
                (boundp 'mark-active) mark-active))))
 
 ;; Shush compiler.
-(defvar struct)                         ; XEmacs
-(defvar x)                              ; XEmacs
-(defvar y)                              ; XEmacs
+(mh-do-in-xemacs
+  (defvar struct)
+  (defvar x)
+  (defvar y))
 
 ;;;###mh-autoload
 (defmacro mh-defstruct (name-spec &rest fields)
diff --git a/lisp/mh-e/mh-alias.el b/lisp/mh-e/mh-alias.el
index 2df6025bf09..d1b3ccebf46 100644
--- a/lisp/mh-e/mh-alias.el
+++ b/lisp/mh-e/mh-alias.el
@@ -316,8 +316,7 @@ Blind aliases or users from /etc/passwd are not expanded."
                         res)
                   res)))
              ((t) (all-completions string mh-alias-alist pred))
-             ((lambda) (if (fboundp 'test-completion)
-                      (test-completion string mh-alias-alist pred))))))))))
+             ((lambda) (mh-test-completion string mh-alias-alist pred)))))))))
 
 
 ;;; Alias File Updating
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index 169679e88ae..882a8771e28 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -213,7 +213,7 @@ Elements look like (HEADER . VALUE) where both HEADER and VALUE
 are strings.
 
 CONTINUE, SWITCH-FUNCTION, YANK-ACTION, SEND-ACTIONS, and
-RETURN-ACTION are ignored."
+RETURN-ACTION and any additional arguments are IGNORED."
   (mh-find-path)
   (let ((mh-error-if-no-draft t))
     (mh-send to "" subject)
@@ -223,7 +223,8 @@ RETURN-ACTION are ignored."
       (setq other-headers (cdr other-headers)))))
 
 ;; Shush compiler.
-(defvar sendmail-coding-system)         ; XEmacs
+(mh-do-in-xemacs
+  (defvar sendmail-coding-system))
 
 ;;;###autoload
 (defun mh-send-letter (&optional arg)
diff --git a/lisp/mh-e/mh-compat.el b/lisp/mh-e/mh-compat.el
index 01a0f26b9e8..16dfe05b094 100644
--- a/lisp/mh-e/mh-compat.el
+++ b/lisp/mh-e/mh-compat.el
@@ -251,6 +251,18 @@ The argument STRING is ignored."
   (buffer-substring-no-properties
    (match-beginning num) (match-end num)))
 
+(defun-mh mh-pop-to-buffer-same-window
+  pop-to-buffer-same-window (&optional buffer-or-name norecord label)
+  "Pop to buffer specified by BUFFER-OR-NAME in the selected window.
+Another window will be used only if the buffer can't be shown in
+the selected window, usually because it is dedicated to another
+buffer. Optional arguments BUFFER-OR-NAME, NORECORD and LABEL are
+as for `pop-to-buffer'. This macro is used by Emacs versions that
+lack the `pop-to-buffer-same-window' function, introduced in
+Emacs 24. The function `switch-to-buffer' is used instead and
+LABEL is ignored."
+  (switch-to-buffer buffer-or-name norecord))
+
 (defun-mh mh-replace-regexp-in-string replace-regexp-in-string
   (regexp rep string &optional fixedcase literal subexp start)
   "Replace REGEXP with REP everywhere in STRING and return result.
@@ -260,6 +272,12 @@ The arguments FIXEDCASE, SUBEXP, and START, used by
 `replace-in-string' are ignored."
   (replace-in-string string regexp rep literal))
 
+(defun-mh mh-test-completion
+  test-completion (string collection &optional predicate)
+  "Return non-nil if STRING is a valid completion.
+XEmacs does not have `test-completion'. This function returns nil
+on that system." nil)
+
 ;; Copy of constant from url-util.el in Emacs 22; needed by Emacs 21.
 (if (not (boundp 'url-unreserved-chars))
     (defconst mh-url-unreserved-chars
@@ -296,6 +314,16 @@ The arguments RETURN-TO and EXIT-ACTION are ignored."
   (if exit-action nil)
   (view-mode 1))
 
+(defun-mh mh-window-full-height-p
+  window-full-height-p (&optional WINDOW)
+  "Return non-nil if WINDOW is not the result of a vertical split.
+This function is defined in XEmacs as it lacks
+`window-full-height-p'. The values of the functions
+`window-height' and `frame-height' are compared instead. The
+argument WINDOW is ignored."
+  (= (1+ (window-height))
+     (frame-height)))
+
 (defmacro mh-write-file-functions ()
   "Return `write-file-functions' if it exists.
 Otherwise return `local-write-file-hooks'.
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 90803d183d2..51b41e854b0 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -5,7 +5,7 @@
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
-;; Version: 8.2
+;; Version: 8.2.91
 ;; Keywords: mail
 
 ;; This file is part of GNU Emacs.
@@ -27,7 +27,7 @@
 
 ;; MH-E is an Emacs interface to the MH mail system.
 
-;; MH-E is supported in GNU Emacs 21 and 22, as well as XEmacs 21
+;; MH-E is supported in GNU Emacs 21 and higher, as well as XEmacs 21
 ;; (except for versions 21.5.9-21.5.16). It is compatible with MH
 ;; versions 6.8.4 and higher, all versions of nmh, and GNU mailutils
 ;; 1.0 and higher. Gnus is also required; version 5.10 or higher is
@@ -90,10 +90,7 @@
 ;; Provide functions to the rest of MH-E. However, mh-e.el must not
 ;; use any definitions in files that require mh-e from mh-loaddefs,
 ;; for if it does it will introduce a require loop.
-(eval-and-compile
-  ;; Load it during compilation as well, since it defines the macro
-  ;; mh-require-cl.
-  (load "mh-loaddefs" nil 'nomessage))
+(require 'mh-loaddefs)
 
 (mh-require-cl)
 
@@ -130,7 +127,7 @@
 ;; Try to keep variables local to a single file. Provide accessors if
 ;; variables are shared. Use this section as a last resort.
 
-(defconst mh-version "8.2" "Version number of MH-E.")
+(defconst mh-version "8.2.91" "Version number of MH-E.")
 
 ;; Variants
 
@@ -616,7 +613,8 @@ Output is expected to be shown to user, not parsed by MH-E."
   (mh-exchange-point-and-mark-preserving-active-mark))
 
 ;; Shush compiler.
-(defvar mark-active)                    ; XEmacs
+(mh-do-in-xemacs
+  (defvar mark-active))
 
 (defun mh-exchange-point-and-mark-preserving-active-mark ()
   "Put the mark where point is now, and point where the mark is now.
diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el
index aab40c7be13..1d9a79d0deb 100644
--- a/lisp/mh-e/mh-folder.el
+++ b/lisp/mh-e/mh-folder.el
@@ -77,7 +77,7 @@ the MH mail system."
 ;;; Desktop Integration
 
 ;; desktop-buffer-mode-handlers appeared in Emacs 22.
-(if (fboundp 'desktop-buffer-mode-handlers)
+(if (boundp 'desktop-buffer-mode-handlers)
     (add-to-list 'desktop-buffer-mode-handlers
                  '(mh-folder-mode . mh-restore-desktop-buffer)))
 
@@ -526,7 +526,8 @@ font-lock is done highlighting.")
 ;; Shush compiler.
 (defvar desktop-save-buffer)
 (defvar font-lock-auto-fontify)
-(defvar font-lock-defaults)             ; XEmacs
+(mh-do-in-xemacs
+  (defvar font-lock-defaults))
 
 ;; Ensure new buffers won't get this mode if default major-mode is nil.
 (put 'mh-folder-mode 'mode-class 'special)
@@ -794,7 +795,7 @@ instead."
              (setq threading-needed-flag mh-show-threads-flag)
              (setq mh-previous-window-config config))
             ((not (eq (current-buffer) (get-buffer folder)))
-             (switch-to-buffer folder)
+             (mh-pop-to-buffer-same-window folder)
              (setq mh-previous-window-config config))))
     (mh-get-new-mail file)
     (when (and threading-needed-flag
@@ -854,7 +855,7 @@ From a program, edit MESSAGE; nil means edit current message."
 
     ;; Just show the edit buffer...
     (delete-other-windows)
-    (switch-to-buffer edit-buffer)))
+    (mh-pop-to-buffer-same-window edit-buffer)))
 
 ;;;###mh-autoload
 (defun mh-next-button (&optional backward-flag)
@@ -1704,7 +1705,7 @@ DONT-EXEC-PENDING is non-nil."
          (unless dont-exec-pending
            (mh-process-or-undo-commands folder)
            (mh-reset-threads-and-narrowing))
-         (switch-to-buffer folder)))
+         (mh-pop-to-buffer-same-window folder)))
   (mh-regenerate-headers range)
   (if (zerop (buffer-size))
       (if (equal range "all")
@@ -1785,7 +1786,7 @@ Also removes all content from the folder buffer."
 (defun mh-make-folder (name)
   "Create a new mail folder called NAME.
 Make it the current folder."
-  (switch-to-buffer name)
+  (mh-pop-to-buffer-same-window name)
   (setq buffer-read-only nil)
   (erase-buffer)
   (if mh-adaptive-cmd-note-flag
diff --git a/lisp/mh-e/mh-funcs.el b/lisp/mh-e/mh-funcs.el
index dfac684ed50..46a04c38845 100644
--- a/lisp/mh-e/mh-funcs.el
+++ b/lisp/mh-e/mh-funcs.el
@@ -349,7 +349,7 @@ See `mh-store-msg' for a description of DIRECTORY."
         (error "Error occurred during execution of %s" command)))))
 
 ;;;###mh-autoload
-(defun mh-undo-folder (&rest _ignored)
+(defun mh-undo-folder (&rest ignored)
   "Undo all refiles and deletes in the current folder.
 Arguments are IGNORED (for `revert-buffer')."
   (interactive)
diff --git a/lisp/mh-e/mh-letter.el b/lisp/mh-e/mh-letter.el
index 2ced886c05e..f269faf3a51 100644
--- a/lisp/mh-e/mh-letter.el
+++ b/lisp/mh-e/mh-letter.el
@@ -185,7 +185,7 @@ semi-obsolete and is only used if `mail-citation-hook' is nil.")
   "\C-c\C-w"            mh-check-whom
   "\C-c\C-y"            mh-yank-cur-msg
   "\C-c\M-d"            mh-insert-auto-fields
-  "\M-\t"               mh-letter-complete ;; FIXME: completion-at-point
+  "\M-\t"               mh-letter-complete
   "\t"                  mh-letter-next-header-field-or-indent
   [backtab]             mh-letter-previous-header-field)
 
@@ -273,7 +273,8 @@ searching for `mh-mail-header-separator' in the buffer."
 ;;; MH-Letter Mode
 
 ;; Shush compiler.
-(defvar font-lock-defaults)             ; XEmacs
+(mh-do-in-xemacs
+  (defvar font-lock-defaults))
 
 ;; Ensure new buffers won't get this mode if default major-mode is nil.
 (put 'mh-letter-mode 'mode-class 'special)
@@ -502,10 +503,13 @@ This provides alias and folder completion in header fields according to
         (or (funcall func) #'ignore)
       mh-letter-complete-function)))
 
-(defalias 'mh-letter-complete
-  (if (fboundp 'completion-at-point) #'completion-at-point
-    (lambda ()
-      "Perform completion on header field or word preceding point.
+;; TODO Now that completion-at-point performs the task of
+;; mh-letter-complete, perhaps mh-letter-complete along with
+;; mh-complete-word should be rewritten as a more general function for
+;; XEmacs, renamed to mh-completion-at-point, and moved to
+;; mh-compat.el.
+(defun-mh mh-letter-complete completion-at-point ()
+  "Perform completion on header field or word preceding point.
 
 If the field contains addresses (for example, \"To:\" or \"Cc:\")
 or folders (for example, \"Fcc:\") then this command will provide
@@ -521,7 +525,7 @@ alias completion. In the body of the message, this command runs
                 (end (nth 1 data))
                 (table (nth 2 data)))
             (mh-complete-word (buffer-substring-no-properties start end)
-                              table start end))))))))
+                              table start end))))))
 
 (defun mh-letter-complete-or-space (arg)
   "Perform completion or insert space.
@@ -531,8 +535,7 @@ this command to perform completion in the header. Otherwise, a
 space is inserted; use a prefix argument ARG to specify more than
 one space."
   (interactive "p")
-  (let ((func nil)
-        (end-of-prev (save-excursion
+  (let ((end-of-prev (save-excursion
                        (goto-char (mh-beginning-of-word))
                        (mh-beginning-of-word -1))))
     (cond ((not mh-compose-space-does-completion-flag)
@@ -889,7 +892,6 @@ downcasing the field name."
 
 ;;;###mh-autoload
 (defun mh-complete-word (word choices begin end)
-  ;; FIXME: Only needed when completion-at-point doesn't exist.
   "Complete WORD from CHOICES.
 Any match found replaces the text from BEGIN to END."
   (let ((completion (try-completion word choices))
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index 48c6a3793ef..0327b64a33f 100644
--- a/lisp/mh-e/mh-mime.el
+++ b/lisp/mh-e/mh-mime.el
@@ -511,7 +511,7 @@ decoding the same message multiple times."
   (when mh-decode-mime-flag
     (save-excursion
       (let ((buffer-read-only nil))
-        (rfc2047-decode-region (progn (mh-goto-header-field "subject:") (point))
+        (rfc2047-decode-region (progn (mh-goto-header-field "Subject:") (point))
                                (progn (mh-header-field-end) (point)))))))
 
 ;;;###mh-autoload
@@ -835,7 +835,7 @@ being used to highlight the signature in a MIME part."
 ;;; Button Display
 
 ;; Shush compiler.
-(when (featurep 'xemacs)
+(mh-do-in-xemacs
   (defvar dots)
   (defvar type)
   (defvar ov))
@@ -885,7 +885,8 @@ by commands like \"K v\" which operate on individual MIME parts."
 ;; Shush compiler.
 (defvar mm-verify-function-alist)       ; < Emacs 22
 (defvar mm-decrypt-function-alist)      ; < Emacs 22
-(defvar pressed-details)                ; XEmacs
+(mh-do-in-xemacs
+  (defvar pressed-details))
 
 (defun mh-insert-mime-security-button (handle)
   "Display buttons for PGP message, HANDLE."
@@ -1689,19 +1690,19 @@ buffer, while END defaults to the end of the buffer."
   (unless begin (setq begin (point-min)))
   (unless end (setq end (point-max)))
   (save-excursion
-    (block 'search-for-mh-directive
+    (block search-for-mh-directive
       (goto-char begin)
       (while (re-search-forward "^#" end t)
         (let ((s (buffer-substring-no-properties
                   (point) (mh-line-end-position))))
           (cond ((equal s ""))
                 ((string-match "^forw[ \t\n]+" s)
-                 (return-from 'search-for-mh-directive t))
+                 (return-from search-for-mh-directive t))
                 (t (let ((first-token (car (split-string s "[ \t;@]"))))
                      (when (and first-token
                                 (string-match mh-media-type-regexp
                                               first-token))
-                       (return-from 'search-for-mh-directive t)))))))
+                       (return-from search-for-mh-directive t)))))))
       nil)))
 
 (defun mh-minibuffer-read-type (filename &optional default)
diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el
index a90a26ab2a4..a547dd8d80a 100644
--- a/lisp/mh-e/mh-search.el
+++ b/lisp/mh-e/mh-search.el
@@ -321,7 +321,8 @@ folder containing the index search results."
                        count (> (hash-table-count msg-hash) 0)))))))
 
 ;; Shush compiler.
-(defvar pick-folder)                    ; XEmacs
+(mh-do-in-xemacs
+  (defvar pick-folder))
 
 (defun mh-search-folder (folder window-config)
   "Search FOLDER for messages matching a pattern.
@@ -401,8 +402,9 @@ or nothing to search all folders."
   (mh-index-sequenced-messages folders mh-tick-seq))
 
 ;; Shush compiler.
-(defvar mh-mairix-folder)               ; XEmacs
-(defvar mh-flists-search-folders)       ; XEmacs
+(mh-do-in-xemacs
+  (defvar mh-mairix-folder)
+  (defvar mh-flists-search-folders))
 
 ;;;###mh-autoload
 (defun mh-index-sequenced-messages (folders sequence)
@@ -452,12 +454,12 @@ search all folders."
 
 (defvar mh-flists-search-folders)
 
-(defun mh-flists-execute (&rest args)
+(defun mh-flists-execute (&rest ignored)
   "Execute flists.
 Search for messages belonging to `mh-flists-sequence' in the
 folders specified by `mh-flists-search-folders'. If
 `mh-recursive-folders-flag' is t, then the folders are searched
-recursively. All parameters ARGS are ignored."
+recursively. All arguments are IGNORED."
   (set-buffer (get-buffer-create mh-temp-index-buffer))
   (erase-buffer)
   (unless (executable-find "sh")
@@ -1442,7 +1444,8 @@ being the list of messages originally from that folder."
   mh-index-data)
 
 ;; Shush compiler
-(defvar mh-speed-flists-inhibit-flag)   ; XEmacs
+(mh-do-in-xemacs
+  (defvar mh-speed-flists-inhibit-flag))
 
 ;;;###mh-autoload
 (defun mh-index-execute-commands ()
diff --git a/lisp/mh-e/mh-seq.el b/lisp/mh-e/mh-seq.el
index 145b689c6b9..fc3e5c08143 100644
--- a/lisp/mh-e/mh-seq.el
+++ b/lisp/mh-e/mh-seq.el
@@ -198,7 +198,8 @@ MESSAGE appears."
                         " "))))
 
 ;; Shush compiler.
-(defvar tool-bar-mode)                  ; XEmacs
+(mh-do-in-xemacs
+  (defvar tool-bar-mode))
 (defvar tool-bar-map)
 
 ;;;###mh-autoload
diff --git a/lisp/mh-e/mh-show.el b/lisp/mh-e/mh-show.el
index 5c2f08cefe5..7b5593ba608 100644
--- a/lisp/mh-e/mh-show.el
+++ b/lisp/mh-e/mh-show.el
@@ -146,9 +146,7 @@ displayed."
             (if (not clean-message-header)
                 (mh-start-of-uncleaned-message)))
         (mh-display-msg msg folder)))
-    (unless (if (fboundp 'window-full-height-p)
-                (window-full-height-p)
-              (= (1+ (window-height)) (frame-height))) ; not vertically split
+    (unless (mh-window-full-height-p) ; not vertically split
       (shrink-window (- (window-height) (or mh-summary-height
                                             (mh-summary-height)))))
     (mh-recenter nil)
diff --git a/lisp/mh-e/mh-speed.el b/lisp/mh-e/mh-speed.el
index b782081c85c..5c3679e8ce6 100644
--- a/lisp/mh-e/mh-speed.el
+++ b/lisp/mh-e/mh-speed.el
@@ -126,9 +126,9 @@ With non-nil FORCE, the update is always carried out."
         ;; Otherwise on to your regular programming
         (t t)))
 
-(defun mh-speed-toggle (&rest args)
+(defun mh-speed-toggle (&rest ignored)
   "Toggle the display of child folders in the speedbar.
-The optional ARGS from speedbar are ignored."
+The optional arguments from speedbar are IGNORED."
   (interactive)
   (declare (ignore args))
   (beginning-of-line)
@@ -165,9 +165,9 @@ The optional ARGS from speedbar are ignored."
               (mh-line-beginning-position) (1+ (line-beginning-position))
               `(mh-expanded t)))))))
 
-(defun mh-speed-view (&rest args)
+(defun mh-speed-view (&rest ignored)
   "Visits the selected folder just as if you had used \\<mh-folder-mode-map>\\[mh-visit-folder].
-The optional ARGS from speedbar are ignored."
+The optional arguments from speedbar are IGNORED."
   (interactive)
   (declare (ignore args))
   (let* ((folder (get-text-property (mh-line-beginning-position) 'mh-folder))
diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el
index 4394e1b1b22..6132af17dab 100644
--- a/lisp/mh-e/mh-utils.el
+++ b/lisp/mh-e/mh-utils.el
@@ -596,7 +596,6 @@ Expects FOLDER to have already been normalized with
                   (setq name (substring name 0 (1- (length name)))))
                 (push
                  (cons name
-                       ;; FIXME: what is this used for?  --Stef
                        (search-forward "(others)" (mh-line-end-position) t))
                  results))))
           (forward-line 1))))
@@ -732,8 +731,9 @@ See Info node `(elisp) Programmed Completion' for details."
                    (t (file-directory-p path))))))))
 
 ;; Shush compiler.
-(defvar completion-root-regexp)          ; XEmacs
-(defvar minibuffer-completing-file-name) ; XEmacs
+(mh-do-in-xemacs
+  (defvar completion-root-regexp)
+  (defvar minibuffer-completing-file-name))
 
 (defun mh-folder-completing-read (prompt default allow-root-folder-flag)
   "Read folder name with PROMPT and default result DEFAULT.
diff --git a/lisp/mh-e/mh-xface.el b/lisp/mh-e/mh-xface.el
index 027d79a948a..179b552d536 100644
--- a/lisp/mh-e/mh-xface.el
+++ b/lisp/mh-e/mh-xface.el
@@ -125,7 +125,8 @@ in this order is used."
 (defun mh-face-to-png (data)
   "Convert base64 encoded DATA to png image."
   (with-temp-buffer
-    (set-buffer-multibyte nil)
+    (if (fboundp 'set-buffer-multibyte)
+        (set-buffer-multibyte nil))
     (insert data)
     (ignore-errors (base64-decode-region (point-min) (point-max)))
     (buffer-string)))
@@ -133,7 +134,8 @@ in this order is used."
 (defun mh-uncompface (data)
   "Run DATA through `uncompface' to generate bitmap."
   (with-temp-buffer
-    (set-buffer-multibyte nil)
+    (if (fboundp 'set-buffer-multibyte)
+        (set-buffer-multibyte nil))
     (insert data)
     (when (and mh-uncompface-executable
                (equal (call-process-region (point-min) (point-max)
@@ -205,7 +207,7 @@ The directories are searched for in the order they appear in the list.")
       (cond (cached-value (return-from mh-picon-get-image cached-value))
             ((not host-list) (return-from mh-picon-get-image nil)))
       (setq match
-            (block 'loop
+            (block loop
               ;; u@h search
               (loop for dir in mh-picon-existing-directory-list
                     do (loop for type in mh-picon-image-types
@@ -213,15 +215,15 @@ The directories are searched for in the order they appear in the list.")
                              for file1 = (format "%s/%s.%s"
                                                  dir canonical-address type)
                              when (file-exists-p file1)
-                             do (return-from 'loop file1)
+                             do (return-from loop file1)
                              ;; [path]user
                              for file2 = (format "%s/%s.%s" dir user type)
                              when (file-exists-p file2)
-                             do (return-from 'loop file2)
+                             do (return-from loop file2)
                              ;; [path]host
                              for file3 = (format "%s/%s.%s" dir host type)
                              when (file-exists-p file3)
-                             do (return-from 'loop file3)))
+                             do (return-from loop file3)))
               ;; facedb search
               ;; Search order for user@foo.net:
               ;;   [path]net/foo/user
@@ -239,11 +241,11 @@ The directories are searched for in the order they appear in the list.")
                                       do (loop for type in mh-picon-image-types
                                                for z1 = (format "%s.%s" y type)
                                                when (file-exists-p z1)
-                                               do (return-from 'loop z1)
+                                               do (return-from loop z1)
                                                for z2 = (format "%s/face.%s"
                                                                 y type)
                                                when (file-exists-p z2)
-                                               do (return-from 'loop z2)))))))
+                                               do (return-from loop z2)))))))
       (setf (gethash canonical-address mh-picon-cache)
             (mh-picon-file-contents match)))))
 
@@ -271,7 +273,8 @@ file contents as a string is returned. If FILE is nil, then both
 elements of the list are nil."
   (if (stringp file)
       (with-temp-buffer
-        (set-buffer-multibyte nil)
+        (if (fboundp 'set-buffer-multibyte)
+            (set-buffer-multibyte nil))
         (let ((type (and (string-match ".*\\.\\(...\\)$" file)
                          (intern (match-string 1 file)))))
           (insert-file-contents-literally file)
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 32ddfe99707..d62b377954d 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1442,7 +1442,9 @@ we entered `completion-in-region-mode'.")
 (defun completion-in-region (start end collection &optional predicate)
   "Complete the text between START and END using COLLECTION.
 Return nil if there is no valid completion, else t.
-Point needs to be somewhere between START and END."
+Point needs to be somewhere between START and END.
+PREDICATE (a function called with no arguments) says when to
+exit."
   (assert (<= start (point)) (<= (point) end))
   (with-wrapper-hook
       ;; FIXME: Maybe we should use this hook to provide a "display
@@ -1634,30 +1636,43 @@ The completion method is determined by `completion-at-point-functions'."
 
 ;;; Key bindings.
 
-(define-obsolete-variable-alias 'minibuffer-local-must-match-filename-map
-  'minibuffer-local-filename-must-match-map "23.1")
-
 (let ((map minibuffer-local-map))
   (define-key map "\C-g" 'abort-recursive-edit)
   (define-key map "\r" 'exit-minibuffer)
   (define-key map "\n" 'exit-minibuffer))
 
-(let ((map minibuffer-local-completion-map))
-  (define-key map "\t" 'minibuffer-complete)
-  ;; M-TAB is already abused for many other purposes, so we should find
-  ;; another binding for it.
-  ;; (define-key map "\e\t" 'minibuffer-force-complete)
-  (define-key map " " 'minibuffer-complete-word)
-  (define-key map "?" 'minibuffer-completion-help))
+(defvar minibuffer-local-completion-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map minibuffer-local-map)
+    (define-key map "\t" 'minibuffer-complete)
+    ;; M-TAB is already abused for many other purposes, so we should find
+    ;; another binding for it.
+    ;; (define-key map "\e\t" 'minibuffer-force-complete)
+    (define-key map " " 'minibuffer-complete-word)
+    (define-key map "?" 'minibuffer-completion-help)
+    map)
+  "Local keymap for minibuffer input with completion.")
+
+(defvar minibuffer-local-must-match-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map minibuffer-local-completion-map)
+    (define-key map "\r" 'minibuffer-complete-and-exit)
+    (define-key map "\n" 'minibuffer-complete-and-exit)
+    map)
+  "Local keymap for minibuffer input with completion, for exact match.")
 
-(let ((map minibuffer-local-must-match-map))
-  (define-key map "\r" 'minibuffer-complete-and-exit)
-  (define-key map "\n" 'minibuffer-complete-and-exit))
+(defvar minibuffer-local-filename-completion-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map " " nil)
+    map)
+  "Local keymap for minibuffer input with completion for filenames.
+Gets combined either with `minibuffer-local-completion-map' or
+with `minibuffer-local-must-match-map'.")
 
-(let ((map minibuffer-local-filename-completion-map))
-  (define-key map " " nil))
-(let ((map minibuffer-local-filename-must-match-map))
-  (define-key map " " nil))
+(defvar minibuffer-local-filename-must-match-map (make-sparse-keymap))
+(make-obsolete-variable 'minibuffer-local-filename-must-match-map nil "24.1")
+(define-obsolete-variable-alias 'minibuffer-local-must-match-filename-map
+  'minibuffer-local-filename-must-match-map "23.1")
 
 (let ((map minibuffer-local-ns-map))
   (define-key map " " 'exit-minibuffer)
@@ -2732,13 +2747,22 @@ See `completing-read' for the meaning of the arguments."
          (minibuffer-completion-predicate predicate)
          (minibuffer-completion-confirm (unless (eq require-match t)
                                           require-match))
-         (keymap (if require-match
-                     (if (memq minibuffer-completing-file-name '(nil lambda))
+         (base-keymap (if require-match
                          minibuffer-local-must-match-map
-                       minibuffer-local-filename-must-match-map)
-                   (if (memq minibuffer-completing-file-name '(nil lambda))
-                       minibuffer-local-completion-map
-                     minibuffer-local-filename-completion-map)))
+                        minibuffer-local-completion-map))
+         (keymap (if (memq minibuffer-completing-file-name '(nil lambda))
+                     base-keymap
+                   ;; Layer minibuffer-local-filename-completion-map
+                   ;; on top of the base map.
+                   ;; Use make-composed-keymap so that set-keymap-parent
+                   ;; doesn't modify minibuffer-local-filename-completion-map.
+                   (let ((map (make-composed-keymap
+                               minibuffer-local-filename-completion-map)))
+                     ;; Set base-keymap as the parent, so that nil bindings
+                     ;; in minibuffer-local-filename-completion-map can
+                     ;; override bindings in base-keymap.
+                     (set-keymap-parent map base-keymap)
+                     map)))
          (result (read-from-minibuffer prompt initial-input keymap
                                        nil hist def inherit-input-method)))
     (when (and (equal result "") def)
diff --git a/lisp/mouse-sel.el b/lisp/mouse-sel.el
index 1f601377ad4..50d221b6fa0 100644
--- a/lisp/mouse-sel.el
+++ b/lisp/mouse-sel.el
@@ -202,14 +202,10 @@ If nil, point will always be placed at the beginning of the region."
 With prefix ARG, turn Mouse Sel mode on if and only if ARG is positive.
 Returns the new status of Mouse Sel mode (non-nil means on).
 
-When Mouse Sel mode is enabled, mouse selection is enhanced in various ways:
+When Mouse Sel mode is enabled, mouse selection is enhanced in
+various ways:
 
-- Clicking mouse-1 starts (cancels) selection, dragging extends it.
-
-- Clicking or dragging mouse-3 extends the selection as well.
-
-- Double-clicking on word constituents selects words.
-Double-clicking on symbol constituents selects symbols.
+- Double-clicking on symbol constituents selects symbols.
 Double-clicking on quotes or parentheses selects sexps.
 Double-clicking on whitespace selects whitespace.
 Triple-clicking selects lines.
@@ -224,14 +220,8 @@ mouse-sel sets the variables `interprogram-cut-function' and
 - Clicking mouse-2 inserts the contents of the primary selection at
 the mouse position (or point, if `mouse-yank-at-point' is non-nil).
 
-- Pressing mouse-2 while selecting or extending copies selection
-to the kill ring.  Pressing mouse-1 or mouse-3 kills it.
-
-- Double-clicking mouse-3 also kills selection.
-
-- M-mouse-1, M-mouse-2 & M-mouse-3 work similarly to mouse-1, mouse-2
-& mouse-3, but operate on the X secondary selection rather than the
-primary selection and region."
+- mouse-2 while selecting or extending copies selection to the
+kill ring; mouse-1 or mouse-3 kills it."
   :global t
   :group 'mouse-sel
   (if mouse-sel-mode
@@ -286,8 +276,17 @@ primary selection and region."
   (setq mouse-secondary-overlay (make-overlay 1 1))
   (overlay-put mouse-secondary-overlay 'face 'secondary-selection))
 
+(defconst mouse-sel-primary-overlay
+  (let ((ol (make-overlay (point-min) (point-min))))
+    (delete-overlay ol)
+    (overlay-put ol 'face 'region)
+    ol)
+  "An overlay which records the current primary selection.
+This is used by Mouse Sel mode only.")
+
 (defconst mouse-sel-selection-alist
-  '((SECONDARY mouse-secondary-overlay mouse-sel-secondary-thing))
+  '((PRIMARY mouse-sel-primary-overlay mouse-sel-primary-thing)
+    (SECONDARY mouse-secondary-overlay mouse-sel-secondary-thing))
   "Alist associating selections with variables.
 Each element is of the form:
 
diff --git a/lisp/mouse.el b/lisp/mouse.el
index f35069763bd..63395619f44 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -687,7 +687,9 @@ This should be bound to a mouse click event type."
 
 (defun mouse-set-region (click)
   "Set the region to the text dragged over, and copy to kill ring.
-This should be bound to a mouse drag event."
+This should be bound to a mouse drag event.
+See the `mouse-drag-copy-region' variable to control whether this
+command alters the kill ring or not."
   (interactive "e")
   (mouse-minibuffer-check click)
   (select-window (posn-window (event-start click)))
@@ -2092,17 +2094,19 @@ choose a font."
 (global-set-key [double-mouse-1] 'mouse-set-point)
 (global-set-key [triple-mouse-1] 'mouse-set-point)
 
-;; Clicking on the fringes causes hscrolling:
-(global-set-key [left-fringe mouse-1]   'mouse-set-point)
-(global-set-key [right-fringe mouse-1]  'mouse-set-point)
+(defun mouse--strip-first-event (_prompt)
+  (substring (this-single-command-raw-keys) 1))
+
+(define-key function-key-map [left-fringe mouse-1] 'mouse--strip-first-event)
+(define-key function-key-map [right-fringe mouse-1] 'mouse--strip-first-event)
 
 (global-set-key [mouse-2]       'mouse-yank-primary)
 ;; Allow yanking also when the corresponding cursor is "in the fringe".
-(global-set-key [right-fringe mouse-2] 'mouse-yank-at-click)
-(global-set-key [left-fringe mouse-2] 'mouse-yank-at-click)
+(define-key function-key-map [right-fringe mouse-2] 'mouse--strip-first-event)
+(define-key function-key-map [left-fringe mouse-2] 'mouse--strip-first-event)
 (global-set-key [mouse-3]       'mouse-save-then-kill)
-(global-set-key [right-fringe mouse-3]  'mouse-save-then-kill)
-(global-set-key [left-fringe mouse-3]   'mouse-save-then-kill)
+(define-key function-key-map [right-fringe mouse-3] 'mouse--strip-first-event)
+(define-key function-key-map [left-fringe mouse-3] 'mouse--strip-first-event)
 
 ;; By binding these to down-going events, we let the user use the up-going
 ;; event to make the selection, saving a click.
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index ac12030471e..e18b42a275f 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -214,13 +214,7 @@
 
 ;;;###autoload
 (defcustom browse-url-browser-function
-  (cond
-   ((memq system-type '(windows-nt ms-dos cygwin))
-    'browse-url-default-windows-browser)
-   ((memq system-type '(darwin))
-    'browse-url-default-macosx-browser)
-   (t
-    'browse-url-default-browser))
+  'browse-url-default-browser
   "Function to display the current buffer in a WWW browser.
 This is used by the `browse-url-at-point', `browse-url-at-mouse', and
 `browse-url-of-file' commands.
@@ -908,12 +902,13 @@ a random existing one.  A non-nil interactive prefix argument reverses
 the effect of `browse-url-new-window-flag'.
 
 When called non-interactively, optional second argument NEW-WINDOW is
-used instead of `browse-url-new-window-flag'.
-
-The order attempted is gnome-moz-remote, Mozilla, Firefox,
-Galeon, Konqueror, Netscape, Mosaic, Lynx in an xterm, and then W3."
+used instead of `browse-url-new-window-flag'."
   (apply
    (cond
+    ((memq system-type '(windows-nt ms-dos cygwin))
+     'browse-url-default-windows-browser)
+    ((memq system-type '(darwin))
+     'browse-url-default-macosx-browser)
     ((browse-url-can-use-xdg-open) 'browse-url-xdg-open)
     ((executable-find browse-url-gnome-moz-program) 'browse-url-gnome-moz)
     ((executable-find browse-url-mozilla-program) 'browse-url-mozilla)
diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el
index a8989398e15..bb09d8945c9 100644
--- a/lisp/net/network-stream.el
+++ b/lisp/net/network-stream.el
@@ -98,6 +98,10 @@ values:
 
 :end-of-command specifies a regexp matching the end of a command.
 
+:end-of-capability specifies a regexp matching the end of the
+  response to the command specified for :capability-command.
+  It defaults to the regexp specified for :end-of-command.
+
 :success specifies a regexp matching a message indicating a
   successful STARTTLS negotiation.  For instance, the default
   should be \"^3\" for an NNTP connection.
@@ -203,11 +207,14 @@ functionality.
          (success-string     (plist-get parameters :success))
          (capability-command (plist-get parameters :capability-command))
          (eoc                (plist-get parameters :end-of-command))
+         (eo-capa            (or (plist-get parameters :end-of-capability)
+                                 eoc))
          ;; Return (STREAM GREETING CAPABILITIES RESULTING-TYPE)
          (stream (make-network-process :name name :buffer buffer
                                        :host host :service service))
          (greeting (network-stream-get-response stream start eoc))
-         (capabilities (network-stream-command stream capability-command eoc))
+         (capabilities (network-stream-command stream capability-command
+                                               eo-capa))
          (resulting-type 'plain)
          (builtin-starttls (and (fboundp 'gnutls-available-p)
                                 (gnutls-available-p)))
@@ -250,14 +257,22 @@ functionality.
         ;; Requery capabilities for protocols that require it; i.e.,
         ;; EHLO for SMTP.
         (when (plist-get parameters :always-query-capabilities)
-          (network-stream-command stream capability-command eoc)))
+          (network-stream-command stream capability-command eo-capa)))
       (when (string-match success-string
                           (network-stream-command stream starttls-command eoc))
         ;; The server said it was OK to begin STARTTLS negotiations.
         (if builtin-starttls
             (let ((cert (network-stream-certificate host service parameters)))
-              (gnutls-negotiate :process stream :hostname host
-                                :keylist (and cert (list cert))))
+              (condition-case nil
+                  (gnutls-negotiate :process stream :hostname host
+                                    :keylist (and cert (list cert)))
+                ;; If we get a gnutls-specific error (for instance if
+                ;; the certificate the server gives us is completely
+                ;; syntactically invalid), then close the connection
+                ;; and possibly (further down) try to create a
+                ;; non-encrypted connection.
+                (gnutls-error
+                 (delete-process stream))))
           (unless (starttls-negotiate stream)
             (delete-process stream)))
         (if (memq (process-status stream) '(open run))
@@ -271,21 +286,17 @@ functionality.
             (network-stream-get-response stream start eoc)))
         ;; Re-get the capabilities, which may have now changed.
         (setq capabilities
-              (network-stream-command stream capability-command eoc))))
+              (network-stream-command stream capability-command eo-capa))))
 
     ;; If TLS is mandatory, close the connection if it's unencrypted.
-    (when (and (or require-tls
-                   ;; The server said it was possible to do STARTTLS,
-                   ;; and we wanted to use it...
-                   (and starttls-command
-                        (plist-get parameters :use-starttls-if-possible)))
+    (when (and require-tls
                ;; ... but Emacs wasn't able to -- either no built-in
                ;; support, or no gnutls-cli installed.
                (eq resulting-type 'plain))
-          (setq error
-                (if require-tls
-                    "Server does not support TLS"
-                  "Server supports STARTTLS, but Emacs does not have support for it"))
+      (setq error
+            (if require-tls
+                "Server does not support TLS"
+              "Server supports STARTTLS, but Emacs does not have support for it"))
       (delete-process stream)
       (setq stream nil))
     ;; Return value:
@@ -353,7 +364,9 @@ functionality.
                                     ?p service))))))
     (list stream
           (network-stream-get-response stream start eoc)
-          (network-stream-command stream capability-command eoc)
+          (network-stream-command stream capability-command
+                                  (or (plist-get parameters :end-of-capability)
+                                      eoc))
           'plain)))
 
 (provide 'network-stream)
diff --git a/lisp/net/soap-client.el b/lisp/net/soap-client.el
index b7b0b61f4e1..42c698876cd 100644
--- a/lisp/net/soap-client.el
+++ b/lisp/net/soap-client.el
@@ -729,9 +729,7 @@ traverse an element tree."
                               (incf nprocessed)
                               (soap-resolve-references-for-element e wsdl)
                               (setf (soap-element-namespace-tag e) nstag))))))
-                 (soap-namespace-elements ns))))
-
-    (message "Processed %d" nprocessed))
+                 (soap-namespace-elements ns)))))
     wsdl)
 
 ;;;;; Loading WSDL from XML documents
@@ -1714,10 +1712,6 @@ operations in a WSDL document."
                     ;; error)
                     (warn "Error in SOAP response: HTTP code %s"
                           url-http-response-status))
-                                 (when (> (buffer-size) 1000000)
-                                   (soap-warning
-                                    "Received large message: %s bytes"
-                                    (buffer-size)))
                 (let ((mime-part (mm-dissect-buffer t t)))
                   (unless mime-part
                     (error "Failed to decode response from server"))
diff --git a/lisp/net/tramp-cmds.el b/lisp/net/tramp-cmds.el
index 764ee35d45b..fcf523a7068 100644
--- a/lisp/net/tramp-cmds.el
+++ b/lisp/net/tramp-cmds.el
@@ -100,6 +100,15 @@ When called interactively, a Tramp connection has to be selected."
       (when (bufferp buf) (kill-buffer buf)))))
 
 ;;;###tramp-autoload
+(defun tramp-cleanup-this-connection ()
+  "Flush all connection related objects of the current buffer's connection."
+  (interactive)
+  (and (stringp default-directory)
+       (file-remote-p default-directory)
+       (tramp-cleanup-connection
+        (tramp-dissect-file-name default-directory 'noexpand))))
+
+;;;###tramp-autoload
 (defun tramp-cleanup-all-connections ()
   "Flush all Tramp internal objects.
 This includes password cache, file cache, connection cache, buffers."
diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el
index 3c0642c3c78..460c9f0e118 100644
--- a/lisp/net/tramp-compat.el
+++ b/lisp/net/tramp-compat.el
@@ -23,9 +23,9 @@
 
 ;;; Commentary:
 
-;; Tramp's main Emacs version for development is GNU Emacs 24.  This
-;; package provides compatibility functions for GNU Emacs 22, GNU
-;; Emacs 23 and XEmacs 21.4+.
+;; Tramp's main Emacs version for development is Emacs 24.  This
+;; package provides compatibility functions for Emacs 22, Emacs 23,
+;; XEmacs 21.4+ and SXEmacs 22.
 
 ;;; Code:
 
@@ -286,9 +286,8 @@ Not actually used.  Use `(format \"%o\" i)' instead?"
           (tramp-compat-funcall 'file-attributes filename id-format)
         (wrong-number-of-arguments (file-attributes filename))))))
 
-;; PRESERVE-UID-GID has been introduced with Emacs 23.  It does not
-;; hurt to ignore it for other (X)Emacs versions.
-;; PRESERVE-SELINUX-CONTEXT has been introduced with Emacs 24.
+;; PRESERVE-UID-GID does not exist in XEmacs.
+;; PRESERVE-SELINUX-CONTEXT has been introduced with Emacs 24.1.
 (defun tramp-compat-copy-file
   (filename newname &optional ok-if-already-exists keep-date
             preserve-uid-gid preserve-selinux-context)
@@ -484,10 +483,7 @@ exiting if process is running."
       (tramp-compat-funcall 'set-process-query-on-exit-flag process flag)
     (tramp-compat-funcall 'process-kill-without-query process flag)))
 
-(add-hook 'tramp-unload-hook
-          (lambda ()
-            (unload-feature 'tramp-compat 'force)))
-
+;; There exist different implementations for this function.
 (defun tramp-compat-coding-system-change-eol-conversion (coding-system eol-type)
   "Return a coding system like CODING-SYSTEM but with given EOL-TYPE.
 EOL-TYPE can be one of `dos', `unix', or `mac'."
@@ -506,6 +502,10 @@ EOL-TYPE can be one of `dos', `unix', or `mac'."
                         "`dos', `unix', or `mac'")))))
         (t (error "Can't change EOL conversion -- is MULE missing?"))))
 
+(add-hook 'tramp-unload-hook
+          (lambda ()
+            (unload-feature 'tramp-compat 'force)))
+
 (provide 'tramp-compat)
 
 ;;; TODO:
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index e340ddc6cb0..1c6f0844be0 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -66,6 +66,9 @@ files conditionalize this setup based on the TERM environment variable."
   :group 'tramp
   :type 'string)
 
+(defconst tramp-color-escape-sequence-regexp "\e[[;0-9]+m"
+  "Escape sequences produced by the \"ls\" command.")
+
 ;; ksh on OpenBSD 4.5 requires that $PS1 contains a `#' character for
 ;; root users.  It uses the `$' character for other users.  In order
 ;; to guarantee a proper prompt, we use "#$ " for the prompt.
@@ -484,7 +487,7 @@ detected as prompt when being sent on echoing hosts, therefore.")
 ;; FreeBSD: /usr/bin:/bin:/usr/sbin:/sbin: - beware trailing ":"!
 ;; IRIX64: /usr/bin
 (defcustom tramp-remote-path
-  '(tramp-default-remote-path "/usr/sbin" "/usr/local/bin"
+  '(tramp-default-remote-path "/bin" "/usr/bin" "/usr/sbin" "/usr/local/bin"
     "/local/bin" "/local/freeware/bin" "/local/gnu/bin"
     "/usr/freeware/bin" "/usr/pkg/bin" "/usr/contrib/bin")
   "*List of directories to search for executables on remote host.
@@ -2582,6 +2585,12 @@ This is like `dired-recursive-delete-directory' for Tramp files."
           (forward-line 1)
           (delete-region (match-beginning 0) (point)))
 
+        ;; Some busyboxes are reluctant to discard colors.
+        (unless (string-match "color" (tramp-get-connection-property v "ls" ""))
+          (goto-char beg)
+          (while (re-search-forward tramp-color-escape-sequence-regexp nil t)
+            (replace-match "")))
+
         ;; The inserted file could be from somewhere else.
         (when (and (not wildcard) (not full-directory-p))
           (goto-char (point-max))
@@ -2669,6 +2678,7 @@ the result will be a local, non-Tramp, filename."
     (let ((vec (tramp-get-connection-property proc "vector" nil)))
       (when vec
         (tramp-message vec 5 "Sentinel called: `%s' `%s'" proc event)
+        (tramp-flush-connection-property proc)
         (tramp-flush-directory-property vec "")))))
 
 ;; We use BUFFER also as connection buffer during setup. Because of
@@ -2680,8 +2690,13 @@ the result will be a local, non-Tramp, filename."
     ;; When PROGRAM is nil, we just provide a tty.
     (let ((command
            (when (stringp program)
-             (format "cd %s; exec %s"
+             (format "cd %s; exec env PS1=%s %s"
                      (tramp-shell-quote-argument localname)
+                     ;; Use a human-friendly prompt, for example for `shell'.
+                     (tramp-shell-quote-argument
+                      (format "%s %s"
+                              (file-remote-p default-directory)
+                              tramp-initial-end-of-output))
                      (mapconcat 'tramp-shell-quote-argument
                                 (cons program args) " "))))
           (tramp-process-connection-type
@@ -2721,9 +2736,7 @@ the result will be a local, non-Tramp, filename."
                        v 'file-error
                        "pty association is not supported for `%s'" name)))))
               (let ((p (tramp-get-connection-process v)))
-                ;; Set sentinel and query flag for this process.
-                (tramp-set-connection-property p "vector" v)
-                (set-process-sentinel p 'tramp-process-sentinel)
+                ;; Set query flag for this process.
                 (tramp-compat-set-process-query-on-exit-flag p t)
                 ;; Return process.
                 p)))
@@ -3834,10 +3847,9 @@ process to set up.  VEC specifies the connection."
     (tramp-send-command vec "stty -oxtabs" t))
 
   ;; Set `remote-tty' process property.
-  (ignore-errors
-    (let ((tty (tramp-send-command-and-read vec "echo \\\"`tty`\\\"")))
-      (unless (zerop (length tty))
-        (tramp-compat-process-put proc 'remote-tty tty))))
+  (let ((tty (tramp-send-command-and-read vec "echo \\\"`tty`\\\"" 'noerror)))
+    (unless (zerop (length tty))
+      (tramp-compat-process-put proc 'remote-tty tty)))
 
   ;; Dump stty settings in the traces.
   (when (>= tramp-verbose 9)
@@ -4291,16 +4303,24 @@ connection if a previous connection has died for some reason."
                  ;; This must be done in order to avoid our file name handler.
                  (p (let ((default-directory
                             (tramp-compat-temporary-file-directory)))
-                      (start-process
+                      (apply
+                       'start-process
                        (tramp-get-connection-name vec)
                        (tramp-get-connection-buffer vec)
-                       tramp-encoding-shell))))
+                       (if tramp-encoding-command-interactive
+                           (list tramp-encoding-shell
+                                 tramp-encoding-command-interactive)
+                         (list tramp-encoding-shell))))))
+
+            ;; Set sentinel and query flag.
+            (tramp-set-connection-property p "vector" vec)
+            (set-process-sentinel p 'tramp-process-sentinel)
+            (tramp-compat-set-process-query-on-exit-flag p nil)
 
             (tramp-message
              vec 6 "%s" (mapconcat 'identity (process-command p) " "))
 
             ;; Check whether process is alive.
-            (tramp-compat-set-process-query-on-exit-flag p nil)
             (tramp-barf-if-no-shell-prompt
              p 60 "Couldn't find local shell prompt %s" tramp-encoding-shell)
 
@@ -4488,9 +4508,10 @@ FMT and ARGS which are passed to `error'."
   (unless (tramp-send-command-and-check vec command)
     (apply 'tramp-error vec 'file-error fmt args)))
 
-(defun tramp-send-command-and-read (vec command)
+(defun tramp-send-command-and-read (vec command &optional noerror)
   "Run COMMAND and return the output, which must be a Lisp expression.
-In case there is no valid Lisp expression, it raises an error"
+In case there is no valid Lisp expression and NOERROR is nil, it
+raises an error."
   (tramp-barf-unless-okay vec command "`%s' returns with error" command)
   (with-current-buffer (tramp-get-connection-buffer vec)
     ;; Read the expression.
@@ -4500,16 +4521,21 @@ In case there is no valid Lisp expression, it raises an error"
           ;; Error handling.
           (when (re-search-forward "\\S-" (point-at-eol) t)
             (error nil)))
-      (error (tramp-error
-              vec 'file-error
-              "`%s' does not return a valid Lisp expression: `%s'"
-              command (buffer-string))))))
+      (error (unless noerror
+               (tramp-error
+                vec 'file-error
+                "`%s' does not return a valid Lisp expression: `%s'"
+                command (buffer-string)))))))
 
 (defun tramp-convert-file-attributes (vec attr)
   "Convert file-attributes ATTR generated by perl script, stat or ls.
 Convert file mode bits to string and set virtual device number.
 Return ATTR."
   (when attr
+    ;; Remove color escape sequences from symlink.
+    (when (stringp (car attr))
+      (while (string-match tramp-color-escape-sequence-regexp (car attr))
+        (setcar attr (replace-match "" nil nil (car attr)))))
     ;; Convert last access time.
     (unless (listp (nth 4 attr))
       (setcar (nthcdr 4 attr)
@@ -4687,8 +4713,7 @@ This is used internally by `tramp-file-mode-from-int'."
              (when elt1
                (or
                 (tramp-send-command-and-read
-                 vec
-                 "x=`getconf PATH 2>/dev/null` && echo \\\"$x\\\" || echo nil")
+                 vec "echo \\\"`getconf PATH 2>/dev/null`\\\"" 'noerror)
                 ;; Default if "getconf" is not available.
                 (progn
                   (tramp-message
@@ -4850,15 +4875,12 @@ This is used internally by `tramp-file-mode-from-int'."
     (let ((result (tramp-find-executable
                    vec "stat" (tramp-get-remote-path vec)))
           tmp)
-      ;; Check whether stat(1) returns usable syntax.  %s does not
+      ;; Check whether stat(1) returns usable syntax.  "%s" does not
       ;; work on older AIX systems.
       (when result
         (setq tmp
-              ;; We don't want to display an error message.
-              (tramp-compat-with-temp-message (or (current-message) "")
-                (ignore-errors
-                  (tramp-send-command-and-read
-                   vec (format "%s -c '(\"%%N\" %%s)' /" result)))))
+              (tramp-send-command-and-read
+               vec (format "%s -c '(\"%%N\" %%s)' /" result) 'noerror))
         (unless (and (listp tmp) (stringp (car tmp))
                      (string-match "^./.$" (car tmp))
                      (integerp (cadr tmp)))
@@ -4871,11 +4893,8 @@ This is used internally by `tramp-file-mode-from-int'."
     (let ((result (tramp-find-executable
                    vec "readlink" (tramp-get-remote-path vec))))
       (when (and result
-                 ;; We don't want to display an error message.
-                 (tramp-compat-with-temp-message (or (current-message) "")
-                   (ignore-errors
-                     (tramp-send-command-and-check
-                      vec (format "%s --canonicalize-missing /" result)))))
+                 (tramp-send-command-and-check
+                  vec (format "%s --canonicalize-missing /" result)))
         result))))
 
 (defun tramp-get-remote-trash (vec)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 9aff06031fc..82d878a6fa8 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -159,6 +159,9 @@ For encoding and deocding, commands like the following are executed:
 This variable can be used to change the \"/bin/sh\" part.  See the
 variable `tramp-encoding-command-switch' for the \"-c\" part.
 
+If the shell must be forced to be interactive, see
+`tramp-encoding-command-interactive'.
+
 Note that this variable is not used for remote commands.  There are
 mechanisms in tramp.el which automatically determine the right shell to
 use for the remote host."
@@ -174,6 +177,13 @@ See the variable `tramp-encoding-shell' for more information."
   :group 'tramp
   :type 'string)
 
+(defcustom tramp-encoding-command-interactive
+  (unless (string-match "cmd\\.exe" tramp-encoding-shell) "-i")
+  "*Use this switch together with `tramp-encoding-shell' for interactive shells.
+See the variable `tramp-encoding-shell' for more information."
+  :group 'tramp
+  :type '(choice (const nil) string))
+
 ;;;###tramp-autoload
 (defvar tramp-methods nil
   "*Alist of methods for remote files.
diff --git a/lisp/nxml/rng-maint.el b/lisp/nxml/rng-maint.el
index d31740f0ca2..bd5b3136d54 100644
--- a/lisp/nxml/rng-maint.el
+++ b/lisp/nxml/rng-maint.el
@@ -224,19 +224,13 @@
 
 ;;; Timing
 
-(defun rng-time-to-float (time)
-  (+ (* (nth 0 time) 65536.0)
-     (nth 1 time)
-     (/ (nth 2 time) 1000000.0)))
-
 (defun rng-time-function (function &rest args)
   (let* ((start (current-time))
          (val (apply function args))
          (end (current-time)))
     (message "%s ran in %g seconds"
              function
-             (- (rng-time-to-float end)
-                (rng-time-to-float start)))
+             (float-time (time-subtract end start)))
     val))
 
 (defun rng-time-tokenize-buffer ()
diff --git a/lisp/obsolete/old-emacs-lock.el b/lisp/obsolete/old-emacs-lock.el
new file mode 100644
index 00000000000..b45003fcecc
--- /dev/null
+++ b/lisp/obsolete/old-emacs-lock.el
@@ -0,0 +1,102 @@
+;;; emacs-lock.el --- prevents you from exiting Emacs if a buffer is locked
+
+;; Copyright (C) 1994, 1997, 2001-2011 Free Software Foundation, Inc
+
+;; Author: Tom Wurgler <twurgler@goodyear.com>
+;; Created: 12/8/94
+;; Keywords: extensions, processes
+;; Obsolete-since: 24.1
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; This code sets a buffer-local variable to t if toggle-emacs-lock is run,
+;; then if the user attempts to exit Emacs, the locked buffer name will be
+;; displayed and the exit aborted.  This is just a way of protecting
+;; yourself from yourself.  For example, if you have a shell running a big
+;; program and exiting Emacs would abort that program, you may want to lock
+;; that buffer, then if you forget about it after a while, you won't
+;; accidentally exit Emacs.  To unlock the buffer, just goto the buffer and
+;; run toggle-emacs-lock again.
+
+;;; Code:
+
+(defvar emacs-lock-from-exiting nil
+  "Whether Emacs is locked to prevent exiting.  See `check-emacs-lock'.")
+(make-variable-buffer-local 'emacs-lock-from-exiting)
+
+(defvar emacs-lock-buffer-locked nil
+  "Whether a shell or telnet buffer was locked when its process was killed.")
+(make-variable-buffer-local 'emacs-lock-buffer-locked)
+(put 'emacs-lock-buffer-locked 'permanent-local t)
+
+(defun check-emacs-lock ()
+  "Check if variable `emacs-lock-from-exiting' is t for any buffer.
+If any locked buffer is found, signal error and display the buffer's name."
+  (save-excursion
+    (dolist (buffer (buffer-list))
+      (set-buffer buffer)
+      (when emacs-lock-from-exiting
+        (error "Emacs is locked from exit due to buffer: %s" (buffer-name))))))
+
+(defun toggle-emacs-lock ()
+  "Toggle `emacs-lock-from-exiting' for the current buffer.
+See `check-emacs-lock'."
+  (interactive)
+  (setq emacs-lock-from-exiting (not emacs-lock-from-exiting))
+  (if emacs-lock-from-exiting
+      (message "Buffer is now locked")
+    (message "Buffer is now unlocked")))
+
+(defun emacs-lock-check-buffer-lock ()
+  "Check if variable `emacs-lock-from-exiting' is t for a buffer.
+If the buffer is locked, signal error and display its name."
+  (when emacs-lock-from-exiting
+    (error "Buffer `%s' is locked, can't delete it" (buffer-name))))
+
+; These next defuns make it so if you exit a shell that is locked,  the lock
+; is shut off for that shell so you can exit Emacs.  Same for telnet.
+; Also, if a shell or a telnet buffer was locked and the process killed,
+; turn the lock back on again if the process is restarted.
+
+(defun emacs-lock-shell-sentinel ()
+  (set-process-sentinel
+   (get-buffer-process (buffer-name)) (function emacs-lock-clear-sentinel)))
+
+(defun emacs-lock-clear-sentinel (_proc _str)
+  (if emacs-lock-from-exiting
+      (progn
+        (setq emacs-lock-from-exiting nil)
+        (setq emacs-lock-buffer-locked t)
+        (message "Buffer is now unlocked"))
+    (setq emacs-lock-buffer-locked nil)))
+
+(defun emacs-lock-was-buffer-locked ()
+  (if emacs-lock-buffer-locked
+      (setq emacs-lock-from-exiting t)))
+
+(unless noninteractive
+  (add-hook 'kill-emacs-hook 'check-emacs-lock))
+(add-hook 'kill-buffer-hook 'emacs-lock-check-buffer-lock)
+(add-hook 'shell-mode-hook 'emacs-lock-was-buffer-locked)
+(add-hook 'shell-mode-hook 'emacs-lock-shell-sentinel)
+(add-hook 'telnet-mode-hook 'emacs-lock-was-buffer-locked)
+(add-hook 'telnet-mode-hook 'emacs-lock-shell-sentinel)
+
+(provide 'emacs-lock)
+
+;;; emacs-lock.el ends here
diff --git a/lisp/pcmpl-linux.el b/lisp/pcmpl-linux.el
index 8090397627e..d75479fab3e 100644
--- a/lisp/pcmpl-linux.el
+++ b/lisp/pcmpl-linux.el
@@ -83,6 +83,19 @@
           (forward-line)))
       (pcomplete-uniqify-list points))))
 
+(defun pcomplete-pare-list (l r)
+  "Destructively remove from list L all elements matching any in list R.
+Test is done using `equal'."
+  (while (and l (and r (member (car l) r)))
+    (setq l (cdr l)))
+  (let ((m l))
+    (while m
+      (while (and (cdr m)
+                  (and r (member (cadr m) r)))
+        (setcdr m (cddr m)))
+      (setq m (cdr m))))
+  l)
+
 (defun pcmpl-linux-mountable-directories ()
   "Return a list of mountable directory names."
   (let (points)
diff --git a/lisp/play/animate.el b/lisp/play/animate.el
index 157a2fe7593..facdfa2f347 100644
--- a/lisp/play/animate.el
+++ b/lisp/play/animate.el
@@ -89,11 +89,15 @@
   (insert-char char 1))
 
 (defvar animate-n-steps 10
-  "Number of steps to use `animate-string'.")
+"*Number of steps `animate-string' will place a char before its last position.")
+
+(defvar animation-buffer-name nil
+  "*String naming the default buffer for animations.
+When nil animations dipslayed in the buffer named *Animation*.")
 
 ;;;###autoload
 (defun animate-string (string vpos &optional hpos)
-  "Display STRING starting at position VPOS, HPOS, using animation.
+  "Display STRING animations starting at position VPOS, HPOS.
 The characters start at randomly chosen places,
 and all slide in parallel to their final positions,
 passing through `animate-n-steps' positions before the final ones.
@@ -138,14 +142,19 @@ in the current window."
 
 ;;;###autoload
 (defun animate-sequence (list-of-strings space)
-  "Display strings from LIST-OF-STRING with animation in a new buffer.
-Strings will be separated from each other by SPACE lines."
+  "Display animation strings from LIST-OF-STRING with buffer *Animation*.
+Strings will be separated from each other by SPACE lines.
+ When the variable `animation-buffer-name' is non-nil display
+animation in the buffer named by variable's value, creating the
+buffer if one does not exist."
   (let ((vpos (/ (- (window-height)
                     1 ;; For the mode-line
                     (* (1- (length list-of-strings)) space)
                     (length list-of-strings))
                  2)))
-    (switch-to-buffer (get-buffer-create "*Animation*"))
+    (switch-to-buffer (get-buffer-create
+                       (or animation-buffer-name
+                           "*Animation*")))
     (erase-buffer)
     (sit-for 0)
     (while list-of-strings
@@ -155,19 +164,25 @@ Strings will be separated from each other by SPACE lines."
 
 ;;;###autoload
 (defun animate-birthday-present (&optional name)
-  "Display one's birthday present in a new buffer.
-You can specify the one's name by NAME; the default value is \"Sarah\"."
-  (interactive (list (read-string "Name (default Sarah): "
-                                  nil nil "Sarah")))
+  "Return a birthday present in the buffer *Birthday-Present*.
+When optional arg NAME is non-nil or called-interactively, prompt for
+NAME of birthday present receiver and return a birthday present in
+the buffer *Birthday-Present-for-Name*."
+  (interactive (list (read-string "Birthday present for: "
+                                  nil nil)))
   ;; Make a suitable buffer to display the birthday present in.
-  (switch-to-buffer (get-buffer-create (format "*%s*" name)))
+  (switch-to-buffer (get-buffer-create
+                     (if name
+                         (concat "*A-Present-for-" (capitalize name) "*")
+                       "*Birthday-Present*")))
   (erase-buffer)
   ;; Display the empty buffer.
   (sit-for 0)
 
-  (animate-string "Happy Birthday," 6)
-  (animate-string (format "%s" name) 7)
-
+  (if name
+      (animate-string "Happy Birthday," 6)
+      (animate-string "Happy Birthday" 6))
+  (when name (animate-string (format "%s" (capitalize name)) 7))
   (sit-for 1)
 
   (animate-string "You are my sunshine," 10 30)
diff --git a/lisp/play/hanoi.el b/lisp/play/hanoi.el
index ac78a86757c..31a6d6f425b 100644
--- a/lisp/play/hanoi.el
+++ b/lisp/play/hanoi.el
@@ -113,7 +113,7 @@ intermediate positions."
              (prefix-numeric-value current-prefix-arg))))
   (if (< nrings 0)
       (error "Negative number of rings"))
-  (hanoi-internal nrings (make-list nrings 0) (hanoi-current-time-float)))
+  (hanoi-internal nrings (make-list nrings 0) (float-time)))
 
 ;;;###autoload
 (defun hanoi-unix ()
@@ -123,7 +123,7 @@ second since 1970-01-01 00:00:00 GMT.
 
 Repent before ring 31 moves."
   (interactive)
-  (let* ((start (ftruncate (hanoi-current-time-float)))
+  (let* ((start (ftruncate (float-time)))
          (bits (loop repeat 32
                      for x = (/ start (expt 2.0 31)) then (* x 2.0)
                      collect (truncate (mod x 2.0))))
@@ -137,7 +137,7 @@ This is, necessarily (as of Emacs 20.3), a crock.  When the
 current-time interface is made s2G-compliant, hanoi.el will need
 to be updated."
   (interactive)
-  (let* ((start (ftruncate (hanoi-current-time-float)))
+  (let* ((start (ftruncate (float-time)))
          (bits (loop repeat 64
                      for x = (/ start (expt 2.0 63)) then (* x 2.0)
                      collect (truncate (mod x 2.0))))
@@ -283,11 +283,6 @@ BITS must be of length nrings.  Start at START-TIME."
     (setq buffer-read-only t)
     (force-mode-line-update)))
 
-(defun hanoi-current-time-float ()
-  "Return values from current-time combined into a single float."
-  (destructuring-bind (high low micros) (current-time)
-    (+ (* high 65536.0) low (/ micros 1000000.0))))
-
 (defun hanoi-put-face (start end value &optional object)
   "If hanoi-use-faces is non-nil, call put-text-property for face property."
   (if hanoi-use-faces
@@ -383,7 +378,7 @@ BITS must be of length nrings.  Start at START-TIME."
                     (/ (- tick flyward-ticks fly-ticks)
                        ticks-per-pole-step))))))))
     (if hanoi-move-period
-        (loop for elapsed = (- (hanoi-current-time-float) start-time)
+        (loop for elapsed = (- (float-time) start-time)
               while (< elapsed hanoi-move-period)
               with tick-period = (/ (float hanoi-move-period) total-ticks)
               for tick = (ceiling (/ elapsed tick-period)) do
diff --git a/lisp/printing.el b/lisp/printing.el
index e66cca25933..9f98c2b6e29 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -4611,7 +4611,7 @@ bottom."
 
 ;;;###autoload
 (defun pr-toggle-region ()
-  "Toggle auto region."
+  "Toggle whether the region is automagically detected."
   (interactive)
   (pr-toggle-region-menu t))
 
@@ -5346,102 +5346,119 @@ If menu binding was not done, calls `pr-menu-bind'."
 
 
 (defun pr-toggle-file-duplex-menu (&optional no-menu)
+  "Toggle whether to print PostScript files in duplex mode."
   (interactive)
   (pr-toggle 'pr-file-duplex "PS file duplex" nil 7 5 nil
              '("PostScript Print" "File") no-menu))
 
 
 (defun pr-toggle-file-tumble-menu (&optional no-menu)
+  "Toggle whether to print PostScript files in tumble mode."
   (interactive)
   (pr-toggle 'pr-file-tumble "PS file tumble" nil 8 5 nil
              '("PostScript Print" "File") no-menu))
 
 
 (defun pr-toggle-file-landscape-menu (&optional no-menu)
+  "Toggle whether to print PostScript files in landscape orientation."
   (interactive)
   (pr-toggle 'pr-file-landscape "PS file landscape" nil 6 5 nil
              '("PostScript Print" "File") no-menu))
 
 
 (defun pr-toggle-ghostscript-menu (&optional no-menu)
+  "Toggle whether to print using ghostscript."
   (interactive)
   (pr-toggle 'pr-print-using-ghostscript "Printing using ghostscript"
              'postscript-process 2 12 'toggle nil no-menu))
 
 
 (defun pr-toggle-faces-menu (&optional no-menu)
+  "Toggle whether to print with face attributes."
   (interactive)
   (pr-toggle 'pr-faces-p "Printing with faces"
              'postscript-process 1 12 'toggle nil no-menu))
 
 
 (defun pr-toggle-spool-menu (&optional no-menu)
+  "Toggle whether to spool printing in a buffer."
   (interactive)
   (pr-toggle 'pr-spool-p "Spooling printing"
              'postscript-process 0 12 'toggle nil no-menu))
 
 
 (defun pr-toggle-duplex-menu (&optional no-menu)
+  "Toggle whether to generate PostScript for a two-sided printer."
   (interactive)
   (pr-toggle 'ps-spool-duplex "Printing duplex"
              'postscript-options 5 12 'toggle nil no-menu))
 
 
 (defun pr-toggle-tumble-menu (&optional no-menu)
+  "Toggle how pages on opposite sides of a sheet are oriented."
   (interactive)
   (pr-toggle 'ps-spool-tumble "Tumble"
              'postscript-options 6 12 'toggle nil no-menu))
 
 
 (defun pr-toggle-landscape-menu (&optional no-menu)
+  "Toggle whether to print in landscape mode."
   (interactive)
   (pr-toggle 'ps-landscape-mode "Landscape"
              'postscript-options 0 12 'toggle nil no-menu))
 
 
 (defun pr-toggle-upside-down-menu (&optional no-menu)
+  "Toggle whether to print upside-down (that is, rotated by 180 degrees)."
   (interactive)
   (pr-toggle 'ps-print-upside-down "Upside-Down"
              'postscript-options 7 12 'toggle nil no-menu))
 
 
 (defun pr-toggle-line-menu (&optional no-menu)
+  "Toggle whether to means print line numbers."
   (interactive)
   (pr-toggle 'ps-line-number "Line number"
              'postscript-options 3 12 'toggle nil no-menu))
 
 
 (defun pr-toggle-zebra-menu (&optional no-menu)
+  "Toggle whether to print zebra stripes."
   (interactive)
   (pr-toggle 'ps-zebra-stripes "Zebra stripe"
              'postscript-options 4 12 'toggle nil no-menu))
 
 
 (defun pr-toggle-header-menu (&optional no-menu)
+  "Toggle whether to print a header at the top of each page."
   (interactive)
   (pr-toggle 'ps-print-header "Print header"
              'postscript-options 1 12 'toggle nil no-menu))
 
 
 (defun pr-toggle-header-frame-menu (&optional no-menu)
+  "Toggle whether to draw a gaudy frame around the header."
   (interactive)
   (pr-toggle 'ps-print-header-frame "Print header frame"
              'postscript-options 2 12 'toggle nil no-menu))
 
 
 (defun pr-toggle-lock-menu (&optional no-menu)
+  "Toggle whether the menu is locked while selecting toggle options."
   (interactive)
   (pr-toggle 'pr-menu-lock "Menu lock"
              'printing 2 12 'toggle nil no-menu))
 
 
 (defun pr-toggle-region-menu (&optional no-menu)
+  "Toggle whether the region is automagically detected."
   (interactive)
   (pr-toggle 'pr-auto-region "Auto region"
              'printing 0 12 'toggle nil no-menu))
 
 
 (defun pr-toggle-mode-menu (&optional no-menu)
+  "Toggle whether major-mode specific printing is prefered over normal printing."
   (interactive)
   (pr-toggle 'pr-auto-mode "Auto mode"
              'printing 1 12 'toggle nil no-menu))
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 0eec54fab6f..38f66b4504e 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -8712,6 +8712,35 @@ comment at the start of cc-engine.el for more info."
        (c-beginning-of-statement-1 containing-sexp)
        (c-add-syntax 'annotation-var-cont (point)))
 
+     ;; CASE G: a template list continuation?
+     ;; Mostly a duplication of case 5D.3 to fix templates-19:
+     ((and (c-major-mode-is 'c++-mode)
+           (save-excursion
+             (goto-char indent-point)
+             (c-with-syntax-table c++-template-syntax-table
+               (setq placeholder (c-up-list-backward)))
+             (and placeholder
+                  (eq (char-after placeholder) ?<)
+                  (/= (char-before placeholder) ?<)
+                  (progn
+                    (goto-char (1+ placeholder))
+                    (not (looking-at c-<-op-cont-regexp))))))
+      (c-with-syntax-table c++-template-syntax-table
+        (goto-char placeholder)
+        (c-beginning-of-statement-1 containing-sexp t)
+        (if (save-excursion
+              (c-backward-syntactic-ws containing-sexp)
+              (eq (char-before) ?<))
+            ;; In a nested template arglist.
+            (progn
+              (goto-char placeholder)
+              (c-syntactic-skip-backward "^,;" containing-sexp t)
+              (c-forward-syntactic-ws))
+          (back-to-indentation)))
+      ;; FIXME: Should use c-add-stmt-syntax, but it's not yet
+      ;; template aware.
+      (c-add-syntax 'template-args-cont (point) placeholder))
+     
      ;; CASE D: continued statement.
      (t
       (c-beginning-of-statement-1 containing-sexp)
diff --git a/lisp/progmodes/cc-guess.el b/lisp/progmodes/cc-guess.el
new file mode 100644
index 00000000000..6553021e783
--- /dev/null
+++ b/lisp/progmodes/cc-guess.el
@@ -0,0 +1,574 @@
+;;; cc-guess.el --- guess indentation values by scanning existing code
+
+;; Copyright (C) 1985, 1987, 1992-2006, 2011
+;;   Free Software Foundation, Inc.
+
+;; Author:     1994-1995 Barry A. Warsaw
+;;             2011-     Masatake YAMATO
+;; Maintainer: bug-cc-mode@gnu.org
+;; Created:    August 1994, split from cc-mode.el
+;; Version:    See cc-mode.el
+;; Keywords:   c languages oop
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;
+;; This file contains routines that help guess the cc-mode style in a
+;; particular region/buffer.  Here style means `c-offsets-alist' and
+;; `c-basic-offset'.
+;;
+;; The main entry point of this program is `c-guess' command but there
+;; are some variants.
+;;
+;; Suppose the major mode for the current buffer is one of the modes
+;; provided by cc-mode. `c-guess' guesses the indentation style by
+;; examining the indentation in the region between beginning of buffer
+;; and `c-guess-region-max'.
+
+;; and installs the guessed style. The name for installed style is given
+;; by `c-guess-style-name'.
+;;
+;; `c-guess-buffer' does the same but in the whole buffer.
+;; `c-guess-region' does the same but in the region between the point
+;; and the mark.  `c-guess-no-install', `c-guess-buffer-no-install'
+;; and `c-guess-region-no-install' guess the indentation style but
+;; don't install it. You can review a guessed style with `c-guess-view'.
+;; After reviewing, use `c-guess-install' to install the style
+;; if you prefer it.
+;;
+;; If you want to reuse the guessed style in another buffer,
+;; run `c-set-style' command with the name of the guessed style:
+;; "*c-guess*:<name-of-file-which-examined-when-guessing>".
+;; Once the guessed style is installed explicitly with `c-guess-install'
+;; or implicitly with `c-guess', `c-guess-buffer', or `c-guess-region',
+;; a style name is given by `c-guess-style-name' with the above form.
+;;
+;; If you want to reuse the guessed style in future emacs sessions,
+;; you may want to put it to your .emacs. `c-guess-view' is for
+;; you. It emits emacs lisp code which defines the last guessed
+;; style, in a temporary buffer. You can put the emitted code into
+;; your .emacs. This command was suggested by Alan Mackenzie.
+
+;;; Code:
+
+(eval-when-compile
+  (let ((load-path
+         (if (and (boundp 'byte-compile-dest-file)
+                  (stringp byte-compile-dest-file))
+             (cons (file-name-directory byte-compile-dest-file) load-path)
+           load-path)))
+    (load "cc-bytecomp" nil t)))
+
+(cc-require 'cc-defs)
+(cc-require 'cc-engine)
+(cc-require 'cc-styles)
+
+
+
+(defcustom c-guess-offset-threshold 10
+  "Threshold of acceptable offsets when examining indent information.
+Discard an examined offset if its absolute value is greater than this.
+
+The offset of a line included in the indent information returned by
+`c-guess-basic-syntax'."
+  :type 'integer
+  :group 'c)
+
+(defcustom c-guess-region-max 50000
+  "The maximum region size for examining indent information with `c-guess'.
+It takes a long time to examine indent information from a large region;
+this option helps you limit that time. `nil' means no limit."
+  :type 'integer
+  :group 'c)
+
+
+;;;###autoload
+(defvar c-guess-guessed-offsets-alist nil
+  "Currently guessed offsets-alist.")
+;;;###autoload
+(defvar c-guess-guessed-basic-offset nil
+  "Currently guessed basic-offset.")
+
+(defvar c-guess-accumulator nil)
+;; Accumulated examined indent information.  Information is represented
+;; in a list.  Each element in it has following structure:
+;;
+;; (syntactic-symbol ((indentation-offset1 . number-of-times1)
+;;                    (indentation-offset2 . number-of-times2)
+;;                    ...))
+;;
+;; This structure is built by `c-guess-accumulate-offset'.
+;;
+;; Here we call the pair (indentation-offset1 . number-of-times1) a
+;; counter.  `c-guess-sort-accumulator' sorts the order of
+;; counters by number-of-times.
+;; Use `c-guess-dump-accumulator' to see the value.
+
+(defconst c-guess-conversions
+  '((c . c-lineup-C-comments)
+    (inher-cont . c-lineup-multi-inher)
+    (string . -1000)
+    (comment-intro . c-lineup-comment)
+    (arglist-cont-nonempty . c-lineup-arglist)
+    (arglist-close . c-lineup-close-paren)
+    (cpp-macro . -1000)))
+
+
+;;;###autoload
+(defun c-guess (&optional accumulate)
+  "Guess the style in the region up to `c-guess-region-max', and install it.
+
+The style is given a name based on the file's absolute file name.
+
+If given a prefix argument (or if the optional argument ACCUMULATE is
+non-nil) then the previous guess is extended, otherwise a new guess is
+made from scratch."
+  (interactive "P")
+  (c-guess-region (point-min)
+                   (min (point-max) (or c-guess-region-max
+                                        (point-max)))
+                   accumulate))
+
+;;;###autoload
+(defun c-guess-no-install (&optional accumulate)
+  "Guess the style in the region up to `c-guess-region-max'; don't install it.
+
+If given a prefix argument (or if the optional argument ACCUMULATE is
+non-nil) then the previous guess is extended, otherwise a new guess is
+made from scratch."
+  (interactive "P")
+  (c-guess-region-no-install (point-min)
+                              (min (point-max) (or c-guess-region-max
+                                                   (point-max)))
+                              accumulate))
+
+;;;###autoload
+(defun c-guess-buffer (&optional accumulate)
+  "Guess the style on the whole current buffer, and install it.
+
+The style is given a name based on the file's absolute file name.
+
+If given a prefix argument (or if the optional argument ACCUMULATE is
+non-nil) then the previous guess is extended, otherwise a new guess is
+made from scratch."
+  (interactive "P")
+  (c-guess-region (point-min)
+                   (point-max)
+                   accumulate))
+
+;;;###autoload
+(defun c-guess-buffer-no-install (&optional accumulate)
+  "Guess the style on the whole current buffer; don't install it.
+
+If given a prefix argument (or if the optional argument ACCUMULATE is
+non-nil) then the previous guess is extended, otherwise a new guess is
+made from scratch."
+  (interactive "P")
+  (c-guess-region-no-install (point-min)
+                              (point-max)
+                              accumulate))
+
+;;;###autoload
+(defun c-guess-region (start end &optional accumulate)
+  "Guess the style on the region and install it.
+
+The style is given a name based on the file's absolute file name.
+
+If given a prefix argument (or if the optional argument ACCUMULATE is
+non-nil) then the previous guess is extended, otherwise a new guess is
+made from scratch."
+  (interactive "r\nP")
+  (c-guess-region-no-install start end accumulate)
+  (c-guess-install))
+
+
+(defsubst c-guess-empty-line-p ()
+  (eq (line-beginning-position)
+      (line-end-position)))
+
+;;;###autoload
+(defun c-guess-region-no-install (start end &optional accumulate)
+  "Guess the style on the region; don't install it.
+
+Every line of code in the region is examined and values for the following two
+variables are guessed:
+
+* `c-basic-offset', and
+* the indentation values of the various syntactic symbols in
+  `c-offsets-alist'.
+
+The guessed values are put into `c-guess-guessed-basic-offset' and
+`c-guess-guessed-offsets-alist'.
+
+Frequencies of use are taken into account when guessing, so minor
+inconsistencies in the indentation style shouldn't produce wrong guesses.
+
+If given a prefix argument (or if the optional argument ACCUMULATE is
+non-nil) then the previous examination is extended, otherwise a new
+guess is made from scratch.
+
+Note that the larger the region to guess in, the slower the guessing.
+So you can limit the region with `c-guess-region-max'."
+  (interactive "r\nP")
+  (let ((accumulator (when accumulate c-guess-accumulator)))
+    (setq c-guess-accumulator (c-guess-examine start end accumulator))
+    (let ((pair (c-guess-guess c-guess-accumulator)))
+      (setq c-guess-guessed-basic-offset (car pair)
+            c-guess-guessed-offsets-alist (cdr pair)))))
+
+
+(defun c-guess-examine (start end accumulator)
+  (let ((reporter (when (fboundp 'make-progress-reporter)
+                    (make-progress-reporter "Examining Indentation "
+                                            start
+                                            end))))
+    (save-excursion
+      (goto-char start)
+      (while (< (point) end)
+        (unless (c-guess-empty-line-p)
+          (mapc (lambda (s)
+                  (setq accumulator (or (c-guess-accumulate accumulator s)
+                                        accumulator)))
+                (c-save-buffer-state () (c-guess-basic-syntax))))
+        (when reporter (progress-reporter-update reporter (point)))
+        (forward-line 1)))
+    (when reporter (progress-reporter-done reporter)))
+  (c-guess-sort-accumulator accumulator))
+
+(defun c-guess-guess (accumulator)
+  ;; Guess basic-offset and offsets-alist from ACCUMULATOR,
+  ;; then return them as a cons: (basic-offset . offsets-alist).
+  ;; See the comments at `c-guess-accumulator' about the format
+  ;; ACCUMULATOR.
+  (let* ((basic-offset (c-guess-make-basic-offset accumulator))
+         (typical-offsets-alist (c-guess-make-offsets-alist
+                                 accumulator))
+         (symbolic-offsets-alist (c-guess-symbolize-offsets-alist
+                                  typical-offsets-alist
+                                  basic-offset))
+         (merged-offsets-alist (c-guess-merge-offsets-alists
+                                (copy-tree c-guess-conversions)
+                                symbolic-offsets-alist)))
+    (cons basic-offset merged-offsets-alist)))
+
+(defun c-guess-current-offset (relpos)
+  ;; Calculate relative indentation (point) to RELPOS.
+  (- (progn (back-to-indentation)
+            (current-column))
+     (save-excursion
+       (goto-char relpos)
+       (current-column))))
+
+(defun c-guess-accumulate (accumulator syntax-element)
+  ;; Add SYNTAX-ELEMENT to ACCUMULATOR.
+  (let ((symbol (car syntax-element))
+        (relpos (cadr syntax-element)))
+    (when (numberp relpos)
+      (let ((offset (c-guess-current-offset relpos)))
+        (when (< (abs offset) c-guess-offset-threshold)
+          (c-guess-accumulate-offset accumulator
+                                      symbol
+                                      offset))))))
+
+(defun c-guess-accumulate-offset (accumulator symbol offset)
+  ;; Added SYMBOL and OFFSET to ACCUMULATOR.  See
+  ;; `c-guess-accumulator' about the structure of ACCUMULATOR.
+  (let* ((entry    (assoc symbol accumulator))
+         (counters (cdr entry))
+         counter)
+    (if entry
+        (progn
+          (setq counter (assoc offset counters))
+          (if counter
+              (setcdr counter (1+ (cdr counter)))
+            (setq counters (cons (cons offset 1) counters))
+            (setcdr entry counters))
+          accumulator)
+      (cons (cons symbol (cons (cons offset 1) nil)) accumulator))))
+
+(defun c-guess-sort-accumulator (accumulator)
+  ;; Sort each element of ACCUMULATOR by the number-of-times.  See
+  ;; `c-guess-accumulator' for more details.
+  (mapcar
+   (lambda (entry)
+     (let ((symbol (car entry))
+           (counters (cdr entry)))
+       (cons symbol (sort counters
+                          (lambda (a b)
+                            (if (> (cdr a) (cdr b))
+                                t
+                              (and
+                               (eq (cdr a) (cdr b))
+                               (< (car a) (car b)))))))))
+   accumulator))
+
+(defun c-guess-make-offsets-alist (accumulator)
+  ;; Throw away the rare cases in accumulator and make an offsets-alist structure.
+  (mapcar
+   (lambda (entry)
+     (cons (car entry)
+           (car (car (cdr entry)))))
+   accumulator))
+
+(defun c-guess-merge-offsets-alists (strong weak)
+  ;; Merge two offsets-alists into one.
+  ;; When two offsets-alists have the same symbol
+  ;; entry, give STRONG priority over WEAK.
+  (mapc
+   (lambda (weak-elt)
+     (unless (assoc (car weak-elt) strong)
+       (setq strong (cons weak-elt strong))))
+   weak)
+  strong)
+
+(defun c-guess-make-basic-offset (accumulator)
+  ;; As candidate for `c-basic-offset', find the most frequently appearing
+  ;; indentation-offset in ACCUMULATOR.
+  (let* (;; Drop the value related to `c' syntactic-symbol.
+         ;; (`c': Inside a multiline C style block comment.)
+         ;; The impact for values of `c' is too large for guessing
+         ;; `basic-offset' if the target source file is small and its license
+         ;; notice is at top of the file.
+         (accumulator (assq-delete-all 'c (copy-tree accumulator)))
+         ;; Drop syntactic-symbols from ACCUMULATOR.
+         (alist (apply #'append (mapcar (lambda (elts)
+                                          (mapcar (lambda (elt)
+                                                    (cons (abs (car elt))
+                                                          (cdr elt)))
+                                                  (cdr elts)))
+                                        accumulator)))
+         ;; Gather all indentation-offsets other than 0.
+         ;; 0 is meaningless as `basic-offset'.
+         (offset-list (delete 0
+                              (delete-dups (mapcar
+                                            (lambda (elt) (car elt))
+                                            alist))))
+         ;; Sum of number-of-times for offset:
+         ;;  (offset . sum)
+         (summed (mapcar (lambda (offset)
+                           (cons offset
+                                 (apply #'+
+                                        (mapcar (lambda (a)
+                                                  (if (eq (car a) offset)
+                                                      (cdr a)
+                                                    0))
+                                                alist))))
+                         offset-list)))
+    ;;
+    ;; Find the majority.
+    ;;
+    (let ((majority '(nil . 0)))
+      (while summed
+        (when (< (cdr majority) (cdr (car summed)))
+          (setq majority (car summed)))
+        (setq summed (cdr summed)))
+      (car majority))))
+
+(defun c-guess-symbolize-offsets-alist (offsets-alist basic-offset)
+  ;; Convert the representation of OFFSETS-ALIST to an alist using
+  ;; `+', `-', `++', `--', `*', or `/'. These symbols represent
+  ;; a value relative to BASIC-OFFSET.  Their meaning can be found
+  ;; in the CC Mode manual.
+  (mapcar
+   (lambda (elt)
+     (let ((s (car elt))
+           (v (cdr elt)))
+       (cond
+        ((integerp v)
+         (cons s (c-guess-symbolize-integer v
+                                             basic-offset)))
+        (t elt))))
+   offsets-alist))
+
+(defun c-guess-symbolize-integer (int basic-offset)
+  (let ((aint (abs int)))
+    (cond
+     ((eq int basic-offset) '+)
+     ((eq aint basic-offset) '-)
+     ((eq int (* 2 basic-offset)) '++)
+     ((eq aint (* 2 basic-offset)) '--)
+     ((eq (* 2 int) basic-offset) '*)
+     ((eq (* 2 aint) basic-offset) '-)
+     (t int))))
+
+(defun c-guess-style-name ()
+  ;; Make a style name for the guessed style.
+  (format "*c-guess*:%s" (buffer-file-name)))
+
+(defun c-guess-make-style (basic-offset offsets-alist)
+  (when basic-offset
+    ;; Make a style from guessed values.
+    (let*       ((offsets-alist (c-guess-merge-offsets-alists
+                                 offsets-alist
+                                 c-offsets-alist)))
+      `((c-basic-offset . ,basic-offset)
+        (c-offsets-alist . ,offsets-alist)))))
+
+;;;###autoload
+(defun c-guess-install (&optional style-name)
+  "Install the latest guessed style into the current buffer.
+\(This guessed style is a combination of `c-guess-guessed-basic-offset',
+`c-guess-guessed-offsets-alist' and `c-offsets-alist'.)
+
+The style is entered into CC Mode's style system by
+`c-add-style'.  Its name is either STYLE-NAME, or a name based on
+the absolute file name of the file if STYLE-NAME is nil."
+  (interactive "sNew style name (empty for default name): ")
+  (let* ((style (c-guess-make-style c-guess-guessed-basic-offset
+                                    c-guess-guessed-offsets-alist)))
+    (if style
+        (let ((style-name (or (if (equal style-name "")
+                                  nil
+                                style-name)
+                              (c-guess-style-name))))
+          (c-add-style style-name style t)
+          (message "Style \"%s\" is installed" style-name))
+      (error "Not yet guessed"))))
+
+(defun c-guess-dump-accumulator ()
+  "Show `c-guess-accumulator'."
+  (interactive)
+  (with-output-to-temp-buffer "*Accumulated Examined Indent Information*"
+    (pp c-guess-accumulator)))
+
+(defun c-guess-reset-accumulator ()
+  "Reset `c-guess-accumulator'."
+  (interactive)
+  (setq c-guess-accumulator nil))
+
+(defun c-guess-dump-guessed-values ()
+  "Show `c-guess-guessed-basic-offset' and `c-guess-guessed-offsets-alist'."
+  (interactive)
+  (with-output-to-temp-buffer "*Guessed Values*"
+    (princ "basic-offset: \n\t")
+    (pp c-guess-guessed-basic-offset)
+    (princ "\n\n")
+    (princ "offsets-alist: \n")
+    (pp c-guess-guessed-offsets-alist)
+    ))
+
+(defun c-guess-dump-guessed-style (&optional printer)
+  "Show the guessed style.
+`pp' is used to print the style but if PRINTER is given,
+PRINTER is used instead. If PRINTER is not `nil', it
+is called with one argument, the guessed style."
+  (interactive)
+  (let ((style (c-guess-make-style c-guess-guessed-basic-offset
+                                   c-guess-guessed-offsets-alist)))
+    (if style
+        (with-output-to-temp-buffer "*Guessed Style*"
+          (funcall (if printer printer 'pp) style))
+      (error "Not yet guessed"))))
+
+(defun c-guess-guessed-syntactic-symbols ()
+  ;; Return syntactic symbols in c-guess-guessed-offsets-alist
+  ;; but not in c-guess-conversions.
+  (let ((alist c-guess-guessed-offsets-alist)
+        elt
+        (symbols nil))
+    (while alist
+      (setq elt (car alist)
+            alist (cdr alist))
+      (unless (assq (car elt) c-guess-conversions)
+        (setq symbols (cons (car elt)
+                            symbols))))
+    symbols))
+
+(defun c-guess-view-reorder-offsets-alist-in-style (style guessed-syntactic-symbols)
+  ;; Reorder the `c-offsets-alist' field of STYLE.
+  ;; If an entry in `c-offsets-alist' holds a guessed value, move it to
+  ;; front in the field. In addition alphabetical sort by entry name is done.
+  (setq style (copy-tree style))
+  (let ((offsets-alist-cell (assq 'c-offsets-alist style))
+        (guessed-syntactic-symbols (c-guess-guessed-syntactic-symbols)))
+    (setcdr offsets-alist-cell
+            (sort (cdr offsets-alist-cell)
+                  (lambda (a b)
+                    (let ((a-guessed? (memq (car a) guessed-syntactic-symbols))
+                          (b-guessed? (memq (car b) guessed-syntactic-symbols)))
+                      (cond
+                       ((or (and a-guessed? b-guessed?)
+                            (not (or a-guessed? b-guessed?)))
+                        (string-lessp (symbol-name (car a))
+                                      (symbol-name (car b))))
+                       (a-guessed? t)
+                       (b-guessed? nil)))))))
+  style)
+
+(defun c-guess-view-mark-guessed-entries (guessed-syntactic-symbols)
+  ;; Put " ; Guess value" markers on all entries which hold
+  ;; guessed values.
+  ;; `c-basic-offset' is always considered as holding a guessed value.
+  (let ((needs-markers (cons 'c-basic-offset
+                             guessed-syntactic-symbols)))
+    (while needs-markers
+      (goto-char (point-min))
+      (when (search-forward (concat "("
+                                    (symbol-name (car needs-markers))
+                                    " ") nil t)
+        (move-end-of-line 1)
+        (comment-dwim nil)
+        (insert " Guessed value"))
+      (setq needs-markers
+            (cdr needs-markers)))))
+
+(defun c-guess-view (&optional with-name)
+  "Emit emacs lisp code which defines the last guessed style.
+So you can put the code into .emacs if you prefer the
+guessed code.
+\"STYLE NAME HERE\" is used as the name for the style in the
+emitted code. If WITH-NAME is given, it is used instead.
+WITH-NAME is expected as a string but if this function
+called interactively with prefix argument, the value for
+WITH-NAME is asked to the user."
+  (interactive "P")
+  (let* ((temporary-style-name (cond
+                                ((stringp with-name) with-name)
+                                (with-name (read-from-minibuffer
+                                            "New style name: "))
+                                (t
+                                 "STYLE NAME HERE")))
+         (guessed-style-name (c-guess-style-name))
+         (current-style-name c-indentation-style)
+         (parent-style-name (if (string-equal guessed-style-name
+                                              current-style-name)
+                                ;; The guessed style is already installed.
+                                ;; It cannot be used as the parent style.
+                                ;; Use the default style for the current
+                                ;; major mode as the parent style.
+                                (cc-choose-style-for-mode
+                                 major-mode
+                                 c-default-style)
+                              ;; The guessed style is not installed yet.
+                              current-style-name)))
+    (c-guess-dump-guessed-style
+     (lambda (style)
+       (let ((guessed-syntactic-symbols (c-guess-guessed-syntactic-symbols)))
+         (pp `(c-add-style ,temporary-style-name
+                           ',(cons parent-style-name
+                                   (c-guess-view-reorder-offsets-alist-in-style
+                                    style
+                                    guessed-syntactic-symbols))))
+         (with-current-buffer standard-output
+           (lisp-interaction-mode)
+           (c-guess-view-mark-guessed-entries
+            guessed-syntactic-symbols)
+           (buffer-enable-undo)))))))
+
+
+(cc-provide 'cc-guess)
+;;; cc-guess.el ends here
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 86a963bcf55..a6459e1724f 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -295,6 +295,19 @@ the evaluated constant value at compile time."
             ["Backslashify"           c-backslash-region
              (c-fn-region-is-active-p)]))
       "----"
+      ("Style..."
+       ["Set Style..."                   c-set-style t]
+       ["Show Current Style Name"        (message
+                                          "Style Name: %s"
+                                          c-indentation-style) t]
+       ["Guess Style from this Buffer"   c-guess-buffer-no-install t]
+       ["Install the Last Guessed Style..." c-guess-install
+        (and c-guess-guessed-offsets-alist
+             c-guess-guessed-basic-offset) ]
+       ["View the Last Guessed Style"    c-guess-view
+        (and c-guess-guessed-offsets-alist
+             c-guess-guessed-basic-offset) ])
+      "----"
       ("Toggle..."
        ["Syntactic indentation" c-toggle-syntactic-indentation
         :style toggle :selected c-syntactic-indentation]
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 3a5a643a2a8..1adc6c2eac0 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -93,6 +93,7 @@
 (cc-require 'cc-cmds)
 (cc-require 'cc-align)
 (cc-require 'cc-menus)
+(cc-require 'cc-guess)
 
 ;; Silence the compiler.
 (cc-bytecomp-defvar adaptive-fill-first-line-regexp) ; Emacs
@@ -553,11 +554,7 @@ that requires a literal mode spec at compile time."
   (c-clear-found-types)
 
   ;; now set the mode style based on default-style
-  (let ((style (if (stringp default-style)
-                   default-style
-                 (or (cdr (assq mode default-style))
-                     (cdr (assq 'other default-style))
-                     "gnu"))))
+  (let ((style (cc-choose-style-for-mode mode default-style)))
     ;; Override style variables if `c-old-style-variable-behavior' is
     ;; set.  Also override if we are using global style variables,
     ;; have already initialized a style once, and are switching to a
@@ -692,7 +689,8 @@ This function is called from the hook `before-hack-local-variables-hook'."
                    (c-count-cfss file-local-variables-alist))
                   (cfs-in-dir-count (c-count-cfss dir-local-variables-alist)))
               (c-set-style stile
-                           (= cfs-in-file-and-dir-count cfs-in-dir-count)))
+                           (and (= cfs-in-file-and-dir-count cfs-in-dir-count)
+                                'keep-defaults)))
           (c-set-style stile)))
       (when offsets
         (mapc
diff --git a/lisp/progmodes/cc-styles.el b/lisp/progmodes/cc-styles.el
index e161eb6d0f5..96cb15f2a72 100644
--- a/lisp/progmodes/cc-styles.el
+++ b/lisp/progmodes/cc-styles.el
@@ -650,6 +650,15 @@ any reason to call this function directly."
       (setq c-style-variables-are-local-p t))
     ))
 
+(defun cc-choose-style-for-mode (mode default-style)
+  "Return suitable style for MODE from DEFAULT-STYLE.
+DEFAULT-STYLE has the same format as `c-default-style'."
+  (if (stringp default-style)
+      default-style
+    (or (cdr (assq mode default-style))
+        (cdr (assq 'other default-style))
+        "gnu")))
+
 
 
 (cc-provide 'cc-styles)
diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el
index d2a5d117635..58dc1737c5a 100644
--- a/lisp/progmodes/cc-vars.el
+++ b/lisp/progmodes/cc-vars.el
@@ -1633,8 +1633,7 @@ as designated in the variable `c-file-style'.")
 ;; It isn't possible to specify a doc-string without specifying an
 ;; initial value with `defvar', so the following two variables have been
 ;; given doc-strings by setting the property `variable-documentation'
-;; directly.  C-h v will read this documentation only for versions of GNU
-;; Emacs from 22.1.  It's really good not to have an initial value for
+;; directly.  It's really good not to have an initial value for
 ;; variables like these that always should be dynamically bound, so it's
 ;; worth the inconvenience.
 
diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el
index 22ece17cb28..7989c60f80c 100644
--- a/lisp/progmodes/cfengine.el
+++ b/lisp/progmodes/cfengine.el
@@ -3,6 +3,7 @@
 ;; Copyright (C) 2001-2011  Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
+;; Maintainer: Ted Zlatanov <tzz@lifelogs.com>
 ;; Keywords: languages
 
 ;; This file is part of GNU Emacs.
@@ -28,6 +29,13 @@
 ;; Possible customization for auto-mode selection:
 ;; (push '(("^cfagent.conf\\'" . cfengine-mode)) auto-mode-alist)
 ;; (push '(("^cf\\." . cfengine-mode)) auto-mode-alist)
+;; (push '(("\\.cf\\'" . cfengine-mode)) auto-mode-alist)
+
+;; Or, if you want to use the CFEngine 3.x support:
+
+;; (push '(("^cfagent.conf\\'" . cfengine3-mode)) auto-mode-alist)
+;; (push '(("^cf\\." . cfengine3-mode)) auto-mode-alist)
+;; (push '(("\\.cf\\'" . cfengine3-mode)) auto-mode-alist)
 
 ;; This is not the same as the mode written by Rolf Ebert
 ;; <ebert@waporo.muc.de>, distributed with cfengine-2.0.5.  It does
@@ -63,7 +71,27 @@
       ;; cfservd
       "admit" "grant" "deny")
     "List of the action keywords supported by Cfengine.
-This includes those for cfservd as well as cfagent."))
+This includes those for cfservd as well as cfagent.")
+
+  (defconst cfengine3-defuns
+    (mapcar
+     'symbol-name
+     '(bundle body))
+    "List of the CFEngine 3.x defun headings.")
+
+  (defconst cfengine3-defuns-regex
+    (regexp-opt cfengine3-defuns t)
+    "Regex to match the CFEngine 3.x defuns.")
+
+  (defconst cfengine3-class-selector-regex "\\([[:alnum:]_().&|!]+\\)::")
+
+  (defconst cfengine3-category-regex "\\([[:alnum:]_]+\\):")
+
+  (defconst cfengine3-vartypes
+    (mapcar
+     'symbol-name
+     '(string int real slist ilist rlist irange rrange counter))
+    "List of the CFEngine 3.x variable types."))
 
 (defvar cfengine-font-lock-keywords
   `(;; Actions.
@@ -82,6 +110,31 @@ This includes those for cfservd as well as cfagent."))
     ;; File, acl &c in group:   { token ... }
     ("{[ \t]*\\([^ \t\n]+\\)" 1 font-lock-constant-face)))
 
+(defvar cfengine3-font-lock-keywords
+  `(
+    (,(concat "^[ \t]*" cfengine3-class-selector-regex)
+     1 font-lock-keyword-face)
+    (,(concat "^[ \t]*" cfengine3-category-regex)
+     1 font-lock-builtin-face)
+    ;; Variables, including scope, e.g. module.var
+    ("[@$](\\([[:alnum:]_.]+\\))" 1 font-lock-variable-name-face)
+    ("[@$]{\\([[:alnum:]_.]+\\)}" 1 font-lock-variable-name-face)
+    ;; Variable definitions.
+    ("\\<\\([[:alnum:]_]+\\)[ \t]*=[ \t]*(" 1 font-lock-variable-name-face)
+
+    ;; CFEngine 3.x faces
+    ;; defuns
+    (,(concat "\\<" cfengine3-defuns-regex "\\>"
+              "[ \t]+\\<\\([[:alnum:]_]+\\)\\>"
+              "[ \t]+\\<\\([[:alnum:]_]+\\)\\((\\([^)]*\\))\\)?")
+    (1 font-lock-builtin-face)
+    (2 font-lock-constant-name-face)
+    (3 font-lock-function-name-face)
+    (5 font-lock-variable-name-face))
+    ;; variable types
+    (,(concat "\\<" (eval-when-compile (regexp-opt cfengine3-vartypes t)) "\\>")
+     1 font-lock-type-face)))
+
 (defvar cfengine-imenu-expression
   `((nil ,(concat "^[ \t]*" (eval-when-compile
                               (regexp-opt cfengine-actions t))
@@ -197,6 +250,191 @@ Intended as the value of `indent-line-function'."
         (fill-paragraph justify))
       t))
 
+(defun cfengine3-beginning-of-defun ()
+  "`beginning-of-defun' function for Cfengine 3 mode.
+Treats body/bundle blocks as defuns."
+  (unless (<= (current-column) (current-indentation))
+    (end-of-line))
+  (if (re-search-backward (concat "^[ \t]*" cfengine3-defuns-regex "\\>") nil t)
+      (beginning-of-line)
+    (goto-char (point-min)))
+  t)
+
+(defun cfengine3-end-of-defun ()
+  "`end-of-defun' function for Cfengine 3 mode.
+Treats body/bundle blocks as defuns."
+  (end-of-line)
+  (if (re-search-forward (concat "^[ \t]*" cfengine3-defuns-regex "\\>") nil t)
+      (beginning-of-line)
+    (goto-char (point-max)))
+  t)
+
+(defun cfengine3-indent-line ()
+  "Indent a line in Cfengine 3 mode.
+Intended as the value of `indent-line-function'."
+  (let ((pos (- (point-max) (point)))
+        parse)
+    (save-restriction
+      (narrow-to-defun)
+      (back-to-indentation)
+      (setq parse (parse-partial-sexp (point-min) (point)))
+      (message "%S" parse)
+      (cond
+       ;; body/bundle blocks start at 0
+       ((looking-at (concat cfengine3-defuns-regex "\\>"))
+        (indent-line-to 0))
+       ;; categories are indented one step
+       ((looking-at (concat cfengine3-category-regex "[ \t]*$"))
+        (indent-line-to cfengine-indent))
+       ;; class selectors are indented two steps
+       ((looking-at (concat cfengine3-class-selector-regex "[ \t]*$"))
+        (indent-line-to (* 2 cfengine-indent)))
+       ;; Outdent leading close brackets one step.
+       ((or (eq ?\} (char-after))
+            (eq ?\) (char-after)))
+        (condition-case ()
+            (indent-line-to (save-excursion
+                              (forward-char)
+                              (backward-sexp)
+                              (current-column)))
+          (error nil)))
+       ;; inside a string and it starts before this line
+       ((and (nth 3 parse)
+             (< (nth 8 parse) (save-excursion (beginning-of-line) (point))))
+        (indent-line-to 0))
+       ;; inside a defun, but not a nested list (depth is 1)
+       ((= 1 (nth 0 parse))
+        (indent-line-to (* (+ 2 (nth 0 parse)) cfengine-indent)))
+       ;; Inside brackets/parens: indent to start column of non-comment
+       ;; token on line following open bracket or by one step from open
+       ;; bracket's column.
+       ((condition-case ()
+            (progn (indent-line-to (save-excursion
+                                     (backward-up-list)
+                                     (forward-char)
+                                     (skip-chars-forward " \t")
+                                     (cond
+                                      ((looking-at "[^\n#]")
+                                       (current-column))
+                                      ((looking-at "[^\n#]")
+                                       (current-column))
+                                      (t
+                                       (skip-chars-backward " \t")
+                                       (+ (current-column) -1
+                                          cfengine-indent)))))
+                   t)
+          (error nil)))
+       ;; Else don't indent.
+       (t (indent-line-to 0))))
+    ;; If initial point was within line's indentation,
+    ;; position after the indentation.  Else stay at same point in text.
+    (if (> (- (point-max) pos) (point))
+        (goto-char (- (point-max) pos)))))
+
+;; CFEngine 3.x grammar
+
+;; specification: blocks
+;; blocks: block | blocks block;
+;; block:                 bundle typeid blockid bundlebody
+;;                      | bundle typeid blockid usearglist bundlebody
+;;                      | body typeid blockid bodybody
+;;                      | body typeid blockid usearglist bodybody;
+
+;; typeid: id
+;; blockid: id
+;; usearglist: '(' aitems ')';
+;; aitems: aitem | aitem ',' aitems |;
+;; aitem: id
+
+;; bundlebody: '{' statements '}'
+;; statements: statement | statements statement;
+;; statement: category | classpromises;
+
+;; bodybody: '{' bodyattribs '}'
+;; bodyattribs: bodyattrib | bodyattribs bodyattrib;
+;; bodyattrib: class | selections;
+;; selections: selection | selections selection;
+;; selection: id ASSIGN rval ';' ;
+
+;; classpromises: classpromise | classpromises classpromise;
+;; classpromise: class | promises;
+;; promises: promise | promises promise;
+;; category: CATEGORY
+;; promise: promiser ARROW rval constraints ';' | promiser constraints ';';
+;; constraints: constraint | constraints ',' constraint |;
+;; constraint: id ASSIGN rval;
+;; class: CLASS
+;; id: ID
+;; rval: ID | QSTRING | NAKEDVAR | list | usefunction
+;; list: '{' litems '}' ;
+;; litems: litem | litem ',' litems |;
+;; litem: ID | QSTRING | NAKEDVAR | list | usefunction
+
+;; functionid: ID | NAKEDVAR
+;; promiser: QSTRING
+;; usefunction: functionid givearglist
+;; givearglist: '(' gaitems ')'
+;; gaitems: gaitem | gaitems ',' gaitem |;
+;; gaitem: ID | QSTRING | NAKEDVAR | list | usefunction
+
+;; # from lexer:
+
+;; bundle: "bundle"
+;; body: "body"
+;; COMMENT    #[^\n]*
+;; NAKEDVAR   [$@][(][a-zA-Z0-9_\200-\377.]+[)]|[$@][{][a-zA-Z0-9_\200-\377.]+[}]
+;; ID: [a-zA-Z0-9_\200-\377]+
+;; ASSIGN: "=>"
+;; ARROW: "->"
+;; QSTRING: \"((\\\")|[^"])*\"|\'((\\\')|[^'])*\'|`[^`]*`
+;; CLASS: [.|&!()a-zA-Z0-9_\200-\377]+::
+;; CATEGORY: [a-zA-Z_]+:
+
+(defun cfengine-common-settings ()
+  (set (make-local-variable 'syntax-propertize-function)
+       ;; In the main syntax-table, \ is marked as a punctuation, because
+       ;; of its use in DOS-style directory separators.  Here we try to
+       ;; recognize the cases where \ is used as an escape inside strings.
+       (syntax-propertize-rules ("\\(\\(?:\\\\\\)+\\)\"" (1 "\\"))))
+  (set (make-local-variable 'parens-require-spaces) nil)
+  (set (make-local-variable 'comment-start)  "# ")
+  (set (make-local-variable 'comment-start-skip)
+       "\\(\\(?:^\\|[^\\\\\n]\\)\\(?:\\\\\\\\\\)*\\)#+[ \t]*")
+  ;; Like Lisp mode.  Without this, we lose with, say,
+  ;; `backward-up-list' when there's an unbalanced quote in a
+  ;; preceding comment.
+  (set (make-local-variable 'parse-sexp-ignore-comments) t))
+
+(defun cfengine-common-syntax (table)
+  ;; the syntax defaults seem OK to give reasonable word movement
+  (modify-syntax-entry ?# "<" table)
+  (modify-syntax-entry ?\n ">#" table)
+  (modify-syntax-entry ?\" "\"" table)
+  ;; variable substitution:
+  (modify-syntax-entry ?$ "." table)
+  ;; Doze path separators:
+  (modify-syntax-entry ?\\ "." table))
+
+;;;###autoload
+(define-derived-mode cfengine3-mode prog-mode "CFEngine3"
+  "Major mode for editing cfengine input.
+There are no special keybindings by default.
+
+Action blocks are treated as defuns, i.e. \\[beginning-of-defun] moves
+to the action header."
+  (cfengine-common-settings)
+  (cfengine-common-syntax cfengine3-mode-syntax-table)
+
+  (set (make-local-variable 'indent-line-function) #'cfengine3-indent-line)
+  (setq font-lock-defaults
+        '(cfengine3-font-lock-keywords nil nil nil beginning-of-defun))
+
+  ;; use defuns as the essential syntax block
+  (set (make-local-variable 'beginning-of-defun-function)
+       #'cfengine3-beginning-of-defun)
+  (set (make-local-variable 'end-of-defun-function)
+       #'cfengine3-end-of-defun))
+
 ;;;###autoload
 (define-derived-mode cfengine-mode prog-mode "Cfengine"
   "Major mode for editing cfengine input.
@@ -204,25 +442,15 @@ There are no special keybindings by default.
 
 Action blocks are treated as defuns, i.e. \\[beginning-of-defun] moves
 to the action header."
-  (modify-syntax-entry ?# "<" cfengine-mode-syntax-table)
-  (modify-syntax-entry ?\n ">#" cfengine-mode-syntax-table)
+  (cfengine-common-settings)
+  (cfengine-common-syntax cfengine-mode-syntax-table)
+
   ;; Shell commands can be quoted by single, double or back quotes.
   ;; It's debatable whether we should define string syntax, but it
   ;; should avoid potential confusion in some cases.
-  (modify-syntax-entry ?\" "\"" cfengine-mode-syntax-table)
   (modify-syntax-entry ?\' "\"" cfengine-mode-syntax-table)
   (modify-syntax-entry ?\` "\"" cfengine-mode-syntax-table)
-  ;; variable substitution:
-  (modify-syntax-entry ?$ "." cfengine-mode-syntax-table)
-  ;; Doze path separators:
-  (modify-syntax-entry ?\\ "." cfengine-mode-syntax-table)
-  ;; Otherwise, syntax defaults seem OK to give reasonable word
-  ;; movement.
 
-  (set (make-local-variable 'parens-require-spaces) nil)
-  (set (make-local-variable 'comment-start)  "# ")
-  (set (make-local-variable 'comment-start-skip)
-       "\\(\\(?:^\\|[^\\\\\n]\\)\\(?:\\\\\\\\\\)*\\)#+[ \t]*")
   (set (make-local-variable 'indent-line-function) #'cfengine-indent-line)
   (set (make-local-variable 'outline-regexp) "[ \t]*\\(\\sw\\|\\s_\\)+:+")
   (set (make-local-variable 'outline-level) #'cfengine-outline-level)
@@ -233,20 +461,12 @@ to the action header."
         '(cfengine-font-lock-keywords nil nil nil beginning-of-line))
   ;; Fixme: set the args of functions in evaluated classes to string
   ;; syntax, and then obey syntax properties.
-  (set (make-local-variable 'syntax-propertize-function)
-       ;; In the main syntax-table, \ is marked as a punctuation, because
-       ;; of its use in DOS-style directory separators.  Here we try to
-       ;; recognize the cases where \ is used as an escape inside strings.
-       (syntax-propertize-rules ("\\(\\(?:\\\\\\)+\\)\"" (1 "\\"))))
   (setq imenu-generic-expression cfengine-imenu-expression)
   (set (make-local-variable 'beginning-of-defun-function)
        #'cfengine-beginning-of-defun)
-  (set (make-local-variable 'end-of-defun-function) #'cfengine-end-of-defun)
-  ;; Like Lisp mode.  Without this, we lose with, say,
-  ;; `backward-up-list' when there's an unbalanced quote in a
-  ;; preceding comment.
-  (set (make-local-variable 'parse-sexp-ignore-comments) t))
+  (set (make-local-variable 'end-of-defun-function) #'cfengine-end-of-defun))
 
+(provide 'cfengine3)
 (provide 'cfengine)
 
 ;;; cfengine.el ends here
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 1a23cd112af..503698f0f7b 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -253,7 +253,7 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
 \\(?:-\\([0-9]+\\)?\\(?:\\.\\([0-9]+\\)\\)?\\)?:\
 \\(?: *\\(\\(?:Future\\|Runtime\\)?[Ww]arning\\|W:\\)\\|\
  *\\([Ii]nfo\\(?:\\>\\|rmationa?l?\\)\\|I:\\|instantiated from\\|[Nn]ote\\)\\|\
-\[0-9]?\\(?:[^0-9\n]\\|$\\)\\|[0-9][0-9][0-9]\\)"
+ *[Ee]rror\\|\[0-9]?\\(?:[^0-9\n]\\|$\\)\\|[0-9][0-9][0-9]\\)"
      1 (2 . 4) (3 . 5) (6 . 7))
 
     (lcc
@@ -400,15 +400,16 @@ File = \\(.+\\), Line = \\([0-9]+\\)\\(?:, Column = \\([0-9]+\\)\\)?"
      "^# Failed test [0-9]+ in \\([^ \t\r\n]+\\) at line \\([0-9]+\\)"
      1 2)
     (perl--Test2
-     ;; Or when comparing got/want values,
+     ;; Or when comparing got/want values, with a "fail #n" if repeated
      ;; # Test 2 got: "xx" (t-compilation-perl-2.t at line 10)
+     ;; # Test 3 got: "xx" (t-compilation-perl-2.t at line 10 fail #2)
      ;;
      ;; And under Test::Harness they're preceded by progress stuff with
      ;; \r and "NOK",
      ;; ... NOK 1# Test 1 got: "1234" (t/foo.t at line 46)
      ;;
      "^\\(.*NOK.*\\)?# Test [0-9]+ got:.* (\\([^ \t\r\n]+\\) at line \
-\\([0-9]+\\))"
+\\([0-9]+\\)\\( fail #[0-9]+\\)?)"
      2 3)
     (perl--Test::Harness
      ;; perl Test::Harness output, eg.
@@ -2409,9 +2410,7 @@ and overlay is highlighted between MK and END-MK."
         ;; display the source in another window.
         (let ((pop-up-windows t))
           (pop-to-buffer (marker-buffer mk) 'other-window))
-      (if (window-dedicated-p (selected-window))
-          (pop-to-buffer (marker-buffer mk))
-        (switch-to-buffer (marker-buffer mk))))
+      (pop-to-buffer-same-window (marker-buffer mk)))
     (unless (eq (goto-char mk) (point))
       ;; If narrowing gets in the way of going to the right place, widen.
       (widen)
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 48df73a678f..ad3b777977c 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -613,7 +613,7 @@ One should tune up `cperl-close-paren-offset' as well."
 (defcustom cperl-syntaxify-by-font-lock
   (and cperl-can-font-lock
        (boundp 'parse-sexp-lookup-properties))
-  "*Non-nil means that CPerl uses `font-lock's routines for syntaxification."
+  "*Non-nil means that CPerl uses the `font-lock' routines for syntaxification."
   :type '(choice (const message) boolean)
   :group 'cperl-speed)
 
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 8abf298bb76..385adf1af0a 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -1860,7 +1860,11 @@ nil, we exit; otherwise we scan the next file."
 Stops when a match is found.
 To continue searching for next match, use command \\[tags-loop-continue].
 
-See documentation of variable `tags-file-name'."
+If `file-list-form' is non-nil, it should be a form that, when
+evaluated, will return a list of file names.  The search will be
+restricted to these files.
+
+Aleso see the documentation of the `tags-file-name' variable."
   (interactive "sTags search (regexp): ")
   (if (and (equal regexp "")
            (eq (car tags-loop-scan) 're-search-forward)
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 8f617b44dae..1c138f053d3 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -1339,8 +1339,12 @@ With arg, turn Flymake mode on if and only if arg is positive."
 
    ;; Turning the mode ON.
    (flymake-mode
-    (if (not (flymake-can-syntax-check-file buffer-file-name))
-        (flymake-log 2 "flymake cannot check syntax in buffer %s" (buffer-name))
+    (cond
+     ((not buffer-file-name)
+      (message "Flymake unable to run without a buffer file name"))
+     ((not (flymake-can-syntax-check-file buffer-file-name))
+      (flymake-log 2 "flymake cannot check syntax in buffer %s" (buffer-name)))
+     (t
       (add-hook 'after-change-functions 'flymake-after-change-function nil t)
       (add-hook 'after-save-hook 'flymake-after-save-hook nil t)
       (add-hook 'kill-buffer-hook 'flymake-kill-buffer-hook nil t)
@@ -1352,7 +1356,7 @@ With arg, turn Flymake mode on if and only if arg is positive."
             (run-at-time nil 1 'flymake-on-timer-event (current-buffer)))
 
       (when flymake-start-syntax-check-on-find-file
-        (flymake-start-syntax-check))))
+        (flymake-start-syntax-check)))))
 
    ;; Turning the mode OFF.
    (t
@@ -1406,6 +1410,7 @@ With arg, turn Flymake mode on if and only if arg is positive."
     (cancel-timer flymake-timer)
     (setq flymake-timer nil)))
 
+;;;###autoload
 (defun flymake-find-file-hook ()
   ;;+(when flymake-start-syntax-check-on-find-file
   ;;+    (flymake-log 3 "starting syntax check on file open")
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 61055ef4342..87209a78ffb 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -104,7 +104,8 @@
 (require 'bindat)
 (eval-when-compile (require 'cl))
 
-(declare-function speedbar-change-initial-expansion-list "speedbar" (new-default))
+(declare-function speedbar-change-initial-expansion-list
+                  "speedbar" (new-default))
 (declare-function speedbar-timer-fn "speedbar" ())
 (declare-function speedbar-line-text "speedbar" (&optional p))
 (declare-function speedbar-change-expand-button-char "speedbar" (char))
@@ -190,7 +191,8 @@ as returned from \"-break-list\" by `gdb-json-partial-output'
 (defvar gdb-current-language nil)
 (defvar gdb-var-list nil
   "List of variables in watch window.
-Each element has the form (VARNUM EXPRESSION NUMCHILD TYPE VALUE STATUS HAS_MORE FP)
+Each element has the form
+  (VARNUM EXPRESSION NUMCHILD TYPE VALUE STATUS HAS_MORE FP)
 where STATUS is nil (`unchanged'), `changed' or `out-of-scope', FP the frame
 address for root variables.")
 (defvar gdb-main-file nil "Source file from which program execution begins.")
@@ -329,7 +331,7 @@ valid signal handlers.")
   "Maximum size of `gdb-debug-log'.  If nil, size is unlimited."
   :group 'gdb
   :type '(choice (integer :tag "Number of elements")
-                 (const   :tag "Unlimited" nil))
+          (const   :tag "Unlimited" nil))
   :version "22.1")
 
 (defcustom gdb-non-stop-setting t
@@ -367,13 +369,18 @@ Emacs always switches to the thread which caused the stop."
           (set :tag "Selection of reasons..."
                (const :tag "A breakpoint was reached." "breakpoint-hit")
                (const :tag "A watchpoint was triggered." "watchpoint-trigger")
-               (const :tag "A read watchpoint was triggered." "read-watchpoint-trigger")
-               (const :tag "An access watchpoint was triggered." "access-watchpoint-trigger")
+               (const :tag "A read watchpoint was triggered."
+                      "read-watchpoint-trigger")
+               (const :tag "An access watchpoint was triggered."
+                      "access-watchpoint-trigger")
                (const :tag "Function finished execution." "function-finished")
                (const :tag "Location reached." "location-reached")
-               (const :tag "Watchpoint has gone out of scope" "watchpoint-scope")
-               (const :tag "End of stepping range reached." "end-stepping-range")
-               (const :tag "Signal received (like interruption)." "signal-received"))
+               (const :tag "Watchpoint has gone out of scope"
+                      "watchpoint-scope")
+               (const :tag "End of stepping range reached."
+                      "end-stepping-range")
+               (const :tag "Signal received (like interruption)."
+                      "signal-received"))
           (const :tag "None" nil))
   :group 'gdb-non-stop
   :version "23.2"
@@ -488,17 +495,17 @@ predefined macros."
   :group 'gdb
   :version "22.1")
 
- (defcustom gdb-create-source-file-list t
-   "Non-nil means create a list of files from which the executable was built.
+(defcustom gdb-create-source-file-list t
+  "Non-nil means create a list of files from which the executable was built.
  Set this to nil if the GUD buffer displays \"initializing...\" in the mode
  line for a long time when starting, possibly because your executable was
  built from a large number of files.  This allows quicker initialization
  but means that these files are not automatically enabled for debugging,
  e.g., you won't be able to click in the fringe to set a breakpoint until
  execution has already stopped there."
-   :type 'boolean
-   :group 'gdb
-   :version "23.1")
+  :type 'boolean
+  :group 'gdb
+  :version "23.1")
 
 (defcustom gdb-show-main nil
   "Non-nil means display source file containing the main routine at startup.
@@ -644,12 +651,12 @@ detailed description of this mode.
   (interactive (list (gud-query-cmdline 'gdb)))
 
   (when (and gud-comint-buffer
-           (buffer-name gud-comint-buffer)
-           (get-buffer-process gud-comint-buffer)
-           (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba)))
-        (gdb-restore-windows)
-        (error
-         "Multiple debugging requires restarting in text command mode"))
+             (buffer-name gud-comint-buffer)
+             (get-buffer-process gud-comint-buffer)
+             (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba)))
+    (gdb-restore-windows)
+    (error
+     "Multiple debugging requires restarting in text command mode"))
   ;;
   (gud-common-init command-line nil 'gud-gdbmi-marker-filter)
   (set (make-local-variable 'gud-minor-mode) 'gdbmi)
@@ -663,7 +670,7 @@ detailed description of this mode.
           (hsize (getenv "HISTSIZE")))
       (dolist (file (append '("~/.gdbinit")
                             (unless (string-equal (expand-file-name ".")
-                                              (expand-file-name "~"))
+                                                  (expand-file-name "~"))
                               '(".gdbinit"))))
         (if (file-readable-p (setq file (expand-file-name file)))
             (with-temp-buffer
@@ -763,7 +770,7 @@ detailed description of this mode.
     'gdb-mouse-set-clear-breakpoint)
   (define-key gud-minor-mode-map [left-fringe mouse-1]
     'gdb-mouse-set-clear-breakpoint)
-   (define-key gud-minor-mode-map [left-margin C-mouse-1]
+  (define-key gud-minor-mode-map [left-margin C-mouse-1]
     'gdb-mouse-toggle-breakpoint-margin)
   (define-key gud-minor-mode-map [left-fringe C-mouse-1]
     'gdb-mouse-toggle-breakpoint-fringe)
@@ -786,7 +793,10 @@ detailed description of this mode.
   (define-key gud-minor-mode-map [left-margin C-mouse-3]
     'gdb-mouse-jump)
 
-  (local-set-key "\C-i" 'gud-gdb-complete-command)
+  (add-hook 'completion-at-point-functions #'gud-gdb-completion-at-point
+            nil 'local)
+  (local-set-key "\C-i" 'completion-at-point)
+
   (setq gdb-first-prompt t)
   (setq gud-running nil)
 
@@ -846,11 +856,11 @@ detailed description of this mode.
 
   ;; find source file and compilation directory here
   (gdb-input
-   ; Needs GDB 6.2 onwards.
+                                        ; Needs GDB 6.2 onwards.
    (list "-file-list-exec-source-files" 'gdb-get-source-file-list))
   (if gdb-create-source-file-list
       (gdb-input
-        ; Needs GDB 6.0 onwards.
+                                        ; Needs GDB 6.0 onwards.
        (list "-file-list-exec-source-file" 'gdb-get-source-file)))
   (gdb-input
    (list "-gdb-show prompt" 'gdb-get-prompt)))
@@ -859,7 +869,8 @@ detailed description of this mode.
   (goto-char (point-min))
   (if (re-search-forward "No symbol" nil t)
       (progn
-        (message "This version of GDB doesn't support non-stop mode.  Turning it off.")
+        (message
+         "This version of GDB doesn't support non-stop mode.  Turning it off.")
         (setq gdb-non-stop nil)
         (setq gdb-version "pre-7.0"))
     (setq gdb-version "7.0+")
@@ -882,8 +893,8 @@ detailed description of this mode.
                                  (list t nil) nil "-c"
                                  (concat gdb-cpp-define-alist-program " "
                                          gdb-cpp-define-alist-flags))))))
-        (define-list (split-string output "\n" t))
-        (name))
+         (define-list (split-string output "\n" t))
+         (name))
     (setq gdb-define-alist nil)
     (dolist (define define-list)
       (setq name (nth 1 (split-string define "[( ]")))
@@ -893,13 +904,13 @@ detailed description of this mode.
 (defvar tooltip-use-echo-area)
 
 (defun gdb-tooltip-print (expr)
-   (with-current-buffer (gdb-get-buffer 'gdb-partial-output-buffer)
-     (goto-char (point-min))
-     (if (re-search-forward ".*value=\\(\".*\"\\)" nil t)
-         (tooltip-show
-          (concat expr " = " (read (match-string 1)))
-          (or gud-tooltip-echo-area tooltip-use-echo-area
-              (not (display-graphic-p)))))))
+  (with-current-buffer (gdb-get-buffer 'gdb-partial-output-buffer)
+    (goto-char (point-min))
+    (if (re-search-forward ".*value=\\(\".*\"\\)" nil t)
+        (tooltip-show
+         (concat expr " = " (read (match-string 1)))
+         (or gud-tooltip-echo-area tooltip-use-echo-area
+             (not (display-graphic-p)))))))
 
 ;; If expr is a macro for a function don't print because of possible dangerous
 ;; side-effects. Also printing a function within a tooltip generates an
@@ -923,13 +934,13 @@ detailed description of this mode.
 
 (defmacro gdb-if-arrow (arrow-position &rest body)
   `(if ,arrow-position
-      (let ((buffer (marker-buffer ,arrow-position)) (line))
-        (if (equal buffer (window-buffer (posn-window end)))
-            (with-current-buffer buffer
-              (when (or (equal start end)
-                        (equal (posn-point start)
-                               (marker-position ,arrow-position)))
-                ,@body))))))
+       (let ((buffer (marker-buffer ,arrow-position)) (line))
+         (if (equal buffer (window-buffer (posn-window end)))
+             (with-current-buffer buffer
+               (when (or (equal start end)
+                         (equal (posn-point start)
+                                (marker-position ,arrow-position)))
+                 ,@body))))))
 
 (defun gdb-mouse-until (event)
   "Continue running until a source line past the current line.
@@ -1060,7 +1071,7 @@ With arg, enter name of variable to be watched in the minibuffer."
                      (bindat-get-field result 'value)
                      nil
                      (bindat-get-field result 'has_more)
-                      gdb-frame-address)))
+                     gdb-frame-address)))
           (push var gdb-var-list)
           (speedbar 1)
           (unless (string-equal
@@ -1091,20 +1102,20 @@ With arg, enter name of variable to be watched in the minibuffer."
       (setcar (nthcdr 4 var) (read (match-string 1)))))
   (gdb-speedbar-update))
 
-; Uses "-var-list-children --all-values".  Needs GDB 6.1 onwards.
+                                        ; Uses "-var-list-children --all-values".  Needs GDB 6.1 onwards.
 (defun gdb-var-list-children (varnum)
   (gdb-input
    (list (concat "-var-update " varnum) 'ignore))
   (gdb-input
    (list (concat "-var-list-children --all-values "
-                varnum)
-             `(lambda () (gdb-var-list-children-handler ,varnum)))))
+                 varnum)
+         `(lambda () (gdb-var-list-children-handler ,varnum)))))
 
 (defun gdb-var-list-children-handler (varnum)
   (let* ((var-list nil)
          (output (bindat-get-field (gdb-json-partial-output "child")))
          (children (bindat-get-field output 'children)))
-   (catch 'child-already-watched
+    (catch 'child-already-watched
       (dolist (var gdb-var-list)
         (if (string-equal varnum (car var))
             (progn
@@ -1147,11 +1158,11 @@ With arg, enter name of variable to be watched in the minibuffer."
   (interactive)
   (let ((text (speedbar-line-text)))
     (string-match "\\(\\S-+\\)" text)
-       (let* ((var (nth (- (count-lines (point-min) (point)) 2) gdb-var-list))
-              (varnum (car var)))
-         (if (string-match "\\." (car var))
-             (message-box "Can only delete a root expression")
-           (gdb-var-delete-1 var varnum)))))
+    (let* ((var (nth (- (count-lines (point-min) (point)) 2) gdb-var-list))
+           (varnum (car var)))
+      (if (string-match "\\." (car var))
+          (message-box "Can only delete a root expression")
+        (gdb-var-delete-1 var varnum)))))
 
 (defun gdb-var-delete-children (varnum)
   "Delete children of variable object at point from the speedbar."
@@ -1174,7 +1185,7 @@ With arg, enter name of variable to be watched in the minibuffer."
   (if (re-search-forward gdb-error-regexp nil t)
       (message-box "Invalid number or expression (%s)" value)))
 
-; Uses "-var-update --all-values".  Needs GDB 6.4 onwards.
+                                        ; Uses "-var-update --all-values".  Needs GDB 6.4 onwards.
 (defun gdb-var-update ()
   (if (not (gdb-pending-p 'gdb-var-update))
       (gdb-input
@@ -1210,38 +1221,38 @@ With arg, enter name of variable to be watched in the minibuffer."
                      (gdb-var-delete-1 var varnum)))))
           (let ((var-list nil) var1
                 (children (bindat-get-field change 'new_children)))
-            (if new-num
-                (progn
-                  (setq var1 (pop temp-var-list))
-                  (while var1
-                    (if (string-equal varnum (car var1))
-                        (let ((new (string-to-number new-num))
-                              (previous (string-to-number (nth 2 var1))))
-                          (setcar (nthcdr 2 var1) new-num)
-                          (push var1 var-list)
-                          (cond ((> new previous)
-                                 ;; Add new children to list.
-                                 (dotimes (dummy previous)
-                                   (push (pop temp-var-list) var-list))
-                                 (dolist (child children)
-                                   (let ((varchild
-                                          (list (bindat-get-field child 'name)
-                                                (bindat-get-field child 'exp)
-                                                (bindat-get-field child 'numchild)
-                                                (bindat-get-field child 'type)
-                                                (bindat-get-field child 'value)
-                                                'changed
-                                                (bindat-get-field child 'has_more))))
-                                     (push varchild var-list))))
-                                ;; Remove deleted children from list.
-                                ((< new previous)
-                                 (dotimes (dummy new)
-                                     (push (pop temp-var-list) var-list))
-                                 (dotimes (dummy (- previous new))
-                                     (pop temp-var-list)))))
-                      (push var1 var-list))
-                    (setq var1 (pop temp-var-list)))
-                  (setq gdb-var-list (nreverse var-list)))))))))
+            (when new-num
+              (setq var1 (pop temp-var-list))
+              (while var1
+                (if (string-equal varnum (car var1))
+                    (let ((new (string-to-number new-num))
+                          (previous (string-to-number (nth 2 var1))))
+                      (setcar (nthcdr 2 var1) new-num)
+                      (push var1 var-list)
+                      (cond
+                       ((> new previous)
+                        ;; Add new children to list.
+                        (dotimes (dummy previous)
+                          (push (pop temp-var-list) var-list))
+                        (dolist (child children)
+                          (let ((varchild
+                                 (list (bindat-get-field child 'name)
+                                       (bindat-get-field child 'exp)
+                                       (bindat-get-field child 'numchild)
+                                       (bindat-get-field child 'type)
+                                       (bindat-get-field child 'value)
+                                       'changed
+                                       (bindat-get-field child 'has_more))))
+                            (push varchild var-list))))
+                       ;; Remove deleted children from list.
+                       ((< new previous)
+                        (dotimes (dummy new)
+                          (push (pop temp-var-list) var-list))
+                        (dotimes (dummy (- previous new))
+                          (pop temp-var-list)))))
+                  (push var1 var-list))
+                (setq var1 (pop temp-var-list)))
+              (setq gdb-var-list (nreverse var-list))))))))
   (setq gdb-pending-triggers
         (delq 'gdb-var-update gdb-pending-triggers))
   (gdb-speedbar-update))
@@ -1369,7 +1380,8 @@ this trigger is subscribed to `gdb-buf-publisher' and called with
             (when trigger
               (gdb-add-subscriber gdb-buf-publisher
                                   (cons (current-buffer)
-                                        (gdb-bind-function-to-buffer trigger (current-buffer))))
+                                        (gdb-bind-function-to-buffer
+                                         trigger (current-buffer))))
               (funcall trigger 'start))
             (current-buffer))))))
 
@@ -1783,8 +1795,8 @@ is running."
 ;; visited breakpoint is, use that window.
 (defun gdb-display-source-buffer (buffer)
   (let* ((last-window (if gud-last-last-frame
-                         (get-buffer-window
-                          (gud-find-file (car gud-last-last-frame)))))
+                          (get-buffer-window
+                           (gud-find-file (car gud-last-last-frame)))))
          (source-window (or last-window
                             (if (and gdb-source-window
                                      (window-live-p gdb-source-window))
@@ -1857,7 +1869,7 @@ is running."
             ;; Suppress "No registers." since GDB 6.8 and earlier duplicates MI
             ;; error message on internal stream.  Don't print to GUD buffer.
             (unless (and (eq record-type 'gdb-internals)
-                     (string-equal (read arg1) "No registers.\n"))
+                         (string-equal (read arg1) "No registers.\n"))
               (funcall record-type arg1))))))
 
     (setq gdb-output-sink 'user)
@@ -1881,15 +1893,15 @@ is running."
 (defun gdb-thread-exited (output-field)
   "Handle =thread-exited async record: unset `gdb-thread-number'
  if current thread exited and update threads list."
-   (let* ((thread-id (bindat-get-field (gdb-json-string output-field) 'id)))
-     (if (string= gdb-thread-number thread-id)
-         (gdb-setq-thread-number nil))
-     ;; When we continue current thread and it quickly exits,
-     ;; gdb-pending-triggers left after gdb-running disallow us to
-     ;; properly call -thread-info without --thread option. Thus we
-     ;; need to use gdb-wait-for-pending.
-     (gdb-wait-for-pending
-      (gdb-emit-signal gdb-buf-publisher 'update-threads))))
+  (let* ((thread-id (bindat-get-field (gdb-json-string output-field) 'id)))
+    (if (string= gdb-thread-number thread-id)
+        (gdb-setq-thread-number nil))
+    ;; When we continue current thread and it quickly exits,
+    ;; gdb-pending-triggers left after gdb-running disallow us to
+    ;; properly call -thread-info without --thread option. Thus we
+    ;; need to use gdb-wait-for-pending.
+    (gdb-wait-for-pending
+     (gdb-emit-signal gdb-buf-publisher 'update-threads))))
 
 (defun gdb-thread-selected (output-field)
   "Handler for =thread-selected MI output record.
@@ -1909,7 +1921,8 @@ Sets `gdb-thread-number' to new id."
      (gdb-update))))
 
 (defun gdb-running (output-field)
-  (let* ((thread-id (bindat-get-field (gdb-json-string output-field) 'thread-id)))
+  (let* ((thread-id
+          (bindat-get-field (gdb-json-string output-field) 'thread-id)))
     ;; We reset gdb-frame-number to nil if current thread has gone
     ;; running. This can't be done in gdb-thread-list-handler-custom
     ;; because we need correct gdb-frame-number by the time
@@ -1984,23 +1997,23 @@ current thread and update GDB buffers."
         ;; reasons
         (if (or (eq gdb-switch-reasons t)
                 (member reason gdb-switch-reasons))
-              (when (not (string-equal gdb-thread-number thread-id))
-                (message (concat "Switched to thread " thread-id))
-                (gdb-setq-thread-number thread-id))
+            (when (not (string-equal gdb-thread-number thread-id))
+              (message (concat "Switched to thread " thread-id))
+              (gdb-setq-thread-number thread-id))
           (message (format "Thread %s stopped" thread-id)))))
 
-  ;; Print "(gdb)" to GUD console
-  (when gdb-first-done-or-error
-    (setq gdb-filter-output (concat gdb-filter-output gdb-prompt-name)))
+    ;; Print "(gdb)" to GUD console
+    (when gdb-first-done-or-error
+      (setq gdb-filter-output (concat gdb-filter-output gdb-prompt-name)))
 
-  ;; In non-stop, we update information as soon as another thread gets
-  ;; stopped
-  (when (or gdb-first-done-or-error
-            gdb-non-stop)
-    ;; In all-stop this updates gud-running properly as well.
-    (gdb-update)
-    (setq gdb-first-done-or-error nil))
-  (run-hook-with-args 'gdb-stopped-hooks result)))
+    ;; In non-stop, we update information as soon as another thread gets
+    ;; stopped
+    (when (or gdb-first-done-or-error
+              gdb-non-stop)
+      ;; In all-stop this updates gud-running properly as well.
+      (gdb-update)
+      (setq gdb-first-done-or-error nil))
+    (run-hook-with-args 'gdb-stopped-hooks result)))
 
 ;; Remove the trimmings from log stream containing debugging messages
 ;; being produced by GDB's internals, use warning face and send to GUD
@@ -2020,7 +2033,7 @@ current thread and update GDB buffers."
 ;; Remove the trimmings from the console stream and send to GUD buffer
 ;; (frontend MI commands should not print to this stream)
 (defun gdb-console (output-field)
-   (setq gdb-filter-output
+  (setq gdb-filter-output
         (gdb-concat-output
          gdb-filter-output
          (read output-field))))
@@ -2033,11 +2046,11 @@ current thread and update GDB buffers."
         (setq token-number nil)
         ;; MI error - send to minibuffer
         (when (eq type 'error)
-            ;; Skip "msg=" from `output-field'
-            (message (read (substring output-field 4)))
-            ;; Don't send to the console twice.  (If it is a console error
-            ;; it is also in the console stream.)
-            (setq output-field nil)))
+          ;; Skip "msg=" from `output-field'
+          (message (read (substring output-field 4)))
+          ;; Don't send to the console twice.  (If it is a console error
+          ;; it is also in the console stream.)
+          (setq output-field nil)))
     ;; Output from command from frontend.
     (setq gdb-output-sink 'emacs))
 
@@ -2215,11 +2228,11 @@ calling `gdb-table-string'."
           (append row-properties (list properties)))
     (setf (gdb-table-column-sizes table)
           (gdb-mapcar* (lambda (x s)
-                     (let ((new-x
-                            (max (abs x) (string-width (or s "")))))
-                       (if right-align new-x (- new-x))))
-                   (gdb-table-column-sizes table)
-                   row))
+                         (let ((new-x
+                                (max (abs x) (string-width (or s "")))))
+                           (if right-align new-x (- new-x))))
+                       (gdb-table-column-sizes table)
+                       row))
     ;; Avoid trailing whitespace at eol
     (if (not (gdb-table-right-align table))
         (setcar (last (gdb-table-column-sizes table)) 0))))
@@ -2308,8 +2321,8 @@ If NOPRESERVE is non-nil, window point is not restored after CUSTOM-DEFUN."
           '(set-window-point window p)))))
 
 (defmacro def-gdb-trigger-and-handler (trigger-name gdb-command
-                                       handler-name custom-defun
-                                       &optional signal-list)
+                                                    handler-name custom-defun
+                                                    &optional signal-list)
   "Define trigger and handler.
 
 TRIGGER-NAME trigger is defined to send GDB-COMMAND. See
@@ -2353,29 +2366,29 @@ HANDLER-NAME handler uses customization of CUSTOM-DEFUN. See
             (pending (bindat-get-field breakpoint 'pending))
             (func (bindat-get-field breakpoint 'func))
             (type (bindat-get-field breakpoint 'type)))
-      (gdb-table-add-row table
-       (list
-        (bindat-get-field breakpoint 'number)
-        type
-        (bindat-get-field breakpoint 'disp)
-        (let ((flag (bindat-get-field breakpoint 'enabled)))
-          (if (string-equal flag "y")
-              (propertize "y" 'font-lock-face  font-lock-warning-face)
-            (propertize "n" 'font-lock-face  font-lock-comment-face)))
-        (bindat-get-field breakpoint 'addr)
-        (bindat-get-field breakpoint 'times)
-        (if (string-match ".*watchpoint" type)
-            (bindat-get-field breakpoint 'what)
-          (or pending at
-              (concat "in "
-                      (propertize (or func "unknown")
-                                  'font-lock-face font-lock-function-name-face)
-                      (gdb-frame-location breakpoint)))))
-       ;; Add clickable properties only for breakpoints with file:line
-       ;; information
-       (append (list 'gdb-breakpoint breakpoint)
-               (when func '(help-echo "mouse-2, RET: visit breakpoint"
-                            mouse-face highlight))))))
+        (gdb-table-add-row table
+                           (list
+                            (bindat-get-field breakpoint 'number)
+                            type
+                            (bindat-get-field breakpoint 'disp)
+                            (let ((flag (bindat-get-field breakpoint 'enabled)))
+                              (if (string-equal flag "y")
+                                  (propertize "y" 'font-lock-face  font-lock-warning-face)
+                                (propertize "n" 'font-lock-face  font-lock-comment-face)))
+                            (bindat-get-field breakpoint 'addr)
+                            (bindat-get-field breakpoint 'times)
+                            (if (string-match ".*watchpoint" type)
+                                (bindat-get-field breakpoint 'what)
+                              (or pending at
+                                  (concat "in "
+                                          (propertize (or func "unknown")
+                                                      'font-lock-face font-lock-function-name-face)
+                                          (gdb-frame-location breakpoint)))))
+                           ;; Add clickable properties only for breakpoints with file:line
+                           ;; information
+                           (append (list 'gdb-breakpoint breakpoint)
+                                   (when func '(help-echo "mouse-2, RET: visit breakpoint"
+                                                mouse-face highlight))))))
     (insert (gdb-table-string table " "))
     (gdb-place-breakpoints)))
 
@@ -2389,7 +2402,7 @@ HANDLER-NAME handler uses customization of CUSTOM-DEFUN. See
           (gdb-remove-breakpoint-icons (point-min) (point-max)))))
   (dolist (breakpoint gdb-breakpoints-list)
     (let* ((breakpoint (cdr breakpoint)) ; gdb-breakpoints-list is
-                                         ; an associative list
+                                        ; an associative list
            (line (bindat-get-field breakpoint 'line)))
       (when line
         (let ((file (bindat-get-field breakpoint 'fullname))
@@ -2411,7 +2424,7 @@ HANDLER-NAME handler uses customization of CUSTOM-DEFUN. See
             (gdb-input
              (list "-file-list-exec-source-file"
                    `(lambda () (gdb-get-location
-                                ,bptno ,line ,flag))))))))))
+                           ,bptno ,line ,flag))))))))))
 
 (defvar gdb-source-file-regexp "fullname=\"\\(.*?\\)\"")
 
@@ -2422,7 +2435,7 @@ Put in buffer and place breakpoint icon."
   (catch 'file-not-found
     (if (re-search-forward gdb-source-file-regexp nil t)
         (delete (cons bptno "File not found") gdb-location-alist)
-        (push (cons bptno (match-string 1)) gdb-location-alist)
+      (push (cons bptno (match-string 1)) gdb-location-alist)
       (gdb-resync)
       (unless (assoc bptno gdb-location-alist)
         (push (cons bptno "File not found") gdb-location-alist)
@@ -2510,20 +2523,20 @@ If not in a source or disassembly buffer just set point."
               (if (get-text-property 0 'gdb-enabled obj)
                   "-break-disable "
                 "-break-enable ")
-               (get-text-property 0 'gdb-bptno obj)))))))))
+              (get-text-property 0 'gdb-bptno obj)))))))))
 
 (defun gdb-breakpoints-buffer-name ()
   (concat "*breakpoints of " (gdb-get-target-string) "*"))
 
 (def-gdb-display-buffer
- gdb-display-breakpoints-buffer
- 'gdb-breakpoints-buffer
- "Display status of user-settable breakpoints.")
+  gdb-display-breakpoints-buffer
+  'gdb-breakpoints-buffer
+  "Display status of user-settable breakpoints.")
 
 (def-gdb-frame-for-buffer
- gdb-frame-breakpoints-buffer
- 'gdb-breakpoints-buffer
- "Display status of user-settable breakpoints in a new frame.")
+  gdb-frame-breakpoints-buffer
+  'gdb-breakpoints-buffer
+  "Display status of user-settable breakpoints in a new frame.")
 
 (defvar gdb-breakpoints-mode-map
   (let ((map (make-sparse-keymap))
@@ -2540,9 +2553,9 @@ If not in a source or disassembly buffer just set point."
     (define-key map "q" 'gdb-delete-frame-or-window)
     (define-key map "\r" 'gdb-goto-breakpoint)
     (define-key map "\t" (lambda ()
-                            (interactive)
-                            (gdb-set-window-buffer
-                             (gdb-get-buffer-create 'gdb-threads-buffer) t)))
+                           (interactive)
+                           (gdb-set-window-buffer
+                            (gdb-get-buffer-create 'gdb-threads-buffer) t)))
     (define-key map [mouse-2] 'gdb-goto-breakpoint)
     (define-key map [follow-link] 'mouse-face)
     map))
@@ -2585,14 +2598,14 @@ corresponding to the mode line clicked."
   (concat "*threads of " (gdb-get-target-string) "*"))
 
 (def-gdb-display-buffer
- gdb-display-threads-buffer
- 'gdb-threads-buffer
- "Display GDB threads.")
+  gdb-display-threads-buffer
+  'gdb-threads-buffer
+  "Display GDB threads.")
 
 (def-gdb-frame-for-buffer
- gdb-frame-threads-buffer
- 'gdb-threads-buffer
- "Display GDB threads in a new frame.")
+  gdb-frame-threads-buffer
+  'gdb-threads-buffer
+  "Display GDB threads in a new frame.")
 
 (def-gdb-trigger-and-handler
   gdb-invalidate-threads (gdb-current-context-command "-thread-info")
@@ -2626,18 +2639,20 @@ corresponding to the mode line clicked."
     (define-key map "i" 'gdb-interrupt-thread)
     (define-key map "c" 'gdb-continue-thread)
     (define-key map "s" 'gdb-step-thread)
-    (define-key map "\t" (lambda ()
-                            (interactive)
-                            (gdb-set-window-buffer
-                             (gdb-get-buffer-create 'gdb-breakpoints-buffer) t)))
+    (define-key map "\t"
+      (lambda ()
+        (interactive)
+        (gdb-set-window-buffer
+         (gdb-get-buffer-create 'gdb-breakpoints-buffer) t)))
     (define-key map [mouse-2] 'gdb-select-thread)
     (define-key map [follow-link] 'mouse-face)
     map))
 
 (defvar gdb-threads-header
   (list
-   (gdb-propertize-header "Breakpoints" gdb-breakpoints-buffer
-                          "mouse-1: select" mode-line-highlight mode-line-inactive)
+   (gdb-propertize-header
+    "Breakpoints" gdb-breakpoints-buffer
+    "mouse-1: select" mode-line-highlight mode-line-inactive)
    " "
    (gdb-propertize-header "Threads" gdb-threads-buffer
                           nil nil mode-line)))
@@ -2661,44 +2676,45 @@ corresponding to the mode line clicked."
     (set-marker gdb-thread-position nil)
 
     (dolist (thread (reverse threads-list))
-      (let ((running (string-equal (bindat-get-field thread 'state) "running")))
-      (add-to-list 'gdb-threads-list
-                   (cons (bindat-get-field thread 'id)
-                         thread))
-      (if running
-          (incf gdb-running-threads-count)
-        (incf gdb-stopped-threads-count))
-
-      (gdb-table-add-row table
-       (list
-        (bindat-get-field thread 'id)
-        (concat
-         (if gdb-thread-buffer-verbose-names
-             (concat (bindat-get-field thread 'target-id) " ") "")
-         (bindat-get-field thread 'state)
-         ;; Include frame information for stopped threads
-         (if (not running)
-             (concat
-              " in " (bindat-get-field thread 'frame 'func)
-              (if gdb-thread-buffer-arguments
-                  (concat
-                   " ("
-                   (let ((args (bindat-get-field thread 'frame 'args)))
-                     (mapconcat
-                      (lambda (arg)
-                        (apply 'format `("%s=%s" ,@(gdb-get-many-fields arg 'name 'value))))
-                      args ","))
-                   ")")
-                "")
-              (if gdb-thread-buffer-locations
-                  (gdb-frame-location (bindat-get-field thread 'frame)) "")
-              (if gdb-thread-buffer-addresses
-                  (concat " at " (bindat-get-field thread 'frame 'addr)) ""))
-           "")))
-       (list
-        'gdb-thread thread
-        'mouse-face 'highlight
-        'help-echo "mouse-2, RET: select thread")))
+      (let ((running (equal (bindat-get-field thread 'state) "running")))
+        (add-to-list 'gdb-threads-list
+                     (cons (bindat-get-field thread 'id)
+                           thread))
+        (if running
+            (incf gdb-running-threads-count)
+          (incf gdb-stopped-threads-count))
+
+        (gdb-table-add-row table
+                           (list
+                            (bindat-get-field thread 'id)
+                            (concat
+                             (if gdb-thread-buffer-verbose-names
+                                 (concat (bindat-get-field thread 'target-id) " ") "")
+                             (bindat-get-field thread 'state)
+                             ;; Include frame information for stopped threads
+                             (if (not running)
+                                 (concat
+                                  " in " (bindat-get-field thread 'frame 'func)
+                                  (if gdb-thread-buffer-arguments
+                                      (concat
+                                       " ("
+                                       (let ((args (bindat-get-field thread 'frame 'args)))
+                                         (mapconcat
+                                          (lambda (arg)
+                                            (apply #'format "%s=%s"
+                                                   (gdb-get-many-fields arg 'name 'value)))
+                                          args ","))
+                                       ")")
+                                    "")
+                                  (if gdb-thread-buffer-locations
+                                      (gdb-frame-location (bindat-get-field thread 'frame)) "")
+                                  (if gdb-thread-buffer-addresses
+                                      (concat " at " (bindat-get-field thread 'frame 'addr)) ""))
+                               "")))
+                           (list
+                            'gdb-thread thread
+                            'mouse-face 'highlight
+                            'help-echo "mouse-2, RET: select thread")))
       (when (string-equal gdb-thread-number
                           (bindat-get-field thread 'id))
         (setq marked-line (length gdb-threads-list))))
@@ -2727,7 +2743,8 @@ be the value of 'gdb-thread property of the current line. If
              ,custom-defun
            (error "Not recognized as thread line"))))))
 
-(defmacro def-gdb-thread-buffer-simple-command (name buffer-command &optional doc)
+(defmacro def-gdb-thread-buffer-simple-command (name buffer-command
+                                                     &optional doc)
   "Define a NAME which will call BUFFER-COMMAND with id of thread
 on the current line."
   `(def-gdb-thread-buffer-command ,name
@@ -2830,19 +2847,19 @@ line."
 (defcustom gdb-memory-format "x"
   "Display format of data items in memory window."
   :type '(choice (const :tag "Hexadecimal" "x")
-                 (const :tag "Signed decimal" "d")
-                 (const :tag "Unsigned decimal" "u")
-                 (const :tag "Octal" "o")
-                 (const :tag "Binary" "t"))
+          (const :tag "Signed decimal" "d")
+          (const :tag "Unsigned decimal" "u")
+          (const :tag "Octal" "o")
+          (const :tag "Binary" "t"))
   :group 'gud
   :version "22.1")
 
 (defcustom gdb-memory-unit 4
   "Unit size of data items in memory window."
   :type '(choice (const :tag "Byte" 1)
-                 (const :tag "Halfword" 2)
-                 (const :tag "Word" 4)
-                 (const :tag "Giant word" 8))
+          (const :tag "Halfword" 2)
+          (const :tag "Word" 4)
+          (const :tag "Giant word" 8))
   :group 'gud
   :version "23.2")
 
@@ -2893,14 +2910,14 @@ in `gdb-memory-format'."
           (setq gdb-memory-next-page (bindat-get-field res 'next-page))
           (setq gdb-memory-prev-page (bindat-get-field res 'prev-page))
           (setq gdb-memory-last-address gdb-memory-address)
-        (dolist (row memory)
-          (insert (concat (bindat-get-field row 'addr) ":"))
-          (dolist (column (bindat-get-field row 'data))
-            (insert (gdb-pad-string column
-                                    (+ 2 (gdb-memory-column-width
-                                          gdb-memory-unit
-                                          gdb-memory-format)))))
-          (newline)))
+          (dolist (row memory)
+            (insert (concat (bindat-get-field row 'addr) ":"))
+            (dolist (column (bindat-get-field row 'data))
+              (insert (gdb-pad-string column
+                                      (+ 2 (gdb-memory-column-width
+                                            gdb-memory-unit
+                                            gdb-memory-format)))))
+            (newline)))
       ;; Show last page instead of empty buffer when out of bounds
       (progn
         (let ((gdb-memory-address gdb-memory-last-address))
@@ -2925,7 +2942,7 @@ in `gdb-memory-format'."
     (define-key map "g" 'gdb-memory-unit-giant)
     (define-key map "R" 'gdb-memory-set-rows)
     (define-key map "C" 'gdb-memory-set-columns)
-     map))
+    map))
 
 (defun gdb-memory-set-address-event (event)
   "Handle a click on address field in memory buffer header."
@@ -3115,8 +3132,8 @@ DOC is an optional documentation string."
 
 (defvar gdb-memory-font-lock-keywords
   '(;; <__function.name+n>
-    ("<\\(\\(\\sw\\|[_.]\\)+\\)\\(\\+[0-9]+\\)?>" (1 font-lock-function-name-face))
-    )
+    ("<\\(\\(\\sw\\|[_.]\\)+\\)\\(\\+[0-9]+\\)?>"
+     (1 font-lock-function-name-face)))
   "Font lock keywords used in `gdb-memory-mode'.")
 
 (defvar gdb-memory-header
@@ -3124,52 +3141,52 @@ DOC is an optional documentation string."
     (concat
      "Start address["
      (propertize "-"
-                  'face font-lock-warning-face
-                  'help-echo "mouse-1: decrement address"
-                  'mouse-face 'mode-line-highlight
-                  'local-map (gdb-make-header-line-mouse-map
-                              'mouse-1
-                              #'gdb-memory-show-previous-page))
+                 'face font-lock-warning-face
+                 'help-echo "mouse-1: decrement address"
+                 'mouse-face 'mode-line-highlight
+                 'local-map (gdb-make-header-line-mouse-map
+                             'mouse-1
+                             #'gdb-memory-show-previous-page))
      "|"
      (propertize "+"
-                  'face font-lock-warning-face
-                  'help-echo "mouse-1: increment address"
+                 'face font-lock-warning-face
+                 'help-echo "mouse-1: increment address"
                  'mouse-face 'mode-line-highlight
                  'local-map (gdb-make-header-line-mouse-map
                              'mouse-1
                              #'gdb-memory-show-next-page))
-    "]: "
-    (propertize gdb-memory-address
+     "]: "
+     (propertize gdb-memory-address
                  'face font-lock-warning-face
                  'help-echo "mouse-1: set start address"
                  'mouse-face 'mode-line-highlight
                  'local-map (gdb-make-header-line-mouse-map
                              'mouse-1
                              #'gdb-memory-set-address-event))
-    "  Rows: "
-    (propertize (number-to-string gdb-memory-rows)
+     "  Rows: "
+     (propertize (number-to-string gdb-memory-rows)
                  'face font-lock-warning-face
                  'help-echo "mouse-1: set number of columns"
                  'mouse-face 'mode-line-highlight
                  'local-map (gdb-make-header-line-mouse-map
                              'mouse-1
                              #'gdb-memory-set-rows))
-    "  Columns: "
-    (propertize (number-to-string gdb-memory-columns)
+     "  Columns: "
+     (propertize (number-to-string gdb-memory-columns)
                  'face font-lock-warning-face
                  'help-echo "mouse-1: set number of columns"
                  'mouse-face 'mode-line-highlight
                  'local-map (gdb-make-header-line-mouse-map
                              'mouse-1
                              #'gdb-memory-set-columns))
-    "  Display Format: "
-    (propertize gdb-memory-format
+     "  Display Format: "
+     (propertize gdb-memory-format
                  'face font-lock-warning-face
                  'help-echo "mouse-3: select display format"
                  'mouse-face 'mode-line-highlight
                  'local-map gdb-memory-format-map)
-    "  Unit Size: "
-    (propertize (number-to-string gdb-memory-unit)
+     "  Unit Size: "
+     (propertize (number-to-string gdb-memory-unit)
                  'face font-lock-warning-face
                  'help-echo "mouse-3: select unit size"
                  'mouse-face 'mode-line-highlight
@@ -3210,18 +3227,18 @@ DOC is an optional documentation string."
    (concat "disassembly of " (gdb-get-target-string))))
 
 (def-gdb-display-buffer
- gdb-display-disassembly-buffer
- 'gdb-disassembly-buffer
- "Display disassembly for current stack frame.")
+  gdb-display-disassembly-buffer
+  'gdb-disassembly-buffer
+  "Display disassembly for current stack frame.")
 
 (def-gdb-preempt-display-buffer
   gdb-preemptively-display-disassembly-buffer
   'gdb-disassembly-buffer)
 
 (def-gdb-frame-for-buffer
- gdb-frame-disassembly-buffer
- 'gdb-disassembly-buffer
- "Display disassembly in a new frame.")
+  gdb-frame-disassembly-buffer
+  'gdb-disassembly-buffer
+  "Display disassembly in a new frame.")
 
 (def-gdb-auto-update-trigger gdb-invalidate-disassembly
   (let* ((frame (gdb-current-buffer-frame))
@@ -3266,7 +3283,7 @@ DOC is an optional documentation string."
   (let ((map (make-sparse-keymap)))
     (suppress-keymap map)
     (define-key map "q" 'kill-this-buffer)
-     map))
+    map))
 
 (define-derived-mode gdb-disassembly-mode gdb-parent-mode "Disassembly"
   "Major mode for GDB disassembly information."
@@ -3283,12 +3300,13 @@ DOC is an optional documentation string."
          (address (bindat-get-field (gdb-current-buffer-frame) 'addr))
          (table (make-gdb-table))
          (marked-line nil))
-      (dolist (instr instructions)
+    (dolist (instr instructions)
       (gdb-table-add-row table
-       (list
-        (bindat-get-field instr 'address)
-        (apply 'format `("<%s+%s>:" ,@(gdb-get-many-fields instr 'func-name 'offset)))
-        (bindat-get-field instr 'inst)))
+                         (list
+                          (bindat-get-field instr 'address)
+                          (apply #'format "<%s+%s>:"
+                                 (gdb-get-many-fields instr 'func-name 'offset))
+                          (bindat-get-field instr 'inst)))
       (when (string-equal (bindat-get-field instr 'address)
                           address)
         (progn
@@ -3297,17 +3315,18 @@ DOC is an optional documentation string."
                 (if (string-equal gdb-frame-number "0")
                     nil
                   '((overlay-arrow . hollow-right-triangle)))))))
-      (insert (gdb-table-string table " "))
-      (gdb-disassembly-place-breakpoints)
-      ;; Mark current position with overlay arrow and scroll window to
-      ;; that point
-      (when marked-line
-        (let ((window (get-buffer-window (current-buffer) 0)))
-          (set-window-point window (gdb-mark-line marked-line gdb-disassembly-position))))
-      (setq mode-name
-            (gdb-current-context-mode-name
-            (concat "Disassembly: "
-                    (bindat-get-field (gdb-current-buffer-frame) 'func))))))
+    (insert (gdb-table-string table " "))
+    (gdb-disassembly-place-breakpoints)
+    ;; Mark current position with overlay arrow and scroll window to
+    ;; that point
+    (when marked-line
+      (let ((window (get-buffer-window (current-buffer) 0)))
+        (set-window-point window (gdb-mark-line marked-line
+                                                gdb-disassembly-position))))
+    (setq mode-name
+          (gdb-current-context-mode-name
+           (concat "Disassembly: "
+                   (bindat-get-field (gdb-current-buffer-frame) 'func))))))
 
 (defun gdb-disassembly-place-breakpoints ()
   (gdb-remove-breakpoint-icons (point-min) (point-max))
@@ -3328,7 +3347,8 @@ DOC is an optional documentation string."
                           nil nil mode-line)
    " "
    (gdb-propertize-header "Threads" gdb-threads-buffer
-                          "mouse-1: select" mode-line-highlight mode-line-inactive)))
+                          "mouse-1: select" mode-line-highlight
+                          mode-line-inactive)))
 
 ;;; Breakpoints view
 (define-derived-mode gdb-breakpoints-mode gdb-parent-mode "Breakpoints"
@@ -3344,7 +3364,7 @@ DOC is an optional documentation string."
     (let ((breakpoint (get-text-property (point) 'gdb-breakpoint)))
       (if breakpoint
           (gud-basic-call
-           (concat (if (string-equal "y" (bindat-get-field breakpoint 'enabled))
+           (concat (if (equal "y" (bindat-get-field breakpoint 'enabled))
                        "-break-disable "
                      "-break-enable ")
                    (bindat-get-field breakpoint 'number)))
@@ -3354,11 +3374,12 @@ DOC is an optional documentation string."
   "Delete the breakpoint at current line of breakpoints buffer."
   (interactive)
   (save-excursion
-  (beginning-of-line)
-  (let ((breakpoint (get-text-property (point) 'gdb-breakpoint)))
-    (if breakpoint
-        (gud-basic-call (concat "-break-delete " (bindat-get-field breakpoint 'number)))
-      (error "Not recognized as break/watchpoint line")))))
+    (beginning-of-line)
+    (let ((breakpoint (get-text-property (point) 'gdb-breakpoint)))
+      (if breakpoint
+          (gud-basic-call (concat "-break-delete "
+                                  (bindat-get-field breakpoint 'number)))
+        (error "Not recognized as break/watchpoint line")))))
 
 (defun gdb-goto-breakpoint (&optional event)
   "Go to the location of breakpoint at current line of
@@ -3369,24 +3390,24 @@ breakpoints buffer."
   (let ((window (get-buffer-window gud-comint-buffer)))
     (if window (save-selected-window  (select-window window))))
   (save-excursion
-  (beginning-of-line)
-  (let ((breakpoint (get-text-property (point) 'gdb-breakpoint)))
-    (if breakpoint
-        (let ((bptno (bindat-get-field breakpoint 'number))
-              (file  (bindat-get-field breakpoint 'fullname))
-              (line  (bindat-get-field breakpoint 'line)))
-          (save-selected-window
-            (let* ((buffer (find-file-noselect
-                         (if (file-exists-p file) file
-                           (cdr (assoc bptno gdb-location-alist)))))
-                   (window (or (gdb-display-source-buffer buffer)
-                               (display-buffer buffer))))
-              (setq gdb-source-window window)
-              (with-current-buffer buffer
-                (goto-char (point-min))
-                (forward-line (1- (string-to-number line)))
-                (set-window-point window (point))))))
-      (error "Not recognized as break/watchpoint line")))))
+    (beginning-of-line)
+    (let ((breakpoint (get-text-property (point) 'gdb-breakpoint)))
+      (if breakpoint
+          (let ((bptno (bindat-get-field breakpoint 'number))
+                (file  (bindat-get-field breakpoint 'fullname))
+                (line  (bindat-get-field breakpoint 'line)))
+            (save-selected-window
+              (let* ((buffer (find-file-noselect
+                              (if (file-exists-p file) file
+                                (cdr (assoc bptno gdb-location-alist)))))
+                     (window (or (gdb-display-source-buffer buffer)
+                                 (display-buffer buffer))))
+                (setq gdb-source-window window)
+                (with-current-buffer buffer
+                  (goto-char (point-min))
+                  (forward-line (1- (string-to-number line)))
+                  (set-window-point window (point))))))
+        (error "Not recognized as break/watchpoint line")))))
 
 
 ;; Frames buffer.  This displays a perpetually correct bactrack trace.
@@ -3418,21 +3439,21 @@ member."
   (let ((stack (bindat-get-field (gdb-json-partial-output "frame") 'stack))
         (table (make-gdb-table)))
     (set-marker gdb-stack-position nil)
-         (dolist (frame stack)
-           (gdb-table-add-row table
-            (list
-             (bindat-get-field frame 'level)
-             "in"
-             (concat
-              (bindat-get-field frame 'func)
-              (if gdb-stack-buffer-locations
-                  (gdb-frame-location frame) "")
-              (if gdb-stack-buffer-addresses
-                  (concat " at " (bindat-get-field frame 'addr)) "")))
-            `(mouse-face highlight
-              help-echo "mouse-2, RET: Select frame"
-              gdb-frame ,frame)))
-         (insert (gdb-table-string table " ")))
+    (dolist (frame stack)
+      (gdb-table-add-row table
+                         (list
+                          (bindat-get-field frame 'level)
+                          "in"
+                          (concat
+                           (bindat-get-field frame 'func)
+                           (if gdb-stack-buffer-locations
+                               (gdb-frame-location frame) "")
+                           (if gdb-stack-buffer-addresses
+                               (concat " at " (bindat-get-field frame 'addr)) "")))
+                         `(mouse-face highlight
+                                      help-echo "mouse-2, RET: Select frame"
+                                      gdb-frame ,frame)))
+    (insert (gdb-table-string table " ")))
   (when (and gdb-frame-number
              (gdb-buffer-shows-main-thread-p))
     (gdb-mark-line (1+ (string-to-number gdb-frame-number))
@@ -3445,18 +3466,18 @@ member."
    (concat "stack frames of " (gdb-get-target-string))))
 
 (def-gdb-display-buffer
- gdb-display-stack-buffer
- 'gdb-stack-buffer
- "Display backtrace of current stack.")
+  gdb-display-stack-buffer
+  'gdb-stack-buffer
+  "Display backtrace of current stack.")
 
 (def-gdb-preempt-display-buffer
   gdb-preemptively-display-stack-buffer
   'gdb-stack-buffer nil t)
 
 (def-gdb-frame-for-buffer
- gdb-frame-stack-buffer
- 'gdb-stack-buffer
- "Display backtrace of current stack in a new frame.")
+  gdb-frame-stack-buffer
+  'gdb-stack-buffer
+  "Display backtrace of current stack in a new frame.")
 
 (defvar gdb-frames-mode-map
   (let ((map (make-sparse-keymap)))
@@ -3489,7 +3510,8 @@ member."
         (if (gdb-buffer-shows-main-thread-p)
             (let ((new-level (bindat-get-field frame 'level)))
               (setq gdb-frame-number new-level)
-              (gdb-input (list (concat "-stack-select-frame " new-level) 'ignore))
+              (gdb-input (list (concat "-stack-select-frame " new-level)
+                               'ignore))
               (gdb-update))
           (error "Could not select frame for non-current thread"))
       (error "Not recognized as frame line"))))
@@ -3499,7 +3521,8 @@ member."
 ;; uses "-stack-list-locals --simple-values". Needs GDB 6.1 onwards.
 (def-gdb-trigger-and-handler
   gdb-invalidate-locals
-  (concat (gdb-current-context-command "-stack-list-locals") " --simple-values")
+  (concat (gdb-current-context-command "-stack-list-locals")
+          " --simple-values")
   gdb-locals-handler gdb-locals-handler-custom
   '(start update))
 
@@ -3515,7 +3538,7 @@ member."
     (define-key map "\r" 'gud-watch)
     (define-key map [mouse-2] 'gud-watch)
     map)
- "Keymap to create watch expression of a complex data type local variable.")
+  "Keymap to create watch expression of a complex data type local variable.")
 
 (defvar gdb-edit-locals-map-1
   (let ((map (make-sparse-keymap)))
@@ -3523,7 +3546,7 @@ member."
     (define-key map "\r" 'gdb-edit-locals-value)
     (define-key map [mouse-2] 'gdb-edit-locals-value)
     map)
- "Keymap to edit value of a simple data type local variable.")
+  "Keymap to edit value of a simple data type local variable.")
 
 (defun gdb-edit-locals-value (&optional event)
   "Assign a value to a variable displayed in the locals buffer."
@@ -3549,14 +3572,14 @@ member."
         (if (or (not value)
                 (string-match "\\0x" value))
             (add-text-properties 0 (length name)
-                            `(mouse-face highlight
-                              help-echo "mouse-2: create watch expression"
-                              local-map ,gdb-locals-watch-map)
-                            name)
+                                 `(mouse-face highlight
+                                              help-echo "mouse-2: create watch expression"
+                                              local-map ,gdb-locals-watch-map)
+                                 name)
           (add-text-properties 0 (length value)
                                `(mouse-face highlight
-                                help-echo "mouse-2: edit value"
-                                local-map ,gdb-edit-locals-map-1)
+                                            help-echo "mouse-2: edit value"
+                                            local-map ,gdb-edit-locals-map-1)
                                value))
         (gdb-table-add-row
          table
@@ -3568,7 +3591,8 @@ member."
     (insert (gdb-table-string table " "))
     (setq mode-name
           (gdb-current-context-mode-name
-          (concat "Locals: " (bindat-get-field (gdb-current-buffer-frame) 'func))))))
+           (concat "Locals: "
+                   (bindat-get-field (gdb-current-buffer-frame) 'func))))))
 
 (defvar gdb-locals-header
   (list
@@ -3576,19 +3600,20 @@ member."
                           nil nil mode-line)
    " "
    (gdb-propertize-header "Registers" gdb-registers-buffer
-                          "mouse-1: select" mode-line-highlight mode-line-inactive)))
+                          "mouse-1: select" mode-line-highlight
+                          mode-line-inactive)))
 
 (defvar gdb-locals-mode-map
   (let ((map (make-sparse-keymap)))
     (suppress-keymap map)
     (define-key map "q" 'kill-this-buffer)
     (define-key map "\t" (lambda ()
-                            (interactive)
-                            (gdb-set-window-buffer
-                             (gdb-get-buffer-create
-                              'gdb-registers-buffer
-                              gdb-thread-number) t)))
-     map))
+                           (interactive)
+                           (gdb-set-window-buffer
+                            (gdb-get-buffer-create
+                             'gdb-registers-buffer
+                             gdb-thread-number) t)))
+    map))
 
 (define-derived-mode gdb-locals-mode gdb-parent-mode "Locals"
   "Major mode for gdb locals."
@@ -3600,18 +3625,18 @@ member."
    (concat "locals of " (gdb-get-target-string))))
 
 (def-gdb-display-buffer
- gdb-display-locals-buffer
- 'gdb-locals-buffer
- "Display local variables of current stack and their values.")
+  gdb-display-locals-buffer
+  'gdb-locals-buffer
+  "Display local variables of current stack and their values.")
 
 (def-gdb-preempt-display-buffer
- gdb-preemptively-display-locals-buffer
- 'gdb-locals-buffer nil t)
+  gdb-preemptively-display-locals-buffer
+  'gdb-locals-buffer nil t)
 
 (def-gdb-frame-for-buffer
- gdb-frame-locals-buffer
- 'gdb-locals-buffer
- "Display local variables of current stack and their values in a new frame.")
+  gdb-frame-locals-buffer
+  'gdb-locals-buffer
+  "Display local variables of current stack and their values in a new frame.")
 
 
 ;; Registers buffer.
@@ -3631,7 +3656,8 @@ member."
 
 (defun gdb-registers-handler-custom ()
   (when gdb-register-names
-    (let ((register-values (bindat-get-field (gdb-json-partial-output) 'register-values))
+    (let ((register-values
+           (bindat-get-field (gdb-json-partial-output) 'register-values))
           (table (make-gdb-table)))
       (dolist (register register-values)
         (let* ((register-number (bindat-get-field register 'number))
@@ -3641,7 +3667,8 @@ member."
           (gdb-table-add-row
            table
            (list
-            (propertize register-name 'font-lock-face font-lock-variable-name-face)
+            (propertize register-name
+                        'font-lock-face font-lock-variable-name-face)
             (if (member register-number gdb-changed-registers)
                 (propertize value 'font-lock-face font-lock-warning-face)
               value))
@@ -3671,17 +3698,18 @@ member."
     (define-key map [mouse-2] 'gdb-edit-register-value)
     (define-key map "q" 'kill-this-buffer)
     (define-key map "\t" (lambda ()
-                            (interactive)
-                            (gdb-set-window-buffer
-                             (gdb-get-buffer-create
-                              'gdb-locals-buffer
-                              gdb-thread-number) t)))
+                           (interactive)
+                           (gdb-set-window-buffer
+                            (gdb-get-buffer-create
+                             'gdb-locals-buffer
+                             gdb-thread-number) t)))
     map))
 
 (defvar gdb-registers-header
   (list
    (gdb-propertize-header "Locals" gdb-locals-buffer
-                          "mouse-1: select" mode-line-highlight mode-line-inactive)
+                          "mouse-1: select" mode-line-highlight
+                          mode-line-inactive)
    " "
    (gdb-propertize-header "Registers" gdb-registers-buffer
                           nil nil mode-line)))
@@ -3696,17 +3724,17 @@ member."
    (concat "registers of " (gdb-get-target-string))))
 
 (def-gdb-display-buffer
- gdb-display-registers-buffer
- 'gdb-registers-buffer
- "Display integer register contents.")
+  gdb-display-registers-buffer
+  'gdb-registers-buffer
+  "Display integer register contents.")
 
 (def-gdb-preempt-display-buffer
   gdb-preemptively-display-registers-buffer
- 'gdb-registers-buffer nil t)
+  'gdb-registers-buffer nil t)
 
 (def-gdb-frame-for-buffer
- gdb-frame-registers-buffer
- 'gdb-registers-buffer
+  gdb-frame-registers-buffer
+  'gdb-registers-buffer
   "Display integer register contents in a new frame.")
 
 ;; Needs GDB 6.4 onwards (used to fail with no stack).
@@ -3723,14 +3751,16 @@ member."
 (defun gdb-changed-registers-handler ()
   (gdb-delete-pending 'gdb-get-changed-registers)
   (setq gdb-changed-registers nil)
-  (dolist (register-number (bindat-get-field (gdb-json-partial-output) 'changed-registers))
+  (dolist (register-number
+           (bindat-get-field (gdb-json-partial-output) 'changed-registers))
     (push register-number gdb-changed-registers)))
 
 (defun gdb-register-names-handler ()
   ;; Don't use gdb-pending-triggers because this handler is called
   ;; only once (in gdb-init-1)
   (setq gdb-register-names nil)
-  (dolist (register-name (bindat-get-field (gdb-json-partial-output) 'register-names))
+  (dolist (register-name
+           (bindat-get-field (gdb-json-partial-output) 'register-names))
     (push register-name gdb-register-names))
   (setq gdb-register-names (reverse gdb-register-names)))
 
@@ -3755,7 +3785,8 @@ thread. Called from `gdb-update'."
   (if (not (gdb-pending-p 'gdb-get-main-selected-frame))
       (progn
         (gdb-input
-         (list (gdb-current-context-command "-stack-info-frame") 'gdb-frame-handler))
+         (list (gdb-current-context-command "-stack-info-frame")
+               'gdb-frame-handler))
         (gdb-add-pending 'gdb-get-main-selected-frame))))
 
 (defun gdb-frame-handler ()
@@ -3806,10 +3837,10 @@ window and show BUF there, if the window is not used for GDB
 already, in which case that window is splitted first."
   (let ((answer (get-buffer-window buf (or frame 0))))
     (if answer
-        (display-buffer buf nil (or frame 0)) ;Deiconify the frame if necessary.
+        (display-buffer buf nil (or frame 0)) ;Deiconify frame if necessary.
       (let ((window (get-lru-window)))
         (if (eq (buffer-local-value 'gud-minor-mode (window-buffer window))
-                  'gdbmi)
+                'gdbmi)
             (let ((largest (get-largest-window)))
               (setq answer (split-window largest))
               (set-window-buffer answer buf)
@@ -3872,7 +3903,8 @@ SPLIT-HORIZONTAL and show BUF in the new window."
   (define-key menu [gdb] '("Gdb" . gdb-frame-gdb-buffer))
   (define-key menu [threads] '("Threads" . gdb-frame-threads-buffer))
   (define-key menu [memory] '("Memory" . gdb-frame-memory-buffer))
-  (define-key menu [disassembly] '("Disassembly" . gdb-frame-disassembly-buffer))
+  (define-key menu [disassembly]
+    '("Disassembly" . gdb-frame-disassembly-buffer))
   (define-key menu [registers] '("Registers" . gdb-frame-registers-buffer))
   (define-key menu [inferior]
     '("IO" . gdb-frame-io-buffer))
@@ -3883,40 +3915,41 @@ SPLIT-HORIZONTAL and show BUF in the new window."
 
 (let ((menu (make-sparse-keymap "GDB-MI")))
   (define-key menu [gdb-customize]
-  '(menu-item "Customize" (lambda () (interactive) (customize-group 'gdb))
-              :help "Customize Gdb Graphical Mode options."))
+    '(menu-item "Customize" (lambda () (interactive) (customize-group 'gdb))
+      :help "Customize Gdb Graphical Mode options."))
   (define-key menu [gdb-many-windows]
-  '(menu-item "Display Other Windows" gdb-many-windows
-              :help "Toggle display of locals, stack and breakpoint information"
-              :button (:toggle . gdb-many-windows)))
+    '(menu-item "Display Other Windows" gdb-many-windows
+      :help "Toggle display of locals, stack and breakpoint information"
+      :button (:toggle . gdb-many-windows)))
   (define-key menu [gdb-restore-windows]
-  '(menu-item "Restore Window Layout" gdb-restore-windows
-              :help "Restore standard layout for debug session."))
+    '(menu-item "Restore Window Layout" gdb-restore-windows
+      :help "Restore standard layout for debug session."))
   (define-key menu [sep1]
     '(menu-item "--"))
   (define-key menu [all-threads]
     '(menu-item "GUD controls all threads"
-                (lambda ()
-                  (interactive)
-                  (setq gdb-gud-control-all-threads t))
-                :help "GUD start/stop commands apply to all threads"
-                :button (:radio . gdb-gud-control-all-threads)))
+      (lambda ()
+        (interactive)
+        (setq gdb-gud-control-all-threads t))
+      :help "GUD start/stop commands apply to all threads"
+      :button (:radio . gdb-gud-control-all-threads)))
   (define-key menu [current-thread]
     '(menu-item "GUD controls current thread"
-                (lambda ()
-                  (interactive)
-                  (setq gdb-gud-control-all-threads nil))
-                :help "GUD start/stop commands apply to current thread only"
-                :button (:radio . (not gdb-gud-control-all-threads))))
+      (lambda ()
+        (interactive)
+        (setq gdb-gud-control-all-threads nil))
+      :help "GUD start/stop commands apply to current thread only"
+      :button (:radio . (not gdb-gud-control-all-threads))))
   (define-key menu [sep2]
     '(menu-item "--"))
   (define-key menu [gdb-customize-reasons]
     '(menu-item "Customize switching..."
-                (lambda ()
-                  (interactive)
-                  (customize-option 'gdb-switch-reasons))))
+      (lambda ()
+        (interactive)
+        (customize-option 'gdb-switch-reasons))))
   (define-key menu [gdb-switch-when-another-stopped]
-    (menu-bar-make-toggle gdb-toggle-switch-when-another-stopped gdb-switch-when-another-stopped
+    (menu-bar-make-toggle gdb-toggle-switch-when-another-stopped
+                          gdb-switch-when-another-stopped
                           "Automatically switch to stopped thread"
                           "GDB thread switching %s"
                           "Switch to stopped thread"))
@@ -3930,18 +3963,18 @@ SPLIT-HORIZONTAL and show BUF in the new window."
 ;; show up right before Run button.
 (define-key-after gud-tool-bar-map [all-threads]
   '(menu-item "Switch to non-stop/A mode" gdb-control-all-threads
-              :image (find-image '((:type xpm :file "gud/thread.xpm")))
-              :visible (and (eq gud-minor-mode 'gdbmi)
-                            gdb-non-stop
-                            (not gdb-gud-control-all-threads)))
+    :image (find-image '((:type xpm :file "gud/thread.xpm")))
+    :visible (and (eq gud-minor-mode 'gdbmi)
+                  gdb-non-stop
+                  (not gdb-gud-control-all-threads)))
   'run)
 
 (define-key-after gud-tool-bar-map [current-thread]
   '(menu-item "Switch to non-stop/T mode" gdb-control-current-thread
-              :image (find-image '((:type xpm :file "gud/all.xpm")))
-              :visible (and (eq gud-minor-mode 'gdbmi)
-                            gdb-non-stop
-                            gdb-gud-control-all-threads))
+    :image (find-image '((:type xpm :file "gud/all.xpm")))
+    :visible (and (eq gud-minor-mode 'gdbmi)
+                  gdb-non-stop
+                  gdb-gud-control-all-threads))
   'all-threads)
 
 (defun gdb-frame-gdb-buffer ()
@@ -3960,15 +3993,16 @@ SPLIT-HORIZONTAL and show BUF in the new window."
   (let ((same-window-regexps nil))
     (select-window (display-buffer gud-comint-buffer nil 0))))
 
-(defun gdb-set-window-buffer (name &optional ignore-dedicated)
+(defun gdb-set-window-buffer (name &optional ignore-dedicated window)
   "Set buffer of selected window to NAME and dedicate window.
 
 When IGNORE-DEDICATED is non-nil, buffer is set even if selected
 window is dedicated."
+  (unless window (setq window (selected-window)))
   (when ignore-dedicated
-    (set-window-dedicated-p (selected-window) nil))
-  (set-window-buffer (selected-window) (get-buffer name))
-  (set-window-dedicated-p (selected-window) t))
+    (set-window-dedicated-p window nil))
+  (set-window-buffer window (get-buffer name))
+  (set-window-dedicated-p window t))
 
 (defun gdb-setup-windows ()
   "Layout the window pattern for `gdb-many-windows'."
@@ -3977,35 +4011,35 @@ window is dedicated."
   (delete-other-windows)
   (gdb-display-breakpoints-buffer)
   (delete-other-windows)
-  ; Don't dedicate.
+  ;; Don't dedicate.
   (pop-to-buffer gud-comint-buffer)
-  (split-window nil ( / ( * (window-height) 3) 4))
-  (split-window nil ( / (window-height) 3))
-  (split-window-horizontally)
-  (other-window 1)
-  (gdb-set-window-buffer (gdb-locals-buffer-name))
-  (other-window 1)
-  (switch-to-buffer
-       (if gud-last-last-frame
-           (gud-find-file (car gud-last-last-frame))
-         (if gdb-main-file
-             (gud-find-file gdb-main-file)
-           ;; Put buffer list in window if we
-           ;; can't find a source file.
-           (list-buffers-noselect))))
-  (setq gdb-source-window (selected-window))
-  (split-window-horizontally)
-  (other-window 1)
-  (gdb-set-window-buffer
-   (gdb-get-buffer-create 'gdb-inferior-io))
-  (other-window 1)
-  (gdb-set-window-buffer (gdb-stack-buffer-name))
-  (split-window-horizontally)
-  (other-window 1)
-  (gdb-set-window-buffer (if gdb-show-threads-by-default
-                             (gdb-threads-buffer-name)
-                           (gdb-breakpoints-buffer-name)))
-  (other-window 1))
+  (let ((win0 (selected-window))
+        (win1 (split-window nil ( / ( * (window-height) 3) 4)))
+        (win2 (split-window nil ( / (window-height) 3)))
+        (win3 (split-window-horizontally)))
+    (gdb-set-window-buffer (gdb-locals-buffer-name) nil win3)
+    (select-window win2)
+    (set-window-buffer
+     win2
+     (if gud-last-last-frame
+         (gud-find-file (car gud-last-last-frame))
+       (if gdb-main-file
+           (gud-find-file gdb-main-file)
+         ;; Put buffer list in window if we
+         ;; can't find a source file.
+         (list-buffers-noselect))))
+    (setq gdb-source-window (selected-window))
+    (let ((win4 (split-window-horizontally)))
+      (gdb-set-window-buffer
+       (gdb-get-buffer-create 'gdb-inferior-io) nil win4))
+    (select-window win1)
+    (gdb-set-window-buffer (gdb-stack-buffer-name))
+    (let ((win5 (split-window-horizontally)))
+      (gdb-set-window-buffer (if gdb-show-threads-by-default
+                                 (gdb-threads-buffer-name)
+                               (gdb-breakpoints-buffer-name))
+                             nil win5))
+    (select-window win0)))
 
 (defcustom gdb-many-windows nil
   "If nil just pop up the GUD buffer unless `gdb-show-main' is t.
@@ -4022,34 +4056,33 @@ of the debugged program.  Non-nil means display the layout shown for
 With arg, display additional buffers iff arg is positive."
   (interactive "P")
   (setq gdb-many-windows
-        (if (null arg)
-            (not gdb-many-windows)
-          (> (prefix-numeric-value arg) 0)))
+        (if (null arg)
+            (not gdb-many-windows)
+          (> (prefix-numeric-value arg) 0)))
   (message (format "Display of other windows %sabled"
-                   (if gdb-many-windows "en" "dis")))
+                   (if gdb-many-windows "en" "dis")))
   (if (and gud-comint-buffer
-           (buffer-name gud-comint-buffer))
+           (buffer-name gud-comint-buffer))
       (condition-case nil
-          (gdb-restore-windows)
-        (error nil))))
+          (gdb-restore-windows)
+        (error nil))))
 
 (defun gdb-restore-windows ()
   "Restore the basic arrangement of windows used by gdb.
 This arrangement depends on the value of `gdb-many-windows'."
   (interactive)
-  (pop-to-buffer gud-comint-buffer)     ;Select the right window and frame.
-    (delete-other-windows)
+  (pop-to-buffer gud-comint-buffer) ;Select the right window and frame.
+  (delete-other-windows)
   (if gdb-many-windows
       (gdb-setup-windows)
     (when (or gud-last-last-frame gdb-show-main)
-      (split-window)
-      (other-window 1)
-      (switch-to-buffer
-       (if gud-last-last-frame
-           (gud-find-file (car gud-last-last-frame))
-         (gud-find-file gdb-main-file)))
-      (setq gdb-source-window (selected-window))
-      (other-window 1))))
+      (let ((win (split-window)))
+        (set-window-buffer
+         win
+         (if gud-last-last-frame
+             (gud-find-file (car gud-last-last-frame))
+           (gud-find-file gdb-main-file)))
+        (setq gdb-source-window win)))))
 
 (defun gdb-reset ()
   "Exit a debugging session cleanly.
@@ -4057,23 +4090,23 @@ Kills the gdb buffers, and resets variables and the source buffers."
   (dolist (buffer (buffer-list))
     (unless (eq buffer gud-comint-buffer)
       (with-current-buffer buffer
-        (if (eq gud-minor-mode 'gdbmi)
-            (if (string-match "\\` ?\\*.+\\*\\'" (buffer-name))
-                (kill-buffer nil)
-              (gdb-remove-breakpoint-icons (point-min) (point-max) t)
-              (setq gud-minor-mode nil)
-              (kill-local-variable 'tool-bar-map)
-              (kill-local-variable 'gdb-define-alist))))))
+        (if (eq gud-minor-mode 'gdbmi)
+            (if (string-match "\\` ?\\*.+\\*\\'" (buffer-name))
+                (kill-buffer nil)
+              (gdb-remove-breakpoint-icons (point-min) (point-max) t)
+              (setq gud-minor-mode nil)
+              (kill-local-variable 'tool-bar-map)
+              (kill-local-variable 'gdb-define-alist))))))
   (setq gdb-disassembly-position nil)
   (setq overlay-arrow-variable-list
-        (delq 'gdb-disassembly-position overlay-arrow-variable-list))
+        (delq 'gdb-disassembly-position overlay-arrow-variable-list))
   (setq fringe-indicator-alist '((overlay-arrow . right-triangle)))
   (setq gdb-stack-position nil)
   (setq overlay-arrow-variable-list
-        (delq 'gdb-stack-position overlay-arrow-variable-list))
+        (delq 'gdb-stack-position overlay-arrow-variable-list))
   (setq gdb-thread-position nil)
   (setq overlay-arrow-variable-list
-        (delq 'gdb-thread-position overlay-arrow-variable-list))
+        (delq 'gdb-thread-position overlay-arrow-variable-list))
   (if (boundp 'speedbar-frame) (speedbar-timer-fn))
   (setq gud-running nil)
   (setq gdb-active-process nil)
@@ -4085,12 +4118,12 @@ buffers, if required."
   (goto-char (point-min))
   (if (re-search-forward gdb-source-file-regexp nil t)
       (setq gdb-main-file (match-string 1)))
- (if gdb-many-windows
+  (if gdb-many-windows
       (gdb-setup-windows)
-   (gdb-get-buffer-create 'gdb-breakpoints-buffer)
-   (if gdb-show-main
-       (let ((pop-up-windows t))
-         (display-buffer (gud-find-file gdb-main-file))))))
+    (gdb-get-buffer-create 'gdb-breakpoints-buffer)
+    (if gdb-show-main
+        (let ((pop-up-windows t))
+          (display-buffer (gud-find-file gdb-main-file))))))
 
 ;;from put-image
 (defun gdb-put-string (putstring pos &optional dprop &rest sprops)
@@ -4099,14 +4132,14 @@ PUTSTRING is displayed by putting an overlay into the current buffer with a
 `before-string' string that has a `display' property whose value is
 PUTSTRING."
   (let ((string (make-string 1 ?x))
-        (buffer (current-buffer)))
+        (buffer (current-buffer)))
     (setq putstring (copy-sequence putstring))
     (let ((overlay (make-overlay pos pos buffer))
-          (prop (or dprop
-                    (list (list 'margin 'left-margin) putstring))))
+          (prop (or dprop
+                    (list (list 'margin 'left-margin) putstring))))
       (put-text-property 0 1 'display prop string)
       (if sprops
-          (add-text-properties 0 1 sprops string))
+          (add-text-properties 0 1 sprops string))
       (overlay-put overlay 'put-break t)
       (overlay-put overlay 'before-string string))))
 
@@ -4119,7 +4152,7 @@ BUFFER nil or omitted means use the current buffer."
     (setq buffer (current-buffer)))
   (dolist (overlay (overlays-in start end))
     (when (overlay-get overlay 'put-break)
-          (delete-overlay overlay))))
+      (delete-overlay overlay))))
 
 (defun gdb-put-breakpoint-icon (enabled bptno &optional line)
   (let* ((posns (gdb-line-posns (or line (line-number-at-pos))))
@@ -4131,62 +4164,63 @@ BUFFER nil or omitted means use the current buffer."
      0 1 '(help-echo "mouse-1: clear bkpt, mouse-3: enable/disable bkpt")
      putstring)
     (if enabled
-        (add-text-properties
-         0 1 `(gdb-bptno ,bptno gdb-enabled t) putstring)
+        (add-text-properties
+         0 1 `(gdb-bptno ,bptno gdb-enabled t) putstring)
       (add-text-properties
        0 1 `(gdb-bptno ,bptno gdb-enabled nil) putstring))
     (gdb-remove-breakpoint-icons start end)
     (if (display-images-p)
-        (if (>= (or left-fringe-width
-                    (if source-window (car (window-fringes source-window)))
-                    gdb-buffer-fringe-width) 8)
-            (gdb-put-string
-             nil (1+ start)
-             `(left-fringe breakpoint
-                           ,(if enabled
-                                'breakpoint-enabled
-                              'breakpoint-disabled))
-             'gdb-bptno bptno
-             'gdb-enabled enabled)
-          (when (< left-margin-width 2)
-            (save-current-buffer
-              (setq left-margin-width 2)
-              (if source-window
-                  (set-window-margins
-                   source-window
-                   left-margin-width right-margin-width))))
-          (put-image
-           (if enabled
-               (or breakpoint-enabled-icon
-                   (setq breakpoint-enabled-icon
-                         (find-image `((:type xpm :data
-                                              ,breakpoint-xpm-data
-                                              :ascent 100 :pointer hand)
-                                       (:type pbm :data
-                                              ,breakpoint-enabled-pbm-data
-                                              :ascent 100 :pointer hand)))))
-             (or breakpoint-disabled-icon
-                 (setq breakpoint-disabled-icon
-                       (find-image `((:type xpm :data
-                                            ,breakpoint-xpm-data
-                                            :conversion disabled
-                                            :ascent 100 :pointer hand)
-                                     (:type pbm :data
-                                            ,breakpoint-disabled-pbm-data
-                                            :ascent 100 :pointer hand))))))
-           (+ start 1)
-           putstring
-           'left-margin))
+        (if (>= (or left-fringe-width
+                    (if source-window (car (window-fringes source-window)))
+                    gdb-buffer-fringe-width) 8)
+            (gdb-put-string
+             nil (1+ start)
+             `(left-fringe breakpoint
+                           ,(if enabled
+                                'breakpoint-enabled
+                              'breakpoint-disabled))
+             'gdb-bptno bptno
+             'gdb-enabled enabled)
+          (when (< left-margin-width 2)
+            (save-current-buffer
+              (setq left-margin-width 2)
+              (if source-window
+                  (set-window-margins
+                   source-window
+                   left-margin-width right-margin-width))))
+          (put-image
+           (if enabled
+               (or breakpoint-enabled-icon
+                   (setq breakpoint-enabled-icon
+                         (find-image `((:type xpm :data
+                                        ,breakpoint-xpm-data
+                                        :ascent 100 :pointer hand)
+                                       (:type pbm :data
+                                        ,breakpoint-enabled-pbm-data
+                                        :ascent 100 :pointer hand)))))
+             (or breakpoint-disabled-icon
+                 (setq breakpoint-disabled-icon
+                       (find-image `((:type xpm :data
+                                      ,breakpoint-xpm-data
+                                      :conversion disabled
+                                      :ascent 100 :pointer hand)
+                                     (:type pbm :data
+                                      ,breakpoint-disabled-pbm-data
+                                      :ascent 100 :pointer hand))))))
+           (+ start 1)
+           putstring
+           'left-margin))
       (when (< left-margin-width 2)
-        (save-current-buffer
-          (setq left-margin-width 2)
-          (let ((window (get-buffer-window (current-buffer) 0)))
-            (if window
-              (set-window-margins
-               window left-margin-width right-margin-width)))))
+        (save-current-buffer
+          (setq left-margin-width 2)
+          (let ((window (get-buffer-window (current-buffer) 0)))
+            (if window
+                (set-window-margins
+                 window left-margin-width right-margin-width)))))
       (gdb-put-string
        (propertize putstring
-                   'face (if enabled 'breakpoint-enabled 'breakpoint-disabled))
+                   'face (if enabled
+                             'breakpoint-enabled 'breakpoint-disabled))
        (1+ start)))))
 
 (defun gdb-remove-breakpoint-icons (start end &optional remove-margin)
@@ -4197,8 +4231,8 @@ BUFFER nil or omitted means use the current buffer."
     (setq left-margin-width 0)
     (let ((window (get-buffer-window (current-buffer) 0)))
       (if window
-          (set-window-margins
-           window left-margin-width right-margin-width)))))
+          (set-window-margins
+           window left-margin-width right-margin-width)))))
 
 (provide 'gdb-mi)
 
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index db8e82193b3..5561575ea20 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -1023,7 +1023,8 @@ This command shares argument histories with \\[lgrep] and \\[grep-find]."
                     (read-from-minibuffer "Confirm: "
                                           command nil nil 'grep-find-history))
             (add-to-history 'grep-find-history command))
-          (let ((default-directory dir))
+          (let ((default-directory dir)
+                (process-connection-type nil))
             (compilation-start command 'grep-mode))
           ;; Set default-directory if we started rgrep in the *grep* buffer.
           (if (eq next-error-last-buffer (current-buffer))
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 259ee81c9ba..a54d1438368 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -1581,7 +1581,8 @@ and source-file directory for your debugger."
 ;; Last group is for return value, e.g. "> test.py(2)foo()->None"
 ;; Either file or function name may be omitted: "> <string>(0)?()"
 (defvar gud-pdb-marker-regexp
-  "^> \\([-a-zA-Z0-9_/.:\\]*\\|<string>\\)(\\([0-9]+\\))\\([a-zA-Z0-9_]*\\|\\?\\|<module>\\)()\\(->[^\n]*\\)?\n")
+  "^> \\([-a-zA-Z0-9_/.:\\]*\\|<string>\\)(\\([0-9]+\\))\\([a-zA-Z0-9_]*\\|\\?\\|<module>\\)()\\(->[^\n\r]*\\)?[\n\r]")
+
 (defvar gud-pdb-marker-regexp-file-group 1)
 (defvar gud-pdb-marker-regexp-line-group 2)
 (defvar gud-pdb-marker-regexp-fnname-group 3)
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index a0437ccf9ae..1bdcb4cfa89 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3306,8 +3306,8 @@ If one hasn't been set, or if it's stale, prompt for a new one."
        #'js--which-func-joiner)
 
   ;; Comments
-  (setq comment-start "// ")
-  (setq comment-end "")
+  (set (make-local-variable 'comment-start) "// ")
+  (set (make-local-variable 'comment-end) "")
   (set (make-local-variable 'fill-paragraph-function)
        'js-c-fill-paragraph)
 
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 1da819660d2..80358e1c651 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -4,10 +4,9 @@
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: Michael Mauger <mmaug@yahoo.com>
-;; Version: 2.8
+;; Version: 3.0
 ;; Keywords: comm languages processes
 ;; URL: http://savannah.gnu.org/projects/emacs/
-;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?SqlMode
 
 ;; This file is part of GNU Emacs.
 
@@ -46,7 +45,7 @@
 ;; available in early versions of sql.el.  This support has been
 ;; extended and formalized in later versions.  Part of the impetus for
 ;; the improved support of SQL flavors was borne out of the current
-;; maintainer's consulting experience.  In the past fifteen years, I
+;; maintainers consulting experience.  In the past twenty years, I
 ;; have used Oracle, Sybase, Informix, MySQL, Postgres, and SQLServer.
 ;; On some assignments, I have used two or more of these concurrently.
 
@@ -130,7 +129,7 @@
 ;;    identifier characters.
 
 ;;     (sql-set-product-feature 'xyz
-;;                              :syntax-alist ((?# . "w")))
+;;                              :syntax-alist ((?# . "_")))
 
 ;; 4) Define the interactive command interpreter for the database
 ;;    product.
@@ -184,7 +183,7 @@
 ;;     (sql-set-product-feature 'xyz
 ;;                              :sqli-comint-func 'my-sql-comint-xyz)
 
-;; 6) Define a convienence function to invoke the SQL interpreter.
+;; 6) Define a convenience function to invoke the SQL interpreter.
 
 ;;     (defun my-sql-xyz (&optional buffer)
 ;;       "Run ixyz by XyzDB as an inferior process."
@@ -230,9 +229,18 @@
 (eval-when-compile
   (require 'regexp-opt))
 (require 'custom)
+(require 'thingatpt)
 (eval-when-compile ;; needed in Emacs 19, 20
   (setq max-specpdl-size (max max-specpdl-size 2000)))
 
+(defun sql-signum (n)
+  "Return 1, 0, or -1 to identify the sign of N."
+  (cond
+   ((not (numberp n)) nil)
+   ((< n 0) -1)
+   ((> n 0) 1)
+   (t 0)))
+
 (defvar font-lock-keyword-face)
 (defvar font-lock-set-defaults)
 (defvar font-lock-string-face)
@@ -327,7 +335,8 @@ Customizing your password will store it in your ~/.emacs file."
 (defvar sql-product-alist
   '((ansi
      :name "ANSI"
-     :font-lock sql-mode-ansi-font-lock-keywords)
+     :font-lock sql-mode-ansi-font-lock-keywords
+     :statement sql-ansi-statement-starters)
 
     (db2
      :name "DB2"
@@ -392,7 +401,7 @@ Customizing your password will store it in your ~/.emacs file."
      :sqli-comint-func sql-comint-ms
      :prompt-regexp "^[0-9]*>"
      :prompt-length 5
-     :syntax-alist ((?@ . "w"))
+     :syntax-alist ((?@ . "_"))
      :terminator ("^go" . "go"))
 
     (mysql
@@ -408,6 +417,7 @@ Customizing your password will store it in your ~/.emacs file."
      :prompt-regexp "^mysql> "
      :prompt-length 6
      :prompt-cont-regexp "^    -> "
+     :syntax-alist ((?# . "< b"))
      :input-filter sql-remove-tabs-filter)
 
     (oracle
@@ -417,11 +427,15 @@ Customizing your password will store it in your ~/.emacs file."
      :sqli-options sql-oracle-options
      :sqli-login sql-oracle-login-params
      :sqli-comint-func sql-comint-oracle
+     :list-all sql-oracle-list-all
+     :list-table sql-oracle-list-table
+     :completion-object sql-oracle-completion-object
      :prompt-regexp "^SQL> "
      :prompt-length 5
-     :prompt-cont-regexp "^\\s-*\\d+> "
-     :syntax-alist ((?$ . "w") (?# . "w"))
-     :terminator ("\\(^/\\|;\\)" . "/")
+     :prompt-cont-regexp "^\\s-*[[:digit:]]+  "
+     :statement sql-oracle-statement-starters
+     :syntax-alist ((?$ . "_") (?# . "_"))
+     :terminator ("\\(^/\\|;\\)$" . "/")
      :input-filter sql-placeholders-filter)
 
     (postgres
@@ -434,11 +448,12 @@ Customizing your password will store it in your ~/.emacs file."
      :sqli-comint-func sql-comint-postgres
      :list-all ("\\d+" . "\\dS+")
      :list-table ("\\d+ %s" . "\\dS+ %s")
-     :prompt-regexp "^.*=[#>] "
+     :completion-object sql-postgres-completion-object
+     :prompt-regexp "^\\w*=[#>] "
      :prompt-length 5
-     :prompt-cont-regexp "^.*[-(][#>] "
+     :prompt-cont-regexp "^\\w*[-(][#>] "
      :input-filter sql-remove-tabs-filter
-     :terminator ("\\(^\\s-*\\\\g\\|;\\)" . ";"))
+     :terminator ("\\(^\\s-*\\\\g$\\|;\\)" . "\\g"))
 
     (solid
      :name "Solid"
@@ -460,9 +475,10 @@ Customizing your password will store it in your ~/.emacs file."
      :sqli-comint-func sql-comint-sqlite
      :list-all ".tables"
      :list-table ".schema %s"
+     :completion-object sql-sqlite-completion-object
      :prompt-regexp "^sqlite> "
      :prompt-length 8
-     :prompt-cont-regexp "^   ...> "
+     :prompt-cont-regexp "^   \.\.\.> "
      :terminator ";")
 
     (sybase
@@ -474,7 +490,7 @@ Customizing your password will store it in your ~/.emacs file."
      :sqli-comint-func sql-comint-sybase
      :prompt-regexp "^SQL> "
      :prompt-length 5
-     :syntax-alist ((?@ . "w"))
+     :syntax-alist ((?@ . "_"))
      :terminator ("^go" . "go"))
     )
   "An alist of product specific configuration settings.
@@ -513,10 +529,11 @@ may be any one of the following:
  :sqli-comint-func      name of a function which accepts no
                         parameters that will use the values of
                         `sql-user', `sql-password',
-                        `sql-database' and `sql-server' to open a
-                        comint buffer and connect to the
-                        database.  Do product specific
-                        configuration of comint in this function.
+                        `sql-database', `sql-server' and
+                        `sql-port' to open a comint buffer and
+                        connect to the database.  Do product
+                        specific configuration of comint in this
+                        function.
 
  :list-all              Command string or function which produces
                         a listing of all objects in the database.
@@ -535,6 +552,20 @@ may be any one of the following:
                         produces the standard list and the cdr
                         produces an enhanced list.
 
+ :completion-object     A function that returns a list of
+                        objects.  Called with a single
+                        parameter--if nil then list objects
+                        accessible in the current schema, if
+                        not-nil it is the name of a schema whose
+                        objects should be listed.
+
+ :completion-column     A function that returns a list of
+                        columns.  Called with a single
+                        parameter--if nil then list objects
+                        accessible in the current schema, if
+                        not-nil it is the name of a schema whose
+                        objects should be listed.
+
  :prompt-regexp         regular expression string that matches
                         the prompt issued by the product
                         interpreter.
@@ -555,6 +586,9 @@ may be any one of the following:
                         filtered string.  May also be a list of
                         such functions.
 
+ :statement             name of a variable containing a regexp that
+                        matches the beginning of SQL statements.
+
  :terminator            the terminator to be sent after a
                         `sql-send-string', `sql-send-region',
                         `sql-send-paragraph' and
@@ -574,7 +608,7 @@ using `sql-get-product-feature' to lookup the product specific
 settings.")
 
 (defvar sql-indirect-features
-  '(:font-lock :sqli-program :sqli-options :sqli-login))
+  '(:font-lock :sqli-program :sqli-options :sqli-login :statement))
 
 (defcustom sql-connection-alist nil
   "An alist of connection parameters for interacting with a SQL
@@ -683,6 +717,13 @@ it automatically."
   :version "22.2"
   :group 'SQL)
 
+(defvar sql-contains-names nil
+  "When non-nil, the current buffer contains database names.
+
+Globally should be set to nil; it will be non-nil in `sql-mode',
+`sql-interactive-mode' and list all buffers.")
+
+
 (defcustom sql-pop-to-buffer-after-send-region nil
   "When non-nil, pop to the buffer SQL statements are sent to.
 
@@ -770,6 +811,19 @@ is changed."
   :type 'hook
   :group 'SQL)
 
+;; Customization for ANSI
+
+(defcustom sql-ansi-statement-starters (regexp-opt '(
+ "create" "alter" "drop"
+ "select" "insert" "update" "delete" "merge"
+ "grant" "revoke"
+))
+  "Regexp of keywords that start SQL commands
+
+All products share this list; products should define a regexp to
+identify additional keywords in a variable defined by
+the :statement feature.")
+
 ;; Customization for Oracle
 
 (defcustom sql-oracle-program "sqlplus"
@@ -795,18 +849,22 @@ You will find the file in your Orant\\bin directory."
   :version "24.1"
   :group 'SQL)
 
+(defcustom sql-oracle-statement-starters (regexp-opt '("declare" "begin" "with"))
+  "Additional statement starting keywords in Oracle.")
+
 (defcustom sql-oracle-scan-on t
   "Non-nil if placeholders should be replaced in Oracle SQLi.
 
 When non-nil, Emacs will scan text sent to sqlplus and prompt
 for replacement text for & placeholders as sqlplus does.  This
-is needed on Windows where sqlplus output is buffered and the
+is needed on Windows where SQL*Plus output is buffered and the
 prompts are not shown until after the text is entered.
 
-You will probably want to issue the following command in sqlplus
-to be safe:
+You need to issue the following command in SQL*Plus to be safe:
+
+    SET DEFINE OFF
 
-    SET SCAN OFF"
+In older versions of SQL*Plus, this was the SET SCAN OFF command."
   :type 'boolean
   :group 'SQL)
 
@@ -833,7 +891,7 @@ Starts `sql-interactive-mode' after doing some setup."
   :version "24.1"
   :group 'SQL)
 
-;; Customization for MySql
+;; Customization for MySQL
 
 (defcustom sql-mysql-program "mysql"
   "Command to start mysql by TcX.
@@ -851,7 +909,7 @@ on Windows: \"-C\" \"-t\" \"-f\" \"-n\"."
   :group 'SQL)
 
 (defcustom sql-mysql-login-params '(user password database server)
-  "List of login parameters needed to connect to MySql."
+  "List of login parameters needed to connect to MySQL."
   :type 'sql-login-params
   :version "24.1"
   :group 'SQL)
@@ -1085,13 +1143,13 @@ You can change `sql-prompt-length' on `sql-interactive-mode-hook'.")
 
 Used by `sql-rename-buffer'.")
 
-(defun sql-buffer-live-p (buffer &optional product)
+(defun sql-buffer-live-p (buffer &optional product connection)
   "Returns non-nil if the process associated with buffer is live.
 
 BUFFER can be a buffer object or a buffer name.  The buffer must
 be a live buffer, have an running process attached to it, be in
-`sql-interactive-mode', and, if PRODUCT is specified, it's
-`sql-product' must match."
+`sql-interactive-mode', and, if PRODUCT or CONNECTION are
+specified, it's `sql-product' or `sql-connection' must match."
 
   (when buffer
     (setq buffer (get-buffer buffer))
@@ -1102,7 +1160,9 @@ be a live buffer, have an running process attached to it, be in
          (with-current-buffer buffer
            (and (derived-mode-p 'sql-interactive-mode)
                 (or (not product)
-                    (eq product sql-product)))))))
+                    (eq product sql-product))
+                (or (not connection)
+                    (eq connection sql-connection)))))))
 
 ;; Keymap for sql-interactive-mode.
 
@@ -1136,6 +1196,8 @@ Based on `comint-mode-map'.")
     (define-key map (kbd "C-c C-i") 'sql-product-interactive)
     (define-key map (kbd "C-c C-l a") 'sql-list-all)
     (define-key map (kbd "C-c C-l t") 'sql-list-table)
+    (define-key map [remap beginning-of-defun] 'sql-beginning-of-statement)
+    (define-key map [remap end-of-defun] 'sql-end-of-statement)
     map)
   "Mode map used for `sql-mode'.")
 
@@ -1151,8 +1213,10 @@ Based on `comint-mode-map'.")
    ["Send Buffer" sql-send-buffer (sql-buffer-live-p sql-buffer)]
    ["Send String" sql-send-string (sql-buffer-live-p sql-buffer)]
    "--"
-   ["List all objects" sql-list-all (sql-buffer-live-p sql-buffer)]
-   ["List table details" sql-list-table (sql-buffer-live-p sql-buffer)]
+   ["List all objects" sql-list-all (and (sql-buffer-live-p sql-buffer)
+                                         (sql-get-product-feature sql-product :list-all))]
+   ["List table details" sql-list-table (and (sql-buffer-live-p sql-buffer)
+                                             (sql-get-product-feature sql-product :list-table))]
    "--"
    ["Start SQLi session" sql-product-interactive
     :visible (not sql-connection-alist)
@@ -1194,8 +1258,8 @@ Based on `comint-mode-map'.")
    ["Rename Buffer" sql-rename-buffer t]
    ["Save Connection" sql-save-connection (not sql-connection)]
    "--"
-   ["List all objects" sql-list-all t]
-   ["List table details" sql-list-table t]))
+   ["List all objects" sql-list-all (sql-get-product-feature sql-product :list-all)]
+   ["List table details" sql-list-table (sql-get-product-feature sql-product :list-table)]))
 
 ;; Abbreviations -- if you want more of them, define them in your
 ;; ~/.emacs file.  Abbrevs have to be enabled in your ~/.emacs, too.
@@ -1238,8 +1302,9 @@ Based on `comint-mode-map'.")
     (modify-syntax-entry ?' "\"" table)
     ;; double quotes (") don't delimit strings
     (modify-syntax-entry ?\" "." table)
-    ;; backslash is no escape character
-    (modify-syntax-entry ?\\ "." table)
+    ;; Make these all punctuation
+    (mapc (lambda (c) (modify-syntax-entry c "." table))
+          (string-to-list "!#$%&+,.:;<=>?@\\|"))
     table)
   "Syntax table used in `sql-mode' and `sql-interactive-mode'.")
 
@@ -1298,20 +1363,45 @@ statement.  The format of variable should be a valid
 
       ;; Remove keywords that are defined in ANSI
       (setq kwd keywords)
-      (dolist (k keywords)
-        (catch 'next
-          (dolist (a sql-mode-ansi-font-lock-keywords)
-            (when (and (eq face (cdr a))
-                       (eq (string-match (car a) k 0) 0)
-                       (eq (match-end 0) (length k)))
-              (setq kwd (delq k kwd))
-              (throw 'next nil)))))
+      ;; (dolist (k keywords)
+      ;;   (catch 'next
+      ;;     (dolist (a sql-mode-ansi-font-lock-keywords)
+      ;;       (when (and (eq face (cdr a))
+      ;;               (eq (string-match (car a) k 0) 0)
+      ;;               (eq (match-end 0) (length k)))
+      ;;         (setq kwd (delq k kwd))
+      ;;         (throw 'next nil)))))
 
       ;; Create a properly formed font-lock-keywords item
       (cons (concat (car bdy)
                     (regexp-opt kwd t)
                     (cdr bdy))
-            face))))
+            face)))
+
+  (defun sql-regexp-abbrev (keyword)
+    (let ((brk   (string-match "[~]" keyword))
+          (len   (length keyword))
+          (sep   "\\(?:")
+          re i)
+      (if (not brk)
+          keyword
+        (setq re  (substring keyword 0 brk)
+              i   (+ 2 brk)
+              brk (1+ brk))
+        (while (<= i len)
+          (setq re  (concat re sep (substring keyword brk i))
+                sep "\\|"
+                i   (1+ i)))
+        (concat re "\\)?"))))
+
+  (defun sql-regexp-abbrev-list (&rest keyw-list)
+    (let ((re nil)
+          (sep "\\<\\(?:"))
+      (while keyw-list
+        (setq re (concat re sep (sql-regexp-abbrev (car keyw-list)))
+              sep "\\|"
+              keyw-list (cdr keyw-list)))
+      (concat re "\\)\\>"))))
 
 (eval-when-compile
   (setq sql-mode-ansi-font-lock-keywords
@@ -1346,6 +1436,7 @@ statement.  The format of variable should be a valid
 "user_defined_type_catalog" "user_defined_type_name"
 "user_defined_type_schema"
 )
+
          ;; ANSI Reserved keywords
          (sql-font-lock-keywords-builder 'font-lock-keyword-face nil
 "absolute" "action" "add" "admin" "after" "aggregate" "alias" "all"
@@ -1395,6 +1486,7 @@ statement.  The format of variable should be a valid
 "substring" "sum" "system_user" "translate" "treat" "trim" "upper"
 "user"
 )
+
          ;; ANSI Data Types
          (sql-font-lock-keywords-builder 'font-lock-type-face nil
 "array" "binary" "bit" "blob" "boolean" "char" "character" "clob"
@@ -1414,86 +1506,142 @@ function `regexp-opt'.  Therefore, take a look at the source before
 you define your own `sql-mode-ansi-font-lock-keywords'.  You may want
 to add functions and PL/SQL keywords.")
 
+(defun sql-oracle-show-reserved-words ()
+  ;; This function is for use by the maintainer of SQL.EL only.
+  (interactive)
+  (if (or (and (not (derived-mode-p 'sql-mode))
+               (not (derived-mode-p 'sql-interactive-mode)))
+          (not sql-buffer)
+          (not (eq sql-product 'oracle)))
+      (error "Not an Oracle buffer")
+
+    (let ((b "*RESERVED WORDS*"))
+      (sql-execute sql-buffer b
+                   (concat "SELECT "
+                           "  keyword "
+                           ", reserved AS \"Res\" "
+                           ", res_type AS \"Type\" "
+                           ", res_attr AS \"Attr\" "
+                           ", res_semi AS \"Semi\" "
+                           ", duplicate AS \"Dup\" "
+                           "FROM V$RESERVED_WORDS "
+                           "WHERE length > 1 "
+                           "AND SUBSTR(keyword, 1, 1) BETWEEN 'A' AND 'Z' "
+                           "ORDER BY 2 DESC, 3 DESC, 4 DESC, 5 DESC, 6 DESC, 1;")
+                   nil nil)
+      (with-current-buffer b
+        (set (make-local-variable 'sql-product) 'oracle)
+        (sql-product-font-lock t nil)
+        (font-lock-mode +1)))))
+
 (defvar sql-mode-oracle-font-lock-keywords
   (eval-when-compile
     (list
      ;; Oracle SQL*Plus Commands
-     (cons
-      (concat
-       "^\\s-*\\(?:\\(?:" (regexp-opt '(
-"@" "@@" "accept" "append" "archive" "attribute" "break"
-"btitle" "change" "clear" "column" "connect" "copy" "define"
-"del" "describe" "disconnect" "edit" "execute" "exit" "get" "help"
-"host" "input" "list" "password" "pause" "print" "prompt" "recover"
-"remark" "repfooter" "repheader" "run" "save" "show" "shutdown"
-"spool" "start" "startup" "store" "timing" "ttitle" "undefine"
-"variable" "whenever"
-) t)
+     ;;   Only recognized in they start in column 1 and the
+     ;;   abbreviation is followed by a space or the end of line.
 
-       "\\)\\|"
-       "\\(?:compute\\s-+\\(?:avg\\|cou\\|min\\|max\\|num\\|sum\\|std\\|var\\)\\)\\|"
-       "\\(?:set\\s-+\\("
-
-       (regexp-opt
-        '("appi" "appinfo" "array" "arraysize" "auto" "autocommit"
-          "autop" "autoprint" "autorecovery" "autot" "autotrace" "blo"
-          "blockterminator" "buffer" "closecursor" "cmds" "cmdsep"
-          "colsep" "com" "compatibility" "con" "concat" "constraint"
-          "constraints" "copyc" "copycommit" "copytypecheck" "database"
-          "def" "define" "document" "echo" "editf" "editfile" "emb"
-          "embedded" "esc" "escape" "feed" "feedback" "flagger" "flu"
-          "flush" "hea" "heading" "heads" "headsep" "instance" "lin"
-          "linesize" "lobof" "loboffset" "logsource" "long" "longc"
-          "longchunksize" "maxdata" "newp" "newpage" "null" "num"
-          "numf" "numformat" "numwidth" "pages" "pagesize" "pau"
-          "pause" "recsep" "recsepchar" "role" "scan" "serveroutput"
-          "shift" "shiftinout" "show" "showmode" "space" "sqlbl"
-          "sqlblanklines" "sqlc" "sqlcase" "sqlco" "sqlcontinue" "sqln"
-          "sqlnumber" "sqlp" "sqlpluscompat" "sqlpluscompatibility"
-          "sqlpre" "sqlprefix" "sqlprompt" "sqlt" "sqlterminator"
-          "statement_id" "suf" "suffix" "tab" "term" "termout" "ti"
-          "time" "timi" "timing" "transaction" "trim" "trimout" "trims"
-          "trimspool" "truncate" "und" "underline" "ver" "verify" "wra"
-          "wrap")) "\\)\\)"
-
-       "\\)\\b.*"
-       )
-      'font-lock-doc-face)
-     '("^\\s-*rem\\(?:ark\\)?\\>.*" . font-lock-comment-face)
+     "\\|"
+     (list (concat "^" (sql-regexp-abbrev "rem~ark") "\\(?:\\s-.*\\)?$")
+           0 'font-lock-comment-face t)
+
+     (list
+      (concat
+       "^\\(?:"
+       (sql-regexp-abbrev-list
+        "[@]\\{1,2\\}" "acc~ept" "a~ppend" "archive" "attribute"
+        "bre~ak" "bti~tle" "c~hange" "cl~ear" "col~umn" "conn~ect"
+        "copy" "def~ine" "del" "desc~ribe" "disc~onnect" "ed~it"
+        "exec~ute" "exit" "get" "help" "ho~st" "[$]" "i~nput" "l~ist"
+        "passw~ord" "pau~se" "pri~nt" "pro~mpt" "quit" "recover"
+        "repf~ooter" "reph~eader" "r~un" "sav~e" "sho~w" "shutdown"
+        "spo~ol" "sta~rt" "startup" "store" "tim~ing" "tti~tle"
+        "undef~ine" "var~iable" "whenever")
+       "\\|"
+       (concat "\\(?:"
+               (sql-regexp-abbrev "comp~ute")
+               "\\s-+"
+               (sql-regexp-abbrev-list
+                "avg" "cou~nt" "min~imum" "max~imum" "num~ber" "sum"
+                "std" "var~iance")
+               "\\)")
+       "\\|"
+       (concat "\\(?:set\\s-+"
+               (sql-regexp-abbrev-list
+                "appi~nfo" "array~size" "auto~commit" "autop~rint"
+                "autorecovery" "autot~race" "blo~ckterminator"
+                "cmds~ep" "colsep" "com~patibility" "con~cat"
+                "copyc~ommit" "copytypecheck" "def~ine" "describe"
+                "echo" "editf~ile" "emb~edded" "esc~ape" "feed~back"
+                "flagger" "flu~sh" "hea~ding" "heads~ep" "instance"
+                "lin~esize" "lobof~fset" "long" "longc~hunksize"
+                "mark~up" "newp~age" "null" "numf~ormat" "num~width"
+                "pages~ize" "pau~se" "recsep" "recsepchar"
+                "scan" "serverout~put" "shift~inout" "show~mode"
+                "sqlbl~anklines" "sqlc~ase" "sqlco~ntinue"
+                "sqln~umber" "sqlpluscompat~ibility" "sqlpre~fix"
+                "sqlp~rompt" "sqlt~erminator" "suf~fix" "tab"
+                "term~out" "ti~me" "timi~ng" "trim~out" "trims~pool"
+                "und~erline" "ver~ify" "wra~p")
+               "\\)")
+
+       "\\)\\(?:\\s-.*\\)?\\(?:[-]\n.*\\)*$")
+      0 'font-lock-doc-face t)
 
      ;; Oracle Functions
      (sql-font-lock-keywords-builder 'font-lock-builtin-face nil
-"abs" "acos" "add_months" "ascii" "asciistr" "asin" "atan" "atan2"
-"avg" "bfilename" "bin_to_num" "bitand" "cast" "ceil" "chartorowid"
-"chr" "coalesce" "compose" "concat" "convert" "corr" "cos" "cosh"
-"count" "covar_pop" "covar_samp" "cume_dist" "current_date"
-"current_timestamp" "current_user" "dbtimezone" "decode" "decompose"
-"dense_rank" "depth" "deref" "dump" "empty_clob" "existsnode" "exp"
-"extract" "extractvalue" "first" "first_value" "floor" "following"
-"from_tz" "greatest" "group_id" "grouping_id" "hextoraw" "initcap"
-"instr" "lag" "last" "last_day" "last_value" "lead" "least" "length"
-"ln" "localtimestamp" "lower" "lpad" "ltrim" "make_ref" "max" "min"
-"mod" "months_between" "new_time" "next_day" "nls_charset_decl_len"
+"abs" "acos" "add_months" "appendchildxml" "ascii" "asciistr" "asin"
+"atan" "atan2" "avg" "bfilename" "bin_to_num" "bitand" "cardinality"
+"cast" "ceil" "chartorowid" "chr" "cluster_id" "cluster_probability"
+"cluster_set" "coalesce" "collect" "compose" "concat" "convert" "corr"
+"corr_k" "corr_s" "cos" "cosh" "count" "covar_pop" "covar_samp"
+"cube_table" "cume_dist" "currrent_date" "currrent_timestamp" "cv"
+"dataobj_to_partition" "dbtimezone" "decode" "decompose" "deletexml"
+"dense_rank" "depth" "deref" "dump" "empty_blob" "empty_clob"
+"existsnode" "exp" "extract" "extractvalue" "feature_id" "feature_set"
+"feature_value" "first" "first_value" "floor" "from_tz" "greatest"
+"grouping" "grouping_id" "group_id" "hextoraw" "initcap"
+"insertchildxml" "insertchildxmlafter" "insertchildxmlbefore"
+"insertxmlafter" "insertxmlbefore" "instr" "instr2" "instr4" "instrb"
+"instrc" "iteration_number" "lag" "last" "last_day" "last_value"
+"lead" "least" "length" "length2" "length4" "lengthb" "lengthc"
+"listagg" "ln" "lnnvl" "localtimestamp" "log" "lower" "lpad" "ltrim"
+"make_ref" "max" "median" "min" "mod" "months_between" "nanvl" "nchr"
+"new_time" "next_day" "nlssort" "nls_charset_decl_len"
 "nls_charset_id" "nls_charset_name" "nls_initcap" "nls_lower"
-"nls_upper" "nlssort" "ntile" "nullif" "numtodsinterval"
-"numtoyminterval" "nvl" "nvl2" "over" "path" "percent_rank"
-"percentile_cont" "percentile_disc" "power" "preceding" "rank"
-"ratio_to_report" "rawtohex" "rawtonhex" "reftohex" "regr_"
-"regr_avgx" "regr_avgy" "regr_count" "regr_intercept" "regr_r2"
-"regr_slope" "regr_sxx" "regr_sxy" "regr_syy" "replace" "round"
-"row_number" "rowidtochar" "rowidtonchar" "rpad" "rtrim"
-"sessiontimezone" "sign" "sin" "sinh" "soundex" "sqrt" "stddev"
-"stddev_pop" "stddev_samp" "substr" "sum" "sys_connect_by_path"
-"sys_context" "sys_dburigen" "sys_extract_utc" "sys_guid" "sys_typeid"
-"sys_xmlagg" "sys_xmlgen" "sysdate" "systimestamp" "tan" "tanh"
+"nls_upper" "nth_value" "ntile" "nullif" "numtodsinterval"
+"numtoyminterval" "nvl" "nvl2" "ora_dst_affected" "ora_dst_convert"
+"ora_dst_error" "ora_hash" "path" "percentile_cont" "percentile_disc"
+"percent_rank" "power" "powermultiset" "powermultiset_by_cardinality"
+"prediction" "prediction_bounds" "prediction_cost"
+"prediction_details" "prediction_probability" "prediction_set"
+"presentnnv" "presentv" "previous" "rank" "ratio_to_report" "rawtohex"
+"rawtonhex" "ref" "reftohex" "regexp_count" "regexp_instr"
+"regexp_replace" "regexp_substr" "regr_avgx" "regr_avgy" "regr_count"
+"regr_intercept" "regr_r2" "regr_slope" "regr_sxx" "regr_sxy"
+"regr_syy" "remainder" "replace" "round" "rowidtochar" "rowidtonchar"
+"row_number" "rpad" "rtrim" "scn_to_timestamp" "sessiontimezone" "set"
+"sign" "sin" "sinh" "soundex" "sqrt" "stats_binomial_test"
+"stats_crosstab" "stats_f_test" "stats_ks_test" "stats_mode"
+"stats_mw_test" "stats_one_way_anova" "stats_t_test_indep"
+"stats_t_test_indepu" "stats_t_test_one" "stats_t_test_paired"
+"stats_wsr_test" "stddev" "stddev_pop" "stddev_samp" "substr"
+"substr2" "substr4" "substrb" "substrc" "sum" "sysdate" "systimestamp"
+"sys_connect_by_path" "sys_context" "sys_dburigen" "sys_extract_utc"
+"sys_guid" "sys_typeid" "sys_xmlagg" "sys_xmlgen" "tan" "tanh"
+"timestamp_to_scn" "to_binary_double" "to_binary_float" "to_blob"
 "to_char" "to_clob" "to_date" "to_dsinterval" "to_lob" "to_multi_byte"
 "to_nchar" "to_nclob" "to_number" "to_single_byte" "to_timestamp"
 "to_timestamp_tz" "to_yminterval" "translate" "treat" "trim" "trunc"
-"tz_offset" "uid" "unbounded" "unistr" "updatexml" "upper" "user"
-"userenv" "var_pop" "var_samp" "variance" "vsize" "width_bucket" "xml"
-"xmlagg" "xmlattribute" "xmlcolattval" "xmlconcat" "xmlelement"
-"xmlforest" "xmlsequence" "xmltransform"
+"tz_offset" "uid" "unistr" "updatexml" "upper" "user" "userenv"
+"value" "variance" "var_pop" "var_samp" "vsize" "width_bucket"
+"xmlagg" "xmlcast" "xmlcdata" "xmlcolattval" "xmlcomment" "xmlconcat"
+"xmldiff" "xmlelement" "xmlexists" "xmlforest" "xmlisvalid" "xmlparse"
+"xmlpatch" "xmlpi" "xmlquery" "xmlroot" "xmlsequence" "xmlserialize"
+"xmltable" "xmltransform"
 )
+
+     ;; See the table V$RESERVED_WORDS
      ;; Oracle Keywords
      (sql-font-lock-keywords-builder 'font-lock-keyword-face nil
 "abort" "access" "accessed" "account" "activate" "add" "admin"
@@ -1582,52 +1730,120 @@ to add functions and PL/SQL keywords.")
 "varray" "version" "view" "wait" "when" "whenever" "where" "with"
 "without" "wnds" "wnps" "work" "write" "xmldata" "xmlschema" "xmltype"
 )
+
      ;; Oracle Data Types
      (sql-font-lock-keywords-builder 'font-lock-type-face nil
-"bfile" "blob" "byte" "char" "character" "clob" "date" "dec" "decimal"
-"double" "float" "int" "integer" "interval" "long" "national" "nchar"
-"nclob" "number" "numeric" "nvarchar2" "precision" "raw" "real"
-"rowid" "second" "smallint" "time" "timestamp" "urowid" "varchar"
-"varchar2" "varying" "year" "zone"
+"bfile" "binary_double" "binary_float" "blob" "byte" "char" "charbyte"
+"clob" "date" "day" "float" "interval" "local" "long" "longraw"
+"minute" "month" "nchar" "nclob" "number" "nvarchar2" "raw" "rowid" "second"
+"time" "timestamp" "urowid" "varchar2" "with" "year" "zone"
 )
 
      ;; Oracle PL/SQL Attributes
-     (sql-font-lock-keywords-builder 'font-lock-builtin-face '("" . "\\b")
-"%bulk_rowcount" "%found" "%isopen" "%notfound" "%rowcount" "%rowtype"
-"%type"
+     (sql-font-lock-keywords-builder 'font-lock-builtin-face '("%" . "\\b")
+"bulk_exceptions" "bulk_rowcount" "found" "isopen" "notfound"
+"rowcount" "rowtype" "type"
 )
 
      ;; Oracle PL/SQL Functions
      (sql-font-lock-keywords-builder 'font-lock-builtin-face nil
-"extend" "prior"
+"delete" "trim" "extend" "exists" "first" "last" "count" "limit"
+"prior" "next"
+)
+
+     ;; Oracle PL/SQL Reserved words
+     (sql-font-lock-keywords-builder 'font-lock-keyword-face nil
+"all" "alter" "and" "any" "as" "asc" "at" "begin" "between" "by"
+"case" "check" "clusters" "cluster" "colauth" "columns" "compress"
+"connect" "crash" "create" "cursor" "declare" "default" "desc"
+"distinct" "drop" "else" "end" "exception" "exclusive" "fetch" "for"
+"from" "function" "goto" "grant" "group" "having" "identified" "if"
+"in" "index" "indexes" "insert" "intersect" "into" "is" "like" "lock"
+"minus" "mode" "nocompress" "not" "nowait" "null" "of" "on" "option"
+"or" "order" "overlaps" "procedure" "public" "resource" "revoke"
+"select" "share" "size" "sql" "start" "subtype" "tabauth" "table"
+"then" "to" "type" "union" "unique" "update" "values" "view" "views"
+"when" "where" "with"
+
+"true" "false"
+"raise_application_error"
 )
 
      ;; Oracle PL/SQL Keywords
      (sql-font-lock-keywords-builder 'font-lock-keyword-face nil
-"autonomous_transaction" "bulk" "char_base" "collect" "constant"
-"cursor" "declare" "do" "elsif" "exception_init" "execute" "exit"
-"extends" "false" "fetch" "forall" "goto" "hour" "if" "interface"
-"loop" "minute" "number_base" "ocirowid" "opaque" "others" "rowtype"
-"separate" "serially_reusable" "sql" "sqlcode" "sqlerrm" "subtype"
-"the" "timezone_abbr" "timezone_hour" "timezone_minute"
-"timezone_region" "true" "varrying" "while"
+"a" "add" "agent" "aggregate" "array" "attribute" "authid" "avg"
+"bfile_base" "binary" "blob_base" "block" "body" "both" "bound" "bulk"
+"byte" "c" "call" "calling" "cascade" "char" "char_base" "character"
+"charset" "charsetform" "charsetid" "clob_base" "close" "collect"
+"comment" "commit" "committed" "compiled" "constant" "constructor"
+"context" "continue" "convert" "count" "current" "customdatum"
+"dangling" "data" "date" "date_base" "day" "define" "delete"
+"deterministic" "double" "duration" "element" "elsif" "empty" "escape"
+"except" "exceptions" "execute" "exists" "exit" "external" "final"
+"fixed" "float" "forall" "force" "general" "hash" "heap" "hidden"
+"hour" "immediate" "including" "indicator" "indices" "infinite"
+"instantiable" "int" "interface" "interval" "invalidate" "isolation"
+"java" "language" "large" "leading" "length" "level" "library" "like2"
+"like4" "likec" "limit" "limited" "local" "long" "loop" "map" "max"
+"maxlen" "member" "merge" "min" "minute" "mod" "modify" "month"
+"multiset" "name" "nan" "national" "native" "nchar" "new" "nocopy"
+"number_base" "object" "ocicoll" "ocidate" "ocidatetime" "ociduration"
+"ociinterval" "ociloblocator" "ocinumber" "ociraw" "ociref"
+"ocirefcursor" "ocirowid" "ocistring" "ocitype" "old" "only" "opaque"
+"open" "operator" "oracle" "oradata" "organization" "orlany" "orlvary"
+"others" "out" "overriding" "package" "parallel_enable" "parameter"
+"parameters" "parent" "partition" "pascal" "pipe" "pipelined" "pragma"
+"precision" "prior" "private" "raise" "range" "raw" "read" "record"
+"ref" "reference" "relies_on" "rem" "remainder" "rename" "result"
+"result_cache" "return" "returning" "reverse" "rollback" "row"
+"sample" "save" "savepoint" "sb1" "sb2" "sb4" "second" "segment"
+"self" "separate" "sequence" "serializable" "set" "short" "size_t"
+"some" "sparse" "sqlcode" "sqldata" "sqlname" "sqlstate" "standard"
+"static" "stddev" "stored" "string" "struct" "style" "submultiset"
+"subpartition" "substitutable" "sum" "synonym" "tdo" "the" "time"
+"timestamp" "timezone_abbr" "timezone_hour" "timezone_minute"
+"timezone_region" "trailing" "transaction" "transactional" "trusted"
+"ub1" "ub2" "ub4" "under" "unsigned" "untrusted" "use" "using"
+"valist" "value" "variable" "variance" "varray" "varying" "void"
+"while" "work" "wrapped" "write" "year" "zone"
+;; Pragma
+"autonomous_transaction" "exception_init" "inline"
+"restrict_references" "serially_reusable"
 )
 
      ;; Oracle PL/SQL Data Types
      (sql-font-lock-keywords-builder 'font-lock-type-face nil
-"binary_integer" "boolean" "naturaln" "pls_integer" "positive"
-"positiven" "record" "signtype" "string"
+"\"BINARY LARGE OBJECT\"" "\"CHAR LARGE OBJECT\"" "\"CHAR VARYING\""
+"\"CHARACTER LARGE OBJECT\"" "\"CHARACTER VARYING\""
+"\"DOUBLE PRECISION\"" "\"INTERVAL DAY TO SECOND\""
+"\"INTERVAL YEAR TO MONTH\"" "\"LONG RAW\"" "\"NATIONAL CHAR\""
+"\"NATIONAL CHARACTER LARGE OBJECT\"" "\"NATIONAL CHARACTER\""
+"\"NCHAR LARGE OBJECT\"" "\"NCHAR\"" "\"NCLOB\"" "\"NVARCHAR2\""
+"\"TIME WITH TIME ZONE\"" "\"TIMESTAMP WITH LOCAL TIME ZONE\""
+"\"TIMESTAMP WITH TIME ZONE\""
+"bfile" "bfile_base" "binary_double" "binary_float" "binary_integer"
+"blob" "blob_base" "boolean" "char" "character" "char_base" "clob"
+"clob_base" "cursor" "date" "day" "dec" "decimal"
+"dsinterval_unconstrained" "float" "int" "integer" "interval" "local"
+"long" "mlslabel" "month" "natural" "naturaln" "nchar_cs" "number"
+"number_base" "numeric" "pls_integer" "positive" "positiven" "raw"
+"real" "ref" "rowid" "second" "signtype" "simple_double"
+"simple_float" "simple_integer" "smallint" "string" "time" "timestamp"
+"timestamp_ltz_unconstrained" "timestamp_tz_unconstrained"
+"timestamp_unconstrained" "time_tz_unconstrained" "time_unconstrained"
+"to" "urowid" "varchar" "varchar2" "with" "year"
+"yminterval_unconstrained" "zone"
 )
 
      ;; Oracle PL/SQL Exceptions
      (sql-font-lock-keywords-builder 'font-lock-warning-face nil
 "access_into_null" "case_not_found" "collection_is_null"
 "cursor_already_open" "dup_val_on_index" "invalid_cursor"
-"invalid_number" "login_denied" "no_data_found" "not_logged_on"
-"program_error" "rowtype_mismatch" "self_is_null" "storage_error"
-"subscript_beyond_count" "subscript_outside_limit" "sys_invalid_rowid"
-"timeout_on_resource" "too_many_rows" "value_error" "zero_divide"
-"exception" "notfound"
+"invalid_number" "login_denied" "no_data_found" "no_data_needed"
+"not_logged_on" "program_error" "rowtype_mismatch" "self_is_null"
+"storage_error" "subscript_beyond_count" "subscript_outside_limit"
+"sys_invalid_rowid" "timeout_on_resource" "too_many_rows"
+"value_error" "zero_divide"
 )))
 
   "Oracle SQL keywords used by font-lock.
@@ -2296,10 +2512,7 @@ also be configured."
 
   (let
       ;; Get the product-specific syntax-alist.
-      ((syntax-alist
-        (append
-         (sql-get-product-feature sql-product :syntax-alist)
-         '((?_ . "w") (?. . "w")))))
+      ((syntax-alist (sql-product-font-lock-syntax-alist)))
 
     ;; Get the product-specific keywords.
     (set (make-local-variable 'sql-mode-font-lock-keywords)
@@ -2388,9 +2601,30 @@ adds a fontification pattern to fontify identifiers ending in
 
 ;;; Functions to switch highlighting
 
+(defun sql-product-syntax-table ()
+  (let ((table (copy-syntax-table sql-mode-syntax-table)))
+    (mapc (lambda (entry)
+            (modify-syntax-entry (car entry) (cdr entry) table))
+          (sql-get-product-feature sql-product :syntax-alist))
+    table))
+
+(defun sql-product-font-lock-syntax-alist ()
+  (append
+   ;; Change all symbol character to word characters
+   (mapcar
+    (lambda (entry) (if (string= (substring (cdr entry) 0 1) "_")
+                        (cons (car entry)
+                              (concat "w" (substring (cdr entry) 1)))
+                      entry))
+    (sql-get-product-feature sql-product :syntax-alist))
+   '((?_ . "w"))))
+
 (defun sql-highlight-product ()
   "Turn on the font highlighting for the SQL product selected."
   (when (derived-mode-p 'sql-mode)
+    ;; Enhance the syntax table for the product
+    (set-syntax-table (sql-product-syntax-table))
+
     ;; Setup font-lock
     (sql-product-font-lock nil t)
 
@@ -2418,11 +2652,77 @@ adds a fontification pattern to fontify identifiers ending in
     ;; comint-line-beginning-position is defined in Emacs 21
     (defun comint-line-beginning-position ()
       "Return the buffer position of the beginning of the line, after any prompt.
-The prompt is assumed to be any text at the beginning of the line matching
-the regular expression `comint-prompt-regexp', a buffer local variable."
+The prompt is assumed to be any text at the beginning of the line
+matching the regular expression `comint-prompt-regexp', a buffer
+local variable."
       (save-excursion (comint-bol nil) (point))))
 
-
+;;; Motion Functions
+
+(defun sql-statement-regexp (prod)
+  (let* ((ansi-stmt (sql-get-product-feature 'ansi :statement))
+         (prod-stmt (sql-get-product-feature prod  :statement)))
+    (concat "^\\<"
+            (if prod-stmt
+                ansi-stmt
+              (concat "\\(" ansi-stmt "\\|" prod-stmt "\\)"))
+            "\\>")))
+
+(defun sql-beginning-of-statement (arg)
+  "Moves the cursor to the beginning of the current SQL statement."
+  (interactive "p")
+
+  (let ((here (point))
+        (regexp (sql-statement-regexp sql-product))
+        last next)
+
+    ;; Go to the end of the statement before the start we desire
+    (setq last (or (sql-end-of-statement (- arg))
+                   (point-min)))
+    ;; And find the end after that
+    (setq next (or (sql-end-of-statement 1)
+                   (point-max)))
+
+    ;; Our start must be between them
+    (goto-char last)
+    ;; Find an beginning-of-stmt that's not in a comment
+    (while (and (re-search-forward regexp next t 1)
+                (nth 7 (syntax-ppss)))
+      (goto-char (match-end 0)))
+    (goto-char
+     (if (match-data)
+        (match-beginning 0)
+       last))
+    (beginning-of-line)
+    ;; If we didn't move, try again
+    (when (= here (point))
+      (sql-beginning-of-statement (* 2 (sql-signum arg))))))
+
+(defun sql-end-of-statement (arg)
+  "Moves the cursor to the end of the current SQL statement."
+  (interactive "p")
+  (let ((term (sql-get-product-feature sql-product :terminator))
+        (re-search (if (> 0 arg) 're-search-backward 're-search-forward))
+        (here (point))
+        (n 0))
+    (when (consp term)
+      (setq term (car term)))
+    ;; Iterate until we've moved the desired number of stmt ends
+    (while (not (= (sql-signum arg) 0))
+      ;; if we're looking at the terminator, jump by 2
+      (if (or (and (> 0 arg) (looking-back term))
+              (and (< 0 arg) (looking-at term)))
+          (setq n 2)
+        (setq n 1))
+      ;; If we found another end-of-stmt
+      (if (not (apply re-search term nil t n nil))
+          (setq arg 0)
+        ;; count it if we're not in a comment
+        (unless (nth 7 (syntax-ppss))
+          (setq arg (- arg (sql-signum arg))))))
+    (goto-char (if (match-data)
+                   (match-end 0)
+                 here))))
 
 ;;; Small functions
 
@@ -2456,7 +2756,7 @@ the regular expression `comint-prompt-regexp', a buffer local variable."
 (defun sql-help-list-products (indent freep)
   "Generate listing of products available for use under SQLi.
 
-List products with :free-softare attribute set to FREEP.  Indent
+List products with :free-software attribute set to FREEP.  Indent
 each line with INDENT."
 
   (let (sqli-func doc)
@@ -2649,7 +2949,7 @@ function like this: (sql-get-login 'user 'password 'database)."
                                 nil (append '(:number t) plist)))))))
    what))
 
-(defun sql-find-sqli-buffer (&optional product)
+(defun sql-find-sqli-buffer (&optional product connection)
   "Returns the name of the current default SQLi buffer or nil.
 In order to qualify, the SQLi buffer must be alive, be in
 `sql-interactive-mode' and have a process."
@@ -2657,16 +2957,16 @@ In order to qualify, the SQLi buffer must be alive, be in
         (prod (or product sql-product)))
     (or
      ;; Current sql-buffer, if there is one.
-     (and (sql-buffer-live-p buf prod)
+     (and (sql-buffer-live-p buf prod connection)
           buf)
      ;; Global sql-buffer
      (and (setq buf (default-value 'sql-buffer))
-          (sql-buffer-live-p buf prod)
+          (sql-buffer-live-p buf prod connection)
           buf)
      ;; Look thru each buffer
      (car (apply 'append
                  (mapcar (lambda (b)
-                           (and (sql-buffer-live-p b prod)
+                           (and (sql-buffer-live-p b prod connection)
                                 (list (buffer-name b))))
                          (buffer-list)))))))
 
@@ -2722,7 +3022,8 @@ If you call it from anywhere else, it sets the global copy of
 This is the buffer SQL strings are sent to.  It is stored in the
 variable `sql-buffer'.  See `sql-help' on how to create such a buffer."
   (interactive)
-  (if (null (buffer-live-p (get-buffer sql-buffer)))
+  (if (or (null sql-buffer)
+          (null (buffer-live-p (get-buffer sql-buffer))))
       (message "%s has no SQLi buffer set." (buffer-name (current-buffer)))
     (if (null (get-buffer-process sql-buffer))
         (message "Buffer %s has no process." sql-buffer)
@@ -2932,37 +3233,58 @@ Allows the suppression of continuation prompts.")
 
 ;;; Strip out continuation prompts
 
+(defvar sql-preoutput-hold nil)
+
 (defun sql-interactive-remove-continuation-prompt (oline)
   "Strip out continuation prompts out of the OLINE.
 
 Added to the `comint-preoutput-filter-functions' hook in a SQL
-interactive buffer.  If `sql-outut-newline-count' is greater than
+interactive buffer.  If `sql-output-newline-count' is greater than
 zero, then an output line matching the continuation prompt is filtered
-out.  If the count is one, then the prompt is replaced with a newline
-to force the output from the query to appear on a new line."
-  (if (and sql-prompt-cont-regexp
-           sql-output-newline-count
-           (numberp sql-output-newline-count)
-           (>= sql-output-newline-count 1))
-      (progn
-        (while (and oline
-                    sql-output-newline-count
-                    (> sql-output-newline-count 0)
-                    (string-match sql-prompt-cont-regexp oline))
-
-          (setq oline
-                (replace-match (if (and
-                                    (= 1 sql-output-newline-count)
-                                    sql-output-by-send)
-                                   "\n" "")
-                               nil nil oline)
-                sql-output-newline-count
-                (1- sql-output-newline-count)))
-        (if (= sql-output-newline-count 0)
-            (setq sql-output-newline-count nil))
-        (setq sql-output-by-send nil))
-    (setq sql-output-newline-count nil))
-  oline)
+out.  If the count is zero, then a newline is inserted into the output
+to force the output from the query to appear on a new line.
+
+The complication to this filter is that the continuation prompts
+may arrive in multiple chunks.  If they do, then the function
+saves any unfiltered output in a buffer and prepends that buffer
+to the next chunk to properly match the broken-up prompt.
+
+If the filter gets confused, it should reset and stop filtering
+to avoid deleting non-prompt output."
+
+  (let (did-filter)
+    (setq oline (concat (or sql-preoutput-hold "") oline)
+          sql-preoutput-hold nil)
+
+    (if (and comint-prompt-regexp
+             (integerp sql-output-newline-count)
+             (>= sql-output-newline-count 1))
+        (progn
+          (while (and (not (string= oline ""))
+                      (> sql-output-newline-count 0)
+                      (string-match comint-prompt-regexp oline)
+                      (= (match-beginning 0) 0))
+
+            (setq oline (replace-match "" nil nil oline)
+                  sql-output-newline-count (1- sql-output-newline-count)
+                  did-filter t))
+
+          (if (= sql-output-newline-count 0)
+              (setq sql-output-newline-count nil
+                    oline (concat "\n" oline)
+                    sql-output-by-send nil)
+
+            (setq sql-preoutput-hold oline
+                  oline ""))
+
+          (unless did-filter
+            (setq oline (or sql-preoutput-hold "")
+                  sql-preoutput-hold nil
+                  sql-output-newline-count nil)))
+
+      (setq sql-output-newline-count nil))
+
+    oline))
 
 ;;; Sending the region to the SQLi buffer.
 
@@ -3066,16 +3388,35 @@ If given the optional parameter VALUE, sets
 
 ;;; Redirect output functions
 
-(defun sql-redirect (command combuf &optional outbuf save-prior)
+(defvar sql-debug-redirect nil
+  "If non-nil, display messages related to the use of redirection.")
+
+(defun sql-str-literal (s)
+  (concat "'" (replace-regexp-in-string "[']" "''" s) "'"))
+
+(defun sql-redirect (sqlbuf command &optional outbuf save-prior)
   "Execute the SQL command and send output to OUTBUF.
 
-COMBUF must be an active SQL interactive buffer.  OUTBUF may be
+SQLBUF must be an active SQL interactive buffer.  OUTBUF may be
 an existing buffer, or the name of a non-existing buffer.  If
 omitted the output is sent to a temporary buffer which will be
 killed after the command completes.  COMMAND should be a string
-of commands accepted by the SQLi program."
-
-  (with-current-buffer combuf
+of commands accepted by the SQLi program.  COMMAND may also be a
+list of SQLi command strings."
+
+  (let* ((visible (and outbuf
+                       (not (string= " " (substring outbuf 0 1))))))
+    (when visible
+      (message "Executing SQL command..."))
+    (if (consp command)
+        (mapc (lambda (c) (sql-redirect-one sqlbuf c outbuf save-prior))
+              command)
+      (sql-redirect-one sqlbuf command outbuf save-prior))
+    (when visible
+      (message "Executing SQL command...done"))))
+
+(defun sql-redirect-one (sqlbuf command outbuf save-prior)
+  (with-current-buffer sqlbuf
     (let ((buf  (get-buffer-create (or outbuf " *SQL-Redirect*")))
           (proc (get-buffer-process (current-buffer)))
           (comint-prompt-regexp (sql-get-product-feature sql-product
@@ -3090,12 +3431,13 @@ of commands accepted by the SQLi program."
           (insert "\n"))
         (setq start (point)))
 
+      (when sql-debug-redirect
+        (message ">>SQL> %S" command))
+
       ;; Run the command
-      (message "Executing SQL command...")
       (comint-redirect-send-command-to-process command buf proc nil t)
       (while (null comint-redirect-completed)
         (accept-process-output nil 1))
-      (message "Executing SQL command...done")
 
       ;; Clean up the output results
       (with-current-buffer buf
@@ -3107,12 +3449,16 @@ of commands accepted by the SQLi program."
         (goto-char start)
         (when (looking-at (concat "^" (regexp-quote command) "[\\n]"))
           (delete-region (match-beginning 0) (match-end 0)))
+        ;; Remove Ctrl-Ms
+        (goto-char start)
+        (while (re-search-forward "\r+$" nil t)
+          (replace-match "" t t))
         (goto-char start)))))
 
-(defun sql-redirect-value (command combuf regexp &optional regexp-groups)
+(defun sql-redirect-value (sqlbuf command regexp &optional regexp-groups)
   "Execute the SQL command and return part of result.
 
-COMBUF must be an active SQL interactive buffer.  COMMAND should
+SQLBUF must be an active SQL interactive buffer.  COMMAND should
 be a string of commands accepted by the SQLi program.  From the
 output, the REGEXP is repeatedly matched and the list of
 REGEXP-GROUPS submatches is returned.  This behaves much like
@@ -3122,18 +3468,19 @@ for each match."
 
   (let ((outbuf " *SQL-Redirect-values*")
         (results nil))
-    (sql-redirect command combuf outbuf nil)
+    (sql-redirect sqlbuf command outbuf nil)
     (with-current-buffer outbuf
       (while (re-search-forward regexp nil t)
         (push
          (cond
           ;; no groups-return all of them
           ((null regexp-groups)
-           (let ((i 1)
+           (let ((i (/ (length (match-data)) 2))
                  (r nil))
-             (while (match-beginning i)
+             (while (> i 0)
+               (setq i (1- i))
                (push (match-string i) r))
-             (nreverse r)))
+             r))
           ;; one group specified
           ((numberp regexp-groups)
            (match-string regexp-groups))
@@ -3152,10 +3499,14 @@ for each match."
            (error "sql-redirect-value: unknown REGEXP-GROUPS value - %s"
                   regexp-groups)))
          results)))
-      (nreverse results)))
 
-(defun sql-execute (sqlbuf outbuf command arg)
-  "Executes a command in a SQL interacive buffer and captures the output.
+    (when sql-debug-redirect
+      (message ">>SQL> = %S" (reverse results)))
+
+    (nreverse results)))
+
+(defun sql-execute (sqlbuf outbuf command enhanced arg)
+  "Executes a command in a SQL interactive buffer and captures the output.
 
 The commands are run in SQLBUF and the output saved in OUTBUF.
 COMMAND must be a string, a function or a list of such elements.
@@ -3168,9 +3519,9 @@ buffer is popped into a view window. "
    (lambda (c)
      (cond
       ((stringp c)
-       (sql-redirect (if arg (format c arg) c) sqlbuf outbuf) t)
+       (sql-redirect sqlbuf (if arg (format c arg) c) outbuf) t)
       ((functionp c)
-       (apply c sqlbuf outbuf arg))
+       (apply c sqlbuf outbuf enhanced arg nil))
       (t (error "Unknown sql-execute item %s" c))))
    (if (consp command) command (cons command nil)))
 
@@ -3197,14 +3548,92 @@ buffer is popped into a view window. "
       (setq command (if enhanced
                         (cdr command)
                       (car command))))
-    (sql-execute sqlbuf outbuf command arg)))
+    (sql-execute sqlbuf outbuf command enhanced arg)))
+
+(defvar sql-completion-object nil
+  "A list of database objects used for completion.
+
+The list is maintained in SQL interactive buffers.")
+
+(defvar sql-completion-column nil
+  "A list of column names used for completion.
+
+The list is maintained in SQL interactive buffers.")
+
+(defun sql-build-completions-1 (schema completion-list feature)
+  "Generate a list of objects in the database for use as completions."
+  (let ((f (sql-get-product-feature sql-product feature)))
+    (when f
+      (set completion-list
+            (let (cl)
+              (dolist (e (append (symbol-value completion-list)
+                                 (apply f (current-buffer) (cons schema nil)))
+                         cl)
+                (unless (member e cl) (setq cl (cons e cl))))
+              (sort cl (function string<)))))))
+
+(defun sql-build-completions (schema)
+  "Generate a list of names in the database for use as completions."
+  (sql-build-completions-1 schema 'sql-completion-object :completion-object)
+  (sql-build-completions-1 schema 'sql-completion-column :completion-column))
+
+(defvar sql-completion-sqlbuf nil)
+
+(defun sql-try-completion (string collection &optional predicate)
+  (when sql-completion-sqlbuf
+      (with-current-buffer sql-completion-sqlbuf
+        (let ((schema (and (string-match "\\`\\(\\sw\\(:?\\sw\\|\\s_\\)*\\)[.]" string)
+                           (downcase (match-string 1 string)))))
+
+          ;; If we haven't loaded any object name yet, load local schema
+          (unless sql-completion-object
+            (sql-build-completions nil))
+
+          ;; If they want another schema, load it if we haven't yet
+          (when schema
+            (let ((schema-dot (concat schema "."))
+                  (schema-len (1+ (length schema)))
+                  (names sql-completion-object)
+                  has-schema)
+
+              (while (and (not has-schema) names)
+                (setq has-schema (and
+                                  (>= (length (car names)) schema-len)
+                                  (string= schema-dot
+                                           (downcase (substring (car names) 
+                                                                0 schema-len))))
+                      names (cdr names)))
+              (unless has-schema
+                (sql-build-completions schema)))))
+        
+        ;; Try to find the completion
+        (cond
+         ((not predicate)
+          (try-completion string sql-completion-object))
+         ((eq predicate t)
+          (all-completions string sql-completion-object))
+         ((eq predicate 'lambda)
+          (test-completion string sql-completion-object))
+         ((eq (car predicate) 'boundaries)
+          (completion-boundaries string sql-completion-object nil (cdr predicate)))))))
 
 (defun sql-read-table-name (prompt)
   "Read the name of a database table."
-  ;; TODO: Fetch table/view names from database and provide completion.
-  ;; Also implement thing-at-point if the buffer has valid names in it
-  ;; (i.e. sql-mode, sql-interactive-mode, or sql-list-all buffers)
-  (read-from-minibuffer prompt))
+  (let* ((tname
+          (and (buffer-local-value 'sql-contains-names (current-buffer))
+               (thing-at-point-looking-at
+                (concat "\\_<\\sw\\(:?\\sw\\|\\s_\\)*"
+                        "\\(?:[.]+\\sw\\(?:\\sw\\|\\s_\\)*\\)*\\_>"))
+               (buffer-substring-no-properties (match-beginning 0)
+                                               (match-end 0))))
+         (sql-completion-sqlbuf (sql-find-sqli-buffer))
+         (product (with-current-buffer sql-completion-sqlbuf sql-product))
+         (completion-ignore-case t))
+
+    (if (sql-get-product-feature product :completion-object)
+        (completing-read prompt (function sql-try-completion)
+                         nil nil tname)
+      (read-from-minibuffer prompt tname))))
 
 (defun sql-list-all (&optional enhanced)
   "List all database objects."
@@ -3212,7 +3641,11 @@ buffer is popped into a view window. "
   (let ((sqlbuf (sql-find-sqli-buffer)))
     (unless sqlbuf
       (error "No SQL interactive buffer found"))
-    (sql-execute-feature sqlbuf "*List All*" :list-all enhanced nil)))
+    (sql-execute-feature sqlbuf "*List All*" :list-all enhanced nil)
+    (with-current-buffer sqlbuf
+      ;; Contains the name of database objects
+      (set (make-local-variable 'sql-contains-names) t)
+      (set (make-local-variable 'sql-buffer) sqlbuf))))
 
 (defun sql-list-table (name &optional enhanced)
   "List the details of a database table. "
@@ -3226,7 +3659,6 @@ buffer is popped into a view window. "
       (error "No table name specified"))
     (sql-execute-feature sqlbuf (format "*List %s*" name)
                          :list-table enhanced name)))
-
 
 
 ;;; SQL mode -- uses SQL interactive mode
@@ -3277,6 +3709,8 @@ you must tell Emacs.  Here's how to do that in your `~/.emacs' file:
   (set (make-local-variable 'paragraph-start) "[\n\f]")
   ;; Abbrevs
   (setq abbrev-all-caps 1)
+  ;; Contains the name of database objects
+  (set (make-local-variable 'sql-contains-names) t)
   ;; Catch changes to sql-product and highlight accordingly
   (add-hook 'hack-local-variables-hook 'sql-highlight-product t t))
 
@@ -3362,7 +3796,7 @@ you entered, right above the output it created.
            sql-product))
 
   ;; Setup the mode.
-  (setq major-mode 'sql-interactive-mode) ;FIXME: Use define-derived-mode.
+  (setq major-mode 'sql-interactive-mode)
   (setq mode-name
         (concat "SQLi[" (or (sql-get-product-feature sql-product :name)
                             (symbol-name sql-product)) "]"))
@@ -3385,9 +3819,18 @@ you entered, right above the output it created.
   (setq abbrev-all-caps 1)
   ;; Exiting the process will call sql-stop.
   (set-process-sentinel (get-buffer-process (current-buffer)) 'sql-stop)
-  ;; Save the connection name
-  (make-local-variable 'sql-connection)
-  ;; Create a usefull name for renaming this buffer later.
+  ;; Save the connection and login params
+  (set (make-local-variable 'sql-user)       sql-user)
+  (set (make-local-variable 'sql-database)   sql-database)
+  (set (make-local-variable 'sql-server)     sql-server)
+  (set (make-local-variable 'sql-port)       sql-port)
+  (set (make-local-variable 'sql-connection) sql-connection)
+  ;; Contains the name of database objects
+  (set (make-local-variable 'sql-contains-names) t)
+  ;; Keep track of existing object names
+  (set (make-local-variable 'sql-completion-object) nil)
+  (set (make-local-variable 'sql-completion-column) nil)
+  ;; Create a useful name for renaming this buffer later.
   (set (make-local-variable 'sql-alternate-buffer-name)
        (sql-make-alternate-buffer-name))
   ;; User stuff.  Initialize before the hook.
@@ -3398,6 +3841,7 @@ you entered, right above the output it created.
   (set (make-local-variable 'sql-prompt-cont-regexp)
        (sql-get-product-feature sql-product :prompt-cont-regexp))
   (make-local-variable 'sql-output-newline-count)
+  (make-local-variable 'sql-preoutput-hold)
   (make-local-variable 'sql-output-by-send)
   (add-hook 'comint-preoutput-filter-functions
             'sql-interactive-remove-continuation-prompt nil t)
@@ -3450,7 +3894,7 @@ Sentinels will always get the two parameters PROCESS and EVENT."
                      nil t initial 'sql-connection-history default)))
 
 ;;;###autoload
-(defun sql-connect (connection)
+(defun sql-connect (connection &optional new-name)
   "Connect to an interactive session using CONNECTION settings.
 
 See `sql-connection-alist' to see how to define connections and
@@ -3462,7 +3906,8 @@ is specified in the connection settings."
   ;; Prompt for the connection from those defined in the alist
   (interactive
    (if sql-connection-alist
-       (list (sql-read-connection "Connection: " nil '(nil)))
+       (list (sql-read-connection "Connection: " nil '(nil))
+             current-prefix-arg)
      nil))
 
   ;; Are there connections defined
@@ -3500,14 +3945,15 @@ is specified in the connection settings."
                                            (unless (member token set-params)
                                                     (if plist
                                                         (cons token plist)
-                                                      token)))))
-                          ;; Remember the connection
-                          (sql-connection connection))
+                                                      token))))))
 
                        ;; Set the remaining parameters and start the
                        ;; interactive session
-                       (eval `(let ((,param-var ',rem-params))
-                                (sql-product-interactive sql-product)))))
+                       (eval `(let ((sql-connection ,connection)
+                                     (,param-var ',rem-params))
+                                (sql-product-interactive sql-product 
+                                                         new-name)))))
+
             (message "SQL Connection <%s> does not exist" connection)
             nil)))
     (message "No SQL Connections defined")
@@ -3521,39 +3967,51 @@ optionally is saved to the user's init file."
 
   (interactive "sNew connection name: ")
 
-  (if sql-connection
-      (message "This session was started by a connection; it's already been saved.")
-
-    (let ((login (sql-get-product-feature sql-product :sqli-login))
-          (alist sql-connection-alist)
-          connect)
-
-      ;; Remove the existing connection if the user says so
-      (when (and (assoc name alist)
-                 (yes-or-no-p (format "Replace connection definition <%s>? " name)))
-        (setq alist (assq-delete-all name alist)))
-
-      ;; Add the new connection if it doesn't exist
-      (if (assoc name alist)
-          (message "Connection <%s> already exists" name)
-        (setq connect
-              (append (list name)
-                      (sql-for-each-login
-                       `(product ,@login)
-                       (lambda (token _plist)
-                         (cond
-                          ((eq token 'product)  `(sql-product  ',sql-product))
-                          ((eq token 'user)     `(sql-user     ,sql-user))
-                          ((eq token 'database) `(sql-database ,sql-database))
-                          ((eq token 'server)   `(sql-server   ,sql-server))
-                          ((eq token 'port)     `(sql-port     ,sql-port)))))))
-
-        (setq alist (append alist (list connect)))
-
-        ;; confirm whether we want to save the connections
-        (if (yes-or-no-p "Save the connections for future sessions? ")
-            (customize-save-variable 'sql-connection-alist alist)
-          (customize-set-variable 'sql-connection-alist alist))))))
+  (unless (derived-mode-p 'sql-interactive-mode)
+    (error "Not in a SQL interactive mode!"))
+
+  ;; Capture the buffer local settings
+  (let* ((buf        (current-buffer))
+         (connection (buffer-local-value 'sql-connection buf))
+         (product    (buffer-local-value 'sql-product    buf))
+         (user       (buffer-local-value 'sql-user       buf))
+         (database   (buffer-local-value 'sql-database   buf))
+         (server     (buffer-local-value 'sql-server     buf))
+         (port       (buffer-local-value 'sql-port       buf)))
+
+    (if connection
+        (message "This session was started by a connection; it's already been saved.")
+      
+      (let ((login (sql-get-product-feature product :sqli-login))
+            (alist sql-connection-alist)
+            connect)
+        
+        ;; Remove the existing connection if the user says so
+        (when (and (assoc name alist)
+                   (yes-or-no-p (format "Replace connection definition <%s>? " name)))
+          (setq alist (assq-delete-all name alist)))
+        
+        ;; Add the new connection if it doesn't exist
+        (if (assoc name alist)
+            (message "Connection <%s> already exists" name)
+          (setq connect
+                (append (list name)
+                        (sql-for-each-login
+                         `(product ,@login)
+                         (lambda (token _plist)
+                           (cond
+                            ((eq token 'product)  `(sql-product  ',product))
+                            ((eq token 'user)     `(sql-user     ,user))
+                            ((eq token 'database) `(sql-database ,database))
+                            ((eq token 'server)   `(sql-server   ,server))
+                            ((eq token 'port)     `(sql-port     ,port)))))))
+
+          (setq alist (append alist (list connect)))
+
+          ;; confirm whether we want to save the connections
+          (if (yes-or-no-p "Save the connections for future sessions? ")
+              (customize-save-variable 'sql-connection-alist alist)
+            (customize-set-variable 'sql-connection-alist alist)))))))
 
 (defun sql-connection-menu-filter (tail)
   "Generates menu entries for using each connection."
@@ -3561,7 +4019,10 @@ optionally is saved to the user's init file."
    (mapcar
     (lambda (conn)
       (vector
-       (format "Connection <%s>" (car conn))
+       (format "Connection <%s>\t%s" (car conn)
+               (let ((sql-user "") (sql-database "")
+                     (sql-server "") (sql-port 0))
+                 (eval `(let ,(cdr conn) (sql-make-alternate-buffer-name)))))
        (list 'sql-connect (car conn))
        t))
     sql-connection-alist)
@@ -3599,10 +4060,10 @@ the call to \\[sql-product-interactive] with
   ;; Get the value of product that we need
   (setq product
         (cond
-         ((and product                  ; Product specified
-               (symbolp product)) product)
          ((= (prefix-numeric-value product) 4) ; C-u, prompt for product
           (sql-read-product "SQL product: " sql-product))
+         ((and product                  ; Product specified
+               (symbolp product)) product)
          (t sql-product)))              ; Default to sql-product
 
   ;; If we have a product and it has a interactive mode
@@ -3610,7 +4071,7 @@ the call to \\[sql-product-interactive] with
       (when (sql-get-product-feature product :sqli-comint-func)
         ;; If no new name specified, try to pop to an active SQL
         ;; interactive for the same product
-        (let ((buf (sql-find-sqli-buffer product)))
+        (let ((buf (sql-find-sqli-buffer product sql-connection)))
           (if (and (not new-name) buf)
               (pop-to-buffer buf)
 
@@ -3629,23 +4090,24 @@ the call to \\[sql-product-interactive] with
                        (sql-get-product-feature product :sqli-options))
 
               ;; Set SQLi mode.
-              (setq new-sqli-buffer (current-buffer))
               (let ((sql-interactive-product product))
                 (sql-interactive-mode))
 
               ;; Set the new buffer name
+              (setq new-sqli-buffer (current-buffer))
               (when new-name
                 (sql-rename-buffer new-name))
-
-              ;; Set `sql-buffer' in the new buffer and the start buffer
               (setq sql-buffer (buffer-name new-sqli-buffer))
+
+              ;; Set `sql-buffer' in the start buffer
               (with-current-buffer start-buffer
-                (setq sql-buffer (buffer-name new-sqli-buffer))
-                (run-hooks 'sql-set-sqli-hook))
+                (when (derived-mode-p 'sql-mode)
+                  (setq sql-buffer (buffer-name new-sqli-buffer))
+                  (run-hooks 'sql-set-sqli-hook)))
 
               ;; All done.
               (message "Login...done")
-              (pop-to-buffer sql-buffer)))))
+              (pop-to-buffer new-sqli-buffer)))))
     (message "No default SQL product defined.  Set `sql-product'.")))
 
 (defun sql-comint (product params)
@@ -3720,6 +4182,157 @@ The default comes from `process-coding-system-alist' and
       (setq parameter options))
     (sql-comint product parameter)))
 
+(defun sql-oracle-save-settings (sqlbuf)
+  "Saves most SQL*Plus settings so they may be reset by \\[sql-redirect]."
+  ;; Note: does not capture the following settings:
+  ;;
+  ;; APPINFO
+  ;; BTITLE
+  ;; COMPATIBILITY
+  ;; COPYTYPECHECK
+  ;; MARKUP
+  ;; RELEASE
+  ;; REPFOOTER
+  ;; REPHEADER
+  ;; SQLPLUSCOMPATIBILITY
+  ;; TTITLE
+  ;; USER
+  ;;
+
+  (append
+  ;; (apply 'concat (append
+  ;;  '("SET")
+
+   ;; option value...
+   (sql-redirect-value
+    sqlbuf
+    (concat "SHOW ARRAYSIZE AUTOCOMMIT AUTOPRINT AUTORECOVERY AUTOTRACE"
+            " CMDSEP COLSEP COPYCOMMIT DESCRIBE ECHO EDITFILE EMBEDDED"
+            " ESCAPE FLAGGER FLUSH HEADING INSTANCE LINESIZE LNO LOBOFFSET"
+            " LOGSOURCE LONG LONGCHUNKSIZE NEWPAGE NULL NUMFORMAT NUMWIDTH"
+            " PAGESIZE PAUSE PNO RECSEP SERVEROUTPUT SHIFTINOUT SHOWMODE"
+            " SPOOL SQLBLANKLINES SQLCASE SQLCODE SQLCONTINUE SQLNUMBER"
+            " SQLPROMPT SUFFIX TAB TERMOUT TIMING TRIMOUT TRIMSPOOL VERIFY")
+    "^.+$"
+    "SET \\&")
+
+   ;; option "c" (hex xx)
+   (sql-redirect-value
+    sqlbuf
+    (concat "SHOW BLOCKTERMINATOR CONCAT DEFINE SQLPREFIX SQLTERMINATOR"
+            " UNDERLINE HEADSEP RECSEPCHAR")
+    "^\\(.+\\) (hex ..)$"
+    "SET \\1")
+
+   ;; FEDDBACK ON for 99 or more rows
+   ;; feedback OFF
+   (sql-redirect-value
+    sqlbuf
+    "SHOW FEEDBACK"
+    "^\\(?:FEEDBACK ON for \\([[:digit:]]+\\) or more rows\\|feedback \\(OFF\\)\\)"
+    "SET FEEDBACK \\1\\2")
+
+   ;; wrap : lines will be wrapped
+   ;; wrap : lines will be truncated
+   (list (concat "SET WRAP "
+                 (if (string=
+                      (car (sql-redirect-value
+                            sqlbuf
+                            "SHOW WRAP"
+                            "^wrap : lines will be \\(wrapped\\|truncated\\)" 1))
+                      "wrapped")
+                     "ON" "OFF")))))
+
+(defun sql-oracle-restore-settings (sqlbuf saved-settings)
+  "Restore the SQL*Plus settings in SAVED-SETTINGS."
+
+  ;; Remove any settings that haven't changed
+  (mapc
+   (lambda (one-cur-setting)
+     (setq saved-settings (delete one-cur-setting saved-settings)))
+   (sql-oracle-save-settings sqlbuf))
+
+  ;; Restore the changed settings
+  (sql-redirect sqlbuf saved-settings))
+
+(defun sql-oracle-list-all (sqlbuf outbuf enhanced table-name)
+  ;; Query from USER_OBJECTS or ALL_OBJECTS
+  (let ((settings (sql-oracle-save-settings sqlbuf))
+        (simple-sql
+         (concat
+          "SELECT INITCAP(x.object_type) AS SQL_EL_TYPE "
+          ", x.object_name AS SQL_EL_NAME "
+          "FROM user_objects                    x "
+          "WHERE x.object_type NOT LIKE '%% BODY' "
+          "ORDER BY 2, 1;"))
+        (enhanced-sql
+         (concat
+          "SELECT INITCAP(x.object_type) AS SQL_EL_TYPE "
+          ", x.owner ||'.'|| x.object_name AS SQL_EL_NAME "
+          "FROM all_objects x "
+          "WHERE x.object_type NOT LIKE '%% BODY' "
+          "AND x.owner <> 'SYS' "
+          "ORDER BY 2, 1;")))
+
+    (sql-redirect sqlbuf
+                  (concat "SET LINESIZE 80 PAGESIZE 50000 TRIMOUT ON"
+                          " TAB OFF TIMING OFF FEEDBACK OFF"))
+
+    (sql-redirect sqlbuf
+                  (list "COLUMN SQL_EL_TYPE  HEADING \"Type\" FORMAT A19"
+                        "COLUMN SQL_EL_NAME  HEADING \"Name\""
+                        (format "COLUMN SQL_EL_NAME  FORMAT A%d"
+                                (if enhanced 60 35))))
+
+    (sql-redirect sqlbuf
+                  (if enhanced enhanced-sql simple-sql)
+                  outbuf)
+
+    (sql-redirect sqlbuf
+                  '("COLUMN SQL_EL_NAME CLEAR"
+                    "COLUMN SQL_EL_TYPE CLEAR"))
+
+    (sql-oracle-restore-settings sqlbuf settings)))
+
+(defun sql-oracle-list-table (sqlbuf outbuf enhanced table-name)
+  "Implements :list-table under Oracle."
+  (let ((settings (sql-oracle-save-settings sqlbuf)))
+
+    (sql-redirect sqlbuf
+                  (format
+                   (concat "SET LINESIZE %d PAGESIZE 50000"
+                           " DESCRIBE DEPTH 1 LINENUM OFF INDENT ON")
+                   (max 65 (min 120 (window-width)))))
+
+    (sql-redirect sqlbuf (format "DESCRIBE %s" table-name)
+                  outbuf)
+
+    (sql-oracle-restore-settings sqlbuf settings)))
+
+(defcustom sql-oracle-completion-types '("FUNCTION" "PACKAGE" "PROCEDURE"
+                                         "SEQUENCE" "SYNONYM" "TABLE" "TRIGGER"
+                                         "TYPE" "VIEW")
+  "List of object types to include for completion under Oracle.
+
+See the distinct values in ALL_OBJECTS.OBJECT_TYPE for possible values."
+  :version "24.1"
+  :type '(repeat string)
+  :group 'SQL)
+
+(defun sql-oracle-completion-object (sqlbuf schema)
+  (sql-redirect-value
+   sqlbuf
+   (concat
+    "SELECT CHR(1)||"
+    (if schema
+        (format "owner||'.'||object_name AS o FROM all_objects WHERE owner = %s AND "
+                (sql-str-literal (upcase schema)))
+      "object_name AS o FROM user_objects WHERE ")
+    "temporary = 'N' AND generated = 'N' AND secondary = 'N' AND "
+    "object_type IN ("
+    (mapconcat (function sql-str-literal) sql-oracle-completion-types ",")
+    ");")
+   "^[\001]\\(.+\\)$" 1))
 
 
 ;;;###autoload
@@ -3858,6 +4471,9 @@ The default comes from `process-coding-system-alist' and
     (setq params (append options params))
     (sql-comint product params)))
 
+(defun sql-sqlite-completion-object (sqlbuf schema)
+  (sql-redirect-value sqlbuf ".tables" "\\sw\\(?:\\sw\\|\\s_\\)*" 0))
+
 
 
 ;;;###autoload
@@ -4112,6 +4728,33 @@ Try to set `comint-output-filter-functions' like this:
         (setq params (append (list "-p" sql-port) params)))
     (sql-comint product params)))
 
+(defun sql-postgres-completion-object (sqlbuf schema)
+  (let (cl re fs a r)
+    (sql-redirect sqlbuf "\\t on")
+    (setq a (car (sql-redirect-value sqlbuf "\\a" "Output format is \\(.*\\)[.]$" 1)))
+    (when (string= a "aligned")
+      (sql-redirect sqlbuf "\\a"))
+    (setq fs (or (car (sql-redirect-value sqlbuf "\\f" "Field separator is \"\\(.\\)[.]$" 1)) "|"))
+
+    (setq re (concat "^\\([^" fs "]*\\)" fs "\\([^" fs "]*\\)" fs "[^" fs "]*" fs  "[^" fs "]*$"))
+    (setq cl (if (not schema)
+                 (sql-redirect-value sqlbuf "\\d" re '(1 2))
+               (append (sql-redirect-value sqlbuf (format "\\dt %s.*" schema) re '(1 2))
+                       (sql-redirect-value sqlbuf (format "\\dv %s.*" schema) re '(1 2))
+                       (sql-redirect-value sqlbuf (format "\\ds %s.*" schema) re '(1 2)))))
+
+    ;; Restore tuples and alignment to what they were
+    (sql-redirect sqlbuf "\\t off")
+    (when (not (string= a "aligned"))
+      (sql-redirect sqlbuf "\\a"))
+    
+    ;; Return the list of table names (public schema name can be omitted) 
+    (mapcar (lambda (tbl)
+              (if (string= (car tbl) "public")
+                  (cadr tbl)
+                (format "%s.%s" (car tbl) (cadr tbl))))
+            cl)))
+
 
 
 ;;;###autoload
@@ -4199,8 +4842,7 @@ The default comes from `process-coding-system-alist' and
   "Create comint buffer and connect to DB2."
   ;; Put all parameters to the program (if defined) in a list and call
   ;; make-comint.
-  (sql-comint product options)
-)
+  (sql-comint product options))
 
 ;;;###autoload
 (defun sql-linter (&optional buffer)
@@ -4257,3 +4899,6 @@ buffer.
 (provide 'sql)
 
 ;;; sql.el ends here
+
+; LocalWords:  sql SQL SQLite sqlite Sybase Informix MySQL
+; LocalWords:  Postgres SQLServer SQLi
diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el
index 4e4d7b15053..97e188139e9 100644
--- a/lisp/progmodes/which-func.el
+++ b/lisp/progmodes/which-func.el
@@ -206,7 +206,8 @@ It creates the Imenu index for the buffer, if necessary."
           (setq imenu--index-alist
                 (save-excursion (funcall imenu-create-index-function))))
     (error
-     (message "which-func-ff-hook error: %S" err)
+     (unless (equal err '(error "This buffer cannot use `imenu-default-create-index-function'"))
+       (message "which-func-ff-hook error: %S" err))
      (setq which-func-mode nil))))
 
 (defun which-func-update ()
diff --git a/lisp/rect.el b/lisp/rect.el
index ad914cab7d2..0756ec3bc0a 100644
--- a/lisp/rect.el
+++ b/lisp/rect.el
@@ -93,8 +93,9 @@ Point is at the end of the segment of this line within the rectangle."
   "Call FUNCTION for each line of rectangle with corners at START, END.
 FUNCTION is called with two arguments: the start and end columns of the
 rectangle, plus ARGS extra arguments.  Point is at the beginning of line when
-the function is called."
-  (let (startcol startpt endcol endpt)
+the function is called.
+The final point after the last operation will be returned."
+  (let (startcol startpt endcol endpt final-point)
     (save-excursion
       (goto-char start)
       (setq startcol (current-column))
@@ -112,8 +113,9 @@ the function is called."
       (goto-char startpt)
       (while (< (point) endpt)
         (apply function startcol endcol args)
+        (setq final-point (point))
         (forward-line 1)))
-    ))
+    final-point))
 
 (defun delete-rectangle-line (startcol endcol fill)
   (when (= (move-to-column startcol (if fill t 'coerce)) startcol)
@@ -323,7 +325,8 @@ Called from a program, takes three args; START, END and STRING."
                                 (or (car string-rectangle-history) ""))
                         nil 'string-rectangle-history
                         (car string-rectangle-history)))))
-  (apply-on-rectangle 'string-rectangle-line start end string t))
+  (goto-char
+   (apply-on-rectangle 'string-rectangle-line start end string t)))
 
 ;;;###autoload
 (defalias 'replace-rectangle 'string-rectangle)
diff --git a/lisp/register.el b/lisp/register.el
index 82a0cf33c3e..89a725f28c5 100644
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -70,7 +70,7 @@
 DATA can be any value.
 PRINT-FUNC if provided controls how `list-registers' and
 `view-register' print the register.  It should be a function
-recieving one argument DATA and print text that completes
+receiving one argument DATA and print text that completes
 this sentence:
   Register X contains [TEXT PRINTED BY PRINT-FUNC]
 JUMP-FUNC if provided, controls how `jump-to-register' jumps to the register.
@@ -329,6 +329,8 @@ Interactively, second arg is non-nil if prefix arg is supplied."
               "Don't know how to insert register %s"
               (single-key-description register))
       (funcall (registerv-insert-func val) (registerv-data val)))
+     ((consp val)
+      (insert-rectangle val))
      ((stringp val)
       (insert-for-yank val))
      ((numberp val)
diff --git a/lisp/replace.el b/lisp/replace.el
index 0578ed09b1c..fb98a714dff 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1140,7 +1140,8 @@ are not modified."
   "Show all lines in buffers BUFS containing a match for REGEXP.
 This function acts on multiple buffers; otherwise, it is exactly like
 `occur'.  When you invoke this command interactively, you must specify
-the buffer names that you want, one by one."
+the buffer names that you want, one by one.
+See also `multi-occur-in-matching-buffers'."
   (interactive
    (cons
     (let* ((bufs (list (read-buffer "First buffer to search: "
diff --git a/lisp/scroll-bar.el b/lisp/scroll-bar.el
index 54f2ba765b5..0c68bca4d2e 100644
--- a/lisp/scroll-bar.el
+++ b/lisp/scroll-bar.el
@@ -81,7 +81,8 @@ SIDE must be the symbol `left' or `right'."
 This is nil while loading `scroll-bar.el', and t afterward.")
 
 (defun set-scroll-bar-mode (value)
-  "Set `scroll-bar-mode' to VALUE and put the new value into effect."
+  "Set the scroll bar mode to VALUE and put the new value into effect.
+See the `scroll-bar-mode' variable for possible values to use."
   (if scroll-bar-mode
       (setq previous-scroll-bar-mode scroll-bar-mode))
 
diff --git a/lisp/server.el b/lisp/server.el
index 42da7a210c5..c91f10b6584 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -679,7 +679,7 @@ Server mode runs a process that accepts commands from the
 (defun server-eval-and-print (expr proc)
   "Eval EXPR and send the result back to client PROC."
   (let ((v (eval (car (read-from-string expr)))))
-    (when (and v proc)
+    (when proc
       (with-temp-buffer
         (let ((standard-output (current-buffer)))
           (pp v)
@@ -1153,7 +1153,10 @@ The following commands are accepted by the client:
                              "When done with a buffer, type \\[server-edit]")))))
           (when (and frame (null tty-name))
             (server-unselect-display frame)))
-      (error (server-return-error proc err)))))
+      ((quit error)
+       (when (eq (car err) 'quit)
+         (message "Quit emacsclient request"))
+       (server-return-error proc err)))))
 
 (defun server-return-error (proc err)
   (ignore-errors
@@ -1200,12 +1203,12 @@ so don't mark these buffers specially, just visit them normally."
           (add-to-history 'file-name-history filen)
           (if (null obuf)
               (progn
-                (run-hooks 'pre-command-hook)  
+                (run-hooks 'pre-command-hook)
                 (set-buffer (find-file-noselect filen)))
             (set-buffer obuf)
             ;; separately for each file, in sync with post-command hooks,
             ;; with the new buffer current:
-            (run-hooks 'pre-command-hook)  
+            (run-hooks 'pre-command-hook)
             (cond ((file-exists-p filen)
                    (when (not (verify-visited-file-modtime obuf))
                      (revert-buffer t nil)))
@@ -1219,7 +1222,7 @@ so don't mark these buffers specially, just visit them normally."
           (server-goto-line-column (cdr file))
           (run-hooks 'server-visit-hook)
           ;; hooks may be specific to current buffer:
-          (run-hooks 'post-command-hook)) 
+          (run-hooks 'post-command-hook))
         (unless nowait
           ;; When the buffer is killed, inform the clients.
           (add-hook 'kill-buffer-hook 'server-kill-buffer nil t)
diff --git a/lisp/ses.el b/lisp/ses.el
index 8b06f058fcd..9b2048eae83 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -56,6 +56,7 @@
 ;;; Code:
 
 (require 'unsafep)
+(eval-when-compile (require 'cl))
 
 
 ;;----------------------------------------------------------------------------
@@ -272,18 +273,18 @@ default printer and then modify its output.")
 (eval-and-compile
   (defconst ses-localvars
     '(ses--blank-line ses--cells ses--col-printers
-      ses--col-widths (ses--curcell . nil) ses--curcell-overlay
+      ses--col-widths ses--curcell ses--curcell-overlay
       ses--default-printer
-      ses--deferred-narrow (ses--deferred-recalc
-      . nil) (ses--deferred-write . nil) ses--file-format
+      ses--deferred-narrow ses--deferred-recalc
+      ses--deferred-write ses--file-format
       (ses--header-hscroll . -1) ; Flag for "initial recalc needed"
       ses--header-row ses--header-string ses--linewidth
       ses--numcols ses--numrows ses--symbolic-formulas
-      ses--data-marker ses--params-marker (ses--Dijkstra-attempt-nb
-      . 0) ses--Dijkstra-weight-bound
+      ses--data-marker ses--params-marker (ses--Dijkstra-attempt-nb . 0)
+      ses--Dijkstra-weight-bound
       ;; Global variables that we override
       mode-line-process next-line-add-newlines transient-mark-mode)
-    "Buffer-local variables used by SES."))
+    "Buffer-local variables used by SES.")
 
 (defun ses-set-localvars ()
   "Set buffer-local and initialize some SES variables."
@@ -292,8 +293,11 @@ default printer and then modify its output.")
      ((symbolp x)
       (set (make-local-variable x) nil))
      ((consp x)
-       (set (make-local-variable (car x)) (cdr x)))
-     (error "Unexpected elements `%S' in list `ses-localvars'"))))
+      (set (make-local-variable (car x)) (cdr x)))
+     (t (error "Unexpected elements `%S' in list `ses-localvars'" x))))))
+
+(eval-when-compile                      ; silence compiler
+  (ses-set-localvars))
 
 ;;; This variable is documented as being permitted in file-locals:
 (put 'ses--symbolic-formulas 'safe-local-variable 'consp)
@@ -3344,10 +3348,8 @@ TEST is evaluated."
 ;; These functions use the variables 'row' and 'col' that are dynamically bound
 ;; by ses-print-cell.  We define these variables at compile-time to make the
 ;; compiler happy.
-(eval-when-compile
-  (dolist (x '(row col))
-    (make-local-variable x)
-    (set x nil)))
+(defvar row)
+(defvar col)
 
 (defun ses-center (value &optional span fill)
   "Print VALUE, centered within column.  FILL is the fill character for
diff --git a/lisp/simple.el b/lisp/simple.el
index b36cf2ec3ec..64333402924 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1152,6 +1152,8 @@ display the result of expression evaluation."
 (defun eval-expression (eval-expression-arg
                         &optional eval-expression-insert-value)
   "Evaluate EVAL-EXPRESSION-ARG and print value in the echo area.
+When called interactively, read an Emacs Lisp expression and
+evaluate it.
 Value is also consed on to front of the variable `values'.
 Optional argument EVAL-EXPRESSION-INSERT-VALUE non-nil (interactively,
 with prefix argument) means insert the result into the current buffer
@@ -2531,7 +2533,11 @@ specifies the value of ERROR-BUFFER."
             (let ((output
                    (if (and error-file
                             (< 0 (nth 7 (file-attributes error-file))))
-                       "some error output"
+                       (format "some error output%s"
+                               (if shell-command-default-error-buffer
+                                   (format " to the \"%s\" buffer"
+                                           shell-command-default-error-buffer)
+                                 ""))
                      "no output")))
               (cond ((null exit-status)
                      (message "(Shell command failed with error)"))
@@ -5299,11 +5305,12 @@ The variable `selective-display' has a separate value for each buffer."
 (defvaralias 'indicate-unused-lines 'indicate-empty-lines)
 
 (defun toggle-truncate-lines (&optional arg)
-  "Toggle whether to fold or truncate long lines for the current buffer.
+  "Toggle truncating of long lines for the current buffer.
+When truncating is off, long lines are folded.
 With prefix argument ARG, truncate long lines if ARG is positive,
-otherwise don't truncate them.  Note that in side-by-side windows,
-this command has no effect if `truncate-partial-width-windows'
-is non-nil."
+otherwise fold them.  Note that in side-by-side windows, this
+command has no effect if `truncate-partial-width-windows' is
+non-nil."
   (interactive "P")
   (setq truncate-lines
         (if (null arg)
@@ -5516,8 +5523,8 @@ The function should return non-nil if the two tokens do not match.")
                 (minibuffer-message "Mismatched parentheses")
               (message "Mismatched parentheses"))
           (if (minibufferp)
-              (minibuffer-message "Unmatched parenthesis")
-            (message "Unmatched parenthesis"))))
+              (minibuffer-message "No matching parenthesis found")
+            (message "No matching parenthesis found"))))
        ((not blinkpos) nil)
        ((pos-visible-in-window-p blinkpos)
         ;; Matching open within window, temporarily move to blinkpos but only
diff --git a/lisp/startup.el b/lisp/startup.el
index 26c5a469330..6953ed25ed4 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -41,8 +41,9 @@
 (defcustom initial-buffer-choice nil
   "Buffer to show after starting Emacs.
 If the value is nil and `inhibit-startup-screen' is nil, show the
-startup screen.  If the value is string, visit the specified file or
-directory using `find-file'.  If t, open the `*scratch*' buffer."
+startup screen.  If the value is string, visit the specified file
+or directory using `find-file'.  If t, open the `*scratch*'
+buffer."
   :type '(choice
           (const     :tag "Startup screen" nil)
           (directory :tag "Directory" :value "~/")
@@ -1293,7 +1294,7 @@ If this is nil, no message will be displayed."
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (defconst fancy-startup-text
-  `((:face (variable-pitch (:foreground "red"))
+  `((:face (variable-pitch font-lock-comment-face)
      "Welcome to "
      :link ("GNU Emacs"
             ,(lambda (_button) (browse-url "http://www.gnu.org/software/emacs/"))
@@ -1350,7 +1351,7 @@ Each element in the list should be a list of strings or pairs
 `:face FACE', like `fancy-splash-insert' accepts them.")
 
 (defconst fancy-about-text
-  `((:face (variable-pitch (:foreground "red"))
+  `((:face (variable-pitch font-lock-comment-face)
      "This is "
      :link ("GNU Emacs"
             ,(lambda (_button) (browse-url "http://www.gnu.org/software/emacs/"))
@@ -1366,11 +1367,7 @@ Each element in the list should be a list of strings or pairs
          `("GNU" ,(lambda (_button) (describe-gnu-project))
            "Display info on the GNU project.")))
      " operating system.\n"
-     :face ,(lambda ()
-             (list 'variable-pitch
-                   (list :foreground
-                         (if (eq (frame-parameter nil 'background-mode) 'dark)
-                             "cyan" "darkblue"))))
+     :face (variable-pitch font-lock-builtin-face)
      "\n"
      ,(lambda () (emacs-version))
      "\n"
@@ -1426,8 +1423,7 @@ Each element in the list should be a list of strings or pairs
             ,(lambda (_button)
                (browse-url "http://www.gnu.org/software/emacs/tour/"))
             "Browse http://www.gnu.org/software/emacs/tour/")
-     "\tSee an overview of Emacs features at gnu.org"
-     ))
+     "\tSee an overview of Emacs features at gnu.org"))
   "A list of texts to show in the middle part of the About screen.
 Each element in the list should be a list of strings or pairs
 `:face FACE', like `fancy-splash-insert' accepts them.")
@@ -1537,93 +1533,91 @@ a face or button specification."
 
 (defun fancy-startup-tail (&optional concise)
   "Insert the tail part of the splash screen into the current buffer."
-  (let ((fg (if (eq (frame-parameter nil 'background-mode) 'dark)
-                "cyan" "darkblue")))
-    (unless concise
-      (fancy-splash-insert
-       :face 'variable-pitch
-       "\nTo start...     "
-       :link `("Open a File"
-               ,(lambda (_button) (call-interactively 'find-file))
-               "Specify a new file's name, to edit the file")
-       "     "
-       :link `("Open Home Directory"
-               ,(lambda (_button) (dired "~"))
-               "Open your home directory, to operate on its files")
-       "     "
-       :link `("Customize Startup"
-               ,(lambda (_button) (customize-group 'initialization))
-               "Change initialization settings including this screen")
-       "\n"))
+  (unless concise
     (fancy-splash-insert
-     :face 'variable-pitch "To quit a partially entered command, type "
-     :face 'default "Control-g"
-     :face 'variable-pitch ".\n")
-    (fancy-splash-insert :face `(variable-pitch (:foreground ,fg))
-                         "\nThis is "
-                         (emacs-version)
-                         "\n"
-                         :face '(variable-pitch (:height 0.8))
-                         emacs-copyright
-                         "\n")
-    (and auto-save-list-file-prefix
-         ;; Don't signal an error if the
-         ;; directory for auto-save-list files
-         ;; does not yet exist.
-         (file-directory-p (file-name-directory
-                            auto-save-list-file-prefix))
-         (directory-files
-          (file-name-directory auto-save-list-file-prefix)
-          nil
-          (concat "\\`"
-                  (regexp-quote (file-name-nondirectory
-                                 auto-save-list-file-prefix)))
-          t)
-         (fancy-splash-insert :face '(variable-pitch (:foreground "red"))
-                              "\nIf an Emacs session crashed recently, "
-                              "type "
-                              :face '(fixed-pitch :foreground "red")
-                              "Meta-x recover-session RET"
-                              :face '(variable-pitch (:foreground "red"))
-                              "\nto recover"
-                              " the files you were editing."))
-
-    (when concise
-      (fancy-splash-insert
-       :face 'variable-pitch "\n"
-       :link `("Dismiss this startup screen"
-               ,(lambda (_button)
-                  (when startup-screen-inhibit-startup-screen
-                    (customize-set-variable 'inhibit-startup-screen t)
-                    (customize-mark-to-save 'inhibit-startup-screen)
-                    (custom-save-all))
-                  (let ((w (get-buffer-window "*GNU Emacs*")))
-                    (and w (not (one-window-p)) (delete-window w)))
-                  (kill-buffer "*GNU Emacs*")))
-       "  ")
-      (when (or user-init-file custom-file)
-        (let ((checked (create-image "checked.xpm"
-                                     nil nil :ascent 'center))
-              (unchecked (create-image "unchecked.xpm"
-                                       nil nil :ascent 'center)))
-          (insert-button
-           " "
-           :on-glyph checked
-           :off-glyph unchecked
-           'checked nil 'display unchecked 'follow-link t
-           'action (lambda (button)
-                     (if (overlay-get button 'checked)
-                         (progn (overlay-put button 'checked nil)
-                                (overlay-put button 'display
-                                             (overlay-get button :off-glyph))
-                                (setq startup-screen-inhibit-startup-screen
-                                      nil))
-                       (overlay-put button 'checked t)
-                       (overlay-put button 'display
-                                    (overlay-get button :on-glyph))
-                       (setq startup-screen-inhibit-startup-screen t)))))
-        (fancy-splash-insert :face '(variable-pitch (:height 0.9))
-                             " Never show it again.")))))
+     :face 'variable-pitch
+     "\nTo start...     "
+     :link `("Open a File"
+             ,(lambda (_button) (call-interactively 'find-file))
+             "Specify a new file's name, to edit the file")
+     "     "
+     :link `("Open Home Directory"
+             ,(lambda (_button) (dired "~"))
+             "Open your home directory, to operate on its files")
+     "     "
+     :link `("Customize Startup"
+             ,(lambda (_button) (customize-group 'initialization))
+             "Change initialization settings including this screen")
+     "\n"))
+  (fancy-splash-insert
+   :face 'variable-pitch "To quit a partially entered command, type "
+   :face 'default "Control-g"
+   :face 'variable-pitch ".\n")
+  (fancy-splash-insert :face `(variable-pitch font-lock-builtin-face)
+                       "\nThis is "
+                       (emacs-version)
+                       "\n"
+                       :face '(variable-pitch (:height 0.8))
+                       emacs-copyright
+                       "\n")
+  (and auto-save-list-file-prefix
+       ;; Don't signal an error if the
+       ;; directory for auto-save-list files
+       ;; does not yet exist.
+       (file-directory-p (file-name-directory
+                          auto-save-list-file-prefix))
+       (directory-files
+        (file-name-directory auto-save-list-file-prefix)
+        nil
+        (concat "\\`"
+                (regexp-quote (file-name-nondirectory
+                               auto-save-list-file-prefix)))
+        t)
+       (fancy-splash-insert :face '(variable-pitch font-lock-comment-face)
+                            "\nIf an Emacs session crashed recently, "
+                            "type "
+                            :face '(fixed-pitch font-lock-comment-face)
+                            "Meta-x recover-session RET"
+                            :face '(variable-pitch font-lock-comment-face)
+                            "\nto recover"
+                            " the files you were editing."))
+
+  (when concise
+    (fancy-splash-insert
+     :face 'variable-pitch "\n"
+     :link `("Dismiss this startup screen"
+             ,(lambda (_button)
+                (when startup-screen-inhibit-startup-screen
+                  (customize-set-variable 'inhibit-startup-screen t)
+                  (customize-mark-to-save 'inhibit-startup-screen)
+                  (custom-save-all))
+                (let ((w (get-buffer-window "*GNU Emacs*")))
+                  (and w (not (one-window-p)) (delete-window w)))
+                (kill-buffer "*GNU Emacs*")))
+     "  ")
+    (when (or user-init-file custom-file)
+      (let ((checked (create-image "checked.xpm"
+                                   nil nil :ascent 'center))
+            (unchecked (create-image "unchecked.xpm"
+                                     nil nil :ascent 'center)))
+        (insert-button
+         " "
+         :on-glyph checked
+         :off-glyph unchecked
+         'checked nil 'display unchecked 'follow-link t
+         'action (lambda (button)
+                   (if (overlay-get button 'checked)
+                       (progn (overlay-put button 'checked nil)
+                              (overlay-put button 'display
+                                           (overlay-get button :off-glyph))
+                              (setq startup-screen-inhibit-startup-screen
+                                    nil))
+                     (overlay-put button 'checked t)
+                     (overlay-put button 'display
+                                  (overlay-get button :on-glyph))
+                     (setq startup-screen-inhibit-startup-screen t)))))
+      (fancy-splash-insert :face '(variable-pitch (:height 0.9))
+                           " Never show it again."))))
 
 (defun exit-splash-screen ()
   "Stop displaying the splash screen buffer."
diff --git a/lisp/subr.el b/lisp/subr.el
index 4d2f3b1808c..94b28c007d1 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -490,6 +490,7 @@ SEQ must be a list, vector, or string.  The comparison is done with `equal'."
   "Return LIST with all occurrences of ELT removed.
 The comparison is done with `eq'.  Contrary to `delq', this does not use
 side-effects, and the argument LIST is not modified."
+  (while (and (eq elt (car list)) (setq list (cdr list))))
   (if (memq elt list)
       (delq elt (copy-sequence list))
     list))
@@ -591,31 +592,88 @@ Don't call this function; it is for internal use only."
     (dolist (p list)
       (funcall function (car p) (cdr p)))))
 
+(defun keymap--menu-item-binding (val)
+  "Return the binding part of a menu-item."
+  (cond
+   ((not (consp val)) val)              ;Not a menu-item.
+   ((eq 'menu-item (car val))
+    (let* ((binding (nth 2 val))
+           (plist (nthcdr 3 val))
+           (filter (plist-get plist :filter)))
+      (if filter (funcall filter binding)
+        binding)))
+   ((and (consp (cdr val)) (stringp (cadr val)))
+    (cddr val))
+   ((stringp (car val))
+    (cdr val))
+   (t val)))                            ;Not a menu-item either.
+
+(defun keymap--menu-item-with-binding (item binding)
+  "Build a menu-item like ITEM but with its binding changed to BINDING."
+  (cond
+   ((eq 'menu-item (car item))
+    (setq item (copy-sequence item))
+    (let ((tail (nthcdr 2 item)))
+      (setcar tail binding)
+      ;; Remove any potential filter.
+      (if (plist-get (cdr tail) :filter)
+          (setcdr tail (plist-put (cdr tail) :filter nil))))
+    item)
+   ((and (consp (cdr item)) (stringp (cadr item)))
+    (cons (car item) (cons (cadr item) binding)))
+   (t (cons (car item) binding))))
+
+(defun keymap--merge-bindings (val1 val2)
+  "Merge bindings VAL1 and VAL2."
+  (let ((map1 (keymap--menu-item-binding val1))
+        (map2 (keymap--menu-item-binding val2)))
+    (if (not (and (keymapp map1) (keymapp map2)))
+        ;; There's nothing to merge: val1 takes precedence.
+        val1
+      (let ((map (list 'keymap map1 map2))
+            (item (if (keymapp val1) (if (keymapp val2) nil val2) val1)))
+        (keymap--menu-item-with-binding item map)))))
+
 (defun keymap-canonicalize (map)
-  "Return an equivalent keymap, without inheritance."
+  "Return a simpler equivalent keymap.
+This resolves inheritance and redefinitions.  The returned keymap
+should behave identically to a copy of KEYMAP w.r.t `lookup-key'
+and use in active keymaps and menus.
+Subkeymaps may be modified but are not canonicalized."
+  ;; FIXME: Problem with the difference between a nil binding
+  ;; that hides a binding in an inherited map and a nil binding that's ignored
+  ;; to let some further binding visible.  Currently a nil binding hides all.
+  ;; FIXME: we may want to carefully (re)order elements in case they're
+  ;; menu-entries.
   (let ((bindings ())
         (ranges ())
         (prompt (keymap-prompt map)))
     (while (keymapp map)
-      (setq map (map-keymap-internal
+      (setq map (map-keymap ;; -internal
                  (lambda (key item)
                    (if (consp key)
                        ;; Treat char-ranges specially.
                        (push (cons key item) ranges)
                      (push (cons key item) bindings)))
                  map)))
+    ;; Create the new map.
     (setq map (funcall (if ranges 'make-keymap 'make-sparse-keymap) prompt))
     (dolist (binding ranges)
-      ;; Treat char-ranges specially.
+      ;; Treat char-ranges specially.  FIXME: need to merge as well.
       (define-key map (vector (car binding)) (cdr binding)))
+    ;; Process the bindings starting from the end.
     (dolist (binding (prog1 bindings (setq bindings ())))
       (let* ((key (car binding))
              (item (cdr binding))
              (oldbind (assq key bindings)))
-        ;; Newer bindings override older.
-        (if oldbind (setq bindings (delq oldbind bindings)))
-        (when item                      ;nil bindings just hide older ones.
-          (push binding bindings))))
+        (push (if (not oldbind)
+                  ;; The normal case: no duplicate bindings.
+                  binding
+                ;; This is the second binding for this key.
+                (setq bindings (delq oldbind bindings))
+                (cons key (keymap--merge-bindings (cdr binding)
+                                                  (cdr oldbind))))
+              bindings)))
     (nconc map bindings)))
 
 (put 'keyboard-translate-table 'char-table-extra-slots 0)
@@ -1204,10 +1262,10 @@ unless the optional argument APPEND is non-nil, in which case
 FUNCTION is added at the end.
 
 The optional fourth argument, LOCAL, if non-nil, says to modify
-the hook's buffer-local value rather than its default value.
-This makes the hook buffer-local if needed, and it makes t a member
-of the buffer-local value.  That acts as a flag to run the hook
-functions in the default value as well as in the local value.
+the hook's buffer-local value rather than its global value.
+This makes the hook buffer-local, and it makes t a member of the
+buffer-local value.  That acts as a flag to run the hook
+functions of the global value as well as in the local value.
 
 HOOK should be a symbol, and FUNCTION may be any valid function.  If
 HOOK is void, it is first set to nil.  If HOOK's value is a single
@@ -3014,8 +3072,15 @@ See also `with-temp-file' and `with-output-to-string'."
   "Execute BODY, pretending it does not modify the buffer.
 If BODY performs real modifications to the buffer's text, other
 than cosmetic ones, undo data may become corrupted.
-Typically used around modifications of text-properties which do not really
-affect the buffer's content."
+
+This macro will run BODY normally, but doesn't count its buffer
+modifications as being buffer modifications.  This affects things
+like buffer-modified-p, checking whether the file is locked by
+someone else, running buffer modification hooks, and other things
+of that nature.
+
+Typically used around modifications of text-properties which do
+not really affect the buffer's content."
   (declare (debug t) (indent 0))
   (let ((modified (make-symbol "modified")))
     `(let* ((,modified (buffer-modified-p))
@@ -4022,7 +4087,8 @@ If all LST elements are zeros or LST is nil, return zero."
 Note that version string \"1\" is equal to \"1.0\", \"1.0.0\", \"1.0.0.0\",
 etc.  That is, the trailing \".0\"s are insignificant.  Also, version
 string \"1\" is higher (newer) than \"1pre\", which is higher than \"1beta\",
-which is higher than \"1alpha\"."
+which is higher than \"1alpha\".  Also, \"-CVS\" and \"-NNN\" are treated
+as alpha versions."
   (version-list-< (version-to-list v1) (version-to-list v2)))
 
 
@@ -4032,7 +4098,8 @@ which is higher than \"1alpha\"."
 Note that version string \"1\" is equal to \"1.0\", \"1.0.0\", \"1.0.0.0\",
 etc.  That is, the trailing \".0\"s are insignificant.  Also, version
 string \"1\" is higher (newer) than \"1pre\", which is higher than \"1beta\",
-which is higher than \"1alpha\"."
+which is higher than \"1alpha\".  Also, \"-CVS\" and \"-NNN\" are treated
+as alpha versions."
   (version-list-<= (version-to-list v1) (version-to-list v2)))
 
 (defun version= (v1 v2)
@@ -4041,7 +4108,8 @@ which is higher than \"1alpha\"."
 Note that version string \"1\" is equal to \"1.0\", \"1.0.0\", \"1.0.0.0\",
 etc.  That is, the trailing \".0\"s are insignificant.  Also, version
 string \"1\" is higher (newer) than \"1pre\", which is higher than \"1beta\",
-which is higher than \"1alpha\"."
+which is higher than \"1alpha\".  Also, \"-CVS\" and \"-NNN\" are treated
+as alpha versions."
   (version-list-= (version-to-list v1) (version-to-list v2)))
 
 
diff --git a/lisp/tabify.el b/lisp/tabify.el
index da1038a2164..0b2411d0316 100644
--- a/lisp/tabify.el
+++ b/lisp/tabify.el
@@ -34,19 +34,21 @@ Called non-interactively, the region is specified by arguments
 START and END, rather than by the position of point and mark.
 The variable `tab-width' controls the spacing of tab stops."
   (interactive "r")
-  (save-excursion
-    (save-restriction
-      (narrow-to-region (point-min) end)
-      (goto-char start)
-      (while (search-forward "\t" nil t)        ; faster than re-search
-        (forward-char -1)
-        (let ((tab-beg (point))
-              (indent-tabs-mode nil)
-              column)
-          (skip-chars-forward "\t")
-          (setq column (current-column))
-          (delete-region tab-beg (point))
-          (indent-to column))))))
+  (let ((c (current-column)))
+    (save-excursion
+      (save-restriction
+        (narrow-to-region (point-min) end)
+        (goto-char start)
+        (while (search-forward "\t" nil t)      ; faster than re-search
+          (forward-char -1)
+          (let ((tab-beg (point))
+                (indent-tabs-mode nil)
+                column)
+            (skip-chars-forward "\t")
+            (setq column (current-column))
+            (delete-region tab-beg (point))
+            (indent-to column)))))
+    (move-to-column c)))
 
 (defvar tabify-regexp " [ \t]+"
   "Regexp matching whitespace that tabify should consider.
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index fbf3e91d3d9..447d7fd2533 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -892,6 +892,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
 (declare-function ns-list-services "nsfns.m" ())
 (declare-function x-open-connection "nsfns.m"
                   (display &optional xrm-string must-succeed))
+(declare-function ns-set-resource "nsfns.m" (owner name value))
 
 ;; Do the actual Nextstep Windows setup here; the above code just
 ;; defines functions and variables that we use now.
@@ -916,7 +917,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
   ;; FIXME: This will surely lead to "MODIFIED OUTSIDE CUSTOM" warnings.
   (menu-bar-mode (if (get-lisp-resource nil "Menus") 1 -1))
 
-  ;; OS X Lion introduces PressAndHold, which is unsupported by this port. 
+  ;; OS X Lion introduces PressAndHold, which is unsupported by this port.
   ;; See this thread for more details:
   ;; http://lists.gnu.org/archive/html/emacs-devel/2011-06/msg00505.html
   (ns-set-resource nil "ApplePressAndHoldEnabled" "NO")
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index 107a0728bae..a660bdb6488 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -90,8 +90,8 @@ If this is a function, call it to generate the initial field text."
 (defcustom bibtex-user-optional-fields
   '(("annote" "Personal annotation (ignored)"))
   "List of optional fields the user wants to have always present.
-Entries should be of the same form as the OPTIONAL and
-CROSSREF-OPTIONAL lists in `bibtex-entry-field-alist' (which see)."
+Entries should be of the same form as the OPTIONAL list
+in `bibtex-BibTeX-entry-alist' (which see)."
   :group 'bibtex
   :type '(repeat (group (string :tag "Field")
                         (string :tag "Comment")
@@ -127,7 +127,7 @@ braces              Enclose parts of field entries by braces according to
 strings             Replace parts of field entries by string constants
                       according to `bibtex-field-strings-alist'.
 sort-fields         Sort fields to match the field order in
-                    `bibtex-entry-field-alist'.
+                    `bibtex-BibTeX-entry-alist'.
 
 The value t means do all of the above formatting actions.
 The value nil means do no formatting at all."
@@ -264,265 +264,584 @@ If parsing fails, try to set this variable to nil."
   :group 'bibtex
   :type 'boolean)
 
-(defcustom bibtex-entry-field-alist
-  '(("Article"
-     ((("author" "Author1 [and Author2 ...] [and others]")
-       ("title" "Title of the article (BibTeX converts it to lowercase)")
-       ("journal" "Name of the journal (use string, remove braces)")
-       ("year" "Year of publication"))
-      (("volume" "Volume of the journal")
-       ("number" "Number of the journal (only allowed if entry contains volume)")
-       ("pages" "Pages in the journal")
-       ("month" "Month of the publication as a string (remove braces)")
-       ("note" "Remarks to be put at the end of the \\bibitem")))
-     ((("author" "Author1 [and Author2 ...] [and others]")
-       ("title" "Title of the article (BibTeX converts it to lowercase)"))
-      (("pages" "Pages in the journal")
-       ("journal" "Name of the journal (use string, remove braces)")
-       ("year" "Year of publication")
-       ("volume" "Volume of the journal")
-       ("number" "Number of the journal")
-       ("month" "Month of the publication as a string (remove braces)")
-       ("note" "Remarks to be put at the end of the \\bibitem"))))
-    ("Book"
-     ((("author" "Author1 [and Author2 ...] [and others]" nil t)
-       ("editor" "Editor1 [and Editor2 ...] [and others]" nil t)
-       ("title" "Title of the book")
-       ("publisher" "Publishing company")
-       ("year" "Year of publication"))
-      (("volume" "Volume of the book in the series")
-       ("number" "Number of the book in a small series (overwritten by volume)")
-       ("series" "Series in which the book appeared")
-       ("address" "Address of the publisher")
-       ("edition" "Edition of the book as a capitalized English word")
-       ("month" "Month of the publication as a string (remove braces)")
-       ("note" "Remarks to be put at the end of the \\bibitem")))
-     ((("author" "Author1 [and Author2 ...] [and others]" nil t)
-       ("editor" "Editor1 [and Editor2 ...] [and others]" nil t)
-       ("title" "Title of the book"))
-      (("publisher" "Publishing company")
-       ("year" "Year of publication")
-       ("volume" "Volume of the book in the series")
-       ("number" "Number of the book in a small series (overwritten by volume)")
-       ("series" "Series in which the book appeared")
-       ("address" "Address of the publisher")
-       ("edition" "Edition of the book as a capitalized English word")
-       ("month" "Month of the publication as a string (remove braces)")
-       ("note" "Remarks to be put at the end of the \\bibitem"))))
-    ("Booklet"
-     ((("title" "Title of the booklet (BibTeX converts it to lowercase)"))
-      (("author" "Author1 [and Author2 ...] [and others]")
-       ("howpublished" "The way in which the booklet was published")
-       ("address" "Address of the publisher")
-       ("month" "Month of the publication as a string (remove braces)")
-       ("year" "Year of publication")
-       ("note" "Remarks to be put at the end of the \\bibitem"))))
-    ("InBook"
-     ((("author" "Author1 [and Author2 ...] [and others]" nil t)
-       ("editor" "Editor1 [and Editor2 ...] [and others]" nil t)
-       ("title" "Title of the book")
-       ("chapter" "Chapter in the book")
-       ("publisher" "Publishing company")
-       ("year" "Year of publication"))
-      (("volume" "Volume of the book in the series")
-       ("number" "Number of the book in a small series (overwritten by volume)")
-       ("series" "Series in which the book appeared")
-       ("type" "Word to use instead of \"chapter\"")
-       ("address" "Address of the publisher")
-       ("edition" "Edition of the book as a capitalized English word")
-       ("month" "Month of the publication as a string (remove braces)")
-       ("pages" "Pages in the book")
-       ("note" "Remarks to be put at the end of the \\bibitem")))
-     ((("author" "Author1 [and Author2 ...] [and others]" nil t)
-       ("editor" "Editor1 [and Editor2 ...] [and others]" nil t)
-       ("title" "Title of the book")
-       ("chapter" "Chapter in the book"))
-      (("pages" "Pages in the book")
-       ("publisher" "Publishing company")
-       ("year" "Year of publication")
-       ("volume" "Volume of the book in the series")
-       ("number" "Number of the book in a small series (overwritten by volume)")
-       ("series" "Series in which the book appeared")
-       ("type" "Word to use instead of \"chapter\"")
-       ("address" "Address of the publisher")
-       ("edition" "Edition of the book as a capitalized English word")
-       ("month" "Month of the publication as a string (remove braces)")
-       ("note" "Remarks to be put at the end of the \\bibitem"))))
-    ("InCollection"
-     ((("author" "Author1 [and Author2 ...] [and others]")
-       ("title" "Title of the article in book (BibTeX converts it to lowercase)")
-       ("booktitle" "Name of the book")
-       ("publisher" "Publishing company")
-       ("year" "Year of publication"))
-      (("editor" "Editor1 [and Editor2 ...] [and others]")
-       ("volume" "Volume of the book in the series")
-       ("number" "Number of the book in a small series (overwritten by volume)")
-       ("series" "Series in which the book appeared")
-       ("type" "Word to use instead of \"chapter\"")
-       ("chapter" "Chapter in the book")
-       ("pages" "Pages in the book")
-       ("address" "Address of the publisher")
-       ("edition" "Edition of the book as a capitalized English word")
-       ("month" "Month of the publication as a string (remove braces)")
-       ("note" "Remarks to be put at the end of the \\bibitem")))
-     ((("author" "Author1 [and Author2 ...] [and others]")
-       ("title" "Title of the article in book (BibTeX converts it to lowercase)")
-       ("booktitle" "Name of the book"))
-      (("pages" "Pages in the book")
-       ("publisher" "Publishing company")
-       ("year" "Year of publication")
-       ("editor" "Editor1 [and Editor2 ...] [and others]")
-       ("volume" "Volume of the book in the series")
-       ("number" "Number of the book in a small series (overwritten by volume)")
-       ("series" "Series in which the book appeared")
-       ("type" "Word to use instead of \"chapter\"")
-       ("chapter" "Chapter in the book")
-       ("address" "Address of the publisher")
-       ("edition" "Edition of the book as a capitalized English word")
-       ("month" "Month of the publication as a string (remove braces)")
-       ("note" "Remarks to be put at the end of the \\bibitem"))))
-    ("InProceedings"
-     ((("author" "Author1 [and Author2 ...] [and others]")
-       ("title" "Title of the article in proceedings (BibTeX converts it to lowercase)")
-       ("booktitle" "Name of the conference proceedings")
-       ("year" "Year of publication"))
-      (("editor" "Editor1 [and Editor2 ...] [and others]")
-       ("volume" "Volume of the conference proceedings in the series")
-       ("number" "Number of the conference proceedings in a small series (overwritten by volume)")
-       ("series" "Series in which the conference proceedings appeared")
-       ("pages" "Pages in the conference proceedings")
-       ("address" "Location of the Proceedings")
-       ("month" "Month of the publication as a string (remove braces)")
-       ("organization" "Sponsoring organization of the conference")
-       ("publisher" "Publishing company, its location")
-       ("note" "Remarks to be put at the end of the \\bibitem")))
-     ((("author" "Author1 [and Author2 ...] [and others]")
-       ("title" "Title of the article in proceedings (BibTeX converts it to lowercase)"))
-      (("booktitle" "Name of the conference proceedings")
-       ("pages" "Pages in the conference proceedings")
-       ("year" "Year of publication")
-       ("editor" "Editor1 [and Editor2 ...] [and others]")
-       ("volume" "Volume of the conference proceedings in the series")
-       ("number" "Number of the conference proceedings in a small series (overwritten by volume)")
-       ("series" "Series in which the conference proceedings appeared")
-       ("address" "Location of the Proceedings")
-       ("month" "Month of the publication as a string (remove braces)")
-       ("organization" "Sponsoring organization of the conference")
-       ("publisher" "Publishing company, its location")
-       ("note" "Remarks to be put at the end of the \\bibitem"))))
-    ("Manual"
-     ((("title" "Title of the manual"))
-      (("author" "Author1 [and Author2 ...] [and others]")
-       ("organization" "Publishing organization of the manual")
-       ("address" "Address of the organization")
-       ("edition" "Edition of the manual as a capitalized English word")
-       ("month" "Month of the publication as a string (remove braces)")
-       ("year" "Year of publication")
-       ("note" "Remarks to be put at the end of the \\bibitem"))))
-    ("MastersThesis"
-     ((("author" "Author1 [and Author2 ...] [and others]")
-       ("title" "Title of the master\'s thesis (BibTeX converts it to lowercase)")
-       ("school" "School where the master\'s thesis was written")
-       ("year" "Year of publication"))
-      (("type" "Type of the master\'s thesis (if other than \"Master\'s thesis\")")
-       ("address" "Address of the school (if not part of field \"school\") or country")
-       ("month" "Month of the publication as a string (remove braces)")
-       ("note" "Remarks to be put at the end of the \\bibitem"))))
-    ("Misc"
-     (()
-      (("author" "Author1 [and Author2 ...] [and others]")
-       ("title" "Title of the work (BibTeX converts it to lowercase)")
-       ("howpublished" "The way in which the work was published")
-       ("month" "Month of the publication as a string (remove braces)")
-       ("year" "Year of publication")
-       ("note" "Remarks to be put at the end of the \\bibitem"))))
-    ("PhdThesis"
-     ((("author" "Author1 [and Author2 ...] [and others]")
-       ("title" "Title of the PhD. thesis")
-       ("school" "School where the PhD. thesis was written")
-       ("year" "Year of publication"))
-      (("type" "Type of the PhD. thesis")
-       ("address" "Address of the school (if not part of field \"school\") or country")
-       ("month" "Month of the publication as a string (remove braces)")
-       ("note" "Remarks to be put at the end of the \\bibitem"))))
-    ("Proceedings"
-     ((("title" "Title of the conference proceedings")
-       ("year" "Year of publication"))
-      (("booktitle" "Title of the proceedings for cross references")
-       ("editor" "Editor1 [and Editor2 ...] [and others]")
-       ("volume" "Volume of the conference proceedings in the series")
-       ("number" "Number of the conference proceedings in a small series (overwritten by volume)")
-       ("series" "Series in which the conference proceedings appeared")
-       ("address" "Location of the Proceedings")
-       ("month" "Month of the publication as a string (remove braces)")
-       ("organization" "Sponsoring organization of the conference")
-       ("publisher" "Publishing company, its location")
-       ("note" "Remarks to be put at the end of the \\bibitem"))))
-    ("TechReport"
-     ((("author" "Author1 [and Author2 ...] [and others]")
-       ("title" "Title of the technical report (BibTeX converts it to lowercase)")
-       ("institution" "Sponsoring institution of the report")
-       ("year" "Year of publication"))
-      (("type" "Type of the report (if other than \"technical report\")")
-       ("number" "Number of the technical report")
-       ("address" "Address of the institution (if not part of field \"institution\") or country")
-       ("month" "Month of the publication as a string (remove braces)")
-       ("note" "Remarks to be put at the end of the \\bibitem"))))
-    ("Unpublished"
-     ((("author" "Author1 [and Author2 ...] [and others]")
-       ("title" "Title of the unpublished work (BibTeX converts it to lowercase)")
-       ("note" "Remarks to be put at the end of the \\bibitem"))
-      (("month" "Month of the publication as a string (remove braces)")
-       ("year" "Year of publication")))))
-
-  "List of BibTeX entry types and their associated fields.
-List elements are triples
-\(ENTRY-TYPE (REQUIRED OPTIONAL) (CROSSREF-REQUIRED CROSSREF-OPTIONAL)).
-ENTRY-TYPE is the type of a BibTeX entry.  The remaining pairs contain
-the required and optional fields of the BibTeX entry.
-The second pair is used if a crossref field is present
-and the first pair is used if a crossref field is absent.
-If the second pair is nil, the first pair is always used.
-REQUIRED, OPTIONAL, CROSSREF-REQUIRED and CROSSREF-OPTIONAL are lists.
+(define-widget 'bibtex-entry-alist 'lazy
+  "Format of `bibtex-BibTeX-entry-alist' and friends."
+  :type '(repeat (group (string :tag "Entry type")
+                        (string :tag "Documentation")
+                        (repeat :tag "Required fields"
+                                (group (string :tag "Field")
+                                       (option (choice :tag "Comment" :value nil
+                                                       (const nil) string))
+                                       (option (choice :tag "Init" :value nil
+                                                       (const nil) string function))
+                                       (option (choice :tag "Alternative" :value nil
+                                                       (const nil) integer))))
+                        (repeat :tag "Crossref fields"
+                                (group (string :tag "Field")
+                                       (option (choice :tag "Comment" :value nil
+                                                       (const nil) string))
+                                       (option (choice :tag "Init" :value nil
+                                                       (const nil) string function))
+                                       (option (choice :tag "Alternative" :value nil
+                                                       (const nil) integer))))
+                        (repeat :tag "Optional fields"
+                                (group (string :tag "Field")
+                                       (option (choice :tag "Comment" :value nil
+                                                       (const nil) string))
+                                       (option (choice :tag "Init" :value nil
+                                                       (const nil) string function)))))))
+
+(define-obsolete-variable-alias 'bibtex-entry-field-alist
+  'bibtex-BibTeX-entry-alist "24.1")
+(defcustom bibtex-BibTeX-entry-alist
+  '(("Article" "Article in Journal"
+     (("author")
+      ("title" "Title of the article (BibTeX converts it to lowercase)"))
+     (("journal") ("year"))
+     (("volume" "Volume of the journal")
+      ("number" "Number of the journal (only allowed if entry contains volume)")
+      ("pages" "Pages in the journal")
+      ("month") ("note")))
+    ("InProceedings" "Article in Conference Proceedings"
+     (("author")
+      ("title" "Title of the article in proceedings (BibTeX converts it to lowercase)"))
+     (("booktitle" "Name of the conference proceedings")
+      ("year"))
+     (("editor")
+      ("volume" "Volume of the conference proceedings in the series")
+      ("number" "Number of the conference proceedings in a small series (overwritten by volume)")
+      ("series" "Series in which the conference proceedings appeared")
+      ("pages" "Pages in the conference proceedings")
+      ("month") ("address")
+      ("organization" "Sponsoring organization of the conference")
+      ("publisher" "Publishing company, its location")
+      ("note")))
+    ("InCollection" "Article in a Collection"
+     (("author")
+      ("title" "Title of the article in book (BibTeX converts it to lowercase)")
+      ("booktitle" "Name of the book"))
+     (("publisher") ("year"))
+     (("editor")
+      ("volume" "Volume of the book in the series")
+      ("number" "Number of the book in a small series (overwritten by volume)")
+      ("series" "Series in which the book appeared")
+      ("type" "Word to use instead of \"chapter\"")
+      ("chapter" "Chapter in the book")
+      ("pages" "Pages in the book")
+      ("edition" "Edition of the book as a capitalized English word")
+      ("month") ("address") ("note")))
+    ("InBook" "Chapter or Pages in a Book"
+     (("author" nil nil 0)
+      ("editor" nil nil 0)
+      ("title" "Title of the book")
+      ("chapter" "Chapter in the book"))
+     (("publisher") ("year"))
+     (("volume" "Volume of the book in the series")
+      ("number" "Number of the book in a small series (overwritten by volume)")
+      ("series" "Series in which the book appeared")
+      ("type" "Word to use instead of \"chapter\"")
+      ("address")
+      ("edition" "Edition of the book as a capitalized English word")
+      ("month")
+      ("pages" "Pages in the book")
+      ("note")))
+    ("Proceedings" "Conference Proceedings"
+     (("title" "Title of the conference proceedings")
+      ("year"))
+     nil
+     (("booktitle" "Title of the proceedings for cross references")
+      ("editor")
+      ("volume" "Volume of the conference proceedings in the series")
+      ("number" "Number of the conference proceedings in a small series (overwritten by volume)")
+      ("series" "Series in which the conference proceedings appeared")
+      ("address")
+      ("month")
+      ("organization" "Sponsoring organization of the conference")
+      ("publisher" "Publishing company, its location")
+      ("note")))
+    ("Book" "Book"
+     (("author" nil nil 0)
+      ("editor" nil nil 0)
+      ("title" "Title of the book"))
+     (("publisher") ("year"))
+     (("volume" "Volume of the book in the series")
+      ("number" "Number of the book in a small series (overwritten by volume)")
+      ("series" "Series in which the book appeared")
+      ("address")
+      ("edition" "Edition of the book as a capitalized English word")
+      ("month") ("note")))
+    ("Booklet" "Booklet (Bound, but no Publisher)"
+     (("title" "Title of the booklet (BibTeX converts it to lowercase)"))
+     nil
+     (("author")
+      ("howpublished" "The way in which the booklet was published")
+      ("address") ("month") ("year") ("note")))
+    ("PhdThesis" "PhD. Thesis"
+     (("author")
+      ("title" "Title of the PhD. thesis")
+      ("school" "School where the PhD. thesis was written")
+      ("year"))
+     nil
+     (("type" "Type of the PhD. thesis")
+      ("address" "Address of the school (if not part of field \"school\") or country")
+      ("month") ("note")))
+    ("MastersThesis" "Master's Thesis"
+     (("author")
+      ("title" "Title of the master's thesis (BibTeX converts it to lowercase)")
+      ("school" "School where the master's thesis was written")
+      ("year"))
+     nil
+     (("type" "Type of the master's thesis (if other than \"Master's thesis\")")
+      ("address" "Address of the school (if not part of field \"school\") or country")
+      ("month") ("note")))
+    ("TechReport" "Technical Report"
+     (("author")
+      ("title" "Title of the technical report (BibTeX converts it to lowercase)")
+      ("institution" "Sponsoring institution of the report")
+      ("year"))
+     nil
+     (("type" "Type of the report (if other than \"technical report\")")
+      ("number" "Number of the technical report")
+      ("address") ("month") ("note")))
+    ("Manual" "Technical Manual"
+     (("title" "Title of the manual"))
+     nil
+     (("author")
+      ("organization" "Publishing organization of the manual")
+      ("address")
+      ("edition" "Edition of the manual as a capitalized English word")
+      ("month") ("year") ("note")))
+    ("Unpublished" "Unpublished"
+     (("author")
+      ("title" "Title of the unpublished work (BibTeX converts it to lowercase)")
+      ("note"))
+     nil
+     (("month") ("year")))
+    ("Misc" "Miscellaneous" nil nil
+     (("author")
+      ("title" "Title of the work (BibTeX converts it to lowercase)")
+      ("howpublished" "The way in which the work was published")
+      ("month") ("year") ("note"))))
+  "Alist of BibTeX entry types and their associated fields.
+Elements are lists (ENTRY-TYPE DOC REQUIRED CROSSREF OPTIONAL).
+ENTRY-TYPE is the type of a BibTeX entry.
+DOC is a brief doc string used for menus. If nil ENTRY-TYPE is used.
+REQUIRED is a list of required fields.
+CROSSREF is a list of fields that are optional if a crossref field
+is present; but these fields are required otherwise.
+OPTIONAL is a list of optional fields.
+
 Each element of these lists is a list of the form
-\(FIELD-NAME COMMENT-STRING INIT ALTERNATIVE-FLAG).
-COMMENT-STRING, INIT, and ALTERNATIVE-FLAG are optional.
-FIELD-NAME is the name of the field, COMMENT-STRING is the comment that
-appears in the echo area, INIT is either the initial content of the
-field or a function, which is called to determine the initial content
-of the field, and ALTERNATIVE-FLAG (either nil or t) marks if the
-field is an alternative.  ALTERNATIVE-FLAG may be t only in the
-REQUIRED or CROSSREF-REQUIRED lists."
+  \(FIELD COMMENT INIT ALTERNATIVE).
+COMMENT, INIT, and ALTERNATIVE are optional.
+
+FIELD is the name of the field.
+COMMENT is the comment string that appears in the echo area.
+If COMMENT is nil use `bibtex-BibTeX-field-alist' if possible.
+INIT is either the initial content of the field or a function,
+which is called to determine the initial content of the field.
+ALTERNATIVE if non-nil is an integer that numbers sets of
+alternatives, starting from zero."
+  :group 'BibTeX
+  :type 'bibtex-entry-alist)
+(put 'bibtex-BibTeX-entry-alist 'risky-local-variable t)
+
+(defcustom bibtex-biblatex-entry-alist
+  ;; Compare in biblatex documentation:
+  ;; Sec. 2.1.1  Regular types (required and optional fields)
+  ;; Appendix A  Default Crossref setup
+  '(("Article" "Article in Journal"
+     (("author") ("title") ("journaltitle")
+      ("year" nil nil 0) ("date" nil nil 0))
+     nil
+     (("translator") ("annotator") ("commentator") ("subtitle") ("titleaddon")
+      ("editor") ("editora") ("editorb") ("editorc")
+      ("journalsubtitle") ("issuetitle") ("issuesubtitle")
+      ("language") ("origlanguage") ("series") ("volume") ("number") ("eid")
+      ("issue") ("month") ("pages") ("version") ("note") ("issn")
+      ("addendum") ("pubstate") ("doi") ("eprint") ("eprintclass")
+      ("eprinttype") ("url") ("urldate")))
+    ("Book" "Single-Volume Book"
+     (("author") ("title") ("year" nil nil 0) ("date" nil nil 0))
+     nil
+     (("editor") ("editora") ("editorb") ("editorc")
+      ("translator") ("annotator") ("commentator")
+      ("introduction") ("foreword") ("afterword") ("titleaddon")
+      ("maintitle") ("mainsubtitle") ("maintitleaddon")
+      ("language") ("origlanguage") ("volume") ("part") ("edition") ("volumes")
+      ("series") ("number") ("note") ("publisher") ("location") ("isbn")
+      ("chapter") ("pages") ("pagetotal") ("addendum") ("pubstate") ("doi")
+      ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate")))
+    ("MVBook" "Multi-Volume Book"
+     (("author") ("title") ("year" nil nil 0) ("date" nil nil 0))
+     nil
+     (("editor") ("editora") ("editorb") ("editorc")
+      ("translator") ("annotator") ("commentator")
+      ("introduction") ("foreword") ("afterword") ("subtitle")
+      ("titleaddon") ("language") ("origlanguage") ("edition") ("volumes")
+      ("series") ("number") ("note") ("publisher")
+      ("location") ("isbn") ("pagetotal") ("addendum") ("pubstate") ("doi")
+      ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate")))
+    ("InBook" "Chapter or Pages in a Book"
+     (("title") ("year" nil nil 0) ("date" nil nil 0))
+     (("author") ("booktitle"))
+     (("bookauthor") ("editor") ("editora") ("editorb") ("editorc")
+      ("translator") ("annotator") ("commentator") ("introduction") ("foreword")
+      ("afterword") ("subtitle") ("titleaddon") ("maintitle") ("mainsubtitle")
+      ("maintitleaddon") ("booksubtitle") ("booktitleaddon")
+      ("language") ("origlanguage") ("volume") ("part") ("edition") ("volumes")
+      ("series") ("number") ("note") ("publisher") ("location") ("isbn")
+      ("chapter") ("pages") ("addendum") ("pubstate")
+      ("doi") ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate")))
+    ("BookInBook" "Book in Collection" ; same as @inbook
+     (("title") ("year" nil nil 0) ("date" nil nil 0))
+     (("author") ("booktitle"))
+     (("bookauthor") ("editor") ("editora") ("editorb") ("editorc")
+      ("translator") ("annotator") ("commentator") ("introduction") ("foreword")
+      ("afterword") ("subtitle") ("titleaddon") ("maintitle") ("mainsubtitle")
+      ("maintitleaddon") ("booksubtitle") ("booktitleaddon")
+      ("language") ("origlanguage") ("volume") ("part") ("edition") ("volumes")
+      ("series") ("number") ("note") ("publisher") ("location") ("isbn")
+      ("chapter") ("pages") ("addendum") ("pubstate")
+      ("doi") ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate")))
+    ("SuppBook" "Supplemental Material in a Book" ; same as @inbook
+     (("title") ("year" nil nil 0) ("date" nil nil 0))
+     (("author") ("booktitle"))
+     (("bookauthor") ("editor") ("editora") ("editorb") ("editorc")
+      ("translator") ("annotator") ("commentator") ("introduction") ("foreword")
+      ("afterword") ("subtitle") ("titleaddon") ("maintitle") ("mainsubtitle")
+      ("maintitleaddon") ("booksubtitle") ("booktitleaddon")
+      ("language") ("origlanguage") ("volume") ("part") ("edition") ("volumes")
+      ("series") ("number") ("note") ("publisher") ("location") ("isbn")
+      ("chapter") ("pages") ("addendum") ("pubstate")
+      ("doi") ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate")))
+    ("Booklet" "Booklet (Bound, but no Publisher)"
+     (("author" nil nil 0) ("editor" nil nil 0) ("title")
+      ("year" nil nil 1) ("date" nil nil 1))
+     nil
+     (("subtitle") ("titleaddon") ("language") ("howpublished") ("type")
+      ("note") ("location") ("chapter") ("pages") ("pagetotal") ("addendum")
+      ("pubstate") ("doi") ("eprint") ("eprintclass") ("eprinttype")
+      ("url") ("urldate")))
+    ("Collection" "Single-Volume Collection"
+     (("editor") ("title") ("year" nil nil 0) ("date" nil nil 0))
+     nil
+     (("editora") ("editorb") ("editorc") ("translator") ("annotator")
+      ("commentator") ("introduction") ("foreword") ("afterword")
+      ("subtitle") ("titleaddon") ("maintitle") ("mainsubtitle")
+      ("maintitleaddon") ("language") ("origlanguage") ("volume")
+      ("part") ("edition") ("volumes") ("series") ("number") ("note")
+      ("publisher") ("location") ("isbn") ("chapter") ("pages") ("pagetotal")
+      ("addendum") ("pubstate") ("doi") ("eprint") ("eprintclass")
+      ("eprinttype") ("url") ("urldate")))
+    ("MVCollection" "Multi-Volume Collection"
+     (("editor") ("title") ("year" nil nil 0) ("date" nil nil 0))
+     nil
+     (("editora") ("editorb") ("editorc") ("translator") ("annotator")
+      ("commentator") ("introduction") ("foreword") ("afterword")
+      ("subtitle") ("titleaddon") ("language") ("origlanguage") ("edition")
+      ("volumes") ("series") ("number") ("note") ("publisher")
+      ("location") ("isbn") ("pagetotal") ("addendum") ("pubstate") ("doi")
+      ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate")))
+    ("InCollection" "Article in a Collection"
+     (("author") ("editor") ("title") ("year" nil nil 0) ("date" nil nil 0))
+     (("booktitle"))
+     (("editora") ("editorb") ("editorc") ("translator") ("annotator")
+      ("commentator") ("introduction") ("foreword") ("afterword")
+      ("subtitle") ("titleaddon") ("maintitle") ("mainsubtitle")
+      ("maintitleaddon") ("booksubtitle") ("booktitleaddon")
+      ("language") ("origlanguage") ("volume") ("part") ("edition")
+      ("volumes") ("series") ("number") ("note") ("publisher") ("location")
+      ("isbn") ("chapter") ("pages") ("addendum") ("pubstate") ("doi")
+      ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate")))
+    ("SuppCollection" "Supplemental Material in a Collection" ; same as @incollection
+     (("author") ("editor") ("title") ("year" nil nil 0) ("date" nil nil 0))
+     (("booktitle"))
+     (("editora") ("editorb") ("editorc") ("translator") ("annotator")
+      ("commentator") ("introduction") ("foreword") ("afterword")
+      ("subtitle") ("titleaddon") ("maintitle") ("mainsubtitle")
+      ("maintitleaddon") ("booksubtitle") ("booktitleaddon")
+      ("language") ("origlanguage") ("volume") ("part") ("edition")
+      ("volumes") ("series") ("number") ("note") ("publisher") ("location")
+      ("isbn") ("chapter") ("pages") ("addendum") ("pubstate") ("doi")
+      ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate")))
+    ("Manual" "Technical Manual"
+     (("author" nil nil 0) ("editor" nil nil 0) ("title")
+      ("year" nil nil 1) ("date" nil nil 1))
+     nil
+     (("subtitle") ("titleaddon") ("language") ("edition")
+      ("type") ("series") ("number") ("version") ("note")
+      ("organization") ("publisher") ("location") ("isbn") ("chapter")
+      ("pages") ("pagetotal") ("addendum") ("pubstate")
+      ("doi") ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate")))
+    ("Misc" "Miscellaneous"
+     (("author" nil nil 0) ("editor" nil nil 0) ("title")
+      ("year" nil nil 1) ("date" nil nil 1))
+     nil
+     (("subtitle") ("titleaddon") ("language") ("howpublished") ("type")
+      ("version") ("note") ("organization") ("location")
+      ("date") ("month") ("year") ("addendum") ("pubstate")
+      ("doi") ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate")))
+    ("Online" "Online Resource"
+     (("author" nil nil 0) ("editor" nil nil 0) ("title")
+      ("year" nil nil 1) ("date" nil nil 1) ("url"))
+     nil
+     (("subtitle") ("titleaddon") ("language") ("version") ("note")
+      ("organization") ("date") ("month") ("year") ("addendum")
+      ("pubstate") ("urldate")))
+    ("Patent" "Patent"
+     (("author") ("title") ("number") ("year" nil nil 0) ("date" nil nil 0))
+     nil
+     (("holder") ("subtitle") ("titleaddon") ("type") ("version") ("location")
+      ("note") ("date") ("month") ("year") ("addendum") ("pubstate")
+      ("doi") ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate")))
+    ("Periodical" "Complete Issue of a Periodical"
+     (("editor") ("title") ("year" nil nil 0) ("date" nil nil 0))
+     nil
+     (("editora") ("editorb") ("editorc") ("subtitle") ("issuetitle")
+      ("issuesubtitle") ("language") ("series") ("volume") ("number") ("issue")
+      ("date") ("month") ("year") ("note") ("issn") ("addendum") ("pubstate")
+      ("doi") ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate")))
+    ("SuppPeriodical" "Supplemental Material in a Periodical" ; same as @article
+     (("author") ("title") ("journaltitle")
+      ("year" nil nil 0) ("date" nil nil 0))
+     nil
+     (("translator") ("annotator") ("commentator") ("subtitle") ("titleaddon")
+      ("editor") ("editora") ("editorb") ("editorc")
+      ("journalsubtitle") ("issuetitle") ("issuesubtitle")
+      ("language") ("origlanguage") ("series") ("volume") ("number") ("eid")
+      ("issue") ("month") ("pages") ("version") ("note") ("issn")
+      ("addendum") ("pubstate") ("doi") ("eprint") ("eprintclass")
+      ("eprinttype") ("url") ("urldate")))
+    ("Proceedings" "Single-Volume Conference Proceedings"
+     (("editor") ("title") ("year" nil nil 0) ("date" nil nil 0))
+     nil
+     (("subtitle") ("titleaddon") ("maintitle") ("mainsubtitle")
+      ("maintitleaddon") ("eventtitle") ("eventdate") ("venue") ("language")
+      ("volume") ("part") ("volumes") ("series") ("number") ("note")
+      ("organization") ("publisher") ("location") ("month")
+      ("isbn") ("chapter") ("pages") ("pagetotal") ("addendum") ("pubstate")
+      ("doi") ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate")))
+    ("MVProceedings" "Multi-Volume Conference Proceedings"
+     (("editor") ("title") ("year" nil nil 0) ("date" nil nil 0))
+     nil
+     (("subtitle") ("titleaddon") ("eventtitle") ("eventdate") ("venue")
+      ("language") ("volumes") ("series") ("number") ("note")
+      ("organization") ("publisher") ("location") ("month")
+      ("isbn") ("pagetotal") ("addendum") ("pubstate")
+      ("doi") ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate")))
+    ("InProceedings" "Article in Conference Proceedings"
+     (("author") ("editor") ("title") ("year" nil nil 0) ("date" nil nil 0))
+     (("booktitle"))
+     (("subtitle") ("titleaddon") ("maintitle") ("mainsubtitle")
+      ("maintitleaddon") ("booksubtitle") ("booktitleaddon")
+      ("eventtitle") ("eventdate") ("venue") ("language")
+      ("volume") ("part") ("volumes") ("series") ("number") ("note")
+      ("organization") ("publisher") ("location") ("month") ("isbn")
+      ("chapter") ("pages") ("addendum") ("pubstate")
+      ("doi") ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate")))
+    ("Reference" "Single-Volume Work of Reference" ; same as @collection
+     (("editor") ("title") ("year" nil nil 0) ("date" nil nil 0))
+     nil
+     (("editora") ("editorb") ("editorc") ("translator") ("annotator")
+      ("commentator") ("introduction") ("foreword") ("afterword")
+      ("subtitle") ("titleaddon") ("maintitle") ("mainsubtitle")
+      ("maintitleaddon") ("language") ("origlanguage") ("volume")
+      ("part") ("edition") ("volumes") ("series") ("number") ("note")
+      ("publisher") ("location") ("isbn") ("chapter") ("pages") ("pagetotal")
+      ("addendum") ("pubstate") ("doi") ("eprint") ("eprintclass")
+      ("eprinttype") ("url") ("urldate")))
+    ("MVReference" "Multi-Volume Work of Reference" ; same as @mvcollection
+     (("editor") ("title") ("year" nil nil 0) ("date" nil nil 0))
+     nil
+     (("editora") ("editorb") ("editorc") ("translator") ("annotator")
+      ("commentator") ("introduction") ("foreword") ("afterword")
+      ("subtitle") ("titleaddon") ("language") ("origlanguage") ("edition")
+      ("volumes") ("series") ("number") ("note") ("publisher")
+      ("location") ("isbn") ("pagetotal") ("addendum") ("pubstate") ("doi")
+      ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate")))
+    ("InReference" "Article in a Work of Reference" ; same as @incollection
+     (("author") ("editor") ("title") ("year" nil nil 0) ("date" nil nil 0))
+     (("booktitle"))
+     (("editora") ("editorb") ("editorc") ("translator") ("annotator")
+      ("commentator") ("introduction") ("foreword") ("afterword")
+      ("subtitle") ("titleaddon") ("maintitle") ("mainsubtitle")
+      ("maintitleaddon") ("booksubtitle") ("booktitleaddon")
+      ("language") ("origlanguage") ("volume") ("part") ("edition")
+      ("volumes") ("series") ("number") ("note") ("publisher") ("location")
+      ("isbn") ("chapter") ("pages") ("addendum") ("pubstate") ("doi")
+      ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate")))
+    ("Report" "Technical or Research Report"
+     (("author") ("title") ("type") ("institution")
+      ("year" nil nil 0) ("date" nil nil 0))
+     nil
+     (("subtitle") ("titleaddon") ("language") ("number") ("version") ("note")
+      ("location") ("month") ("isrn") ("chapter") ("pages") ("pagetotal")
+      ("addendum") ("pubstate")
+      ("doi") ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate")))
+    ("Thesis" "PhD. or Master's Thesis"
+     (("author") ("title") ("type") ("institution")
+      ("year" nil nil 0) ("date" nil nil 0))
+     nil
+     (("subtitle") ("titleaddon") ("language") ("note") ("location")
+      ("month") ("isbn") ("chapter") ("pages") ("pagetotal")
+      ("addendum") ("pubstate")
+      ("doi") ("eprint") ("eprintclass") ("eprinttype") ("url") ("urldate")))
+    ("Unpublished" "Unpublished"
+     (("author") ("title") ("year" nil nil 0) ("date" nil nil 0))
+     nil
+     (("subtitle") ("titleaddon") ("language") ("howpublished")
+      ("note") ("location") ("isbn") ("date") ("month") ("year")
+      ("addendum") ("pubstate") ("url") ("urldate"))))
+  "Alist of biblatex entry types and their associated fields.
+It has the same format as `bibtex-BibTeX-entry-alist'."
   :group 'bibtex
-  :type '(repeat (group (string :tag "Entry type")
-                        (group (repeat :tag "Required fields"
-                                       (group (string :tag "Field")
-                                              (string :tag "Comment")
-                                              (option (choice :tag "Init" :value nil
-                                                              (const nil) string function))
-                                              (option (choice :tag "Alternative"
-                                                              (const :tag "No" nil)
-                                                              (const :tag "Yes" t)))))
-                               (repeat :tag "Optional fields"
-                                       (group (string :tag "Field")
-                                              (string :tag "Comment")
-                                              (option (choice :tag "Init" :value nil
-                                                              (const nil) string function)))))
-                        (option :extra-offset -4
-                         (group (repeat :tag "Crossref: required fields"
-                                        (group (string :tag "Field")
-                                               (string :tag "Comment")
-                                               (option (choice :tag "Init" :value nil
-                                                               (const nil) string function))
-                                               (option (choice :tag "Alternative"
-                                                               (const :tag "No" nil)
-                                                               (const :tag "Yes" t)))))
-                                (repeat :tag "Crossref: optional fields"
-                                        (group (string :tag "Field")
-                                               (string :tag "Comment")
-                                               (option (choice :tag "Init" :value nil
-                                                               (const nil) string function)))))))))
-(put 'bibtex-entry-field-alist 'risky-local-variable t)
+  :type 'bibtex-entry-alist)
+(put 'bibtex-biblatex-entry-alist 'risky-local-variable t)
+
+(define-widget 'bibtex-field-alist 'lazy
+  "Format of `bibtex-BibTeX-entry-alist' and friends."
+  :type '(repeat (group (string :tag "Field type")
+                        (string :tag "Comment"))))
+
+(defcustom bibtex-BibTeX-field-alist
+  '(("author" "Author1 [and Author2 ...] [and others]")
+    ("editor" "Editor1 [and Editor2 ...] [and others]")
+    ("journal" "Name of the journal (use string, remove braces)")
+    ("year" "Year of publication")
+    ("month" "Month of the publication as a string (remove braces)")
+    ("note" "Remarks to be put at the end of the \\bibitem")
+    ("publisher" "Publishing company")
+    ("address" "Address of the publisher"))
+    "Alist of BibTeX fields.
+Each element is a list (FIELD COMMENT).  COMMENT is used as a default
+if `bibtex-BibTeX-entry-alist' does not define a comment for FIELD."
+  :group 'bibtex
+  :type 'bibtex-field-alist)
+
+(defcustom bibtex-biblatex-field-alist
+  ;; See 2.2.2 Data Fields
+  '(("abstract" "Abstract of the work")
+    ("addendum" "Miscellaneous bibliographic data")
+    ("afterword" "Author(s) of an afterword to the work")
+    ("annotation" "Annotation")
+    ("annotator" "Author(s) of annotations to the work")
+    ("author" "Author(s) of the title")
+    ("bookauthor" "Author(s) of the booktitle.")
+    ("bookpagination" "Pagination scheme of the enclosing work")
+    ("booksubtitle" "Subtitle related to the booktitle")
+    ("booktitle" "Title of the book")
+    ("booktitleaddon" "Annex to the booktitle")
+    ("chapter" "Chapter, section, or any other unit of a work")
+    ("commentator" "Author(s) of a commentary to the work")
+    ("date" "Publication date")
+    ("doi" "Digital Object Identifier")
+    ("edition" "Edition of a printed publication")
+    ("editor" "Editor(s) of the title, booktitle, or maintitle")
+    ("editora" "Secondary editor")
+    ("editorb" "Secondary editor")
+    ("editorc" "Secondary editor")
+    ("editortype" "Type of editorial role performed by the editor")
+    ("editoratype" "Type of editorial role performed by editora")
+    ("editorbtype" "Type of editorial role performed by editorb")
+    ("editorctype" "Type of editorial role performed by editorc")
+    ("eid" "Electronic identifier of an article")
+    ("eprint" "Electronic identifier of an online publication")
+    ("eprintclass" "Additional information related to the eprinttype")
+    ("eprinttype" "Type of eprint identifier")
+    ("eventdate" "Date of a conference or some other event")
+    ("eventtitle" "Title of a conference or some other event")
+    ("file" "Local link to an electronic version of the work")
+    ("foreword" "Author(s) of a foreword to the work")
+    ("holder" "Holder(s) of a patent")
+    ("howpublished" "Publication notice for unusual publications")
+    ("indextitle" "Title to use for indexing instead of the regular title")
+    ("institution" "Name of a university or some other institution")
+    ("introduction" "Author(s) of an introduction to the work")
+    ("isan" "International Standard Audiovisual Number of an audiovisual work")
+    ("isbn" "International Standard Book Number of a book.")
+    ("ismn" "International Standard Music Number for printed music")
+    ("isrn" "International Standard Technical Report Number")
+    ("issn" "International Standard Serial Number of a periodical.")
+    ("issue" "Issue of a journal")
+    ("issuesubtitle" "Subtitle of a specific issue of a journal or other periodical.")
+    ("issuetitle" "Title of a specific issue of a journal or other periodical.")
+    ("iswc" "International Standard Work Code of a musical work")
+    ("journalsubtitle" "Subtitle of a journal, a newspaper, or some other periodical.")
+    ("journaltitle" "Name of a journal, a newspaper, or some other periodical.")
+    ("label" "Substitute for the regular label to be used by the citation style")
+    ("language" "Language(s) of the work")
+    ("library" "Library name and a call number")
+    ("location" "Place(s) of publication")
+    ("mainsubtitle" "Subtitle related to the maintitle")
+    ("maintitle" "Main title of a multi-volume book, such as Collected Works")
+    ("maintitleaddon" "Annex to the maintitle")
+    ("month" "Publication month")
+    ("nameaddon" "Addon to be printed immediately after the author name")
+    ("note" "Miscellaneous bibliographic data")
+    ("number" "Number of a journal or the volume/number of a book in a series")
+    ("organization" "Organization(s) that published a work")
+    ("origdate" "Publication date of the original edition")
+    ("origlanguage" "Original publication language of a translated edition")
+    ("origlocation" "Location of the original edition")
+    ("origpublisher" "Publisher of the original edition")
+    ("origtitle" "Title of the original work")
+    ("pages" "Page number(s) or page range(s)")
+    ("pagetotal" "Total number of pages of the work.")
+    ("pagination" "Pagination of the work")
+    ("part" "Number of a partial volume")
+    ("publisher" "Name(s) of the publisher(s)")
+    ("pubstate" "Publication state of the work, e. g.,'in press'")
+    ("reprinttitle" "Title of a reprint of the work")
+    ("series" "Name of a publication series")
+    ("shortauthor" "Author(s) of the work, given in an abbreviated form")
+    ("shorteditor" "Editor(s) of the work, given in an abbreviated form")
+    ("shortjournal" "Short version or an acronym of the journal title")
+    ("shortseries" "Short version or an acronym of the series field")
+    ("shorttitle" "Title in an abridged form")
+    ("subtitle" "Subtitle of the work")
+    ("title" "Title of the work")
+    ("titleaddon" "Annex to the title")
+    ("translator" "Translator(s) of the work")
+    ("type" "Type of a manual, patent, report, or thesis")
+    ("url" " URL of an online publication.")
+    ("urldate" "Access date of the address specified in the url field")
+    ("venue" "Location of a conference, a symposium, or some other event")
+    ("version" "Revision number of a piece of software, a manual, etc.")
+    ("volume" "Volume of a multi-volume book or a periodical")
+    ("volumes" "Total number of volumes of a multi-volume work")
+    ("year" "Year of publication"))
+    "Alist of biblatex fields.
+It has the same format as `bibtex-BibTeX-entry-alist'."
+  :group 'bibtex
+  :type 'bibtex-field-alist)
+
+(defcustom bibtex-dialect-list '(BibTeX biblatex)
+  "List of BibTeX dialects known to BibTeX mode.
+For each DIALECT (a symbol) a variable bibtex-DIALECT-entry-alist defines
+the allowed entries and bibtex-DIALECT-field-alist defines known field types.
+Predefined dialects include BibTeX and biblatex."
+  :group 'bibtex
+  :type '(repeat (symbol :tag "Dialect")))
+
+(defcustom bibtex-dialect 'BibTeX
+  "Current BibTeX dialect.  For allowed values see `bibtex-dialect-list'.
+During a session change it via `bibtex-set-dialect'."
+  :group 'bibtex
+  :set '(lambda (symbol value)
+          (set-default symbol value)
+          ;; `bibtex-set-dialect' is undefined during loading (no problem)
+          (if (fboundp 'bibtex-set-dialect)
+              (bibtex-set-dialect value)))
+  :type '(choice (const BibTeX)
+                 (const biblatex)
+                 (symbol :tag "Custom")))
+
+(defcustom bibtex-no-opt-remove-re "\\`option"
+  "If a field name matches this regexp, the prefix OPT is not removed.
+If nil prefix OPT is always removed"
+  :group 'bibtex
+  :type '(choice (regexp) (const nil)))
 
 (defcustom bibtex-comment-start "@Comment"
   "String starting a BibTeX comment."
@@ -1120,29 +1439,15 @@ Set this variable before loading BibTeX mode."
      ["(Re)Initialize BibTeX Buffers" bibtex-initialize t]
      ["Validate Entries" bibtex-validate-globally t])))
 
-(easy-menu-define
-  bibtex-entry-menu bibtex-mode-map "Entry-Types Menu in BibTeX mode"
-  (list "Entry-Types"
-        ["Article in Journal" bibtex-Article t]
-        ["Article in Conference Proceedings" bibtex-InProceedings t]
-        ["Article in a Collection" bibtex-InCollection t]
-        ["Chapter or Pages in a Book" bibtex-InBook t]
-        ["Conference Proceedings" bibtex-Proceedings t]
-        ["Book" bibtex-Book t]
-        ["Booklet (Bound, but no Publisher/Institution)" bibtex-Booklet t]
-        ["PhD. Thesis" bibtex-PhdThesis t]
-        ["Master's Thesis" bibtex-MastersThesis t]
-        ["Technical Report" bibtex-TechReport t]
-        ["Technical Manual" bibtex-Manual t]
-        ["Unpublished" bibtex-Unpublished t]
-        ["Miscellaneous" bibtex-Misc t]
-        "--"
-        ["String" bibtex-String t]
-        ["Preamble" bibtex-Preamble t]))
-
 
 ;; Internal Variables
 
+(defvar bibtex-entry-alist bibtex-BibTeX-entry-alist
+  "Alist of currently active entry types.")
+
+(defvar bibtex-field-alist bibtex-BibTeX-field-alist
+  "Alist of currently active field types.")
+
 (defvar bibtex-field-braces-opt nil
   "Optimized value of `bibtex-field-braces-alist'.
 Created by `bibtex-field-re-init'.
@@ -1237,33 +1542,26 @@ The CDRs of the elements are t for header keys and nil for crossref keys.")
 (defconst bibtex-field-const "[][[:alnum:].:;?!`'/*@+=|<>&_^$-]+"
   "Regexp matching a BibTeX field constant.")
 
-(defvar bibtex-entry-type
-  (concat "@[ \t]*\\(?:"
-          (regexp-opt (mapcar 'car bibtex-entry-field-alist)) "\\)")
-  "Regexp matching the type of a BibTeX entry.")
+(defvar bibtex-entry-type nil
+  "Regexp matching the type of a BibTeX entry.
+Initialized by `bibtex-set-dialect'.")
 
-(defvar bibtex-entry-head
-  (concat "^[ \t]*\\("
-          bibtex-entry-type
-          "\\)[ \t]*[({][ \t\n]*\\("
-          bibtex-reference-key
-          "\\)")
-  "Regexp matching the header line of a BibTeX entry (including key).")
+(defvar bibtex-entry-head nil
+  "Regexp matching the header line of a BibTeX entry (including key).
+Initialized by `bibtex-set-dialect'.")
 
-(defvar bibtex-entry-maybe-empty-head
-  (concat bibtex-entry-head "?")
-  "Regexp matching the header line of a BibTeX entry (possibly without key).")
+(defvar bibtex-entry-maybe-empty-head nil
+  "Regexp matching the header line of a BibTeX entry (possibly without key).
+Initialized by `bibtex-set-dialect'.")
 
 (defconst bibtex-any-entry-maybe-empty-head
   (concat "^[ \t]*\\(@[ \t]*" bibtex-field-name "\\)[ \t]*[({][ \t\n]*\\("
           bibtex-reference-key "\\)?")
   "Regexp matching the header line of any BibTeX entry (possibly without key).")
 
-(defvar bibtex-any-valid-entry-type
-  (concat "^[ \t]*@[ \t]*\\(?:"
-          (regexp-opt (append '("String" "Preamble")
-                              (mapcar 'car bibtex-entry-field-alist))) "\\)")
-  "Regexp matching any valid BibTeX entry (including String and Preamble).")
+(defvar bibtex-any-valid-entry-type nil
+  "Regexp matching any valid BibTeX entry (including String and Preamble).
+Initialized by `bibtex-set-dialect'.")
 
 (defconst bibtex-type-in-head 1
   "Regexp subexpression number of the type part in `bibtex-entry-head'.")
@@ -1520,7 +1818,9 @@ If optional arg REMOVE-OPT-ALT is non-nil remove \"OPT\" and \"ALT\"."
                (bibtex-start-of-name-in-field bounds)
                (bibtex-end-of-name-in-field bounds))))
     (if (and remove-opt-alt
-             (string-match "\\`\\(OPT\\|ALT\\)" name))
+             (string-match "\\`\\(OPT\\|ALT\\)" name)
+             (not (and bibtex-no-opt-remove-re
+                       (string-match bibtex-no-opt-remove-re name))))
         (substring name 3)
       name)))
 
@@ -1686,7 +1986,7 @@ Point must be at beginning of preamble.  Do not move point."
 (defun bibtex-valid-entry (&optional empty-key)
   "Parse a valid BibTeX entry (maybe without key if EMPTY-KEY is t).
 A valid entry is a syntactical correct one with type contained in
-`bibtex-entry-field-alist'.  Ignore @String and @Preamble entries.
+`bibtex-BibTeX-entry-alist'.  Ignore @String and @Preamble entries.
 Return a cons pair with buffer positions of beginning and end of entry
 if a valid entry is found, nil otherwise.  Do not move point.
 After a call to this function `match-data' corresponds to the header
@@ -1717,7 +2017,7 @@ of the entry, see regexp `bibtex-entry-head'."
 Do not move if we are already at beginning of a valid BibTeX entry.
 With optional argument BACKWARD non-nil, move backward to
 beginning of previous valid one.  A valid entry is a syntactical correct one
-with type contained in `bibtex-entry-field-alist' or, if
+with type contained in `bibtex-BibTeX-entry-alist' or, if
 `bibtex-sort-ignore-string-entries' is nil, a syntactical correct string
 entry.  Return buffer position of beginning and end of entry if a valid
 entry is found, nil otherwise."
@@ -1911,6 +2211,14 @@ Optional arg COMMA is as in `bibtex-enclosing-field'."
           (let ((key (bibtex-key-in-head)))
             (if key (push (cons key t) bibtex-reference-keys))))))))
 
+(defsubst bibtex-vec-push (vec idx newelt)
+  "Add NEWELT to the list stored in VEC at index IDX."
+  (aset vec idx (cons newelt (aref vec idx))))
+
+(defsubst bibtex-vec-incr (vec idx)
+  "Add NEWELT to the list stored in VEC at index IDX."
+  (aset vec idx (1+ (aref vec idx))))
+
 (defun bibtex-format-entry ()
   "Helper function for `bibtex-clean-entry'.
 Formats current entry according to variable `bibtex-entry-format'."
@@ -1932,7 +2240,7 @@ Formats current entry according to variable `bibtex-entry-format'."
                   bibtex-entry-format))
         (left-delim-re (regexp-quote (bibtex-field-left-delimiter)))
         bounds crossref-key req-field-list default-field-list field-list
-        alt-fields error-field-name)
+        num-alt alt-fields idx error-field-name)
     (unwind-protect
         ;; formatting (undone if error occurs)
         (atomic-change-group
@@ -1954,7 +2262,7 @@ Formats current entry according to variable `bibtex-entry-format'."
                      (end-type (match-end 0))
                      (entry-list (assoc-string (buffer-substring-no-properties
                                                 beg-type end-type)
-                                               bibtex-entry-field-alist t)))
+                                               bibtex-entry-alist t)))
 
                 ;; unify case of entry type
                 (when (memq 'unify-case format)
@@ -1978,13 +2286,18 @@ Formats current entry according to variable `bibtex-entry-format'."
 
                 ;; list of required fields appropriate for an entry with
                 ;; or without crossref key.
-                (setq req-field-list (if (and crossref-key (nth 2 entry-list))
-                                         (car (nth 2 entry-list))
-                                       (car (nth 1 entry-list)))
+                (setq req-field-list (if crossref-key (nth 2 entry-list)
+                                       (append (nth 2 entry-list) (nth 3 entry-list)))
                       ;; default list of fields that may appear in this entry
-                      default-field-list (append (nth 0 (nth 1 entry-list))
-                                                 (nth 1 (nth 1 entry-list))
-                                                 bibtex-user-optional-fields))
+                      default-field-list (append (nth 2 entry-list) (nth 3 entry-list)
+                                                 (nth 4 entry-list)
+                                                 bibtex-user-optional-fields)
+                      ;; number of ALT fields we expect to find
+                      num-alt (length (delq nil (delete-dups
+                                                 (mapcar (lambda (x) (nth 3 x))
+                                                         req-field-list))))
+                      ;; ALT fields of respective groups
+                      alt-fields (make-vector num-alt nil))
 
                 (when (memq 'sort-fields format)
                   (goto-char (point-min))
@@ -1995,10 +2308,10 @@ Formats current entry according to variable `bibtex-entry-format'."
                     (dolist (field default-field-list)
                       (when (setq elt (assoc-string (car field) fields-alist t))
                         (setq fields-alist (delete elt fields-alist))
-                        (bibtex-make-field (list (car elt) "" (cdr elt)) nil nil t)))
+                        (bibtex-make-field (list (car elt) nil (cdr elt)) nil nil t)))
                     (dolist (field fields-alist)
                       (unless (member (car field) '("=key=" "=type="))
-                        (bibtex-make-field (list (car field) "" (cdr field)) nil nil t))))))
+                        (bibtex-make-field (list (car field) nil (cdr field)) nil nil t))))))
 
               ;; process all fields
               (bibtex-beginning-first-field (point-min))
@@ -2009,17 +2322,18 @@ Formats current entry according to variable `bibtex-entry-format'."
                        (end-name  (copy-marker (bibtex-end-of-name-in-field bounds)))
                        (beg-text  (copy-marker (bibtex-start-of-text-in-field bounds)))
                        (end-text  (copy-marker (bibtex-end-of-text-in-field bounds) t))
-                       (opt-alt   (string-match "OPT\\|ALT"
-                                                (buffer-substring-no-properties
-                                                 beg-name (+ beg-name 3))))
-                       (field-name (buffer-substring-no-properties
-                                    (if opt-alt (+ beg-name 3) beg-name) end-name))
                        (empty-field (equal "" (bibtex-text-in-field-bounds bounds t)))
+                       (field-name (buffer-substring-no-properties beg-name end-name))
+                       (opt-alt   (and (string-match "\\`\\(OPT\\|ALT\\)" field-name)
+                                       (not (and bibtex-no-opt-remove-re
+                                                 (string-match bibtex-no-opt-remove-re
+                                                               field-name)))))
                        deleted)
+                  (if opt-alt (setq field-name (substring field-name 3)))
 
                   ;; keep track of alternatives
-                  (if (nth 3 (assoc-string field-name req-field-list t))
-                      (push field-name alt-fields))
+                  (if (setq idx (nth 3 (assoc-string field-name req-field-list t)))
+                      (bibtex-vec-push alt-fields idx field-name))
 
                   (if (memq 'opts-or-alts format)
                       ;; delete empty optional and alternative fields
@@ -2170,12 +2484,14 @@ Formats current entry according to variable `bibtex-entry-format'."
 
               ;; check whether all required fields are present
               (if (memq 'required-fields format)
-                  (let ((found 0) alt-list)
+                  (let ((alt-expect (make-vector num-alt nil))
+                        (alt-found (make-vector num-alt 0)))
                     (dolist (fname req-field-list)
-                      (cond ((nth 3 fname) ; t if field has alternative flag
-                             (push (car fname) alt-list)
+                      (cond ((setq idx (nth 3 fname))
+                             ;; t if field has alternative flag
+                             (bibtex-vec-push alt-expect idx (car fname))
                              (if (member-ignore-case (car fname) field-list)
-                                 (setq found (1+ found))))
+                                 (bibtex-vec-incr alt-found idx)))
                             ((not (member-ignore-case (car fname) field-list))
                              ;; If we use the crossref field, a required field
                              ;; can have the OPT prefix.  So if it was empty,
@@ -2183,17 +2499,16 @@ Formats current entry according to variable `bibtex-entry-format'."
                              ;; move point on this empty field.
                              (setq error-field-name (car fname))
                              (error "Mandatory field `%s' is missing" (car fname)))))
-                    (if alt-list
-                        (cond ((= found 0)
-                               (if alt-fields
-                                   (setq error-field-name (car (last alt-fields))))
-                               (error "Alternative mandatory field `%s' is missing"
-                                      alt-list))
-                              ((> found 1)
-                               (if alt-fields
-                                   (setq error-field-name (car (last alt-fields))))
-                               (error "Alternative fields `%s' are defined %s times"
-                                      alt-list found))))))
+                    (dotimes (idx num-alt)
+                      (cond ((= 0 (aref alt-found idx))
+                             (setq error-field-name (car (last (aref alt-fields idx))))
+                             (error "Alternative mandatory field `%s' is missing"
+                                    (aref alt-expect idx)))
+                            ((< 1 (aref alt-found idx))
+                             (setq error-field-name (car (last (aref alt-fields idx))))
+                             (error "Alternative fields `%s' are defined %s times"
+                                    (aref alt-expect idx)
+                                    (length (aref alt-fields idx))))))))
 
               ;; update comma after last field
               (if (memq 'last-comma format)
@@ -2547,7 +2862,7 @@ for parsing BibTeX keys.  If parsing fails, try to set this variable to nil."
                                  (push (list key) crossref-keys))))
                             ;; only keys of known entries
                             ((assoc-string (bibtex-type-in-head)
-                                           bibtex-entry-field-alist t)
+                                           bibtex-entry-alist t)
                              ;; This is an entry.
                              (let ((key (bibtex-key-in-head)))
                                (unless (assoc key ref-keys)
@@ -2745,7 +3060,7 @@ When called interactively, FORCE is t, CURRENT is t if current buffer uses
     ;; select BibTeX buffer
     (if select
         (if buffer-list
-            (switch-to-buffer
+            (pop-to-buffer-same-window
              (completing-read "Switch to BibTeX buffer: "
                               (mapcar 'buffer-name buffer-list)
                               nil t
@@ -3056,25 +3371,122 @@ if that value is non-nil.
         bibtex-font-lock-syntactic-keywords))
   (setq imenu-generic-expression
         (list (list nil bibtex-entry-head bibtex-key-in-head))
-        imenu-case-fold-search t))
+        imenu-case-fold-search t)
+  (bibtex-set-dialect bibtex-dialect))
+
+(defun bibtex-set-dialect (dialect)
+  "Select BibTeX mode DIALECT.
+This sets the variable `bibtex-dialect' which holds the currently active
+dialect.  Dialects are listed in `bibtex-dialect-list'."
+  (interactive (list (intern (completing-read "Dialect: "
+                                              (mapcar 'list bibtex-dialect-list)
+                                              nil t))))
+  (unless (eq dialect (get 'bibtex-dialect 'dialect))
+    (put 'bibtex-dialect 'dialect dialect)
+    (setq bibtex-dialect dialect)
+
+  ;; Bind variables
+    (setq bibtex-entry-alist
+          (let ((var (intern (format "bibtex-%s-entry-alist" dialect)))
+                entry-alist)
+            (if (boundp var)
+                (setq entry-alist (symbol-value var))
+              (error "BibTeX dialect `%s' undefined" dialect))
+            (if (not (consp (nth 1 (car entry-alist))))
+                ;; new format
+                entry-alist
+              ;; Convert old format
+              (unless (get var 'entry-list-format)
+                (put var 'entry-list-format "pre-24")
+                (message "Old format of `%s' (pre GNU Emacs 24).
+Please convert to the new format."
+                         (if (eq (indirect-variable 'bibtex-entry-field-alist) var)
+                             'bibtex-entry-field-alist var))
+                (sit-for 3))
+              (let (lst)
+                (dolist (entry entry-alist)
+                  (let ((fl (nth 1 entry)) req xref opt)
+                    (dolist (field (copy-tree (car fl)))
+                      (if (nth 3 field) (setcar (nthcdr 3 field) 0))
+                      (if (or (not (nth 2 entry))
+                              (assoc-string (car field) (car (nth 2 entry)) t))
+                          (push field req)
+                        (push field xref)))
+                    (dolist (field (nth 1 fl))
+                      (push field opt))
+                    (push (list (car entry) nil (nreverse req)
+                                (nreverse xref) (nreverse opt))
+                          lst)))
+                (nreverse lst))))
+          bibtex-field-alist
+          (let ((var (intern (format "bibtex-%s-field-alist" dialect))))
+            (if (boundp var)
+                (symbol-value var)
+              (error "Field types for BibTeX dialect `%s' undefined" dialect)))
+          bibtex-entry-type
+          (concat "@[ \t]*\\(?:"
+                  (regexp-opt (mapcar 'car bibtex-entry-alist)) "\\)")
+          bibtex-entry-head (concat "^[ \t]*\\("
+                                    bibtex-entry-type
+                                    "\\)[ \t]*[({][ \t\n]*\\("
+                                    bibtex-reference-key
+                                    "\\)")
+          bibtex-entry-maybe-empty-head (concat bibtex-entry-head "?")
+          bibtex-any-valid-entry-type
+          (concat "^[ \t]*@[ \t]*\\(?:"
+                  (regexp-opt (append '("String" "Preamble")
+                                      (mapcar 'car bibtex-entry-alist))) "\\)"))
+    ;; Define entry commands
+    (dolist (elt bibtex-entry-alist)
+      (let* ((entry (car elt))
+             (fname (intern (concat "bibtex-" entry))))
+        (unless (fboundp fname)
+          (eval (list 'defun fname nil
+                      (format "Insert a new BibTeX @%s entry; see also `bibtex-entry'."
+                              entry)
+                      '(interactive "*")
+                      `(bibtex-entry ,entry))))))
+    ;; Define menu
+    ;; We use the same keymap for all BibTeX buffers.  So all these buffers
+    ;; have the same BibTeX dialect.  To define entry types buffer-locally,
+    ;; it would be necessary to give each BibTeX buffer a new keymap that
+    ;; becomes a child of `bibtex-mode-map'.  Useful??
+    (easy-menu-define
+      nil bibtex-mode-map "Entry-Types Menu in BibTeX mode"
+      (apply 'list "Entry-Types"
+             (append
+              (mapcar (lambda (entry)
+                        (vector (or (nth 1 entry) (car entry))
+                                (intern (format "bibtex-%s" (car entry))) t))
+                      bibtex-entry-alist)
+              `("---"
+                ["String" bibtex-String t]
+                ["Preamble" bibtex-Preamble t]
+                "---"
+                ,(append '("BibTeX dialect")
+                         (mapcar (lambda (dialect)
+                                   (vector (symbol-name dialect)
+                                           `(lambda () (interactive)
+                                              (bibtex-set-dialect ',dialect))
+                                           t))
+                                 bibtex-dialect-list))))))))
 
 (defun bibtex-field-list (entry-type)
   "Return list of allowed fields for entry ENTRY-TYPE.
 More specifically, the return value is a cons pair (REQUIRED . OPTIONAL),
 where REQUIRED and OPTIONAL are lists of the required and optional field
-names for ENTRY-TYPE according to `bibtex-entry-field-alist',
+names for ENTRY-TYPE according to `bibtex-BibTeX-entry-alist' and friends,
 `bibtex-include-OPTkey', `bibtex-include-OPTcrossref',
 and `bibtex-user-optional-fields'."
-  (let ((e (assoc-string entry-type bibtex-entry-field-alist t))
+  (let ((e-list (assoc-string entry-type bibtex-entry-alist t))
         required optional)
-    (unless e
+    (unless e-list
       (error "Fields for BibTeX entry type %s not defined" entry-type))
-    (if (and (member-ignore-case entry-type bibtex-include-OPTcrossref)
-             (nth 2 e))
-        (setq required (nth 0 (nth 2 e))
-              optional (nth 1 (nth 2 e)))
-      (setq required (nth 0 (nth 1 e))
-            optional (nth 1 (nth 1 e))))
+    (if (member-ignore-case entry-type bibtex-include-OPTcrossref)
+        (setq required (nth 2 e-list)
+              optional (append (nth 3 e-list) (nth 4 e-list)))
+      (setq required  (append (nth 2 e-list) (nth 3 e-list))
+            optional (nth 4 e-list)))
     (if bibtex-include-OPTkey
         (push (list "key"
                     "Used for reference key creation if author and editor fields are missing"
@@ -3094,7 +3506,7 @@ After insertion call the value of `bibtex-add-entry-hook' if that value
 is non-nil."
   (interactive
    (let ((completion-ignore-case t))
-     (list (completing-read "Entry Type: " bibtex-entry-field-alist
+     (list (completing-read "Entry Type: " bibtex-entry-alist
                             nil t nil 'bibtex-entry-type-history))))
   (let ((key (if bibtex-maintain-sorted-entries
                  (bibtex-read-key (format "%s key: " entry-type))))
@@ -3127,7 +3539,7 @@ When called interactively with a prefix arg, query for a value of ENTRY-TYPE."
   (interactive
    (list (if current-prefix-arg
              (let ((completion-ignore-case t))
-               (completing-read "New entry type: " bibtex-entry-field-alist
+               (completing-read "New entry type: " bibtex-entry-alist
                                 nil t nil 'bibtex-entry-type-history)))))
   (save-excursion
     (bibtex-beginning-of-entry)
@@ -3264,14 +3676,16 @@ interactive calls."
            (field-list (bibtex-field-list type))
            (comment (assoc-string field (append (car field-list)
                                                 (cdr field-list)) t)))
-      (if comment (message "%s" (nth 1 comment))
-        (message "No comment available")))))
+      (message "%s" (cond ((nth 1 comment) (nth 1 comment))
+                          ((setq comment (assoc-string field bibtex-field-alist t))
+                           (nth 1 comment))
+                          (t "No comment available"))))))
 
 (defun bibtex-make-field (field &optional move interactive nodelim)
   "Make a field named FIELD in current BibTeX entry.
 FIELD is either a string or a list of the form
 \(FIELD-NAME COMMENT-STRING INIT ALTERNATIVE-FLAG) as in
-`bibtex-entry-field-alist'.
+`bibtex-BibTeX-entry-alist' and friends.
 If MOVE is non-nil, move point past the present field before making
 the new field.  If INTERACTIVE is non-nil, move point to the end of
 the new field.  Otherwise move point past the new field.
@@ -3296,6 +3710,8 @@ INIT is surrounded by field delimiters, unless NODELIM is non-nil."
         (forward-char)))
   (insert ",\n")
   (indent-to-column (+ bibtex-entry-offset bibtex-field-indentation))
+  ;; If there are multiple sets of alternatives, we could use
+  ;; the numeric value of (nth 3 field) to number these sets.  Useful??
   (if (nth 3 field) (insert "ALT"))
   (insert (car field) " ")
   (if bibtex-align-at-equal-sign
@@ -3794,14 +4210,22 @@ Return t if test was successful, nil otherwise."
              "Checking required fields and month fields")
             (let ((bibtex-sort-ignore-string-entries t))
               (bibtex-map-entries
-               (lambda (_key beg _end)
+               (lambda (_key beg end)
                  (bibtex-progress-message)
-                 (let* ((entry-list (assoc-string (bibtex-type-in-head)
-                                                  bibtex-entry-field-alist t))
-                        (req (copy-sequence (elt (elt entry-list 1) 0)))
-                        (creq (copy-sequence (elt (elt entry-list 2) 0)))
-                        crossref-there bounds alt-there field)
-                   (bibtex-beginning-first-field beg)
+                 (bibtex-beginning-first-field beg)
+                 (let* ((beg-line (save-excursion (goto-char beg)
+                                                  (bibtex-current-line)))
+                        (entry-list (assoc-string (bibtex-type-in-head)
+                                                  bibtex-entry-alist t))
+                        (crossref (bibtex-search-forward-field "crossref" end))
+                        (req (if crossref (copy-sequence (nth 2 entry-list))
+                               (append (nth 2 entry-list)
+                                       (copy-sequence (nth 3 entry-list)))))
+                        (num-alt (length (delq nil (delete-dups
+                                                    (mapcar (lambda (x) (nth 3 x))
+                                                            req)))))
+                        (alt-fields (make-vector num-alt nil))
+                        bounds field idx)
                    (while (setq bounds (bibtex-parse-field))
                      (let ((field-name (bibtex-name-in-field bounds)))
                        (if (and (bibtex-string= field-name "month")
@@ -3815,36 +4239,28 @@ Return t if test was successful, nil otherwise."
                                        "Questionable month field")
                                  error-list))
                        (setq field (assoc-string field-name req t)
-                             req (delete field req)
-                             creq (delete (assoc-string field-name creq t) creq))
-                       (if (nth 3 field)
-                           (if alt-there
+                             req (delete field req))
+                       (if (setq idx (nth 3 field))
+                           (if (aref alt-fields idx)
                                (push (cons (bibtex-current-line)
                                            "More than one non-empty alternative")
                                      error-list)
-                             (setq alt-there t)))
-                       (if (bibtex-string= field-name "crossref")
-                           (setq crossref-there t)))
+                             (aset alt-fields idx t))))
                      (goto-char (bibtex-end-of-field bounds)))
-                   (if crossref-there (setq req creq))
-                   (let (alt)
-                     (dolist (field req)
-                       (if (nth 3 field)
-                           (push (car field) alt)
-                         (push (cons (save-excursion (goto-char beg)
-                                                     (bibtex-current-line))
+                   (let ((alt-expect (make-vector num-alt nil)))
+                     (dolist (field req) ; absent required fields
+                       (if (setq idx (nth 3 field))
+                           (bibtex-vec-push alt-expect idx (car field))
+                         (push (cons beg-line
                                      (format "Required field `%s' missing"
                                              (car field)))
                                error-list)))
-                     ;; The following fails if there are more than two
-                     ;; alternatives in a BibTeX entry, which isn't
-                     ;; the case momentarily.
-                     (if (cdr alt)
-                         (push (cons (save-excursion (goto-char beg)
-                                                     (bibtex-current-line))
-                                     (format "Alternative fields `%s'/`%s' missing"
-                                             (car alt) (cadr alt)))
-                               error-list)))))))
+                     (dotimes (idx num-alt)
+                       (unless (aref alt-fields idx)
+                         (push (cons beg-line
+                                     (format "Alternative fields `%s' missing"
+                                             (aref alt-expect idx)))
+                               error-list))))))))
             (bibtex-progress-message 'done)))))
 
     (if error-list
@@ -3890,7 +4306,7 @@ Return t if test was successful, nil otherwise."
               (setq entry-type (bibtex-type-in-head)
                     key (bibtex-key-in-head))
               (if (or (and strings (bibtex-string= entry-type "string"))
-                      (assoc-string entry-type bibtex-entry-field-alist t))
+                      (assoc-string entry-type bibtex-entry-alist t))
                   (if (member key key-list)
                       (push (format "%s:%d: Duplicate key `%s'\n"
                                     (buffer-file-name)
@@ -4057,7 +4473,13 @@ is as in `bibtex-enclosing-field'.  It is t for interactive calls."
         (bounds (bibtex-enclosing-field comma)))
     (save-excursion
       (goto-char (bibtex-start-of-name-in-field bounds))
-      (when (looking-at "OPT\\|ALT")
+      (when (and (looking-at "OPT\\|ALT")
+                 (not (and bibtex-no-opt-remove-re
+                           (string-match
+                            bibtex-no-opt-remove-re
+                            (buffer-substring-no-properties
+                             (bibtex-start-of-name-in-field bounds)
+                             (bibtex-end-of-name-in-field bounds))))))
         (delete-region (match-beginning 0) (match-end 0))
         ;; make field non-OPT
         (search-forward "=")
@@ -4600,71 +5022,6 @@ entries from minibuffer."
                    (when (eq status 'finished)
                      (save-excursion (bibtex-remove-delimiters)))))))))
 
-(defun bibtex-Article ()
-  "Insert a new BibTeX @Article entry; see also `bibtex-entry'."
-  (interactive "*")
-  (bibtex-entry "Article"))
-
-(defun bibtex-Book ()
-  "Insert a new BibTeX @Book entry; see also `bibtex-entry'."
-  (interactive "*")
-  (bibtex-entry "Book"))
-
-(defun bibtex-Booklet ()
-  "Insert a new BibTeX @Booklet entry; see also `bibtex-entry'."
-  (interactive "*")
-  (bibtex-entry "Booklet"))
-
-(defun bibtex-InBook ()
-  "Insert a new BibTeX @InBook entry; see also `bibtex-entry'."
-  (interactive "*")
-  (bibtex-entry "InBook"))
-
-(defun bibtex-InCollection ()
-  "Insert a new BibTeX @InCollection entry; see also `bibtex-entry'."
-  (interactive "*")
-  (bibtex-entry "InCollection"))
-
-(defun bibtex-InProceedings ()
-  "Insert a new BibTeX @InProceedings entry; see also `bibtex-entry'."
-  (interactive "*")
-  (bibtex-entry "InProceedings"))
-
-(defun bibtex-Manual ()
-  "Insert a new BibTeX @Manual entry; see also `bibtex-entry'."
-  (interactive "*")
-  (bibtex-entry "Manual"))
-
-(defun bibtex-MastersThesis ()
-  "Insert a new BibTeX @MastersThesis entry; see also `bibtex-entry'."
-  (interactive "*")
-  (bibtex-entry "MastersThesis"))
-
-(defun bibtex-Misc ()
-  "Insert a new BibTeX @Misc entry; see also `bibtex-entry'."
-  (interactive "*")
-  (bibtex-entry "Misc"))
-
-(defun bibtex-PhdThesis ()
-  "Insert a new BibTeX @PhdThesis entry; see also `bibtex-entry'."
-  (interactive "*")
-  (bibtex-entry "PhdThesis"))
-
-(defun bibtex-Proceedings ()
-  "Insert a new BibTeX @Proceedings entry; see also `bibtex-entry'."
-  (interactive "*")
-  (bibtex-entry "Proceedings"))
-
-(defun bibtex-TechReport ()
-  "Insert a new BibTeX @TechReport entry; see also `bibtex-entry'."
-  (interactive "*")
-  (bibtex-entry "TechReport"))
-
-(defun bibtex-Unpublished ()
-  "Insert a new BibTeX @Unpublished entry; see also `bibtex-entry'."
-  (interactive "*")
-  (bibtex-entry "Unpublished"))
-
 (defun bibtex-String (&optional key)
   "Insert a new BibTeX @String entry with key KEY."
   (interactive (list (bibtex-read-string-key)))
@@ -4822,10 +5179,8 @@ where FILE is the BibTeX file of ENTRY."
           (delete-dups
            (apply 'append
                   bibtex-user-optional-fields
-                  (mapcar (lambda (x)
-                            (append (mapcar 'car (nth 0 (nth 1 x)))
-                                    (mapcar 'car (nth 1 (nth 1 x)))))
-                          bibtex-entry-field-alist))) nil t)
+                  (mapcar (lambda (x) (mapcar 'car (apply 'append (nthcdr 2 x))))
+                          bibtex-entry-alist))) nil t)
          (read-string "Regexp: ")
          (if bibtex-search-entry-globally
              (not current-prefix-arg)
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index a85ed982ab0..b264cc30850 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -988,7 +988,7 @@ can take care of filling.  JUSTIFY is used as in `fill-paragraph'."
 (defun fill-region (from to &optional justify nosqueeze to-eop)
   "Fill each of the paragraphs in the region.
 A prefix arg means justify as well.
-Ordinarily the variable `fill-column' controls the width.
+The `fill-column' variable controls the width.
 
 Noninteractively, the third argument JUSTIFY specifies which
 kind of justification to do: `full', `left', `right', `center',
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index bc8644be786..e6837d0abde 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -993,14 +993,17 @@ Mostly we check word delimiters."
 ;;*---------------------------------------------------------------------*/
 ;;*    flyspell-word-search-backward ...                                */
 ;;*---------------------------------------------------------------------*/
-(defun flyspell-word-search-backward (word bound)
+(defun flyspell-word-search-backward (word bound &optional ignore-case)
   (save-excursion
     (let ((r '())
           (inhibit-point-motion-hooks t)
           p)
       (while (and (not r) (setq p (search-backward word bound t)))
         (let ((lw (flyspell-get-word)))
-          (if (and (consp lw) (string-equal (car lw) word))
+          (if (and (consp lw)
+                   (if ignore-case
+                       (string-equal (downcase (car lw)) (downcase word))
+                     (string-equal (car lw) word)))
               (setq r p)
             (goto-char p))))
       r)))
@@ -1069,7 +1072,7 @@ misspelling and skips redundant spell-checking step."
                               (- end start)
                               (- (skip-chars-backward " \t\n\f"))))
                           (p (when (>= bound (point-min))
-                               (flyspell-word-search-backward word bound))))
+                               (flyspell-word-search-backward word bound t))))
                      (and p (/= p start)))))
             ;; yes, this is a doublon
             (flyspell-highlight-incorrect-region start end 'doublon)
diff --git a/lisp/textmodes/reftex-parse.el b/lisp/textmodes/reftex-parse.el
index 6ffbf7a4621..b0f22085064 100644
--- a/lisp/textmodes/reftex-parse.el
+++ b/lisp/textmodes/reftex-parse.el
@@ -146,7 +146,7 @@
     (unless (assq 'xr docstruct)
       (let* ((allxr (reftex-all-assq 'xr-doc docstruct))
              (alist (mapcar
-                     (lambda (x) 
+                     (lambda (x)
                        (if (setq tmp (reftex-locate-file (nth 2 x) "tex"
                                                          master-dir))
                            (cons (nth 1 x) tmp)
@@ -157,7 +157,7 @@
              (alist (delq nil alist))
              (allprefix (delq nil (mapcar 'car alist)))
              (regexp (if allprefix
-                         (concat "\\`\\(" 
+                         (concat "\\`\\("
                                  (mapconcat 'identity allprefix "\\|")
                                  "\\)")
                        "\\\\\\\\\\\\")))   ; this will never match
@@ -189,6 +189,9 @@ of master file."
       (push file file-list))
     (nreverse file-list)))
 
+;; Bound in the caller, reftex-do-parse.
+(defvar index-tags)
+
 (defun reftex-parse-from-file (file docstruct master-dir)
   ;; Scan the buffer for labels and save them in a list.
   (let ((regexp (reftex-everything-regexp))
@@ -259,7 +262,7 @@ of master file."
                  ;; It's an include or input
                  (setq include-file (reftex-match-string 7))
                  ;; Test if this file should be ignored
-                 (unless (delq nil (mapcar 
+                 (unless (delq nil (mapcar
                                     (lambda (x) (string-match x include-file))
                                     reftex-no-include-regexps))
                    ;; Parse it
@@ -308,10 +311,10 @@ of master file."
                (push (cons 'bib tmp) docstruct))
 
              (goto-char 1)
-             (when (re-search-forward 
+             (when (re-search-forward
                     "\\(\\`\\|[\n\r]\\)[ \t]*\\\\begin{thebibliography}" nil t)
                (push (cons 'thebib file) docstruct))
-                   
+
              ;; Find external document specifications
              (goto-char 1)
              (while (re-search-forward "[\n\r][ \t]*\\\\externaldocument\\(\\[\\([^]]*\\)\\]\\)?{\\([^}]+\\)}" nil t)
@@ -330,7 +333,7 @@ of master file."
 
 (defun reftex-locate-bibliography-files (master-dir &optional files)
   ;; Scan buffer for bibliography macro and return file list.
-  
+
   (unless files
     (save-excursion
       (goto-char (point-min))
@@ -340,11 +343,11 @@ of master file."
             "\\(^\\)[^%\n\r]*\\\\\\("
             (mapconcat 'identity reftex-bibliography-commands "\\|")
             "\\){[ \t]*\\([^}]+\\)") nil t)
-          (setq files 
+          (setq files
                 (split-string (reftex-match-string 3)
                               "[ \t\n\r]*,[ \t\n\r]*")))))
   (when files
-    (setq files 
+    (setq files
           (mapcar
            (lambda (x)
              (if (or (member x reftex-bibfile-ignore-list)
@@ -398,13 +401,13 @@ of master file."
          (unnumbered (or star (< level 0)))
          (level (abs level))
          (section-number (reftex-section-number level unnumbered))
-         (text1 (save-match-data 
+         (text1 (save-match-data
                   (save-excursion
                     (reftex-context-substring prefix))))
          (literal (buffer-substring-no-properties
                    (1- (match-beginning 3))
                    (min (point-max) (+ (match-end 0) (length text1) 1))))
-         ;; Literal can be too short since text1 too short. No big problem. 
+         ;; Literal can be too short since text1 too short. No big problem.
          (text (reftex-nicify-text text1)))
 
     ;; Add section number and indentation
@@ -454,7 +457,7 @@ of master file."
                             (throw 'exit nil)))
            (itag (nth 1 entry))
            (prefix (nth 2 entry))
-           (index-tag 
+           (index-tag
             (cond ((stringp itag) itag)
                   ((integerp itag)
                    (progn (goto-char boa)
@@ -476,16 +479,16 @@ of master file."
            (key-end (if (string-match reftex-index-key-end-re arg)
                         (1+ (match-beginning 0))))
            (rawkey (substring arg 0 key-end))
-                              
+
            (key (if prefix (concat prefix rawkey) rawkey))
            (sortkey (downcase key))
-           (showkey (mapconcat 'identity 
+           (showkey (mapconcat 'identity
                                (split-string key reftex-index-level-re)
                                " ! ")))
       (goto-char end-of-args)
       ;;       0        1       2      3   4   5  6      7       8      9
       (list 'index index-tag context file bom arg key showkey sortkey key-end))))
-  
+
 (defun reftex-short-context (env parse &optional bound derive)
   ;; Get about one line of useful context for the label definition at point.
 
@@ -608,7 +611,7 @@ of master file."
                ((match-end 10)
                 ;; Index entry
                 (when reftex-support-index
-                  (let* ((index-info (save-excursion 
+                  (let* ((index-info (save-excursion
                                        (reftex-index-info-safe nil)))
                          (list (member (list 'bof (buffer-file-name))
                                        docstruct))
@@ -618,7 +621,7 @@ of master file."
                     ;; Check all index entries with equal text
                     (while (and list (not (eq endelt (car list))))
                       (when (and (eq (car (car list)) 'index)
-                                 (string= (nth 2 index-info) 
+                                 (string= (nth 2 index-info)
                                           (nth 2 (car list))))
                         (incf n)
                         (setq dist (abs (- (point) (nth 4 (car list)))))
@@ -691,7 +694,7 @@ of master file."
                    level (nth 5 entry))
              ;; Insert the section info
              (push entry (cdr tail))
-             
+
              ;; We are done unless we use section numbers
              (unless (nth 1 reftex-label-menu-flags) (throw 'exit nil))
 
@@ -722,7 +725,7 @@ of master file."
                   (setq entry (reftex-index-info-safe buffer-file-name))
                   ;; FIXME: (add-to-list 'index-tags (nth 1 index-entry))
                   (push entry (cdr tail))))))))))
-            
+
     (error nil))
   )
 
@@ -875,7 +878,7 @@ of master file."
                         reftex-special-env-parsers))
             specials rtn)
         ;; Call all functions
-        (setq specials (mapcar 
+        (setq specials (mapcar
                         (lambda (fun)
                           (save-excursion
                             (setq rtn (and fun (funcall fun bound)))
@@ -885,7 +888,7 @@ of master file."
         (setq specials (delq nil specials))
         ;; Sort
         (setq specials (sort specials (lambda (a b) (> (cdr a) (cdr b)))))
-        (if (eq which t) 
+        (if (eq which t)
             specials
           (car specials))))))
 
@@ -923,9 +926,9 @@ of master file."
 
     ;; Do the real thing.
     (let ((cnt 1))
-      
+
       (when (reftex-move-to-next-arg)
-        
+
         (while (< cnt n)
           (while (and (member cnt opt-args)
                       (eq (following-char) ?\{))
@@ -950,7 +953,7 @@ of master file."
   (condition-case nil
       (while (memq (following-char) '(?\[ ?\{))
         (forward-list 1))
-    (error nil)))  
+    (error nil)))
 
 (defun reftex-context-substring (&optional to-end)
   ;; Return up to 150 chars from point
@@ -979,7 +982,7 @@ of master file."
             (error (point-max))))))
    (t
     ;; no list - just grab 150 characters
-    (buffer-substring-no-properties (point) 
+    (buffer-substring-no-properties (point)
                                     (min (+ (point) 150) (point-max))))))
 
 ;; Variable holding the vector with section numbers
@@ -1016,7 +1019,7 @@ of master file."
     ;; not included in the numbering of other sectioning levels.
     (when level
       (when (and (> level -1) (not star))
-        (aset reftex-section-numbers 
+        (aset reftex-section-numbers
               level (1+ (aref reftex-section-numbers level))))
       (setq idx (1+ level))
       (when (not star)
@@ -1042,7 +1045,7 @@ of master file."
             (setq string (replace-match "" nil nil string)))
         (if (and appendix
                  (string-match "\\`[0-9]+" string))
-            (setq string 
+            (setq string
                   (concat
                    (char-to-string
                     (1- (+ ?A (string-to-number (match-string 0 string)))))
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index 9ed5309bb53..c1ce950522c 100644
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -2800,7 +2800,7 @@ details check the Rst Faces Defaults group."
                          rst-level-face-base-color
                          (+ (* (1- i) rst-level-face-step-light)
                             rst-level-face-base-light))))
-        (unless (boundp sym)
+        (unless (facep sym)
           (make-empty-face sym)
           (set-face-doc-string sym doc)
           (set-face-background sym col)
diff --git a/lisp/textmodes/texnfo-upd.el b/lisp/textmodes/texnfo-upd.el
index 12a3e2a620b..047bba72ccd 100644
--- a/lisp/textmodes/texnfo-upd.el
+++ b/lisp/textmodes/texnfo-upd.el
@@ -687,7 +687,7 @@ is the menu entry name, and the cdr of P is the node name."
         (insert (format "%s: %s." (car node-part) (cdr node-part)))))
 
     ;; Insert the description, if present.
-    (when (cdr menu)
+    (when (> (length (cdr menu)) 0)
       ;; Move to right place.
       (indent-to texinfo-column-for-description 2)
       ;; Insert description.
diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index 8f797d13103..ff63ca34035 100644
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -55,7 +55,11 @@
 
 ;;;###autoload
 (defun forward-thing (thing &optional n)
-  "Move forward to the end of the Nth next THING."
+  "Move forward to the end of the Nth next THING.
+THING should be a symbol specifying a type of syntactic entity.
+Possibilities include `symbol', `list', `sexp', `defun',
+`filename', `url', `email', `word', `sentence', `whitespace',
+`line', and `page'."
   (let ((forward-op (or (get thing 'forward-op)
                         (intern-soft (format "forward-%s" thing)))))
     (if (functionp forward-op)
@@ -67,15 +71,16 @@
 ;;;###autoload
 (defun bounds-of-thing-at-point (thing)
   "Determine the start and end buffer locations for the THING at point.
-THING is a symbol which specifies the kind of syntactic entity you want.
-Possibilities include `symbol', `list', `sexp', `defun', `filename', `url',
-`email', `word', `sentence', `whitespace', `line', `page' and others.
+THING should be a symbol specifying a type of syntactic entity.
+Possibilities include `symbol', `list', `sexp', `defun',
+`filename', `url', `email', `word', `sentence', `whitespace',
+`line', and `page'.
 
-See the file `thingatpt.el' for documentation on how to define
-a symbol as a valid THING.
+See the file `thingatpt.el' for documentation on how to define a
+valid THING.
 
-The value is a cons cell (START . END) giving the start and end positions
-of the textual entity that was found."
+Return a cons cell (START . END) giving the start and end
+positions of the thing found."
   (if (get thing 'bounds-of-thing-at-point)
       (funcall (get thing 'bounds-of-thing-at-point))
     (let ((orig (point)))
@@ -125,9 +130,10 @@ of the textual entity that was found."
 ;;;###autoload
 (defun thing-at-point (thing)
   "Return the THING at point.
-THING is a symbol which specifies the kind of syntactic entity you want.
-Possibilities include `symbol', `list', `sexp', `defun', `filename', `url',
-`email', `word', `sentence', `whitespace', `line', `page' and others.
+THING should be a symbol specifying a type of syntactic entity.
+Possibilities include `symbol', `list', `sexp', `defun',
+`filename', `url', `email', `word', `sentence', `whitespace',
+`line', and `page'.
 
 See the file `thingatpt.el' for documentation on how to define
 a symbol as a valid THING."
@@ -140,11 +146,15 @@ a symbol as a valid THING."
 ;; Go to beginning/end
 
 (defun beginning-of-thing (thing)
+  "Move point to the beginning of THING.
+The bounds of THING are determined by `bounds-of-thing-at-point'."
   (let ((bounds (bounds-of-thing-at-point thing)))
     (or bounds (error "No %s here" thing))
     (goto-char (car bounds))))
 
 (defun end-of-thing (thing)
+  "Move point to the end of THING.
+The bounds of THING are determined by `bounds-of-thing-at-point'."
   (let ((bounds (bounds-of-thing-at-point thing)))
     (or bounds (error "No %s here" thing))
     (goto-char (cdr bounds))))
@@ -162,12 +172,16 @@ a symbol as a valid THING."
 ;;  Sexps
 
 (defun in-string-p ()
+  "Return non-nil if point is in a string.
+\[This is an internal function.]"
   (let ((orig (point)))
     (save-excursion
       (beginning-of-defun)
       (nth 3 (parse-partial-sexp (point) orig)))))
 
 (defun end-of-sexp ()
+  "Move point to the end of the current sexp.
+\[This is an internal function.]"
   (let ((char-syntax (char-syntax (char-after))))
     (if (or (eq char-syntax ?\))
             (and (eq char-syntax ?\") (in-string-p)))
@@ -177,6 +191,8 @@ a symbol as a valid THING."
 (put 'sexp 'end-op 'end-of-sexp)
 
 (defun beginning-of-sexp ()
+  "Move point to the beginning of the current sexp.
+\[This is an internal function.]"
   (let ((char-syntax (char-syntax (char-before))))
     (if (or (eq char-syntax ?\()
             (and (eq char-syntax ?\") (in-string-p)))
@@ -190,6 +206,8 @@ a symbol as a valid THING."
 (put 'list 'bounds-of-thing-at-point 'thing-at-point-bounds-of-list-at-point)
 
 (defun thing-at-point-bounds-of-list-at-point ()
+  "Return the bounds of the list at point.
+\[Internal function used by `bounds-of-thing-at-point'.]"
   (save-excursion
     (let ((opoint (point))
           (beg (condition-case nil
@@ -235,7 +253,7 @@ a symbol as a valid THING."
   "A regular expression probably matching the host and filename or e-mail part of a URL.")
 
 (defvar thing-at-point-short-url-regexp
-  (concat "[-A-Za-z0-9.]+" thing-at-point-url-path-regexp)
+  (concat "[-A-Za-z0-9]+\\.[-A-Za-z0-9.]+" thing-at-point-url-path-regexp)
   "A regular expression probably matching a URL without an access scheme.
 Hostname matching is stricter in this case than for
 ``thing-at-point-url-regexp''.")
@@ -397,6 +415,11 @@ with angle brackets.")
 ;;  Whitespace
 
 (defun forward-whitespace (arg)
+  "Move point to the end of the next sequence of whitespace chars.
+Each such sequence may be a single newline, or a sequence of
+consecutive space and/or tab characters.
+With prefix argument ARG, do it ARG times if positive, or move
+backwards ARG times if negative."
   (interactive "p")
   (if (natnump arg)
       (re-search-forward "[ \t]+\\|\n" nil 'move arg)
@@ -414,6 +437,11 @@ with angle brackets.")
 ;;  Symbols
 
 (defun forward-symbol (arg)
+  "Move point to the next position that is the end of a symbol.
+A symbol is any sequence of characters that are in either the
+word constituent or symbol constituent syntax class.
+With prefix argument ARG, do it ARG times if positive, or move
+backwards ARG times if negative."
   (interactive "p")
   (if (natnump arg)
       (re-search-forward "\\(\\sw\\|\\s_\\)+" nil 'move arg)
@@ -425,6 +453,9 @@ with angle brackets.")
 ;;  Syntax blocks
 
 (defun forward-same-syntax (&optional arg)
+  "Move point past all characters with the same syntax class.
+With prefix argument ARG, do it ARG times if positive, or move
+backwards ARG times if negative."
   (interactive "p")
   (while (< arg 0)
     (skip-syntax-backward
@@ -436,8 +467,13 @@ with angle brackets.")
 
 ;;  Aliases
 
-(defun word-at-point () (thing-at-point 'word))
-(defun sentence-at-point () (thing-at-point 'sentence))
+(defun word-at-point ()
+  "Return the word at point.  See `thing-at-point'."
+  (thing-at-point 'word))
+
+(defun sentence-at-point ()
+  "Return the sentence at point.  See `thing-at-point'."
+  (thing-at-point 'sentence))
 
 (defun read-from-whole-string (str)
   "Read a Lisp expression from STR.
diff --git a/lisp/time.el b/lisp/time.el
index 7d752c85d4d..b158ef64691 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -423,30 +423,31 @@ update which can wait for the next redisplay."
                               (getenv "MAIL")
                               (concat rmail-spool-directory
                                       (user-login-name))))
-         (mail (or (and display-time-mail-function
-                        (funcall display-time-mail-function))
-                   (and display-time-mail-directory
-                        (display-time-mail-check-directory))
-                   (and (stringp mail-spool-file)
-                        (or (null display-time-server-down-time)
-                            ;; If have been down for 20 min, try again.
-                            (> (- (nth 1 now) display-time-server-down-time)
-                               1200)
-                            (and (< (nth 1 now) display-time-server-down-time)
-                                 (> (- (nth 1 now)
-                                       display-time-server-down-time)
-                                    -64336)))
-                        (let ((start-time (current-time)))
-                          (prog1
-                              (display-time-file-nonempty-p mail-spool-file)
-                            (if (> (- (nth 1 (current-time))
-                                      (nth 1 start-time))
-                                   20)
-                                ;; Record that mail file is not accessible.
-                                (setq display-time-server-down-time
-                                      (nth 1 (current-time)))
-                              ;; Record that mail file is accessible.
-                              (setq display-time-server-down-time nil)))))))
+         (mail (cond
+                (display-time-mail-function
+                 (funcall display-time-mail-function))
+                (display-time-mail-directory
+                 (display-time-mail-check-directory))
+                ((and (stringp mail-spool-file)
+                      (or (null display-time-server-down-time)
+                          ;; If have been down for 20 min, try again.
+                          (> (- (nth 1 now) display-time-server-down-time)
+                             1200)
+                          (and (< (nth 1 now) display-time-server-down-time)
+                               (> (- (nth 1 now)
+                                     display-time-server-down-time)
+                                  -64336))))
+                 (let ((start-time (current-time)))
+                   (prog1
+                       (display-time-file-nonempty-p mail-spool-file)
+                     (if (> (- (nth 1 (current-time))
+                               (nth 1 start-time))
+                            20)
+                         ;; Record that mail file is not accessible.
+                         (setq display-time-server-down-time
+                               (nth 1 (current-time)))
+                       ;; Record that mail file is accessible.
+                       (setq display-time-server-down-time nil)))))))
          (24-hours (substring time 11 13))
          (hour (string-to-number 24-hours))
          (12-hours (int-to-string (1+ (% (+ hour 11) 12))))
diff --git a/lisp/tool-bar.el b/lisp/tool-bar.el
index 8fdce17df86..05208abb720 100644
--- a/lisp/tool-bar.el
+++ b/lisp/tool-bar.el
@@ -44,7 +44,8 @@
 ;; when you are on a tty.  I hope that won't cause too much trouble -- rms.
 (define-minor-mode tool-bar-mode
   "Toggle use of the tool bar.
-With numeric ARG, display the tool bar if and only if ARG is positive.
+With a numeric argument, if the argument is positive, turn on the
+tool bar; otherwise, turn off the tool bar.
 
 See `tool-bar-add-item' and `tool-bar-add-item-from-menu' for
 conveniently adding tool bar items."
diff --git a/lisp/type-break.el b/lisp/type-break.el
index 58022ef8813..d276e64f6db 100644
--- a/lisp/type-break.el
+++ b/lisp/type-break.el
@@ -47,7 +47,7 @@
 ;; or set the variable of the same name to `t'.
 
 ;; This program can truly cons up a storm because of all the calls to
-;; `current-time' (which always returns 3 fresh conses).  I'm dismayed by
+;; `current-time' (which always returns fresh conses).  I'm dismayed by
 ;; this, but I think the health of my hands is far more important than a
 ;; few pages of virtual memory.
 
@@ -501,12 +501,9 @@ variable of the same name."
 (defun timep (time)
   "If TIME is in the format returned by `current-time' then
 return TIME, else return nil."
-  (and (listp time)
-       (eq (length time) 3)
-       (integerp (car time))
-       (integerp (nth 1 time))
-       (integerp (nth 2 time))
-       time))
+  (condition-case nil
+      (and (float-time time) time)
+    (error nil)))
 
 (defun type-break-choose-file ()
   "Return file to read from."
@@ -993,12 +990,8 @@ FRAC should be the inverse of the fractional value; for example, a value of
 
 ;; Compute the difference, in seconds, between a and b, two structures
 ;; similar to those returned by `current-time'.
-;; Use addition rather than logand since that is more robust; the low 16
-;; bits of the seconds might have been incremented, making it more than 16
-;; bits wide.
 (defun type-break-time-difference (a b)
-  (+ (lsh (- (car b) (car a)) 16)
-     (- (car (cdr b)) (car (cdr a)))))
+  (round (float-time (time-subtract b a))))
 
 ;; Return (in a new list the same in structure to that returned by
 ;; `current-time') the sum of the arguments.  Each argument may be a time
@@ -1008,34 +1001,11 @@ FRAC should be the inverse of the fractional value; for example, a value of
 ;; the result is passed to `current-time-string' it will toss some of the
 ;; "low" bits and format the time incorrectly.
 (defun type-break-time-sum (&rest tmlist)
-  (let ((high 0)
-        (low 0)
-        (micro 0)
-        tem)
-    (while tmlist
-      (setq tem (car tmlist))
-      (setq tmlist (cdr tmlist))
-      (cond
-       ((numberp tem)
-        (setq low (+ low tem)))
-       (t
-        (setq high  (+ high  (or (car tem) 0)))
-        (setq low   (+ low   (or (car (cdr tem)) 0)))
-        (setq micro (+ micro (or (car (cdr (cdr tem))) 0))))))
-
-    (and (>= micro 1000000)
-         (progn
-           (setq tem (/ micro 1000000))
-           (setq low (+ low tem))
-           (setq micro (- micro (* tem 1000000)))))
-
-    (setq tem (lsh low -16))
-    (and (> tem 0)
-         (progn
-           (setq low (logand low 65535))
-           (setq high (+ high tem))))
-
-    (list high low micro)))
+  (let ((sum '(0 0 0)))
+    (dolist (tem tmlist sum)
+      (setq sum (time-add sum (if (integerp tem)
+                                  (list (floor tem 65536) (mod tem 65536))
+                                tem))))))
 
 (defun type-break-time-stamp (&optional when)
   (if (fboundp 'format-time-string)
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 9f7ad1c1ca5..6a3638c4232 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,24 @@
+2011-07-13  Chris Newton  <redshodan@gmail.com>  (tiny change)
+
+        * url-http.el (url-http): Copy over `url-show-status' to the async
+        buffer so that `url-display-percentage' does the right thing
+        (bug#4680).
+
+2011-07-06  Nick Dokos  <nicholas.dokos@hp.com>  (tiny change)
+
+        * url-cache.el (url-cache-extract): Set buffer multibyte flag to
+        nil (bug#8827).
+
+2011-07-03  Nicolas Avrutin  <nicolasavru@gmail.com>  (tiny change)
+
+        * url-http.el (url-http-create-request): Remove double carriage
+        return and newline (bug#8931).
+
+2011-07-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * url-http.el (url-http-wait-for-headers-change-function): Remove
+        pointless "HTTP/0.9 How I hate thee!" message (bug#6735).
+
 2011-06-04  Andreas Schwab  <schwab@linux-m68k.org>
 
         * url-future.el (url-future-test): Fix scope of `saver'.
diff --git a/lisp/url/url-cache.el b/lisp/url/url-cache.el
index 1615920e64c..80d77020456 100644
--- a/lisp/url/url-cache.el
+++ b/lisp/url/url-cache.el
@@ -192,6 +192,7 @@ Very fast if you have an `md5' primitive function, suitably fast otherwise."
 (defun url-cache-extract (fnam)
   "Extract FNAM from the local disk cache."
   (erase-buffer)
+  (set-buffer-multibyte nil)
   (insert-file-contents-literally fnam))
 
 (defun url-cache-expired (url &optional expire-time)
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 28071e7165a..def35449397 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -338,7 +338,7 @@ request.")
              ;; End request
              "\r\n"
              ;; Any data
-             url-http-data "\r\n"))
+             url-http-data))
            ""))
     (url-http-debug "Request is: \n%s" request)
     request))
@@ -1059,19 +1059,16 @@ the end of the document."
           ;; Haven't seen the end of the headers yet, need to wait
           ;; for more data to arrive.
           nil
-        (if old-http
-            (message "HTTP/0.9 How I hate thee!")
-          (progn
-            (url-http-parse-response)
-            (mail-narrow-to-head)
-            ;;(narrow-to-region (point-min) url-http-end-of-headers)
-            (setq url-http-transfer-encoding (mail-fetch-field
-                                              "transfer-encoding")
-                  url-http-content-type (mail-fetch-field "content-type"))
-            (if (mail-fetch-field "content-length")
-                (setq url-http-content-length
-                      (string-to-number (mail-fetch-field "content-length"))))
-            (widen)))
+        (unless old-http
+          (url-http-parse-response)
+          (mail-narrow-to-head)
+          (setq url-http-transfer-encoding (mail-fetch-field
+                                            "transfer-encoding")
+                url-http-content-type (mail-fetch-field "content-type"))
+          (if (mail-fetch-field "content-length")
+              (setq url-http-content-length
+                    (string-to-number (mail-fetch-field "content-length"))))
+          (widen))
         (when url-http-transfer-encoding
           (setq url-http-transfer-encoding
                 (downcase url-http-transfer-encoding)))
@@ -1175,6 +1172,7 @@ CBARGS as the arguments."
                     url-http-after-change-function
                     url-callback-function
                     url-callback-arguments
+                    url-show-status
                     url-http-method
                     url-http-extra-headers
                     url-http-data
@@ -1209,6 +1207,7 @@ CBARGS as the arguments."
                        url-http-chunked-start
                        url-callback-function
                        url-callback-arguments
+                       url-show-status
                        url-http-process
                        url-http-method
                        url-http-extra-headers
diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el
index 9655ce64a99..fd24558da6a 100644
--- a/lisp/vc/diff.el
+++ b/lisp/vc/diff.el
@@ -76,10 +76,10 @@ delete the temporary files so named."
 ;;;###autoload
 (defun diff (old new &optional switches no-async)
   "Find and display the differences between OLD and NEW files.
-When called interactively, read OLD and NEW using the minibuffer;
-the default for NEW is the current buffer's file name, and the
-default for OLD is a backup file for NEW, if one exists.
-If NO-ASYNC is non-nil, call diff synchronously.
+When called interactively, read NEW, then OLD, using the
+minibuffer.  The default for NEW is the current buffer's file
+name, and the default for OLD is a backup file for NEW, if one
+exists.  If NO-ASYNC is non-nil, call diff synchronously.
 
 When called interactively with a prefix argument, prompt
 interactively for diff switches.  Otherwise, the switches
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 40ffea624fb..df6a7e938af 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -4144,15 +4144,9 @@ Mail anyway? (y or n) ")
 
 ;; calculate time used by command
 (defun ediff-calc-command-time ()
-  (let ((end (current-time))
-        micro sec)
-    (setq micro
-          (if (>= (nth 2 end) (nth 2 ediff-command-begin-time))
-              (- (nth 2 end) (nth 2 ediff-command-begin-time))
-            (+ (nth 2 end) (- 1000000 (nth 2 ediff-command-begin-time)))))
-    (setq sec (- (nth 1 end) (nth 1 ediff-command-begin-time)))
-    (or (equal ediff-command-begin-time '(0 0 0))
-        (message "Elapsed time: %d second(s) + %d microsecond(s)" sec micro))))
+  (or (equal ediff-command-begin-time '(0 0 0))
+      (message "Elapsed time: %g second(s)"
+               (float-time (time-since ediff-command-begin-time)))))
 
 (defsubst ediff-save-time ()
   (setq ediff-command-begin-time (current-time)))
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el
index 5e352493dc9..464fdc0a589 100644
--- a/lisp/vc/ediff.el
+++ b/lisp/vc/ediff.el
@@ -1348,7 +1348,7 @@ buffer."
 
 ;;;###autoload
 (defun ediff-patch-file (&optional arg patch-buf)
-  "Run Ediff by patching SOURCE-FILENAME.
+  "Query for a file name, and then run Ediff by patching that file.
 If optional PATCH-BUF is given, use the patch in that buffer
 and don't ask the user.
 If prefix argument, then: if even argument, assume that the patch is in a
diff --git a/lisp/vc/vc-arch.el b/lisp/vc/vc-arch.el
index 59cefe047b6..eeac55ac0f8 100644
--- a/lisp/vc/vc-arch.el
+++ b/lisp/vc/vc-arch.el
@@ -39,7 +39,7 @@
 
 ;; Bugs:
 
-;; - *VC-log*'s initial content lacks the `Summary:' lines.
+;; - *vc-log*'s initial content lacks the `Summary:' lines.
 ;; - All files under the tree are considered as "under Arch's control"
 ;;   without regards to =tagging-method and such.
 ;; - Files are always considered as `edited'.
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index fa59b7ef19c..4eff3244cdc 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -1172,8 +1172,9 @@ stream.  Standard error output is discarded."
 
 (eval-and-compile
   (defconst vc-bzr-revision-keywords
-    '("revno" "revid" "last" "before"
-      "tag" "date" "ancestor" "branch" "submit")))
+    ;; bzr help revisionspec  | sed -ne 's/^\([a-z]*\):$/"\1"/p' | sort -u
+    '("ancestor" "annotate" "before" "branch" "date" "last" "mainline" "revid"
+      "revno" "submit" "tag")))
 
 (defun vc-bzr-revision-completion-table (files)
   (lexical-let ((files files))
@@ -1211,6 +1212,19 @@ stream.  Standard error output is discarded."
               (push (match-string-no-properties 1) table)))
           (completion-table-with-context prefix table tag pred action)))
 
+       ((string-match "\\`annotate:" string)
+        (completion-table-with-context
+         (substring string 0 (match-end 0))
+         (apply-partially #'completion-table-with-terminator '(":" . "\\`a\\`")
+                          #'completion-file-name-table)
+         (substring string (match-end 0)) pred action))
+
+       ((string-match "\\`date:" string)
+        (completion-table-with-context
+         (substring string 0 (match-end 0))
+         '("yesterday" "today" "tomorrow")
+         (substring string (match-end 0)) pred action))
+
        ((string-match "\\`\\([a-z]+\\):" string)
         ;; no actual completion for the remaining keywords.
         (completion-table-with-context (substring string 0 (match-end 0))
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 5ec4c3998d8..6704a43e59b 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -620,7 +620,7 @@
 ;;   buffer, if one is present, instead of adding to the ChangeLog.
 ;;
 ;; - When vc-next-action calls vc-checkin it could pre-fill the
-;;   *VC-log* buffer with some obvious items: the list of files that
+;;   *vc-log* buffer with some obvious items: the list of files that
 ;;   were added, the list of files that were removed.  If the diff is
 ;;   available, maybe it could even call something like
 ;;   `diff-add-change-log-entries-other-window' to create a detailed
@@ -1414,7 +1414,7 @@ Runs the normal hooks `vc-before-checkin-hook' and `vc-checkin-hook'."
    (vc-start-logentry
     files comment initial-contents
     "Enter a change comment."
-    "*VC-log*"
+    "*vc-log*"
     (lambda ()
       (vc-call-backend backend 'log-edit-mode))
     (lexical-let ((rev rev))
@@ -1605,10 +1605,13 @@ Return t if the buffer had changes, nil otherwise."
       ;; bindings are nicer for read only buffers. pcl-cvs does the
       ;; same thing.
       (setq buffer-read-only t)
-      (vc-exec-after `(vc-diff-finish ,(current-buffer) ',(when verbose
-                                                            messages)))
       ;; Display the buffer, but at the end because it can change point.
       (pop-to-buffer (current-buffer))
+      ;; The diff process may finish early, so call `vc-diff-finish'
+      ;; after `pop-to-buffer'; the former assumes the diff buffer is
+      ;; shown in some window.
+      (vc-exec-after `(vc-diff-finish ,(current-buffer)
+                                      ',(when verbose messages)))
       ;; In the async case, we return t even if there are no differences
       ;; because we don't know that yet.
       t)))
@@ -1876,7 +1879,7 @@ The headers are reset to their non-expanded form."
     (vc-start-logentry
      files oldcomment t
      "Enter a replacement change comment."
-     "*VC-log*"
+     "*vc-log*"
      (lambda () (vc-call-backend backend 'log-edit-mode))
      (lexical-let ((rev rev))
        (lambda (files comment)
@@ -2425,7 +2428,7 @@ its name; otherwise return nil."
    (list file)
    (let ((backup-file (vc-version-backup-file file)))
      (when backup-file
-       (copy-file backup-file file 'ok-if-already-exists 'keep-date)
+       (copy-file backup-file file 'ok-if-already-exists)
        (vc-delete-automatic-version-backups file))
      (vc-call revert file backup-file))
    `((vc-state . up-to-date)
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index a002a63e3f8..cb21d4b08c0 100644
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -335,6 +335,8 @@ This function is provided for backward compatibility, since
 (global-set-key [lwindow] 'ignore)
 (global-set-key [rwindow] 'ignore)
 
+(defvar w32-charset-info-alist)         ; w32font.c
+
 (defun w32-add-charset-info (xlfd-charset windows-charset codepage)
   "Function to add character sets to display with Windows fonts.
 Creates entries in `w32-charset-info-alist'.
diff --git a/lisp/window.el b/lisp/window.el
index 161dbb33646..0302a672521 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -106,8 +106,7 @@ be any window."
        (or (window-buffer object) (window-child object))
        t))
 
-;; The following four functions should probably go to subr.el.
-(defsubst normalize-live-buffer (buffer-or-name)
+(defsubst window-normalize-buffer (buffer-or-name)
   "Return buffer specified by BUFFER-OR-NAME.
 BUFFER-OR-NAME must be either a buffer or a string naming a live
 buffer and defaults to the current buffer."
@@ -122,7 +121,7 @@ buffer and defaults to the current buffer."
    (t
     (error "No such buffer %s" buffer-or-name))))
 
-(defsubst normalize-live-frame (frame)
+(defsubst window-normalize-frame (frame)
   "Return frame specified by FRAME.
 FRAME must be a live frame and defaults to the selected frame."
   (if frame
@@ -131,7 +130,7 @@ FRAME must be a live frame and defaults to the selected frame."
         (error "%s is not a live frame" frame))
     (selected-frame)))
 
-(defsubst normalize-any-window (window)
+(defsubst window-normalize-any-window (window)
   "Return window specified by WINDOW.
 WINDOW must be a window that has not been deleted and defaults to
 the selected window."
@@ -141,7 +140,7 @@ the selected window."
         (error "%s is not a window" window))
     (selected-window)))
 
-(defsubst normalize-live-window (window)
+(defsubst window-normalize-live-window (window)
   "Return live window specified by WINDOW.
 WINDOW must be a live window and defaults to the selected one."
   (if window
@@ -164,8 +163,8 @@ Anything less might crash Emacs.")
 
 (defcustom window-min-height 4
   "The minimum number of lines of any window.
-The value has to accomodate a mode- or header-line if present.  A
-value less than `window-safe-min-height' is ignored.  The value
+The value has to accommodate a mode- or header-line if present.
+A value less than `window-safe-min-height' is ignored.  The value
 of this variable is honored when windows are resized or split.
 
 Applications should never rebind this variable.  To resize a
@@ -202,7 +201,7 @@ narrower, explictly specify the SIZE argument of that function."
 WINDOW can be any window and defaults to the selected one.
 Optional argument HORIZONTAL non-nil means return WINDOW's first
 child if WINDOW is a horizontal combination."
-  (setq window (normalize-any-window window))
+  (setq window (window-normalize-any-window window))
   (if horizontal
       (window-left-child window)
     (window-top-child window)))
@@ -212,7 +211,7 @@ child if WINDOW is a horizontal combination."
 WINDOW can be any window and defaults to the selected one.
 Optional argument HORIZONTAL non-nil means return non-nil if and
 only if WINDOW is horizontally combined."
-  (setq window (normalize-any-window window))
+  (setq window (window-normalize-any-window window))
   (let ((parent (window-parent window)))
     (and parent (window-iso-combination-p parent horizontal))))
 
@@ -221,7 +220,7 @@ only if WINDOW is horizontally combined."
 WINDOW can be any window and defaults to the selected one.
 Optional argument HORIZONTAL non-nil means to return the largest
 number of horizontally arranged subwindows of WINDOW."
-  (setq window (normalize-any-window window))
+  (setq window (window-normalize-any-window window))
   (cond
    ((window-live-p window)
     ;; If WINDOW is live, return 1.
@@ -277,7 +276,7 @@ FRAME.
 This function performs a pre-order, depth-first traversal of the
 window tree.  If PROC changes the window tree, the result is
 unpredictable."
-  (let ((walk-window-tree-frame (normalize-live-frame frame)))
+  (let ((walk-window-tree-frame (window-normalize-frame frame)))
     (walk-window-tree-1
      proc (frame-root-window walk-window-tree-frame) any)))
 
@@ -290,7 +289,7 @@ on all live and internal subwindows of WINDOW.
 This function performs a pre-order, depth-first traversal of the
 window tree rooted at WINDOW.  If PROC changes that window tree,
 the result is unpredictable."
-  (setq window (normalize-any-window window))
+  (setq window (window-normalize-any-window window))
   (walk-window-tree-1 proc window any t))
 
 (defun windows-with-parameter (parameter &optional value frame any values)
@@ -336,14 +335,14 @@ too."
   "Return root of atomic window WINDOW is a part of.
 WINDOW can be any window and defaults to the selected one.
 Return nil if WINDOW is not part of a atomic window."
-  (setq window (normalize-any-window window))
+  (setq window (window-normalize-any-window window))
   (let (root)
     (while (and window (window-parameter window 'window-atom))
       (setq root window)
       (setq window (window-parent window)))
     root))
 
-(defun make-window-atom (window)
+(defun window-make-atom (window)
   "Make WINDOW an atomic window.
 WINDOW must be an internal window.  Return WINDOW."
   (if (not (window-child window))
@@ -548,7 +547,7 @@ windows may get as small as `window-safe-min-height' lines and
 `window-safe-min-width' columns.  IGNORE a window means ignore
 restrictions for that window only."
   (window-min-size-1
-   (normalize-any-window window) horizontal ignore))
+   (window-normalize-any-window window) horizontal ignore))
 
 (defun window-min-size-1 (window horizontal ignore)
   "Internal function of `window-min-size'."
@@ -641,7 +640,7 @@ imposed by fixed size windows, `window-min-height' or
 windows may get as small as `window-safe-min-height' lines and
 `window-safe-min-width' columns.  IGNORE any window means ignore
 restrictions for that window only."
-  (setq window (normalize-any-window window))
+  (setq window (window-normalize-any-window window))
   (cond
    ((< delta 0)
     (max (- (window-min-size window horizontal ignore)
@@ -659,7 +658,7 @@ restrictions for that window only."
   "Return t if WINDOW can be resized by DELTA lines.
 For the meaning of the arguments of this function see the
 doc-string of `window-sizable'."
-  (setq window (normalize-any-window window))
+  (setq window (window-normalize-any-window window))
   (if (> delta 0)
       (>= (window-sizable window delta horizontal ignore) delta)
     (<= (window-sizable window delta horizontal ignore) delta)))
@@ -707,7 +706,7 @@ If this function returns nil, this does not necessarily mean that
 WINDOW can be resized in the desired direction.  The functions
 `window-resizable' and `window-resizable-p' will tell that."
   (window-size-fixed-1
-   (normalize-any-window window) horizontal))
+   (window-normalize-any-window window) horizontal))
 
 (defun window-min-delta-1 (window delta &optional horizontal ignore trail noup)
   "Internal function for `window-min-delta'."
@@ -773,7 +772,7 @@ tree but try to enlarge windows within WINDOW's combination only.
 Optional argument NODOWN non-nil means don't check whether WINDOW
 itself \(and its subwindows) can be shrunk; check only whether at
 least one other windows can be enlarged appropriately."
-  (setq window (normalize-any-window window))
+  (setq window (window-normalize-any-window window))
   (let ((size (window-total-size window horizontal))
         (minimum (window-min-size window horizontal ignore)))
     (cond
@@ -855,7 +854,7 @@ WINDOW's combination.
 Optional argument NODOWN non-nil means do not check whether
 WINDOW itself \(and its subwindows) can be enlarged; check only
 whether other windows can be shrunk appropriately."
-  (setq window (normalize-any-window window))
+  (setq window (window-normalize-any-window window))
   (if (and (not (window-size-ignore window ignore))
            (not nodown) (window-size-fixed-p window horizontal))
       ;; With IGNORE and NOWDON nil return zero if WINDOW has fixed
@@ -899,7 +898,7 @@ within WINDOW's combination.
 
 Optional argument NODOWN non-nil means don't check whether WINDOW
 and its subwindows can be resized."
-  (setq window (normalize-any-window window))
+  (setq window (window-normalize-any-window window))
   (cond
    ((< delta 0)
     (max (- (window-min-delta window horizontal ignore trail noup nodown))
@@ -913,7 +912,7 @@ and its subwindows can be resized."
   "Return t if WINDOW can be resized vertically by DELTA lines.
 For the meaning of the arguments of this function see the
 doc-string of `window-resizable'."
-  (setq window (normalize-any-window window))
+  (setq window (window-normalize-any-window window))
   (if (> delta 0)
       (>= (window-resizable window delta horizontal ignore trail noup nodown)
           delta)
@@ -942,7 +941,7 @@ More precisely, return t if and only if the total height of
 WINDOW equals the total height of the root window of WINDOW's
 frame.  WINDOW can be any window and defaults to the selected
 one."
-  (setq window (normalize-any-window window))
+  (setq window (window-normalize-any-window window))
   (= (window-total-size window)
      (window-total-size (frame-root-window window))))
 
@@ -961,7 +960,7 @@ otherwise."
 More precisely, return t if and only if the total width of WINDOW
 equals the total width of the root window of WINDOW's frame.
 WINDOW can be any window and defaults to the selected one."
-  (setq window (normalize-any-window window))
+  (setq window (window-normalize-any-window window))
   (= (window-total-size window t)
      (window-total-size (frame-root-window window) t)))
 
@@ -1002,7 +1001,7 @@ or nil).
 Unlike `window-scroll-bars', this function reports the scroll bar
 type actually used, once frame defaults and `scroll-bar-mode' are
 taken into account."
-  (setq window (normalize-live-window window))
+  (setq window (window-normalize-live-window window))
   (let ((vert (nth 2 (window-scroll-bars window)))
         (hor nil))
     (when (or (eq vert t) (eq hor t))
@@ -1077,7 +1076,7 @@ DIRECTION must be one of `above', `below', `left' or `right'.
 WINDOW must be a live window and defaults to the selected one.
 IGNORE, when non-nil means a window can be returned even if its
 `no-other-window' parameter is non-nil."
-  (setq window (normalize-live-window window))
+  (setq window (window-normalize-live-window window))
   (unless (memq direction '(above below left right))
     (error "Wrong direction %s" direction))
   (let* ((frame (window-frame window))
@@ -1334,7 +1333,7 @@ non-nil values of ALL-FRAMES have special meanings:
 
 Anything else means consider all windows on the selected frame
 and no others."
-  (let ((buffer (normalize-live-buffer buffer-or-name))
+  (let ((buffer (window-normalize-buffer buffer-or-name))
         windows)
     (dolist (window (window-list-1 (selected-window) minibuf all-frames))
       (when (eq (window-buffer window) buffer)
@@ -1353,7 +1352,7 @@ meaning of this argument."
    (length (window-list-1 nil minibuf)))
 
 ;;; Resizing windows.
-(defun window-resize-reset (&optional frame horizontal)
+(defun window--resize-reset (&optional frame horizontal)
   "Reset resize values for all windows on FRAME.
 FRAME defaults to the selected frame.
 
@@ -1361,23 +1360,23 @@ This function stores the current value of `window-total-size' applied
 with argument HORIZONTAL in the new total size of all windows on
 FRAME.  It also resets the new normal size of each of these
 windows."
-  (window-resize-reset-1
-   (frame-root-window (normalize-live-frame frame)) horizontal))
+  (window--resize-reset-1
+   (frame-root-window (window-normalize-frame frame)) horizontal))
 
-(defun window-resize-reset-1 (window horizontal)
-  "Internal function of `window-resize-reset'."
+(defun window--resize-reset-1 (window horizontal)
+  "Internal function of `window--resize-reset'."
   ;; Register old size in the new total size.
   (set-window-new-total window (window-total-size window horizontal))
   ;; Reset new normal size.
   (set-window-new-normal window)
   (when (window-child window)
-    (window-resize-reset-1 (window-child window) horizontal))
+    (window--resize-reset-1 (window-child window) horizontal))
   (when (window-right window)
-    (window-resize-reset-1 (window-right window) horizontal)))
+    (window--resize-reset-1 (window-right window) horizontal)))
 
 ;; The following routine is used to manually resize the minibuffer
 ;; window and is currently used, for example, by ispell.el.
-(defun resize-mini-window (window delta)
+(defun window--resize-mini-window (window delta)
   "Resize minibuffer window WINDOW by DELTA lines.
 If WINDOW cannot be resized by DELTA lines make it as large \(or
 as small) as possible but don't signal an error."
@@ -1396,11 +1395,11 @@ as small) as possible but don't signal an error."
         (setq delta min-delta)))
 
       ;; Resize now.
-      (window-resize-reset frame)
+      (window--resize-reset frame)
       ;; Ideally we should be able to resize just the last subwindow of
       ;; root here.  See the comment in `resize-root-window-vertically'
       ;; for why we do not do that.
-      (resize-this-window root (- delta) nil nil t)
+      (window--resize-this-window root (- delta) nil nil t)
       (set-window-new-total window (+ height delta))
       ;; The following routine catches the case where we want to resize
       ;; a minibuffer-only frame.
@@ -1432,17 +1431,17 @@ This function resizes other windows proportionally and never
 deletes any windows.  If you want to move only the low (right)
 edge of WINDOW consider using `adjust-window-trailing-edge'
 instead."
-  (setq window (normalize-any-window window))
+  (setq window (window-normalize-any-window window))
   (let* ((frame (window-frame window))
          sibling)
     (cond
      ((eq window (frame-root-window frame))
       (error "Cannot resize the root window of a frame"))
      ((window-minibuffer-p window)
-      (resize-mini-window window delta))
+      (window--resize-mini-window window delta))
      ((window-resizable-p window delta horizontal ignore)
-      (window-resize-reset frame horizontal)
-      (resize-this-window window delta horizontal ignore t)
+      (window--resize-reset frame horizontal)
+      (window--resize-this-window window delta horizontal ignore t)
       (if (and (not (window-splits window))
                (window-iso-combined-p window horizontal)
                (setq sibling (or (window-right window) (window-left window)))
@@ -1453,7 +1452,7 @@ instead."
           (let ((normal-delta
                  (/ (float delta)
                     (window-total-size (window-parent window) horizontal))))
-            (resize-this-window sibling (- delta) horizontal nil t)
+            (window--resize-this-window sibling (- delta) horizontal nil t)
             (set-window-new-normal
              window (+ (window-normal-size window horizontal)
                        normal-delta))
@@ -1461,16 +1460,16 @@ instead."
              sibling (- (window-normal-size sibling horizontal)
                         normal-delta)))
         ;; Otherwise, resize all other windows in the same combination.
-        (resize-other-windows window delta horizontal ignore))
+        (window--resize-siblings window delta horizontal ignore))
       (window-resize-apply frame horizontal))
      (t
       (error "Cannot resize window %s" window)))))
 
-(defsubst resize-subwindows-skip-p (window)
+(defsubst window--resize-subwindows-skip-p (window)
   "Return non-nil if WINDOW shall be skipped by resizing routines."
   (memq (window-new-normal window) '(ignore stuck skip)))
 
-(defun resize-subwindows-normal (parent horizontal window this-delta &optional trail other-delta)
+(defun window--resize-subwindows-normal (parent horizontal window this-delta &optional trail other-delta)
   "Set the new normal height of subwindows of window PARENT.
 HORIZONTAL non-nil means set the new normal width of these
 windows.  WINDOW specifies a subwindow of PARENT that has been
@@ -1567,7 +1566,7 @@ PARENT in order to resize WINDOW."
        ;; Don't get larger than 1 or smaller than 0.
        (min 1.0 (max (- 1.0 sum) 0.0))))))
 
-(defun resize-subwindows (parent delta &optional horizontal window ignore trail edge)
+(defun window--resize-subwindows (parent delta &optional horizontal window ignore trail edge)
   "Resize subwindows of window PARENT vertically by DELTA lines.
 PARENT must be a vertically combined internal window.
 
@@ -1603,10 +1602,10 @@ already set by this routine."
                (setq sub first)
                (while (and (window-right sub)
                            (or (and (eq trail 'before)
-                                    (not (resize-subwindows-skip-p
+                                    (not (window--resize-subwindows-skip-p
                                           (window-right sub))))
                                (and (eq trail 'after)
-                                    (resize-subwindows-skip-p sub))))
+                                    (window--resize-subwindows-skip-p sub))))
                  (setq sub (window-right sub)))
                sub)
              (if horizontal
@@ -1623,7 +1622,8 @@ already set by this routine."
              (window-sizable-p sub delta horizontal ignore))
         ;; Resize only windows adjacent to EDGE.
         (progn
-          (resize-this-window sub delta horizontal ignore t trail edge)
+          (window--resize-this-window
+           sub delta horizontal ignore t trail edge)
           (if (and window (eq (window-parent sub) parent))
               (progn
                 ;; Assign new normal sizes.
@@ -1633,15 +1633,16 @@ already set by this routine."
                  window (- (window-normal-size window horizontal)
                            (- (window-new-normal sub)
                               (window-normal-size sub horizontal)))))
-            (resize-subwindows-normal parent horizontal sub 0 trail delta))
-          ;; Return 'normalized to notify `resize-other-windows' that
+            (window--resize-subwindows-normal
+             parent horizontal sub 0 trail delta))
+          ;; Return 'normalized to notify `window--resize-siblings' that
           ;; normal sizes have been already set.
           'normalized)
       ;; Resize all windows proportionally.
       (setq sub first)
       (while sub
         (cond
-         ((or (resize-subwindows-skip-p sub)
+         ((or (window--resize-subwindows-skip-p sub)
               ;; Ignore windows to skip and fixed-size subwindows - in
               ;; the latter case make it a window to skip.
               (and (not ignore)
@@ -1738,11 +1739,11 @@ already set by this routine."
               (unless (and (zerop delta) (not trail))
                 ;; For the TRAIL non-nil case we have to resize SUB
                 ;; recursively even if it's size does not change.
-                (resize-this-window
+                (window--resize-this-window
                  sub delta horizontal ignore nil trail edge))))
           (setq sub (window-right sub)))))))
 
-(defun resize-other-windows (window delta &optional horizontal ignore trail edge)
+(defun window--resize-siblings (window delta &optional horizontal ignore trail edge)
   "Resize other windows when WINDOW is resized vertically by DELTA lines.
 Optional argument HORIZONTAL non-nil means resize other windows
 when WINDOW is resized horizontally by DELTA columns.  WINDOW
@@ -1814,17 +1815,19 @@ preferably only resize windows adjacent to EDGE."
             (if (zerop this-delta)
                 ;; We haven't got anything from WINDOW's siblings but we
                 ;; must update the normal sizes to respect other-delta.
-                (resize-subwindows-normal
+                (window--resize-subwindows-normal
                  parent horizontal window this-delta trail other-delta)
               ;; We did get something from WINDOW's siblings which means
               ;; we have to resize their subwindows.
-              (unless (eq (resize-subwindows parent (- this-delta) horizontal
-                                             window ignore trail edge)
-                          ;; `resize-subwindows' returning 'normalized,
-                          ;; means it has set the normal sizes already.
+              (unless (eq (window--resize-subwindows
+                           parent (- this-delta) horizontal
+                           window ignore trail edge)
+                          ;; If `window--resize-subwindows' returns
+                          ;; 'normalized, this means it has set the
+                          ;; normal sizes already.
                           'normalized)
                 ;; Set the normal sizes.
-                (resize-subwindows-normal
+                (window--resize-subwindows-normal
                  parent horizontal window this-delta trail other-delta))
               ;; Set DELTA to what we still have to get from ancestor
               ;; windows.
@@ -1835,14 +1838,15 @@ preferably only resize windows adjacent to EDGE."
         (set-window-new-total parent delta 'add)
         (while sub
           (unless (eq sub window)
-            (resize-this-window sub delta horizontal ignore t))
+            (window--resize-this-window sub delta horizontal ignore t))
           (setq sub (window-right sub))))
 
       (unless (zerop delta)
         ;; "Go up."
-        (resize-other-windows parent delta horizontal ignore trail edge)))))
+        (window--resize-siblings
+         parent delta horizontal ignore trail edge)))))
 
-(defun resize-this-window (window delta &optional horizontal ignore add trail edge)
+(defun window--resize-this-window (window delta &optional horizontal ignore add trail edge)
   "Resize WINDOW vertically by DELTA lines.
 Optional argument HORIZONTAL non-nil means resize WINDOW
 horizontally by DELTA columns.
@@ -1879,14 +1883,16 @@ actually take effect."
      ((window-iso-combined-p sub horizontal)
       ;; In an iso-combination resize subwindows according to their
       ;; normal sizes.
-      (resize-subwindows window delta horizontal nil ignore trail edge))
+      (window--resize-subwindows
+       window delta horizontal nil ignore trail edge))
      ;; In an ortho-combination resize each subwindow by DELTA.
      (t
       (while sub
-        (resize-this-window sub delta horizontal ignore t trail edge)
+        (window--resize-this-window
+         sub delta horizontal ignore t trail edge)
         (setq sub (window-right sub)))))))
 
-(defun resize-root-window (window delta horizontal ignore)
+(defun window--resize-root-window (window delta horizontal ignore)
   "Resize root window WINDOW vertically by DELTA lines.
 HORIZONTAL non-nil means resize root window WINDOW horizontally
 by DELTA columns.
@@ -1898,10 +1904,10 @@ This function is only called by the frame resizing routines.  It
 resizes windows proportionally and never deletes any windows."
   (when (and (windowp window) (numberp delta)
              (window-sizable-p window delta horizontal ignore))
-    (window-resize-reset (window-frame window) horizontal)
-    (resize-this-window window delta horizontal ignore t)))
+    (window--resize-reset (window-frame window) horizontal)
+    (window--resize-this-window window delta horizontal ignore t)))
 
-(defun resize-root-window-vertically (window delta)
+(defun window--resize-root-window-vertically (window delta)
   "Resize root window WINDOW vertically by DELTA lines.
 If DELTA is less than zero and we can't shrink WINDOW by DELTA
 lines, shrink it as much as possible.  If DELTA is greater than
@@ -1922,7 +1928,7 @@ any windows."
         (unless (window-sizable window delta)
           (setq ignore t))))
 
-      (window-resize-reset (window-frame window))
+      (window--resize-reset (window-frame window))
       ;; Ideally, we would resize just the last window in a combination
       ;; but that's not feasible for the following reason: If we grow
       ;; the minibuffer window and the last window cannot be shrunk any
@@ -1932,7 +1938,7 @@ any windows."
       ;; So, in practice, we'd need a history variable to record how to
       ;; proceed.  But I'm not sure how such a variable could work with
       ;; repeated minibuffer window growing steps.
-      (resize-this-window window delta nil ignore t)
+      (window--resize-this-window window delta nil ignore t)
       delta)))
 
 (defun adjust-window-trailing-edge (window delta &optional horizontal)
@@ -1944,7 +1950,7 @@ If DELTA is greater zero, then move the edge downwards or to the
 right.  If DELTA is less than zero, move the edge upwards or to
 the left.  If the edge can't be moved by DELTA lines or columns,
 move it as far as possible in the desired direction."
-  (setq window (normalize-any-window window))
+  (setq window (window-normalize-any-window window))
   (let ((frame (window-frame window))
         (right window)
         left this-delta min-delta max-delta failed)
@@ -1955,7 +1961,7 @@ move it as far as possible in the desired direction."
     (cond
      ((and (not right) (not horizontal) (not resize-mini-windows)
            (eq (window-frame (minibuffer-window frame)) frame))
-      (resize-mini-window (minibuffer-window frame) (- delta)))
+      (window--resize-mini-window (minibuffer-window frame) (- delta)))
      ((or (not (setq left right)) (not (setq right (window-right right))))
       (if horizontal
           (error "No window on the right of this one")
@@ -2000,17 +2006,17 @@ move it as far as possible in the desired direction."
           (setq delta (min max-delta (- min-delta))))
         (unless (zerop delta)
           ;; Start resizing.
-          (window-resize-reset frame horizontal)
+          (window--resize-reset frame horizontal)
           ;; Try to enlarge LEFT first.
           (setq this-delta (window-resizable left delta horizontal))
           (unless (zerop this-delta)
-            (resize-this-window
+            (window--resize-this-window
              left this-delta horizontal nil t 'before
              (if horizontal
                  (+ (window-left-column left) (window-total-size left t))
                (+ (window-top-line left) (window-total-size left)))))
           ;; Shrink windows on right of LEFT.
-          (resize-other-windows
+          (window--resize-siblings
            left delta horizontal nil 'after
            (if horizontal
                (window-left-column right)
@@ -2023,17 +2029,17 @@ move it as far as possible in the desired direction."
           (setq delta (max (- max-delta) min-delta)))
         (unless (zerop delta)
           ;; Start resizing.
-          (window-resize-reset frame horizontal)
+          (window--resize-reset frame horizontal)
           ;; Try to enlarge RIGHT.
           (setq this-delta (window-resizable right (- delta) horizontal))
           (unless (zerop this-delta)
-            (resize-this-window
+            (window--resize-this-window
              right this-delta horizontal nil t 'after
              (if horizontal
                  (window-left-column right)
                (window-top-line right))))
           ;; Shrink windows on left of RIGHT.
-          (resize-other-windows
+          (window--resize-siblings
            right (- delta) horizontal nil 'before
            (if horizontal
                (+ (window-left-column left) (window-total-size left t))
@@ -2091,7 +2097,7 @@ Return nil."
 Make WINDOW as large as possible without deleting any windows.
 WINDOW can be any window and defaults to the selected window."
   (interactive)
-  (setq window (normalize-any-window window))
+  (setq window (window-normalize-any-window window))
   (window-resize window (window-max-delta window))
   (window-resize window (window-max-delta window t) t))
 
@@ -2100,7 +2106,7 @@ WINDOW can be any window and defaults to the selected window."
 Make WINDOW as small as possible without deleting any windows.
 WINDOW can be any window and defaults to the selected window."
   (interactive)
-  (setq window (normalize-any-window window))
+  (setq window (window-normalize-any-window window))
   (window-resize window (- (window-min-delta window)))
   (window-resize window (- (window-min-delta window t)) t))
 
@@ -2146,7 +2152,7 @@ and the rest of the elements are the subwindows in the split.
 Each of the subwindows may again be a window or a list
 representing a window split, and so on.  EDGES is a list \(LEFT
 TOP RIGHT BOTTOM) as returned by `window-edges'."
-  (setq frame (normalize-live-frame frame))
+  (setq frame (window-normalize-frame frame))
   (window-tree-1 (frame-root-window frame) t))
 
 (defun other-window (count &optional all-frames)
@@ -2278,7 +2284,7 @@ variable are `switch-to-prev-buffer', `delete-windows-on',
   "Return t if WINDOW can be safely deleted from its frame.
 Return `frame' if deleting WINDOW should delete its frame
 instead."
-  (setq window (normalize-any-window window))
+  (setq window (window-normalize-any-window window))
   (unless ignore-window-parameters
     ;; Handle atomicity.
     (when (window-parameter window 'window-atom)
@@ -2336,7 +2342,7 @@ Otherwise, if WINDOW is part of an atomic window, call
 argument.  If WINDOW is the only window on its frame or the last
 non-side window, signal an error."
   (interactive)
-  (setq window (normalize-any-window window))
+  (setq window (window-normalize-any-window window))
   (let* ((frame (window-frame window))
          (function (window-parameter window 'delete-window))
          (parent (window-parent window))
@@ -2371,21 +2377,21 @@ non-side window, signal an error."
              ;; Emacs 23 preferably gives WINDOW's space to its left
              ;; sibling.
              (sibling (or (window-left window) (window-right window))))
-        (window-resize-reset frame horizontal)
+        (window--resize-reset frame horizontal)
         (cond
          ((and (not (window-splits window))
                sibling (window-sizable-p sibling size))
           ;; Resize WINDOW's sibling.
-          (resize-this-window sibling size horizontal nil t)
+          (window--resize-this-window sibling size horizontal nil t)
           (set-window-new-normal
            sibling (+ (window-normal-size sibling horizontal)
                       (window-normal-size window horizontal))))
          ((window-resizable-p window (- size) horizontal nil nil nil t)
           ;; Can do without resizing fixed-size windows.
-          (resize-other-windows window (- size) horizontal))
+          (window--resize-siblings window (- size) horizontal))
          (t
           ;; Can't do without resizing fixed-size windows.
-          (resize-other-windows window (- size) horizontal t)))
+          (window--resize-siblings window (- size) horizontal t)))
         ;; Actually delete WINDOW.
         (delete-window-internal window)
         (when (and frame-selected
@@ -2417,7 +2423,7 @@ WINDOW is a non-side window, make WINDOW the only non-side window
 on the frame.  Side windows are not deleted. If WINDOW is a side
 window signal an error."
   (interactive)
-  (setq window (normalize-any-window window))
+  (setq window (window-normalize-any-window window))
   (let* ((frame (window-frame window))
          (function (window-parameter window 'delete-other-windows))
          (window-side (window-parameter window 'window-side))
@@ -2499,7 +2505,7 @@ This may be a useful alternative binding for \\[delete-other-windows]
 (defun record-window-buffer (&optional window)
   "Record WINDOW's buffer.
 WINDOW must be a live window and defaults to the selected one."
-  (let* ((window (normalize-live-window window))
+  (let* ((window (window-normalize-live-window window))
          (buffer (window-buffer window))
          (entry (assq buffer (window-prev-buffers window))))
     ;; Reset WINDOW's next buffers.  If needed, they are resurrected by
@@ -2535,7 +2541,7 @@ WINDOW must be a live window and defaults to the selected one."
 WINDOW must be a live window and defaults to the selected one.
 BUFFER must be a live buffer and defaults to the buffer of
 WINDOW."
-  (let* ((window (normalize-live-window window))
+  (let* ((window (window-normalize-live-window window))
          (buffer (or buffer (window-buffer window))))
     (set-window-prev-buffers
      window (assq-delete-all buffer (window-prev-buffers window)))
@@ -2570,7 +2576,7 @@ Optional argument BURY-OR-KILL non-nil means the buffer currently
 shown in WINDOW is about to be buried or killed and consequently
 shall not be switched to in future invocations of this command."
   (interactive)
-  (let* ((window (normalize-live-window window))
+  (let* ((window (window-normalize-live-window window))
          (old-buffer (window-buffer window))
          ;; Save this since it's destroyed by `set-window-buffer'.
          (next-buffers (window-next-buffers window))
@@ -2672,7 +2678,7 @@ shall not be switched to in future invocations of this command."
   "In WINDOW switch to next buffer.
 WINDOW must be a live window and defaults to the selected one."
   (interactive)
-  (let* ((window (normalize-live-window window))
+  (let* ((window (window-normalize-live-window window))
          (old-buffer (window-buffer window))
          (next-buffers (window-next-buffers window))
          new-buffer entry killed-buffers visible)
@@ -2786,7 +2792,7 @@ current buffer.  Also, if BUFFER-OR-NAME is nil or omitted,
 remove the current buffer from the selected window if it is
 displayed there."
   (interactive)
-  (let* ((buffer (normalize-live-buffer buffer-or-name)))
+  (let* ((buffer (window-normalize-buffer buffer-or-name)))
     ;; If `buffer-or-name' is not on the selected frame we unrecord it
     ;; although it's not "here" (call it a feature).
     (unrecord-buffer buffer)
@@ -2796,7 +2802,9 @@ displayed there."
      ((or buffer-or-name (not (eq buffer (window-buffer)))))
      ((not (window-dedicated-p))
       (switch-to-prev-buffer nil 'bury))
-     ((frame-root-window-p (selected-window))
+     ((and (frame-root-window-p (selected-window))
+           ;; Don't iconify if it's the only frame.
+           (not (eq (next-frame nil 0) (selected-frame))))
       (iconify-frame (window-frame (selected-window))))
      ((window-deletable-p)
       (delete-window)))
@@ -2811,11 +2819,15 @@ displayed there."
 (defun next-buffer ()
   "In selected window switch to next buffer."
   (interactive)
+  (if (window-minibuffer-p)
+      (error "Cannot switch buffers in minibuffer window"))
   (switch-to-next-buffer))
 
 (defun previous-buffer ()
   "In selected window switch to previous buffer."
   (interactive)
+  (if (window-minibuffer-p)
+      (error "Cannot switch buffers in minibuffer window"))
   (switch-to-prev-buffer))
 
 (defun delete-windows-on (&optional buffer-or-name frame)
@@ -2843,7 +2855,7 @@ When a window showing BUFFER-OR-NAME is dedicated and the only
 window of its frame, that frame is deleted when there are other
 frames left."
   (interactive "BDelete windows on (buffer):\nP")
-  (let ((buffer (normalize-live-buffer buffer-or-name))
+  (let ((buffer (window-normalize-buffer buffer-or-name))
         ;; Handle the "inverted" meaning of the FRAME argument wrt other
         ;; `window-list-1' based function.
         (all-frames (cond ((not frame) t) ((eq frame t) nil) (t frame))))
@@ -2877,7 +2889,7 @@ left, some other buffer is displayed in that window.
 
 This function removes the buffer denoted by BUFFER-OR-NAME from
 all window-local buffer lists."
-  (let ((buffer (normalize-live-buffer buffer-or-name)))
+  (let ((buffer (window-normalize-buffer buffer-or-name)))
     (dolist (window (window-list-1 nil nil t))
       (if (eq (window-buffer window) buffer)
           (let ((deletable (window-deletable-p window)))
@@ -2910,7 +2922,7 @@ Optional argument KILL non-nil means in addition kill WINDOW's
 buffer.  If KILL is nil, put WINDOW's buffer at the end of the
 buffer list.  Interactively, KILL is the prefix argument."
   (interactive "i\nP")
-  (setq window (normalize-live-window window))
+  (setq window (window-normalize-live-window window))
   (let ((buffer (window-buffer window))
         (quit-restore (window-parameter window 'quit-restore))
         deletable resize)
@@ -3014,7 +3026,7 @@ window, these properties as well as the buffer displayed in the
 new window are inherited from the window selected on WINDOW's
 frame.  The selected window is not changed by this function."
   (interactive "i")
-  (setq window (normalize-any-window window))
+  (setq window (window-normalize-any-window window))
   (let* ((side (cond
                 ((not side) 'below)
                 ((memq side '(below above right left)) side)
@@ -3141,7 +3153,7 @@ frame.  The selected window is not changed by this function."
           ;; SIZE specification violates minimum size restrictions.
           (error "Window %s too small for splitting" window)))
 
-        (window-resize-reset frame horizontal)
+        (window--resize-reset frame horizontal)
 
         (setq new-parent
               ;; Make new-parent non-nil if we need a new parent window;
@@ -3162,7 +3174,7 @@ frame.  The selected window is not changed by this function."
             ;; we won't be able to return space to those windows when we
             ;; delete the one we create here.  Hence we do not go up.
             (progn
-              (resize-subwindows parent (- new-size) horizontal)
+              (window--resize-subwindows parent (- new-size) horizontal)
               (let* ((normal (- 1.0 new-normal))
                      (sub (window-child parent)))
                 (while sub
@@ -3171,7 +3183,7 @@ frame.  The selected window is not changed by this function."
                   (setq sub (window-right sub)))))
           ;; Get entire space from WINDOW.
           (set-window-new-total window (- old-size new-size))
-          (resize-this-window window (- new-size) horizontal)
+          (window--resize-this-window window (- new-size) horizontal)
           (set-window-new-normal
            window (- (if new-parent 1.0 (window-normal-size window horizontal))
                      new-normal)))
@@ -3287,8 +3299,8 @@ The selected window remains selected.  Return the new window."
 ;;; Balancing windows.
 
 ;; The following routine uses the recycled code from an old version of
-;; `resize-subwindows'.  It's not very pretty, but coding it the way the
-;; new `resize-subwindows' code does would hardly make it any shorter or
+;; `window--resize-subwindows'.  It's not very pretty, but coding it the way the
+;; new `window--resize-subwindows' code does would hardly make it any shorter or
 ;; more readable (FWIW we'd need three loops - one to calculate the
 ;; minimum sizes per window, one to enlarge or shrink windows until the
 ;; new parent-size matches, and one where we shrink the largest/enlarge
@@ -3317,7 +3329,7 @@ WINDOW must be an iso-combination."
       (setq sub first)
       (while (and sub (not failed))
         ;; Ignore subwindows that should be ignored or are stuck.
-        (unless (resize-subwindows-skip-p sub)
+        (unless (window--resize-subwindows-skip-p sub)
           (setq found t)
           (setq sub-total (window-total-size sub horizontal))
           (setq sub-delta (- size sub-total))
@@ -3338,7 +3350,7 @@ WINDOW must be an iso-combination."
     ;; (column) until `rest' is zero.
     (setq sub first)
     (while (and sub (> rest 0))
-      (unless (resize-subwindows-skip-p window)
+      (unless (window--resize-subwindows-skip-p window)
         (set-window-new-total sub 1 t)
         (setq rest (1- rest)))
       (setq sub (window-right sub)))
@@ -3372,7 +3384,7 @@ WINDOW must be an iso-combination."
             (balance-windows-2 window horizontal)
           (let ((size (window-new-total window)))
             (while sub
-              (set-window-new-total sub size) 
+              (set-window-new-total sub size)
               (balance-windows-1 sub horizontal)
               (setq sub (window-right sub))))))))
 
@@ -3396,11 +3408,11 @@ window."
             (error "Not a window or frame %s" window-or-frame))))
          (frame (window-frame window)))
     ;; Balance vertically.
-    (window-resize-reset (window-frame window))
+    (window--resize-reset (window-frame window))
     (balance-windows-1 window)
     (window-resize-apply frame)
     ;; Balance horizontally.
-    (window-resize-reset (window-frame window) t)
+    (window--resize-reset (window-frame window) t)
     (balance-windows-1 window t)
     (window-resize-apply frame t)))
 
@@ -3534,7 +3546,6 @@ specific buffers."
           (window-list-no-nils
            type
            (unless (window-next-sibling window) (cons 'last t))
-           (cons 'clone-number (window-clone-number window))
            (cons 'total-height (window-total-size window))
            (cons 'total-width (window-total-size window t))
            (cons 'normal-height (window-normal-size window))
@@ -3546,6 +3557,9 @@ specific buffers."
                (unless (memq (car parameter)
                              window-state-ignored-parameters)
                  (setq list (cons parameter list))))
+             (unless (window-parameter window 'clone-of)
+               ;; Make a clone-of parameter.
+               (setq list (cons (cons 'clone-of window) list)))
              (when list
                (cons 'parameters list)))
            (when buffer
@@ -3686,13 +3700,10 @@ value can be also stored on disk and read back in a new session."
   "Helper function for `window-state-put'."
   (dolist (item window-state-put-list)
     (let ((window (car item))
-          (clone-number (cdr (assq 'clone-number item)))
           (splits (cdr (assq 'splits item)))
           (nest (cdr (assq 'nest item)))
           (parameters (cdr (assq 'parameters item)))
           (state (cdr (assq 'buffer item))))
-      ;; Put in clone-number.
-      (when clone-number (set-window-clone-number window clone-number))
       (when splits (set-window-splits window splits))
       (when nest (set-window-nest window nest))
       ;; Process parameters.
@@ -3767,7 +3778,7 @@ Optional argument IGNORE non-nil means ignore minimum window
 sizes and fixed size restrictions.  IGNORE equal `safe' means
 subwindows can get as small as `window-safe-min-height' and
 `window-safe-min-width'."
-  (setq window (normalize-live-window window))
+  (setq window (window-normalize-live-window window))
   (let* ((frame (window-frame window))
          (head (car state))
          ;; We check here (1) whether the total sizes of root window of
@@ -3818,22 +3829,6 @@ subwindows can get as small as `window-safe-min-height' and
         (window-state-put-2 ignore))
       (window-check frame))))
 
-;;; Displaying buffers.
-(defconst display-buffer-default-specifiers
-  '((reuse-window nil same visible)
-    (pop-up-window (largest . nil) (lru . nil))
-    (pop-up-window-min-height . 40)
-    (pop-up-window-min-width . 80)
-    (reuse-window other nil nil)
-    (reuse-window nil other visible)
-    (reuse-window nil nil t)
-    (reuse-window-even-sizes . t))
-  "Buffer display default specifiers.
-The value specified here is used when no other specifiers have
-been specified by the user or the application.  Consult the
-documentation of `display-buffer-alist' for a description of
-buffer display specifiers.")
-
 (defconst display-buffer-macro-specifiers
   '((same-window
      ;; Use the same window.
@@ -3843,11 +3838,6 @@ buffer display specifiers.")
      (reuse-window nil same nil)
      (pop-up-window (largest . nil) (lru . nil))
      (reuse-window nil other nil))
-    ;; (other-window
-    ;;  ;; Avoid selected window.
-    ;;  (reuse-window other same visible)
-    ;;  (pop-up-window (largest . nil) (lru . nil))
-    ;;  (reuse-window other other visible))
     (same-frame-other-window
      ;; Avoid other frames and selected window.
      (reuse-window other same nil)
@@ -3857,25 +3847,10 @@ buffer display specifiers.")
      ;; Avoid selected frame.
      (reuse-window nil same other)
      (pop-up-frame)
-     (reuse-window nil other other))
-    (default
-      ;; The default specifiers.
-      display-buffer-default-specifiers))
+     (reuse-window nil other other)))
   "Buffer display macro specifiers.")
 
-(defcustom display-buffer-alist
-  '((((regexp . ".*"))
-     ;; Reuse window showing same buffer on same frame.
-     reuse-window (reuse-window nil same nil)
-     ;; Pop up window.
-     pop-up-window
-     ;; Split largest or lru window.
-     (pop-up-window (largest . nil) (lru . nil))
-     (pop-up-window-min-height . 40) ; split-height-threshold / 2
-     (pop-up-window-min-width . 80) ; split-width-threshold / 2
-     ;; Reuse any but selected window on same frame.
-     reuse-window (reuse-window other nil nil)
-     (reuse-window-even-sizes . t)))
+(defcustom display-buffer-alist nil
   "List associating buffer identifiers with display specifiers.
 The car of each element of this list is built from a set of cons
 cells called buffer identifiers.  `display-buffer' shows a buffer
@@ -3898,7 +3873,7 @@ match occurs in one of the following three cases:
 Display specifiers are either symbols, cons cells, or lists.
 Five specifiers have been reserved to indicate the basic method
 for displaying the buffer: `reuse-window', `pop-up-window',
-`pop-up-frame', `use-side-window', and `fun-with-args'.
+`pop-up-frame', `use-side-window', and `function'.
 
 A list whose car is the symbol `reuse-window' indicates that an
 existing window shall be reused for displaying the buffer.  The
@@ -4088,11 +4063,11 @@ The following specifiers are useful in connection with the
 `pop-up-window-min-height', `pop-up-window-min-width',
 `pop-up-window-set-height' and `pop-up-window-set-width'.
 
-A list whose car is the symbol `fun-with-args' specifies that the
+A list whose car is the symbol `function' specifies that the
 function specified in the second element of the list is
 responsible for displaying the buffer.  `display-buffer' calls
 this function with the buffer as first argument and the remaining
-elements of the list as the other arguments.
+elements of the list as the second.
 
 The function should choose or create a window, display the buffer
 in it, and return the window.  It is also responsible for giving
@@ -4514,18 +4489,18 @@ using the location specifiers `same-window' or `other-frame'."
         ;; Function with argument specifiers.
         (list
          :tag "Function with arguments"
-         :value (fun-with-args (fun-with-args 'ignore))
+         :value (function (function 'ignore))
          :format "%t\n%v"
          :inline t
          ;; For customization purposes only.
-         (const :format "" fun-with-args)
+         (const :format "" function)
          (set
           :format "%v"
           :inline t
           (list
            :format "%v"
-           :value (fun-with-args 'ignore)
-           (const :format "" fun-with-args)
+           :value (function 'ignore)
+           (const :format "" function)
            (function :tag "Function" :format "%t: %v\n" :size 25)
            (list
             :format "%v"
@@ -4736,19 +4711,19 @@ Return WINDOW.
 
 SPECIFIERS must be a list of buffer display specifiers, see the
 documentation of `display-buffer-alist' for a description."
-  (setq buffer (normalize-live-buffer buffer))
-  (setq window (normalize-live-window window))
+  (setq buffer (window-normalize-buffer buffer))
+  (setq window (window-normalize-live-window window))
   (let* ((old-frame (selected-frame))
          (new-frame (window-frame window))
-         (dedicated (cdr (assq 'dedicated specifiers)))
+         (dedicate (cdr (assq 'dedicate specifiers)))
          (no-other-window (cdr (assq 'no-other-window specifiers))))
     ;; Show BUFFER in WINDOW.
     (unless (eq buffer (window-buffer window))
       ;; If we show another buffer in WINDOW, undedicate it first.
       (set-window-dedicated-p window nil))
     (set-window-buffer window buffer)
-    (when dedicated
-      (set-window-dedicated-p window dedicated))
+    (when dedicate
+      (set-window-dedicated-p window dedicate))
     (when no-other-window
       (set-window-parameter window 'no-other-window t))
     (unless (or (eq old-frame new-frame)
@@ -4764,7 +4739,7 @@ documentation of `display-buffer-alist' for a description."
     ;; Return window.
     window))
 
-(defun display-buffer-reuse-window (buffer method &optional specifiers)
+(defun display-buffer-reuse-window (buffer method &optional specifiers other-window)
   "Display BUFFER in an existing window.
 METHOD must be a list in the form of the cdr of a `reuse-window'
 buffer display specifier, see `display-buffer-alist' for an
@@ -4776,8 +4751,9 @@ frame to use - either nil, 0, `visible', `other', t, or a live
 frame.
 
 Optional argument SPECIFIERS must be a list of valid display
-specifiers.  Return the window chosen to display BUFFER, nil if
-none was found."
+specifiers.  Optional argument OTHER-WINDOW, if non-nil, means do
+not use the selected window.  Return the window chosen to display
+BUFFER, nil if none was found."
   (let* ((method-window (nth 0 method))
          (method-buffer (nth 1 method))
          (method-frame (nth 2 method))
@@ -4795,6 +4771,7 @@ none was found."
                        (eq window-buffer buffer))
                    (or (not method-window)
                        (and (eq method-window 'same)
+                            (not other-window)
                             (eq window (selected-window)))
                        (and (eq method-window 'other)
                             (not (eq window (selected-window))))
@@ -5032,7 +5009,7 @@ description."
           (setq window
                 (cond
                  ((eq cand 'largest)
-                  ;; The largest window. 
+                  ;; The largest window.
                   (get-largest-window frame t))
                  ((eq cand 'lru)
                   ;; The least recently used window.
@@ -5053,7 +5030,7 @@ description."
                   ;; A window, directly specified.
                   cand)))
 
-          (when (and (window-live-p window)
+          (when (and (window-any-p window)
                      ;; The window must be on the correct frame,
                      (eq (window-frame window) frame)
                      ;; and must be neither a minibuffer window
@@ -5073,7 +5050,7 @@ description."
                       ;; Don't pass any specifiers to this function.
                       (funcall side window)))))
 
-            (when window
+            (when (window-live-p window)
               ;; Adjust sizes if asked for.
               (display-buffer-set-height window specifiers)
               (display-buffer-set-width window specifiers)
@@ -5287,7 +5264,7 @@ SPECIFIERS must be a list of buffer display specifiers."
           (set-window-parameter window 'window-slot slot))
         (display-buffer-in-window buffer window specifiers)))))
 
-(defun normalize-buffer-to-display (buffer-or-name)
+(defun window-normalize-buffer-to-display (buffer-or-name)
   "Normalize BUFFER-OR-NAME argument for buffer display functions.
 If BUFFER-OR-NAME is nil, return the curent buffer.  Else, if a
 buffer specified by BUFFER-OR-NAME exists, return that buffer.
@@ -5313,201 +5290,225 @@ Optional argument LABEL is like the same argument of
 
 The calculation of the return value is exclusively based on the
 user preferences expressed in `display-buffer-alist'."
-  (let* ((buffer (normalize-live-buffer buffer-or-name))
-         (list (display-buffer-normalize-alist (buffer-name buffer) label))
-         (value (assq 'other-window-means-other-frame
-                      (or (car list) (cdr list)))))
-    (when value (cdr value))))
-
-(defun display-buffer-normalize-arguments (buffer-name specifiers label other-frame)
-  "Normalize second and third argument of `display-buffer'.
-BUFFER-NAME is the name of the buffer that shall be displayed,
-SPECIFIERS is the second argument of `display-buffer'.  LABEL is
-the same argument of `display-buffer'.  OTHER-FRAME non-nil means
-use other-frame for other-window."
-  (let (normalized entry specifier pars)
-    (setq specifier
-          (cond
-           ((not specifiers)
-            nil)
-           ((listp specifiers)
-            ;; If SPECIFIERS is a list, we assume it is a list of specifiers.
-            (dolist (specifier specifiers)
-              (cond
-               ((consp specifier)
-                (setq normalized (cons specifier normalized)))
-               ((eq specifier 'other-window)
-                ;; `other-window' must be treated separately.
-                (let ((entry (assq (if other-frame
-                                       'other-frame
-                                     'same-frame-other-window)
-                                   display-buffer-macro-specifiers)))
-                  (dolist (item (cdr entry))
-                    (setq normalized (cons item normalized)))))
-               ((symbolp specifier)
-                ;; Might be a macro specifier, try to expand it (the cdr is a
-                ;; list and we have to reverse it later, so do it one at a
-                ;; time).
-                (let ((entry (assq specifier display-buffer-macro-specifiers)))
-                  (dolist (item (cdr entry))
-                    (setq normalized (cons item normalized)))))))
-            ;; Reverse list.
-            (nreverse normalized))
-           ((setq entry (assq specifiers display-buffer-macro-specifiers))
-            ;; A macro specifier.
-            (cdr entry))
-           ((or other-frame (with-no-warnings pop-up-frames))
-            ;; `special-display-p' group.
-            (if (and (with-no-warnings special-display-function)
-                     ;; `special-display-p' returns either t or a list
-                     ;; of frame parameters to pass to
-                     ;; `special-display-function'.
-                     (setq pars (with-no-warnings
-                                  (special-display-p buffer-name))))
-                (list (list 'fun-with-args
-                            (with-no-warnings special-display-function)
-                            (when (listp pars) pars)))
-              ;; Pop up another frame.
-              (cddr (assq 'other-frame display-buffer-macro-specifiers))))
-           (t
-            ;; In any other case pop up a new window.
-            (cdr (assq 'same-frame-other-window
-                       display-buffer-macro-specifiers)))))
-
-    ;; Handle the old meaning of the LABEL argument of `display-buffer'.
-    (cond
-     ((or (memq label '(visible 0 t)) (frame-live-p label))
-      ;; LABEL must be one of visible (and visible frame), 0 (any
-      ;; visible or iconfied frame), t (any frame), or a live frame.
-      (cons `(reuse-window nil same ,label) specifier))
-     ((or other-frame
-          (with-no-warnings pop-up-frames)
-          (with-no-warnings display-buffer-reuse-frames))
-      (cons '(reuse-window nil same 0) specifier))
-     (t
-      specifier))))
-
-(defun display-buffer-normalize-options (buffer-or-name)
+  (let* ((buffer-name
+          (buffer-name (window-normalize-buffer buffer-or-name)))
+         (default (display-buffer-normalize-default buffer-name))
+         (alist (display-buffer-normalize-alist buffer-name label)))
+    (or (cdr (assq 'other-window-means-other-frame default))
+        (cdr (assq 'other-window-means-other-frame (cdr alist))))))
+
+(defun display-buffer-normalize-special (&optional args)
+  "Return buffer display specifiers for `special-display-frame-alist'."
+  (progn ;; <-- reserved for with-no-warnings
+    (if (and (listp args) (symbolp (car args)))
+        ;; Note: `display-buffer' funcalls this so take "(nth 1 args)"
+        ;; where `special-display-popup-frame' (which uses apply) takes
+        ;; "(cdr args)".
+        `((function ,(car args) ,(nth 1 args)))
+      (append
+       '((reuse-window nil same 0))
+       (when (and (listp args) (cdr (assq 'same-window args)))
+         '((reuse-window same nil nil) (reuse-dedicated . weak)))
+       (when (and (listp args)
+                  (or (cdr (assq 'same-frame args))
+                      (cdr (assq 'same-window args))))
+         '((pop-up-window (largest . nil) (lru . nil))
+           (reuse-window nil nil nil)))
+       (unless display-buffer-mark-dedicated
+         ;; Don't make anything created above dedicated unless requested.
+         ;; Otherwise the dedication request below gets in our way.
+         '((dedicate . nil)))
+       `((pop-up-frame t)
+         ,(append '(pop-up-frame-alist)
+                  (when (listp args) args)
+                  special-display-frame-alist)
+         (dedicate . t))))))
+
+(defun display-buffer-normalize-default (buffer-or-name)
   "Subroutine of `display-buffer-normalize-specifiers'.
-BUFFER-OR-NAME is the buffer to display.  This routine provides a
-compatibility layer for the now obsolete Emacs 23 buffer display
-options."
-  (with-no-warnings
-    (let* ((buffer (normalize-live-buffer buffer-or-name))
+BUFFER-OR-NAME is the buffer to display.
+
+This routine provides a compatibility layer for the obsolete
+Emacs 23 buffer display options to set up the corresponding
+buffer display specifiers."
+  (progn ;; <-- reserved for with-no-warnings
+    (let* ((buffer (window-normalize-buffer buffer-or-name))
            (buffer-name (buffer-name buffer))
-           (use-pop-up-frames
-            (or (and (eq pop-up-frames 'graphic-only)
-                     (display-graphic-p))
-                pop-up-frames))
-           specifiers)
-      ;; `even-window-heights', unless nil or unset.
-      (unless (memq even-window-heights '(nil unset))
+           (pop-up-frames
+            (and (boundp 'pop-up-frames)
+                 (or (and (eq pop-up-frames 'graphic-only)
+                          (display-graphic-p))
+                     pop-up-frames)))
+           specifiers args)
+      ;; `other-window-means-other-frame'
+      (when pop-up-frames
+        (setq specifiers
+              (cons (cons 'other-window-means-other-frame t) specifiers)))
+
+      ;; `even-window-heights'
+      (unless (and (boundp 'even-window-heights)
+                   (not even-window-heights))
         (setq specifiers
               (cons (cons 'reuse-window-even-sizes t) specifiers)))
 
       ;; `display-buffer-mark-dedicated'
-      (when display-buffer-mark-dedicated
+      (when (and (boundp 'display-buffer-mark-dedicated)
+                 display-buffer-mark-dedicated)
         (setq specifiers
               (cons (cons 'dedicate display-buffer-mark-dedicated)
                     specifiers)))
 
-      ;; `pop-up-window' group.  Anything is added here iff
-      ;; `pop-up-windows' is neither nil nor unset.
-      (let ((pop-up-window (not (memq pop-up-windows '(nil unset))))
-            (fun (unless (eq split-window-preferred-function
-                             'split-window-sensibly)
-                   split-window-preferred-function))
-            (min-height (if (numberp split-height-threshold)
-                            (/ split-height-threshold 2)
-                          1.0))
-            (min-width (if (numberp split-width-threshold)
-                           (/ split-width-threshold 2)
-                         1.0)))
-        ;; Create an entry only if a default value was changed.
-        (when (or pop-up-window
-                  (not (equal split-height-threshold 80))
-                  (not (equal split-width-threshold 160)))
-          ;; `reuse-window' (needed as fallback when popping up the new
-          ;; window fails).
-          (setq specifiers
-                (cons (list 'reuse-window 'other nil nil)
-                      specifiers))
-          ;; `split-width-threshold'
-          (setq specifiers
-                (cons (cons 'pop-up-window-min-width min-width)
-                      specifiers))
-          ;; `split-height-threshold'
-          (setq specifiers
-                (cons (cons 'pop-up-window-min-height min-height)
-                      specifiers))
+      ;; `pop-up-window-min-height'
+      (let ((min-height
+             (if (boundp 'split-height-threshold)
+                 (if (numberp split-height-threshold)
+                     (/ split-height-threshold 2)
+                   1.0)
+               40)))
+        (setq specifiers
+              (cons (cons 'pop-up-window-min-height min-height)
+                    specifiers)))
+
+      ;; `pop-up-window-min-width'
+      (let ((min-width
+             (if (boundp 'split-width-threshold)
+                 (if (numberp split-width-threshold)
+                     (/ split-width-threshold 2)
+                   1.0)
+               80)))
+        (setq specifiers
+              (cons (cons 'pop-up-window-min-width min-width)
+                    specifiers)))
+
+      ;; `pop-up-window'
+      (unless (and (boundp 'pop-up-windows) (not pop-up-windows))
+        (let ((fun (when (and (boundp 'split-window-preferred-function)
+                              (not (eq split-window-preferred-function
+                                       'split-window-sensibly)))
+                     split-window-preferred-function)))
           ;; `pop-up-window'
           (setq specifiers
-                (cons (list 'pop-up-window
-                            (cons 'largest fun) (cons 'lru fun))
-                      specifiers))))
+                (cons
+                 (list 'pop-up-window (cons 'largest fun) (cons 'lru fun))
+                 specifiers))))
+
+      ;; `pop-up-frame-function'
+      (when (and (boundp 'pop-up-frame-function)
+                 (not (equal pop-up-frame-function
+                             '(lambda nil
+                                (make-frame pop-up-frame-alist)))))
+        (setq specifiers
+              (cons (cons 'pop-up-frame-function pop-up-frame-function)
+                    specifiers)))
+
+      ;; `pop-up-frame-alist'
+      (when pop-up-frame-alist
+        (setq specifiers
+              (cons (cons 'pop-up-frame-alist pop-up-frame-alist)
+                    specifiers)))
 
-      ;; `pop-up-frame' group.
-      (when use-pop-up-frames
+      ;; `pop-up-frame'
+      (when pop-up-frames
         ;; `pop-up-frame-function'.  If `pop-up-frame-function' uses the
         ;; now obsolete `pop-up-frame-alist' it will continue to do so.
-        (setq specifiers
-              (cons (cons 'pop-up-frame-function pop-up-frame-function)
-                    specifiers))
         ;; `pop-up-frame'
         (setq specifiers
+              ;; Maybe we should merge graphic-only into the following?
               (cons (list 'pop-up-frame t) specifiers)))
 
-      ;; `pop-up-windows' and `use-pop-up-frames' both nil means means
-      ;; we are supposed to reuse any window on the same frame (unless
-      ;; we find one showing the same buffer already).
-      (unless (or pop-up-windows use-pop-up-frames)
-        ;; `reuse-window' showing any buffer on same frame.
-        (setq specifiers
-              (cons (list 'reuse-window nil nil nil)
-                    specifiers)))
-
-      ;; `special-display-p' group.
-      (when special-display-function
-        ;; `special-display-p' returns either t or a list of frame
-        ;; parameters to pass to `special-display-function'.
-        (let ((pars (special-display-p buffer-name)))
-          (when pars
+      ;; `special-display'
+      (when (and (boundp 'special-display-function)
+                 special-display-function
+                 (fboundp 'special-display-p)
+                 (setq args (special-display-p buffer-name)))
+        ;; `special-display-p' returns either t or a list of arguments
+        ;; to pass to `special-display-function'.
+        (if (eq special-display-function 'special-display-popup-frame)
             (setq specifiers
-                  (cons (list 'fun-with-args special-display-function
-                              (when (listp pars) pars))
-                        specifiers)))))
+                  (append (display-buffer-normalize-special args)
+                          specifiers))
+          (setq specifiers
+                (cons
+                 `(function ,special-display-function ,(when (listp args) args))
+                 specifiers))))
 
+      ;; Reuse window showing same buffer on visible or iconified frame.
       ;; `pop-up-frames', `display-buffer-reuse-frames' means search for
       ;; a window showing the buffer on some visible or iconfied frame.
-      ;; `last-nonminibuffer-frame' set and not the same frame means
-      ;; search that frame.
-      (let ((frames (or (and (or use-pop-up-frames
-                                 display-buffer-reuse-frames
+      ;; `last-nonminibuffer-frame' non-nil means search that frame.
+      (let ((frames (or (and (or pop-up-frames
+                                 (and (boundp 'display-buffer-reuse-frames)
+                                      display-buffer-reuse-frames)
                                  (not (last-nonminibuffer-frame)))
                              ;; All visible or iconfied frames.
                              0)
-                        ;; Same frame.
+                        ;; The following usually returns the same frame
+                        ;; so we implicitly search for a window showing
+                        ;; the buffer on the same frame already.
                         (last-nonminibuffer-frame))))
         (when frames
           (setq specifiers
                 (cons (list 'reuse-window 'other 'same frames)
                       specifiers))))
 
-      ;; `same-window-p' group.
-      (when (same-window-p buffer-name)
+      ;; `same-window'
+      (when (and (fboundp 'same-window-p) (same-window-p buffer-name))
         ;; Try to reuse the same (selected) window.
         (setq specifiers
-              (cons (list 'reuse-window 'same nil nil)
-                    specifiers)))
+              (cons (list 'reuse-window 'same nil nil) specifiers)))
 
-      ;; Prepend "reuse window on same frame if showing the buffer
-      ;; already" specifier.  It will be overriden by the application
-      ;; supplied 'other-window specifier.
-      (setq specifiers (cons (list 'reuse-window nil 'same nil)
-                             specifiers))
+      ;; Same window if showing this buffer already.  Can be overridden
+      ;; by `other-window' argument if the buffer is already shown in
+      ;; the same window.
+      (setq specifiers
+            (cons (list 'reuse-window 'same 'same nil) specifiers))
 
       specifiers)))
 
+(defun display-buffer-normalize-argument (buffer-name specifiers other-window-means-other-frame)
+  "Normalize second argument of `display-buffer'.
+BUFFER-NAME is the name of the buffer that shall be displayed,
+SPECIFIERS is the second argument of `display-buffer'.
+OTHER-WINDOW-MEANS-OTHER-FRAME non-nil means use other-frame for
+other-window."
+  (progn ;; <-- reserved for with-no-warnings
+    (let (normalized entry specifier pars)
+      (cond
+       ((not specifiers)
+        nil)
+       ((listp specifiers)
+        ;; If SPECIFIERS is a list, we assume it is a list of valid
+        ;; specifiers.
+        (dolist (specifier specifiers)
+          (cond
+           ((consp specifier)
+            (setq normalized (cons specifier normalized)))
+           ((eq specifier 'other-window)
+            ;; `other-window' must be treated separately.
+            (let ((entry (assq (if other-window-means-other-frame
+                                   'other-frame
+                                 'same-frame-other-window)
+                               display-buffer-macro-specifiers)))
+              (dolist (item (cdr entry))
+                (setq normalized (cons item normalized)))))
+           ((symbolp specifier)
+            ;; Might be a macro specifier, try to expand it (the cdr is a
+            ;; list and we have to reverse it later, so do it one at a
+            ;; time).
+            (let ((entry (assq specifier display-buffer-macro-specifiers)))
+              (dolist (item (cdr entry))
+                (setq normalized (cons item normalized)))))))
+        ;; Reverse list.
+        (nreverse normalized))
+       ((setq entry (assq specifiers display-buffer-macro-specifiers))
+        ;; A macro specifier.
+        (cdr entry))
+       (t
+        ;; Anything else means use another window according to the
+        ;; non-overriding specifiers of `display-buffer-alist' and the
+        ;; specifiers produced by `display-buffer-normalize-default'.
+        '((other-window . t)))))))
+
 (defun display-buffer-normalize-alist-1 (specifiers label)
   "Subroutine of `display-buffer-normalize-alist'.
 SPECIFIERS is a list of buffer display specfiers.  LABEL is the
@@ -5568,9 +5569,6 @@ LABEL the corresponding argument of `display-buffer'."
 
     (cons list-1 list-2)))
 
-(defvar display-buffer-normalize-options-inhibit nil
-  "If non-nil, `display-buffer' doesn't process obsolete options.")
-
 (defun display-buffer-normalize-specifiers (buffer-name specifiers label)
   "Return normalized specifiers for a buffer matching BUFFER-NAME or LABEL.
 BUFFER-NAME must be a string specifying a valid buffer name.
@@ -5589,25 +5587,33 @@ specifiers:
 
 - The specifiers in `display-buffer-alist' whose buffer
   identifier matches BUFFER-NAME or LABEL and whose 'override
-  component is not set.
-
-- `display-buffer-default-specifiers'."
-  (let* ((list (display-buffer-normalize-alist buffer-name label))
-         (other-frame (cdr (assq 'other-window-means-other-frame
-                                 (or (car list) (cdr list))))))
+  component is not set."
+  (let* ((default (display-buffer-normalize-default buffer-name))
+         (alist (display-buffer-normalize-alist buffer-name label))
+         (other-window-means-other-frame
+          (or (cdr (assq 'other-window-means-other-frame default))
+              (cdr (assq 'other-window-means-other-frame (cdr alist)))))
+         (arg2 (display-buffer-normalize-argument
+                buffer-name specifiers other-window-means-other-frame))
+         (arg3
+          ;; Handle special meaning of the LABEL argument of
+          ;; `display-buffer'.
+          (when (or (memq label '(visible 0 t)) (frame-live-p label))
+            ;; LABEL must be one of visible (any visible frame), 0 (any
+            ;; visible or iconfied frame), t (any frame), or a live
+            ;; frame.
+            `((reuse-window nil same ,label)))))
     (append
      ;; Overriding user specifiers.
-     (car list)
-     ;; Application specifiers.
-     (display-buffer-normalize-arguments
-      buffer-name specifiers label other-frame)
-     ;; Emacs 23 compatibility specifiers.
-     (unless display-buffer-normalize-options-inhibit
-       (display-buffer-normalize-options buffer-name))
+     (car alist)
+     ;; Special value of third argument of display-buffer.
+     arg3
+     ;; Second argument of display-buffer.
+     arg2
      ;; Non-overriding user specifiers.
-     (cdr list)
+     (cdr alist)
      ;; Default specifiers.
-     display-buffer-default-specifiers)))
+     default)))
 
 ;; Minibuffer-only frames should be documented better.  They really
 ;; deserve a separate section in the manual.  Also
@@ -5615,7 +5621,7 @@ specifiers:
 (defun display-buffer-frame (&optional frame)
   "Return FRAME if it is live and not a minibuffer-only frame.
 Return the value of `last-nonminibuffer-frame' otherwise."
-  (setq frame (normalize-live-frame frame))
+  (setq frame (window-normalize-frame frame))
   (if (and (frame-live-p frame)
            ;; A not very nice way to get that information.
            (not (window-minibuffer-p (frame-root-window frame))))
@@ -5642,9 +5648,8 @@ For convenience, SPECIFIERS may also consist of a single buffer
 display location specifier or t, where the latter means to
 display the buffer in any but the selected window.  If SPECIFIERS
 is nil or omitted, this means to exclusively use the specifiers
-provided by `display-buffer-alist'.  If the value of the latter
-is nil too, all specifiers are provided by the constant
-`display-buffer-default-specifiers'.
+provided by the variable `display-buffer-alist' and the function
+`display-buffer-normalize-default'.
 
 As a special case, the `reuse-window' specifier allows to specify
 as second element an arbitrary window, as third element an
@@ -5688,7 +5693,7 @@ The result must be a list of valid buffer display specifiers.  If
 `display-buffer-function' is non-nil, call it with the buffer and
 this list as arguments."
   (interactive "BDisplay buffer:\nP")
-  (let* ((buffer (normalize-buffer-to-display buffer-or-name))
+  (let* ((buffer (window-normalize-buffer-to-display buffer-or-name))
          (buffer-name (buffer-name buffer))
          (normalized
           ;; Normalize specifiers.
@@ -5696,7 +5701,7 @@ this list as arguments."
          ;; Don't use a minibuffer frame.
          (frame (display-buffer-frame))
          ;; `window' is the window we use for showing `buffer'.
-         window specifier method)
+         window specifier method other-window)
     ;; Reset this.
     (setq display-buffer-window nil)
     (if display-buffer-function
@@ -5712,7 +5717,7 @@ this list as arguments."
               (cond
                ((eq method 'reuse-window)
                 (display-buffer-reuse-window
-                 buffer (cdr specifier) normalized))
+                 buffer (cdr specifier) normalized other-window))
                ((eq method 'pop-up-window)
                 (display-buffer-pop-up-window
                  buffer (cdr specifier) normalized))
@@ -5722,28 +5727,34 @@ this list as arguments."
                ((eq method 'use-side-window)
                 (display-buffer-in-side-window
                  buffer (nth 1 specifier) (nth 2 specifier) normalized))
-               ((eq method 'fun-with-args)
-                (apply (nth 1 specifier) buffer (nth 2 specifier))))))
+               ((eq method 'function)
+                (funcall (nth 1 specifier) buffer (nth 2 specifier)))
+               ((eq method 'other-window)
+                (setq other-window t)))))
 
       ;; If we don't have a window yet, try a fallback method.  All
-      ;; specifiers have been used up by now.
+      ;; specifiers have been used up by now.  Try reusing a window
       (or (and (window-live-p window) window)
-          ;; Try reusing a window showing BUFFER on any visible or
-          ;; iconfied frame.
-          (display-buffer-reuse-window buffer `(nil ,buffer 0))
-          ;; Try reusing a window not showing BUFFER on any visible or
-          ;; iconified frame.
-          (display-buffer-reuse-window buffer '(nil other 0))
-          ;; Eli says it's better to never try making a new frame.
-          ;; (display-buffer-pop-up-frame buffer)
-          ;; Try using a weakly dedicated window.
+          ;; on the selected frame,
           (display-buffer-reuse-window
-           buffer '(nil nil t) '((reuse-window-dedicated . weak)))
-          ;; Try using a strongly dedicated window.
+           buffer '(nil nil nil) nil other-window)
+          ;; showing BUFFER on any visible frame,
           (display-buffer-reuse-window
-           buffer '(nil nil t) '((reuse-window-dedicated . t)))))))
+           buffer '(nil same visible) nil other-window)
+          ;; not showing BUFFER on any visible frame,
+          (display-buffer-reuse-window
+           buffer '(nil other visible) nil other-window)
+          ;; showing BUFFER on any visible or iconified frame,
+          (display-buffer-reuse-window
+           buffer '(nil same 0) nil other-window)
+          ;; not showing BUFFER on any visible or iconified frame.
+          (display-buffer-reuse-window
+           buffer '(nil other 0) nil other-window)
+          ;; If everything failed so far, try popping up a new frame
+          ;; regardless of graphic-only restrictions.
+          (display-buffer-pop-up-frame buffer)))))
 
-(defsubst display-buffer-same-window (&optional buffer-or-name label) 
+(defsubst display-buffer-same-window (&optional buffer-or-name label)
   "Display buffer specified by BUFFER-OR-NAME in the selected window.
 Another window will be used only if the buffer can't be shown in
 the selected window, usually because it is dedicated to another
@@ -5752,7 +5763,7 @@ buffer.  Optional argument BUFFER-OR-NAME and LABEL are as for
   (interactive "BDisplay buffer in same window:\nP")
   (display-buffer buffer-or-name 'same-window label))
 
-(defsubst display-buffer-same-frame (&optional buffer-or-name label) 
+(defsubst display-buffer-same-frame (&optional buffer-or-name label)
   "Display buffer specified by BUFFER-OR-NAME in a window on the same frame.
 Another frame will be used only if there is no other choice.
 Optional argument BUFFER-OR-NAME and LABEL are as for
@@ -5760,7 +5771,7 @@ Optional argument BUFFER-OR-NAME and LABEL are as for
   (interactive "BDisplay buffer on same frame:\nP")
   (display-buffer buffer-or-name 'same-frame label))
 
-(defsubst display-buffer-other-window (&optional buffer-or-name label) 
+(defsubst display-buffer-other-window (&optional buffer-or-name label)
   "Display buffer specified by BUFFER-OR-NAME in another window.
 The selected window will be used only if there is no other
 choice.  Windows on the selected frame are preferred to windows
@@ -5769,7 +5780,7 @@ for `display-buffer'."
   (interactive "BDisplay buffer in another window:\nP")
   (display-buffer buffer-or-name 'other-window label))
 
-(defun display-buffer-same-frame-other-window (&optional buffer-or-name label) 
+(defun display-buffer-same-frame-other-window (&optional buffer-or-name label)
   "Display buffer specified by BUFFER-OR-NAME in another window on the same frame.
 The selected window or another frame will be used only if there
 is no other choice.  Optional argument BUFFER-OR-NAME and LABEL are
@@ -5790,37 +5801,36 @@ If this command uses another frame, it will also select that frame."
 (defun pop-to-buffer (&optional buffer-or-name specifiers norecord label)
   "Display buffer specified by BUFFER-OR-NAME and select the window used.
 Optional argument BUFFER-OR-NAME may be a buffer, a string \(a
-buffer name), or nil.  If BUFFER-OR-NAME is a string not naming
-an existent buffer, create a buffer with that name.  If
+buffer name), or nil.  If BUFFER-OR-NAME is a string naming a buffer
+that does not exist, create a buffer with that name.  If
 BUFFER-OR-NAME is nil or omitted, display the current buffer.
 Interactively, prompt for the buffer name using the minibuffer.
 
-Optional second argument SPECIFIERS must be a list of buffer
-display specifiers, a single location specifier, `t' which means
-the latter means to display the buffer in any but the selected
-window, or nil which means to exclusively apply the specifiers
-customized by the user.
+Optional second argument SPECIFIERS can be: a list of buffer
+display specifiers (see `display-buffer-alist'); a single
+location specifier; t, which means to display the buffer in any
+but the selected window; or nil, which means to exclusively apply
+the specifiers customized by the user.  See `display-buffer' for
+more details.
 
-Optional argument NORECORD non-nil means do not put the buffer
-specified by BUFFER-OR-NAME at the front of the buffer list and
-do not make the window displaying it the most recently selected
-one.
+Optional argument NORECORD non-nil means do not put the displayed
+buffer at the front of the buffer list, and do not make the window
+displaying it the most recently selected one.
 
 The optional argument LABEL, if non-nil, is a symbol specifying the
 display purpose.  Applications should set this when the buffer
-shall be displayed in a special way but BUFFER-OR-NAME does not
+should be displayed in a special way but BUFFER-OR-NAME does not
 identify the buffer as special.  Buffers that typically fit into
 this category are those whose names have been derived from the
 name of the file they are visiting.
 
-Return the buffer specified by BUFFER-OR-NAME or nil if
-displaying the buffer failed.
+Returns the displayed buffer, or nil if displaying the buffer failed.
 
 This uses the function `display-buffer' as a subroutine; see the
 documentations of `display-buffer' and `display-buffer-alist' for
 additional information."
   (interactive "BPop to buffer:\nP")
-  (let ((buffer (normalize-buffer-to-display buffer-or-name))
+  (let ((buffer (window-normalize-buffer-to-display buffer-or-name))
         (old-window (selected-window))
         (old-frame (selected-frame))
         new-window new-frame)
@@ -5846,7 +5856,7 @@ as for `pop-to-buffer'."
   (interactive "BPop to buffer in selected window:\nP")
   (pop-to-buffer buffer-or-name 'same-window norecord label))
 
-(defsubst pop-to-buffer-same-frame (&optional buffer-or-name norecord label) 
+(defsubst pop-to-buffer-same-frame (&optional buffer-or-name norecord label)
   "Pop to buffer specified by BUFFER-OR-NAME in a window on the selected frame.
 Another frame will be used only if there is no other choice.
 Optional arguments BUFFER-OR-NAME, NORECORD and LABEL are as for
@@ -5863,7 +5873,7 @@ LABEL are as for `pop-to-buffer'."
   (interactive "BPop to buffer in another window:\nP")
   (pop-to-buffer buffer-or-name 'other-window norecord))
 
-(defsubst pop-to-buffer-same-frame-other-window (&optional buffer-or-name norecord label) 
+(defsubst pop-to-buffer-same-frame-other-window (&optional buffer-or-name norecord label)
   "Pop to buffer specified by BUFFER-OR-NAME in another window on the selected frame.
 The selected window or another frame will be used only if there
 is no other choice.  Optional arguments BUFFER-OR-NAME, NORECORD
@@ -5902,7 +5912,7 @@ from the list of completions and default values."
       (read-buffer prompt (other-buffer (current-buffer))
                    (confirm-nonexistent-file-or-buffer)))))
 
-(defun normalize-buffer-to-switch-to (buffer-or-name)
+(defun window-normalize-buffer-to-switch-to (buffer-or-name)
   "Normalize BUFFER-OR-NAME argument of buffer switching functions.
 If BUFFER-OR-NAME is nil, return the buffer returned by
 `other-buffer'.  Else, if a buffer specified by BUFFER-OR-NAME
@@ -5915,7 +5925,7 @@ buffer with the name BUFFER-OR-NAME and return that buffer."
             buffer))
     (other-buffer)))
 
-(defun switch-to-buffer (buffer-or-name &optional norecord)
+(defun switch-to-buffer (buffer-or-name &optional norecord force-same-window)
   "Switch to buffer BUFFER-OR-NAME in the selected window.
 If called interactively, prompt for the buffer name using the
 minibuffer.  The variable `confirm-nonexistent-file-or-buffer'
@@ -5931,24 +5941,30 @@ BUFFER-OR-NAME is nil, switch to the buffer returned by
 Optional argument NORECORD non-nil means do not put the buffer
 specified by BUFFER-OR-NAME at the front of the buffer list and
 do not make the window displaying it the most recently selected
-one.  Return the buffer switched to.
+one.
 
-This function is intended for interactive use only.  Lisp
-functions should call `pop-to-buffer-same-window' instead."
+If FORCE-SAME-WINDOW is non-nil, BUFFER-OR-NAME must be displayed
+in the currently selected window; signal an error if that is
+impossible (e.g. if the selected window is minibuffer-only).
+If non-nil, BUFFER-OR-NAME may be displayed in another window.
+
+Return the buffer switched to."
   (interactive
-   (list (read-buffer-to-switch "Switch to buffer: ")))
-  (let ((buffer (normalize-buffer-to-switch-to buffer-or-name)))
-    (if (and (or (window-minibuffer-p) (eq (window-dedicated-p) t))
-             (not (eq buffer (window-buffer))))
-        ;; Cannot switch to another buffer in a minibuffer or strongly
-        ;; dedicated window that does not show the buffer already.  Call
-        ;; `pop-to-buffer' instead.
-        (pop-to-buffer buffer 'same-window norecord)
-      (unless (eq buffer (window-buffer))
-        ;; I'm not sure why we should NOT call `set-window-buffer' here,
-        ;; but let's keep things as they are (otherwise we could always
-        ;; call `pop-to-buffer-same-window' here).
-        (set-window-buffer nil buffer))
+   (list (read-buffer-to-switch "Switch to buffer: ") nil nil))
+  (let ((buffer (window-normalize-buffer-to-switch-to buffer-or-name)))
+    (if (null force-same-window)
+        (pop-to-buffer buffer-or-name
+                       '(same-window (reuse-window-dedicated . weak))
+                       norecord nil)
+      (cond
+       ;; Don't call set-window-buffer if it's not needed since it
+       ;; might signal an error (e.g. if the window is dedicated).
+       ((eq buffer (window-buffer)) nil)
+       ((window-minibuffer-p)
+        (error "Cannot switch buffers in minibuffer window"))
+       ((eq (window-dedicated-p) t)
+        (error "Cannot switch buffers in a dedicated window"))
+       (t (set-window-buffer nil buffer)))
       (unless norecord
         (select-window (selected-window)))
       (set-buffer buffer))))
@@ -5963,7 +5979,7 @@ This function is intended for interactive use only.  Lisp
 functions should call `pop-to-buffer-same-frame' instead."
   (interactive
    (list (read-buffer-to-switch "Switch to buffer in other window: ")))
-  (let ((buffer (normalize-buffer-to-switch-to buffer-or-name)))
+  (let ((buffer (window-normalize-buffer-to-switch-to buffer-or-name)))
     (pop-to-buffer buffer 'same-frame norecord)))
 
 (defun switch-to-buffer-other-window (buffer-or-name &optional norecord)
@@ -5977,7 +5993,7 @@ This function is intended for interactive use only.  Lisp
 functions should call `pop-to-buffer-other-window' instead."
   (interactive
    (list (read-buffer-to-switch "Switch to buffer in other window: ")))
-  (let ((buffer (normalize-buffer-to-switch-to buffer-or-name)))
+  (let ((buffer (window-normalize-buffer-to-switch-to buffer-or-name)))
     (pop-to-buffer buffer 'other-window norecord)))
 
 (defun switch-to-buffer-other-window-same-frame (buffer-or-name &optional norecord)
@@ -5991,7 +6007,7 @@ functions should call `pop-to-buffer-other-window-same-frame'
 instead."
   (interactive
    (list (read-buffer-to-switch "Switch to buffer in other window: ")))
-  (let ((buffer (normalize-buffer-to-switch-to buffer-or-name)))
+  (let ((buffer (window-normalize-buffer-to-switch-to buffer-or-name)))
     (pop-to-buffer buffer 'same-frame-other-window norecord)))
 
 (defun switch-to-buffer-other-frame (buffer-or-name &optional norecord)
@@ -6004,7 +6020,7 @@ This function is intended for interactive use only.  Lisp
 functions should call `pop-to-buffer-other-frame' instead."
   (interactive
    (list (read-buffer-to-switch "Switch to buffer in other frame: ")))
-  (let ((buffer (normalize-buffer-to-switch-to buffer-or-name)))
+  (let ((buffer (window-normalize-buffer-to-switch-to buffer-or-name)))
     (pop-to-buffer buffer 'other-frame norecord)))
 
 ;;; Obsolete definitions of `display-buffer' below.
@@ -6022,9 +6038,9 @@ ignored.
 See also `same-window-regexps'."
  :type '(repeat (string :format "%v"))
  :group 'windows)
-(make-obsolete-variable
- 'same-window-buffer-names
- "use 2nd arg of `display-buffer' instead." "24.1")
+;; (make-obsolete-variable
+ ;; 'same-window-buffer-names
+ ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom same-window-regexps nil
   "List of regexps saying which buffers should appear in the \"same\" window.
@@ -6040,9 +6056,9 @@ the buffer name.  This is for compatibility with
 See also `same-window-buffer-names'."
   :type '(repeat (regexp :format "%v"))
   :group 'windows)
-(make-obsolete-variable
- 'same-window-regexps
- "use 2nd arg of `display-buffer' instead." "24.1")
+;; (make-obsolete-variable
+ ;; 'same-window-regexps
+ ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defun same-window-p (buffer-name)
   "Return non-nil if a buffer named BUFFER-NAME would be shown in the \"same\" window.
@@ -6067,8 +6083,8 @@ selected rather than \(as usual\) some other window.  See
                     (and (consp regexp) (stringp (car regexp))
                          (string-match-p (car regexp) buffer-name)))
             (throw 'found t))))))))
-(make-obsolete
- 'same-window-p "pass argument to buffer display function instead." "24.1")
+;; (make-obsolete
+ ;; 'same-window-p "pass argument to buffer display function instead." "24.1")
 
 (defcustom special-display-frame-alist
   '((height . 14) (width . 80) (unsplittable . t))
@@ -6086,9 +6102,9 @@ These supersede the values given in `default-frame-alist'."
                          (symbol :tag "Parameter")
                          (sexp :tag "Value")))
   :group 'frames)
-(make-obsolete-variable
- 'special-display-frame-alist
- "use 2nd arg of `display-buffer' instead." "24.1")
+;; (make-obsolete-variable
+ ;; 'special-display-frame-alist
+ ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defun special-display-popup-frame (buffer &optional args)
   "Display BUFFER in a special frame and return the window chosen.
@@ -6103,7 +6119,7 @@ BUFFER in a window on the selected frame.
 
 If ARGS is a list whose car is a symbol, use (car ARGS) as a
 function to do the work.  Pass it BUFFER as first argument,
-and (cdr ARGS) as second."
+and (cdr ARGS) as the rest of the arguments."
   (if (and args (symbolp (car args)))
       (apply (car args) buffer (cdr args))
     (let ((window (get-buffer-window buffer 0)))
@@ -6134,9 +6150,9 @@ and (cdr ARGS) as second."
          (set-window-buffer (frame-selected-window frame) buffer)
          (set-window-dedicated-p (frame-selected-window frame) t)
          (frame-selected-window frame))))))
-(make-obsolete
- 'special-display-popup-frame
- "use 2nd arg of `display-buffer' instead." "24.1")
+;; (make-obsolete
+ ;; 'special-display-popup-frame
+ ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom special-display-function 'special-display-popup-frame
   "Function to call for displaying special buffers.
@@ -6153,9 +6169,9 @@ A buffer is special when its name is either listed in
   :type 'function
   :group 'windows
   :group 'frames)
-(make-obsolete-variable
- 'special-display-function
- "use 2nd arg of `display-buffer' instead." "24.1")
+;; (make-obsolete-variable
+ ;; 'special-display-function
+ ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom special-display-buffer-names nil
   "List of names of buffers that should be displayed specially.
@@ -6220,9 +6236,9 @@ See also `special-display-regexps'."
                         (repeat :tag "Arguments" (sexp)))))
   :group 'windows
   :group 'frames)
-(make-obsolete-variable
- 'special-display-buffer-names
- "use 2nd arg of `display-buffer' instead." "24.1")
+;; (make-obsolete-variable
+ ;; 'special-display-buffer-names
+ ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
 ;;;###autoload
 (put 'special-display-buffer-names 'risky-local-variable t)
@@ -6291,9 +6307,9 @@ See also `special-display-buffer-names'."
                         (repeat :tag "Arguments" (sexp)))))
   :group 'windows
   :group 'frames)
-(make-obsolete-variable
- 'special-display-regexps
- "use 2nd arg of `display-buffer' instead." "24.1")
+;; (make-obsolete-variable
+ ;; 'special-display-regexps
+ ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defun special-display-p (buffer-name)
   "Return non-nil if a buffer named BUFFER-NAME gets a special frame.
@@ -6321,9 +6337,9 @@ entry."
            ((and (consp regexp) (stringp (car regexp))
                  (string-match-p (car regexp) buffer-name))
             (throw 'found (cdr regexp))))))))))
-(make-obsolete
- 'special-display-p
- "pass argument to buffer display function instead." "24.1")
+;; (make-obsolete
+ ;; 'special-display-p
+ ;; "pass argument to buffer display function instead." "24.1")
 
 (defcustom pop-up-frame-alist nil
   "Alist of parameters for automatically generated new frames.
@@ -6343,9 +6359,9 @@ affected by this variable."
                        (symbol :tag "Parameter")
                        (sexp :tag "Value")))
   :group 'frames)
-(make-obsolete-variable
- 'pop-up-frame-alist
- "use 2nd arg of `display-buffer' instead." "24.1")
+;; (make-obsolete-variable
+ ;; 'pop-up-frame-alist
+ ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom pop-up-frame-function
   (lambda () (make-frame pop-up-frame-alist))
@@ -6355,9 +6371,9 @@ frame.  The default value calls `make-frame' with the argument
 `pop-up-frame-alist'."
   :type 'function
   :group 'frames)
-(make-obsolete-variable
- 'pop-up-frame-function
- "use 2nd arg of `display-buffer' instead." "24.1")
+;; (make-obsolete-variable
+ ;; 'pop-up-frame-function
+ ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom pop-up-frames nil
   "Whether `display-buffer' should make a separate frame.
@@ -6371,9 +6387,9 @@ Any other non-nil value means always make a separate frame."
           (const :tag "Always" t))
   :group 'windows
   :group 'frames)
-(make-obsolete-variable
- 'pop-up-frames
- "use 2nd arg of `display-buffer' instead." "24.1")
+;; (make-obsolete-variable
+ ;; 'pop-up-frames
+ ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom display-buffer-reuse-frames nil
   "Set and non-nil means `display-buffer' should reuse frames.
@@ -6383,18 +6399,17 @@ that frame."
   :version "21.1"
   :group 'windows
   :group 'frames)
-(make-obsolete-variable
- 'display-buffer-reuse-frames
- "use 2nd arg of `display-buffer' instead." "24.1")
+;; (make-obsolete-variable
+ ;; 'display-buffer-reuse-frames
+ ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
-(defcustom pop-up-windows 'unset ; t
-  "Set and non-nil means `display-buffer' should make a new window."
+(defcustom pop-up-windows t
+  "Non-nil means `display-buffer' should make a new window."
   :type 'boolean
-  :version "24.1"
   :group 'windows)
-(make-obsolete-variable
- 'pop-up-windows
- "use 2nd arg of `display-buffer' instead." "24.1")
+;; (make-obsolete-variable
+ ;; 'pop-up-windows
+ ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom split-window-preferred-function 'split-window-sensibly
   "Function called by `display-buffer' to split a window.
@@ -6421,9 +6436,9 @@ not want to split the selected window."
   :type 'function
   :version "23.1"
   :group 'windows)
-(make-obsolete-variable
- 'split-window-preferred-function
- "use 2nd arg of `display-buffer' instead." "24.1")
+;; (make-obsolete-variable
+ ;; 'split-window-preferred-function
+ ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom split-height-threshold 80
   "Minimum height for splitting a window to display a buffer.
@@ -6435,9 +6450,9 @@ split it vertically disregarding the value of this variable."
   :type '(choice (const nil) (integer :tag "lines"))
   :version "23.1"
   :group 'windows)
-(make-obsolete-variable
- 'split-height-threshold
- "use 2nd arg of `display-buffer' instead." "24.1")
+;; (make-obsolete-variable
+ ;; 'split-height-threshold
+ ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defcustom split-width-threshold 160
   "Minimum width for splitting a window to display a buffer.
@@ -6447,29 +6462,28 @@ is nil, `display-buffer' cannot split windows horizontally."
   :type '(choice (const nil) (integer :tag "columns"))
   :version "23.1"
   :group 'windows)
-(make-obsolete-variable
- 'split-width-threshold
- "use 2nd arg of `display-buffer' instead." "24.1")
+;; (make-obsolete-variable
+ ;; 'split-width-threshold
+ ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
-(defcustom even-window-heights 'unset ; t
-  "If set and non-nil `display-buffer' will try to even window heights.
+(defcustom even-window-heights t
+  "If non-nil `display-buffer' will try to even window heights.
 Otherwise `display-buffer' will leave the window configuration
-alone.  Heights are evened only when `display-buffer' reuses a
+alone.  Heights are evened only when `display-buffer' chooses a
 window that appears above or below the selected window."
   :type 'boolean
-  :version "24.1"
   :group 'windows)
-(make-obsolete-variable
- 'even-window-heights
- "use 2nd arg of `display-buffer' instead." "24.1")
+;; (make-obsolete-variable
+ ;; 'even-window-heights
+ ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defvar display-buffer-mark-dedicated nil
   "Non-nil means `display-buffer' marks the windows it creates as dedicated.
 The actual non-nil value of this variable will be copied to the
 `window-dedicated-p' flag.")
-(make-obsolete-variable
- 'display-buffer-mark-dedicated
- "use 2nd arg of `display-buffer' instead." "24.1")
+;; (make-obsolete-variable
+ ;; 'display-buffer-mark-dedicated
+ ;; "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defun window-splittable-p (window &optional horizontal)
   "Return non-nil if `split-window-sensibly' may split WINDOW.
@@ -6520,8 +6534,8 @@ hold:
                  (max split-height-threshold
                       (* 2 (max window-min-height
                                 (if mode-line-format 2 1))))))))))
-(make-obsolete
- 'window-splittable-p "use 2nd arg of `display-buffer' instead." "24.1")
+;; (make-obsolete
+ ;; 'window-splittable-p "use 2nd arg of `display-buffer' instead." "24.1")
 
 (defun split-window-sensibly (window)
   "Split WINDOW in a way suitable for `display-buffer'.
@@ -6571,8 +6585,8 @@ split."
              (when (with-no-warnings (window-splittable-p window))
                (with-selected-window window
                  (split-window-vertically)))))))
-(make-obsolete
- 'split-window-sensibly "use 2nd arg of `display-buffer' instead." "24.1")
+;; (make-obsolete
+ ;; 'split-window-sensibly "use 2nd arg of `display-buffer' instead." "24.1")
 
 ;; Functions for converting Emacs 23 buffer display options to buffer
 ;; display specifiers.
@@ -6627,7 +6641,7 @@ value of `display-buffer-alist'."
               1.0)))
        (list
         'pop-up-window
-        (when pop-up-windows ; unset qualifies as t
+        (when pop-up-windows
           (list
            'pop-up-window
            (cons 'largest fun)
@@ -6657,8 +6671,8 @@ value of `display-buffer-alist'."
         (display-buffer-alist-add
          `((regexp . ,entry))
          (list
-          'fun-with-args
-          (list 'fun-with-args special-display-function
+          'function
+          (list 'function special-display-function
                 special-display-frame-alist))
          no-custom))
        ((consp entry)
@@ -6670,9 +6684,9 @@ value of `display-buffer-alist'."
             (display-buffer-alist-add
              `((name . ,name))
              (list
-              'fun-with-args
+              'function
               ;; Weary.
-              (list 'fun-with-args (car rest) (cadr rest)))
+              (list 'function (car rest) (cadr rest)))
              no-custom))
            ((listp rest)
             ;; A list of parameters.
@@ -6691,8 +6705,8 @@ value of `display-buffer-alist'."
               (display-buffer-alist-add
                `((name . ,name))
                (list
-                'fun-with-args
-                (list 'fun-with-args special-display-function
+                'function
+                (list 'function special-display-function
                       special-display-frame-alist))
                no-custom)))))))))
 
@@ -6704,8 +6718,8 @@ value of `display-buffer-alist'."
         (display-buffer-alist-add
          `((name . ,entry))
          (list
-          'fun-with-args
-          (list 'fun-with-args special-display-function
+          'function
+          (list 'function special-display-function
                 special-display-frame-alist))
          no-custom))
        ((consp entry)
@@ -6717,9 +6731,9 @@ value of `display-buffer-alist'."
             (display-buffer-alist-add
              `((name . ,name))
              (list
-              'fun-with-args
+              'function
               ;; Weary.
-              (list 'fun-with-args (car rest) (cadr rest)))
+              (list 'function (car rest) (cadr rest)))
              no-custom))
            ((listp rest)
             ;; A list of parameters.
@@ -6738,8 +6752,8 @@ value of `display-buffer-alist'."
               (display-buffer-alist-add
                `((name . ,name))
                (list
-                'fun-with-args
-                (list 'fun-with-args special-display-function
+                'function
+                (list 'function special-display-function
                       special-display-frame-alist))
                no-custom)))))))))
 
@@ -6781,7 +6795,7 @@ value of `display-buffer-alist'."
               ;; "0" (all visible and iconified frames) is hardcoded in
               ;; Emacs 23.
               0))
-      (unless (memq even-window-heights '(nil unset))
+      (when even-window-heights
         (cons 'reuse-window-even-sizes t)))
      no-custom)
 
@@ -6790,7 +6804,7 @@ value of `display-buffer-alist'."
       (display-buffer-alist-add
        nil
        (list
-        (cons 'dedicated display-buffer-mark-dedicated))
+        (cons 'dedicate display-buffer-mark-dedicated))
        no-custom)))
 
   display-buffer-alist)
@@ -6805,7 +6819,7 @@ Note that the current implementation of this function cannot
 always set the height exactly, but attempts to be conservative,
 by allocating more lines than are actually needed in the case
 where some error may be present."
-  (setq window (normalize-live-window window))
+  (setq window (window-normalize-live-window window))
   (let ((delta (- height (window-text-height window))))
     (unless (zerop delta)
       ;; Setting window-min-height to a value like 1 can lead to very
@@ -6901,9 +6915,9 @@ WINDOW was scrolled."
   (interactive)
   ;; Do all the work in WINDOW and its buffer and restore the selected
   ;; window and the current buffer when we're done.
-  (setq window (normalize-live-window window))
+  (setq window (window-normalize-live-window window))
   ;; Can't resize a full height or fixed-size window.
-  (unless (or (window-size-fixed-p window) 
+  (unless (or (window-size-fixed-p window)
               (window-full-height-p window))
     ;; `with-selected-window' should orderly restore the current buffer.
     (with-selected-window window
@@ -6996,8 +7010,8 @@ WINDOW defaults to the selected window."
       ;; `window-iso-combined-p' instead should handle that.
       (or (= (nth 2 edges) (nth 2 (window-edges (previous-window))))
           (= (nth 0 edges) (nth 0 (window-edges (next-window))))))))
-(make-obsolete
- 'window-safely-shrinkable-p "use `window-iso-combined-p' instead." "24.1")
+;; (make-obsolete
+ ;; 'window-safely-shrinkable-p "use `window-iso-combined-p' instead." "24.1")
 
 (defun shrink-window-if-larger-than-buffer (&optional window)
   "Shrink height of WINDOW if its buffer doesn't need so many lines.
@@ -7013,7 +7027,7 @@ window, or if the window is the only window of its frame.
 
 Return non-nil if the window was shrunk, nil otherwise."
   (interactive)
-  (setq window (normalize-live-window window))
+  (setq window (window-normalize-live-window window))
   ;; Make sure that WINDOW is vertically combined and `point-min' is
   ;; visible (for whatever reason that's needed).  The remaining issues
   ;; should be taken care of by `fit-window-to-buffer'.
diff --git a/lisp/winner.el b/lisp/winner.el
index e5855ad8aac..70038362c2e 100644
--- a/lisp/winner.el
+++ b/lisp/winner.el
@@ -145,7 +145,7 @@ You may want to include buffer names such as *Help*, *Apropos*,
 
 ;;; Saved configurations
 
-;; This variable contains the window cofiguration rings.
+;; This variable contains the window configuration rings.
 ;; The key in this alist is the frame.
 (defvar winner-ring-alist nil)
 
diff --git a/lisp/woman.el b/lisp/woman.el
index eb801b55d4d..c6bd4a4c8d1 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -2157,8 +2157,8 @@ No external programs are used."
   (run-hooks 'woman-pre-format-hook)
   (and (boundp 'font-lock-mode) font-lock-mode (font-lock-mode -1))
   ;; (fundamental-mode)
-  (let ((start-time (current-time))     ; (HIGH LOW MICROSEC)
-        time)                           ; HIGH * 2**16 + LOW seconds
+  (let ((start-time (current-time))
+        time)
     (message "WoMan formatting buffer...")
 ;  (goto-char (point-min))
 ;  (cond
@@ -2167,10 +2167,8 @@ No external programs are used."
 ;    (delete-region (point-min) (point))) ; potentially dangerous!
 ;   (t (message "WARNING: .TH request not found -- not man-page format?")))
     (woman-decode-region (point-min) (point-max))
-    (setq time (current-time)
-          time (+ (* (- (car time) (car start-time)) 65536)
-                  (- (cadr time) (cadr start-time))))
-    (message "WoMan formatting buffer...done in %d seconds" time)
+    (setq time (float-time (time-since start-time)))
+    (message "WoMan formatting buffer...done in %g seconds" time)
     (WoMan-log-end time))
   (run-hooks 'woman-post-format-hook))
 
@@ -4529,7 +4527,7 @@ IGNORED is a string appended to the log message."
   "Log the end of formatting in *WoMan-Log*.
 TIME specifies the time it took to format the man page, to be printed
 with the message."
-  (WoMan-log-1 (format "Formatting time %d seconds." time) 'end))
+  (WoMan-log-1 (format "Formatting time %g seconds." time) 'end))
 
 (defun WoMan-log-1 (string &optional end)
   "Log a message STRING in *WoMan-Log*.