Merge from trunk.

243 files changed, 5667 insertions, 5669 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8b92eab8579..c1d943ccaf0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,809 @@
+2011-09-03  Chong Yidong  <cyd@stupidchicken.com>
+
+        * mail/sendmail.el (sendmail-query-once-function): Deleted.
+        (sendmail-query-once): Save directly to send-mail-function.
+        Update message-send-mail-function too.
+
+        * mail/smtpmail.el (smtpmail-try-auth-methods): Clarify prompt.
+
+2011-09-03  Christoph Scholtes  <cschol2112@googlemail.com>
+
+        * progmodes/python.el (python-mode-map): Use correct function to
+        start python interpreter from menu-bar (as reported by Geert
+        Kloosterman).
+        (inferior-python-mode-map): Fix typo.
+        (python-shell-map): Removed.
+
+2011-09-03  Deniz Dogan  <deniz@dogan.se>
+
+        * net/rcirc.el (rcirc-print): Simplify code for
+        rcirc-scroll-show-maximum-output.  There is no need to walk
+        through all windows to find the right one.
+
+2011-09-03  Christoph Scholtes  <cschol2112@googlemail.com>
+
+        * help.el (help-return-method): Doc fix.
+
+2011-09-03  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (window-deletable-p): Don't return a non-nil value
+        when there's a buffer that was shown in the window before.
+        (Bug#9419)
+        (display-buffer-pop-up-frame, display-buffer-pop-up-window): Set
+        window's previous buffers to nil.
+
+2011-09-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * mail/rmailmm.el (rmail-mime-insert-tagline): Insert an extra
+        newline before and after the tag line, so it doesn't interfere
+        with determining the paragraph direction of bidirectional text.
+
+2011-09-03  Leo Liu  <sdl.web@gmail.com>
+
+        * files.el (find-file-not-true-dirname-list): Remove.  (Bug#9422)
+
+2011-09-02  Chong Yidong  <cyd@stupidchicken.com>
+
+        * window.el (pop-to-buffer-1, pop-to-buffer-same-window): Deleted.
+        (pop-to-buffer): Change interactive spec.  Pass second argument
+        directly to display-buffer.
+        (display-buffer): Fix interactive spec.  Use functionp to
+        distinguish between a function and a list of functions.
+
+        * abbrev.el (edit-abbrevs):
+        * arc-mode.el (archive-extract):
+        * autoinsert.el (auto-insert):
+        * bookmark.el (bookmark-bmenu-list):
+        * files.el (find-file):
+        * view.el (view-buffer):
+        * progmodes/compile.el (compilation-goto-locus):
+        * textmodes/bibtex.el (bibtex-initialize): Use switch-to-buffer.
+
+2011-09-02  Chong Yidong  <cyd@stupidchicken.com>
+
+        * window.el (display-buffer-alist): Doc fix.
+        (display-buffer): Add docstring.  Don't treat
+        display-buffer-default specially.
+        (display-buffer-reuse-selected-window)
+        (display-buffer-same-window, display-buffer-maybe-same-window)
+        (display-buffer-reuse-window, display-buffer-pop-up-frame)
+        (display-buffer-pop-up-window)
+        (display-buffer-reuse-or-pop-window)
+        (display-buffer-use-some-window): New functions.
+        (display-buffer-default-action): Use them.
+        (display-buffer-default): Deleted.
+        (pop-to-buffer-1): Fix choice of actions.
+
+2011-09-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuffer.el (completion--insert-strings): Don't get confused by
+        completion entries that end with an LF char.
+
+2011-09-01  Eli Zaretskii  <eliz@gnu.org>
+
+        * window.el (frame-auto-delete, window-deletable-p): Doc fix.
+
+2011-09-01  Chong Yidong  <cyd@stupidchicken.com>
+
+        * window.el (display-buffer): Restore interactive spec.
+        (display-buffer-same-window, display-buffer-other-window):
+        New functions.
+        (pop-to-buffer-1): New function.  Use the above.
+        (pop-to-buffer, pop-to-buffer-same-window): Use it.
+        (pop-to-buffer-other-window, pop-to-buffer-other-frame): Delete.
+
+        * view.el (view-buffer-other-window, view-buffer-other-frame):
+        Just use pop-to-buffer.
+
+2011-09-01  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
+
+        * vc/vc-rcs.el (vc-rcs-responsible-p): Handle directories.  (Bug#9391)
+
+2011-09-01  Wilfred Hughes  <wilfred@potatolondon.com>  (tiny change)
+
+        * vc/vc-git.el (vc-git-grep): Use --no-color.  (Bug#9408)
+
+2011-08-31  Richard Stallman  <rms@gnu.org>
+
+        * mail/rmail.el (rmail-epa-decrypt): Rewrite to take account
+        of the separation of rmail-view-buffer from rmail-buffer.
+        If you say no to "replace original", the decrypt is in the
+        view buffer.  If you say yes, the decrypt goes into the
+        rmail buffer also.
+
+2011-08-31  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (display-buffer-window): Rewrite doc-string.
+        (display-buffer-record-window): New function.
+        (display-buffer-macro-specifiers)
+        (display-buffer-even-window-sizes, display-buffer-set-height)
+        (display-buffer-set-width, display-buffer-in-window)
+        (display-buffer-reuse-window, display-buffer-split-specifiers)
+        (display-buffer-side-specifiers, display-buffer-split-window-1)
+        (display-buffer-split-window, display-buffer-split-atom-window)
+        (display-buffer-pop-up-window, display-buffer-pop-up-frame)
+        (display-buffer-pop-up-side-window, display-buffer-in-side-window)
+        (display-buffer-other-window-means-other-frame)
+        (display-buffer-normalize-special)
+        (display-buffer-normalize-default)
+        (display-buffer-normalize-argument)
+        (display-buffer-normalize-alist-1, display-buffer-normalize-alist)
+        (display-buffer-normalize-specifiers, display-buffer-frame)
+        (display-buffer-same-window, display-buffer-same-frame)
+        (display-buffer-other-window)
+        (display-buffer-same-frame-other-window)
+        (display-buffer-other-frame, pop-to-buffer-same-window)
+        (pop-to-buffer-same-frame, pop-to-buffer-other-window)
+        (pop-to-buffer-same-frame-other-window, pop-to-buffer-other-frame)
+        (switch-to-buffer-same-frame)
+        (switch-to-buffer-other-window-same-frame)
+        (display-buffer-alist-of-strings-p, display-buffer-alist-add)
+        (display-buffer-alist-set-1, display-buffer-alist-set-2)
+        (display-buffer-alist-set): Remove.
+        (display-buffer-function, special-display-buffer-names)
+        (special-display-regexps, special-display-function):
+        In doc-string refer to display-buffer-window and quit-restore
+        parameter.
+        (pop-up-frame-alist, pop-up-frame-function, special-display-p)
+        (special-display-frame-alist, special-display-popup-frame)
+        (same-window-buffer-names, same-window-regexps, same-window-p)
+        (pop-up-frames, display-buffer-reuse-frames, pop-up-windows)
+        (split-window-preferred-function, split-height-threshold)
+        (split-width-threshold, window-splittable-p)
+        (split-window-sensibly, window--try-to-split-window)
+        (window--frame-usable-p, even-window-heights)
+        (window--even-window-heights, window--display-buffer-1)
+        (window--display-buffer-2, display-buffer-other-frame):
+        Restore old Emacs 23 code, order and doc-strings where applicable.
+        (display-buffer-default, display-buffer-assq-regexp): New functions.
+        (display-buffer-alist): Rewrite doc-string.
+        (display-buffer-default-action)
+        (display-buffer-overriding-action): New variables.
+        (display-buffer, switch-to-buffer): Rewrite.
+        (pop-to-buffer): Restore Emacs 23 behavior but use
+        window-normalize-buffer-to-display.
+        (switch-to-buffer-other-window, switch-to-buffer-other-frame):
+        Restore Emacs 23 behavior but use
+        window-normalize-buffer-to-switch-to.
+        (pop-to-buffer-same-window): Rewrite.
+        (pop-to-buffer-other-window, pop-to-buffer-other-frame):
+        Rewrite using Emacs 23 options.
+
+2011-08-31  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-root-regexp): Remove.
+        (tramp-completion-file-name-regexp-unified)
+        (tramp-completion-file-name-regexp-separate)
+        (tramp-completion-file-name-regexp-url): Don't use leading volume
+        letter on win32 systems.  (Bug#5303, Bug#9311)
+        (tramp-drop-volume-letter): Simplify definition.
+        Suggested by Stefan Monnier <monnier@iro.umontreal.ca>.
+
+2011-08-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * subr.el (event-modifiers): Fix "missing modifier" part of docstring
+        (bug#9356).
+
+2011-08-30  Reuben Thomas  <rrt@sc3d.org>  (tiny change)
+
+        * vc/pcvs-defs.el (cvs-find-file-and-jump): Docstring typo (bug#9369).
+
+2011-08-29  Juri Linkov  <juri@jurta.org>
+
+        * isearch.el (isearch-done): Don't display message "Mark saved"
+        when arg `edit' is non-nil to prevent its flicker in the echo area.
+
+2011-08-28  Chong Yidong  <cyd@stupidchicken.com>
+
+        * emacs-lisp/package.el (package-menu-mark-delete): Allow marking
+        obsolete packages for deletion.
+
+2011-08-28  Christoph Scholtes  <cschol2112@googlemail.com>
+
+        * help-mode.el (help-mode-map): Add special-mode-map to parent.
+        (help-mode): Derive help-mode from special-mode. Don't invoke
+        view-mode from help-mode.
+        (help-xref-override-view-map): Remove.
+        (help-make-xrefs): Remove minor-mode-overriding-map-alist since
+        view-mode is not used anymore.
+
+2011-08-28  Chong Yidong  <cyd@stupidchicken.com>
+
+        * server.el (server-port): Doc fix.
+
+        * cus-theme.el (custom-theme-choose-mode): Inherit from
+        special-mode (Bug#9124).
+        (custom-theme-choose-mode-map): Add special-mode to parent.
+
+2011-08-28  Alan Mackenzie  <acm@muc.de>
+
+        * progmodes/cc-fonts.el
+        (c-make-font-lock-BO-decl-search-function): New function.
+        (c-basic-matchers-after - "Fontify the clauses after various
+        keywords"): Extract the three keyword lists for the 3 erroneous
+        constructs from the list of four, and use the new function above
+        in place of an old one.
+
+2011-08-28  Deniz Dogan  <deniz@dogan.se>
+
+        * net/rcirc.el (rcirc-insert-prev-input)
+        (rcirc-insert-next-input): Remove unused argument.
+
+2011-08-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * shell.el (shell-parse-pcomplete-arguments): Unquote args (bug#9160).
+
+2011-08-27  Alan Mackenzie  <acm@muc.de>
+
+        * progmodes/cc-menus.el (cc-imenu-c++-generic-expression): Make it
+        handle function pointer parameters properly.
+
+2011-08-27  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (display-buffer-reuse-window): Fix case where
+        selected window was reused with non-nil OTHER-WINDOW argument.
+        (Bug#9381)
+
+2011-08-27  Deniz Dogan  <deniz@dogan.se>
+
+        * net/rcirc.el (rcirc-check-auth-status): Adding support for
+        oftc's NickServ messages.
+
+2011-08-27  Glenn Morris  <rgm@gnu.org>
+
+        * saveplace.el (save-place-limit): Make it finite.  (Bug#9352)
+
+2011-08-26  Chong Yidong  <cyd@stupidchicken.com>
+
+        * emacs-lisp/package.el (package-install): Call package-initialize
+        if called interactively.
+
+2011-08-26  Leo Liu  <sdl.web@gmail.com>
+
+        * emacs-lisp/cl-macs.el (defstruct): Fix format.  (Bug#9357)
+
+2011-08-25  Juri Linkov  <juri@jurta.org>
+
+        * isearch.el (isearch-occur): Let-bind `search-spaces-regexp' to
+        `search-whitespace-regexp' (bug#9364).
+
+2011-08-25  Juri Linkov  <juri@jurta.org>
+
+        * isearch.el (isearch-edit-string): Let-bind `search-ring' and
+        `regexp-search-ring' to their global values to protect from
+        updating by `read-from-minibuffer' (bug#9185).
+
+2011-08-25  Juri Linkov  <juri@jurta.org>
+
+        * textmodes/ispell.el (ispell-command-loop): Add newline
+        at the end of the "Use option `i'..." line.
+
+2011-08-25  Juri Linkov  <juri@jurta.org>
+
+        * battery.el (display-battery-mode): If `battery-status-function'
+        or `battery-mode-line-format' is nil, display the message and set
+        `display-battery-mode' to nil (bug#9363).
+
+2011-08-25  Eli Zaretskii  <eliz@gnu.org>
+
+        * buff-menu.el (Buffer-menu-buffer+size): Remove calls to
+        bidi-string-mark-left-to-right; they are unnecessary now.
+
+2011-08-25  Deniz Dogan  <deniz@dogan.se>
+
+        * net/quickurl.el: Documentation typo fixes.
+
+2011-08-25  Chong Yidong  <cyd@stupidchicken.com>
+
+        * window.el (bury-buffer, quit-window): Use bury-buffer-internal.
+
+2011-08-25  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/derived.el (define-derived-mode): Doc fix.
+
+        * mail/smtpmail.el (smtpmail-smtp-user): Add version: tag.
+        (smtpmail-via-smtp): Handle nil response from smtp.
+
+2011-08-24  Juri Linkov  <juri@jurta.org>
+
+        * proced.el (proced-marked): Inherit from `error' instead of
+        `font-lock-warning-face'.
+
+        * ibuffer.el (ibuffer-marked-face): Change default face from
+        `font-lock-warning-face' to `warning'.
+        (ibuffer-deletion-face): Change default face from
+        `font-lock-type-face' to `error'.
+
+        * battery.el (battery-update): Use the face `error' instead of
+        `font-lock-warning-face' (bug#6117).
+
+2011-08-24  Juri Linkov  <juri@jurta.org>
+
+        * faces.el (success): Change face color from "Green3" to
+        "ForestGreen" on light background (bug#9353).
+
+2011-08-24  Chong Yidong  <cyd@stupidchicken.com>
+
+        * window.el (quit-window): Rename from quit-restore-window.
+        Use same arglist as old quit-window.
+        (frame-auto-delete): Doc fix.
+
+        * view.el (view-mode-exit): Use quit-window.
+
+2011-08-24  Juri Linkov  <juri@jurta.org>
+
+        * isearch.el (isearch-ring-adjust1): Start visiting previous
+        search strings from the index 0 (-1 + 1) instead of 1 (0 + 1).
+        (isearch-repeat, isearch-edit-string): Call `isearch-ring-adjust1'
+        for empty search string (when the last search string is reused
+        automatically) to adjust the isearch ring to the last element and
+        prepare the correct index for further M-p commands (bug#9185).
+
+2011-08-24  Kenichi Handa  <handa@m17n.org>
+
+        * international/ucs-normalize.el: If decomposition property of
+        CHAR is the default one (i.e. a list of CHAR itself), treat it as
+        nil.
+        (nfd, nfkd): Likewise.
+
+2011-08-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * mpc.el (mpc--proc-filter): Don't signal mpc-proc-error since signals
+        from process filters aren't reliably transmitted to the surrounding
+        accept-process-output.
+        (mpc-proc-check): New function.
+        (mpc-proc-sync): Use it (bug#8293)
+
+2011-08-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/eieio.el (eieio-defmethod, eieio-defgeneric):
+        Add compatibility functions (bug#9313).
+
+2011-08-23  Eli Zaretskii  <eliz@gnu.org>
+
+        * cus-start.el (all): Add entry for bidi-paragraph-direction.
+
+        * international/uni-bidi.el: Regenerated.
+
+2011-08-23  Kenichi Handa  <handa@m17n.org>
+
+        * 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.
+
+2011-08-23  Martin Rudalics  <rudalics@gmx.at>
+
+        * help.el (help-window-setup): Fix message displayed when other
+        window is reused.  (Bug#9341)
+
+2011-08-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * shell.el (shell-completion-vars): Set pcomplete-arg-quote-list.
+        * pcomplete.el (pcomplete-quote-argument): Fix thinko (bug#9161).
+
+        * pcomplete.el (pcomplete-parse-comint-arguments): Fix inf-loop.
+        Mark obsolete.
+        * shell.el (shell-parse-pcomplete-arguments): New function.
+        (shell-completion-vars): Use it instead (bug#9160).
+
+2011-08-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/sh-script.el (sh-maybe-here-document): Disable magic in
+        strings and comments (bug#9333).
+
+        * emacs-lisp/debug.el (debug-arglist): New function.
+        (debug-convert-byte-code): Use it.  Handle lexical byte-codes.
+        (debug-on-entry-1): Handle interpreted closures (bug#9120).
+
+2011-08-22  Juri Linkov  <juri@jurta.org>
+
+        * progmodes/compile.el (compilation-mode-font-lock-keywords):
+        Revert regexp that highlights output switches to its old
+        pre-2010-10-28 value and remove one `?' from it (bug#9319).
+
+        * progmodes/grep.el (grep-process-setup): Use `buffer-modified-p'
+        to check for empty output (bug#9226).
+
+2011-08-22  Chong Yidong  <cyd@stupidchicken.com>
+
+        * progmodes/scheme.el (scheme-mode-syntax-table): Don't use
+        symbol-constituent as the default, as that stops font-lock from
+        working properly (Bug#8843).
+
+2011-08-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * mail/smtpmail.el (smtpmail-via-smtp): Only bind
+        `coding-system-for-*' around the process open call to avoid
+        auth-source side effects.
+        (smtpmail-try-auth-methods): Expand the secret password.
+        (smtpmail-query-smtp-server): Allow `quit'-ing out in case the
+        probe hangs.
+
+2011-08-21  Chong Yidong  <cyd@stupidchicken.com>
+
+        * term.el (term-mouse-paste): Yank primary selection (Bug#6845).
+
+        * emacs-lisp/find-func.el (find-function-noselect): New arg
+        lisp-only.
+
+        * emacs-lisp/edebug.el (edebug-instrument-function): Use it to
+        signal an error for built-in functions (Bug#6664).
+
+2011-08-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * mail/smtpmail.el (smtpmail-smtp-user): New variable.
+        (smtpmail-try-auth-methods): Use it.
+
+2011-08-21  Chong Yidong  <cyd@stupidchicken.com>
+
+        * font-lock.el (font-lock-fontify-region)
+        (font-lock-unfontify-region, font-lock-default-fontify-buffer)
+        (font-lock-default-unfontify-buffer)
+        (font-lock-default-fontify-region)
+        (font-lock-default-unfontify-region): Add docstrings (Bug#8624).
+
+        * progmodes/compile.el (compilation-error-properties):
+        Fix confusion between file struct and message struct (Bug#9319).
+        (compilation-error-regexp-alist-alist): Fix 2011-05-09 change to
+        `ant' regexp.
+
+        * net/browse-url.el (browse-url-firefox): Don't call
+        browse-url-firefox-sentinel unless using -remote (Bug#9328).
+
+2011-08-20  Glenn Morris  <rgm@gnu.org>
+
+        * tutorial.el (help-with-tutorial): Avoid an error on short screens.
+
+        * tutorial.el (tutorial--default-keys): Update some default bindings.
+
+        * files.el (hack-local-variables): Fully ignore case for "mode:".
+
+2011-08-20  Alan Mackenzie  <acm@muc.de>
+
+        Resolve invalid use of a regexp in regexp-opt.
+
+        * cc-fonts.el (c-complex-decl-matchers): Add in special detection
+        for a java annotation.
+
+        * cc-engine.el (c-forward-decl-or-cast-1): Add in special
+        detection for a java annotation.
+
+        * cc-langs.el (c-prefix-spec-kwds-re): Remove the special handling
+        for java.
+        (c-modifier-kwds): Remove the regexp "@[A-za-z0-9]+".
+
+2011-08-20  Chong Yidong  <cyd@stupidchicken.com>
+
+        * startup.el (normal-top-level-add-subdirs-to-load-path): Doc fix
+        (Bug#9274).
+
+2011-08-20  Alan Mackenzie  <acm@muc.de>
+
+        * Fontify CPP expressions correctly when starting in the middle of
+        such a construct.  Mainly for when jit-lock etc. starts a chunk
+        here.
+
+        * progmodes/cc-fonts.el (c-font-lock-context): new buffer local
+        variable.
+        (c-make-font-lock-search-form): new function, extracted from
+        c-make-font-lock-search-function.
+        (c-make-font-lock-search-function): Use the above function.
+        (c-make-font-lock-context-search-function): New function.
+        (c-cpp-matchers): Enhance the preprocessor expression case with
+        the above function
+        (c-font-lock-complex-decl-prepare): Test for being in a CPP form
+        which takes an expression.
+
+        * progmodes/cc-langs.el (c-cpp-expr-intro-re): New lang-variable.
+
+2011-08-20  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (display-buffer-reuse-window)
+        (display-buffer-pop-up-window): Don't reuse or split a side
+        window.
+
+2011-08-19  Glenn Morris  <rgm@gnu.org>
+
+        * files.el (hack-local-variables-prop-line, hack-local-variables):
+        Downcase "Mode:". (Bug#9331)
+
+2011-08-18  Chong Yidong  <cyd@stupidchicken.com>
+
+        * international/characters.el: Add L and R categories.
+
+        * subr.el (bidi-string-mark-left-to-right): Rename from
+        string-mark-left-to-right.  Use category search.
+
+        * buff-menu.el (Buffer-menu-buffer+size): Callers changed.
+
+2011-08-18  Juri Linkov  <juri@jurta.org>
+
+        * faces.el (error, warning, success): New faces with definitions
+        copied from old default values of `font-lock-warning-face',
+        `compilation-warning', `compilation-info' (bug#6117).
+
+        * font-lock.el (font-lock-warning-face): Inherit from `error'.
+
+        * progmodes/compile.el (compilation-error): Inherit from `error'.
+        (compilation-warning): Inherit from `warning'.
+        (compilation-info): Inherit from `success'.
+
+        * dired.el (dired-marked): Inherit from `warning'.
+        (dired-flagged): Inherit from `error'.
+
+2011-08-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * mail/smtpmail.el (auth-source): Require to avoid problems with
+        binding variables (bug#9298).  Also clean up some unused
+        autoloads.
+
+        * net/network-stream.el (network-stream-open-starttls):
+        Support using starttls.el without using gnutls-cli.
+
+2011-08-17  Juri Linkov  <juri@jurta.org>
+
+        * progmodes/grep.el (rgrep): Handle the case when
+        `grep-find-command' is a cons cell (bug#9278).
+
+2011-08-17  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (display-buffer-pop-up-frame): Run frame creation
+        function with BUFFER current (as special-display-popup-frame
+        does).  Reported by Drew Adams.
+
+2011-08-17  Daiki Ueno  <ueno@unixuser.org>
+
+        * epa-mail.el: Simplify GnuPG group expansion using
+        epg-expand-group.
+        (epa-mail-group-alist, epa-mail-group-modtime)
+        (epa-mail-gnupg-conf-file, epa-mail-parse-groups)
+        (epa-mail-sync-groups, epa-mail-expand-recipient-1)
+        (epa-mail-expand-recipients-2, epa-mail-expand-recipients):
+        Remove.
+
+2011-08-16  Feng Li <fengli@gmail.com> (tiny change)
+
+        * calc/calc-ext.el (math-defintegral-2): Remove nested backquote.
+
+2011-08-16  Alan Mackenzie  <acm@muc.de>
+
+        * progmodes/cc-engine.el (c-state-cache-non-literal-place):
+        Correct, to avoid the inside of macros.
+
+2011-08-16  Richard Stallman  <rms@gnu.org>
+
+        * epa-mail.el: Handle GnuPG group definitions.
+        (epa-mail-group-alist, epa-mail-group-modtime)
+        (epa-mail-gnupg-conf-file): New variables.
+        (epa-mail-parse-groups, epa-mail-sync-groups)
+        (epa-mail-expand-recipient-1, epa-mail-expand-recipients-2)
+        (epa-mail-expand-recipients): New functions.
+        (epa-mail-encrypt): Call epa-mail-expand-recipients.
+
+        * mail/rmail.el (rmail-epa-decrypt): New command.
+
+        * epa.el (epa-decrypt-region): New arg MAKE-BUFFER-FUNCTION.
+        Don't bind buffer-read-only, just inhibit-read-only.
+        (epa--find-coding-system-for-mime-charset): Fix the non-xemacs case.
+        (epa-decrypt-armor-in-region): Make error message clearer.
+
+2011-08-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuffer.el (completion-pcm--merge-completions): Don't merge "a1b"
+        and "a2b" to "ab" for `prefix'.
+
+2011-08-14  Chong Yidong  <cyd@stupidchicken.com>
+
+        * ibuf-ext.el (ibuffer-filter-disable): New arg for deleting
+        filter groups.
+        (ibuffer-included-in-filter-p-1): Use it.  Suggested by Rafaël
+        Fourquet (Bug#8804).
+
+2011-08-12  Juanma Barranquero  <lekktu@gmail.com>
+
+        * startup.el (argi): Declare as global variable (bug#9275).
+
+2011-08-12  Chong Yidong  <cyd@stupidchicken.com>
+
+        * subr.el (string-mark-left-to-right): Search the entire string
+        for RTL script, not just the terminating character.  Doc fix.
+
+2011-08-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/js.el (js-syntax-propertize, js-syntax-propertize-regexp):
+        New function.
+        (js--regexp-literal, js-syntax-propertize-function): Remove.
+        (js-mode): Use js-syntax-propertize to handle multilines (bug#9183).
+        (js-mode-map): Don't rebind electric keys.
+        (js-insert-and-indent): Remove.
+        (js-mode): Setup electric-layout and electric-indent instead.
+
+        * epa-file.el (epa-file-select-keys): Revert to nil default (bug#9280).
+
+2011-08-12  Daiki Ueno  <ueno@unixuser.org>
+
+        * epa.el (epa-progress-callback-function): Fix the logic of
+        displaying progress.
+        * epa-file.el (epa-file-insert-file-contents): Make progress
+        display more user-friendly.
+        (epa-file-write-region): Ditto.
+
+2011-08-10  Chong Yidong  <cyd@stupidchicken.com>
+
+        * subr.el (string-mark-left-to-right): New function.
+
+        * buff-menu.el (Buffer-menu-buffer+size): Remove LRM argument.
+        Use string-mark-left-to-right.
+        (list-buffers-noselect): Caller changed.
+
+        * emacs-lisp/tabulated-list.el (tabulated-list-print-entry):
+        Use string-mark-left-to-right.
+        (tabulated-list-print): Recenter after moving point.
+
+2011-08-10  Juri Linkov  <juri@jurta.org>
+
+        * progmodes/grep.el (rgrep): Don't bind `process-connection-type'.
+        This finishes incomplete reversion of 2011-06-30T01:09:13Z!larsi@gnus.org
+        intended by 2011-07-06T15:49:19Z!larsi@gnus.org.
+
+2011-08-09  Chong Yidong  <cyd@stupidchicken.com>
+
+        * hi-lock.el (hi-lock-unface-buffer): Fix interactive spec
+        (Bug#7554).
+
+2011-08-09  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * xt-mouse.el (xterm-mouse-event-read): Try to recover the raw
+        character.  (Bug#6594)
+
+2011-08-08  Chong Yidong  <cyd@stupidchicken.com>
+
+        * image-dired.el: Don't use find-file for temporary work (Bug#7895).
+        (image-dired--with-db-file): New macro.
+        (image-dired-write-tags, image-dired-remove-tag)
+        (image-dired-create-gallery-lists, image-dired-write-comments)
+        (image-dired-get-comment, image-dired-mark-tagged-files)
+        (image-dired-list-tags, image-dired-gallery-generate): Use it.
+        (image-dired-gallery-generate): Use insert-file-contents.
+
+        * time.el (display-time-world-list, display-time-world-display):
+        * time-stamp.el (time-stamp-string):
+        * vc/add-log.el (add-change-log-entry): Use setenv instead of
+        set-time-zone-rule (Bug#7337).
+
+2011-08-08  Daiki Ueno  <ueno@unixuser.org>
+
+        * epg.el (epg--status-KEYEXPIRED, epg--status-KEYREVOKED): Fix typo.
+        (epg-error-to-string, epg-errors-to-string): New function.
+        (epg-wait-for-completion): Reverse errors list.
+        (epg--check-error-for-decrypt, epg-sign-file, epg-sign-string)
+        (epg-encrypt-file, epg-encrypt-string, epg-export-keys-to-file)
+        (epg--import-keys-1, epg-receive-keys, epg-delete-keys)
+        (epg-sign-keys, epg-generate-key-from-file)
+        (epg-generate-key-from-string): Format errors by using
+        epg-errors-to-string (bug#9255).
+        (epg--status-INV_SGNR, epg--status-NO_SGNR): New status handler.
+
+2011-08-07  Juri Linkov  <juri@jurta.org>
+
+        * faces.el (list-faces-display): Remove extra angle bracket
+        from `help-mode-map'.
+
+        * info.el (Info-history-toc-nodes): Doc fix.
+
+        * longlines.el (longlines-mode): Doc fix.
+
+2011-08-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/js.el (js--regexp-literal): Accept regexps at the beginning
+        of statements and in a few more cases (bug#9183).
+
+        * emacs-lisp/cl-macs.el (cl--make-usage-var, cl--make-usage-args):
+        New functions.
+        (cl-transform-lambda): Use them (bug#9239).
+
+2011-08-05  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (display-buffer-same-window)
+        (display-buffer-same-frame, display-buffer-other-window)
+        (pop-to-buffer-same-window, pop-to-buffer-same-frame)
+        (pop-to-buffer-other-window)
+        (pop-to-buffer-same-frame-other-window)
+        (pop-to-buffer-other-frame): Make them defuns.
+        (switch-to-buffer): Don't set LABEL argument of pop-to-buffer.
+
+2011-08-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * subr.el (make-composed-keymap): Move from C.  Change calling
+        convention, and improve docstring to bring attention to a subtle point.
+        * minibuffer.el (completing-read-default): Adjust accordingly.
+
+2011-08-03  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-open-connection-setup-interactive-shell)
+        (tramp-open-shell): Use `tramp-shell-quote-argument'.
+
+        * net/trampver.el: Update release number.
+
+2011-08-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/sh-script.el (sh-font-lock-paren): Don't mistake "main" for
+        "in" (bug#9190).
+
+2011-08-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * mail/sendmail.el (sendmail-query-once): Restore the current
+        buffer after querying (bug#9074).
+
+        * dired.el (dired-flagged): Use different faces for marked and
+        flagged files (bug#6117).
+
+        * emacs-lisp/cl-macs.el (dolist): Mention that there's a nil block
+        (bug#4433).
+
+        * ido.el (ido-mode): Switch off the message if called
+        non-interactively.
+
+        * mail/smtpmail.el (smtpmail-query-smtp-server): Try port 25
+        before 587, since it appears that that's more likely to work for
+        more people.
+
+        * cus-edit.el (custom-file): When running under emacs -q, always
+        refuse to save the customisations, even if the .emacs file doesn't
+        exist.
+
+        * info.el: Remove the `Info-beginning-of-buffer' function
+        (bug#8325).
+
+        * net/network-stream.el (network-stream-open-starttls):
+        Use `starttls-available-p' to see whether starttls.el can be used.
+
+2011-08-01  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (display-buffer-in-window): Don't set dedicated status
+        of window here (Bug#9215).
+        (display-buffer-pop-up-window, display-buffer-pop-up-frame)
+        (display-buffer-pop-up-side-window)
+        (display-buffer-in-side-window): Set dedicated status of window here.
+
+2011-08-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/package.el (package-generate-autoloads): Load autoloads
+        before binding generated-autoload-file.
+
+2011-08-01  Deniz Dogan  <deniz@dogan.se>
+
+        * net/rcirc.el (rcirc-handler-333): Clarify docstring.
+
+2011-07-30  Michael Albinus  <michael.albinus@gmx.de>
+
+        Sync with Tramp 2.2.2.
+
+        * net/trampver.el: Update release number.
+
+2011-07-30  Juri Linkov  <juri@jurta.org>
+
+        * dired-aux.el (dired-touch-initial): Remove function.
+        (dired-do-chxxx): For op-symbol `touch', set `initial' to the
+        current time, and `default' to the last modification time of the
+        current marked file (bug#6887).
+
 2011-07-28  Jose E. Marchesi  <jemarch@gnu.org>
 
         * simple.el (goto-line): Use string-to-number to provide a
-        numeric argument to read-number.
+        numeric argument to read-number (bug#9163).
 
 2011-07-27  Michael Albinus  <michael.albinus@gmx.de>
 
@@ -28,8 +830,8 @@
         QT keyword "more" to prevent "more slots: ...." being spuriously
         parsed as a bitfield declaraion.
 
-        * progmodes/cc-engine.el (c-beginning-of-statement-1): Refactor
-        and enhance to handle bitfield declarations.
+        * progmodes/cc-engine.el (c-beginning-of-statement-1):
+        Refactor and enhance to handle bitfield declarations.
         (c-punctuation-in): New function.
         (c-forward-decl-or-cast-1): Enhance CASE 3 to handle bitfield
         declarations properly.
@@ -38,7 +840,7 @@
 
         * calendar/icalendar.el (icalendar--all-events): Take care of
         multiple vcalendars in a single file.
-        (icalendar--convert-float-to-ical): checkdoc fixes.
+        (icalendar--convert-float-to-ical): Checkdoc fixes.
 
 2011-07-25  Deniz Dogan  <deniz@dogan.se>
 
@@ -72,8 +874,7 @@
         (display-buffer-pop-up-side-window)
         (display-buffer-in-side-window): Call display-buffer-set-height
         and display-buffer-set-width after setting the new window's
-        buffer so `fit-window-to-buffer' and friends work on the right
-        buffer.
+        buffer so `fit-window-to-buffer' and friends work on the right buffer.
 
 2011-07-20  Sam Steingold  <sds@gnu.org>
 
@@ -105,8 +906,8 @@
 2011-07-19  Martin Rudalics  <rudalics@gmx.at>
 
         * window.el (display-buffer-alist-of-strings-p)
-        (display-buffer-alist-set-1, display-buffer-alist-set-2): New
-        functions.
+        (display-buffer-alist-set-1, display-buffer-alist-set-2):
+        New functions.
         (display-buffer-alist-set): Rewrite to handle Emacs 23 options
         more accurately.
 
@@ -117,8 +918,8 @@
 
         * progmodes/cc-langs.el (c-symbol-chars): Correct a typo.
 
-        * progmodes/cc-fonts.el (c-font-lock-enclosing-decls): New
-        function.
+        * progmodes/cc-fonts.el (c-font-lock-enclosing-decls):
+        New function.
         (c-complex-decl-matchers): Insert reference to
         c-font-lock-enclosing-decls.
 
@@ -137,7 +938,7 @@
 
 2011-07-16  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-        * net/gnutls.el (gnutls-log-level): Removed.
+        * net/gnutls.el (gnutls-log-level): Remove.
 
         * textmodes/fill.el (adaptive-fill-regexp): Include EN DASH as an
         indentation character (bug#6380).
@@ -159,11 +960,10 @@
 
 2011-07-16  Martin Rudalics  <rudalics@gmx.at>
 
-        * frame.el (select-frame-set-input-focus): New argument
-        NORECORD.
+        * frame.el (select-frame-set-input-focus): New argument NORECORD.
         * window.el (pop-to-buffer): Select window used even if it was
-        selected before, see discussion of (Bug#8615), (Bug#6954).  Pass
-        argument NORECORD on to select-frame-set-input-focus.
+        selected before, see discussion of (Bug#8615), (Bug#6954).
+        Pass argument NORECORD on to select-frame-set-input-focus.
 
 2011-07-15  Glenn Morris  <rgm@gnu.org>
 
@@ -177,8 +977,8 @@
 
 2011-07-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-        * net/gnutls.el (gnutls-negotiate): Upcase
-        `gnutls-algorithm-priority'.
+        * net/gnutls.el (gnutls-negotiate):
+        Upcase `gnutls-algorithm-priority'.
 
 2011-07-15  Glenn Morris  <rgm@gnu.org>
 
@@ -253,15 +1053,12 @@
         (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.
+        * 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).
@@ -277,8 +1074,8 @@
 
 2011-07-14  Martin Rudalics  <rudalics@gmx.at>
 
-        * window.el (display-buffer-normalize-special): Replace
-        `dedicated' by `dedicate' to dedicate window (Bug#9072).
+        * window.el (display-buffer-normalize-special):
+        Replace `dedicated' by `dedicate' to dedicate window (Bug#9072).
 
 2011-07-14  Eli Zaretskii  <eliz@gnu.org>
 
@@ -299,7 +1096,7 @@
         switch-to-buffer.
 
         * net/tramp-compat.el (tramp-compat-pop-to-buffer-same-window):
-        Deleted.
+        Delete.
 
 2011-07-14  Juanma Barranquero  <lekktu@gmail.com>
 
@@ -317,8 +1114,8 @@
 
 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.
+        * 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.
@@ -343,8 +1140,8 @@
 
 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).
+        * 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>
 
@@ -438,15 +1235,15 @@
 
 2011-07-12  Roland Winkler  <winkler@gnu.org>
 
-        * textmodes/bibtex.el (bibtex-initialize): Use
-        pop-to-buffer-same-window.
+        * 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.
+        Fontise bytecomp Error lines more correctly (bug#2490).
+        Fix suggested by Johan Bockgård.
 
         * subr.el (remove-duplicates): Remove; `delete-dups' is sufficient.
 
@@ -459,8 +1256,8 @@
 
 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
+        * 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.
@@ -525,16 +1322,15 @@
 
 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).
+        * 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-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)
@@ -549,11 +1345,10 @@
         (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.
+        (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
+        (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>
diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15
index 190be56dd09..2acf847cddc 100644
--- a/lisp/ChangeLog.15
+++ b/lisp/ChangeLog.15
@@ -3573,7 +3573,7 @@
         * locate.el (locate-default-make-command-line): Don't consider
         drive letter and root directory part of
         `directory-listing-before-filename-regexp'.  (Bug#7308)
-        (locate-post-command-hook, locate-post-command-hook): New defcustoms.
+        (locate-post-command-hook, locate-mode-hook): New defcustoms.
 
 2010-11-27  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index 3795dd46010..5a7a741a3a6 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)
-  (pop-to-buffer-same-window (prepare-abbrev-list-buffer)))
+  (switch-to-buffer (prepare-abbrev-list-buffer)))
 
 (defun edit-abbrevs-redefine ()
   "Redefine abbrevs according to current buffer contents."
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index ea875b9989d..e3d1955ded5 100644
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -1083,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 (pop-to-buffer-same-window buffer))))))
+           (t (switch-to-buffer buffer))))))
 
 (defun archive-*-extract (archive name command)
   (let* ((default-directory (file-name-as-directory archive-tmpdir))
diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el
index 3b849cece22..5793c3180be 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
-                     (pop-to-buffer-same-window (current-buffer))
+                     (switch-to-buffer (current-buffer))
                      (if (and (consp action)
                               (not (eq (car action) 'lambda)))
                          (skeleton-insert action)
diff --git a/lisp/battery.el b/lisp/battery.el
index d7d3045fa58..f5c01fbef58 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -173,13 +173,16 @@ seconds."
   (setq battery-mode-line-string "")
   (or global-mode-string (setq global-mode-string '("")))
   (and battery-update-timer (cancel-timer battery-update-timer))
-  (if (not display-battery-mode)
-      (setq global-mode-string
-            (delq 'battery-mode-line-string global-mode-string))
-    (add-to-list 'global-mode-string 'battery-mode-line-string t)
-    (setq battery-update-timer (run-at-time nil battery-update-interval
-                                            'battery-update-handler))
-    (battery-update)))
+  (if (and battery-status-function battery-mode-line-format)
+      (if (not display-battery-mode)
+          (setq global-mode-string
+                (delq 'battery-mode-line-string global-mode-string))
+        (add-to-list 'global-mode-string 'battery-mode-line-string t)
+        (setq battery-update-timer (run-at-time nil battery-update-interval
+                                                'battery-update-handler))
+        (battery-update))
+    (message "Battery status not available")
+    (setq display-battery-mode nil)))
 
 (defun battery-update-handler ()
   (battery-update)
@@ -199,7 +202,7 @@ seconds."
                       'face
                       (and (<= (car (read-from-string (cdr (assq ?p data))))
                                    battery-load-critical)
-                           'font-lock-warning-face)
+                           'error)
                       'help-echo "Battery status information")))
   (force-mode-line-update))
 
diff --git a/lisp/bindings.el b/lisp/bindings.el
index c4f9369219a..57bfeb60f82 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -834,6 +834,7 @@ if `inhibit-field-text-motion' is non-nil."
     (setq i (1+ i))))
 (define-key global-map [?\C-\M--] 'negative-argument)
 
+;; Update tutorial--default-keys if you change these.
 (define-key global-map "\177" 'delete-backward-char)
 (define-key global-map "\C-d" 'delete-char)
 
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index bb7ad153e8b..51e869e3a21 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1539,7 +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)
-        (pop-to-buffer-same-window buf)
+        (switch-to-buffer buf)
       (set-buffer buf)))
   (let ((inhibit-read-only t))
     (erase-buffer)
diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index f0a44747378..2be74cf5efb 100644
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -666,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 lrm)
+(defun Buffer-menu-buffer+size (name size &optional name-props size-props)
   (if (> (+ (string-width name) (string-width size) 2)
          Buffer-menu-buffer+size-width)
       (setq name
@@ -681,17 +681,9 @@ For more information, see the function `buffer-menu'."
                           (string-width tail)
                           2))
                       Buffer-menu-short-ellipsis
-                      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) ""))))
+                      tail)))
     ;; Don't put properties on (buffer-name).
-    (setq name (concat (copy-sequence name)
-                       (if lrm
-                           (propertize (string ?\x200e) 'invisible t)
-                         ""))))
+    (setq name (copy-sequence name)))
   (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
@@ -929,8 +921,7 @@ For more information, see the function `buffer-menu'."
                                                    (max (length size) 3)
                                                    2))
                                             name
-                                          "mouse-2: select this buffer"))
-                         nil t))
+                                          "mouse-2: select this buffer"))))
                 "  "
                 (if (> (string-width (nth 4 buffer)) Buffer-menu-mode-width)
                     (truncate-string-to-width (nth 4 buffer)
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index 6e05cdb07e5..8b816665d97 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -2887,7 +2887,7 @@ If X is not an error form, return 1."
   (cons 'progn
         (mapcar #'(lambda (func)
                     `(put ',func 'math-integral-2
-                          `(nconc
+                          (nconc
                             (get ',func 'math-integral-2)
                             (list #'(lambda (u v) ,@code)))))
                 (if (symbolp funcs) (list funcs) funcs))))
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 60d7690a3c8..093e592c475 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-30  Chong Yidong  <cyd@stupidchicken.com>
+
+        * semantic/grammar.el (semantic-grammar-insert-defanalyzers): Fix
+        require.
+
 2011-07-04  Darren Hoo  <darren.hoo@gmail.com>  (tiny change)
 
         * semantic/db.el (semanticdb-file-table-object): Don't bug out on
diff --git a/lisp/cedet/semantic/bovine/c-by.el b/lisp/cedet/semantic/bovine/c-by.el
index 8e1fe8d3617..31489a4f625 100644
--- a/lisp/cedet/semantic/bovine/c-by.el
+++ b/lisp/cedet/semantic/bovine/c-by.el
@@ -19,8 +19,7 @@
 
 ;;; Commentary:
 ;;
-;; This file was generated from the grammar file semantic/bovine/c.by
-;; in the CEDET repository.
+;; This file was generated from etc/grammars/c.by.
 
 ;;; Code:
 
diff --git a/lisp/cedet/semantic/bovine/make-by.el b/lisp/cedet/semantic/bovine/make-by.el
index 3cc4e5b23a3..41da728d537 100644
--- a/lisp/cedet/semantic/bovine/make-by.el
+++ b/lisp/cedet/semantic/bovine/make-by.el
@@ -19,8 +19,7 @@
 
 ;;; Commentary:
 ;;
-;; This file was generated from the grammar file
-;; semantic/bovine/make.by in the CEDET repository.
+;; This file was generated from etc/grammars/make.by.
 
 ;;; Code:
 
diff --git a/lisp/cedet/semantic/bovine/scm-by.el b/lisp/cedet/semantic/bovine/scm-by.el
index 87efe747a4c..8dd170384bc 100644
--- a/lisp/cedet/semantic/bovine/scm-by.el
+++ b/lisp/cedet/semantic/bovine/scm-by.el
@@ -19,8 +19,7 @@
 
 ;;; Commentary:
 ;;
-;; This file was generated from the grammar file
-;; semantic/bovine/scm.by in the CEDET repository.
+;; This file was generated from etc/grammars/scm.by.
 
 ;;; Code:
 
diff --git a/lisp/cedet/semantic/grammar.el b/lisp/cedet/semantic/grammar.el
index 270668e2959..1d1184e534f 100644
--- a/lisp/cedet/semantic/grammar.el
+++ b/lisp/cedet/semantic/grammar.el
@@ -801,7 +801,7 @@ Block definitions are read from the current table of lexical types."
     (with-current-buffer semantic--grammar-input-buffer
       (setq tokens (semantic-grammar-tokens)
             props  (semantic-grammar-token-properties tokens)))
-    (insert "(require 'semantic-lex)\n\n")
+    (insert "(require 'semantic/lex)\n\n")
     (let ((semantic-lex-types-obarray
            (semantic-lex-make-type-table tokens props))
           semantic-grammar--lex-block-specs)
diff --git a/lisp/cedet/semantic/wisent/javat-wy.el b/lisp/cedet/semantic/wisent/javat-wy.el
index adea4ef6932..38c19387440 100644
--- a/lisp/cedet/semantic/wisent/javat-wy.el
+++ b/lisp/cedet/semantic/wisent/javat-wy.el
@@ -19,8 +19,7 @@
 
 ;;; Commentary:
 ;;
-;; This file was generated from the grammar file
-;; semantic/wisent/wisent-java-tags.wy in the CEDET repository.
+;; This file was generated from etc/java-tags.wy.
 
 ;;; Code:
 
diff --git a/lisp/cedet/semantic/wisent/js-wy.el b/lisp/cedet/semantic/wisent/js-wy.el
index e982caf4485..b523db8771b 100644
--- a/lisp/cedet/semantic/wisent/js-wy.el
+++ b/lisp/cedet/semantic/wisent/js-wy.el
@@ -1,6 +1,7 @@
 ;;; semantic/wisent/js-wy.el --- Generated parser support file
 
 ;; Copyright (C) 2005, 2009-2011  Free Software Foundation, Inc.
+;; Copyright (C) Ecma International.
 
 ;; This file is part of GNU Emacs.
 
@@ -19,8 +20,7 @@
 
 ;;; Commentary:
 ;;
-;; This file was generated from the grammar file
-;; semantic/wisent/wisent-javascript-jv.wy in the CEDET repository.
+;; This file was generated from etc/grammars/javascript-jv.wy.
 
 ;;; Code:
 (require 'semantic/lex)
diff --git a/lisp/cedet/semantic/wisent/python-wy.el b/lisp/cedet/semantic/wisent/python-wy.el
index 3a69078b02c..36965757a14 100644
--- a/lisp/cedet/semantic/wisent/python-wy.el
+++ b/lisp/cedet/semantic/wisent/python-wy.el
@@ -1,6 +1,7 @@
 ;;; semantic/wisent/python-wy.el --- Generated parser support file
 
 ;; Copyright (C) 2002-2004, 2007, 2010-2011  Free Software Foundation, Inc.
+;; Copyright (C) 2001-2010 Python Software Foundation
 
 ;; This file is part of GNU Emacs.
 
@@ -19,8 +20,7 @@
 
 ;;; Commentary:
 ;;
-;; This file was generated from the grammar file
-;; semantic/wisent/wisent-python.wy in the CEDET repository.
+;; This file was generated from etc/grammars/python.wy.
 
 ;;; Code:
 
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index d443d6c160c..3e41a304f43 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -4409,25 +4409,14 @@ if only the first line of the docstring is shown."))
 
 (defun custom-file (&optional no-error)
   "Return the file name for saving customizations."
-  (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 (null user-init-file)
+      ;; Started with -q, i.e. the file containing Custom settings
+      ;; hasn't been read.  Saving settings there won't make much
+      ;; sense.
+      (if no-error
+          nil
+        (error "Saving settings from \"emacs -q\" would overwrite existing customizations"))
+    (file-chase-links (or custom-file user-init-file))))
 
 ;; If recentf-mode is non-nil, this is defined.
 (declare-function recentf-expand-file-name "recentf" (name))
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 389716b35b9..232c6c3808e 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -118,6 +118,13 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                                   :standard (not noninteractive)
                                   :initialize custom-initialize-delay
                                   :set custom-set-minor-mode)
+             (bidi-paragraph-direction
+              paragraphs
+              (choice
+               (const :tag "Left to Right" left-to-right)
+               (const :tag "Right to Left" right-to-left)
+               (const :tag "Dynamic, according to paragraph text" nil))
+              "24.1")
              ;; callint.c
              (mark-even-if-inactive editing-basics boolean)
              ;; callproc.c
diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el
index 04a9e728b22..1f33c3e8256 100644
--- a/lisp/cus-theme.el
+++ b/lisp/cus-theme.el
@@ -521,7 +521,8 @@ It includes all faces in list FACES."
 
 (defvar custom-theme-choose-mode-map
   (let ((map (make-keymap)))
-    (set-keymap-parent map widget-keymap)
+    (set-keymap-parent map (make-composed-keymap widget-keymap
+                                                 special-mode-map))
     (suppress-keymap map)
     (define-key map "\C-x\C-s" 'custom-theme-save)
     (define-key map "n" 'widget-forward)
@@ -530,7 +531,7 @@ It includes all faces in list FACES."
     map)
   "Keymap for `custom-theme-choose-mode'.")
 
-(define-derived-mode custom-theme-choose-mode nil "Themes"
+(define-derived-mode custom-theme-choose-mode special-mode "Themes"
   "Major mode for selecting Custom themes.
 Do not call this mode function yourself.  It is meant for internal use."
   (use-local-map custom-theme-choose-mode-map)
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 3103fbd5a7f..ec157fc4939 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -226,34 +226,28 @@ List has a form of (file-name full-file-name (attribute-list))."
              (file-attributes full-file-name))))
    (directory-files dir)))
 
-
-(defun dired-touch-initial (files)
-  "Create initial input value for `touch' command."
-  ;; Nobody can explain what this version is supposed to do.  (Bug#6887)
-  ;; Also, the manual says it uses "the present time".
-  ;;; (let (initial)
-  ;;;   (while files
-  ;;;     (let ((current (nth 5 (file-attributes (car files)))))
-  ;;;       (if (and initial (not (equal initial current)))
-  ;;;           (setq initial (current-time) files nil)
-  ;;;         (setq initial current))
-  ;;;       (setq files (cdr files))))
-  ;;;   (format-time-string "%Y%m%d%H%M.%S" initial)))
-  (format-time-string "%Y%m%d%H%M.%S" (current-time)))
+;;; Change file attributes
 
 (defun dired-do-chxxx (attribute-name program op-symbol arg)
-  ;; Change file attributes (mode, group, owner, timestamp) of marked files and
+  ;; Change file attributes (group, owner, timestamp) of marked files and
   ;; refresh their file lines.
   ;; ATTRIBUTE-NAME is a string describing the attribute to the user.
   ;; PROGRAM is the program used to change the attribute.
-  ;; OP-SYMBOL is the type of operation (for use in dired-mark-pop-up).
-  ;; ARG describes which files to use, as in dired-get-marked-files.
+  ;; OP-SYMBOL is the type of operation (for use in `dired-mark-pop-up').
+  ;; ARG describes which files to use, as in `dired-get-marked-files'.
   (let* ((files (dired-get-marked-files t arg))
+         (initial
+          (if (eq op-symbol 'touch)
+              (format-time-string "%Y%m%d%H%M.%S")))
+         (default
+           (if (eq op-symbol 'touch)
+               (and (stringp (car files))
+                    (format-time-string "%Y%m%d%H%M.%S"
+                                        (nth 5 (file-attributes (car files)))))))
          (new-attribute
           (dired-mark-read-string
            (concat "Change " attribute-name " of %s to: ")
-           (if (eq op-symbol 'touch) (dired-touch-initial files))
-           op-symbol arg files))
+           initial op-symbol arg files default))
          (operation (concat program " " new-attribute))
          failures)
     (setq failures
diff --git a/lisp/dired.el b/lisp/dired.el
index 01d41bba27d..ecb626a275e 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -342,7 +342,7 @@ Subexpression 2 must end right before the \\n or \\r.")
   "Face name used for dired marks.")
 
 (defface dired-marked
-  '((t (:inherit font-lock-warning-face)))
+  '((t (:inherit warning)))
   "Face used for marked files."
   :group 'dired-faces
   :version "22.1")
@@ -350,7 +350,7 @@ Subexpression 2 must end right before the \\n or \\r.")
   "Face name used for marked files.")
 
 (defface dired-flagged
-  '((t (:inherit font-lock-warning-face)))
+  '((t (:inherit error)))
   "Face used for files flagged for deletion."
   :group 'dired-faces
   :version "22.1")
@@ -3663,7 +3663,7 @@ 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" "ab62f310329f404f96a29e4f0ab8df73")
+;;;;;;  dired-diff) "dired-aux" "dired-aux.el" "bbb53a5b6bf56c413fe0f898559bef8d")
 ;;; Generated autoloads from dired-aux.el
 
 (autoload 'dired-diff "dired-aux" "\
diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el
index 270211f6a78..d6512306ad1 100644
--- a/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@ -282,7 +282,7 @@ Not documented
 ;;;;;;  flet progv psetq do-all-symbols do-symbols dotimes dolist
 ;;;;;;  do* do loop return-from return block etypecase typecase ecase
 ;;;;;;  case load-time-value eval-when destructuring-bind function*
-;;;;;;  defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "9452c0e16fd960fce5c19e5c067a7160")
+;;;;;;  defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "cc8cbd8c86e2facbe61986e992e6c508")
 ;;; Generated autoloads from cl-macs.el
 
 (autoload 'gensym "cl-macs" "\
@@ -426,6 +426,7 @@ The Common Lisp `do*' loop.
 Loop over a list.
 Evaluate BODY with VAR bound to each `car' from LIST, in turn.
 Then evaluate RESULT to get return value, default nil.
+An implicit nil block is established around the loop.
 
 \(fn (VAR LIST [RESULT]) BODY...)" nil (quote macro))
 
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index d6b4643d6a4..d9531cc5261 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -238,6 +238,37 @@ It is a list of elements of the form either:
 
 (declare-function help-add-fundoc-usage "help-fns" (docstring arglist))
 
+(defun cl--make-usage-var (x)
+  "X can be a var or a (destructuring) lambda-list."
+  (cond
+   ((symbolp x) (make-symbol (upcase (symbol-name x))))
+   ((consp x) (cl--make-usage-args x))
+   (t x)))
+
+(defun cl--make-usage-args (arglist)
+  ;; `orig-args' can contain &cl-defs (an internal
+  ;; CL thingy I don't understand), so remove it.
+  (let ((x (memq '&cl-defs arglist)))
+    (when x (setq arglist (delq (car x) (remq (cadr x) arglist)))))
+  (let ((state nil))
+    (mapcar (lambda (x)
+              (cond
+               ((symbolp x)
+                (if (eq ?\& (aref (symbol-name x) 0))
+                    (setq state x)
+                  (make-symbol (upcase (symbol-name x)))))
+               ((not (consp x)) x)
+               ((memq state '(nil &rest)) (cl--make-usage-args x))
+               (t        ;(VAR INITFORM SVAR) or ((KEYWORD VAR) INITFORM SVAR).
+                (list*
+                 (if (and (consp (car x)) (eq state '&key))
+                     (list (caar x) (cl--make-usage-var (nth 1 (car x))))
+                   (cl--make-usage-var (car x)))
+                 (nth 1 x)                          ;INITFORM.
+                 (cl--make-usage-args (nthcdr 2 x)) ;SVAR.
+                 ))))
+            arglist)))
+
 (defun cl-transform-lambda (form bind-block)
   (let* ((args (car form)) (body (cdr form)) (orig-args args)
          (bind-defs nil) (bind-enquote nil)
@@ -282,11 +313,8 @@ It is a list of elements of the form either:
                         (require 'help-fns)
                         (cons (help-add-fundoc-usage
                                (if (stringp (car hdr)) (pop hdr))
-                               ;; orig-args can contain &cl-defs (an internal
-                               ;; CL thingy I don't understand), so remove it.
-                               (let ((x (memq '&cl-defs orig-args)))
-                                 (if (null x) orig-args
-                                   (delq (car x) (remq (cadr x) orig-args)))))
+                               (format "(fn %S)"
+                                       (cl--make-usage-args orig-args)))
                               hdr)))
                     (list (nconc (list 'let* bind-lets)
                                  (nreverse bind-forms) body)))))))
@@ -1233,6 +1261,7 @@ Valid clauses are:
   "Loop over a list.
 Evaluate BODY with VAR bound to each `car' from LIST, in turn.
 Then evaluate RESULT to get return value, default nil.
+An implicit nil block is established around the loop.
 
 \(fn (VAR LIST [RESULT]) BODY...)"
   (let ((temp (make-symbol "--cl-dolist-temp--")))
@@ -2387,9 +2416,8 @@ value, that slot cannot be set via `setf'.
                         (append
                          (and pred-check
                               (list (list 'or pred-check
-                                          (list 'error
-                                                (format "%s accessing a non-%s"
-                                                        accessor name)))))
+                                          `(error "%s accessing a non-%s"
+                                                  ',accessor ',name))))
                          (list (if (eq type 'vector) (list 'aref 'cl-x pos)
                                  (if (= pos 0) '(car cl-x)
                                    (list 'nth pos 'cl-x)))))) forms)
@@ -2397,9 +2425,8 @@ value, that slot cannot be set via `setf'.
               (push (list 'define-setf-method accessor '(cl-x)
                              (if (cadr (memq :read-only (cddr desc)))
                                  (list 'progn '(ignore cl-x)
-                                       (list 'error
-                                             (format "%s is a read-only slot"
-                                                     'accessor)))
+                                       `(error "%s is a read-only slot"
+                                               ',accessor))
                                ;; If cl is loaded only for compilation,
                                ;; the call to cl-struct-setf-expander would
                                ;; cause a warning because it may not be
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 157749500e7..8276030ccf8 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -778,6 +778,7 @@ Redefining FUNCTION also cancels it."
                          (not (debugger-special-form-p symbol))))
                 t nil nil (symbol-name fn)))
      (list (if (equal val "") fn (intern val)))))
+  ;; FIXME: Use advice.el.
   (when (debugger-special-form-p function)
     (error "Function %s is a special form" function))
   (if (or (symbolp (symbol-function function))
@@ -835,24 +836,30 @@ To specify a nil argument interactively, exit with an empty minibuffer."
     (message "Cancelling debug-on-entry for all functions")
     (mapcar 'cancel-debug-on-entry debug-function-list)))
 
+(defun debug-arglist (definition)
+  ;; FIXME: copied from ad-arglist.
+  "Return the argument list of DEFINITION."
+  (require 'help-fns)
+  (help-function-arglist definition 'preserve-names))
+
 (defun debug-convert-byte-code (function)
   (let* ((defn (symbol-function function))
          (macro (eq (car-safe defn) 'macro)))
     (when macro (setq defn (cdr defn)))
-    (unless (consp defn)
-      ;; Assume a compiled code object.
-      (let* ((contents (append defn nil))
+    (when (byte-code-function-p defn)
+      (let* ((args (debug-arglist defn))
              (body
-              (list (list 'byte-code (nth 1 contents)
-                          (nth 2 contents) (nth 3 contents)))))
-        (if (nthcdr 5 contents)
-            (setq body (cons (list 'interactive (nth 5 contents)) body)))
-        (if (nth 4 contents)
+              `((,(if (memq '&rest args) #'apply #'funcall)
+                 ,defn
+                 ,@(remq '&rest (remq '&optional args))))))
+        (if (> (length defn) 5)
+            (push `(interactive ,(aref defn 5)) body))
+        (if (aref defn 4)
             ;; Use `documentation' here, to get the actual string,
             ;; in case the compiled function has a reference
             ;; to the .elc file.
             (setq body (cons (documentation function) body)))
-        (setq defn (cons 'lambda (cons (car contents) body))))
+        (setq defn `(closure (t) ,args ,@body)))
       (when macro (setq defn (cons 'macro defn)))
       (fset function defn))))
 
@@ -861,11 +868,12 @@ To specify a nil argument interactively, exit with an empty minibuffer."
          (tail defn))
     (when (eq (car-safe tail) 'macro)
       (setq tail (cdr tail)))
-    (if (not (eq (car-safe tail) 'lambda))
+    (if (not (memq (car-safe tail) '(closure lambda)))
         ;; Only signal an error when we try to set debug-on-entry.
         ;; When we try to clear debug-on-entry, we are now done.
         (when flag
           (error "%s is not a user-defined Lisp function" function))
+      (if (eq (car tail) 'closure) (setq tail (cdr tail)))
       (setq tail (cdr tail))
       ;; Skip the docstring.
       (when (and (stringp (cadr tail)) (cddr tail))
@@ -875,9 +883,9 @@ To specify a nil argument interactively, exit with an empty minibuffer."
         (setq tail (cdr tail)))
       (unless (eq flag (equal (cadr tail) '(implement-debug-on-entry)))
         ;; Add/remove debug statement as needed.
-        (if flag
-            (setcdr tail (cons '(implement-debug-on-entry) (cdr tail)))
-          (setcdr tail (cddr tail)))))
+        (setcdr tail (if flag
+                         (cons '(implement-debug-on-entry) (cdr tail))
+                       (cddr tail)))))
     defn))
 
 (defun debugger-list-functions ()
diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el
index 4fda2bf1d52..81932f9940a 100644
--- a/lisp/emacs-lisp/derived.el
+++ b/lisp/emacs-lisp/derived.el
@@ -133,10 +133,10 @@ BODY can start with a bunch of keyword arguments.  The following keyword
         Declare the customization group that corresponds to this mode.
         The command `customize-mode' uses this.
 :syntax-table TABLE
-        Use TABLE instead of the default.
+        Use TABLE instead of the default (CHILD-syntax-table).
         A nil value means to simply use the same syntax-table as the parent.
 :abbrev-table TABLE
-        Use TABLE instead of the default.
+        Use TABLE instead of the default (CHILD-abbrev-table).
         A nil value means to simply use the same abbrev-table as the parent.
 
 Here is how you could define LaTeX-Thesis mode as a variant of LaTeX mode:
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index f84de0308bf..57d25c9e169 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -3408,7 +3408,7 @@ go to the end of the last sexp, or if that is the same point, then step."
       (message "%s is already instrumented." func)
       func)
      (t
-      (let ((loc (find-function-noselect func)))
+      (let ((loc (find-function-noselect func t)))
         (unless (cdr loc)
           (error "Could not find the definition in its file"))
         (with-current-buffer (car loc)
diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index 83c09b6fe0f..f1fe9594fc0 100644
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -1312,20 +1312,20 @@ Summary:
 (defun eieio--defmethod (method kind argclass code)
   "Work part of the `defmethod' macro defining METHOD with ARGS."
   (let ((key
-    ;; find optional keys
+         ;; find optional keys
          (cond ((or (eq ':BEFORE kind)
                     (eq ':before kind))
-                 method-before)
+                method-before)
                ((or (eq ':AFTER kind)
                     (eq ':after kind))
-                 method-after)
+                method-after)
                ((or (eq ':PRIMARY kind)
                     (eq ':primary kind))
-                 method-primary)
+                method-primary)
                ((or (eq ':STATIC kind)
                     (eq ':static kind))
-                 method-static)
-                ;; Primary key
+                method-static)
+               ;; Primary key
                (t method-primary))))
     ;; Make sure there is a generic (when called from defclass).
     (eieio--defalias
@@ -1338,8 +1338,8 @@ Summary:
     ;; under the type `primary' which is a non-specific calling of the
     ;; function.
     (if argclass
-          (if (not (class-p argclass))
-              (error "Unknown class type %s in method parameters"
+        (if (not (class-p argclass))
+            (error "Unknown class type %s in method parameters"
                    argclass))
       (if (= key -1)
           (signal 'wrong-type-argument (list :static 'non-class-arg)))
@@ -2864,6 +2864,106 @@ of `eq'."
 )
 
 
+;;; Obsolete backward compatibility functions.
+;; Needed to run byte-code compiled with the EIEIO of Emacs-23.
+
+(defun eieio-defmethod (method args)
+  "Obsolete work part of an old version of the `defmethod' macro."
+  (let ((key nil) (body nil) (firstarg nil) (argfix nil) (argclass nil) loopa)
+    ;; find optional keys
+    (setq key
+          (cond ((or (eq ':BEFORE (car args))
+                     (eq ':before (car args)))
+                 (setq args (cdr args))
+                 method-before)
+                ((or (eq ':AFTER (car args))
+                     (eq ':after (car args)))
+                 (setq args (cdr args))
+                 method-after)
+                ((or (eq ':PRIMARY (car args))
+                     (eq ':primary (car args)))
+                 (setq args (cdr args))
+                 method-primary)
+                ((or (eq ':STATIC (car args))
+                     (eq ':static (car args)))
+                 (setq args (cdr args))
+                 method-static)
+                ;; Primary key
+                (t method-primary)))
+    ;; get body, and fix contents of args to be the arguments of the fn.
+    (setq body (cdr args)
+          args (car args))
+    (setq loopa args)
+    ;; Create a fixed version of the arguments
+    (while loopa
+      (setq argfix (cons (if (listp (car loopa)) (car (car loopa)) (car loopa))
+                         argfix))
+      (setq loopa (cdr loopa)))
+    ;; make sure there is a generic
+    (eieio-defgeneric
+     method
+     (if (stringp (car body))
+         (car body) (format "Generically created method `%s'." method)))
+    ;; create symbol for property to bind to.  If the first arg is of
+    ;; the form (varname vartype) and `vartype' is a class, then
+    ;; that class will be the type symbol.  If not, then it will fall
+    ;; under the type `primary' which is a non-specific calling of the
+    ;; function.
+    (setq firstarg (car args))
+    (if (listp firstarg)
+        (progn
+          (setq argclass  (nth 1 firstarg))
+          (if (not (class-p argclass))
+              (error "Unknown class type %s in method parameters"
+                     (nth 1 firstarg))))
+      (if (= key -1)
+          (signal 'wrong-type-argument (list :static 'non-class-arg)))
+      ;; generics are higher
+      (setq key (eieio-specialized-key-to-generic-key key)))
+    ;; Put this lambda into the symbol so we can find it
+    (if (byte-code-function-p (car-safe body))
+        (eieiomt-add method (car-safe body) key argclass)
+      (eieiomt-add method (append (list 'lambda (reverse argfix)) body)
+                   key argclass))
+    )
+
+  (when eieio-optimize-primary-methods-flag
+    ;; Optimizing step:
+    ;;
+    ;; If this method, after this setup, only has primary methods, then
+    ;; we can setup the generic that way.
+    (if (generic-primary-only-p method)
+        ;; If there is only one primary method, then we can go one more
+        ;; optimization step.
+        (if (generic-primary-only-one-p method)
+            (eieio-defgeneric-reset-generic-form-primary-only-one method)
+          (eieio-defgeneric-reset-generic-form-primary-only method))
+      (eieio-defgeneric-reset-generic-form method)))
+
+  method)
+(make-obsolete 'eieio-defmethod 'eieio--defmethod "24.1")
+
+(defun eieio-defgeneric (method doc-string)
+  "Obsolete work part of an old version of the `defgeneric' macro."
+  (if (and (fboundp method) (not (generic-p method))
+           (or (byte-code-function-p (symbol-function method))
+               (not (eq 'autoload (car (symbol-function method)))))
+           )
+      (error "You cannot create a generic/method over an existing symbol: %s"
+             method))
+  ;; Don't do this over and over.
+  (unless (fboundp 'method)
+    ;; This defun tells emacs where the first definition of this
+    ;; method is defined.
+    `(defun ,method nil)
+    ;; Make sure the method tables are installed.
+    (eieiomt-install method)
+    ;; Apply the actual body of this function.
+    (fset method (eieio-defgeneric-form method doc-string))
+    ;; Return the method
+    'method))
+(make-obsolete 'eieio-defgeneric nil "24.1")
+
 ;;; Interfacing with edebug
 ;;
 (defun eieio-edebug-prin1-to-string (object &optional noescape)
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index 0194af2e3a8..2c7208db8a3 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -312,7 +312,7 @@ The search is done in the source for library LIBRARY."
               (cons (current-buffer) nil))))))))
 
 ;;;###autoload
-(defun find-function-noselect (function)
+(defun find-function-noselect (function &optional lisp-only)
   "Return a pair (BUFFER . POINT) pointing to the definition of FUNCTION.
 
 Finds the source file containing the definition of FUNCTION
@@ -320,6 +320,10 @@ in a buffer and the point of the definition.  The buffer is
 not selected.  If the function definition can't be found in
 the buffer, returns (BUFFER).
 
+If FUNCTION is a built-in function, this function normally
+attempts to find it in the Emacs C sources; however, if LISP-ONLY
+is non-nil, signal an error instead.
+
 If the file where FUNCTION is defined is not known, then it is
 searched for in `find-function-source-path' if non-nil, otherwise
 in `load-path'."
@@ -345,6 +349,8 @@ in `load-path'."
            (cond ((eq (car-safe def) 'autoload)
                   (nth 1 def))
                  ((subrp def)
+                  (if lisp-only
+                      (error "%s is a built-in function" function))
                   (help-C-file-name def 'subr))
                  ((symbol-file function 'defun)))))
       (find-function-search-for-symbol function nil library))))
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index e42103a7a01..caf0ec2e8b8 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -570,11 +570,11 @@ EXTRA-PROPERTIES is currently unused."
   file)
 
 (defun package-generate-autoloads (name pkg-dir)
+  (require 'autoload)         ;Load before we let-bind generated-autoload-file!
   (let* ((auto-name (concat name "-autoloads.el"))
          (ignore-name (concat name "-pkg.el"))
          (generated-autoload-file (expand-file-name auto-name pkg-dir))
          (version-control 'never))
-    (require 'autoload)
     (unless (fboundp 'autoload-ensure-default-file)
       (package-autoload-ensure-default-file generated-autoload-file))
     (update-directory-autoloads pkg-dir)))
@@ -852,18 +852,26 @@ using `package-compute-transaction'."
        (t
         (error "Unknown package kind: %s" (symbol-name kind)))))))
 
+(defvar package--initialized nil)
+
 ;;;###autoload
 (defun package-install (name)
   "Install the package named NAME.
-Interactively, prompt for the package name.
-The package is found on one of the archives in `package-archives'."
+NAME should be the name of one of the available packages in an
+archive in `package-archives'.  Interactively, prompt for NAME."
   (interactive
-   (list (intern (completing-read "Install package: "
-                                  (mapcar (lambda (elt)
-                                            (cons (symbol-name (car elt))
-                                                  nil))
-                                          package-archive-contents)
-                                  nil t))))
+   (progn
+     ;; Initialize the package system to get the list of package
+     ;; symbols for completion.
+     (unless package--initialized
+       (package-initialize t))
+     (list (intern (completing-read
+                    "Install package: "
+                    (mapcar (lambda (elt)
+                              (cons (symbol-name (car elt))
+                                    nil))
+                            package-archive-contents)
+                    nil t)))))
   (let ((pkg-desc (assq name package-archive-contents)))
     (unless pkg-desc
       (error "Package `%s' is not available for installation"
@@ -1076,8 +1084,6 @@ makes them available for download."
                       (car archive)))))
   (package-read-all-archive-contents))
 
-(defvar package--initialized nil)
-
 ;;;###autoload
 (defun package-initialize (&optional no-activate)
   "Load Emacs Lisp packages, and activate them.
@@ -1434,7 +1440,7 @@ If optional arg BUTTON is non-nil, describe its associated package."
 (defun package-menu-mark-delete (num)
   "Mark a package for deletion and move to the next line."
   (interactive "p")
-  (if (string-equal (package-menu-get-status) "installed")
+  (if (member (package-menu-get-status) '("installed" "obsolete"))
       (tabulated-list-put-tag "D" t)
     (forward-line)))
 
diff --git a/lisp/emacs-lisp/tabulated-list.el b/lisp/emacs-lisp/tabulated-list.el
index 2fdfa9525b1..75c9a01323d 100644
--- a/lisp/emacs-lisp/tabulated-list.el
+++ b/lisp/emacs-lisp/tabulated-list.el
@@ -258,7 +258,8 @@ to the entry with the same ID element as the current line."
     ;; If REMEMBER-POS was specified, move to the "old" location.
     (if saved-pt
         (progn (goto-char saved-pt)
-               (move-to-column saved-col))
+               (move-to-column saved-col)
+               (recenter))
       (goto-char (point-min)))))
 
 (defun tabulated-list-print-entry (id cols)
@@ -282,6 +283,7 @@ of column descriptors."
              (> (length label) width)
              (setq label (concat (substring label 0 (- width 3))
                                  "...")))
+        (setq label (bidi-string-mark-left-to-right label))
         (if (stringp desc)
             (insert (propertize label 'help-echo help-echo))
           (apply 'insert-text-button label (cdr desc)))
diff --git a/lisp/epa-file.el b/lisp/epa-file.el
index aa9915d8cfa..bef67ba4f69 100644
--- a/lisp/epa-file.el
+++ b/lisp/epa-file.el
@@ -35,7 +35,7 @@ way."
   :type 'boolean
   :group 'epa-file)
 
-(defcustom epa-file-select-keys 'silent
+(defcustom epa-file-select-keys nil
   "Control whether or not to pop up the key selection dialog.
 
 If t, always asks user to select recipients.
@@ -137,8 +137,10 @@ encryption is used."
      context
      (cons #'epa-file-passphrase-callback-function
            local-file))
-    (epg-context-set-progress-callback context
-                                       #'epa-progress-callback-function)
+    (epg-context-set-progress-callback
+     context
+     (cons #'epa-progress-callback-function
+           (format "Decrypting %s" file)))
     (unwind-protect
         (progn
           (if replace
@@ -211,8 +213,10 @@ encryption is used."
      context
      (cons #'epa-file-passphrase-callback-function
            file))
-    (epg-context-set-progress-callback context
-                                       #'epa-progress-callback-function)
+    (epg-context-set-progress-callback
+     context
+     (cons #'epa-progress-callback-function
+           (format "Encrypting %s" file)))
     (epg-context-set-armor context epa-armor)
     (condition-case error
         (setq string
diff --git a/lisp/epa-mail.el b/lisp/epa-mail.el
index a3f11f78675..9d7542b3980 100644
--- a/lisp/epa-mail.el
+++ b/lisp/epa-mail.el
@@ -51,7 +51,8 @@
   nil " epa-mail" epa-mail-mode-map)
 
 (defun epa-mail--find-usable-key (keys usage)
-  "Find a usable key from KEYS for USAGE."
+  "Find a usable key from KEYS for USAGE.
+USAGE would be `sign' or `encrypt'."
   (catch 'found
     (while keys
       (let ((pointer (epg-key-sub-key-list (car keys))))
@@ -116,6 +117,7 @@ Don't use this command in Lisp programs!"
   (interactive
    (save-excursion
      (let ((verbose current-prefix-arg)
+           (config (epg-configuration))
            (context (epg-make-context epa-protocol))
            recipients-string recipients recipient-key sign)
        (goto-char (point-min))
@@ -140,6 +142,17 @@ Don't use this command in Lisp programs!"
            (setq recipients (delete ""
                                     (split-string recipients
                                                   "[ \t\n]*,[ \t\n]*"))))
+
+       ;; Process all the recipients thru the list of GnuPG groups.
+       ;; Expand GnuPG group names to what they stand for.
+       (setq recipients
+             (apply #'nconc
+                    (mapcar
+                     (lambda (recipient)
+                       (or (epg-expand-group config recipient)
+                           (list recipient)))
+                     recipients)))
+
        (goto-char (point-min))
        (if (search-forward mail-header-separator nil t)
            (forward-line))
diff --git a/lisp/epa.el b/lisp/epa.el
index d4f4fab2eed..f0ec1ece0d1 100644
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -651,10 +651,17 @@ If SECRET is non-nil, list secret keys instead of public keys."
 
 (defun epa-progress-callback-function (_context what _char current total
                                                handback)
-  (message "%s%d%% (%d/%d)" (or handback
-                                (concat what ": "))
-           (if (> total 0) (floor (* (/ current (float total)) 100)) 0)
-           current total))
+  (let ((prompt (or handback
+                    (format "Processing %s: " what))))
+    ;; According to gnupg/doc/DETAIL: a "total" of 0 indicates that
+    ;; the total amount is not known. The condition TOTAL && CUR ==
+    ;; TOTAL may be used to detect the end of an operation.
+    (if (> total 0)
+        (if (= current total)
+            (message "%s...done" prompt)
+          (message "%s...%d%%" prompt
+                   (floor (* (/ current (float total)) 100))))
+      (message "%s..." prompt))))
 
 ;;;###autoload
 (defun epa-decrypt-file (file)
@@ -796,10 +803,15 @@ If no one is selected, symmetric encryption will be performed.  ")))
              (file-name-nondirectory cipher))))
 
 ;;;###autoload
-(defun epa-decrypt-region (start end)
+(defun epa-decrypt-region (start end &optional make-buffer-function)
   "Decrypt the current region between START and END.
 
-Don't use this command in Lisp programs!
+If MAKE-BUFFER-FUNCTION is non-nil, call it to prepare an output buffer.
+It should return that buffer.  If it copies the input, it should
+delete the text now being decrypted.  It should leave point at the
+proper place to insert the plaintext.
+
+Be careful about using this command in Lisp programs!
 Since this function operates on regions, it does some tricks such
 as coding-system detection and unibyte/multibyte conversion.  If
 you are sure how the data in the region should be treated, you
@@ -831,16 +843,19 @@ For example:
                    (or coding-system-for-read
                        (get-text-property start 'epa-coding-system-used)
                        'undecided)))
-      (if (y-or-n-p "Replace the original text? ")
-          (let ((inhibit-read-only t)
-                buffer-read-only)
-            (delete-region start end)
-            (goto-char start)
-            (insert plain))
-        (with-output-to-temp-buffer "*Temp*"
-          (set-buffer standard-output)
-          (insert plain)
-          (epa-info-mode)))
+      (if make-buffer-function
+          (with-current-buffer (funcall make-buffer-function)
+            (let ((inhibit-read-only t))
+              (insert plain)))
+        (if (y-or-n-p "Replace the original text? ")
+            (let ((inhibit-read-only t))
+              (delete-region start end)
+              (goto-char start)
+              (insert plain))
+          (with-output-to-temp-buffer "*Temp*"
+            (set-buffer standard-output)
+              (insert plain)
+              (epa-info-mode))))
       (if (epg-context-result-for context 'verify)
           (epa-display-info (epg-verify-result-to-string
                              (epg-context-result-for context 'verify)))))))
@@ -849,12 +864,13 @@ For example:
   (if (featurep 'xemacs)
       (if (fboundp 'find-coding-system)
           (find-coding-system mime-charset))
+    ;; Find the first coding system which corresponds to MIME-CHARSET.
     (let ((pointer (coding-system-list)))
       (while (and pointer
-                  (eq (coding-system-get (car pointer) 'mime-charset)
-                      mime-charset))
+                  (not (eq (coding-system-get (car pointer) 'mime-charset)
+                           mime-charset)))
         (setq pointer (cdr pointer)))
-      pointer)))
+      (car pointer))))
 
 ;;;###autoload
 (defun epa-decrypt-armor-in-region (start end)
@@ -873,7 +889,7 @@ See the reason described in the `epa-decrypt-region' documentation."
                 armor-end (re-search-forward "^-----END PGP MESSAGE-----$"
                                              nil t))
           (unless armor-end
-            (error "No armor tail"))
+            (error "Encryption armor beginning has no matching end"))
           (goto-char armor-start)
           (let ((coding-system-for-read
                  (or coding-system-for-read
diff --git a/lisp/epg.el b/lisp/epg.el
index 348ad970b14..9ca07e213b4 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -1069,6 +1069,59 @@ This function is for internal use only."
               (format " secret keys unchanged: %d\n"
                       (epg-import-result-secret-unchanged import-result)))))
 
+(defun epg-error-to-string (error)
+  (cond
+   ((eq (car error) 'exit)
+    "Exit")
+   ((eq (car error) 'quit)
+    "Cancelled")
+   ((eq (car error) 'no-data)
+    (let ((entry (assq (cdr error) epg-no-data-reason-alist)))
+      (if entry
+          (format "No data (%s)" (downcase (cdr entry)))
+        "No data")))
+   ((eq (car error) 'unexpected)
+    (let ((entry (assq (cdr error) epg-unexpected-reason-alist)))
+      (if entry
+          (format "Unexpected (%s)" (downcase (cdr entry)))
+        "Unexpected")))
+   ((eq (car error) 'bad-armor)
+    "Bad armor")
+   ((memq (car error) '(invalid-recipient invalid-signer))
+    (concat
+     (if (eq (car error) 'invalid-recipient)
+         "Unusable public key"
+       "Unusable secret key")
+     (let ((entry (assq 'requested (cdr error))))
+       (if entry
+           (format ": %s" (cdr entry))
+         ": <unknown>"))
+     (let ((entry (assq 'reason (cdr error))))
+       (if (and entry
+                (> (cdr entry) 0)       ;no specific reason given
+                (setq entry (assq (cdr entry)
+                                  epg-invalid-recipients-reason-alist)))
+           (format " (%s)" (downcase (cdr entry)))
+         ""))))
+   ((eq (car error) 'no-pubkey)
+    (format "No public key: %s" (cdr error)))
+   ((eq (car error) 'no-seckey)
+    (format "No secret key: %s" (cdr error)))
+   ((eq (car error) 'no-recipients)
+    "No recipients")
+   ((eq (car error) 'no-signers)
+    "No signers")
+   ((eq (car error) 'delete-problem)
+    (let ((entry (assq (cdr error) epg-delete-problem-reason-alist)))
+      (if entry
+          (format "Delete problem (%s)" (downcase (cdr entry)))
+        "Delete problem")))
+   ((eq (car error) 'key-not-created)
+    "Key not created")))
+
+(defun epg-errors-to-string (errors)
+  (mapconcat #'epg-error-to-string errors "; "))
+
 (defun epg--start (context args)
   "Start `epg-gpg-program' in a subprocess with given ARGS."
   (if (and (epg-context-process context)
@@ -1195,7 +1248,7 @@ This function is for internal use only."
     (if epg-pending-status-list
         (epg-context-set-result-for
          context 'error
-         (cons (list 'exit)
+         (cons '(exit)
                (epg-context-result-for context 'error))))))
 
 (defun epg-wait-for-completion (context)
@@ -1203,7 +1256,10 @@ This function is for internal use only."
   (while (eq (process-status (epg-context-process context)) 'run)
     (accept-process-output (epg-context-process context) 1))
   ;; This line is needed to run the process-filter right now.
-  (sleep-for 0.1))
+  (sleep-for 0.1)
+  (epg-context-set-result-for
+   context 'error
+   (nreverse (epg-context-result-for context 'error))))
 
 (defun epg-reset (context)
   "Reset the CONTEXT."
@@ -1399,11 +1455,22 @@ This function is for internal use only."
   (epg--status-*SIG context 'bad string))
 
 (defun epg--status-NO_PUBKEY (context string)
-  (let ((signature (car (epg-context-result-for context 'verify))))
-    (if (and signature
-             (eq (epg-signature-status signature) 'error)
-             (equal (epg-signature-key-id signature) string))
-        (epg-signature-set-status signature 'no-pubkey))))
+  (if (eq (epg-context-operation context) 'verify)
+      (let ((signature (car (epg-context-result-for context 'verify))))
+        (if (and signature
+                 (eq (epg-signature-status signature) 'error)
+                 (equal (epg-signature-key-id signature) string))
+            (epg-signature-set-status signature 'no-pubkey)))
+    (epg-context-set-result-for
+     context 'error
+     (cons (cons 'no-pubkey string)
+           (epg-context-result-for context 'error)))))
+
+(defun epg--status-NO_SECKEY (context string)
+  (epg-context-set-result-for
+   context 'error
+   (cons (cons 'no-seckey string)
+         (epg-context-result-for context 'error))))
 
 (defun epg--time-from-seconds (seconds)
   (let ((number-seconds (string-to-number (concat seconds ".0"))))
@@ -1564,13 +1631,13 @@ This function is for internal use only."
    context 'key
    (cons (list 'key-expired (cons 'expiration-time
                                   (epg--time-from-seconds string)))
-         (epg-context-result-for context 'error))))
+         (epg-context-result-for context 'key))))
 
 (defun epg--status-KEYREVOKED (context _string)
   (epg-context-set-result-for
    context 'key
    (cons '(key-revoked)
-         (epg-context-result-for context 'error))))
+         (epg-context-result-for context 'key))))
 
 (defun epg--status-BADARMOR (context _string)
   (epg-context-set-result-for
@@ -1585,7 +1652,18 @@ This function is for internal use only."
        (cons (list 'invalid-recipient
                    (cons 'reason
                          (string-to-number (match-string 1 string)))
-                   (cons 'requested-recipient
+                   (cons 'requested
+                         (match-string 2 string)))
+             (epg-context-result-for context 'error)))))
+
+(defun epg--status-INV_SGNR (context string)
+  (if (string-match "\\`\\([0-9]+\\) \\(.*\\)" string)
+      (epg-context-set-result-for
+       context 'error
+       (cons (list 'invalid-signer
+                   (cons 'reason
+                         (string-to-number (match-string 1 string)))
+                   (cons 'requested
                          (match-string 2 string)))
              (epg-context-result-for context 'error)))))
 
@@ -1595,6 +1673,12 @@ This function is for internal use only."
    (cons '(no-recipients)
          (epg-context-result-for context 'error))))
 
+(defun epg--status-NO_SGNR (context _string)
+  (epg-context-set-result-for
+   context 'error
+   (cons '(no-signers)
+         (epg-context-result-for context 'error))))
+
 (defun epg--status-DELETE_PROBLEM (context string)
   (if (string-match "\\`\\([0-9]+\\)" string)
       (epg-context-set-result-for
@@ -1960,17 +2044,13 @@ If you are unsure, use synchronous version of this function
     (epg-wait-for-status context '("BEGIN_DECRYPTION"))))
 
 (defun epg--check-error-for-decrypt (context)
-  (if (epg-context-result-for context 'decryption-failed)
-      (signal 'epg-error (list "Decryption failed")))
-  (if (epg-context-result-for context 'no-secret-key)
-      (signal 'epg-error
-              (list "No secret key"
-                    (epg-context-result-for context 'no-secret-key))))
+  (let ((errors (epg-context-result-for context 'error)))
+    (if (epg-context-result-for context 'decryption-failed)
+        (signal 'epg-error
+                (list "Decryption failed" (epg-errors-to-string errors))))
     (unless (epg-context-result-for context 'decryption-okay)
-      (let* ((error (epg-context-result-for context 'error)))
-        (if (assq 'no-data error)
-            (signal 'epg-error (list "No data")))
-        (signal 'epg-error (list "Can't decrypt" error)))))
+      (signal 'epg-error
+              (list "Can't decrypt" (epg-errors-to-string errors))))))
 
 (defun epg-decrypt-file (context cipher plain)
   "Decrypt a file CIPHER and store the result to a file PLAIN.
@@ -2165,10 +2245,9 @@ Otherwise, it makes a cleartext signature."
         (epg-start-sign context (epg-make-data-from-file plain) mode)
         (epg-wait-for-completion context)
         (unless (epg-context-result-for context 'sign)
-          (if (epg-context-result-for context 'error)
-              (error "Sign failed: %S"
-                     (epg-context-result-for context 'error))
-            (error "Sign failed")))
+          (let ((errors (epg-context-result-for context 'error)))
+            (signal 'epg-error
+                    (list "Sign failed" (epg-errors-to-string errors)))))
         (unless signature
           (epg-read-output context)))
     (unless signature
@@ -2203,9 +2282,9 @@ Otherwise, it makes a cleartext signature."
           (epg-wait-for-completion context)
           (unless (epg-context-result-for context 'sign)
             (if (epg-context-result-for context 'error)
-                (error "Sign failed: %S"
-                       (epg-context-result-for context 'error))
-              (error "Sign failed")))
+                (let ((errors (epg-context-result-for context 'error)))
+                  (signal 'epg-error
+                          (list "Sign failed" (epg-errors-to-string errors))))))
           (epg-read-output context))
       (epg-delete-output-file context)
       (if input-file
@@ -2276,15 +2355,14 @@ If RECIPIENTS is nil, it performs symmetric encryption."
         (epg-start-encrypt context (epg-make-data-from-file plain)
                            recipients sign always-trust)
         (epg-wait-for-completion context)
-        (if (and sign
-                 (not (epg-context-result-for context 'sign)))
-            (if (epg-context-result-for context 'error)
-                (error "Sign failed: %S"
-                       (epg-context-result-for context 'error))
-                (error "Sign failed")))
-        (if (epg-context-result-for context 'error)
-            (error "Encrypt failed: %S"
-                   (epg-context-result-for context 'error)))
+        (let ((errors (epg-context-result-for context 'error)))
+          (if (and sign
+                   (not (epg-context-result-for context 'sign)))
+              (signal 'epg-error
+                      (list "Sign failed" (epg-errors-to-string errors))))
+          (if errors
+              (signal 'epg-error
+                      (list "Encrypt failed" (epg-errors-to-string errors)))))
         (unless cipher
           (epg-read-output context)))
     (unless cipher
@@ -2317,15 +2395,14 @@ If RECIPIENTS is nil, it performs symmetric encryption."
                                (epg-make-data-from-string plain))
                              recipients sign always-trust)
           (epg-wait-for-completion context)
-          (if (and sign
-                   (not (epg-context-result-for context 'sign)))
-              (if (epg-context-result-for context 'error)
-                  (error "Sign failed: %S"
-                         (epg-context-result-for context 'error))
-                (error "Sign failed")))
-          (if (epg-context-result-for context 'error)
-              (error "Encrypt failed: %S"
-                     (epg-context-result-for context 'error)))
+          (let ((errors (epg-context-result-for context 'error)))
+            (if (and sign
+                     (not (epg-context-result-for context 'sign)))
+                (signal 'epg-error
+                        (list "Sign failed" (epg-errors-to-string errors))))
+            (if errors
+                (signal 'epg-error
+                        (list "Encrypt failed" (epg-errors-to-string errors)))))
           (epg-read-output context))
       (epg-delete-output-file context)
       (if input-file
@@ -2359,9 +2436,11 @@ If you are unsure, use synchronous version of this function
                                        (epg--make-temp-file "epg-output")))
         (epg-start-export-keys context keys)
         (epg-wait-for-completion context)
-        (if (epg-context-result-for context 'error)
-            (error "Export keys failed: %S"
-                   (epg-context-result-for context 'error)))
+        (let ((errors (epg-context-result-for context 'error)))
+          (if errors
+              (signal 'epg-error
+                      (list "Export keys failed"
+                            (epg-errors-to-string errors)))))
         (unless file
           (epg-read-output context)))
     (unless file
@@ -2398,9 +2477,11 @@ If you are unsure, use synchronous version of this function
       (progn
         (epg-start-import-keys context keys)
         (epg-wait-for-completion context)
-        (if (epg-context-result-for context 'error)
-            (error "Import keys failed: %S"
-                   (epg-context-result-for context 'error))))
+        (let ((errors (epg-context-result-for context 'error)))
+          (if errors
+              (signal 'epg-error
+                      (list "Import keys failed"
+                            (epg-errors-to-string errors))))))
     (epg-reset context)))
 
 (defun epg-import-keys-from-file (context keys)
@@ -2431,9 +2512,11 @@ KEYS is a list of key IDs"
       (progn
         (epg-start-receive-keys context keys)
         (epg-wait-for-completion context)
-        (if (epg-context-result-for context 'error)
-            (error "Receive keys failed: %S"
-                   (epg-context-result-for context 'error))))
+        (let ((errors (epg-context-result-for context 'error)))
+          (if errors
+              (signal 'epg-error
+                      (list "Receive keys failed"
+                            (epg-errors-to-string errors))))))
     (epg-reset context)))
 
 (defalias 'epg-import-keys-from-server 'epg-receive-keys)
@@ -2463,13 +2546,11 @@ If you are unsure, use synchronous version of this function
       (progn
         (epg-start-delete-keys context keys allow-secret)
         (epg-wait-for-completion context)
-        (let ((entry (assq 'delete-problem
-                           (epg-context-result-for context 'error))))
-          (if entry
-              (if (setq entry (assq (cdr entry)
-                                    epg-delete-problem-reason-alist))
-                  (error "Delete keys failed: %s" (cdr entry))
-                (error "Delete keys failed")))))
+        (let ((errors (epg-context-result-for context 'error)))
+          (if errors
+              (signal 'epg-error
+                      (list "Delete keys failed"
+                            (epg-errors-to-string errors))))))
     (epg-reset context)))
 
 (defun epg-start-sign-keys (context keys &optional local)
@@ -2498,9 +2579,11 @@ If you are unsure, use synchronous version of this function
       (progn
         (epg-start-sign-keys context keys local)
         (epg-wait-for-completion context)
-        (if (epg-context-result-for context 'error)
-            (error "Sign keys failed: %S"
-                   (epg-context-result-for context 'error))))
+        (let ((errors (epg-context-result-for context 'error)))
+          (if errors
+              (signal 'epg-error
+                      (list "Sign keys failed"
+                            (epg-errors-to-string errors))))))
     (epg-reset context)))
 (make-obsolete 'epg-sign-keys "do not use." "23.1")
 
@@ -2532,9 +2615,11 @@ PARAMETERS is a file which tells how to create the key."
       (progn
         (epg-start-generate-key context (epg-make-data-from-file parameters))
         (epg-wait-for-completion context)
-        (if (epg-context-result-for context 'error)
-            (error "Generate key failed: %S"
-                   (epg-context-result-for context 'error))))
+        (let ((errors (epg-context-result-for context 'error)))
+          (if errors
+              (signal 'epg-error
+                      (list "Generate key failed"
+                            (epg-errors-to-string errors))))))
     (epg-reset context)))
 
 (defun epg-generate-key-from-string (context parameters)
@@ -2544,9 +2629,11 @@ PARAMETERS is a string which tells how to create the key."
       (progn
         (epg-start-generate-key context (epg-make-data-from-string parameters))
         (epg-wait-for-completion context)
-        (if (epg-context-result-for context 'error)
-            (error "Generate key failed: %S"
-                   (epg-context-result-for context 'error))))
+        (let ((errors (epg-context-result-for context 'error)))
+          (if errors
+              (signal 'epg-error
+                      (list "Generate key failed"
+                            (epg-errors-to-string errors))))))
     (epg-reset context)))
 
 (defun epg--decode-percent-escape (string)
diff --git a/lisp/faces.el b/lisp/faces.el
index 302f8af35ac..3c4a3330c81 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1255,7 +1255,7 @@ arg, prompt for a regular expression."
         (insert
          (substitute-command-keys
           (concat
-           "\\<help-mode-map>>Use "
+           "\\<help-mode-map>Use "
            (if (display-mouse-p) "\\[help-follow-mouse] or ")
            "\\[help-follow] on a face name to customize it\n"
            "or on its sample text for a description of the face.\n\n")))
@@ -2413,6 +2413,39 @@ Note: Other faces cannot inherit from the cursor face."
 It is used for characters of no fonts too."
   :version "24.1"
   :group 'basic-faces)
+
+(defface error
+  '((((class color) (min-colors 88) (background light)) (:foreground "Red1" :weight bold))
+    (((class color) (min-colors 88) (background dark)) (:foreground "Pink" :weight bold))
+    (((class color) (min-colors 16) (background light)) (:foreground "Red1" :weight bold))
+    (((class color) (min-colors 16) (background dark)) (:foreground "Pink" :weight bold))
+    (((class color) (min-colors 8)) (:foreground "red"))
+    (t (:inverse-video t :weight bold)))
+  "Basic face used to highlight errors and to denote failure."
+  :version "24.1"
+  :group 'basic-faces)
+
+(defface warning
+  '((((class color) (min-colors 16)) (:foreground "DarkOrange" :weight bold))
+    (((class color)) (:foreground "yellow" :weight bold))
+    (t (:weight bold)))
+  "Basic face used to highlight warnings."
+  :version "24.1"
+  :group 'basic-faces)
+
+(defface success
+  '((((class color) (min-colors 16) (background light))
+     (:foreground "ForestGreen" :weight bold))
+    (((class color) (min-colors 88) (background dark))
+     (:foreground "Green1" :weight bold))
+    (((class color) (min-colors 16) (background dark))
+     (:foreground "Green" :weight bold))
+    (((class color)) (:foreground "green" :weight bold))
+    (t (:weight bold)))
+  "Basic face used to indicate successful operation."
+  :version "24.1"
+  :group 'basic-faces)
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Manipulating font names.
diff --git a/lisp/files.el b/lisp/files.el
index 6b8a352f20c..a0f55517546 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1342,8 +1342,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 #'pop-to-buffer-same-window (nreverse value))
-      (pop-to-buffer-same-window value))))
+        (mapcar 'switch-to-buffer (nreverse value))
+      (switch-to-buffer value))))
 
 (defun find-file-other-window (filename &optional wildcards)
   "Edit file FILENAME, in another window.
@@ -1639,11 +1639,6 @@ home directory is a root directory) and removes automounter prefixes
                         (substring filename (match-end 0)))))
       filename)))
 
-(defcustom find-file-not-true-dirname-list nil
-  "List of logical names for which visiting shouldn't save the true dirname."
-  :type '(repeat (string :tag "Name"))
-  :group 'find-file)
-
 (defun find-buffer-visiting (filename &optional predicate)
   "Return the buffer visiting file FILENAME (a string).
 This is like `get-file-buffer', except that it checks for any buffer
@@ -3003,9 +2998,10 @@ mode, if there is one, otherwise nil."
                                                 "-mode"))))
                    (or (equal keyname "coding")
                        (condition-case nil
-                           (push (cons (if (eq key 'eval)
-                                           'eval
-                                         (indirect-variable key))
+                           (push (cons (cond ((eq key 'eval) 'eval)
+                                             ;; Downcase "Mode:".
+                                             ((equal keyname "mode") 'mode)
+                                             (t (indirect-variable key)))
                                        val) result)
                          (error nil))))
                  (skip-chars-forward " \t;")))
@@ -3153,6 +3149,8 @@ major-mode."
                            (var (let ((read-circle nil))
                                   (read str)))
                            val val2)
+                      (and (equal (downcase (symbol-name var)) "mode")
+                           (setq var 'mode))
                       ;; Read the variable value.
                       (skip-chars-forward "^:")
                       (forward-char 1)
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 6902ce98ab1..c37a9ae916e 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1018,14 +1018,20 @@ The region it returns may start or end in the middle of a line.")
   (funcall font-lock-unfontify-buffer-function))
 
 (defun font-lock-fontify-region (beg end &optional loudly)
+  "Fontify the text between BEG and END.
+If LOUDLY is non-nil, print status messages while fontifying.
+This works by calling `font-lock-fontify-region-function'."
   (font-lock-set-defaults)
   (funcall font-lock-fontify-region-function beg end loudly))
 
 (defun font-lock-unfontify-region (beg end)
+  "Unfontify the text between BEG and END.
+This works by calling `font-lock-unfontify-region-function'."
   (save-buffer-state
     (funcall font-lock-unfontify-region-function beg end)))
 
 (defun font-lock-default-fontify-buffer ()
+  "Fontify the whole buffer using `font-lock-fontify-region-function'."
   (let ((verbose (if (numberp font-lock-verbose)
                      (> (buffer-size) font-lock-verbose)
                    font-lock-verbose)))
@@ -1045,6 +1051,7 @@ The region it returns may start or end in the middle of a line.")
           (quit (font-lock-unfontify-buffer)))))))
 
 (defun font-lock-default-unfontify-buffer ()
+  "Unfontify the whole buffer using `font-lock-unfontify-region-function'."
   ;; Make sure we unfontify etc. in the whole buffer.
   (save-restriction
     (widen)
@@ -1114,6 +1121,9 @@ Put first the functions more likely to cause a change and cheaper to compute.")
     changed))
 
 (defun font-lock-default-fontify-region (beg end loudly)
+  "Fontify the text between BEG and END.
+If LOUDLY is non-nil, print status messages while fontifying.
+This function is the default `font-lock-fontify-region-function'."
   (save-buffer-state
     ;; Use the fontification syntax table, if any.
     (with-syntax-table (or font-lock-syntax-table (syntax-table))
@@ -1162,6 +1172,8 @@ This is used by `font-lock-default-unfontify-region' to decide
 what properties to clear before refontifying a region.")
 
 (defun font-lock-default-unfontify-region (beg end)
+  "Unfontify the text between BEG and END.
+This function is the default `font-lock-unfontify-region-function'."
   (remove-list-of-text-properties
    beg end (append
             font-lock-extra-managed-props
@@ -1959,12 +1971,7 @@ Sets various variables using `font-lock-defaults' and
   :group 'font-lock-faces)
 
 (defface font-lock-warning-face
-  '((((class color) (min-colors 88) (background light)) (:foreground "Red1" :weight bold))
-    (((class color) (min-colors 88) (background dark)) (:foreground "Pink" :weight bold))
-    (((class color) (min-colors 16) (background light)) (:foreground "Red1" :weight bold))
-    (((class color) (min-colors 16) (background dark)) (:foreground "Pink" :weight bold))
-    (((class color) (min-colors 8)) (:foreground "red"))
-    (t (:inverse-video t :weight bold)))
+  '((t :inherit error))
   "Font Lock mode face used to highlight warnings."
   :group 'font-lock-faces)
 
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index acdd1033933..ceac837bc55 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,226 @@
+2011-09-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * nnimap.el (nnimap-open-connection-1): Use the correct port number in
+        the error message.
+
+2011-09-02  Eli Zaretskii  <eliz@gnu.org>
+
+        * message.el (message-setup-1): Return t (Bug#9392).
+
+2011-09-01  Andrew Cohen  <cohen@andy.bu.edu>
+
+        * gnus-sum.el: When adding article headers to a summary buffer also
+        update gnus-newsgroup-articles (bug#9386).
+
+2011-08-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * auth-source.el: Autoload help-mode.
+
+2011-08-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-group.el (gnus-group-name-charset): Don't bug out on server
+        names.
+
+2011-08-27  Daiki Ueno  <ueno@unixuser.org>
+
+        * mml-smime.el (mml-smime-epg-verify): Don't use the 4th arg of
+        mm-replace-in-string for compatibility issues.
+        * mml2015.el (mml2015-epg-verify): Ditto.
+
+2011-08-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mailcap.el (mailcap-mime-data): Regexp-quote MIME subtype.
+
+        * gnus-msg.el (gnus-setup-message): Remove extra apostrophe.
+
+2011-08-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * nnmail.el (nnmail-get-new-mail-1): If one mail source bugs out,
+        continue on and do the clean-up phase (bug#9188).
+
+        * gnus-sum.el (gnus-summary-expire-articles): When expiring articles,
+        just ignore groups that can't be opened instead of erroring out
+        (bug#9225).
+
+        * gnus-art.el (gnus-article-update-date-headers): Flip the default to
+        nil since some many people are fuddy-duddies.
+
+        * gnus-html.el (gnus-html-image-fetched): Don't cache zero-length
+        images.
+
+        * nntp.el (nntp-authinfo-file): Mark as obsolete -- use auth-source
+        instead.
+
+        * pop3.el (pop3-wait-for-messages): Don't use Gnus functions here.
+
+        * gnus-util.el (gnus-process-live-p): Copy over compat function.
+
+        * pop3.el (pop3-wait-for-messages): If the pop3 process dies, stop
+        processing.
+
+        * nntp.el (nntp-kill-buffer): Kill the process before killing the
+        buffer to avoid warnings.
+
+2011-08-20  Simon Josefsson  <simon@josefsson.org>
+
+        * gnus-agent.el (gnus-agent-expire-done-message): Use %.f as format
+        specified to reduce precision.
+
+2011-08-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * nnimap.el (nnimap-transform-headers): Protect against (NIL ...)
+        bodystructures (bug#9314).
+
+2011-08-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-art.el (gnus-insert-mime-button, gnus-mime-display-alternative):
+        Make button keymap non-sticky after buttons.
+
+2011-08-18  David Engster  <dengste@eml.cc>
+
+        * nnmairix.el (nnmairix-request-set-mark)
+        (nnmairix-goto-original-article): Remove adding of article to registry,
+        since `gnus-registry-add-group' isn't available anymore.
+        (nnmairix-determine-original-group-from-registry): Use
+        `gnus-registry-get-id-key' since `gnus-registry-fetch-groups' isn't
+        available anymore.
+
+2011-08-12  Simon Josefsson  <simon@josefsson.org>
+
+        * starttls.el (starttls-any-program-available): Define as obsolete
+        function.
+
+2011-08-18  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-util.el (gnus-y-or-n-p): Reinstate the message-clearing y-or-n-p
+        versions which Gnus use when appropriate.
+
+        * gnus-group.el (gnus-group-clear-data): Add a y-or-n query, since it's
+        a pretty destructive command.
+
+        * nnmail.el (nnmail-extra-headers): Clarify slightly (bug#9302).
+
+2011-08-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * message.el (message-fix-before-sending): Make a different warning
+        about NUL characters (bug#9270).
+
+        * gnus-sum.el (gnus-auto-select-subject): Allow specifying a function
+        from custom (bug#9260).
+
+        * gnus-spec.el (gnus-lrm-string): Use 8206 instead of ?\x200e to make
+        things work in Emacs 22 and XEmacs, too.
+
+        * gnus-sum.el (gnus-summary-from-or-to-or-newsgroups): LRM-ify the
+        default From.
+
+        * gnus-spec.el (gnus-lrm-string-p): New macro.
+        (gnus-lrm-string): New constant.
+        (gnus-summary-line-format-spec): LRM-ify the from.
+        (gnus-tilde-max-form): LRM-ify string chopping.
+
+        * gnus-ems.el (gnus-string-mark-left-to-right): New function.
+
+        * message.el (message-is-yours-p): Allow disabling canlock checking
+        (bug#9295).
+        (message-shoot-gnksa-feet): Add `canlock-verify'.
+        (message-auto-save-directory): Use ~/ as the auto-save directory if the
+        message directory isn't writable (bug#9304).
+
+        * auth-source.el (auth-source-netrc-saver): Make the .authinfo file
+        non-world-readable.
+
+2011-08-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * nndraft.el (nndraft-update-unread-articles): Don't send delayed
+        articles.
+
+2011-08-13  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * gnus-score.el (gnus-all-score-files): Use copy-sequence instead of
+        copy-list.
+
+2011-08-12  Sam Steingold  <sds@gnu.org>
+
+        * gnus-score.el (gnus-score-find-alist): Keep the score files already
+        in the reverse order to avoid modifying the cache with `nreverse'.
+        (gnus-all-score-files): Do not modify the value returned by
+        `gnus-score-find-alist' because it lives in a cache variable.
+        (gnus-current-home-score-file): No need to `nreverse' the return value
+        of `gnus-score-find-alist', it is already in the correct order.
+
+2011-08-11  Andrew Cohen  <cohen@andy.bu.edu>
+
+        * nnimap.el (nnimap-transform-headers): BODYSTRUCTURE for messages of
+        type MESSAGE and subtype RFC822 is slightly different from those of
+        type TEXT.
+
+2011-08-05  Andrew Cohen  <cohen@andy.bu.edu>
+
+        * gnus-sum.el (gnus-summary-refer-article): Warp to article. This
+        allows article-referral to work from an nnir group.
+
+2011-08-04  Andrew Cohen  <cohen@andy.bu.edu>
+
+        * gnus.el (registry-ignore): Add nnir groups to the ignore-list.
+
+2011-08-04  Daiki Ueno  <ueno@unixuser.org>
+
+        * mml1991.el (mml1991-epg-find-usable-key)
+        (mml1991-epg-find-usable-secret-key): New function.
+        (mml1991-epg-sign): Check if signing key is usable.
+        (mml1991-epg-encrypt): Check if encrypting key is usable (bug#8955).
+
+2011-08-03  Andrew Cohen  <cohen@andy.bu.edu>
+
+        * nnir.el (nnir-read-server-parm): Add an argument to restrict to
+        server-variables only. This should fix a bug introduced with commit
+        e1889675b7f4adf057833c5513c9374134c4e053.
+        (nnir-run-query): 'nnir-search-engine should not be set from the global
+        environment.
+
+2011-08-02  Andrew Cohen  <cohen@andy.bu.edu>
+
+        * nnir.el (nnir-search-thread): Position point on referring article
+        line.
+        (nnir-warp-to-article): Clean up summary buffers.
+
+        * nnimap.el (nnimap-request-thread): Whitespace fix.
+
+2011-08-02  Steve Purcell  <steve@sanityinc.com>  (tiny change)
+
+        * nnimap.el (nnimap-get-groups): Decode "&" correctly.
+
+2011-08-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * starttls.el (starttls-available-p): Renamed from
+        `starttls-any-program-available' and changed return convention.
+
+2011-07-31  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * nnmaildir.el (nnmaildir-request-accept-article): Don't call
+        `unix-sync' unless it's defined.
+
+2011-07-31  Marcus Harnisch  <marcus.harnisch@gmx.net>  (tiny change)
+
+        * gnus-art.el (gnus-article-stop-animations): Use `elt' instead of
+        `aref' for XEmacs compatibiltiy.
+
+2011-07-31  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * spam.el (spam-fetch-field-fast): Rewrite slightly for clarity.
+
+2011-07-31  Dave Abrahams  <dave@boostpro.com>  (tiny change)
+
+        * gnus-sum.el (gnus-summary-refer-thread): Since lambdas aren't
+        closures, quote the form properly (bug#9194).
+
+2011-07-31  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-sum.el (gnus-summary-insert-new-articles): Clean up slightly.
+        (gnus-summary-insert-new-articles): Protect against servers that are
+        down.
+
 2011-07-29  Daniel Dehennin  <daniel.dehennin@baby-gnu.org>
 
         * mm-decode.el (mm-dissect-buffer): Add a default content-disposition
diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el
index e249e97e826..74d69d0820c 100644
--- a/lisp/gnus/auth-source.el
+++ b/lisp/gnus/auth-source.el
@@ -70,6 +70,8 @@
 (autoload 'epg-context-set-armor "epg")
 (autoload 'epg-encrypt-string "epg")
 
+(autoload 'help-mode "help-mode" nil t)
+
 (defvar secrets-enabled)
 
 (defgroup auth-source nil
@@ -1377,6 +1379,8 @@ Respects `auth-source-save-behavior'.  Uses
                 (insert "\n"))
               (insert add "\n")
               (write-region (point-min) (point-max) file nil 'silent)
+              ;; Make the .authinfo file non-world-readable.
+              (set-file-modes file #o600)
               (auth-source-do-debug
                "auth-source-netrc-create: wrote 1 new line to %s"
                file)
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index 424c55c40f5..26222119b98 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -3560,7 +3560,7 @@ articles in every agentized group? "))
                 units (cdr units)))
 
         (format "Expiry recovered %d NOV entries, deleted %d files,\
- and freed %f %s."
+ and freed %.f %s."
                 (nth 0 stats)
                 (nth 1 stats)
                 size (car units)))
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index c29000f4691..eaf0ed52f51 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -1039,7 +1039,7 @@ Some of these headers are updated automatically.  See
           (item :tag "ISO8601 format" :value 'iso8601)
           (item :tag "User-defined" :value 'user-defined)))
 
-(defcustom gnus-article-update-date-headers 1
+(defcustom gnus-article-update-date-headers nil
   "A number that says how often to update the date header (in seconds).
 If nil, don't update it at all."
   :version "24.1"
@@ -4541,7 +4541,7 @@ commands:
 (defun gnus-article-stop-animations ()
   (dolist (timer (and (boundp 'timer-list)
                       timer-list))
-    (when (eq (aref timer 5) 'image-animate-timeout)
+    (when (eq (elt timer 5) 'image-animate-timeout)
       (cancel-timer timer))))
 
 ;; Set article window start at LINE, where LINE is the number of lines
@@ -5700,7 +5700,8 @@ all parts."
               gnus-callback gnus-mm-display-part
               gnus-part ,gnus-tmp-id
               article-type annotation
-              gnus-data ,handle))
+              gnus-data ,handle
+              rear-nonsticky t))
     (setq e (if (bolp)
                 ;; Exclude a newline.
                 (1- (point))
@@ -6013,7 +6014,8 @@ If displaying \"text/html\" is discouraged \(see
              ,gnus-mouse-face-prop ,gnus-article-mouse-face
              face ,gnus-article-button-face
              gnus-part ,id
-             article-type multipart))
+             article-type multipart
+             rear-nonsticky t))
           (widget-convert-button 'link from (point)
                                  :action 'gnus-widget-press-button
                                  :button-keymap gnus-widget-button-keymap)
@@ -6037,7 +6039,8 @@ If displaying \"text/html\" is discouraged \(see
                ,gnus-mouse-face-prop ,gnus-article-mouse-face
                face ,gnus-article-button-face
                gnus-part ,id
-               gnus-data ,handle))
+               gnus-data ,handle
+               rear-nonsticky t))
             (widget-convert-button 'link from (point)
                                    :action 'gnus-widget-press-button
                                    :button-keymap gnus-widget-button-keymap)
diff --git a/lisp/gnus/gnus-ems.el b/lisp/gnus/gnus-ems.el
index bc85e4960d4..aed471c38f4 100644
--- a/lisp/gnus/gnus-ems.el
+++ b/lisp/gnus/gnus-ems.el
@@ -209,6 +209,11 @@
           (setq start end
                 end nil))))))
 
+(defmacro gnus-string-mark-left-to-right (string)
+  (if (fboundp 'string-mark-left-to-right)
+      `(string-mark-left-to-right ,string)
+    string))
+
 (eval-and-compile
   ;; XEmacs does not have window-inside-pixel-edges
   (defalias 'gnus-window-inside-pixel-edges
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 2a31ccd34f0..5cc01759a04 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -1194,21 +1194,27 @@ The following commands are available:
     (gnus-group-mode)))
 
 (defun gnus-group-name-charset (method group)
-  (if (null method)
-      (setq method (gnus-find-method-for-group group)))
-  (let ((item (or (assoc method gnus-group-name-charset-method-alist)
-                  (and (consp method)
-                       (assoc (list (car method) (cadr method))
-                              gnus-group-name-charset-method-alist))))
-        (alist gnus-group-name-charset-group-alist)
-        result)
-    (if item
-        (cdr item)
-      (while (setq item (pop alist))
-        (if (string-match (car item) group)
-            (setq alist nil
-                  result (cdr item))))
-      result)))
+  (unless method
+    (setq method (gnus-find-method-for-group group)))
+  (when (stringp method)
+    (setq method (gnus-server-to-method method)))
+  (if (eq (car method) 'nnimap)
+      ;; IMAP groups should not be encoded, since they do the encoding
+      ;; in utf7 in the protocol.
+      nil
+    (let ((item (or (assoc method gnus-group-name-charset-method-alist)
+                    (and (consp method)
+                         (assoc (list (car method) (cadr method))
+                                gnus-group-name-charset-method-alist))))
+          (alist gnus-group-name-charset-group-alist)
+          result)
+      (if item
+          (cdr item)
+        (while (setq item (pop alist))
+          (if (string-match (car item) group)
+              (setq alist nil
+                    result (cdr item))))
+        result))))
 
 (defun gnus-group-name-decode (string charset)
   ;; Fixme: Don't decode in unibyte mode.
@@ -3471,13 +3477,14 @@ sort in reverse order."
   "Clear all marks and read ranges from the current group.
 Obeys the process/prefix convention."
   (interactive "P")
-  (gnus-group-iterate arg
-    (lambda (group)
-      (let (info)
-        (gnus-info-clear-data (setq info (gnus-get-info group)))
-        (gnus-get-unread-articles-in-group info (gnus-active group) t)
-        (when (gnus-group-goto-group group)
-          (gnus-group-update-group-line))))))
+  (when (gnus-y-or-n-p "Really clear data? ")
+    (gnus-group-iterate arg
+      (lambda (group)
+        (let (info)
+          (gnus-info-clear-data (setq info (gnus-get-info group)))
+          (gnus-get-unread-articles-in-group info (gnus-active group) t)
+          (when (gnus-group-goto-group group)
+            (gnus-group-update-group-line)))))))
 
 (defun gnus-group-clear-data-on-native-groups ()
   "Clear all marks and read ranges from all native groups."
diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index d3da6aab1b7..f443c4021e2 100644
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/gnus-html.el
@@ -399,15 +399,16 @@ Use ALT-TEXT for the image string."
 (defun gnus-html-image-fetched (status buffer image)
   "Callback function called when image has been fetched."
   (unless (plist-get status :error)
-    (when gnus-html-image-automatic-caching
-      (url-store-in-cache (current-buffer)))
     (when (and (or (search-forward "\n\n" nil t)
                    (search-forward "\r\n\r\n" nil t))
-               (buffer-live-p buffer))
-      (let ((data (buffer-substring (point) (point-max))))
-        (with-current-buffer buffer
-          (let ((inhibit-read-only t))
-            (gnus-html-put-image data (car image) (cadr image)))))))
+               (not (eobp)))
+      (when gnus-html-image-automatic-caching
+        (url-store-in-cache (current-buffer)))
+      (when (buffer-live-p buffer)
+        (let ((data (buffer-substring (point) (point-max))))
+          (with-current-buffer buffer
+            (let ((inhibit-read-only t))
+              (gnus-html-put-image data (car image) (cadr image))))))))
   (kill-buffer (current-buffer)))
 
 (defun gnus-html-get-image-data (url)
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index 9d3ec25c03a..d60c7165abd 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -435,7 +435,7 @@ Thank you for your help in stamping out bugs.
            (progn
              ,@forms)
          (gnus-inews-add-send-actions ,winconf ,buffer ,article ,config
-                                      ,yanked ',winconf-name)
+                                      ,yanked ,winconf-name)
          (setq gnus-message-buffer (current-buffer))
          (set (make-local-variable 'gnus-message-group-art)
               (cons ,group ,article))
diff --git a/lisp/gnus/gnus-score.el b/lisp/gnus/gnus-score.el
index 9bbfbfb057e..eb7234a811e 100644
--- a/lisp/gnus/gnus-score.el
+++ b/lisp/gnus/gnus-score.el
@@ -2834,8 +2834,7 @@ The list is determined from the variable `gnus-score-file-alist'."
       ;; handle the multiple match alist
       (while alist
         (when (string-match (caar alist) group)
-          (setq score-files
-                (nconc score-files (copy-sequence (cdar alist)))))
+          (setq score-files (append (cdar alist) score-files)))
         (setq alist (cdr alist)))
       (setq alist gnus-score-file-single-match-alist)
       ;; handle the single match alist
@@ -2845,8 +2844,7 @@ The list is determined from the variable `gnus-score-file-alist'."
           ;; and score-files is still nil.  -sj
           ;; this can be construed as a "stop searching here" feature :>
           ;; and used to simplify regexps in the single-alist
-          (setq score-files
-                (nconc score-files (copy-sequence (cdar alist))))
+          (setq score-files (append (cdar alist) score-files))
           (setq alist nil))
         (setq alist (cdr alist)))
       ;; cache the score files
@@ -2866,7 +2864,7 @@ The list is determined from the variable `gnus-score-file-alist'."
       (when gnus-score-use-all-scores
         ;; Get the initial score files for this group.
         (when funcs
-          (setq score-files (nreverse (gnus-score-find-alist group))))
+          (setq score-files (copy-sequence (gnus-score-find-alist group))))
         ;; Add any home adapt files.
         (let ((home (gnus-home-score-file group t)))
           (when home
@@ -3013,7 +3011,7 @@ If ADAPT, return the home adaptive file instead."
 
 (defun gnus-current-home-score-file (group)
   "Return the \"current\" regular score file."
-  (car (nreverse (gnus-score-find-alist group))))
+  (car (gnus-score-find-alist group)))
 
 ;;;
 ;;; Score decays
diff --git a/lisp/gnus/gnus-spec.el b/lisp/gnus/gnus-spec.el
index 4682f512476..0fa64a84b75 100644
--- a/lisp/gnus/gnus-spec.el
+++ b/lisp/gnus/gnus-spec.el
@@ -90,6 +90,15 @@ text properties. This is only needed on XEmacs, as Emacs does this anyway."
 (declare-function gnus-summary-from-or-to-or-newsgroups "gnus-sum"
                   (header gnus-tmp-from))
 
+(defmacro gnus-lrm-string-p (string)
+  (if (fboundp 'string-mark-left-to-rigth)
+      `(eq (aref ,string (1- (length ,string))) 8206)
+    nil))
+
+(defvar gnus-lrm-string (if (ignore-errors (string 8206))
+                            (propertize (string 8206) 'invisible t)
+                          ""))
+
 (defun gnus-summary-line-format-spec ()
   (insert gnus-tmp-unread gnus-tmp-replied
           gnus-tmp-score-char gnus-tmp-indentation)
@@ -103,7 +112,9 @@ text properties. This is only needed on XEmacs, as Emacs does this anyway."
                        (gnus-summary-from-or-to-or-newsgroups
                         gnus-tmp-header gnus-tmp-from))))
                 (if (> (length val) 23)
-                    (substring val 0 23)
+                    (if (gnus-lrm-string-p val)
+                        (concat (substring val 0 23) gnus-lrm-string)
+                      (substring val 0 23))
                   val))
               gnus-tmp-closing-bracket))
      (point))
@@ -351,13 +362,17 @@ Return a list of updated types."
         `(if (> (,length-fun ,el) ,max)
              ,(if (< max-width 0)
                   `(,substring-fun ,el (- (,length-fun ,el) ,max))
-                `(,substring-fun ,el 0 ,max))
+                `(if (gnus-lrm-string-p ,el)
+                     (concat (,substring-fun ,el 0 ,max) ,gnus-lrm-string)
+                   (,substring-fun ,el 0 ,max)))
            ,el)
       `(let ((val (eval ,el)))
          (if (> (,length-fun val) ,max)
              ,(if (< max-width 0)
                   `(,substring-fun val (- (,length-fun val) ,max))
-                `(,substring-fun val 0 ,max))
+                `(if (gnus-lrm-string-p val)
+                     (concat (,substring-fun val 0 ,max) ,gnus-lrm-string)
+                   (,substring-fun val 0 ,max)))
            val)))))
 
 (defun gnus-tilde-cut-form (el cut-width)
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 5917c9d7cef..fd441c46d17 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -375,7 +375,8 @@ place point on some subject line."
                  (const unread)
                  (const first)
                  (const unseen)
-                 (const unseen-or-unread)))
+                 (const unseen-or-unread)
+                 (function :tag "Function to call")))
 
 (defcustom gnus-auto-select-next t
   "*If non-nil, offer to go to the next group from the end of the previous.
@@ -3709,7 +3710,9 @@ buffer that was in action when the last article was fetched."
                                 gnus-newsgroup-name)) 'nntp)
                       (gnus-group-real-name gnus-newsgroup-name))))
               (concat gnus-summary-newsgroup-prefix newsgroups)))))
-     (inline (gnus-summary-extract-address-component gnus-tmp-from)))))
+     (gnus-string-mark-left-to-right
+      (inline
+       (gnus-summary-extract-address-component gnus-tmp-from))))))
 
 (defun gnus-summary-insert-line (gnus-tmp-header
                                  gnus-tmp-level gnus-tmp-current
@@ -8627,6 +8630,8 @@ fetched for this group."
            'list gnus-newsgroup-headers
            (gnus-fetch-headers articles nil t)
            'gnus-article-sort-by-number))
+    (setq gnus-newsgroup-articles
+          (gnus-sorted-nunion gnus-newsgroup-articles articles))
     (gnus-summary-limit (append articles gnus-newsgroup-limit))))
 
 (defun gnus-summary-limit-exclude-dormant ()
@@ -9015,13 +9020,15 @@ non-numeric or nil fetch the number specified by the
                    (refs (split-string (or (mail-header-references header)
                                            "")))
                    (gnus-parse-headers-hook
-                    (lambda () (goto-char (point-min))
+                    `(lambda () (goto-char (point-min))
                       (keep-lines
-                       (regexp-opt (append refs (list id subject)))))))
+                       (regexp-opt ',(append refs (list id subject)))))))
               (gnus-fetch-headers (list last) (if (numberp limit)
-                                                  (* 2 limit) limit) t)))))
+                                                  (* 2 limit) limit) t))))
+         article-ids)
     (when (listp new-headers)
       (dolist (header new-headers)
+        (push (mail-header-number header) article-ids)
         (when (member (mail-header-number header) gnus-newsgroup-unselected)
           (push (mail-header-number header) gnus-newsgroup-unreads)
           (setq gnus-newsgroup-unselected
@@ -9032,11 +9039,14 @@ non-numeric or nil fetch the number specified by the
              (gnus-merge
               'list gnus-newsgroup-headers new-headers
               'gnus-article-sort-by-number)))
+      (setq gnus-newsgroup-articles
+            (gnus-sorted-nunion gnus-newsgroup-articles (nreverse article-ids)))
       (gnus-summary-limit-include-thread id))))
 
 (defun gnus-summary-refer-article (message-id)
   "Fetch an article specified by MESSAGE-ID."
   (interactive "sMessage-ID: ")
+  (gnus-warp-to-article)
   (when (and (stringp message-id)
              (not (zerop (length message-id))))
     (setq message-id (gnus-replace-in-string message-id " " ""))
@@ -10283,34 +10293,33 @@ This will be the case if the article has both been mailed and posted."
         ;; There are expirable articles in this group, so we run them
         ;; through the expiry process.
         (gnus-message 6 "Expiring articles...")
-        (unless (gnus-check-group gnus-newsgroup-name)
-          (error "Can't open server for %s" gnus-newsgroup-name))
-        ;; The list of articles that weren't expired is returned.
-        (save-excursion
-          (if expiry-wait
-              (let ((nnmail-expiry-wait-function nil)
-                    (nnmail-expiry-wait expiry-wait))
-                (setq es (gnus-request-expire-articles
-                          expirable gnus-newsgroup-name)))
-            (setq es (gnus-request-expire-articles
-                      expirable gnus-newsgroup-name)))
-          (unless total
-            (setq gnus-newsgroup-expirable es))
-          ;; We go through the old list of expirable, and mark all
-          ;; really expired articles as nonexistent.
-          (unless (eq es expirable) ;If nothing was expired, we don't mark.
-            (let ((gnus-use-cache nil))
-              (dolist (article expirable)
-                (when (and (not (memq article es))
-                           (gnus-data-find article))
-                  (gnus-summary-mark-article article gnus-canceled-mark)
-                  (run-hook-with-args 'gnus-summary-article-expire-hook
-                                      'delete
-                                      (gnus-data-header
-                                       (assoc article (gnus-data-list nil)))
-                                      gnus-newsgroup-name
-                                      nil
-                                      nil))))))
+        (when (gnus-check-group gnus-newsgroup-name)
+          ;; The list of articles that weren't expired is returned.
+          (save-excursion
+            (if expiry-wait
+                (let ((nnmail-expiry-wait-function nil)
+                      (nnmail-expiry-wait expiry-wait))
+                  (setq es (gnus-request-expire-articles
+                            expirable gnus-newsgroup-name)))
+              (setq es (gnus-request-expire-articles
+                        expirable gnus-newsgroup-name)))
+            (unless total
+              (setq gnus-newsgroup-expirable es))
+            ;; We go through the old list of expirable, and mark all
+            ;; really expired articles as nonexistent.
+            (unless (eq es expirable) ;If nothing was expired, we don't mark.
+              (let ((gnus-use-cache nil))
+                (dolist (article expirable)
+                  (when (and (not (memq article es))
+                             (gnus-data-find article))
+                    (gnus-summary-mark-article article gnus-canceled-mark)
+                    (run-hook-with-args 'gnus-summary-article-expire-hook
+                                        'delete
+                                        (gnus-data-header
+                                         (assoc article (gnus-data-list nil)))
+                                        gnus-newsgroup-name
+                                        nil
+                                        nil)))))))
         (gnus-message 6 "Expiring articles...done")))))
 
 (defun gnus-summary-expire-articles-now ()
@@ -12740,6 +12749,8 @@ returned."
                       gnus-newsgroup-headers
                       (gnus-fetch-headers articles)
                       'gnus-article-sort-by-number))
+    (setq gnus-newsgroup-articles
+          (gnus-sorted-nunion gnus-newsgroup-articles articles))
     ;; Suppress duplicates?
     (when gnus-suppress-duplicates
       (gnus-dup-suppress-articles))
@@ -12851,26 +12862,26 @@ If ALL is a number, fetch this number of articles."
 (defun gnus-summary-insert-new-articles ()
   "Insert all new articles in this group."
   (interactive)
-  (prog1
-      (let ((old (sort (mapcar 'car gnus-newsgroup-data) '<))
-            (old-high gnus-newsgroup-highest)
-            (nnmail-fetched-sources (list t))
-            i new)
-        (setq gnus-newsgroup-active
-              (gnus-copy-sequence
-               (gnus-activate-group gnus-newsgroup-name 'scan)))
-        (setq i (cdr gnus-newsgroup-active)
-              gnus-newsgroup-highest i)
-        (while (> i old-high)
-          (push i new)
-          (decf i))
-        (if (not new)
-            (message "No gnus is bad news")
-          (gnus-summary-insert-articles new)
-          (setq gnus-newsgroup-unreads
-                (gnus-sorted-nunion gnus-newsgroup-unreads new))
-          (gnus-summary-limit (gnus-sorted-nunion old new))))
-    (gnus-summary-position-point)))
+  (let ((old (sort (mapcar 'car gnus-newsgroup-data) '<))
+        (old-high gnus-newsgroup-highest)
+        (nnmail-fetched-sources (list t))
+        (new-active (gnus-activate-group gnus-newsgroup-name 'scan))
+        i new)
+    (unless new-active
+      (error "Couldn't fetch new data"))
+    (setq gnus-newsgroup-active (gnus-copy-sequence new-active))
+    (setq i (cdr gnus-newsgroup-active)
+          gnus-newsgroup-highest i)
+    (while (> i old-high)
+      (push i new)
+      (decf i))
+    (if (not new)
+        (message "No gnus is bad news")
+      (gnus-summary-insert-articles new)
+      (setq gnus-newsgroup-unreads
+            (gnus-sorted-nunion gnus-newsgroup-unreads new))
+      (gnus-summary-limit (gnus-sorted-nunion old new))))
+  (gnus-summary-position-point))
 
 ;;; Bookmark support for Gnus.
 (declare-function bookmark-make-record-default
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 7155c7f9607..34953611966 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -388,57 +388,14 @@ TIME defaults to the current time."
           (define-key keymap key (pop plist))
         (pop plist)))))
 
-;; Two silly functions to ensure that all `y-or-n-p' questions clear
-;; the echo area.
-;;
-;; Do we really need these functions?  Workarounds for bugs in the corresponding
-;; Emacs functions?  Maybe these bugs are no longer present in any supported
-;; (X)Emacs version?  Alias them to the original functions and see if anyone
-;; reports a problem.  If not, replace with original functions.  --rsteib,
-;; 2007-12-14
-;;
-;; All supported Emacsen clear the echo area after `yes-or-no-p', so we can
-;; remove `yes-or-no-p'.  RMS says that not clearing after `y-or-n-p' is
-;; intentional (see below), so we could remove `gnus-y-or-n-p' too.
-;; Objections?  --rsteib, 2008-02-16
-;;
-;; ,----[ http://thread.gmane.org/gmane.emacs.gnus.general/65099/focus=66070 ]
-;; | From: Richard Stallman
-;; | Subject: Re: Do we need gnus-yes-or-no-p and gnus-y-or-n-p?
-;; | To: Katsumi Yamaoka [...]
-;; | Cc: emacs-devel@[...], xemacs-beta@[...], ding@[...]
-;; | Date: Mon, 07 Jan 2008 12:16:05 -0500
-;; | Message-ID: <E1JBva1-000528-VY@fencepost.gnu.org>
-;; |
-;; |     The behavior of `y-or-n-p' that it doesn't clear the question
-;; |     and the answer is not serious of course, but I feel it is not
-;; |     cool.
-;; |
-;; | It is intentional.
-;; |
-;; |     Currently, it is commented out in the trunk by Reiner Steib.  He
-;; |     also wrote the benefit of leaving the question and the answer in
-;; |     the echo area as follows:
-;; |
-;; |     (http://article.gmane.org/gmane.emacs.gnus.general/66061)
-;; |     > In contrast to yes-or-no-p it is much easier to type y, n,
-;; |     > SPC, DEL, etc accidentally, so it might be useful for the user
-;; |     > to see what he has typed.
-;; |
-;; | Yes, that is the reason.
-;; `----
-
-;; (defun gnus-y-or-n-p (prompt)
-;;   (prog1
-;;       (y-or-n-p prompt)
-;;     (message "")))
-;; (defun gnus-yes-or-no-p (prompt)
-;;   (prog1
-;;       (yes-or-no-p prompt)
-;;     (message "")))
-
-(defalias 'gnus-y-or-n-p 'y-or-n-p)
-(defalias 'gnus-yes-or-no-p 'yes-or-no-p)
+(defun gnus-y-or-n-p (prompt)
+  (prog1
+      (y-or-n-p prompt)
+    (message "")))
+(defun gnus-yes-or-no-p (prompt)
+  (prog1
+      (yes-or-no-p prompt)
+    (message "")))
 
 ;; By Frank Schmitt <ich@Frank-Schmitt.net>. Allows to have
 ;; age-depending date representations. (e.g. just the time if it's
@@ -1292,6 +1249,13 @@ This function saves the current buffer."
        (with-current-buffer gnus-group-buffer
          (eq major-mode 'gnus-group-mode))))
 
+(defun gnus-process-live-p (process)
+  "Returns non-nil if PROCESS is alive.
+A process is considered alive if its status is `run', `open',
+`listen', `connect' or `stop'."
+  (memq (process-status process)
+        '(run open listen connect stop)))
+
 (defun gnus-remove-if (predicate sequence &optional hash-table-p)
   "Return a copy of SEQUENCE with all items satisfying PREDICATE removed.
 SEQUENCE should be a list, a vector, or a string.  Returns always a list.
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 7ff90f583cf..cd9b6eeb949 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -1875,7 +1875,7 @@ total number of articles in the group.")
  :variable-default (mapcar
                     (lambda (g) (list g t))
                     '("delayed$" "drafts$" "queue$" "INBOX$"
-                      "^nnmairix:" "archive"))
+                      "^nnmairix:" "^nnir:" "archive"))
  :variable-document
  "*Groups in which the registry should be turned off."
  :variable-group gnus-registry
diff --git a/lisp/gnus/mailcap.el b/lisp/gnus/mailcap.el
index dffb279daba..7959104d646 100644
--- a/lisp/gnus/mailcap.el
+++ b/lisp/gnus/mailcap.el
@@ -90,7 +90,7 @@ This is a compatibility function for different Emacsen."
 ;; files for the rest?  -- fx
 (defvar mailcap-mime-data
   `(("application"
-     ("vnd.ms-excel"
+     ("vnd\\.ms-excel"
       (viewer . "gnumeric %s")
       (test   . (getenv "DISPLAY"))
       (type . "application/vnd.ms-excel"))
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 47c4de0aedc..194ebf81873 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1310,7 +1310,7 @@ text and it replaces `self-insert-command' with the other command, e.g.
   :type '(repeat function))
 
 (defcustom message-auto-save-directory
-  (if (file-exists-p message-directory)
+  (if (file-writable-p message-directory)
       (file-name-as-directory (expand-file-name "drafts" message-directory))
     "~/")
   "*Directory where Message auto-saves buffers if Gnus isn't running.
@@ -1353,7 +1353,8 @@ candidates:
 `quoted-text-only'  Allow you to post quoted text only;
 `multiple-copies'   Allow you to post multiple copies;
 `cancel-messages'   Allow you to cancel or supersede messages from
-                    your other email addresses.")
+                    your other email addresses;
+`canlock-verify'    Allow you to cancel messages without verifying canlock.")
 
 (defsubst message-gnksa-enable-p (feature)
   (or (not (listp message-shoot-gnksa-feet))
@@ -4253,8 +4254,10 @@ conformance."
                  "Invisible text found and made visible; continue sending? ")
           (error "Invisible text found and made visible")))))
   (message-check 'illegible-text
-    (let (char found choice)
+    (let (char found choice nul-chars)
       (message-goto-body)
+      (setq nul-chars (save-excursion
+                        (search-forward "\000" nil t)))
       (while (progn
                (skip-chars-forward mm-7bit-chars)
                (when (get-text-property (point) 'no-illegible-text)
@@ -4280,7 +4283,9 @@ conformance."
       (when found
         (setq choice
               (gnus-multiple-choice
-               "Non-printable characters found.  Continue sending?"
+               (if nul-chars
+                   "NUL characters found, which may cause problems.  Continue sending?"
+                 "Non-printable characters found.  Continue sending?")
                `((?d "Remove non-printable characters and send")
                  (?r ,(format
                        "Replace non-printable characters with \"%s\" and send"
@@ -6525,7 +6530,9 @@ are not included."
   (message-position-point)
   ;; Allow correct handling of `message-checksum' in `message-yank-original':
   (set-buffer-modified-p nil)
-  (undo-boundary))
+  (undo-boundary)
+  ;; rmail-start-mail expects message-mail to return t (Bug#9392)
+  t)
 
 (defun message-set-auto-save-file-name ()
   "Associate the message buffer with a file in the drafts directory."
@@ -7037,7 +7044,8 @@ regexp to match all of yours addresses."
   (save-excursion
     (save-restriction
       (message-narrow-to-head-1)
-      (if (message-fetch-field "Cancel-Lock")
+      (if (and (message-fetch-field "Cancel-Lock")
+               (message-gnksa-enable-p 'canlock-verify))
           (if (null (canlock-verify))
               t
             (error "Failed to verify Cancel-lock: This article is not yours"))
diff --git a/lisp/gnus/mml-smime.el b/lisp/gnus/mml-smime.el
index 43c91604ec5..7a7b3f6d82d 100644
--- a/lisp/gnus/mml-smime.el
+++ b/lisp/gnus/mml-smime.el
@@ -531,7 +531,7 @@ Content-Disposition: attachment; filename=smime.p7m
         (mm-set-handle-multipart-parameter
          mm-security-handle 'gnus-info "Corrupted")
         (throw 'error handle))
-      (setq part (mm-replace-in-string part "\n" "\r\n" t)
+      (setq part (mm-replace-in-string part "\n" "\r\n")
             context (epg-make-context 'CMS))
       (condition-case error
           (setq plain (epg-verify-string context (mm-get-part signature) part))
diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el
index a5d778845c1..ad9f95796fe 100644
--- a/lisp/gnus/mml1991.el
+++ b/lisp/gnus/mml1991.el
@@ -247,6 +247,10 @@ Whether the passphrase is cached at all is controlled by
 (autoload 'epg-context-set-textmode "epg")
 (autoload 'epg-context-set-signers "epg")
 (autoload 'epg-context-set-passphrase-callback "epg")
+(autoload 'epg-key-sub-key-list "epg")
+(autoload 'epg-sub-key-capability "epg")
+(autoload 'epg-sub-key-validity "epg")
+(autoload 'epg-sub-key-fingerprint "epg")
 (autoload 'epg-sign-string "epg")
 (autoload 'epg-encrypt-string "epg")
 (autoload 'epg-configuration "epg-config")
@@ -274,17 +278,59 @@ Whether the passphrase is cached at all is controlled by
               (cons key-id mml1991-epg-secret-key-id-list))
         (copy-sequence passphrase)))))
 
+(defun mml1991-epg-find-usable-key (keys usage)
+  (catch 'found
+    (while keys
+      (let ((pointer (epg-key-sub-key-list (car keys))))
+        (while pointer
+          (if (and (memq usage (epg-sub-key-capability (car pointer)))
+                   (not (memq 'disabled (epg-sub-key-capability (car pointer))))
+                   (not (memq (epg-sub-key-validity (car pointer))
+                              '(revoked expired))))
+              (throw 'found (car keys)))
+          (setq pointer (cdr pointer))))
+      (setq keys (cdr keys)))))
+
+;; XXX: since gpg --list-secret-keys does not return validity of each
+;; key, `mml1991-epg-find-usable-key' defined above is not enough for
+;; secret keys.  The function `mml1991-epg-find-usable-secret-key'
+;; below looks at appropriate public keys to check usability.
+(defun mml1991-epg-find-usable-secret-key (context name usage)
+  (let ((secret-keys (epg-list-keys context name t))
+        secret-key)
+    (while (and (not secret-key) secret-keys)
+      (if (mml1991-epg-find-usable-key
+           (epg-list-keys context (epg-sub-key-fingerprint
+                                   (car (epg-key-sub-key-list
+                                         (car secret-keys)))))
+           usage)
+          (setq secret-key (car secret-keys)
+                secret-keys nil)
+        (setq secret-keys (cdr secret-keys))))
+    secret-key))
+
 (defun mml1991-epg-sign (cont)
   (let ((context (epg-make-context))
-        headers cte signers signature)
+        headers cte signer-key signers signature)
     (if (eq mm-sign-option 'guided)
         (setq signers (epa-select-keys context "Select keys for signing.
 If no one is selected, default secret key is used.  "
                                        mml1991-signers t))
       (if mml1991-signers
-          (setq signers (mapcar (lambda (name)
-                                  (car (epg-list-keys context name t)))
-                                mml1991-signers))))
+          (setq signers (delq nil
+                              (mapcar
+                               (lambda (name)
+                                 (setq signer-key
+                                       (mml1991-epg-find-usable-secret-key
+                                        context name 'sign))
+                                 (unless (or signer-key
+                                             (y-or-n-p
+                                              (format
+                                               "No secret key for %s; skip it? "
+                                               name)))
+                                   (error "No secret key for %s" name))
+                                 signer-key)
+                               mml1991-signers)))))
     (epg-context-set-armor context t)
     (epg-context-set-textmode context t)
     (epg-context-set-signers context signers)
@@ -344,7 +390,11 @@ If no one is selected, default secret key is used.  "
              (split-string
               (message-options-get 'message-recipients)
               "[ \f\t\n\r\v,]+")))
-        cipher signers config)
+        recipient-key signer-key cipher signers config)
+    (when mml1991-encrypt-to-self
+      (unless mml1991-signers
+        (error "mml1991-signers is not set"))
+      (setq recipients (nconc recipients mml1991-signers)))
     ;; We should remove this check if epg-0.0.6 is released.
     (if (and (condition-case nil
                  (require 'epg-config)
@@ -363,26 +413,32 @@ If no one is selected, default secret key is used.  "
 If no one is selected, symmetric encryption will be performed.  "
                                recipients))
       (setq recipients
-            (delq nil (mapcar (lambda (name)
-                                (car (epg-list-keys context name)))
-                              recipients))))
-    (if mml1991-encrypt-to-self
-        (if mml1991-signers
-            (setq recipients
-                  (nconc recipients
-                         (mapcar (lambda (name)
-                                   (car (epg-list-keys context name)))
-                                 mml1991-signers)))
-          (error "mml1991-signers not set")))
+            (delq nil (mapcar
+                       (lambda (name)
+                         (setq recipient-key (mml1991-epg-find-usable-key
+                                              (epg-list-keys context name)
+                                              'encrypt))
+                         (unless (or recipient-key
+                                   (y-or-n-p
+                                    (format "No public key for %s; skip it? "
+                                            name)))
+                           (error "No public key for %s" name))
+                         recipient-key)
+                       recipients)))
+      (unless recipients
+        (error "No recipient specified")))
     (when sign
       (if (eq mm-sign-option 'guided)
           (setq signers (epa-select-keys context "Select keys for signing.
 If no one is selected, default secret key is used.  "
                                          mml1991-signers t))
         (if mml1991-signers
-            (setq signers (mapcar (lambda (name)
-                                    (car (epg-list-keys context name t)))
-                                  mml1991-signers))))
+            (setq signers (delq nil
+                                (mapcar
+                                 (lambda (name)
+                                   (mml1991-epg-find-usable-secret-key
+                                    context name 'sign))
+                                 mml1991-signers)))))
       (epg-context-set-signers context signers))
     (epg-context-set-armor context t)
     (epg-context-set-textmode context t)
diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el
index 7d8a4119c0e..b9310beed58 100644
--- a/lisp/gnus/mml2015.el
+++ b/lisp/gnus/mml2015.el
@@ -923,7 +923,7 @@ If set, it overrides the setting of `mml2015-sign-with-sender'."
         (mm-set-handle-multipart-parameter
          mm-security-handle 'gnus-info "Corrupted")
         (throw 'error handle))
-      (setq part (mm-replace-in-string part "\n" "\r\n" t)
+      (setq part (mm-replace-in-string part "\n" "\r\n")
             signature (mm-get-part signature)
             context (epg-make-context))
       (condition-case error
diff --git a/lisp/gnus/nndraft.el b/lisp/gnus/nndraft.el
index f528222dd16..0b47062a919 100644
--- a/lisp/gnus/nndraft.el
+++ b/lisp/gnus/nndraft.el
@@ -177,6 +177,8 @@ are generated if and only if they are also in `message-draft-headers'.")
                                                        (list 'nndraft "")))
                            (nnmail-get-active)))
            (gnus-group-marked (copy-sequence groups))
+           ;; Don't send delayed articles.
+           (gnus-get-new-news-hook nil)
            (inhibit-read-only t))
       (gnus-group-get-new-news-this-group nil t)
       (dolist (group groups)
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 52de48869d8..52c4b3c4290 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -216,9 +216,14 @@ textual parts.")
           (let ((structure (ignore-errors
                              (read (current-buffer)))))
             (while (and (consp structure)
-                        (not (stringp (car structure))))
+                        (not (atom (car structure))))
               (setq structure (car structure)))
-            (setq lines (nth 7 structure))))
+            (setq lines (if (and
+                             (stringp (car structure))
+                             (equal (upcase (nth 0 structure)) "MESSAGE")
+                             (equal (upcase (nth 1 structure)) "RFC822"))
+                            (nth 9 structure)
+                          (nth 7 structure)))))
         (delete-region (line-beginning-position) (line-end-position))
         (insert (format "211 %s Article retrieved." article))
         (forward-line 1)
@@ -345,7 +350,6 @@ textual parts.")
   (with-current-buffer (nnimap-make-process-buffer buffer)
     (let* ((coding-system-for-read 'binary)
            (coding-system-for-write 'binary)
-           (port nil)
            (ports
             (cond
              ((memq nnimap-stream '(network plain starttls))
@@ -390,7 +394,7 @@ textual parts.")
         (if (not stream)
             (progn
               (nnheader-report 'nnimap "Unable to contact %s:%s via %s"
-                               nnimap-address port nnimap-stream)
+                               nnimap-address (car ports) nnimap-stream)
               'no-connect)
           (gnus-set-process-query-on-exit-flag stream nil)
           (if (not (gnus-string-match-p "[*.] \\(OK\\|PREAUTH\\)" greeting))
@@ -1107,9 +1111,9 @@ textual parts.")
             (separator (read (current-buffer)))
             (group (read (current-buffer))))
         (unless (member '%NoSelect flags)
-          (push (if (stringp group)
-                    group
-                  (format "%s" group))
+          (push (utf7-decode (if (stringp group)
+                                 group
+                               (format "%s" group)) t)
                 groups))))
     (nreverse groups)))
 
@@ -1168,7 +1172,7 @@ textual parts.")
                        (nnimap-get-groups)))
         (unless (assoc group nnimap-current-infos)
           ;; Insert dummy numbers here -- they don't matter.
-          (insert (format "%S 0 1 y\n" group))))
+          (insert (format "%S 0 1 y\n" (utf7-encode group)))))
       t)))
 
 (deffoo nnimap-retrieve-group-data-early (server infos)
@@ -1566,7 +1570,7 @@ textual parts.")
                   (articles &optional limit force-new dependencies))
 
 (deffoo nnimap-request-thread (header &optional group server)
-  (if gnus-refer-thread-use-nnir 
+  (if gnus-refer-thread-use-nnir
       (nnir-search-thread header)
     (when (nnimap-possibly-change-group group server)
       (let* ((cmd (nnimap-make-thread-query header))
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index e6420a4d7bb..17fc3f3fe81 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -767,11 +767,18 @@ Add an entry here when adding a new search engine.")
 (deffoo nnir-warp-to-article ()
   (let* ((cur (if (> (gnus-summary-article-number) 0)
                   (gnus-summary-article-number)
-                (error "This is not a real article.")))
-         (gnus-newsgroup-name (nnir-article-group cur))
-         (backend-number (nnir-article-number cur)))
-    (gnus-summary-read-group-1 gnus-newsgroup-name t t gnus-summary-buffer
-                               nil (list backend-number))))
+                (error "This is not a real article")))
+         (backend-article-group (nnir-article-group cur))
+         (backend-article-number (nnir-article-number cur))
+         (quit-config (gnus-ephemeral-group-p gnus-newsgroup-name)))
+    ;; first exit from the nnir summary buffer.
+    (gnus-summary-exit)
+    ;; and if the nnir summary buffer in turn came from another
+    ;; summary buffer we have to clean that summary up too.
+    (when (eq (cdr quit-config) 'summary)
+      (gnus-summary-exit))
+    (gnus-summary-read-group-1 backend-article-group t t  nil
+                               nil (list backend-article-number))))
 
 (nnoo-define-skeleton nnir)
 
@@ -1617,7 +1624,7 @@ actually)."
               (let* ((server (car x))
                      (nnir-search-engine
                       (or (nnir-read-server-parm 'nnir-search-engine
-                                                 server)
+                                                 server t)
                           (cdr (assoc (car
                                        (gnus-server-to-method server))
                                       nnir-method-default-engines))))
@@ -1636,14 +1643,16 @@ actually)."
                   nil)))
             groups))))
 
-(defun nnir-read-server-parm (key server)
-  "Returns the parameter value of key for the given server, where
-server is of form 'backend:name'."
+(defun nnir-read-server-parm (key server &optional not-global)
+  "Returns the parameter value corresponding to `key' for
+`server'. If no server-specific value is found consult the global
+environment unless `not-global' is non-nil."
   (let ((method (gnus-server-to-method server)))
     (cond ((and method (assq key (cddr method)))
-           (nth 1 (assq key (cddr method))))
-          ((boundp key) (symbol-value key))
-          (t nil))))
+           (nth 1 (assq key (cddr method))))
+          ((and (not not-global) (boundp key)) (symbol-value key))
+          (t nil))))
+
 
 (defun nnir-possibly-change-server (server)
   (unless (and server (nnir-server-opened server))
@@ -1659,7 +1668,8 @@ server is of form 'backend:name'."
                (cons 'server (gnus-method-to-server
                               (gnus-find-method-for-group
                                gnus-newsgroup-name))))))
-    (gnus-group-make-nnir-group nil parm)))
+    (gnus-group-make-nnir-group nil parm)
+    (gnus-summary-goto-subject (gnus-id-to-article (mail-header-id header)))))
 
 ;; unused?
 (defun nnir-artlist-groups (artlist)
diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index 8906a036779..d83467a1ed5 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -554,7 +554,9 @@ parameter.  It should return nil, `warn' or `delete'."
                  (const delete)))
 
 (defcustom nnmail-extra-headers '(To Newsgroups)
-  "*Extra headers to parse."
+  "Extra headers to parse.
+In addition to the standard headers, these extra headers will be
+included in NOV headers (and the like) when backends parse headers."
   :version "21.1"
   :group 'nnmail
   :type '(repeat symbol))
@@ -1840,18 +1842,23 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
       ;; and fetch the mail from each.
       (while (setq source (pop fetching-sources))
         (when (setq new
-                    (mail-source-fetch
-                     source
-                     (gnus-byte-compile
-                      `(lambda (file orig-file)
-                         (nnmail-split-incoming
-                          file ',(intern (format "%s-save-mail" method))
-                          ',spool-func
-                          (or in-group
-                              (if (equal file orig-file)
-                                  nil
-                                (nnmail-get-split-group orig-file ',source)))
-                          ',(intern (format "%s-active-number" method)))))))
+                    (condition-case cond
+                        (mail-source-fetch
+                         source
+                         (gnus-byte-compile
+                          `(lambda (file orig-file)
+                             (nnmail-split-incoming
+                              file ',(intern (format "%s-save-mail" method))
+                              ',spool-func
+                              (or in-group
+                                  (if (equal file orig-file)
+                                      nil
+                                    (nnmail-get-split-group orig-file
+                                                            ',source)))
+                              ',(intern (format "%s-active-number" method))))))
+                      ((error quit)
+                       (message "Mail source %s failed: %s" source cond)
+                       0)))
           (incf total new)
           (incf i)))
       ;; If we did indeed read any incoming spools, we save all info.
diff --git a/lisp/gnus/nnmaildir.el b/lisp/gnus/nnmaildir.el
index 8e2cd4bdde3..bbace7c784a 100644
--- a/lisp/gnus/nnmaildir.el
+++ b/lisp/gnus/nnmaildir.el
@@ -1381,7 +1381,8 @@ by nnmaildir-request-article.")
         (error
          (gmm-write-region (point-min) (point-max) tmpfile nil 'no-message nil
                            'excl)
-         (unix-sync))) ;; no fsync :(
+         (when (fboundp 'unix-sync)
+           (unix-sync)))) ;; no fsync :(
       (nnheader-cancel-timer 24h)
       (condition-case err
           (add-name-to-file tmpfile curfile)
diff --git a/lisp/gnus/nnmairix.el b/lisp/gnus/nnmairix.el
index b82d6c2ee7b..3d1ac02b6aa 100644
--- a/lisp/gnus/nnmairix.el
+++ b/lisp/gnus/nnmairix.el
@@ -604,9 +604,7 @@ Other back ends might or might not work.")
 
 ;; Silence byte-compiler.
 (defvar gnus-registry-install)
-(autoload 'gnus-registry-fetch-group "gnus-registry")
-(autoload 'gnus-registry-fetch-groups "gnus-registry")
-(autoload 'gnus-registry-add-group "gnus-registry")
+(autoload 'gnus-registry-get-id-key "gnus-registry")
 
 (deffoo nnmairix-request-set-mark (group actions &optional server)
   (when server
@@ -660,13 +658,7 @@ Other back ends might or might not work.")
                               nnmairix-only-use-registry)
                     (setq ogroup
                           (nnmairix-determine-original-group-from-path
-                           mid nnmairix-current-server))
-                    ;; if available and allowed, add this entry to the registry
-                    (when (and (boundp 'gnus-registry-install)
-                               gnus-registry-install)
-                      (dolist (cur ogroup)
-                        (unless (gnus-parameter-registry-ignore cur)
-                          (gnus-registry-add-group mid cur)))))
+                           mid nnmairix-current-server)))
                   (unless ogroup
                     (nnheader-message
                      3 "Unable to set mark: couldn't find original group for %s" mid)
@@ -1630,14 +1622,7 @@ search in raw mode."
         ;; registry was not available or did not find article
         ;; so we search again with mairix in raw mode to get filename
         (setq allgroups
-              (nnmairix-determine-original-group-from-path mid server))
-        ;; if available and allowed, add this entry to the registry
-        (when (and (not no-registry)
-                   (boundp 'gnus-registry-install)
-                   gnus-registry-install)
-          (dolist (cur allgroups)
-            (unless (gnus-parameter-registry-ignore cur)
-              (gnus-registry-add-group mid cur)))))
+              (nnmairix-determine-original-group-from-path mid server)))
       (if (> (length allgroups) 1)
           (setq group
                 (gnus-completing-read
@@ -1657,7 +1642,7 @@ search in raw mode."
       (set mid (concat "<" mid)))
     (unless (string-match ">$" mid)
       (set mid (concat mid ">")))
-    (gnus-registry-fetch-groups mid)))
+    (gnus-registry-get-id-key mid 'group)))
 
 (defun nnmairix-determine-original-group-from-path (mid server)
   "Determine original group(s) for message-id MID from the file path.
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index 986fd51a613..325aa67f80d 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -261,6 +261,8 @@ See `nnml-marks-is-evil' for more information.")
                                           (const :format "" "password")
                                           (string :format "Password: %v")))))))
 
+(make-obsolete 'nntp-authinfo-file nil "Emacs 24.1")
+
 
 
 (defvoo nntp-connection-timeout nil
@@ -430,6 +432,9 @@ be restored and the command retried."
 
 (defun nntp-kill-buffer (buffer)
   (when (buffer-name buffer)
+    (let ((process (get-buffer-process buffer)))
+      (when process
+        (delete-process process)))
     (kill-buffer buffer)
     (nnheader-init-server-buffer)))
 
diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el
index e29ddb0d44e..54c21703836 100644
--- a/lisp/gnus/pop3.el
+++ b/lisp/gnus/pop3.el
@@ -178,6 +178,8 @@ Use streaming commands."
 
 (defun pop3-wait-for-messages (process count total-size)
   (while (< (pop3-number-of-responses total-size) count)
+    (unless (memq (process-status process) '(open run))
+      (error "pop3 process died"))
     (when total-size
       (message "pop3 retrieved %dKB (%d%%)"
                (truncate (/ (buffer-size) 1000))
diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el
index 33dbaaa1f0c..c7f993d7293 100644
--- a/lisp/gnus/spam.el
+++ b/lisp/gnus/spam.el
@@ -1581,31 +1581,31 @@ to find it out)."
   (when (numberp article)
     (let* ((data-header (or prepared-data-header
                             (spam-fetch-article-header article))))
-      (if (arrayp data-header)
-        (cond
-         ((equal field 'number)
-          (mail-header-number data-header))
-         ((equal field 'from)
-          (mail-header-from data-header))
-         ((equal field 'message-id)
-          (mail-header-message-id data-header))
-         ((equal field 'subject)
-          (mail-header-subject data-header))
-         ((equal field 'references)
-          (mail-header-references data-header))
-         ((equal field 'date)
-          (mail-header-date data-header))
-         ((equal field 'xref)
-          (mail-header-xref data-header))
-         ((equal field 'extra)
-          (mail-header-extra data-header))
-         (t
-          (gnus-error
-           5
-           "spam-fetch-field-fast: unknown field %s requested"
-           field)
-          nil))
-        (gnus-message 6 "Article %d has a nil data header" article)))))
+      (cond
+       ((not (arrayp data-header))
+        (gnus-message 6 "Article %d has a nil data header" article))
+       ((equal field 'number)
+        (mail-header-number data-header))
+       ((equal field 'from)
+        (mail-header-from data-header))
+       ((equal field 'message-id)
+        (mail-header-message-id data-header))
+       ((equal field 'subject)
+        (mail-header-subject data-header))
+       ((equal field 'references)
+        (mail-header-references data-header))
+       ((equal field 'date)
+        (mail-header-date data-header))
+       ((equal field 'xref)
+        (mail-header-xref data-header))
+       ((equal field 'extra)
+        (mail-header-extra data-header))
+       (t
+        (gnus-error
+         5
+         "spam-fetch-field-fast: unknown field %s requested"
+         field)
+        nil)))))
 
 (defun spam-fetch-field-from-fast (article &optional prepared-data-header)
   (spam-fetch-field-fast article 'from prepared-data-header))
diff --git a/lisp/gnus/starttls.el b/lisp/gnus/starttls.el
index 4b4839a4df2..b995f7478ce 100644
--- a/lisp/gnus/starttls.el
+++ b/lisp/gnus/starttls.el
@@ -295,18 +295,15 @@ GNUTLS requires a port number."
       (starttls-set-process-query-on-exit-flag process nil)
       process)))
 
-(defun starttls-any-program-available ()
-  (let ((program (if starttls-use-gnutls
-                     starttls-gnutls-program
-                   starttls-program)))
-    (condition-case ()
-        (progn
-          (call-process program)
-          program)
-      (error (progn
-               (message "No STARTTLS program was available (tried '%s')"
-                        program)
-               nil)))))
+(defun starttls-available-p ()
+  "Say whether the STARTTLS programs are available."
+  (executable-find (if starttls-use-gnutls
+                       starttls-gnutls-program
+                     starttls-program)))
+
+(defalias 'starttls-any-program-available 'starttls-available-p)
+(make-obsolete 'starttls-any-program-available 'starttls-available-p
+               "2011-08-02")
 
 (provide 'starttls)
 
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index b13e6a77d5d..5e034b14fde 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -65,7 +65,9 @@
 
 (defun help-split-fundoc (docstring def)
   "Split a function DOCSTRING into the actual doc and the usage info.
-Return (USAGE . DOC) or nil if there's no usage info.
+Return (USAGE . DOC) or nil if there's no usage info, where USAGE info
+is a string describing the argument list of DEF, such as
+\"(apply FUNCTION &rest ARGUMENTS)\".
 DEF is the function whose usage we're looking for in DOCSTRING."
   ;; Functions can get the calling sequence at the end of the doc string.
   ;; In cases where `function' has been fset to a subr we can't search for
@@ -156,12 +158,7 @@ the same names as used in the original source code, when possible."
 (defun help-make-usage (function arglist)
   (cons (if (symbolp function) function 'anonymous)
         (mapcar (lambda (arg)
-                  (if (not (symbolp arg))
-                      (if (and (consp arg) (symbolp (car arg)))
-                          ;; CL style default values for optional args.
-                          (cons (intern (upcase (symbol-name (car arg))))
-                                (cdr arg))
-                        arg)
+                  (if (not (symbolp arg)) arg
                     (let ((name (symbol-name arg)))
                       (cond
                        ((string-match "\\`&" name) arg)
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index 1a96f29c4cc..64c114c993d 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -35,13 +35,12 @@
 
 (defvar help-mode-map
   (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map button-buffer-map)
-
+    (set-keymap-parent map (make-composed-keymap button-buffer-map
+                                                 special-mode-map))
     (define-key map [mouse-2] 'help-follow-mouse)
     (define-key map "\C-c\C-b" 'help-go-back)
     (define-key map "\C-c\C-f" 'help-go-forward)
     (define-key map "\C-c\C-c" 'help-follow-symbol)
-    ;; Documentation only, since we use minor-mode-overriding-map-alist.
     (define-key map "\r" 'help-follow)
     map)
   "Keymap for help mode.")
@@ -266,37 +265,13 @@ The format is (FUNCTION ARGS...).")
   'help-function 'customize-create-theme
   'help-echo (purecopy "mouse-2, RET: edit this theme file"))
 
-;;;###autoload
-(defun help-mode ()
+(define-derived-mode help-mode special-mode "Help"
   "Major mode for viewing help text and navigating references in it.
 Entry to this mode runs the normal hook `help-mode-hook'.
 Commands:
 \\{help-mode-map}"
-  (interactive)
-  (kill-all-local-variables)
-  (use-local-map help-mode-map)
-  (setq mode-name "Help")
-  (setq major-mode 'help-mode)
-
-  (view-mode)
-  (set (make-local-variable 'view-no-disable-on-exit) t)
-  ;; With Emacs 22 `view-exit-action' could delete the selected window
-  ;; disregarding whether the help buffer was shown in that window at
-  ;; all.  Since `view-exit-action' is called with the help buffer as
-  ;; argument it seems more appropriate to have it work on the buffer
-  ;; only and leave it to `view-mode-exit' to delete any associated
-  ;; window(s).
-  (setq view-exit-action
-        (lambda (buffer)
-          ;; Use `with-current-buffer' to make sure that `bury-buffer'
-          ;; also removes BUFFER from the selected window.
-          (with-current-buffer buffer
-            (bury-buffer))))
-
   (set (make-local-variable 'revert-buffer-function)
-       'help-mode-revert-buffer)
-
-  (run-mode-hooks 'help-mode-hook))
+       'help-mode-revert-buffer))
 
 ;;;###autoload
 (defun help-mode-setup ()
@@ -403,13 +378,6 @@ it does not already exist."
        (error "Current buffer is not in Help mode"))
      (current-buffer))))
 
-(defvar help-xref-override-view-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map view-mode-map)
-    (define-key map "\r" nil)
-    map)
-  "Replacement keymap for `view-mode' in help buffers.")
-
 ;;;###autoload
 (defun help-make-xrefs (&optional buffer)
   "Parse and hyperlink documentation cross-references in the given BUFFER.
@@ -594,9 +562,6 @@ that."
                                      (current-buffer)))
           (when (or help-xref-stack help-xref-forward-stack)
             (insert "\n")))
-        ;; View mode steals RET from us.
-        (set (make-local-variable 'minor-mode-overriding-map-alist)
-             (list (cons 'view-mode help-xref-override-view-map)))
         (set-buffer-modified-p old-modified)))))
 
 ;;;###autoload
diff --git a/lisp/help.el b/lisp/help.el
index e6496f625d1..3ed6f79275a 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -132,7 +132,7 @@
   "What to do to \"exit\" the help buffer.
 This is a list
  (WINDOW . t)              delete the selected window (and possibly its frame,
-                           see `quit-window' and `View-quit'), go to WINDOW.
+                           see `quit-window'), go to WINDOW.
  (WINDOW . quit-window)    do quit-window, then select WINDOW.
  (WINDOW BUF START POINT)  display BUF at START, POINT, then select WINDOW.")
 
@@ -1104,7 +1104,7 @@ This relies on `display-buffer-window' being correctly set up by
           ((eq help-value 'new-window)
            "Type \\[delete-other-windows] to delete the help window")
           ((eq help-value 'reuse-other-window)
-           "Type \\[switch-to-prev-buffer] RET to restore previous buffer"))
+           "Type \"q\" in other window to quit"))
          help-window 'other))
        (t
         ;; Not much to say here.
diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el
index a0b5844582b..a254abe33ac 100644
--- a/lisp/hi-lock.el
+++ b/lisp/hi-lock.el
@@ -461,7 +461,9 @@ interactive functions.  \(See `hi-lock-interactive-patterns'.\)
 \\<minibuffer-local-must-match-map>Use \\[minibuffer-complete] to complete a partially typed regexp.
 \(See info node `Minibuffer History'.\)"
   (interactive
-   (if (and (display-popup-menus-p) (not last-nonmenu-event))
+   (if (and (display-popup-menus-p)
+            (listp last-nonmenu-event)
+            use-dialog-box)
        (catch 'snafu
          (or
           (x-popup-menu
diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el
index f4b729458e6..073efaeee2a 100644
--- a/lisp/ibuf-ext.el
+++ b/lisp/ibuf-ext.el
@@ -505,7 +505,7 @@ To evaluate a form without viewing the buffer, see `ibuffer-do-eval'."
               (assoc (cdr filter)
                      ibuffer-saved-filters)))
          (unless data
-           (ibuffer-filter-disable)
+           (ibuffer-filter-disable t)
            (error "Unknown saved filter %s" (cdr filter)))
          (ibuffer-included-in-filters-p buf (cadr data))))
       (t
@@ -514,7 +514,7 @@ To evaluate a form without viewing the buffer, see `ibuffer-do-eval'."
          ;; filterdat should be like (TYPE DESCRIPTION FUNC)
          ;; just a sanity check
         (unless filterdat
-          (ibuffer-filter-disable)
+          (ibuffer-filter-disable t)
           (error "Undefined filter %s" (car filter)))
         (not
          (not
@@ -768,11 +768,14 @@ The value from `ibuffer-saved-filter-groups' is used."
   (ibuffer-update nil t))
 
 ;;;###autoload
-(defun ibuffer-filter-disable ()
-  "Disable all filters currently in effect in this buffer."
+(defun ibuffer-filter-disable (&optional delete-filter-groups)
+  "Disable all filters currently in effect in this buffer.
+With optional arg DELETE-FILTER-GROUPS non-nil, delete all filter
+group definitions by setting `ibuffer-filter-groups' to nil."
   (interactive)
-  (setq ibuffer-filtering-qualifiers nil
-        ibuffer-filter-groups nil)
+  (setq ibuffer-filtering-qualifiers nil)
+  (if delete-filter-groups
+      (setq ibuffer-filter-groups nil))
   (let ((buf (ibuffer-current-buffer)))
     (ibuffer-update nil t)
     (when buf
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 5fda52f3d12..5a86508e144 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -356,12 +356,12 @@ directory, like `default-directory'."
   :type 'hook
   :group 'ibuffer)
 
-(defcustom ibuffer-marked-face 'font-lock-warning-face
+(defcustom ibuffer-marked-face 'warning
   "Face used for displaying marked buffers."
   :type 'face
   :group 'ibuffer)
 
-(defcustom ibuffer-deletion-face 'font-lock-type-face
+(defcustom ibuffer-deletion-face 'error
   "Face used for displaying buffers marked for deletion."
   :type 'face
   :group 'ibuffer)
@@ -2648,7 +2648,7 @@ will be inserted before the group at point."
 ;;;;;;  ibuffer-backward-filter-group ibuffer-forward-filter-group
 ;;;;;;  ibuffer-toggle-filter-group ibuffer-mouse-toggle-filter-group
 ;;;;;;  ibuffer-interactive-filter-by-mode ibuffer-mouse-filter-by-mode
-;;;;;;  ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" "001cd83e8e1ff27c9a61097c840a984d")
+;;;;;;  ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" "617b36fc8479547d679cf0103f82e3ff")
 ;;; Generated autoloads from ibuf-ext.el
 
 (autoload 'ibuffer-auto-mode "ibuf-ext" "\
@@ -2778,8 +2778,10 @@ The value from `ibuffer-saved-filter-groups' is used.
 
 (autoload 'ibuffer-filter-disable "ibuf-ext" "\
 Disable all filters currently in effect in this buffer.
+With optional arg DELETE-FILTER-GROUPS non-nil, delete all filter
+group definitions by setting `ibuffer-filter-groups' to nil.
 
-\(fn)" t nil)
+\(fn &optional DELETE-FILTER-GROUPS)" t nil)
 
 (autoload 'ibuffer-pop-filter "ibuf-ext" "\
 Remove the top filter in this buffer.
diff --git a/lisp/ido.el b/lisp/ido.el
index b50ddcc1254..4086000e3e9 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -1557,7 +1557,8 @@ This function also adds a hook to the minibuffer."
         (setq ido-minor-mode-map-entry (cons 'ido-mode map))
         (add-to-list 'minor-mode-map-alist ido-minor-mode-map-entry))))
 
-  (message "Ido mode %s" (if ido-mode "enabled" "disabled")))
+  (when (called-interactively-p 'any)
+    (message "Ido mode %s" (if ido-mode "enabled" "disabled"))))
 
 
 ;;; IDO KEYMAP
diff --git a/lisp/image-dired.el b/lisp/image-dired.el
index ce351f13a19..5477d01379d 100644
--- a/lisp/image-dired.el
+++ b/lisp/image-dired.el
@@ -516,6 +516,14 @@ before warning the user."
   :type 'integer
   :group 'image-dired)
 
+(defmacro image-dired--with-db-file (&rest body)
+  "Run BODY in a temp buffer containing `image-dired-db-file'.
+Return the last form in BODY."
+  `(with-temp-buffer
+     (if (file-exists-p image-dired-db-file)
+         (insert-file-contents image-dired-db-file))
+     ,@body))
+
 (defun image-dired-dir ()
   "Return the current thumbnails directory (from variable `image-dired-dir').
 Create the thumbnails directory if it does not exist."
@@ -898,76 +906,69 @@ FILE-TAGS is an alist in the following form:
  ((FILE . TAG) ... )"
   (image-dired-sane-db-file)
   (let (end file tag)
-    (with-temp-file image-dired-db-file
-      (insert-file-contents image-dired-db-file)
-      (dolist (elt file-tags)
-        (setq file (car elt)
-              tag (cdr elt))
-        (goto-char (point-min))
-        (if (search-forward-regexp (format "^%s.*$" file) nil t)
-            (progn
-              (setq end (point))
-              (beginning-of-line)
-              (when (not (search-forward (format ";%s" tag) end t))
-                (end-of-line)
-                (insert (format ";%s" tag))))
-          (goto-char (point-max))
-          (insert (format "\n%s;%s" file tag)))))))
+    (image-dired--with-db-file
+     (setq buffer-file-name image-dired-db-file)
+     (dolist (elt file-tags)
+       (setq file (car elt)
+             tag (cdr elt))
+       (goto-char (point-min))
+       (if (search-forward-regexp (format "^%s.*$" file) nil t)
+           (progn
+             (setq end (point))
+             (beginning-of-line)
+             (when (not (search-forward (format ";%s" tag) end t))
+               (end-of-line)
+               (insert (format ";%s" tag))))
+         (goto-char (point-max))
+         (insert (format "\n%s;%s" file tag))))
+     (save-buffer))))
 
 (defun image-dired-remove-tag (files tag)
   "For all FILES, remove TAG from the image database."
   (image-dired-sane-db-file)
-  (save-excursion
-    (let (end buf)
-      (setq buf (find-file image-dired-db-file))
-      (if (not (listp files))
-          (if (stringp files)
-              (setq files (list files))
-            (error "Files must be a string or a list of strings!")))
-      (mapc
-       (lambda (file)
-         (goto-char (point-min))
-         (when (search-forward-regexp
-                (format "^%s" file) nil t)
-           (end-of-line)
-           (setq end (point))
-           (beginning-of-line)
-           (when (search-forward-regexp (format "\\(;%s\\)" tag) end t)
-             (delete-region (match-beginning 1) (match-end 1))
-             ;; Check if file should still be in the database. If
-             ;; it has no tags or comments, it will be removed.
-             (end-of-line)
-             (setq end (point))
-             (beginning-of-line)
-             (when (not (search-forward ";" end t))
-               (kill-line 1)
-               ;; If on empty line at end of buffer
-               (when (and (eobp)
-                          (looking-at "^$"))
-                 (delete-char -1))))))
-       files)
-      (save-buffer)
-      (kill-buffer buf))))
+  (image-dired--with-db-file
+   (setq buffer-file-name image-dired-db-file)
+   (let (end)
+     (unless (listp files)
+       (if (stringp files)
+           (setq files (list files))
+         (error "Files must be a string or a list of strings!")))
+     (dolist (file files)
+       (goto-char (point-min))
+       (when (search-forward-regexp (format "^%s" file) nil t)
+         (end-of-line)
+         (setq end (point))
+         (beginning-of-line)
+         (when (search-forward-regexp (format "\\(;%s\\)" tag) end t)
+           (delete-region (match-beginning 1) (match-end 1))
+           ;; Check if file should still be in the database. If
+           ;; it has no tags or comments, it will be removed.
+           (end-of-line)
+           (setq end (point))
+           (beginning-of-line)
+           (when (not (search-forward ";" end t))
+             (kill-line 1)
+             ;; If on empty line at end of buffer
+             (and (eobp)
+                  (looking-at "^$")
+                  (delete-char -1)))))))
+   (save-buffer)))
 
 (defun image-dired-list-tags (file)
   "Read all tags for image FILE from the image database."
   (image-dired-sane-db-file)
-  (save-excursion
-    (let (end buf (tags ""))
-      (setq buf (find-file image-dired-db-file))
-      (goto-char (point-min))
-      (when (search-forward-regexp
-             (format "^%s" file) nil t)
-        (end-of-line)
-        (setq end (point))
-        (beginning-of-line)
-        (if (search-forward ";" end t)
-            (if (search-forward "comment:" end t)
-                (if (search-forward ";" end t)
-                    (setq tags (buffer-substring (point) end)))
-              (setq tags (buffer-substring (point) end)))))
-      (kill-buffer buf)
-      (split-string tags ";"))))
+  (image-dired--with-db-file
+   (let (end (tags ""))
+     (when (search-forward-regexp (format "^%s" file) nil t)
+       (end-of-line)
+       (setq end (point))
+       (beginning-of-line)
+       (if (search-forward ";" end t)
+           (if (search-forward "comment:" end t)
+               (if (search-forward ";" end t)
+                   (setq tags (buffer-substring (point) end)))
+             (setq tags (buffer-substring (point) end)))))
+     (split-string tags ";"))))
 
 ;;;###autoload
 (defun image-dired-tag-files (arg)
@@ -2061,34 +2062,35 @@ FILE-COMMENTS is an alist on the following form:
  ((FILE . COMMENT) ... )"
   (image-dired-sane-db-file)
   (let (end comment-beg-pos comment-end-pos file comment)
-    (with-temp-file image-dired-db-file
-      (insert-file-contents image-dired-db-file)
-      (dolist (elt file-comments)
-        (setq file (car elt)
-              comment (cdr elt))
-        (goto-char (point-min))
-        (if (search-forward-regexp (format "^%s.*$" file) nil t)
-            (progn
-              (setq end (point))
-              (beginning-of-line)
-              ;; Delete old comment, if any
-              (when (search-forward ";comment:" end t)
-                (setq comment-beg-pos (match-beginning 0))
-                ;; Any tags after the comment?
-                (if (search-forward ";" end t)
-                    (setq comment-end-pos (- (point) 1))
-                  (setq comment-end-pos end))
-                ;; Delete comment tag and comment
-                (delete-region comment-beg-pos comment-end-pos))
-              ;; Insert new comment
-              (beginning-of-line)
-              (unless (search-forward ";" end t)
-                (end-of-line)
-                (insert ";"))
-              (insert (format "comment:%s;" comment)))
-          ;; File does not exist in database - add it.
-          (goto-char (point-max))
-          (insert (format "\n%s;comment:%s" file comment)))))))
+    (image-dired--with-db-file
+     (setq buffer-file-name image-dired-db-file)
+     (dolist (elt file-comments)
+       (setq file (car elt)
+             comment (cdr elt))
+       (goto-char (point-min))
+       (if (search-forward-regexp (format "^%s.*$" file) nil t)
+           (progn
+             (setq end (point))
+             (beginning-of-line)
+             ;; Delete old comment, if any
+             (when (search-forward ";comment:" end t)
+               (setq comment-beg-pos (match-beginning 0))
+               ;; Any tags after the comment?
+               (if (search-forward ";" end t)
+                   (setq comment-end-pos (- (point) 1))
+                 (setq comment-end-pos end))
+               ;; Delete comment tag and comment
+               (delete-region comment-beg-pos comment-end-pos))
+             ;; Insert new comment
+             (beginning-of-line)
+             (unless (search-forward ";" end t)
+               (end-of-line)
+               (insert ";"))
+             (insert (format "comment:%s;" comment)))
+         ;; File does not exist in database - add it.
+         (goto-char (point-max))
+         (insert (format "\n%s;comment:%s" file comment))))
+     (save-buffer))))
 
 (defun image-dired-update-property (prop value)
   "Update text property PROP with value VALUE at point."
@@ -2130,24 +2132,20 @@ Optionally use old comment from FILE as initial value."
 (defun image-dired-get-comment (file)
   "Get comment for file FILE."
   (image-dired-sane-db-file)
-  (save-excursion
-    (let (end buf comment-beg-pos comment-end-pos comment)
-      (setq buf (find-file image-dired-db-file))
-      (goto-char (point-min))
-      (when (search-forward-regexp
-             (format "^%s" file) nil t)
-        (end-of-line)
-        (setq end (point))
-        (beginning-of-line)
-        (cond ((search-forward ";comment:" end t)
-               (setq comment-beg-pos (point))
-               (if (search-forward ";" end t)
-                   (setq comment-end-pos (- (point) 1))
-                 (setq comment-end-pos end))
-               (setq comment (buffer-substring
-                              comment-beg-pos comment-end-pos)))))
-      (kill-buffer buf)
-      comment)))
+  (image-dired--with-db-file
+   (let (end comment-beg-pos comment-end-pos comment)
+     (when (search-forward-regexp (format "^%s" file) nil t)
+       (end-of-line)
+       (setq end (point))
+       (beginning-of-line)
+       (when (search-forward ";comment:" end t)
+         (setq comment-beg-pos (point))
+         (if (search-forward ";" end t)
+             (setq comment-end-pos (- (point) 1))
+           (setq comment-end-pos end))
+         (setq comment (buffer-substring
+                        comment-beg-pos comment-end-pos))))
+     comment)))
 
 ;;;###autoload
 (defun image-dired-mark-tagged-files ()
@@ -2161,32 +2159,26 @@ matching tag will be marked in the dired buffer."
   (image-dired-sane-db-file)
   (let ((tag (read-string "Mark tagged files (regexp): "))
         (hits 0)
-        files buf)
-    (save-excursion
-      (setq buf (find-file image-dired-db-file))
-      (goto-char (point-min))
-      ;; Collect matches
-      (while (search-forward-regexp
-              (concat "\\(^[^;\n]+\\);.*" tag ".*$") nil t)
-        (setq files (append (list (match-string 1)) files)))
-      (kill-buffer buf)
-      ;; Mark files
-      (mapc
-       ;; I tried using `dired-mark-files-regexp' but it was
-       ;; waaaay to slow.
-       (lambda (curr-file)
-         ;; Don't bother about hits found in other directories than
-         ;; the current one.
-         (when (string= (file-name-as-directory
-                         (expand-file-name default-directory))
-                      (file-name-as-directory
-                       (file-name-directory curr-file)))
-           (setq curr-file (file-name-nondirectory curr-file))
-           (goto-char (point-min))
-           (when (search-forward-regexp (format "\\s %s$" curr-file) nil t)
-             (setq hits (+ hits 1))
-             (dired-mark 1))))
-       files))
+        files)
+    (image-dired--with-db-file
+     ;; Collect matches
+     (while (search-forward-regexp
+             (concat "\\(^[^;\n]+\\);.*" tag ".*$") nil t)
+       (push (match-string 1) files)))
+    ;; Mark files
+    (dolist (curr-file files)
+      ;; I tried using `dired-mark-files-regexp' but it was waaaay to
+      ;; slow.  Don't bother about hits found in other directories
+      ;; than the current one.
+      (when (string= (file-name-as-directory
+                      (expand-file-name default-directory))
+                     (file-name-as-directory
+                      (file-name-directory curr-file)))
+        (setq curr-file (file-name-nondirectory curr-file))
+        (goto-char (point-min))
+        (when (search-forward-regexp (format "\\s %s$" curr-file) nil t)
+          (setq hits (+ hits 1))
+          (dired-mark 1))))
     (message "%d files with matching tag marked." hits)))
 
 (defun image-dired-mouse-display-image (event)
@@ -2322,29 +2314,26 @@ image-dired-file-comment-list:
 (defun image-dired-create-gallery-lists ()
   "Create temporary lists used by `image-dired-gallery-generate'."
   (image-dired-sane-db-file)
-  (let ((buf (find-file image-dired-db-file))
-        end beg file row-tags)
-    (setq image-dired-tag-file-list nil)
-    (setq image-dired-file-tag-list nil)
-    (setq image-dired-file-comment-list nil)
-    (goto-char (point-min))
-    (while (search-forward-regexp "^." nil t)
-      (end-of-line)
-      (setq end (point))
-      (beginning-of-line)
-      (setq beg (point))
-      (if (not (search-forward ";" end nil))
-          (error "Something is really wrong, check format of database"))
-      (setq row-tags (split-string
-                      (buffer-substring beg end) ";"))
-      (setq file (car row-tags))
-      (mapc
-       (lambda (x)
-         (if (not (string-match "^comment:\\(.*\\)" x))
-             (image-dired-add-to-tag-file-lists x file)
-           (image-dired-add-to-file-comment-list file (match-string 1 x))))
-       (cdr row-tags)))
-    (kill-buffer buf))
+  (image-dired--with-db-file
+   (let (end beg file row-tags)
+     (setq image-dired-tag-file-list nil)
+     (setq image-dired-file-tag-list nil)
+     (setq image-dired-file-comment-list nil)
+     (goto-char (point-min))
+     (while (search-forward-regexp "^." nil t)
+       (end-of-line)
+       (setq end (point))
+       (beginning-of-line)
+       (setq beg (point))
+       (unless (search-forward ";" end nil)
+         (error "Something is really wrong, check format of database"))
+       (setq row-tags (split-string
+                       (buffer-substring beg end) ";"))
+       (setq file (car row-tags))
+       (dolist (x (cdr row-tags))
+         (if (not (string-match "^comment:\\(.*\\)" x))
+             (image-dired-add-to-tag-file-lists x file)
+           (image-dired-add-to-file-comment-list file (match-string 1 x)))))))
   ;; Sort tag-file list
   (setq image-dired-tag-file-list
         (sort image-dired-tag-file-list
@@ -2372,7 +2361,8 @@ it easier to generate, then HTML-files are created in
 when using per-directory thumbnail file storage"))
   (image-dired-create-gallery-lists)
   (let ((tags image-dired-tag-file-list)
-        count tag index-buf tag-buf
+        (index-file (format "%s/index.html" image-dired-gallery-dir))
+        count tag tag-file
         comment file-tags tag-link tag-link-list)
     ;; Make sure gallery root exist
     (if (file-exists-p image-dired-gallery-dir)
@@ -2380,85 +2370,75 @@ when using per-directory thumbnail file storage"))
             (error "Variable image-dired-gallery-dir is not a directory"))
       (make-directory image-dired-gallery-dir))
     ;; Open index file
-    (setq index-buf (find-file
-                     (format "%s/index.html" image-dired-gallery-dir)))
-    (erase-buffer)
-    (insert "<html>\n")
-    (insert "  <body>\n")
-    (insert "   <h2>Image-Dired Gallery</h2>\n")
-    (insert (format "<p>\n    Gallery generated %s\n   <p>\n"
-                    (current-time-string)))
-    (insert "   <h3>Tag index</h3>\n")
-    (setq count 1)
-    ;; Pre-generate list of all tag links
-    (mapc
-     (lambda (curr)
-       (setq tag (car curr))
-       (when (not (member tag image-dired-gallery-hidden-tags))
-         (setq tag-link (format "<a href=\"%d.html\">%s</a>" count tag))
-         (if tag-link-list
-             (setq tag-link-list
-                   (append tag-link-list (list (cons tag tag-link))))
-           (setq tag-link-list (list (cons tag tag-link))))
-         (setq count (1+ count))))
-     tags)
-    (setq count 1)
-    ;; Main loop where we generated thumbnail pages per tag
-    (mapc
-     (lambda (curr)
-       (setq tag (car curr))
-       ;; Don't display hidden tags
-       (when (not (member tag image-dired-gallery-hidden-tags))
-         ;; Insert link to tag page in index
-         (insert (format "    %s<br>\n" (cdr (assoc tag tag-link-list))))
-         ;; Open per-tag file
-         (setq tag-buf (find-file
-                        (format "%s/%s.html" image-dired-gallery-dir count)))
-         (erase-buffer)
-         (insert "<html>\n")
-         (insert "  <body>\n")
-         (insert "  <p><a href=\"index.html\">Index</a></p>\n")
-         (insert (format "  <h2>Images with tag &quot;%s&quot;</h2>" tag))
-         ;; Main loop for files per tag page
-         (mapc
-          (lambda (file)
-            (when (not (image-dired-hidden-p file))
-              ;; Insert thumbnail with link to full image
-              (insert
-               (format "<a href=\"%s/%s\"><img src=\"%s/%s\"%s></a>\n"
-                       image-dired-gallery-image-root-url
-                       (file-name-nondirectory file)
-                       image-dired-gallery-thumb-image-root-url
-                       (file-name-nondirectory (image-dired-thumb-name file)) file))
-              ;; Insert comment, if any
-              (if (setq comment (cdr (assoc file image-dired-file-comment-list)))
-                  (insert (format "<br>\n%s<br>\n" comment))
-                (insert "<br>\n"))
-              ;; Insert links to other tags, if any
-              (when (> (length
-                        (setq file-tags (assoc file image-dired-file-tag-list))) 2)
-                (insert "[ ")
-                (mapc
-                 (lambda (extra-tag)
-                   ;; Only insert if not file name or the main tag
-                   (if (and (not (equal extra-tag tag))
-                            (not (equal extra-tag file)))
-                       (insert
-                        (format "%s " (cdr (assoc extra-tag tag-link-list))))))
-                 file-tags)
-                (insert "]<br>\n"))))
-          (cdr curr))
-         (insert "  <p><a href=\"index.html\">Index</a></p>\n")
-         (insert "  </body>\n")
-         (insert "</html>\n")
-         (save-buffer)
-         (kill-buffer tag-buf)
-         (setq count (1+ count))))
-       tags)
-    (insert "  </body>\n")
-    (insert "</html>")
-    (save-buffer)
-    (kill-buffer index-buf)))
+    (with-temp-file index-file
+      (if (file-exists-p index-file)
+          (insert-file-contents index-file))
+      (insert "<html>\n")
+      (insert "  <body>\n")
+      (insert "   <h2>Image-Dired Gallery</h2>\n")
+      (insert (format "<p>\n    Gallery generated %s\n   <p>\n"
+                      (current-time-string)))
+      (insert "   <h3>Tag index</h3>\n")
+      (setq count 1)
+      ;; Pre-generate list of all tag links
+      (dolist (curr tags)
+        (setq tag (car curr))
+        (when (not (member tag image-dired-gallery-hidden-tags))
+          (setq tag-link (format "<a href=\"%d.html\">%s</a>" count tag))
+          (if tag-link-list
+              (setq tag-link-list
+                    (append tag-link-list (list (cons tag tag-link))))
+            (setq tag-link-list (list (cons tag tag-link))))
+          (setq count (1+ count))))
+      (setq count 1)
+      ;; Main loop where we generated thumbnail pages per tag
+      (dolist (curr tags)
+        (setq tag (car curr))
+        ;; Don't display hidden tags
+        (when (not (member tag image-dired-gallery-hidden-tags))
+          ;; Insert link to tag page in index
+          (insert (format "    %s<br>\n" (cdr (assoc tag tag-link-list))))
+          ;; Open per-tag file
+          (setq tag-file (format "%s/%s.html" image-dired-gallery-dir count))
+          (with-temp-file tag-file
+            (if (file-exists-p tag-file)
+                (insert-file-contents tag-file))
+            (erase-buffer)
+            (insert "<html>\n")
+            (insert "  <body>\n")
+            (insert "  <p><a href=\"index.html\">Index</a></p>\n")
+            (insert (format "  <h2>Images with tag &quot;%s&quot;</h2>" tag))
+            ;; Main loop for files per tag page
+            (dolist (file (cdr curr))
+              (unless (image-dired-hidden-p file)
+                ;; Insert thumbnail with link to full image
+                (insert
+                 (format "<a href=\"%s/%s\"><img src=\"%s/%s\"%s></a>\n"
+                         image-dired-gallery-image-root-url
+                         (file-name-nondirectory file)
+                         image-dired-gallery-thumb-image-root-url
+                         (file-name-nondirectory (image-dired-thumb-name file)) file))
+                ;; Insert comment, if any
+                (if (setq comment (cdr (assoc file image-dired-file-comment-list)))
+                    (insert (format "<br>\n%s<br>\n" comment))
+                  (insert "<br>\n"))
+                ;; Insert links to other tags, if any
+                (when (> (length
+                          (setq file-tags (assoc file image-dired-file-tag-list))) 2)
+                  (insert "[ ")
+                  (dolist (extra-tag file-tags)
+                    ;; Only insert if not file name or the main tag
+                    (if (and (not (equal extra-tag tag))
+                             (not (equal extra-tag file)))
+                        (insert
+                         (format "%s " (cdr (assoc extra-tag tag-link-list))))))
+                  (insert "]<br>\n"))))
+            (insert "  <p><a href=\"index.html\">Index</a></p>\n")
+            (insert "  </body>\n")
+            (insert "</html>\n"))
+          (setq count (1+ count))))
+      (insert "  </body>\n")
+      (insert "</html>"))))
 
 (defun image-dired-kill-buffer-and-window ()
   "Kill the current buffer and, if possible, also the window."
diff --git a/lisp/info.el b/lisp/info.el
index a4826ee8c2c..191e75f9750 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -2128,7 +2128,7 @@ If SAME-FILE is non-nil, do not move to a different Info file."
                ))
 
 (defun Info-history-toc-nodes (filename)
-  "History-specific implementation of `Info-history-toc-nodes'."
+  "History-specific implementation of `Info-toc-nodes'."
   `(,filename
     ("Top" nil nil nil)))
 
@@ -2789,11 +2789,6 @@ N is the digit argument used to invoke this command."
                (goto-char (point-max)))))
         (t (error "No previous nodes"))))
 
-(defun Info-beginning-of-buffer ()
-  "Go to the beginnning of the buffer."
-  (interactive)
-  (goto-char (point-min)))
-
 (defun Info-scroll-up ()
   "Scroll one screenful forward in Info, considering all nodes as one sequence.
 Once you scroll far enough in a node that its menu appears on the screen
@@ -3655,7 +3650,7 @@ If FORK is non-nil, it is passed to `Info-goto-node'."
 (defvar Info-mode-map
   (let ((map (make-keymap)))
     (suppress-keymap map)
-    (define-key map "." 'Info-beginning-of-buffer)
+    (define-key map "." 'beginning-of-buffer)
     (define-key map " " 'Info-scroll-up)
     (define-key map "\C-m" 'Info-follow-nearest-node)
     (define-key map "\t" 'Info-next-reference)
@@ -3676,8 +3671,8 @@ If FORK is non-nil, it is passed to `Info-goto-node'."
     (define-key map "[" 'Info-backward-node)
     (define-key map "<" 'Info-top-node)
     (define-key map ">" 'Info-final-node)
-    (define-key map "b" 'Info-beginning-of-buffer)
-    (put 'Info-beginning-of-buffer :advertised-binding "b")
+    (define-key map "b" 'beginning-of-buffer)
+    (put 'beginning-of-buffer :advertised-binding "b")
     (define-key map "d" 'Info-directory)
     (define-key map "e" 'Info-edit)
     (define-key map "f" 'Info-follow-reference)
@@ -3731,7 +3726,7 @@ If FORK is non-nil, it is passed to `Info-goto-node'."
     :help "Go backward one node, considering all as a sequence"]
    ["Forward" Info-forward-node
     :help "Go forward one node, considering all as a sequence"]
-   ["Beginning" Info-beginning-of-buffer
+   ["Beginning" beginning-of-buffer
     :help "Go to beginning of this node"]
    ["Top" Info-top-node
     :help "Go to top node of file"]
@@ -3937,7 +3932,7 @@ Moving within a node:
 \\[Info-scroll-down]    Normally, scroll backward.  If the beginning of the buffer is
           already visible, try to go to the previous menu entry, or up
           if there is none.
-\\[Info-beginning-of-buffer]    Go to beginning of node.
+\\[beginning-of-buffer] Go to beginning of node.
 
 Advanced commands:
 \\[Info-search] Search through this Info file for specified regexp,
diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index a9657c17b9f..47426784e51 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -114,6 +114,16 @@ A character which can't be placed at end of line.")
 Base characters (Unicode General Category L,N,P,S,Zs)")
 (define-category ?^ "Combining
 Combining diacritic or mark (Unicode General Category M)")
+
+;; bidi types
+(define-category ?R "Right-to-left (strong)
+Characters with \"strong\" right-to-left directionality, i.e.
+with R, AL, RLE, or RLO Unicode bidi character type.")
+
+(define-category ?L "Left-to-right (strong)
+Characters with \"strong\" left-to-right directionality, i.e.
+with L, LRE, or LRO Unicode bidi character type.")
+
 
 ;;; Setting syntax and category.
 
@@ -478,6 +488,16 @@ Combining diacritic or mark (Unicode General Category M)")
                   (modify-category-entry x category))
               chars)))))
 
+;; Bidi categories
+
+(map-char-table (lambda (key val)
+                  (cond
+                   ((memq val '(R AL RLO RLE))
+                    (modify-category-entry key ?R))
+                   ((memq val '(L LRE LRO))
+                    (modify-category-entry key ?L))))
+                (unicode-property-table-internal 'bidi-class))
+
 ;; Latin
 
 (modify-category-entry '(#x80 . #x024F) ?l)
diff --git a/lisp/international/charprop.el b/lisp/international/charprop.el
index 919666010b1..2424e87ae44 100644
--- a/lisp/international/charprop.el
+++ b/lisp/international/charprop.el
@@ -29,15 +29,18 @@ one of these symbols representing compatibility formatting tag:
 ;; FILE: uni-decimal.el
 (define-char-code-property 'decimal-digit-value "uni-decimal.el"
   "Unicode numeric value (decimal digit).
-Property value is an integer.")
+Property value is an integer 0..9, or nil.
+The value nil stands for NaN \"Numeric_Value\".")
 ;; FILE: uni-digit.el
 (define-char-code-property 'digit-value "uni-digit.el"
   "Unicode numeric value (digit).
-Property value is an integer.")
+Property value is an integer 0..9, or nil.
+The value nil stands for NaN \"Numeric_Value\".")
 ;; FILE: uni-numeric.el
 (define-char-code-property 'numeric-value "uni-numeric.el"
   "Unicode numeric value (numeric).
-Property value is an integer or a floating point.")
+Property value is an integer, a floating point, or nil.
+The value nil stands for NaN \"Numeric_Value\".")
 ;; FILE: uni-mirrored.el
 (define-char-code-property 'mirrored "uni-mirrored.el"
   "Unicode bidi mirrored flag.
@@ -53,20 +56,27 @@ Property value is a string.")
 ;; FILE: uni-uppercase.el
 (define-char-code-property 'uppercase "uni-uppercase.el"
   "Unicode simple uppercase mapping.
-Property value is a character.")
+Property value is a character or nil.
+The value nil means that the actual property value of a character
+is the character itself.")
 ;; FILE: uni-lowercase.el
 (define-char-code-property 'lowercase "uni-lowercase.el"
   "Unicode simple lowercase mapping.
-Property value is a character.")
+Property value is a character or nil.
+The value nil means that the actual property value of a character
+is the character itself.")
 ;; FILE: uni-titlecase.el
 (define-char-code-property 'titlecase "uni-titlecase.el"
   "Unicode simple titlecase mapping.
-Property value is a character.")
+Property value is a character or nil.
+The value nil means that the actual property value of a character
+is the character itself.")
 ;; 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.")
+Property value is a character that has the corresponding mirroring image or nil.
+The value nil means that the actual property value of a character
+is the character itself.")
 ;; Local Variables:
 ;; coding: utf-8
 ;; no-byte-compile: t
diff --git a/lisp/international/ucs-normalize.el b/lisp/international/ucs-normalize.el
index f83e0f7588f..df05b355b46 100644
--- a/lisp/international/ucs-normalize.el
+++ b/lisp/international/ucs-normalize.el
@@ -139,14 +139,17 @@
   (defun nfd (char)
     (let ((decomposition
            (get-char-code-property char 'decomposition)))
-      (if (and decomposition (numberp (car decomposition)))
+      (if (and decomposition (numberp (car decomposition))
+               (or (> (length decomposition) 1)
+                   (/= (car decomposition) char)))
           decomposition)))
 
   (defun nfkd (char)
     (let ((decomposition
            (get-char-code-property char 'decomposition)))
       (if (symbolp (car decomposition)) (cdr decomposition)
-        decomposition)))
+        (if (or (> (length decomposition) 1)
+                (/= (car decomposition) char)) decomposition))))
 
   (defun hfs-nfd (char)
     (when (or (and (>= char 0) (< char #x2000))
@@ -180,6 +183,9 @@
          (setq ccc (ucs-normalize-ccc char))
          (setq decomposition (get-char-code-property
                               char 'decomposition))
+         (if (and (= (length decomposition) 1)
+                  (= (car decomposition) char))
+             (setq decomposition nil))
          (if (and ccc (/= 0 ccc)) (add-to-list 'combining-chars char))
          (if (and (numberp (car decomposition))
                   (/= (ucs-normalize-ccc (car decomposition))
diff --git a/lisp/international/uni-bidi.el b/lisp/international/uni-bidi.el
index e7682c6d8ff..4d86fc821fa 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 a4455decc52..94b7c18b6e2 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 227b9d0af79..1437ff9acbd 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 c9743064bd4..21ccfe3ffe7 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 2c424ffb5de..096257add20 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 b0bf07bbe85..b9660cdab0a 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 fc52fd8c28c..efb78b0e43d 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 41890018204..7afd9503cb3 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 006cf575591..e650166c24c 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 7fac18b278d..8b681631067 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 d16e8c00870..a1865f1fb23 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 4e704e5cdd0..de2d67b9450 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 b8098c81876..517edb20445 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 899276eb725..fcb22d72470 100644
--- a/lisp/international/uni-uppercase.el
+++ b/lisp/international/uni-uppercase.el
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 1942641fae9..6eab3dbcbc4 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -952,7 +952,7 @@ NOPUSH is t and EDIT is t."
       (or (and transient-mark-mode mark-active)
           (progn
             (push-mark isearch-opoint t)
-            (or executing-kbd-macro (> (minibuffer-depth) 0)
+            (or executing-kbd-macro (> (minibuffer-depth) 0) edit
                 (message "Mark saved where search started")))))
 
   (and (not edit) isearch-recursive-edit (exit-recursive-edit)))
@@ -1132,6 +1132,14 @@ If first char entered is \\[isearch-yank-word-or-char], then do word search inst
               ;; Save current configuration so we can restore it here.
               (isearch-window-configuration (current-window-configuration))
 
+              ;; This could protect the index of the search rings,
+              ;; but we can't reliably count the number of typed M-p
+              ;; in `read-from-minibuffer' to adjust the index accordingly.
+              ;; So when the following is commented out, `isearch-mode'
+              ;; below resets the index to the predictable value nil.
+              ;; (search-ring-yank-pointer search-ring-yank-pointer)
+              ;; (regexp-search-ring-yank-pointer regexp-search-ring-yank-pointer)
+
               ;; Temporarily restore `minibuffer-message-timeout'.
               (minibuffer-message-timeout
                isearch-original-minibuffer-message-timeout)
@@ -1152,13 +1160,18 @@ If first char entered is \\[isearch-yank-word-or-char], then do word search inst
 
           (unwind-protect
               (let* ((message-log-max nil)
+                     ;; Protect global value of search rings from updating
+                     ;; by `read-from-minibuffer'.  It should be updated only
+                     ;; by `isearch-update-ring' in `isearch-done', not here.
+                     (search-ring search-ring)
+                     (regexp-search-ring regexp-search-ring)
                      ;; Binding minibuffer-history-symbol to nil is a work-around
                      ;; for some incompatibility with gmhist.
                      (minibuffer-history-symbol))
                 (setq isearch-new-string
                       (read-from-minibuffer
                        (isearch-message-prefix nil nil isearch-nonincremental)
-                        (cons isearch-string (1+ (isearch-fail-pos)))
+                       (cons isearch-string (1+ (isearch-fail-pos)))
                        minibuffer-local-isearch-map nil
                        (if isearch-regexp
                            (cons 'regexp-search-ring
@@ -1191,19 +1204,17 @@ If first char entered is \\[isearch-yank-word-or-char], then do word search inst
                   isearch-word isearch-new-word))
 
           ;; Empty isearch-string means use default.
-          (if (= 0 (length isearch-string))
-              (setq isearch-string (or (car (if isearch-regexp
-                                                regexp-search-ring
-                                              search-ring))
-                                       "")
-
-                    isearch-message
-                    (mapconcat 'isearch-text-char-description
-                               isearch-string ""))
-            ;; This used to set the last search string,
-            ;; but I think it is not right to do that here.
-            ;; Only the string actually used should be saved.
-            ))
+          (when (= 0 (length isearch-string))
+            (setq isearch-string (or (car (if isearch-regexp
+                                              regexp-search-ring
+                                            search-ring))
+                                     "")
+
+                  isearch-message
+                  (mapconcat 'isearch-text-char-description
+                             isearch-string ""))
+            ;; After taking the last element, adjust ring to previous one.
+            (isearch-ring-adjust1 nil)))
 
         ;; This used to push the state as of before this C-s, but it adds
         ;; an inconsistent state where part of variables are from the
@@ -1290,7 +1301,9 @@ Use `isearch-exit' to quit without signaling."
                   isearch-message
                   (mapconcat 'isearch-text-char-description
                              isearch-string "")
-                  isearch-case-fold-search isearch-last-case-fold-search))
+                  isearch-case-fold-search isearch-last-case-fold-search)
+            ;; After taking the last element, adjust ring to previous one.
+            (isearch-ring-adjust1 nil))
         ;; If already have what to search for, repeat it.
         (or isearch-success
             (progn
@@ -1432,9 +1445,10 @@ string.  NLINES has the same meaning as in `occur'."
      (t (regexp-quote isearch-string)))
     (if current-prefix-arg (prefix-numeric-value current-prefix-arg))))
   (let ((case-fold-search isearch-case-fold-search)
-        ;; set `search-upper-case' to nil to not call
-        ;; `isearch-no-upper-case-p' in `occur-1'
-        (search-upper-case nil))
+        ;; Set `search-upper-case' to nil to not call
+        ;; `isearch-no-upper-case-p' in `occur-1'.
+        (search-upper-case nil)
+        (search-spaces-regexp search-whitespace-regexp))
     (occur regexp nlines)))
 
 (declare-function hi-lock-read-face-name "hi-lock" ())
@@ -2071,7 +2085,7 @@ Isearch mode."
         ()
       (set yank-pointer-name
            (setq yank-pointer
-                 (mod (+ (or yank-pointer 0)
+                 (mod (+ (or yank-pointer (if advance 0 -1))
                          (if advance -1 1))
                       length)))
       (setq isearch-string (nth yank-pointer ring)
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index 75de9a9f9b2..7d75bf2b98d 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -114,7 +114,7 @@ Completion is available.
 ;;;;;;  add-change-log-entry-other-window add-change-log-entry find-change-log
 ;;;;;;  prompt-for-change-log-name add-log-mailing-address add-log-full-name
 ;;;;;;  add-log-current-defun-function) "add-log" "vc/add-log.el"
-;;;;;;  (19931 11784))
+;;;;;;  (20033 22846))
 ;;; Generated autoloads from vc/add-log.el
 
 (put 'change-log-default-name 'safe-local-variable 'string-or-null-p)
@@ -489,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"
-;;;;;;  (19981 40664))
+;;;;;;  (19988 13913))
 ;;; Generated autoloads from allout.el
 
 (autoload 'allout-auto-activation-helper "allout" "\
@@ -749,6 +749,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
 
@@ -847,7 +848,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"
-;;;;;;  (19981 40664))
+;;;;;;  (19988 13913))
 ;;; 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))))
@@ -928,11 +929,11 @@ directory, so that Emacs will know its current contents.
 ;;;***
 
 ;;;### (autoloads (animate-birthday-present animate-sequence animate-string)
-;;;;;;  "animate" "play/animate.el" (19845 45374))
+;;;;;;  "animate" "play/animate.el" (19986 58615))
 ;;; Generated autoloads from play/animate.el
 
 (autoload 'animate-string "animate" "\
-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.
@@ -942,14 +943,19 @@ in the current window.
 \(fn STRING VPOS &optional HPOS)" nil nil)
 
 (autoload 'animate-sequence "animate" "\
-Display strings from LIST-OF-STRING with animation in a new buffer.
+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.
 
 \(fn LIST-OF-STRINGS SPACE)" nil nil)
 
 (autoload 'animate-birthday-present "animate" "\
-Display one's birthday present in a new buffer.
-You can specify the one's name by NAME; the default value is \"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*.
 
 \(fn &optional NAME)" t nil)
 
@@ -1144,8 +1150,8 @@ Returns list of symbols and documentation found.
 
 ;;;***
 
-;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (19886
-;;;;;;  45771))
+;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (19990
+;;;;;;  55648))
 ;;; Generated autoloads from arc-mode.el
 
 (autoload 'archive-mode "arc-mode" "\
@@ -1472,7 +1478,7 @@ Special commands:
 ;;;***
 
 ;;;### (autoloads (auth-source-cache-expiry) "auth-source" "gnus/auth-source.el"
-;;;;;;  (19981 40664))
+;;;;;;  (20062 2656))
 ;;; Generated autoloads from gnus/auth-source.el
 
 (defvar auth-source-cache-expiry 7200 "\
@@ -1550,7 +1556,7 @@ Major mode for editing Autoconf configure.in files.
 ;;;***
 
 ;;;### (autoloads (auto-insert-mode define-auto-insert auto-insert)
-;;;;;;  "autoinsert" "autoinsert.el" (19845 45374))
+;;;;;;  "autoinsert" "autoinsert.el" (19988 13913))
 ;;; Generated autoloads from autoinsert.el
 
 (autoload 'auto-insert "autoinsert" "\
@@ -1762,7 +1768,7 @@ definition of \"random distance\".)
 ;;;***
 
 ;;;### (autoloads (display-battery-mode battery) "battery" "battery.el"
-;;;;;;  (19976 22732))
+;;;;;;  (20055 29424))
 ;;; Generated autoloads from battery.el
  (put 'battery-mode-line-string 'risky-local-variable t)
 
@@ -1827,7 +1833,7 @@ For non-interactive use see also `benchmark-run' and
 ;;;***
 
 ;;;### (autoloads (bibtex-search-entry bibtex-mode bibtex-initialize)
-;;;;;;  "bibtex" "textmodes/bibtex.el" (19971 4823))
+;;;;;;  "bibtex" "textmodes/bibtex.el" (19997 28887))
 ;;; Generated autoloads from textmodes/bibtex.el
 
 (autoload 'bibtex-initialize "bibtex" "\
@@ -2075,7 +2081,7 @@ a reflection.
 ;;;;;;  bookmark-save bookmark-write bookmark-delete bookmark-insert
 ;;;;;;  bookmark-rename bookmark-insert-location bookmark-relocate
 ;;;;;;  bookmark-jump-other-window bookmark-jump bookmark-set) "bookmark"
-;;;;;;  "bookmark.el" (19914 25180))
+;;;;;;  "bookmark.el" (19998 49767))
 ;;; Generated autoloads from bookmark.el
  (define-key ctl-x-r-map "b" 'bookmark-jump)
  (define-key ctl-x-r-map "m" 'bookmark-set)
@@ -2276,10 +2282,10 @@ 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"
-;;;;;;  (19973 46551))
+;;;;;;  (20048 56149))
 ;;; 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)) "\
+(defvar browse-url-browser-function '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.
@@ -2598,7 +2604,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" (19976 22732))
+;;;;;;  "bs" "bs.el" (19998 49767))
 ;;; Generated autoloads from bs.el
 
 (autoload 'bs-cycle-next "bs" "\
@@ -2681,7 +2687,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" (19968 28627))
+;;;;;;  "bytecomp" "emacs-lisp/bytecomp.el" (19998 49767))
 ;;; 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)
@@ -3053,7 +3059,7 @@ Obsoletes `c-forward-into-nomenclature'.
 ;;;***
 
 ;;;### (autoloads (c-guess-basic-syntax) "cc-engine" "progmodes/cc-engine.el"
-;;;;;;  (19981 40664))
+;;;;;;  (20048 56149))
 ;;; Generated autoloads from progmodes/cc-engine.el
 
 (autoload 'c-guess-basic-syntax "cc-engine" "\
@@ -3165,7 +3171,7 @@ the absolute file name of the file if STYLE-NAME is 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"
-;;;;;;  (19981 40664))
+;;;;;;  (20010 40918))
 ;;; Generated autoloads from progmodes/cc-mode.el
 
 (autoload 'c-initialize-cc-mode "cc-mode" "\
@@ -3393,7 +3399,7 @@ and exists only for compatibility reasons.
 
 ;;;***
 
-;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (19845 45374))
+;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (19997 28887))
 ;;; Generated autoloads from progmodes/cc-vars.el
 (put 'c-basic-offset 'safe-local-variable 'integerp)
 (put 'c-backslash-column 'safe-local-variable 'integerp)
@@ -4291,8 +4297,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" (19968
-;;;;;;  28627))
+;;;;;;  compilation-mode-hook) "compile" "progmodes/compile.el" (20051
+;;;;;;  32345))
 ;;; Generated autoloads from progmodes/compile.el
 
 (defvar compilation-mode-hook nil "\
@@ -4716,7 +4722,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" (19975 1875))
+;;;;;;  "cperl-mode" "progmodes/cperl-mode.el" (19997 56302))
 ;;; Generated autoloads from progmodes/cperl-mode.el
 (put 'cperl-indent-level 'safe-local-variable 'integerp)
 (put 'cperl-brace-offset 'safe-local-variable 'integerp)
@@ -5064,7 +5070,7 @@ Enable CUA selection mode without the C-z/C-x/C-c/C-v bindings.
 ;;;;;;  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))
+;;;;;;  "cus-edit" "cus-edit.el" (20025 8284))
 ;;; Generated autoloads from cus-edit.el
 
 (defvar custom-browse-sort-alphabetically nil "\
@@ -5378,8 +5384,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" (19980
-;;;;;;  19797))
+;;;;;;  customize-create-theme) "cus-theme" "cus-theme.el" (20059
+;;;;;;  26455))
 ;;; Generated autoloads from cus-theme.el
 
 (autoload 'customize-create-theme "cus-theme" "\
@@ -5498,7 +5504,7 @@ If the argument is nil, we return the display table to its standard state.
 ;;;***
 
 ;;;### (autoloads (dabbrev-expand dabbrev-completion) "dabbrev" "dabbrev.el"
-;;;;;;  (19886 45771))
+;;;;;;  (19989 34789))
 ;;; Generated autoloads from dabbrev.el
 (put 'dabbrev-case-fold-search 'risky-local-variable t)
 (put 'dabbrev-case-replace 'risky-local-variable t)
@@ -5697,13 +5703,13 @@ There is some minimal font-lock support (see vars
 ;;;***
 
 ;;;### (autoloads (cancel-debug-on-entry debug-on-entry debug) "debug"
-;;;;;;  "emacs-lisp/debug.el" (19961 55377))
+;;;;;;  "emacs-lisp/debug.el" (20051 32345))
 ;;; Generated autoloads from emacs-lisp/debug.el
 
 (setq debugger 'debug)
 
 (autoload 'debug "debug" "\
-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.
 
@@ -5877,7 +5883,7 @@ any selection.
 ;;;***
 
 ;;;### (autoloads (derived-mode-init-mode-variables define-derived-mode)
-;;;;;;  "derived" "emacs-lisp/derived.el" (19849 29307))
+;;;;;;  "derived" "emacs-lisp/derived.el" (20054 8529))
 ;;; Generated autoloads from emacs-lisp/derived.el
 
 (autoload 'define-derived-mode "derived" "\
@@ -5900,10 +5906,10 @@ BODY can start with a bunch of keyword arguments.  The following keyword
         Declare the customization group that corresponds to this mode.
         The command `customize-mode' uses this.
 :syntax-table TABLE
-        Use TABLE instead of the default.
+        Use TABLE instead of the default (CHILD-syntax-table).
         A nil value means to simply use the same syntax-table as the parent.
 :abbrev-table TABLE
-        Use TABLE instead of the default.
+        Use TABLE instead of the default (CHILD-abbrev-table).
         A nil value means to simply use the same abbrev-table as the parent.
 
 Here is how you could define LaTeX-Thesis mode as a variant of LaTeX mode:
@@ -6232,7 +6238,7 @@ Major mode for editing the diary file.
 ;;;***
 
 ;;;### (autoloads (diff-buffer-with-file diff-backup diff diff-command
-;;;;;;  diff-switches) "diff" "vc/diff.el" (19903 54862))
+;;;;;;  diff-switches) "diff" "vc/diff.el" (19999 41597))
 ;;; Generated autoloads from vc/diff.el
 
 (defvar diff-switches (purecopy "-c") "\
@@ -6247,10 +6253,10 @@ The command to use to run diff.")
 
 (autoload 'diff "diff" "\
 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
@@ -6316,7 +6322,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" (19966 16984))
+;;;;;;  dired dired-listing-switches) "dired" "dired.el" (20045 30688))
 ;;; Generated autoloads from dired.el
 
 (defvar dired-listing-switches (purecopy "-al") "\
@@ -6345,8 +6351,7 @@ Dired displays a list of files in DIRNAME (which may also have
 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
+\\<dired-mode-map>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.
 
@@ -6382,8 +6387,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
@@ -6391,9 +6396,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.
@@ -6403,10 +6408,10 @@ 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
+directories again, type \\[dired-do-redisplay] 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.
 
@@ -6485,7 +6490,7 @@ redefine OBJECT if it is a symbol.
 ;;;;;;  standard-display-g1 standard-display-ascii standard-display-default
 ;;;;;;  standard-display-8bit describe-current-display-table describe-display-table
 ;;;;;;  set-display-table-slot display-table-slot make-display-table)
-;;;;;;  "disp-table" "disp-table.el" (19845 45374))
+;;;;;;  "disp-table" "disp-table.el" (19984 16846))
 ;;; Generated autoloads from disp-table.el
 
 (autoload 'make-display-table "disp-table" "\
@@ -6668,8 +6673,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" (19953
-;;;;;;  8437))
+;;;;;;  doc-view-mode doc-view-mode-p) "doc-view" "doc-view.el" (20002
+;;;;;;  46800))
 ;;; Generated autoloads from doc-view.el
 
 (autoload 'doc-view-mode-p "doc-view" "\
@@ -7511,7 +7516,7 @@ an EDE controlled project.
 
 ;;;### (autoloads (edebug-all-forms edebug-all-defs edebug-eval-top-level-form
 ;;;;;;  edebug-basic-spec edebug-all-forms edebug-all-defs) "edebug"
-;;;;;;  "emacs-lisp/edebug.el" (19863 8742))
+;;;;;;  "emacs-lisp/edebug.el" (20050 11479))
 ;;; Generated autoloads from emacs-lisp/edebug.el
 
 (defvar edebug-all-defs nil "\
@@ -7584,7 +7589,7 @@ Toggle edebugging of all forms.
 ;;;;;;  ediff-merge-directories-with-ancestor ediff-merge-directories
 ;;;;;;  ediff-directories3 ediff-directory-revisions ediff-directories
 ;;;;;;  ediff-buffers3 ediff-buffers ediff-backup ediff-current-file
-;;;;;;  ediff-files3 ediff-files) "ediff" "vc/ediff.el" (19845 45374))
+;;;;;;  ediff-files3 ediff-files) "ediff" "vc/ediff.el" (19996 8027))
 ;;; Generated autoloads from vc/ediff.el
 
 (autoload 'ediff-files "ediff" "\
@@ -7768,7 +7773,7 @@ buffer.
 \(fn &optional FILE STARTUP-HOOKS MERGE-BUFFER-FILE)" t nil)
 
 (autoload 'ediff-patch-file "ediff" "\
-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
@@ -8149,6 +8154,32 @@ displayed.
 
 ;;;***
 
+;;;### (autoloads (emacs-lock-mode) "emacs-lock" "emacs-lock.el"
+;;;;;;  (19988 13913))
+;;; Generated autoloads from emacs-lock.el
+
+(autoload 'emacs-lock-mode "emacs-lock" "\
+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.
+
+\(fn &optional ARG)" t nil)
+
+;;;***
+
 ;;;### (autoloads (report-emacs-bug) "emacsbug" "mail/emacsbug.el"
 ;;;;;;  (19978 37530))
 ;;; Generated autoloads from mail/emacsbug.el
@@ -8261,8 +8292,8 @@ Commands:
 ;;;;;;  epa-sign-region epa-verify-cleartext-in-region epa-verify-region
 ;;;;;;  epa-decrypt-armor-in-region epa-decrypt-region epa-encrypt-file
 ;;;;;;  epa-sign-file epa-verify-file epa-decrypt-file epa-select-keys
-;;;;;;  epa-list-secret-keys epa-list-keys) "epa" "epa.el" (19865
-;;;;;;  50420))
+;;;;;;  epa-list-secret-keys epa-list-keys) "epa" "epa.el" (20042
+;;;;;;  17367))
 ;;; Generated autoloads from epa.el
 
 (autoload 'epa-list-keys "epa" "\
@@ -8308,7 +8339,12 @@ Encrypt FILE for RECIPIENTS.
 (autoload 'epa-decrypt-region "epa" "\
 Decrypt the current region between START and END.
 
-Don't use this command in Lisp programs!
+If MAKE-BUFFER-FUNCTION is non-nil, call it to prepare an output buffer.
+It should return that buffer.  If it copies the input, it should
+delete the text now being decrypted.  It should leave point at the
+proper place to insert the plaintext.
+
+Be careful about using this command in Lisp programs!
 Since this function operates on regions, it does some tricks such
 as coding-system detection and unibyte/multibyte conversion.  If
 you are sure how the data in the region should be treated, you
@@ -8323,7 +8359,7 @@ For example:
     (epg-decrypt-string context (buffer-substring start end))
     'utf-8))
 
-\(fn START END)" t nil)
+\(fn START END &optional MAKE-BUFFER-FUNCTION)" t nil)
 
 (autoload 'epa-decrypt-armor-in-region "epa" "\
 Decrypt OpenPGP armors in the current region between START and END.
@@ -8461,7 +8497,7 @@ Encrypt marked files.
 ;;;***
 
 ;;;### (autoloads (epa-file-disable epa-file-enable epa-file-handler)
-;;;;;;  "epa-file" "epa-file.el" (19865 50420))
+;;;;;;  "epa-file" "epa-file.el" (20038 20303))
 ;;; Generated autoloads from epa-file.el
 
 (autoload 'epa-file-handler "epa-file" "\
@@ -8483,7 +8519,7 @@ Encrypt marked files.
 
 ;;;### (autoloads (epa-global-mail-mode epa-mail-import-keys epa-mail-encrypt
 ;;;;;;  epa-mail-sign epa-mail-verify epa-mail-decrypt epa-mail-mode)
-;;;;;;  "epa-mail" "epa-mail.el" (19865 50420))
+;;;;;;  "epa-mail" "epa-mail.el" (20043 38232))
 ;;; Generated autoloads from epa-mail.el
 
 (autoload 'epa-mail-mode "epa-mail" "\
@@ -8547,7 +8583,7 @@ Minor mode to hook EasyPG into Mail mode.
 
 ;;;***
 
-;;;### (autoloads (epg-make-context) "epg" "epg.el" (19865 50420))
+;;;### (autoloads (epg-make-context) "epg" "epg.el" (20031 47065))
 ;;; Generated autoloads from epg.el
 
 (autoload 'epg-make-context "epg" "\
@@ -8579,7 +8615,7 @@ Look at CONFIG and try to expand GROUP.
 ;;;***
 
 ;;;### (autoloads (erc-handle-irc-url erc erc-select-read-args) "erc"
-;;;;;;  "erc/erc.el" (19981 40664))
+;;;;;;  "erc/erc.el" (19986 58615))
 ;;; Generated autoloads from erc/erc.el
 
 (autoload 'erc-select-read-args "erc" "\
@@ -8608,7 +8644,7 @@ then the server and full-name will be set to those values, whereas
 `erc-compute-port', `erc-compute-nick' and `erc-compute-full-name' will
 be invoked for the values of the other parameters.
 
-\(fn &key (SERVER (erc-compute-server)) (PORT (erc-compute-port)) (NICK (erc-compute-nick)) PASSWORD (FULL-NAME (erc-compute-full-name)))" t nil)
+\(fn &key (server (erc-compute-server)) (port (erc-compute-port)) (nick (erc-compute-nick)) PASSWORD (full-name (erc-compute-full-name)))" t nil)
 
 (defalias 'erc-select 'erc)
 
@@ -9202,7 +9238,7 @@ corresponding to a successful execution.
 ;;;;;;  visit-tags-table tags-table-mode find-tag-default-function
 ;;;;;;  find-tag-hook tags-add-tables tags-compression-info-list
 ;;;;;;  tags-table-list tags-case-fold-search) "etags" "progmodes/etags.el"
-;;;;;;  (19936 52203))
+;;;;;;  (20007 64734))
 ;;; Generated autoloads from progmodes/etags.el
 
 (defvar tags-file-name nil "\
@@ -9459,7 +9495,11 @@ Search through all files listed in tags table for match for REGEXP.
 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.
 
 \(fn REGEXP &optional FILE-LIST-FORM)" t nil)
 
@@ -10138,7 +10178,7 @@ Besides the choice of face, it is the same as `buffer-face-mode'.
 
 ;;;### (autoloads (feedmail-queue-reminder feedmail-run-the-queue
 ;;;;;;  feedmail-run-the-queue-global-prompt feedmail-run-the-queue-no-prompts
-;;;;;;  feedmail-send-it) "feedmail" "mail/feedmail.el" (19931 11784))
+;;;;;;  feedmail-send-it) "feedmail" "mail/feedmail.el" (19986 58615))
 ;;; Generated autoloads from mail/feedmail.el
 
 (autoload 'feedmail-send-it "feedmail" "\
@@ -10547,7 +10587,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" (19981 40664))
+;;;;;;  "emacs-lisp/find-func.el" (20050 11479))
 ;;; Generated autoloads from emacs-lisp/find-func.el
 
 (autoload 'find-library "find-func" "\
@@ -10576,11 +10616,15 @@ in a buffer and the point of the definition.  The buffer is
 not selected.  If the function definition can't be found in
 the buffer, returns (BUFFER).
 
+If FUNCTION is a built-in function, this function normally
+attempts to find it in the Emacs C sources; however, if LISP-ONLY
+is non-nil, signal an error instead.
+
 If the file where FUNCTION is defined is not known, then it is
 searched for in `find-function-source-path' if non-nil, otherwise
 in `load-path'.
 
-\(fn FUNCTION)" nil nil)
+\(fn FUNCTION &optional LISP-ONLY)" nil nil)
 
 (autoload 'find-function "find-func" "\
 Find the definition of the FUNCTION near point.
@@ -10782,8 +10826,8 @@ to get the effect of a C-q.
 
 ;;;***
 
-;;;### (autoloads (flymake-mode-off flymake-mode-on flymake-mode)
-;;;;;;  "flymake" "progmodes/flymake.el" (19976 22732))
+;;;### (autoloads (flymake-find-file-hook flymake-mode-off flymake-mode-on
+;;;;;;  flymake-mode) "flymake" "progmodes/flymake.el" (19984 16846))
 ;;; Generated autoloads from progmodes/flymake.el
 
 (autoload 'flymake-mode "flymake" "\
@@ -10803,11 +10847,16 @@ Turn flymake mode off.
 
 \(fn)" nil nil)
 
+(autoload 'flymake-find-file-hook "flymake" "\
+
+
+\(fn)" nil nil)
+
 ;;;***
 
 ;;;### (autoloads (flyspell-buffer flyspell-region flyspell-mode-off
 ;;;;;;  turn-off-flyspell turn-on-flyspell flyspell-mode flyspell-prog-mode)
-;;;;;;  "flyspell" "textmodes/flyspell.el" (19981 40664))
+;;;;;;  "flyspell" "textmodes/flyspell.el" (19982 3545))
 ;;; Generated autoloads from textmodes/flyspell.el
 
 (autoload 'flyspell-prog-mode "flyspell" "\
@@ -10877,7 +10926,7 @@ Flyspell whole buffer.
 
 ;;;### (autoloads (follow-delete-other-windows-and-split follow-mode
 ;;;;;;  turn-off-follow-mode turn-on-follow-mode) "follow" "follow.el"
-;;;;;;  (19886 45771))
+;;;;;;  (19998 49767))
 ;;; Generated autoloads from follow.el
 
 (autoload 'turn-on-follow-mode "follow" "\
@@ -11129,7 +11178,7 @@ and choose the directory as the fortune-file.
 ;;;***
 
 ;;;### (autoloads (gdb gdb-enable-debug) "gdb-mi" "progmodes/gdb-mi.el"
-;;;;;;  (19931 11784))
+;;;;;;  (19988 13913))
 ;;; Generated autoloads from progmodes/gdb-mi.el
 
 (defvar gdb-enable-debug nil "\
@@ -11337,7 +11386,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" (19978 37530))
+;;;;;;  gnus-slave-no-server) "gnus" "gnus/gnus.el" (20027 50006))
 ;;; Generated autoloads from gnus/gnus.el
 (when (fboundp 'custom-autoload)
  (custom-autoload 'gnus-select-method "gnus"))
@@ -11390,7 +11439,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" (19953 61266))
+;;;;;;  "gnus/gnus-agent.el" (20048 56149))
 ;;; Generated autoloads from gnus/gnus-agent.el
 
 (autoload 'gnus-unplugged "gnus-agent" "\
@@ -11481,7 +11530,7 @@ If CLEAN, obsolete (ignore).
 ;;;***
 
 ;;;### (autoloads (gnus-article-prepare-display) "gnus-art" "gnus/gnus-art.el"
-;;;;;;  (19981 40664))
+;;;;;;  (20050 11479))
 ;;; Generated autoloads from gnus/gnus-art.el
 
 (autoload 'gnus-article-prepare-display "gnus-art" "\
@@ -11699,7 +11748,7 @@ If gravatars are already displayed, remove them.
 ;;;***
 
 ;;;### (autoloads (gnus-fetch-group-other-frame gnus-fetch-group)
-;;;;;;  "gnus-group" "gnus/gnus-group.el" (19981 40664))
+;;;;;;  "gnus-group" "gnus/gnus-group.el" (20062 2656))
 ;;; Generated autoloads from gnus/gnus-group.el
 
 (autoload 'gnus-fetch-group "gnus-group" "\
@@ -11717,7 +11766,7 @@ Pop up a frame and enter GROUP.
 ;;;***
 
 ;;;### (autoloads (gnus-html-prefetch-images gnus-article-html) "gnus-html"
-;;;;;;  "gnus/gnus-html.el" (19917 1372))
+;;;;;;  "gnus/gnus-html.el" (20050 11479))
 ;;; Generated autoloads from gnus/gnus-html.el
 
 (autoload 'gnus-article-html "gnus-html" "\
@@ -11874,7 +11923,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" (19978 37530))
+;;;;;;  "gnus-msg" "gnus/gnus-msg.el" (20055 29424))
 ;;; Generated autoloads from gnus/gnus-msg.el
 
 (autoload 'gnus-msg-mail "gnus-msg" "\
@@ -12040,7 +12089,7 @@ See the documentation for these variables and functions for details.
 ;;;***
 
 ;;;### (autoloads (gnus-update-format) "gnus-spec" "gnus/gnus-spec.el"
-;;;;;;  (19845 45374))
+;;;;;;  (20046 14433))
 ;;; Generated autoloads from gnus/gnus-spec.el
 
 (autoload 'gnus-update-format "gnus-spec" "\
@@ -12051,7 +12100,7 @@ Update the format specification near point.
 ;;;***
 
 ;;;### (autoloads (gnus-declare-backend) "gnus-start" "gnus/gnus-start.el"
-;;;;;;  (19953 61266))
+;;;;;;  (19988 13913))
 ;;; Generated autoloads from gnus/gnus-start.el
 
 (autoload 'gnus-declare-backend "gnus-start" "\
@@ -12062,7 +12111,7 @@ Declare back end NAME with ABILITIES as a Gnus back end.
 ;;;***
 
 ;;;### (autoloads (gnus-summary-bookmark-jump) "gnus-sum" "gnus/gnus-sum.el"
-;;;;;;  (19981 40664))
+;;;;;;  (20050 11479))
 ;;; Generated autoloads from gnus/gnus-sum.el
 
 (autoload 'gnus-summary-bookmark-jump "gnus-sum" "\
@@ -12100,6 +12149,23 @@ Add the window configuration CONF to `gnus-buffer-configuration'.
 
 ;;;***
 
+;;;### (autoloads (gnutls-min-prime-bits) "gnutls" "net/gnutls.el"
+;;;;;;  (20002 46800))
+;;; Generated autoloads from net/gnutls.el
+
+(defvar gnutls-min-prime-bits nil "\
+The minimum number of bits to be used in Diffie-Hellman key exchange.
+
+This sets the minimum accepted size of the key to be used in a
+client-server handshake.  If the server sends a prime with fewer than
+the specified number of bits the handshake will fail.
+
+A value of nil says to use the default gnutls value.")
+
+(custom-autoload 'gnutls-min-prime-bits "gnutls" t)
+
+;;;***
+
 ;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (19889 21967))
 ;;; Generated autoloads from play/gomoku.el
 
@@ -12185,7 +12251,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" (19980 19797))
+;;;;;;  grep-window-height) "grep" "progmodes/grep.el" (20050 11479))
 ;;; Generated autoloads from progmodes/grep.el
 
 (defvar grep-window-height nil "\
@@ -12356,7 +12422,7 @@ the form \"WINDOW-ID PIXMAP-ID\".  Value is non-nil if successful.
 ;;;***
 
 ;;;### (autoloads (gud-tooltip-mode gdb-script-mode jdb pdb perldb
-;;;;;;  xdb dbx sdb gud-gdb) "gud" "progmodes/gud.el" (19931 11784))
+;;;;;;  xdb dbx sdb gud-gdb) "gud" "progmodes/gud.el" (19988 13913))
 ;;; Generated autoloads from progmodes/gud.el
 
 (autoload 'gud-gdb "gud" "\
@@ -12665,7 +12731,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" (19977 43600))
+;;;;;;  "help-fns" "help-fns.el" (20029 5330))
 ;;; Generated autoloads from help-fns.el
 
 (autoload 'describe-function "help-fns" "\
@@ -12761,18 +12827,9 @@ 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" (19958
-;;;;;;  33091))
+;;;;;;  help-mode-setup) "help-mode" "help-mode.el" (20059 26455))
 ;;; Generated autoloads from help-mode.el
 
-(autoload 'help-mode "help-mode" "\
-Major mode for viewing help text and navigating references in it.
-Entry to this mode runs the normal hook `help-mode-hook'.
-Commands:
-\\{help-mode-map}
-
-\(fn)" t nil)
-
 (autoload 'help-mode-setup "help-mode" "\
 
 
@@ -12968,7 +13025,7 @@ This discards the buffer's undo information.
 ;;;### (autoloads (hi-lock-write-interactive-patterns hi-lock-unface-buffer
 ;;;;;;  hi-lock-face-phrase-buffer hi-lock-face-buffer hi-lock-line-face-buffer
 ;;;;;;  global-hi-lock-mode hi-lock-mode) "hi-lock" "hi-lock.el"
-;;;;;;  (19845 45374))
+;;;;;;  (20034 23247))
 ;;; Generated autoloads from hi-lock.el
 
 (autoload 'hi-lock-mode "hi-lock" "\
@@ -13746,7 +13803,7 @@ bound to the current value of the filter.
 ;;;***
 
 ;;;### (autoloads (ibuffer ibuffer-other-window ibuffer-list-buffers)
-;;;;;;  "ibuffer" "ibuffer.el" (19886 45771))
+;;;;;;  "ibuffer" "ibuffer.el" (20053 39261))
 ;;; Generated autoloads from ibuffer.el
 
 (autoload 'ibuffer-list-buffers "ibuffer" "\
@@ -13787,7 +13844,7 @@ FORMATS is the value to use for `ibuffer-formats'.
 
 ;;;### (autoloads (icalendar-import-buffer icalendar-import-file
 ;;;;;;  icalendar-export-region icalendar-export-file) "icalendar"
-;;;;;;  "calendar/icalendar.el" (19897 16090))
+;;;;;;  "calendar/icalendar.el" (20015 58840))
 ;;; Generated autoloads from calendar/icalendar.el
 
 (autoload 'icalendar-export-file "icalendar" "\
@@ -14062,8 +14119,8 @@ The main features of this mode are
 ;;;;;;  ido-find-alternate-file ido-find-file-other-window ido-find-file
 ;;;;;;  ido-find-file-in-dir ido-switch-buffer-other-frame ido-insert-buffer
 ;;;;;;  ido-kill-buffer ido-display-buffer ido-switch-buffer-other-window
-;;;;;;  ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (19931
-;;;;;;  11784))
+;;;;;;  ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (20025
+;;;;;;  8284))
 ;;; Generated autoloads from ido.el
 
 (defvar ido-mode nil "\
@@ -14353,7 +14410,7 @@ Toggle inline image minor mode.
 ;;;;;;  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"
-;;;;;;  (19956 37456))
+;;;;;;  (20013 17118))
 ;;; Generated autoloads from image.el
 
 (autoload 'image-type-from-data "image" "\
@@ -14439,6 +14496,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-image' 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
@@ -14450,8 +14508,8 @@ means display it in the right marginal area.
 (autoload 'insert-image "image" "\
 Insert IMAGE into current buffer at point.
 IMAGE is displayed by inserting STRING into the current buffer
-with a `display' property whose value is the image.  STRING is
-defaulted if you omit it.
+with a `display' property whose value is the image.  STRING
+defaults to the empty string if you omit it.
 AREA is where to display the image.  AREA nil or omitted means
 display it in the text area, a value of `left-margin' means
 display it in the left marginal area, a value of `right-margin'
@@ -14549,7 +14607,7 @@ If Emacs is compiled without ImageMagick support, do nothing.
 ;;;;;;  image-dired-jump-thumbnail-buffer image-dired-delete-tag
 ;;;;;;  image-dired-tag-files image-dired-show-all-from-dir image-dired-display-thumbs
 ;;;;;;  image-dired-dired-with-window-configuration image-dired-dired-toggle-marked-thumbs)
-;;;;;;  "image-dired" "image-dired.el" (19931 11784))
+;;;;;;  "image-dired" "image-dired.el" (20033 22846))
 ;;; Generated autoloads from image-dired.el
 
 (autoload 'image-dired-dired-toggle-marked-thumbs "image-dired" "\
@@ -14749,7 +14807,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" (19951 19539))
+;;;;;;  image-mode) "image-mode" "image-mode.el" (19999 41597))
 ;;; Generated autoloads from image-mode.el
 
 (autoload 'image-mode "image-mode" "\
@@ -15007,7 +15065,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" (19967 7755))
+;;;;;;  info info-other-window) "info" "info.el" (20031 47065))
 ;;; Generated autoloads from info.el
 
 (autoload 'info-other-window "info" "\
@@ -15022,7 +15080,7 @@ Enter Info, the documentation browser.
 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
@@ -15194,7 +15252,7 @@ Go to Info buffer that displays MANUAL, creating it if none already exists.
 
 ;;;### (autoloads (info-complete-file info-complete-symbol info-lookup-file
 ;;;;;;  info-lookup-symbol info-lookup-reset) "info-look" "info-look.el"
-;;;;;;  (19936 52203))
+;;;;;;  (19984 16846))
 ;;; Generated autoloads from info-look.el
 
 (autoload 'info-lookup-reset "info-look" "\
@@ -15513,7 +15571,7 @@ Add submenus to the File menu, to convert to and from various formats.
 ;;;;;;  ispell-complete-word ispell-continue ispell-buffer ispell-comments-and-strings
 ;;;;;;  ispell-region ispell-change-dictionary ispell-kill-ispell
 ;;;;;;  ispell-help ispell-pdict-save ispell-word ispell-personal-dictionary)
-;;;;;;  "ispell" "textmodes/ispell.el" (19905 10215))
+;;;;;;  "ispell" "textmodes/ispell.el" (20055 29424))
 ;;; Generated autoloads from textmodes/ispell.el
 
 (put 'ispell-check-comments 'safe-local-variable (lambda (a) (memq a '(nil t exclusive))))
@@ -15837,7 +15895,7 @@ If non-nil, second arg INITIAL-INPUT is a string to insert before reading.
 ;;;***
 
 ;;;### (autoloads (jka-compr-uninstall jka-compr-handler) "jka-compr"
-;;;;;;  "jka-compr.el" (19886 45771))
+;;;;;;  "jka-compr.el" (20000 30139))
 ;;; Generated autoloads from jka-compr.el
 
 (defvar jka-compr-inhibit nil "\
@@ -15860,7 +15918,7 @@ by `jka-compr-installed'.
 
 ;;;***
 
-;;;### (autoloads (js-mode) "js" "progmodes/js.el" (19981 40664))
+;;;### (autoloads (js-mode) "js" "progmodes/js.el" (20038 20303))
 ;;; Generated autoloads from progmodes/js.el
 
 (autoload 'js-mode "js" "\
@@ -16346,8 +16404,8 @@ See `linum-mode' for more information on Linum mode.
 
 ;;;***
 
-;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (19975
-;;;;;;  1875))
+;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (19996
+;;;;;;  8027))
 ;;; Generated autoloads from loadhist.el
 
 (autoload 'unload-feature "loadhist" "\
@@ -16469,16 +16527,20 @@ Major mode for browsing CVS log output.
 
 ;;;***
 
-;;;### (autoloads (longlines-mode) "longlines" "longlines.el" (19886
-;;;;;;  45771))
+;;;### (autoloads (longlines-mode) "longlines" "longlines.el" (20031
+;;;;;;  47065))
 ;;; Generated autoloads from longlines.el
 
 (autoload 'longlines-mode "longlines" "\
-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 Long Lines mode.
+With a prefix argument ARG, turn Long Lines 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.
@@ -17103,7 +17165,7 @@ Previous contents of that buffer are killed first.
 ;;;***
 
 ;;;### (autoloads (Man-bookmark-jump man-follow man) "man" "man.el"
-;;;;;;  (19870 57559))
+;;;;;;  (19999 41597))
 ;;; Generated autoloads from man.el
 
 (defalias 'manual-entry 'man)
@@ -17211,7 +17273,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" (19980 19797))
+;;;;;;  "gnus/message.el" (20047 35303))
 ;;; 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)
@@ -17439,7 +17501,7 @@ redisplayed as output is inserted.
 
 ;;;### (autoloads (mh-fully-kill-draft mh-send-letter mh-user-agent-compose
 ;;;;;;  mh-smail-batch mh-smail-other-window mh-smail) "mh-comp"
-;;;;;;  "mh-e/mh-comp.el" (19845 45374))
+;;;;;;  "mh-e/mh-comp.el" (19993 31832))
 ;;; Generated autoloads from mh-e/mh-comp.el
 
 (autoload 'mh-smail "mh-comp" "\
@@ -17486,7 +17548,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.
 
 \(fn &optional TO SUBJECT OTHER-HEADERS CONTINUE SWITCH-FUNCTION YANK-ACTION SEND-ACTIONS RETURN-ACTION &rest IGNORED)" nil nil)
 
@@ -17529,7 +17591,7 @@ delete the draft message.
 
 ;;;***
 
-;;;### (autoloads (mh-version) "mh-e" "mh-e/mh-e.el" (19931 11784))
+;;;### (autoloads (mh-version) "mh-e" "mh-e/mh-e.el" (20004 2139))
 ;;; Generated autoloads from mh-e/mh-e.el
 
 (put 'mh-progs 'risky-local-variable t)
@@ -17546,7 +17608,7 @@ Display version information about MH-E and the MH mail handling system.
 ;;;***
 
 ;;;### (autoloads (mh-folder-mode mh-nmail mh-rmail) "mh-folder"
-;;;;;;  "mh-e/mh-folder.el" (19845 45374))
+;;;;;;  "mh-e/mh-folder.el" (20004 2139))
 ;;; Generated autoloads from mh-e/mh-folder.el
 
 (autoload 'mh-rmail "mh-folder" "\
@@ -17876,7 +17938,7 @@ Assume text has been decoded if DECODED is non-nil.
 ;;;***
 
 ;;;### (autoloads (mml1991-sign mml1991-encrypt) "mml1991" "gnus/mml1991.el"
-;;;;;;  (19940 49234))
+;;;;;;  (20026 29156))
 ;;; Generated autoloads from gnus/mml1991.el
 
 (autoload 'mml1991-encrypt "mml1991" "\
@@ -17893,7 +17955,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" (19981 40664))
+;;;;;;  "mml2015" "gnus/mml2015.el" (20059 26455))
 ;;; Generated autoloads from gnus/mml2015.el
 
 (autoload 'mml2015-decrypt "mml2015" "\
@@ -18041,8 +18103,8 @@ To test this function, evaluate:
 
 ;;;***
 
-;;;### (autoloads (mouse-sel-mode) "mouse-sel" "mouse-sel.el" (19886
-;;;;;;  45771))
+;;;### (autoloads (mouse-sel-mode) "mouse-sel" "mouse-sel.el" (19997
+;;;;;;  28887))
 ;;; Generated autoloads from mouse-sel.el
 
 (defvar mouse-sel-mode nil "\
@@ -18059,14 +18121,10 @@ Toggle Mouse Sel mode.
 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:
-
-- Clicking mouse-1 starts (cancels) selection, dragging extends it.
-
-- Clicking or dragging mouse-3 extends the selection as well.
+When Mouse Sel mode is enabled, mouse selection is enhanced in
+various ways:
 
-- 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.
@@ -18081,20 +18139,14 @@ 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.
 
 \(fn &optional ARG)" t nil)
 
 ;;;***
 
-;;;### (autoloads (mpc) "mpc" "mpc.el" (19946 1612))
+;;;### (autoloads (mpc) "mpc" "mpc.el" (20052 53218))
 ;;; Generated autoloads from mpc.el
 
 (autoload 'mpc "mpc" "\
@@ -18527,7 +18579,7 @@ listed in the PORTS list.
 ;;;***
 
 ;;;### (autoloads (open-network-stream) "network-stream" "net/network-stream.el"
-;;;;;;  (19976 22732))
+;;;;;;  (20044 59100))
 ;;; Generated autoloads from net/network-stream.el
 
 (autoload 'open-network-stream "network-stream" "\
@@ -18578,6 +18630,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.
@@ -19083,13 +19139,14 @@ the variable `nxml-enabled-unicode-blocks'.
 ;;;;;;  org-babel-next-src-block org-babel-goto-named-result org-babel-goto-named-src-block
 ;;;;;;  org-babel-goto-src-block-head org-babel-hide-result-toggle-maybe
 ;;;;;;  org-babel-sha1-hash org-babel-execute-subtree org-babel-execute-buffer
-;;;;;;  org-babel-map-src-blocks org-babel-open-src-block-result
-;;;;;;  org-babel-switch-to-session-with-code org-babel-switch-to-session
-;;;;;;  org-babel-initiate-session org-babel-load-in-session org-babel-expand-src-block
-;;;;;;  org-babel-execute-src-block org-babel-pop-to-session-maybe
-;;;;;;  org-babel-load-in-session-maybe org-babel-expand-src-block-maybe
+;;;;;;  org-babel-map-inline-src-blocks org-babel-map-src-blocks
+;;;;;;  org-babel-open-src-block-result org-babel-switch-to-session-with-code
+;;;;;;  org-babel-switch-to-session org-babel-initiate-session org-babel-load-in-session
+;;;;;;  org-babel-check-src-block org-babel-expand-src-block org-babel-execute-src-block
+;;;;;;  org-babel-pop-to-session-maybe org-babel-load-in-session-maybe
+;;;;;;  org-babel-expand-src-block-maybe org-babel-view-src-block-info
 ;;;;;;  org-babel-execute-maybe org-babel-execute-safely-maybe) "ob"
-;;;;;;  "org/ob.el" (19845 45374))
+;;;;;;  "org/ob.el" (20045 31431))
 ;;; Generated autoloads from org/ob.el
 
 (autoload 'org-babel-execute-safely-maybe "ob" "\
@@ -19102,6 +19159,13 @@ the variable `nxml-enabled-unicode-blocks'.
 
 \(fn)" t nil)
 
+(autoload 'org-babel-view-src-block-info "ob" "\
+Display information on the current source block.
+This includes header arguments, language and name, and is largely
+a window into the `org-babel-get-src-block-info' function.
+
+\(fn)" t nil)
+
 (autoload 'org-babel-expand-src-block-maybe "ob" "\
 Conditionally expand a source block.
 Detect if this is context for a org-babel src-block and if so
@@ -19149,6 +19213,11 @@ arguments and pop open the results in a preview buffer.
 
 \(fn &optional ARG INFO PARAMS)" t nil)
 
+(autoload 'org-babel-check-src-block "ob" "\
+Check for misspelled header arguments in the current code block.
+
+\(fn)" t nil)
+
 (autoload 'org-babel-load-in-session "ob" "\
 Load the body of the current source-code block.
 Evaluate the header arguments for the source block before
@@ -19212,6 +19281,15 @@ end-body --------- point at the end of the body
 
 (put 'org-babel-map-src-blocks 'lisp-indent-function '1)
 
+(autoload 'org-babel-map-inline-src-blocks "ob" "\
+Evaluate BODY forms on each inline source-block in FILE.
+If FILE is nil evaluate BODY forms on source blocks in current
+buffer.
+
+\(fn FILE &rest BODY)" nil (quote macro))
+
+(put 'org-babel-map-inline-src-blocks 'lisp-indent-function '1)
+
 (autoload 'org-babel-execute-buffer "ob" "\
 Execute source code blocks in a buffer.
 Call `org-babel-execute-src-block' on every source block in
@@ -19271,7 +19349,7 @@ Mark current src block
 ;;;***
 
 ;;;### (autoloads (org-babel-describe-bindings) "ob-keys" "org/ob-keys.el"
-;;;;;;  (19845 45374))
+;;;;;;  (20045 30710))
 ;;; Generated autoloads from org/ob-keys.el
 
 (autoload 'org-babel-describe-bindings "ob-keys" "\
@@ -19282,7 +19360,7 @@ Describe all keybindings behind `org-babel-key-prefix'.
 ;;;***
 
 ;;;### (autoloads (org-babel-lob-get-info org-babel-lob-execute-maybe
-;;;;;;  org-babel-lob-ingest) "ob-lob" "org/ob-lob.el" (19845 45374))
+;;;;;;  org-babel-lob-ingest) "ob-lob" "org/ob-lob.el" (20045 31431))
 ;;; Generated autoloads from org/ob-lob.el
 
 (autoload 'org-babel-lob-ingest "ob-lob" "\
@@ -19307,7 +19385,7 @@ Return a Library of Babel function call as a string.
 
 ;;;### (autoloads (org-babel-tangle org-babel-tangle-file org-babel-load-file
 ;;;;;;  org-babel-tangle-lang-exts) "ob-tangle" "org/ob-tangle.el"
-;;;;;;  (19845 45374))
+;;;;;;  (20045 30712))
 ;;; Generated autoloads from org/ob-tangle.el
 
 (defvar org-babel-tangle-lang-exts '(("emacs-lisp" . "el")) "\
@@ -19344,7 +19422,7 @@ TARGET-FILE can be used to specify a default export file for all
 source blocks.  Optional argument LANG can be used to limit the
 exported source code blocks by language.
 
-\(fn &optional TARGET-FILE LANG)" t nil)
+\(fn &optional ONLY-THIS-BLOCK TARGET-FILE LANG)" t nil)
 
 ;;;***
 
@@ -19460,7 +19538,7 @@ including a reproducible test case and send the message.
 ;;;;;;  org-insert-link-global org-store-link org-run-like-in-org-mode
 ;;;;;;  turn-on-orgstruct++ turn-on-orgstruct orgstruct-mode org-global-cycle
 ;;;;;;  org-mode org-babel-do-load-languages) "org" "org/org.el"
-;;;;;;  (19931 11784))
+;;;;;;  (20045 30720))
 ;;; Generated autoloads from org/org.el
 
 (autoload 'org-babel-do-load-languages "org" "\
@@ -19598,6 +19676,7 @@ SCOPE determines the scope of this command.  It can be any of:
 
 nil     The current buffer, respecting the restriction if any
 tree    The subtree started with the entry at point
+region  The entries within the active region, if any
 file    The current buffer, without restriction
 file-with-archives
         The current buffer, and any archives associated with it
@@ -19683,7 +19762,7 @@ Call the customize function with org as argument.
 ;;;;;;  org-diary org-agenda-list-stuck-projects org-tags-view org-todo-list
 ;;;;;;  org-search-view org-agenda-list org-batch-store-agenda-views
 ;;;;;;  org-store-agenda-views org-batch-agenda-csv org-batch-agenda
-;;;;;;  org-agenda) "org-agenda" "org/org-agenda.el" (19914 25180))
+;;;;;;  org-agenda) "org-agenda" "org/org-agenda.el" (20045 30712))
 ;;; Generated autoloads from org/org-agenda.el
 
 (autoload 'org-agenda "org-agenda" "\
@@ -19784,11 +19863,6 @@ Produce a daily/weekly view from all files in variable `org-agenda-files'.
 The view will be for the current day or week, but from the overview buffer
 you will be able to go to other days/weeks.
 
-With one \\[universal-argument] prefix argument INCLUDE-ALL,
-all unfinished TODO items will also be shown, before the agenda.
-This feature is considered obsolete, please use the TODO list or a block
-agenda instead.
-
 With a numeric prefix argument in an interactive call, the agenda will
 span INCLUDE-ALL days.  Lisp programs should instead specify SPAN to change
 the number of days.  SPAN defaults to `org-agenda-span'.
@@ -19933,7 +20007,7 @@ belonging to the \"Work\" category.
 
 ;;;### (autoloads (org-archive-subtree-default-with-confirmation
 ;;;;;;  org-archive-subtree-default) "org-archive" "org/org-archive.el"
-;;;;;;  (19845 45374))
+;;;;;;  (20045 30713))
 ;;; Generated autoloads from org/org-archive.el
 
 (autoload 'org-archive-subtree-default "org-archive" "\
@@ -19953,8 +20027,8 @@ This command is set with the variable `org-archive-default-command'.
 ;;;### (autoloads (org-export-as-ascii org-export-region-as-ascii
 ;;;;;;  org-replace-region-by-ascii org-export-as-ascii-to-buffer
 ;;;;;;  org-export-as-utf8-to-buffer org-export-as-utf8 org-export-as-latin1-to-buffer
-;;;;;;  org-export-as-latin1) "org-ascii" "org/org-ascii.el" (19931
-;;;;;;  11784))
+;;;;;;  org-export-as-latin1) "org-ascii" "org/org-ascii.el" (20045
+;;;;;;  30713))
 ;;; Generated autoloads from org/org-ascii.el
 
 (autoload 'org-export-as-latin1 "org-ascii" "\
@@ -19968,7 +20042,7 @@ Like `org-export-as-ascii-to-buffer', use latin1 encoding for symbols.
 \(fn &rest ARGS)" t nil)
 
 (autoload 'org-export-as-utf8 "org-ascii" "\
-Like `org-export-as-ascii', use use encoding for special symbols.
+Like `org-export-as-ascii', use encoding for special symbols.
 
 \(fn &rest ARGS)" t nil)
 
@@ -20027,8 +20101,8 @@ publishing directory.
 
 ;;;***
 
-;;;### (autoloads (org-attach) "org-attach" "org/org-attach.el" (19931
-;;;;;;  11784))
+;;;### (autoloads (org-attach) "org-attach" "org/org-attach.el" (20045
+;;;;;;  30713))
 ;;; Generated autoloads from org/org-attach.el
 
 (autoload 'org-attach "org-attach" "\
@@ -20040,7 +20114,7 @@ Shows a list of commands and prompts for another key to execute a command.
 ;;;***
 
 ;;;### (autoloads (org-bbdb-anniversaries) "org-bbdb" "org/org-bbdb.el"
-;;;;;;  (19845 45374))
+;;;;;;  (20045 30713))
 ;;; Generated autoloads from org/org-bbdb.el
 
 (autoload 'org-bbdb-anniversaries "org-bbdb" "\
@@ -20051,7 +20125,7 @@ Extract anniversaries from BBDB for display in the agenda.
 ;;;***
 
 ;;;### (autoloads (org-capture-import-remember-templates org-capture-insert-template-here
-;;;;;;  org-capture) "org-capture" "org/org-capture.el" (19845 45374))
+;;;;;;  org-capture) "org-capture" "org/org-capture.el" (20045 30713))
 ;;; Generated autoloads from org/org-capture.el
 
 (autoload 'org-capture "org-capture" "\
@@ -20089,7 +20163,7 @@ Set org-capture-templates to be similar to `org-remember-templates'.
 ;;;***
 
 ;;;### (autoloads (org-clock-persistence-insinuate org-get-clocktable)
-;;;;;;  "org-clock" "org/org-clock.el" (19845 45374))
+;;;;;;  "org-clock" "org/org-clock.el" (20045 30713))
 ;;; Generated autoloads from org/org-clock.el
 
 (autoload 'org-get-clocktable "org-clock" "\
@@ -20107,7 +20181,7 @@ Set up hooks for clock persistence.
 ;;;***
 
 ;;;### (autoloads (org-datetree-find-date-create) "org-datetree"
-;;;;;;  "org/org-datetree.el" (19845 45374))
+;;;;;;  "org/org-datetree.el" (20045 30713))
 ;;; Generated autoloads from org/org-datetree.el
 
 (autoload 'org-datetree-find-date-create "org-datetree" "\
@@ -20123,7 +20197,7 @@ tree can be found.
 ;;;### (autoloads (org-export-as-docbook org-export-as-docbook-pdf-and-open
 ;;;;;;  org-export-as-docbook-pdf org-export-region-as-docbook org-replace-region-by-docbook
 ;;;;;;  org-export-as-docbook-to-buffer org-export-as-docbook-batch)
-;;;;;;  "org-docbook" "org/org-docbook.el" (19845 45374))
+;;;;;;  "org-docbook" "org/org-docbook.el" (20045 30713))
 ;;; Generated autoloads from org/org-docbook.el
 
 (autoload 'org-export-as-docbook-batch "org-docbook" "\
@@ -20200,7 +20274,7 @@ publishing directory.
 
 ;;;### (autoloads (org-insert-export-options-template org-export-as-org
 ;;;;;;  org-export-visible org-export) "org-exp" "org/org-exp.el"
-;;;;;;  (19931 11784))
+;;;;;;  (20045 30715))
 ;;; Generated autoloads from org/org-exp.el
 
 (autoload 'org-export "org-exp" "\
@@ -20213,6 +20287,10 @@ The prefix argument ARG will be passed to the exporter.  However, if
 ARG is a double universal prefix \\[universal-argument] \\[universal-argument], that means to inverse the
 value of `org-export-run-in-background'.
 
+If `org-export-initial-scope' is set to 'subtree, try to export
+the current subtree, otherwise try to export the whole buffer.
+Pressing `1' will switch between these two options.
+
 \(fn &optional ARG)" t nil)
 
 (autoload 'org-export-visible "org-exp" "\
@@ -20257,8 +20335,8 @@ Insert into the buffer a template with information for exporting.
 ;;;***
 
 ;;;### (autoloads (org-feed-show-raw-feed org-feed-goto-inbox org-feed-update
-;;;;;;  org-feed-update-all) "org-feed" "org/org-feed.el" (19845
-;;;;;;  45374))
+;;;;;;  org-feed-update-all) "org-feed" "org/org-feed.el" (20045
+;;;;;;  30715))
 ;;; Generated autoloads from org/org-feed.el
 
 (autoload 'org-feed-update-all "org-feed" "\
@@ -20286,34 +20364,58 @@ Show the raw feed buffer of a feed.
 ;;;***
 
 ;;;### (autoloads (org-footnote-normalize org-footnote-action) "org-footnote"
-;;;;;;  "org/org-footnote.el" (19845 45374))
+;;;;;;  "org/org-footnote.el" (20045 30715))
 ;;; Generated autoloads from org/org-footnote.el
 
 (autoload 'org-footnote-action "org-footnote" "\
 Do the right thing for footnotes.
-When at a footnote reference, jump to the definition.  When at a definition,
-jump to the references.  When neither at definition or reference,
-create a new footnote, interactively.
+
+When at a footnote reference, jump to the definition.
+
+When at a definition, jump to the references if they exist, offer
+to create them otherwise.
+
+When neither at definition or reference, create a new footnote,
+interactively.
+
 With prefix arg SPECIAL, offer additional commands in a menu.
 
 \(fn &optional SPECIAL)" t nil)
 
 (autoload 'org-footnote-normalize "org-footnote" "\
 Collect the footnotes in various formats and normalize them.
+
 This finds the different sorts of footnotes allowed in Org, and
 normalizes them to the usual [N] format that is understood by the
 Org-mode exporters.
+
 When SORT-ONLY is set, only sort the footnote definitions into the
 referenced sequence.
 
-\(fn &optional SORT-ONLY FOR-PREPROCESSOR)" nil nil)
+If Org is amidst an export process, EXPORT-PROPS will hold the
+export properties of the buffer.
+
+When EXPORT-PROPS is non-nil, the default action is to insert
+normalized footnotes towards the end of the pre-processing buffer.
+Some exporters like docbook, odt, etc. expect that footnote
+definitions be available before any references to them.  Such
+exporters can let bind `org-footnote-insert-pos-for-preprocessor' to
+symbol 'point-min to achieve the desired behaviour.
+
+Additional note on `org-footnote-insert-pos-for-preprocessor':
+1. This variable has not effect when FOR-PREPROCESSOR is nil.
+2. This variable (potentially) obviates the need for extra scan
+   of pre-processor buffer as witnessed in
+   `org-export-docbook-get-footnotes'.
+
+\(fn &optional SORT-ONLY EXPORT-PROPS)" nil nil)
 
 ;;;***
 
 ;;;### (autoloads (org-freemind-to-org-mode org-freemind-from-org-sparse-tree
 ;;;;;;  org-freemind-from-org-mode org-freemind-from-org-mode-node
 ;;;;;;  org-freemind-show org-export-as-freemind) "org-freemind"
-;;;;;;  "org/org-freemind.el" (19845 45374))
+;;;;;;  "org/org-freemind.el" (20045 31431))
 ;;; Generated autoloads from org/org-freemind.el
 
 (autoload 'org-export-as-freemind "org-freemind" "\
@@ -20374,7 +20476,7 @@ Convert FreeMind file MM-FILE to `org-mode' file ORG-FILE.
 ;;;### (autoloads (org-export-htmlize-generate-css org-export-as-html
 ;;;;;;  org-export-region-as-html org-replace-region-by-html org-export-as-html-to-buffer
 ;;;;;;  org-export-as-html-batch org-export-as-html-and-open) "org-html"
-;;;;;;  "org/org-html.el" (19931 11784))
+;;;;;;  "org/org-html.el" (20045 30715))
 ;;; Generated autoloads from org/org-html.el
 
 (put 'org-export-html-style-include-default 'safe-local-variable 'booleanp)
@@ -20468,7 +20570,7 @@ that uses these same face definitions.
 
 ;;;### (autoloads (org-export-icalendar-combine-agenda-files org-export-icalendar-all-agenda-files
 ;;;;;;  org-export-icalendar-this-file) "org-icalendar" "org/org-icalendar.el"
-;;;;;;  (19845 45374))
+;;;;;;  (20045 30716))
 ;;; Generated autoloads from org/org-icalendar.el
 
 (autoload 'org-export-icalendar-this-file "org-icalendar" "\
@@ -20496,7 +20598,7 @@ The file is stored under the name `org-combined-agenda-icalendar-file'.
 ;;;### (autoloads (org-id-store-link org-id-find-id-file org-id-find
 ;;;;;;  org-id-goto org-id-get-with-outline-drilling org-id-get-with-outline-path-completion
 ;;;;;;  org-id-get org-id-copy org-id-get-create) "org-id" "org/org-id.el"
-;;;;;;  (19845 45374))
+;;;;;;  (20045 30716))
 ;;; Generated autoloads from org/org-id.el
 
 (autoload 'org-id-get-create "org-id" "\
@@ -20565,7 +20667,7 @@ Store a link to the current entry, using its ID.
 ;;;***
 
 ;;;### (autoloads (org-indent-mode) "org-indent" "org/org-indent.el"
-;;;;;;  (19845 45374))
+;;;;;;  (20045 30716))
 ;;; Generated autoloads from org/org-indent.el
 
 (autoload 'org-indent-mode "org-indent" "\
@@ -20580,7 +20682,7 @@ FIXME:  How to update when broken?
 ;;;***
 
 ;;;### (autoloads (org-irc-store-link) "org-irc" "org/org-irc.el"
-;;;;;;  (19845 45374))
+;;;;;;  (20045 30716))
 ;;; Generated autoloads from org/org-irc.el
 
 (autoload 'org-irc-store-link "org-irc" "\
@@ -20593,7 +20695,7 @@ Dispatch to the appropriate function to store a link to an IRC session.
 ;;;### (autoloads (org-export-as-pdf-and-open org-export-as-pdf org-export-as-latex
 ;;;;;;  org-export-region-as-latex org-replace-region-by-latex org-export-as-latex-to-buffer
 ;;;;;;  org-export-as-latex-batch) "org-latex" "org/org-latex.el"
-;;;;;;  (19845 45374))
+;;;;;;  (20045 30716))
 ;;; Generated autoloads from org/org-latex.el
 
 (autoload 'org-export-as-latex-batch "org-latex" "\
@@ -20673,8 +20775,8 @@ Export as LaTeX, then process through to PDF, and open.
 ;;;***
 
 ;;;### (autoloads (org-mobile-create-sumo-agenda org-mobile-pull
-;;;;;;  org-mobile-push) "org-mobile" "org/org-mobile.el" (19845
-;;;;;;  45374))
+;;;;;;  org-mobile-push) "org-mobile" "org/org-mobile.el" (20045
+;;;;;;  30717))
 ;;; Generated autoloads from org/org-mobile.el
 
 (autoload 'org-mobile-push "org-mobile" "\
@@ -20699,7 +20801,7 @@ Create a file that contains all custom agenda views.
 ;;;***
 
 ;;;### (autoloads (org-plot/gnuplot) "org-plot" "org/org-plot.el"
-;;;;;;  (19845 45374))
+;;;;;;  (20045 30717))
 ;;; Generated autoloads from org/org-plot.el
 
 (autoload 'org-plot/gnuplot "org-plot" "\
@@ -20713,7 +20815,7 @@ line directly before or after the table.
 
 ;;;### (autoloads (org-publish-current-project org-publish-current-file
 ;;;;;;  org-publish-all org-publish) "org-publish" "org/org-publish.el"
-;;;;;;  (19845 45374))
+;;;;;;  (20045 30718))
 ;;; Generated autoloads from org/org-publish.el
 
 (defalias 'org-publish-project 'org-publish)
@@ -20747,7 +20849,7 @@ the project.
 
 ;;;### (autoloads (org-remember-handler org-remember org-remember-apply-template
 ;;;;;;  org-remember-annotation org-remember-insinuate) "org-remember"
-;;;;;;  "org/org-remember.el" (19845 45374))
+;;;;;;  "org/org-remember.el" (20045 30718))
 ;;; Generated autoloads from org/org-remember.el
 
 (autoload 'org-remember-insinuate "org-remember" "\
@@ -20823,7 +20925,7 @@ See also the variable `org-reverse-note-order'.
 ;;;***
 
 ;;;### (autoloads (org-table-to-lisp orgtbl-mode turn-on-orgtbl)
-;;;;;;  "org-table" "org/org-table.el" (19914 25180))
+;;;;;;  "org-table" "org/org-table.el" (20045 30718))
 ;;; Generated autoloads from org/org-table.el
 
 (autoload 'turn-on-orgtbl "org-table" "\
@@ -20847,7 +20949,7 @@ The table is taken from the parameter TXT, or from the buffer at point.
 ;;;***
 
 ;;;### (autoloads (org-export-as-taskjuggler-and-open org-export-as-taskjuggler)
-;;;;;;  "org-taskjuggler" "org/org-taskjuggler.el" (19845 45374))
+;;;;;;  "org-taskjuggler" "org/org-taskjuggler.el" (20045 30718))
 ;;; Generated autoloads from org/org-taskjuggler.el
 
 (autoload 'org-export-as-taskjuggler "org-taskjuggler" "\
@@ -20875,7 +20977,7 @@ with the TaskJuggler GUI.
 
 ;;;### (autoloads (org-timer-set-timer org-timer-item org-timer-change-times-in-region
 ;;;;;;  org-timer org-timer-start) "org-timer" "org/org-timer.el"
-;;;;;;  (19845 45374))
+;;;;;;  (20045 30718))
 ;;; Generated autoloads from org/org-timer.el
 
 (autoload 'org-timer-start "org-timer" "\
@@ -20936,7 +21038,7 @@ replace any running timer.
 ;;;***
 
 ;;;### (autoloads (org-export-as-xoxo) "org-xoxo" "org/org-xoxo.el"
-;;;;;;  (19845 45374))
+;;;;;;  (20045 30719))
 ;;; Generated autoloads from org/org-xoxo.el
 
 (autoload 'org-export-as-xoxo "org-xoxo" "\
@@ -21009,7 +21111,7 @@ See the command `outline-mode' for more information on this mode.
 ;;;### (autoloads (list-packages describe-package package-initialize
 ;;;;;;  package-install-file package-install-from-buffer package-install
 ;;;;;;  package-enable-at-startup) "package" "emacs-lisp/package.el"
-;;;;;;  (19893 19022))
+;;;;;;  (20059 26455))
 ;;; Generated autoloads from emacs-lisp/package.el
 
 (defvar package-enable-at-startup t "\
@@ -21025,8 +21127,8 @@ activate the package system at any time.")
 
 (autoload 'package-install "package" "\
 Install the package named NAME.
-Interactively, prompt for the package name.
-The package is found on one of the archives in `package-archives'.
+NAME should be the name of one of the available packages in an
+archive in `package-archives'.  Interactively, prompt for NAME.
 
 \(fn NAME)" t nil)
 
@@ -21285,7 +21387,7 @@ Completion for the GNU tar utility.
 ;;;***
 
 ;;;### (autoloads (pcomplete/mount pcomplete/umount pcomplete/kill)
-;;;;;;  "pcmpl-linux" "pcmpl-linux.el" (19845 45374))
+;;;;;;  "pcmpl-linux" "pcmpl-linux.el" (19986 58615))
 ;;; Generated autoloads from pcmpl-linux.el
 
 (autoload 'pcomplete/kill "pcmpl-linux" "\
@@ -21375,8 +21477,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" (19964
-;;;;;;  31562))
+;;;;;;  pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (20051
+;;;;;;  32345))
 ;;; Generated autoloads from pcomplete.el
 
 (autoload 'pcomplete "pcomplete" "\
@@ -21510,7 +21612,7 @@ The exact behavior is determined also by `cvs-dired-use-hook'." (when (stringp d
 
 ;;;***
 
-;;;### (autoloads nil "pcvs-defs" "vc/pcvs-defs.el" (19845 45374))
+;;;### (autoloads nil "pcvs-defs" "vc/pcvs-defs.el" (20062 2656))
 ;;; Generated autoloads from vc/pcvs-defs.el
 
 (defvar cvs-global-menu (let ((m (make-sparse-keymap "PCL-CVS"))) (define-key m [status] `(menu-item ,(purecopy "Directory Status") cvs-status :help ,(purecopy "A more verbose status of a workarea"))) (define-key m [checkout] `(menu-item ,(purecopy "Checkout Module") cvs-checkout :help ,(purecopy "Check out a module from the repository"))) (define-key m [update] `(menu-item ,(purecopy "Update Directory") cvs-update :help ,(purecopy "Fetch updates from the repository"))) (define-key m [examine] `(menu-item ,(purecopy "Examine Directory") cvs-examine :help ,(purecopy "Examine the current state of a workarea"))) (fset 'cvs-global-menu m)))
@@ -21660,8 +21762,8 @@ they are not defaultly assigned to keys.
 
 ;;;***
 
-;;;### (autoloads (plstore-open) "plstore" "gnus/plstore.el" (19981
-;;;;;;  40664))
+;;;### (autoloads (plstore-open) "plstore" "gnus/plstore.el" (19990
+;;;;;;  55648))
 ;;; Generated autoloads from gnus/plstore.el
 
 (autoload 'plstore-open "plstore" "\
@@ -21699,7 +21801,7 @@ pong-mode keybindings:\\<pong-mode-map>
 
 ;;;***
 
-;;;### (autoloads (pop3-movemail) "pop3" "gnus/pop3.el" (19940 49234))
+;;;### (autoloads (pop3-movemail) "pop3" "gnus/pop3.el" (20048 56149))
 ;;; Generated autoloads from gnus/pop3.el
 
 (autoload 'pop3-movemail "pop3" "\
@@ -21780,7 +21882,7 @@ Ignores leading comment characters.
 ;;;;;;  pr-ps-buffer-print pr-ps-buffer-using-ghostscript pr-ps-buffer-preview
 ;;;;;;  pr-ps-directory-ps-print pr-ps-directory-print pr-ps-directory-using-ghostscript
 ;;;;;;  pr-ps-directory-preview pr-interface) "printing" "printing.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19999 41597))
 ;;; Generated autoloads from printing.el
 
 (autoload 'pr-interface "printing" "\
@@ -22222,7 +22324,7 @@ Toggle menu lock.
 \(fn)" t nil)
 
 (autoload 'pr-toggle-region "printing" "\
-Toggle auto region.
+Toggle whether the region is automagically detected.
 
 \(fn)" t nil)
 
@@ -22367,7 +22469,7 @@ are both set to t.
 
 ;;;***
 
-;;;### (autoloads (proced) "proced" "proced.el" (19975 1875))
+;;;### (autoloads (proced) "proced" "proced.el" (20053 39261))
 ;;; Generated autoloads from proced.el
 
 (autoload 'proced "proced" "\
@@ -23020,8 +23122,8 @@ of each directory.
 
 ;;;### (autoloads (quickurl-list quickurl-list-mode quickurl-edit-urls
 ;;;;;;  quickurl-browse-url-ask quickurl-browse-url quickurl-add-url
-;;;;;;  quickurl-ask quickurl) "quickurl" "net/quickurl.el" (19845
-;;;;;;  45374))
+;;;;;;  quickurl-ask quickurl) "quickurl" "net/quickurl.el" (20054
+;;;;;;  8529))
 ;;; Generated autoloads from net/quickurl.el
 
 (defconst quickurl-reread-hook-postfix "\n;; Local Variables:\n;; eval: (progn (require 'quickurl) (add-hook 'local-write-file-hooks (lambda () (quickurl-read) nil)))\n;; End:\n" "\
@@ -23036,7 +23138,7 @@ To make use of this do something like:
 in your ~/.emacs (after loading/requiring quickurl).")
 
 (autoload 'quickurl "quickurl" "\
-Insert an URL based on LOOKUP.
+Insert a URL based on LOOKUP.
 
 If not supplied LOOKUP is taken to be the word at point in the current
 buffer, this default action can be modifed via
@@ -23045,14 +23147,14 @@ buffer, this default action can be modifed via
 \(fn &optional LOOKUP)" t nil)
 
 (autoload 'quickurl-ask "quickurl" "\
-Insert an URL, with `completing-read' prompt, based on LOOKUP.
+Insert a URL, with `completing-read' prompt, based on LOOKUP.
 
 \(fn LOOKUP)" t nil)
 
 (autoload 'quickurl-add-url "quickurl" "\
 Allow the user to interactively add a new URL associated with WORD.
 
-See `quickurl-grab-url' for details on how the default word/url combination
+See `quickurl-grab-url' for details on how the default word/URL combination
 is decided.
 
 \(fn WORD URL COMMENT)" t nil)
@@ -23093,7 +23195,7 @@ Display `quickurl-list' as a formatted list using `quickurl-list-mode'.
 ;;;***
 
 ;;;### (autoloads (rcirc-track-minor-mode rcirc-connect rcirc) "rcirc"
-;;;;;;  "net/rcirc.el" (19968 28627))
+;;;;;;  "net/rcirc.el" (20058 5591))
 ;;; Generated autoloads from net/rcirc.el
 
 (autoload 'rcirc "rcirc" "\
@@ -23187,7 +23289,7 @@ that were operated on recently.
 ;;;;;;  string-rectangle delete-whitespace-rectangle open-rectangle
 ;;;;;;  insert-rectangle yank-rectangle kill-rectangle extract-rectangle
 ;;;;;;  delete-extract-rectangle delete-rectangle) "rect" "rect.el"
-;;;;;;  (19886 45771))
+;;;;;;  (19999 41597))
 ;;; Generated autoloads from rect.el
  (define-key ctl-x-r-map "c" 'clear-rectangle)
  (define-key ctl-x-r-map "k" 'kill-rectangle)
@@ -23737,7 +23839,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" (19976 23054))
+;;;;;;  "rmail" "mail/rmail.el" (20063 23511))
 ;;; Generated autoloads from mail/rmail.el
 
 (autoload 'rmail-movemail-variant-p "rmail" "\
@@ -24141,7 +24243,7 @@ Toggle the use of ROT13 encoding for the current window.
 ;;;***
 
 ;;;### (autoloads (rst-minor-mode rst-mode) "rst" "textmodes/rst.el"
-;;;;;;  (19932 55155))
+;;;;;;  (19986 58615))
 ;;; Generated autoloads from textmodes/rst.el
  (add-to-list 'auto-mode-alist (purecopy '("\\.re?st\\'" . rst-mode)))
 
@@ -24557,7 +24659,7 @@ which is probably undesirable.
 ;;;***
 
 ;;;### (autoloads (dsssl-mode scheme-mode) "scheme" "progmodes/scheme.el"
-;;;;;;  (19845 45374))
+;;;;;;  (20050 11479))
 ;;; Generated autoloads from progmodes/scheme.el
 
 (autoload 'scheme-mode "scheme" "\
@@ -24708,8 +24810,9 @@ Semantic mode.
 ;;;;;;  mail-citation-prefix-regexp mail-citation-hook mail-indentation-spaces
 ;;;;;;  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" (19980 19797))
+;;;;;;  sendmail-query-once send-mail-function mail-interactive mail-self-blind
+;;;;;;  mail-specify-envelope-from mail-from-style) "sendmail" "mail/sendmail.el"
+;;;;;;  (20025 8284))
 ;;; Generated autoloads from mail/sendmail.el
 
 (defvar mail-from-style 'default "\
@@ -24752,9 +24855,7 @@ Otherwise, let mailer send back a message to report errors.")
 
 (custom-autoload 'mail-interactive "sendmail" t)
 
-(put 'send-mail-function 'standard-value '((if (or (and window-system (eq system-type 'darwin)) (eq system-type 'windows-nt)) 'mailclient-send-it 'sendmail-send-it)))
-
-(defvar send-mail-function (if (or (and window-system (eq system-type 'darwin)) (eq system-type 'windows-nt)) 'mailclient-send-it 'sendmail-send-it) "\
+(defvar 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,
@@ -24763,7 +24864,13 @@ This is used by the default mail-sending commands.  See also
 `message-send-mail-function' for use with the Message package.")
 
 (custom-autoload 'send-mail-function "sendmail" t)
-(custom-initialize-delay 'send-mail-function nil)
+
+(autoload 'sendmail-query-once "sendmail" "\
+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.
+
+\(fn)" nil nil)
 
 (defvar mail-header-separator (purecopy "--text follows this line--") "\
 Line used to separate headers from text in messages being composed.")
@@ -24988,8 +25095,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" (19975
-;;;;;;  1875))
+;;;;;;  server-force-delete server-start) "server" "server.el" (20059
+;;;;;;  26455))
 ;;; Generated autoloads from server.el
 
 (put 'server-host 'risky-local-variable t)
@@ -25137,7 +25244,7 @@ To work around that, do:
 ;;;***
 
 ;;;### (autoloads (sh-mode) "sh-script" "progmodes/sh-script.el"
-;;;;;;  (19890 42850))
+;;;;;;  (20051 32345))
 ;;; Generated autoloads from progmodes/sh-script.el
 (put 'sh-shell 'safe-local-variable 'symbolp)
 
@@ -25292,7 +25399,7 @@ Set up file shadowing.
 ;;;***
 
 ;;;### (autoloads (shell shell-dumb-shell-regexp) "shell" "shell.el"
-;;;;;;  (19964 31562))
+;;;;;;  (20058 5591))
 ;;; Generated autoloads from shell.el
 
 (defvar shell-dumb-shell-regexp (purecopy "cmd\\(proxy\\)?\\.exe") "\
@@ -25341,8 +25448,8 @@ Otherwise, one argument `-i' is passed to the shell.
 
 ;;;***
 
-;;;### (autoloads (shr-insert-document) "shr" "gnus/shr.el" (19976
-;;;;;;  22732))
+;;;### (autoloads (shr-insert-document) "shr" "gnus/shr.el" (20007
+;;;;;;  64734))
 ;;; Generated autoloads from gnus/shr.el
 
 (autoload 'shr-insert-document "shr" "\
@@ -25592,7 +25699,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" (19978 37530))
+;;;;;;  "mail/smtpmail.el" (20053 39293))
 ;;; Generated autoloads from mail/smtpmail.el
 
 (autoload 'smtpmail-send-it "smtpmail" "\
@@ -25898,8 +26005,8 @@ From a program takes two point or marker arguments, BEG and END.
 
 ;;;***
 
-;;;### (autoloads (spam-initialize) "spam" "gnus/spam.el" (19976
-;;;;;;  22732))
+;;;### (autoloads (spam-initialize) "spam" "gnus/spam.el" (20022
+;;;;;;  32083))
 ;;; Generated autoloads from gnus/spam.el
 
 (autoload 'spam-initialize "spam" "\
@@ -26002,7 +26109,7 @@ Return a vector containing the lines from `spook-phrases-file'.
 ;;;;;;  sql-ms sql-ingres sql-solid sql-mysql sql-sqlite sql-informix
 ;;;;;;  sql-sybase sql-oracle sql-product-interactive sql-connect
 ;;;;;;  sql-mode sql-help sql-add-product-keywords) "sql" "progmodes/sql.el"
-;;;;;;  (19931 11784))
+;;;;;;  (19988 13913))
 ;;; Generated autoloads from progmodes/sql.el
 
 (autoload 'sql-add-product-keywords "sql" "\
@@ -26100,7 +26207,7 @@ their settings.
 The user will not be prompted for any login parameters if a value
 is specified in the connection settings.
 
-\(fn CONNECTION)" t nil)
+\(fn CONNECTION &optional NEW-NAME)" t nil)
 
 (autoload 'sql-product-interactive "sql" "\
 Run PRODUCT interpreter as an inferior process.
@@ -26511,7 +26618,7 @@ Major-mode for writing SRecode macros.
 ;;;***
 
 ;;;### (autoloads (starttls-open-stream) "starttls" "gnus/starttls.el"
-;;;;;;  (19845 45374))
+;;;;;;  (20047 35303))
 ;;; Generated autoloads from gnus/starttls.el
 
 (autoload 'starttls-open-stream "starttls" "\
@@ -26778,7 +26885,7 @@ It relies on the `gpm' daemon being activated.
 
 ;;;***
 
-;;;### (autoloads (tabify untabify) "tabify" "tabify.el" (19845 45374))
+;;;### (autoloads (tabify untabify) "tabify" "tabify.el" (19998 49767))
 ;;; Generated autoloads from tabify.el
 
 (autoload 'untabify "tabify" "\
@@ -27402,7 +27509,7 @@ converts a table into plain text without frames.  It is a companion to
 ;;;***
 
 ;;;### (autoloads (tabulated-list-mode) "tabulated-list" "emacs-lisp/tabulated-list.el"
-;;;;;;  (19885 24894))
+;;;;;;  (20045 30688))
 ;;; Generated autoloads from emacs-lisp/tabulated-list.el
 
 (autoload 'tabulated-list-mode "tabulated-list" "\
@@ -27559,7 +27666,7 @@ Normally input is edited in Emacs and sent a line at a time.
 ;;;***
 
 ;;;### (autoloads (serial-term ansi-term term make-term) "term" "term.el"
-;;;;;;  (19931 11784))
+;;;;;;  (20050 11479))
 ;;; Generated autoloads from term.el
 
 (autoload 'make-term "term" "\
@@ -27639,7 +27746,7 @@ subprocess started.
 ;;;***
 
 ;;;### (autoloads (testcover-this-defun) "testcover" "emacs-lisp/testcover.el"
-;;;;;;  (19943 25429))
+;;;;;;  (19998 49767))
 ;;; Generated autoloads from emacs-lisp/testcover.el
 
 (autoload 'testcover-this-defun "testcover" "\
@@ -28137,33 +28244,39 @@ 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" (19980 19797))
+;;;;;;  "thingatpt" "thingatpt.el" (19990 55648))
 ;;; Generated autoloads from thingatpt.el
 
 (autoload 'forward-thing "thingatpt" "\
 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'.
 
 \(fn THING &optional N)" nil nil)
 
 (autoload 'bounds-of-thing-at-point "thingatpt" "\
 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.
 
 \(fn THING)" nil nil)
 
 (autoload 'thing-at-point "thingatpt" "\
 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.
@@ -28332,7 +28445,7 @@ This function performs no refilling of the changed text.
 
 ;;;### (autoloads (emacs-init-time emacs-uptime display-time-world
 ;;;;;;  display-time-mode display-time display-time-day-and-date)
-;;;;;;  "time" "time.el" (19886 45771))
+;;;;;;  "time" "time.el" (20033 22846))
 ;;; Generated autoloads from time.el
 
 (defvar display-time-day-and-date nil "\
@@ -28511,7 +28624,7 @@ This function does not work for SECONDS greater than `most-positive-fixnum'.
 ;;;***
 
 ;;;### (autoloads (time-stamp-toggle-active time-stamp) "time-stamp"
-;;;;;;  "time-stamp.el" (19886 45771))
+;;;;;;  "time-stamp.el" (20033 22846))
 ;;; Generated autoloads from time-stamp.el
 (put 'time-stamp-format 'safe-local-variable 'stringp)
 (put 'time-stamp-time-zone 'safe-local-variable 'string-or-null-p)
@@ -28778,7 +28891,7 @@ Show TODO list.
 
 ;;;### (autoloads (tool-bar-local-item-from-menu tool-bar-add-item-from-menu
 ;;;;;;  tool-bar-local-item tool-bar-add-item toggle-tool-bar-mode-from-frame)
-;;;;;;  "tool-bar" "tool-bar.el" (19886 45771))
+;;;;;;  "tool-bar" "tool-bar.el" (19994 52720))
 ;;; Generated autoloads from tool-bar.el
 
 (autoload 'toggle-tool-bar-mode-from-frame "tool-bar" "\
@@ -28961,7 +29074,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" (19981 40664))
+;;;;;;  "net/tramp.el" (20062 2656))
 ;;; Generated autoloads from net/tramp.el
 
 (defvar tramp-mode t "\
@@ -29013,24 +29126,19 @@ updated after changing this variable.
 
 Also see `tramp-file-name-structure'.")
 
-(defconst tramp-root-regexp (if (memq system-type '(cygwin windows-nt)) "\\`\\([a-zA-Z]:\\)?/" "\\`/") "\
-Beginning of an incomplete Tramp file name.
-Usually, it is just \"\\\\`/\".  On W32 systems, there might be a
-volume letter, which will be removed by `tramp-drop-volume-letter'.")
-
-(defconst tramp-completion-file-name-regexp-unified (if (memq system-type '(cygwin windows-nt)) (concat tramp-root-regexp "[^/]\\{2,\\}\\'") (concat tramp-root-regexp "[^/]*\\'")) "\
+(defconst tramp-completion-file-name-regexp-unified (if (memq system-type '(cygwin windows-nt)) "\\`/[^/]\\{2,\\}\\'" "\\`/[^/]*\\'") "\
 Value for `tramp-completion-file-name-regexp' for unified remoting.
 GNU Emacs uses a unified filename syntax for Tramp and Ange-FTP.
 See `tramp-file-name-structure' for more explanations.
 
 On W32 systems, the volume letter must be ignored.")
 
-(defconst tramp-completion-file-name-regexp-separate (concat tramp-root-regexp "\\([[][^]]*\\)?\\'") "\
+(defconst tramp-completion-file-name-regexp-separate "\\`/\\([[][^]]*\\)?\\'" "\
 Value for `tramp-completion-file-name-regexp' for separate remoting.
 XEmacs uses a separate filename syntax for Tramp and EFS.
 See `tramp-file-name-structure' for more explanations.")
 
-(defconst tramp-completion-file-name-regexp-url (concat tramp-root-regexp "[^/:]+\\(:\\(/\\(/[^/]*\\)?\\)?\\)?\\'") "\
+(defconst tramp-completion-file-name-regexp-url "\\`/[^/:]+\\(:\\(/\\(/[^/]*\\)?\\)?\\)?\\'" "\
 Value for `tramp-completion-file-name-regexp' for URL-like remoting.
 See `tramp-file-name-structure' for more explanations.")
 
@@ -29109,8 +29217,8 @@ Discard Tramp from loading remote files.
 
 ;;;***
 
-;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (19845
-;;;;;;  45374))
+;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (20048
+;;;;;;  56149))
 ;;; Generated autoloads from tutorial.el
 
 (autoload 'help-with-tutorial "tutorial" "\
@@ -29197,7 +29305,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"
-;;;;;;  (19981 40664))
+;;;;;;  (19985 37722))
 ;;; Generated autoloads from type-break.el
 
 (defvar type-break-mode nil "\
@@ -29397,7 +29505,7 @@ You might need to set `uce-mail-reader' before using this.
 ;;;;;;  ucs-normalize-NFKC-string ucs-normalize-NFKC-region ucs-normalize-NFKD-string
 ;;;;;;  ucs-normalize-NFKD-region ucs-normalize-NFC-string ucs-normalize-NFC-region
 ;;;;;;  ucs-normalize-NFD-string ucs-normalize-NFD-region) "ucs-normalize"
-;;;;;;  "international/ucs-normalize.el" (19845 45374))
+;;;;;;  "international/ucs-normalize.el" (20052 53218))
 ;;; Generated autoloads from international/ucs-normalize.el
 
 (autoload 'ucs-normalize-NFD-region "ucs-normalize" "\
@@ -29601,7 +29709,7 @@ RATING   a rating between 1 and 10 of the strength of the authentication.
 ;;;***
 
 ;;;### (autoloads (url-cache-extract url-is-cached url-store-in-cache)
-;;;;;;  "url-cache" "url/url-cache.el" (19845 45374))
+;;;;;;  "url-cache" "url/url-cache.el" (19988 13913))
 ;;; Generated autoloads from url/url-cache.el
 
 (autoload 'url-store-in-cache "url-cache" "\
@@ -29732,7 +29840,7 @@ accessible.
 ;;;***
 
 ;;;### (autoloads (url-http-options url-http-file-attributes url-http-file-exists-p
-;;;;;;  url-http) "url-http" "url/url-http.el" (19882 48702))
+;;;;;;  url-http) "url-http" "url/url-http.el" (20031 47065))
 ;;; Generated autoloads from url/url-http.el
 
 (autoload 'url-http "url-http" "\
@@ -30210,8 +30318,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" (19976
-;;;;;;  22732))
+;;;;;;  vc-checkin-hook vc-checkout-hook) "vc" "vc/vc.el" (19997
+;;;;;;  28887))
 ;;; Generated autoloads from vc/vc.el
 
 (defvar vc-checkout-hook nil "\
@@ -30531,7 +30639,7 @@ mode-specific menu.  `vc-annotate-color-map' and
 
 ;;;***
 
-;;;### (autoloads nil "vc-arch" "vc/vc-arch.el" (19845 45374))
+;;;### (autoloads nil "vc-arch" "vc/vc-arch.el" (19984 16846))
 ;;; Generated autoloads from vc/vc-arch.el
  (defun vc-arch-registered (file)
   (if (vc-find-root file "{arch}/=tagging-method")
@@ -30541,7 +30649,7 @@ mode-specific menu.  `vc-annotate-color-map' and
 
 ;;;***
 
-;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (19931 34253))
+;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (19991 42275))
 ;;; Generated autoloads from vc/vc-bzr.el
 
 (defconst vc-bzr-admin-dirname ".bzr" "\
@@ -30614,7 +30722,7 @@ case, and the process object in the asynchronous case.
 
 ;;;***
 
-;;;### (autoloads nil "vc-git" "vc/vc-git.el" (19845 45374))
+;;;### (autoloads nil "vc-git" "vc/vc-git.el" (20063 23511))
 ;;; Generated autoloads from vc/vc-git.el
  (defun vc-git-registered (file)
   "Return non-nil if FILE is registered with git."
@@ -31535,7 +31643,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" (19958 33091))
+;;;;;;  "view" "view.el" (20053 39261))
 ;;; Generated autoloads from view.el
 
 (defvar view-remove-frame-by-deleting t "\
@@ -31929,7 +32037,7 @@ Please submit bug reports and other feedback to the author, Neil W. Van Dyke
 ;;;***
 
 ;;;### (autoloads (which-function-mode) "which-func" "progmodes/which-func.el"
-;;;;;;  (19915 46047))
+;;;;;;  (19988 13913))
 ;;; Generated autoloads from progmodes/which-func.el
  (put 'which-func-format 'risky-local-variable t)
  (put 'which-func-current 'risky-local-variable t)
@@ -32488,7 +32596,7 @@ Default MODIFIER is 'shift.
 ;;;***
 
 ;;;### (autoloads (winner-mode winner-mode) "winner" "winner.el"
-;;;;;;  (19845 45374))
+;;;;;;  (19998 49767))
 ;;; Generated autoloads from winner.el
 
 (defvar winner-mode nil "\
@@ -32732,8 +32840,8 @@ If LIMIT is non-nil, then do not consider characters beyond LIMIT.
 
 ;;;***
 
-;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (19886
-;;;;;;  45771))
+;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (20034
+;;;;;;  23247))
 ;;; Generated autoloads from xt-mouse.el
 
 (defvar xterm-mouse-mode nil "\
@@ -32900,36 +33008,35 @@ Zone out, completely.
 ;;;;;;  "emacs-lisp/eieio.el" "emacs-lisp/find-gc.el" "emacs-lisp/gulp.el"
 ;;;;;;  "emacs-lisp/lisp-mnt.el" "emacs-lisp/package-x.el" "emacs-lisp/regi.el"
 ;;;;;;  "emacs-lisp/smie.el" "emacs-lisp/tcover-ses.el" "emacs-lisp/tcover-unsafep.el"
-;;;;;;  "emacs-lock.el" "emulation/cua-gmrk.el" "emulation/cua-rect.el"
-;;;;;;  "emulation/edt-lk201.el" "emulation/edt-mapper.el" "emulation/edt-pc.el"
-;;;;;;  "emulation/edt-vt100.el" "emulation/tpu-extras.el" "emulation/viper-cmd.el"
-;;;;;;  "emulation/viper-ex.el" "emulation/viper-init.el" "emulation/viper-keym.el"
-;;;;;;  "emulation/viper-macs.el" "emulation/viper-mous.el" "emulation/viper-util.el"
-;;;;;;  "erc/erc-backend.el" "erc/erc-goodies.el" "erc/erc-ibuffer.el"
-;;;;;;  "erc/erc-lang.el" "eshell/em-alias.el" "eshell/em-banner.el"
-;;;;;;  "eshell/em-basic.el" "eshell/em-cmpl.el" "eshell/em-dirs.el"
-;;;;;;  "eshell/em-glob.el" "eshell/em-hist.el" "eshell/em-ls.el"
-;;;;;;  "eshell/em-pred.el" "eshell/em-prompt.el" "eshell/em-rebind.el"
-;;;;;;  "eshell/em-script.el" "eshell/em-smart.el" "eshell/em-term.el"
-;;;;;;  "eshell/em-unix.el" "eshell/em-xtra.el" "eshell/esh-arg.el"
-;;;;;;  "eshell/esh-cmd.el" "eshell/esh-ext.el" "eshell/esh-groups.el"
-;;;;;;  "eshell/esh-io.el" "eshell/esh-module.el" "eshell/esh-opt.el"
-;;;;;;  "eshell/esh-proc.el" "eshell/esh-util.el" "eshell/esh-var.el"
-;;;;;;  "ezimage.el" "foldout.el" "format-spec.el" "forms-d2.el"
-;;;;;;  "forms-pass.el" "fringe.el" "generic-x.el" "gnus/compface.el"
-;;;;;;  "gnus/gnus-async.el" "gnus/gnus-bcklg.el" "gnus/gnus-cite.el"
-;;;;;;  "gnus/gnus-cus.el" "gnus/gnus-demon.el" "gnus/gnus-dup.el"
-;;;;;;  "gnus/gnus-eform.el" "gnus/gnus-ems.el" "gnus/gnus-int.el"
-;;;;;;  "gnus/gnus-logic.el" "gnus/gnus-mh.el" "gnus/gnus-salt.el"
-;;;;;;  "gnus/gnus-score.el" "gnus/gnus-setup.el" "gnus/gnus-srvr.el"
-;;;;;;  "gnus/gnus-topic.el" "gnus/gnus-undo.el" "gnus/gnus-util.el"
-;;;;;;  "gnus/gnus-uu.el" "gnus/gnus-vm.el" "gnus/gssapi.el" "gnus/ietf-drums.el"
-;;;;;;  "gnus/legacy-gnus-agent.el" "gnus/mail-parse.el" "gnus/mail-prsvr.el"
-;;;;;;  "gnus/mail-source.el" "gnus/mailcap.el" "gnus/messcompat.el"
-;;;;;;  "gnus/mm-bodies.el" "gnus/mm-decode.el" "gnus/mm-encode.el"
-;;;;;;  "gnus/mm-util.el" "gnus/mm-view.el" "gnus/mml-sec.el" "gnus/mml-smime.el"
-;;;;;;  "gnus/mml.el" "gnus/nnagent.el" "gnus/nnbabyl.el" "gnus/nndir.el"
-;;;;;;  "gnus/nndraft.el" "gnus/nneething.el" "gnus/nngateway.el"
+;;;;;;  "emulation/cua-gmrk.el" "emulation/cua-rect.el" "emulation/edt-lk201.el"
+;;;;;;  "emulation/edt-mapper.el" "emulation/edt-pc.el" "emulation/edt-vt100.el"
+;;;;;;  "emulation/tpu-extras.el" "emulation/viper-cmd.el" "emulation/viper-ex.el"
+;;;;;;  "emulation/viper-init.el" "emulation/viper-keym.el" "emulation/viper-macs.el"
+;;;;;;  "emulation/viper-mous.el" "emulation/viper-util.el" "erc/erc-backend.el"
+;;;;;;  "erc/erc-goodies.el" "erc/erc-ibuffer.el" "erc/erc-lang.el"
+;;;;;;  "eshell/em-alias.el" "eshell/em-banner.el" "eshell/em-basic.el"
+;;;;;;  "eshell/em-cmpl.el" "eshell/em-dirs.el" "eshell/em-glob.el"
+;;;;;;  "eshell/em-hist.el" "eshell/em-ls.el" "eshell/em-pred.el"
+;;;;;;  "eshell/em-prompt.el" "eshell/em-rebind.el" "eshell/em-script.el"
+;;;;;;  "eshell/em-smart.el" "eshell/em-term.el" "eshell/em-unix.el"
+;;;;;;  "eshell/em-xtra.el" "eshell/esh-arg.el" "eshell/esh-cmd.el"
+;;;;;;  "eshell/esh-ext.el" "eshell/esh-groups.el" "eshell/esh-io.el"
+;;;;;;  "eshell/esh-module.el" "eshell/esh-opt.el" "eshell/esh-proc.el"
+;;;;;;  "eshell/esh-util.el" "eshell/esh-var.el" "ezimage.el" "foldout.el"
+;;;;;;  "format-spec.el" "forms-d2.el" "forms-pass.el" "fringe.el"
+;;;;;;  "generic-x.el" "gnus/compface.el" "gnus/gnus-async.el" "gnus/gnus-bcklg.el"
+;;;;;;  "gnus/gnus-cite.el" "gnus/gnus-cus.el" "gnus/gnus-demon.el"
+;;;;;;  "gnus/gnus-dup.el" "gnus/gnus-eform.el" "gnus/gnus-ems.el"
+;;;;;;  "gnus/gnus-int.el" "gnus/gnus-logic.el" "gnus/gnus-mh.el"
+;;;;;;  "gnus/gnus-salt.el" "gnus/gnus-score.el" "gnus/gnus-setup.el"
+;;;;;;  "gnus/gnus-srvr.el" "gnus/gnus-topic.el" "gnus/gnus-undo.el"
+;;;;;;  "gnus/gnus-util.el" "gnus/gnus-uu.el" "gnus/gnus-vm.el" "gnus/gssapi.el"
+;;;;;;  "gnus/ietf-drums.el" "gnus/legacy-gnus-agent.el" "gnus/mail-parse.el"
+;;;;;;  "gnus/mail-prsvr.el" "gnus/mail-source.el" "gnus/mailcap.el"
+;;;;;;  "gnus/messcompat.el" "gnus/mm-bodies.el" "gnus/mm-decode.el"
+;;;;;;  "gnus/mm-encode.el" "gnus/mm-util.el" "gnus/mm-view.el" "gnus/mml-sec.el"
+;;;;;;  "gnus/mml-smime.el" "gnus/mml.el" "gnus/nnagent.el" "gnus/nnbabyl.el"
+;;;;;;  "gnus/nndir.el" "gnus/nndraft.el" "gnus/nneething.el" "gnus/nngateway.el"
 ;;;;;;  "gnus/nnheader.el" "gnus/nnimap.el" "gnus/nnir.el" "gnus/nnmail.el"
 ;;;;;;  "gnus/nnmaildir.el" "gnus/nnmairix.el" "gnus/nnmbox.el" "gnus/nnmh.el"
 ;;;;;;  "gnus/nnnil.el" "gnus/nnoo.el" "gnus/nnregistry.el" "gnus/nnrss.el"
@@ -32963,60 +33070,62 @@ Zone out, completely.
 ;;;;;;  "mh-e/mh-utils.el" "mh-e/mh-xface.el" "mouse-copy.el" "mouse.el"
 ;;;;;;  "mwheel.el" "net/dns.el" "net/eudc-vars.el" "net/eudcb-bbdb.el"
 ;;;;;;  "net/eudcb-ldap.el" "net/eudcb-mab.el" "net/eudcb-ph.el"
-;;;;;;  "net/gnutls.el" "net/hmac-def.el" "net/hmac-md5.el" "net/imap.el"
-;;;;;;  "net/ldap.el" "net/mairix.el" "net/newsticker.el" "net/ntlm.el"
-;;;;;;  "net/sasl-cram.el" "net/sasl-digest.el" "net/sasl-ntlm.el"
-;;;;;;  "net/sasl.el" "net/soap-client.el" "net/soap-inspect.el"
-;;;;;;  "net/socks.el" "net/tls.el" "net/tramp-cache.el" "net/tramp-cmds.el"
-;;;;;;  "net/tramp-compat.el" "net/tramp-gvfs.el" "net/tramp-gw.el"
-;;;;;;  "net/tramp-loaddefs.el" "net/tramp-sh.el" "net/tramp-smb.el"
-;;;;;;  "net/tramp-uu.el" "net/trampver.el" "net/zeroconf.el" "notifications.el"
-;;;;;;  "nxml/nxml-enc.el" "nxml/nxml-maint.el" "nxml/nxml-ns.el"
-;;;;;;  "nxml/nxml-outln.el" "nxml/nxml-parse.el" "nxml/nxml-rap.el"
-;;;;;;  "nxml/nxml-util.el" "nxml/rng-dt.el" "nxml/rng-loc.el" "nxml/rng-maint.el"
-;;;;;;  "nxml/rng-match.el" "nxml/rng-parse.el" "nxml/rng-pttrn.el"
-;;;;;;  "nxml/rng-uri.el" "nxml/rng-util.el" "nxml/xsd-regexp.el"
-;;;;;;  "org/ob-C.el" "org/ob-R.el" "org/ob-asymptote.el" "org/ob-calc.el"
-;;;;;;  "org/ob-clojure.el" "org/ob-comint.el" "org/ob-css.el" "org/ob-ditaa.el"
-;;;;;;  "org/ob-dot.el" "org/ob-emacs-lisp.el" "org/ob-eval.el" "org/ob-exp.el"
-;;;;;;  "org/ob-gnuplot.el" "org/ob-haskell.el" "org/ob-js.el" "org/ob-latex.el"
-;;;;;;  "org/ob-ledger.el" "org/ob-lisp.el" "org/ob-matlab.el" "org/ob-mscgen.el"
-;;;;;;  "org/ob-ocaml.el" "org/ob-octave.el" "org/ob-org.el" "org/ob-perl.el"
-;;;;;;  "org/ob-plantuml.el" "org/ob-python.el" "org/ob-ref.el" "org/ob-ruby.el"
-;;;;;;  "org/ob-sass.el" "org/ob-scheme.el" "org/ob-screen.el" "org/ob-sh.el"
-;;;;;;  "org/ob-sql.el" "org/ob-sqlite.el" "org/ob-table.el" "org/org-beamer.el"
-;;;;;;  "org/org-bibtex.el" "org/org-colview.el" "org/org-compat.el"
-;;;;;;  "org/org-complete.el" "org/org-crypt.el" "org/org-ctags.el"
-;;;;;;  "org/org-docview.el" "org/org-entities.el" "org/org-exp-blocks.el"
-;;;;;;  "org/org-faces.el" "org/org-gnus.el" "org/org-habit.el" "org/org-info.el"
-;;;;;;  "org/org-inlinetask.el" "org/org-install.el" "org/org-jsinfo.el"
-;;;;;;  "org/org-list.el" "org/org-mac-message.el" "org/org-macs.el"
-;;;;;;  "org/org-mew.el" "org/org-mhe.el" "org/org-mks.el" "org/org-mouse.el"
-;;;;;;  "org/org-protocol.el" "org/org-rmail.el" "org/org-src.el"
-;;;;;;  "org/org-vm.el" "org/org-w3m.el" "org/org-wl.el" "patcomp.el"
-;;;;;;  "play/gamegrid.el" "play/gametree.el" "play/meese.el" "progmodes/ada-prj.el"
-;;;;;;  "progmodes/cc-align.el" "progmodes/cc-awk.el" "progmodes/cc-bytecomp.el"
-;;;;;;  "progmodes/cc-cmds.el" "progmodes/cc-defs.el" "progmodes/cc-fonts.el"
-;;;;;;  "progmodes/cc-langs.el" "progmodes/cc-menus.el" "progmodes/ebnf-abn.el"
-;;;;;;  "progmodes/ebnf-bnf.el" "progmodes/ebnf-dtd.el" "progmodes/ebnf-ebx.el"
-;;;;;;  "progmodes/ebnf-iso.el" "progmodes/ebnf-otz.el" "progmodes/ebnf-yac.el"
-;;;;;;  "progmodes/idlw-complete-structtag.el" "progmodes/idlw-help.el"
-;;;;;;  "progmodes/idlw-toolbar.el" "progmodes/mantemp.el" "progmodes/xscheme.el"
-;;;;;;  "ps-def.el" "ps-mule.el" "ps-samp.el" "saveplace.el" "sb-image.el"
-;;;;;;  "scroll-bar.el" "select.el" "soundex.el" "subdirs.el" "tempo.el"
-;;;;;;  "textmodes/bib-mode.el" "textmodes/makeinfo.el" "textmodes/page-ext.el"
-;;;;;;  "textmodes/refbib.el" "textmodes/refer.el" "textmodes/reftex-auc.el"
-;;;;;;  "textmodes/reftex-dcr.el" "textmodes/reftex-ref.el" "textmodes/reftex-sel.el"
-;;;;;;  "textmodes/reftex-toc.el" "textmodes/texnfo-upd.el" "timezone.el"
-;;;;;;  "tooltip.el" "tree-widget.el" "uniquify.el" "url/url-about.el"
-;;;;;;  "url/url-cookie.el" "url/url-dired.el" "url/url-expand.el"
-;;;;;;  "url/url-ftp.el" "url/url-future.el" "url/url-history.el"
-;;;;;;  "url/url-imap.el" "url/url-methods.el" "url/url-nfs.el" "url/url-proxy.el"
-;;;;;;  "url/url-vars.el" "vc/ediff-diff.el" "vc/ediff-init.el" "vc/ediff-merg.el"
-;;;;;;  "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") (19981 41048 99944))
+;;;;;;  "net/hmac-def.el" "net/hmac-md5.el" "net/imap.el" "net/ldap.el"
+;;;;;;  "net/mairix.el" "net/newsticker.el" "net/ntlm.el" "net/sasl-cram.el"
+;;;;;;  "net/sasl-digest.el" "net/sasl-ntlm.el" "net/sasl.el" "net/soap-client.el"
+;;;;;;  "net/soap-inspect.el" "net/socks.el" "net/tls.el" "net/tramp-cache.el"
+;;;;;;  "net/tramp-cmds.el" "net/tramp-compat.el" "net/tramp-gvfs.el"
+;;;;;;  "net/tramp-gw.el" "net/tramp-loaddefs.el" "net/tramp-sh.el"
+;;;;;;  "net/tramp-smb.el" "net/tramp-uu.el" "net/trampver.el" "net/zeroconf.el"
+;;;;;;  "notifications.el" "nxml/nxml-enc.el" "nxml/nxml-maint.el"
+;;;;;;  "nxml/nxml-ns.el" "nxml/nxml-outln.el" "nxml/nxml-parse.el"
+;;;;;;  "nxml/nxml-rap.el" "nxml/nxml-util.el" "nxml/rng-dt.el" "nxml/rng-loc.el"
+;;;;;;  "nxml/rng-maint.el" "nxml/rng-match.el" "nxml/rng-parse.el"
+;;;;;;  "nxml/rng-pttrn.el" "nxml/rng-uri.el" "nxml/rng-util.el"
+;;;;;;  "nxml/xsd-regexp.el" "org/ob-C.el" "org/ob-R.el" "org/ob-asymptote.el"
+;;;;;;  "org/ob-awk.el" "org/ob-calc.el" "org/ob-clojure.el" "org/ob-comint.el"
+;;;;;;  "org/ob-css.el" "org/ob-ditaa.el" "org/ob-dot.el" "org/ob-emacs-lisp.el"
+;;;;;;  "org/ob-eval.el" "org/ob-exp.el" "org/ob-gnuplot.el" "org/ob-haskell.el"
+;;;;;;  "org/ob-java.el" "org/ob-js.el" "org/ob-latex.el" "org/ob-ledger.el"
+;;;;;;  "org/ob-lilypond.el" "org/ob-lisp.el" "org/ob-matlab.el"
+;;;;;;  "org/ob-maxima.el" "org/ob-mscgen.el" "org/ob-ocaml.el" "org/ob-octave.el"
+;;;;;;  "org/ob-org.el" "org/ob-perl.el" "org/ob-plantuml.el" "org/ob-python.el"
+;;;;;;  "org/ob-ref.el" "org/ob-ruby.el" "org/ob-sass.el" "org/ob-scheme.el"
+;;;;;;  "org/ob-screen.el" "org/ob-sh.el" "org/ob-sql.el" "org/ob-sqlite.el"
+;;;;;;  "org/ob-table.el" "org/org-beamer.el" "org/org-bibtex.el"
+;;;;;;  "org/org-colview.el" "org/org-compat.el" "org/org-crypt.el"
+;;;;;;  "org/org-ctags.el" "org/org-docview.el" "org/org-entities.el"
+;;;;;;  "org/org-exp-blocks.el" "org/org-faces.el" "org/org-gnus.el"
+;;;;;;  "org/org-habit.el" "org/org-info.el" "org/org-inlinetask.el"
+;;;;;;  "org/org-install.el" "org/org-jsinfo.el" "org/org-list.el"
+;;;;;;  "org/org-mac-message.el" "org/org-macs.el" "org/org-mew.el"
+;;;;;;  "org/org-mhe.el" "org/org-mks.el" "org/org-mouse.el" "org/org-pcomplete.el"
+;;;;;;  "org/org-protocol.el" "org/org-rmail.el" "org/org-special-blocks.el"
+;;;;;;  "org/org-src.el" "org/org-vm.el" "org/org-w3m.el" "org/org-wl.el"
+;;;;;;  "patcomp.el" "play/gamegrid.el" "play/gametree.el" "play/meese.el"
+;;;;;;  "progmodes/ada-prj.el" "progmodes/cc-align.el" "progmodes/cc-awk.el"
+;;;;;;  "progmodes/cc-bytecomp.el" "progmodes/cc-cmds.el" "progmodes/cc-defs.el"
+;;;;;;  "progmodes/cc-fonts.el" "progmodes/cc-langs.el" "progmodes/cc-menus.el"
+;;;;;;  "progmodes/ebnf-abn.el" "progmodes/ebnf-bnf.el" "progmodes/ebnf-dtd.el"
+;;;;;;  "progmodes/ebnf-ebx.el" "progmodes/ebnf-iso.el" "progmodes/ebnf-otz.el"
+;;;;;;  "progmodes/ebnf-yac.el" "progmodes/idlw-complete-structtag.el"
+;;;;;;  "progmodes/idlw-help.el" "progmodes/idlw-toolbar.el" "progmodes/mantemp.el"
+;;;;;;  "progmodes/xscheme.el" "ps-def.el" "ps-mule.el" "ps-samp.el"
+;;;;;;  "saveplace.el" "sb-image.el" "scroll-bar.el" "select.el"
+;;;;;;  "soundex.el" "subdirs.el" "tempo.el" "textmodes/bib-mode.el"
+;;;;;;  "textmodes/makeinfo.el" "textmodes/page-ext.el" "textmodes/refbib.el"
+;;;;;;  "textmodes/refer.el" "textmodes/reftex-auc.el" "textmodes/reftex-dcr.el"
+;;;;;;  "textmodes/reftex-ref.el" "textmodes/reftex-sel.el" "textmodes/reftex-toc.el"
+;;;;;;  "textmodes/texnfo-upd.el" "timezone.el" "tooltip.el" "tree-widget.el"
+;;;;;;  "uniquify.el" "url/url-about.el" "url/url-cookie.el" "url/url-dired.el"
+;;;;;;  "url/url-expand.el" "url/url-ftp.el" "url/url-future.el"
+;;;;;;  "url/url-history.el" "url/url-imap.el" "url/url-methods.el"
+;;;;;;  "url/url-nfs.el" "url/url-proxy.el" "url/url-vars.el" "vc/ediff-diff.el"
+;;;;;;  "vc/ediff-init.el" "vc/ediff-merg.el" "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") (20063
+;;;;;;  23539 958052))
 
 ;;;***
 
diff --git a/lisp/longlines.el b/lisp/longlines.el
index e81a235a17b..f625d8fcac7 100644
--- a/lisp/longlines.el
+++ b/lisp/longlines.el
@@ -100,8 +100,8 @@ 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,
+With no argument, this command toggles Long Lines mode.
+With a prefix argument ARG, turn Long Lines minor mode on if ARG is positive,
 otherwise turn it off.
 
 If the variable `longlines-auto-wrap' is non-nil, lines are automatically
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index c43ec9e5611..ac07f07a76b 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -4249,7 +4249,7 @@ TEXT and INDENT are not used."
    ;; rmail-output expands non-absolute filenames against rmail-default-file.
    ;; What is the point of that, anyway?
    (rmail-output (expand-file-name token))))
-
+
 ;; Functions for setting, getting and encoding the POP password.
 ;; The password is encoded to prevent it from being easily accessible
 ;; to "prying eyes."  Obviously, this encoding isn't "real security,"
@@ -4300,6 +4300,85 @@ encoded string (and the same mask) will decode the string."
      (setq i (1+ i)))
    (concat string-vector)))
 
+(defun rmail-epa-decrypt ()
+  "Decrypt OpenPGP armors in current message."
+  (interactive)
+
+  ;; Save the current buffer here for cleanliness, in case we
+  ;; change it in one of the calls to `epa-decrypt-region'.
+
+  (save-excursion
+    (let (decrypts)
+      (goto-char (point-min))
+
+      ;; In case the encrypted data is inside a mime attachment,
+      ;; show it.  This is a kludge; to be clean, it should not
+      ;; modify the buffer, but I don't see how to do that.
+      (when (search-forward "octet-stream" nil t)
+        (beginning-of-line)
+        (forward-button 1)
+        (if (looking-at "Show")
+            (rmail-mime-toggle-hidden)))
+
+      ;; Now find all armored messages in the buffer
+      ;; and decrypt them one by one.
+      (goto-char (point-min))
+      (while (re-search-forward "-----BEGIN PGP MESSAGE-----$" nil t)
+        (let ((coding-system-for-read coding-system-for-read)
+              armor-start armor-end after-end)
+          (setq armor-start (match-beginning 0)
+                armor-end (re-search-forward "^-----END PGP MESSAGE-----$"
+                                             nil t))
+          (unless armor-end
+            (error "Encryption armor beginning has no matching end"))
+          (goto-char armor-start)
+
+          ;; Because epa--find-coding-system-for-mime-charset not autoloaded.
+          (require 'epa)
+
+          ;; Use the charset specified in the armor.
+          (unless coding-system-for-read
+            (if (re-search-forward "^Charset: \\(.*\\)" armor-end t)
+                (setq coding-system-for-read
+                      (epa--find-coding-system-for-mime-charset
+                       (intern (downcase (match-string 1)))))))
+
+          ;; Advance over this armor.
+          (goto-char armor-end)
+          (setq after-end (- (point-max) armor-end))
+
+          ;; Decrypt it, maybe in place, maybe making new buffer.
+          (epa-decrypt-region
+           armor-start armor-end
+           ;; Call back this function to prepare the output.
+           (lambda ()
+             (let ((inhibit-read-only t))
+               (delete-region armor-start armor-end)
+               (goto-char armor-start)
+               (current-buffer))))
+
+          (push (list armor-start (- (point-max) after-end))
+                decrypts)))
+
+      (when (and decrypts (rmail-buffers-swapped-p))
+        (when (y-or-n-p "Replace the original message? ")
+          (setq decrypts (nreverse decrypts))
+          (let ((beg (rmail-msgbeg rmail-current-message))
+                (end (rmail-msgend rmail-current-message))
+                (from-buffer (current-buffer)))
+            (with-current-buffer rmail-view-buffer
+              (narrow-to-region beg end)
+              (goto-char (point-min))
+              (dolist (d decrypts)
+                (if (re-search-forward "-----BEGIN PGP MESSAGE-----$" nil t)
+                    (let (armor-start armor-end)
+                      (setq armor-start (match-beginning 0)
+                            armor-end (re-search-forward "^-----END PGP MESSAGE-----$"
+                                                         nil t))
+                      (when armor-end
+                        (delete-region armor-start armor-end)
+                        (insert-buffer-substring from-buffer (nth 0 d) (nth 1 d)))))))))))))
+
 ;;;;  Desktop support
 
 (defun rmail-restore-desktop-buffer (desktop-buffer-file-name
@@ -4403,7 +4482,7 @@ With prefix argument N moves forward N messages with these labels.
 
 ;;;***
 
-;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "a7d3e7205efa4e20ca9038c9b260ce83")
+;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "2c8675d7c069c68bc36a4003b15448d1")
 ;;; Generated autoloads from rmailmm.el
 
 (autoload 'rmail-mime "rmailmm" "\
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index 597068562b5..d3351255583 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -426,7 +426,7 @@ The value is a vector [ INDEX HEADER TAGLINE BODY END], where
   "Insert a tag line for MIME-entity ENTITY.
 ITEM-LIST is a list of strings or button-elements (list) to be added
 to the tag line."
-  (insert "[")
+  (insert "\n[")
   (let ((tag (aref (rmail-mime-entity-tagline entity) 0)))
     (if (> (length tag) 0) (insert (substring tag 1) ":")))
   (insert (car (rmail-mime-entity-type entity)) " ")
@@ -439,7 +439,7 @@ to the tag line."
       (if (stringp item)
           (insert item)
         (apply 'insert-button item))))
-  (insert "]\n"))
+  (insert "]\n\n"))
 
 (defun rmail-mime-update-tagline (entity)
   "Update the current tag line for MIME-entity ENTITY."
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index fe20ad921da..cb02a4b374d 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -156,49 +156,6 @@ This is used by the default mail-sending commands.  See also
   :version "24.1"
   :group 'sendmail)
 
-(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--")
   "Line used to separate headers from text in messages being composed."
@@ -541,6 +498,51 @@ by Emacs.)")
   "Additional expressions to highlight in Mail mode.")
 
 
+;;;###autoload
+(defun sendmail-query-once ()
+  "Query for `send-mail-function' and send mail with it.
+This also saves the value of `send-mail-function' via Customize."
+  (let* ((mail-buffer (current-buffer))
+         ;; Compute default mail sender, preferring smtpmail if it's
+         ;; already configured.
+         (default (cond
+                   ((and (boundp 'smtpmail-smtp-server)
+                         smtpmail-smtp-server)
+                    'smtpmail-send-it)
+                   ((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)))
+         (send-function (if (eq default 'smtpmail-send-it)
+                            'smtpmail-send-it)))
+    (unless send-function
+      ;; Query the user.
+      (with-temp-buffer
+        (rename-buffer "*Mail Help*" t)
+        (erase-buffer)
+        (insert "Emacs has not been set up for sending mail.\n
+Type `y' to configure and use Emacs as a mail client,
+or `n' to use your system's default mailer.\n
+To change your decision later, customize `send-mail-function'.\n")
+        (goto-char (point-min))
+        (display-buffer (current-buffer))
+        (if (y-or-n-p "Set up Emacs for sending SMTP mail? ")
+            ;; FIXME: We should check and correct the From: field too.
+            (setq send-function 'smtpmail-send-it)
+          (setq send-function default))))
+    (when send-function
+      (customize-save-variable 'send-mail-function send-function)
+      ;; HACK: Message mode stupidly has `message-send-mail-function',
+      ;; so we must update it too or sending again in the current
+      ;; Emacs session will still call `sendmail-query-once'.
+      (and (boundp 'message-send-mail-function)
+           (eq message-send-mail-function 'sendmail-query-once)
+           (customize-set-variable 'message-send-mail-function
+                                   send-function))
+      (funcall send-function))))
+
 (defun sendmail-sync-aliases ()
   (when mail-personal-alias-file
     (let ((modtime (nth 5 (file-attributes mail-personal-alias-file))))
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index cc46660712f..544570a1bc3 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -55,15 +55,12 @@
 ;;; Code:
 
 (require 'sendmail)
+(require 'auth-source)
 (autoload 'mail-strip-quoted-names "mail-utils")
 (autoload 'message-make-date "message")
 (autoload 'message-make-message-id "message")
 (autoload 'rfc2104-hash "rfc2104")
-(autoload 'netrc-parse "netrc")
-(autoload 'netrc-machine "netrc")
-(autoload 'netrc-get "netrc")
 (autoload 'password-read "password-cache")
-(autoload 'auth-source-search "auth-source")
 
 ;;;
 (defgroup smtpmail nil
@@ -89,6 +86,12 @@ The default value would be \"smtp\" or 25."
   :type '(choice (integer :tag "Port") (string :tag "Service"))
   :group 'smtpmail)
 
+(defcustom smtpmail-smtp-user nil
+  "User name to use when looking up credentials."
+  :version "24.1"
+  :type '(choice (const nil) string)
+  :group 'smtpmail)
+
 (defcustom smtpmail-local-domain nil
   "Local domain name without a host name.
 If the function `system-name' returns the full internet address,
@@ -487,12 +490,13 @@ The list is in preference order.")
   (let* ((mechs (cdr-safe (assoc 'auth supported-extensions)))
          (mech (car (smtpmail-intersection mechs smtpmail-auth-supported)))
          (auth-source-creation-prompts
-          '((user  . "SMTP user at %h: ")
+          '((user  . "SMTP user name for %h: ")
             (secret . "SMTP password for %u@%h: ")))
          (auth-info (car
                      (auth-source-search
                       :host host
                       :port port
+                      :user smtpmail-smtp-user
                       :max 1
                       :require (and ask-for-password
                                     '(:user :secret))
@@ -502,6 +506,8 @@ The list is in preference order.")
          (save-function (and ask-for-password
                              (plist-get auth-info :save-function)))
          ret)
+    (when (functionp password)
+      (setq password (funcall password)))
     (when (and user
                (not password))
       ;; The user has stored the user name, but not the password, so
@@ -513,6 +519,7 @@ The list is in preference order.")
               :max 1
               :host host
               :port port
+              :user smtpmail-smtp-user
               :require '(:user :secret)
               :create t))
             password (plist-get auth-info :secret)))
@@ -589,15 +596,17 @@ The list is in preference order.")
 
 (defun smtpmail-query-smtp-server ()
   (let ((server (read-string "Outgoing SMTP mail server: "))
-        (ports '(587 "smtp"))
+        (ports '("smtp" 587))
         stream port)
     (when (and smtpmail-smtp-server
                (not (member smtpmail-smtp-server ports)))
       (push smtpmail-smtp-server ports))
     (while (and (not smtpmail-smtp-server)
                 (setq port (pop ports)))
-      (when (setq stream (ignore-errors
-                           (open-network-stream "smtp" nil server port)))
+      (when (setq stream (condition-case ()
+                             (open-network-stream "smtp" nil server port)
+                           (quit nil)
+                           (error nil)))
         (customize-save-variable 'smtpmail-smtp-server server)
         (customize-save-variable 'smtpmail-smtp-service port)
         (delete-process stream)))
@@ -618,8 +627,6 @@ The list is in preference order.")
                            (and mail-specify-envelope-from
                                 (mail-envelope-from))
                            user-mail-address))
-        (coding-system-for-read 'binary)
-        (coding-system-for-write 'binary)
         response-code
         process-buffer
         result
@@ -638,21 +645,23 @@ The list is in preference order.")
             (erase-buffer))
 
           ;; open the connection to the server
-          (setq result
-                (open-network-stream
-                 "smtpmail" process-buffer host port
-                 :type smtpmail-stream-type
-                 :return-list t
-                 :capability-command (format "EHLO %s\r\n" (smtpmail-fqdn))
-                 :end-of-command "^[0-9]+ .*\r\n"
-                 :success "^2.*\n"
-                 :always-query-capabilities t
-                 :starttls-function
-                 (lambda (capabilities)
-                   (and (string-match "-STARTTLS" capabilities)
-                        "STARTTLS\r\n"))
-                 :client-certificate t
-                 :use-starttls-if-possible t))
+          (let ((coding-system-for-read 'binary)
+                (coding-system-for-write 'binary))
+            (setq result
+                  (open-network-stream
+                   "smtpmail" process-buffer host port
+                   :type smtpmail-stream-type
+                   :return-list t
+                   :capability-command (format "EHLO %s\r\n" (smtpmail-fqdn))
+                   :end-of-command "^[0-9]+ .*\r\n"
+                   :success "^2.*\n"
+                   :always-query-capabilities t
+                   :starttls-function
+                   (lambda (capabilities)
+                     (and (string-match "-STARTTLS" capabilities)
+                          "STARTTLS\r\n"))
+                   :client-certificate t
+                   :use-starttls-if-possible t)))
 
           ;; If we couldn't access the server at all, we give up.
           (unless (setq process (car result))
@@ -669,7 +678,7 @@ The list is in preference order.")
               (throw 'done (format "No greeting: %s" greeting)))
             (when (>= code 400)
               (throw 'done (format "Connection not allowed: %s" greeting))))
-          
+
           (with-current-buffer process-buffer
             (set-buffer-process-coding-system 'raw-text-unix 'raw-text-unix)
             (make-local-variable 'smtpmail-read-point)
@@ -722,7 +731,7 @@ The list is in preference order.")
 
             (when (member 'xusr supported-extensions)
               (smtpmail-command-or-throw process (format "XUSR")))
-            
+
             ;; MAIL FROM:<sender>
             (let ((size-part
                    (if (or (member 'size supported-extensions)
@@ -761,7 +770,7 @@ The list is in preference order.")
                 )
                ((and auth-mechanisms
                      (not ask-for-password)
-                     (= (car result) 530))
+                     (eq (car result) 530))
                 ;; We got a "530 auth required", so we close and try
                 ;; again, this time asking the user for a password.
                 (smtpmail-send-command process "QUIT")
@@ -788,6 +797,7 @@ The list is in preference order.")
                   nil)
                  ((and auth-mechanisms
                        (not ask-for-password)
+                       (integerp (car result))
                        (>= (car result) 550)
                        (<= (car result) 554))
                   ;; We got a "550 relay not permitted" (or the like),
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index d62b377954d..820b1599abb 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1076,12 +1076,15 @@ It also eliminates runs of equal strings."
            (column 0)
            (rows (/ (length strings) columns))
            (row 0)
+           (first t)
            (laststring nil))
       ;; The insertion should be "sensible" no matter what choices were made
       ;; for the parameters above.
       (dolist (str strings)
         (unless (equal laststring str) ; Remove (consecutive) duplicates.
           (setq laststring str)
+          ;; FIXME: `string-width' doesn't pay attention to
+          ;; `display' properties.
           (let ((length (if (consp str)
                             (+ (string-width (car str))
                                (string-width (cadr str)))
@@ -1100,11 +1103,11 @@ It also eliminates runs of equal strings."
                     (forward-line 1)
                     (end-of-line)))
                 (insert " \t")
-                (set-text-properties (- (point) 1) (point)
+                (set-text-properties (1- (point)) (point)
                                      `(display (space :align-to ,column)))))
              (t
               ;; Horizontal format
-              (unless (bolp)
+              (unless first
                 (if (< wwidth (+ (max colwidth length) column))
                     ;; No space for `str' at point, move to next line.
                     (progn (insert "\n") (setq column 0))
@@ -1112,12 +1115,13 @@ It also eliminates runs of equal strings."
                   ;; Leave the space unpropertized so that in the case we're
                   ;; already past the goal column, there is still
                   ;; a space displayed.
-                  (set-text-properties (- (point) 1) (point)
+                  (set-text-properties (1- (point)) (point)
                                        ;; We can't just set tab-width, because
                                        ;; completion-setup-function will kill
                                        ;; all local variables :-(
                                        `(display (space :align-to ,column)))
                   nil))))
+            (setq first nil)
             (if (not (consp str))
                 (put-text-property (point) (progn (insert str) (point))
                                    'mouse-face 'highlight)
@@ -2299,7 +2303,7 @@ the commands start with a \"-\" or a SPC."
 (defun completion-pcm--string->pattern (string &optional point)
   "Split STRING into a pattern.
 A pattern is a list where each element is either a string
-or a symbol chosen among `any', `star', `point', `prefix'."
+or a symbol, see `completion-pcm--merge-completions'."
   (if (and point (< point (length string)))
       (let ((prefix (substring string 0 point))
             (suffix (substring string point)))
@@ -2515,7 +2519,19 @@ filter out additional entries (because TABLE migth not obey PRED)."
     (mapcar 'completion--sreverse strs))))
 
 (defun completion-pcm--merge-completions (strs pattern)
-  "Extract the commonality in STRS, with the help of PATTERN."
+  "Extract the commonality in STRS, with the help of PATTERN.
+PATTERN can contain strings and symbols chosen among `star', `any', `point',
+and `prefix'.  They all match anything (aka \".*\") but are merged differently:
+`any' only grows from the left (when matching \"a1b\" and \"a2b\" it gets
+  completed to just \"a\").
+`prefix' only grows from the right (when matching \"a1b\" and \"a2b\" it gets
+  completed to just \"b\").
+`star' grows from both ends and is reified into a \"*\"  (when matching \"a1b\"
+  and \"a2b\" it gets completed to \"a*b\").
+`point' is like `star' except that it gets reified as the position of point
+  instead of being reified as a \"*\" character.
+The underlying idea is that we should return a string which still matches
+the same set of elements."
   ;; When completing while ignoring case, we want to try and avoid
   ;; completing "fo" to "foO" when completing against "FOO" (bug#4219).
   ;; So we try and make sure that the string we return is all made up
@@ -2568,7 +2584,9 @@ filter out additional entries (because TABLE migth not obey PRED)."
               (let* ((prefix (try-completion fixed comps))
                      (unique (or (and (eq prefix t) (setq prefix fixed))
                                  (eq t (try-completion prefix comps)))))
-                (unless (equal prefix "") (push prefix res))
+                (unless (or (eq elem 'prefix)
+                            (equal prefix ""))
+                  (push prefix res))
                 ;; If there's only one completion, `elem' is not useful
                 ;; any more: it can only match the empty string.
                 ;; FIXME: in some cases, it may be necessary to turn an
@@ -2754,15 +2772,12 @@ See `completing-read' for the meaning of the arguments."
                      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)))
+                   (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.
+                    base-keymap)))
          (result (read-from-minibuffer prompt initial-input keymap
                                        nil hist def inherit-input-method)))
     (when (and (equal result "") def)
diff --git a/lisp/mpc.el b/lisp/mpc.el
index 5319ea43898..932fb5926fd 100644
--- a/lisp/mpc.el
+++ b/lisp/mpc.el
@@ -246,11 +246,12 @@ and HOST defaults to localhost."
             (process-put proc 'ready t)
             (unless (eq (match-end 0) (point-max))
               (error "Unexpected trailing text"))
-            (let ((error (match-string 1)))
+            (let ((error-text (match-string 1)))
               (delete-region (point) (point-max))
               (let ((callback (process-get proc 'callback)))
                 (process-put proc 'callback nil)
-                (if error (signal 'mpc-proc-error error))
+                (if error-text
+                    (process-put proc 'mpc-proc-error error-text))
                 (funcall callback)))))))))
 
 (defun mpc--proc-connect (host)
@@ -314,19 +315,23 @@ and HOST defaults to localhost."
            mpc-proc)
       (setq mpc-proc (mpc--proc-connect mpc-host))))
 
+(defun mpc-proc-check (proc)
+  (let ((error-text (process-get proc 'mpc-proc-error)))
+    (when error-text
+      (process-put proc 'mpc-proc-error nil)
+      (signal 'mpc-proc-error error-text))))
+
 (defun mpc-proc-sync (&optional proc)
   "Wait for MPC process until it is idle again.
 Return the buffer in which the process is/was running."
   (unless proc (setq proc (mpc-proc)))
   (unwind-protect
-      (condition-case err
-          (progn
-            (while (and (not (process-get proc 'ready))
-                        (accept-process-output proc)))
-            (if (process-get proc 'ready) (process-buffer proc)
-              ;; (delete-process proc)
-              (error "No response from MPD")))
-        (error (message "MPC: %s" err) (signal (car err) (cdr err))))
+      (progn
+        (while (and (not (process-get proc 'ready))
+                    (accept-process-output proc)))
+        (mpc-proc-check proc)
+        (if (process-get proc 'ready) (process-buffer proc)
+          (error "No response from MPD")))
     (unless (process-get proc 'ready)
       ;; (debug)
       (message "Killing hung process")
@@ -358,13 +363,13 @@ which will be concatenated with proper quoting before passing them to MPD."
                       "\n")))
       (if callback
           ;; (let ((buf (current-buffer)))
-            (process-put proc 'callback
-                         callback
-                         ;; (lambda ()
-                         ;;   (funcall callback
-                         ;;            (prog1 (current-buffer)
-                         ;;              (set-buffer buf)))))
-                         )
+          (process-put proc 'callback
+                       callback
+                       ;; (lambda ()
+                       ;;   (funcall callback
+                       ;;            (prog1 (current-buffer)
+                       ;;              (set-buffer buf)))))
+                       )
         ;; If `callback' is nil, we're executing synchronously.
         (process-put proc 'callback 'ignore)
         ;; This returns the process's buffer.
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index e18b42a275f..f9bc13e1e25 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -1103,26 +1103,32 @@ URL in a new window."
   (interactive (browse-url-interactive-arg "URL: "))
   (setq url (browse-url-encode-url url))
   (let* ((process-environment (browse-url-process-environment))
+         (use-remote
+          (not (memq system-type '(windows-nt ms-dos))))
          (process
           (apply 'start-process
                  (concat "firefox " url) nil
                  browse-url-firefox-program
                  (append
                   browse-url-firefox-arguments
-                  (if (memq system-type '(windows-nt ms-dos))
-                      (list url)
-                    (list "-remote"
-                          (concat "openURL("
-                                  url
-                                  (if (browse-url-maybe-new-window
-                                       new-window)
-                                      (if browse-url-firefox-new-window-is-tab
-                                          ",new-tab"
-                                        ",new-window"))
-                                  ")")))))))
-    (set-process-sentinel process
-                          `(lambda (process change)
-                             (browse-url-firefox-sentinel process ,url)))))
+                  (if use-remote
+                      (list "-remote"
+                            (concat
+                             "openURL("
+                             url
+                             (if (browse-url-maybe-new-window new-window)
+                                 (if browse-url-firefox-new-window-is-tab
+                                     ",new-tab"
+                                   ",new-window"))
+                             ")"))
+                    (list url))))))
+    ;; If we use -remote, the process exits with status code 2 if
+    ;; Firefox is not already running.  The sentinel runs firefox
+    ;; directly if that happens.
+    (when use-remote
+      (set-process-sentinel process
+                            `(lambda (process change)
+                               (browse-url-firefox-sentinel process ,url))))))
 
 (defun browse-url-firefox-sentinel (process url)
   "Handle a change to the process communicating with Firefox."
diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el
index bb09d8945c9..0c3d0285f91 100644
--- a/lisp/net/network-stream.el
+++ b/lisp/net/network-stream.el
@@ -230,20 +230,20 @@ functionality.
                (or builtin-starttls
                    (and (or require-tls
                             (plist-get parameters :use-starttls-if-possible))
-                        (executable-find "gnutls-cli")))
+                        (starttls-available-p)))
                (not (eq (plist-get parameters :type) 'plain)))
       ;; If using external STARTTLS, drop this connection and start
       ;; anew with `starttls-open-stream'.
       (unless builtin-starttls
         (delete-process stream)
         (setq start (with-current-buffer buffer (point-max)))
-        (let* ((starttls-use-gnutls t)
-               (starttls-extra-arguments
+        (let* ((starttls-extra-arguments
                 (if require-tls
                     starttls-extra-arguments
                   ;; For opportunistic TLS upgrades, we don't really
                   ;; care about the identity of the peer.
                   (cons "--insecure" starttls-extra-arguments)))
+               (starttls-extra-args starttls-extra-args)
                (cert (network-stream-certificate host service parameters)))
           ;; There are client certificates requested, so add them to
           ;; the command line.
@@ -251,7 +251,11 @@ functionality.
             (setq starttls-extra-arguments
                   (nconc (list "--x509keyfile" (expand-file-name (nth 0 cert))
                                "--x509certfile" (expand-file-name (nth 1 cert)))
-                         starttls-extra-arguments)))
+                         starttls-extra-arguments)
+                  starttls-extra-args
+                  (nconc (list "--key-file" (expand-file-name (nth 0 cert))
+                               "--cert-file" (expand-file-name (nth 1 cert)))
+                         starttls-extra-args)))
           (setq stream (starttls-open-stream name buffer host service)))
         (network-stream-get-response stream start eoc)
         ;; Requery capabilities for protocols that require it; i.e.,
diff --git a/lisp/net/quickurl.el b/lisp/net/quickurl.el
index c3da1707165..712f0b0c924 100644
--- a/lisp/net/quickurl.el
+++ b/lisp/net/quickurl.el
@@ -1,4 +1,4 @@
-;;; quickurl.el --- insert an URL based on text at point in buffer
+;;; quickurl.el --- insert a URL based on text at point in buffer
 
 ;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
@@ -24,7 +24,7 @@
 
 ;;; Commentary:
 ;;
-;; This package provides a simple method of inserting an URL based on the
+;; This package provides a simple method of inserting a URL based on the
 ;; text at point in the current buffer. This is part of an on-going effort
 ;; to increase the information I provide people while reducing the ammount
 ;; of typing I need to do. No-doubt there are undiscovered Emacs packages
@@ -90,7 +90,7 @@
 ;; Customize options.
 
 (defgroup quickurl nil
-  "Insert an URL based on text at point in buffer."
+  "Insert a URL based on text at point in buffer."
   :version "21.1"
   :group  'abbrev
   :prefix "quickurl-")
@@ -194,14 +194,14 @@ in your ~/.emacs (after loading/requiring quickurl).")
 (defvar quickurl-list-last-buffer nil
   "`current-buffer' when `quickurl-list' was called.")
 
-;; Functions for working with an URL entry.
+;; Functions for working with a URL entry.
 
 (defun quickurl-url-commented-p (url)
   "Does the URL have a comment?"
   (listp (cdr url)))
 
 (defun quickurl-make-url (keyword url &optional comment)
-  "Create an URL from KEYWORD, URL and (optionaly) COMMENT."
+  "Create a URL from KEYWORD, URL and (optionaly) COMMENT."
   (if (and comment (not (zerop (length comment))))
       (list keyword url comment)
     (cons keyword url)))
@@ -230,7 +230,7 @@ Note that this function is a setfable place."
     (setf (cdr ,url) ,store)))
 
 (defun quickurl-url-comment (url)
-  "Get the comment from an URL.
+  "Get the comment from a URL.
 
 If the URL has no comment an empty string is returned. Also note that this
 function is a setfable place."
@@ -304,7 +304,7 @@ Also display a `message' saying what the URL was unless SILENT is non-nil."
 
 ;;;###autoload
 (defun* quickurl (&optional lookup)
-  "Insert an URL based on LOOKUP.
+  "Insert a URL based on LOOKUP.
 
 If not supplied LOOKUP is taken to be the word at point in the current
 buffer, this default action can be modifed via
@@ -323,7 +323,7 @@ buffer, this default action can be modifed via
 
 ;;;###autoload
 (defun quickurl-ask (lookup)
-  "Insert an URL, with `completing-read' prompt, based on LOOKUP."
+  "Insert a URL, with `completing-read' prompt, based on LOOKUP."
   (interactive
    (list
     (progn
@@ -335,7 +335,7 @@ buffer, this default action can be modifed via
       (quickurl-insert url))))
 
 (defun quickurl-grab-url ()
-  "Attempt to grab a word/url pair from point in the current buffer.
+  "Attempt to grab a word/URL pair from point in the current buffer.
 
 Point should be somewhere on the URL and the word is taken to be the thing
 that is returned from calling `quickurl-grab-lookup-function' once a
@@ -369,7 +369,7 @@ It is assumed that the URL is either \"unguarded\" or is wrapped inside an
 (defun quickurl-add-url (word url comment)
   "Allow the user to interactively add a new URL associated with WORD.
 
-See `quickurl-grab-url' for details on how the default word/url combination
+See `quickurl-grab-url' for details on how the default word/URL combination
 is decided."
   (interactive (let ((word-url (quickurl-grab-url)))
                  (list (read-string "Word: "    (quickurl-url-keyword word-url))
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 9e04abb8cd5..06bbfb0b78c 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -815,18 +815,19 @@ If SILENT is non-nil, do not print the message in any irc buffer."
 
 (defvar rcirc-input-ring nil)
 (defvar rcirc-input-ring-index 0)
+
 (defun rcirc-prev-input-string (arg)
   (ring-ref rcirc-input-ring (+ rcirc-input-ring-index arg)))
 
-(defun rcirc-insert-prev-input (arg)
-  (interactive "p")
+(defun rcirc-insert-prev-input ()
+  (interactive)
   (when (<= rcirc-prompt-end-marker (point))
     (delete-region rcirc-prompt-end-marker (point-max))
     (insert (rcirc-prev-input-string 0))
     (setq rcirc-input-ring-index (1+ rcirc-input-ring-index))))
 
-(defun rcirc-insert-next-input (arg)
-  (interactive "p")
+(defun rcirc-insert-next-input ()
+  (interactive)
   (when (<= rcirc-prompt-end-marker (point))
     (delete-region rcirc-prompt-end-marker (point-max))
     (setq rcirc-input-ring-index (1- rcirc-input-ring-index))
@@ -1555,18 +1556,16 @@ record activity."
 
           ;; keep window on bottom line if it was already there
           (when rcirc-scroll-show-maximum-output
-            (walk-windows (lambda (w)
-                            (when (eq (window-buffer w) (current-buffer))
-                              (with-current-buffer (window-buffer w)
-                                (when (eq major-mode 'rcirc-mode)
-                                  (with-selected-window w
-                                    (when (<= (- (window-height)
-                                                 (count-screen-lines (window-point)
-                                                                     (window-start))
-                                                 1)
-                                              0)
-                                      (recenter -1)))))))
-                                  nil t))
+            (let ((window (get-buffer-window)))
+              (when window
+                (with-selected-window window
+                  (when (eq major-mode 'rcirc-mode)
+                    (when (<= (- (window-height)
+                                 (count-screen-lines (window-point)
+                                                     (window-start))
+                                 1)
+                              0)
+                      (recenter -1)))))))
 
           ;; flush undo (can we do something smarter here?)
           (buffer-disable-undo)
@@ -2514,6 +2513,7 @@ the only argument."
                 (member message
                         (list
                          (format "You are now identified for \C-b%s\C-b." rcirc-nick)
+                         (format "You are successfully identified as \C-b%s\C-b." rcirc-nick)
                          "Password accepted - you are now recognized."
                          )))
                (and ;; quakenet
@@ -2695,7 +2695,8 @@ the only argument."
       (setq rcirc-topic (caddr args)))))
 
 (defun rcirc-handler-333 (process sender args text)
-  "Not in rfc1459.txt"
+  "333 says who set the topic and when.
+Not in rfc1459.txt"
   (let ((buffer (or (rcirc-get-buffer process (cadr args))
                     (rcirc-get-temp-buffer-create process (cadr args)))))
     (with-current-buffer buffer
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 5c497748943..428bd6422d8 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -3640,11 +3640,11 @@ file exists and nonzero exit status otherwise."
       (when extra-args (setq shell (concat shell " " extra-args)))
       (tramp-send-command
        vec (format "exec env ENV='' PROMPT_COMMAND='' PS1=%s PS2='' PS3='' %s"
-                   (shell-quote-argument tramp-end-of-output) shell)
+                   (tramp-shell-quote-argument tramp-end-of-output) shell)
        t))
     ;; Setting prompts.
     (tramp-send-command
-     vec (format "PS1=%s" (shell-quote-argument tramp-end-of-output)) t)
+     vec (format "PS1=%s" (tramp-shell-quote-argument tramp-end-of-output)) t)
     (tramp-send-command vec "PS2=''" t)
     (tramp-send-command vec "PS3=''" t)
     (tramp-send-command vec "PROMPT_COMMAND=''" t)))
@@ -3736,7 +3736,7 @@ process to set up.  VEC specifies the connection."
 
   (tramp-message vec 5 "Setting shell prompt")
   (tramp-send-command
-   vec (format "PS1=%s" (shell-quote-argument tramp-end-of-output)) t)
+   vec (format "PS1=%s" (tramp-shell-quote-argument tramp-end-of-output)) t)
   (tramp-send-command vec "PS2=''" t)
   (tramp-send-command vec "PS3=''" t)
   (tramp-send-command vec "PROMPT_COMMAND=''" t)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 9b11ef58eab..274bc72391b 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -861,19 +861,9 @@ updated after changing this variable.
 Also see `tramp-file-name-structure'.")
 
 ;;;###autoload
-(defconst tramp-root-regexp
-  (if (memq system-type '(cygwin windows-nt))
-      "\\`\\([a-zA-Z]:\\)?/"
-    "\\`/")
-  "Beginning of an incomplete Tramp file name.
-Usually, it is just \"\\\\`/\".  On W32 systems, there might be a
-volume letter, which will be removed by `tramp-drop-volume-letter'.")
-
-;;;###autoload
 (defconst tramp-completion-file-name-regexp-unified
   (if (memq system-type '(cygwin windows-nt))
-      (concat tramp-root-regexp "[^/]\\{2,\\}\\'")
-    (concat tramp-root-regexp "[^/]*\\'"))
+      "\\`/[^/]\\{2,\\}\\'" "\\`/[^/]*\\'")
   "Value for `tramp-completion-file-name-regexp' for unified remoting.
 GNU Emacs uses a unified filename syntax for Tramp and Ange-FTP.
 See `tramp-file-name-structure' for more explanations.
@@ -882,14 +872,14 @@ On W32 systems, the volume letter must be ignored.")
 
 ;;;###autoload
 (defconst tramp-completion-file-name-regexp-separate
-  (concat tramp-root-regexp "\\([[][^]]*\\)?\\'")
+  "\\`/\\([[][^]]*\\)?\\'"
   "Value for `tramp-completion-file-name-regexp' for separate remoting.
 XEmacs uses a separate filename syntax for Tramp and EFS.
 See `tramp-file-name-structure' for more explanations.")
 
 ;;;###autoload
 (defconst tramp-completion-file-name-regexp-url
-  (concat tramp-root-regexp "[^/:]+\\(:\\(/\\(/[^/]*\\)?\\)?\\)?\\'")
+  "\\`/[^/:]+\\(:\\(/\\(/[^/]*\\)?\\)?\\)?\\'"
   "Value for `tramp-completion-file-name-regexp' for URL-like remoting.
 See `tramp-file-name-structure' for more explanations.")
 
@@ -1494,20 +1484,20 @@ progress reporter."
 (tramp-compat-font-lock-add-keywords
  'emacs-lisp-mode '("\\<tramp-with-progress-reporter\\>"))
 
-(eval-and-compile                       ;; Silence compiler.
+(defalias 'tramp-drop-volume-letter
   (if (memq system-type '(cygwin windows-nt))
-      (defun tramp-drop-volume-letter (name)
+      (lambda (name)
         "Cut off unnecessary drive letter from file NAME.
 The functions `tramp-*-handle-expand-file-name' call `expand-file-name'
 locally on a remote file name.  When the local system is a W32 system
 but the remote system is Unix, this introduces a superfluous drive
 letter into the file name.  This function removes it."
         (save-match-data
-          (if (string-match tramp-root-regexp name)
+          (if (string-match "\\`[a-zA-Z]:/" name)
               (replace-match "/" nil t name)
             name)))
 
-    (defalias 'tramp-drop-volume-letter 'identity)))
+    'identity))
 
 ;;; Config Manipulation Functions:
 
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 7b4c6fd75b1..5492441ac77 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -31,7 +31,7 @@
 ;; should be changed only there.
 
 ;;;###tramp-autoload
-(defconst tramp-version "2.2.2-pre"
+(defconst tramp-version "2.2.3-pre"
   "This version of Tramp.")
 
 ;;;###tramp-autoload
@@ -44,7 +44,7 @@
                       (= emacs-major-version 21)
                       (>= emacs-minor-version 4)))
              "ok"
-           (format "Tramp 2.2.2-pre is not fit for %s"
+           (format "Tramp 2.2.3-pre is not fit for %s"
                    (when (string-match "^.*$" (emacs-version))
                      (match-string 0 (emacs-version)))))))
   (unless (string-match "\\`ok\\'" x) (error "%s" x)))
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 0822f313ac4..d63929d794e 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,44 @@
+2011-09-02  Chong Yidong  <cyd@stupidchicken.com>
+
+        * org-compat.el (org-pop-to-buffer-same-window): Deleted.
+
+        * ob-ref.el (org-babel-ref-goto-headline-id):
+        * org.el (org-get-location, org-tree-to-indirect-buffer)
+        (org-mark-ring-goto, org-refile, org-add-log-note)
+        (org-revert-all-org-buffers, org-switchb)
+        (org-cycle-agenda-files, org-submit-bug-report)
+        (org-goto-marker-or-bmk):
+        * org-agenda.el (org-prepare-agenda, org-agenda-switch-to):
+        * org-capture.el (org-capture-goto-target)
+        (org-capture-fill-template):
+        * org-clock.el (org-clock-goto):
+        * org-ctags.el (org-ctags-visit-buffer-or-file):
+        * org-exp.el (org-export-as-org):
+        * org-feed.el (org-feed-show-raw-feed):
+        * org-html.el (org-export-htmlize-generate-css):
+        * org-id.el (org-id-goto):
+        * org-irc.el (org-irc-visit-erc):
+        * org-mobile.el (org-mobile-apply):
+        * org-publish.el (org-publish-org-to, org-publish-find-date):
+        * org-remember.el (org-go-to-remember-target):
+        * org-src.el (org-src-switch-to-buffer)
+        (org-edit-fixed-width-region): Use switch-to-buffer.
+
+2011-08-31  Martin Rudalics  <rudalics@gmx.at>
+
+        * org-compat.el (org-pop-to-buffer-same-window): Remove LABEL
+        argument from pop-to-buffer-same-window call.
+
+2011-07-30  Carsten Dominik  <carsten.dominik@gmail.com>
+
+        * ob.el (org-babel-src-block-regexp): If a code block has a body,
+        its last character must be a newline.
+
+2011-07-28  Bastien Guerry  <bzg@gnu.org>
+
+        * org-pcomplete.el: New file.  Rename from org-complete.el.
+        * org-complete.el: Delete file.
+
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
         * org-publish.el (org-publish-index-generate-theindex): rename
@@ -21,15 +62,14 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-publish.el (org-publish-find-title): bugfix: kill buffers
+        * org-publish.el (org-publish-find-title): Bugfix: kill buffers
         unless they were already visited.
         (org-sitemap-sort-files, org-sitemap-sort-folders)
         (org-sitemap-ignore-case, org-sitemap-requested)
-        (org-sitemap-date-format, org-sitemap-file-entry-format): use
+        (org-sitemap-date-format, org-sitemap-file-entry-format): Use
         a correct prefix.
         (org-publish-projects): Make sure to delete .orgx files.
-        (org-publish-index-generate-theindex.inc): Small docstring
-        fix.
+        (org-publish-index-generate-theindex.inc): Small docstring fix.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -42,15 +82,15 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el: search blank lines down to the end of the item
+        * org-list.el: Search blank lines down to the end of the item
         instead of stopping at the item, in order to possibly match such
         lines within the item.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-latex.el (org-export-latex-href-format): docstring fix to
+        * org-latex.el (org-export-latex-href-format): Docstring fix to
         reflect the fact that you can use only one "%s".
-        (org-export-latex-links): allow `org-export-latex-href-format' to
+        (org-export-latex-links): Allow `org-export-latex-href-format' to
         have only one "%s".
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
@@ -63,7 +103,7 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-capture.el (org-capture-templates): docstring fix.
+        * org-capture.el (org-capture-templates): Docstring fix.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -71,7 +111,7 @@
         code blocks.
 
         * ob-keys.el (org-babel-key-bindings): Key bindings for
-        org-babel-view-src-block-info.
+        `org-babel-view-src-block-info'.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -88,7 +128,7 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-footnote.el (org-footnote-create-definition): when skipping
+        * org-footnote.el (org-footnote-create-definition): When skipping
         already written footnotes definition, the algorithme would assume
         each one was only one-line long.
 
@@ -96,22 +136,22 @@
 
         * org-table.el (org-table-eval-formula): Fix bug when a formula
         "range" is just one cell.
-        (org-table-time-string-to-seconds): don't check whether
-        we manipulate a string.
+        (org-table-time-string-to-seconds): Don't check whether we
+        manipulate a string.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org-exp.el (org-export-mark-list-end)
-        (org-export-mark-list-properties): don't remove the ending regexp
+        (org-export-mark-list-properties): Don't remove the ending regexp
         when it consists in blank lines.
 
-        * org-list.el (org-list-parse-list): ditto, but remove it
+        * org-list.el (org-list-parse-list): Ditto, but remove it
         completely when it isn't made of blank lines (i.e. during export
         process).
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-table.el (org-table-time-string-to-seconds): match either
+        * org-table.el (org-table-time-string-to-seconds): Match either
         HH:MM:SS or HH:MM (instead of MM:SS).
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
@@ -127,12 +167,12 @@
         variables as of Org version 7.7 as you can already export the
         timestamp from the preamble or the postamble.
         (org-export-html-before-content-div): Delete variable.
-        (org-export-html-content-div): obsolete variable as of 7.7.
+        (org-export-html-content-div): Obsolete variable as of 7.7.
         (org-export-html-divs): New variable to define divs used in
         HTML export.
         (org-export-as-html): Now the preamble and the postamble are
-        surrounded by a <div ...>.  The name of the div is defined
-        through `org-export-html-divs'.
+        surrounded by a <div ...>.  The name of the div is defined through
+        `org-export-html-divs'.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -141,22 +181,21 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-macs.el (org-with-limited-levels): some functions, like
+        * org-macs.el (org-with-limited-levels): Some functions, like
         `org-back-to-heading', being deeply based on outline-mode, still
         refer to `outline-regexp' instead of `org-outline-regexp'.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org.el (org-refile-get-targets): new optional argument
+        * org.el (org-refile-get-targets): New optional argument
         `excluded-entries' to exclude entries from the targets.
         (org-refile-get-location): From an org-mode buffer, exclude
         current heading and subheadings from the list of targets when
-        org-refile-use-cache is nil.
+        `org-refile-use-cache' is nil.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-imenu-get-tree): note to self: headlines start at
-        bol.
+        * org.el (org-imenu-get-tree): Headlines start at bol.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -164,37 +203,38 @@
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
-        * ob.el (org-babel-sha1-hash): Only call copy-seq on proper lists.
+        * ob.el (org-babel-sha1-hash): Only call `copy-seq' on proper
+        lists.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-kill-is-subtree-p): matched string needs to start at
+        * org.el (org-kill-is-subtree-p): Matched string needs to start at
         bol.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org.el (org-paste-subtree, org-kill-is-subtree-p)
-        (org-yank-folding-would-swallow-text, org-yank-generic): use
+        (org-yank-folding-would-swallow-text, org-yank-generic): Use
         `org-with-limited-levels' macro.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-macs.el (org-with-limited-levels): also modify, when
+        * org-macs.el (org-with-limited-levels): Also modify, when
         appropriate, `org-outline-regexp-at-bol'.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-timestamp-change): some locales don't use the same
-        length for date abbreviations. Set a marker at origin in case
+        * org.el (org-timestamp-change): Some locales don't use the same
+        length for date abbreviations.  Set a marker at origin in case
         length of new timestamp is different.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-imenu-get-tree): browse only true headlines.
+        * org.el (org-imenu-get-tree): Browse only true headlines.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-archive.el (org-archive-subtree): while it might be possible
+        * org-archive.el (org-archive-subtree): While it might be possible
         to archive an headline of a temporary buffer (i.e. not visiting a
         file), it wouldn't be really sensical.
 
@@ -202,13 +242,13 @@
 
         * org-archive.el (org-extract-archive-file)
         (org-extract-archive-heading, org-archive-subtree):
-        buffer-file-name is nil in an indirect buffer.  Thus, use
-        (buffer-file-name (buffer-base-buffer)), which will, in any case,
-        return the file-name.
+        `buffer-file-name' is nil in an indirect buffer.  Thus, use
+        `(buffer-file-name (buffer-base-buffer))', which will, in any
+        case, return the file name.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-capture.el (org-capture): if dired isn't loaded,
+        * org-capture.el (org-capture): If dired isn't loaded,
         `dired-buffers' isn't defined, and %F will fail.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
@@ -222,19 +262,19 @@
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
-        * ob.el (org-babel-execute-src-block): Replaced call to defunct
+        * ob.el (org-babel-execute-src-block): Replace call to defunct
         function `org-babel-result-hash'.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-footnote.el (org-footnote-in-valid-context-p): avoid cited
-        lines and headers in message-mode.
-        (org-footnote-at-reference-p): remove check for cited lines, this
+        * org-footnote.el (org-footnote-in-valid-context-p): Avoid cited
+        lines and headers in `message-mode'.
+        (org-footnote-at-reference-p): Remove check for cited lines, this
         is now handled by the previous function.  Refactor.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-capture.el (org-capture): if no file is associated to
+        * org-capture.el (org-capture): If no file is associated to
         current buffer, check dired buffer and try to retreive a possibly
         directory associated.
 
@@ -248,16 +288,16 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org.el (org-refile-get-location): exclude current heading from
+        * org.el (org-refile-get-location): Exclude current heading from
         the refile table.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-footnote.el (org-footnote-at-reference-p): test if match is
+        * org-footnote.el (org-footnote-at-reference-p): Test if match is
         in cited text, when replying to a message.
-        (org-footnote-new): do not create a new footnote at bol, as it might
-        be seen as a definition.
-        (org-footnote-at-definition-p): ignore definitions in forbidden
+        (org-footnote-new): Do not create a new footnote at bol, as it
+        might be seen as a definition.
+        (org-footnote-at-definition-p): Ignore definitions in forbidden
         blocks, as it is already the case for references.
 
 2011-07-28  Matt Lundin  <mdl@imapmail.org>
@@ -273,11 +313,11 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-insert-item): actualize code comments.
-        (org-insert-item): for consistency, point cannot be moved at
-        a surprising place when the user is being asked to choose a new
-        description term to insert in the list. Point should stay where the
-        user called the command.
+        * org-list.el (org-list-insert-item): Actualize code comments.
+        (org-insert-item): For consistency, point cannot be moved at a
+        surprising place when the user is being asked to choose a new
+        description term to insert in the list.  Point should stay where
+        the user called the command.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -308,20 +348,20 @@
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org.el (org-update-parent-todo-statistics): COOKIE_DATA should
-        be checked for parent, not current headline. Also, this function
+        be checked for parent, not current headline.  Also, this function
         doesn't need to be interactive.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org-list.el (org-list-send-item, org-list-struct-apply-struct)
-        (org-apply-on-list, org-toggle-checkbox): make markers point
+        (org-apply-on-list, org-toggle-checkbox): Make markers point
         nowhere when they have become useless.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-insert-item): when insertion point is in
+        * org-list.el (org-list-insert-item): When insertion point is in
         some white line after the end of the list, remove all unnecessary
-        white lines there before proceeding. Also refactor a snippet of
+        white lines there before proceeding.  Also refactor a snippet of
         code.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
@@ -331,15 +371,15 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-fontify-meta-lines-and-blocks-1): blocks cannot be
+        * org.el (org-fontify-meta-lines-and-blocks-1): Blocks cannot be
         correctly fontified when the buffer is missing a final newline.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
         * ob.el (org-babel-strip-protective-commas): Return `nil' instead
         of an error if no argument is given.
-        (org-babel-parse-src-block-match): Make sure body is defined
-        in the let construct.
+        (org-babel-parse-src-block-match): Make sure body is defined in
+        the let construct.
 
 2011-07-28  Jon Anders Skorpen  <jonas@ifi.uio.no>  (tiny change)
 
@@ -348,13 +388,13 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-footnote.el (org-footnote-normalize): footnote section
+        * org-footnote.el (org-footnote-normalize): Footnote section
         should be inserted only if there are footnotes to insert.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org-footnote.el (org-footnote-at-definition-p)
-        (org-footnote-normalize): do not grab signature in the definition
+        (org-footnote-normalize): Do not grab signature in the definition
         of the last footnote.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
@@ -366,55 +406,55 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-exp.el (org-export-preprocess-string): add the possibility
-        to call recursively the function. Also change order of some
-        function calls. Comment export process for footnotes.
+        * org-exp.el (org-export-preprocess-string): Add the possibility
+        to call recursively the function.  Also change order of some
+        function calls.  Comment export process for footnotes.
 
-        * org-footnote.el (org-footnote-normalize): change the export
-        specific parameter to hold properties of export. Thus, the
+        * org-footnote.el (org-footnote-normalize): Change the export
+        specific parameter to hold properties of export.  Thus, the
         function can send every footnote definition in the buffer through
         `org-export-process-string'.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-latex.el (org-export-latex-preprocess): first insert
+        * org-latex.el (org-export-latex-preprocess): First insert
         footnotes in the temporary buffer so their contents can properly
         be protected from further transformations if required.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-indent-offset): new variable.
-        (org-list-struct-fix-ind): make use of the new variable.
+        * org-list.el (org-list-indent-offset): New variable.
+        (org-list-struct-fix-ind): Make use of the new variable.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-latex.el (org-export-latex-list-parameters): complete
+        * org-latex.el (org-export-latex-list-parameters): Complete
         default value with cbtrans option.
 
-        * org-list.el (org-list-to-latex): set a more consistent default
+        * org-list.el (org-list-to-latex): Set a more consistent default
         value.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-swap-items): move it to a meaningful
+        * org-list.el (org-list-swap-items): Move it to a meaningful
         position in source code (i.e. before any function using it), and
         rename it to an easier name.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-separating-blank-lines-number): if there
+        * org-list.el (org-list-separating-blank-lines-number): If there
         are blank lines already in the whole list, add a blank line.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-use-circular-move): new variable.
-        (org-previous-item, org-next-item): make use of the new variable.
-        (org-move-item-down, org-move-item-up): make use of the new
-        variable. Simplify code.
+        * org-list.el (org-list-use-circular-move): New variable.
+        (org-previous-item, org-next-item): Make use of the new variable.
+        (org-move-item-down, org-move-item-up): Make use of the new
+        variable.  Simplify code.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-delete-item, org-list-send-item): new
+        * org-list.el (org-list-delete-item, org-list-send-item): New
         functions.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
@@ -430,7 +470,7 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-capture.el (org-capture-finalize): bugfix about inserted
+        * org-capture.el (org-capture-finalize): Bugfix about inserted
         blank line when killing the capture buffer and
         `org-blank-before-new-entry' tells to not insert anything before a
         heading.
@@ -449,8 +489,8 @@
 
         * org.el (org-last-set-property): New variable.
         (org-read-property-name): Use the new variable: the prompt
-        defaults to the last property set, unless there is a property
-        in the line at point.
+        defaults to the last property set, unless there is a property in
+        the line at point.
 
 2011-07-28  David Maus  <dmaus@ictsoc.de>
 
@@ -495,15 +535,15 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-plain-list-ordered-item-terminator): remove
+        * org-list.el (org-plain-list-ordered-item-terminator): Remove
         incorrect assumption.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-footnote.el (org-footnote-forbidden-blocks): add missing
+        * org-footnote.el (org-footnote-forbidden-blocks): Add missing
         exporter specific blocks.
 
-        * org-list.el (org-list-forbidden-blocks): ditto.
+        * org-list.el (org-list-forbidden-blocks): Ditto.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -517,7 +557,7 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org.el (org-timestamp-up, org-timestamp-down): mention time
+        * org.el (org-timestamp-up, org-timestamp-down): Mention time
         changes in the docstring.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
@@ -528,15 +568,15 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-in-valid-context-p): use `org-in-block-p'.
+        * org-list.el (org-list-in-valid-context-p): Use `org-in-block-p'.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org.el (org-in-block-p): new function.
 
-        * org-footnote.el (org-footnote-forbidden-blocks): new variable.
-        (org-footnote-in-valid-context-p): new function.
-        (org-footnote-at-reference-p): use new function. Allow inline
+        * org-footnote.el (org-footnote-forbidden-blocks): New variable.
+        (org-footnote-in-valid-context-p): New function.
+        (org-footnote-at-reference-p): Use new function.  Allow inline
         footnotes to start at bol.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
@@ -546,7 +586,7 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-ascii.el (org-export-as-utf8): fix call to
+        * org-ascii.el (org-export-as-utf8): Fix call to
         `org-called-interactively-p': it requires an argument.  Also fix
         the docstring.
 
@@ -565,13 +605,13 @@
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
         * org-publish.el
-        (org-publish-cache-file-needs-publishing): only check against .org
+        (org-publish-cache-file-needs-publishing): Only check against .org
         files.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org.el (org-mode): Use org-default as
-        the default face in org-mode.
+        * org.el (org-mode): Use `org-default' as the default face in
+        org-mode.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -582,30 +622,23 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-exp.el (org-export-preprocess-string): if the last subtree
-        is a task, footnotes may be removed along with the subtree. This
+        * org-exp.el (org-export-preprocess-string): If the last subtree
+        is a task, footnotes may be removed along with the subtree.  This
         patch ensures footnotes are put at the end of the buffer after the
         subtree has been removed.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-footnote.el (org-footnote-at-reference-p): verify that what
+        * org-footnote.el (org-footnote-at-reference-p): Verify that what
         looks like a footnote doesn't belong to a link.
-        (org-footnote-next-reference-or-definition): check more strictly
+        (org-footnote-next-reference-or-definition): Check more strictly
         footnote definitions.
 
-2011-07-28  Deech  <deech@deech-ThinkPad-X200.(none)>
+2011-07-28  Deech  <deech@deech-ThinkPad-X200.(none)>  (tiny change)
 
         * ob-tangle.el (org-babel-tangle): Ignore errors thrown by
         language modes.
 
-2011-07-28  Suvayu Ali  <fatkasuvayu+linux@gmail.com>
-
-        * Mention use of keywords like multicolumn and float
-
-        * Remove previous mention of hack with placement option as per
-        comments on the mailing list. The hack is better suited for Worg.
-
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
         * ob-python.el (org-babel-python-evaluate-session): Inhibit return
@@ -625,9 +658,8 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-table.el
-        (org-table-time-seconds-to-string): use `org-format-seconds'
-        instead of `format-seconds'.
+        * org-table.el (org-table-time-seconds-to-string): Use
+        `org-format-seconds' instead of `format-seconds'.
 
 2011-07-28  David Maus  <dmaus@ictsoc.de>
 
@@ -644,7 +676,7 @@
         * org-freemind.el (org-freemind-convert-links-helper)
         (org-freemind-convert-text-p, org-freemind-write-mm-buffer)
         (org-freemind-get-node-style): Use org-string-match-p for backward
-        compatibility with Emacs22.
+        compatibility with Emacs 22.
 
 2011-07-28  David Maus  <dmaus@ictsoc.de>
 
@@ -654,7 +686,7 @@
 2011-07-28  David Maus  <dmaus@ictsoc.de>
 
         * ob-haskell.el (org-babel-haskell-export-to-lhs): Call
-        kill-buffer with argument indiciating to kill current
+        `kill-buffer' with argument indiciating to kill current
         buffer. Emacs 22 compatibility.
 
 2011-07-28  David Maus  <dmaus@ictsoc.de>
@@ -664,13 +696,12 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org.el (org-add-planning-info): fix
-        issues with timestamps not being inserted at the same position.
+        * org.el (org-add-planning-info): Fix issues with timestamps not
+        being inserted at the same position.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-table.el
-        (org-table-time-string-to-seconds)
+        * org-table.el (org-table-time-string-to-seconds)
         (org-table-time-seconds-to-string): New functions.
         (org-table-eval-formula): Implement the "T" (time) flag for
         computing durations.
@@ -684,8 +715,8 @@
 
         * org.el (org-fontify-meta-lines-and-blocks-1): Include header
         lines.
-        (org-additional-option-like-keywords): Include data as a synonym for
-        results.
+        (org-additional-option-like-keywords): Include data as a synonym
+        for results.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -694,18 +725,18 @@
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
-        * ob-ref.el (org-babel-ref-goto-headline-id): Don't let org-id
+        * ob-ref.el (org-babel-ref-goto-headline-id): Don't let `org-id'
         rescan all IDs when trying to resolve a reference.
 
 2011-07-28  Julien Barnier  <julien@nozav.org>
 
         * org.el (org-fontify-meta-lines-and-blocks-1): Fix test for src
-        blocks lang attribute
+        blocks lang attribute.
 
 2011-07-28  Eric S Fraga  <e.fraga@ucl.ac.uk>
 
-        * Allow for a different markup for inactive time stamps on latex
-        export
+        * org-latex.el (org-export-latex-timestamp-inactive-markup): New
+        option to allow different markup for inactive timestamps.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -715,31 +746,31 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-full-item-re): allow counter and check-box
+        * org-list.el (org-list-full-item-re): Allow counter and check-box
         to be separated by white spaces.
-        (org-list-struct-apply-struct): reflect changes made to
+        (org-list-struct-apply-struct): Reflect changes made to
         `org-list-full-item-re'.
 
-        * org-html.el (org-html-export-list-line): recognize spaces
+        * org-html.el (org-html-export-list-line): Recognize spaces
         between counter and check-boxes as valid.
 
-        * org-docbook.el (org-export-docbook-list-line): ditto.
+        * org-docbook.el (org-export-docbook-list-line): Ditto.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-insert-item): make sure point is moved to
+        * org-list.el (org-list-insert-item): Make sure point is moved to
         the specified POS before starting the function.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-activate-footnote-links): properly fontify inline
+        * org.el (org-activate-footnote-links): Properly fontify inline
         footnotes.
-        (org-set-font-lock-defaults): apply changes to previous function.
+        (org-set-font-lock-defaults): Apply changes to previous function.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-footnote.el (org-footnote-at-reference-p): first check if
-        point is at the beginning of a footnote. Indeed `org-in-regexp'
+        * org-footnote.el (org-footnote-at-reference-p): First check if
+        point is at the beginning of a footnote.  Indeed `org-in-regexp'
         first checks backwards and might find an incorrect footnote if
         they are side-by-side.
 
@@ -748,7 +779,7 @@
         * org-agenda.el (org-agenda-compact-blocks): Improve docstring.
         (org-agenda-block-separator): Add nil to docstring and customization.
         (org-prepare-agenda): Skip agenda block separator additionally if
-        org-agenda-block-separator is nil.
+        `org-agenda-block-separator' is nil.
         (org-agenda-overriding-header): Improve docstring.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
@@ -773,65 +804,65 @@
 2011-07-28  Michael Markert  <markert.michael@googlemail.com>
 
         * ob.el (org-babel-sha1-hash): Adding optional argument KIND to
-        all org-called-interactively-p function invocations.
+        all `org-called-interactively-p' function invocations.
 
         * org-agenda.el (org-agenda-redo): Adding optional argument KIND
-        to all org-called-interactively-p function invocations.
+        to all `org-called-interactively-p' function invocations.
         (org-agenda-show-1): Adding optional argument KIND to all
-        org-called-interactively-p function invocations.
+        `org-called-interactively-p' function invocations.
         (org-agenda-set-tags): Adding optional argument KIND to all
-        org-called-interactively-p function invocations.
+        `org-called-interactively-p' function invocations.
 
         * org-ascii.el (org-export-as-latin1): Adding optional argument
-        KIND to all org-called-interactively-p function invocations.
+        KIND to all `org-called-interactively-p' function invocations.
         (org-export-as-latin1-to-buffer): Adding optional argument KIND to
-        all org-called-interactively-p function invocations.
+        all `org-called-interactively-p' function invocations.
         (org-export-as-utf8-to-buffer): Adding optional argument KIND to all
-        org-called-interactively-p function invocations.
+        `org-called-interactively-p' function invocations.
         (org-export-region-as-ascii): Adding optional argument KIND to all
-        org-called-interactively-p function invocations.
+        `org-called-interactively-p' function invocations.
 
         * org-docbook.el (org-export-region-as-docbook): Adding optional
-        argument KIND to all org-called-interactively-p function
+        argument KIND to all `org-called-interactively-p' function
         invocations.
 
         * org-html.el (org-export-region-as-html): Adding optional
-        argument KIND to all org-called-interactively-p function
+        argument KIND to all `org-called-interactively-p' function
         invocations.
 
         * org-latex.el (org-export-region-as-latex): Adding optional
-        argument KIND to all org-called-interactively-p function
+        argument KIND to all `org-called-interactively-p' function
         invocations.
 
         * org-table.el (org-table-blank-field): Adding optional argument
-        KIND to all org-called-interactively-p function invocations.
+        KIND to all `org-called-interactively-p' function invocations.
         (org-table-current-column): Adding optional argument KIND to all
-        org-called-interactively-p function invocations.
+        `org-called-interactively-p' function invocations.
         (org-table-current-dline): Adding optional argument KIND to all
-        org-called-interactively-p function invocations.
+        `org-called-interactively-p' function invocations.
         (org-table-sort-lines): Adding optional argument KIND to all
-        org-called-interactively-p function invocations.
+        `org-called-interactively-p' function invocations.
         (org-table-sum): Adding optional argument KIND to all
-        org-called-interactively-p function invocations.
+        `org-called-interactively-p' function invocations.
         (org-table-rotate-recalc-marks): Adding optional argument KIND to
-        all org-called-interactively-p function invocations.
+        all `org-called-interactively-p' function invocations.
         (org-table-eval-formula): Adding optional argument KIND to all
-        org-called-interactively-p function invocations.
+        `org-called-interactively-p' function invocations.
         (orgtbl-send-table): Adding optional argument KIND to all
-        org-called-interactively-p function invocations.
+        `org-called-interactively-p' function invocations.
 
         * org.el (org-mode): Adding optional argument KIND to all
-        org-called-interactively-p function invocations.
+        `org-called-interactively-p' function invocations.
         (org-copy-subtree): Adding optional argument KIND to all
-        org-called-interactively-p function invocations.
+        `org-called-interactively-p' function invocations.
         (org-paste-subtree): Adding optional argument KIND to all
-        org-called-interactively-p function invocations.
+        `org-called-interactively-p' function invocations.
         (org-store-link): Adding optional argument KIND to all
-        org-called-interactively-p function invocations.
+        `org-called-interactively-p' function invocations.
         (org-todo): Adding optional argument KIND to all
-        org-called-interactively-p function invocations.
+        `org-called-interactively-p' function invocations.
         (org-occur): Adding optional argument KIND to all
-        org-called-interactively-p function invocations.
+        `org-called-interactively-p' function invocations.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
@@ -900,7 +931,7 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-exp (org-export-preprocess-string): normalize footnotes
+        * org-exp.el (org-export-preprocess-string): normalize footnotes
         before marking lists ending.
 
         * org-latex.el (org-export-latex-preprocess): work with labels as
@@ -1047,21 +1078,21 @@
 
 2011-07-28  Achim Gratz  <stromeko@nexgo.de>
 
-        * org.el (defcustom org-log-into-drawer): correct typo
+        * org.el (org-log-into-drawer): Correct typo.
 
         * org-clock.el (org-clock-into-drawer): New function to change the
         location of clock events based on properties CLOCK_INTO_DRAWER or,
         as fallback, LOG_INTO_DRAWER, like it is already possible for
         state change logs.
 
-        * org-clock.el (org-clock-jump-to-current-clock): add statement to
-        let clause to bind org-clock-into-drawer to result of function
-        eval
+        * org-clock.el (org-clock-jump-to-current-clock): Add statement to
+        let clause to bind `org-clock-into-drawer' to result of function
+        eval.
 
-        * org-clock.el (org-clock-find-position): add statement to let
-        clause to bind org-clock-into-drawer to result of function eval,
+        * org-clock.el (org-clock-find-position): Add statement to let
+        clause to bind `org-clock-into-drawer' to result of function eval,
         change let to let* since the binding is used later in the same
-        clause
+        clause.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -1168,7 +1199,7 @@
 2011-07-28  Jambunathan K  <kjambunathan@gmail.com>
 
         * org-exp.el (org-export-format-source-code-or-example):
-        Simplify. Also add `org-native-text' as a text property to the
+        Simplify.  Also add `org-native-text' as a text property to the
         formatted text and throw error for unknown backends.
 
 2011-07-28  Jambunathan K  <kjambunathan@gmail.com>
@@ -1182,16 +1213,15 @@
         * org-exp.el (org-export-backends): New variable.
         (org-export-select-backend-specific-text): Use above
         variable. Also mark text between #+BACKEND and
-        #+BEGIN_BACKEND...#+END_BACKEND with org-native-text
-        property. This text property is currently used only by the new
-        line-oriented generic exporter (which is not yet part of the
-        repo).
+        #+BEGIN_BACKEND...#+END_BACKEND with org-native-text property.
+        This text property is currently used only by the new line-oriented
+        generic exporter (which is not yet part of the repo).
 
 2011-07-28  Jambunathan K  <kjambunathan@gmail.com>
 
         * org-exp.el (org-export): Reserve keys 'o' and 'O' for
-        OpenDocumentText export and bind them to org-export-as-odt and
-        org-export-as-odt-and-open.
+        OpenDocumentText export and bind them to `org-export-as-odt' and
+        `org-export-as-odt-and-open'.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -1205,29 +1235,29 @@
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
-        * ob-C.el (ob-tangle): initialize variable from ob-tangle.
+        * ob-C.el (ob-tangle): initialize variable from `ob-tangle'.
 
-        * ob-asymptote.el (ob-tangle): initialize variable from ob-tangle.
+        * ob-asymptote.el (ob-tangle): initialize variable from `ob-tangle'.
 
-        * ob-awk.el (ob-tangle): initialize variable from ob-tangle.
+        * ob-awk.el (ob-tangle): initialize variable from `ob-tangle'.
 
-        * ob-clojure.el (ob-tangle): initialize variable from ob-tangle.
+        * ob-clojure.el (ob-tangle): initialize variable from `ob-tangle'.
 
-        * ob-haskell.el (ob-tangle): initialize variable from ob-tangle.
+        * ob-haskell.el (ob-tangle): initialize variable from `ob-tangle'.
 
-        * ob-latex.el (ob-tangle): initialize variable from ob-tangle.
+        * ob-latex.el (ob-tangle): initialize variable from `ob-tangle'.
 
-        * ob-lisp.el (ob-tangle): initialize variable from ob-tangle.
+        * ob-lisp.el (ob-tangle): initialize variable from `ob-tangle'.
 
-        * ob-ocaml.el (ob-tangle): initialize variable from ob-tangle.
+        * ob-ocaml.el (ob-tangle): initialize variable from `ob-tangle'.
 
-        * ob-perl.el (ob-tangle): initialize variable from ob-tangle.
+        * ob-perl.el (ob-tangle): initialize variable from `ob-tangle'.
 
-        * ob-python.el (ob-tangle): initialize variable from ob-tangle.
+        * ob-python.el (ob-tangle): initialize variable from `ob-tangle'.
 
-        * ob-ruby.el (ob-tangle): initialize variable from ob-tangle.
+        * ob-ruby.el (ob-tangle): initialize variable from `ob-tangle'.
 
-        * ob-tangle.el (ob-tangle): initialize variable from ob-tangle.
+        * ob-tangle.el (ob-tangle): initialize variable from `ob-tangle'.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -1307,9 +1337,8 @@
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>  (tiny change)
 
-        * org.el (org-find-dblock):
-        (org-clocktable-try-shift): Make regexp work also when #+begin
-        line is indentex.
+        * org.el (org-find-dblock, org-clocktable-try-shift): Make regexp
+        work also when #+begin line is indentex.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -1395,28 +1424,33 @@
         `interactive-p'.
         (org-export-as-utf8-to-buffer): Replacing call to now-defunct function
         `interactive-p'.
-        (org-export-region-as-ascii): Replacing call to now-defunct function
-        `interactive-p'.Replacing call to now-defunct function `interactive-p'.
+        (org-export-region-as-ascii): Replacing call to now-defunct
+        function `interactive-p'.Replacing call to now-defunct function
+        `interactive-p'.
 
         * org-docbook.el: Replacing call to now-defunct function
         `interactive-p'.
-        (org-export-region-as-docbook): Replacing call to now-defunct function
-        `interactive-p'.Replacing call to now-defunct function `interactive-p'.
+        (org-export-region-as-docbook): Replacing call to now-defunct
+        function `interactive-p'.Replacing call to now-defunct function
+        `interactive-p'.
 
         * org-html.el: Replacing call to now-defunct function
         `interactive-p'.
-        (org-export-region-as-html): Replacing call to now-defunct function
-        `interactive-p'.Replacing call to now-defunct function `interactive-p'.
+        (org-export-region-as-html): Replacing call to now-defunct
+        function `interactive-p'.Replacing call to now-defunct function
+        `interactive-p'.
 
         * org-latex.el: Replacing call to now-defunct function
         `interactive-p'.
-        (org-export-region-as-latex): Replacing call to now-defunct function
-        `interactive-p'.Replacing call to now-defunct function `interactive-p'.
+        (org-export-region-as-latex): Replacing call to now-defunct
+        function `interactive-p'.Replacing call to now-defunct function
+        `interactive-p'.
 
         * org-macs.el: Replacing call to now-defunct function
         `interactive-p'.
-        (org-called-interactively-p): Replacing call to now-defunct function
-        `interactive-p'.Replacing call to now-defunct function `interactive-p'.
+        (org-called-interactively-p): Replacing call to now-defunct
+        function `interactive-p'.Replacing call to now-defunct function
+        `interactive-p'.
 
         * org-table.el: Replacing call to now-defunct function
         `interactive-p'.
@@ -1439,7 +1473,8 @@
         (orgtbl-send-table): Replacing call to now-defunct function `interactive-p'.
 
         * org.el: Replacing call to now-defunct function `interactive-p'.
-        (org-mode): Replacing call to now-defunct function `interactive-p'.
+        (org-mode): Replacing call to now-defunct function
+        `interactive-p'.
         (org-copy-subtree): Replacing call to now-defunct function
         `interactive-p'.
         (org-paste-subtree): Replacing call to now-defunct function
@@ -1473,8 +1508,8 @@
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
-        * org-html.el (org-export-as-html):
-        (org-html-level-start): Only convert section number underscores to dashes.
+        * org-html.el (org-export-as-html, org-html-level-start): Only
+        convert section number underscores to dashes.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -1524,8 +1559,8 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>  (tiny change)
 
-        * org-list.el (org-list-to-latex): the enumerate environment in
-        latex increments the counter before using it. Therefore, org-mode
+        * org-list.el (org-list-to-latex): The enumerate environment in
+        latex increments the counter before using it.  Therefore, org-mode
         should set the enumeration counter to the desired value minus one.
 
 2011-07-28  Michael Brand  <michael.ch.brand@gmail.com>  (tiny change)
@@ -1535,17 +1570,17 @@
 
 2011-07-28  Christian Egli  <christian.egli@sbszh.ch>
 
-        * org-taskjuggler.el (org-taskjuggler-clean-effort): handle any
+        * org-taskjuggler.el (org-taskjuggler-clean-effort): Handle any
         effort that is accepted by `org-duration-string-to-minutes´.
 
 2011-07-28  Julien Barnier  <julien@nozav.org>
 
-        * ob-sh.el (org-babel-sh-evaluate) : when sending input to comint,
-        wait until previous line execution is finished
+        * ob-sh.el (org-babel-sh-evaluate): When sending input to comint,
+        wait until previous line execution is finished.
 
-        * ob-comint.el (org-babel-comint-with-output) : when looking for
+        * ob-comint.el (org-babel-comint-with-output): When looking for
         end-of-evaluation indicator, search forward for the indicator
-        before searching forward for the prompt
+        before searching forward for the prompt.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -1553,11 +1588,11 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-auto-align-tags): change docstring.
-        (org-update-parent-todo-statistics): keep tags aligned even when
+        * org.el (org-auto-align-tags): Change docstring.
+        (org-update-parent-todo-statistics): Keep tags aligned even when
         statistics cookies are shifting them.
 
-        * org-list.el (org-update-checkbox-count): keep tags aligned even
+        * org-list.el (org-update-checkbox-count): Keep tags aligned even
         when statistics cookies are shifting them.
 
 2011-07-28  Lawrence Mitchell  <wence@gmx.li>
@@ -1568,7 +1603,7 @@
 2011-07-28  Lawrence Mitchell  <wence@gmx.li>
 
         * ob.el (org-babel-result-regexp): Use non-shy group around
-        org-babel-data-names.
+        `org-babel-data-names'.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -1593,7 +1628,7 @@
         * ob-lisp.el (org-babel-execute:lisp): No real functional change,
         just aesthetic.
 
-2011-07-28  Sébastien Delafond  <sdelafond@gmail.com>
+2011-07-28  Sébastien Delafond  <sdelafond@gmail.com>  (tiny change)
 
         * org.el (org-mode-flyspell-verify): This is useful when using
         flyspell with a non-English dictionary, or if some of your
@@ -1605,7 +1640,7 @@
         `org-activate-mark'.
 
         * org-compat.el (org-activate-mark): New function. Provide
-        `activate-mark' if not present (e.g. Emacs22).
+        `activate-mark' if not present (e.g. Emacs 22).
 
 2011-07-28  David Maus  <dmaus@ictsoc.de>
 
@@ -1637,7 +1672,7 @@
         * org.el (org-self-insert-command): Use `delete-char' instead of
         `delete-backward-char'.
 
-        * org-table.el (orgtbl-self-insert-command): Dto.
+        * org-table.el (orgtbl-self-insert-command): Ditto.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -1650,7 +1685,7 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-latex.el (org-export-latex-preprocess): add
+        * org-latex.el (org-export-latex-preprocess): Add
         `original-indentation' property to footnotes so they cannot
         possibly end a list by being less indented than the item they
         belong to.
@@ -1680,33 +1715,33 @@
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org.el (org-self-insert-command): Catch the case of
-        buffer-undo-list eq t.
+        `buffer-undo-list' eq t.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-toggle-heading): region should be considered as made
+        * org.el (org-toggle-heading): Region should be considered as made
         of full lines, without the last one if region-end is at bol.
-        Removed unused variables. Refactored and commented code.
+        Removed unused variables.  Refactored and commented code.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-toggle-item): when region includes an headline less
+        * org.el (org-toggle-item): When region includes an headline less
         indented than first one, set it as the new reference.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-to-subtree): if the list is before first
+        * org-list.el (org-list-to-subtree): If the list is before first
         heading and `org-odd-levels-only' is non-nil, the first item gets
         two stars instead of one.
 
-        * org.el (org-reduced-level): a level of 0 was reduced to 1 with
+        * org.el (org-reduced-level): A level of 0 was reduced to 1 with
         `org-odd-levels-only' non-nil.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-toggle-item): converting an heading to an item would
+        * org.el (org-toggle-item): Converting an heading to an item would
         sometimes insert unnecessary spaces before it, and unwanted space
-        with `org-indent-mode' on. Changing some text into an item
+        with `org-indent-mode' on.  Changing some text into an item
         wouldn't always preserve indentation.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
@@ -1714,21 +1749,21 @@
         * org-capture.el (org-capture-current-plist): Improve docstring.
         (org-capture-put): Add docstring.
         (org-capture-get): Add docstring.
-        (org-capture-member): Add LOCAL argument. Add docstring.
-        (org-capture-set-target-location): Store the time received from a date
-        prompt into the :prompt-time property.
+        (org-capture-member): Add LOCAL argument.  Add docstring.
+        (org-capture-set-target-location): Store the time received from a
+        date prompt into the :prompt-time property.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-exp.el (org-export-mark-list-properties): even if context is
+        * org-exp.el (org-export-mark-list-properties): Even if context is
         invalid, mark list item with `list-context' property.
 
-        * org-list.el (org-list-forbidden-blocks): add exporters specific
+        * org-list.el (org-list-forbidden-blocks): Add exporters specific
         blocks to the list of forbidden blocks.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-sort-list): function tries to intern
+        * org-list.el (org-sort-list): Function tries to intern
         getkey-func before it is defined, so it's always nil.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
@@ -1747,7 +1782,7 @@
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
-        * ob-sh.el (ob-ref): Uses ob-ref to resolve the value of the
+        * ob-sh.el (ob-ref): Uses `ob-ref' to resolve the value of the
         :stdin header argument.
         (org-babel-execute:sh): Use the :stdin header argument.
         (org-babel-sh-var-to-sh): Split the bulk of this function off into a
@@ -1824,11 +1859,11 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-separating-blank-lines-number): fix
-        confusion between point and item beginning. Now, if no information
-        is avalaible, truly follow user preference when it inserts blank
-        lines manually.
-        (org-list-insert-item): send correct argument to the preceding
+        * org-list.el (org-list-separating-blank-lines-number): Fix
+        confusion between point and item beginning.  Now, if no
+        information is avalaible, truly follow user preference when it
+        inserts blank lines manually.
+        (org-list-insert-item): Send correct argument to the preceding
         function.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
@@ -1836,13 +1871,13 @@
         * ob.el (org-babel-src-block-regexp): Keep the now-mandatory
         newline inside of the code block body.
 
-2011-07-28  Sean O'Halpin  <sean.ohalpin@gmail.com>
+2011-07-28  Sean O'Halpin  <sean.ohalpin@gmail.com>  (tiny change)
 
         * ob.el: Avoid spurious matches to literal.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-indent-line-function): don't include #+include
+        * org.el (org-indent-line-function): Don't include #+include
         lines.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
@@ -1851,7 +1886,8 @@
         org-babel-check-src-block.
 
         * ob.el (org-babel-expand-src-block): Fit within 80 cols.
-        (org-babel-edit-distance): Returns the edit distance of two strings.
+        (org-babel-edit-distance): Returns the edit distance of two
+        strings.
         (org-babel-check-src-block): Check a code block for errors.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>  (tiny change)
@@ -1863,9 +1899,9 @@
 
         * org-table.el
         (org-table-exit-follow-field-mode-when-leaving-table): New option.
-        (org-table-check-inside-data-field): New optional argument `noerror'.
-        When set, the function will only return nil instead of throwing an
-        error.
+        (org-table-check-inside-data-field): New optional argument
+        `noerror'.  When set, the function will only return nil instead of
+        throwing an error.
         (org-table-edit-field): Interpret double prefix argument, and improve
         the properties of the editing window.
         (org-table-follow-field-mode): New minor mode.
@@ -1881,12 +1917,12 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-full-item-re): allow description term to
+        * org-list.el (org-list-full-item-re): Allow description term to
         have a newline character after the colons.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-sort-list): no longer ignore with-case
+        * org-list.el (org-sort-list): No longer ignore with-case
         argument: the function sorted case-sensitively, regardless of
         argument.
 
@@ -1903,7 +1939,7 @@
         * org.el (org-special-properties): Add CLOCKSUM to the special
         properties.
 
-2011-07-28  Robert P. Goldman  <rpgoldman@real-time.com>
+2011-07-28  Robert P. Goldman  <rpgoldman@real-time.com>  (tiny change)
 
         * ob-exp.el (org-babel-exp-in-export-file): Bind
         `org-link-search-inhibit-query' to t to inhibit prompts.
@@ -1924,19 +1960,19 @@
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org-latex.el (org-export-latex-preprocess): Pipe index entries
-        through org-export-latex-fontify-headline.
+        through `org-export-latex-fontify-headline'.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org-exp.el (org-export-add-options-to-plist): Fix the option
-        parser
+        parser.
 
-2011-07-28  Robert P. Goldman  <rpgoldman@real-time.com>
+2011-07-28  Robert P. Goldman  <rpgoldman@real-time.com>  (tiny change)
 
         * org-latex.el (org-export-latex-preprocess): Replace index
         entries.
 
-2011-07-28  Robert P. Goldman  <rpgoldman@real-time.com>
+2011-07-28  Robert P. Goldman  <rpgoldman@real-time.com>  (tiny change)
 
         * org.el (org-structure-template-alist): Add an easy template for
         index (i), and move include file to I from i.
@@ -1944,7 +1980,7 @@
 2011-07-28  Matt Lundin  <mdl@imapmail.org>
 
         * org-agenda.el (org-agenda-open-link): Pass entire text of agenda
-        line to org-offer-links-in-entry.
+        line to `org-offer-links-in-entry'.
 
 2011-07-28  Michael Markert  <markert.michael@googlemail.com>
 
@@ -1960,8 +1996,8 @@
         existing headline.
         (org-bibtex-export-arbitrary-fields)
         (org-bibtex-treat-headline-as-title): Fix typos
-        (org-bibtex-fleshout): Don't upcase optional field; remove ":" from
-        type completion.
+        (org-bibtex-fleshout): Don't upcase optional field; remove ":"
+        from type completion.
 
 2011-07-28  Matt Lundin  <mdl@imapmail.org>
 
@@ -1974,11 +2010,11 @@
 
 2011-07-28  Tom Dye  <tsd@tsdye.com>
 
-        * org-bibtex.el: Added crossref field to other fields
+        * org-bibtex.el: Added crossref field to other fields.
 
 2011-07-28  Tom Dye  <tsd@tsdye.com>
 
-        * org-bibtex.el: Add crossref option to incollection
+        * org-bibtex.el: Add crossref option to incollection.
 
 2011-07-28  Matt Lundin  <mdl@imapmail.org>
 
@@ -1992,15 +2028,16 @@
 
 2011-07-28  Matt Lundin  <mdl@imapmail.org>
 
-        * org-bibtex.el (org-bibtex-tags): New variable
-        (org-bibtex-tags-are-keywords): New variable
-        (org-bibtex-no-export-tags): New variable
-        (org-bibtex-headline): Export tags as comma-separated bibtex keywords
-        (org-bibtex-read): Import bibtex keywords field as tags
+        * org-bibtex.el (org-bibtex-tags): New variable.
+        (org-bibtex-tags-are-keywords): New variable.
+        (org-bibtex-no-export-tags): New variable.
+        (org-bibtex-headline): Export tags as comma-separated bibtex
+        keywords.
+        (org-bibtex-read): Import bibtex keywords field as tags.
 
 2011-07-28  Manuel Giraud  <manuel.giraud@univ-nantes.fr>
 
-        * org-publish.el (org-publish-find-date): optimization
+        * org-publish.el (org-publish-find-date): Optimization.
 
 2011-07-28  Tassilo Horn  <tassilo@member.fsf.org>
 
@@ -2011,12 +2048,13 @@
 
         * org-publish.el (org-publish-project-alist): Document new
         :sitemap-sans-extension property.
-        (org-publish-org-sitemap): Use new sitemap-sans-extension setting.
+        (org-publish-org-sitemap): Use new `sitemap-sans-extension'
+        setting.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org.el (org-remove-uninherited-tags): Renamed from
-        org-remove-iniherited-tags.
+        `org-remove-iniherited-tags'.
         (org-scan-tags): Fix typo in function call.
         (org-get-tags-at): Fix typo in function call.
 
@@ -2066,8 +2104,9 @@
 
         * org-bibtex.el (org-bibtex-export-arbitrary-fields): New option.
         (org-bibtex-key-property): New option.
-        (org-bibtex-put): Make use of new `org-bibtex-key-property' variable.
-        (org-bibtex-headline):  Make use of new
+        (org-bibtex-put): Make use of new `org-bibtex-key-property'
+        variable.
+        (org-bibtex-headline): Make use of new
         `org-bibtex-export-arbitrary-fields' and `org-bibtex-key-property'
         variables.
         (org-bibtex-autokey):  Make use of new `org-bibtex-key-property'
@@ -2130,20 +2169,20 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-exp.el (org-export-preprocess-string): mark list end before
-        expanding macros. Thus, a macro inside a list and containing blank
-        lines cannot break the list structure.
-        (org-export-preprocess-apply-macros): multi-lines macros get
-        indented with the same indentation as the first line. Thus, we are
-        sure that every line belongs to the same list as the first line, if
-        such list exists. Also add comments in code.
+        * org-exp.el (org-export-preprocess-string): Mark list end before
+        expanding macros.  Thus, a macro inside a list and containing
+        blank lines cannot break the list structure.
+        (org-export-preprocess-apply-macros): Multi-lines macros get
+        indented with the same indentation as the first line.  Thus, we
+        are sure that every line belongs to the same list as the first
+        line, if such list exists.  Also add comments in code.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org-agenda.el (org-agenda-clock-consistency-checks): New option.
         (org-agenda-list): Handle display change to clock check.
-        (org-agenda-get-progress): Show only clock entries if we are doing the
-        consistency check.
+        (org-agenda-get-progress): Show only clock entries if we are doing
+        the consistency check.
         (org-agenda-show-clocking-issues): New function.
         (org-agenda-check-clock-gap): New function.
         (org-agenda-view-mode-dispatch): Offer consistency check.
@@ -2155,7 +2194,7 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-struct): when walking down the list, the
+        * org-list.el (org-list-struct): When walking down the list, the
         function would not pay attention to drawers or blocks indentation.
         Thus, such constructs couldn't consistently end an item or a list.
         This patch ensures line indentation is stored (if applicable)
@@ -2164,7 +2203,7 @@
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org-exp.el (org-export): Add EXPORT_FILE_NAME to the enclosing
-        tree properties
+        tree properties.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -2175,36 +2214,35 @@
 
         * org-exp.el (org-export): Go to next heading before searching
         backward, so make this also work if we are on the headline of the
-        entry with the property...
+        entry with the property.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org.el (org-promote):
         (org-demote): Soften the previous change, by only removing the
-        flyspell function from after-change functions, because that was the
-        one causing the slowdown - at least much of it.
+        flyspell function from after-change functions, because that was
+        the one causing the slowdown - at least much of it.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
-        * org.el (org-promote):
-        (org-demote): Turn off after-change-functions to speed up the
-        reindentation of text.
+        * org.el (org-promote, org-demote): Turn off
+        after-change-functions to speed up the reindentation of text.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
-        * ob-ocaml.el (org-babel-ocaml-read-list): Using
+        * ob-ocaml.el (org-babel-ocaml-read-list): Use
         `org-babel-script-escape'.
-        (org-babel-ocaml-read-array): Using `org-babel-script-escape'.
+        (org-babel-ocaml-read-array): Use `org-babel-script-escape'.
 
 2011-07-28  Manuel Giraud  <manuel.giraud@univ-nantes.fr>
 
-        * org-html.el (org-html-handle-links): add an alternate for inline
+        * org-html.el (org-html-handle-links): Add an alternate for inline
         images
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org-agenda.el (org-agenda-bulk-action): Do not use the entries
-        variable before it is defined
+        variable before it is defined.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -2218,16 +2256,17 @@
 
 2011-07-28  Manuel Giraud  <manuel.giraud@univ-nantes.fr>
 
-        * org-html.el (org-html-make-link): correct a bug in coderef link.
+        * org-html.el (org-html-make-link): Correct a bug in coderef link.
 
 2011-07-28  Bernt Hansen  <bernt@norang.ca>
 
-        * org-agenda.el (org-agenda-filter-by-tag): Fix variable name typo
+        * org-agenda.el (org-agenda-filter-by-tag): Fix variable name
+        typo.
 
 2011-07-28  Bernt Hansen  <bernt@norang.ca>
 
         * org-agenda.el (org-agenda-get-timestamps): Fix agenda display
-        when headlines are missing
+        when headlines are missing.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -2260,30 +2299,24 @@
 
 2011-07-28  Julien Danjou  <julien@danjou.info>
 
-        * org.el (org-entry-get):
-        (org-entry-delete):
-        (org-entry-put):
-        (org-property-values):
-        (org-delete-property-globally): Use org-re-property.
-        (org-re-property): New function allowing to build a regexp to match a
-        property.
+        * org.el (org-entry-get, org-entry-delete, org-entry-put)
+        (org-property-values, org-delete-property-globally): Use
+        `org-re-property'.
+        (org-re-property): New function allowing to build a regexp to
+        match a property.
 
 2011-07-28  Julien Danjou  <julien@danjou.info>
 
         * org.el (org-property-values): Enhance docstring.
 
-2011-07-28  Ethan Ligon  <ligon@are.berkeley.edu>
+2011-07-28  Ethan Ligon  <ligon@are.berkeley.edu>  (tiny change)
 
-        * Illustration of bug in html export - This has a space after the
-        colons :: so will work in latex and html - This doesn't have a
-        space after the colons ::so is an invalid description item
-        according to the org manual.  Won't work in html or docbook.  Will
-        nevertheless work in latex, provided /first/ description item is
-        valid.  - Has a terminating space :: - So it works in both html
-        and latex export!  - Even though it's difficult to distinguish
-        from the next example.  - Lacks a terminating space :: - At
-        present, *doesn't* work in html or docbook export, does in latex.
-        This is the case that the following patch fixes.
+        * org-html.el (org-html-export-list-line): Fix regexp for
+        detecting description lists to allow "::" marker to be last
+        visible element at end of line.
+        * org-docbook.el (org-docbook-export-list-line): Fix regexp for
+        detecting description lists to allow "::" marker to be last
+        visible element at end of line.
 
 2011-07-28  Julien Danjou  <julien@danjou.info>
 
@@ -2292,9 +2325,9 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-in-valid-context-p): renamed from
-        org-list-in-valid-block-p.
-        (org-at-item-p,org-list-search-generic): use renamed function.
+        * org-list.el (org-list-in-valid-context-p): Renamed from
+        `org-list-in-valid-block-p'.
+        (org-at-item-p,org-list-search-generic): Use renamed function.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
@@ -2304,21 +2337,21 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-latex.el: pay attention to end of footnote.  Before closing
+        * org-latex.el: Pay attention to end of footnote.  Before closing
         the command, ensure that list is properly closed or that last link
         is separated from the curly brace.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-indent-line-function): footnote definition must stay
-        at column 0 to be recognized as such. Body below can have normal
+        * org.el (org-indent-line-function): Footnote definition must stay
+        at column 0 to be recognized as such.  Body below can have normal
         indentation, so it should ignore its definition when computing
         indentation.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-protocol.el (org-protocol-remember)
-        (org-protocol-capture): More appropriate message.
+        * org-protocol.el (org-protocol-remember, org-protocol-capture):
+        More appropriate message.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -2334,14 +2367,14 @@
 2011-07-28  Bernt Hansen  <bernt@norang.ca>
 
         * org-agenda.el: Remove obsolete code for adding todo list in
-        front of the agenda
+        front of the agenda.
 
 2011-07-28  Lawrence Mitchell  <wence@gmx.li>
 
         * org-latex.el (org-export-latex-convert-table.el-table): Fix
         format-string for insertion of captions.
 
-2011-07-28  Nick Dokos  <nicholas.dokos@hp.com>
+2011-07-28  Nick Dokos  <nicholas.dokos@hp.com>  (tiny change)
 
         * org-exp.el (org-export-remove-comment-blocks-and-subtrees): Fix
         regexp.
@@ -2358,7 +2391,7 @@
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
         * ob-lisp.el (org-babel-execute:lisp): Turn vectors into lists
-        before reading by elisp
+        before reading by elisp.
         (org-bable-lisp-vector-to-list): Stub of a vector->list function,
         should be replaced with a cl-vector->el-vector function.
 
@@ -2377,7 +2410,7 @@
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
-        * org-beamer.el (org-beamer-environments-extra): Fix docstring
+        * org-beamer.el (org-beamer-environments-extra): Fix docstring.
 
 2011-07-28  Lawrence Mitchell  <wence@gmx.li>
 
@@ -2386,7 +2419,7 @@
 
 2011-07-28  Lawrence Mitchell  <wence@gmx.li>
 
-        * org-html.el (org-export-as-html) (org-html-level-start): Fix
+        * org-html.el (org-export-as-html, org-html-level-start): Fix
         logic for section number printing when NUM is an integer.
 
 2011-07-28  Lawrence Mitchell  <wence@gmx.li>
@@ -2397,7 +2430,7 @@
 2011-07-28  Lawrence Mitchell  <wence@gmx.li>
 
         * org.el (org-point-at-end-of-empty-headline): Bind
-        case-fold-search to nil.
+        `case-fold-search' to nil.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -2414,10 +2447,10 @@
 
         * org.el (org-ts-regexp-both): Add "]" to class of characters that
         should not be matched.
-        (org-ts-regexp0):
-        (org-ts-regexp1): Do not start a class with "^]-+", because that tries
-        to (not) match characters between "]" and "+".  Instead, move the "-"
-        to the end of the class where it causes no harm.
+        (org-ts-regexp0, org-ts-regexp1): Do not start a class with
+        "^]-+", because that tries to (not) match characters between "]"
+        and "+".  Instead, move the "-" to the end of the class where it
+        causes no harm.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -2428,7 +2461,7 @@
 
         * ob-tangle.el (org-babel-tangle-collect-blocks): Brought the link
         extraction code into line with a newer version of the
-        org-store-link function.
+        `org-store-link' function.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -2440,8 +2473,8 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el: move org-update-checkbox-count-maybe call outside
-        of save-excursion to get back to original position.
+        * org-list.el: Move `org-update-checkbox-count-maybe' call outside
+        of ̀save-excursion' to get back to original position.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -2456,11 +2489,14 @@
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
-        * org-ascii.el (org-export-as-ascii):
+        * org-ascii.el (org-export-as-ascii): Pass the :done-tasks
+        property to the export preprocessor.
 
-        * org-docbook.el (org-export-as-docbook):
+        * org-docbook.el (org-export-as-docbook): Pass the :done-tasks
+        property to the export preprocessor.
 
-        * org-html.el (org-export-as-html):
+        * org-html.el (org-export-as-html): Pass the :done-tasks property
+        to the export preprocessor.
 
         * org-latex.el (org-export-as-latex): Pass the :done-tasks
         property to the export preprocessor.
@@ -2482,14 +2518,14 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-toggle-checkbox): build value of
+        * org-list.el (org-toggle-checkbox): Build value of
         org-keyword-time-regexp instead of using it directly, as it's
         buffer-local, and function might be called outside Org.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-struct,org-in-item-p): don't assume end of
-        blocks or drawers necessarily start somewhere. It it isn't the
+        * org-list.el (org-list-struct,org-in-item-p): Don't assume end of
+        blocks or drawers necessarily start somewhere.  It it isn't the
         case, treat them as normal text.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
@@ -2505,14 +2541,14 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-checkbox): when called from an headline,
+        * org-list.el (org-list-checkbox): When called from an headline,
         function would normally skip drawers, but not if a SCHEDULED or
-        DEADLINE keyword is standing before the drawer. Also avoid
+        DEADLINE keyword is standing before the drawer.  Also avoid
         problems if function is called in buffers not is Org mode.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-clock.el (org-clock-report): change the scope of the
+        * org-clock.el (org-clock-report): Change the scope of the
         inserted clock report depending on whether the point is within a
         subtree (:scope subtree) or not (:scope file).
 
@@ -2542,7 +2578,7 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-protocol.el (org-protocol-do-capture): allow template keys
+        * org-protocol.el (org-protocol-do-capture): Allow template keys
         of two characters.
         (org-protocol-default-template-key): Update the docstring to
         reflect the change in `org-protocol-do-capture'.
@@ -2583,21 +2619,21 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-in-item-p): re-build org-drawer-regexp,
+        * org-list.el (org-in-item-p): Re-build `org-drawer-regexp',
         whatever the major mode is.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-inlinetask.el (org-inlinetask-export-templates): fix default
+        * org-inlinetask.el (org-inlinetask-export-templates): Fix default
         templates.
-        (org-inlinetask-export-handler): Ensure contents of inline task, if
-        any, starts and ends with a newline character. Refactor and comment
-        code.
+        (org-inlinetask-export-handler): Ensure contents of inline task,
+        if any, starts and ends with a newline character.  Refactor and
+        comment code.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org-capture.el (org-datetree-find-date-create): Lower-case for
-        variable names in define-function form.
+        variable names in `define-function' form.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -2611,7 +2647,7 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-latex.el (org-export-latex-preprocess): last brace shouldn't
+        * org-latex.el (org-export-latex-preprocess): Last brace shouldn't
         be on the same line as a list end marker.
 
 2011-07-28  Julien Danjou  <julien@danjou.info>
@@ -2634,10 +2670,10 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-to-generic): set a default term for
-        ill-formed description lists. Do not insert newline characters
+        * org-list.el (org-list-to-generic): Set a default term for
+        ill-formed description lists.  Do not insert newline characters
         unless told to.
-        (org-list-to-texinfo,org-list-to-html): apply changes to
+        (org-list-to-texinfo,org-list-to-html): Apply changes to
         `org-list-parse-liste'.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
@@ -2662,16 +2698,16 @@
 
         * org-taskjuggler.el (org-taskjuggler-compute-task-leafiness):
         Compute the leafiness of a node.
-        (org-taskjuggler-open-task, org-export-as-taskjuggler): Mark a node as
-        a milestone if it is a leaf and has no effort.
+        (org-taskjuggler-open-task, org-export-as-taskjuggler): Mark a
+        node as a milestone if it is a leaf and has no effort.
 
 2011-07-28  Christian Egli  <christian.egli@alumni.ethz.ch>
 
         * org-taskjuggler.el (org-export-taskjuggler-target-version):
-        (org-taskjuggler-targeting-tj3-p): Add some minimal infrastructure to
-        handle export to both tj2 and tj3.
-        (org-taskjuggler-open-task): Use a different way to purge allocations
-        for tj2 and tj3.
+        (org-taskjuggler-targeting-tj3-p): Add some minimal infrastructure
+        to handle export to both tj2 and tj3.
+        (org-taskjuggler-open-task): Use a different way to purge
+        allocations for tj2 and tj3.
 
 2011-07-28  Matt Lundin  <mdl@imapmail.org>
 
@@ -2800,7 +2836,7 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-parse-list): fixed regexp.
+        * org-list.el (org-list-parse-list): Fixed regexp.
 
 2011-07-28  David Maus  <dmaus@ictsoc.de>
 
@@ -2833,8 +2869,8 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-fill-paragraph): fill-forward-paragraph function has
-        been introduced with emacs 23.1.
+        * org.el (org-fill-paragraph): `fill-forward-paragraph' function
+        has been introduced with emacs 23.1.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -2857,18 +2893,18 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-adaptive-fill-function): when a region is specified
+        * org.el (org-adaptive-fill-function): When a region is specified
         first line of paragraph isn't skipped, so fill-paragraph have to
         be computed even if point is at an item.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-in-valid-block-p): new function.
-        (org-at-item-p,org-list-search-generic): use new function.
+        * org-list.el (org-list-in-valid-block-p): New function.
+        (org-at-item-p,org-list-search-generic): Use new function.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-indent-line-function): text in both a list and a
+        * org.el (org-indent-line-function): Text in both a list and a
         valid block is indented with regards to current item, not to block
         boundaries.
 
@@ -2894,7 +2930,7 @@
         * org-html.el (org-export-as-html): Bugfix: don't insert closing
         HTML tags when exporting body only.
 
-2011-07-28  Jason Dunsmore  <emacs-orgmode@deathroller.dunsmor.com>
+2011-07-28  Jason Dunsmore  <emacs-orgmode@deathroller.dunsmor.com>  (tiny change)
 
         * org.el (org-back-over-empty-lines): Bugfix.  Honor
         `org-blank-before-new-entry' correctly in various contexts.
@@ -2906,7 +2942,7 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-timer.el (org-timer-item): save-excursion prevents
+        * org-timer.el (org-timer-item): `save-excursion' prevents
         `org-list-struct' to get the list structure when point isn't on
         the first line of the item.
 
@@ -2919,7 +2955,7 @@
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org-list.el (org-update-checkbox-count): Ensure cookies on an
-        heading are correctly updated when checkboxes are hidden. It
+        heading are correctly updated when checkboxes are hidden.  It
         allows, for example, to use C-c C-x C-b on a collapsed tree and
         still get the update.
 
@@ -2975,19 +3011,19 @@
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org-inlinetask.el (org-inlinetask-promote)
-        (org-inlinetask-demote): new functions.
+        (org-inlinetask-demote): New functions.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-demote-subtree,org-promote-subtree): wrap
-        org-map-tree into org-with-limited-levels macro, so it avoids
+        * org.el (org-demote-subtree,org-promote-subtree): Wrap
+        `org-map-tree' into `org-with-limited-levels' macro, so it avoids
         operating on inline tasks.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org.el (org-narrow-to-subtree): ensure `org-back-to-heading'
         will move point to a real heading and not an inline task by
-        wraping function into a org-with-limited-levels macro.
+        wraping function into a `org-with-limited-levels' macro.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -3212,17 +3248,17 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-exp.el (org-export-mark-list-end): change end marker
+        * org-exp.el (org-export-mark-list-end): Change end marker.
 
-        * org-docbook.el (org-export-docbook-list-line): use new marker.
+        * org-docbook.el (org-export-docbook-list-line): Use new marker.
 
-        * org-html.el (org-html-export-list-line): use new marker
+        * org-html.el (org-html-export-list-line): Use new marker.
 
-        * org-latex.el (org-export-latex-lists): use new marker
+        * org-latex.el (org-export-latex-lists): Use new marker.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-latex.el (org-export-latex-lists): make sure markers used
+        * org-latex.el (org-export-latex-lists): Make sure markers used
         for export are taken into account by temporarily setting an
         appropriate value for `org-list-ending-method'.
 
@@ -3271,14 +3307,14 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-open-at-point): if a link to a radio target is the
+        * org.el (org-open-at-point): If a link to a radio target is the
         first, (resp. the last), element of a buffer, function cannot find
         the property change required to get its boundaries, and
         `buffer-substring' is called with an invalid nil argument.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-table.el (org-table-copy-down): fix docstring.
+        * org-table.el (org-table-copy-down): Fix docstring.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -3305,19 +3341,19 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-insert-item): when computing size of item
+        * org-list.el (org-list-insert-item): When computing size of item
         being inserted, function has to take into account that indentation
         may not only be made of spaces.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-clock.el (org-clock-find-position): if a list was adjacent
+        * org-clock.el (org-clock-find-position): If a list was adjacent
         to some clocks and a drawer was going to be created, only the
         first element of the list would make it into the drawer.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-toggle-checkbox): fix bug where top item in
+        * org-list.el (org-toggle-checkbox): Fix bug where top item in
         list was omitted when checking boxes.
 
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
@@ -3354,8 +3390,8 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list (org-cycle-item-indentation): do not break an
-        indentation cycle because visibility cycling is requested. This
+        * org-list.el (org-cycle-item-indentation): Do not break an
+        indentation cycle because visibility cycling is requested.  This
         happens when an item becomes a parent, due to indentation change.
         Not considered empty anymore, the function cannot change its
         indentation again.
@@ -3379,11 +3415,11 @@
         (org-babel-insert-result): Writing code block results to lists has
         been updated to reflect the new list structure.
         (org-babel-result-end): Remove a previous change to end-of-list
-        marker detection
+        marker detection.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-cycle-item-indentation): each time the function
+        * org-list.el (org-cycle-item-indentation): Each time the function
         moves item back to child position, a white space is added to the
         line.
 
@@ -3399,9 +3435,9 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-ctrl-c-ctrl-c): call `org-list-send-list' only when
+        * org.el (org-ctrl-c-ctrl-c): Call `org-list-send-list' only when
         cursor it at very first item of the list, as specified in the
-        manual. Also refactored the list part of the function a bit.
+        manual.  Also refactored the list part of the function a bit.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -3419,606 +3455,609 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-toggle-checkbox, org-update-checkbox-count): no
-        need to wrap org-entry-get in ignore-errors since commit
-        7dd425cc5d42fb297f547f713edfdc936f9271f0
+        * org-list.el (org-toggle-checkbox, org-update-checkbox-count): No
+        need to wrap `org-entry-get' in `ignore-errors'.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-toggle-item, org-toggle-heading): make sure every
+        * org.el (org-toggle-item, org-toggle-heading): Make sure every
         sub-item in a list is changed into a sub-heading and sub-headings
-        are translated into sub-items. Also ignore inline tasks in the
+        are translated into sub-items.  Also ignore inline tasks in the
         process.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-exp.el (org-export-select-backend-specific-text): add
+        * org-exp.el (org-export-select-backend-specific-text): Add
         `original-indentation' property when replacing #+begin_backend and
-        #+backend blocks with their content. This is needed for lists, as
+        #+backend blocks with their content.  This is needed for lists, as
         they must know if the block belonged to them.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-html.el (org-html-export-list-line): insert a newline
+        * org-html.el (org-html-export-list-line): Insert a newline
         character before ending an item, as anchor could be on a line
         going to be deleted, like a drawer ending string.
 
-        * org-list.el (org-list-to-html): same.
+        * org-list.el (org-list-to-html): Same.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-set-autofill-regexps): use `org-item-re' in
+        * org.el (org-set-autofill-regexps): Use `org-item-re' in
         `paragraph-start' to recognize alphabetical lists.
-        (org-fill-paragraph): enforce a pre-computed fill-prefix before
-        calling fill-paragraph when point in in an item. Also prevent
+        (org-fill-paragraph): Enforce a pre-computed fill-prefix before
+        calling `fill-paragraph' when point in in an item.  Also prevent
         paragraphs getting merged into an adjacent list upon filling.
-        (org-adaptive-fill-function): make sure to determine real fill-prefix
-        for auto-fill.
-        (org-auto-fill-function): use a pre-computed fill-prefix before
-        calling do-auto-fill.
+        (org-adaptive-fill-function): Make sure to determine real
+        fill-prefix for auto-fill.
+        (org-auto-fill-function): Use a pre-computed fill-prefix before
+        calling `do-auto-fill'.
 
-        * org-list.el (org-list-item-body-column): new function
+        * org-list.el (org-list-item-body-column): New function.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org-inlinetask.el (org-inlinetask-at-task-p)
-        (org-inlinetask-toggle-visibility): new functions.
+        (org-inlinetask-toggle-visibility): New functions.
 
-        * org-list.el (org-list-set-item-visibility): new function.
+        * org-list.el (org-list-set-item-visibility): New function.
 
-        * org.el (org-cycle, org-cycle-internal-local): separate lists and
+        * org.el (org-cycle, org-cycle-internal-local): Separate lists and
         inline tasks from headlines.
-        (org-outline-level): do not consider lists as headlines.
-        Cycling visibility is using different tools.
+        (org-outline-level): Do not consider lists as headlines.  Cycling
+        visibility is using different tools.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-struct): mark items less indented than top
+        * org-list.el (org-list-struct): Mark items less indented than top
         item of the list, so that they will be modified.
-        (org-list-struct-apply-struct): compare struct's indentation with
-        line's indentation instead of old-struct's. This is needed because
-        `org-list-struct' automatically fixes indentation so changes might not
-        be seen otherwise.
+        (org-list-struct-apply-struct): Compare struct's indentation with
+        line's indentation instead of old-struct's.  This is needed
+        because `org-list-struct' automatically fixes indentation so
+        changes might not be seen otherwise.
 
-        * org.el (org-ctrl-c-ctrl-c): small refactoring.
+        * org.el (org-ctrl-c-ctrl-c): Small refactoring.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-update-checkbox-count): when a part of the
+        * org-list.el (org-update-checkbox-count): When a part of the
         buffer is processed to count checkboxes, lists are read from top
         to bottom, but inside lists (in drawers, blocks, or inline tasks)
-        are skipped. Thus, cookies cannot be updated. This patch enforces
-        reading of such lists if counter is itself in a special context.
+        are skipped.  Thus, cookies cannot be updated.  This patch
+        enforces reading of such lists if counter is itself in a special
+        context.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-struct-apply-struct): inline tasks along
+        * org-list.el (org-list-struct-apply-struct): Inline tasks along
         with their content must stay at column 0 even if the item is
-        gaining indentation. Moreover, fix indentation of text in an
+        gaining indentation.  Moreover, fix indentation of text in an
         inline task, now it can be in such a task within a list.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-at-item-p): also verify context is valid.
-        Otherwise it would recognize valid items where org-in-item-p
+        * org-list.el (org-at-item-p): Also verify context is valid.
+        Otherwise it would recognize valid items where `org-in-item-p'
         wouldn't.
-        (org-in-item-p, org-list-struct-apply-struct): use shorter version of
-        org-at-item-p.
-        (org-cycle-list-bullet): fix typo.
-        (org-list-parse-list): avoid calling org-at-item-p two times by using
-        an appropriate regexp
+        (org-in-item-p, org-list-struct-apply-struct): Use shorter version
+        of org-at-item-p.
+        (org-cycle-list-bullet): Fix typo.
+        (org-list-parse-list): Avoid calling `org-at-item-p' two times by
+        using an appropriate regexp.
 
-        * org.el (org-indent-line-function): use an appropriate regexp
-        instead of calling org-at-item-p two times.
+        * org.el (org-indent-line-function): Use an appropriate regexp
+        instead of calling `org-at-item-p' two times.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org-list.el (org-in-item-p): When point was just after
-        org-list-end-re, check wouldn't be done for starting line. So, if
+        org-list-end-re, check wouldn't be done for starting line.  So, if
         the first line was an item, it wouln't be noticed and function
-        would return nil. Simplify and comment code.
+        would return nil.  Simplify and comment code.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-toggle-item): when used on normal text, ensure every
+        * org.el (org-toggle-item): When used on normal text, ensure every
         line in region is included in the new item, regardless of its
         original indentation.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-struct-apply-struct): if end of list was
+        * org-list.el (org-list-struct-apply-struct): If end of list was
         at eol, for example, with list inside a block, the last list
-        wouldn't be shifted. Thus, the patch ensures no blank lines is
+        wouldn't be shifted.  Thus, the patch ensures no blank lines is
         skipped.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org.el (org-toggle-item): Now accepts a prefix argument. When
         used without argument on normal text, it will make the whole
-        region one item. With an argument, it defaults to old behavior:
+        region one item.  With an argument, it defaults to old behavior:
         change each line in region into an item.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-return): when called from inside an item with the
-        indent flag, function should keep text moved inside the item. This
-        allows to use C-j to separate lines in an item: cursor won't go
-        back to column 0.
+        * org.el (org-return): When called from inside an item with the
+        indent flag, function should keep text moved inside the item.
+        This allows to use C-j to separate lines in an item: cursor won't
+        go back to column 0.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org-list.el (org-list-struct): when a line has org-example
-        property, skip the entire block. This is needed during export, for
-        example when src blocks in org markup contain lists, and are
+        property, skip the entire block.  This is needed during export,
+        for example when src blocks in org markup contain lists, and are
         returned verbatim because org isn't in the list of interpreted
         languages.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-in-item-p): handle special cases when function
+        * org-list.el (org-in-item-p): Handle special cases when function
         is called with cursor amidst `org-list-end-re' or at an inline
         task.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * ob.el (org-babel-result-end): apply renaming.
+        * ob.el (org-babel-result-end): Apply renaming.
 
-        * org-exp.el (org-export-mark-list-properties): apply renaming.
+        * org-exp.el (org-export-mark-list-properties): Apply renaming.
 
-        * org-list.el (org-list-prevs-alist): renamed from
-        org-list-struct-prev-alist.
-        (org-list-parents-alist): renamed from org-list-struct-parent-alist.
-        (org-list-write-struct): renamed from org-list-struct-fix-struct.
-        (org-list-parse-list, org-sort-list, org-list-indent-item-generic,
-        org-toggle-checkbox, org-update-checkbox-count, org-cycle-list-bullet,
-        org-list-repair, org-insert-item, org-move-item-up, org-move-item-up,
-        org-move-item-down, org-next-item, org-previous-item,
-        org-end-of-item-list, org-beginning-of-item-list, org-apply-on-list):
-        apply renaming.
-        (org-get-bullet): removed function, as it is not needed anymore.
+        * org-list.el (org-list-prevs-alist): Renamed from
+        `org-list-struct-prev-alist'.
+        (org-list-parents-alist): Renamed from `org-list-struct-parent-alist'.
+        (org-list-write-struct): Renamed from `org-list-struct-fix-struct'.
+        (org-list-parse-list, org-sort-list, org-list-indent-item-generic)
+        (org-toggle-checkbox, org-update-checkbox-count)
+        (org-cycle-list-bullet, org-list-repair, org-insert-item)
+        (org-move-item-up, org-move-item-up, org-move-item-down)
+        (org-next-item, org-previous-item, org-end-of-item-list)
+        (org-beginning-of-item-list, org-apply-on-list): Apply renaming.
+        (org-get-bullet): Removed function, as it is not needed anymore.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-insert-item-generic): change arguments.
-        The function now accepts structure and previous items alist. This
-        allow to insert an item programmatically more easily.
-        (org-insert-item): Apply changes to org-list-insert-item-generic. The
-        function now takes care about repairing structure and updating
-        checkboxes.
+        * org-list.el (org-list-insert-item-generic): Change arguments.
+        The function now accepts structure and previous items alist.  This
+        allows to insert an item programmatically more easily.
+        (org-insert-item): Apply changes to
+        `org-list-insert-item-generic'.  The function now takes care about
+        repairing structure and updating checkboxes.
 
         * org-timer.el (org-timer-item): Apply changes to
-        org-list-insert-item-generic. The function now takes care about
+        `org-list-insert-item-generic'.  The function now takes care about
         repairing structure.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-make-subtree): function now uses
-        org-list-parse-list mechanism.
-        (org-list-make-subtrees): removed function.
-        (org-list-to-generic): added a parameter and every parameter can be a
-        sexp returning a string, for finer control.
-        (org-list-to-html, org-list-to-latex, org-list-to-texinfo): slight
-        modifications to apply changes to org-list-to-generic.
-        (org-list-to-subtree): new function.
+        * org-list.el (org-list-make-subtree): Function now uses
+        `org-list-parse-list mechanism'.
+        (org-list-make-subtrees): Removed function.
+        (org-list-to-generic): Added a parameter and every parameter can
+        be a sexp returning a string, for finer control.
+        (org-list-to-html, org-list-to-latex, org-list-to-texinfo): Slight
+        modifications to apply changes to `org-list-to-generic'.
+        (org-list-to-subtree): New function.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-beginning-of-line): apply changes to
+        * org.el (org-beginning-of-line): Apply changes to
         `org-item-beginning-re' to correct sub-expression reference.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-docbook.el (org-export-docbook-list-line): even with
+        * org-docbook.el (org-export-docbook-list-line): Even with
         alphabetical lists, Org shouldn't enforce a particular list type
-        to exporters. This is a job for style files.
+        to exporters.  This is a job for style files.
 
-        * org-html.el (org-html-export-list-line): ib idem.
+        * org-html.el (org-html-export-list-line): Ib idem.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-at-item-counter-p): new function.
-        (org-list-parse-list): handle counters and list depth.
-        (org-list-to-generic): a special string is used when an item has a
+        * org-list.el (org-at-item-counter-p): New function.
+        (org-list-parse-list): Handle counters and list depth.
+        (org-list-to-generic): A special string is used when an item has a
         counter.
-        (org-list-to-latex): use new special string for counters. This fixes
-        the counter bug in LaTeX export, as the enumi counter was the only one
-        modified.
+        (org-list-to-latex): Use new special string for counters.  This
+        fixes the counter bug in LaTeX export, as the enumi counter was
+        the only one modified.
 
-        * org-latex.el (org-export-latex-lists): use new
+        * org-latex.el (org-export-latex-lists): Use new
         `org-list-parse-list' output.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-get-list-type): new function.
-        (org-list-parse-list): use new function.
+        * org-list.el (org-list-get-list-type): New function.
+        (org-list-parse-list): Use new function.
 
-        * org-html.el (org-html-export-list-line): use new function.
+        * org-html.el (org-html-export-list-line): Use new function.
 
-        * org-docbook.el (org-export-docbook-list-line): use new function.
+        * org-docbook.el (org-export-docbook-list-line): Use new function.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-alphabetical-lists): new variable
-        (org-item-re, org-list-full-item, org-cycle-list-bullet,
-        org-list-struct-fix-bul, org-list-inc-bullet-maybe): reflect
+        * org-list.el (org-alphabetical-lists): New variable
+        (org-item-re, org-list-full-item, org-cycle-list-bullet)
+        (org-list-struct-fix-bul, org-list-inc-bullet-maybe): Reflect
         introduction of the new variable.
-        (org-item-beginning-re): changed into a function, so any modification
-        of `org-alphabetical-lists' will not require reloading Org.
-        (org-at-item-p, org-toggle-checkbox, org-update-checkbox-count,
-        org-list-parse-list, org-list-send-list): reflect changes to
+        (org-item-beginning-re): Changed into a function, so any
+        modification of `org-alphabetical-lists' will not require
+        reloading Org.
+        (org-at-item-p, org-toggle-checkbox, org-update-checkbox-count)
+        (org-list-parse-list, org-list-send-list): Reflect changes to
         `org-item-beginning-re'.
-        (org-list-use-alpha-bul-p): new function.
+        (org-list-use-alpha-bul-p): New function.
 
-        * org.el (org-check-for-hidden): reflect changes to
+        * org.el (org-check-for-hidden): Reflect changes to
         `org-item-beginning-re'.
 
-        * org-capture.el (org-capture-place-item): reflect changes to
+        * org-capture.el (org-capture-place-item): Reflect changes to
         `org-item-beginning-re'.
 
-        * org-docbook.el (org-export-docbook-list-line): handle new type
+        * org-docbook.el (org-export-docbook-list-line): handle New type
         of items.
 
         * org-exp.el (org-export-mark-list-end)
-        (org-export-mark-list-properties): reflect changes to
+        (org-export-mark-list-properties): Reflect changes to
         `org-item-beginning-re'.
 
-        * org-html.el (org-html-export-list-line): handle new type of
+        * org-html.el (org-html-export-list-line): Handle new type of
         items.
 
-        * org-latex.el (org-export-latex-lists): handle new type of items
+        * org-latex.el (org-export-latex-lists): Handle new type of items
         and reflect changes to `org-item-beginning-re'.
 
-        * org-ascii.el (org-export-ascii-preprocess): handle new counters.
+        * org-ascii.el (org-export-ascii-preprocess): Handle new counters.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-end-re): removed function and made it a
-        variable. There's no need for the overhead of calling the function
-        every at every line in a list. User will have to reload Org if he
-        change value of either `org-list-end-regexp' or
+        * org-list.el (org-list-end-re): Removed function and made it a
+        variable.  There's no need for the overhead of calling the
+        function every at every line in a list.  User will have to reload
+        Org if he change value of either `org-list-end-regexp' or
         `org-empty-line-terminates-plain-lists'.
-        (org-in-item-p,org-list-struct,org-list-parse-list): apply change.
+        (org-in-item-p,org-list-struct,org-list-parse-list): Apply change.
 
         * org-exp.el (org-export-mark-list-end)
-        (org-export-mark-list-properties): apply change
+        (org-export-mark-list-properties): Apply change
 
-        * org-latex.el (org-export-latex-lists): apply change. Also
+        * org-latex.el (org-export-latex-lists): Apply change.  Also
         prevent items with org-example property to be considered as real
         items.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-inlinetask.el (org-inlinetask-export-templates): slightly
+        * org-inlinetask.el (org-inlinetask-export-templates): Slightly
         modify templates so environment boundaries don't interfere with
-        content of task. Unprotect content of task so it might benefit
+        content of task.  Unprotect content of task so it might benefit
         from further transformations. Set original-indentation property to
         a high value to ensure that task is always in the last item of the
         list.  Also, apply templates later in export process.
 
-        * org-list.el (org-list-struct): fix inline task skipping.
+        * org-list.el (org-list-struct): Fix inline task skipping.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org-latex.el (org-export-latex-lists): Search for unprotected
-        items only, and redefine `org-at-item'. This change is required
+        items only, and redefine `org-at-item'.  This change is required
         when verbatim lists are inserted during export, usually by Babel.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * ob.el (org-babel-result-end): end position is end of current
+        * ob.el (org-babel-result-end): End position is end of current
         sublist instead of bottom point, as results might be inserted in a
         list themselves.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-automatic-rules): removed insert rule.
-        (org-list-insert-item-generic): removed code preventing user to insert
-        another item in a block within a list. It is because new list context
-        make it impossible to see if a point in a block is also in a list.
+        * org-list.el (org-list-automatic-rules): Removed insert rule.
+        (org-list-insert-item-generic): Removed code preventing user to
+        insert another item in a block within a list.  It is because new
+        list context make it impossible to see if a point in a block is
+        also in a list.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-exp.el (org-export-preprocess-string): mark list endings
+        * org-exp.el (org-export-preprocess-string): Mark list endings
         before babel blocks preprocessing starts, so blank lines that may
-        be inserted do not break list's structure. Then, mark list with
+        be inserted do not break list's structure.  Then, mark list with
         special properties required by exporters. Thus output from babel
         can easily be included in lists.
-        (org-export-mark-list-end): new function
-        (org-export-mark-list-properties): new function
-        (org-export-mark-lists): removed function. It was split into the two
-        preceding functions.
+        (org-export-mark-list-end): New function.
+        (org-export-mark-list-properties): New function.
+        (org-export-mark-lists): Removed function.  It was split into the
+        two preceding functions.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-update-checkbox-count): do not recompute every
+        * org-list.el (org-update-checkbox-count): Do not recompute every
         list before next heading when there are more than one cookie in an
-        headline. Moreover, ignore the case where cookie is inserted
+        headline.  Moreover, ignore the case where cookie is inserted
         neither at an heading nor at an item.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-sort-list): fix number of arguments to
-        `org-list-repair', plus make end-record go to end of item before
+        * org-list.el (org-sort-list): Fix number of arguments to
+        `org-list-repair', plus make `end-record' go to end of item before
         any blank line to keep them from being swallowed in the sorting.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-forbidden-blocks): variable renamed from
-        org-list-blocks.
-        (org-list-export-context): new variable
+        * org-list.el (org-list-forbidden-blocks): Renamed from
+        `org-list-blocks'.
+        (org-list-export-context): New variable.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-search-generic): renamed form
-        org-search-unenclosed-generic to reflect now behavior. Now, match
-        can only be in a valid context for lists, as determined by
+        * org-list.el (org-list-search-generic): Renamed form
+        `org-search-unenclosed-generic' to reflect the new behavior.  Now,
+        match can only be in a valid context for lists, as determined by
         `org-list-context'.
-        (org-list-search-backward): renamed from
-        org-search-backward-unenclosed.
-        (org-list-search-forward): renamed from org-search-forward-unenclosed.
-        (org-toggle-checkbox,org-update-checkbox-count): use new functions.
-        (org-sort-list): using default regexp search functions as context is
-        not required in this case.
+        (org-list-search-backward): Renamed from
+        `org-search-backward-unenclosed'.
+        (org-list-search-forward): Renamed from
+        `org-search-forward-unenclosed'.
+        (org-toggle-checkbox,org-update-checkbox-count): Use new
+        functions.
+        (org-sort-list): Using default regexp search functions as context
+        is not required in this case.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-exp.el (org-export-mark-lists): new function, replacing
-        org-export-mark-list-ending. It adds information as text
+        * org-exp.el (org-export-mark-lists): New function, replacing
+        org-export-mark-list-ending.  It adds information as text
         properties to every list, before changes done by exporter destruct
         them.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-get-first-item): new alias for
-        org-list-get-list-begin
-        (org-list-get-last-item): new function
-        (org-list-get-list-end): use org-list-get-last-item
+        * org-list.el (org-list-get-first-item): New alias for
+        `org-list-get-list-begin'.
+        (org-list-get-last-item): New function.
+        (org-list-get-list-end): Use `org-list-get-last-item'.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-get-string-indentation): moved in generally useful
+        * org.el (org-get-string-indentation): Moved in generally useful
         functions section, as it wasn't specific to plain lists and that
         no code was using it in org-list.el.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-skip-over-state-notes,org-store-log-note): use new
+        * org.el (org-skip-over-state-notes,org-store-log-note): Use new
         accessors.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-indent-item-generic): remove error
-        messages happening before process. This belongs to interactive
+        * org-list.el (org-list-indent-item-generic): Remove error
+        messages happening before process.  This belongs to interactive
         functions.
         (org-indent-item,org-indent-item-tree)
-        (org-outdent-item,org-outdent-item-tree): ensure point or region
-        is correct before computing list structure. Return an error
+        (org-outdent-item,org-outdent-item-tree): Ensure point or region
+        is correct before computing list structure.  Return an error
         message otherwise.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-apply-on-list): use new structures. Function is
-        now applied in reverse order so modifications do not change
+        * org-list.el (org-apply-on-list): Use new structures.  Function
+        is now applied in reverse order so modifications do not change
         positions of items in buffer.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-parse-list): rewrite of function to allow
-        text following a sub-list in the same item. See docstring for an
+        * org-list.el (org-list-parse-list): Rewrite of function to allow
+        text following a sub-list in the same item.  See docstring for an
         example of output.
-        (org-list-to-generic): use new parsing function.
-        (org-list-to-latex,org-list-to-html): minor change for clearer
+        (org-list-to-generic): Use new parsing function.
+        (org-list-to-latex,org-list-to-html): Minor change for clearer
         export.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-has-child-p): renamed from
-        org-list-get-child.  Returning first child is only useful as a
-        predicate, as we're allowing an item to have more than one
+        * org-list.el (org-list-has-child-p): Renamed from
+        `org-list-get-child'.  Returning first child is only useful as a
+        predicate, as we are allowing an item to have more than one
         sub-list.
-        (org-list-indent-item-generic): use `org-list-has-child-p' instead of
-        org-list-get-child.
-        (org-in-item-p): also return item beginning when list starts at
+        (org-list-indent-item-generic): Use `org-list-has-child-p' instead
+        of org-list-get-child.
+        (org-in-item-p): Also return item beginning when list starts at
         context beginning.
-        (org-list-get-parent): use of `org-list-struct-parent-alist' helper
-        function is not optional anymore.
-        (org-list-get-all-items): shorten code with the help of cl.el.
-        (org-list-get-children): now returns all children of item, even if
+        (org-list-get-parent): Use of `org-list-struct-parent-alist'
+        helper function is not optional anymore.
+        (org-list-get-all-items): Shorten code with the help of cl.el.
+        (org-list-get-children): Now returns all children of item, even if
         they do not belong to the same list. Renamed from
-        org-list-get-all-children.
-        (org-list-get-list-begin): function wasn't return value when item was
-        already the first item of the list at point.
-        (org-list-get-list-end): function wasn't return value when item was
-        already the last item of the list at point.
-        (org-list-struct-fix-box,org-update-checkbox-count): now uses
+        `org-list-get-all-children'.
+        (org-list-get-list-begin): Function wasn't return value when item
+        was already the first item of the list at point.
+        (org-list-get-list-end): Function wasn't return value when item
+        was already the last item of the list at point.
+        (org-list-struct-fix-box,org-update-checkbox-count): Now uses
         `org-list-get-children'.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
         * org.el (org-indent-line-function): Indentation of item's body
-        starts just after the bullet, not after a checkbox. Moreover, As
+        starts just after the bullet, not after a checkbox.  Moreover, As
         `org-in-item-p' also returns item beginning position when point is
         in a list, do not compute it a second time.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-ctrl-c-ctrl-c): when called at a list item, replace
+        * org.el (org-ctrl-c-ctrl-c): When called at a list item, replace
         usage `org-repair-list', forcing another reading of the list, with
         only needed subroutines.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-separating-blank-lines-number): use new
+        * org-list.el (org-list-separating-blank-lines-number): Use new
         accessors.
-        (org-list-insert-item-generic): use list structures to insert a new
-        item.
-        (org-list-exchange-items): refactor and comment code. Now return new
-        struct instead of modifying it, as list sorting would sometimes eat
-        first item.
-        (org-move-item-down,org-move-item-up): reflect changes to
+        (org-list-insert-item-generic): Use list structures to insert a
+        new item.
+        (org-list-exchange-items): Refactor and comment code.  Now return
+        new struct instead of modifying it, as list sorting would
+        sometimes eat first item.
+        (org-move-item-down,org-move-item-up): Reflect changes to
         `org-list-exchange-items'.
-        (org-insert-item): as `org-in-item-p' also computes item beginning
+        (org-insert-item): As `org-in-item-p' also computes item beginning
         when applicable, reuse the result.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-in-item-p): unify methods for this
+        * org-list.el (org-list-in-item-p): Unify methods for this
         predicate.
-        (org-list-in-item-p-with-indent): removed function
-        (org-list-ending-between): removed function
-        (org-list-maybe-skip-block): removed function
-        (org-list-in-item-p-with-regexp): removed function
-        (org-list-top-point-with-regexp): removed function
-        (org-list-top-point-with-indent): removed function
-        (org-list-bottom-point-with-indent): removed function
-        (org-list-bottom-point-with-regexp): removed function
-        (org-list-get-item-same-level): removed function
-        (org-list-top-point): removed function
-        (org-list-bottom-point): removed function
-        (org-get-item-beginning): renamed to org-list-get-item-begin to be
-        consistent with naming policy of non-interactive functions.
-        (org-get-beginning-of-list): removed function
-        (org-beginning-of-item-list): use new accessors
-        (org-get-end-of-list): removed function
-        (org-end-of-list): use new accessors
-        (org-get-end-of-item): removed function
-        (org-end-of-item): use new accessors
-        (org-get-previous-item): removed function
-        (org-previous-item): use new accessors
-        (org-get-next-item): removed function
-        (org-next-item): use new accessors
-        (org-end-of-item-before-blank): renamed to
+        (org-list-in-item-p-with-indent): Removed function.
+        (org-list-ending-between): Removed function.
+        (org-list-maybe-skip-block): Removed function.
+        (org-list-in-item-p-with-regexp): Removed function.
+        (org-list-top-point-with-regexp): Removed function.
+        (org-list-top-point-with-indent): Removed function.
+        (org-list-bottom-point-with-indent): Removed function.
+        (org-list-bottom-point-with-regexp): Removed function.
+        (org-list-get-item-same-level): Removed function.
+        (org-list-top-point): Removed function.
+        (org-list-bottom-point): Removed function.
+        (org-get-item-beginning): Renamed to `org-list-get-item-begin' to
+        be consistent with naming policy of non-interactive functions.
+        (org-get-beginning-of-list): Removed function.
+        (org-beginning-of-item-list): Use new accessors.
+        (org-get-end-of-list): Removed function.
+        (org-end-of-list): Use new accessors.
+        (org-get-end-of-item): Removed function.
+        (org-end-of-item): Use new accessors.
+        (org-get-previous-item): Removed function.
+        (org-previous-item): Use new accessors.
+        (org-get-next-item): Removed function.
+        (org-next-item): Use new accessors.
         (org-list-get-item-end-before-blank): Use new accessors.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-repair): removed optional argument
-        FORCE-BULLET. The job of this interactive function is to
-        completely fix a list at point. Changing bullets is a separate
-        task. Also removed others optional arguments TOP and BOTTOM to
+        * org-list.el (org-list-repair): Removed optional argument
+        FORCE-BULLET.  The job of this interactive function is to
+        completely fix a list at point.  Changing bullets is a separate
+        task.  Also removed others optional arguments TOP and BOTTOM to
         follow the new structures.
-        (org-list-indent-item-generic): remove need for TOP and BOTTOM. STRUCT
-        is a new required argument. This avoids computing a list structure
-        many times when function is called more than once in a row, for
-        example in org-cycle-item-indentation. Use new accessors. Now, also
-        call `org-update-checkbox-count-maybe'.
-        (org-outdent-item,org-indent-item,org-outdent-item-tree,org-indent-item-tree):
-        remove need for TOP and BOTTOM.
-        (org-list-insert-item-generic): reflect changes to `org-list-repair'.
-        (org-list-exchange-items): use new accessors. Now modify struct to
-        avoid re-reading it later.
-        (org-move-item-down): reflect changes to `org-list-repair'. Use new
-        accessors.
-        (org-move-item-up): reflect changes to `org-list-repair'. Use new
+        (org-list-indent-item-generic): Remove need for TOP and BOTTOM.
+        STRUCT is a new required argument.  This avoids computing a list
+        structure many times when function is called more than once in a
+        row, for example in `org-cycle-item-indentation'.  Use new
+        accessors.  Now, also call `org-update-checkbox-count-maybe'.
+        (org-outdent-item, org-indent-item, org-outdent-item-tree)
+        (org-indent-item-tree): Remove need for TOP and BOTTOM.
+        (org-list-insert-item-generic): Reflect changes to `org-list-repair'.
+        (org-list-exchange-items): Use new accessors.  Now modify struct
+        to avoid re-reading it later.
+        (org-move-item-down): Reflect changes to `org-list-repair'.  Use
+        new accessors.
+        (org-move-item-up): Reflect changes to `org-list-repair'.  Use new
         accessors.
-        (org-cycle-list-bullet): use new structures. Also use a shortcut to
-        `org-list-struct-fix-struct' in order to avoid unnecessary fixes, like
-        `org-list-struct-fix-box'
-        (org-sort-list): use of new structures. Renamed an internal function
-        for a little more clarity.
-        (org-cycle-item-indentation): remove dependency on org-list-repair.
-        Use new accessors.
-        (org-list-get-child): correct bug when asking for the child of the
-        last item
-        (org-list-exchange-items): use new accessors.
+        (org-cycle-list-bullet): Use new structures.  Also use a shortcut
+        to `org-list-struct-fix-struct' in order to avoid unnecessary
+        fixes, like `org-list-struct-fix-box'
+        (org-sort-list): Use of new structures.  Renamed an internal
+        function for a little more clarity.
+        (org-cycle-item-indentation): Remove dependency on
+        `org-list-repair'.  Use new accessors.
+        (org-list-get-child): Correct bug when asking for the child of the
+        last item.
+        (org-list-exchange-items): Use new accessors.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-blocks): new variable
-        (org-list-context): new function
-        (org-list-full-item-re): new variable
-        (org-list-struct-assoc-at-point): use new varible
-        (org-list-struct): rewrite of function. Now, list data is collected by
-        looking at the list line after line. It reads the whole list each time
-        because reading only a subtree was not enough for some operations,
-        like fixing checkboxes. It also removes the need to get
-        `org-list-top-point' and `org-list-bottom-point' first. An added data
-        is the position of item ending. This aims to be able to have list
-        followed by text inside an item.
-        (org-list-struct-assoc-end): new function
-        (org-list-struct-parent-alist): new function
-        (org-list-get-parent): new function
-        (org-list-get-child): new function
-        (org-list-get-next-item): new function
-        (org-list-get-prev-item): new function
-        (org-list-get-subtree): use helper function `org-list-struct-prev-alist'.
-        (org-list-get-all-items): new function
-        (org-list-get-all-children): new function
-        (org-list-get-top-point): new function
-        (org-list-get-bottom-point): new function
-        (org-list-get-counter): new function
-        (org-list-get-item-end): new function
-        (org-list-struct-fix-bul): rewrite for cleaner code. Make use of new
-        accessors.
-        (org-list-struct-fix-ind): make use of new accessors.
-        (org-list-struct-fix-box): new function
-        (org-list-struct-fix-checkboxes): removed function
-        (org-list-struct-outdent): use new accessors. Use the fact that there
-        is no longer a virtual item at beginning of structure.
-        (org-list-struct-indent): use helper functions
-        `org-list-struct-prev-alist' and `org-list-struct-parent-alist'. Also
-        use new accessors.
-        (org-list-struct-fix-struct): comment function. Call directly
+        * org-list.el (org-list-blocks): New variable.
+        (org-list-context): New function.
+        (org-list-full-item-re): New variable.
+        (org-list-struct-assoc-at-point): Use new varible.
+        (org-list-struct): Rewrite of function.  Now, list data is
+        collected by looking at the list line after line.  It reads the
+        whole list each time because reading only a subtree was not enough
+        for some operations, like fixing checkboxes.  It also removes the
+        need to get `org-list-top-point' and `org-list-bottom-point'
+        first.  An added data is the position of item ending.  This aims
+        to be able to have list followed by text inside an item.
+        (org-list-struct-assoc-end): New function.
+        (org-list-struct-parent-alist): New function.
+        (org-list-get-parent): New function.
+        (org-list-get-child): New function.
+        (org-list-get-next-item): New function.
+        (org-list-get-prev-item): New function.
+        (org-list-get-subtree): Use helper function `org-list-struct-prev-alist'.
+        (org-list-get-all-items): New function.
+        (org-list-get-all-children): New function.
+        (org-list-get-top-point): New function.
+        (org-list-get-bottom-point): New function.
+        (org-list-get-counter): New function.
+        (org-list-get-item-end): New function.
+        (org-list-struct-fix-bul): Rewrite for cleaner code.  Make use of
+        new accessors.
+        (org-list-struct-fix-ind): Make use of new accessors.
+        (org-list-struct-fix-box): New function.
+        (org-list-struct-fix-checkboxes): Removed function.
+        (org-list-struct-outdent): Use new accessors.  Use the fact that
+        there is no longer a virtual item at beginning of structure.
+        (org-list-struct-indent): Use helper functions
+        `org-list-struct-prev-alist' and `org-list-struct-parent-alist'.
+        Also use new accessors.
+        (org-list-struct-fix-struct): Comment function.  Call directly
         `org-list-struct-apply-struct', without removing unchanged items
         first.
-        (org-list-struct-apply-struct): comment function. Rewrite using new
-        accessors. Use new variable `org-list-full-item-re'.
-        (org-list-shift-item-indentation): removed function, now included in
-        `org-list-struct-apply-struct' because it is too specific.
+        (org-list-struct-apply-struct): Comment function.  Rewrite using
+        new accessors.  Use new variable `org-list-full-item-re'.
+        (org-list-shift-item-indentation): Removed function, now included
+        in `org-list-struct-apply-struct' because it is too specific.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-toggle-checkbox): use structures to fix
-        checkboxes of a list
-        (org-update-checkbox-count): use structures to update cookies
+        * org-list.el (org-toggle-checkbox): Use structures to fix
+        checkboxes of a list.
+        (org-update-checkbox-count): Use structures to update cookies.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-struct-fix-checkboxes): new function
-        (org-checkbox-blocked-p): removed function
+        * org-list.el (org-list-struct-fix-checkboxes): New function.
+        (org-checkbox-blocked-p): Removed function.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-get-all-items): new function
-        (org-list-get-all-children): new function
-        (org-list-get-nth): new function
-        (org-list-set-nth): new function
-        (org-list-get-ind): new function
-        (org-list-set-ind): new function
-        (org-list-get-bullet): new function
-        (org-list-set-bullet): new function
-        (org-list-get-checkbox): new function
-        (org-list-set-checkbox): new function
-        (org-list-struct-fix-bul): use new accessors
-        (org-list-repair): use new accessors
-        (org-list-indent-item-generic): make use of accessors
-        (org-list-get-parent): renamed from org-list-struct-get-parent
-        (org-list-get-child): renamed from org-list-struct-get-child
-        (org-list-struct-fix-ind): make use of accessors
-        (org-list-get-next-item): new function
-        (org-list-get-subtree): new function
+        * org-list.el (org-list-get-all-items): New function.
+        (org-list-get-all-children): New function.
+        (org-list-get-nth): New function.
+        (org-list-set-nth): New function.
+        (org-list-get-ind): New function.
+        (org-list-set-ind): New function.
+        (org-list-get-bullet): New function.
+        (org-list-set-bullet): New function.
+        (org-list-get-checkbox): New function.
+        (org-list-set-checkbox): New function.
+        (org-list-struct-fix-bul): Use new accessors.
+        (org-list-repair): Use new accessors.
+        (org-list-indent-item-generic): Make use of accessors.
+        (org-list-get-parent): Renamed from `org-list-struct-get-parent'.
+        (org-list-get-child): Renamed from `org-list-struct-get-child'.
+        (org-list-struct-fix-ind): Make use of accessors.
+        (org-list-get-next-item): New function.
+        (org-list-get-subtree): New function.
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-list.el (org-list-struct-assoc-at-point): add checkbox to
-        list structure
+        * org-list.el (org-list-struct-assoc-at-point): Add checkbox to
+        list structure.
 
-        * org-list.el (org-list-struct-assoc-at-point): add checkbox as
-        value in structure
+        * org-list.el (org-list-struct-assoc-at-point): Add checkbox as
+        value in structure.
 
-        * org-list.el (org-list-struct-apply-struct): also apply
-        checkboxes
+        * org-list.el (org-list-struct-apply-struct): Also apply
+        checkboxes.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-latex.el (org-export-latex-content): bind local variables
+        * org-latex.el (org-export-latex-content): Bind local variables
         for export in the temporary export buffer.
 
 2011-07-28  David Maus  <dmaus@ictsoc.de>
 
         * org-protocol.el (org-protocol-unhex-single-byte-sequence)
-        (org-protocol-unhex-string, org-protocol-unhex-compound): Change date
-        of obsolete declaration to 2011-02-17.
+        (org-protocol-unhex-string, org-protocol-unhex-compound): Change
+        date of obsolete declaration to 2011-02-17.
 
 2011-07-28  David Maus  <dmaus@ictsoc.de>
 
@@ -4116,10 +4155,10 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-publish.el (org-publish-cache-ctime-of-src): improve
+        * org-publish.el (org-publish-cache-ctime-of-src): Improve
         docstring.
-        (org-publish-find-title): New option to explicitly reset the
-        title in the cache.
+        (org-publish-find-title): New option to explicitly reset the title
+        in the cache.
         (org-publish-format-file-entry): Use this new option.
 
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
@@ -4131,19 +4170,20 @@
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
         * org-exp.el (org-export-format-source-code-or-example): Allow
-        empty string as second element in minted/listings options
+        empty string as second element in minted/listings options.
 
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
         * org-exp.el (org-export-format-source-code-or-example): Support
-        new user-customizable options
-        (org-export-latex-custom-lang-environments): Ensure new variable is defined
-        (org-export-latex-listings-options): Ensure new variable is defined
-        (org-export-latex-minted-options): Ensure new variable is defined
+        new user-customizable options.
+        (org-export-latex-custom-lang-environments): Ensure new variable
+        is defined.
+        (org-export-latex-listings-options): Ensure new variable is defined.
+        (org-export-latex-minted-options): Ensure new variable is defined.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-html.el (org-export-as-html): handle the case when
+        * org-html.el (org-export-as-html): Handle the case when
         `org-export-html-validation-link' is nil to keep backward
         compatible with the old default value of this variable.
 
@@ -4152,28 +4192,22 @@
         * ob.el (org-babel-insert-result): Don't choke if indent is not a
         number.
 
-2011-07-28  Bastien Guerry  <bzg@gnu.org>
-
-        * 2011
-        ** 2011-02 monthname
-        *** 2011-02-13 dayname
-
 2011-07-28  Christian Moe  <mail@christianmoe.com>  (tiny change)
 
         * org-bbdb.el (org-bbdb-export): When a link description has been
-        added by org-export-normalize-links, use path instead (remove the
-        `bbdb:' prefix).
+        added by `org-export-normalize-links', use path instead (remove
+        the `bbdb:' prefix).
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
         * org-ascii.el (org-export-ascii-underline): Put the level's
         characters in the right order, as documented by the docstring.
-        (org-ascii-level-start): select the right char for underlining
+        (org-ascii-level-start): Select the right char for underlining
         headlines.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-src.el (org-edit-src-code): allow to edit source code from
+        * org-src.el (org-edit-src-code): Allow to edit source code from
         modes derived from Org.
 
 2011-07-28  Niels Giesen  <niels.giesen@gmail.com>
@@ -4194,8 +4228,7 @@
         Send a message when no entry is marked.
         (org-agenda-bulk-action): Fix bug about scattering deadlines.
         Send an error when trying to scatter outside an agenda or a
-        timeline view.  Silently fail when trying to scatter sexp
-        entries.
+        timeline view.  Silently fail when trying to scatter sexp entries.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -4226,11 +4259,12 @@
 
         * org-src.el (org-edit-src-code): When generating the code edit
         buffer, it is necessary for several variables to inherit their
-        values from the parent org buffer. These changes collect all such
+        values from the parent org buffer.  These changes collect all such
         variables together into a single association list of
-        (variable-name value) pairs. In addition, a new variable is added
-        to the list: `org-edit-src-content-indentation'. This has the
-        effect that a buffer local value can be used for that variable.
+        `(variable-name value)' pairs.  In addition, a new variable is
+        added to the list: `org-edit-src-content-indentation'.  This has
+        the effect that a buffer local value can be used for that
+        variable.
 
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
@@ -4253,12 +4287,12 @@
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
         * org.el (org-open-at-point): Fix bug when using prefix arg to
-        construct `org-link-search' call. Rename prefix arg with a more
+        construct `org-link-search' call.  Rename prefix arg with a more
         generic name, to reflect its diverse uses in this function.
 
 2011-07-28  Rémi Vanicat  <vanicat@debian.org>
 
-        * org-icalendar.el (org-icalendar-use-UTC-date-time): remove.
+        * org-icalendar.el (org-icalendar-use-UTC-date-time): Remove.
         (org-icalendar-date-time-format): New custom variable.
         (org-icalendar-use-UTC-date-timep): New function.
         (org-ical-ts-to-string): Use the new variable.
@@ -4275,25 +4309,25 @@
 
 2011-07-28  Bastien  <bastien.guerry@wikimedia.fr>
 
-        * org-capture.el (org-capture-templates): document currentfile for
-        capture template.
+        * org-capture.el (org-capture-templates): Document "currentfile"
+        for capture template.
         (org-capture-templates): Allow to use currentfile for capture
         templates.
-        (org-capture-set-target-location): Handle currentfile as a way
-        to setting the capture buffer.
+        (org-capture-set-target-location): Handle currentfile as a way to
+        setting the capture buffer.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * ob.el (org-babel-params-from-properties): don't wrap
-        org-entry-get into condition-case.
+        * ob.el (org-babel-params-from-properties): Don't wrap
+        `org-entry-get' into `condition-case'.
 
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
         * org.el (org-entry-get): Don't look for a property drawer if we
         are before the first heading in the file.
-        (org-entry-get-with-inheritance): Don't attempt to move up the tree if
-        we are before the first heading in the file. Also, enclose less of the
-        function in the save-excursion.
+        (org-entry-get-with-inheritance): Don't attempt to move up the
+        tree if we are before the first heading in the file.  Also,
+        enclose less of the function in the `save-excursion'.
 
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
@@ -4313,37 +4347,37 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-info.el (org-info-store-link): use "#" to separate the info
+        * org-info.el (org-info-store-link): Use "#" to separate the info
         file and the node.
-        (org-info-follow-link): use both "#" to separate the info file
-        and the node.  Continue to use ":" for backward compatibility.
+        (org-info-follow-link): Use both "#" to separate the info file and
+        the node.  Continue to use ":" for backward compatibility.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
         * org-icalendar.el (org-icalendar-honor-noexport-tag): New custom
         variable.
-        (org-print-icalendar-entries): Use this new variable to
-        prevent export of entries with a :noexport: tag.
+        (org-print-icalendar-entries): Use this new variable to prevent
+        export of entries with a :noexport: tag.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-exp.el (org-export-initial-scope): new custom variable.
+        * org-exp.el (org-export-initial-scope): New custom variable.
         (org-export): Use this new variable.  If there is an active
         region, tell it when prompting the user for an export command.
-        Also change the way the function handles selection of buffer
-        and subtree export.
+        Also change the way the function handles selection of buffer and
+        subtree export.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
         * org-html.el (org-export-html-auto-preamble)
         (org-export-html-auto-postamble): Remove.
-        (org-export-html-preamble, org-export-html-postamble): Turn
-        into custom variables.  Update the docstrings.
+        (org-export-html-preamble, org-export-html-postamble): Turn into
+        custom variables.  Update the docstrings.
         (org-export-html-preamble-format)
         (org-export-html-postamble-format): New custom variables.
-        (org-export-as-html): Use org-export-html-postamble-format and
-        org-export-html-preamble-format.
-        (org-export-html-title-format): delete.
+        (org-export-as-html): Use `org-export-html-postamble-format' and
+        `org-export-html-preamble-format'.
+        (org-export-html-title-format): Delete.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -4360,14 +4394,14 @@
 2011-07-28  Manuel Giraud  <manuel.giraud@univ-nantes.fr>
 
         * org-publish.el (org-publish-sitemap-date-format)
-        (org-publish-sitemap-file-entry-format): new custom variables.
-        (org-publish-projects): use these variables to format the sitemap
+        (org-publish-sitemap-file-entry-format): New custom variables.
+        (org-publish-projects): Use these variables to format the sitemap
         entries.
 
 2011-07-28  Ulf Stegemann  <ulf-news@zeitform.de>
 
-        * org-gnus.el (org-gnus-store-link): Allow org-link creation from
-        message-mode.
+        * org-gnus.el (org-gnus-store-link): Allow `org-link' creation
+        from `message-mode'.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -4377,21 +4411,21 @@
 
 2011-07-28  Julien Danjou  <julien@danjou.info>
 
-        * org-agenda.el (org-agenda): Kill all local variables. This
+        * org-agenda.el (org-agenda): Kill all local variables.  This
         assures we are not keeping buffer variable from an old agenda view
         when switching to a new custom agenda.
 
 2011-07-28  Julien Danjou  <julien@danjou.info>
 
         * org-crypt.el (org-encrypt-string): New function.
-        (org-encrypt-entry): Use org-encrypt-string to encrypt, so we use cached
-        crypted values.
+        (org-encrypt-entry): Use org-encrypt-string to encrypt, so we use
+        cached crypted values.
         (org-decrypt-entry): Store crypted text in decrypted text.
 
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
         * ob-exp.el (org-babel-exp-lob-one-liners): Only replace the match
-        if a non-nil result is returned
+        if a non-nil result is returned.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -4400,7 +4434,7 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org.el (org-update-parent-todo-statistics): fix bug when
+        * org.el (org-update-parent-todo-statistics): Fix bug when
         updating statistics from the column view.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
@@ -4419,11 +4453,12 @@
 2011-07-28  Julien Danjou  <julien@danjou.info>
 
         * org-faces.el (org-special-keyword): Make it inherited from
-        font-lock-keyword-face.
+        `font-lock-keyword-face'.
 
 2011-07-28  Julien Danjou  <julien@danjou.info>
 
-        * org-faces.el (org-link): Make org-link inherits from link face.
+        * org-faces.el (org-link): Make `org-link' inherits from `link'
+        face.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -4450,10 +4485,10 @@
         * org-latex.el (org-export-latex-emph-format): Don't use
         `org-export-latex-use-verb'.  Remove this variable.
 
-2011-07-28  Jason Dunsmore  <emacs-orgmode@dunsmor.com>
+2011-07-28  Jason Dunsmore  <emacs-orgmode@dunsmor.com>  (tiny change)
 
-        * org-html.el (org-html-handle-time-stamps): fix bug when exporing
-        inactive timestamps.
+        * org-html.el (org-html-handle-time-stamps): Fix bug when
+        exporting inactive timestamps.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -4466,8 +4501,7 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-archive.el (org-archive-save-context-info): Fix docstring
-        typo.
+        * org-archive.el (org-archive-save-context-info): Fix docstring.
 
 2011-07-28  Julien Danjou  <julien@danjou.info>
 
@@ -4478,8 +4512,8 @@
 
 2011-07-28  Julien Danjou  <julien@danjou.info>
 
-        * org-agenda.el (org-agenda-list): Use org-agenda-current-span as
-        a possible default span if it is set.
+        * org-agenda.el (org-agenda-list): Use `org-agenda-current-span'
+        as a possible default span if it is set.
 
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
@@ -4487,29 +4521,17 @@
         (org-edit-src-code): Get rid of help message in echo area.
 
         * ob.el (org-babel-do-in-edit-buffer): Do not pass 'quietly
-        argument to org-edit-src-code as this has been removed
+        argument to org-edit-src-code as this has been removed.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-latex.el (org-export-latex-emphasis-alist): use
+        * org-latex.el (org-export-latex-emphasis-alist): Use
         \protectedtexttt for the =...= emphasis and \verb for the ~...~
         emphasis.
-        (org-export-latex-use-verb): now defaults to t.
-        (org-export-latex-emph-format): distinguish between =...= and
+        (org-export-latex-use-verb): Now defaults to t.
+        (org-export-latex-emph-format): Distinguish between =...= and
         ~...~ emphasis.
 
-2011-07-28  David Maus  <dmaus@ictsoc.de>
-
-        * test-org-html.el (test-org-html/export-link-alist): New
-        variable. Abstract link export test definition.
-        (test-org-html/export-link-factory): New function. Create tests for
-        link export.
-
-2011-07-28  David Maus  <dmaus@ictsoc.de>
-
-        * org-test.el (org-test-strip-text-props): New function. Strip
-        text properties.
-
 2011-07-28  Julien Danjou  <julien@danjou.info>
 
         * org.el (org-link-expand-abbrev): Allow any type of character in
@@ -4521,12 +4543,12 @@
 
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
-        * ob-ref.el (org-babel-ref-resolve): save-window-excursion when
+        * ob-ref.el (org-babel-ref-resolve): `save-window-excursion' when
         resolving references.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org-html.el (org-export-html-html-helper-timestamp): use <hr/>
+        * org-html.el (org-export-html-html-helper-timestamp): Use <hr/>
         instead of <hr> to keep w3c validator happy.
 
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
@@ -4542,8 +4564,8 @@
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
-        * ob.el (org-babel-result-end): Replace call to org-in-item-p to
-        the more specific org-at-item-p.
+        * ob.el (org-babel-result-end): Replace call to `org-in-item-p' to
+        the more specific `org-at-item-p'.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -4595,17 +4617,18 @@
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
         * org-latex.el (org-export-as-latex): Process export property list
-        with `org-export-process-option-filters' early in latex export
+        with `org-export-process-option-filters' early in latex export.
 
 2011-07-28  Julien Danjou  <julien@danjou.info>
 
-        * org.el: Remove org-invisible-p: outline-invisible-p is available
-        in Emacs 22 and in recent XEmacs 21. Replace in various files.
+        * org.el: Remove `org-invisible-p': `outline-invisible-p' is
+        available in Emacs 22 and in recent XEmacs 21.  Replace in various
+        files.
 
 2011-07-28  Julien Danjou  <julien@danjou.info>
 
         * org-agenda.el (org-agenda-get-progress): Fix regexp for statep:
-        it must has \\ at the end of the line. This avoid matching the
+        it must has \\ at the end of the line.  This avoid matching the
         following heading when there's no newline between the logged state
         and the next heading.
 
@@ -4615,11 +4638,10 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org.el (org-current-level):
-        (org-store-link):
-        (org-mark-subtree): Use `org-with-limited-levels'.
+        * org.el (org-current-level, org-store-link, org-mark-subtree):
+        Use `org-with-limited-levels'.
 
-2011-07-28  Jan Seeger  <jan.seeger@thenybble.de>
+2011-07-28  Jan Seeger  <jan.seeger@thenybble.de>  (tiny change)
 
         * org-publish.el (org-publish-get-base-files): Add sitemap file.
 
@@ -4657,7 +4679,7 @@
 2011-07-28  Julien Danjou  <julien@danjou.info>
 
         * org-agenda.el (org-agenda-get-blocks): Fix time of start/end of
-        events with range. This display things like: <2011-01-22 Sat
+        events with range.  This display things like: <2011-01-22 Sat
         14:00>--<2011-01-23 Sun 20:00> correctly, with the event starting
         at 14:00 and ending at 20:00.
 
@@ -4669,7 +4691,7 @@
 
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
-        * ob.el (org-babel-merge-params): docstring typo.
+        * ob.el (org-babel-merge-params): Docstring typo.
 
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
@@ -4679,11 +4701,11 @@
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
         * ob.el (org-babel-get-src-block-info): Alter order of merge
-        arguments
+        arguments.
 
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
-        * ob-python.el: Test whether non-nil buffer is #<killed buffer>
+        * ob-python.el: Test whether non-nil buffer is #<killed buffer>.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -4715,12 +4737,12 @@
 
         * org-exp.el (org-export-handle-include-files): Support :lines
         property.
-        (org-get-file-contents): New argument lines to include specify a range
-        of lines to include.
+        (org-get-file-contents): New argument lines to include specify a
+        range of lines to include.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org.el (org-fast-tag-selection): Fix bug when assigning keys
+        * org.el (org-fast-tag-selection): Fix bug when assigning keys.
 
 2011-07-28  Lawrence Mitchell  <wence@gmx.li>
 
@@ -4733,9 +4755,9 @@
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
-        * org-complete.el (pcomplete/org-mode/link):
-        (pcomplete/org-mode/todo):
-        (pcomplete/org-mode/prop): Copy list before uniquifying.
+        * org-complete.el (pcomplete/org-mode/link)
+        (pcomplete/org-mode/todo, pcomplete/org-mode/prop): Copy list
+        before uniquifying.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -4746,15 +4768,15 @@
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
-        * org.el (org-refile-check-position): send a more explicit message
+        * org.el (org-refile-check-position): Send a more explicit message
         on how to clear the cache before refiling again.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org-agenda.el (org-agenda-skip-function-global): New option.
         (org-agenda-skip-eval): New function.
-        (org-agenda-skip): Use `org-agenda-skip-eval' and also check for the
-        global skipping condition.
+        (org-agenda-skip): Use `org-agenda-skip-eval' and also check for
+        the global skipping condition.
 
 2011-07-28  David Maus  <dmaus@ictsoc.de>
 
@@ -4772,10 +4794,6 @@
         * ob.el (org-babel-update-block-body): Literal argument to
         `replace-match' to allow insertion of text containing '\'.
 
-2011-07-28  Tassilo Horn  <tassilo@member.fsf.org>
-
-        * org-gnus.el (org-gnus-store-link):
-
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
         * ob-ref.el (org-babel-ref-parse): Allow passing empty strings
@@ -4795,7 +4813,7 @@
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org.el (org-sort-entries): Fix sorting with a bold emphasis at
-        bol
+        bol.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -4810,8 +4828,8 @@
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
         * ob.el (org-babel-temp-file): Ensure that
-        org-babel-temporary-directory is bound before using.
-        (org-babel-remove-temporary-directory):  Safer error throwing.
+        `org-babel-temporary-directory' is bound before using.
+        (org-babel-remove-temporary-directory): Safer error throwing.
 
 2011-07-28  niels giesen  <niels.giesen@gmail.com>
 
@@ -4838,16 +4856,12 @@
 
         * org.el (org-occur-next-match): New function.
         (org-mode): Set the variable `next-error-function'.
-        (org-highlight-new-match): Add an `org-type' property to the overlays.
+        (org-highlight-new-match): Add an `org-type' property to the
+        overlays.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
-        * ob-calc.el: No longer require `calc-trail' on XEmacs
-
-2011-07-28  Bastien Guerry  <bzg@gnu.org>
-
-        * simple.el (mail-user-agent): Default to the
-        upwardly-UI-compatible and more featureful message-mode.
+        * ob-calc.el: No longer require `calc-trail' on XEmacs.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -4855,11 +4869,10 @@
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
-        * org-special-blocks.el (htmlp):
-        (latexp):
-        (line): Add defvars for dynamically scoped variables.
+        * org-special-blocks.el (htmlp, latexp, line): Add defvars for
+        dynamically scoped variables.
 
-        * org.el (org-modules): Move org-special-blocks into the core
+        * org.el (org-modules): Move `org-special-blocks' into the core
         modules section.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
@@ -4872,10 +4885,10 @@
 
 2011-07-28  Bernt Hansen  <bernt@norang.ca>
 
-        * org-agenda.el (org-agenda-goto): Display invisible entry text
+        * org-agenda.el (org-agenda-goto): Display invisible entry text.
 
         * org-agenda.el (org-agenda-switch-to): Display invisible entry
-        text
+        text.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -4989,8 +5002,8 @@
         send graphical output to file by means of the ":results graphics"
         directive.
         (org-babel-expand-body:R): Use `org-babel-R-graphical-output-file'
-        when constructing the R code to evaluate, which may be augmented with
-        code implementing the writing of graohical output to file.
+        when constructing the R code to evaluate, which may be augmented
+        with code implementing the writing of graohical output to file.
         (org-babel-execute:R): Use `org-babel-R-graphical-output-file' to
         determine whether R is taking responsibility for writing output to
         file; if so, this is signalled to ob.el by returning a nil result.
@@ -5001,8 +5014,9 @@
         of src block execution.
         (org-babel-execute-src-block): Use `org-babel-format-result' when
         writing to file.
-        (org-babel-open-src-block-result): Use `org-babel-format-result' when
-        displaying results in a buffer; name results buffer differently.
+        (org-babel-open-src-block-result): Use `org-babel-format-result'
+        when displaying results in a buffer.  Name results buffer
+        differently.
 
 2011-07-28  Dan Davison  <dandavison7@gmail.com>
 
@@ -5023,10 +5037,12 @@
 
 2011-07-28  Nicolas Goaziou  <n.goaziou@gmail.com>
 
-        * org-inlinetask.el (org-inlinetask-in-task-p): small refactoring,
+        * org-inlinetask.el (org-inlinetask-in-task-p): Small refactoring,
         do not modify match data either.
-        (org-inlinetask-goto-end): small refactoring, remove case-sensitivity.
-        (org-inlinetask-goto-beginning): small refactoring, remove case-sensitivity.
+        (org-inlinetask-goto-end): Small refactoring, remove
+        case-sensitivity.
+        (org-inlinetask-goto-beginning): Small refactoring, remove
+        case-sensitivity.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -5109,8 +5125,8 @@
 
 2011-07-28  Lawrence Mitchell  <wence@gmx.li>
 
-        * org.el (org-make-target-link-regexp): regexp-quote target before
-        replacing whitespace.
+        * org.el (org-make-target-link-regexp): `regexp-quote' target
+        before replacing whitespace.
 
 2011-07-28  Eric Schulte  <schulte.eric@gmail.com>
 
@@ -5125,7 +5141,7 @@
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
         * org-latex.el (org-export-latex-first-lines): Anchor outline
-        regexp during LaTeX tree export
+        regexp during LaTeX tree export.
 
 2011-07-28  Konrad Hinsen  <konrad.hinsen@fastmail.net>
 
@@ -5147,7 +5163,7 @@
 
         * org.el (org-entry-properties): Stop scanning for timestamps if a
         specific timestamp property (e.g., DEADLINE, SCHEDULED, etc.) is
-        requested and a match is found. Also, if a specific timestamp
+        requested and a match is found.  Also, if a specific timestamp
         property is requested, do not push non-relevant timestamps onto
         property list.
 
@@ -5164,9 +5180,9 @@
 
 2011-07-28  Achim Gratz  <Stromeko@nexgo.de>
 
-        * org.el: remove spurious linebreak introduced by earlier patch.
+        * org.el: Remove spurious linebreak introduced by earlier patch.
 
-        * ob.el, ob-ref.el: remove double fix of the same problem.
+        * ob.el, ob-ref.el: Remove double fix of the same problem.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
 
@@ -5174,7 +5190,7 @@
 
 2011-07-28  Łukasz Stelmach  <lukasz.stelmach@iem.pw.edu.pl>
 
-        * org-html.el (org-export-html-mathjax-template): displaymath
+        * org-html.el (org-export-html-mathjax-template): Displaymath
         environment and MathJax.
 
 2011-07-28  Carsten Dominik  <carsten.dominik@gmail.com>
@@ -7352,7 +7368,7 @@
         (org-export-latex-keywords-maybe):
         Use `org-export-latex-tag-markup'.
 
-2010-11-11  Rémi Vanicat  <vanicat@debian.org>
+2010-11-11  Rémi Vanicat  <vanicat@debian.org>  (tiny change)
 
         * org-icalendar.el (org-icalendar-use-UTC-date-time): New option.
         (org-ical-ts-to-string): Use UTC time when requested.
diff --git a/lisp/org/ob-C.el b/lisp/org/ob-C.el
index cc44ece4ea8..4f8106cd66f 100644
--- a/lisp/org/ob-C.el
+++ b/lisp/org/ob-C.el
@@ -1,6 +1,6 @@
 ;;; ob-C.el --- org-babel functions for C and similar languages
 
-;; Copyright (C) 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -191,6 +191,6 @@ of the same value."
 
 (provide 'ob-C)
 
-;; arch-tag: 8f49e462-54e3-417b-9a8d-423864893b37
+
 
 ;;; ob-C.el ends here
diff --git a/lisp/org/ob-R.el b/lisp/org/ob-R.el
index 35cdcb90926..2b0e6d5e16a 100644
--- a/lisp/org/ob-R.el
+++ b/lisp/org/ob-R.el
@@ -1,8 +1,9 @@
 ;;; ob-R.el --- org-babel functions for R code evaluation
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
-;; Author: Eric Schulte, Dan Davison
+;; Author: Eric Schulte
+;;      Dan Davison
 ;; Keywords: literate programming, reproducible research, R, statistics
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7
@@ -312,6 +313,6 @@ Insert hline if column names in output have been requested."
 
 (provide 'ob-R)
 
-;; arch-tag: cd4c7298-503b-450f-a3c2-f3e74b630237
+
 
 ;;; ob-R.el ends here
diff --git a/lisp/org/ob-asymptote.el b/lisp/org/ob-asymptote.el
index d360cfc2274..6bae3581cf4 100644
--- a/lisp/org/ob-asymptote.el
+++ b/lisp/org/ob-asymptote.el
@@ -1,6 +1,6 @@
 ;;; ob-asymptote.el --- org-babel functions for asymptote evaluation
 
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -160,6 +160,6 @@ of int, where every cell must be of int type."
 
 (provide 'ob-asymptote)
 
-;; arch-tag: f2f5bd0d-78e8-412b-8e6c-6dadc94cc06b
+
 
 ;;; ob-asymptote.el ends here
diff --git a/lisp/org/ob-awk.el b/lisp/org/ob-awk.el
index 368957c2f9b..66e07bf175c 100644
--- a/lisp/org/ob-awk.el
+++ b/lisp/org/ob-awk.el
@@ -24,8 +24,6 @@
 
 ;;; Commentary:
 
-;;; Commentary:
-
 ;; Babel's awk can use special header argument:
 ;; 
 ;; - :in-file takes a path to a file of data to be processed by awk
@@ -114,6 +112,6 @@ Emacs-lisp table, otherwise return the results as a string."
 
 (provide 'ob-awk)
 
-;; arch-tag: 844e2c88-6aad-4018-868d-a2df6bcdf68f
+
 
 ;;; ob-awk.el ends here
diff --git a/lisp/org/ob-calc.el b/lisp/org/ob-calc.el
index 0f88ccf4dae..68694786729 100644
--- a/lisp/org/ob-calc.el
+++ b/lisp/org/ob-calc.el
@@ -1,6 +1,6 @@
 ;;; ob-calc.el --- org-babel functions for calc code evaluation
 
-;; Copyright (C) 2010  Free Software Foundation, Inc
+;; Copyright (C) 2010-2011  Free Software Foundation, Inc
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -99,6 +99,6 @@
 
 (provide 'ob-calc)
 
-;; arch-tag: 5c57a3b7-5818-4c6c-acda-7a94831a6449
+
 
 ;;; ob-calc.el ends here
diff --git a/lisp/org/ob-clojure.el b/lisp/org/ob-clojure.el
index d9bc213dfa2..090b60662f8 100644
--- a/lisp/org/ob-clojure.el
+++ b/lisp/org/ob-clojure.el
@@ -1,8 +1,9 @@
 ;;; ob-clojure.el --- org-babel functions for clojure evaluation
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
-;; Author: Joel Boehland, Eric Schulte
+;; Author: Joel Boehland
+;;      Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7
@@ -92,6 +93,6 @@
 
 (provide 'ob-clojure)
 
-;; arch-tag: a43b33f2-653e-46b1-ac56-2805cf05b7d1
+
 
 ;;; ob-clojure.el ends here
diff --git a/lisp/org/ob-comint.el b/lisp/org/ob-comint.el
index 4e238880ec2..efdac4d3818 100644
--- a/lisp/org/ob-comint.el
+++ b/lisp/org/ob-comint.el
@@ -1,6 +1,6 @@
 ;;; ob-comint.el --- org-babel functions for interaction with comint buffers
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research, comint
@@ -158,6 +158,6 @@ FILE exists at end of evaluation."
 
 (provide 'ob-comint)
 
-;; arch-tag: 9adddce6-0864-4be3-b0b5-6c5157dc7889
+
 
 ;;; ob-comint.el ends here
diff --git a/lisp/org/ob-css.el b/lisp/org/ob-css.el
index 25d75ccf80a..7bc97f82909 100644
--- a/lisp/org/ob-css.el
+++ b/lisp/org/ob-css.el
@@ -1,6 +1,6 @@
 ;;; ob-css.el --- org-babel functions for css evaluation
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -44,6 +44,6 @@ CSS does not support sessions."
 
 (provide 'ob-css)
 
-;; arch-tag: f4447e8c-50ab-41f9-b322-b7b9574d9fbe
+
 
 ;;; ob-css.el ends here
diff --git a/lisp/org/ob-ditaa.el b/lisp/org/ob-ditaa.el
index 810af9411f4..db638f6ef98 100644
--- a/lisp/org/ob-ditaa.el
+++ b/lisp/org/ob-ditaa.el
@@ -1,6 +1,6 @@
 ;;; ob-ditaa.el --- org-babel functions for ditaa evaluation
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -74,6 +74,6 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-ditaa)
 
-;; arch-tag: 492cd006-07d9-4fac-bef6-5bb60b48842e
+
 
 ;;; ob-ditaa.el ends here
diff --git a/lisp/org/ob-dot.el b/lisp/org/ob-dot.el
index 4bb4d532a43..cc78ac5bf95 100644
--- a/lisp/org/ob-dot.el
+++ b/lisp/org/ob-dot.el
@@ -1,6 +1,6 @@
 ;;; ob-dot.el --- org-babel functions for dot evaluation
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -85,6 +85,6 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-dot)
 
-;; arch-tag: 817d0516-7b47-4f77-a8b2-2aadd8e4d0e2
+
 
 ;;; ob-dot.el ends here
diff --git a/lisp/org/ob-emacs-lisp.el b/lisp/org/ob-emacs-lisp.el
index 5892aa5dc7a..2eccf19b6d1 100644
--- a/lisp/org/ob-emacs-lisp.el
+++ b/lisp/org/ob-emacs-lisp.el
@@ -1,6 +1,6 @@
 ;;; ob-emacs-lisp.el --- org-babel functions for emacs-lisp code evaluation
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -76,6 +76,6 @@
 
 (provide 'ob-emacs-lisp)
 
-;; arch-tag: e9a3acca-dc84-472a-9f5a-23c35befbcd6
+
 
 ;;; ob-emacs-lisp.el ends here
diff --git a/lisp/org/ob-eval.el b/lisp/org/ob-eval.el
index cc089cbaa32..e74be0b6e02 100644
--- a/lisp/org/ob-eval.el
+++ b/lisp/org/ob-eval.el
@@ -1,6 +1,6 @@
 ;;; ob-eval.el --- org-babel functions for external code evaluation
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research, comint
@@ -257,6 +257,6 @@ This buffer is named by `org-babel-error-buffer-name'."
 
 (provide 'ob-eval)
 
-;; arch-tag: 5328b17f-957d-42d9-94da-a2952682d04d
+
 
 ;;; ob-eval.el ends here
diff --git a/lisp/org/ob-exp.el b/lisp/org/ob-exp.el
index d65441e95c5..0fceb184c5e 100644
--- a/lisp/org/ob-exp.el
+++ b/lisp/org/ob-exp.el
@@ -1,8 +1,9 @@
 ;;; ob-exp.el --- Exportation of org-babel source blocks
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
-;; Author: Eric Schulte, Dan Davison
+;; Author: Eric Schulte
+;;      Dan Davison
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7
@@ -266,6 +267,6 @@ inhibit insertion of results into the buffer."
 
 (provide 'ob-exp)
 
-;; arch-tag: 523abf4c-76d1-44ed-9f27-e3bddf34bf0f
+
 
 ;;; ob-exp.el ends here
diff --git a/lisp/org/ob-gnuplot.el b/lisp/org/ob-gnuplot.el
index 8259cf839e5..9bf0433f9fc 100644
--- a/lisp/org/ob-gnuplot.el
+++ b/lisp/org/ob-gnuplot.el
@@ -1,6 +1,6 @@
 ;;; ob-gnuplot.el --- org-babel functions for gnuplot evaluation
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -230,6 +230,6 @@ Pass PARAMS through to `orgtbl-to-generic' when exporting TABLE."
 
 (provide 'ob-gnuplot)
 
-;; arch-tag: 50490ace-a9e1-4b29-a6e5-0db9f16c610b
+
 
 ;;; ob-gnuplot.el ends here
diff --git a/lisp/org/ob-haskell.el b/lisp/org/ob-haskell.el
index 63e76f6f139..cae07036c57 100644
--- a/lisp/org/ob-haskell.el
+++ b/lisp/org/ob-haskell.el
@@ -1,6 +1,6 @@
 ;;; ob-haskell.el --- org-babel functions for haskell evaluation
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -213,6 +213,6 @@ constructs (header arguments, no-web syntax etc...) are ignored."
 
 (provide 'ob-haskell)
 
-;; arch-tag: b53f75f3-ba1a-4b05-82d9-a2a0d4e70804
+
 
 ;;; ob-haskell.el ends here
diff --git a/lisp/org/ob-java.el b/lisp/org/ob-java.el
index 3f349fea271..20824d4cb30 100644
--- a/lisp/org/ob-java.el
+++ b/lisp/org/ob-java.el
@@ -69,6 +69,6 @@
 
 (provide 'ob-java)
 
-;; arch-tag: dd1cfb00-7f76-4ecf-922c-f7031b68b85e
+
 
 ;;; ob-java.el ends here
diff --git a/lisp/org/ob-js.el b/lisp/org/ob-js.el
index f9c1722eb65..9e6751c9525 100644
--- a/lisp/org/ob-js.el
+++ b/lisp/org/ob-js.el
@@ -1,28 +1,26 @@
 ;;; ob-js.el --- org-babel functions for Javascript
 
-;; Copyright (C) 2010 Free Software Foundation
+;; Copyright (C) 2010-2011 Free Software Foundation
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research, js
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7
 
-;;; License:
+;; This file is part of GNU Emacs.
 
-;; This program is free software; you can redistribute it and/or modify
+;; 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, or (at your option)
-;; any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
+;; 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; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -35,7 +33,7 @@
 
 ;; - a non-browser javascript engine such as node.js http://nodejs.org/
 ;;   or mozrepl http://wiki.github.com/bard/mozrepl/
-;; 
+;;
 ;; - for session based evaluation mozrepl and moz.el are required see
 ;;   http://wiki.github.com/bard/mozrepl/emacs-integration for
 ;;   configuration instructions
@@ -160,6 +158,6 @@ then create.  Return the initialized session."
 
 (provide 'ob-js)
 
-;; arch-tag: 84401fb3-b8d9-4bb6-9a90-cbe2d103d494
+
 
 ;;; ob-js.el ends here
diff --git a/lisp/org/ob-keys.el b/lisp/org/ob-keys.el
index b55913599cc..b56ba5cf01a 100644
--- a/lisp/org/ob-keys.el
+++ b/lisp/org/ob-keys.el
@@ -1,6 +1,6 @@
 ;;; ob-keys.el --- key bindings for org-babel
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -97,6 +97,6 @@ a-list placed behind the generic `org-babel-key-prefix'.")
 
 (provide 'ob-keys)
 
-;; arch-tag: 01e348ee-4906-46fa-839a-6b7b6f989048
+
 
 ;;; ob-keys.el ends here
diff --git a/lisp/org/ob-latex.el b/lisp/org/ob-latex.el
index 2121a8e5296..c27ca33080a 100644
--- a/lisp/org/ob-latex.el
+++ b/lisp/org/ob-latex.el
@@ -1,6 +1,6 @@
 ;;; ob-latex.el --- org-babel functions for latex "evaluation"
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -176,6 +176,6 @@ Extracted from `org-export-as-pdf' in org-latex.el."
 
 (provide 'ob-latex)
 
-;; arch-tag: 1f13f7e2-26de-4c24-9274-9f331d4c6ff3
+
 
 ;;; ob-latex.el ends here
diff --git a/lisp/org/ob-ledger.el b/lisp/org/ob-ledger.el
index 425a3458685..a5bdcbf2f73 100644
--- a/lisp/org/ob-ledger.el
+++ b/lisp/org/ob-ledger.el
@@ -1,6 +1,6 @@
 ;;; ob-ledger.el --- org-babel functions for ledger evaluation
 
-;; Copyright (C) 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric S Fraga
 ;; Keywords: literate programming, reproducible research, accounting
@@ -67,6 +67,6 @@ called by `org-babel-execute-src-block'."
 
 (provide 'ob-ledger)
 
-;; arch-tag: 7bbb529e-95a1-4236-9d29-b0000b918c7c
+
 
 ;;; ob-ledger.el ends here
diff --git a/lisp/org/ob-lilypond.el b/lisp/org/ob-lilypond.el
index 23f5d511d34..23fc8f04c34 100644
--- a/lisp/org/ob-lilypond.el
+++ b/lisp/org/ob-lilypond.el
@@ -1,6 +1,6 @@
 ;;; ob-lilypond.el --- org-babel functions for lilypond evaluation
 
-;; Copyright (C) 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
 
 ;; Author: Martyn Jago
 ;; Keywords: babel language, literate programming
@@ -442,6 +442,6 @@ dependent on LY-ARRANGE-MODE"
 
 (provide 'ob-lilypond)
 
-;; arch-tag: ac449eea-2cf2-4dc5-ae33-426f57ba4894
+
 
 ;;; ob-lilypond.el ends here
diff --git a/lisp/org/ob-lisp.el b/lisp/org/ob-lisp.el
index 97e8a97b24b..4ff9c4076ec 100644
--- a/lisp/org/ob-lisp.el
+++ b/lisp/org/ob-lisp.el
@@ -1,8 +1,10 @@
 ;;; ob-lisp.el --- org-babel functions for common lisp evaluation
 
-;; Copyright (C) 2009, 2010, 2011  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
-;; Author: Joel Boehland, Eric Schulte, David T. O'Toole <dto@gnu.org>
+;; Author: Joel Boehland
+;;      Eric Schulte
+;;      David T. O'Toole <dto@gnu.org>
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7
@@ -101,6 +103,6 @@ current directory string."
 
 (provide 'ob-lisp)
 
-;; arch-tag: 18086168-009f-4947-bbb5-3532375d851d
+
 
 ;;; ob-lisp.el ends here
diff --git a/lisp/org/ob-lob.el b/lisp/org/ob-lob.el
index 5c4894d4510..5cb40a057f3 100644
--- a/lisp/org/ob-lob.el
+++ b/lisp/org/ob-lob.el
@@ -1,8 +1,9 @@
 ;;; ob-lob.el --- functions supporting the Library of Babel
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
-;; Author: Eric Schulte, Dan Davison
+;; Author: Eric Schulte
+;;      Dan Davison
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7
@@ -136,6 +137,6 @@ if so then run the appropriate source block from the Library."
 
 (provide 'ob-lob)
 
-;; arch-tag: ce0712c9-2147-4019-ba3f-42341b8b474b
+
 
 ;;; ob-lob.el ends here
diff --git a/lisp/org/ob-matlab.el b/lisp/org/ob-matlab.el
index 3ddb3065fc7..bb32c5a29f5 100644
--- a/lisp/org/ob-matlab.el
+++ b/lisp/org/ob-matlab.el
@@ -1,6 +1,6 @@
 ;;; ob-matlab.el --- org-babel support for matlab evaluation
 
-;; Copyright (C) 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
 
 ;; Author: Dan Davison
 ;; Keywords: literate programming, reproducible research
@@ -43,6 +43,6 @@
 
 (provide 'ob-matlab)
 
-;; arch-tag: 6b234299-c1f7-4eb1-ace8-7b93344065ac
+
 
 ;;; ob-matlab.el ends here
diff --git a/lisp/org/ob-maxima.el b/lisp/org/ob-maxima.el
index 7534065f1f7..279ba6b928b 100644
--- a/lisp/org/ob-maxima.el
+++ b/lisp/org/ob-maxima.el
@@ -1,28 +1,27 @@
 ;;; ob-maxima.el --- org-babel functions for maxima evaluation
 
-;; Copyright (c) 2009, 2010, 2011 Eric S Fraga, Eric Schulte
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
-;; Author: Eric S Fraga, Eric Schulte
+;; Author: Eric S Fraga
+;;         Eric Schulte
 ;; Keywords: literate programming, reproducible research, maxima
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7
 
-;;; License:
+;; This file is part of GNU Emacs.
 
-;; This program is free software; you can redistribute it and/or modify
+;; 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, or (at your option)
-;; any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
+;; 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; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -75,6 +74,6 @@ called by `org-babel-execute-src-block'."
 
 (provide 'ob-maxima)
 
-;; arch-tag: d86c97ac-7eab-4349-8d8b-302dd09779a8
+
 
 ;;; ob-maxima.el ends here
diff --git a/lisp/org/ob-mscgen.el b/lisp/org/ob-mscgen.el
index f96ba9a600b..dc800a875c6 100644
--- a/lisp/org/ob-mscgen.el
+++ b/lisp/org/ob-mscgen.el
@@ -1,6 +1,6 @@
 ;;; ob-msc.el --- org-babel functions for mscgen evaluation
 
-;; Copyright (C) 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
 
 ;; Author: Juan Pechiar
 ;; Keywords: literate programming, reproducible research
@@ -81,6 +81,6 @@ ERROR: no output file specified. Add \":file name.png\" to the src header"))
 
 (provide 'ob-mscgen)
 
-;; arch-tag: 74695b1e-715f-4b5a-a3a9-d78ee39ba5c8
+
 
 ;;; ob-msc.el ends here
diff --git a/lisp/org/ob-ocaml.el b/lisp/org/ob-ocaml.el
index c4b40c46cb8..ee7a7cc212c 100644
--- a/lisp/org/ob-ocaml.el
+++ b/lisp/org/ob-ocaml.el
@@ -1,6 +1,6 @@
 ;;; ob-ocaml.el --- org-babel functions for ocaml evaluation
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -140,6 +140,6 @@ Emacs-lisp table, otherwise return the results as a string."
 
 (provide 'ob-ocaml)
 
-;; arch-tag: 2e815f4d-365e-4d69-b1df-dd17fdd7b7b7
+
 
 ;;; ob-ocaml.el ends here
diff --git a/lisp/org/ob-octave.el b/lisp/org/ob-octave.el
index ac434b4abb6..2003a6f18f7 100644
--- a/lisp/org/ob-octave.el
+++ b/lisp/org/ob-octave.el
@@ -1,6 +1,6 @@
 ;;; ob-octave.el --- org-babel functions for octave and matlab evaluation
 
-;; Copyright (C) 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
 
 ;; Author: Dan Davison
 ;; Keywords: literate programming, reproducible research
@@ -258,6 +258,6 @@ This removes initial blank and comment lines and then calls
 
 (provide 'ob-octave)
 
-;; arch-tag: d8e5f68b-ba13-440a-a495-b653e989e704
+
 
 ;;; ob-octave.el ends here
diff --git a/lisp/org/ob-org.el b/lisp/org/ob-org.el
index 74071363747..37256d015c7 100644
--- a/lisp/org/ob-org.el
+++ b/lisp/org/ob-org.el
@@ -1,6 +1,6 @@
 ;;; ob-org.el --- org-babel functions for org code block evaluation
 
-;; Copyright (C) 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -66,6 +66,6 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-org)
 
-;; arch-tag: 130af5fe-cc56-46bd-9508-fa0ebd94cb1f
+
 
 ;;; ob-org.el ends here
diff --git a/lisp/org/ob-perl.el b/lisp/org/ob-perl.el
index ec93c729e7b..13d71413731 100644
--- a/lisp/org/ob-perl.el
+++ b/lisp/org/ob-perl.el
@@ -1,8 +1,9 @@
 ;;; ob-perl.el --- org-babel functions for perl evaluation
 
-;; Copyright (C) 2009, 2010  Free Software Foundation
+;; Copyright (C) 2009-2011  Free Software Foundation
 
-;; Author: Dan Davison, Eric Schulte
+;; Author: Dan Davison
+;;      Eric Schulte
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7
@@ -113,6 +114,6 @@ return the value of the last statement in BODY, as elisp."
 
 (provide 'ob-perl)
 
-;; arch-tag: 88ef9396-d857-4dc3-8946-5a72bdfa2337
+
 
 ;;; ob-perl.el ends here
diff --git a/lisp/org/ob-plantuml.el b/lisp/org/ob-plantuml.el
index b226a5342ff..9fa55727592 100644
--- a/lisp/org/ob-plantuml.el
+++ b/lisp/org/ob-plantuml.el
@@ -1,6 +1,6 @@
 ;;; ob-plantuml.el --- org-babel functions for plantuml evaluation
 
-;; Copyright (C) 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
 
 ;; Author: Zhang Weize
 ;; Keywords: literate programming, reproducible research
@@ -80,6 +80,6 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-plantuml)
 
-;; arch-tag: 451f50c5-e779-407e-ad64-70e0e8f161d1
+
 
 ;;; ob-plantuml.el ends here
diff --git a/lisp/org/ob-python.el b/lisp/org/ob-python.el
index 0fe0b4fefd8..5234d83ecee 100644
--- a/lisp/org/ob-python.el
+++ b/lisp/org/ob-python.el
@@ -1,8 +1,9 @@
 ;;; ob-python.el --- org-babel functions for python evaluation
 
-;; Copyright (C) 2009, 2010  Free Software Foundation
+;; Copyright (C) 2009-2011  Free Software Foundation
 
-;; Author: Eric Schulte, Dan Davison
+;; Author: Eric Schulte
+;;      Dan Davison
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7
@@ -294,6 +295,6 @@ last statement in BODY, as elisp."
 
 (provide 'ob-python)
 
-;; arch-tag: f19b6c3d-dfcb-4a1a-9ce0-45ade1ebc212
+
 
 ;;; ob-python.el ends here
diff --git a/lisp/org/ob-ref.el b/lisp/org/ob-ref.el
index d6ad39ed073..d0a2c14bee9 100644
--- a/lisp/org/ob-ref.el
+++ b/lisp/org/ob-ref.el
@@ -1,8 +1,9 @@
 ;;; ob-ref.el --- org-babel functions for referencing external data
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
-;; Author: Eric Schulte, Dan Davison
+;; Author: Eric Schulte
+;;      Dan Davison
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7
@@ -60,8 +61,6 @@
 (declare-function org-narrow-to-subtree "org" ())
 (declare-function org-id-find-id-in-file "org-id" (id file &optional markerp))
 (declare-function org-show-context "org" (&optional key))
-(declare-function org-pop-to-buffer-same-window 
-                  "org-compat" (&optional buffer-or-name norecord label))
 
 (defvar org-babel-ref-split-regexp
   "[ \f\t\n\r\v]*\\(.+?\\)[ \f\t\n\r\v]*=[ \f\t\n\r\v]*\\(.+\\)[ \f\t\n\r\v]*")
@@ -95,7 +94,7 @@ the variable."
                (m (when file (org-id-find-id-in-file id file 'marker))))
           (when (and file m)
             (message "file:%S" file)
-            (org-pop-to-buffer-same-window (marker-buffer m))
+            (switch-to-buffer (marker-buffer m))
             (goto-char m)
             (move-marker m nil)
             (org-show-context)
@@ -263,6 +262,6 @@ Supported reference types are tables and source blocks."
 
 (provide 'ob-ref)
 
-;; arch-tag: ace4a4f4-ea38-4dac-8fe6-6f52fcc43b6d
+
 
 ;;; ob-ref.el ends here
diff --git a/lisp/org/ob-ruby.el b/lisp/org/ob-ruby.el
index f0ed1a16676..02089b4a214 100644
--- a/lisp/org/ob-ruby.el
+++ b/lisp/org/ob-ruby.el
@@ -1,6 +1,6 @@
 ;;; ob-ruby.el --- org-babel functions for ruby evaluation
 
-;; Copyright (C) 2009, 2010  Free Software Foundation
+;; Copyright (C) 2009-2011  Free Software Foundation
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -241,6 +241,6 @@ return the value of the last statement in BODY, as elisp."
 
 (provide 'ob-ruby)
 
-;; arch-tag: 3e9726db-4520-49e2-b263-e8f571ac88f5
+
 
 ;;; ob-ruby.el ends here
diff --git a/lisp/org/ob-sass.el b/lisp/org/ob-sass.el
index c51a4433426..162113ea5a8 100644
--- a/lisp/org/ob-sass.el
+++ b/lisp/org/ob-sass.el
@@ -1,6 +1,6 @@
 ;;; ob-sass.el --- org-babel functions for the sass css generation language
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -68,6 +68,6 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-sass)
 
-;; arch-tag: 2954b169-eef4-45ce-a8e5-3e619f0f07ac
+
 
 ;;; ob-sass.el ends here
diff --git a/lisp/org/ob-scheme.el b/lisp/org/ob-scheme.el
index a772151aee4..3e93a3a74f7 100644
--- a/lisp/org/ob-scheme.el
+++ b/lisp/org/ob-scheme.el
@@ -1,28 +1,26 @@
 ;;; ob-scheme.el --- org-babel functions for Scheme
 
-;; Copyright (C) 2010 Free Software Foundation
+;; Copyright (C) 2010-2011 Free Software Foundation
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research, scheme
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7
 
-;;; License:
+;; This file is part of GNU Emacs.
 
-;; This program is free software; you can redistribute it and/or modify
+;; 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, or (at your option)
-;; any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
+;; 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; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -35,7 +33,7 @@
 
 ;; - a working scheme implementation
 ;;   (e.g. guile http://www.gnu.org/software/guile/guile.html)
-;;   
+;;
 ;; - for session based evaluation cmuscheme.el is required which is
 ;;   included in Emacs
 
@@ -134,6 +132,6 @@ then create.  Return the initialized session."
 
 (provide 'ob-scheme)
 
-;; arch-tag: 6b2fe76f-4b25-4e87-ad1c-225b2f282a71
+
 
 ;;; ob-scheme.el ends here
diff --git a/lisp/org/ob-screen.el b/lisp/org/ob-screen.el
index a9a3c5c794a..084beffd229 100644
--- a/lisp/org/ob-screen.el
+++ b/lisp/org/ob-screen.el
@@ -1,6 +1,6 @@
 ;;; ob-screen.el --- org-babel support for interactive terminal
 
-;; Copyright (C) 2009, 2010  Free Software Foundation
+;; Copyright (C) 2009-2011  Free Software Foundation
 
 ;; Author: Benjamin Andresen
 ;; Keywords: literate programming, interactive shell
@@ -142,6 +142,6 @@ The terminal should shortly flicker."
 
 (provide 'ob-screen)
 
-;; arch-tag: 908e5afe-89a0-4f27-b982-23f1f2e3bac9
+
 
 ;;; ob-screen.el ends here
diff --git a/lisp/org/ob-sh.el b/lisp/org/ob-sh.el
index 9349a842a60..f46ba45770a 100644
--- a/lisp/org/ob-sh.el
+++ b/lisp/org/ob-sh.el
@@ -1,6 +1,6 @@
 ;;; ob-sh.el --- org-babel functions for shell evaluation
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -193,6 +193,6 @@ return the value of the last statement in BODY."
 
 (provide 'ob-sh)
 
-;; arch-tag: 416dd531-c230-4b0a-a5bf-8d948f990f2d
+
 
 ;;; ob-sh.el ends here
diff --git a/lisp/org/ob-sql.el b/lisp/org/ob-sql.el
index 8fc7d3b4f84..9274438c18e 100644
--- a/lisp/org/ob-sql.el
+++ b/lisp/org/ob-sql.el
@@ -1,6 +1,6 @@
 ;;; ob-sql.el --- org-babel functions for sql evaluation
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -140,6 +140,6 @@ This function is called by `org-babel-execute-src-block'."
 
 (provide 'ob-sql)
 
-;; arch-tag: a43ff944-6de1-4566-a83c-626814e3dad2
+
 
 ;;; ob-sql.el ends here
diff --git a/lisp/org/ob-sqlite.el b/lisp/org/ob-sqlite.el
index 3162fcca81f..c08c7f38e8a 100644
--- a/lisp/org/ob-sqlite.el
+++ b/lisp/org/ob-sqlite.el
@@ -1,6 +1,6 @@
 ;;; ob-sqlite.el --- org-babel functions for sqlite database interaction
 
-;; Copyright (C) 2010  Free Software Foundation
+;; Copyright (C) 2010-2011  Free Software Foundation
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -145,6 +145,6 @@ Prepare SESSION according to the header arguments specified in PARAMS."
 
 (provide 'ob-sqlite)
 
-;; arch-tag: 5c03d7f2-0f72-48b8-bbd1-35aafea248ac
+
 
 ;;; ob-sqlite.el ends here
diff --git a/lisp/org/ob-table.el b/lisp/org/ob-table.el
index 91e238f254b..ea253b2f048 100644
--- a/lisp/org/ob-table.el
+++ b/lisp/org/ob-table.el
@@ -1,6 +1,6 @@
 ;;; ob-table.el --- support for calling org-babel functions from tables
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -121,6 +121,6 @@ example above."
 
 (provide 'ob-table)
 
-;; arch-tag: 4234cc7c-4fc8-4e92-abb0-2892de1a493b
+
 
 ;;; ob-table.el ends here
diff --git a/lisp/org/ob-tangle.el b/lisp/org/ob-tangle.el
index d4fb60618be..26549126009 100644
--- a/lisp/org/ob-tangle.el
+++ b/lisp/org/ob-tangle.el
@@ -1,6 +1,6 @@
 ;;; ob-tangle.el --- extract source code from org-mode files
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
@@ -494,6 +494,6 @@ which enable the original code blocks to be found."
 
 (provide 'ob-tangle)
 
-;; arch-tag: 413ced93-48f5-4216-86e4-3fc5df8c8f24
+
 
 ;;; ob-tangle.el ends here
diff --git a/lisp/org/ob.el b/lisp/org/ob.el
index 0de0aa661c5..728c6c5cb5e 100644
--- a/lisp/org/ob.el
+++ b/lisp/org/ob.el
@@ -1,8 +1,9 @@
 ;;; ob.el --- working with code blocks in org-mode
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
-;; Author: Eric Schulte, Dan Davison
+;; Author: Eric Schulte
+;;      Dan Davison
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7
@@ -137,7 +138,7 @@ remove code block execution from the C-c C-c keybinding."
    ;; (4) header arguments
    "\\([^\n]*\\)\n"
    ;; (5) body
-   "\\([^\000]*?\\)[ \t]*#\\+end_src")
+   "\\([^\000]*?\n\\)?[ \t]*#\\+end_src")
   "Regexp used to identify code blocks.")
 
 (defvar org-babel-inline-src-block-regexp
@@ -2198,6 +2199,6 @@ of `org-babel-temporary-directory'."
 
 (provide 'ob)
 
-;; arch-tag: 01a7ebee-06c5-4ee4-a709-e660d28c0af1
+
 
 ;;; ob.el ends here
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index d47013b76f1..aea284fe72c 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -1,7 +1,6 @@
 ;;; org-agenda.el --- Dynamic task and appointment lists for Org
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -61,8 +60,6 @@
 (declare-function org-is-habit-p "org-habit" (&optional pom))
 (declare-function org-habit-parse-todo "org-habit" (&optional pom))
 (declare-function org-habit-get-priority "org-habit" (habit &optional moment))
-(declare-function org-pop-to-buffer-same-window "org-compat" 
-                  (&optional buffer-or-name norecord label))
 
 (defvar calendar-mode-map)
 (defvar org-clock-current-task) ; defined in org-clock.el
@@ -3068,7 +3065,7 @@ the global options and expect it to be applied to the entire view.")
        (awin (select-window awin))
        ((not (setq org-pre-agenda-window-conf (current-window-configuration))))
        ((equal org-agenda-window-setup 'current-window)
-        (org-pop-to-buffer-same-window abuf))
+        (switch-to-buffer abuf))
        ((equal org-agenda-window-setup 'other-window)
         (org-switch-to-buffer-other-window abuf))
        ((equal org-agenda-window-setup 'other-frame)
@@ -3079,7 +3076,7 @@ the global options and expect it to be applied to the entire view.")
       ;; additional test in case agenda is invoked from within agenda
       ;; buffer via elisp link
       (unless (equal (current-buffer) abuf)
-        (org-pop-to-buffer-same-window abuf)))
+        (switch-to-buffer abuf)))
     (setq buffer-read-only nil)
     (let ((inhibit-read-only t)) (erase-buffer))
     (org-agenda-mode)
@@ -6973,7 +6970,7 @@ at the text of the entry itself."
                        (org-agenda-error)))
            (buffer (marker-buffer marker))
            (pos (marker-position marker)))
-      (org-pop-to-buffer-same-window buffer)
+      (switch-to-buffer buffer)
       (and delete-other-windows (delete-other-windows))
       (widen)
       (goto-char pos)
@@ -8446,6 +8443,6 @@ belonging to the \"Work\" category."
 
 (provide 'org-agenda)
 
-;; arch-tag: 77f7565d-7c4b-44af-a2df-9f6f7070cff1
+
 
 ;;; org-agenda.el ends here
diff --git a/lisp/org/org-archive.el b/lisp/org/org-archive.el
index 6c46b511786..7436696433c 100644
--- a/lisp/org/org-archive.el
+++ b/lisp/org/org-archive.el
@@ -1,7 +1,6 @@
 ;;; org-archive.el --- Archiving for Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -483,6 +482,6 @@ This command is set with the variable `org-archive-default-command'."
 
 (provide 'org-archive)
 
-;; arch-tag: 0837f601-9699-43c3-8b90-631572ae6c85
+
 
 ;;; org-archive.el ends here
diff --git a/lisp/org/org-ascii.el b/lisp/org/org-ascii.el
index 8c37f9c08df..d6a4e30714b 100644
--- a/lisp/org/org-ascii.el
+++ b/lisp/org/org-ascii.el
@@ -1,7 +1,6 @@
 ;;; org-ascii.el --- ASCII export for Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -726,5 +725,5 @@ publishing directory."
 
 (provide 'org-ascii)
 
-;; arch-tag: aa96f882-f477-4e13-86f5-70d43e7adf3c
+
 ;;; org-ascii.el ends here
diff --git a/lisp/org/org-attach.el b/lisp/org/org-attach.el
index 809ec159496..aa8c476e89b 100644
--- a/lisp/org/org-attach.el
+++ b/lisp/org/org-attach.el
@@ -1,6 +1,6 @@
 ;;; org-attach.el --- Manage file attachments to org-mode tasks
 
-;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@newartisans.com>
 ;; Keywords: org data task
@@ -437,5 +437,5 @@ prefix."
 
 (provide 'org-attach)
 
-;; arch-tag: fce93c2e-fe07-4fa3-a905-e10dcc7a6248
+
 ;;; org-attach.el ends here
diff --git a/lisp/org/org-bbdb.el b/lisp/org/org-bbdb.el
index b405718a49a..a7b6efae836 100644
--- a/lisp/org/org-bbdb.el
+++ b/lisp/org/org-bbdb.el
@@ -1,7 +1,6 @@
 ;;; org-bbdb.el --- Support for links to BBDB entries from within Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>,
 ;;         Thomas Baumann <thomas dot baumann at ch dot tum dot de>
@@ -392,6 +391,6 @@ END:VEVENT\n"
 
 (provide 'org-bbdb)
 
-;; arch-tag: 9e4f275d-d080-48c1-b040-62247f66b5c2
+
 
 ;;; org-bbdb.el ends here
diff --git a/lisp/org/org-beamer.el b/lisp/org/org-beamer.el
index 97f17c043af..5cebe50efd1 100644
--- a/lisp/org/org-beamer.el
+++ b/lisp/org/org-beamer.el
@@ -1,6 +1,6 @@
 ;;; org-beamer.el --- Beamer-specific LaTeX export for org-mode
 ;;
-;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
 ;;
 ;; Version: 7.7
 ;; Author: Carsten Dominik <carsten.dominik AT gmail DOT com>
@@ -632,6 +632,6 @@ include square brackets."
 
 (provide 'org-beamer)
 
-;; arch-tag: 68bac91a-a946-43a3-8173-a9269306f67c
+
 
 ;;; org-beamer.el ends here
diff --git a/lisp/org/org-bibtex.el b/lisp/org/org-bibtex.el
index da6c1fec58c..5c9b37b2341 100644
--- a/lisp/org/org-bibtex.el
+++ b/lisp/org/org-bibtex.el
@@ -1,6 +1,6 @@
 ;;; org-bibtex.el --- Org links to BibTeX entries
 ;;
-;; Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
 ;;
 ;; Author: Bastien Guerry <bzg at altern dot org>
 ;;         Carsten Dominik <carsten dot dominik at gmail dot com>
@@ -642,6 +642,6 @@ This function relies `org-search-view' to locate results."
 
 (provide 'org-bibtex)
 
-;; arch-tag: 83987d5a-01b8-41c7-85bc-77700f1285f5
+
 
 ;;; org-bibtex.el ends here
diff --git a/lisp/org/org-capture.el b/lisp/org/org-capture.el
index d2a011249c9..05cca0e311e 100644
--- a/lisp/org/org-capture.el
+++ b/lisp/org/org-capture.el
@@ -1,6 +1,6 @@
 ;;; org-capture.el --- Fast note taking in Org-mode
 
-;; Copyright (C) 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -57,8 +57,6 @@
                   (date &optional keep-restriction))
 (declare-function org-table-get-specials "org-table" ())
 (declare-function org-table-goto-line "org-table" (N))
-(declare-function org-pop-to-buffer-same-window "org-compat" 
-                  (&optional buffer-or-name norecord label))
 
 (defvar org-remember-default-headline)
 (defvar org-remember-templates)
@@ -1201,7 +1199,7 @@ The user is queried for the template."
       (error "No capture template selected"))
     (org-capture-set-plist entry)
     (org-capture-set-target-location)
-    (org-pop-to-buffer-same-window (org-capture-get :buffer))
+    (switch-to-buffer (org-capture-get :buffer))
     (goto-char (org-capture-get :pos))))
 
 (defun org-capture-get-indirect-buffer (&optional buffer prefix)
@@ -1311,7 +1309,7 @@ The template may still contain \"%?\" for cursor positioning."
             (sit-for 1))
     (save-window-excursion
       (delete-other-windows)
-      (org-pop-to-buffer-same-window (get-buffer-create "*Capture*"))
+      (switch-to-buffer (get-buffer-create "*Capture*"))
       (erase-buffer)
       (insert template)
       (goto-char (point-min))
@@ -1505,6 +1503,6 @@ The template may still contain \"%?\" for cursor positioning."
 
 (provide 'org-capture)
 
-;; arch-tag: 986bf41b-8ada-4e28-bf20-e8388a7205a0
+
 
 ;;; org-capture.el ends here
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index 91d4ef11193..de5087e163c 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -1,7 +1,6 @@
 ;;; org-clock.el --- The time clocking code for Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -37,7 +36,6 @@
 
 (declare-function calendar-absolute-from-iso "cal-iso" (&optional date))
 (declare-function notifications-notify "notifications" (&rest params))
-(declare-function org-pop-to-buffer-same-window "org-compat" (&optional buffer-or-name norecord label))
 (defvar org-time-stamp-formats)
 (defvar org-ts-what)
 
@@ -1499,7 +1497,7 @@ With prefix arg SELECT, offer recently clocked tasks for selection."
               (setq recent t)
               (car org-clock-history))
              (t (error "No active or recent clock task")))))
-    (org-pop-to-buffer-same-window (marker-buffer m))
+    (switch-to-buffer (marker-buffer m))
     (if (or (< m (point-min)) (> m (point-max))) (widen))
     (goto-char m)
     (org-show-entry)
@@ -2640,7 +2638,7 @@ The details of what will be saved are regulated by the variable
 
 (provide 'org-clock)
 
-;; arch-tag: 7b42c5d4-9b36-48be-97c0-66a869daed4c
+
 
 ;;; org-clock.el ends here
 
diff --git a/lisp/org/org-colview.el b/lisp/org/org-colview.el
index debc92a101d..05df6bb7524 100644
--- a/lisp/org/org-colview.el
+++ b/lisp/org/org-colview.el
@@ -1,7 +1,6 @@
 ;;; org-colview.el --- Column View in Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -1526,6 +1525,6 @@ The string should be two numbers joined with a \"-\"."
 
 (provide 'org-colview)
 
-;; arch-tag: 61f5128d-747c-4983-9479-e3871fa3d73c
+
 
 ;;; org-colview.el ends here
diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el
index e96918cbcb5..896acc5aeae 100644
--- a/lisp/org/org-compat.el
+++ b/lisp/org/org-compat.el
@@ -1,7 +1,6 @@
 ;;; org-compat.el --- Compatibility code for Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -433,17 +432,8 @@ With two arguments, return floor and remainder of their quotient."
   (let ((q (floor x y)))
     (list q (- x (if y (* y q) q)))))
 
-;; `pop-to-buffer-same-window' has been introduced with Emacs 24.1.
-(defun org-pop-to-buffer-same-window
-  (&optional buffer-or-name norecord label)
-  "Pop to buffer specified by BUFFER-OR-NAME in the selected window."
-  (if (fboundp 'pop-to-buffer-same-window)
-      (funcall
-       'pop-to-buffer-same-window buffer-or-name norecord label)
-    (funcall 'switch-to-buffer buffer-or-name norecord)))
-
 (provide 'org-compat)
 
-;; arch-tag: a0a0579f-e68c-4bdf-9e55-93768b846bbe
+
 
 ;;; org-compat.el ends here
diff --git a/lisp/org/org-crypt.el b/lisp/org/org-crypt.el
index 28d92cc63f7..b260391a0da 100644
--- a/lisp/org/org-crypt.el
+++ b/lisp/org/org-crypt.el
@@ -1,6 +1,6 @@
 ;;; org-crypt.el --- Public key encryption for org-mode entries
 
-;; Copyright (C) 2007, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2009-2011  Free Software Foundation, Inc.
 
 ;; Emacs Lisp Archive Entry
 ;; Filename: org-crypt.el
@@ -252,6 +252,6 @@ nil      : Leave auto-save-mode enabled.
 
 (provide 'org-crypt)
 
-;; arch-tag: 8202ed2c-221e-4001-9e4b-54674a7e846e
+
 
 ;;; org-crypt.el ends here
diff --git a/lisp/org/org-ctags.el b/lisp/org/org-ctags.el
index f28823f30e9..48eced9ea08 100644
--- a/lisp/org/org-ctags.el
+++ b/lisp/org/org-ctags.el
@@ -1,6 +1,6 @@
 ;;; org-ctags.el - Integrate Emacs "tags" facility with org mode.
 ;;
-;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
 
 ;; Author: Paul Sexton <eeeickythump@gmail.com>
 ;; Version: 7.7
@@ -140,8 +140,6 @@
 
 (require 'org)
 
-(declare-function org-pop-to-buffer-same-window "org-compat" (&optional buffer-or-name norecord label))
-
 (defgroup org-ctags nil
   "Options concerning use of ctags within org mode."
   :tag "Org-Ctags"
@@ -387,7 +385,7 @@ the new file."
     (cond
      ((get-buffer (concat name ".org"))
       ;; Buffer is already open
-      (org-pop-to-buffer-same-window (get-buffer (concat name ".org"))))
+      (switch-to-buffer (get-buffer (concat name ".org"))))
      ((file-exists-p filename)
       ;; File exists but is not open --> open it
       (message "Opening existing org file `%S'..."
@@ -539,5 +537,5 @@ a new topic."
 
 (provide 'org-ctags)
 
-;; arch-tag: 4b1ddd5a-8529-4b17-bcde-96a922d26343
+
 ;;; org-ctags.el ends here
diff --git a/lisp/org/org-datetree.el b/lisp/org/org-datetree.el
index 11e81a8a155..f02f3789823 100644
--- a/lisp/org/org-datetree.el
+++ b/lisp/org/org-datetree.el
@@ -1,6 +1,6 @@
 ;;; org-datetree.el --- Create date entries in a tree
 
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -195,6 +195,6 @@ before running this command, even though the command tries to be smart."
 
 (provide 'org-datetree)
 
-;; arch-tag: 1daea962-fd08-448b-9f98-6e8b511b3601
+
 
 ;;; org-datetree.el ends here
diff --git a/lisp/org/org-docbook.el b/lisp/org/org-docbook.el
index bb17a4dcde2..f964a93fa1c 100644
--- a/lisp/org/org-docbook.el
+++ b/lisp/org/org-docbook.el
@@ -1,6 +1,6 @@
 ;;; org-docbook.el --- DocBook exporter for org-mode
 ;;
-;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
 ;;
 ;; Emacs Lisp Archive Entry
 ;; Filename: org-docbook.el
@@ -1445,5 +1445,5 @@ the alist of previous items."
 
 (provide 'org-docbook)
 
-;; arch-tag: a24a127c-d365-4c2a-9e9b-f7dcb0ebfdc3
+
 ;;; org-docbook.el ends here
diff --git a/lisp/org/org-docview.el b/lisp/org/org-docview.el
index e13cdfd666a..201567251d7 100644
--- a/lisp/org/org-docview.el
+++ b/lisp/org/org-docview.el
@@ -1,6 +1,6 @@
 ;;; org-docview.el --- support for links to doc-view-mode buffers
 
-;; Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Jan Böcker <jan.boecker at jboecker dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -88,6 +88,6 @@ and append it."
 
 (provide 'org-docview)
 
-;; arch-tag: dd147a78-cce1-481b-b40a-15869417debe
+
 
 ;;; org-docview.el ends here
diff --git a/lisp/org/org-entities.el b/lisp/org/org-entities.el
index 0146abb07cf..1e7fd627a17 100644
--- a/lisp/org/org-entities.el
+++ b/lisp/org/org-entities.el
@@ -1,6 +1,6 @@
 ;;; org-entities.el --- Support for special entities in Org-mode
 
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2011 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>,
 ;;         Ulf Stegemann <ulf at zeitform dot de>
@@ -568,6 +568,6 @@ Kind can be any of `latex', `html', `ascii', `latin1', or `utf8'."
 ;; coding: utf-8
 ;; End:
 
-;; arch-tag: e6bd163f-7419-4009-9c93-a74623016424
+
 
 ;;; org-entities.el ends here
diff --git a/lisp/org/org-exp-blocks.el b/lisp/org/org-exp-blocks.el
index 43cb9d10f03..398da3859d0 100644
--- a/lisp/org/org-exp-blocks.el
+++ b/lisp/org/org-exp-blocks.el
@@ -1,7 +1,6 @@
 ;;; org-exp-blocks.el --- pre-process blocks when exporting org files
 
-;; Copyright (C) 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Version: 7.7
@@ -377,5 +376,5 @@ other backends, it converts the comment into an EXAMPLE segment."
 
 (provide 'org-exp-blocks)
 
-;; arch-tag: 1c365fe9-8808-4f72-bb15-0b00f36d8024
+
 ;;; org-exp-blocks.el ends here
diff --git a/lisp/org/org-exp.el b/lisp/org/org-exp.el
index b00e86dabf6..ee8e6027706 100644
--- a/lisp/org/org-exp.el
+++ b/lisp/org/org-exp.el
@@ -1,7 +1,6 @@
 ;;; org-exp.el --- ASCII, HTML, XOXO and iCalendar export for Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -48,8 +47,6 @@
 (declare-function org-inlinetask-remove-END-maybe "org-inlinetask" ())
 (declare-function org-table-cookie-line-p "org-table" (line))
 (declare-function org-table-colgroup-line-p "org-table" (line))
-(declare-function org-pop-to-buffer-same-window "org-compat" 
-                  (&optional buffer-or-name norecord label))
 
 (autoload 'org-export-generic "org-export-generic" "Export using the generic exporter" t)
 
@@ -2975,7 +2972,7 @@ directory."
          (region (buffer-string))
          str-ret)
     (save-excursion
-      (org-pop-to-buffer-same-window buffer)
+      (switch-to-buffer buffer)
       (erase-buffer)
       (insert region)
       (let ((org-inhibit-startup t)) (org-mode))
@@ -3231,6 +3228,6 @@ The depends on the variable `org-export-copy-to-kill'."
 
 (provide 'org-exp)
 
-;; arch-tag: 65985fe9-095c-49c7-a7b6-cb4ee15c0a95
+
 
 ;;; org-exp.el ends here
diff --git a/lisp/org/org-faces.el b/lisp/org/org-faces.el
index 960eb615450..af9632eec44 100644
--- a/lisp/org/org-faces.el
+++ b/lisp/org/org-faces.el
@@ -1,7 +1,6 @@
 ;;; org-faces.el --- Face definitions for Org-mode.
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -736,6 +735,6 @@ level org-n-level-faces"
 
 (provide 'org-faces)
 
-;; arch-tag: 9dab5f91-c4b9-4d6f-bac3-1f6211ad0a04
+
 
 ;;; org-faces.el ends here
diff --git a/lisp/org/org-feed.el b/lisp/org/org-feed.el
index a05463a2875..d1b31f11b4a 100644
--- a/lisp/org/org-feed.el
+++ b/lisp/org/org-feed.el
@@ -1,6 +1,6 @@
 ;;; org-feed.el --- Add RSS feed items to Org files
 ;;
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -436,7 +436,7 @@ it can be a list structured like an entry in `org-feed-alist'."
   (if (stringp feed) (setq feed (assoc feed org-feed-alist)))
   (unless feed
     (error "No such feed in `org-feed-alist"))
-  (org-pop-to-buffer-same-window
+  (switch-to-buffer
    (org-feed-update feed 'retrieve-only))
   (goto-char (point-min)))
 
@@ -674,5 +674,5 @@ formatted as a string, not the original XML data."
 
 (provide 'org-feed)
 
-;; arch-tag: 0929b557-9bc4-47f4-9633-30a12dbb5ae2
+
 ;;; org-feed.el ends here
diff --git a/lisp/org/org-footnote.el b/lisp/org/org-footnote.el
index 9a92bd5db1d..223d2573fdb 100644
--- a/lisp/org/org-footnote.el
+++ b/lisp/org/org-footnote.el
@@ -1,6 +1,6 @@
 ;;; org-footnote.el --- Footnote support in Org and elsewhere
 ;;
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -862,6 +862,6 @@ If LABEL is non-nil, delete that footnote instead."
 
 (provide 'org-footnote)
 
-;; arch-tag: 1b5954df-fb5d-4da5-8709-78d944dbfc37
+
 
 ;;; org-footnote.el ends here
diff --git a/lisp/org/org-freemind.el b/lisp/org/org-freemind.el
index 6664bf1f4f2..91a1e5e59cb 100644
--- a/lisp/org/org-freemind.el
+++ b/lisp/org/org-freemind.el
@@ -1,6 +1,6 @@
 ;;; org-freemind.el --- Export Org files to freemind
 
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 
 ;; Author: Lennart Borgman (lennart O borgman A gmail O com)
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -57,26 +57,6 @@
 ;;             Added y/n question before showing in FreeMind.
 ;; 2009-11-04: Added support for #+BEGIN_HTML.
 ;;
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;; This program 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 2, or
-;; (at your option) any later version.
-;;
-;; This program 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 this program; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-;; Floor, Boston, MA 02110-1301, USA.
-;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
 ;;; Code:
 
 (require 'xml)
@@ -1237,7 +1217,7 @@ PATH should be a list of steps, where each step has the form
 
 (provide 'org-freemind)
 
-;; arch-tag: e7b0d776-94fd-404a-b35e-0f855fae3627
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; org-freemind.el ends here
diff --git a/lisp/org/org-gnus.el b/lisp/org/org-gnus.el
index da0712b9249..0ccb66ca497 100644
--- a/lisp/org/org-gnus.el
+++ b/lisp/org/org-gnus.el
@@ -1,7 +1,6 @@
 ;;; org-gnus.el --- Support for links to Gnus groups and messages from within Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;         Tassilo Horn <tassilo at member dot fsf dot org>
@@ -291,6 +290,6 @@ If `org-store-link' was called with a prefix arg the meaning of
 
 (provide 'org-gnus)
 
-;; arch-tag: 512e0840-58fa-45b3-b456-71e10fa2376d
+
 
 ;;; org-gnus.el ends here
diff --git a/lisp/org/org-habit.el b/lisp/org/org-habit.el
index ebdfa0c773c..c146a5bebbd 100644
--- a/lisp/org/org-habit.el
+++ b/lisp/org/org-habit.el
@@ -1,6 +1,6 @@
 ;;; org-habit.el --- The habit tracking code for Org-mode
 
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw at gnu dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -358,6 +358,6 @@ current time."
 
 (provide 'org-habit)
 
-;; arch-tag: 64e070d9-bd09-4917-bd44-44465f5ed348
+
 
 ;;; org-habit.el ends here
diff --git a/lisp/org/org-html.el b/lisp/org/org-html.el
index c150b3d8dd2..46126ce2573 100644
--- a/lisp/org/org-html.el
+++ b/lisp/org/org-html.el
@@ -1,7 +1,6 @@
 ;;; org-html.el --- HTML export for Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -35,8 +34,6 @@
 
 (declare-function org-id-find-id-file "org-id" (id))
 (declare-function htmlize-region "ext:htmlize" (beg end))
-(declare-function org-pop-to-buffer-same-window 
-                  "org-compat" (&optional buffer-or-name norecord label))
 
 (defgroup org-export-html nil
   "Options specific for HTML export of Org-mode files."
@@ -2266,7 +2263,7 @@ that uses these same face definitions."
         (when (and (symbolp f) (or (not i) (not (listp i))))
           (insert (org-add-props (copy-sequence "1") nil 'face f))))
       (htmlize-region (point-min) (point-max))))
-  (org-pop-to-buffer-same-window "*html*")
+  (switch-to-buffer "*html*")
   (goto-char (point-min))
   (if (re-search-forward "<style" nil t)
       (delete-region (point-min) (match-beginning 0)))
@@ -2607,5 +2604,5 @@ the alist of previous items."
 
 (provide 'org-html)
 
-;; arch-tag: 8109d84d-eb8f-460b-b1a8-f45f3a6c7ea1
+
 ;;; org-html.el ends here
diff --git a/lisp/org/org-icalendar.el b/lisp/org/org-icalendar.el
index bc0efce6a81..dd64fc2f783 100644
--- a/lisp/org/org-icalendar.el
+++ b/lisp/org/org-icalendar.el
@@ -1,7 +1,6 @@
 ;;; org-icalendar.el --- iCalendar export for Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -685,5 +684,5 @@ a time), or the day by one (if it does not contain a time)."
 
 (provide 'org-icalendar)
 
-;; arch-tag: 2dee2b6e-9211-4aee-8a47-a3c7e5bc30cf
+
 ;;; org-icalendar.el ends here
diff --git a/lisp/org/org-id.el b/lisp/org/org-id.el
index d724dff3060..c2d5cf0f25b 100644
--- a/lisp/org/org-id.el
+++ b/lisp/org/org-id.el
@@ -1,6 +1,6 @@
 ;;; org-id.el --- Global identifiers for Org-mode entries
 ;;
-;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -74,8 +74,6 @@
 (require 'org)
 
 (declare-function message-make-fqdn "message" ())
-(declare-function org-pop-to-buffer-same-window 
-                  "org-compat" (&optional buffer-or-name norecord label))
 
 ;;; Customization
 
@@ -255,7 +253,7 @@ Move the cursor to that entry in that buffer."
   (let ((m (org-id-find id 'marker)))
     (unless m
       (error "Cannot find entry with ID \"%s\"" id))
-    (org-pop-to-buffer-same-window (marker-buffer m))
+    (switch-to-buffer (marker-buffer m))
     (goto-char m)
     (move-marker m nil)
     (org-show-context)))
@@ -643,6 +641,6 @@ optional argument MARKERP, return the position as a new marker."
 
 ;;; org-id.el ends here
 
-;; arch-tag: e5abaca4-e16f-4b25-832a-540cfb63a712
+
 
 
diff --git a/lisp/org/org-indent.el b/lisp/org/org-indent.el
index 68821a4f772..a2099a4bde3 100644
--- a/lisp/org/org-indent.el
+++ b/lisp/org/org-indent.el
@@ -1,5 +1,5 @@
 ;;; org-indent.el --- Dynamic indentation for  Org-mode
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -322,5 +322,5 @@ Point is assumed to be at the beginning of a headline."
 
 (provide 'org-indent)
 
-;; arch-tag: b76736bc-9f4a-43cd-977c-ecfd6689846a
+
 ;;; org-indent.el ends here
diff --git a/lisp/org/org-info.el b/lisp/org/org-info.el
index d1bfc53e5e3..4f44045f9bf 100644
--- a/lisp/org/org-info.el
+++ b/lisp/org/org-info.el
@@ -1,7 +1,6 @@
 ;;; org-info.el --- Support for links to Info nodes from within Org-Mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -78,6 +77,6 @@
 
 (provide 'org-info)
 
-;; arch-tag: 1e289f54-7176-487f-b575-dd4854bab15e
+
 
 ;;; org-info.el ends here
diff --git a/lisp/org/org-inlinetask.el b/lisp/org/org-inlinetask.el
index 7a52d6b6b40..72c19062983 100644
--- a/lisp/org/org-inlinetask.el
+++ b/lisp/org/org-inlinetask.el
@@ -1,6 +1,6 @@
 ;;; org-inlinetask.el --- Tasks independent of outline hierarchy
 
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/lisp/org/org-irc.el b/lisp/org/org-irc.el
index bc0e94450b7..7a84d2053ad 100644
--- a/lisp/org/org-irc.el
+++ b/lisp/org/org-irc.el
@@ -1,6 +1,6 @@
 ;;; org-irc.el --- Store links to IRC sessions
 ;;
-;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
 ;;
 ;; Author: Philip Jackson <emacs@shellarchive.co.uk>
 ;; Keywords: erc, irc, link, org
@@ -60,8 +60,6 @@
 (declare-function erc-server-buffer "erc" ())
 (declare-function erc-get-server-nickname-list "erc" ())
 (declare-function erc-cmd-JOIN "erc" (channel &optional key))
-(declare-function org-pop-to-buffer-same-window 
-                  "org-compat" (&optional buffer-or-name norecord label))
 
 (defvar org-irc-client 'erc
   "The IRC client to act on.")
@@ -234,7 +232,7 @@ default."
                                       (throw 'found x))))))
                 (if chan-buf
                     (progn
-                      (org-pop-to-buffer-same-window chan-buf)
+                      (switch-to-buffer chan-buf)
                       ;; if we got a nick, and they're in the chan,
                       ;; then start a chat with them
                       (let ((nick (pop link)))
@@ -245,14 +243,14 @@ default."
                                 (insert (concat nick ": ")))
                               (error "%s not found in %s" nick chan-name)))))
                     (progn
-                      (org-pop-to-buffer-same-window server-buffer)
+                      (switch-to-buffer server-buffer)
                       (erc-cmd-JOIN chan-name))))
-              (org-pop-to-buffer-same-window server-buffer)))
+              (switch-to-buffer server-buffer)))
         ;; no server match, make new connection
         (erc-select :server server :port port))))
 
 (provide 'org-irc)
 
-;; arch-tag: 018d7dda-53b8-4a35-ba92-6670939e525a
+
 
 ;;; org-irc.el ends here
diff --git a/lisp/org/org-jsinfo.el b/lisp/org/org-jsinfo.el
index cdefef8428c..3ef8c4c809c 100644
--- a/lisp/org/org-jsinfo.el
+++ b/lisp/org/org-jsinfo.el
@@ -1,7 +1,6 @@
 ;;; org-jsinfo.el --- Support for org-info.js Javascript in Org HTML export
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -205,6 +204,6 @@ Option settings will replace the %MANAGER-OPTIONS cookie."
 (provide 'org-infojs)
 (provide 'org-jsinfo)
 
-;; arch-tag: c71d1d85-3337-4817-a066-725e74ac9eac
+
 
 ;;; org-jsinfo.el ends here
diff --git a/lisp/org/org-latex.el b/lisp/org/org-latex.el
index bd9c1138c7f..0402b2da964 100644
--- a/lisp/org/org-latex.el
+++ b/lisp/org/org-latex.el
@@ -1,6 +1,6 @@
 ;;; org-latex.el --- LaTeX exporter for org-mode
 ;;
-;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
 ;;
 ;; Emacs Lisp Archive Entry
 ;; Filename: org-latex.el
@@ -2769,6 +2769,6 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
 (provide 'org-export-latex)
 (provide 'org-latex)
 
-;; arch-tag: 23c2b87d-da04-4c2d-ad2d-1eb6487bc3ad
+
 
 ;;; org-latex.el ends here
diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el
index 2339c4d1bc1..d3c5dd99aa6 100644
--- a/lisp/org/org-list.el
+++ b/lisp/org/org-list.el
@@ -1,7 +1,6 @@
 ;;; org-list.el --- Plain lists for Org-mode
 ;;
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;         Bastien Guerry <bzg AT altern DOT org>
@@ -3201,5 +3200,5 @@ with overruling parameters for `org-list-to-generic'."
 
 (provide 'org-list)
 
-;; arch-tag: 73cf50c1-200f-4d1d-8a53-4e842a5b11c8
+
 ;;; org-list.el ends here
diff --git a/lisp/org/org-mac-message.el b/lisp/org/org-mac-message.el
index 9c1089994ba..fc52b92a21d 100644
--- a/lisp/org/org-mac-message.el
+++ b/lisp/org/org-mac-message.el
@@ -1,6 +1,6 @@
 ;;; org-mac-message.el --- Links to Apple Mail.app messages from within Org-mode
 
-;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;;         Christopher Suckling <suckling at gmail dot com>
@@ -214,6 +214,6 @@ list of message:// links to flagged mail after heading."
 
 (provide 'org-mac-message)
 
-;; arch-tag: 3806d0c1-abe1-4db6-9c31-f3ed7d4a9b32
+
 
 ;;; org-mac-message.el ends here
diff --git a/lisp/org/org-macs.el b/lisp/org/org-macs.el
index 906be613a9c..dc413f4d993 100644
--- a/lisp/org/org-macs.el
+++ b/lisp/org/org-macs.el
@@ -1,7 +1,6 @@
 ;;; org-macs.el --- Top-level definitions for Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -372,6 +371,6 @@ The number of levels is controlled by `org-inlinetask-min-level'"
 
 (provide 'org-macs)
 
-;; arch-tag: 7e6a73ce-aac9-4fc0-9b30-ce6f89dc6668
+
 
 ;;; org-macs.el ends here
diff --git a/lisp/org/org-mew.el b/lisp/org/org-mew.el
index 2f095949858..97cad1ae316 100644
--- a/lisp/org/org-mew.el
+++ b/lisp/org/org-mew.el
@@ -1,6 +1,6 @@
 ;;; org-mew.el --- Support for links to Mew messages from within Org-mode
 
-;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
 
 ;; Author: Tokuya Kameshima <kames at fa2 dot so-net dot ne dot jp>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -135,6 +135,6 @@
 
 (provide 'org-mew)
 
-;; arch-tag: 07ccdca7-6020-4941-a593-588a1e51b870
+
 
 ;;; org-mew.el ends here
diff --git a/lisp/org/org-mhe.el b/lisp/org/org-mhe.el
index c75bed37b8c..7075018894f 100644
--- a/lisp/org/org-mhe.el
+++ b/lisp/org/org-mhe.el
@@ -1,7 +1,6 @@
 ;;; org-mhe.el --- Support for links to MH-E messages from within Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Thomas Baumann <thomas dot baumann at ch dot tum dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -226,6 +225,6 @@ folders."
 
 (provide 'org-mhe)
 
-;; arch-tag: dcb05484-8627-491d-a8c1-01dbd2bde4ae
+
 
 ;;; org-mhe.el ends here
diff --git a/lisp/org/org-mks.el b/lisp/org/org-mks.el
index c71db81b52f..5f3ebbb6c81 100644
--- a/lisp/org/org-mks.el
+++ b/lisp/org/org-mks.el
@@ -1,6 +1,6 @@
 ;;; org-mks.el --- Multi-key-selection for Org-mode
 
-;; Copyright (C) 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -132,6 +132,6 @@ only the bare key is returned."
 
 (provide 'org-mks)
 
-;; arch-tag: 4ea90d0e-c6e4-4684-bd61-baf878712f9f
+
 
 ;;; org-mks.el ends here
diff --git a/lisp/org/org-mobile.el b/lisp/org/org-mobile.el
index 40fe7031c6f..f270419877e 100644
--- a/lisp/org/org-mobile.el
+++ b/lisp/org/org-mobile.el
@@ -1,5 +1,5 @@
 ;;; org-mobile.el --- Code for asymmetric sync with a mobile device
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -38,9 +38,6 @@
 
 (eval-when-compile (require 'cl))
 
-(declare-function org-pop-to-buffer-same-window 
-                  "org-compat" (&optional buffer-or-name norecord label))
-
 (defgroup org-mobile nil
   "Options concerning support for a viewer/editor on a mobile device."
   :tag "Org Mobile"
@@ -912,7 +909,7 @@ If BEG and END are given, only do this in that region."
                                    (buffer-file-name (current-buffer))))))
                 (error (setq org-mobile-error msg))))
             (when org-mobile-error
-              (org-pop-to-buffer-same-window (marker-buffer marker))
+              (switch-to-buffer (marker-buffer marker))
               (goto-char marker)
               (incf cnt-error)
               (insert (if (stringp (nth 1 org-mobile-error))
@@ -1099,7 +1096,7 @@ A and B must be strings or nil."
 
 (provide 'org-mobile)
 
-;; arch-tag: ace0e26c-58f2-4309-8a61-05ec1535f658
+
 
 ;;; org-mobile.el ends here
 
diff --git a/lisp/org/org-mouse.el b/lisp/org/org-mouse.el
index 8d59073ce40..8f1e7735693 100644
--- a/lisp/org/org-mouse.el
+++ b/lisp/org/org-mouse.el
@@ -1,6 +1,6 @@
 ;;; org-mouse.el --- Better mouse support for org-mode
 
-;; Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation
+;; Copyright (C) 2006-2011 Free Software Foundation
 ;;
 ;; Author: Piotr Zielinski <piotr dot zielinski at gmail dot com>
 ;; Maintainer: Carsten Dominik <carsten at orgmode dot org>
@@ -1146,6 +1146,6 @@ This means, between the beginning of line and the point."
 
 (provide 'org-mouse)
 
-;; arch-tag: ff1ae557-3529-41a3-95c6-baaebdcc280f
+
 
 ;;; org-mouse.el ends here
diff --git a/lisp/org/org-pcomplete.el b/lisp/org/org-pcomplete.el
index e34ab38e4e5..cede736d929 100644
--- a/lisp/org/org-pcomplete.el
+++ b/lisp/org/org-pcomplete.el
@@ -1,7 +1,6 @@
 ;;; org-pcomplete.el --- In-buffer completion code
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;         John Wiegley <johnw at gnu dot org>
@@ -277,6 +276,6 @@ Complete a language in the first field, the header arguments and switches."
 
 (provide 'org-pcomplete)
 
-;; arch-tag: 
+
 
 ;;; org-pcomplete.el ends here
diff --git a/lisp/org/org-plot.el b/lisp/org/org-plot.el
index 7f1bbac06b6..b90c248eb6d 100644
--- a/lisp/org/org-plot.el
+++ b/lisp/org/org-plot.el
@@ -1,6 +1,6 @@
 ;;; org-plot.el --- Support for plotting from Org-mode
 
-;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
 ;;
 ;; Author: Eric Schulte <schulte dot eric at gmail dot com>
 ;; Keywords: tables, plotting
@@ -350,5 +350,5 @@ line directly before or after the table."
 
 (provide 'org-plot)
 
-;; arch-tag: 5763f7c6-0c75-416d-b070-398ee4ec0eca
+
 ;;; org-plot.el ends here
diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el
index 42a71224aea..655123cafa9 100644
--- a/lisp/org/org-protocol.el
+++ b/lisp/org/org-protocol.el
@@ -1,7 +1,6 @@
 ;;; org-protocol.el --- Intercept calls from emacsclient to trigger custom actions.
 ;;
-;; Copyright (C) 2008, 2009, 2010
-;;          Free Software Foundation, Inc.
+;; Copyright (C) 2008-2011  Free Software Foundation, Inc.
 ;;
 ;; Author: Bastien Guerry <bzg AT altern DOT org>
 ;; Author: Daniel M German <dmg AT uvic DOT org>
@@ -645,5 +644,5 @@ project-plist is the CDR of an element in `org-publish-project-alist', reuse
 
 (provide 'org-protocol)
 
-;; arch-tag: b5c5c2ac-77cf-4a94-a649-2163dff95846
+
 ;;; org-protocol.el ends here
diff --git a/lisp/org/org-publish.el b/lisp/org/org-publish.el
index 67bccae15a2..ddb3cf7b63a 100644
--- a/lisp/org/org-publish.el
+++ b/lisp/org/org-publish.el
@@ -1,6 +1,5 @@
 ;;; org-publish.el --- publish related org-mode files as a website
-;; Copyright (C) 2006, 2007, 2008, 2009, 2010
-;;          Free Software Foundation, Inc.
+;; Copyright (C) 2006-2011  Free Software Foundation, Inc.
 
 ;; Author: David O'Toole <dto@gnu.org>
 ;; Maintainer: Carsten Dominik <carsten DOT dominik AT gmail DOT com>
@@ -370,8 +369,6 @@ This is a compatibility function for Emacsen without `delete-dups'."
 
 (declare-function org-publish-delete-dups "org-publish" (list))
 (declare-function find-lisp-find-files "find-lisp" (directory regexp))
-(declare-function org-pop-to-buffer-same-window 
-                  "org-compat" (&optional buffer-or-name norecord label))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Getting project information out of org-publish-project-alist
@@ -562,7 +559,7 @@ PUB-DIR is the publishing directory."
     (make-directory pub-dir t))
   (let ((visiting (find-buffer-visiting filename)))
     (save-excursion
-      (org-pop-to-buffer-same-window (or visiting (find-file filename)))
+      (switch-to-buffer (or visiting (find-file filename)))
       (let* ((plist (cons :buffer-will-be-killed (cons t plist)))
              (init-buf (current-buffer))
              (init-point (point))
@@ -863,7 +860,7 @@ system's modification time.
 It returns time in `current-time' format."
   (let ((visiting (find-buffer-visiting file)))
     (save-excursion
-      (org-pop-to-buffer-same-window (or visiting (find-file-noselect file nil t)))
+      (switch-to-buffer (or visiting (find-file-noselect file nil t)))
       (let* ((plist (org-infile-export-plist))
              (date (plist-get plist :date)))
         (unless visiting
@@ -1183,6 +1180,6 @@ Returns value on success, else nil."
 
 (provide 'org-publish)
 
-;; arch-tag: 72807f3c-8af0-4a6b-8dca-c3376eb25adb
+
 
 ;;; org-publish.el ends here
diff --git a/lisp/org/org-remember.el b/lisp/org/org-remember.el
index 40bf6888dff..2bc5ef92ae7 100644
--- a/lisp/org/org-remember.el
+++ b/lisp/org/org-remember.el
@@ -1,7 +1,6 @@
 ;;; org-remember.el --- Fast note taking in Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -41,8 +40,6 @@
 (declare-function remember "remember" (&optional initial))
 (declare-function remember-buffer-desc "remember" ())
 (declare-function remember-finalize "remember" ())
-(declare-function org-pop-to-buffer-same-window 
-                  "org-compat" (&optional buffer-or-name norecord label))
 
 (defvar remember-save-after-remembering)
 (defvar remember-register)
@@ -789,7 +786,7 @@ The user is queried for the template."
       (setq heading org-remember-default-headline))
     (setq visiting (org-find-base-buffer-visiting file))
     (if (not visiting) (find-file-noselect file))
-    (org-pop-to-buffer-same-window (or visiting (get-file-buffer file)))
+    (switch-to-buffer (or visiting (get-file-buffer file)))
     (widen)
     (goto-char (point-min))
     (if (re-search-forward
@@ -1153,7 +1150,7 @@ See also the variable `org-reverse-note-order'."
 
 (provide 'org-remember)
 
-;; arch-tag: 497f30d0-4bc3-4097-8622-2d27ac5f2698
+
 
 ;;; org-remember.el ends here
 
diff --git a/lisp/org/org-rmail.el b/lisp/org/org-rmail.el
index cbb63365985..1169c206981 100644
--- a/lisp/org/org-rmail.el
+++ b/lisp/org/org-rmail.el
@@ -1,7 +1,6 @@
 ;;; org-rmail.el --- Support for links to Rmail messages from within Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -115,6 +114,6 @@
 
 (provide 'org-rmail)
 
-;; arch-tag: c6cf4a8b-6639-4b7f-821f-bdf10746b173
+
 
 ;;; org-rmail.el ends here
diff --git a/lisp/org/org-special-blocks.el b/lisp/org/org-special-blocks.el
index 4f4d5e8e561..c09b27de895 100644
--- a/lisp/org/org-special-blocks.el
+++ b/lisp/org/org-special-blocks.el
@@ -1,25 +1,23 @@
 ;;; org-special-blocks.el --- Turn blocks into LaTeX envs and HTML divs
 
-;; Copyright (C) 2009 Chris Gray
+;; Copyright (C) 2009, 2011  Free Software Foundation, Inc.
 
 ;; Author: Chris Gray <chrismgray@gmail.com>
 
 ;; This file is part of GNU Emacs.
 
-;; This program 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 2, or (at
-;; your option) any later version.
+;; 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.
 
-;; This program 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.
+;; 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 this program ; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/org/org-src.el b/lisp/org/org-src.el
index 30ffc34a6eb..5de55fa455f 100644
--- a/lisp/org/org-src.el
+++ b/lisp/org/org-src.el
@@ -1,7 +1,6 @@
 ;;; org-src.el --- Source code examples in Org
 ;;
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;         Bastien Guerry <bzg AT altern DOT org>
@@ -43,8 +42,6 @@
 (declare-function org-at-table.el-p "org" ())
 (declare-function org-get-indentation "org" (&optional line))
 (declare-function org-switch-to-buffer-other-window "org" (&rest args))
-(declare-function org-pop-to-buffer-same-window 
-                  "org-compat" (&optional buffer-or-name norecord label))
 
 (defcustom org-edit-src-region-extra nil
   "Additional regexps to identify regions for editing with `org-edit-src-code'.
@@ -342,7 +339,7 @@ buffer."
 (defun org-src-switch-to-buffer (buffer context)
   (case org-src-window-setup
     ('current-window
-     (org-pop-to-buffer-same-window buffer))
+     (switch-to-buffer buffer))
     ('other-window
      (switch-to-buffer-other-window buffer))
     ('other-frame
@@ -353,7 +350,7 @@ buffer."
           (delete-frame frame)))
        ('save
         (kill-buffer (current-buffer))
-        (org-pop-to-buffer-same-window buffer))
+        (switch-to-buffer buffer))
        (t
         (switch-to-buffer-other-frame buffer))))
     ('reorganize-frame
@@ -365,7 +362,7 @@ buffer."
     (t
      (message "Invalid value %s for org-src-window-setup"
               (symbol-name org-src-window-setup))
-     (org-pop-to-buffer-same-window buffer))))
+     (switch-to-buffer buffer))))
 
 (defun org-src-construct-edit-buffer-name (org-buffer-name lang)
   "Construct the buffer name for a source editing buffer."
@@ -425,7 +422,7 @@ the fragment in the Org-mode buffer."
             begline (save-excursion (goto-char beg) (org-current-line)))
       (if (and (setq buffer (org-edit-src-find-buffer beg end))
                (y-or-n-p "Return to existing edit buffer? [n] will revert changes: "))
-          (org-pop-to-buffer-same-window buffer)
+          (switch-to-buffer buffer)
         (when buffer
           (with-current-buffer buffer
             (if (boundp 'org-edit-src-overlay)
@@ -445,7 +442,7 @@ the fragment in the Org-mode buffer."
                            (define-key map [mouse-1] 'org-edit-src-continue)
                            map))
         (overlay-put ovl :read-only "Leave me alone")
-        (org-pop-to-buffer-same-window buffer)
+        (switch-to-buffer buffer)
         (insert code)
         (remove-text-properties (point-min) (point-max)
                                 '(display nil invisible nil intangible nil))
@@ -814,5 +811,5 @@ LANG is a string, and the returned major mode is a symbol."
 
 (provide 'org-src)
 
-;; arch-tag: 6a1fc84f-dec7-47be-a416-64be56bea5d8
+
 ;;; org-src.el ends here
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index 82d1e1309b1..7f49b3236ee 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -1,7 +1,6 @@
 ;;; org-table.el --- The table editor for Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -4721,7 +4720,7 @@ list of the fields in the rectangle ."
 
 (provide 'org-table)
 
-;; arch-tag: 4d21cfdd-0268-440a-84b0-09237a0fe0ef
+
 
 ;;; org-table.el ends here
 
diff --git a/lisp/org/org-taskjuggler.el b/lisp/org/org-taskjuggler.el
index 8a2ccc8dd83..0d9516a389e 100644
--- a/lisp/org/org-taskjuggler.el
+++ b/lisp/org/org-taskjuggler.el
@@ -1,6 +1,6 @@
 ;;; org-taskjuggler.el --- TaskJuggler exporter for org-mode
 ;;
-;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
 ;;
 ;; Emacs Lisp Archive Entry
 ;; Filename: org-taskjuggler.el
diff --git a/lisp/org/org-timer.el b/lisp/org/org-timer.el
index e612d45b145..b8fbc4ff388 100644
--- a/lisp/org/org-timer.el
+++ b/lisp/org/org-timer.el
@@ -1,6 +1,6 @@
 ;;; org-timer.el --- The relative timer code for Org-mode
 
-;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -403,6 +403,6 @@ replace any running timer."
 
 (provide 'org-timer)
 
-;; arch-tag: 97538f8c-3871-4509-8f23-1e7b3ff3d107
+
 
 ;;; org-timer.el ends here
diff --git a/lisp/org/org-vm.el b/lisp/org/org-vm.el
index d7e69e35092..d0991b81116 100644
--- a/lisp/org/org-vm.el
+++ b/lisp/org/org-vm.el
@@ -1,7 +1,6 @@
 ;;; org-vm.el --- Support for links to VM messages from within Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -140,6 +139,6 @@
 
 (provide 'org-vm)
 
-;; arch-tag: cbc3047b-935e-4d2a-96e7-c5b0117aaa6d
+
 
 ;;; org-vm.el ends here
diff --git a/lisp/org/org-w3m.el b/lisp/org/org-w3m.el
index dcdd02230d8..bce90092e6e 100644
--- a/lisp/org/org-w3m.el
+++ b/lisp/org/org-w3m.el
@@ -1,6 +1,6 @@
 ;;; org-w3m.el --- Support from copy and paste from w3m to Org-mode
 
-;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
 
 ;; Author: Andy Stewart <lazycat dot manatee at gmail dot com>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -168,6 +168,6 @@ Return t if there is no previous link; otherwise, return nil."
 
 (provide 'org-w3m)
 
-;; arch-tag: 851d7447-488d-49f0-a14d-46c092e84352
+
 
 ;;; org-w3m.el ends here
diff --git a/lisp/org/org-wl.el b/lisp/org/org-wl.el
index 1a0a357d4fd..9bc49c8b91a 100644
--- a/lisp/org/org-wl.el
+++ b/lisp/org/org-wl.el
@@ -1,7 +1,6 @@
 ;;; org-wl.el --- Support for links to Wanderlust messages from within Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Tokuya Kameshima <kames at fa2 dot so-net dot ne dot jp>
 ;;         David Maus <dmaus at ictsoc dot de>
@@ -310,6 +309,6 @@ for namazu index."
 
 (provide 'org-wl)
 
-;; arch-tag: 29b75a0f-ef2e-430b-8abc-acff75bde54a
+
 
 ;;; org-wl.el ends here
diff --git a/lisp/org/org-xoxo.el b/lisp/org/org-xoxo.el
index e81e4e74381..02f351fe724 100644
--- a/lisp/org/org-xoxo.el
+++ b/lisp/org/org-xoxo.el
@@ -1,7 +1,6 @@
 ;;; org-xoxo.el --- XOXO export for Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -124,5 +123,5 @@ The XOXO buffer is named *xoxo-<source buffer name>*"
 
 (provide 'org-xoxo)
 
-;; arch-tag: 16e6a31f-f4f5-46f1-af18-48dc89faa702
+
 ;;; org-xoxo.el ends here
diff --git a/lisp/org/org.el b/lisp/org/org.el
index c29ef115400..d494bdb28fa 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -1,7 +1,6 @@
 ;;; org.el --- Outline-based notes management and organizer
 ;; Carstens outline-mode for keeping track of everything.
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -106,7 +105,6 @@
 (declare-function org-inlinetask-at-task-p "org-inlinetask" ())
 (declare-function org-inlinetask-outline-regexp "org-inlinetask" ())
 (declare-function org-inlinetask-toggle-visibility "org-inlinetask" ())
-(declare-function org-pop-to-buffer-same-window "org-compat" (&optional buffer-or-name norecord label))
 (declare-function org-at-clock-log-p "org-clock" ())
 (declare-function org-clock-timestamps-up "org-clock" ())
 (declare-function org-clock-timestamps-down "org-clock" ())
@@ -6652,7 +6650,7 @@ or nil."
       (save-window-excursion
         (delete-other-windows)
         (and (get-buffer "*org-goto*") (kill-buffer "*org-goto*"))
-        (org-pop-to-buffer-same-window
+        (switch-to-buffer
          (condition-case nil
              (make-indirect-buffer (current-buffer) "*org-goto*")
            (error (make-indirect-buffer (current-buffer) "*org-goto*"))))
@@ -6790,7 +6788,7 @@ frame is not changed."
           (and arg (eq org-indirect-buffer-display 'dedicated-frame)))
       (select-frame (make-frame))
       (delete-other-windows)
-      (org-pop-to-buffer-same-window ibuf)
+      (switch-to-buffer ibuf)
       (org-set-frame-title heading))
      ((eq org-indirect-buffer-display 'dedicated-frame)
       (raise-frame
@@ -6799,10 +6797,10 @@ frame is not changed."
                               org-indirect-dedicated-frame)
                          (setq org-indirect-dedicated-frame (make-frame)))))
       (delete-other-windows)
-      (org-pop-to-buffer-same-window ibuf)
+      (switch-to-buffer ibuf)
       (org-set-frame-title (concat "Indirect: " heading)))
      ((eq org-indirect-buffer-display 'current-window)
-      (org-pop-to-buffer-same-window ibuf))
+      (switch-to-buffer ibuf))
      ((eq org-indirect-buffer-display 'other-window)
       (pop-to-buffer ibuf))
      (t (error "Invalid value")))
@@ -9834,7 +9832,7 @@ onto the ring."
       (setq p org-mark-ring))
     (setq org-mark-ring-last-goto p)
     (setq m (car p))
-    (org-pop-to-buffer-same-window (marker-buffer m))
+    (switch-to-buffer (marker-buffer m))
     (goto-char m)
     (if (or (outline-invisible-p) (org-invisible-p2)) (org-show-context 'mark-goto))))
 
@@ -10430,7 +10428,7 @@ prefix argument (`C-u C-u C-u C-c C-w')."
                          (find-file-noselect file)))
           (if goto
               (progn
-                (org-pop-to-buffer-same-window nbuf)
+                (switch-to-buffer nbuf)
                 (goto-char pos)
                 (org-show-context 'org-goto))
             (if regionp
@@ -12042,7 +12040,7 @@ EXTRA is additional text that will be inserted into the notes buffer."
   (setq org-log-note-window-configuration (current-window-configuration))
   (delete-other-windows)
   (move-marker org-log-note-return-to (point))
-  (org-pop-to-buffer-same-window (marker-buffer org-log-note-marker))
+  (switch-to-buffer (marker-buffer org-log-note-marker))
   (goto-char org-log-note-marker)
   (org-switch-to-buffer-other-window "*Org Note*")
   (erase-buffer)
@@ -15884,7 +15882,7 @@ changes from another.  I believe the procedure must be like this:
        (lambda (b)
          (when (and (with-current-buffer b (org-mode-p))
                     (with-current-buffer b buffer-file-name))
-           (org-pop-to-buffer-same-window b)
+           (switch-to-buffer b)
            (revert-buffer t 'no-confirm)))
        (buffer-list))
       (when (and (featurep 'org-id) org-id-track-globally)
@@ -15908,7 +15906,7 @@ Set `org-completion-use-ido' to make it use ido instead."
         (org-completion-use-ido org-completion-use-ido))
     (unless (or org-completion-use-ido org-completion-use-iswitchb)
       (setq org-completion-use-iswitchb t))
-    (org-pop-to-buffer-same-window
+    (switch-to-buffer
      (org-icompleting-read "Org buffer: "
                            (mapcar 'list (mapcar 'buffer-name blist))
                            nil t))))
@@ -16075,7 +16073,7 @@ If the current buffer does not, find the first agenda file."
               (find-file (car files))
               (throw 'exit t))))
       (find-file (car fs)))
-    (if (buffer-base-buffer) (org-pop-to-buffer-same-window (buffer-base-buffer)))))
+    (if (buffer-base-buffer) (switch-to-buffer (buffer-base-buffer)))))
 
 (defun org-agenda-file-to-front (&optional to-end)
   "Move/add the current file to the top of the agenda file list.
@@ -18512,7 +18510,7 @@ information about your Org-mode version and configuration."
      (org-version)
      (let (list)
        (save-window-excursion
-         (org-pop-to-buffer-same-window (get-buffer-create "*Warn about privacy*"))
+         (switch-to-buffer (get-buffer-create "*Warn about privacy*"))
          (delete-other-windows)
          (erase-buffer)
          (insert "You are about to submit a bug report to the Org-mode mailing list.
@@ -18709,7 +18707,7 @@ With prefix arg UNCOMPILED, load the uncompiled versions."
   (if (and marker (marker-buffer marker)
            (buffer-live-p (marker-buffer marker)))
       (progn
-        (org-pop-to-buffer-same-window (marker-buffer marker))
+        (switch-to-buffer (marker-buffer marker))
         (if (or (> marker (point-max)) (< marker (point-min)))
             (widen))
         (goto-char marker)
@@ -20537,6 +20535,6 @@ Still experimental, may disappear in the future."
 
 (run-hooks 'org-load-hook)
 
-;; arch-tag: e77da1a7-acc7-4336-b19e-efa25af3f9fd
+
 
 ;;; org.el ends here
diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el
index 46a82e3720d..bdf2dadd16c 100644
--- a/lisp/pcomplete.el
+++ b/lisp/pcomplete.el
@@ -811,15 +811,19 @@ this is `comint-dynamic-complete-functions'."
       (while (< (point) end)
         (skip-chars-forward " \t\n")
         (push (point) begins)
-        (let ((skip t))
-          (while skip
-            (skip-chars-forward "^ \t\n")
-            (if (eq (char-before) ?\\)
-                (skip-chars-forward " \t\n")
-              (setq skip nil))))
+        (while
+            (progn
+              (skip-chars-forward "^ \t\n\\")
+              (when (eq (char-after) ?\\)
+                (forward-char 1)
+                (unless (eolp)
+                  (forward-char 1)
+                  t))))
         (push (buffer-substring-no-properties (car begins) (point))
               args))
       (cons (nreverse args) (nreverse begins)))))
+(make-obsolete 'pcomplete-parse-comint-arguments
+               'comint-parse-pcomplete-arguments "24.1")
 
 (defun pcomplete-parse-arguments (&optional expand-p)
   "Parse the command line arguments.  Most completions need this info."
@@ -879,7 +883,7 @@ Magic characters are those in `pcomplete-arg-quote-list'."
                        (or (run-hook-with-args-until-success
                             'pcomplete-quote-arg-hook filename index)
                            (when (memq c pcomplete-arg-quote-list)
-                             (string "\\" c))
+                             (string ?\\ c))
                            (char-to-string c))
                      (setq index (1+ index))))
                  filename
diff --git a/lisp/proced.el b/lisp/proced.el
index 94ea579ebd8..e4987bd926c 100644
--- a/lisp/proced.el
+++ b/lisp/proced.el
@@ -395,7 +395,7 @@ It is a list of lists (KEY PREDICATE REVERSE).")
   :group 'proced-faces)
 
 (defface proced-marked
-  '((t (:inherit font-lock-warning-face)))
+  '((t (:inherit error)))
   "Face used for marked processes."
   :group 'proced-faces)
 
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 0236a2be296..a1cbdc16560 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -2130,13 +2130,17 @@ comment at the start of cc-engine.el for more info."
       pos))
 
 (defsubst c-state-cache-non-literal-place (pos state)
-  ;; Return a position outside of a string/comment at or before POS.
+  ;; Return a position outside of a string/comment/macro at or before POS.
   ;; STATE is the parse-partial-sexp state at POS.
-  (if (or (nth 3 state)                 ; in a string?
-          (nth 4 state))                ; in a comment?
-      (nth 8 state)
-    pos))
-
+  (let ((res (if (or (nth 3 state)      ; in a string?
+                     (nth 4 state))     ; in a comment?
+                 (nth 8 state)
+               pos)))
+    (save-excursion
+      (goto-char res)
+      (if (c-beginning-of-macro)
+          (point)
+        res))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Stuff to do with point-min, and coping with any literal there.
@@ -6321,7 +6325,9 @@ comment at the start of cc-engine.el for more info."
         (let* ((start (point)) kwd-sym kwd-clause-end found-type)
 
           ;; Look for a specifier keyword clause.
-          (when (looking-at c-prefix-spec-kwds-re)
+          (when (or (looking-at c-prefix-spec-kwds-re)
+                    (and (c-major-mode-is 'java-mode)
+                         (looking-at "@[A-Za-z0-9]+")))
             (if (looking-at c-typedef-key)
                 (setq at-typedef t))
             (setq kwd-sym (c-keyword-sym (match-string 1)))
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index 2277ba760ab..bca95c97e8b 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -199,10 +199,16 @@
 (set-face-foreground 'c-annotation-face "blue")
 
 (eval-and-compile
-  ;; We need the following functions during compilation since they're
-  ;; called when the `c-lang-defconst' initializers are evaluated.
-  ;; Define them at runtime too for the sake of derived modes.
-
+  ;; We need the following definitions during compilation since they're
+  ;; used when the `c-lang-defconst' initializers are evaluated.  Define
+  ;; them at runtime too for the sake of derived modes.
+
+  ;; This indicates the "font locking context", and is set just before
+  ;; fontification is done.  If non-nil, it says, e.g., point starts
+  ;; from within a #if preprocessor construct.
+  (defvar c-font-lock-context nil)
+  (make-variable-buffer-local 'c-font-lock-context)
+  
   (defmacro c-put-font-lock-face (from to face)
     ;; Put a face on a region (overriding any existing face) in the way
     ;; font-lock would do it.  In XEmacs that means putting an
@@ -283,6 +289,45 @@
                               nil)))))
           res))))
 
+  (defun c-make-font-lock-search-form (regexp highlights)
+    ;; Return a lisp form which will fontify every occurence of REGEXP
+    ;; (a regular expression, NOT a function) between POINT and `limit'
+    ;; with HIGHLIGHTS, a list of highlighters as specified on page
+    ;; "Search-based Fontification" in the elisp manual.
+    `(while (re-search-forward ,regexp limit t)
+       (unless (progn
+                 (goto-char (match-beginning 0))
+                 (c-skip-comments-and-strings limit))
+         (goto-char (match-end 0))
+         ,@(mapcar
+            (lambda (highlight)
+              (if (integerp (car highlight))
+                  ;; e.g. highlight is (1 font-lock-type-face t)
+                  (progn
+                    (unless (eq (nth 2 highlight) t)
+                      (error
+                       "The override flag must currently be t in %s"
+                       highlight))
+                    (when (nth 3 highlight)
+                      (error
+                       "The laxmatch flag may currently not be set in %s"
+                       highlight))
+                    `(save-match-data
+                       (c-put-font-lock-face
+                        (match-beginning ,(car highlight))
+                        (match-end ,(car highlight))
+                        ,(elt highlight 1))))
+                ;; highlight is an "ANCHORED HIGHLIGHER" of the form
+                ;; (ANCHORED-MATCHER PRE-FORM POST-FORM SUBEXP-HIGHLIGHTERS...)
+                (when (nth 3 highlight)
+                  (error "Match highlights currently not supported in %s"
+                         highlight))
+                `(progn
+                   ,(nth 1 highlight)
+                   (save-match-data ,(car highlight))
+                   ,(nth 2 highlight))))
+            highlights))))
+
   (defun c-make-font-lock-search-function (regexp &rest highlights)
     ;; This function makes a byte compiled function that works much like
     ;; a matcher element in `font-lock-keywords'.  It cuts out a little
@@ -313,43 +358,154 @@
     ;; lambda more easily.
     (byte-compile
      `(lambda (limit)
-        (let (;; The font-lock package in Emacs is known to clobber
+        (let ( ;; The font-lock package in Emacs is known to clobber
               ;; `parse-sexp-lookup-properties' (when it exists).
               (parse-sexp-lookup-properties
                (cc-eval-when-compile
                  (boundp 'parse-sexp-lookup-properties))))
-          (while (re-search-forward ,regexp limit t)
-            (unless (progn
-                      (goto-char (match-beginning 0))
-                      (c-skip-comments-and-strings limit))
-              (goto-char (match-end 0))
-              ,@(mapcar
-                 (lambda (highlight)
-                   (if (integerp (car highlight))
-                       (progn
-                         (unless (eq (nth 2 highlight) t)
-                           (error
-                            "The override flag must currently be t in %s"
-                            highlight))
-                         (when (nth 3 highlight)
-                           (error
-                            "The laxmatch flag may currently not be set in %s"
-                            highlight))
-                         `(save-match-data
-                            (c-put-font-lock-face
-                             (match-beginning ,(car highlight))
-                             (match-end ,(car highlight))
-                             ,(elt highlight 1))))
-                     (when (nth 3 highlight)
-                       (error "Match highlights currently not supported in %s"
-                              highlight))
-                     `(progn
-                        ,(nth 1 highlight)
-                        (save-match-data ,(car highlight))
-                        ,(nth 2 highlight))))
-                 highlights))))
+
+          ;; (while (re-search-forward ,regexp limit t)
+          ;;   (unless (progn
+          ;;          (goto-char (match-beginning 0))
+          ;;          (c-skip-comments-and-strings limit))
+          ;;     (goto-char (match-end 0))
+          ;;     ,@(mapcar
+          ;;     (lambda (highlight)
+          ;;       (if (integerp (car highlight))
+          ;;           (progn
+          ;;             (unless (eq (nth 2 highlight) t)
+          ;;               (error
+          ;;                "The override flag must currently be t in %s"
+          ;;                highlight))
+          ;;             (when (nth 3 highlight)
+          ;;               (error
+          ;;                "The laxmatch flag may currently not be set in %s"
+          ;;                highlight))
+          ;;             `(save-match-data
+          ;;                (c-put-font-lock-face
+          ;;                 (match-beginning ,(car highlight))
+          ;;                 (match-end ,(car highlight))
+          ;;                 ,(elt highlight 1))))
+          ;;         (when (nth 3 highlight)
+          ;;           (error "Match highlights currently not supported in %s"
+          ;;                  highlight))
+          ;;         `(progn
+          ;;            ,(nth 1 highlight)
+          ;;            (save-match-data ,(car highlight))
+          ;;            ,(nth 2 highlight))))
+          ;;     highlights)))
+          ,(c-make-font-lock-search-form regexp highlights))
+
         nil)))
 
+  (defun c-make-font-lock-BO-decl-search-function (regexp &rest highlights)
+    ;; This function makes a byte compiled function that first moves back
+    ;; to the beginning of the current declaration (if any), then searches
+    ;; forward for matcher elements (as in `font-lock-keywords') and
+    ;; fontifies them.
+    ;;
+    ;; The motivation for moving back to the declaration start is to
+    ;; establish a context for the current text when, e.g., a character
+    ;; is typed on a C++ inheritance continuation line, or a jit-lock
+    ;; chunk starts there.
+    ;; 
+    ;; The new function works much like a matcher element in
+    ;; `font-lock-keywords'.  It cuts out a little bit of the overhead
+    ;; compared to a real matcher.  The main reason is however to pass the
+    ;; real search limit to the anchored matcher(s), since most (if not
+    ;; all) font-lock implementations arbitrarily limit anchored matchers
+    ;; to the same line, and also to insulate against various other
+    ;; irritating differences between the different (X)Emacs font-lock
+    ;; packages.
+    ;;
+    ;; REGEXP is the matcher, which must be a regexp.  Only matches
+    ;; where the beginning is outside any comment or string literal are
+    ;; significant.
+    ;;
+    ;; HIGHLIGHTS is a list of highlight specs, just like in
+    ;; `font-lock-keywords', with these limitations: The face is always
+    ;; overridden (no big disadvantage, since hits in comments etc are
+    ;; filtered anyway), there is no "laxmatch", and an anchored matcher
+    ;; is always a form which must do all the fontification directly.
+    ;; `limit' is a variable bound to the real limit in the context of
+    ;; the anchored matcher forms.
+    ;;
+    ;; This function does not do any hidden buffer changes, but the
+    ;; generated functions will.  (They are however used in places
+    ;; covered by the font-lock context.)
+
+    ;; Note: Replace `byte-compile' with `eval' to debug the generated
+    ;; lambda more easily.
+    (byte-compile
+     `(lambda (limit)
+        (let ( ;; The font-lock package in Emacs is known to clobber
+              ;; `parse-sexp-lookup-properties' (when it exists).
+              (parse-sexp-lookup-properties
+               (cc-eval-when-compile
+                 (boundp 'parse-sexp-lookup-properties))))
+          (goto-char
+           (let ((here (point)))
+             (if (eq (car (c-beginning-of-decl-1)) 'same)
+                 (point)
+               here)))
+          ,(c-make-font-lock-search-form regexp highlights))
+        nil)))
+
+  (defun c-make-font-lock-context-search-function (normal &rest state-stanzas)
+    ;; This function makes a byte compiled function that works much like
+    ;; a matcher element in `font-lock-keywords', with the following
+    ;; enhancement: the generated function will test for particular "font
+    ;; lock contexts" at the start of the region, i.e. is this point in
+    ;; the middle of some particular construct?  if so the generated
+    ;; function will first fontify the tail of the construct, before
+    ;; going into the main loop and fontify full constructs up to limit.
+    ;;
+    ;; The generated function takes one parameter called `limit', and
+    ;; will fontify the region between POINT and LIMIT.
+    ;;
+    ;; NORMAL is a list of the form (REGEXP HIGHLIGHTS .....), and is
+    ;; used to fontify the "regular" bit of the region.
+    ;; STATE-STANZAS is list of elements of the form (STATE LIM REGEXP
+    ;; HIGHLIGHTS), each element coding one possible font lock context.
+
+    ;; o - REGEXP is a font-lock regular expression (NOT a function),
+    ;; o - HIGHLIGHTS is a list of zero or more highlighters as defined
+    ;;   on page "Search-based Fontification" in the elisp manual.  As
+    ;;   yet (2009-06), they must have OVERRIDE set, and may not have
+    ;;   LAXMATCH set.
+    ;;
+    ;; o - STATE is the "font lock context" (e.g. in-cpp-expr) and is
+    ;;   not quoted.
+    ;; o - LIM is a lisp form whose evaluation will yield the limit
+    ;;   position in the buffer for fontification by this stanza.
+    ;;
+    ;; This function does not do any hidden buffer changes, but the
+    ;; generated functions will.  (They are however used in places
+    ;; covered by the font-lock context.)
+    ;; 
+    ;; Note: Replace `byte-compile' with `eval' to debug the generated
+    ;; lambda more easily.
+    (byte-compile
+     `(lambda (limit)
+        (let ( ;; The font-lock package in Emacs is known to clobber
+              ;; `parse-sexp-lookup-properties' (when it exists).
+              (parse-sexp-lookup-properties
+               (cc-eval-when-compile
+                 (boundp 'parse-sexp-lookup-properties))))
+          ,@(mapcar
+             (lambda (stanza)
+               (let ((state (car stanza))
+                     (lim (nth 1 stanza))
+                     (regexp (nth 2 stanza))
+                     (highlights (cdr (cddr stanza))))
+                 `(if (eq c-font-lock-context ',state)
+                      (let ((limit ,lim))
+                        ,(c-make-font-lock-search-form
+                          regexp highlights)))))
+             state-stanzas)
+          ,(c-make-font-lock-search-form (car normal) (cdr normal))
+          nil))))
+
 ;  (eval-after-load "edebug" ; 2006-07-09: def-edebug-spec is now in subr.el.
 ;    '(progn
   (def-edebug-spec c-fontify-types-and-refs let*)
@@ -494,19 +650,24 @@ stuff.  Used on level 1 and higher."
                                   (c-lang-const c-cpp-expr-directives)))
                         (cef-re (c-make-keywords-re t
                                   (c-lang-const c-cpp-expr-functions))))
-                    `((,(c-make-font-lock-search-function
-                         (concat noncontinued-line-end
-                                 (c-lang-const c-opt-cpp-prefix)
-                                 ced-re ; 1 + ncle-depth
-                                 ;; Match the whole logical line to look
-                                 ;; for the functions in.
-                                 "\\(\\\\\\(.\\|[\n\r]\\)\\|[^\n\r]\\)*")
-                         `((let ((limit (match-end 0)))
-                             (while (re-search-forward ,cef-re limit 'move)
-                               (c-put-font-lock-face (match-beginning 1)
-                                                     (match-end 1)
-                                                     c-preprocessor-face-name)))
-                           (goto-char (match-end ,(1+ ncle-depth)))))))))
+
+                    `((,(c-make-font-lock-context-search-function
+                         `(,(concat noncontinued-line-end
+                                    (c-lang-const c-opt-cpp-prefix)
+                                    ced-re ; 1 + ncle-depth
+                                    ;; Match the whole logical line to look
+                                    ;; for the functions in.
+                                    "\\(\\\\\\(.\\|[\n\r]\\)\\|[^\n\r]\\)*")
+                           ((let ((limit (match-end 0)))
+                              (while (re-search-forward ,cef-re limit 'move)
+                                (c-put-font-lock-face (match-beginning 1)
+                                                      (match-end 1)
+                                                      c-preprocessor-face-name)))
+                            (goto-char (match-end ,(1+ ncle-depth)))))
+                         `(in-cpp-expr
+                           (save-excursion (c-end-of-macro) (point))
+                           ,cef-re
+                           (1 c-preprocessor-face-name t)))))))
 
               ;; Fontify the directive names.
               (,(c-make-font-lock-search-function
@@ -759,6 +920,12 @@ casts and declarations are fontified.  Used on level 2 and higher."
       (c-forward-syntactic-ws limit)
       (c-font-lock-declarators limit t (eq prop 'c-decl-type-start))))
 
+  (setq c-font-lock-context ;; (c-guess-font-lock-context)
+        (save-excursion
+          (if (and c-cpp-expr-intro-re
+                   (c-beginning-of-macro)
+                   (looking-at c-cpp-expr-intro-re))
+              'in-cpp-expr)))
   nil)
 
 (defun c-font-lock-<>-arglists (limit)
@@ -1552,7 +1719,9 @@ on level 2 only and so aren't combined with `c-complex-decl-matchers'."
                         (unless (c-skip-comments-and-strings limit)
                           (c-forward-syntactic-ws)
                           ;; Handle prefix declaration specifiers.
-                          (when (looking-at c-prefix-spec-kwds-re)
+                          (when (or (looking-at c-prefix-spec-kwds-re)
+                                    (and (c-major-mode-is 'java-mode)
+                                         (looking-at "@[A-Za-z0-9]+")))
                             (c-forward-keyword-clause 1))
                           ,(if (c-major-mode-is 'c++-mode)
                                `(when (and (c-forward-type)
@@ -1712,24 +1881,32 @@ higher."
                           c-label-face-name nil t))))))
 
       ;; Fontify the clauses after various keywords.
-      ,@(when (or (c-lang-const c-type-list-kwds)
-                  (c-lang-const c-ref-list-kwds)
-                  (c-lang-const c-colon-type-list-kwds)
-                  (c-lang-const c-paren-type-kwds))
-          `((,(c-make-font-lock-search-function
-               (concat "\\<\\("
-                       (c-make-keywords-re nil
-                         (append (c-lang-const c-type-list-kwds)
-                                 (c-lang-const c-ref-list-kwds)
-                                 (c-lang-const c-colon-type-list-kwds)
-                                 (c-lang-const c-paren-type-kwds)))
-                       "\\)\\>")
-               '((c-fontify-types-and-refs ((c-promote-possible-types t))
-                   (c-forward-keyword-clause 1)
-                   (if (> (point) limit) (goto-char limit))))))))
-
-      ,@(when (c-major-mode-is 'java-mode)
-          `((eval . (list "\\<\\(@[a-zA-Z0-9]+\\)\\>" 1 c-annotation-face))))
+        ,@(when (or (c-lang-const c-type-list-kwds)
+                    (c-lang-const c-ref-list-kwds)
+                    (c-lang-const c-colon-type-list-kwds))
+            `((,(c-make-font-lock-BO-decl-search-function
+                 (concat "\\<\\("
+                         (c-make-keywords-re nil
+                           (append (c-lang-const c-type-list-kwds)
+                                   (c-lang-const c-ref-list-kwds)
+                                   (c-lang-const c-colon-type-list-kwds)))
+                         "\\)\\>")
+                 '((c-fontify-types-and-refs ((c-promote-possible-types t))
+                     (c-forward-keyword-clause 1)
+                     (if (> (point) limit) (goto-char limit))))))))
+
+        ,@(when (c-lang-const c-paren-type-kwds)
+            `((,(c-make-font-lock-search-function
+                 (concat "\\<\\("
+                         (c-make-keywords-re nil
+                           (c-lang-const c-paren-type-kwds))
+                         "\\)\\>")
+                 '((c-fontify-types-and-refs ((c-promote-possible-types t))
+                     (c-forward-keyword-clause 1)
+                     (if (> (point) limit) (goto-char limit))))))))
+
+        ,@(when (c-major-mode-is 'java-mode)
+            `((eval . (list "\\<\\(@[a-zA-Z0-9]+\\)\\>" 1 c-annotation-face))))
       ))
 
 (c-lang-defconst c-matchers-1
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 35097242cb7..279c5e46c46 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -815,6 +815,16 @@ expression."
   t (if (c-lang-const c-opt-cpp-prefix)
         '("if" "elif")))
 
+(c-lang-defconst c-cpp-expr-intro-re
+  "Regexp which matches the start of a CPP directive which contains an
+expression, or nil if there aren't any in the language."
+  t (if (c-lang-const c-cpp-expr-directives)
+        (concat
+         (c-lang-const c-opt-cpp-prefix)
+         (c-make-keywords-re t (c-lang-const c-cpp-expr-directives)))))
+(c-lang-defvar c-cpp-expr-intro-re
+  (c-lang-const c-cpp-expr-intro-re))
+
 (c-lang-defconst c-cpp-expr-functions
   "List of functions in cpp expressions."
   t    (if (c-lang-const c-opt-cpp-prefix)
@@ -1813,7 +1823,7 @@ will be handled."
          "bindsTo" "delegatesTo" "implements" "proxy" "storedOn")
   ;; Note: "const" is not used in Java, but it's still a reserved keyword.
   java '("abstract" "const" "final" "native" "private" "protected" "public"
-         "static" "strictfp" "synchronized" "transient" "volatile" "@[A-Za-z0-9]+")
+         "static" "strictfp" "synchronized" "transient" "volatile")
   pike '("final" "inline" "local" "nomask" "optional" "private" "protected"
          "public" "static" "variant"))
 
@@ -1899,10 +1909,7 @@ one of `c-type-list-kwds', `c-ref-list-kwds',
 
 (c-lang-defconst c-prefix-spec-kwds-re
   ;; Adorned regexp of `c-prefix-spec-kwds'.
-  t (c-make-keywords-re t (c-lang-const c-prefix-spec-kwds))
-  java (replace-regexp-in-string
-     "\\\\\\[" "["
-     (replace-regexp-in-string "\\\\\\+" "+" (c-make-keywords-re t (c-lang-const c-prefix-spec-kwds)))))
+  t (c-make-keywords-re t (c-lang-const c-prefix-spec-kwds)))
 
 (c-lang-defvar c-prefix-spec-kwds-re (c-lang-const c-prefix-spec-kwds-re))
 
diff --git a/lisp/progmodes/cc-menus.el b/lisp/progmodes/cc-menus.el
index f53a7da5186..4e9350de425 100644
--- a/lisp/progmodes/cc-menus.el
+++ b/lisp/progmodes/cc-menus.el
@@ -108,8 +108,11 @@ A sample value might look like: `\\(_P\\|_PROTO\\)'.")
        "[^" c-alnum "_:<>~]"                  ; match any non-identifier char
        "\\([" c-alpha "_][" c-alnum "_:<>~]*\\)" ; match function name
        "\\([ \t\n]\\|\\\\\n\\)*("             ; see above, BUT the arg list
-       "\\([ \t\n]\\|\\\\\n\\)*\\([^ \t\n(*][^)]*\\)?)" ; must not start
-       "\\([ \t\n]\\|\\\\\n\\)*[^ \t\n;(]"    ; with an asterisk or parentheses
+       "\\([ \t\n]\\|\\\\\n\\)*"              ; must not start
+       "\\([^ \t\n(*]"                        ; with an asterisk or parentheses
+       "[^()]*\\(([^()]*)[^()]*\\)*"          ; Maybe function pointer arguments
+       "\\)?)"
+       "\\([ \t\n]\\|\\\\\n\\)*[^ \t\n;(]"
        ) 1)
     ;; Special case for definitions using phony prototype macros like:
     ;; `int main _PROTO( (int argc,char *argv[]) )'.
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 503698f0f7b..5f99cfe0028 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -145,7 +145,7 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
 
     (ant
      "^[ \t]*\\[[^] \n]+\\][ \t]*\\([^: \n]+\\):\\([0-9]+\\):\\(?:\\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\):\\)?\
-\\( warning\\)?" 1 (2 . 4) (3 . 5) (4))
+\\( warning\\)?" 1 (2 . 4) (3 . 5) (6))
 
     (bash
      "^\\([^: \n\t]+\\): line \\([0-9]+\\):" 1 2)
@@ -523,7 +523,7 @@ you may also want to change `compilation-page-delimiter'.")
      ;; Command output lines.  Recognize `make[n]:' lines too.
      ("^\\([[:alnum:]_/.+-]+\\)\\(\\[\\([0-9]+\\)\\]\\)?[ \t]*:"
       (1 font-lock-function-name-face) (3 compilation-line-face nil t))
-     (" -\\(?:o[= ]?\\|-\\(?:outfile\\|output\\)[= ]\\)\\(\\S +\\)" . 1)
+     (" --?o\\(?:utfile\\|utput\\)?[= ]\\(\\S +\\)" . 1)
      ("^Compilation \\(finished\\).*"
       (0 '(face nil compilation-message nil help-echo nil mouse-face nil) t)
       (1 compilation-info-face))
@@ -647,19 +647,19 @@ starting the compilation process.")
 (defvar compile-history nil)
 
 (defface compilation-error
-  '((t :inherit font-lock-warning-face))
+  '((t :inherit error))
   "Face used to highlight compiler errors."
   :group 'compilation
   :version "22.1")
 
 (defface compilation-warning
-  '((t :inherit font-lock-variable-name-face))
+  '((t :inherit warning))
   "Face used to highlight compiler warnings."
   :group 'compilation
   :version "22.1")
 
 (defface compilation-info
-  '((t :inherit font-lock-type-face))
+  '((t :inherit success))
   "Face used to highlight compiler information."
   :group 'compilation
   :version "22.1")
@@ -985,12 +985,15 @@ POS and RES.")
             (let* ((prev
                     (or (get-text-property (1- prev-pos) 'compilation-message)
                         (get-text-property prev-pos 'compilation-message)))
-                   (prev-struct
-                    (car (nth 2 (car prev)))))
+                   (prev-file-struct
+                    (and prev
+                         (compilation--loc->file-struct
+                          (compilation--message->loc prev)))))
+
               ;; Construct FILE . DIR from that.
-              (if prev-struct
-                  (setq file (cons (car prev-struct)
-                                   (cadr prev-struct))))))
+              (if prev-file-struct
+                  (setq file (cons (caar prev-file-struct)
+                                   (cadr (car prev-file-struct)))))))
         (unless file
           (setq file '("*unknown*")))))
     ;; All of these fields are optional, get them only if we have an index, and
@@ -2410,7 +2413,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))
-      (pop-to-buffer-same-window (marker-buffer mk)))
+      (switch-to-buffer (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/grep.el b/lisp/progmodes/grep.el
index 5561575ea20..709f01444bf 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -463,9 +463,12 @@ Set up `compilation-exit-message-function' and run `grep-setup-hook'."
   (set (make-local-variable 'compilation-exit-message-function)
        (lambda (status code msg)
          (if (eq status 'exit)
-             (cond ((zerop code)
+             ;; This relies on the fact that `compilation-start'
+             ;; sets buffer-modified to nil before running the command,
+             ;; so the buffer is still unmodified if there is no output.
+             (cond ((and (zerop code) (buffer-modified-p))
                     '("finished (matches found)\n" . "matched"))
-                   ((= code 1)
+                   ((or (= code 1) (not (buffer-modified-p)))
                     '("finished with no matches found\n" . "no match"))
                    (t
                     (cons msg code)))
@@ -965,7 +968,9 @@ This command shares argument histories with \\[lgrep] and \\[grep-find]."
     (unless (and dir (file-directory-p dir) (file-readable-p dir))
       (setq dir default-directory))
     (if (null files)
-        (if (not (string= regexp grep-find-command))
+        (if (not (string= regexp (if (consp grep-find-command)
+                                     (car grep-find-command)
+                                   grep-find-command)))
             (compilation-start regexp 'grep-mode))
       (setq dir (file-name-as-directory (expand-file-name dir)))
       (require 'find-dired)             ; for `find-name-arg'
@@ -1023,8 +1028,7 @@ 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)
-                (process-connection-type nil))
+          (let ((default-directory dir))
             (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/js.el b/lisp/progmodes/js.el
index 1bdcb4cfa89..5505e8e94b2 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -61,6 +61,7 @@
 (defvar inferior-moz-buffer)
 (defvar moz-repl-name)
 (defvar ido-cur-list)
+(defvar electric-layout-rules)
 (declare-function ido-mode "ido")
 (declare-function inferior-moz-process "ext:mozrepl" ())
 
@@ -507,9 +508,6 @@ getting timeout messages."
 
 (defvar js-mode-map
   (let ((keymap (make-sparse-keymap)))
-    (mapc (lambda (key)
-            (define-key keymap key #'js-insert-and-indent))
-          '("{" "}" "(" ")" ":" ";" ","))
     (define-key keymap [(control ?c) (meta ?:)] #'js-eval)
     (define-key keymap [(control ?c) (control ?j)] #'js-set-js-context)
     (define-key keymap [(control meta ?x)] #'js-eval-defun)
@@ -525,21 +523,6 @@ getting timeout messages."
     keymap)
   "Keymap for `js-mode'.")
 
-(defun js-insert-and-indent (key)
-  "Run the command bound to KEY, and indent if necessary.
-Indentation does not take place if point is in a string or
-comment."
-  (interactive (list (this-command-keys)))
-  (call-interactively (lookup-key (current-global-map) key))
-  (let ((syntax (save-restriction (widen) (syntax-ppss))))
-    (when (or (and (not (nth 8 syntax))
-                   js-auto-indent-flag)
-              (and (nth 4 syntax)
-                   (eq (current-column)
-                       (1+ (current-indentation)))))
-      (indent-according-to-mode))))
-
-
 ;;; Syntax table and parsing
 
 (defvar js-mode-syntax-table
@@ -1653,21 +1636,35 @@ This performs fontification according to `js--class-styles'."
                                    js--font-lock-keywords-3)
   "Font lock keywords for `js-mode'.  See `font-lock-keywords'.")
 
-;; XXX: Javascript can continue a regexp literal across lines so long
-;; as the newline is escaped with \. Account for that in the regexp
-;; below.
-(eval-and-compile
-  (defconst js--regexp-literal
-    "[=(,:]\\(?:\\s-\\|\n\\)*\\(/\\)\\(?:\\\\.\\|[^/*\\]\\)\\(?:\\\\.\\|[^/\\]\\)*\\(/\\)"
-  "Regexp matching a JavaScript regular expression literal.
-Match groups 1 and 2 are the characters forming the beginning and
-end of the literal."))
-
-(defconst js-syntax-propertize-function
-  (syntax-propertize-rules
-   ;; We want to match regular expressions only at the beginning of
-   ;; expressions.
-   (js--regexp-literal (1 "\"") (2 "\""))))
+(defun js-syntax-propertize-regexp (end)
+  (when (eq (nth 3 (syntax-ppss)) ?/)
+    ;; A /.../ regexp.
+    (when (re-search-forward "\\(?:\\=\\|[^\\]\\)\\(?:\\\\\\\\\\)*/" end 'move)
+      (put-text-property (1- (point)) (point)
+                         'syntax-table (string-to-syntax "\"/")))))
+
+(defun js-syntax-propertize (start end)
+  ;; Javascript allows immediate regular expression objects, written /.../.
+  (goto-char start)
+  (js-syntax-propertize-regexp end)
+  (funcall
+   (syntax-propertize-rules
+    ;; Distinguish /-division from /-regexp chars (and from /-comment-starter).
+    ("\\(?:^\\|[=([{,:;]\\)\\(?:[ \t]\\)*\\(/\\)[^/*]"
+     (1 (ignore
+         (forward-char -1)
+         (when (or (not (memq (char-after (match-beginning 0)) '(?\s ?\t)))
+                   ;; If the / is at the beginning of line, we have to check
+                   ;; the end of the previous text.
+                   (save-excursion
+                     (goto-char (match-beginning 0))
+                     (forward-comment (- (point)))
+                     (memq (char-before)
+                           (eval-when-compile (append "=({[,:;" '(nil))))))
+           (put-text-property (match-beginning 1) (match-end 1)
+                              'syntax-table (string-to-syntax "\"/"))
+           (js-syntax-propertize-regexp end))))))
+   (point) end))
 
 ;;; Indentation
 
@@ -3298,7 +3295,7 @@ If one hasn't been set, or if it's stale, prompt for a new one."
   (set (make-local-variable 'font-lock-defaults)
        (list js--font-lock-keywords))
   (set (make-local-variable 'syntax-propertize-function)
-       js-syntax-propertize-function)
+       #'js-syntax-propertize)
 
   (set (make-local-variable 'parse-sexp-ignore-comments) t)
   (set (make-local-variable 'parse-sexp-lookup-properties) t)
@@ -3331,6 +3328,11 @@ If one hasn't been set, or if it's stale, prompt for a new one."
         c-comment-start-regexp "/[*/]\\|\\s!"
         comment-start-skip "\\(//+\\|/\\*+\\)\\s *")
 
+  (set (make-local-variable 'electric-indent-chars)
+       (append "{}():;," electric-indent-chars))
+  (set (make-local-variable 'electric-layout-rules)
+       '((?\; . after) (?\{ . after) (?\} . before)))
+
   (let ((c-buffer-is-cc-mode t))
     ;; FIXME: These are normally set by `c-basic-common-init'.  Should
     ;; we call it instead?  (Bug#6071)
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 4d2f15c69d8..3f923f496b9 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -296,7 +296,7 @@ Used for syntactic keywords.  N is the match number (1, 2 or 3)."
          :filter (lambda (&rest junk)
                    (abbrev-table-menu python-mode-abbrev-table)))
         "-"
-        ["Start interpreter" python-shell
+        ["Start interpreter" run-python
          :help "Run `inferior' Python in separate buffer"]
         ["Import/reload file" python-load-file
          :help "Load into inferior Python session"]
@@ -328,14 +328,6 @@ Used for syntactic keywords.  N is the match number (1, 2 or 3)."
 ;; eric has items including: (un)indent, (un)comment, restart script,
 ;; run script, debug script; also things for profiling, unit testing.
 
-(defvar python-shell-map
-  (let ((map (copy-keymap comint-mode-map)))
-    (define-key map [tab]   'tab-to-tab-stop)
-    (define-key map "\C-c-" 'py-up-exception)
-    (define-key map "\C-c=" 'py-down-exception)
-    map)
-  "Keymap used in *Python* shell buffers.")
-
 (defvar python-mode-syntax-table
   (let ((table (make-syntax-table)))
     ;; Give punctuation syntax to ASCII that normally has symbol
@@ -1345,7 +1337,7 @@ local value.")
     (define-key map "\C-c\C-l" 'python-load-file)
     (define-key map "\C-c\C-v" 'python-check)
     ;; Note that we _can_ still use these commands which send to the
-    ;; Python process even at the prompt iff we have a normal prompt,
+    ;; Python process even at the prompt if we have a normal prompt,
     ;; i.e. '>>> ' and not '... '.  See the comment before
     ;; python-send-region.  Fixme: uncomment these if we address that.
 
diff --git a/lisp/progmodes/scheme.el b/lisp/progmodes/scheme.el
index 4151e2bb79a..470b309434c 100644
--- a/lisp/progmodes/scheme.el
+++ b/lisp/progmodes/scheme.el
@@ -55,24 +55,24 @@
 (defvar scheme-mode-syntax-table
   (let ((st (make-syntax-table))
         (i 0))
-
-    ;; Default is atom-constituent.
-    (while (< i 256)
+    ;; Symbol constituents
+    ;; We used to treat chars 128-256 as symbol-constituent, but they
+    ;; should be valid word constituents (Bug#8843).  Note that valid
+    ;; identifier characters are Scheme-implementation dependent.
+    (while (< i ?0)
       (modify-syntax-entry i "_   " st)
       (setq i (1+ i)))
-
-    ;; Word components.
-    (setq i ?0)
-    (while (<= i ?9)
-      (modify-syntax-entry i "w   " st)
+    (setq i (1+ ?9))
+    (while (< i ?A)
+      (modify-syntax-entry i "_   " st)
       (setq i (1+ i)))
-    (setq i ?A)
-    (while (<= i ?Z)
-      (modify-syntax-entry i "w   " st)
+    (setq i (1+ ?Z))
+    (while (< i ?a)
+      (modify-syntax-entry i "_   " st)
       (setq i (1+ i)))
-    (setq i ?a)
-    (while (<= i ?z)
-      (modify-syntax-entry i "w   " st)
+    (setq i (1+ ?z))
+    (while (< i 128)
+      (modify-syntax-entry i "_   " st)
       (setq i (1+ i)))
 
     ;; Whitespace
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 258f9be9237..7b949134c6c 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -460,6 +460,7 @@ This is buffer-local in every such buffer.")
     (define-key map "\C-c+" 'sh-add)
     (define-key map "\C-\M-x" 'sh-execute-region)
     (define-key map "\C-c\C-x" 'executable-interpret)
+    ;; FIXME: Use post-self-insert-hook.
     (define-key map "<" 'sh-maybe-here-document)
     (define-key map "(" 'skeleton-pair-insert-maybe)
     (define-key map "{" 'skeleton-pair-insert-maybe)
@@ -1028,45 +1029,45 @@ subshells can nest."
 
 (defun sh-font-lock-paren (start)
   (unless (nth 8 (syntax-ppss))
-  (save-excursion
-    (goto-char start)
-    ;; Skip through all patterns
-    (while
-        (progn
+    (save-excursion
+      (goto-char start)
+      ;; Skip through all patterns
+      (while
+          (progn
             (while
                 (progn
-          (forward-comment (- (point-max)))
+                  (forward-comment (- (point-max)))
                   (when (and (eolp) (sh-is-quoted-p (point)))
                     (forward-char -1)
                     t)))
-          ;; Skip through one pattern
-          (while
-              (or (/= 0 (skip-syntax-backward "w_"))
+            ;; Skip through one pattern
+            (while
+                (or (/= 0 (skip-syntax-backward "w_"))
                     (/= 0 (skip-chars-backward "-$=?[]*@/\\\\"))
-                  (and (sh-is-quoted-p (1- (point)))
-                       (goto-char (- (point) 2)))
+                    (and (sh-is-quoted-p (1- (point)))
+                         (goto-char (- (point) 2)))
                     (when (memq (char-before) '(?\" ?\' ?\}))
-                    (condition-case nil (progn (backward-sexp 1) t)
-                      (error nil)))))
-          ;; Patterns can be preceded by an open-paren (Bug#1320).
-          (if (eq (char-before (point)) ?\()
-              (backward-char 1))
-          (while (progn
-                   (forward-comment (- (point-max)))
-                   ;; Maybe we've bumped into an escaped newline.
-                   (sh-is-quoted-p (point)))
-            (backward-char 1))
-          (when (eq (char-before) ?|)
-            (backward-char 1) t)))
-    (when (progn (backward-char 2)
-                 (if (> start (line-end-position))
-                     (put-text-property (point) (1+ start)
-                                        'syntax-multiline t))
-                 ;; FIXME: The `in' may just be a random argument to
-                 ;; a normal command rather than the real `in' keyword.
-                 ;; I.e. we should look back to try and find the
-                 ;; corresponding `case'.
-                   (and (looking-at ";[;&]\\|in")
+                      (condition-case nil (progn (backward-sexp 1) t)
+                        (error nil)))))
+            ;; Patterns can be preceded by an open-paren (Bug#1320).
+            (if (eq (char-before (point)) ?\()
+                (backward-char 1))
+            (while (progn
+                     (forward-comment (- (point-max)))
+                     ;; Maybe we've bumped into an escaped newline.
+                     (sh-is-quoted-p (point)))
+              (backward-char 1))
+            (when (eq (char-before) ?|)
+              (backward-char 1) t)))
+      (when (progn (backward-char 2)
+                   (if (> start (line-end-position))
+                       (put-text-property (point) (1+ start)
+                                          'syntax-multiline t))
+                   ;; FIXME: The `in' may just be a random argument to
+                   ;; a normal command rather than the real `in' keyword.
+                   ;; I.e. we should look back to try and find the
+                   ;; corresponding `case'.
+                   (and (looking-at ";[;&]\\|\\_<in")
                         ;; ";; esac )" is a case that looks like a case-pattern
                         ;; but it's really just a close paren after a case
                         ;; statement.  I.e. if we skipped over `esac' just now,
@@ -3659,6 +3660,7 @@ The document is bounded by `sh-here-document-word'."
       (save-excursion
         (backward-char 2)
         (sh-quoted-p))
+      (nth 8 (syntax-ppss))
       (let ((tabs (if (string-match "\\`-" sh-here-document-word)
                       (make-string (/ (current-indentation) tab-width) ?\t)
                     ""))
diff --git a/lisp/saveplace.el b/lisp/saveplace.el
index 2d1586d895a..9d776877ca6 100644
--- a/lisp/saveplace.el
+++ b/lisp/saveplace.el
@@ -89,8 +89,9 @@ value of `version-control'."
 (defvar save-place-loaded nil
   "Non-nil means that the `save-place-file' has been loaded.")
 
-(defcustom save-place-limit nil
+(defcustom save-place-limit 400
   "Maximum number of entries to retain in the list; nil means no limit."
+  :version "24.1"                       ; nil -> 400
   :type '(choice (integer :tag "Entries" :value 1)
                  (const :tag "No Limit" nil))
   :group 'save-place)
diff --git a/lisp/server.el b/lisp/server.el
index c91f10b6584..63d46a365c9 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -112,7 +112,10 @@ If set, the server accepts remote connections; otherwise it is local."
 (put 'server-host 'risky-local-variable t)
 
 (defcustom server-port nil
-  "The port number that the server process should listen on."
+  "The port number that the server process should listen on.
+This variable only takes effect when the Emacs server is using
+TCP instead of local sockets.  A nil value means to use a random
+port number."
   :group 'server
   :type '(choice
           (string :tag "Port number")
diff --git a/lisp/shell.el b/lisp/shell.el
index de811543ba0..909ebb48afc 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -383,6 +383,39 @@ to `dirtrack-mode'."
   :group 'shell
   :type '(choice (const nil) regexp))
 
+(defun shell-parse-pcomplete-arguments ()
+  "Parse whitespace separated arguments in the current region."
+  (let ((begin (save-excursion (shell-backward-command 1) (point)))
+        (end (point))
+        begins args)
+    (save-excursion
+      (goto-char begin)
+      (while (< (point) end)
+        (skip-chars-forward " \t\n")
+        (push (point) begins)
+        (let ((arg ()))
+          (while (looking-at
+                  (eval-when-compile
+                    (concat
+                     "\\(?:[^\s\t\n\\\"']+"
+                     "\\|'\\([^']*\\)'?"
+                     "\\|\"\\(\\(?:[^\"\\]\\|\\\\.\\)*\\)\"?"
+                     "\\|\\\\\\(\\(?:.\\|\n\\)?\\)\\)")))
+            (goto-char (match-end 0))
+            (cond
+             ((match-beginning 3)       ;Backslash escape.
+              (push (if (= (match-beginning 3) (match-end 3))
+                        "\\" (match-string 3))
+                    arg))
+             ((match-beginning 2)       ;Double quote.
+              (push (replace-regexp-in-string
+                     "\\\\\\(.\\)" "\\1" (match-string 2))
+                    arg))
+             ((match-beginning 1)       ;Single quote.
+              (push (match-string 1) arg))
+             (t (push (match-string 0) arg))))
+          (push (mapconcat #'identity (nreverse arg) "") args)))
+      (cons (nreverse args) (nreverse begins)))))
 
 (defun shell-completion-vars ()
   "Setup completion vars for `shell-mode' and `read-shell-command'."
@@ -396,8 +429,9 @@ to `dirtrack-mode'."
   (set (make-local-variable 'comint-dynamic-complete-functions)
        shell-dynamic-complete-functions)
   (set (make-local-variable 'pcomplete-parse-arguments-function)
-       ;; FIXME: This function should be moved to shell.el.
-       #'pcomplete-parse-comint-arguments)
+       #'shell-parse-pcomplete-arguments)
+  (set (make-local-variable 'pcomplete-arg-quote-list)
+       (append "\\ \t\n\r\"'`$|&;(){}[]<>#" nil))
   (set (make-local-variable 'pcomplete-termination-string)
        (cond ((not comint-completion-addsuffix) "")
              ((stringp comint-completion-addsuffix)
diff --git a/lisp/startup.el b/lisp/startup.el
index 6953ed25ed4..6c3bb397e9a 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -105,6 +105,11 @@ This is a convenience alias, so that one can write \(pop argv\)
 inside of --eval command line arguments in order to access
 following arguments.")
 
+(with-no-warnings
+  ;; FIXME: Bad name for a dynamically bound variable
+  (defvar argi nil
+    "Current command-line argument."))
+
 (defvar command-line-functions nil    ;; lrs 7/31/89
   "List of functions to process unrecognized command-line arguments.
 Each function should access the dynamically bound variables
@@ -404,7 +409,7 @@ The regexp should not contain a starting \"\\`\" or a trailing
  \"\\'\"; those are added automatically by callers.")
 
 (defun normal-top-level-add-subdirs-to-load-path ()
-  "Add all subdirectories of current directory to `load-path'.
+  "Add all subdirectories of `default-directory' to `load-path'.
 More precisely, this uses only the subdirectories whose names
 start with letters or digits; it excludes any subdirectory named `RCS'
 or `CVS', and any subdirectory that contains a file named `.nosearch'."
diff --git a/lisp/subr.el b/lisp/subr.el
index ef19797012a..b49a20e7f6e 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -526,6 +526,20 @@ but optional second arg NODIGITS non-nil treats them like other chars."
           (define-key map (char-to-string loop) 'digit-argument)
           (setq loop (1+ loop))))))
 
+(defun make-composed-keymap (maps &optional parent)
+  "Construct a new keymap composed of MAPS and inheriting from PARENT.
+When looking up a key in the returned map, the key is looked in each
+keymap of MAPS in turn until a binding is found.
+If no binding is found in MAPS, the lookup continues in PARENT, if non-nil.
+As always with keymap inheritance, a nil binding in MAPS overrides
+any corresponding binding in PARENT, but it does not override corresponding
+bindings in other keymaps of MAPS.
+MAPS can be a list of keymaps or a single keymap.
+PARENT if non-nil should be a keymap."
+  `(keymap
+    ,@(if (keymapp maps) (list maps) maps)
+    ,@parent))
+
 (defun define-key-after (keymap key definition &optional after)
   "Add binding in KEYMAP for KEY => DEFINITION, right after AFTER's binding.
 This is like `define-key' except that the binding for KEY is placed
@@ -874,8 +888,8 @@ The elements of the list may include `meta', `control',
 and `down'.
 EVENT may be an event or an event type.  If EVENT is a symbol
 that has never been used in an event that has been read as input
-in the current Emacs session, then this function can return nil,
-even when EVENT actually has modifiers."
+in the current Emacs session, then this function may fail to include
+the `click' modifier."
   (let ((type event))
     (if (listp type)
         (setq type (car type)))
@@ -3524,6 +3538,24 @@ If IGNORE-CASE is non-nil, the comparison is done without paying attention
 to case differences."
   (eq t (compare-strings str1 nil nil
                          str2 0 (length str1) ignore-case)))
+
+(defun bidi-string-mark-left-to-right (str)
+  "Return a string that can be safely inserted in left-to-right text.
+
+Normally, inserting a string with right-to-left (RTL) script into
+a buffer may cause some subsequent text to be displayed as part
+of the RTL segment (usually this affects punctuation characters).
+This function returns a string which displays as STR but forces
+subsequent text to be displayed as left-to-right.
+
+If STR contains any RTL character, this function returns a string
+consisting of STR followed by an invisible left-to-right mark
+\(LRM) character.  Otherwise, it returns STR."
+  (unless (stringp str)
+    (signal 'wrong-type-argument (list 'stringp str)))
+  (if (string-match "\\cR" str)
+      (concat str (propertize (string ?\x200e) 'invisible t))
+    str))
 
 ;;;; invisibility specs
 
diff --git a/lisp/term.el b/lisp/term.el
index 6d7f6f5c535..361ff685396 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -1227,9 +1227,9 @@ without any interpretation."
                               (make-string 1 char)
                             (format "\e%c" char)))))
 
-(defun term-mouse-paste (click arg)
-  "Insert the last stretch of killed text at the position clicked on."
-  (interactive "e\nP")
+(defun term-mouse-paste (click)
+  "Insert the primary selection at the position clicked on."
+  (interactive "e")
   (if (featurep 'xemacs)
       (term-send-raw-string
        (or (condition-case () (x-get-selection) (error ()))
@@ -1238,10 +1238,17 @@ without any interpretation."
     (run-hooks 'mouse-leave-buffer-hook)
     (setq this-command 'yank)
     (mouse-set-point click)
-    (term-send-raw-string (current-kill (cond
-                                         ((listp arg) 0)
-                                         ((eq arg '-) -1)
-                                         (t (1- arg)))))))
+    (term-send-raw-string
+     (or (cond  ; From `mouse-yank-primary':
+          ((eq system-type 'windows-nt)
+           (or (x-get-selection 'PRIMARY)
+               (x-get-selection-value)))
+          ((fboundp 'x-get-selection-value)
+           (or (x-get-selection-value)
+               (x-get-selection 'PRIMARY)))
+          (t
+           (x-get-selection 'PRIMARY)))
+         (error "No selection is available")))))
 
 (defun term-paste ()
   "Insert the last stretch of killed text at point."
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index a660bdb6488..0383251523f 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -3060,7 +3060,7 @@ When called interactively, FORCE is t, CURRENT is t if current buffer uses
     ;; select BibTeX buffer
     (if select
         (if buffer-list
-            (pop-to-buffer-same-window
+            (switch-to-buffer
              (completing-read "Switch to BibTeX buffer: "
                               (mapcar 'buffer-name buffer-list)
                               nil t
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index c196218feec..5521cfd3de8 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -1914,7 +1914,7 @@ Global `ispell-quit' set to start location to continue spell session."
                     (setq line (1+ line))))
               (insert (car guess) "    ")
               (setq guess (cdr guess)))
-            (insert "\nUse option `i' to accept this spelling and put it in your private dictionary.")
+            (insert "\nUse option `i' to accept this spelling and put it in your private dictionary.\n")
             (setq line (+ line (if choices 3 2)))))
       (while (and choices
                   (< (if (> (+ 7 (current-column) (length (car choices))
diff --git a/lisp/time-stamp.el b/lisp/time-stamp.el
index 59340583997..fda8cd1438d 100644
--- a/lisp/time-stamp.el
+++ b/lisp/time-stamp.el
@@ -424,10 +424,10 @@ format the string."
           (let ((ts-real-time-zone (getenv "TZ")))
             (unwind-protect
                 (progn
-                  (set-time-zone-rule time-stamp-time-zone)
+                  (setenv "TZ" time-stamp-time-zone)
                   (format-time-string
                    (time-stamp-string-preprocess ts-format)))
-              (set-time-zone-rule ts-real-time-zone)))
+              (setenv "TZ" ts-real-time-zone)))
         (format-time-string
          (time-stamp-string-preprocess ts-format)))
     ;; handle version 1 compatibility
diff --git a/lisp/time.el b/lisp/time.el
index b158ef64691..f8fea0c64a2 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -156,21 +156,24 @@ LABEL is a string to display as the label of that TIMEZONE's time."
 (defcustom display-time-world-list
   ;; Determine if zoneinfo style timezones are supported by testing that
   ;; America/New York and Europe/London return different timezones.
-  (let (gmt nyt)
-    (set-time-zone-rule "America/New_York")
-    (setq nyt (format-time-string "%z"))
-    (set-time-zone-rule "Europe/London")
-    (setq gmt (format-time-string "%z"))
-    (set-time-zone-rule nil)
+  (let ((old-tz (getenv "TZ"))
+        gmt nyt)
+    (unwind-protect
+        (progn
+          (setenv "TZ" "America/New_York")
+          (setq nyt (format-time-string "%z"))
+          (setenv "TZ" "Europe/London")
+          (setq gmt (format-time-string "%z")))
+      (setenv "TZ" old-tz))
     (if (string-equal nyt gmt)
         legacy-style-world-list
       zoneinfo-style-world-list))
   "Alist of time zones and places for `display-time-world' to display.
 Each element has the form (TIMEZONE LABEL).
-TIMEZONE should be in the format supported by `set-time-zone-rule' on
-your system.  See the documentation of `zoneinfo-style-world-list' and
-\`legacy-style-world-list' for two widely used formats.
-LABEL is a string to display as the label of that TIMEZONE's time."
+TIMEZONE should be in a format supported by your system.  See the
+documentation of `zoneinfo-style-world-list' and
+\`legacy-style-world-list' for two widely used formats.  LABEL is
+a string to display as the label of that TIMEZONE's time."
   :group 'display-time
   :type '(repeat (list string string))
   :version "23.1")
@@ -521,26 +524,26 @@ See `display-time-world'."
 (defun display-time-world-display (alist)
   "Replace current buffer text with times in various zones, based on ALIST."
   (let ((inhibit-read-only t)
-        (buffer-undo-list t))
+        (buffer-undo-list t)
+        (old-tz (getenv "TZ"))
+        (max-width 0)
+        result fmt)
     (erase-buffer)
-    (let ((max-width 0)
-          (result ())
-          fmt)
-      (unwind-protect
-          (dolist (zone alist)
-            (let* ((label (cadr zone))
-                   (width (string-width label)))
-              (set-time-zone-rule (car zone))
-              (push (cons label
-                          (format-time-string display-time-world-time-format))
-                    result)
-              (when (> width max-width)
-                (setq max-width width))))
-        (set-time-zone-rule nil))
-      (setq fmt (concat "%-" (int-to-string max-width) "s %s\n"))
-      (dolist (timedata (nreverse result))
-        (insert (format fmt (car timedata) (cdr timedata)))))
-    (delete-char -1)))
+    (unwind-protect
+        (dolist (zone alist)
+          (let* ((label (cadr zone))
+                 (width (string-width label)))
+            (setenv "TZ" (car zone))
+            (push (cons label
+                        (format-time-string display-time-world-time-format))
+                  result)
+            (when (> width max-width)
+              (setq max-width width))))
+      (setenv "TZ" old-tz))
+    (setq fmt (concat "%-" (int-to-string max-width) "s %s\n"))
+    (dolist (timedata (nreverse result))
+      (insert (format fmt (car timedata) (cdr timedata)))))
+  (delete-char -1))
 
 ;;;###autoload
 (defun display-time-world ()
diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index 77ef50843d3..c57ec33d2e2 100644
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -253,7 +253,7 @@ LEFT and RIGHT are the elements to compare."
              ;; * INSERTING AND DELETING
              ;; C-u 8 * to insert ********.
              (delete-backward-char "\d")
-             (delete-forward-char [?\C-d])
+             (delete-char [?\C-d])
              (backward-kill-word [?\M-\d])
              (kill-word [?\M-d])
              (kill-line [?\C-k])
@@ -298,7 +298,7 @@ LEFT and RIGHT are the elements to compare."
              (isearch-backward [?\C-r])
 
              ;; * MULTIPLE WINDOWS
-             (split-window-vertically [?\C-x ?2])
+             (split-window-above-each-other [?\C-x ?2])
              (scroll-other-window [?\C-\M-v])
              (other-window [?\C-x ?o])
              (find-file-other-window [?\C-x ?4 ?\C-f])
@@ -889,6 +889,11 @@ Run the Viper tutorial? "))
                  (search-forward ">>")
                  (replace-match "]")))
           (beginning-of-line)
+          ;; FIXME: if the window is not tall, and especially if the
+          ;; big red "NOTICE: The main purpose..." text has been
+          ;; inserted at the start of the buffer, the "type C-v to
+          ;; move to the next screen" might not be visible on the
+          ;; first screen (n < 0).  How will the novice know what to do?
           (let ((n (- (window-height (selected-window))
                       (count-lines (point-min) (point))
                       6)))
@@ -897,7 +902,7 @@ Run the Viper tutorial? "))
                   ;; For a short gap, we don't need the [...] line,
                   ;; so delete it.
                   (delete-region (point) (progn (end-of-line) (point)))
-                  (newline n))
+                  (if (> n 0) (newline n)))
               ;; Some people get confused by the large gap.
               (newline (/ n 2))
 
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 6a3638c4232..5714179fcfe 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-07  Chong Yidong  <cyd@stupidchicken.com>
+
+        * url-http.el (url-http-parse-headers): For HTTP 301/302/307,
+        don't convert to a GET request (Bug#701).
+
 2011-07-13  Chris Newton  <redshodan@gmail.com>  (tiny change)
 
         * url-http.el (url-http): Copy over `url-show-status' to the async
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index def35449397..a21aed21436 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -563,16 +563,8 @@ should be shown to the user."
             ;; automatically redirect the request unless it can be
             ;; confirmed by the user, since this might change the
             ;; conditions under which the request was issued.
-            (if (member url-http-method '("HEAD" "GET"))
-                ;; Automatic redirection is ok
-                nil
-              ;; It is just too big of a pain in the ass to get this
-              ;; prompt all the time.  We will just silently lose our
-              ;; data and convert to a GET method.
-              (url-http-debug "Converting `%s' request to `GET' because of REDIRECT(%d)"
-                              url-http-method url-http-response-status)
-              (setq url-http-method "GET"
-                    url-http-data nil)))
+            (unless (member url-http-method '("HEAD" "GET"))
+              (setq redirect-uri nil)))
            (see-other                   ; 303
             ;; The response to the request can be found under a different
             ;; URI and SHOULD be retrieved using a GET method on that
diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el
index e5aead2309f..9170d7b9424 100644
--- a/lisp/vc/add-log.el
+++ b/lisp/vc/add-log.el
@@ -853,9 +853,9 @@ non-nil, otherwise in local time."
                             (let ((tz (getenv "TZ")))
                               (unwind-protect
                                   (progn
-                                    (set-time-zone-rule add-log-time-zone-rule)
+                                    (setenv "TZ" add-log-time-zone-rule)
                                     (funcall add-log-time-format))
-                                (set-time-zone-rule tz)))
+                                (setenv "TZ" tz)))
                           (funcall add-log-time-format))
                         "  " full-name
                         "  <" addr ">"))
diff --git a/lisp/vc/pcvs-defs.el b/lisp/vc/pcvs-defs.el
index 67f86dd364c..46b95130ca0 100644
--- a/lisp/vc/pcvs-defs.el
+++ b/lisp/vc/pcvs-defs.el
@@ -183,7 +183,7 @@ If set to nil, `cvs-mode-add' will always prompt for a message."
 
 (defcustom cvs-find-file-and-jump nil
   "Jump to the modified area when finding a file.
-If non-nil, `cvs-mode-file-file' will place the cursor at the beginning of
+If non-nil, `cvs-mode-find-file' will place the cursor at the beginning of
 the modified area.  If the file is not locally modified, this will obviously
 have no effect."
   :group 'pcl-cvs
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 711a573ba99..fc42b43c97d 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -988,7 +988,8 @@ This command shares argument histories with \\[rgrep] and \\[grep]."
               (setq command nil))
         (setq dir (file-name-as-directory (expand-file-name dir)))
         (setq command
-              (grep-expand-template "git grep -n -e <R> -- <F>" regexp files))
+              (grep-expand-template "git grep --no-color -n -e <R> -- <F>"
+                                    regexp files))
         (when command
           (if (equal current-prefix-arg '(4))
               (setq command
diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el
index 488efaa3522..8051009a983 100644
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -314,7 +314,10 @@ expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile."
 (defun vc-rcs-responsible-p (file)
   "Return non-nil if RCS thinks it would be responsible for registering FILE."
   ;; TODO: check for all the patterns in vc-rcs-master-templates
-  (file-directory-p (expand-file-name "RCS" (file-name-directory file))))
+  (file-directory-p (expand-file-name "RCS"
+                                      (if (file-directory-p file)
+                                          file
+                                        (file-name-directory file)))))
 
 (defun vc-rcs-receive-file (file rev)
   "Implementation of receive-file for RCS."
diff --git a/lisp/view.el b/lisp/view.el
index 21479a70a72..11cbc79449f 100644
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -318,7 +318,7 @@ EXIT-ACTION to `kill-buffer-if-not-modified' avoids this."
       (progn
         (switch-to-buffer buffer)
         (message "Not using View mode because the major mode is special"))
-    (pop-to-buffer-same-window buffer)
+    (switch-to-buffer buffer)
     (view-mode-enter nil exit-action)))
 
 ;;;###autoload
@@ -338,7 +338,8 @@ 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'."
   (interactive "bIn other window view buffer:\nP")
-  (pop-to-buffer-other-window buffer)
+  (let ((pop-up-windows t))
+    (pop-to-buffer buffer t))
   (view-mode-enter nil exit-action))
 
 ;;;###autoload
@@ -358,7 +359,8 @@ 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'."
   (interactive "bView buffer in other frame: \nP")
-  (pop-to-buffer-other-frame buffer)
+  (let ((pop-up-frames t))
+    (pop-to-buffer buffer t))
   (view-mode-enter nil exit-action))
 
 ;;;###autoload
@@ -576,9 +578,9 @@ current buffer. "
         (cond
          ((or all-windows view-exits-all-viewing-windows)
           (dolist (window (get-buffer-window-list))
-            (quit-restore-window window)))
+            (quit-window nil window)))
          ((eq (window-buffer) (current-buffer))
-          (quit-restore-window)))
+          (quit-window)))
 
         (when exit-action
           (funcall exit-action buffer))
diff --git a/lisp/window.el b/lisp/window.el
index 905db8dc9b6..5272841a9c7 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -2259,10 +2259,10 @@ and no others."
 
 ;;; Deleting windows.
 (defcustom frame-auto-delete 'automatic
-  "If non-nil, quitting a window can delete it's frame.
+  "If non-nil, quitting a window can delete its frame.
 If this variable is nil, functions that quit a window never
-delete the associated frame.  If this variable equals the symbol
-`automatic', a frame is deleted only if it the window is
+delete the associated frame.  If this variable's value is the
+symbol `automatic', a frame is deleted only if the window is
 dedicated or was created by `display-buffer'.  If this variable
 is t, a frame can be always deleted, even if it was created by
 `make-frame-command'.  Other values should not be used.
@@ -2272,7 +2272,7 @@ another frame still exists.
 
 Functions quitting a window and consequently affected by this
 variable are `switch-to-prev-buffer', `delete-windows-on',
-`replace-buffer-in-windows' and `quit-restore-window'."
+`replace-buffer-in-windows' and `quit-window'."
   :type '(choice
           (const :tag "Never" nil)
           (const :tag "Automatic" automatic)
@@ -2282,8 +2282,8 @@ variable are `switch-to-prev-buffer', `delete-windows-on',
 
 (defun window-deletable-p (&optional window)
   "Return t if WINDOW can be safely deleted from its frame.
-Return `frame' if deleting WINDOW should delete its frame
-instead."
+Return `frame' if deleting WINDOW should also delete its
+frame."
   (setq window (window-normalize-any-window window))
   (unless ignore-window-parameters
     ;; Handle atomicity.
@@ -2291,29 +2291,45 @@ instead."
       (setq window (window-atom-root window))))
   (let ((parent (window-parent window))
         (frame (window-frame window))
+        (buffer (window-buffer window))
         (dedicated (and (window-buffer window) (window-dedicated-p window)))
         (quit-restore (window-parameter window 'quit-restore)))
     (cond
      ((frame-root-window-p window)
+     ;; Don't delete FRAME if `frame-auto-delete' is nil.
       (when (and (or (eq frame-auto-delete t)
                      (and (eq frame-auto-delete 'automatic)
+                          ;; Delete FRAME only if it's either dedicated
+                          ;; or quit-restore's car is `new-frame' and
+                          ;; WINDOW still displays the same buffer
                           (or dedicated
                               (and (eq (car-safe quit-restore) 'new-frame)
                                    (eq (nth 1 quit-restore)
                                        (window-buffer window))))))
+                 ;; Don't delete FRAME if we have another buffer in
+                 ;; WINDOW's previous buffers.  Bug#9419.
+                 (or (not (window-prev-buffers window))
+                     (eq (caar (window-prev-buffers window)) buffer))
+                 ;; Don't try to delete FRAME when there are no other
+                 ;; visible frames left.
                  (other-visible-frames-p frame))
-        ;; WINDOW is the root window of its frame.  Return `frame' but
-        ;; only if WINDOW is (1) either dedicated or quit-restore's car
-        ;; is new-frame and the window still displays the same buffer
-        ;; and (2) there are other frames left.
         'frame))
-     ((and (not ignore-window-parameters)
-           (eq (window-parameter window 'window-side) 'none)
-           (or (not parent)
-               (not (eq (window-parameter parent 'window-side) 'none))))
-      ;; Can't delete last main window.
-      nil)
-     (t))))
+     ;; Don't delete WINDOW if we find another buffer in WINDOW's
+     ;; previous buffers.
+     ((and (or (not (window-prev-buffers window))
+               (eq (caar (window-prev-buffers window)) buffer))
+           ;; Delete WINDOW only if it's dedicated or quit-restore's car
+           ;; is `new-frame' or `new-window' and it still displays the
+           ;; same buffer.
+           (or dedicated
+               (and (memq (car-safe quit-restore) '(new-window new-frame))
+                    (eq (nth 1 quit-restore) (window-buffer window))))
+           ;; Don't delete the last main window.
+           (or ignore-window-parameters
+               (not (eq (window-parameter window 'window-side) 'none))
+               (and parent
+                    (eq (window-parameter parent 'window-side) 'none))))
+      t))))
 
 (defun window-or-subwindow-p (subwindow window)
   "Return t if SUBWINDOW is either WINDOW or a subwindow of WINDOW."
@@ -2795,7 +2811,7 @@ displayed there."
   (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)
+    (bury-buffer-internal buffer)
     ;; Handle case where `buffer-or-name' is nil and the current buffer
     ;; is shown in the selected window.
     (cond
@@ -2907,21 +2923,17 @@ all window-local buffer lists."
         ;; Unrecord BUFFER in WINDOW.
         (unrecord-window-buffer window buffer)))))
 
-(defun quit-restore-window (&optional window kill)
-  "Quit WINDOW in some way.
-WINDOW must be a live window and defaults to the selected window.
-Return nil.
+(defun quit-window (&optional kill window)
+  "Quit WINDOW and bury its buffer.
+WINDOW defaults to the selected window.
+With a prefix argument, kill the buffer instead.
 
 According to information stored in WINDOW's `quit-restore' window
 parameter either \(1) delete WINDOW and its frame, \(2) delete
 WINDOW, \(3) restore the buffer previously displayed in WINDOW,
 or \(4) make WINDOW display some other buffer than the present
-one.  If non-nil, reset `quit-restore' parameter to nil.
-
-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")
+one.  If non-nil, reset `quit-restore' parameter to nil."
+  (interactive "P")
   (setq window (window-normalize-live-window window))
   (let ((buffer (window-buffer window))
         (quit-restore (window-parameter window 'quit-restore))
@@ -2932,12 +2944,9 @@ buffer list.  Interactively, KILL is the prefix argument."
                     (eq (window-buffer window) (nth 1 quit-restore)))
                (window-dedicated-p window))
            (setq deletable (window-deletable-p window)))
-      ;; WINDOW can be deleted.
-      (unrecord-buffer buffer)
+      ;; Check if WINDOW's frame can be deleted.
       (if (eq deletable 'frame)
-          ;; WINDOW's frame can be deleted.
           (delete-frame (window-frame window))
-        ;; Just delete WINDOW.
         (delete-window window))
       ;; If the previously selected window is still alive, select it.
       (when (window-live-p (nth 2 quit-restore))
@@ -2948,17 +2957,17 @@ buffer list.  Interactively, KILL is the prefix argument."
            ;; in the first place.
            (eq (window-buffer window) (nth 3 quit-restore)))
       (setq resize (with-current-buffer buffer temp-buffer-resize-mode))
-      ;; Unrecord buffer.
-      (unrecord-buffer buffer)
       (unrecord-window-buffer window buffer)
       ;; Display buffer stored in the quit-restore parameter.
       (set-window-dedicated-p window nil)
       (set-window-buffer window (nth 0 quit-restore))
       (set-window-start window (nth 1 quit-restore))
       (set-window-point window (nth 2 quit-restore))
-      (when (and resize (/= (nth 4 quit-restore) (window-total-size window)))
-        (window-resize
-         window (- (nth 4 quit-restore) (window-total-size window))))
+      (and resize
+           (/= (nth 4 quit-restore) (window-total-size window))
+           (window-resize window
+                          (- (nth 4 quit-restore)
+                             (window-total-size window))))
       ;; Reset the quit-restore parameter.
       (set-window-parameter window 'quit-restore nil)
       (when (window-live-p (nth 5 quit-restore))
@@ -2967,12 +2976,12 @@ buffer list.  Interactively, KILL is the prefix argument."
       ;; Otherwise, show another buffer in WINDOW and reset the
       ;; quit-restore parameter.
       (set-window-parameter window 'quit-restore nil)
-      (unrecord-buffer buffer)
       (switch-to-prev-buffer window 'bury-or-kill)))
 
     ;; Kill WINDOW's old-buffer if requested
-    (when kill (kill-buffer buffer))
-    nil))
+    (if kill
+        (kill-buffer buffer)
+      (bury-buffer-internal buffer))))
 
 ;;; Splitting windows.
 (defsubst window-split-min-size (&optional horizontal)
@@ -3829,790 +3838,6 @@ subwindows can get as small as `window-safe-min-height' and
         (window-state-put-2 ignore))
       (window-check frame))))
 
-(defconst display-buffer-macro-specifiers
-  '((same-window
-     ;; Use the same window.
-     (reuse-window same nil nil))
-    (same-frame
-     ;; Avoid other frames.
-     (reuse-window nil same nil)
-     (pop-up-window (largest . nil) (lru . nil))
-     (reuse-window nil other nil))
-    (same-frame-other-window
-     ;; Avoid other frames and selected window.
-     (reuse-window other same nil)
-     (pop-up-window (largest . nil) (lru . nil))
-     (reuse-window other other nil))
-    (other-frame
-     ;; Avoid selected frame.
-     (reuse-window nil same other)
-     (pop-up-frame)
-     (reuse-window nil other other)))
-  "Buffer display macro specifiers.")
-
-(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
-according to the display specifiers in the element's cdr
-\(elements are true lists) if at least one of the identifiers
-matches the first or third argument of `display-buffer'.  Such a
-match occurs in one of the following three cases:
-
-- The car of the buffer identifier is the symbol `name' and its
-  cdr is a string equalling the name of the buffer specified by
-  the first \(BUFFER-OR-NAME) argument of `display-buffer'.
-
-- The car is the symbol `regexp' and the cdr is a regular
-  expression matching the name of the buffer specified by the
-  first \(BUFFER-OR-NAME) argument of `display-buffer'.
-
-- The car is the symbol `label' and the cdr is a symbol equalling
-  the third \(LABEL) argument of `display-buffer'.
-
-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 `function'.
-
-A list whose car is the symbol `reuse-window' indicates that an
-existing window shall be reused for displaying the buffer.  The
-second element of this list specifies the window to use and can
-be one of the following symbols:
-
-  nil stands for any window.
-
-  `same' stands for the selected window.
-
-  `other' stands for any but the selected window.
-
-The third element specifies whether the buffer shown in a window
-that shall be reused must be the same buffer that shall be
-displayed or another buffer and can be one of the following:
-
-  nil means to not care about the window's buffer.
-
-  `same' means the window must show the buffer already.
-
-  `other' means the window must not show the buffer yet.
-
-The fourth element specifies the set of frames to search for a
-suitable window and can be one of the following:
-
-  nil to reuse a window on the selected frame.
-
-  `visible' to search visible frames on the current terminal.
-
-  `other' stands for any visible frame but the selected one.
-
-  0 \(the number zero) to search visible and iconified frames on
-  the current terminal.
-
-  t to search arbitrary frames including invisible ones.
-
-If more than one window fits the constraints imposed by these
-elements, the least recently used candidate is chosen.  A side
-window is never reused unless it already shows the buffer.
-
-The following two specifiers are useful when the method equals
-`reuse-window':
-
-- A cons cell whose car is the symbol `reuse-window-even-sizes'
-  and whose cdr is non-nil means to even out the sizes of a
-  reused window and the selected window provided they (1) appear
-  adjacent to each other and (2) the selected window is larger
-  than the window chosen.  If the cdr is nil, this means that the
-  window sizes are left alone.
-
-- A cons cell whose car is the symbol `reuse-window-dedicated'
-  and whose cdr is non-nil means that a window can be reused even
-  if it's weakly dedicated to its buffer.  If the cdr is t, a
-  strongly dedicated window can be reused to show the buffer.
-  Any other non-nil value means only weakly dedicated windows can
-  be reused.  If the cdr is nil, dedicated windows are not
-  reused.
-
-  This specifier should be used in emergency cases only since
-  windows are usually made dedicated in order to prevent
-  `display-buffer' from reusing them.
-
-A list whose car is the symbol `pop-up-window' and whose cdr is
-built from cons cells representing window/side tuples indicates
-that a new window shall be made for displaying the buffer on the
-selected frame.
-
-Window/side tuples are cons cells.  The car of such a tuple
-identifies the window that shall be split.  Possible values are
-`largest', `lru', `selected', and `root' to split the largest,
-least recently used, selected or root window of the selected
-frame.
-
-If the frame has side windows, these values do allow to split
-only the selected frame's main window or one of its subwindows.
-Setting the car to one of `left', `top', `right' and `bottom'
-splits the corresponding side window, provided such a window
-exists.
-
-The cdr of each pair specifies on which side of the window to
-split the new window shall appear and can be one of `below',
-`right', `above', or `left' with the obvious meanings.  If the
-cdr is nil, the window is split in a fashion suitable for its
-current dimensions.  If the cdr specifies a function, that
-function is called with one argument - the window to split.  The
-function is supposed to split that window and return the new
-window.
-
-`display-buffer' scans these tuples until it can either produce a
-suitable window or fails.  The default value for
-`display-buffer-alist' contains the tuples \(largest . nil) and
-\(lru . nil) in order to split the largest window first and, if
-that fails, the least recently used one.
-
-The following specifiers are useful if the method specifier is
-`pop-up-window'.
-
-- A cons cell whose car is the symbol `pop-up-window-min-height'
-  specifiies the minimum height of the new window.  If the cdr is
-  an integer number, it specifies the minimum number of lines of
-  the window.  A floating point number gives the minimum fraction
-  of the window height with respect to the height of the frame's
-  root window.  A new window is created only if it can be made at
-  least as high as specified by the number.  If the cdr is nil,
-  this means to use the value of `window-min-height'.
-
-- A cons cell whose car is the symbol `pop-up-window-min-width'
-  specifies the minimum width of the new window.  If the cdr is
-  an integer number, it specifies the minimum number of columns
-  of the window.  A floating point number gives the minimum
-  fraction of the window width with respect to the width of the
-  frame's root window.  A new window is created only if it can be
-  made at least as wide as specified by the number.  If the cdr
-  is nil, this means to use the value of `window-min-width'.
-
-- A cons cell whose car is `pop-up-window-set-height' with
-  the following interpretations for the cdr:
-
-  - nil means leave the height of the new window alone.
-
-  - A number specifies the desired height of the new window.  An
-    integer number specifies the number of lines of the window.
-    A floating point number gives the fraction of the window
-    height with respect to the height of the frame's root window.
-
-  - If the cdr specifies a function, that function is called with
-    one argument - the new window.  The function is supposed to
-    adjust the height of the window; its return value is ignored.
-    Suitable functions are `shrink-window-if-larger-than-buffer'
-    and `fit-window-to-buffer'.
-
-- A cons cell whose car equals `pop-up-window-set-width' with
-  the following interpretations for the cdr:
-
-  - nil means leave the width of the new window alone.
-
-  - A number specifies the desired width of the new window.  An
-    integer number specifies the number of columns of the window.
-    A floating point number gives the fraction of the window
-    width with respect to the width of the frame's root window.
-
-  - If the cdr specifies a function, that function is called with
-    one argument - the new window.  The function is supposed to
-    adjust the width of the window; its return value is ignored.
-
-  Observe that specifying `pop-up-window-set-height' or
-  `pop-up-window-set-width' may override restrictions given by
-  the `pop-up-window-min-height' and `pop-up-window-min-width'
-  specifiers.
-
-- A cons cell whose car is `pop-up-window-split-unsplittable' and
-  whose cdr is non-nil allows to make a new window on an
-  unsplittable frame.  If the cdr is nil, unsplittable frames are
-  not split.  This specifier should be used in special cases only
-  since frames are usually made unsplittable in order to prevent
-  `display-buffer' from splitting them.
-
-A list whose car is the symbol `pop-up-frame' specifies that a
-new frame shall be made for displaying the buffer.  The second
-element, if non-nil, allows popping up a new frame on graphic
-displays only.
-
-The following specifiers are useful if the method specifier is
-`pop-up-frame'.
-
-- A list whose car is the symbol `pop-up-frame-function' together
-  with a valid function as cdr specifies the function for
-  creating a new frame.  If the cdr is nil, the default function
-  `make-frame' is called.  The function is called with the
-  parameters and values provided by the specifier described next.
-
-- A list whose car is the symbol `pop-up-frame-alist' followed by
-  an arbitrary number of frame parameter/value tuples, each given
-  as a cons cell, specifies the parameters passed to the pop-up
-  frame function.
-
-A list of three elements whose car is the symbol
-`use-side-window' specifies that the buffer shall be displayed in
-a side window of the selected frame.  The second element denotes
-the side of the frame where the window appears or shall be made.
-The third element denotes the slot used by the window.  If a side
-window with the specified slot exists already, that window is
-reused.  If no such window exists it is created.
-
-The following specifiers are useful in connection with the
-`use-side-window' method specifier: `reuse-window-dedicated',
-`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 `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 second.
-
-The function should choose or create a window, display the buffer
-in it, and return the window.  It is also responsible for giving
-the variable `display-buffer-window' and the `quit-restore'
-parameter of the window used a meaningful value.
-
-Within the body of this function avoid calling `display-buffer'
-with the same buffer as argument since this may lead to endless
-recursion.
-
-Instead of supplying basic method specifiers, it's sometimes more
-convenient to use macro specifiers.  They provide some commonly
-used display methods but do not support the fine control provided
-by the basic method specifiers.  Macro specifiers are symbols.
-The following macro specifiers are provided:
-
-  `same-window' to display the buffer in the selected window.
-
-  `same-frame' to display the buffer on the selected frame.
-
-  `other-window' to display the buffer in any window but the
-   selected one.
-
-  `same-frame-other-window' as `other-window' but stay on the
-  selected frame.
-
-  `other-frame' to display the buffer on another visible
-  frame.
-
-  `default' to use the default value of `display-buffer-alist'.
-
-One specifier is useful with any method specifier: A list whose
-car is the symbol `dedicate' and whose cdr is non-nil will
-dedicate the window to its buffer.  The following values are
-supported:
-
-- nil to not dedicate the window to the buffer.
-
-- `weak' to weakly dedicate the window to the buffer.
-
-- t to strongly dedicate the window to the buffer.
-
-A cons cell whose car is `other-window-means-other-frame' and
-whose cdr is non-nil means that you want calls of
-`display-buffer' with the second argument t or the symbol
-`other-window' to display the buffer in another frame.  This
-means, for example, that you prefer functions like
-`find-file-other-window' or `switch-to-buffer-other-window' to
-make a new frame instead of a new window on the selected frame.
-
-Usually, applications are free to override the specifiers of
-`display-buffer-alist' by passing their own specifiers as second
-argument of `display-buffer'.  For every `display-buffer-alist'
-entry you can, however, add a cons cell whose car is the symbol
-`override' and whose cdr is non-nil, to explicitly override any
-value supplied by the application.
-
-Overriding specifiers supplied by the calling application is, in
-general, not advisable.  It permits, for example, to change the
-semantics of a function like `display-buffer-other-window' by
-using the location specifiers `same-window' or `other-frame'."
-  :risky t
-  :type
-  '(repeat
-    :offset 9
-    ;; Associations of buffer identifiers and display specifiers.
-    (list
-     :format "%v"
-     ;; Buffer identifiers.
-     (repeat
-      :tag "Buffer identifiers"
-      (choice
-       :tag "Identifier"
-       :format "%[%t%] %v" :size 15
-       (cons
-        :tag "Name"
-        :format "%v"
-        :help-echo "A buffer name."
-        (const :format "" name)
-        (string :format "Name: %v\n" :size 32))
-       (cons
-        :tag "Regexp"
-        :format "%v"
-        :help-echo "A regular expression matching buffer names."
-        (const :format "" regexp)
-        (string :format "Regexp: %v\n" :size 32))
-       (cons
-        :tag "Label"
-        :format "%v"
-        :help-echo "A symbol equalling the buffer display label."
-        (const :format "" label)
-        (symbol :format "Label: %v\n" :size 32))))
-
-     ;; Display specifiers.
-     (repeat
-      :offset 9
-      :tag "Display specifiers"
-      :inline t
-      (list
-       :inline t
-       :format "%v"
-       (choice
-        :tag "Method"
-        :value (reuse-window
-                (reuse-window nil same nil)
-                (reuse-window-even-sizes . t))
-        :inline t
-        :help-echo "Method for displaying the buffer."
-        :format "%[Method%] %v" :size 15
-
-        ;; Reuse window specifiers.
-        (list
-         :tag "Reuse window"
-         :value (reuse-window
-                 (reuse-window nil same nil)
-                 (reuse-window-even-sizes . t))
-         :format "%t\n%v"
-         :inline t
-         ;; For customization purposes only.
-         (const :format "" reuse-window)
-         (set
-          :format "%v"
-          :inline t
-          ;; The window to reuse.
-          (list
-           :format "%v\n"
-           (const :format "" reuse-window)
-           ;; The window type.
-           (choice
-            :tag "Window"
-            :help-echo "Window to reuse."
-            :value nil
-            :format "%[Window%] %v" :size 15
-            (const :tag "Any window" :format "%t" nil)
-            (const :tag "Same window" :format "%t" same)
-            (const :tag "Other window" :format "%t" other))
-           ;; The window's buffer.
-           (choice
-            :tag "Buffer"
-            :help-echo "Buffer shown by reused window."
-            :value t
-            :format " %[Buffer%] %v" :size 15
-            (const :tag "Any buffer" :format "%t" nil)
-            (const :tag "Same buffer" :format "%t" same)
-            (const :tag "Other buffer" :format "%t" other))
-           ;; The window's frame.
-           (choice
-            :help-echo "Frames to search for a window to reuse."
-            :tag "Frame"
-            :value nil
-            :format " %[Frame%] %v" :size 15
-            (const :tag "Same frame only" :format "%t" nil)
-            (const :tag "Visible frames" :format "%t" visible)
-            (const :tag "Any other visible frame" :format "%t" other)
-            (const :tag "Visible and iconified frames" :format "%t" 0)
-            (const :tag "All frames" :format "%t" t)))
-          ;; Whether window sizes should be evened out.
-          (cons
-           :format "%v\n"
-           :tag "Even window sizes"
-           (const :format "" reuse-window-even-sizes)
-           (choice
-            :tag "Even window sizes"
-            :help-echo "Whether to even sizes of selected and reused window."
-            :value t
-            :format "%[Even window sizes%] %v" :size 15
-            (const :tag "Off" :format "%t" nil)
-            (const :tag "Even window sizes" :format "%t" t)))
-          ;; Whether to reuse a dedicated window
-          (cons
-           :format "%v\n"
-           (const :format "" reuse-window-dedicated)
-           (choice
-            :tag "Reuse dedicated window" :value nil
-            :help-echo "Reuse a window even if it is dedicated to its buffer."
-            :format "%[Reuse dedicated window%] %v" :size 15
-            (const :tag "Off" :format "%t" nil)
-            (const :tag "Reuse weakly dedicated windows" :format "%t" weak)
-            (const :tag "Reuse any dedicated window" :format "%t" t)))))
-
-        ;; Pop-up window specifiers.
-        (list
-         :tag "Pop-up window"
-         :value (pop-up-window (pop-up-window (largest . nil) (lru . nil)))
-         :format "%t\n%v"
-         :inline t
-         (const :format "" pop-up-window)
-         (set
-          :format "%v"
-          :inline t
-          ;; Pop-up window list.
-          (list
-           :format "%v"
-           :value (pop-up-window (largest . nil) (lru . nil))
-           (const :format "" pop-up-window)
-           (repeat
-            :tag "Window / Side tuples"
-            :inline t
-            (cons
-             :format "%v\n"
-             (choice
-              :tag "Window"
-              :help-echo "The window to split."
-              :value largest
-              :format "%[Window%] %v"
-              (const :tag "Largest" :format "%t" largest)
-              (const :tag "Least recently used" :format "%t" lru)
-              (const :tag "Selected" :format "%t" selected)
-              (const :tag "Root" :format "%t" root)
-              (const :tag "Left" :format "%t" left)
-              (const :tag "Top" :format "%t" top)
-              (const :tag "Right" :format "%t" right)
-              (const :tag "Bottom" :format "%t" bottom))
-             (choice
-              :tag "Side"
-              :help-echo "The position of the new window with respect to the window to split."
-              :value nil
-              :format " %[Side%] %v"
-              (const :tag "Dynamic" :format "%t" nil)
-              (const :tag "Below" :format "%t" below)
-              (const :tag "Right" :format "%t" right)
-              (const :tag "Above" :format "%t" above)
-              (const :tag "Left" :format "%t" left)
-              (function
-               :tag "Function" :format "%v" :size 25)))))
-          ;; Minimum height of pop-up windows.
-          (cons
-           :format "%v\n"
-           (const :format "" pop-up-window-min-height)
-           (choice
-            :help-echo "Minimum height of popped-up window."
-            :format "%[Minimum height%] %v"
-            (const :tag "Default" :format "%t" :value nil)
-            (integer :tag "Number of lines" :value 12 :size 5)
-            (float :tag "Fraction of frame height" :value .25 :size 5)))
-          ;; Minimum width of pop-up windows.
-          (cons
-           :format "%v\n"
-           (const :format "" pop-up-window-min-width)
-           (choice
-            :help-echo "Minimum width of popped-up window."
-            :format "%[Minimum width%] %v"
-            (const :tag "Default" :format "%t" :value nil)
-            (integer :tag "Number of columns" :value 12 :size 5)
-            (float :tag "Fraction of frame width" :value .25 :size 5)))
-          ;; Desired height of pop-up windows.
-          (cons
-           :format "%v\n"
-           (const :format "" pop-up-window-set-height)
-           (choice
-            :help-echo "Desired height of popped-up window."
-            :format "%[Desired height%] %v"
-            (const :tag "Default" :format "%t" :value nil)
-            (integer :tag "Number of lines" :value 12 :size 5)
-            (float :tag "Fraction of frame height" :value .25 :size 5)
-            (function :tag "Function" :size 25)))
-          ;; Desired width of pop-up windows.
-          (cons
-           :format "%v\n"
-           (const :format "" pop-up-window-set-width)
-           (choice
-            :help-echo "Desired width of popped-up window."
-            :format "%[Desired width%] %v"
-            (const :tag "Default" :format "%t" :value nil)
-            (integer :tag "Number of column" :value 12 :size 5)
-            (float :tag "Fraction of frame width" :value .25 :size 5)
-            (function :tag "Function" :size 25)))
-          ;; Split unsplittable frames.
-          (cons
-           :format "%v\n"
-           (const :format "" pop-up-window-unsplittable)
-           (choice
-            :help-echo "Allow popping up a window on \"unsplittable\" frames."
-            :format "%[Split unsplittable frame%] %v"
-            (const :tag "Off" :format "%t" nil)
-            (const :tag "Allow" :format "%t" t)))))
-
-        ;; Pop-up frame specifiers.
-        (list
-         :tag "Pop-up frame"
-         :value (pop-up-frame
-                 (pop-up-frame))
-         :format "%t\n%v"
-         :inline t
-         (const :format "" pop-up-frame)
-         (set
-          :format "%v"
-          :inline t
-          ;; Pop-up frame.
-          (list
-           :tag "Pop-up a new frame"
-           :value (pop-up-frame)
-           :format "%v"
-           (const :format "" pop-up-frame)
-           (choice
-            :tag "Pop-up a new frame"
-            :help-echo "Whether to pop-up a new frame on a display."
-            :format "%[Display%] %v\n" :size 15
-            (const :tag "On any display" :format "%t" nil)
-            (const :tag "On graphic displays only" :format "%t" t)))
-          ;; Pop-up frame function.
-          (cons
-           :format "%v\n"
-           (const :format "" pop-up-frame-function)
-           (choice
-            :tag "Pop-up frame function"
-            :value nil
-            :help-echo "Function to use to pop-up a new frame."
-            :format "%[Function%] %v" :size 15
-            (const :tag "Default" :format "%t" nil)
-            (function
-             :value make-frame
-             :format "%t: %v"
-             :size 25)))
-          ;; Pop-up frame alist.
-          (list
-           :format "%v"
-           (const :format "" pop-up-frame-alist)
-           (repeat
-            :tag "Parameter / Value tuples"
-            :inline t
-            (cons
-             :format "%v\n"
-             (symbol
-              :tag "Parameter"
-              :format "Parameter: %v"
-              :size 16)
-             (sexp
-              :tag "Value"
-              :format "  Value: %v"
-              :size 8))))))
-
-        ;; Use side-window specifiers.
-        (list
-         :tag "Use side-window"
-         :value (use-side-window (use-side-window bottom 0))
-         :format "%t\n%v"
-         :inline t
-         ;; For customization purposes only.
-         (const :format "" use-side-window)
-         (set
-          :format "%v"
-          :inline t
-          ;; Side and slot.
-          (list
-           :format "%v\n"
-           :value (use-side-window bottom 0)
-           (const :format "" use-side-window)
-           ;; The side.
-           (choice
-            :tag "Side"
-            :help-echo "Side of frame."
-            :value bottom
-            :format "%[Side%] %v" :size 15
-            (const :tag "Left" :format "%t" left)
-            (const :tag "Top" :format "%t" top)
-            (const :tag "Right" :format "%t" right)
-            (const :tag "Bottom" :format "%t" bottom))
-           ;; The slot
-           (number
-            :tag "Slot"
-            :help-echo "The slot (an arbitrary number, where 0 stands for the center slot)."
-            :value 0
-            :format "   Slot: %v" :size 8))
-          ;; Whether to reuse a dedicated side window
-          (cons
-           :format "%v\n"
-           (const :format "" reuse-window-dedicated)
-           (choice
-            :tag "Reuse dedicated side window" :value nil
-            :help-echo "Reuse a side window even if it is dedicated to its buffer."
-            :format "%[Reuse dedicated side window%] %v" :size 15
-            (const :tag "Off" :format "%t" nil)
-            (const :tag "Reuse weakly dedicated side windows" :format "%t" weak)
-            (const :tag "Reuse any dedicated side window" :format "%t" t)))
-          ;; Minimum height of pop-up side windows.
-          (cons
-           :format "%v\n"
-           (const :format "" pop-up-window-min-height)
-           (choice
-            :help-echo "Minimum height of popped-up side window."
-            :format "%[Minimum height%] %v"
-            (const :tag "Default" :format "%t" :value nil)
-            (integer :tag "Number of lines" :value 12 :size 5)
-            (float :tag "Fraction of frame height" :value .25 :size 5)))
-          ;; Minimum width of pop-up windows.
-          (cons
-           :format "%v\n"
-           (const :format "" pop-up-window-min-width)
-           (choice
-            :help-echo "Minimum width of popped-up side window."
-            :format "%[Minimum width%] %v"
-            (const :tag "Default" :format "%t" :value nil)
-            (integer :tag "Number of columns" :value 12 :size 5)
-            (float :tag "Fraction of frame width" :value .25 :size 5)))
-          ;; Desired height of pop-up windows.
-          (cons
-           :format "%v\n"
-           (const :format "" pop-up-window-set-height)
-           (choice
-            :help-echo "Desired height of popped-up side window."
-            :format "%[Desired height%] %v"
-            (const :tag "Default" :format "%t" :value nil)
-            (integer :tag "Number of lines" :value 12 :size 5)
-            (float :tag "Fraction of frame height" :value .25 :size 5)
-            (function :tag "Function" :size 25)))
-          ;; Desired width of pop-up windows.
-          (cons
-           :format "%v\n"
-           (const :format "" pop-up-window-set-width)
-           (choice
-            :help-echo "Desired width of popped-up side window."
-            :format "%[Desired width%] %v"
-            (const :tag "Default" :format "%t" :value nil)
-            (integer :tag "Number of column" :value 12 :size 5)
-            (float :tag "Fraction of frame width" :value .25 :size 5)
-            (function :tag "Function" :size 25)))))
-
-        ;; Function with argument specifiers.
-        (list
-         :tag "Function with arguments"
-         :value (function (function 'ignore))
-         :format "%t\n%v"
-         :inline t
-         ;; For customization purposes only.
-         (const :format "" function)
-         (set
-          :format "%v"
-          :inline t
-          (list
-           :format "%v"
-           :value (function 'ignore)
-           (const :format "" function)
-           (function :tag "Function" :format "%t: %v\n" :size 25)
-           (list
-            :format "%v"
-            (repeat
-             :tag "Arguments"
-             :inline t
-             (sexp
-              :format "%v\n"
-              :size 16))))))
-
-        ;; Macro specifiers.
-        (list
-         :tag "Same window"
-         :format "%t%v"
-         :inline t
-         (const :format "\n" same-window))
-        (list
-         :tag "Same frame"
-         :format "%t%v"
-         :inline t
-         (const :format "\n" same-frame))
-        (list
-         :tag "Other window"
-         :format "%t%v"
-         :inline t
-         (const :format "\n" other-window))
-        (list
-         :tag "Same frame other window"
-         :format "%t%v"
-         :inline t
-         (const :format "\n" same-frame-other-window))
-        (list
-         :tag "Other frame"
-         :format "%t%v"
-         :inline t
-         (const :format "\n" other-frame))
-        (list
-         :tag "Default"
-         :format "%t%v"
-         :inline t
-         (const :format "\n" default)))))
-
-     (set
-      :format "%v"
-      :inline t
-      ;; Dedicate window to buffer.
-      (cons
-       :format "%v"
-       (const :format "" dedicate)
-       (choice
-        :help-echo "Mark window as dedicated to its buffer."
-        :format "%[Dedicate window to buffer%] %v\n" :size 15
-        (const :tag "Off" :format "%t" nil)
-        (const :tag "Weak" :format "%t" weak)
-        (const :tag "Strong" :format "%t" t)))
-      ;; No other window.
-      (cons
-       :format "%v"
-       (const :format "" no-other-window)
-       (choice
-        :help-echo "Whether `other-window' shall ignore the window."
-        :format "%[No other window%] %v\n" :size 15
-        (const :tag "Off" :format "%t" nil)
-        (const :tag "Ignore" :format "%t" t)))
-      ;; Other window means other frame.
-      (cons
-       :format "%v"
-       (const :format "" other-window-means-other-frame)
-       (choice
-        :help-echo "Whether other window means same or other frame."
-        :format "%[Other window means other frame%] %v\n" :size 15
-        (const :tag "Off" :format "%t" nil)
-        (const :tag "On" :format "%t" t)))
-      ;; Overriding.
-      (cons
-       :format "%v\n"
-       (const :format "" override)
-       (choice
-        :help-echo "Override application supplied specifiers."
-        :format "%[Override%] %v"
-        (const :tag "Off" :format "%t" nil)
-        (const :tag "Override" :format "%t" t))))))
-  :group 'windows
-  :group 'frames)
-
-(defcustom display-buffer-function nil
-  "If non-nil, function to call to display a buffer.
-`display-buffer' calls this function with two arguments, the
-buffer to display and a list of buffer display specifiers, see
-`display-buffer-alist'.
-
-The function is supposed to choose or create a window, display
-the specified buffer in it, and return the window.  It is also
-responsible for giving the variable `display-buffer-window' and
-the `quit-restore' parameter of the window used a meaningful
-value.
-
-The function specified here overrides all specifiers of the
-variable `display-buffer-alist' any specifiers passed to
-`display-buffer'.
-
-If you call `display-buffer' within the body of the function,
-bind the value of `display-buffer-function' to nil around that
-call to avoid that the function recursively calls itself."
-  :type '(choice
-          (const nil)
-          (function :tag "Function"))
-  :group 'windows)
-
-;; The following is a global variable which is used externally (by
-;; help.el) to (1) know which window was used for displaying a buffer
-;; and (2) whether the window was new or reused.
 (defvar display-buffer-window nil
   "Window used by `display-buffer' and related information.
 After `display-buffer' displays a buffer in some window this
@@ -4621,1583 +3846,89 @@ display the buffer.  The cdr is supposed to be one of the symbols
 `reuse-buffer-window', `reuse-other-window', `new-window' or
 `new-frame'.
 
-If the buffer display location specifier is one of 'same-window,
-'same-frame, or 'other-frame, the `display-buffer' routines
-assign the value of this variable.  If the location specifier is
-a function, that function becomes responsible for assigning a
-meaningful value to this variable.  See the functions
-`display-buffer-reuse-window', `display-buffer-pop-up-window' and
-`display-buffer-pop-up-frame' for how this can be done.")
-
-(defun display-buffer-even-window-sizes (window specifiers)
-  "Even sizes of WINDOW and selected window according to SPECIFIERS.
-SPECIFIERS must be a list of buffer display specifiers, see the
-documentation of `display-buffer-alist' for a description.
-
-Sizes are evened out if and only if WINDOW and the selected
-window appear next to each other and the selected window is
-larger than WINDOW."
-  (cond
-   ((or (not (cdr (assq 'reuse-window-even-sizes specifiers)))
-        ;; Don't resize minibuffer windows.
-        (window-minibuffer-p)
-        ;; WINDOW must be adjacent to the selected one.
-        (not (or (eq window (window-prev-sibling))
-                 (eq window (window-next-sibling))))))
-   ((and (window-iso-combined-p window)
-         ;; Resize iff the selected window is higher than WINDOW.
-         (> (window-total-height) (window-total-height window)))
-    ;; Don't throw an error if we can't even window heights for
-    ;; whatever reason.  In any case, enlarging the selected window
-    ;; might fail anyway if there are other windows above or below
-    ;; WINDOW and the selected one.  But for a simple two windows
-    ;; configuration the present behavior is good enough so why care?
-    (ignore-errors
-      (window-resize
-       window (/ (- (window-total-height) (window-total-height window))
-                 2))))
-   ((and (window-iso-combined-p window t)
-         ;; Resize iff the selected window is wider than WINDOW.
-         (> (window-total-width) (window-total-width window)))
-    ;; Don't throw an error if we can't even window widths, see
-    ;; comment above.
-    (ignore-errors
-      (window-resize
-       window (/ (- (window-total-width) (window-total-width window))
-                 2) t)))))
-
-(defun display-buffer-set-height (window specifiers)
-  "Adjust height of WINDOW according to SPECIFIERS.
-SPECIFIERS must be a list of buffer display specifiers, see the
-documentation of `display-buffer-alist' for a description."
-  (let ((set-height (cdr (assq 'pop-up-window-set-height specifiers))))
-    (cond
-     ((numberp set-height)
-      (let* ((height (if (integerp set-height)
-                         set-height
-                       (round
-                        (* (window-total-size (frame-root-window window))
-                           set-height))))
-             (delta (- height (window-total-size window))))
-        (when (and (window-resizable-p window delta nil 'safe)
-                   (window-iso-combined-p window))
-          (window-resize window delta nil 'safe))))
-     ((functionp set-height)
-      (ignore-errors (funcall set-height window))))))
-
-(defun display-buffer-set-width (window specifiers)
-  "Adjust width of WINDOW according to SPECIFIERS.
-SPECIFIERS must be a list of buffer display specifiers, see the
-documentation of `display-buffer-alist' for a description."
-  (let ((set-width (cdr (assq 'pop-up-window-set-width specifiers))))
-    (cond
-     ((numberp set-width)
-      (let* ((width (if (integerp set-width)
-                        set-width
-                      (round
-                       (* (window-total-size (frame-root-window window) t)
-                          set-width))))
-             (delta (- width (window-total-size window t))))
-        (when (and (window-resizable-p window delta t 'safe)
-                   (window-iso-combined-p window t))
-          (window-resize window delta t 'safe))))
-     ((functionp set-width)
-      (ignore-errors (funcall set-width window))))))
-
-(defun display-buffer-in-window (buffer window specifiers)
-  "Display BUFFER in WINDOW and raise its frame if needed.
-WINDOW must be a live window and defaults to the selected one.
-Return WINDOW.
-
-SPECIFIERS must be a list of buffer display specifiers, see the
-documentation of `display-buffer-alist' for a description."
-  (setq buffer (window-normalize-buffer buffer))
-  (setq window (window-normalize-live-window window))
-  (let* ((old-frame (selected-frame))
-         (new-frame (window-frame window))
-         (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 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)
-                (not (frame-visible-p new-frame))
-                ;; Assume the selected frame is already visible enough.
-                (eq new-frame (selected-frame))
-                ;; Assume the frame from which we invoked the minibuffer
-                ;; is visible.
-                (and (minibuffer-window-active-p (selected-window))
-                     (eq new-frame
-                         (window-frame (minibuffer-selected-window)))))
-      (raise-frame new-frame))
-    ;; Return window.
-    window))
+See the function `display-buffer-record-window' for how this
+variable can be assigned a value.")
 
-(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
-explanation.  The first element must specifiy the window to use,
-and can be either nil, `same', `other', or a live window.  The
-second element must specify the window's buffer and can be either
-nil, `same', `other', or a live buffer.  The third element is the
-frame to use - either nil, 0, `visible', `other', t, or a live
-frame.
-
-Optional argument SPECIFIERS must be a list of valid display
-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))
-         (reuse-dedicated (cdr (assq 'reuse-window-dedicated specifiers)))
-         windows other-frame dedicated time best-window best-time)
-    (when (eq method-frame 'other)
-      ;; `other' is not handled by `window-list-1'.
-      (setq other-frame t)
-      (setq method-frame t))
-    (dolist (window (window-list-1 nil 'nomini method-frame))
-      (let ((window-buffer (window-buffer window)))
-        (when (and (not (window-minibuffer-p window))
-                   ;; Don't reuse a side window.
-                   (or (not (eq (window-parameter window 'window-side) 'side))
-                       (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))))
-                       ;; Special case for applications that specifiy
-                       ;; the window explicitly.
-                       (eq method-window window))
-                   (or (not method-buffer)
-                       (and (eq method-buffer 'same)
-                            (eq window-buffer buffer))
-                       (and (eq method-buffer 'other)
-                            (not (eq window-buffer buffer)))
-                       ;; Special case for applications that specifiy
-                       ;; the window's buffer explicitly.
-                       (eq method-buffer window-buffer))
-                   (or (not other-frame)
-                       (not (eq (window-frame window) (selected-frame))))
-                   ;; Handle dedicatedness.
-                   (or (eq window-buffer buffer)
-                       ;; The window does not show the same buffer.
-                       (not (setq dedicated (window-dedicated-p window)))
-                       ;; If the window is weakly dedicated to its
-                       ;; buffer, reuse-dedicated must be non-nil.
-                       (and (not (eq dedicated t)) reuse-dedicated)
-                       ;; If the window is strongly dedicated to its
-                       ;; buffer, reuse-dedicated must be t.
-                       (eq reuse-dedicated t)))
-          (setq windows (cons window windows)))))
-
-    (if (eq method-buffer 'same)
-        ;; When reusing a window on the same buffer use the lru one.
-        (dolist (window windows)
-          (setq time (window-use-time window))
-          (when (or (not best-window) (< time best-time))
-            (setq best-window window)
-            (setq best-time time)))
-      ;; Otherwise, sort windows according to their use-time.
-      (setq windows
-            (sort windows
-                  #'(lambda (window-1 window-2)
-                      (<= (window-use-time window-1)
-                          (window-use-time window-2)))))
-      (setq best-window
-            ;; Try to get a full-width window (this is silly and can
-            ;; get us to another frame but let's ignore these issues
-            ;; for the moment).
-            (catch 'found
-              (dolist (window windows)
-                (when (window-full-width-p window)
-                  (throw 'found window)))
-              ;; If there's no full-width window return the lru window.
-              (car windows))))
-
-    (when best-window
-      (display-buffer-even-window-sizes best-window specifiers)
-      ;; Never change the quit-restore parameter of a window here.
-      (if (eq (window-buffer best-window) buffer)
-          (setq display-buffer-window
-                (cons best-window 'reuse-buffer-window))
+(defun display-buffer-record-window (type window buffer)
+  "Record information for window used by `display-buffer'.
+TYPE must be one of the symbols reuse-window, pop-up-window, or
+pop-up-frame.  WINDOW is the window used for or created by the
+`display-buffer' routines.  BUFFER is the buffer that shall be
+displayed."
+  (cond
+   ((eq type 'reuse-window)
+    ;; In `display-buffer-window' record whether we used a window on the
+    ;; same buffer or another one.
+    (if (eq (window-buffer window) buffer)
         (setq display-buffer-window
-              (cons best-window 'reuse-other-window))
-        (unless (window-parameter best-window 'quit-restore)
-          ;; Don't overwrite an existing quit-restore entry.
-          (set-window-parameter
-           best-window 'quit-restore
-           (list (window-buffer best-window) (window-start best-window)
-                 (window-point best-window) buffer
-                 (window-total-size best-window) (selected-window)))))
-
-      (display-buffer-in-window buffer best-window specifiers))))
-
-(defconst display-buffer-split-specifiers '(largest lru selected root left top right bottom)
-  "List of symbols identifying window that shall be split.")
-
-(defconst display-buffer-side-specifiers '(below right above left nil)
-  "List of symbols identifying side of split-off window.")
-
-(defun display-buffer-split-window-1 (window side min-size)
-  "Subroutine of `display-buffer-split-window'."
-  (let* ((horizontal (memq side '(left right)))
-         (parent (window-parent window))
-         (resize (and window-splits (window-iso-combined-p window horizontal)))
-         (old-size
-          ;; We either resize WINDOW or its parent.
-          (window-total-size (if resize parent window) horizontal))
-         new-size)
-    ;; We don't call split-window-vertically/-horizontally any more
-    ;; here. If for some reason it's needed we can always do so
-    ;; (provided we give it an optional SIDE argument).
-    (cond
-     (resize
-      ;; When we resize a combination, the new window must be at least
-      ;; MIN-SIZE large after the split.
-      (setq new-size
-            (max min-size
-                 (min (- old-size (window-min-size parent horizontal))
-                      (/ old-size
-                         ;; Try to make the size of the new window
-                         ;; proportional to the number of iso-arranged
-                         ;; windows in the combination.
-                         (1+ (window-iso-combinations parent horizontal))))))
-      (when (window-sizable-p parent (- new-size) horizontal)
-        (split-window window (- new-size) side)))
-     ((window-live-p window)
-      (setq new-size (/ old-size 2))
-      ;; When WINDOW is live, the old _and_ the new window must be at
-      ;; least MIN-SIZE large after the split.
-      (when (and (>= new-size min-size)
-                 (window-sizable-p window (- new-size) horizontal))
-        ;; Do an even split to make Stepan happy.
-        (split-window window nil side)))
-     (t
-      ;; When WINDOW is internal, the new window must be at least
-      ;; MIN-SIZE large after the split.
-      (setq new-size
-            (max min-size
-                 (/ old-size
-                    ;; Try to make the size of the new window
-                    ;; proportional to the number of iso-arranged
-                    ;; subwindows of WINDOW.
-                    (1+ (window-iso-combinations window horizontal)))))
-      (when (window-sizable-p window (- new-size) horizontal)
-        (split-window window (- new-size) side))))))
-
-(defun display-buffer-split-window (window &optional side specifiers)
-  "Split WINDOW in a way suitable for `display-buffer'.
-Optional argument SIDE must be a side specifier \(one of the
-symbols below, right, above, left, or nil).  SPECIFIERS must be a
-list of buffer display specifiers, see the documentation of
-`display-buffer-alist' for a description.
-
-Return the new window, nil if it could not be created."
-  (let ((min-height (cdr (assq 'pop-up-window-min-height specifiers)))
-        (min-width (cdr (assq 'pop-up-window-min-width specifiers)))
-        size)
-    ;; Normalize min-height and min-width, we might need both.
-    (setq min-height
-          ;; If min-height is specified, it can be as small as
-          ;; `window-safe-min-height'.
-          (cond
-           ((and (integerp min-height)
-                 (>= min-height window-safe-min-height))
-            min-height)
-           ((and (floatp min-height)
-                 (<= min-height 1)
-                 (let* ((root-height (window-total-height
-                                      (frame-root-window
-                                       (window-frame window))))
-                        (height (round (* min-height root-height))))
-                   (when (>= height window-safe-min-height)
-                     height))))
-           (t window-min-height)))
-    (setq min-width
-          ;; If min-width is specified, it can be as small as
-          ;; `window-safe-min-width'.
-          (cond
-           ((and (integerp min-width)
-                 (>= min-width window-safe-min-width))
-            min-width)
-           ((and (floatp min-width)
-                 (<= min-width 1)
-                 (let* ((root-width (window-total-width
-                                     (frame-root-window
-                                      (window-frame window))))
-                        (width (round (* min-width root-width))))
-                   (when (>= width window-safe-min-width)
-                     width))))
-           (t window-min-width)))
-
-    (or (and (memq side '(nil above below))
-             (display-buffer-split-window-1
-              window (or side 'below) min-height))
-        ;; If SIDE is nil and vertical splitting failed, we try again
-        ;; splitting horizontally this time.
-        (and (memq side '(nil left right))
-             (display-buffer-split-window-1
-              window (or side 'right) min-width))
-        ;; If WINDOW is live and the root window of its frame, try once
-        ;; more splitting vertically, disregarding the min-height
-        ;; specifier this time and using `window-min-height' instead.
-        (and (memq side '(nil above below))
-             (<= window-min-height min-height)
-             (window-live-p window)
-             (eq window (frame-root-window window))
-             (display-buffer-split-window-1
-              window (or side 'below) window-min-height)))))
-
-(defun display-buffer-split-atom-window (window &optional side nest specifiers)
-  "Make WINDOW part of an atomic window."
-  (let ((ignore-window-parameters t)
-        (window-nest t)
-        (selected-window (selected-window))
-        root new new-parent)
-
-      ;; We are in an atomic window.
-    (when (and (window-parameter window 'window-atom) (not nest))
-      ;; Split the root window.
-      (setq window (window-atom-root window)))
-
-    (when (setq new (display-buffer-split-window window side specifiers))
-      (setq new-parent (window-parent window))
-      ;; WINDOW is or becomes atomic.
-      (unless (window-parameter window 'window-atom)
-        (walk-window-subtree
-         (lambda (window)
-           (set-window-parameter window 'window-atom t))
-         window t))
-      ;; New window and any new parent get their window-atom parameter
-      ;; set too.
-      (set-window-parameter new 'window-atom t)
-      (set-window-parameter new-parent 'window-atom t)
-      new)))
-
-(defun display-buffer-pop-up-window (buffer methods &optional specifiers)
-  "Display BUFFER in a new window.
-Return the window displaying BUFFER, nil if popping up the window
-failed.  METHODS must be a list of window/side tuples like those
-forming the cdr of the `pop-up-window' buffer display specifier.
-As a special case, the car of such a tuple can be also a live
-window.
-
-Optional argument SPECIFIERS must be a list of buffer display
-specifiers, see the doc-string of `display-buffer-alist' for a
-description."
-  (let* ((frame (display-buffer-frame))
-         (selected-window (frame-selected-window frame))
-         cand window side atomic)
-    (unless (and (cdr (assq 'unsplittable (frame-parameters frame)))
-                 ;; Don't split an unsplittable frame unless
-                 ;; SPECIFIERS allow it.
-                 (not (cdr (assq 'split-unsplittable-frame specifiers))))
-      (catch 'done
-        (dolist (method methods)
-          (setq cand (car method))
-          (setq side (cdr method))
-          (setq window
-                (cond
-                 ((eq cand 'largest)
-                  ;; The largest window.
-                  (get-largest-window frame t))
-                 ((eq cand 'lru)
-                  ;; The least recently used window.
-                  (get-lru-window frame t))
-                 ((eq cand 'selected)
-                  ;; The selected window.
-                  (frame-selected-window frame))
-                 ((eq cand 'root)
-                  ;; If there are side windows, split the main window
-                  ;; else the frame's root window.
-                  (or (window-with-parameter 'window-side 'none nil t)
-                      (frame-root-window frame)))
-                 ((memq cand window-sides)
-                  ;; This should gets us the "root" side window if there
-                  ;; exists more than one window on that side.
-                  (window-with-parameter 'window-side cand nil t))
-                 ((windowp cand)
-                  ;; A window, directly specified.
-                  cand)))
-
-          (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
-                     (not (window-minibuffer-p window))
-                     ;; nor a side window.
-                     (not (eq (window-parameter window 'window-side) 'side)))
-            (setq window
-                  (cond
-                   ((memq side display-buffer-side-specifiers)
-                    (if (and (window-buffer window)
-                             (setq atomic (cdr (assq 'atomic specifiers))))
-                        (display-buffer-split-atom-window
-                         window side (eq atomic 'nest) specifiers)
-                      (display-buffer-split-window window side specifiers)))
-                   ((functionp side)
-                    (ignore-errors
-                      ;; Don't pass any specifiers to this function.
-                      (funcall side window)))))
-
-            (when (window-live-p window)
-              ;; In `quit-restore' parameter record that we popped up
-              ;; this window, its buffer and which window was selected.
-              (set-window-parameter
-               window 'quit-restore (list 'new-window buffer selected-window))
-              ;; For `display-buffer-window' mark window as new.
-              (setq display-buffer-window (cons window 'new-window))
-              ;; Install BUFFER in the new window.
-              (display-buffer-in-window buffer window specifiers)
-              ;; Adjust sizes if asked for (for `fit-window-to-buffer'
-              ;; and friends BUFFER must be already shown in the new
-              ;; window).
-              (display-buffer-set-height window specifiers)
-              (display-buffer-set-width window specifiers)
-              ;; Reset list of window's previous buffers to nil.
-              (set-window-prev-buffers window nil)
-              ;; Return the new window.
-              (throw 'done window))))))))
-
-(defun display-buffer-pop-up-frame (buffer &optional graphic-only specifiers)
-  "Make a new frame for displaying BUFFER.
-Return the window displaying BUFFER if creating the new frame was
-successful, nil otherwise.  Optional argument GRAPHIC-ONLY
-non-nil means to make a new frame on graphic displays only.
-
-SPECIFIERS must be a list of buffer display specifiers, see the
-documentation of `display-buffer-alist' for a description."
-  (unless (or (and graphic-only (not (display-graphic-p)))
-              noninteractive)
-    (let* ((selected-window (selected-window))
-           (function (or (cdr (assq 'pop-up-frame-function specifiers))
-                         'make-frame))
-           (parameters
-            (when (symbolp function)
-              (cdr (assq 'pop-up-frame-alist specifiers))))
-           (frame
-            (if (symbolp function)
-                (funcall function parameters)
-              (funcall function))))
-      (when frame
-        (let ((window (frame-selected-window frame)))
-          (set-window-parameter
-           window 'quit-restore (list 'new-frame buffer selected-window))
-          (setq display-buffer-window (cons window 'new-frame))
-          (display-buffer-in-window buffer window specifiers))))))
-
-(defun display-buffer-pop-up-side-window (buffer side slot &optional specifiers)
-  "Display BUFFER in a new window on SIDE of the selected frame.
-SLOT specifies the slot to use.  SPECIFIERS must be a list of
-buffer display specifiers.
-
-Return the window displaying BUFFER, nil if popping up the window
-failed."
-  (let* ((root (frame-root-window))
-         (main (window-with-parameter 'window-side 'none nil t))
-         (left-or-right (memq side '(left right)))
-         (main-or-root
-          (if (and main
-                   (or (and left-or-right (not window-sides-vertical))
-                       (and (not left-or-right) window-sides-vertical)))
-              main
-            root))
-         (selected-window (selected-window))
-         (on-side (cond
-                   ((eq side 'top) 'above)
-                   ((eq side 'bottom) 'below)
-                   (t side)))
-         (window
-          (display-buffer-split-window main-or-root on-side specifiers))
-         fun)
-    (when window
-      ;; We were able to split off a new window.
-      (unless main
-        (walk-window-subtree
-         (lambda (window)
-           ;; Make all main-or-root subwindows main windows.
-           (set-window-parameter window 'window-side 'none))
-         main-or-root t))
-      ;; Reset window-side parameter of new window's parent to nil.
-      (set-window-parameter (window-parent window) 'window-side nil)
-      ;; Initialize window-side parameter of new window to SIDE.
-      (set-window-parameter window 'window-side side)
-      ;; Install window-slot parameter of new window.
-      (set-window-parameter window 'window-slot slot)
-      ;; In `quit-restore' parameter record that we popped up a new
-      ;; window.
+              (cons window 'reuse-buffer-window))
+      (setq display-buffer-window
+            (cons window 'reuse-other-window)))
+    ;; In quit-restore parameter record information about the old buffer
+    ;; unless such information exists already.
+    (unless (window-parameter window 'quit-restore)
       (set-window-parameter
-       window 'quit-restore (list 'new-window buffer selected-window))
-      ;; For `display-buffer-window' mark window as new.
-      (setq display-buffer-window (cons window 'new-window))
-      ;; Install BUFFER in new window.
-      (display-buffer-in-window buffer window specifiers)
-      ;; Adjust sizes of new window if asked for.
-      (display-buffer-set-height window specifiers)
-      (display-buffer-set-width window specifiers)
-      ;; Reset list of new window's previous buffers to nil.
-      (set-window-prev-buffers window nil)
-      ;; Return the new window.
-      window)))
-
-(defun display-buffer-in-side-window (buffer side &optional slot specifiers)
-  "Display BUFFER in a window on SIDE of the selected frame.
-SLOT, if non-nil, specifies the window slot where to display the
-BUFFER.  SLOT zero or nil means use the central slot on SIDE.
-SLOT negative means use a slot preceding the central window.
-SLOT positive means use a slot following the central window.
-
-SPECIFIERS must be a list of buffer display specifiers."
-  (unless (memq side window-sides)
-    (error "Invalid side %s specified" side))
-  (let* ((major (window-with-parameter 'window-side side nil t))
-         ;; `major' is the major window on SIDE, `windows' the life
-         ;; windows on SIDE.
-         (windows (when major (windows-with-parameter 'window-side side)))
-         (reuse-dedicated (cdr (assq 'reuse-window-dedicated specifiers)))
-         (slots (when major (window-child-count major)))
-         (max-slots
-          (nth (cond
-                ((eq side 'left) 0)
-                ((eq side 'top) 1)
-                ((eq side 'right) 2)
-                ((eq side 'bottom) 3))
-                window-sides-slots))
-         (selected-window (selected-window))
-         window this-window this-slot prev-window next-window
-         best-window best-slot abs-slot dedicated new-window)
-
-    (unless (numberp slot)
-      (setq slot 0))
-    (if (not windows)
-        ;; No suitable side window exists, make one.
-        (display-buffer-pop-up-side-window buffer side slot specifiers)
-      ;; Scan windows on SIDE.
-      (catch 'found
-        (dolist (window windows)
-          (setq this-slot (window-parameter window 'window-slot))
-          (cond
-           ((not (numberp this-slot)))
-           ((and (= this-slot slot)
-                 ;; Dedicatedness check.
-                 (or (not (setq dedicated (window-dedicated-p window)))
-                     ;; If the window is weakly dedicated to its
-                     ;; buffer, reuse-dedicated must be non-nil.
-                     (and (not (eq dedicated t)) reuse-dedicated)
-                     ;; If the window is strongly dedicated to its
-                     ;; buffer, reuse-dedicated must be t.
-                     (eq reuse-dedicated t)))
-            ;; Window with matching SLOT, use it.
-            (setq this-window window)
-            (throw 'found t))
-           (t
-            (setq abs-slot (abs (- (abs slot) (abs this-slot))))
-            (unless (and best-slot (<= best-slot abs-slot))
-              (setq best-window window)
-              (setq best-slot abs-slot))
-            (cond
-             ((<= this-slot slot)
-              (setq prev-window window))
-             ((not next-window)
-              (setq next-window window)))))))
-
-      ;; `this-window' is the first window with the same SLOT.
-      ;; `prev-window' is the window with the largest slot < SLOT.  A new
-      ;; window will be created after it.
-      ;; `next-window' is the window with the smallest slot > SLOT.  A new
-      ;; window will be created before it.
-      ;; `best-window' is the window with the smallest absolute difference
-      ;; of its slot and SLOT.
-      (or (and this-window
-               ;; Reuse this window.
-               (prog1
-                   (setq window this-window)
-                 (if (eq (window-buffer window) buffer)
-                     (setq display-buffer-window
-                           (cons window 'reuse-buffer-window))
-                   (setq display-buffer-window
-                         (cons window 'reuse-other-window))
-                   (unless (window-parameter window 'quit-restore)
-                     ;; Don't overwrite an existing quit-restore entry.
-                     (set-window-parameter
-                      window 'quit-restore
-                      (list (window-buffer window) (window-start window)
-                            (window-point window) buffer
-                            (window-total-size window) (selected-window)))))))
-          (and (or (not max-slots) (< slots max-slots))
-               (or (and next-window
-                        ;; Make new window before next-window.
-                        (let ((next-side
-                               (if (memq side '(left right)) 'above 'left)))
-                          (setq window (display-buffer-split-window
-                                        next-window next-side specifiers))))
-                   (and prev-window
-                        ;; Make new window after prev-window.
-                        (let ((prev-side
-                               (if (memq side '(left right)) 'below 'right)))
-                          (setq window (display-buffer-split-window
-                                        prev-window prev-side specifiers)))))
-               (progn
-                 ;; In `quit-restore' parameter record that we popped up
-                 ;; this window, its buffer and the old selected window.
-                 (set-window-parameter
-                  window 'quit-restore
-                  (list 'new-window buffer selected-window))
-                 ;; For `display-buffer-window' mark window as new.
-                 (setq display-buffer-window (cons window 'new-window))
-                 ;; Record that window is new, we need this for
-                 ;; adjusting sizes below.
-                 (setq new-window window)))
-          (and best-window
-               (setq window best-window)
-               ;; Reuse best window (the window nearest to SLOT).
-               (if (eq (window-buffer window) buffer)
-                   (setq display-buffer-window
-                         (cons window 'reuse-buffer-window))
-                 (setq display-buffer-window
-                       (cons window 'reuse-other-window))
-
-                 (unless (window-parameter window 'quit-restore)
-                   ;; Don't overwrite an existing quit-restore entry.
-                   (set-window-parameter
-                    window 'quit-restore
-                    (list (window-buffer window) (window-start window)
-                          (window-point window) buffer
-                          (window-total-size window) (selected-window)))))
-               window))
-
-      (when window
-        (unless (window-parameter window 'window-slot)
-          ;; Don't change exisiting slot value.
-          (set-window-parameter window 'window-slot slot))
-        ;; Install BUFFER in the window.
-        (display-buffer-in-window buffer window specifiers)
-        (when new-window
-          ;; Adjust sizes if asked for (for `fit-window-to-buffer' and
-          ;; friends BUFFER must be already shown in the new window).
-          (display-buffer-set-height window specifiers)
-          (display-buffer-set-width window specifiers)
-          ;; Reset list of new window's previous buffers to nil.
-          (set-window-prev-buffers window nil))
-        ;; Return the window used.
-        window))))
-
-(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.
-If no such buffer exists, create a buffer with the name
-BUFFER-OR-NAME and return that buffer."
-  (if buffer-or-name
-      (or (get-buffer buffer-or-name)
-          (let ((buffer (get-buffer-create buffer-or-name)))
-            (set-buffer-major-mode buffer)
-            buffer))
-    (current-buffer)))
-
-(defun display-buffer-other-window-means-other-frame (buffer-or-name &optional label)
-  "Return non-nil if BUFFER shall be preferably displayed in another frame.
-BUFFER must be a live buffer or the name of a live buffer.
-
-Return nil if BUFFER shall be preferably displayed in another
-window on the selected frame.  Return non-nil if BUFFER shall be
-preferably displayed in a window on any but the selected frame.
-
-Optional argument LABEL is like the same argument of
-`display-buffer'.
-
-The calculation of the return value is exclusively based on the
-user preferences expressed in `display-buffer-alist'."
-  (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 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))
-           (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 (and (boundp 'display-buffer-mark-dedicated)
-                 display-buffer-mark-dedicated)
-        (setq specifiers
-              (cons (cons 'dedicate display-buffer-mark-dedicated)
-                    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))))
-
-      ;; `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'
-      (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.
-        ;; `pop-up-frame'
-        (setq specifiers
-              ;; Maybe we should merge graphic-only into the following?
-              (cons (list 'pop-up-frame t) specifiers)))
-
-      ;; `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
-                  (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' 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)
-                        ;; 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'
-      (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)))
-
-      ;; 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
-same argument of `display-buffer'."
-  (let (normalized entry)
-    (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)))
-         ((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)))))
-
-(defun display-buffer-normalize-alist (buffer-name label)
-  "Normalize `display-buffer-alist'.
-BUFFER-NAME must be the name of the buffer that shall be displayed.
-LABEL the corresponding argument of `display-buffer'."
-  (let (list-1 list-2)
-    (dolist (entry display-buffer-alist)
-      (when (and (listp entry)
-                 (catch 'match
-                   (dolist (id (car entry))
-                     (when (consp id)
-                       (let ((type (car id))
-                             (value (cdr id)))
-                         (when (or (and (eq type 'name) (stringp value)
-                                        (equal value buffer-name))
-                                   (and (eq type 'regexp) (stringp value)
-                                        (string-match-p value buffer-name))
-                                   (and (eq type 'label) (eq value label)))
-                           (throw 'match t)))))))
-        (let* ((specifiers (cdr entry))
-               (normalized
-                (display-buffer-normalize-alist-1 specifiers label)))
-          (if (cdr (assq 'override specifiers))
-              (setq list-1
-                    (if list-1
-                        (append list-1 normalized)
-                      normalized))
-            (setq list-2
-                  (if list-2
-                      (append list-2 normalized)
-                    normalized))))))
-
-    (cons list-1 list-2)))
-
-(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.
-SPECIFIERS and LABEL are the homonymous arguments of
-`display-buffer'.
-
-The method for displaying the buffer specified by BUFFER-NAME or
-LABEL is established by appending the following four lists of
-specifiers:
-
-- The specifiers in `display-buffer-alist' whose buffer
-  identifier matches BUFFER-NAME or LABEL and whose 'override
-  component is set.
-
-- SPECIFIERS.
-
-- The specifiers in `display-buffer-alist' whose buffer
-  identifier matches BUFFER-NAME or LABEL and whose 'override
-  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 alist)
-     ;; Special value of third argument of display-buffer.
-     arg3
-     ;; Second argument of display-buffer.
-     arg2
-     ;; Non-overriding user specifiers.
-     (cdr alist)
-     ;; Default specifiers.
-     default)))
-
-;; Minibuffer-only frames should be documented better.  They really
-;; deserve a separate section in the manual.  Also
-;; `last-nonminibuffer-frame' is nowhere documented in the manual.
-(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 (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))))
-      frame
-    (last-nonminibuffer-frame)))
-
-(defun display-buffer (&optional buffer-or-name specifiers label)
-  "Make the buffer specified by BUFFER-OR-NAME appear in some window.
-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-OR-NAME is nil or omitted, display the current buffer.
-Interactively, prompt for the buffer name using the minibuffer.
-
-Return the window chosen to display the buffer or nil if no such
-window is found.  Do not change the selected window unless the
-buffer is shown on a different frame than the selected one.
-
-Optional argument SPECIFIERS must be a list of buffer display
-specifiers, see the documentation of `display-buffer-alist' for a
-description.
-
-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 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
-arbitrary buffer, and as fourth element an arbitrary frame.  As
-first element of a window/side pair of the `pop-up-window'
-specifier you can specifiy an arbitrary window.
-
-The optional third argument LABEL, if non-nil, must be a symbol
-specifiying the buffer display label.  Applications should set
-this when the buffer shall be displayed in some special way but
-BUFFER-OR-NAME does not identify the buffer as special.  Typical
-buffers that fit into this category are those whose names are
-derived from the name of the file they are visiting.  A user can
-override SPECIFIERS by adding an entry to `display-buffer-alist'
-whose car contains LABEL and whose cdr specifies the preferred
-alternative display method.
-
-The following values of LABEL have a special meaning and allow to
-specify the set of frames to investigate when the buffer already
-appears in a window:
-
-`visible' - the set of visible frames.
-
-0 - the set of visible or iconified frames.
-
-t - the set of all frames.
-
-A live frame - the set containing that frame as its only element.
-
-If the buffer is already displayed in a window on a frame in the
-specified set, return that window.
-
-The method to display the buffer is derived by combining the
-values of `display-buffer-alist' and SPECIFIERS.  Highest
-priority is given to overriding elements of
-`display-buffer-alist'.  Next come the elements specified by
-SPECIFIERS, followed by the non-overriding elements of
-`display-buffer-alist'.
-
-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 (window-normalize-buffer-to-display buffer-or-name))
-         (buffer-name (buffer-name buffer))
-         (normalized
-          ;; Normalize specifiers.
-          (display-buffer-normalize-specifiers buffer-name specifiers label))
-         ;; Don't use a minibuffer frame.
-         (frame (display-buffer-frame))
-         ;; `window' is the window we use for showing `buffer'.
-         window specifier method other-window)
-    ;; Reset this.
-    (setq display-buffer-window nil)
-    (if display-buffer-function
-        ;; Let `display-buffer-function' do the job.
-        (funcall display-buffer-function buffer specifiers)
-      ;; Retrieve the next location specifier while there a specifiers
-      ;; left and we don't have a valid window.
-      (while (and normalized (not (window-live-p window)))
-        (setq specifier (car normalized))
-        (setq normalized (cdr normalized))
-        (setq method (car specifier))
-        (setq window
-              (cond
-               ((eq method 'reuse-window)
-                (display-buffer-reuse-window
-                 buffer (cdr specifier) normalized other-window))
-               ((eq method 'pop-up-window)
-                (display-buffer-pop-up-window
-                 buffer (cdr specifier) normalized))
-               ((eq method 'pop-up-frame)
-                (display-buffer-pop-up-frame
-                 buffer (cdr specifier) normalized))
-               ((eq method 'use-side-window)
-                (display-buffer-in-side-window
-                 buffer (nth 1 specifier) (nth 2 specifier) normalized))
-               ((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.  Try reusing a window
-      (or (and (window-live-p window) window)
-          ;; on the selected frame,
-          (display-buffer-reuse-window
-           buffer '(nil nil nil) nil other-window)
-          ;; showing BUFFER on any visible frame,
-          (display-buffer-reuse-window
-           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)
-  "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
-buffer.  Optional argument BUFFER-OR-NAME and LABEL are as for
-`display-buffer'."
-  (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)
-  "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
-`display-buffer'."
-  (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)
-  "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
-on other frames.  Optional argument BUFFER-OR-NAME and LABEL are as
-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)
-  "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
-as for `display-buffer'."
-  (interactive "BDisplay buffer in another window on same frame:\nP")
-  (display-buffer buffer-or-name 'same-frame-other-window label))
-
-(defun display-buffer-other-frame (&optional buffer-or-name label)
-  "Display buffer specified by BUFFER-OR-NAME on another frame.
-The selected frame will be used only if there is no other choice.
-Optional argument BUFFER-OR-NAME and LABEL are as for
-`display-buffer'.
-
-If this command uses another frame, it will also select that frame."
-  (interactive "BDisplay buffer in other frame: ")
-  (display-buffer buffer-or-name 'other-frame label))
-
-(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 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 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 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
-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.
-
-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 (window-normalize-buffer-to-display buffer-or-name))
-        (old-window (selected-window))
-        (old-frame (selected-frame))
-        new-window new-frame)
-    (set-buffer buffer)
-    (setq new-window (display-buffer buffer specifiers label))
-    (setq new-frame (window-frame new-window))
-    (if (eq old-frame new-frame)
-        ;; Make sure new-window gets selected (Bug#8615), (Bug#6954).
-        (select-window new-window norecord)
-      ;; `display-buffer' has chosen another frame, make sure it gets
-      ;; input focus and is risen.
-      (select-frame-set-input-focus new-frame norecord))
-    buffer))
-
-(defsubst 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'."
-  (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)
-  "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
-`pop-to-buffer'."
-  (interactive "BPop to buffer on same frame:\nP")
-  (pop-to-buffer buffer-or-name 'same-frame norecord label))
-
-(defsubst pop-to-buffer-other-window (&optional buffer-or-name norecord label)
-  "Pop to 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
-on other frames.  Optional arguments BUFFER-OR-NAME, NORECORD and
-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)
-  "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
-and LABEL are as for `pop-to-buffer'."
-  (interactive "BPop to buffer in another window on same frame:\nP")
-  (pop-to-buffer buffer-or-name 'same-frame-other-window norecord label))
-
-(defsubst pop-to-buffer-other-frame (&optional buffer-or-name norecord label)
-  "Pop to buffer specified by BUFFER-OR-NAME on another frame.
-The selected frame will be used only if there's no other choice.
-Optional arguments BUFFER-OR-NAME, NORECORD and LABEL are as for
-`pop-to-buffer'."
-  (interactive "BPop to buffer on another frame:\nP")
-  (pop-to-buffer buffer-or-name 'other-frame norecord label))
-
-(defun read-buffer-to-switch (prompt)
-  "Read the name of a buffer to switch to, prompting with PROMPT.
-Return the neame of the buffer as a string.
-
-This function is intended for the `switch-to-buffer' family of
-commands since these need to omit the name of the current buffer
-from the list of completions and default values."
-  (let ((rbts-completion-table (internal-complete-buffer-except)))
-    (minibuffer-with-setup-hook
-        (lambda ()
-          (setq minibuffer-completion-table rbts-completion-table)
-          ;; Since rbts-completion-table is built dynamically, we
-          ;; can't just add it to the default value of
-          ;; icomplete-with-completion-tables, so we add it
-          ;; here manually.
-          (if (and (boundp 'icomplete-with-completion-tables)
-                   (listp icomplete-with-completion-tables))
-              (set (make-local-variable 'icomplete-with-completion-tables)
-                   (cons rbts-completion-table
-                         icomplete-with-completion-tables))))
-      (read-buffer prompt (other-buffer (current-buffer))
-                   (confirm-nonexistent-file-or-buffer)))))
-
-(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
-exists, return that buffer.  If no such buffer exists, create a
-buffer with the name BUFFER-OR-NAME and return that buffer."
-  (if buffer-or-name
-      (or (get-buffer buffer-or-name)
-          (let ((buffer (get-buffer-create buffer-or-name)))
-            (set-buffer-major-mode buffer)
-            buffer))
-    (other-buffer)))
-
-(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'
-determines whether to request confirmation before creating a new
-buffer.
-
-BUFFER-OR-NAME may be a buffer, a string \(a buffer name), or
-nil.  If BUFFER-OR-NAME is a string that does not identify an
-existing buffer, create a buffer with that name.  If
-BUFFER-OR-NAME is nil, switch to the buffer returned by
-`other-buffer'.
-
-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.
-
-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: ") nil nil))
-  (let ((buffer (window-normalize-buffer-to-switch-to buffer-or-name)))
-    (if (null force-same-window)
-        (pop-to-buffer
-         buffer '(same-window (reuse-window-dedicated . weak))
-         norecord 'switch-to-buffer)
-      (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)))
-       ((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))))
-
-(defun switch-to-buffer-same-frame (buffer-or-name &optional norecord)
-  "Switch to buffer BUFFER-OR-NAME in a window on the selected frame.
-Another frame will be used only if there is no other choice.
-Arguments BUFFER-OR-NAME and NORECORD have the same meaning as
-for `switch-to-buffer'.
-
-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 (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)
-  "Switch to buffer 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
-on other frames.  Arguments BUFFER-OR-NAME and NORECORD have the
-same meaning as for `switch-to-buffer'.
-
-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 (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)
-  "Switch to buffer 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.  Arguments BUFFER-OR-NAME and NORECORD have
-the same meaning as for `switch-to-buffer'.
-
-This function is intended for interactive use only.  Lisp
-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 (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)
-  "Switch to buffer BUFFER-OR-NAME on another frame.
-The same frame will be used only if there is no other choice.
-Arguments BUFFER-OR-NAME and NORECORD have the same meaning
-as for `switch-to-buffer'.
-
-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 (window-normalize-buffer-to-switch-to buffer-or-name)))
-    (pop-to-buffer buffer 'other-frame norecord)))
-
-;;; Obsolete definitions of `display-buffer' below.
-(defcustom same-window-buffer-names nil
-  "List of names of buffers that should appear in the \"same\" window.
-`display-buffer' and `pop-to-buffer' show a buffer whose name is
-on this list in the selected rather than some other window.
+       window 'quit-restore
+       (list (window-buffer window) (window-start window)
+             (window-point window) buffer
+             (window-total-size window) (selected-window)))))
+   ((eq type 'pop-up-window)
+    ;; In `display-buffer-window' record window as new.
+    (setq display-buffer-window (cons window 'new-window))
+    ;; In `quit-restore' parameter record that we popped up this window,
+    ;; its buffer, and which window was selected before.
+    (set-window-parameter
+     window 'quit-restore (list 'new-window buffer (selected-window))))
+   ((eq type 'pop-up-frame)
+    ;; In `display-buffer-window' record window as on new frame.
+    (setq display-buffer-window (cons window 'new-frame))
+    ;; In `quit-restore' parameter record that we popped up this window
+    ;; on a new frame, the buffer, and which window was selected before.
+    (set-window-parameter
+     window 'quit-restore (list 'new-frame buffer (selected-window))))))
 
-An element of this list can be a cons cell instead of just a
-string.  In that case, the cell's car must be a string specifying
-the buffer name.  This is for compatibility with
-`special-display-buffer-names'; the cdr of the cons cell is
-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")
-
-(defcustom same-window-regexps nil
-  "List of regexps saying which buffers should appear in the \"same\" window.
-`display-buffer' and `pop-to-buffer' show a buffer whose name
-matches a regexp on this list in the selected rather than some
-other window.
-
-An element of this list can be a cons cell instead of just a
-string.  In that case, the cell's car must be a regexp matching
-the buffer name.  This is for compatibility with
-`special-display-regexps'; the cdr of the cons cell is ignored.
-
-See also `same-window-buffer-names'."
-  :type '(repeat (regexp :format "%v"))
+(defcustom display-buffer-function nil
+  "If non-nil, function to call to handle `display-buffer'.
+It will receive two args, the buffer and a flag which if non-nil
+means that the currently selected window is not acceptable.  It
+should choose or create a window, display the specified buffer in
+it, and return the window.
+
+The function specified here is responsible for setting the value
+of `display-buffer-window' and the quit-restore parameter of the
+window used."
+  :type '(choice
+          (const nil)
+          (function :tag "function"))
   :group 'windows)
-;; (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.
-This function returns non-nil if `display-buffer' or
-`pop-to-buffer' would show a buffer named BUFFER-NAME in the
-selected rather than \(as usual\) some other window.  See
-`same-window-buffer-names' and `same-window-regexps'."
-  (let ((buffer-names (with-no-warnings same-window-buffer-names))
-        (regexps (with-no-warnings same-window-regexps)))
-    (cond
-     ((not (stringp buffer-name)))
-     ;; The elements of `same-window-buffer-names' can be buffer
-     ;; names or cons cells whose cars are buffer names.
-     ((member buffer-name buffer-names))
-     ((assoc buffer-name buffer-names))
-     ((catch 'found
-        (dolist (regexp regexps)
-          ;; The elements of `same-window-regexps' can be regexps
-          ;; or cons cells whose cars are regexps.
-          (when (or (and (stringp regexp)
-                         (string-match regexp buffer-name))
-                    (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")
 
-(defcustom special-display-frame-alist
-  '((height . 14) (width . 80) (unsplittable . t))
-  "Alist of parameters for special frames.
-Special frames are used for buffers whose names are listed in
-`special-display-buffer-names' and for buffers whose names match
-one of the regular expressions in `special-display-regexps'.
+(defcustom pop-up-frame-alist nil
+  "Alist of parameters for automatically generated new frames.
+You can set this in your init file; for example,
 
-This variable can be set in your init file, like this:
+  (setq pop-up-frame-alist '((width . 80) (height . 20)))
 
-  (setq special-display-frame-alist '((width . 80) (height . 20)))
+If non-nil, the value you specify here is used by the default
+`pop-up-frame-function' for the creation of new frames.
 
-These supersede the values given in `default-frame-alist'."
+Since `pop-up-frame-function' is used by `display-buffer' for
+making new frames, any value specified here by default affects
+the automatic generation of new frames via `display-buffer' and
+all functions based on it.  The behavior of `make-frame' is not
+affected by this variable."
   :type '(repeat (cons :format "%v"
-                         (symbol :tag "Parameter")
-                         (sexp :tag "Value")))
+                       (symbol :tag "Parameter")
+                       (sexp :tag "Value")))
   :group 'frames)
-;; (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.
-If BUFFER is already displayed in a visible or iconified frame,
-raise that frame.  Otherwise, display BUFFER in a way as
-specified by optional argument ARGS.
-
-If ARGS is an alist, use it as a list of frame parameters.  If
-these parameters contain \(same-window . t), display BUFFER in
-the selected window.  If they contain \(same-frame . t), display
-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 the rest of the arguments."
-  (if (and args (symbolp (car args)))
-      (apply (car args) buffer (cdr args))
-    (let ((window (get-buffer-window buffer 0)))
-      (or
-       ;; If we have a window already, make it visible.
-       (when window
-         (let ((frame (window-frame window)))
-           (make-frame-visible frame)
-           (raise-frame frame)
-           window))
-       ;; Reuse the current window if the user requested it.
-       (when (cdr (assq 'same-window args))
-         (display-buffer-reuse-window
-          buffer '(same nil nil) '((reuse-dedicated . weak))))
-       ;; Stay on the same frame if requested.
-       (when (or (cdr (assq 'same-frame args))
-                 (cdr (assq 'same-window args)))
-         (or (display-buffer-pop-up-window
-              buffer '((largest . nil) (lru . nil)))
-             (display-buffer-reuse-window
-              buffer '(nil nil nil))))
-       ;; If no window yet, make one in a new frame.
-       (let ((frame
-              (with-current-buffer buffer
-                (make-frame
-                 (append args (with-no-warnings
-                                special-display-frame-alist))))))
-         (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")
-
-(defcustom special-display-function 'special-display-popup-frame
-  "Function to call for displaying special buffers.
-This function is called with two arguments - the buffer and,
-optionally, a list - and should return a window displaying that
-buffer.  The default value usually makes a separate frame for the
-buffer using `special-display-frame-alist' to specify the frame
-parameters.  See the definition of `special-display-popup-frame'
-for how to specify such a function.
-
-A buffer is special when its name is either listed in
-`special-display-buffer-names' or matches a regexp in
-`special-display-regexps'."
+(defcustom pop-up-frame-function
+  (lambda () (make-frame pop-up-frame-alist))
+  "Function used by `display-buffer' for creating a new frame.
+This function is called with no arguments and should return a new
+frame.  The default value calls `make-frame' with the argument
+`pop-up-frame-alist'."
   :type 'function
-  :group 'windows
   :group 'frames)
-;; (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.
@@ -6234,6 +3965,9 @@ named BUFFER-NAME as first argument, and OTHER-ARGS as the
 second.  If `special-display-function' specifies some other
 function, that function is called with the buffer named
 BUFFER-NAME as first, and the element's cdr as second argument.
+In any case, that function is responsible for setting the value
+of `display-buffer-window' and the quit-restore parameter of the
+window used.
 
 If this variable appears \"not to work\", because you added a
 name to it but the corresponding buffer is displayed in the
@@ -6262,9 +3996,6 @@ 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")
 
 ;;;###autoload
 (put 'special-display-buffer-names 'risky-local-variable t)
@@ -6333,9 +4064,6 @@ 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")
 
 (defun special-display-p (buffer-name)
   "Return non-nil if a buffer named BUFFER-NAME gets a special frame.
@@ -6345,17 +4073,15 @@ matching BUFFER-NAME.  If `special-display-buffer-names' or
 `special-display-regexps' contain a list entry whose car equals
 or matches BUFFER-NAME, the return value is the cdr of that
 entry."
-  (let ((buffer-names (with-no-warnings special-display-buffer-names))
-        (regexps (with-no-warnings special-display-regexps))
-        tmp)
+  (let (tmp)
     (cond
      ((not (stringp buffer-name)))
-     ((member buffer-name buffer-names)
+     ((member buffer-name special-display-buffer-names)
       t)
-     ((setq tmp (assoc buffer-name buffer-names))
+     ((setq tmp (assoc buffer-name special-display-buffer-names))
       (cdr tmp))
      ((catch 'found
-        (dolist (regexp regexps)
+        (dolist (regexp special-display-regexps)
           (cond
            ((stringp regexp)
             (when (string-match-p regexp buffer-name)
@@ -6363,43 +4089,142 @@ 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")
 
-(defcustom pop-up-frame-alist nil
-  "Alist of parameters for automatically generated new frames.
-You can set this in your init file; for example,
+(defcustom special-display-frame-alist
+  '((height . 14) (width . 80) (unsplittable . t))
+  "Alist of parameters for special frames.
+Special frames are used for buffers whose names are listed in
+`special-display-buffer-names' and for buffers whose names match
+one of the regular expressions in `special-display-regexps'.
 
-  (setq pop-up-frame-alist '((width . 80) (height . 20)))
+This variable can be set in your init file, like this:
 
-If non-nil, the value you specify here is used by the default
-`pop-up-frame-function' for the creation of new frames.
+  (setq special-display-frame-alist '((width . 80) (height . 20)))
 
-Since `pop-up-frame-function' is used by `display-buffer' for
-making new frames, any value specified here by default affects
-the automatic generation of new frames via `display-buffer' and
-all functions based on it.  The behavior of `make-frame' is not
-affected by this variable."
+These supersede the values given in `default-frame-alist'."
   :type '(repeat (cons :format "%v"
-                       (symbol :tag "Parameter")
-                       (sexp :tag "Value")))
+                         (symbol :tag "Parameter")
+                         (sexp :tag "Value")))
   :group 'frames)
-;; (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))
-  "Function used by `display-buffer' for creating a new frame.
-This function is called with no arguments and should return a new
-frame.  The default value calls `make-frame' with the argument
-`pop-up-frame-alist'."
+(defun special-display-popup-frame (buffer &optional args)
+  "Display BUFFER and return the window chosen.
+If BUFFER is already displayed in a visible or iconified frame,
+raise that frame.  Otherwise, display BUFFER in a new frame.
+
+Optional argument ARGS is a list specifying additional
+information.
+
+If ARGS is an alist, use it as a list of frame parameters.  If
+these parameters contain \(same-window . t), display BUFFER in
+the selected window.  If they contain \(same-frame . t), display
+BUFFER in a window of 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."
+  (if (and args (symbolp (car args)))
+      (apply (car args) buffer (cdr args))
+    (let ((window (get-buffer-window buffer 0)))
+      (or
+       ;; If we have a window already, make it visible.
+       (when window
+         (let ((frame (window-frame window)))
+           (make-frame-visible frame)
+           (raise-frame frame)
+           (display-buffer-record-window 'reuse-window window buffer)
+           window))
+       ;; Reuse the current window if the user requested it.
+       (when (cdr (assq 'same-window args))
+         (condition-case nil
+             (progn (switch-to-buffer buffer nil t) (selected-window))
+           (error nil)))
+       ;; Stay on the same frame if requested.
+       (when (or (cdr (assq 'same-frame args)) (cdr (assq 'same-window args)))
+         (let* ((pop-up-windows t)
+                pop-up-frames
+                special-display-buffer-names special-display-regexps)
+           (display-buffer buffer)))
+       ;; If no window yet, make one in a new frame.
+       (let ((frame
+              (with-current-buffer buffer
+                (make-frame (append args special-display-frame-alist)))))
+         (display-buffer-record-window
+          'pop-up-frame (frame-selected-window frame) buffer)
+         (set-window-buffer (frame-selected-window frame) buffer)
+         (set-window-dedicated-p (frame-selected-window frame) t)
+         (frame-selected-window frame))))))
+
+(defcustom special-display-function 'special-display-popup-frame
+  "Function to call for displaying special buffers.
+This function is called with two arguments - the buffer and,
+optionally, a list - and should return a window displaying that
+buffer.  The default value usually makes a separate frame for the
+buffer using `special-display-frame-alist' to specify the frame
+parameters.  See the definition of `special-display-popup-frame'
+for how to specify such a function.
+
+A buffer is special when its name is either listed in
+`special-display-buffer-names' or matches a regexp in
+`special-display-regexps'.
+
+The function specified here is responsible for setting the value
+of `display-buffer-window' and the quit-restore parameter of the
+window used."
   :type 'function
   :group 'frames)
-;; (make-obsolete-variable
- ;; 'pop-up-frame-function
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
+
+(defcustom same-window-buffer-names nil
+  "List of names of buffers that should appear in the \"same\" window.
+`display-buffer' and `pop-to-buffer' show a buffer whose name is
+on this list in the selected rather than some other window.
+
+An element of this list can be a cons cell instead of just a
+string.  In that case, the cell's car must be a string specifying
+the buffer name.  This is for compatibility with
+`special-display-buffer-names'; the cdr of the cons cell is
+ignored.
+
+See also `same-window-regexps'."
+ :type '(repeat (string :format "%v"))
+ :group 'windows)
+
+(defcustom same-window-regexps nil
+  "List of regexps saying which buffers should appear in the \"same\" window.
+`display-buffer' and `pop-to-buffer' show a buffer whose name
+matches a regexp on this list in the selected rather than some
+other window.
+
+An element of this list can be a cons cell instead of just a
+string.  In that case, the cell's car must be a regexp matching
+the buffer name.  This is for compatibility with
+`special-display-regexps'; the cdr of the cons cell is ignored.
+
+See also `same-window-buffer-names'."
+  :type '(repeat (regexp :format "%v"))
+  :group 'windows)
+
+(defun same-window-p (buffer-name)
+  "Return non-nil if a buffer named BUFFER-NAME would be shown in the \"same\" window.
+This function returns non-nil if `display-buffer' or
+`pop-to-buffer' would show a buffer named BUFFER-NAME in the
+selected rather than \(as usual\) some other window.  See
+`same-window-buffer-names' and `same-window-regexps'."
+  (cond
+   ((not (stringp buffer-name)))
+   ;; The elements of `same-window-buffer-names' can be buffer
+   ;; names or cons cells whose cars are buffer names.
+   ((member buffer-name same-window-buffer-names))
+   ((assoc buffer-name same-window-buffer-names))
+   ((catch 'found
+      (dolist (regexp same-window-regexps)
+        ;; The elements of `same-window-regexps' can be regexps
+        ;; or cons cells whose cars are regexps.
+        (when (or (and (stringp regexp)
+                       (string-match regexp buffer-name))
+                  (and (consp regexp) (stringp (car regexp))
+                       (string-match-p (car regexp) buffer-name)))
+          (throw 'found t)))))))
 
 (defcustom pop-up-frames nil
   "Whether `display-buffer' should make a separate frame.
@@ -6411,48 +4236,39 @@ Any other non-nil value means always make a separate frame."
           (const :tag "Never" nil)
           (const :tag "On graphic displays only" graphic-only)
           (const :tag "Always" t))
-  :group 'windows
-  :group 'frames)
-;; (make-obsolete-variable
- ;; 'pop-up-frames
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
+  :group 'windows)
 
 (defcustom display-buffer-reuse-frames nil
-  "Set and non-nil means `display-buffer' should reuse frames.
+  "Non-nil means `display-buffer' should reuse frames.
 If the buffer in question is already displayed in a frame, raise
 that frame."
   :type 'boolean
   :version "21.1"
-  :group 'windows
-  :group 'frames)
-;; (make-obsolete-variable
- ;; 'display-buffer-reuse-frames
- ;; "use 2nd arg of `display-buffer' instead." "24.1")
+  :group 'windows)
 
 (defcustom pop-up-windows t
   "Non-nil means `display-buffer' should make a new window."
   :type 'boolean
   :group 'windows)
-;; (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.
+  "Function called by `display-buffer' routines to split a window.
 This function is called with a window as single argument and is
 supposed to split that window and return the new window.  If the
 window can (or shall) not be split, it is supposed to return nil.
-
 The default is to call the function `split-window-sensibly' which
 tries to split the window in a way which seems most suitable.
 You can customize the options `split-height-threshold' and/or
 `split-width-threshold' in order to have `split-window-sensibly'
 prefer either vertical or horizontal splitting.
 
-If you set this to any other function, bear in mind that
-`display-buffer' may call that function repeatedly; the option
-`pop-up-windows' controls which windows may become the argument
-of this function.
+If you set this to any other function, bear in mind that the
+`display-buffer' routines may call this function two times.  The
+argument of the first call is the largest window on its frame.
+If that call fails to return a live window, the function is
+called again with the least recently used window as argument.  If
+that call fails too, `display-buffer' will use an existing window
+to display its buffer.
 
 The window selected at the time `display-buffer' was invoked is
 still selected when this function is called.  Hence you can
@@ -6462,54 +4278,28 @@ 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")
 
 (defcustom split-height-threshold 80
-  "Minimum height for splitting a window to display a buffer.
-If this is an integer, `display-buffer' can split a window
+  "Minimum height for splitting windows sensibly.
+If this is an integer, `split-window-sensibly' may split a window
 vertically only if it has at least this many lines.  If this is
-nil, `display-buffer' does not split windows vertically.  If a
-window is the only window on its frame, `display-buffer' may
-split it vertically disregarding the value of this variable."
+nil, `split-window-sensibly' is not allowed to split a window
+vertically.  If, however, a window is the only window on its
+frame, `split-window-sensibly' may 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")
 
 (defcustom split-width-threshold 160
-  "Minimum width for splitting a window to display a buffer.
-If this is an integer, `display-buffer' can split a window
+  "Minimum width for splitting windows sensibly.
+If this is an integer, `split-window-sensibly' may split a window
 horizontally only if it has at least this many columns.  If this
-is nil, `display-buffer' cannot split windows horizontally."
+is nil, `split-window-sensibly' is not allowed to split a window
+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")
-
-(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' chooses a
-window that appears above or below the selected window."
-  :type 'boolean
-  :group 'windows)
-;; (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")
 
 (defun window-splittable-p (window &optional horizontal)
   "Return non-nil if `split-window-sensibly' may split WINDOW.
@@ -6560,8 +4350,6 @@ 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")
 
 (defun split-window-sensibly (window)
   "Split WINDOW in a way suitable for `display-buffer'.
@@ -6594,11 +4382,11 @@ more likely to occur.
 Have a look at the function `window-splittable-p' if you want to
 know how `split-window-sensibly' determines whether WINDOW can be
 split."
-  (or (and (with-no-warnings (window-splittable-p window))
+  (or (and (window-splittable-p window)
            ;; Split window vertically.
            (with-selected-window window
              (split-window-vertically)))
-      (and (with-no-warnings (window-splittable-p window t))
+      (and (window-splittable-p window t)
            ;; Split window horizontally.
            (with-selected-window window
              (split-window-horizontally)))
@@ -6608,238 +4396,633 @@ split."
            ;; minibuffer window, try to split it vertically disregarding
            ;; the value of `split-height-threshold'.
            (let ((split-height-threshold 0))
-             (when (with-no-warnings (window-splittable-p window))
+             (when (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")
-
-;; Functions for converting Emacs 23 buffer display options to buffer
-;; display specifiers.
-(defun display-buffer-alist-of-strings-p (list)
-  "Return t if LIST is a non-empty list of strings."
-  (when list
-    (catch 'failed
-      (dolist (item list)
-        (unless (stringp item)
-          (throw 'failed nil)))
-      t)))
-
-(defun display-buffer-alist-add (identifiers specifiers &optional no-custom)
-  "Helper function for `display-buffer-alist-set'."
-  (unless identifiers
-    (setq identifiers '((regexp . ".*"))))
-  (unless (atom specifiers)
-    (setq specifiers (delq nil specifiers)))
-
-  (if no-custom
-      (setq display-buffer-alist
-            (cons (cons identifiers specifiers) display-buffer-alist))
-    (customize-set-variable
-     'display-buffer-alist
-     (cons (cons identifiers specifiers) display-buffer-alist))))
-
-(defun display-buffer-alist-set-1 ()
-  "Helper function for `display-buffer-alist-set'."
-  (progn ;; with-no-warnings
-    (append
-     '(reuse-window (reuse-window nil same 0))
-     `(pop-up-frame (pop-up-frame t)
-                    ,(append '(pop-up-frame-alist)
-                             special-display-frame-alist))
-     '((dedicate . weak)))))
-
-(defun display-buffer-alist-set-2 (args)
-  "Helper function for `display-buffer-alist-set'."
-  (progn ;; with-no-warnings
-    (if (and (listp args) (symbolp (car args)))
-        `(function (function ,(car args) ,(cdr args)))
-      (append
-       '(reuse-window (reuse-window nil same 0))
-       (when (and (listp args) (cdr (assq 'same-window args)))
-         '(reuse-window
-           (reuse-window same nil nil) (reuse-window-dedicated . weak)))
-       (when (and (listp args)
-                  (or (cdr (assq 'same-frame args))
-                      (cdr (assq 'same-window args))))
-         '(pop-up-window (pop-up-window (largest . nil) (lru . nil))))
-       (when (and (listp args)
-                  (or (cdr (assq 'same-frame args))
-                      (cdr (assq 'same-window args))))
-         '(reuse-window (reuse-window nil nil nil)))
-       `(pop-up-frame (pop-up-frame t)
-                      ,(append '(pop-up-frame-alist)
-                               (when (listp args) args)
-                               special-display-frame-alist))
-       '((dedicate . weak))))))
-
-(defun display-buffer-alist-set (&optional no-custom add)
-  "Set `display-buffer-alist' from Emacs 23 buffer display options.
-Optional argument NO-CUSTOM nil means use `customize-set-variable'
-to set the value of `display-buffer-alist'.  NO-CUSTOM non-nil
-means to use `setq' instead.
-
-Optional argument ADD nil means to replace the actual value of
-`display-buffer-alist' with the value calculated here.  ADD
-non-nil means prepend the value calculated here to the current
-value of `display-buffer-alist'.  Return `display-buffer-alist'."
-  (unless add
-    (if no-custom
-        (setq display-buffer-alist nil)
-      (customize-set-variable 'display-buffer-alist nil)))
-
-  ;; Disable warnings, there are too many obsolete options here.
-  (progn ;; with-no-warnings
-    `other-window-means-other-frame'
-    (when pop-up-frames
-      (display-buffer-alist-add
-       nil '(pop-up-frame
-             (other-window-means-other-frame . t)) no-custom))
-
-    ;; `reuse-window-even-sizes'
-    (when even-window-heights
-      (display-buffer-alist-add
-       nil '(reuse-window (reuse-window-even-sizes . t)) no-custom))
-
-    ;; `dedicate'
-    (when display-buffer-mark-dedicated
-      (display-buffer-alist-add
-       nil '(dedicate (display-buffer-mark-dedicated . t)) no-custom))
-
-    ;; `pop-up-window' group
-    (let ((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)))
-      (display-buffer-alist-add
-       nil
-       (list
-        'pop-up-window
-        ;; `pop-up-window'
-        (when pop-up-windows
-          (list 'pop-up-window (cons 'largest fun) (cons 'lru fun)))
-        ;; `pop-up-window-min-height'
-        (cons 'pop-up-window-min-height min-height)
-        ;; `pop-up-window-min-width'
-        (cons 'pop-up-window-min-width min-width))
-       no-custom))
-
-    ;; `pop-up-frame' group
-    (when (or pop-up-frames
-              (not (equal pop-up-frame-function
-                          '(lambda nil
-                             (make-frame pop-up-frame-alist))))
-              pop-up-frame-alist)
-      (display-buffer-alist-add
-       nil
-       (list
-        'pop-up-frame
-        (when pop-up-frames
-          ;; `pop-up-frame'
-          (list 'pop-up-frame
-                (when (eq pop-up-frames 'graphic-only)
-                  t)))
-        (unless (equal pop-up-frame-function
-                       '(lambda nil
-                          (make-frame pop-up-frame-alist)))
-          ;; `pop-up-frame-function'
-          (cons 'pop-up-frame-function pop-up-frame-function))
-        (when pop-up-frame-alist
-          ;; `pop-up-frame-alist'
-          (cons 'pop-up-frame-alist pop-up-frame-alist)))
-       no-custom))
-
-    ;; `special-display-regexps'
-    (if (display-buffer-alist-of-strings-p special-display-regexps)
-        ;; Handle case where `special-display-regexps' is a plain list
-        ;; of strings specially.
-        (let (list)
-          (dolist (regexp special-display-regexps)
-            (setq list (cons (cons 'regexp regexp) list)))
-          (setq list (nreverse list))
-          (display-buffer-alist-add
-           list (display-buffer-alist-set-1) no-custom))
-      ;; Else iterate over the entries.
-      (dolist (item special-display-regexps)
-        (if (stringp item)
-            (display-buffer-alist-add
-             `((regexp . ,item)) (display-buffer-alist-set-1)
-             no-custom)
-          (display-buffer-alist-add
-           `((regexp . ,(car item)))
-           (display-buffer-alist-set-2 (cdr item))
-           no-custom))))
-
-    ;; `special-display-buffer-names'
-    (if (display-buffer-alist-of-strings-p special-display-buffer-names)
-        ;; Handle case where `special-display-buffer-names' is a plain
-        ;; list of strings specially.
-        (let (list)
-          (dolist (name special-display-buffer-names)
-            (setq list (cons (cons 'name name) list)))
-          (setq list (nreverse list))
-          (display-buffer-alist-add
-           list (display-buffer-alist-set-1) no-custom))
-      ;; Else iterate over the entries.
-      (dolist (item special-display-buffer-names)
-        (if (stringp item)
-            (display-buffer-alist-add
-             `((name . ,item)) (display-buffer-alist-set-1)
-             no-custom)
-          (display-buffer-alist-add
-           `((name . ,(car item)))
-           (display-buffer-alist-set-2 (cdr item))
-           no-custom))))
-
-    ;; `same-window-regexps'
-    (if (display-buffer-alist-of-strings-p same-window-regexps)
-        ;; Handle case where `same-window-regexps' is a plain list of
-        ;; strings specially.
-        (let (list)
-          (dolist (regexp same-window-regexps)
-            (setq list (cons (cons 'regexp regexp) list)))
-          (setq list (nreverse list))
-          (display-buffer-alist-add
-           list '(reuse-window (reuse-window same nil nil)) no-custom))
-      (dolist (entry same-window-regexps)
-        (display-buffer-alist-add
-         `((regexp . ,(if (stringp entry) entry (car entry))))
-         '(reuse-window (reuse-window same nil nil)) no-custom)))
-
-    ;; `same-window-buffer-names'
-    (if (display-buffer-alist-of-strings-p same-window-buffer-names)
-        ;; Handle case where `same-window-buffer-names' is a plain list
-        ;; of strings specially.
-        (let (list)
-          (dolist (name same-window-buffer-names)
-            (setq list (cons (cons 'name name) list)))
-          (setq list (nreverse list))
-          (display-buffer-alist-add
-           list '(reuse-window (reuse-window same nil nil)) no-custom))
-      (dolist (entry same-window-buffer-names)
-        (display-buffer-alist-add
-         `((name . ,(if (stringp entry) entry (car entry))))
-         '(reuse-window (reuse-window same nil nil)) no-custom)))
-
-    ;; `reuse-window'
-    (display-buffer-alist-add
-     nil `(reuse-window
-           (reuse-window
-            nil same
-            ,(when (or display-buffer-reuse-frames pop-up-frames)
-               ;; "0" (all visible and iconified frames) is
-               ;; hardcoded in Emacs 23.
-               0)))
-     no-custom)
-
-    display-buffer-alist))
+
+(defun window--try-to-split-window (window)
+  "Try to split WINDOW.
+Return value returned by `split-window-preferred-function' if it
+represents a live window, nil otherwise."
+      (and (window-live-p window)
+           (not (frame-parameter (window-frame window) 'unsplittable))
+           (let ((new-window
+                  ;; Since `split-window-preferred-function' might
+                  ;; throw an error use `condition-case'.
+                  (condition-case nil
+                      (funcall split-window-preferred-function window)
+                    (error nil))))
+             (and (window-live-p new-window) new-window))))
+
+(defun window--frame-usable-p (frame)
+  "Return FRAME if it can be used to display a buffer."
+  (when (frame-live-p frame)
+    (let ((window (frame-root-window frame)))
+      ;; `frame-root-window' may be an internal window which is considered
+      ;; "dead" by `window-live-p'.  Hence if `window' is not live we
+      ;; implicitly know that `frame' has a visible window we can use.
+      (unless (and (window-live-p window)
+                   (or (window-minibuffer-p window)
+                       ;; If the window is soft-dedicated, the frame is usable.
+                       ;; Actually, even if the window is really dedicated,
+                       ;; the frame is still usable by splitting it.
+                       ;; At least Emacs-22 allowed it, and it is desirable
+                       ;; when displaying same-frame windows.
+                       nil ; (eq t (window-dedicated-p window))
+                       ))
+        frame))))
+
+(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' chooses a
+window that appears above or below the selected window."
+  :type 'boolean
+  :group 'windows)
+
+(defun window--even-window-heights (window)
+  "Even heights of WINDOW and selected window.
+Do this only if these windows are vertically adjacent to each
+other, `even-window-heights' is non-nil, and the selected window
+is higher than WINDOW."
+  (when (and even-window-heights
+             (not (eq window (selected-window)))
+             ;; Don't resize minibuffer windows.
+             (not (window-minibuffer-p (selected-window)))
+             (> (window-height (selected-window)) (window-height window))
+             (eq (window-frame window) (window-frame (selected-window)))
+             (let ((sel-edges (window-edges (selected-window)))
+                   (win-edges (window-edges window)))
+               (and (= (nth 0 sel-edges) (nth 0 win-edges))
+                    (= (nth 2 sel-edges) (nth 2 win-edges))
+                    (or (= (nth 1 sel-edges) (nth 3 win-edges))
+                        (= (nth 3 sel-edges) (nth 1 win-edges))))))
+    (let ((window-min-height 1))
+      ;; Don't throw an error if we can't even window heights for
+      ;; whatever reason.
+      (condition-case nil
+          (enlarge-window (/ (- (window-height window) (window-height)) 2))
+        (error nil)))))
+
+(defun window--display-buffer-1 (window)
+  "Raise the frame containing WINDOW.
+Do not raise the selected frame.  Return WINDOW."
+  (let* ((frame (window-frame window))
+         (visible (frame-visible-p frame)))
+    (unless (or (not visible)
+                ;; Assume the selected frame is already visible enough.
+                (eq frame (selected-frame))
+                ;; Assume the frame from which we invoked the minibuffer
+                ;; is visible.
+                (and (minibuffer-window-active-p (selected-window))
+                     (eq frame (window-frame (minibuffer-selected-window)))))
+      (raise-frame frame))
+    window))
+
+(defun window--display-buffer-2 (buffer window &optional dedicated)
+  "Display BUFFER in WINDOW and make its frame visible.
+Set `window-dedicated-p' to DEDICATED if non-nil.
+Return WINDOW."
+  (when (and (buffer-live-p buffer) (window-live-p window))
+    (set-window-buffer window buffer)
+    (when dedicated
+      (set-window-dedicated-p window dedicated))
+    (window--display-buffer-1 window)))
+
+(defvar display-buffer-mark-dedicated nil
+  "If non-nil, `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.")
+
+(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.
+If no such buffer exists, create a buffer with the name
+BUFFER-OR-NAME and return that buffer."
+  (if buffer-or-name
+      (or (get-buffer buffer-or-name)
+          (let ((buffer (get-buffer-create buffer-or-name)))
+            (set-buffer-major-mode buffer)
+            buffer))
+    (current-buffer)))
+
+(defvar display-buffer-alist nil
+  "Alist of conditional actions for `display-buffer'.
+This is a list of elements (CONDITION . ACTION), where:
+
+ CONDITION is either a regexp matching buffer names, or a function
+  that takes a buffer and returns a boolean.
+
+ ACTION is a cons cell (FUNCTION . ALIST), where FUNCTION is
+  either a function or a list of functions.  Each such function
+  should accept 2 arguments: a buffer to display and an alist of
+  the same form as ALIST.  It should return the window used, or
+  nil if it fails to display the window.  See `display-buffer'
+  for more details.
+
+Usable action functions include:
+ `display-buffer-reuse-selected-window'
+ `display-buffer-same-window'
+ `display-buffer-maybe-same-window'
+ `display-buffer-reuse-window'
+ `display-buffer-pop-up-frame'
+ `display-buffer-pop-up-window'
+ `display-buffer-reuse-or-pop-window'
+ `display-buffer-use-some-window'
+
+The above functions recognize the following alist entries:
+ - `inhibit-same-window', if non-nil, prevents the same window
+   from being used for display.
+ - `reuse-frame' specifies the frames that can be searched for a
+   window displaying the buffer.  Its values have the same
+   meaning as the ALL-FRAMES arg to `get-buffer-window-list'.")
+
+(defvar display-buffer-default-action
+  '((display-buffer-reuse-selected-window
+     display-buffer-maybe-same-window
+     display-buffer-reuse-or-pop-window
+     display-buffer-use-some-window
+     ;; If all else fails, pop up a new frame regardless of
+     ;; restrictions.
+     display-buffer-pop-up-frame))
+  "List of default actions for `display-buffer'.
+It should be a cons cell of the form (FUNCTION . ALIST), which
+has the same meaning as in `display-buffer-alist'.")
+
+(defvar display-buffer-overriding-action nil
+  "Overriding action to perform to display a buffer.
+If non-nil, it should be a cons cell (FUNCTION . ALIST), which
+has the same meaning as in `display-buffer-alist'.")
+
+(defun display-buffer-assq-regexp (buffer-name alist)
+  "Retrieve ALIST entry corresponding to BUFFER-NAME."
+  (catch 'match
+    (dolist (entry alist)
+      (let ((key (car entry))
+            (value (cdr entry)))
+        (when (or (and (stringp key)
+                       (string-match-p key buffer-name))
+                  (and (symbolp key) (functionp key)
+                       (funcall key buffer-name alist)))
+          (throw 'match (cdr entry)))))))
+
+(defun display-buffer (&optional buffer-or-name action frame)
+  "Display BUFFER-OR-NAME in some window.
+BUFFER-OR-NAME must be a buffer or the name of an existing
+buffer.  Return the window chosen for displaying BUFFER-OR-NAME,
+or nil if no such window is found.
+
+Optional argument ACTION should have the form (FUNCTION . ALIST).
+FUNCTION is either a function or a list of functions.  Each such
+function is called with 2 arguments: the buffer to display and an
+alist.  It should either display the buffer and return the
+window, or return nil if it is unable to display the buffer.
+
+`display-buffer' constructs a list of action functions and an
+action alist by combining `display-buffer-overriding-action',
+`display-buffer-alist', the ACTION argument, and
+`display-buffer-default-action' (in that order).  It calls each
+action function in turn, passing the combined action alist as the
+second argument, until one of the functions returns non-nil.
+
+The ACTION argument to `display-buffer' can also have a non-nil
+and non-list value.  This means to display the buffer in a window
+other than the selected one, even if it is already displayed in
+the selected window.  If called interactively with a prefix
+argument, ACTION is t.
+
+Optional argument FRAME specifies where to look for a window that
+already displays the buffer.  If nil, check only the selected
+frame (actually the last non-minibuffer frame), except if
+`display-buffer-reuse-frames' or `pop-up-frames' is non-nil
+\(non-nil and not graphic-only on a text-only terminal), in which
+case check all visible or iconified frames.  Otherwise, FRAME can
+be a specific frame, `visible' (all visible frames), 0 (all
+frames on the current terminal), or t (all frames)."
+  (interactive (list (read-buffer "Display buffer: " (other-buffer))
+                     (if current-prefix-arg t)))
+  (let ((buffer (window-normalize-buffer-to-display buffer-or-name))
+        ;; Handle the old form of the first argument.
+        (inhibit-same-window (and action (not (listp action)))))
+    (unless (listp action) (setq action nil))
+    (if display-buffer-function
+        ;; If `display-buffer-function' is defined, let it do the job.
+        (funcall display-buffer-function buffer inhibit-same-window)
+      ;; Otherwise, use the defined actions.
+      (let* ((user-action
+              (display-buffer-assq-regexp (buffer-name buffer)
+                                          display-buffer-alist))
+             ;; Extra actions from the arguments to this function:
+             (extra-action
+              (cons nil (append (if inhibit-same-window
+                                    '((inhibit-same-window . t)))
+                                (if frame
+                                    `((reuse-frame . ,frame))))))
+             ;; Construct action function list and action alist.
+             (actions (list display-buffer-overriding-action
+                            user-action action extra-action
+                            display-buffer-default-action))
+             (functions (apply 'append
+                               (mapcar (lambda (x)
+                                         (setq x (car x))
+                                         (if (functionp x) (list x) x))
+                                       actions)))
+             (alist (apply 'append (mapcar 'cdr actions)))
+             window)
+        (unless (buffer-live-p buffer)
+          (error "Invalid buffer"))
+        (while (and functions (not window))
+          (setq window (funcall (car functions) buffer alist)
+                functions (cdr functions)))
+        window))))
+
+(defun display-buffer-other-frame (buffer)
+  "Display buffer BUFFER in another frame.
+This uses the function `display-buffer' as a subroutine; see
+its documentation for additional customization information."
+  (interactive "BDisplay buffer in other frame: ")
+  (let ((pop-up-frames t)
+        same-window-buffer-names same-window-regexps
+        ;;(old-window (selected-window))
+        new-window)
+    (setq new-window (display-buffer buffer t))
+    ;; This may have been here in order to prevent the new frame from hiding
+    ;; the old frame.  But it does more harm than good.
+    ;; Maybe we should call `raise-window' on the old-frame instead?  --Stef
+    ;;(lower-frame (window-frame new-window))
+
+    ;; This may have been here in order to make sure the old-frame gets the
+    ;; focus.  But not only can it cause an annoying flicker, with some
+    ;; window-managers it just makes the window invisible, with no easy
+    ;; way to recover it.  --Stef
+    ;;(make-frame-invisible (window-frame old-window))
+    ;;(make-frame-visible (window-frame old-window))
+    ))
+
+;;; `display-buffer' action functions:
+
+(defun display-buffer-reuse-selected-window (buffer alist)
+  "Try to display BUFFER in the selected window if it is already there.
+If this succeeds, return the selected window.
+
+This fails if BUFFER is not displayed in the selected window, or
+if ALIST has a non-nil `inhibit-same-window' entry.  In that
+case, return nil."
+  (when (and (not (cdr (assq 'inhibit-same-window alist)))
+             (eq buffer (window-buffer)))
+    (display-buffer-record-window 'reuse-window (selected-window) buffer)
+    (window--display-buffer-1 (selected-window))))
+
+(defun display-buffer-same-window (buffer alist)
+  "Try to display BUFFER in the selected window.
+If this succeeds, return the selected window.
+
+This fails if the selected window is a minibuffer window or is
+dedicated to another buffer, or if ALIST has a non-nil
+`inhibit-same-window' entry.  In that case, return nil."
+  (unless (or (cdr (assq 'inhibit-same-window alist))
+              (window-minibuffer-p)
+              (window-dedicated-p))
+    (display-buffer-record-window 'reuse-window (selected-window) buffer)
+    (window--display-buffer-2 buffer (selected-window))))
+
+(defun display-buffer-maybe-same-window (buffer alist)
+  "Try to display BUFFER in the selected window.
+This acts like `display-buffer-same-window', except that it also
+fails if `same-window-p' returns nil for this buffer."
+  (and (same-window-p (buffer-name buffer))
+       (display-buffer-same-window buffer alist)))
+
+(defun display-buffer-reuse-window (buffer alist)
+  "Return a window that is already displaying BUFFER.
+If no usable window is found, return nil.
+
+If ALIST has a non-nil `inhibit-same-window' entry, the same
+window cannot be reused.
+
+If ALIST contains a `reuse-frame' entry, that determines the
+frames to check for a window displaying the buffer.  If the entry
+is omitted or the value is nil, check only this frame.  The value
+can also be a specific frame, `visible' (all visible frames),
+0 (all frames on the current terminal), or t (all frames)."
+  (let* ((can-use-selected-window
+          (not (cdr (assq 'inhibit-same-window alist))))
+         (frames (or (cdr (assq 'reuse-frame alist))
+                     (last-nonminibuffer-frame)))
+         (window (catch 'found
+                   (dolist (window (get-buffer-window-list
+                                    buffer 'nomini frames))
+                     (when (or can-use-selected-window
+                               (not (eq (selected-window) window)))
+                       (throw 'found window))))))
+    (when window
+      (display-buffer-record-window 'reuse-window window buffer)
+      (window--display-buffer-1 window))))
+
+(defun display-buffer-pop-up-frame (buffer alist)
+  "Display BUFFER in a new frame.
+This works by calling `pop-up-frame-function'.  If sucessful,
+return the window on the new frame; otherwise return nil."
+  (let ((fun pop-up-frame-function)
+        frame window)
+    (when (and fun
+               (setq frame (funcall fun))
+               (setq window (frame-selected-window frame)))
+      (display-buffer-record-window 'pop-up-frame window buffer)
+      (window--display-buffer-2 buffer window)
+      ;; Reset list of WINDOW's previous buffers to nil.
+      (set-window-prev-buffers window nil)
+      window)))
+
+(defun display-buffer-pop-up-window (buffer alist)
+  "Display BUFFER by popping up a new window.
+The new window is created on the selected frame, or in
+`last-nonminibuffer-frame' if no windows can be created there.
+If sucessful, return the new window; otherwise return nil."
+  (let ((frame (or (window--frame-usable-p (selected-frame))
+                   (window--frame-usable-p (last-nonminibuffer-frame))))
+        window)
+    (when (and (or (not (frame-parameter frame 'unsplittable))
+                   ;; If the selected frame cannot be split, look at
+                   ;; `last-nonminibuffer-frame'.
+                   (and (eq frame (selected-frame))
+                        (setq frame (last-nonminibuffer-frame))
+                        (window--frame-usable-p frame)
+                        (not (frame-parameter frame 'unsplittable))))
+               ;; Attempt to split largest or least recently used window.
+               (setq window (or (window--try-to-split-window
+                                 (get-largest-window frame t))
+                                (window--try-to-split-window
+                                 (get-lru-window frame t)))))
+      (display-buffer-record-window 'pop-up-window window buffer)
+      (window--display-buffer-2 buffer window)
+      ;; Reset list of WINDOW's previous buffers to nil.
+      (set-window-prev-buffers window nil)
+      window)))
+
+;; This display action function groups together some lower-level ones:
+(defun display-buffer-reuse-or-pop-window (buffer alist)
+  "Display BUFFER in some window other than the selected one.
+This attempts to call the following functions (in order):
+ - `display-buffer-reuse-window', ensuring that it checks all
+   frames on this terminal if `display-buffer-reuse-frames' or
+   `pop-up-frames' is non-nil.
+ - `special-display-function', if it is available.
+ - `display-buffer-pop-up-frame', if specified by `pop-up-frames'.
+ - `display-buffer-pop-up-window', if specified by `pop-up-windows'.
+
+If BUFFER is sucessfully display, return its window; otherwise
+return nil."
+  (let ((use-pop-up-frames (if (eq pop-up-frames 'graphic-only)
+                               (display-graphic-p)
+                             pop-up-frames)))
+    (or (display-buffer-reuse-window
+         buffer
+         ;; If `display-buffer-reuse-frames' or `pop-up-frames' is
+         ;; non-nil, check all frames on this terminal.
+         (if (and (null (cdr (assq 'reuse-frame alist)))
+                  (or use-pop-up-frames display-buffer-reuse-frames))
+             (cons '(reuse-frame . 0) alist)
+           alist))
+        ;; Try with `special-display-function':
+        (and 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 buffer))))
+               (when pars
+                 (funcall special-display-function
+                          buffer (if (listp pars) pars)))))
+        (and use-pop-up-frames
+             (display-buffer-pop-up-frame buffer alist))
+        (and pop-up-windows
+             (display-buffer-pop-up-window buffer alist)))))
+
+(defun display-buffer-use-some-window (buffer alist)
+  "Display BUFFER in an existing window.
+Search for a usable window, set that window to the buffer, and
+return the window.  If no suitable window is found, return nil."
+  (let* ((not-this-window (cdr (assq 'inhibit-same-window alist)))
+         (window-to-undedicate
+          ;; When NOT-THIS-WINDOW is non-nil, temporarily dedicate the
+          ;; selected window to its buffer, to prevent any of the
+          ;; `get-' routines below from choosing it.  (Bug#1415)
+          (and not-this-window (not (window-dedicated-p))
+               (set-window-dedicated-p (selected-window) t)
+               (selected-window)))
+         (frame (or (window--frame-usable-p (selected-frame))
+                    (window--frame-usable-p (last-nonminibuffer-frame))))
+         (use-pop-up-frames (if (eq pop-up-frames 'graphic-only)
+                                (display-graphic-p)
+                              pop-up-frames))
+         window popped-up-frame)
+    (unwind-protect
+        (setq window
+              ;; Reuse an existing window.
+              (or (get-lru-window frame)
+                  (let ((window (get-buffer-window buffer 'visible)))
+                    (unless (and not-this-window
+                                 (eq window (selected-window)))
+                      window))
+                  (get-largest-window 'visible)
+                  (let ((window (get-buffer-window buffer 0)))
+                    (unless (and not-this-window
+                                 (eq window (selected-window)))
+                      window))
+                  (get-largest-window 0)
+                  (and use-pop-up-frames
+                       (prog1
+                           (frame-selected-window (funcall pop-up-frame-function))
+                         (setq popped-up-frame t)))))
+      (when (window-live-p window-to-undedicate)
+        ;; Restore dedicated status of selected window.
+        (set-window-dedicated-p window-to-undedicate nil)))
+    (when window
+      (display-buffer-record-window
+       (if popped-up-frame 'pop-up-frame 'reuse-window) window buffer)
+      (window--even-window-heights window)
+      (window--display-buffer-2 buffer window))))
+
+;;; Display + selection commands:
+
+(defun pop-to-buffer (buffer &optional action norecord)
+  "Select buffer BUFFER in some window, preferably a different one.
+BUFFER may be a buffer, a string (a buffer name), or nil.  If it
+is a string not naming an existent buffer, create a buffer with
+that name.  If BUFFER is nil, choose some other buffer.  Return
+the buffer.
+
+This uses `display-buffer' as a subroutine.  The optional ACTION
+argument is passed to `display-buffer' as its ACTION argument.
+See `display-buffer' for more information.  ACTION is t if called
+interactively with a prefix argument, which means to pop to a
+window other than the selected one even if the buffer is already
+displayed in the selected window.
+
+If the window to show BUFFER is not on the selected
+frame, raise that window's frame and give it input focus.
+
+Optional third arg NORECORD non-nil means do not put this buffer
+at the front of the list of recently selected ones."
+  (interactive (list (read-buffer "Pop to buffer: " (other-buffer))
+                     (if current-prefix-arg t)))
+  (setq buffer (window-normalize-buffer-to-display
+                ;; BUFFER nil means another buffer.
+                (or buffer (other-buffer))))
+  (set-buffer buffer)
+  (let* ((old-window (selected-window))
+         (old-frame (selected-frame))
+         (window (display-buffer (current-buffer) action))
+         (frame (window-frame window)))
+    (if (eq frame old-frame)
+        ;; Make sure new window is selected (Bug#8615), (Bug#6954).
+        (select-window window norecord)
+      ;; If `display-buffer' has chosen another frame, make sure it
+      ;; gets input focus.
+      (select-frame-set-input-focus frame norecord))
+    buffer))
+
+(defun read-buffer-to-switch (prompt)
+  "Read the name of a buffer to switch to, prompting with PROMPT.
+Return the neame of the buffer as a string.
+
+This function is intended for the `switch-to-buffer' family of
+commands since these need to omit the name of the current buffer
+from the list of completions and default values."
+  (let ((rbts-completion-table (internal-complete-buffer-except)))
+    (minibuffer-with-setup-hook
+        (lambda ()
+          (setq minibuffer-completion-table rbts-completion-table)
+          ;; Since rbts-completion-table is built dynamically, we
+          ;; can't just add it to the default value of
+          ;; icomplete-with-completion-tables, so we add it
+          ;; here manually.
+          (if (and (boundp 'icomplete-with-completion-tables)
+                   (listp icomplete-with-completion-tables))
+              (set (make-local-variable 'icomplete-with-completion-tables)
+                   (cons rbts-completion-table
+                         icomplete-with-completion-tables))))
+      (read-buffer prompt (other-buffer (current-buffer))
+                   (confirm-nonexistent-file-or-buffer)))))
+
+(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
+exists, return that buffer.  If no such buffer exists, create a
+buffer with the name BUFFER-OR-NAME and return that buffer."
+  (if buffer-or-name
+      (or (get-buffer buffer-or-name)
+          (let ((buffer (get-buffer-create buffer-or-name)))
+            (set-buffer-major-mode buffer)
+            buffer))
+    (other-buffer)))
+
+(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'
+determines whether to request confirmation before creating a new
+buffer.
+
+BUFFER-OR-NAME may be a buffer, a string \(a buffer name), or
+nil.  If BUFFER-OR-NAME is a string that does not identify an
+existing buffer, create a buffer with that name.  If
+BUFFER-OR-NAME is nil, switch to the buffer returned by
+`other-buffer'.
+
+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.
+
+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: ") nil nil))
+  (let ((buffer (window-normalize-buffer-to-switch-to buffer-or-name)))
+    (if (null force-same-window)
+        (cond
+         ((eq buffer (window-buffer))
+          (unless norecord
+            (select-window (selected-window)))
+          (set-buffer buffer))
+         ((or (window-minibuffer-p) (window-dedicated-p))
+          (pop-to-buffer buffer))
+         (t
+          (set-window-buffer nil buffer)
+          (unless norecord
+            (select-window (selected-window)))
+          (set-buffer buffer)))
+      (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)))
+       ((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))))
+
+(defun switch-to-buffer-other-window (buffer-or-name &optional norecord)
+  "Select the buffer specified by BUFFER-OR-NAME in another window.
+BUFFER-OR-NAME may be a buffer, a string \(a buffer name), or
+nil.  Return the buffer switched to.
+
+If called interactively, prompt for the buffer name using the
+minibuffer.  The variable `confirm-nonexistent-file-or-buffer'
+determines whether to request confirmation before creating a new
+buffer.
+
+If BUFFER-OR-NAME is a string and does not identify an existing
+buffer, create a new buffer with that name.  If BUFFER-OR-NAME is
+nil, switch to the buffer returned by `other-buffer'.
+
+Optional second argument NORECORD non-nil means do not put this
+buffer at the front of the list of recently selected ones.
+
+This uses the function `display-buffer' as a subroutine; see its
+documentation for additional customization information."
+  (interactive
+   (list (read-buffer-to-switch "Switch to buffer in other window: ")))
+  (let ((buffer (window-normalize-buffer-to-switch-to buffer-or-name))
+        (pop-up-windows t)
+        same-window-buffer-names same-window-regexps)
+    (pop-to-buffer buffer t norecord)))
+
+(defun switch-to-buffer-other-frame (buffer-or-name &optional norecord)
+  "Switch to buffer BUFFER-OR-NAME in another frame.
+BUFFER-OR-NAME may be a buffer, a string \(a buffer name), or
+nil.  Return the buffer switched to.
+
+If called interactively, prompt for the buffer name using the
+minibuffer.  The variable `confirm-nonexistent-file-or-buffer'
+determines whether to request confirmation before creating a new
+buffer.
+
+If BUFFER-OR-NAME is a string and does not identify an existing
+buffer, create a new buffer with that name.  If BUFFER-OR-NAME is
+nil, switch to the buffer returned by `other-buffer'.
+
+Optional second arg NORECORD non-nil means do not put this
+buffer at the front of the list of recently selected ones.
+
+This uses the function `display-buffer' as a subroutine; see its
+documentation for additional customization information."
+  (interactive
+   (list (read-buffer-to-switch "Switch to buffer in other frame: ")))
+  (let ((buffer (window-normalize-buffer-to-switch-to buffer-or-name))
+        (pop-up-frames t)
+        same-window-buffer-names same-window-regexps)
+    (pop-to-buffer buffer t norecord)))
 
 (defun set-window-text-height (window height)
   "Set the height in lines of the text display area of WINDOW to HEIGHT.
@@ -7087,39 +5270,6 @@ Return non-nil if the window was shrunk, nil otherwise."
        (with-current-buffer buffer-to-kill
          (remove-hook 'kill-buffer-hook delete-window-hook t))))))
 
-(defun quit-window (&optional kill window)
-  "Quit WINDOW and bury its buffer.
-With a prefix argument, kill the buffer instead.  WINDOW defaults
-to the selected window.
-
-If WINDOW is non-nil, dedicated, or a minibuffer window, delete
-it and, if it's alone on its frame, its frame too.  Otherwise, or
-if deleting WINDOW fails in any of the preceding cases, display
-another buffer in WINDOW using `switch-to-buffer'.
-
-Optional argument KILL non-nil means kill WINDOW's buffer.
-Otherwise, bury WINDOW's buffer, see `bury-buffer'."
-  (interactive "P")
-  (let ((buffer (window-buffer window)))
-    (if (or window
-            (window-minibuffer-p window)
-            (window-dedicated-p window))
-        ;; WINDOW is either non-nil, a minibuffer window, or dedicated;
-        ;; try to delete it.
-        (let* ((window (or window (selected-window)))
-               (frame (window-frame window)))
-          (if (frame-root-window-p window)
-              ;; WINDOW is alone on its frame.
-              (delete-frame frame)
-            ;; There are other windows on its frame, delete WINDOW.
-            (delete-window window)))
-      ;; Otherwise, switch to another buffer in the selected window.
-      (switch-to-buffer nil))
-
-    ;; Deal with the buffer.
-    (if kill
-        (kill-buffer buffer)
-      (bury-buffer buffer))))
 
 (defvar recenter-last-op nil
   "Indicates the last recenter operation performed.
@@ -7516,6 +5666,8 @@ Otherwise, consult the value of `truncate-partial-width-windows'
           (< (window-width window) t-p-w-w)
         t-p-w-w))))
 
+;; Some of these are in tutorial--default-keys, so update that if you
+;; change these.
 (define-key ctl-x-map "0" 'delete-window)
 (define-key ctl-x-map "1" 'delete-other-windows)
 (define-key ctl-x-map "2" 'split-window-above-each-other)
diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el
index 403aa5d158b..eca5f813ca2 100644
--- a/lisp/xt-mouse.el
+++ b/lisp/xt-mouse.el
@@ -120,10 +120,17 @@
 
 ;; read xterm sequences above ascii 127 (#x7f)
 (defun xterm-mouse-event-read ()
+  ;; We get the characters decoded by the keyboard coding system.  Try
+  ;; to recover the raw character.
   (let ((c (read-char)))
-    (if (> c #x3FFF80)
-        (+ 128 (- c #x3FFF80))
-      c)))
+    (cond ;; If meta-flag is t we get a meta character
+          ((>= c ?\M-\^@)
+           (- c (- ?\M-\^@ 128)))
+          ;; Reencode the character in the keyboard coding system, if
+          ;; this is a non-ASCII character.
+          ((>= c #x80)
+           (aref (encode-coding-string (string c) (keyboard-coding-system)) 0))
+          (t c))))
 
 (defun xterm-mouse-truncate-wrap (f)
   "Truncate with wrap-around."