merge from trunk

107 files changed, 3140 insertions, 1225 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f2c6b569126..f324ebbad51 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,480 @@
+2013-01-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/nadvice.el (advice--tweak): Make it possible for `tweak'
+        to return an explicit nil.
+        (advice--remove-function): Change accordingly.
+
+        * emacs-lisp/advice.el (ad-preactivate-advice): Adjust the cleanup to
+        the use of nadvice.el.
+
+        * progmodes/which-func.el (which-function): Silence imenu errors
+        (bug#13433).
+
+2013-01-15  Michael R. Mauger  <mmaug@yahoo.com>
+
+        * progmodes/sql.el: (sql-imenu-generic-expression):
+        (sql-mode-font-lock-object-name): Match schema qualified names.
+        (sql-connect): Use string keys.
+        (sql-product-interactive): Wait for interpreter prompt.
+        (sql-comint-oracle): Set process coding based on NLS_LANG.
+
+2013-01-15  Michael R. Mauger  <mmaug@yahoo.com>
+
+        * progmodes/sql.el (sql-output-to-send): Remove, unused.
+        (sql-interactive-remove-continuation-prompt):
+        (sql-send-magic-terminator, sql-interactive-mode): Remove references.
+
+2013-01-14  Leo Liu  <sdl.web@gmail.com>
+
+        * calendar/calendar.el (calendar-redraw): Sync window-point and point.
+        (Bug#13420)
+
+2013-01-14  Glenn Morris  <rgm@gnu.org>
+
+        * progmodes/compile.el (compilation-error-regexp-alist-alist):
+        Fix interpretation of gnu line.col1-col2 format.  (Bug#13335)
+
+2013-01-13  Fabián Ezequiel Gallina  <fgallina@cuca>
+
+        * progmodes/python.el (python-nav-end-of-statement):
+        Fix cornercase when handling multiline strings.
+
+2013-01-13  Richard Stallman  <rms@gnu.org>
+
+        * mail/sendmail.el (mail-position-on-field): Add doc string.
+
+        * mail/rmailmm.el (rmail-insert-mime-forwarded-message):
+        Get current message boundaries and pass them to
+        message-forward-make-body-mime.  Minor style changes.
+
+2013-01-13  Eli Zaretskii  <eliz@gnu.org>
+
+        * cus-start.el (all): Avoid warnings about
+        scroll-bar-adjust-thumb-portion on platforms where it is not defined.
+
+2013-01-11  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * cus-start.el (all): Add scroll-bar-adjust-thumb-portion.
+
+2013-01-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * jit-lock.el (jit-lock-debug-mode): New minor mode.
+        (jit-lock--debug-fontifying): New var.
+        (jit-lock--debug-fontify): New function.
+        * subr.el (condition-case-unless-debug): Don't prevent catching the
+        error, just let the debbugger run.
+        * emacs-lisp/timer.el (timer-event-handler): Don't prevent debugging
+        timer code and don't drop errors silently.
+
+2013-01-12  Michael Albinus  <michael.albinus@gmx.de>
+
+        * autorevert.el (auto-revert-notify-watch-descriptor): Give it
+        `permanent-local' property.
+        (auto-revert-notify-handler): Use `file-equal-p'.
+
+2013-01-12  Eli Zaretskii  <eliz@gnu.org>
+
+        * autorevert.el (auto-revert-notify-handler): Fix filtering of
+        file notification by ACTION. For filtering by file name, compare
+        only the non-directory part of the file name.
+
+2013-01-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * autorevert.el: Use cl-lib instead of cl.
+
+        * vc/vc-bzr.el (vc-bzr--sanitize-header): New function (bug#13307).
+        (vc-bzr-checkin): Use it.
+        * vc/log-edit.el (log-edit-extract-headers): Don't presume FUNCTION
+        will preserve match-data.
+
+2013-01-11  Felix H. Dahlke  <fhd@ubercode.de>
+
+        * progmodes/js.el: Fix multiline declarations's indentation (bug#8576).
+        (js--declaration-keyword-re): New var.
+        (js--multi-line-declaration-indentation): New function.
+        (js--proper-indentation): Use it.
+
+2013-01-11  Aaron S. Hawley  <Aaron.Hawley@vtinfo.com>
+
+        * calc/calc.el (calc-highlight-selections-with-faces)
+         (calc-dispatch):
+        * comint.el (comint-history-isearch-message):
+        * emacs-lisp/edebug.el (edebug-read, edebug-eval-defun):
+        * ffap.el (ffap-string-at-point-region, ffap-next)
+        (ffap-string-at-point, ffap-string-around)
+        (ffap-copy-string-as-kill, ffap-highlight-overlay)
+        (ffap-literally):
+        * font-lock.el (font-lock-keywords-alist)
+        (font-lock-removed-keywords-alist):
+        * help-mode.el (help-xref-symbol-regexp):
+        * info.el (Info-find-emacs-command-nodes):
+        * international/mule.el (add-to-coding-system-list):
+        * isearch.el (isearch-message-function, isearch-fail-pos):
+        * misearch.el (multi-isearch-next-buffer-function):
+        * newcomment.el (comment-box):
+        * printing.el (pr-txt-printer-alist, pr-ps-printer-alist)
+        (pr-setting-database):
+        * progmodes/cc-fonts.el (c-font-lock-keywords-3)
+        (c++-font-lock-keywords-3, objc-font-lock-keywords-3)
+        (java-font-lock-keywords-3, idl-font-lock-keywords-3)
+        (pike-font-lock-keywords-3):
+        * progmodes/compile.el (compile):
+        * progmodes/etags.el (tags-table-files)
+        (tags-table-files-function, tags-included-tables-function):
+        * progmodes/gdb-mi.el (gdb, gdb-setup-windows)
+        (gdb-restore-windows):
+        * ps-print.el (ps-even-or-odd-pages, ps-spool-buffer-with-faces)
+        (ps-n-up-filling-database):
+        * server.el (server-buffer, server-log):
+        * simple.el (newline, delete-backward-char, delete-forward-char)
+        (minibuffer-history-isearch-message, kill-line, track-eol)
+        (temporary-goal-column):
+        * textmodes/flyspell.el (flyspell-mark-duplications-flag)
+        (flyspell-default-deplacement-commands):
+        * textmodes/ispell.el (ispell-accept-output):
+        * textmodes/sgml-mode.el (html-tag-help):
+        * vc/compare-w.el (compare-ignore-whitespace)
+        (compare-ignore-case, compare-windows-dehighlight):
+        * vc/diff.el (diff):
+        * whitespace.el (whitespace-point)
+        (whitespace-font-lock-refontify, whitespace-bob-marker)
+        (whitespace-eob-marker): Fix ambiguous doc string cross-reference(s).
+
+2013-01-11  Michael Albinus  <michael.albinus@gmx.de>
+
+        * autorevert.el (top): Require 'cl in order to pacify byte compiler.
+        (auto-revert-notify-rm-watch): Ignore errors.
+        (auto-revert-notify-add-watch): Ignore errors.  Use '(modify) for
+        inotify, and '(size last-write-time) for w32notify.
+        Set buffer-local `auto-revert-use-notify' to nil when adding a file
+        watch fails - this is a fallback to the file modification check.
+        (auto-revert-notify-event-p, auto-revert-notify-event-descriptor)
+        (auto-revert-notify-event-action)
+        (auto-revert-notify-event-file-name): New defuns.
+        (auto-revert-notify-handler): Use them.  Implement first
+        plausibility checks.
+        (auto-revert-handler): Handle also `auto-revert-tail-mode'.
+
+2013-01-11  Julien Danjou  <julien@danjou.info>
+
+        * color.el (color-rgb-to-hsv): Fix conversion computing in case min and
+        max are almost equal. Also return the correct value for V which is
+        already between 0 and 1.
+
+2013-01-11  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * emacs-lisp/ert.el (ert-run-test): Use point-max-marker.
+
+2013-01-11  Eli Zaretskii  <eliz@gnu.org>
+
+        * autorevert.el (auto-revert-notify-rm-watch)
+        (auto-revert-notify-add-watch): Fix typos in w32notify function
+        names.
+
+2013-01-10  Michael Albinus  <michael.albinus@gmx.de>
+
+        * autorevert.el (auto-revert-notify-enabled): Move up.
+        (auto-revert-use-notify): New defcustom.
+        (auto-revert-mode, global-auto-revert-mode)
+        (auto-revert-notify-add-watch, auto-revert-handler)
+        (auto-revert-buffers): Use `auto-revert-use-notify' instead of
+        `auto-revert-notify-enabled'.
+
+2013-01-10  Elias Pipping  <pipping@exherbo.org>
+
+        * files.el (auto-mode-alist): Use doc-view for djvu files (bug#13164).
+        * doc-view.el (doc-view-document->bitmap):
+        Use doc-view-single-page-converter-function instead of
+        single-page-converter arg; adjust callers.
+
+2013-01-10  Feng Li  <fengli@gmail.com>  (tiny change)
+
+        * progmodes/which-func.el (which-function): Understand Semantic's use
+        of overlays in imenu--index-alist.
+
+2013-01-10  Wolfgang Jenkner  <wjenkner@inode.at>
+
+        * man.el: Handle different "man -k" behaviors (bug#13160).  Use utf-8.
+        (Man-man-k-use-anchor): New var.
+        (Man-parse-man-k): New function.
+        (Man-completion-table): Use it.
+        (man): Flush the completion cache between uses.
+
+2013-01-10  Michael Albinus  <michael.albinus@gmx.de>
+
+        * autorevert.el: Add file watch support.
+        (auto-revert-notify-enabled): New defconst.
+        (auto-revert-notify-watch-descriptor-hash-list)
+        (auto-revert-notify-watch-descriptor)
+        (auto-revert-notify-modified-p): New defvars.
+        (auto-revert-notify-rm-watch, auto-revert-notify-add-watch)
+        (auto-revert-notify-handler): New defuns.
+        (auto-revert-mode, global-auto-revert-mode): Remove file watches
+        when mode is disabled.
+        (auto-revert-handler): Check for `auto-revert-notify-modified-p'.
+        (auto-revert-buffers): Add file watches for active buffers.
+
+2013-01-10  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * cus-start.el (toplevel): Only allow float values for
+        scroll-up-aggressively and scroll-down-aggressively.
+        Allow any number for line-spacing.
+
+2013-01-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * doc-view.el (doc-view-pdfdraw-program): Allow "pdfdraw" name.
+        (doc-view-pdf->png-converter-function): Use mupdf if available.
+        (doc-view-djvu->png-converter-function)
+        (doc-view-ps->png-converter-function): Remove.
+        (doc-view--image-file-pattern): Replace doc-view--image-file-extension.
+        (doc-view-goto-page, doc-view-convert-current-doc, doc-view-display)
+        (doc-view-already-converted-p): Adjust accordingly.
+        (doc-view-mode-p): Simplify.
+        (doc-view-enlarge): Use setq-local.
+        (doc-view-pdf->png-converter-ghostscript)
+        (doc-view-djvu->png-converter-ddjvu)
+        (doc-view-pdf->png-converter-mupdf): Rework to call
+        doc-view-start-process directly.
+        (doc-view-pdf/ps->png): Simplify accordingly.
+        (doc-view-pdf->png-1, doc-view-djvu->png-1): Remove.
+        (doc-view-document->bitmap): Rename from doc-view-document->png.
+        (doc-view-convert-current-doc): Merge pdf and djvu cases.
+        (doc-view-set-slice-from-bounding-box): Fix completion table.
+        (doc-view-mode): Use add-hook for after-revert-hook.
+
+2013-01-10  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/authors.el (authors-ignored-files)
+        (authors-valid-file-names, authors-renamed-files-alist):
+        Add some more entries.
+
+2013-01-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * image-mode.el (image-mode-winprops): Don't throw away the fallback
+        `t' pseudo-window entry.
+
+2013-01-10  Alan Mackenzie  <acm@muc.de>
+
+        Fix bugs in the c-parse-state mechanism.  Reuse some markers
+        instead of continually generating new ones.
+
+        * progmodes/cc-engine.el (c-state-old-cpp-beg-marker)
+        (c-state-old-cpp-end-marker): New variables.
+        (c-append-lower-brace-pair-to-state-cache): Start a backward
+        search for "}" definitively outside CPP constructs.
+        (c-remove-stale-state-cache): Inform the caller of a need to
+        search back for a brace pair in certain circumstances.
+        (c-state-maybe-marker): New macro.
+        (c-parse-state): Reuse markers when appropriate.
+
+2013-01-10  Glenn Morris  <rgm@gnu.org>
+
+        * simple.el (execute-extended-command): Doc fix.
+        Bind prefix-arg around read-extended-command, for prompt.  (Bug#13395)
+
+2013-01-10  Chong Yidong  <cyd@gnu.org>
+
+        * faces.el (read-face-name): Doc fix.
+
+2013-01-10  Roland Winkler  <winkler@gnu.org>
+
+        * emacs-lisp/crm.el: Allow any regexp for separators.
+        (crm-default-separator): All spaces around the default comma separator.
+        (crm--completion-command): New macro.
+        (crm-completion-help, crm-complete, crm-complete-word): Use it.
+        (crm-complete-and-exit): Handle non-single-char separators.
+
+2013-01-09  Elias Pipping  <pipping@lavabit.com>
+
+        * doc-view.el: Add support for DjVu (bug#13164).
+        (doc-view-djvu->png-converter-function): New config var.
+        (doc-view-single-page-converter-function, doc-view--image-type)
+        (doc-view--image-file-extension): New vars.
+        (doc-view-mode): Initialize them.
+        (doc-view-goto-page): Use them.
+        (doc-view-mode-p): Add support for ddjvu.
+        (doc-view-djvu->png-converter-ddjvu, doc-view-djvu->png-1)
+        (doc-view-set-up-single-converter): New funs.
+        (doc-view-pdf/ps->png): Extend for djvu.
+        (doc-view-document->png): Rename from doc-view-pdf->png.
+        (doc-view-convert-current-doc): Handle djvu.
+        (doc-view-insert-image, doc-view-display)
+        (doc-view-already-converted-p): Don't hardcode png.
+        (doc-view-set-doc-type): Recognize djvu docs.
+
+2013-01-09  Elias Pipping  <pipping@lavabit.com>
+
+        * doc-view.el: Add support for mupdf converter (bug#13164).
+        (doc-view-pdfdraw-program, doc-view-pdf->png-converter-function)
+        (doc-view-ps->png-converter-function): New config vars.
+        (doc-view-pdf->png-converter-ghostscript)
+        (doc-view-ps->png-converter-ghostscript)
+        (doc-view-pdf->png-converter-mupdf): New functions.
+        (doc-view-pdf/ps->png, doc-view-pdf->png-1): Use them.
+
+2013-01-09  Jürgen Hötzel  <juergen@archlinux.org>
+
+        * net/tramp.el (tramp-eshell-directory-change): Check remote-path
+        first in session cache: When `tramp-own-remote-path' is in
+        `tramp-remote-path', the remote path is only set in the session
+        cache.
+
+2013-01-09  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/trace.el (trace-function-foreground)
+        (trace-function-background): Doc fix.
+
+2013-01-09  Juri Linkov  <juri@jurta.org>
+
+        * international/mule-cmds.el (read-char-by-name): Move let-binding
+        of completion-ignore-case around completing-read to fix regression
+        exhibited by the test case `C-x 8 RET *acc TAB' and caused by
+        `string-match-p' using the nil value of `case-fold-search' and
+        `completion-ignore-case' in `completion-pcm--all-completions'.
+        (Bug#12615).
+
+2013-01-09  Glenn Morris  <rgm@gnu.org>
+
+        * progmodes/compile.el (compilation-parse-errors):
+        Fix typo.  (Bug#13369)
+
+2013-01-09  Vitalie Spinu  <spinuvit@gmail.com>  (tiny change)
+
+        * comint.el (comint-send-input): Check size of buffer before
+        waiting for process output, in case already accepted.  (Bug#13290)
+
+2013-01-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Spelling fixes.
+        * net/tramp-adb.el (tramp-adb-get-toolbox):
+        Fix misspelling of 'unknown'.
+
+2013-01-08  Juri Linkov  <juri@jurta.org>
+
+        * textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
+        * progmodes/flymake.el (flymake-errline, flymake-warnline):
+        Use underline style wave on terminals that support it.  (Bug#13000)
+
+2013-01-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/pcase.el (pcase--split-equal): Also take advantage if
+        the predicate returns nil.
+
+        * simple.el: Use lexical-binding.
+        (primitive-undo): Use pcase.
+        (minibuffer-history-isearch-push-state): Use a closure.
+
+2013-01-08  Aaron S. Hawley  <aaron.s.hawley@gmail.com>
+
+        * simple.el (primitive-undo): Move from undo.c.
+
+2013-01-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * vc/pcvs.el (cvs-cleanup-collection): Extend meaning of `rm-handled'.
+        (cvs-mode-remove-handled): Use it (bug#13380).
+
+        * emacs-lisp/nadvice.el (advice--tweak): New function.
+        (advice--remove-function, advice--subst-main): Use it.
+
+        * emacs-lisp/advice.el: Update commentary.
+
+2013-01-08  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-adb.el (tramp-adb-file-name-handler-alist):
+        Remove spurious entry.
+
+2013-01-08  Glenn Morris  <rgm@gnu.org>
+
+        * net/tramp.el (tramp-default-host-alist): Add :version.
+
+2013-01-08  Juri Linkov  <juri@jurta.org>
+
+        * info.el (Info-read-node-name-2): Don't duplicate suffixes for
+        single completion.  (Bug#12456)
+        (info--manual-names): Expand node completions into an explicit list
+        before appending it to another list.  Filter out internal buffers
+        with the leading space in the buffer name.  (Bug#10771)
+
+2013-01-08  Juri Linkov  <juri@jurta.org>
+
+        * info.el (Info-read-node-name-1): Allow empty node name in (FILENAME)
+        that defaults to the Top node.
+        (Info-goto-node, Info-read-node-name): Doc fix to mention that
+        the short format (FILENAME) goes to the Top node.
+        (Info-build-node-completions): Rename arg `file' to `filename'.
+        (Bug#13365)
+
+2013-01-07  Bastien Guerry  <bzg@gnu.org>
+
+        * menu-bar.el (menu-bar-search-documentation-menu):
+        Use `apropos-user-option' and fix the help message.
+
+2013-01-07  Bastien Guerry  <bzg@gnu.org>
+
+        * apropos.el (apropos-do-all): Update docstring.
+        (apropos-user-option-button): New face.
+        (apropos-user-option): Rename from `apropos-variable' and update
+        docstring.
+        (apropos-variable): Rewrite, now show all variables by default.
+        (apropos-print): Mention "User option" instead of "Variable" when
+        printing doc for user options.  (Bug#13276)
+
+2013-01-07  Jürgen Hötzel  <juergen@archlinux.org>
+
+        * net/tramp-adb.el (tramp-do-parse-file-attributes-with-ls):
+        Handle filename correctly, when parsing "source -> target" symlink
+        output.
+        (tramp-adb-handle-set-file-times): New defun.
+
+2013-01-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/advice.el (ad-activate-advised-definition): Refresh the
+        advice list when the interactive-spec of ad-Advice-* changes.
+
+2013-01-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * wid-edit.el (widget-default-get): Work for inlined elements.
+        (Bug#12670)
+
+2013-01-07  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-default-host-alist): New defcustom.
+        (tramp-find-host): Use it.
+        (tramp-eshell-directory-change): Move from tramp-sh.el.  Add to
+        `eshell-directory-change-hook'.
+
+        * net/tramp-adb.el (top): Add adb specific entry in
+        `tramp-default-host-alist'.
+        (tramp-adb-file-name-host): Remove function.
+        (tramp-adb-execute-adb-command, tramp-adb-maybe-open-connection):
+        Use `tramp-file-name-host' instead of `tramp-adb-file-name-host'.
+
+        * net/tramp-sh.el: Move eshell integration code to tramp.el.
+
+2013-01-06  Jürgen Hötzel  <juergen@archlinux.org>
+
+        * net/tramp-adb.el (tramp-methods): Add `tramp-tmpdir' entry.
+
+2013-01-06  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-adb.el (tramp-adb-ls-toolbox-regexp): The file size can
+        consist of more than one digit.
+        (tramp-adb-file-name-handler-alist):
+        Use `tramp-handle-file-exists-p' consistently.
+        (tramp-adb-file-name-handler): Don't tweak `tramp-default-host'.
+        (tramp-adb-handle-file-exists-p): Remove function.
+        (tramp-adb-file-name-host): New defun.
+        (tramp-adb-execute-adb-command, tramp-adb-maybe-open-connection):
+        Use it.
+        (tramp-adb-maybe-open-connection): Set "remote-path" property.
+
+2013-01-06  Chong Yidong  <cyd@gnu.org>
+
+        * vc/vc.el (vc-next-action): Detect buffer modifications
+        conflicting with locking VCS operation (Bug#11490).
+
+        * vc/vc-hooks.el (vc-after-save): DTRT for locking VCSes.
+
 2013-01-05  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp-adb.el (tramp-do-parse-file-attributes-with-ls):
@@ -117,8 +594,8 @@
         (tramp-do-copy-or-rename-file): Ignore errors when calling
         `set-file-extended-attributes'.
 
-        * net/tramp-smb.el (tramp-smb-file-name-handler-alist): Add
-        handler for `file-acl'.
+        * net/tramp-smb.el (tramp-smb-file-name-handler-alist):
+        Add handler for `file-acl'.
         (tramp-smb-handle-file-acl): New defun.
 
 2013-01-02  Jay Belanger  <jay.p.belanger@gmail.com>
@@ -310,7 +787,7 @@
 
         * net/tramp-adb.el (tramp-adb-get-ls-command): New defun.
         Suppress coloring, if possible (required for BusyBox based systems like
-        CynagenMod).
+        CyanogenMod).
         (tramp-adb-handle-file-attributes)
         (tramp-adb-handle-insert-directory)
         (tramp-adb-handle-file-name-all-completions): Use it.
@@ -5754,7 +6231,7 @@
 
 2012-08-08  Fabián Ezequiel Gallina  <fgallina@cuca>
 
-        * progmodes/python.el Fixed defsubst warning.
+        * progmodes/python.el: Fix defsubst warning.
         (python-syntax-context) Rename from python-info-ppss-context.
         (python-syntax-context-type): Rename from
         python-info-ppss-context-type.
@@ -11483,7 +11960,7 @@
 
 2012-03-16  Alan Mackenzie  <acm@muc.de>
 
-        Further optimise the handling of large macros.
+        Further optimize the handling of large macros.
 
         * progmodes/cc-engine.el (c-crosses-statement-barrier-p): Use a
         limit to a call of `c-literal-limits'.
@@ -13135,7 +13612,7 @@
 
 2012-01-08  Alan Mackenzie  <acm@muc.de>
 
-        Optimise font locking in long enum definitions.
+        Optimize font locking in long enum definitions.
 
         * progmodes/cc-fonts.el (c-font-lock-declarations): Add an extra
         arm to a cond form to handle enums.
diff --git a/lisp/apropos.el b/lisp/apropos.el
index 5f481f54e57..000d2d87d05 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -69,7 +69,7 @@
   "Non nil means apropos commands will search more extensively.
 This may be slower.  This option affects the following commands:
 
-`apropos-variable' will search all variables, not just user variables.
+`apropos-user-option' will search all variables, not just user options.
 `apropos-command' will also search non-interactive functions.
 `apropos' will search all symbols, not just functions, variables, faces,
 and those with property lists.
@@ -115,6 +115,12 @@ include key-binding information in its output."
   :group 'apropos
   :version "24.3")
 
+(defface apropos-user-option-button
+  '((t (:inherit (font-lock-variable-name-face button))))
+  "Button face indicating a user option in Apropos."
+  :group 'apropos
+  :version "24.4")
+
 (defface apropos-misc-button
   '((t (:inherit (font-lock-constant-face button))))
   "Button face indicating a miscellaneous object type in Apropos."
@@ -261,6 +267,15 @@ term, and the rest of the words are alternative terms.")
   'action (lambda (button)
             (describe-variable (button-get button 'apropos-symbol))))
 
+(define-button-type 'apropos-user-option
+  'apropos-label "User option"
+  'apropos-short-label "o"
+  'face 'apropos-user-option-button
+  'help-echo "mouse-2, RET: Display more help on this user option"
+  'follow-link t
+  'action (lambda (button)
+            (describe-variable (button-get button 'apropos-symbol))))
+
 (define-button-type 'apropos-face
   'apropos-label "Face"
   'apropos-short-label "F"
@@ -461,15 +476,15 @@ This requires that at least 2 keywords (unless only one was given)."
 This is used to decide whether to print the result's type or not.")
 
 ;;;###autoload
-(defun apropos-variable (pattern &optional do-all)
-  "Show user variables that match PATTERN.
+(defun apropos-user-option (pattern &optional do-all)
+  "Show user options that match PATTERN.
 PATTERN can be a word, a list of words (separated by spaces),
 or a regexp (using some regexp special characters).  If it is a word,
 search for matches for that word as a substring.  If it is a list of words,
 search for matches for any two (or more) of those words.
 
 With \\[universal-argument] prefix, or if `apropos-do-all' is non-nil, also show
-normal variables."
+variables, not just user options."
   (interactive (list (apropos-read-pattern
                       (if (or current-prefix-arg apropos-do-all)
                           "variable" "user option"))
@@ -481,6 +496,17 @@ normal variables."
                                 (get symbol 'variable-documentation)))
                      'custom-variable-p)))
 
+;;;###autoload
+(defun apropos-variable (pattern &optional do-not-all)
+  "Show variables that match PATTERN.
+When DO-NOT-ALL is not-nil, show user options only, i.e. behave
+like `apropos-user-option'."
+  (interactive (list (apropos-read-pattern
+                      (if current-prefix-arg "user option" "variable"))
+                     current-prefix-arg))
+  (let ((apropos-do-all (if do-not-all nil t)))
+    (apropos-user-option pattern)))
+
 ;; For auld lang syne:
 ;;;###autoload
 (defalias 'command-apropos 'apropos-command)
@@ -1099,7 +1125,11 @@ If non-nil TEXT is a string that will be printed as a heading."
                                    'apropos-macro
                                  'apropos-function))
                              (not nosubst))
-          (apropos-print-doc 3 'apropos-variable (not nosubst))
+          (apropos-print-doc 3
+                             (if (custom-variable-p symbol)
+                                 'apropos-user-option
+                               'apropos-variable)
+                             (not nosubst))
           (apropos-print-doc 7 'apropos-group t)
           (apropos-print-doc 6 'apropos-face t)
           (apropos-print-doc 5 'apropos-widget t)
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index f491f2427be..c9180482cd9 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -48,6 +48,11 @@
 ;; Emacs.  You should never even notice that this package is active
 ;; (except that your buffers will be reverted, of course).
 ;;
+;; If Emacs is compiled with file watch support, notifications are
+;; used instead of checking the time stamp of the files.  You can
+;; disable this by setting the user option `auto-revert-use-notify' to
+;; nil.
+;;
 ;; After reverting a file buffer, Auto Revert Mode normally puts point
 ;; at the same position that a regular manual revert would.  However,
 ;; there is one exception to this rule.  If point is at the end of the
@@ -92,6 +97,7 @@
 
 ;; Dependencies:
 
+(eval-when-compile (require 'cl-lib))
 (require 'timer)
 
 ;; Custom Group:
@@ -254,6 +260,28 @@ buffers.  CPU usage depends on the version control system."
 This variable becomes buffer local when set in any fashion.")
 (make-variable-buffer-local 'global-auto-revert-ignore-buffer)
 
+(defconst auto-revert-notify-enabled
+  (or (featurep 'inotify) (featurep 'w32notify))
+  "Non-nil when Emacs has been compiled with file watch support.")
+
+(defcustom auto-revert-use-notify auto-revert-notify-enabled
+  "If non-nil Auto Revert Mode uses file watch functions.
+This requires Emacs being compiled with file watch support (see
+`auto-revert-notify-enabled').  You should set this variable
+through Custom only."
+  :group 'auto-revert
+  :type 'boolean
+  :set (lambda (variable value)
+         (set-default variable (and auto-revert-notify-enabled value))
+         (if (symbol-value variable)
+             (add-hook 'kill-buffer-hook 'auto-revert-notify-rm-watch)
+           (remove-hook 'kill-buffer-hook 'auto-revert-notify-rm-watch)
+           (when auto-revert-notify-enabled
+             (dolist (buf (buffer-list))
+               (with-current-buffer buf
+                 (auto-revert-notify-rm-watch))))))
+  :version "24.4")
+
 ;; Internal variables:
 
 (defvar auto-revert-buffer-list ()
@@ -276,6 +304,20 @@ the list of old buffers.")
             (set (make-local-variable 'auto-revert-tail-pos)
                  (nth 7 (file-attributes buffer-file-name)))))
 
+(defvar auto-revert-notify-watch-descriptor-hash-list
+  (make-hash-table :test 'equal)
+  "A hash table collecting all file watch descriptors.
+Hash key is a watch descriptor, hash value is the corresponding buffer.")
+
+(defvar auto-revert-notify-watch-descriptor nil
+  "The file watch descriptor active for the current buffer.")
+(put 'auto-revert-notify-watch-descriptor 'permanent-local t)
+
+(defvar auto-revert-notify-modified-p nil
+  "Non-nil when file has been modified on the file system.
+This has been reported by a file watch event.")
+(make-variable-buffer-local 'auto-revert-notify-modified-p)
+
 ;; Functions:
 
 ;;;###autoload
@@ -296,6 +338,7 @@ without being changed in the part that is already in the buffer."
   (if auto-revert-mode
       (if (not (memq (current-buffer) auto-revert-buffer-list))
           (push (current-buffer) auto-revert-buffer-list))
+    (when auto-revert-use-notify (auto-revert-notify-rm-watch))
     (setq auto-revert-buffer-list
           (delq (current-buffer) auto-revert-buffer-list)))
   (auto-revert-set-timer)
@@ -399,9 +442,12 @@ It displays the text that `global-auto-revert-mode-text'
 specifies in the mode line."
   :global t :group 'auto-revert :lighter global-auto-revert-mode-text
   (auto-revert-set-timer)
-  (when global-auto-revert-mode
-    (auto-revert-buffers)))
-
+  (if global-auto-revert-mode
+      (auto-revert-buffers)
+    (when auto-revert-use-notify
+      (dolist (buf (buffer-list))
+        (with-current-buffer buf
+          (auto-revert-notify-rm-watch))))))
 
 (defun auto-revert-set-timer ()
   "Restart or cancel the timer used by Auto-Revert Mode.
@@ -418,6 +464,83 @@ will use an up-to-date value of `auto-revert-interval'"
                             auto-revert-interval
                             'auto-revert-buffers))))
 
+(defun auto-revert-notify-rm-watch ()
+  "Disable file watch for current buffer's associated file."
+  (when auto-revert-notify-watch-descriptor
+    (ignore-errors
+      (funcall (if (fboundp 'inotify-rm-watch)
+                   'inotify-rm-watch 'w32notify-rm-watch)
+               auto-revert-notify-watch-descriptor))
+    (remhash auto-revert-notify-watch-descriptor
+             auto-revert-notify-watch-descriptor-hash-list))
+  (setq auto-revert-notify-watch-descriptor nil
+        auto-revert-notify-modified-p nil))
+
+(defun auto-revert-notify-add-watch ()
+  "Enable file watch for current buffer's associated file."
+  (when (and buffer-file-name auto-revert-use-notify)
+    (auto-revert-notify-rm-watch)
+    (let ((func (if (fboundp 'inotify-add-watch)
+                    'inotify-add-watch 'w32notify-add-watch))
+          (aspect (if (fboundp 'inotify-add-watch)
+                      '(modify) '(size last-write-time))))
+      (setq auto-revert-notify-watch-descriptor
+            (ignore-errors
+              (funcall
+               func buffer-file-name aspect 'auto-revert-notify-handler)))
+      (if auto-revert-notify-watch-descriptor
+          (puthash auto-revert-notify-watch-descriptor
+                   (current-buffer)
+                   auto-revert-notify-watch-descriptor-hash-list)
+        ;; Fallback to file checks.
+        (set (make-local-variable 'auto-revert-use-notify) nil)))))
+
+(defun auto-revert-notify-event-p (event)
+  "Check that event is a file watch event."
+  (cond ((featurep 'inotify)
+         (and (listp event) (= (length event) 4)))
+        ((featurep 'w32notify)
+         (and (listp event) (= (length event) 3) (stringp (nth 2 event))))))
+
+(defun auto-revert-notify-event-descriptor (event)
+  "Return watch descriptor of notification event, or nil."
+  (and (auto-revert-notify-event-p event) (car event)))
+
+(defun auto-revert-notify-event-action (event)
+  "Return action of notification event, or nil."
+  (and (auto-revert-notify-event-p event) (nth 1 event)))
+
+(defun auto-revert-notify-event-file-name (event)
+  "Return file name of notification event, or nil."
+  (and (auto-revert-notify-event-p event)
+       (cond ((featurep 'inotify) (nth 3 event))
+             ((featurep 'w32notify) (nth 2 event)))))
+
+(defun auto-revert-notify-handler (event)
+  "Handle an event returned from file watch."
+  (when (auto-revert-notify-event-p event)
+    (let* ((descriptor (auto-revert-notify-event-descriptor event))
+           (action (auto-revert-notify-event-action event))
+           (file (auto-revert-notify-event-file-name event))
+           (buffer (gethash descriptor
+                            auto-revert-notify-watch-descriptor-hash-list)))
+      (ignore-errors
+        ;; Check, that event is meant for us.
+        ;; TODO: Filter events which stop watching, like `move' or `removed'.
+        (cl-assert descriptor)
+        (when (featurep 'inotify) (cl-assert (memq 'modify action)))
+        (when (featurep 'w32notify) (cl-assert (eq 'modified action)))
+        (cl-assert (bufferp buffer))
+        (with-current-buffer buffer
+          (when (and (stringp file) (stringp buffer-file-name))
+            ;; w32notify returns the basename of the file without its
+            ;; leading directories; inotify returns its full absolute
+            ;; file name.
+            (cl-assert (file-equal-p file buffer-file-name)))
+
+          ;; Mark buffer modified.
+          (setq auto-revert-notify-modified-p t))))))
+
 (defun auto-revert-active-p ()
   "Check if auto-revert is active (in current buffer or globally)."
   (or auto-revert-mode
@@ -435,6 +558,8 @@ This is an internal function used by Auto-Revert Mode."
     (let* ((buffer (current-buffer)) size
            (revert
             (or (and buffer-file-name
+                     (or (not auto-revert-use-notify)
+                         auto-revert-notify-modified-p)
                      (if auto-revert-tail-mode
                          ;; Tramp caches the file attributes.  Setting
                          ;; `remote-file-name-inhibit-cache' forces Tramp
@@ -456,6 +581,7 @@ This is an internal function used by Auto-Revert Mode."
                      (funcall buffer-stale-function t))))
            eob eoblist)
       (when revert
+        (setq auto-revert-notify-modified-p nil)
         (when (and auto-revert-verbose
                    (not (eq revert 'fast)))
           (message "Reverting buffer `%s'." (buffer-name)))
@@ -561,7 +687,12 @@ the timer when no buffers need to be checked."
                          (memq buf auto-revert-buffer-list))
                     (setq auto-revert-buffer-list
                           (delq buf auto-revert-buffer-list)))
-                (when (auto-revert-active-p) (auto-revert-handler)))
+                (when (auto-revert-active-p)
+                  ;; Enable file watches.
+                  (when (and auto-revert-use-notify buffer-file-name
+                             (not auto-revert-notify-watch-descriptor)
+                      (auto-revert-notify-add-watch)))
+                  (auto-revert-handler)))
             ;; Remove dead buffer from `auto-revert-buffer-list'.
             (setq auto-revert-buffer-list
                   (delq buf auto-revert-buffer-list))))
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index 6f51be4b89b..c35e7650254 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -435,9 +435,9 @@ when converting units."
 (defcustom calc-highlight-selections-with-faces
   nil
   "If non-nil, use a separate face to indicate selected sub-formulas.
-If `calc-show-selections' is non-nil, then selected sub-formulas are shown
-by displaying the rest of the formula in `calc-nonselected-face'.
-If `calc-show-selections' is nil, then selected sub-formulas are shown
+If option `calc-show-selections' is non-nil, then selected sub-formulas are
+shown by displaying the rest of the formula in `calc-nonselected-face'.
+If option `calc-show-selections' is nil, then selected sub-formulas are shown
 by displaying the sub-formula in `calc-selected-face'."
   :version "24.1"
   :group 'calc
@@ -1183,7 +1183,7 @@ Used by `calc-user-invocation'.")
 
 ;;;###autoload
 (defun calc-dispatch (&optional arg)
-  "Invoke the GNU Emacs Calculator.  See `calc-dispatch-help' for details."
+  "Invoke the GNU Emacs Calculator.  See \\[calc-dispatch-help] for details."
   (interactive "P")
 ;  (sit-for echo-keystrokes)
   (condition-case err   ; look for other keys bound to calc-dispatch
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 9b0eb3e9bff..74d3ce80338 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -1562,11 +1562,13 @@ line."
 (defun calendar-redraw ()
   "Redraw the calendar display, if `calendar-buffer' is live."
   (interactive)
-  (if (get-buffer calendar-buffer)
-      (with-current-buffer calendar-buffer
-        (let ((cursor-date (calendar-cursor-to-nearest-date)))
-          (calendar-generate-window displayed-month displayed-year)
-          (calendar-cursor-to-visible-date cursor-date)))))
+  (when (get-buffer calendar-buffer)
+    (with-current-buffer calendar-buffer
+      (let ((cursor-date (calendar-cursor-to-nearest-date)))
+        (calendar-generate-window displayed-month displayed-year)
+        (calendar-cursor-to-visible-date cursor-date))
+      (when (window-live-p (get-buffer-window))
+        (set-window-point (get-buffer-window) (point))))))
 
 (defvar calendar-mode-map
   (let ((map (make-keymap)))
diff --git a/lisp/color.el b/lisp/color.el
index 63326e7c5b3..50f6675bf4b 100644
--- a/lisp/color.el
+++ b/lisp/color.el
@@ -130,7 +130,7 @@ inclusive."
          (max (max r g b))
          (min (min r g b)))
     (if (< (- max min) 1e-8)
-        (list 0.0 0.0 0.0)
+        (list 0.0 0.0 min)
       (list
        (/ (* 2 float-pi
              (cond ((and (= r g) (= g b)) 0)
@@ -146,7 +146,7 @@ inclusive."
                     (+ 240 (* 60 (/ (- r g) (- max min)))))))
           360)
        (if (= max 0) 0 (- 1 (/ min max)))
-       (/ max 255.0)))))
+       max))))
 
 (defun color-rgb-to-hsl (red green blue)
   "Convert RGB colors to their HSL representation.
diff --git a/lisp/comint.el b/lisp/comint.el
index e797fe841d3..21bd732b43c 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1521,7 +1521,7 @@ Intended to be added to `isearch-mode-hook' in `comint-mode'."
 If there are no search errors, this function displays an overlay with
 the Isearch prompt which replaces the original comint prompt.
 Otherwise, it displays the standard Isearch message returned from
-`isearch-message'."
+the function `isearch-message'."
   (if (not (and isearch-success (not isearch-error)))
       ;; Use standard function `isearch-message' when not in comint prompt,
       ;; or search fails, or has an error (like incomplete regexp).
@@ -1847,9 +1847,9 @@ Similarly for Soar, Scheme, etc."
           (let ((echo-len (- comint-last-input-end
                              comint-last-input-start)))
             ;; Wait for all input to be echoed:
-            (while (and (accept-process-output proc)
-                        (> (+ comint-last-input-end echo-len)
+            (while (and (> (+ comint-last-input-end echo-len)
                            (point-max))
+                        (accept-process-output proc)
                         (zerop
                          (compare-buffer-substrings
                           nil comint-last-input-start
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 9d2c2750987..62e91fafcbf 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -115,12 +115,12 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                             (const :tag "On the right" (down . right))))
                (other :tag "On left, no arrows" t)))
              (scroll-up-aggressively windows
-                                     (choice (const :tag "off" nil) number)
+                                     (choice (const :tag "off" nil) float)
                                      "21.1")
              (scroll-down-aggressively windows
-                                       (choice (const :tag "off" nil) number)
+                                       (choice (const :tag "off" nil) float)
                                        "21.1")
-             (line-spacing display (choice (const :tag "none" nil) integer)
+             (line-spacing display (choice (const :tag "none" nil) number)
                            "22.1")
              (cursor-in-non-selected-windows
               cursor boolean nil
@@ -513,6 +513,7 @@ since it could result in memory overflow and make Emacs crash."
              (x-use-underline-position-properties display boolean "22.1")
              (x-underline-at-descent-line display boolean "22.1")
              (x-stretch-cursor display boolean "21.1")
+             (scroll-bar-adjust-thumb-portion windows boolean "24.4")
              ;; xselect.c
              (x-select-enable-clipboard-manager killing boolean "24.1")
              ;; xsettings.c
@@ -575,6 +576,9 @@ since it could result in memory overflow and make Emacs crash."
                               (symbol-name symbol))
                        ;; Any function from fontset.c will do.
                        (fboundp 'new-fontset))
+                      ((equal "scroll-bar-adjust-thumb-portion"
+                              (symbol-name symbol))
+                       (featurep 'x))
                       (t t))))
     (if (not (boundp symbol))
         ;; If variables are removed from C code, give an error here!
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 24434d294c6..fa54eef828d 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -145,7 +145,7 @@
 ;;;; Customization Options
 
 (defgroup doc-view nil
-  "In-buffer viewer for PDF, PostScript and DVI files."
+  "In-buffer viewer for PDF, PostScript, DVI, and DJVU files."
   :link '(function-link doc-view)
   :version "22.2"
   :group 'applications
@@ -158,6 +158,27 @@
   :type 'file
   :group 'doc-view)
 
+(defcustom doc-view-pdfdraw-program
+  (cond
+   ((executable-find "pdfdraw") "pdfdraw")
+   (t "mudraw"))
+  "Name of MuPDF's program to convert PDF files to PNG."
+  :type 'file
+  :version "24.4")
+
+(defcustom doc-view-pdf->png-converter-function
+  (if (executable-find doc-view-pdfdraw-program)
+      #'doc-view-pdf->png-converter-mupdf
+    #'doc-view-pdf->png-converter-ghostscript)
+  "Function to call to convert a PDF file into a PNG file."
+  :type '(radio
+          (function-item doc-view-pdf->png-converter-ghostscript
+                         :doc "Use ghostscript")
+          (function-item doc-view-pdf->png-converter-mupdf
+                         :doc "Use mupdf")
+          function)
+  :version "24.4")
+
 (defcustom doc-view-ghostscript-options
   '("-dSAFER" ;; Avoid security problems when rendering files from untrusted
     ;; sources.
@@ -320,6 +341,19 @@ the (uncompressed, extracted) file residing in
   "The type of document in the current buffer.
 Can be `dvi', `pdf', or `ps'.")
 
+(defvar doc-view-single-page-converter-function nil
+  "Function to call to convert a single page of the document to a bitmap file.
+May operate on the source document or on some intermediate (typically PDF)
+conversion of it.")
+
+(defvar-local doc-view--image-type nil
+  "The type of image in the current buffer.
+Can be `png' or `tiff'.")
+
+(defvar-local doc-view--image-file-pattern nil
+  "The `format' pattern of image file names.
+Typically \"page-%s.png\".")
+
 ;;;; DocView Keymaps
 
 (defvar doc-view-mode-map
@@ -458,24 +492,26 @@ Can be `dvi', `pdf', or `ps'.")
     ;; We used to find the file name from doc-view-current-files but
     ;; that's not right if the pages are not generated sequentially
     ;; or if the page isn't in doc-view-current-files yet.
-    (let ((file (expand-file-name (format "page-%d.png" page)
-                                  (doc-view-current-cache-dir))))
+    (let ((file (expand-file-name
+                 (format doc-view--image-file-pattern page)
+                 (doc-view-current-cache-dir))))
       (doc-view-insert-image file :pointer 'arrow)
       (set-window-hscroll (selected-window) hscroll)
       (when (and (not (file-exists-p file))
                  doc-view-current-converter-processes)
         ;; The PNG file hasn't been generated yet.
-        (doc-view-pdf->png-1 doc-view-buffer-file-name file page
-                             (let ((win (selected-window)))
-                               (lambda ()
-                                 (and (eq (current-buffer) (window-buffer win))
-                                      ;; If we changed page in the mean
-                                      ;; time, don't mess things up.
-                                      (eq (doc-view-current-page win) page)
-                                      ;; Make sure we don't infloop.
-                                      (file-readable-p file)
-                                      (with-selected-window win
-                                                            (doc-view-goto-page page))))))))
+        (funcall doc-view-single-page-converter-function
+                 doc-view-buffer-file-name file page
+                 (let ((win (selected-window)))
+                   (lambda ()
+                     (and (eq (current-buffer) (window-buffer win))
+                          ;; If we changed page in the mean
+                          ;; time, don't mess things up.
+                          (eq (doc-view-current-page win) page)
+                          ;; Make sure we don't infloop.
+                          (file-readable-p file)
+                          (with-selected-window win
+                            (doc-view-goto-page page))))))))
     (overlay-put (doc-view-current-overlay)
                  'help-echo (doc-view-current-info))))
 
@@ -659,14 +695,16 @@ OpenDocument format)."
                        (executable-find doc-view-dvipdf-program))
                   (and doc-view-dvipdfm-program
                        (executable-find doc-view-dvipdfm-program)))))
-        ((or (eq type 'postscript) (eq type 'ps) (eq type 'eps)
-             (eq type 'pdf))
+        ((memq type '(postscript ps eps pdf))
+         ;; FIXME: allow mupdf here
          (and doc-view-ghostscript-program
               (executable-find doc-view-ghostscript-program)))
         ((eq type 'odf)
          (and doc-view-unoconv-program
               (executable-find doc-view-unoconv-program)
               (doc-view-mode-p 'pdf)))
+        ((eq type 'djvu)
+         (executable-find "ddjvu"))
         (t ;; unknown image type
          nil))))
 
@@ -683,13 +721,13 @@ OpenDocument format)."
       ;; ImageMagick supports on-the-fly-rescaling.
       (let ((new (ceiling (* factor doc-view-image-width))))
         (unless (equal new doc-view-image-width)
-          (set (make-local-variable 'doc-view-image-width) new)
+          (setq-local doc-view-image-width new)
           (doc-view-insert-image
            (plist-get (cdr (doc-view-current-image)) :file)
            :width doc-view-image-width)))
     (let ((new (ceiling (* factor doc-view-resolution))))
       (unless (equal new doc-view-resolution)
-        (set (make-local-variable 'doc-view-resolution) new)
+        (setq-local doc-view-resolution new)
         (doc-view-reconvert-doc)))))
 
 (defun doc-view-shrink (factor)
@@ -826,6 +864,45 @@ Should be invoked when the cached images aren't up-to-date."
                             (list "-o" pdf dvi)
                             callback)))
 
+(defun doc-view-pdf->png-converter-ghostscript (pdf png page callback)
+  (doc-view-start-process
+   "pdf/ps->png" doc-view-ghostscript-program
+   `(,@doc-view-ghostscript-options
+     ,(format "-r%d" (round doc-view-resolution))
+     ,@(if page `(,(format "-dFirstPage=%d" page)))
+     ,@(if page `(,(format "-dLastPage=%d" page)))
+     ,(concat "-sOutputFile=" png)
+     ,pdf)
+   callback))
+
+(defalias 'doc-view-ps->png-converter-ghostscript
+  'doc-view-pdf->png-converter-ghostscript)
+
+(defun doc-view-djvu->tiff-converter-ddjvu (djvu tiff page callback)
+  "Convert PAGE of a DJVU file to bitmap(s) asynchronously.
+Call CALLBACK with no arguments when done.
+If PAGE is nil, convert the whole document."
+  (doc-view-start-process
+   "djvu->tiff" "ddjvu"
+   `("-format=tiff"
+     ;; ddjvu only accepts the range 1-999.
+     ,(format "-scale=%d" (round doc-view-resolution))
+     ;; -eachpage was only added after djvulibre-3.5.25.3!
+     ,@(unless page '("-eachpage"))
+     ,@(if page `(,(format "-page=%d" page)))
+     ,djvu
+     ,tiff)
+   callback))
+
+(defun doc-view-pdf->png-converter-mupdf (pdf png page callback)
+  (doc-view-start-process
+   "pdf->png" doc-view-pdfdraw-program
+   `(,(concat "-o" png)
+     ,(format "-r%d" (round doc-view-resolution))
+     ,pdf
+     ,@(if page `(,(format "%d" page))))
+   callback))
+
 (defun doc-view-odf->pdf (odf callback)
   "Convert ODF to PDF asynchronously and call CALLBACK when finished.
 The converted PDF is put into the current cache directory, and it
@@ -835,13 +912,14 @@ is named like ODF with the extension turned to pdf."
                           callback))
 
 (defun doc-view-pdf/ps->png (pdf-ps png)
+  ;; FIXME: Fix name and docstring to account for djvu&tiff.
   "Convert PDF-PS to PNG asynchronously."
-  (doc-view-start-process
-   "pdf/ps->png" doc-view-ghostscript-program
-   (append doc-view-ghostscript-options
-           (list (format "-r%d" (round doc-view-resolution))
-                 (concat "-sOutputFile=" png)
-                 pdf-ps))
+  (funcall
+   (pcase doc-view-doc-type
+     (`pdf doc-view-pdf->png-converter-function)
+     (`djvu #'doc-view-djvu->tiff-converter-ddjvu)
+     (_ #'doc-view-ps->png-converter-ghostscript))
+   pdf-ps png nil
    (let ((resolution doc-view-resolution))
      (lambda ()
        ;; Only create the resolution file when it's all done, so it also
@@ -854,6 +932,7 @@ is named like ODF with the extension turned to pdf."
          (cancel-timer doc-view-current-timer)
          (setq doc-view-current-timer nil))
        (doc-view-display (current-buffer) 'force))))
+
   ;; Update the displayed pages as soon as they're done generating.
   (when doc-view-conversion-refresh-interval
     (setq doc-view-current-timer
@@ -861,25 +940,10 @@ is named like ODF with the extension turned to pdf."
                        'doc-view-display
                        (current-buffer)))))
 
-(defun doc-view-pdf->png-1 (pdf png page callback)
-  "Convert a PAGE of a PDF file to PNG asynchronously.
-Call CALLBACK with no arguments when done."
-  (doc-view-start-process
-   "pdf->png-1" doc-view-ghostscript-program
-   (append doc-view-ghostscript-options
-           (list (format "-r%d" (round doc-view-resolution))
-                 ;; Sadly, `gs' only supports the page-range
-                 ;; for PDF files.
-                 (format "-dFirstPage=%d" page)
-                 (format "-dLastPage=%d" page)
-                 (concat "-sOutputFile=" png)
-                 pdf))
-   callback))
-
 (declare-function clear-image-cache "image.c" (&optional filter))
 
-(defun doc-view-pdf->png (pdf png pages)
-  "Convert a PDF file to PNG asynchronously.
+(defun doc-view-document->bitmap (pdf png pages)
+  "Convert a document file to bitmap images asynchronously.
 Start by converting PAGES, and then the rest."
   (if (null pages)
       (doc-view-pdf/ps->png pdf png)
@@ -888,11 +952,11 @@ Start by converting PAGES, and then the rest."
     ;; a single page anyway, and of the remaining 1%, few cases will have
     ;; consecutive pages, it's not worth the trouble.
     (let ((rest (cdr pages)))
-      (doc-view-pdf->png-1
-       pdf (format png (car pages)) (car pages)
+      (funcall doc-view-single-page-converter-function
+               pdf (format png (car pages)) (car pages)
        (lambda ()
          (if rest
-             (doc-view-pdf->png pdf png rest)
+             (doc-view-document->bitmap pdf png rest)
            ;; Yippie, the important pages are done, update the display.
            (clear-image-cache)
            ;; For the windows that have a message (like "Welcome to
@@ -900,8 +964,8 @@ Start by converting PAGES, and then the rest."
            ;; not sufficient.
            (dolist (win (get-buffer-window-list (current-buffer) nil 'visible))
              (with-selected-window win
-                                   (when (stringp (get-char-property (point-min) 'display))
-                                     (doc-view-goto-page (doc-view-current-page)))))
+               (when (stringp (get-char-property (point-min) 'display))
+                 (doc-view-goto-page (doc-view-current-page)))))
            ;; Convert the rest of the pages.
            (doc-view-pdf/ps->png pdf png)))))))
 
@@ -971,8 +1035,9 @@ Those files are saved in the directory given by the function
   ;; preserves the horizontal/vertical scroll settings (which are otherwise
   ;; resets during the redisplay).
   (setq doc-view-pending-cache-flush t)
-  (let ((png-file (expand-file-name "page-%d.png"
-                                    (doc-view-current-cache-dir))))
+  (let ((png-file (expand-file-name
+                   (format doc-view--image-file-pattern "%d")
+                   (doc-view-current-cache-dir))))
     (make-directory (doc-view-current-cache-dir) t)
     (pcase doc-view-doc-type
       (`dvi
@@ -985,11 +1050,12 @@ Those files are saved in the directory given by the function
        ;; ODF files have to be converted to PDF before Ghostscript can
        ;; process it.
        (let ((pdf (doc-view-current-cache-doc-pdf))
-             (opdf (expand-file-name (concat (file-name-base doc-view-buffer-file-name)
-                                             ".pdf")
-                                     doc-view-current-cache-dir))
+             (opdf (expand-file-name
+                    (concat (file-name-base doc-view-buffer-file-name)
+                            ".pdf")
+                    doc-view-current-cache-dir))
              (png-file png-file))
-         ;; The unoconv tool only supports a output directory, but no
+         ;; The unoconv tool only supports an output directory, but no
          ;; file name.  It's named like the input file with the
          ;; extension replaced by pdf.
          (doc-view-odf->pdf doc-view-buffer-file-name
@@ -997,10 +1063,10 @@ Those files are saved in the directory given by the function
                               ;; Rename to doc.pdf
                               (rename-file opdf pdf)
                               (doc-view-pdf/ps->png pdf png-file)))))
-      (`pdf
+      ((or `pdf `djvu)
        (let ((pages (doc-view-active-pages)))
-         ;; Convert PDF to PNG images starting with the active pages.
-         (doc-view-pdf->png doc-view-buffer-file-name png-file pages)))
+         ;; Convert doc to bitmap images starting with the active pages.
+         (doc-view-document->bitmap doc-view-buffer-file-name png-file pages)))
       (_
        ;; Convert to PNG images.
        (doc-view-pdf/ps->png doc-view-buffer-file-name png-file)))))
@@ -1111,9 +1177,10 @@ much more accurate than could be done manually using
       (let* ((is (image-size (doc-view-current-image) t))
              (iw (car is))
              (ih (cdr is))
-             (ps (or (and (null force-paper-size) (doc-view-guess-paper-size iw ih))
+             (ps (or (and (null force-paper-size)
+                          (doc-view-guess-paper-size iw ih))
                      (intern (completing-read "Paper size: "
-                                              (mapcar #'car doc-view-paper-sizes)
+                                              doc-view-paper-sizes
                                               nil t))))
              (bb (doc-view-scale-bounding-box ps iw ih bb))
              (x1 (nth 0 bb))
@@ -1144,7 +1211,7 @@ ARGS is a list of image descriptors."
         (image (if (and file (file-readable-p file))
                    (if (not (and doc-view-scale-internally
                                  (fboundp 'imagemagick-types)))
-                       (apply 'create-image file 'png nil args)
+                       (apply 'create-image file doc-view--image-type nil args)
                      (unless (member :width args)
                        (setq args `(,@args :width ,doc-view-image-width)))
                      (apply 'create-image file 'imagemagick nil args))))
@@ -1194,13 +1261,16 @@ have the page we want to view."
     (let ((prev-pages doc-view-current-files))
       (setq doc-view-current-files
             (sort (directory-files (doc-view-current-cache-dir) t
-                                   "page-[0-9]+\\.png" t)
+                                   (format doc-view--image-file-pattern
+                                           "[0-9]+")
+                                   t)
                   'doc-view-sort))
       (dolist (win (or (get-buffer-window-list buffer nil t)
                        (list t)))
         (let* ((page (doc-view-current-page win))
-               (pagefile (expand-file-name (format "page-%d.png" page)
-                                           (doc-view-current-cache-dir))))
+               (pagefile (expand-file-name
+                          (format doc-view--image-file-pattern page)
+                          (doc-view-current-cache-dir))))
           (when (or force
                     (and (not (member pagefile prev-pages))
                          (member pagefile doc-view-current-files)))
@@ -1265,7 +1335,7 @@ For now these keys are useful:
         (doc-view-kill-proc)
         (setq buffer-read-only nil)
         (remove-overlays (point-min) (point-max) 'doc-view t)
-        (set (make-local-variable 'image-mode-winprops-alist) t)
+        (setq-local image-mode-winprops-alist t)
         ;; Switch to the previously used major mode or fall back to
         ;; normal mode.
         (doc-view-fallback-mode)
@@ -1393,12 +1463,13 @@ If BACKWARD is non-nil, jump to the previous match."
        ;; the conversion is incomplete.
        (file-readable-p (expand-file-name "resolution.el"
                                           (doc-view-current-cache-dir)))
-       (> (length (directory-files (doc-view-current-cache-dir)
-                                   nil "\\.png\\'"))
+       (> (length (directory-files
+                   (doc-view-current-cache-dir)
+                   nil (format doc-view--image-file-pattern "[0-9]+")))
           0)))
 
 (defun doc-view-initiate-display ()
-  ;; Switch to image display if possible
+  ;; Switch to image display if possible.
   (if (doc-view-mode-p doc-view-doc-type)
       (progn
         (doc-view-buffer-message)
@@ -1406,7 +1477,7 @@ If BACKWARD is non-nil, jump to the previous match."
         (if (doc-view-already-converted-p)
             (progn
               (message "DocView: using cached files!")
-              ;; Load the saved resolution
+              ;; Load the saved resolution.
               (let* ((res-file (expand-file-name "resolution.el"
                                                  (doc-view-current-cache-dir)))
                      (res
@@ -1415,7 +1486,7 @@ If BACKWARD is non-nil, jump to the previous match."
                           (insert-file-contents res-file)
                           (read (current-buffer))))))
                 (when (numberp res)
-                  (set (make-local-variable 'doc-view-resolution) res)))
+                  (setq-local doc-view-resolution res)))
               (doc-view-display (current-buffer) 'force))
           (doc-view-convert-current-doc))
         (message
@@ -1467,6 +1538,8 @@ If BACKWARD is non-nil, jump to the previous match."
                          ("pdf" pdf) ("epdf" pdf)
                          ;; PostScript
                          ("ps" ps) ("eps" ps)
+                         ;; DjVu
+                         ("djvu" djvu)
                          ;; OpenDocument formats
                          ("odt" odf) ("ods" odf) ("odp" odf) ("odg" odf)
                          ("odc" odf) ("odi" odf) ("odm" odf) ("ott" odf)
@@ -1481,14 +1554,25 @@ If BACKWARD is non-nil, jump to the previous match."
            (cond
             ((looking-at "%!") '(ps))
             ((looking-at "%PDF") '(pdf))
-            ((looking-at "\367\002") '(dvi))))))
-    (set (make-local-variable 'doc-view-doc-type)
-         (car (or (doc-view-intersection name-types content-types)
-                  (when (and name-types content-types)
-                    (error "Conflicting types: name says %s but content says %s"
-                           name-types content-types))
-                  name-types content-types
-                  (error "Cannot determine the document type"))))))
+            ((looking-at "\367\002") '(dvi))
+            ((looking-at "AT&TFORM") '(djvu))))))
+    (setq-local doc-view-doc-type
+        (car (or (doc-view-intersection name-types content-types)
+                 (when (and name-types content-types)
+                   (error "Conflicting types: name says %s but content says %s"
+                          name-types content-types))
+                 name-types content-types
+                 (error "Cannot determine the document type"))))))
+
+(defun doc-view-set-up-single-converter ()
+  "Find the right single-page converter for the current document type"
+  (pcase-let ((`(,conv-function ,type ,extension)
+               (pcase doc-view-doc-type
+                 (`djvu (list #'doc-view-djvu->tiff-converter-ddjvu 'tiff "tif"))
+                 (_     (list doc-view-pdf->png-converter-function  'png  "png")))))
+    (setq-local doc-view-single-page-converter-function conv-function)
+    (setq-local doc-view--image-type type)
+    (setq-local doc-view--image-file-pattern (concat "page-%s." extension))))
 
 ;;;###autoload
 (defun doc-view-mode ()
@@ -1513,8 +1597,7 @@ toggle between displaying the document or editing it as text.
                               (unless (eq major-mode 'fundamental-mode)
                                 major-mode))))
       (kill-all-local-variables)
-      (set (make-local-variable 'doc-view-previous-major-mode)
-           prev-major-mode))
+      (setq-local doc-view-previous-major-mode prev-major-mode))
 
     (dolist (var doc-view-saved-settings)
       (set (make-local-variable (car var)) (cdr var)))
@@ -1522,10 +1605,11 @@ toggle between displaying the document or editing it as text.
     ;; Figure out the document type.
     (unless doc-view-doc-type
       (doc-view-set-doc-type))
+    (doc-view-set-up-single-converter)
 
     (doc-view-make-safe-dir doc-view-cache-directory)
     ;; Handle compressed files, remote files, files inside archives
-    (set (make-local-variable 'doc-view-buffer-file-name)
+    (setq-local doc-view-buffer-file-name
          (cond
           (jka-compr-really-do-compress
            ;; FIXME: there's a risk of name conflicts here.
@@ -1564,20 +1648,19 @@ toggle between displaying the document or editing it as text.
               'doc-view-new-window-function nil t)
     (image-mode-setup-winprops)
 
-    (set (make-local-variable 'mode-line-position)
-         '(" P" (:eval (number-to-string (doc-view-current-page)))
-           "/" (:eval (number-to-string (doc-view-last-page-number)))))
+    (setq-local mode-line-position
+                '(" P" (:eval (number-to-string (doc-view-current-page)))
+                  "/" (:eval (number-to-string (doc-view-last-page-number)))))
     ;; Don't scroll unless the user specifically asked for it.
-    (set (make-local-variable 'auto-hscroll-mode) nil)
-    (set (make-local-variable 'mwheel-scroll-up-function)
-         'doc-view-scroll-up-or-next-page)
-    (set (make-local-variable 'mwheel-scroll-down-function)
-         'doc-view-scroll-down-or-previous-page)
-    (set (make-local-variable 'cursor-type) nil)
+    (setq-local auto-hscroll-mode nil)
+    (setq-local mwheel-scroll-up-function #'doc-view-scroll-up-or-next-page)
+    (setq-local mwheel-scroll-down-function
+                #'doc-view-scroll-down-or-previous-page)
+    (setq-local cursor-type nil)
     (use-local-map doc-view-mode-map)
-    (set (make-local-variable 'after-revert-hook) 'doc-view-reconvert-doc)
-    (set (make-local-variable 'bookmark-make-record-function)
-         'doc-view-bookmark-make-record)
+    (add-hook 'after-revert-hook 'doc-view-reconvert-doc nil t)
+    (setq-local bookmark-make-record-function
+                #'doc-view-bookmark-make-record)
     (setq mode-name "DocView"
           buffer-read-only t
           major-mode 'doc-view-mode)
@@ -1586,7 +1669,7 @@ toggle between displaying the document or editing it as text.
     ;; canonical view mode for PDF/PS/DVI files.  This could be
     ;; switched on automatically depending on the value of
     ;; `view-read-only'.
-    (set (make-local-variable 'view-read-only) nil)
+    (setq-local view-read-only nil)
     (run-mode-hooks 'doc-view-mode-hook)))
 
 (defun doc-view-fallback-mode ()
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index 7917b769ab8..3d03e894534 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -589,13 +589,11 @@
 ;; Advice implements forward advice mainly via the following: 1) Separation
 ;; of advice definition and activation that makes it possible to accumulate
 ;; advice information without having the original function already defined,
-;; 2) special versions of the built-in functions `fset/defalias' which check
-;; for advice information whenever they define a function.  If advice
-;; information was found then the advice will immediately get activated when
-;; the function gets defined.
+;; 2) Use of the `defalias-fset-function' symbol property which lets
+;; us advise the function when it gets defined.
 
 ;; Automatic advice activation means, that whenever a function gets defined
-;; with either `defun', `defmacro', `fset' or by loading a byte-compiled
+;; with either `defun', `defmacro', `defalias' or by loading a byte-compiled
 ;; file, and the function has some advice-info stored with it then that
 ;; advice will get activated right away.
 
@@ -2868,10 +2866,8 @@ advised definition from scratch."
 
 (defun ad-preactivate-advice (function advice class position)
   "Preactivate FUNCTION and returns the constructed cache."
-  (let* ((function-defined-p (fboundp function))
-         (old-definition
-          (if function-defined-p
-              (symbol-function function)))
+  (let* ((advicefunname (ad-get-advice-info-field function 'advicefunname))
+         (old-advice (symbol-function advicefunname))
          (old-advice-info (ad-copy-advice-info function))
          (ad-advised-functions ad-advised-functions))
     (unwind-protect
@@ -2885,10 +2881,9 @@ advised definition from scratch."
               (list (ad-get-cache-definition function)
                     (ad-get-cache-id function))))
       (ad-set-advice-info function old-advice-info)
-      ;; Don't `fset' function to nil if it was previously unbound:
-      (if function-defined-p
-          (fset function old-definition)
-        (fmakunbound function)))))
+      (advice-remove function advicefunname)
+      (fset advicefunname old-advice)
+      (if old-advice (advice-add function :around advicefunname)))))
 
 
 ;; @@ Activation and definition handling:
@@ -2917,13 +2912,18 @@ If COMPILE is nil then the result depends on the value of
   "Redefine FUNCTION with its advised definition from cache or scratch.
 The resulting FUNCTION will be compiled if `ad-should-compile' returns t.
 The current definition and its cache-id will be put into the cache."
-  (let ((verified-cached-definition
-         (if (ad-verify-cache-id function)
-             (ad-get-cache-definition function)))
-        (advicefunname (ad-get-advice-info-field function 'advicefunname)))
+  (let* ((verified-cached-definition
+          (if (ad-verify-cache-id function)
+              (ad-get-cache-definition function)))
+         (advicefunname (ad-get-advice-info-field function 'advicefunname))
+         (old-ispec (interactive-form advicefunname)))
     (fset advicefunname
           (or verified-cached-definition
               (ad-make-advised-definition function)))
+    (unless (equal (interactive-form advicefunname) old-ispec)
+      ;; If the interactive-spec of advicefunname has changed, force nadvice to
+      ;; refresh its copy.
+      (advice-remove function advicefunname))
     (advice-add function :around advicefunname)
     (if (ad-should-compile function compile)
         (ad-compile-function function))
diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el
index 6741094aa55..270badd53cb 100644
--- a/lisp/emacs-lisp/authors.el
+++ b/lisp/emacs-lisp/authors.el
@@ -295,6 +295,14 @@ Changes to files matching one of the regexps in this list are not listed.")
     "calc/INSTALL" "calc/Makefile"
     "vms-pp.trans" "_emacs" "batcomp.com" "notes/cpp" ; admin/
     "emacsver.texi.in"
+    "vpath.sed"
+    "Cocoa/Emacs.base/Contents/Info.plist"
+    "Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings"
+    "GNUstep/Emacs.base/Resources/Info-gnustep.plist"
+    "GNUstep/Emacs.base/Resources/Emacs.desktop"
+    "Cocoa/Emacs.base/Contents/Resources/English.lproj"
+    ;; Only existed briefly, then deleted:
+    "coccinelle/overlay.cocci" "coccinelle/symbol.cocci"
     ;; MH-E stuff not in Emacs:
     "import-emacs" "release-utils"
     ;; Erc stuff not in Emacs:
@@ -540,6 +548,7 @@ Changes to files in this list are not listed.")
     "makedist.bat"
     "makefile.def"
     "makefile.nt"
+    "ns.mk"
     "debug.bat.in" "emacs.bat.in"
     ".gdbinit-union"
     "alloca.s"
@@ -553,15 +562,17 @@ Changes to files in this list are not listed.")
     "ymakefile"
     "permute-index" "index.perm"
     "ibmrs6000.inp"
-    "b2m.c" "b2m.1" "b2m.pl"
+    "b2m.c" "b2m.1" "b2m.pl" "rcs-checkin.1"
     "emacs.bash" "emacs.csh" "ms-kermit"
     "emacs.ico"
     "emacs21.ico"
+    "emacs.py" "emacs2.py" "emacs3.py"
     "BABYL" "LPF" "LEDIT" "OTHER.EMACSES"
     "emacs16_mac.png" "emacs24_mac.png"
     "emacs256_mac.png" "emacs32_mac.png"
     "emacs48_mac.png" "emacs512_mac.png"
     "revdiff"                           ; admin/
+    "vcdiff" "rcs-checkin" "tindex.pl"
     "mainmake" "sed1.inp" "sed2.inp" "sed3.inp" ; msdos/
     "mac-fix-env.m"
     ;; Deleted vms stuff:
@@ -580,6 +591,7 @@ in the repository.")
     ("s/windowsnt.h" . "s/ms-w32.h")
     ("s/ms-w32.h" . "inc/ms-w32.h")
     ("winnt.el" . "w32-fns.el")
+    ("emacs.manifest" . "emacs-x86.manifest")
     ("config.emacs" . "configure")
     ("configure.in" . "configure.ac")
     ("config.h.dist" . "config.in")
@@ -616,6 +628,8 @@ in the repository.")
     ("build-install" . "build-ins.in")
     ("build-install.in" . "build-ins.in")
     ("unidata/Makefile" . "unidata/Makefile.in")
+    ("move-if-change" . "build-aux/move-if-change")
+    ("update-subdirs" . "build-aux/update-subdirs")
     ;; Not renamed, but we only have the latter in the Emacs repo.
     ("trampver.texi.in" . "trampver.texi")
     ("e/eterm" . "e/eterm-color")
diff --git a/lisp/emacs-lisp/crm.el b/lisp/emacs-lisp/crm.el
index 5607c9b0698..f88cb0ef9bb 100644
--- a/lisp/emacs-lisp/crm.el
+++ b/lisp/emacs-lisp/crm.el
@@ -30,12 +30,12 @@
 ;; a single prompt, optionally using completion.
 
 ;; Multiple strings are specified by separating each of the strings
-;; with a prespecified separator character.  For example, if the
-;; separator character is a comma, the strings 'alice', 'bob', and
+;; with a prespecified separator regexp.  For example, if the
+;; separator regexp is ",", the strings 'alice', 'bob', and
 ;; 'eve' would be specified as 'alice,bob,eve'.
 
-;; The default value for the separator character is the value of
-;; `crm-default-separator' (comma).  The separator character may be
+;; The default value for the separator regexp is the value of
+;; `crm-default-separator' (comma).  The separator regexp may be
 ;; changed by modifying the value of `crm-separator'.
 
 ;; Contiguous strings of non-separator-characters are referred to as
@@ -96,14 +96,14 @@
 ;;   first revamped version
 
 ;;; Code:
-(defconst crm-default-separator ","
-  "Default separator for `completing-read-multiple'.")
+(defconst crm-default-separator "[ \t]*,[ \t]*"
+  "Default separator regexp for `completing-read-multiple'.")
 
 (defvar crm-separator crm-default-separator
-  "Separator used for separating strings in `completing-read-multiple'.
-It should be a single character string that doesn't appear in the list of
-completion candidates.  Modify this value to make `completing-read-multiple'
-use a separator other than `crm-default-separator'.")
+  "Separator regexp used for separating strings in `completing-read-multiple'.
+It should be a regexp that does not match the list of completion candidates.
+Modify this value to make `completing-read-multiple' use a separator other
+than `crm-default-separator'.")
 
 (defvar crm-local-completion-map
   (let ((map (make-sparse-keymap)))
@@ -173,13 +173,17 @@ Place an overlay on the element, with a `field' property, and return it."
     (overlay-put ol 'field (make-symbol "crm"))
     ol))
 
+(defmacro crm--completion-command (command)
+  "Make COMMAND a completion command for `completing-read-multiple'."
+  `(let ((ol (crm--select-current-element)))
+     (unwind-protect
+         ,command
+       (delete-overlay ol))))
+
 (defun crm-completion-help ()
   "Display a list of possible completions of the current minibuffer element."
   (interactive)
-  (let ((ol (crm--select-current-element)))
-    (unwind-protect
-        (minibuffer-completion-help)
-      (delete-overlay ol)))
+  (crm--completion-command (minibuffer-completion-help))
   nil)
 
 (defun crm-complete ()
@@ -188,19 +192,13 @@ If no characters can be completed, display a list of possible completions.
 
 Return t if the current element is now a valid match; otherwise return nil."
   (interactive)
-  (let ((ol (crm--select-current-element)))
-    (unwind-protect
-        (minibuffer-complete)
-      (delete-overlay ol))))
+  (crm--completion-command (minibuffer-complete)))
 
 (defun crm-complete-word ()
   "Complete the current element at most a single word.
 Like `minibuffer-complete-word' but for `completing-read-multiple'."
   (interactive)
-  (let ((ol (crm--select-current-element)))
-    (unwind-protect
-        (minibuffer-complete-word)
-      (delete-overlay ol))))
+  (crm--completion-command (minibuffer-complete-word)))
 
 (defun crm-complete-and-exit ()
   "If all of the minibuffer elements are valid completions then exit.
@@ -222,9 +220,10 @@ This function is modeled after `minibuffer-complete-and-exit'."
                      (setq doexit nil))
                  (goto-char (overlay-end ol))
                  (delete-overlay ol))
-               (not (eobp))))
+               (not (eobp)))
+             (looking-at crm-separator))
       ;; Skip to the next element.
-      (forward-char 1))
+      (goto-char (match-end 0)))
     (if doexit (exit-minibuffer))))
 
 (defun crm--choose-completion-string (choice buffer base-position
@@ -248,12 +247,12 @@ By using this functionality, a user may specify multiple strings at a
 single prompt, optionally using completion.
 
 Multiple strings are specified by separating each of the strings with
-a prespecified separator character.  For example, if the separator
-character is a comma, the strings 'alice', 'bob', and 'eve' would be
+a prespecified separator regexp.  For example, if the separator
+regexp is \",\", the strings 'alice', 'bob', and 'eve' would be
 specified as 'alice,bob,eve'.
 
-The default value for the separator character is the value of
-`crm-default-separator' (comma).  The separator character may be
+The default value for the separator regexp is the value of
+`crm-default-separator' (comma).  The separator regexp may be
 changed by modifying the value of `crm-separator'.
 
 Contiguous strings of non-separator-characters are referred to as
@@ -282,8 +281,8 @@ INHERIT-INPUT-METHOD."
                (map (if require-match
                         crm-local-must-match-map
                       crm-local-completion-map))
-               ;; If the user enters empty input, read-from-minibuffer returns
-               ;; the empty string, not DEF.
+               ;; If the user enters empty input, `read-from-minibuffer'
+               ;; returns the empty string, not DEF.
                (input (read-from-minibuffer
                        prompt initial-input map
                        nil hist def inherit-input-method)))
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 378ba9db9f4..52e12013fd3 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -461,8 +461,8 @@ STREAM or the value of `standard-input' may be:
 
 This version, from Edebug, maybe instruments the expression.  But the
 STREAM must be the current buffer to do so.  Whether it instruments is
-also dependent on the values of `edebug-all-defs' and
-`edebug-all-forms'."
+also dependent on the values of the option `edebug-all-defs' and
+the option `edebug-all-forms'."
   (or stream (setq stream standard-input))
   (if (eq stream (current-buffer))
       (edebug-read-and-maybe-wrap-form)
@@ -484,8 +484,8 @@ similarly.  Reinitialize the face according to `defface' specification.
 
 With a prefix argument, instrument the code for Edebug.
 
-Setting `edebug-all-defs' to a non-nil value reverses the meaning of
-the prefix argument.  Code is then instrumented when this function is
+Setting option `edebug-all-defs' to a non-nil value reverses the meaning
+of the prefix argument.  Code is then instrumented when this function is
 invoked without a prefix argument
 
 If acting on a `defun' for FUNCTION, and the function was instrumented,
diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index 70d6a6a4a5f..dd849362228 100644
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -937,7 +937,7 @@ Returns the result and stores it in ERT-TEST's `most-recent-result' slot."
   (cl-block error
     (let ((begin-marker
            (with-current-buffer (get-buffer-create "*Messages*")
-             (set-marker (make-marker) (point-max)))))
+             (point-max-marker))))
       (unwind-protect
           (let ((info (make-ert--test-execution-info
                        :test ert-test
diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el
index b4d6fac92a2..b0711fed26c 100644
--- a/lisp/emacs-lisp/nadvice.el
+++ b/lisp/emacs-lisp/nadvice.el
@@ -167,20 +167,27 @@ WHERE is a symbol to select an entry in `advice--where-alist'."
         (setq definition (advice--cdr definition))))
     found))
 
-;;;###autoload
-(defun advice--remove-function (flist function)
+(defun advice--tweak (flist tweaker)
   (if (not (advice--p flist))
-      flist
+      (funcall tweaker nil flist nil)
     (let ((first (advice--car flist))
+          (rest (advice--cdr flist))
           (props (advice--props flist)))
-      (if (or (equal function first)
-              (equal function (cdr (assq 'name props))))
-          (advice--cdr flist)
-        (let* ((rest (advice--cdr flist))
-               (nrest (advice--remove-function rest function)))
-          (if (eq rest nrest) flist
-            (advice--make-1 (aref flist 1) (aref flist 3)
-                            first nrest props)))))))
+      (let ((val (funcall tweaker first rest props)))
+        (if val (car val)
+          (let ((nrest (advice--tweak rest tweaker)))
+            (if (eq rest nrest) flist
+              (advice--make-1 (aref flist 1) (aref flist 3)
+                              first nrest props))))))))
+
+;;;###autoload
+(defun advice--remove-function (flist function)
+  (advice--tweak flist
+                 (lambda (first rest props)
+                   (cond ((not first) rest)
+                         ((or (equal function first)
+                           (equal function (cdr (assq 'name props))))
+                          (list rest))))))
 
 (defvar advice--buffer-local-function-sample nil)
 
@@ -269,15 +276,8 @@ of the piece of advice."
 ;;;; Specific application of add-function to `symbol-function' for advice.
 
 (defun advice--subst-main (old new)
-  (if (not (advice--p old))
-      new
-    (let* ((first (advice--car old))
-           (rest (advice--cdr old))
-           (props (advice--props old))
-           (nrest (advice--subst-main rest new)))
-      (if (equal rest nrest) old
-        (advice--make-1 (aref old 1) (aref old 3)
-                        first nrest props)))))
+  (advice--tweak old
+                 (lambda (first _rest _props) (if (not first) new))))
 
 (defun advice--normalize (symbol def)
   (cond
diff --git a/lisp/emacs-lisp/pcase.el b/lisp/emacs-lisp/pcase.el
index 69834810d11..e000c343721 100644
--- a/lisp/emacs-lisp/pcase.el
+++ b/lisp/emacs-lisp/pcase.el
@@ -431,30 +431,31 @@ MATCH is the pattern that needs to be matched, of the form:
                   (match ,symd . ,(pcase--upat (cdr qpat))))
             :pcase--fail)))
    ;; A QPattern but not for a cons, can only go to the `else' side.
-   ((eq (car-safe pat) '\`) (cons :pcase--fail nil))
+   ((eq (car-safe pat) '\`) '(:pcase--fail . nil))
    ((and (eq (car-safe pat) 'pred)
          (or (member (cons 'consp (cadr pat))
                      pcase-mutually-exclusive-predicates)
              (member (cons (cadr pat) 'consp)
                      pcase-mutually-exclusive-predicates)))
-    (cons :pcase--fail nil))))
+    '(:pcase--fail . nil))))
 
 (defun pcase--split-equal (elem pat)
   (cond
    ;; The same match will give the same result.
    ((and (eq (car-safe pat) '\`) (equal (cadr pat) elem))
-    (cons :pcase--succeed :pcase--fail))
+    '(:pcase--succeed . :pcase--fail))
    ;; A different match will fail if this one succeeds.
    ((and (eq (car-safe pat) '\`)
          ;; (or (integerp (cadr pat)) (symbolp (cadr pat))
          ;;     (consp (cadr pat)))
          )
-    (cons :pcase--fail nil))
+    '(:pcase--fail . nil))
    ((and (eq (car-safe pat) 'pred)
          (symbolp (cadr pat))
-         (get (cadr pat) 'side-effect-free)
-         (funcall (cadr pat) elem))
-    (cons :pcase--succeed nil))))
+         (get (cadr pat) 'side-effect-free))
+    (if (funcall (cadr pat) elem)
+        '(:pcase--succeed . nil)
+      '(:pcase--fail . nil)))))
 
 (defun pcase--split-member (elems pat)
   ;; Based on pcase--split-equal.
@@ -462,7 +463,7 @@ MATCH is the pattern that needs to be matched, of the form:
    ;; The same match (or a match of membership in a superset) will
    ;; give the same result, but we don't know how to check it.
    ;; (???
-   ;;  (cons :pcase--succeed nil))
+   ;;  '(:pcase--succeed . nil))
    ;; A match for one of the elements may succeed or fail.
    ((and (eq (car-safe pat) '\`) (member (cadr pat) elems))
     nil)
@@ -471,7 +472,7 @@ MATCH is the pattern that needs to be matched, of the form:
          ;; (or (integerp (cadr pat)) (symbolp (cadr pat))
          ;;     (consp (cadr pat)))
          )
-    (cons :pcase--fail nil))
+    '(:pcase--fail . nil))
    ((and (eq (car-safe pat) 'pred)
          (symbolp (cadr pat))
          (get (cadr pat) 'side-effect-free)
@@ -479,21 +480,21 @@ MATCH is the pattern that needs to be matched, of the form:
            (dolist (elem elems)
              (unless (funcall p elem) (setq all nil)))
            all))
-    (cons :pcase--succeed nil))))
+    '(:pcase--succeed . nil))))
 
 (defun pcase--split-pred (upat pat)
   ;; FIXME: For predicates like (pred (> a)), two such predicates may
   ;; actually refer to different variables `a'.
   (let (test)
     (cond
-     ((equal upat pat) (cons :pcase--succeed :pcase--fail))
+     ((equal upat pat) '(:pcase--succeed . :pcase--fail))
      ((and (eq 'pred (car upat))
            (eq 'pred (car-safe pat))
            (or (member (cons (cadr upat) (cadr pat))
                        pcase-mutually-exclusive-predicates)
                (member (cons (cadr pat) (cadr upat))
                        pcase-mutually-exclusive-predicates)))
-      (cons :pcase--fail nil))
+      '(:pcase--fail . nil))
      ((and (eq 'pred (car upat))
            (eq '\` (car-safe pat))
            (symbolp (cadr upat))
@@ -502,8 +503,8 @@ MATCH is the pattern that needs to be matched, of the form:
            (ignore-errors
              (setq test (list (funcall (cadr upat) (cadr pat))))))
       (if (car test)
-          (cons nil :pcase--fail)
-        (cons :pcase--fail nil))))))
+          '(nil . :pcase--fail)
+        '(:pcase--fail . nil))))))
 
 (defun pcase--fgrep (vars sexp)
   "Check which of the symbols VARS appear in SEXP."
diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el
index 3eaacd24ec8..8b019d0a785 100644
--- a/lisp/emacs-lisp/timer.el
+++ b/lisp/emacs-lisp/timer.el
@@ -307,13 +307,13 @@ This function is called, by name, directly by the C code."
           ;; Run handler.
           ;; We do this after rescheduling so that the handler function
           ;; can cancel its own timer successfully with cancel-timer.
-          (condition-case nil
+          (condition-case-unless-debug err
               ;; Timer functions should not change the current buffer.
               ;; If they do, all kinds of nasty surprises can happen,
               ;; and it can be hellish to track down their source.
               (save-current-buffer
                 (apply (timer--function timer) (timer--args timer)))
-            (error nil))
+            (error (message "Error in timer: %S" err)))
           (if retrigger
               (setf (timer--triggered timer) nil)))
       (error "Bogus timer event"))))
diff --git a/lisp/emacs-lisp/trace.el b/lisp/emacs-lisp/trace.el
index d2566b8cb9f..fb1b995be2b 100644
--- a/lisp/emacs-lisp/trace.el
+++ b/lisp/emacs-lisp/trace.el
@@ -38,11 +38,6 @@
 ;; generation of trace output won't interfere with what you are currently
 ;; doing.
 
-;; Requirement:
-;; ============
-;; trace.el needs advice.el version 2.0 or later which you can get from the
-;; same place from where you got trace.el.
-
 ;; Restrictions:
 ;; =============
 ;; - Traced subrs when called interactively will always show nil as the
@@ -55,17 +50,6 @@
 ;;   + Macros that were expanded during compilation
 ;; - All the restrictions that apply to advice.el
 
-;; Installation:
-;; =============
-;; Put this file together with advice.el (version 2.0 or later) somewhere
-;; into your Emacs `load-path', byte-compile it/them for efficiency, and
-;; put the following autoload declarations into your .emacs
-;;
-;;    (autoload 'trace-function "trace" "Trace a function" t)
-;;    (autoload 'trace-function-background "trace" "Trace a function" t)
-;;
-;; or explicitly load it with (require 'trace) or (load "trace").
-
 ;; Usage:
 ;; ======
 ;; - To trace a function say `M-x trace-function' which will ask you for the
@@ -183,6 +167,8 @@ some global variables)."
             (mapconcat 'char-to-string (make-string (1- level) ?|) " ")
             (if (> level 1) " " "")
             level
+            ;; FIXME: Make it so we can click the function name to jump to its
+            ;; definition and/or untrace it.
             (cons function args)
             context)))
 
@@ -282,21 +268,17 @@ and return values will be inserted into BUFFER.  This function generates the
 trace advice for FUNCTION and activates it together with any other advice
 there might be!!  The trace BUFFER will popup whenever FUNCTION is called.
 Do not use this to trace functions that switch buffers or do any other
-display oriented stuff, use `trace-function-background' instead."
+display oriented stuff, use `trace-function-background' instead.
+
+To untrace a function, use `untrace-function' or `untrace-all'."
   (interactive (trace--read-args "Trace function: "))
   (trace-function-internal function buffer nil context))
 
 ;;;###autoload
 (defun trace-function-background (function &optional buffer context)
   "Traces FUNCTION with trace output going quietly to BUFFER.
-When this tracing is enabled, every call to FUNCTION writes
-a Lisp-style trace message (showing the arguments and return value)
-into BUFFER.  This function generates advice to trace FUNCTION
-and activates it together with any other advice there might be.
-The trace output goes to BUFFER quietly, without changing
-the window or buffer configuration.
-
-BUFFER defaults to `trace-buffer'."
+Like `trace-function-foreground' but without popping up the trace BUFFER or
+changing the window configuration."
   (interactive (trace--read-args "Trace function in background: "))
   (trace-function-internal function buffer t context))
 
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 3a625eb215e..bbe551c735d 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-11  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * erc-dcc.el (erc-dcc-send-file): Use point-min-marker.
+        (erc-dcc-chat-setup): Use point-max-marker.
+
 2013-01-04  Glenn Morris  <rgm@gnu.org>
 
         * erc-backend.el (312): Fix typo.  (Bug#13235)
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el
index dc67d3b01df..c27bb629f9d 100644
--- a/lisp/erc/erc-dcc.el
+++ b/lisp/erc/erc-dcc.el
@@ -897,7 +897,7 @@ other client."
       (let* ((buffer (erc-dcc-find-file file))
              (size (buffer-size buffer))
              (start (with-current-buffer buffer
-                      (set-marker (make-marker) (point-min))))
+                      (point-min-marker)))
              (sproc (erc-dcc-server "dcc-send"
                                     'erc-dcc-send-filter
                                     'erc-dcc-send-sentinel))
@@ -1166,7 +1166,7 @@ other client."
     (setq erc-dcc-from nick)
     (setq erc-dcc-entry-data entry)
     (setq erc-dcc-unprocessed-output "")
-    (setq erc-insert-marker (set-marker (make-marker) (point-max)))
+    (setq erc-insert-marker (point-max-marker))
     (setq erc-input-marker (make-marker))
     (erc-display-prompt buffer (point-max))
     (set-process-buffer proc buffer)
diff --git a/lisp/faces.el b/lisp/faces.el
index f78a4cb9e3d..60410733514 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -929,27 +929,29 @@ of the default face.  Value is FACE."
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (defun read-face-name (prompt &optional default multiple)
-  "Read a face, defaulting to the face or faces at point.
-If the text at point has the property `read-face-name', that
-overrides the `face' property for determining the default.
+  "Read one or more face names, defaulting to the face(s) at point.
+PROMPT should be a prompt string; it should not end in a space or
+a colon.
 
-PROMPT should be a string that describes what the caller will do
-with the face; it should not end in a space.
+The optional argument DEFAULT specifies the default face name(s)
+to return if the user just types RET.  If its value is non-nil,
+it should be a list of face names (symbols); in that case, the
+default return value is the `car' of DEFAULT (if the argument
+MULTIPLE is non-nil), or DEFAULT (if MULTIPLE is nil).  See below
+for the meaning of MULTIPLE.
 
+If DEFAULT is nil, the list of default face names is taken from
+the `read-face-name' property of the text at point, or, if that
+is nil, from the `face' property of the text at point.
 
 This function uses `completing-read-multiple' with \",\" as the
-separator character, i.e.
-
-
-
-
-
-The optional argument DEFAULT provides the value to display in the
-minibuffer prompt that is returned if the user just types RET
-unless DEFAULT is a string (in which case nil is returned).
-
-If MULTIPLE is non-nil, return a list of faces (possibly only one).
-Otherwise, return a single face."
+separator character.  Thus, the user may enter multiple face
+names, separated by commas.  The optional argument MULTIPLE
+specifies the form of the return value.  If MULTIPLE is non-nil,
+return a list of face names; if the user entered just one face
+name, the return value would be a list of one face name.
+Otherwise, return a single face name; if the user entered more
+than one face name, return only the first one."
   (let ((faceprop (or (get-char-property (point) 'read-face-name)
                       (get-char-property (point) 'face)))
         (aliasfaces nil)
diff --git a/lisp/ffap.el b/lisp/ffap.el
index dfb559f3f0d..c5b0784e5a2 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -321,7 +321,7 @@ disable FFAP most of the time."
   "Last value returned by `ffap-next-guess'.")
 
 (defvar ffap-string-at-point-region '(1 1)
-  "List (BEG END), last region returned by `ffap-string-at-point'.")
+  "List (BEG END), last region returned by the function `ffap-string-at-point'.")
 
 (defun ffap-next-guess (&optional back lim)
   "Move point to next file or URL, and return it as a string.
@@ -346,7 +346,7 @@ Optional argument BACK says to search backwards.
 Optional argument WRAP says to try wrapping around if necessary.
 Interactively: use a single prefix to search backwards,
 double prefix to wrap forward, triple to wrap backwards.
-Actual search is done by `ffap-next-guess'."
+Actual search is done by the function `ffap-next-guess'."
   (interactive
    (cdr (assq (prefix-numeric-value current-prefix-arg)
               '((1) (4 t) (16 nil t) (64 t t)))))
@@ -1028,14 +1028,14 @@ If a given RFC isn't in these then `ffap-rfc-path' is offered."
   "Alist of \(MODE CHARS BEG END\), where MODE is a symbol,
 possibly a major-mode name, or one of the symbol
 `file', `url', `machine', and `nocolon'.
-`ffap-string-at-point' uses the data fields as follows:
+Function `ffap-string-at-point' uses the data fields as follows:
 1. find a maximal string of CHARS around point,
 2. strip BEG chars before point from the beginning,
 3. Strip END chars after point from the end.")
 
 (defvar ffap-string-at-point nil
   ;; Added at suggestion of RHOGEE (for ff-paths), 7/24/95.
-  "Last string returned by `ffap-string-at-point'.")
+  "Last string returned by the function `ffap-string-at-point'.")
 
 (defun ffap-string-at-point (&optional mode)
   "Return a string of characters from around point.
@@ -1043,7 +1043,8 @@ MODE (defaults to value of `major-mode') is a symbol used to look up string
 syntax parameters in `ffap-string-at-point-mode-alist'.
 If MODE is not found, we use `file' instead of MODE.
 If the region is active, return a string from the region.
-Sets `ffap-string-at-point' and `ffap-string-at-point-region'."
+Sets the variable `ffap-string-at-point' and the variable
+`ffap-string-at-point-region'."
   (let* ((args
           (cdr
            (or (assq (or mode major-mode) ffap-string-at-point-mode-alist)
@@ -1068,7 +1069,8 @@ Sets `ffap-string-at-point' and `ffap-string-at-point-region'."
 
 (defun ffap-string-around ()
   ;; Sometimes useful to decide how to treat a string.
-  "Return string of two chars around last `ffap-string-at-point'.
+  "Return string of two chars around last result of function
+`ffap-string-at-point'.
 Assumes the buffer has not changed."
   (save-excursion
     (format "%c%c"
@@ -1082,7 +1084,7 @@ Assumes the buffer has not changed."
 
 (defun ffap-copy-string-as-kill (&optional mode)
   ;; Requested by MCOOK.  Useful?
-  "Call `ffap-string-at-point', and copy result to `kill-ring'."
+  "Call function `ffap-string-at-point', and copy result to `kill-ring'."
   (interactive)
   (let ((str (ffap-string-at-point mode)))
     (if (equal "" str)
@@ -1364,7 +1366,7 @@ which may actually result in an URL rather than a filename."
   :version "22.1")
 
 (defvar ffap-highlight-overlay nil
-  "Overlay used by `ffap-highlight'.")
+  "Overlay used by function `ffap-highlight'.")
 
 (defun ffap-highlight (&optional remove)
   "If `ffap-highlight' is set, highlight the guess in this buffer.
@@ -1734,7 +1736,7 @@ Only intended for interactive use."
     (call-interactively 'ffap)))
 
 (defun ffap-literally ()
-  "Like `ffap' and `find-file-literally'.
+  "Like `ffap' and command `find-file-literally'.
 Only intended for interactive use."
   (interactive)
   (let ((ffap-file-finder 'find-file-literally))
diff --git a/lisp/files.el b/lisp/files.el
index ca5a415fb8e..b015b53db3c 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2357,7 +2357,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'" . archive-mode)
      ("\\.\\(diffs?\\|patch\\|rej\\)\\'" . diff-mode)
      ("\\.\\(dif\\|pat\\)\\'" . diff-mode) ; for MSDOG
      ("\\.[eE]?[pP][sS]\\'" . ps-mode)
-     ("\\.\\(?:PDF\\|DVI\\|OD[FGPST]\\|DOCX?\\|XLSX?\\|PPTX?\\|pdf\\|dvi\\|od[fgpst]\\|docx?\\|xlsx?\\|pptx?\\)\\'" . doc-view-mode-maybe)
+     ("\\.\\(?:PDF\\|DVI\\|OD[FGPST]\\|DOCX?\\|XLSX?\\|PPTX?\\|pdf\\|djvu\\|dvi\\|od[fgpst]\\|docx?\\|xlsx?\\|pptx?\\)\\'" . doc-view-mode-maybe)
      ("configure\\.\\(ac\\|in\\)\\'" . autoconf-mode)
      ("\\.s\\(v\\|iv\\|ieve\\)\\'" . sieve-mode)
      ("BROWSE\\'" . ebrowse-tree-mode)
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 7a2577eabbb..f714eaab233 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -469,7 +469,7 @@ optimized.")
   "Alist of additional `font-lock-keywords' elements for major modes.
 
 Each element has the form (MODE KEYWORDS . HOW).
-`font-lock-set-defaults' adds the elements in the list KEYWORDS to
+Function `font-lock-set-defaults' adds the elements in the list KEYWORDS to
 `font-lock-keywords' when Font Lock is turned on in major mode MODE.
 
 If HOW is nil, KEYWORDS are added at the beginning of
@@ -484,7 +484,7 @@ This is normally set via `font-lock-add-keywords' and
 (defvar font-lock-removed-keywords-alist nil
   "Alist of `font-lock-keywords' elements to be removed for major modes.
 
-Each element has the form (MODE . KEYWORDS).  `font-lock-set-defaults'
+Each element has the form (MODE . KEYWORDS).  Function `font-lock-set-defaults'
 removes the elements in the list KEYWORDS from `font-lock-keywords'
 when Font Lock is turned on in major mode MODE.
 
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index c1140c526f6..1f1b46c8532 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,62 @@
+2013-01-16  Glenn Morris  <rgm@gnu.org>
+
+        * smiley.el (smiley-style): Make the file loadable in batch mode.
+
+2013-01-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * nnimap.el (nnimap-keepalive): Don't throw an error if there's no more
+        imap process running.
+
+2013-01-14  Julien Danjou  <julien@danjou.info>
+
+        * gnus-sum.el (gnus-summary-from-or-to-or-newsgroups):
+        Compare addresses against addresses, not against the full From field.
+
+2013-01-13  Richard Stallman  <rms@gnu.org>
+
+        * message.el (message-forward-make-body-mime): New args BEG, END
+        specify what part of FORWARD-BUFFER to use.  Do the work directly
+        instead of calling `mml-insert-buffer'.
+
+2013-01-11  Aaron S. Hawley  <Aaron.Hawley@vtinfo.com>
+
+        * gnus-start.el (gnus-check-new-newsgroups): Fix ambiguous doc string
+        cross-reference(s).
+
+        * gnus-sum.el (gnus-summary-newsgroup-prefix): Fix ambiguous doc string
+        cross-reference(s).
+
+2013-01-11  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * gnus-art.el (gnus-mime-display-security): Use point-min-marker
+        and point-max-marker.
+        * gnus-async.el (gnus-async-article-callback): Use point-max-marker.
+
+2013-01-10  Uwe Brauer  <oub@mat.ucm.es>  (tiny change)
+
+        * mml-smime.el (mml-smime-encrypt-to-self): New user option analogous
+        to mml2015-encrypt-to-self.
+        (mml-smime-epg-encrypt): Respect mml-smime-encrypt-to-self.
+
+2013-01-09  Daiki Ueno  <ueno@gnu.org>
+
+        * mml-smime.el (epg-sub-key-fingerprint): Autoload for
+        mml-smime-epg-find-usable-secret-key.
+
+2013-01-08  Glenn Morris  <rgm@gnu.org>
+
+        * mml-smime.el (mml-smime-sign-with-sender): Add :version.
+
+2013-01-07  Daiki Ueno  <ueno@gnu.org>
+
+        * mml-smime.el: Support signing by sender.
+        Requested by Uwe Brauer.
+        (mml-smime-sign-with-sender): New user option analogous
+        to mml2015-sign-with-sender.
+        (mml-smime-epg-sign): Respect mml-smime-sign-with-sender.
+        (mml-smime-epg-find-usable-secret-key): New helper function copied from
+        mml2015.el.
+
 2012-12-31  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnus-msg.el (gnus-inews-insert-gcc): Don't insert Gcc headers if Gnus
@@ -128,8 +187,8 @@
         the `face' property with a list whose car is the face specified in the
         format string and whose cdr is (nil).
         * lisp/gnus-util.el
-        (gnus-put-text-property-excluding-characters-with-faces): Change
-        accordingly.
+        (gnus-put-text-property-excluding-characters-with-faces):
+        Change accordingly.
         (gnus-get-text-property-excluding-characters-with-faces): New function.
         * lisp/gnus-sum.el (gnus-summary-highlight-line):
         * lisp/gnus-salt.el (gnus-tree-highlight-node):
@@ -177,8 +236,8 @@
 
 2012-12-22  Philipp Haselwarter  <philipp@haselwarter.org>
 
-        * gnus-sync.el (gnus-sync-file-encrypt-to, gnus-sync-save): Set
-        epa-file-encrypt-to from variable to avoid querying.
+        * gnus-sync.el (gnus-sync-file-encrypt-to, gnus-sync-save):
+        Set epa-file-encrypt-to from variable to avoid querying.
 
 2012-12-14  Akinori MUSHA  <knu@iDaemons.org>  (tiny change)
 
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 1b4cddc5009..25a555f3d8b 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -8688,9 +8688,7 @@ For example:
              gnus-mime-security-button-end-line-format))
         (gnus-insert-mime-security-button handle)))
     (mm-set-handle-multipart-parameter
-     handle 'gnus-region
-     (cons (set-marker (make-marker) (point-min))
-           (set-marker (make-marker) (point-max))))
+     handle 'gnus-region (cons (point-min-marker) (point-max-marker)))
     (goto-char (point-max))))
 
 (defun gnus-mime-security-run-function (function)
diff --git a/lisp/gnus/gnus-async.el b/lisp/gnus/gnus-async.el
index 41b0cc25006..c5d64332547 100644
--- a/lisp/gnus/gnus-async.el
+++ b/lisp/gnus/gnus-async.el
@@ -254,7 +254,7 @@ that was fetched."
          gnus-async-article-alist
          (cons (list (intern (format "%s-%d" group article)
                              gnus-async-hashtb)
-                     mark (set-marker (make-marker) (point-max))
+                     mark (point-max-marker)
                      group article)
                gnus-async-article-alist))))
     (if (not (gnus-buffer-live-p summary))
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 42cc284a0ad..aa8b6bf2703 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -110,7 +110,7 @@ ask the servers (primary, secondary, and archive servers) to list new
 groups since the last time it checked:
   1. This variable is `ask-server'.
   2. This variable is a list of select methods (see below).
-  3. `gnus-read-active-file' is nil or `some'.
+  3. Option `gnus-read-active-file' is nil or `some'.
   4. A prefix argument is given to `gnus-find-new-newsgroups' interactively.
 
 Thus, if this variable is `ask-server' or a list of select methods or
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 49b7e5930f6..ea68a6a2fa5 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -1167,7 +1167,7 @@ using `gnus-ignored-from-addresses'."
 
 (defcustom gnus-summary-newsgroup-prefix "=> "
   "*String prefixed to the Newsgroup field in the summary
-line when using `gnus-ignored-from-addresses'."
+line when using the option `gnus-ignored-from-addresses'."
   :version "22.1"
   :group 'gnus-summary
   :type 'string)
@@ -3651,17 +3651,18 @@ buffer that was in action when the last article was fetched."
   (or (car (funcall gnus-extract-address-components from))
       from))
 
-(defun gnus-summary-from-or-to-or-newsgroups (header gnus-tmp-from)
+(defun gnus-summary-from-or-to-or-newsgroups (header from)
   (let ((mail-parse-charset gnus-newsgroup-charset)
-        (ignored-from-addresses (gnus-ignored-from-addresses))
-        ; Is it really necessary to do this next part for each summary line?
-        ; Luckily, doesn't seem to slow things down much.
-        (mail-parse-ignored-charsets
-         (with-current-buffer gnus-summary-buffer
-           gnus-newsgroup-ignored-charsets)))
+        (ignored-from-addresses (gnus-ignored-from-addresses))
+        ;; Is it really necessary to do this next part for each summary line?
+        ;; Luckily, doesn't seem to slow things down much.
+        (mail-parse-ignored-charsets
+         (with-current-buffer gnus-summary-buffer
+           gnus-newsgroup-ignored-charsets))
+        (address (cadr (gnus-extract-address-components from))))
     (or
      (and ignored-from-addresses
-          (string-match ignored-from-addresses gnus-tmp-from)
+          (string-match ignored-from-addresses address)
           (let ((extra-headers (mail-header-extra header))
                 to
                 newsgroups)
@@ -3680,9 +3681,7 @@ 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)))))
-     (gnus-string-mark-left-to-right
-      (inline
-       (gnus-summary-extract-address-component gnus-tmp-from))))))
+     (gnus-string-mark-left-to-right (gnus-summary-extract-address-component from)))))
 
 (defun gnus-summary-insert-line (gnus-tmp-header
                                  gnus-tmp-level gnus-tmp-current
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 8832899c55d..808e1edd6c3 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -7376,12 +7376,13 @@ Optional DIGEST will use digest to forward."
         (dolist (elem ignored)
           (message-remove-header elem t))))))
 
-(defun message-forward-make-body-mime (forward-buffer)
+(defun message-forward-make-body-mime (forward-buffer &optional beg end)
   (let ((b (point)))
     (insert "\n\n<#part type=message/rfc822 disposition=inline raw=t>\n")
     (save-restriction
       (narrow-to-region (point) (point))
-      (mml-insert-buffer forward-buffer)
+      (insert-buffer-substring forward-buffer beg end)
+      (mml-quote-region (point-min) (point-max))
       (goto-char (point-min))
       (when (looking-at "From ")
         (replace-match "X-From-Line: "))
diff --git a/lisp/gnus/mml-smime.el b/lisp/gnus/mml-smime.el
index 3e769d396b0..6ea55377e02 100644
--- a/lisp/gnus/mml-smime.el
+++ b/lisp/gnus/mml-smime.el
@@ -74,6 +74,18 @@ Whether the passphrase is cached at all is controlled by
   :group 'mime-security
   :type '(repeat (string :tag "Key ID")))
 
+(defcustom mml-smime-sign-with-sender nil
+  "If t, use message sender so find a key to sign with."
+  :group 'mime-security
+  :version "24.4"
+  :type 'boolean)
+
+(defcustom mml-smime-encrypt-to-self nil
+  "If t, add your own key ID to recipient list when encryption."
+  :group 'mime-security
+  :version "24.4"
+  :type 'boolean)
+
 (defun mml-smime-sign (cont)
   (let ((func (nth 1 (assq mml-smime-use mml-smime-function-alist))))
     (if func
@@ -323,6 +335,7 @@ Whether the passphrase is cached at all is controlled by
   (autoload 'epg-encrypt-string "epg")
   (autoload 'epg-passphrase-callback-function "epg")
   (autoload 'epg-context-set-passphrase-callback "epg")
+  (autoload 'epg-sub-key-fingerprint "epg")
   (autoload 'epg-configuration "epg-config")
   (autoload 'epg-expand-group "epg-config")
   (autoload 'epa-select-keys "epa"))
@@ -366,6 +379,24 @@ Whether the passphrase is cached at all is controlled by
           (setq pointer (cdr pointer))))
       (setq keys (cdr keys)))))
 
+;; XXX: since gpg --list-secret-keys does not return validity of each
+;; key, `mml-smime-epg-find-usable-key' defined above is not enough for
+;; secret keys.  The function `mml-smime-epg-find-usable-secret-key'
+;; below looks at appropriate public keys to check usability.
+(defun mml-smime-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 (mml-smime-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))
+
 (autoload 'mml-compute-boundary "mml")
 
 ;; We require mm-decode, which requires mm-bodies, which autoloads
@@ -376,29 +407,36 @@ Whether the passphrase is cached at all is controlled by
   (let* ((inhibit-redisplay t)
          (context (epg-make-context 'CMS))
          (boundary (mml-compute-boundary cont))
+         (sender (message-options-get 'message-sender))
+         (signer-names (or mml-smime-signers
+                           (if (and mml-smime-sign-with-sender sender)
+                               (list (concat "<" sender ">")))))
          signer-key
          (signers
           (or (message-options-get 'mml-smime-epg-signers)
               (message-options-set
-              'mml-smime-epg-signers
-              (if (eq mm-sign-option 'guided)
-                  (epa-select-keys context "\
+               'mml-smime-epg-signers
+               (if (eq mm-sign-option 'guided)
+                   (epa-select-keys context "\
 Select keys for signing.
 If no one is selected, default secret key is used.  "
-                                   mml-smime-signers t)
-                (if mml-smime-signers
-                    (mapcar
-                     (lambda (signer)
-                       (setq signer-key (mml-smime-epg-find-usable-key
-                                         (epg-list-keys context signer t)
-                                         'sign))
-                       (unless (or signer-key
-                                   (y-or-n-p
-                                    (format "No secret key for %s; skip it? "
+                                    signer-names
+                                    t)
+                 (if (or sender mml-smime-signers)
+                     (delq nil
+                           (mapcar
+                            (lambda (signer)
+                              (setq signer-key
+                                    (mml-smime-epg-find-usable-secret-key
+                                     context signer 'sign))
+                              (unless (or signer-key
+                                          (y-or-n-p
+                                           (format
+                                            "No secret key for %s; skip it? "
                                             signer)))
-                         (error "No secret key for %s" signer))
-                       signer-key)
-                     mml-smime-signers))))))
+                                (error "No secret key for %s" signer))
+                              signer-key)
+                            signer-names)))))))
          signature micalg)
     (epg-context-set-signers context signers)
     (if mml-smime-cache-passphrase
@@ -443,13 +481,17 @@ Content-Disposition: attachment; filename=smime.p7s
     (goto-char (point-max))))
 
 (defun mml-smime-epg-encrypt (cont)
-  (let ((inhibit-redisplay t)
-        (context (epg-make-context 'CMS))
-        (config (epg-configuration))
-        (recipients (message-options-get 'mml-smime-epg-recipients))
-        cipher signers
-        (boundary (mml-compute-boundary cont))
-        recipient-key)
+  (let* ((inhibit-redisplay t)
+         (context (epg-make-context 'CMS))
+         (config (epg-configuration))
+         (recipients (message-options-get 'mml-smime-epg-recipients))
+         cipher signers
+         (sender (message-options-get 'message-sender))
+         (signer-names (or mml-smime-signers
+                           (if (and mml-smime-sign-with-sender sender)
+                               (list (concat "<" sender ">")))))
+         (boundary (mml-compute-boundary cont))
+         recipient-key)
     (unless recipients
       (setq recipients
             (apply #'nconc
@@ -462,6 +504,10 @@ Content-Disposition: attachment; filename=smime.p7s
                          (message-options-set 'message-recipients
                                               (read-string "Recipients: ")))
                      "[ \f\t\n\r\v,]+"))))
+      (when mml-smime-encrypt-to-self
+        (unless signer-names
+          (error "Neither message sender nor mml-smime-signers are set"))
+        (setq recipients (nconc recipients signer-names)))
       (if (eq mm-encrypt-option 'guided)
           (setq recipients
                 (epa-select-keys context "\
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index ea579fa3a2b..9c18bc2cff0 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -339,7 +339,8 @@ textual parts.")
                           (nnimap-last-command-time nnimap-object)))
                         ;; More than five minutes since the last command.
                         (* 5 60)))
-            (nnimap-send-command "NOOP")))))))
+            (ignore-errors              ;E.g. "buffer foo has no process".
+              (nnimap-send-command "NOOP"))))))))
 
 (defun nnimap-open-connection (buffer)
   ;; Be backwards-compatible -- the earlier value of nnimap-stream was
@@ -367,7 +368,7 @@ textual parts.")
 (defun nnimap-open-connection-1 (buffer)
   (unless nnimap-keepalive-timer
     (setq nnimap-keepalive-timer (run-at-time (* 60 15) (* 60 15)
-                                              'nnimap-keepalive)))
+                                              #'nnimap-keepalive)))
   (with-current-buffer (nnimap-make-process-buffer buffer)
     (let* ((coding-system-for-read 'binary)
            (coding-system-for-write 'binary)
diff --git a/lisp/gnus/smiley.el b/lisp/gnus/smiley.el
index 6381f5bf9d9..eb71134457c 100644
--- a/lisp/gnus/smiley.el
+++ b/lisp/gnus/smiley.el
@@ -59,7 +59,10 @@
 
 (defcustom smiley-style
   (if (or (and (fboundp 'face-attribute)
-               (>= (face-attribute 'default :height) 160))
+               ;; In batch mode, attributes can be unspecified.
+               (condition-case nil
+                   (>= (face-attribute 'default :height) 160)
+                 (error nil)))
           (and (fboundp 'face-height)
                (>= (face-height 'default) 14)))
       'medium
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index 662f431d3c3..b5aca1a4445 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -322,7 +322,7 @@ Commands:
 
 (defconst help-xref-symbol-regexp
   (purecopy (concat "\\(\\<\\(\\(variable\\|option\\)\\|"  ; Link to var
-                    "\\(function\\|command\\)\\|"          ; Link to function
+                    "\\(function\\|command\\|call\\)\\|"   ; Link to function
                     "\\(face\\)\\|"                        ; Link to face
                     "\\(symbol\\|program\\|property\\)\\|" ; Don't link
                     "\\(source \\(?:code \\)?\\(?:of\\|for\\)\\)\\)"
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 90eb5dfaec5..a95dde1d999 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -63,8 +63,9 @@ otherwise it defaults to t, used for times when the buffer is not displayed."
   (when cleanup
     (setq image-mode-winprops-alist
           (delq nil (mapcar (lambda (winprop)
-                              (if (window-live-p (car-safe winprop))
-                                  winprop))
+                              (let ((w (car-safe winprop)))
+                                (if (or (not (windowp w)) (window-live-p w))
+                                    winprop)))
                             image-mode-winprops-alist))))
   (let ((winprops (assq window image-mode-winprops-alist)))
     ;; For new windows, set defaults from the latest.
diff --git a/lisp/imenu.el b/lisp/imenu.el
index 0bfee770094..f64d1afe951 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -447,6 +447,8 @@ Don't move point."
 Simple elements in the alist look like (INDEX-NAME . POSITION).
 POSITION is the buffer position of the item; to go to the item
 is simply to move point to that position.
+POSITION is passed to `imenu-default-goto-function', so it can be a non-number
+if that variable has been changed (e.g. Semantic uses overlays for POSITIONs).
 
 Special elements look like (INDEX-NAME POSITION FUNCTION ARGUMENTS...).
 To \"go to\" a special element means applying FUNCTION
diff --git a/lisp/info.el b/lisp/info.el
index 8408e01efb5..e230ed0f82c 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1703,7 +1703,9 @@ escaped (\\\",\\\\)."
 If NODENAME is of the form (FILENAME)NODENAME, the node is in the Info file
 FILENAME; otherwise, NODENAME should be in the current Info file (or one of
 its sub-files).
-Completion is available, but only for node names in the current Info file.
+Completion is available for node names in the current Info file as well as
+in the Info file FILENAME after the closing parenthesis in (FILENAME).
+Empty NODENAME in (FILENAME) defaults to the Top node.
 If FORK is non-nil (interactively with a prefix arg), show the node in
 a new Info buffer.
 If FORK is a string, it is the name to use for the new buffer."
@@ -1740,6 +1742,7 @@ list of valid filename suffixes for Info files.  See
   (when (file-name-absolute-p string)
     (setq dirs (list (file-name-directory string))))
   (let ((names nil)
+        (names-sans-suffix nil)
         (suffix (concat (regexp-opt suffixes t) "\\'"))
         (string-dir (file-name-directory string)))
     (dolist (dir dirs)
@@ -1762,7 +1765,14 @@ list of valid filename suffixes for Info files.  See
           ;; add the unsuffixed name as a completion option.
           (when (string-match suffix file)
             (setq file (substring file 0 (match-beginning 0)))
-            (push (if string-dir (concat string-dir file) file) names)))))
+            (push (if string-dir (concat string-dir file) file)
+                  names-sans-suffix)))))
+    ;; If there is just one file, don't duplicate it with suffixes,
+    ;; so `Info-read-node-name-1' will be able to complete a single
+    ;; candidate and to add the terminating ")".
+    (if (and (= (length names) 1) (= (length names-sans-suffix) 1))
+        (setq names names-sans-suffix)
+      (setq names (append names-sans-suffix names)))
     (complete-with-action action names string pred)))
 
 (defun Info-read-node-name-1 (string predicate code)
@@ -1784,16 +1794,19 @@ See `completing-read' for a description of arguments and usage."
    ((string-match "\\`(\\([^)]+\\))" string)
     (let ((file0 (match-string 0 string))
           (file1 (match-string 1 string))
-          (node (substring string (match-end 0))))
-      (completion-table-with-context
-       file0
-       (apply-partially
-        (lambda (string pred action)
-          (complete-with-action
-           action
-           (Info-build-node-completions (Info-find-file file1))
-           string pred)))
-       node predicate code)))
+          (nodename (substring string (match-end 0))))
+      (if (and (equal nodename "") (eq code 'lambda))
+          ;; Empty node name is permitted that means "Top".
+          t
+        (completion-table-with-context
+         file0
+         (apply-partially
+          (lambda (string pred action)
+            (complete-with-action
+             action
+             (Info-build-node-completions (Info-find-file file1))
+             string pred)))
+         nodename predicate code))))
    ;; Otherwise use Info-read-node-completion-table.
    (t (complete-with-action
        code Info-read-node-completion-table string predicate))))
@@ -1802,7 +1815,9 @@ See `completing-read' for a description of arguments and usage."
 (defun Info-read-node-name (prompt)
   "Read an Info node name with completion, prompting with PROMPT.
 A node name can have the form \"NODENAME\", referring to a node
-in the current Info file, or \"(FILENAME)NODENAME\"."
+in the current Info file, or \"(FILENAME)NODENAME\", referring to
+a node in FILENAME.  \"(FILENAME)\" is a short format to go to
+the Top node in FILENAME."
   (let* ((completion-ignore-case t)
          (Info-read-node-completion-table (Info-build-node-completions))
          (nodename (completing-read prompt 'Info-read-node-name-1 nil t)))
@@ -1810,14 +1825,14 @@ in the current Info file, or \"(FILENAME)NODENAME\"."
         (Info-read-node-name prompt)
       nodename)))
 
-(defun Info-build-node-completions (&optional file)
-  (if file
-      (or (cdr (assoc file Info-file-completions))
+(defun Info-build-node-completions (&optional filename)
+  (if filename
+      (or (cdr (assoc filename Info-file-completions))
           (with-temp-buffer
             (Info-mode)
-            (Info-goto-node (format "(%s)Top" file))
+            (Info-goto-node (format "(%s)Top" filename))
             (Info-build-node-completions-1)
-            (push (cons file Info-current-file-completions) Info-file-completions)
+            (push (cons filename Info-current-file-completions) Info-file-completions)
             Info-current-file-completions))
     (or Info-current-file-completions
         (Info-build-node-completions-1))))
@@ -4298,7 +4313,7 @@ If the element is just a file name, the file name also serves as the prefix.")
 The `info-file' property of COMMAND says which Info manual to search.
 If COMMAND has no property, the variable `Info-file-list-for-emacs'
 defines heuristics for which Info manual to try.
-The locations are of the format used in `Info-history', i.e.
+The locations are of the format used in the variable `Info-history', i.e.
 \(FILENAME NODENAME BUFFERPOS), where BUFFERPOS is the line number
 in the first element of the returned list (which is treated specially in
 `Info-goto-emacs-command-node'), and 0 for the rest elements of a list."
@@ -5167,13 +5182,16 @@ Otherwise, visit the manual in a new Info buffer."
       (with-current-buffer buffer
         (and (eq major-mode 'Info-mode)
              (stringp Info-current-file)
+             (not (string= (substring (buffer-name) 0 1) " "))
              (push (file-name-sans-extension
                     (file-name-nondirectory Info-current-file))
                    names))))
     (delete-dups (append (nreverse names)
-                         (apply-partially 'Info-read-node-name-2
-                                          Info-directory-list
-                                          (mapcar 'car Info-suffix-list))))))
+                         (all-completions
+                          ""
+                          (apply-partially 'Info-read-node-name-2
+                                           Info-directory-list
+                                           (mapcar 'car Info-suffix-list)))))))
 
 (provide 'info)
 
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 03b88038dd7..35c303f0ea8 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -2946,14 +2946,14 @@ This function also accepts a hexadecimal number of Unicode code
 point or a number in hash notation, e.g. #o21430 for octal,
 #x2318 for hex, or #10r8984 for decimal."
   (let* ((enable-recursive-minibuffers t)
+         (completion-ignore-case t)
          (input
           (completing-read
            prompt
            (lambda (string pred action)
-             (let ((completion-ignore-case t))
-               (if (eq action 'metadata)
-                   '(metadata (category . unicode-name))
-                 (complete-with-action action (ucs-names) string pred))))))
+             (if (eq action 'metadata)
+                 '(metadata (category . unicode-name))
+               (complete-with-action action (ucs-names) string pred)))))
          (char
           (cond
            ((string-match-p "\\`[0-9a-fA-F]+\\'" input)
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 6fa589a9622..995df2fb9a7 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -891,7 +891,7 @@ or one is an alias of the other."
                  (and (vectorp eol-type-1) (vectorp eol-type-2)))))))
 
 (defun add-to-coding-system-list (coding-system)
-  "Add CODING-SYSTEM to `coding-system-list' while keeping it sorted."
+  "Add CODING-SYSTEM to variable `coding-system-list' while keeping it sorted."
   (if (or (null coding-system-list)
           (coding-system-lessp coding-system (car coding-system-list)))
       (setq coding-system-list (cons coding-system coding-system-list))
diff --git a/lisp/isearch.el b/lisp/isearch.el
index b13881b208b..e16e3840d0d 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -176,7 +176,7 @@ is non-nil if the user quits the search.")
 
 (defvar isearch-message-function nil
   "Function to call to display the search prompt.
-If nil, use `isearch-message'.")
+If nil, use function `isearch-message'.")
 
 (defvar isearch-wrap-function nil
   "Function to call to wrap the search when search is failed.
@@ -1101,7 +1101,7 @@ nonincremental search instead via `isearch-edit-string'."
 
 (defun isearch-fail-pos (&optional msg)
   "Return position of first mismatch in search string, or nil if none.
-If MSG is non-nil, use `isearch-message', otherwise `isearch-string'."
+If MSG is non-nil, use variable `isearch-message', otherwise `isearch-string'."
   (let ((cmds isearch-cmds)
         (curr-msg (if msg isearch-message isearch-string))
         succ-msg)
diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el
index 7be5df72c84..668f1ec963a 100644
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -257,6 +257,47 @@ the variable `jit-lock-stealth-nice'."
          (remove-hook 'after-change-functions 'jit-lock-after-change t)
          (remove-hook 'fontification-functions 'jit-lock-function))))
 
+(define-minor-mode jit-lock-debug-mode
+  "Minor mode to help debug code run from jit-lock.
+When this minor mode is enabled, jit-lock runs as little code as possible
+during redisplay and moves the rest to a timer, where things
+like `debug-on-error' and Edebug can be used."
+  :global t
+  (when jit-lock-defer-timer
+    (cancel-timer jit-lock-defer-timer)
+    (setq jit-lock-defer-timer nil))
+  (when jit-lock-debug-mode
+    (setq jit-lock-defer-timer
+          (run-with-idle-timer 0 t #'jit-lock--debug-fontify))))
+
+(defvar jit-lock--debug-fontifying nil)
+
+(defun jit-lock--debug-fontify ()
+  "Fontify what was deferred for debugging."
+  (when (and (not jit-lock--debug-fontifying)
+             jit-lock-defer-buffers (not memory-full))
+    (let ((jit-lock--debug-fontifying t)
+          (inhibit-debugger nil))       ;FIXME: Not sufficient!
+      ;; Mark the deferred regions back to `fontified = nil'
+      (dolist (buffer jit-lock-defer-buffers)
+        (when (buffer-live-p buffer)
+          (with-current-buffer buffer
+            ;; (message "Jit-Debug %s" (buffer-name))
+            (with-buffer-prepared-for-jit-lock
+                (let ((pos (point-min)))
+                  (while
+                      (progn
+                        (when (eq (get-text-property pos 'fontified) 'defer)
+                          (let ((beg pos)
+                                (end (setq pos (next-single-property-change
+                                                pos 'fontified
+                                                nil (point-max)))))
+                            (put-text-property beg end 'fontified nil)
+                            (jit-lock-fontify-now beg end)))
+                        (setq pos (next-single-property-change
+                                   pos 'fontified)))))))))
+      (setq jit-lock-defer-buffers nil))))
+
 (defun jit-lock-register (fun &optional contextual)
   "Register FUN as a fontification function to be called in this buffer.
 FUN will be called with two arguments START and END indicating the region
@@ -504,7 +545,8 @@ non-nil in a repeated invocation of this function."
                       pos (setq pos (next-single-property-change
                                      pos 'fontified nil (point-max)))
                       'fontified nil))
-                   (setq pos (next-single-property-change pos 'fontified)))))))))
+                   (setq pos (next-single-property-change
+                              pos 'fontified)))))))))
     (setq jit-lock-defer-buffers nil)
     ;; Force fontification of the visible parts.
     (let ((jit-lock-defer-timer nil))
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index e32d3c608d4..c6385498dcd 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -4647,7 +4647,7 @@ With prefix argument N moves forward N messages with these labels.
 
 ;;;***
 
-;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "1f33964668345a1a1f3119fece148227")
+;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "93951f748e43e1015da1b485088970ca")
 ;;; Generated autoloads from rmailmm.el
 
 (autoload 'rmail-mime "rmailmm" "\
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index 566dec1ad39..350e3dacbcf 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -1365,14 +1365,15 @@ The arguments ARG and STATE have no effect in this case."
 (defun rmail-insert-mime-forwarded-message (forward-buffer)
   "Insert the message in FORWARD-BUFFER as a forwarded message.
 This is the usual value of `rmail-insert-mime-forwarded-message-function'."
-  (let ((message-buffer
-         (with-current-buffer forward-buffer
-           (if rmail-buffer-swapped
-               rmail-view-buffer
-             forward-buffer))))
-    (save-restriction
-      (narrow-to-region (point) (point))
-      (message-forward-make-body-mime message-buffer))))
+  (let (contents-buffer start end)
+    (with-current-buffer forward-buffer
+      (setq contents-buffer
+            (if rmail-buffer-swapped
+                rmail-view-buffer
+              forward-buffer)
+            start (rmail-msgbeg rmail-current-message)
+            end (rmail-msgend rmail-current-message)))
+    (message-forward-make-body-mime contents-buffer start end)))
 
 (setq rmail-insert-mime-forwarded-message-function
       'rmail-insert-mime-forwarded-message)
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index e86229a5cfb..e1dee3295f2 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -1493,6 +1493,9 @@ just append to the file, in Babyl format if necessary."
            (insert "\nMail-Followup-To: "))))
 
 (defun mail-position-on-field (field &optional soft)
+  "Move to the start of the contents of header field FIELD.
+If there is none, insert one, unless SOFT is non-nil.
+If there are multiple FIELD fields, this goes to the first."
   (let (end
         (case-fold-search t))
     (setq end (mail-header-end))
diff --git a/lisp/man.el b/lisp/man.el
index b6a6c179374..93a67128de4 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -1,4 +1,4 @@
-;;; man.el --- browse UNIX manual pages -*- coding: iso-8859-1 -*-
+;;; man.el --- browse UNIX manual pages  -*- coding: utf-8 -*-
 
 ;; Copyright (C) 1993-1994, 1996-1997, 2001-2013 Free Software
 ;; Foundation, Inc.
@@ -276,7 +276,7 @@ Used in `bookmark-set' to get the default bookmark name."
   :type 'hook
   :group 'man)
 
-(defvar Man-name-regexp "[-a-zA-Z0-9_­+][-a-zA-Z0-9_.:­+]*"
+(defvar Man-name-regexp "[-a-zA-Z0-9_­+][-a-zA-Z0-9_.:­+]*"
   "Regular expression describing the name of a manpage (without section).")
 
 (defvar Man-section-regexp "[0-9][a-zA-Z0-9+]*\\|[LNln]"
@@ -780,6 +780,59 @@ POS defaults to `point'."
   ;; but apparently that's not the case in all cases, so let's add a cache.
   "Cache of completion table of the form (PREFIX . TABLE).")
 
+(defvar Man-man-k-use-anchor
+  ;; man-db or man-1.*
+  (memq system-type '(gnu gnu/linux gnu/kfreebsd))
+  "If non-nil prepend ^ to the prefix passed to \"man -k\" for completion.
+The value should be nil if \"man -k ^PREFIX\" may omit some man
+pages whose names start with PREFIX.
+
+Currently, the default value depends on `system-type' and is
+non-nil where the standard man programs are known to behave
+properly.  Setting the value to nil always gives correct results
+but computing the list of completions may take a bit longer.")
+
+(defun Man-parse-man-k ()
+  "Parse \"man -k\" output and return the list of page names.
+
+The current buffer should contain the output of a command of the
+form \"man -k keyword\", which is traditionally also available with
+apropos(1).
+
+While POSIX man(1p) is a bit vague about what to expect here,
+this function tries to parse some commonly used formats, which
+can be described in the following informal way, with square brackets
+indicating optional parts and whitespace being interpreted
+somewhat loosely.
+
+foo[, bar [, ...]] [other stuff] (sec) - description
+foo(sec)[, bar(sec) [, ...]] [other stuff] - description
+
+For more details and some regression tests, please see
+test/automated/man-tests.el in the emacs bzr repository."
+  (goto-char (point-min))
+  ;; See man-tests for data about which systems use which format (hopefully we
+  ;; will be able to simplify the code if/when some of those formats aren't
+  ;; used any more).
+  (let (table)
+    (while (search-forward-regexp "^\\([^ \t,\n]+\\)\\(.*?\\)\
+\\(?:[ \t]\\(([^ \t,\n]+?)\\)\\)?\\(?:[ \t]+- ?\\(.*\\)\\)?$" nil t)
+      (let ((section (match-string 3))
+            (description (match-string 4))
+            (bound (match-end 2)))
+        (goto-char (match-end 1))
+        (while
+            (progn
+              ;; The first regexp grouping may already match the section
+              ;; tacked on to the name, which is ok since for the formats we
+              ;; claim to support the third (non-shy) grouping does not
+              ;; match in this case, i.e., section is nil.
+              (push (propertize (concat (match-string 1) section)
+                                'help-echo description)
+                    table)
+              (search-forward-regexp "\\=, *\\([^ \t,]+\\)" bound t)))))
+    (nreverse table)))
+
 (defun Man-completion-table (string pred action)
   (cond
    ;; This ends up returning t for pretty much any string, and hence leads to
@@ -811,16 +864,15 @@ POS defaults to `point'."
             ;; run differently in Man-getpage-in-background, an error
             ;; here may not necessarily mean that we'll also get an
             ;; error later.
-            (ignore-errors
-              (call-process manual-program nil '(t nil) nil
-                            "-k" (concat "^" prefix))))
-          (goto-char (point-min))
-          (while (re-search-forward "^\\([^ \t\n]+\\)\\(?: ?\\((.+?)\\)\\(?:[ \t]+- \\(.*\\)\\)?\\)?" nil t)
-            (push (propertize (concat (match-string 1) (match-string 2))
-                              'help-echo (match-string 3))
-                  table)))
-        ;; Cache the table for later reuse.
-        (setq Man-completion-cache (cons prefix table)))
+            (ignore-errors
+              (call-process manual-program nil '(t nil) nil
+                            "-k" (concat (when (or Man-man-k-use-anchor
+                                                   (string-equal prefix ""))
+                                           "^")
+                                         prefix))))
+          (setq table (Man-parse-man-k)))
+        ;; Cache the table for later reuse.
+        (setq Man-completion-cache (cons prefix table)))
       ;; The table may contain false positives since the match is made
       ;; by "man -k" not just on the manpage's name.
       (if section
@@ -891,6 +943,7 @@ names or descriptions.  The pattern argument is usually an
                 ;; ("man -k" is case-insensitive similarly, so the
                 ;; table has everything available to complete)
                 (completion-ignore-case t)
+                Man-completion-cache    ;Don't cache across calls.
                 (input (completing-read
                         (format "Manual entry%s"
                                 (if (string= default-entry "")
@@ -1395,7 +1448,7 @@ The following key bindings are currently in effect in the buffer:
                               ;; Update len, in case a reference spans
                               ;; more than two lines (paranoia).
                               len (1- (length word))))
-                    (if (memq (aref word len) '(?- ?­))
+                    (if (memq (aref word len) '(?- ?­))
                         (setq hyphenated (substring word 0 len)))
                     (and (string-match Man-reference-regexp word)
                          (not (member word Man--refpages))
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 024e2237cae..60f2bc2999f 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1637,8 +1637,8 @@ key, a click, or a menu-item"))
       '(menu-item "Find Options by Value..." apropos-value
                   :help "Find variables whose values match a regexp"))
     (bindings--define-key menu [find-options-by-name]
-      '(menu-item "Find Options by Name..." apropos-variable
-                  :help "Find variables whose names match a regexp"))
+      '(menu-item "Find Options by Name..." apropos-user-option
+                  :help "Find user options whose names match a regexp"))
     (bindings--define-key menu [find-commands-by-name]
       '(menu-item "Find Commands by Name..." apropos-command
                   :help "Find commands whose names match a regexp"))
diff --git a/lisp/misearch.el b/lisp/misearch.el
index 2584f8df77b..0c4cd4ea323 100644
--- a/lisp/misearch.el
+++ b/lisp/misearch.el
@@ -73,7 +73,7 @@ end of the search space).
 The first argument of this function is the current buffer where the
 search is currently searching.  It defines the base buffer relative to
 which this function should find the next buffer.  When the isearch
-direction is backward (when `isearch-forward' is nil), this function
+direction is backward (when option `isearch-forward' is nil), this function
 should return the previous buffer to search.
 
 If the second argument of this function WRAP is non-nil, then it
diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index fd8fdb51796..ab13d4cf442 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -61,12 +61,17 @@
    "^[[:space:]]*\\([-[:alpha:]]+\\)"   ; \1 permissions
    "[[:space:]]*\\([^[:space:]]+\\)"    ; \2 username
    "[[:space:]]+\\([^[:space:]]+\\)"    ; \3 group
-   "[[:space:]]+\\([[:digit:]]\\)"      ; \4 size
+   "[[:space:]]+\\([[:digit:]]+\\)"     ; \4 size
    "[[:space:]]+\\([-[:digit:]]+[[:space:]][:[:digit:]]+\\)" ; \5 date
    "[[:space:]]+\\(.*\\)$"))            ; \6 filename
 
 ;;;###tramp-autoload
-(add-to-list 'tramp-methods `(,tramp-adb-method))
+(add-to-list 'tramp-methods
+             `(,tramp-adb-method
+               (tramp-tmpdir "/data/local/tmp")))
+
+;;;###tramp-autoload
+(add-to-list 'tramp-default-host-alist `(,tramp-adb-method nil ""))
 
 ;;;###tramp-autoload
 (eval-after-load 'tramp
@@ -95,8 +100,8 @@
     (file-directory-p . tramp-adb-handle-file-directory-p)
     (file-symlink-p . tramp-handle-file-symlink-p)
     ;; FIXME: This is too sloppy.
-    (file-executable-p . file-exists-p)
-    (file-exists-p . tramp-adb-handle-file-exists-p)
+    (file-executable-p . tramp-handle-file-exists-p)
+    (file-exists-p . tramp-handle-file-exists-p)
     (file-readable-p . tramp-handle-file-exists-p)
     (file-writable-p . tramp-adb-handle-file-writable-p)
     (file-local-copy . tramp-adb-handle-file-local-copy)
@@ -106,7 +111,6 @@
     (directory-files . tramp-handle-directory-files)
     (directory-files-and-attributes
      . tramp-adb-handle-directory-files-and-attributes)
-    (file-name-all-completions . tramp-sh-handle-file-name-all-completions)
     (make-directory . tramp-adb-handle-make-directory)
     (delete-directory . tramp-adb-handle-delete-directory)
     (delete-file . tramp-adb-handle-delete-file)
@@ -118,7 +122,7 @@
     (vc-registered . ignore)    ;no  vc control files on Android devices
     (write-region . tramp-adb-handle-write-region)
     (set-file-modes . tramp-adb-handle-set-file-modes)
-    (set-file-times . ignore)
+    (set-file-times . tramp-adb-handle-set-file-times)
     (copy-file . tramp-adb-handle-copy-file)
     (rename-file . tramp-adb-handle-rename-file)
     (process-file . tramp-adb-handle-process-file)
@@ -139,13 +143,7 @@
   "Invoke the ADB handler for OPERATION.
 First arg specifies the OPERATION, second arg is a list of arguments to
 pass to the OPERATION."
-  (let ((fn (assoc operation tramp-adb-file-name-handler-alist))
-        ;; `tramp-default-host's default value is (system-name).  Not
-        ;; useful for us.
-        (tramp-default-host
-         (unless (equal (eval (car (get 'tramp-default-host 'standard-value)))
-                        tramp-default-host)
-           tramp-default-host)))
+  (let ((fn (assoc operation tramp-adb-file-name-handler-alist)))
     (if fn
         (save-match-data (apply (cdr fn) args))
       (tramp-run-real-handler operation args))))
@@ -312,7 +310,9 @@ pass to the OPERATION."
                 (and is-symlink
                      (cadr (split-string name "\\( -> \\|\n\\)")))))
           (push (list
-                 name
+                 (if is-symlink
+                     (car (split-string name "\\( -> \\|\n\\)"))
+                   name)
                  (or is-dir symlink-target)
                  1     ;link-count
                  ;; no way to handle numeric ids in Androids ash
@@ -372,14 +372,14 @@ pass to the OPERATION."
       "ls")))
 
 (defun tramp-adb-get-toolbox (vec)
-  "Get shell toolbox implementation: `toolbox' for orginal distributions
-or `busybox' for CynagenMode based distributions"
+  "Get shell toolbox implementation: `toolbox' for original distributions
+or `busybox' for CyanogenMod based distributions"
   (with-tramp-connection-property vec "toolbox"
     (tramp-message vec 5 "Checking shell toolbox implementation")
     (cond
      ((zerop (tramp-adb-command-exit-status vec "busybox")) 'busybox)
      ((zerop (tramp-adb-command-exit-status vec "toolbox")) 'toolbox)
-     (t 'unkown))))
+     (t 'unknown))))
 
 (defun tramp-adb--gnu-switches-to-ash
   (switches)
@@ -616,6 +616,19 @@ But handle the case, if the \"test\" command is not available."
      v (format "chmod %s %s" (tramp-compat-decimal-to-octal mode) localname)
      "Error while changing file's mode %s" filename)))
 
+(defun tramp-adb-handle-set-file-times (filename &optional time)
+  "Like `set-file-times' for Tramp files."
+  (with-parsed-tramp-file-name filename nil
+    (tramp-flush-file-property v localname)
+    (let ((time (if (or (null time) (equal time '(0 0)))
+                    (current-time)
+                  time)))
+      (tramp-adb-command-exit-status
+       ;; use shell arithmetic because of Emacs integer size limit
+       v (format "touch -t $(( %d * 65536 + %d )) %s"
+                 (car time) (cadr time)
+                 (tramp-shell-quote-argument localname))))))
+
 (defun tramp-adb-handle-copy-file
   (filename newname &optional ok-if-already-exists keep-date
             preserve-uid-gid preserve-extended-attributes)
@@ -940,19 +953,11 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored."
         (tramp-set-connection-property v "process-name" nil)
         (tramp-set-connection-property v "process-buffer" nil)))))
 
-;; Android < 4 doesn't provide test command.
-
-(defun tramp-adb-handle-file-exists-p (filename)
-  "Like `file-exists-p' for Tramp files."
-  (with-parsed-tramp-file-name filename nil
-    (with-tramp-file-property v localname "file-exists-p"
-      (file-attributes filename))))
-
 ;; Helper functions.
 
 (defun tramp-adb-execute-adb-command (vec &rest args)
   "Returns nil on success error-output on failure."
-  (when (tramp-file-name-host vec)
+  (when (> (length (tramp-file-name-host vec)) 0)
     (setq args (append (list "-s" (tramp-file-name-host vec)) args)))
   (with-temp-buffer
     (prog1
@@ -1054,6 +1059,7 @@ Does not do anything if a connection is already open, but re-opens the
 connection if a previous connection has died for some reason."
   (let* ((buf (tramp-get-connection-buffer vec))
          (p (get-buffer-process buf))
+         (host (tramp-file-name-host vec))
          (devices (mapcar 'cadr (tramp-adb-parse-device-names nil))))
     (unless
         (and p (processp p) (memq (process-status p) '(run open)))
@@ -1061,21 +1067,17 @@ connection if a previous connection has died for some reason."
         (when (and p (processp p)) (delete-process p))
         (if (not devices)
             (tramp-error vec 'file-error "No device connected"))
-        (if (and (tramp-file-name-host vec)
-                 (not (member (tramp-file-name-host vec) devices)))
-            (tramp-error
-             vec 'file-error
-             "Device %s not connected" (tramp-file-name-host vec)))
-        (if (and (not (eq (length devices) 1))
-                 (not (tramp-file-name-host vec)))
+        (if (and (> (length host) 0) (not (member host devices)))
+            (tramp-error vec 'file-error "Device %s not connected" host))
+        (if (and (> (length devices) 1) (zerop (length host)))
             (tramp-error
              vec 'file-error
              "Multiple Devices connected: No Host/Device specified"))
         (with-tramp-progress-reporter vec 3 "Opening adb shell connection"
           (let* ((coding-system-for-read 'utf-8-dos) ;is this correct?
                  (process-connection-type tramp-process-connection-type)
-                 (args (if (tramp-file-name-host vec)
-                           (list "-s" (tramp-file-name-host vec) "shell")
+                 (args (if (> (length host) 0)
+                           (list "-s" host "shell")
                          (list "shell")))
                  (p (let ((default-directory
                             (tramp-compat-temporary-file-directory)))
@@ -1111,7 +1113,19 @@ connection if a previous connection has died for some reason."
                  vec 3
                  "Connection reset, because remote host changed from `%s' to `%s'"
                  old-getprop new-getprop)
-                (tramp-adb-maybe-open-connection vec)))))))))
+                (tramp-adb-maybe-open-connection vec)))
+
+            ;; Set "remote-path" connection property.  This is needed
+            ;; for eshell.
+            (tramp-adb-send-command vec "echo \\\"$PATH\\\"")
+            (tramp-set-connection-property
+             vec "remote-path"
+             (split-string
+              (with-current-buffer (tramp-get-connection-buffer vec)
+                ;; Read the expression.
+                (goto-char (point-min))
+                (read (current-buffer)))
+              ":" 'omit-nulls))))))))
 
 (provide 'tramp-adb)
 ;;; tramp-adb.el ends here
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 79f8d82b02b..d83599a6662 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -5181,34 +5181,6 @@ function cell is returned to be applied on a buffer."
          (t
           (format "%s <%%s" coding)))))))
 
-;;; Integration of eshell.el:
-
-(eval-when-compile
-  (defvar eshell-path-env))
-
-;; eshell.el keeps the path in `eshell-path-env'.  We must change it
-;; when `default-directory' points to another host.
-(defun tramp-eshell-directory-change ()
-  "Set `eshell-path-env' to $PATH of the host related to `default-directory'."
-  (setq eshell-path-env
-        (if (file-remote-p default-directory)
-            (with-parsed-tramp-file-name default-directory nil
-              (mapconcat
-               'identity
-               (tramp-get-remote-path v)
-               ":"))
-          (getenv "PATH"))))
-
-(eval-after-load "esh-util"
-  '(progn
-     (tramp-eshell-directory-change)
-     (add-hook 'eshell-directory-change-hook
-               'tramp-eshell-directory-change)
-     (add-hook 'tramp-unload-hook
-               (lambda ()
-                 (remove-hook 'eshell-directory-change-hook
-                              'tramp-eshell-directory-change)))))
-
 (add-hook 'tramp-unload-hook
           (lambda ()
             (unload-feature 'tramp-sh 'force)))
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 7c393622ffc..2c4aac0ac8a 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -381,6 +381,23 @@ Useful for su and sudo methods mostly."
   :group 'tramp
   :type 'string)
 
+;;;###tramp-autoload
+(defcustom tramp-default-host-alist nil
+  "Default host to use for specific method/user pairs.
+This is an alist of items (METHOD USER HOST).  The first matching item
+specifies the host to use for a file name which does not specify a
+host.  METHOD and HOST are regular expressions or nil, which is
+interpreted as a regular expression which always matches.  If no entry
+matches, the variable `tramp-default-host' takes effect.
+
+If the file name does not specify the method, lookup is done using the
+empty string for the method name."
+  :group 'tramp
+  :version "24.4"
+  :type '(repeat (list (choice :tag "Method regexp" regexp sexp)
+                       (choice :tag "  User regexp" regexp sexp)
+                       (choice :tag "    Host name" string (const nil)))))
+
 (defcustom tramp-default-proxies-alist nil
   "Route to be followed for specific host/user pairs.
 This is an alist of items (HOST USER PROXY).  The first matching
@@ -918,7 +935,7 @@ See `tramp-file-name-structure' for more explanations.")
 This regexp should match partial Tramp file names only.
 
 Please note that the entry in `file-name-handler-alist' is made when
-this file (tramp.el) is loaded.  This means that this variable must be set
+this file \(tramp.el\) is loaded.  This means that this variable must be set
 before loading tramp.el.  Alternatively, `file-name-handler-alist' can be
 updated after changing this variable.
 
@@ -1163,6 +1180,15 @@ This is USER, if non-nil. Otherwise, do a lookup in
   "Return the right host string to use.
 This is HOST, if non-nil. Otherwise, it is `tramp-default-host'."
   (or (and (> (length host) 0) host)
+      (let ((choices tramp-default-host-alist)
+            lhost item)
+        (while choices
+          (setq item (pop choices))
+          (when (and (string-match (or (nth 0 item) "") (or method ""))
+                     (string-match (or (nth 1 item) "") (or user "")))
+            (setq lhost (nth 2 item))
+            (setq choices nil)))
+        lhost)
       tramp-default-host))
 
 (defun tramp-dissect-file-name (name &optional nodefault)
@@ -3861,6 +3887,39 @@ Only works for Bourne-like shells."
                                       t t result)))
         result))))
 
+;;; Integration of eshell.el:
+
+(eval-when-compile
+  (defvar eshell-path-env))
+
+;; eshell.el keeps the path in `eshell-path-env'.  We must change it
+;; when `default-directory' points to another host.
+(defun tramp-eshell-directory-change ()
+  "Set `eshell-path-env' to $PATH of the host related to `default-directory'."
+  (setq eshell-path-env
+        (if (file-remote-p default-directory)
+            (with-parsed-tramp-file-name default-directory nil
+              (mapconcat
+               'identity
+               (or
+                ;; When `tramp-own-remote-path' is in `tramp-remote-path',
+                ;; the remote path is only set in the session cache.
+                (tramp-get-connection-property
+                 (tramp-get-connection-process v) "remote-path" nil)
+                (tramp-get-connection-property v "remote-path" nil))
+               ":"))
+          (getenv "PATH"))))
+
+(eval-after-load "esh-util"
+  '(progn
+     (tramp-eshell-directory-change)
+     (add-hook 'eshell-directory-change-hook
+               'tramp-eshell-directory-change)
+     (add-hook 'tramp-unload-hook
+               (lambda ()
+                 (remove-hook 'eshell-directory-change-hook
+                              'tramp-eshell-directory-change)))))
+
 ;; Checklist for `tramp-unload-hook'
 ;; - Unload all `tramp-*' packages
 ;; - Reset `file-name-handler-alist'
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index d55feaa3c1a..bcb5f721ae8 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -1206,7 +1206,8 @@ changed with `comment-style'."
 (defun comment-box (beg end &optional arg)
   "Comment out the BEG .. END region, putting it inside a box.
 The numeric prefix ARG specifies how many characters to add to begin- and
-end- comment markers additionally to what `comment-add' already specifies."
+end- comment markers additionally to what variable `comment-add' already
+specifies."
   (interactive "*r\np")
   (comment-normalize-vars)
   (let ((comment-style (if (cadr (assoc comment-style comment-styles))
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index b348d22d6de..56a76c7d680 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,380 @@
+2013-01-13  Bastien Guerry  <bzg@gnu.org>
+
+        * org-compat.el (org-condition-case-unless-debug): Delete.
+
+        * org-odt.el (org-odt-cleanup-xml-buffers): Use
+        `condition-case' instead of `org-condition-case-unless-debug',
+        which is now deleted.
+
+        * org-capture.el (org-capture-templates-contexts):
+        * org-agenda.el (org-agenda-custom-commands-contexts):
+        Docstring fix.
+
+        * org.el (org-get-tags-at): Remove duplicate inherited tags.
+
+        * org-agenda.el (org-agenda-show-inherited-tags): Allow to be set
+        to 'always or to a list of agenda types.
+        (org-agenda-finalize): Rework conditions under which inherited
+        tags should be made available even when not displayed.
+        (org-search-view, org-agenda-get-todos)
+        (org-agenda-get-timestamps, org-agenda-get-sexps)
+        (org-agenda-get-progress, org-agenda-get-scheduled)
+        (org-agenda-get-blocks): Use new possible values of
+        `org-agenda-show-inherited-tags'.
+
+        * org.el (org-open-at-point): Fix opening all links at point.
+
+        * org-agenda.el (org-get-entries-from-diary): Turn off
+        `diary-file-name-prefix' instead of
+        `diary-file-name-prefix-function', the former is checked before
+        the latter.
+
+        * org.el (org-edit-special): Check for table.el before checking
+        for Org tables.
+
+2013-01-13  Michael Albinus  <michael.albinus@gmx.de>
+
+        * ob-eval.el (org-babel-shell-command-on-region): Use
+        `executable-find' for local `shell-file-name'.
+
+2013-01-09  Achim Gratz  <Stromeko@Stromeko.de>
+
+        * org-faces.el: Define face alias mode-line for XEmacs (it's
+        called modeline there).
+
+        * org-compat.el (org-no-popups): New wrapper macro which let-binds
+        the correct variables to suppress popup windows depending on the
+        Emacs version in use.  This is a compile-time decision when
+        byte-compiling.
+
+        * org.el (org-get-location, org-switch-to-buffer-other-window):
+        Use the wrapper `org-no-popups' to let-bind the correct variables
+        for suppression of popup windows.
+
+        * org-compat.el (user-error): Defalias to `error' for Emacsen that
+        don't have it.
+
+        * org-agenda.el (org-agenda-write): Use org-called-interactively-p
+        instead of called-interactively-p.
+
+        * org.el (org-find-invisible-foreground): Do not use the value of
+        variables `default-frame-alist', `initial-frame-alist' and
+        `window-system-default-frame-alist' when their symbol is not bound.
+
+2013-01-09  Bastien Guerry  <bzg@gnu.org>
+
+        * org-src.el (org-edit-src-code): Fix bug when trying to edit a
+        table.el table.
+
+        * org-agenda.el (org-agenda-finalize): Inhibit readonly for the
+        whole function.
+
+        * org.el (org-entry-get): Speed up by let-binding some variables
+        only if needed.  Also fix a bug: consider an empty drawer as no drawer.
+
+        * org-agenda.el (org-search-view, org-agenda-get-todos)
+        (org-agenda-get-timestamps, org-agenda-get-sexps)
+        (org-agenda-get-progress, org-agenda-get-deadlines)
+        (org-agenda-get-scheduled, org-agenda-get-blocks)
+        (org-agenda-change-all-lines): Get local tags only.
+        (org-agenda-use-tag-inheritance): New option.
+        (org-agenda-finalize): When `org-agenda-use-tag-inheritance'
+        is non-nil, possibly reset tags in the agenda buffer.
+        (org-agenda-check-type): Enhance docstring.
+
+        * org.el (org-use-tag-inheritance): Fix typo in docstring.
+
+        * org-agenda.el (org-float): Don't alias `org-float'.
+
+        * org.el (org-scan-tags): The skipper already checks for archived
+        entries.
+
+        * org.el (org-refresh-properties): Rename from
+        `org-refresh-effort-properties' and use two new parameters.
+        (org-agenda-prepare-buffers): Use `org-refresh-properties'.
+        Also refresh the 'org-appt-warntime text property.
+
+        * org-clock.el (org-clock-in): Use the renamed defun.
+
+        * org-icalendar.el (org-icalendar-print-entries):
+        Refresh the 'org-appt-warntime property.
+        (org-icalendar-print-entries):
+        * org-agenda.el (org-agenda-get-timestamps)
+        (org-agenda-get-sexps, org-agenda-get-deadlines)
+        (org-agenda-get-scheduled): Do not use `org-entry-get' to get the
+        "APPT_WARNTIME" property value.
+
+        * org.el (org-id-link-to-org-use-id): Fix compiler warning.
+
+        * org-agenda.el (org-agenda-format-item): Do not use
+        `org-get-effort' to get the effort text property.
+        (org-agenda-get-sexps): Use `org-back-to-heading' when setting tags.
+
+        * org-clock.el (org-clock-in): Refresh effort properties.
+
+        * org.el (org-refresh-effort-properties): New defun.
+        (org-get-effort): Delete.
+        (org-set-effort):
+        (org-property-next-allowed-value): Set the 'org-effort text property.
+        (org-agenda-prepare-buffers): Refresh effort properties.
+
+        * org.el (org-read-date): Let-bind `mouse-autoselect-window' to
+        nil so that the mouse doesn't jump when the option is set to t globally.
+
+        * org-agenda.el (org-agenda-dim-blocked-tasks): Default to nil.
+        (org-agenda-dim-blocked-tasks): Make interactive and allow an
+        optional parameter 'invisible to hide blocked tasks instead of
+        just dimming them.
+        (org-agenda-mode-map): Bind `org-agenda-dim-blocked-tasks' to "#".
+
+        * org-agenda.el (org-agenda-finalize): Don't try to align tags
+        when there are no tags.  Only try to draw the habit consistency
+        graph when there is a habit in the buffer.  Only mark clocking
+        task when there is one.
+
+        * org.el (org-adaptive-fill-function): DTRT in `message-mode'.
+
+        * org.el (org-get-priority): Save match data even when using
+        `org-get-priority-function'.
+
+        * org-mobile.el (org-mobile-create-index-file):
+        Possibly normalize `org-todo-keywords'.
+
+        * org-mobile.el (org-mobile-push): Use the correct agenda buffer names.
+
+        * org.el (org-store-link): Use `org-id-link-to-org-use-id' instead
+        of the obsolete variable name.
+
+        * org.el (org-fontify-meta-lines-and-blocks-1):
+        Fix bug when fontifying keywords with no value.
+
+        * org.el (org-goto-auto-isearch): Enhance docstring.
+        (org-goto-map): Make a defun, so that the customized value of
+        org-goto-auto-isearch is correctly initialized.
+        (org-goto): Initialize the keymap with `org-goto-map'.
+        (org-get-location): Use *Org Help* as a temporary buffer.
+        Tell whether auto-isearch is on or off.
+
+        * org-exp.el (org-export-as-org): Remove useless argument.
+
+        * org-docbook.el (org-export-as-docbook-batch)
+        (org-export-region-as-docbook, org-export-as-docbook-pdf):
+        Fix the number of arguments.
+        (org-export-as-docbook): Remove useless argument.
+
+        * org.el (org-speed-commands-default): Use ":" instead of ";" for
+        `org-set-tags-command', which is consistent with ":" in agenda
+        view.  Use "=" for `org-columns".
+
+        * org.el (org-sparse-tree): Fix redundant information in prompt.
+
+        * org-exp.el (org-export-string): Fix number of arguments passed
+        to the org-export-as-* functions.
+
+        * org-latex.el (org-export-as-latex): Fix typo in docstring.
+
+        * org-list.el (org-cycle-include-plain-lists): Docstring enhancement.
+
+        * org.el (org-fontify-meta-lines-and-blocks-1): Fix fontification
+        bug when fontifying a keyword with no associated value.
+        (org-cycle-internal-local): Don't run hooks when cycling a plain
+        list before first headline.
+        (org-ctrl-c-ctrl-c): Throw a user error when trying to toggle a
+        blocked checkbox.
+        (org-indent-line): Fix table formulas indenting.
+
+        * org-agenda.el (org-agenda-open-link): Fix bug when no link is
+        matched.  Return a message instead of an error.
+        (org-agenda-priority): Remove useless parameter and fix showing
+        priority in agenda buffers.
+
+        * org-macs.el (org-with-buffer-modified-unmodified): New macro.
+
+        * org.el (org-entry-blocked-p): Use the new macro.
+
+        * org-src.el (org-edit-src-exit): Don't comma-escape the content
+        of a fixed width region.
+
+        * org.el (org-blocker-hook): Update the docstring to mention that
+        functions in this hook should not modify the buffer.
+        (org-trigger-hook): Small docstring fix.
+        (org-entry-blocked-p): Use `with-buffer-modified-unmodified'
+        so that the function never modifies the buffer.
+
+        * org-agenda.el (org-agenda-open-link): Allow to open an internal
+        link by using the new `org-offer-links-in-entry' function.
+
+        * org.el (org-offer-links-in-entry): Do not open the link directly
+        through `org-open-link-from-string', only offer to select a link
+        and return a cons with the link (as a string) and the end of entry.
+        (org-open-at-point): Use `org-offer-links-in-entry' correctly.
+
+        * org.el (org-cycle-internal-local):
+        Fix bug: allow headings with leading blank characters.
+
+        * org-clock.el (org-clock-persist):
+        Docstring fix: document the 'history value.
+
+        * org.el (org-insert-link): Fix bug when inserting links to
+        headlines containing the ">" character.
+
+        * org-crypt.el (org-at-encrypted-entry-p): Fix search boundary.
+
+        * org-compat.el (org-delete-directory): New compatibility function
+        for Emacs 22, where `delete-directory' does not support recursive
+        deletion.
+
+        * org-odt.el (org-odt-cleanup-xml-buffers):
+        Use the new compatibility function.
+
+        * org.el (org-table-map-tables): Fix allowed blocks.
+
+        * org.el (org-edit-special):
+        * org-src.el (org-edit-src-code): Fix regression: allow editing
+        HTML and LaTeX source blocks again.
+
+        * org.el (org-nonsticky-props): Add `htmlize-link'.
+        (org-nonsticky-props): Add `htmlize-link'.
+
+        * org.el (org-edit-special):
+        * org-src.el (org-edit-src-code): Don't edit in verbatim blocks.
+
+        * org-table.el (org-table-fedit-lisp-indent)
+        (orgtbl-self-insert-command): Use `org-delete-backward-char'
+        instead of `backward-delete-char'.
+
+        * org-src.el (org-edit-src-code): Fix another bug about editing
+        special blocks "example" and "verbatim".
+
+        * org.el (org-structure-template-alist): Add verbatim.
+        (org-edit-special): Fix bug about editing special blocks
+        "example" and "verbatim".
+
+        * org.el (org-delete-backward-char, org-delete-char):
+        Save match data, `delete-backward-char' and `delete-char' don't.
+
+        * org.el (org-enable-table-editor, org-insert-heading)
+        (org-remove-timestamp-with-keyword, org-self-insert-command):
+        * org-table.el (org-table-fedit-lisp-indent)
+        (orgtbl-self-insert-command):
+        * org-latex.el (org-export-latex-subcontent):
+        * org-clock.el (org-clocktable-write-default):
+        * org-ascii.el (org-export-ascii-preprocess):
+        Use `delete-backward-char' instead of `backward-delete-char'.
+
+        * org.el (org-todo): Ignore the comment string when changing the
+        TODO state of a headline.
+        (org-edit-special): Fix docstring.
+        (org-in-src-block-p): Small enhancement.
+
+        * org-publish.el (org-publish-org-to): Call `org-export-as-*'
+        functions with the correct list of arguments.
+
+        * org-html.el (org-export-as-html): Delete obsolete arg `hidden'.
+        (org-export-as-html-and-open, org-export-as-html-batch)
+        (org-export-region-as-html): Don't use obsolete arg.
+
+        * org-ascii.el (org-export-as-ascii): Delete obsolete arg `hidden'.
+        (org-export-as-ascii-to-buffer): Don't use obsolete arg.
+
+        * org.el (org-in-fixed-width-region-p): Save match data.
+        (org-in-src-block-p): Use case-folding for searching the block
+        boundaries.
+        (org-activate-plain-links, org-activate-angle-links)
+        (org-activate-bracket-links): Prevent link activation in
+        source code blocks.
+
+        * org-odt.el (org-odt-cleanup-xml-buffers): Fix Emacs Bug#13197 by
+        setting the correct buffer before marking it unmodified to
+        silently kill him.
+
+        * org.el (org-set-font-lock-defaults): Don't activate links in
+        source code blocks and fixed-width regions.
+
+        * org-agenda.el (org-agenda-finalize): Fix links activation.
+
+        * org.el (org-open-at-point): Throw the correct error on
+        non-links.  Use `user-error' instead of `error'.
+
+        * org.el (org-in-fixed-width-region-p): Define before use.
+
+        * org-src.el (org-in-src-block-p): Declare function.
+
+        * org-compat.el: Fix bug: don't use `eval-when-compile' when
+        aliasing `user-error'.
+
+        * org-agenda.el (org-agenda-skip): Only check if point is
+        inside a code block, not at a code block.
+
+        * org.el (org-in-fixed-width-region-p):
+        Rewrite using org-element.el.
+
+        * org.el (org-fill-paragraph): Fill correctly in source code block.
+
+        * org.el (org-in-fixed-width-region-p): New function.
+        (org-edit-special): Fix bug: make sure to DTRT in every
+        special environment.  Also use the new function to check
+        against fixed-width environment.
+
+        * org-src.el (org-edit-src-code): Check if we are in a source code
+        block with `org-in-src-block-p'.  Slightly reformat the docstring.
+
+        * org.el (org-in-src-block-p): Return t when point is at the
+        #+BEGIN_SRC/#+END_SRC lines unless the new optional parameter
+        'inside is set to t.
+
+        * ob-exp.el (obe-marker): Delete useless var.
+
+        * org-src.el (org-edit-src-code): Fix bug triggered by the sexp
+        (copy-marker nil) on Emacs <24.1.
+
+2013-01-09  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * org-agenda.el (org-agenda-get-restriction-and-command):
+        * org-capture.el (org-capture-place-template):
+        * org-colview.el (org-dblock-write:columnview):
+        * org-mobile.el (org-mobile-locate-entry):
+        * org-table.el (org-table-convert-region):
+        * org.el (org-update-statistics-cookies): Use `point-marker'.
+
+2013-01-09  Eric Schulte  <eric.schulte@gmx.com>
+
+        * org-exp.el (org-export-string): Pass the dir option on through
+        to any subsequent export functions.
+
+2013-01-09  Henning Weiss  <hdweiss@gmail.com>  (tiny change)
+
+        * org-mobile.el (org-mobile-sumo-agenda-command): Remove match
+        description from block agendas when they have a title.
+
+2013-01-09  Jambunathan K  <kjambunathan@gmail.com>
+
+        * org-odt.el (org-export-as-odt-batch): Init `org-odt-zip-dir'.
+        Fix Emacs Bug#13254.
+
+        * org-odt.el (org-odt-format-org-link): Add check for presence of
+        description in headline links.
+
+2013-01-09  Michael Gauland  <mike_gauland@stanfordalumni.org>  (tiny change)
+
+        * org-src.el: Create a marker to pass to copy-marker.
+
+2013-01-09  Nicolas Goaziou  <n.goaziou@gmail.com>
+
+        * org.el (org-setup-filling): Set `auto-fill-inhibit-regexp' to
+        nil because `org-adaptive-fill-function' already determines which
+        lines should be filled.
+
+        * org.el (org-fill-paragraph): Small refactoring.
+
+        * org-element.el (org-element--parse-elements)
+        (org-element-at-point): Fix parsing of a list in a block in a list.
+
+2013-01-09  Sebastien Vauban  <wxhgmqzgwmuf-geNee64TY+gS+FvcfC7Uqw@public.gmane.org>
+
+        * org.el (org-copy-subtree, org-paste-subtree):
+        Fix whitespace handling when copying/pasting a subtree.
+
 2012-12-20  Michael Albinus  <michael.albinus@gmx.de>
 
         * ob.el (org-babel-temp-file): Fix setting of
@@ -129,9 +506,8 @@
         * ob-haskell.el (org-export-as-latex): Don't use the obsoleted
         argument `hidden'.
 
-        * org.el (org-refile): Run within `with-demoted-errors' so
-        that a corrupted bookmark file does not stop the refile
-        process.
+        * org.el (org-refile): Run within `with-demoted-errors' so that a
+        corrupted bookmark file does not stop the refile process.
 
         * org-capture.el (org-capture-bookmark-last-stored-position):
         Ditto for the capture process.
diff --git a/lisp/org/ob-eval.el b/lisp/org/ob-eval.el
index afa880bd90c..22d2bcf288e 100644
--- a/lisp/org/ob-eval.el
+++ b/lisp/org/ob-eval.el
@@ -30,6 +30,7 @@
 (eval-when-compile (require 'cl))
 
 (defvar org-babel-error-buffer-name "*Org-Babel Error Output*")
+(declare-function org-babel-temp-file "ob-core" (prefix &optional suffix))
 
 (defun org-babel-eval-error-notify (exit-code stderr)
   "Open a buffer to display STDERR and a message with the value of EXIT-CODE."
@@ -136,12 +137,23 @@ specifies the value of ERROR-BUFFER."
                        t)))
   (let ((input-file (org-babel-temp-file "input-"))
         (error-file (if error-buffer (org-babel-temp-file "scor-") nil))
+        ;; Unfortunately, `executable-find' does not support file name
+        ;; handlers.  Therefore, we could use it in the local case
+        ;; only.
         (shell-file-name
-         (if (file-executable-p
-              (concat (file-remote-p default-directory) shell-file-name))
-             shell-file-name
-           "/bin/sh"))
+         (cond ((and (not (file-remote-p default-directory))
+                     (executable-find shell-file-name))
+                shell-file-name)
+               ((file-executable-p
+                 (concat (file-remote-p default-directory) shell-file-name))
+                shell-file-name)
+               ("/bin/sh")))
         exit-status)
+    ;; There is an error in `process-file' when `error-file' exists.
+    ;; This is fixed in Emacs trunk as of 2012-12-21; let's use this
+    ;; workaround for now.
+    (unless (file-remote-p default-directory)
+      (delete-file error-file))
     (if (or replace
             (and output-buffer
                  (not (or (bufferp output-buffer) (stringp output-buffer)))))
diff --git a/lisp/org/ob-exp.el b/lisp/org/ob-exp.el
index c62a6a8211d..37a9f71cf59 100644
--- a/lisp/org/ob-exp.el
+++ b/lisp/org/ob-exp.el
@@ -28,7 +28,6 @@
 (eval-when-compile
   (require 'cl))
 
-(defvar obe-marker nil)
 (defvar org-current-export-file)
 (defvar org-babel-lob-one-liner-regexp)
 (defvar org-babel-ref-split-regexp)
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index e6e6166ffe2..ca8459ca33d 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -840,7 +840,7 @@ entry, the rest of the entry will not be searched."
   :group 'org-agenda-daily/weekly
   :type 'boolean)
 
-(defcustom org-agenda-dim-blocked-tasks t
+(defcustom org-agenda-dim-blocked-tasks nil
   "Non-nil means dim blocked tasks in the agenda display.
 This causes some overhead during agenda construction, but if you
 have turned on `org-enforce-todo-dependencies',
@@ -857,6 +857,7 @@ that is blocked because of checkboxes will never be made invisible, it
 will only be dimmed."
   :group 'org-agenda-daily/weekly
   :group 'org-agenda-todo-list
+  :version "24.3"
   :type '(choice
           (const :tag "Do not dim" nil)
           (const :tag "Dim to a gray face" t)
@@ -1647,9 +1648,53 @@ When non-nil, this must be the number of minutes, e.g. 60 for one hour."
           (const :tag "No default duration")))
 
 (defcustom org-agenda-show-inherited-tags t
-  "Non-nil means show inherited tags in each agenda line."
+  "Non-nil means show inherited tags in each agenda line.
+
+When this option is set to 'always, it take precedences over
+`org-agenda-use-tag-inheritance' and inherited tags are shown
+in every agenda.
+
+When this option is set to t (the default), inherited tags are
+shown when they are available, i.e. when the value of
+`org-agenda-use-tag-inheritance' has been taken into account.
+
+This can be set to a list of agenda types in which the agenda
+must display the inherited tags.  Available types are 'todo,
+'agenda, 'search and 'timeline.
+
+When set to nil, never show inherited tags in agenda lines."
   :group 'org-agenda-line-format
-  :type 'boolean)
+  :group 'org-agenda
+  :version "24.3"
+  :type '(choice
+          (const :tag "Show inherited tags when available" t)
+          (const :tag "Always show inherited tags" 'always)
+          (repeat :tag "Show inherited tags only in selected agenda types"
+                  (symbol :tag "Agenda type"))))
+
+(defcustom org-agenda-use-tag-inheritance '(todo search timeline agenda)
+  "List of agenda view types where to use tag inheritance.
+
+In tags/tags-todo/tags-tree agenda views, tag inheritance is
+controlled by `org-use-tag-inheritance'.  In other agenda types,
+`org-use-tag-inheritance' is not used for the selection of the
+agenda entries.  Still, you may want the agenda to be aware of
+the inherited tags anyway, e.g. for later tag filtering.
+
+Allowed value are 'todo, 'search, 'timeline and 'agenda.
+
+This variable has no effect if `org-agenda-show-inherited-tags'
+is set to 'always.  In that case, the agenda is aware of those
+tags.
+
+The default value sets tags in every agenda type.  Setting this
+option to nil will speed up non-tags agenda view a lot."
+  :group 'org-agenda
+  :version "24.3"
+  :type '(choice
+          (const :tag "Use tag inheritance in all agenda types" t)
+          (repeat :tag "Use tag inheritance in selected agenda types"
+                  (symbol :tag "Agenda type"))))
 
 (defcustom org-agenda-hide-tags-regexp nil
   "Regular expression used to filter away specific tags in agenda views.
@@ -2012,6 +2057,7 @@ The following commands are available:
 (org-defkey org-agenda-mode-map "\C-c\C-w" 'org-agenda-refile)
 (org-defkey org-agenda-mode-map "m"        'org-agenda-bulk-mark)
 (org-defkey org-agenda-mode-map "*"        'org-agenda-bulk-mark-all)
+(org-defkey org-agenda-mode-map "#"        'org-agenda-dim-blocked-tasks)
 (org-defkey org-agenda-mode-map "%"        'org-agenda-bulk-mark-regexp)
 (org-defkey org-agenda-mode-map "u"        'org-agenda-bulk-unmark)
 (org-defkey org-agenda-mode-map "U"        'org-agenda-bulk-unmark-all)
@@ -2344,7 +2390,7 @@ For example, if you have a custom agenda command \"p\" and you
 want this command to be accessible only from plain text files,
 use this:
 
-   '((\"p\" (in-file . \"\\.txt\")))
+   '((\"p\" ((in-file . \"\\.txt\"))))
 
 Here are the available contexts definitions:
 
@@ -2360,7 +2406,7 @@ accessible if there is at least one valid check.
 You can also bind a key to another agenda custom command
 depending on contextual rules.
 
-    '((\"p\" \"q\" (in-file . \"\\.txt\")))
+    '((\"p\" \"q\" ((in-file . \"\\.txt\"))))
 
 Here it means: in .txt files, use \"p\" as the key for the
 agenda command otherwise associated with \"q\".  (The command
@@ -2664,7 +2710,7 @@ L   Timeline for current buffer         #   List stuck projects (!=configure)
                       (add-text-properties (match-beginning 2) (match-end 2)
                                            '(face bold) header))
                     header)))
-        (setq header-end (move-marker (make-marker) (point)))
+        (setq header-end (point-marker))
         (while t
           (setq custom1 custom)
           (when (eq rmheader t)
@@ -3194,7 +3240,7 @@ If AGENDA-BUFFER-NAME, use this as the buffer name for the agenda to write."
                  (kill-buffer (current-buffer))
                  (message "Plain text written to %s" file))))))))
     (set-buffer (or agenda-bufname
-                    (and (called-interactively-p 'any) (buffer-name))
+                    (and (org-called-interactively-p 'any) (buffer-name))
                     org-agenda-buffer-name)))
   (when open (org-open-file file)))
 
@@ -3514,44 +3560,66 @@ generating a new one."
     (save-excursion
       (let ((inhibit-read-only t))
         (goto-char (point-min))
-        (while (org-activate-bracket-links (point-max))
-          (add-text-properties (match-beginning 0) (match-end 0)
-                               '(face org-link)))
-        (while (org-activate-plain-links (point-max))
-          (add-text-properties (match-beginning 0) (match-end 0)
-                               '(face org-link)))
-        (org-agenda-align-tags)
+        (save-excursion
+          (while (org-activate-bracket-links (point-max))
+            (add-text-properties (match-beginning 0) (match-end 0)
+                                 '(face org-link))))
+        (save-excursion
+          (while (org-activate-plain-links (point-max))
+            (add-text-properties (match-beginning 0) (match-end 0)
+                                 '(face org-link))))
+        (unless (eq org-agenda-remove-tags t)
+          (org-agenda-align-tags))
         (unless org-agenda-with-colors
-          (remove-text-properties (point-min) (point-max) '(face nil))))
-      (if (and (boundp 'org-agenda-overriding-columns-format)
-               org-agenda-overriding-columns-format)
-          (org-set-local 'org-agenda-overriding-columns-format
-                         org-agenda-overriding-columns-format))
-      (if (and (boundp 'org-agenda-view-columns-initially)
-               org-agenda-view-columns-initially)
-          (org-agenda-columns))
-      (when org-agenda-fontify-priorities
-        (org-agenda-fontify-priorities))
-      (when (and org-agenda-dim-blocked-tasks org-blocker-hook)
-        (org-agenda-dim-blocked-tasks))
-      ;; We need to widen when `org-agenda-finalize' is called from
-      ;; `org-agenda-change-all-lines' (e.g. in `org-agenda-clock-in')
-      (save-restriction
-        (widen)
-        (org-agenda-mark-clocking-task))
-      (when org-agenda-entry-text-mode
-        (org-agenda-entry-text-hide)
-        (org-agenda-entry-text-show))
-      (if (functionp 'org-habit-insert-consistency-graphs)
-          (org-habit-insert-consistency-graphs))
-      (let ((inhibit-read-only t))
-        (run-hooks 'org-agenda-finalize-hook))
-      (setq org-agenda-type (org-get-at-bol 'org-agenda-type))
-      (when (or org-agenda-tag-filter (get 'org-agenda-tag-filter :preset-filter))
-        (org-agenda-filter-apply org-agenda-tag-filter 'tag))
-      (when (or org-agenda-category-filter (get 'org-agenda-category-filter :preset-filter))
-        (org-agenda-filter-apply org-agenda-category-filter 'category))
-      (org-add-hook 'kill-buffer-hook 'org-agenda-reset-markers 'append 'local))))
+          (remove-text-properties (point-min) (point-max) '(face nil)))
+        (if (and (boundp 'org-agenda-overriding-columns-format)
+                 org-agenda-overriding-columns-format)
+            (org-set-local 'org-agenda-overriding-columns-format
+                           org-agenda-overriding-columns-format))
+        (if (and (boundp 'org-agenda-view-columns-initially)
+                 org-agenda-view-columns-initially)
+            (org-agenda-columns))
+        (when org-agenda-fontify-priorities
+          (org-agenda-fontify-priorities))
+        (when (and org-agenda-dim-blocked-tasks org-blocker-hook)
+          (org-agenda-dim-blocked-tasks))
+        ;; We need to widen when `org-agenda-finalize' is called from
+        ;; `org-agenda-change-all-lines' (e.g. in `org-agenda-clock-in')
+        (when org-clock-current-task
+          (save-restriction
+            (widen)
+            (org-agenda-mark-clocking-task)))
+        (when org-agenda-entry-text-mode
+          (org-agenda-entry-text-hide)
+          (org-agenda-entry-text-show))
+        (if (and (functionp 'org-habit-insert-consistency-graphs)
+                 (save-excursion (next-single-property-change (point-min) 'org-habit-p)))
+            (org-habit-insert-consistency-graphs))
+        (setq org-agenda-type (org-get-at-bol 'org-agenda-type))
+        (unless (or (eq org-agenda-show-inherited-tags 'always)
+                    (and (listp org-agenda-show-inherited-tags)
+                         (memq org-agenda-type org-agenda-show-inherited-tags))
+                    (and (eq org-agenda-show-inherited-tags t)
+                         (or (eq org-agenda-use-tag-inheritance t)
+                             (and (listp org-agenda-use-tag-inheritance)
+                                  (not (memq org-agenda-type
+                                             org-agenda-use-tag-inheritance))))))
+          (let (mrk)
+            (save-excursion
+              (goto-char (point-min))
+              (while (equal (forward-line) 0)
+                (when (setq mrk (or (get-text-property (point) 'org-hd-marker)
+                                    (get-text-property (point) 'org-hd-marker)))
+                  (put-text-property (point-at-bol) (point-at-eol)
+                                     'tags (org-with-point-at mrk
+                                             (delete-dups
+                                              (mapcar 'downcase (org-get-tags-at))))))))))
+        (run-hooks 'org-agenda-finalize-hook)
+        (when (or org-agenda-tag-filter (get 'org-agenda-tag-filter :preset-filter))
+          (org-agenda-filter-apply org-agenda-tag-filter 'tag))
+        (when (or org-agenda-category-filter (get 'org-agenda-category-filter :preset-filter))
+          (org-agenda-filter-apply org-agenda-category-filter 'category))
+        (org-add-hook 'kill-buffer-hook 'org-agenda-reset-markers 'append 'local)))))
 
 (defun org-agenda-mark-clocking-task ()
   "Mark the current clock entry in the agenda if it is present."
@@ -3607,15 +3675,18 @@ generating a new one."
                ((equal p h) 'bold)))
         (overlay-put ov 'org-type 'org-priority)))))
 
-(defun org-agenda-dim-blocked-tasks ()
+(defun org-agenda-dim-blocked-tasks (&optional invisible)
+  (interactive "P")
   "Dim currently blocked TODO's in the agenda display."
+  (message "Dim or hide blocked tasks...")
   (mapc (lambda (o) (if (eq (overlay-get o 'org-type) 'org-blocked-todo)
                         (delete-overlay o)))
         (overlays-in (point-min) (point-max)))
   (save-excursion
     (let ((inhibit-read-only t)
           (org-depend-tag-blocked nil)
-          (invis (eq org-agenda-dim-blocked-tasks 'invisible))
+          (invis (or (not (null invisible))
+                     (eq org-agenda-dim-blocked-tasks 'invisible)))
           org-blocked-by-checkboxes
           invis1 b e p ov h l)
       (goto-char (point-min))
@@ -3636,7 +3707,8 @@ generating a new one."
             (if invis1
                 (overlay-put ov 'invisible t)
               (overlay-put ov 'face 'org-agenda-dimmed-todo-face))
-            (overlay-put ov 'org-type 'org-blocked-todo)))))))
+            (overlay-put ov 'org-type 'org-blocked-todo))))))
+    (message "Dim or hide blocked tasks...done"))
 
 (defvar org-agenda-skip-function nil
   "Function to be called at each match during agenda construction.
@@ -3656,7 +3728,7 @@ A good way to set it is through options in `org-agenda-custom-commands'.")
 Also moves point to the end of the skipped region, so that search can
 continue from there."
   (let ((p (point-at-bol)) to)
-    (when (org-in-src-block-p) (throw :skip t))
+    (when (org-in-src-block-p t) (throw :skip t))
     (and org-agenda-skip-archived-trees (not org-agenda-archives-mode)
          (get-text-property p :org-archived)
          (org-end-of-subtree t)
@@ -4251,7 +4323,7 @@ in `org-agenda-text-search-extra-files'."
                       'help-echo (format "mouse-2 or RET jump to location")))
          (full-words org-agenda-search-view-force-full-words)
          (org-agenda-text-search-extra-files org-agenda-text-search-extra-files)
-         regexp rtn rtnall files file pos
+         regexp rtn rtnall files file pos inherited-tags
          marker category category-pos tags c neg re boolean
          ee txt beg end words regexps+ regexps- hdl-only buffer beg1 str)
     (unless (and (not edit-at)
@@ -4405,7 +4477,13 @@ in `org-agenda-text-search-extra-files'."
                         (setq marker (org-agenda-new-marker (point))
                               category (org-get-category)
                               category-pos (get-text-property (point) 'org-category-position)
-                              tags (org-get-tags-at (point))
+                              inherited-tags
+                              (or (eq org-agenda-show-inherited-tags 'always)
+                                  (memq 'todo org-agenda-show-inherited-tags)
+                                  (and (eq org-agenda-show-inherited-tags t)
+                                       (or (eq org-agenda-use-tag-inheritance t)
+                                           (memq 'todo org-agenda-use-tag-inheritance))))
+                              tags (org-get-tags-at nil (not inherited-tags))
                               txt (org-agenda-format-item
                                    ""
                                    (buffer-substring-no-properties
@@ -4935,7 +5013,7 @@ of what a project is and how to check if it stuck, customize the variable
          (pop-up-frames nil)
          (diary-list-entries-hook
           (cons 'org-diary-default-entry diary-list-entries-hook))
-         (diary-file-name-prefix-function nil) ; turn this feature off
+         (diary-file-name-prefix nil) ; turn this feature off
          (diary-modify-entry-list-string-function 'org-modify-diary-entry-string)
          entries
          (org-disable-agenda-to-diary t))
@@ -5211,7 +5289,7 @@ the documentation of `org-diary'."
                                               "\\|") "\\)"))
                           (t org-not-done-regexp))))
          marker priority category category-pos tags todo-state
-         ee txt beg end)
+         ee txt beg end inherited-tags)
     (goto-char (point-min))
     (while (re-search-forward regexp nil t)
       (catch :skip
@@ -5229,7 +5307,14 @@ the documentation of `org-diary'."
               category-pos (get-text-property (point) 'org-category-position)
               txt (org-trim
                    (buffer-substring (match-beginning 2) (match-end 0)))
-              tags (org-get-tags-at (point))
+              inherited-tags
+              (or (eq org-agenda-show-inherited-tags 'always)
+                  (and (listp org-agenda-show-inherited-tags)
+                       (memq 'todo org-agenda-show-inherited-tags))
+                  (and (eq org-agenda-show-inherited-tags t)
+                       (or (eq org-agenda-use-tag-inheritance t)
+                           (memq 'todo org-agenda-use-tag-inheritance))))
+              tags (org-get-tags-at nil (not inherited-tags))
               txt (org-agenda-format-item "" txt category tags t)
               priority (1+ (org-get-priority txt))
               todo-state (org-get-todo-state))
@@ -5356,7 +5441,8 @@ Do we have a reason to ignore this TODO entry because it has a time stamp?
            "\\|\\(<%%\\(([^>\n]+)\\)>\\)"))
          marker hdmarker deadlinep scheduledp clockp closedp inactivep
          donep tmp priority category category-pos ee txt timestr tags
-         b0 b3 e3 head todo-state end-of-match show-all warntime habitp)
+         b0 b3 e3 head todo-state end-of-match show-all warntime habitp
+         inherited-tags)
     (goto-char (point-min))
     (while (setq end-of-match (re-search-forward regexp nil t))
       (setq b0 (match-beginning 0)
@@ -5389,7 +5475,7 @@ Do we have a reason to ignore this TODO entry because it has a time stamp?
               clockp (and org-agenda-include-inactive-timestamps
                           (or (string-match org-clock-string tmp)
                               (string-match "]-+\\'" tmp)))
-              warntime (org-entry-get (point) "APPT_WARNTIME")
+              warntime (get-text-property (point) 'org-appt-warntime)
               donep (member todo-state org-done-keywords))
         (if (or scheduledp deadlinep closedp clockp
                 (and donep org-agenda-skip-timestamp-if-done))
@@ -5408,7 +5494,14 @@ Do we have a reason to ignore this TODO entry because it has a time stamp?
                      (assoc (point) deadline-position-alist))
                 (throw :skip nil))
             (setq hdmarker (org-agenda-new-marker)
-                  tags (org-get-tags-at))
+                  inherited-tags
+                  (or (eq org-agenda-show-inherited-tags 'always)
+                      (and (listp org-agenda-show-inherited-tags)
+                           (memq 'agenda org-agenda-show-inherited-tags))
+                      (and (eq org-agenda-show-inherited-tags t)
+                           (or (eq org-agenda-use-tag-inheritance t)
+                               (memq 'agenda org-agenda-use-tag-inheritance))))
+                  tags (org-get-tags-at nil (not inherited-tags)))
             (looking-at "\\*+[ \t]+\\([^\r\n]+\\)")
             (setq head (or (match-string 1) ""))
             (setq txt (org-agenda-format-item
@@ -5440,7 +5533,7 @@ Do we have a reason to ignore this TODO entry because it has a time stamp?
                               (abbreviate-file-name buffer-file-name))))
          (regexp "^&?%%(")
          marker category extra category-pos ee txt tags entry
-         result beg b sexp sexp-entry todo-state warntime)
+         result beg b sexp sexp-entry todo-state warntime inherited-tags)
     (goto-char (point-min))
     (while (re-search-forward regexp nil t)
       (catch :skip
@@ -5458,10 +5551,16 @@ Do we have a reason to ignore this TODO entry because it has a time stamp?
           (setq marker (org-agenda-new-marker beg)
                 category (org-get-category beg)
                 category-pos (get-text-property beg 'org-category-position)
-                tags (save-excursion (org-backward-heading-same-level 0)
-                                     (org-get-tags-at))
+                inherited-tags
+                (or (eq org-agenda-show-inherited-tags 'always)
+                    (and (listp org-agenda-show-inherited-tags)
+                         (memq 'agenda org-agenda-show-inherited-tags))
+                    (and (eq org-agenda-show-inherited-tags t)
+                         (or (eq org-agenda-use-tag-inheritance t)
+                             (memq 'agenda org-agenda-use-tag-inheritance))))
+                tags (org-get-tags-at nil (not inherited-tags))
                 todo-state (org-get-todo-state)
-                warntime (org-entry-get (point) "APPT_WARNTIME")
+                warntime (get-text-property (point) 'org-appt-warntime)
                 extra nil)
 
           (dolist (r (if (stringp result)
@@ -5510,7 +5609,6 @@ Do we have a reason to ignore this TODO entry because it has a time stamp?
   (org-no-warnings
    (let ((calendar-date-style 'european)        (european-calendar-style t))
      (diary-date day month year mark))))
-(defalias 'org-float 'diary-float)
 
 ;; Define the` org-class' function
 (defun org-class (y1 m1 d1 y2 m2 d2 dayname &rest skip-weeks)
@@ -5591,7 +5689,7 @@ please use `org-class' instead."
                     1 11))))
          (org-agenda-search-headline-for-time nil)
          marker hdmarker priority category category-pos tags closedp
-         statep clockp state ee txt extra timestr rest clocked)
+         statep clockp state ee txt extra timestr rest clocked inherited-tags)
     (goto-char (point-min))
     (while (re-search-forward regexp nil t)
       (catch :skip
@@ -5629,7 +5727,14 @@ please use `org-class' instead."
               (setq txt org-agenda-no-heading-message)
             (goto-char (match-beginning 0))
             (setq hdmarker (org-agenda-new-marker)
-                  tags (org-get-tags-at))
+                  inherited-tags
+                  (or (eq org-agenda-show-inherited-tags 'always)
+                      (and (listp org-agenda-show-inherited-tags)
+                           (memq 'todo org-agenda-show-inherited-tags))
+                      (and (eq org-agenda-show-inherited-tags t)
+                           (or (eq org-agenda-use-tag-inheritance t)
+                               (memq 'todo org-agenda-use-tag-inheritance))))
+                  tags (org-get-tags-at nil (not inherited-tags)))
             (looking-at "\\*+[ \t]+\\([^\r\n]+\\)")
             (setq txt (match-string 1))
             (when extra
@@ -5833,13 +5938,13 @@ See also the user option `org-agenda-clock-consistency-checks'."
                            (not (= diff 0))))
                   (setq txt nil)
                 (setq category (org-get-category)
-                      warntime (org-entry-get (point) "APPT_WARNTIME")
+                      warntime (get-text-property (point) 'org-appt-warntime)
                       category-pos (get-text-property (point) 'org-category-position))
                 (if (not (re-search-backward "^\\*+[ \t]+" nil t))
                     (setq txt org-agenda-no-heading-message)
                   (goto-char (match-end 0))
                   (setq pos1 (match-beginning 0))
-                  (setq tags (org-get-tags-at pos1))
+                  (setq tags (org-get-tags-at pos1 t))
                   (setq head (buffer-substring-no-properties
                               (point)
                               (progn (skip-chars-forward "^\r\n")
@@ -5907,7 +6012,7 @@ FRACTION is what fraction of the head-warning time has passed."
                   deadline-results))
          d2 diff pos pos1 category category-pos tags donep
          ee txt head pastschedp todo-state face timestr s habitp show-all
-         did-habit-check-p warntime)
+         did-habit-check-p warntime inherited-tags)
     (goto-char (point-min))
     (while (re-search-forward regexp nil t)
       (catch :skip
@@ -5923,7 +6028,7 @@ FRACTION is what fraction of the head-warning time has passed."
                   (match-string 1) d1 'past show-all
                   (current-buffer) pos)
               diff (- d2 d1)
-              warntime (org-entry-get (point) "APPT_WARNTIME"))
+              warntime (get-text-property (point) 'org-appt-warntime))
         (setq pastschedp (and todayp (< diff 0)))
         (setq did-habit-check-p nil)
         ;; When to show a scheduled item in the calendar:
@@ -5969,7 +6074,14 @@ FRACTION is what fraction of the head-warning time has passed."
                                 pastschedp))
                        (setq mm (assoc pos1 deadline-position-alist)))
                       (throw :skip nil)))
-                (setq tags (org-get-tags-at))
+                (setq inherited-tags
+                      (or (eq org-agenda-show-inherited-tags 'always)
+                          (and (listp org-agenda-show-inherited-tags)
+                               (memq 'agenda org-agenda-show-inherited-tags))
+                          (and (eq org-agenda-show-inherited-tags t)
+                               (or (eq org-agenda-use-tag-inheritance t)
+                                   (memq 'agenda org-agenda-use-tag-inheritance))))
+                      tags (org-get-tags-at nil (not inherited-tags)))
                 (setq head (buffer-substring-no-properties
                             (point)
                             (progn (skip-chars-forward "^\r\n") (point))))
@@ -6024,7 +6136,7 @@ FRACTION is what fraction of the head-warning time has passed."
          (regexp org-tr-regexp)
          (d0 (calendar-absolute-from-gregorian date))
          marker hdmarker ee txt d1 d2 s1 s2 category category-pos
-         todo-state tags pos head donep)
+         todo-state tags pos head donep inherited-tags)
     (goto-char (point-min))
     (while (re-search-forward regexp nil t)
       (catch :skip
@@ -6050,8 +6162,15 @@ FRACTION is what fraction of the head-warning time has passed."
                 (if (not (re-search-backward org-outline-regexp-bol nil t))
                     (setq txt org-agenda-no-heading-message)
                   (goto-char (match-beginning 0))
-                  (setq hdmarker (org-agenda-new-marker (point)))
-                  (setq tags (org-get-tags-at))
+                  (setq hdmarker (org-agenda-new-marker (point))
+                        inherited-tags
+                        (or (eq org-agenda-show-inherited-tags 'always)
+                            (and (listp org-agenda-show-inherited-tags)
+                                 (memq 'agenda org-agenda-show-inherited-tags))
+                            (and (eq org-agenda-show-inherited-tags t)
+                                 (or (eq org-agenda-use-tag-inheritance t)
+                                     (memq 'agenda org-agenda-use-tag-inheritance))))
+                        tags (org-get-tags-at nil (not inherited-tags)))
                   (looking-at "\\*+[ \t]+\\([^\r\n]+\\)")
                   (setq head (match-string 1))
                   (let ((remove-re
@@ -6212,12 +6331,7 @@ Any match of REMOVE-RE will be removed from TXT."
                                (match-string 2 txt))
                        t t txt))))
         (when (derived-mode-p 'org-mode)
-          (setq effort
-                (condition-case nil
-                    (org-get-effort
-                     (or (get-text-property 0 'org-hd-marker txt)
-                         (get-text-property 0 'org-marker txt)))
-                  (error nil)))
+          (setq effort (ignore-errors (get-text-property 0 'org-effort txt)))
           (when effort
             (setq neffort (org-duration-string-to-minutes effort)
                   effort (setq effort (concat "[" effort "]")))))
@@ -6735,7 +6849,8 @@ in the file.  Otherwise, restriction will be to the current subtree."
 
 (defun org-agenda-check-type (error &rest types)
   "Check if agenda buffer is of allowed type.
-If ERROR is non-nil, throw an error, otherwise just return nil."
+If ERROR is non-nil, throw an error, otherwise just return nil.
+Allowed types are 'agenda 'timeline 'todo 'tags 'search."
   (if (not org-agenda-type)
       (error "No Org agenda currently displayed")
     (if (memq org-agenda-type types)
@@ -7890,29 +8005,45 @@ If this information is not given, the function uses the tree at point."
     (unless no-update (org-agenda-redo))))
 
 (defun org-agenda-open-link (&optional arg)
-  "Follow the link in the current line, if any.
-This looks for a link in the displayed line in the agenda.  It also looks
-at the text of the entry itself."
+  "Open the link(s) in the current entry, if any.
+This looks for a link in the displayed line in the agenda.
+It also looks at the text of the entry itself."
   (interactive "P")
   (let* ((marker (or (org-get-at-bol 'org-hd-marker)
                      (org-get-at-bol 'org-marker)))
          (buffer (and marker (marker-buffer marker)))
          (prefix (buffer-substring
-                  (point-at-bol) (point-at-eol))))
+                  (point-at-bol) (point-at-eol)))
+         (lkall (org-offer-links-in-entry buffer marker arg prefix))
+         (lk (car lkall))
+         (lkend (cdr lkall))
+         trg)
     (cond
-     (buffer
+     ((and buffer (stringp lk))
       (with-current-buffer buffer
-        (save-excursion
-          (save-restriction
-            (widen)
-            (goto-char marker)
-            (org-offer-links-in-entry arg prefix)))))
+        (setq trg (and (string-match org-bracket-link-regexp lk)
+                       (match-string 1 lk)))
+        (if (or (not trg) (string-match org-any-link-re trg))
+            (save-excursion
+              (save-restriction
+                (widen)
+                (goto-char marker)
+                (when (search-forward lk nil lkend)
+                  (goto-char (match-beginning 0))
+                  (org-open-at-point))))
+          ;; This is an internal link, widen the buffer
+          (switch-to-buffer-other-window buffer)
+          (widen)
+          (goto-char marker)
+          (when (search-forward lk nil lkend)
+            (goto-char (match-beginning 0))
+            (org-open-at-point)))))
      ((or (org-in-regexp (concat "\\(" org-bracket-link-regexp "\\)"))
           (save-excursion
             (beginning-of-line 1)
             (looking-at (concat ".*?\\(" org-bracket-link-regexp "\\)"))))
       (org-open-link-from-string (match-string 1)))
-     (t (error "No link to open here")))))
+     (t (message "No link to open here")))))
 
 (defun org-agenda-copy-local-variable (var)
   "Get a variable from a referenced buffer and install it here."
@@ -8313,35 +8444,37 @@ If FORCE-TAGS is non nil, the car of it returns the new tags."
   (interactive)
   (org-agenda-priority 'down))
 
-(defun org-agenda-priority (&optional force-direction show)
+(defun org-agenda-priority (&optional force-direction)
   "Set the priority of line at point, also in Org-mode file.
 This changes the line at point, all other lines in the agenda referring to
-the same tree node, and the headline of the tree node in the Org-mode file."
+the same tree node, and the headline of the tree node in the Org-mode file.
+Called with a universal prefix arg, show the priority instead of setting it."
   (interactive "P")
-  (if (equal force-direction '(4)) (setq show t))
-  (unless org-enable-priority-commands
-    (error "Priority commands are disabled"))
-  (org-agenda-check-no-diary)
-  (let* ((marker (or (org-get-at-bol 'org-marker)
-                     (org-agenda-error)))
-         (hdmarker (org-get-at-bol 'org-hd-marker))
-         (buffer (marker-buffer hdmarker))
-         (pos (marker-position hdmarker))
-         (inhibit-read-only t)
-         newhead)
-    (org-with-remote-undo buffer
-      (with-current-buffer buffer
-        (widen)
-        (goto-char pos)
-        (org-show-context 'agenda)
-        (save-excursion
-          (and (outline-next-heading)
-               (org-flag-heading nil)))   ; show the next heading
-        (funcall 'org-priority force-direction show)
-        (end-of-line 1)
-        (setq newhead (org-get-heading)))
-      (org-agenda-change-all-lines newhead hdmarker)
-      (beginning-of-line 1))))
+  (if (equal force-direction '(4))
+      (org-show-priority)
+    (unless org-enable-priority-commands
+      (error "Priority commands are disabled"))
+    (org-agenda-check-no-diary)
+    (let* ((marker (or (org-get-at-bol 'org-marker)
+                       (org-agenda-error)))
+           (hdmarker (org-get-at-bol 'org-hd-marker))
+           (buffer (marker-buffer hdmarker))
+           (pos (marker-position hdmarker))
+           (inhibit-read-only t)
+           newhead)
+      (org-with-remote-undo buffer
+        (with-current-buffer buffer
+          (widen)
+          (goto-char pos)
+          (org-show-context 'agenda)
+          (save-excursion
+            (and (outline-next-heading)
+                 (org-flag-heading nil)))   ; show the next heading
+          (funcall 'org-priority force-direction)
+          (end-of-line 1)
+          (setq newhead (org-get-heading)))
+        (org-agenda-change-all-lines newhead hdmarker)
+        (beginning-of-line 1)))))
 
 ;; FIXME: should fix the tags property of the agenda line.
 (defun org-agenda-set-tags (&optional tag onoff)
diff --git a/lisp/org/org-ascii.el b/lisp/org/org-ascii.el
index cf3f2d14d1d..c5a4b3775e8 100644
--- a/lisp/org/org-ascii.el
+++ b/lisp/org/org-ascii.el
@@ -131,7 +131,7 @@ utf8      Use all UTF-8 characters")
   "Call `org-export-as-ascii` with output to a temporary buffer.
 No file is created.  The prefix ARG is passed through to `org-export-as-ascii'."
   (interactive "P")
-  (org-export-as-ascii arg nil nil "*Org ASCII Export*")
+  (org-export-as-ascii arg nil "*Org ASCII Export*")
   (when org-export-show-temporary-export-buffer
     (switch-to-buffer-other-window "*Org ASCII Export*")))
 
@@ -183,23 +183,19 @@ in a window.  A non-interactive call will only return the buffer."
     (goto-char end)
     (set-mark (point)) ;; to activate the region
     (goto-char beg)
-    (setq rtn (org-export-as-ascii
-               nil nil ext-plist
-               buffer body-only))
+    (setq rtn (org-export-as-ascii nil ext-plist buffer body-only))
     (if (fboundp 'deactivate-mark) (deactivate-mark))
     (if (and (org-called-interactively-p 'any) (bufferp rtn))
         (switch-to-buffer-other-window rtn)
       rtn)))
 
 ;;;###autoload
-(defun org-export-as-ascii (arg &optional hidden ext-plist
-                                to-buffer body-only pub-dir)
+(defun org-export-as-ascii (arg &optional ext-plist to-buffer body-only pub-dir)
   "Export the outline as a pretty ASCII file.
 If there is an active region, export only the region.
 The prefix ARG specifies how many levels of the outline should become
 underlined headlines, default is 3.    Lower levels will become bulleted
-lists.  When HIDDEN is non-nil, don't display the ASCII buffer.
-EXT-PLIST is a property list with external parameters overriding
+lists.  EXT-PLIST is a property list with external parameters overriding
 org-mode's default settings, but still inferior to file-local
 settings.  When TO-BUFFER is non-nil, create a buffer with that
 name and export to that buffer.  If TO-BUFFER is the symbol
diff --git a/lisp/org/org-capture.el b/lisp/org/org-capture.el
index 366dced717c..8a271b8d055 100644
--- a/lisp/org/org-capture.el
+++ b/lisp/org/org-capture.el
@@ -451,7 +451,7 @@ For example, if you have a capture template \"c\" and you want
 this template to be accessible only from `message-mode' buffers,
 use this:
 
-   '((\"c\" (in-mode . \"message-mode\")))
+   '((\"c\" ((in-mode . \"message-mode\"))))
 
 Here are the available contexts definitions:
 
@@ -467,11 +467,11 @@ accessible if there is at least one valid check.
 You can also bind a key to another agenda custom command
 depending on contextual rules.
 
-    '((\"c\" \"d\" (in-mode . \"message-mode\")))
+    '((\"c\" \"d\" ((in-mode . \"message-mode\"))))
 
-Here it means: in `message-mode buffers', use \"d\" as the
+Here it means: in `message-mode buffers', use \"c\" as the
 key for the capture template otherwise associated with \"d\".
-\(The template originally associated with \"q\" is not displayed
+\(The template originally associated with \"d\" is not displayed
 to avoid duplicates.)"
   :version "24.3"
   :group 'org-capture
@@ -979,7 +979,7 @@ it.  When it is a variable, retrieve the value.  Return whatever we get."
   (show-all)
   (goto-char (org-capture-get :pos))
   (org-set-local 'org-capture-target-marker
-                 (move-marker (make-marker) (point)))
+                 (point-marker))
   (org-set-local 'outline-level 'org-outline-level)
   (let* ((template (org-capture-get :template))
          (type (org-capture-get :type)))
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index 9ff0ff3e6de..c043dd19e11 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -35,6 +35,7 @@
 (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))
+(declare-function org-refresh-properties "org" (dprop tprop))
 (defvar org-time-stamp-formats)
 (defvar org-ts-what)
 (defvar org-frame-title-format-backup frame-title-format)
@@ -159,12 +160,15 @@ the clock can be resumed from that point."
 The clock is resumed when Emacs restarts.
 When this is t, both the running clock, and the entire clock
 history are saved.  When this is the symbol `clock', only the
-running clock is saved.
+running clock is saved.  When this is the symbol `history', only
+the clock history is saved.
 
-When Emacs restarts with saved clock information, the file containing the
-running clock as well as all files mentioned in the clock history will
-be visited.
-All this depends on running `org-clock-persistence-insinuate' in .emacs"
+When Emacs restarts with saved clock information, the file containing
+the running clock as well as all files mentioned in the clock history
+will be visited.
+
+All this depends on running `org-clock-persistence-insinuate' in your
+Emacs initialization file."
   :group 'org-clock
   :type '(choice
           (const :tag "Just the running clock" clock)
@@ -1078,6 +1082,7 @@ time as the start time \(see `org-clock-continuously' to
 make this the default behavior.)"
   (interactive "P")
   (setq org-clock-notification-was-shown nil)
+  (org-refresh-properties org-effort-property 'org-effort)
   (catch 'abort
     (let ((interrupting (and (not org-clock-resolving-clocks-due-to-idleness)
                              (org-clocking-p)))
@@ -1199,7 +1204,7 @@ make this the default behavior.)"
               (setq org-clock-start-time
                     (apply 'encode-time
                            (org-parse-time-string (match-string 1))))
-              (setq org-clock-effort (org-get-effort))
+              (setq org-clock-effort (get-text-property (point) 'org-effort))
               (setq org-clock-total-time (org-clock-sum-current-item
                                           (org-clock-get-sum-start))))
              ((eq org-clock-in-resume 'auto-restart)
@@ -1219,7 +1224,7 @@ make this the default behavior.)"
                 (beginning-of-line 1)
                 (org-indent-line-to (- (org-get-indentation) 2)))
               (insert org-clock-string " ")
-              (setq org-clock-effort (org-get-effort))
+              (setq org-clock-effort (get-text-property (point) 'org-effort))
               (setq org-clock-total-time (org-clock-sum-current-item
                                           (org-clock-get-sum-start)))
               (setq org-clock-start-time
diff --git a/lisp/org/org-colview.el b/lisp/org/org-colview.el
index 30adf6a3f72..5a59196baa1 100644
--- a/lisp/org/org-colview.el
+++ b/lisp/org/org-colview.el
@@ -1243,7 +1243,7 @@ PARAMS is a property list of parameters:
 :skip-empty-rows
           When t, skip rows where all specifiers other than ITEM are empty.
 :format   When non-nil, specify the column view format to use."
-  (let ((pos (move-marker (make-marker) (point)))
+  (let ((pos (point-marker))
         (hlines (plist-get params :hlines))
         (vlines (plist-get params :vlines))
         (maxlevel (plist-get params :maxlevel))
diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el
index bc13fa2c737..9292b994367 100644
--- a/lisp/org/org-compat.el
+++ b/lisp/org/org-compat.el
@@ -195,9 +195,8 @@ passed through to `fit-window-to-buffer'.  If SHRINK-ONLY is set, call
 ignored in this case."
   (cond ((if (fboundp 'window-full-width-p)
              (not (window-full-width-p window))
-           (> (frame-width) (window-width window)))
-         ;; do nothing if another window would suffer
-         )
+           ;; do nothing if another window would suffer
+           (> (frame-width) (window-width window))))
         ((and (fboundp 'fit-window-to-buffer) (not shrink-only))
          (fit-window-to-buffer window max-height min-height))
         ((fboundp 'shrink-window-if-larger-than-buffer)
@@ -257,7 +256,6 @@ Works on both Emacs and XEmacs."
       (when (boundp 'zmacs-regions)
         (setq zmacs-regions t)))))
 
-
 ;; Invisibility compatibility
 
 (defun org-remove-from-invisibility-spec (arg)
@@ -372,6 +370,20 @@ TIME defaults to the current time."
       (time-to-seconds (or time (current-time)))
     (float-time time)))
 
+;; `user-error' is only available from 24.2.50 on
+(unless (fboundp 'user-error)
+  (defalias 'user-error 'error))
+
+(defmacro org-no-popups (&rest body)
+  "Suppress popup windows.
+Let-bind some variables to nil around BODY to achieve the desired
+effect, which variables to use depends on the Emacs version."
+    (if (org-version-check "24.2.50" "" :predicate)
+        `(let (pop-up-frames display-buffer-alist)
+           ,@body)
+      `(let (pop-up-frames special-display-buffer-names special-display-regexps special-display-function)
+         ,@body)))
+
 (if (fboundp 'string-match-p)
     (defalias 'org-string-match-p 'string-match-p)
   (defun org-string-match-p (regexp string &optional start)
@@ -384,7 +396,7 @@ TIME defaults to the current time."
     (save-match-data
       (apply 'looking-at args))))
 
-                                        ; XEmacs does not have `looking-back'.
+;; XEmacs does not have `looking-back'.
 (if (fboundp 'looking-back)
     (defalias 'org-looking-back 'looking-back)
   (defun org-looking-back (regexp &optional limit greedy)
@@ -433,14 +445,26 @@ With two arguments, return floor and remainder of their quotient."
        'pop-to-buffer-same-window buffer-or-name norecord)
     (funcall 'switch-to-buffer buffer-or-name norecord)))
 
-;; `condition-case-unless-debug' has been introduced in Emacs 24.1
-;; `condition-case-no-debug' has been introduced in Emacs 23.1
-(defalias 'org-condition-case-unless-debug
-  (or (and (fboundp 'condition-case-unless-debug)
-           'condition-case-unless-debug)
-      (and (fboundp 'condition-case-no-debug)
-           'condition-case-no-debug)
-      'condition-case))
+;; RECURSIVE has been introduced with Emacs 23.2.
+;; This is copying and adapted from `tramp-compat-delete-directory'
+(defun org-delete-directory (directory &optional recursive)
+  "Compatibility function for `delete-directory'."
+  (if (null recursive)
+      (delete-directory directory)
+    (condition-case nil
+        (funcall 'delete-directory directory recursive)
+      ;; This Emacs version does not support the RECURSIVE flag.  We
+      ;; use the implementation from Emacs 23.2.
+      (wrong-number-of-arguments
+       (setq directory (directory-file-name (expand-file-name directory)))
+       (if (not (file-symlink-p directory))
+           (mapc (lambda (file)
+                   (if (eq t (car (file-attributes file)))
+                       (org-delete-directory file recursive)
+                     (delete-file file)))
+                 (directory-files
+                  directory 'full "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*")))
+       (delete-directory directory)))))
 
 ;;;###autoload
 (defmacro org-check-version ()
diff --git a/lisp/org/org-crypt.el b/lisp/org/org-crypt.el
index fdfd1d326da..2dfc4addcc2 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-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2013 Free Software Foundation, Inc.
 
 ;; Emacs Lisp Archive Entry
 ;; Filename: org-crypt.el
@@ -258,7 +258,7 @@ See `org-crypt-disable-auto-save'."
     (save-excursion
       (org-back-to-heading t)
       (search-forward "-----BEGIN PGP MESSAGE-----"
-                      (save-excursion (org-end-of-subtree t)) t))))
+                      (save-excursion (outline-next-heading)) t))))
 
 (defun org-crypt-use-before-save-magic ()
   "Add a hook to automatically encrypt entries before a file is saved to disk."
diff --git a/lisp/org/org-docbook.el b/lisp/org/org-docbook.el
index ba03e3160b1..5253d9100a5 100644
--- a/lisp/org/org-docbook.el
+++ b/lisp/org/org-docbook.el
@@ -274,14 +274,14 @@ For example:
 $ emacs --batch
         --load=$HOME/lib/emacs/org.el
         --visit=MyOrgFile.org --funcall org-export-as-docbook-batch"
-  (org-export-as-docbook 'hidden))
+  (org-export-as-docbook))
 
 ;;;###autoload
 (defun org-export-as-docbook-to-buffer ()
   "Call `org-export-as-docbook' with output to a temporary buffer.
 No file is created."
   (interactive)
-  (org-export-as-docbook nil nil "*Org DocBook Export*")
+  (org-export-as-docbook nil "*Org DocBook Export*")
   (when org-export-show-temporary-export-buffer
     (switch-to-buffer-other-window "*Org DocBook Export*")))
 
@@ -334,17 +334,14 @@ in a window.  A non-interactive call will only return the buffer."
     (goto-char end)
     (set-mark (point)) ;; To activate the region
     (goto-char beg)
-    (setq rtn (org-export-as-docbook
-               nil nil
-               buffer body-only))
+    (setq rtn (org-export-as-docbook nil buffer body-only))
     (if (fboundp 'deactivate-mark) (deactivate-mark))
     (if (and (org-called-interactively-p 'any) (bufferp rtn))
         (switch-to-buffer-other-window rtn)
       rtn)))
 
 ;;;###autoload
-(defun org-export-as-docbook-pdf (&optional hidden ext-plist
-                                            to-buffer body-only pub-dir)
+(defun org-export-as-docbook-pdf (&optional ext-plist to-buffer body-only pub-dir)
   "Export as DocBook XML file, and generate PDF file."
   (interactive "P")
   (if (or (not org-export-docbook-xslt-proc-command)
@@ -360,8 +357,7 @@ in a window.  A non-interactive call will only return the buffer."
            (org-combine-plists (org-default-export-plist)
                                ext-plist
                                (org-infile-export-plist))))
-         (docbook-buf (org-export-as-docbook hidden ext-plist
-                                             to-buffer body-only pub-dir))
+         (docbook-buf (org-export-as-docbook ext-plist to-buffer body-only pub-dir))
          (filename (buffer-file-name docbook-buf))
          (base (file-name-sans-extension filename))
          (fofile (concat base ".fo"))
@@ -398,8 +394,7 @@ in a window.  A non-interactive call will only return the buffer."
 (defvar org-heading-keyword-regexp-format) ; defined in org.el
 
 ;;;###autoload
-(defun org-export-as-docbook (&optional hidden ext-plist
-                                        to-buffer body-only pub-dir)
+(defun org-export-as-docbook (&optional ext-plist to-buffer body-only pub-dir)
   "Export the current buffer as a DocBook file.
 If there is an active region, export only the region.  When
 HIDDEN is obsolete and does nothing.  EXT-PLIST is a
diff --git a/lisp/org/org-element.el b/lisp/org/org-element.el
index 6b2a83de8bd..c8096aa3963 100644
--- a/lisp/org/org-element.el
+++ b/lisp/org/org-element.el
@@ -3808,7 +3808,8 @@ Elements are accumulated into ACC."
                 'section))
              (plain-list 'item)
              (table 'table-row))
-           (org-element-property :structure element)
+           (and (memq type '(item plain-list))
+                (org-element-property :structure element))
            granularity visible-only element))
          ;; ELEMENT has contents.  Parse objects inside, if
          ;; GRANULARITY allows it.
@@ -4249,8 +4250,11 @@ first element of current section."
                    (plain-list
                     (setq special-flag 'item
                           struct (org-element-property :structure element)))
-                   (table (setq special-flag 'table-row))
-                   (otherwise (setq special-flag nil)))
+                   (item (setq special-flag nil))
+                   (property-drawer
+                    (setq special-flag 'node-property struct nil))
+                   (table (setq special-flag 'table-row struct nil))
+                   (otherwise (setq special-flag nil struct nil)))
                  (setq end cend)
                  (goto-char cbeg)))))))))))
 
diff --git a/lisp/org/org-exp.el b/lisp/org/org-exp.el
index 1cf4cb5e054..82b9003e4fd 100644
--- a/lisp/org/org-exp.el
+++ b/lisp/org/org-exp.el
@@ -3047,12 +3047,11 @@ to the value of `temporary-file-directory'."
           (eval ;; convert to fmt -- mimicking `org-run-like-in-org-mode'
            (list 'let org-local-vars
                  (list (intern (format "org-export-as-%s" fmt))
-                       nil nil nil ''string t))))
+                       nil nil ''string t dir))))
       (delete-file tmp-file))))
 
 ;;;###autoload
-(defun org-export-as-org (arg &optional hidden ext-plist
-                              to-buffer body-only pub-dir)
+(defun org-export-as-org (arg &optional ext-plist to-buffer body-only pub-dir)
   "Make a copy with not-exporting stuff removed.
 The purpose of this function is to provide a way to export the source
 Org file of a webpage in Org format, but with sensitive and/or irrelevant
diff --git a/lisp/org/org-faces.el b/lisp/org/org-faces.el
index 80e81349f6a..606db0814c2 100644
--- a/lisp/org/org-faces.el
+++ b/lisp/org/org-faces.el
@@ -44,6 +44,9 @@
           (set-face-doc-string new-face docstring)))))
 (put 'org-copy-face 'lisp-indent-function 2)
 
+(when (featurep 'xemacs)
+  (put 'mode-line 'face-alias 'modeline))
+
 (defgroup org-faces nil
   "Faces in Org-mode."
   :tag "Org Faces"
diff --git a/lisp/org/org-html.el b/lisp/org/org-html.el
index 91df2ebcc4e..493d8a28afb 100644
--- a/lisp/org/org-html.el
+++ b/lisp/org/org-html.el
@@ -328,7 +328,7 @@ You can also customize this for each buffer, using something like
  * @licstart  The following is the entire license notice for the
  *  JavaScript code in %PATH.
  *
- * Copyright (C) 2012  MathJax
+ * Copyright (C) 2012-2013  MathJax
  *
  * Licensed under the Apache License, Version 2.0 (the \"License\");
  * you may not use this file except in compliance with the License.
@@ -793,7 +793,7 @@ If there is an active region, export only the region.
 The prefix ARG specifies how many levels of the outline should become
 headlines.  The default is 3.  Lower levels will become bulleted lists."
   (interactive "P")
-  (org-export-as-html arg 'hidden)
+  (org-export-as-html arg)
   (org-open-file buffer-file-name)
   (when org-export-kill-product-buffer-when-displayed
     (kill-buffer (current-buffer))))
@@ -806,14 +806,14 @@ emacs   --batch
         --load=$HOME/lib/emacs/org.el
         --eval \"(setq org-export-headline-levels 2)\"
         --visit=MyFile --funcall org-export-as-html-batch"
-  (org-export-as-html org-export-headline-levels 'hidden))
+  (org-export-as-html org-export-headline-levels))
 
 ;;;###autoload
 (defun org-export-as-html-to-buffer (arg)
   "Call `org-export-as-html` with output to a temporary buffer.
 No file is created.  The prefix ARG is passed through to `org-export-as-html'."
   (interactive "P")
-  (org-export-as-html arg nil nil "*Org HTML Export*")
+  (org-export-as-html arg nil "*Org HTML Export*")
   (when org-export-show-temporary-export-buffer
     (switch-to-buffer-other-window "*Org HTML Export*")))
 
@@ -865,9 +865,7 @@ in a window.  A non-interactive call will only return the buffer."
     (goto-char end)
     (set-mark (point)) ;; to activate the region
     (goto-char beg)
-    (setq rtn (org-export-as-html
-               nil nil ext-plist
-               buffer body-only))
+    (setq rtn (org-export-as-html nil ext-plist buffer body-only))
     (if (fboundp 'deactivate-mark) (deactivate-mark))
     (if (and (org-called-interactively-p 'any) (bufferp rtn))
         (switch-to-buffer-other-window rtn)
@@ -1171,14 +1169,12 @@ OPT-PLIST is the export options list."
 (defvar org-heading-keyword-regexp-format) ; defined in org.el
 
 ;;;###autoload
-(defun org-export-as-html (arg &optional hidden ext-plist
-                               to-buffer body-only pub-dir)
+(defun org-export-as-html (arg &optional ext-plist to-buffer body-only pub-dir)
   "Export the outline as a pretty HTML file.
 If there is an active region, export only the region.  The prefix
 ARG specifies how many levels of the outline should become
 headlines.  The default is 3.  Lower levels will become bulleted
-lists.  HIDDEN is obsolete and does nothing.
-EXT-PLIST is a property list with external parameters overriding
+lists.  EXT-PLIST is a property list with external parameters overriding
 org-mode's default settings, but still inferior to file-local
 settings.  When TO-BUFFER is non-nil, create a buffer with that
 name and export to that buffer.  If TO-BUFFER is the symbol
diff --git a/lisp/org/org-icalendar.el b/lisp/org/org-icalendar.el
index f13f46d68b9..12cd0584fa0 100644
--- a/lisp/org/org-icalendar.el
+++ b/lisp/org/org-icalendar.el
@@ -327,6 +327,7 @@ When COMBINE is non nil, add the category to each line."
         tmp pri categories location summary desc uid alarm alarm-time
         (sexp-buffer (get-buffer-create "*ical-tmp*")))
     (org-refresh-category-properties)
+    (org-refresh-properties "APPT_WARNTIME" 'org-appt-warntime)
     (save-excursion
       (goto-char (point-min))
       (while (re-search-forward re1 nil t)
@@ -357,7 +358,7 @@ When COMBINE is non nil, add the category to each line."
                         (org-id-get-create)
                       (or (org-id-get) (org-id-new)))
                 categories (org-export-get-categories)
-                alarm-time (org-entry-get nil "APPT_WARNTIME")
+                alarm-time (get-text-property (point) 'org-appt-warntime)
                 alarm-time (if alarm-time (string-to-number alarm-time) 0)
                 alarm ""
                 deadlinep nil scheduledp nil)
@@ -676,7 +677,7 @@ a time), or the day by one (if it does not contain a time)."
       (setq fmt (if have-time
                     (replace-regexp-in-string "%Z"
                                               org-icalendar-timezone
-                                              org-icalendar-date-time-format)
+                                              org-icalendar-date-time-format t)
                   ";VALUE=DATE:%Y%m%d"))
       (concat keyword (format-time-string fmt time
                                           (and (org-icalendar-use-UTC-date-timep)
diff --git a/lisp/org/org-inlinetask.el b/lisp/org/org-inlinetask.el
index 3748d392b38..43913acacde 100644
--- a/lisp/org/org-inlinetask.el
+++ b/lisp/org/org-inlinetask.el
@@ -75,6 +75,9 @@
 ;; Also, if you want to use refiling and archiving for inline tasks,
 ;; The END line must be present to make things work properly.
 ;;
+;; Note that you should not try to use inline tasks within plain list,
+;; visibility cycling is known to be problematic when doing so.
+;;
 ;; This package installs one new command:
 ;;
 ;; C-c C-x t      Insert a new inline task with END line
diff --git a/lisp/org/org-install.el b/lisp/org/org-install.el
index a31d8b79209..aca019fb823 100644
--- a/lisp/org/org-install.el
+++ b/lisp/org/org-install.el
@@ -1,8 +1,10 @@
-;;; org-install.el --- autogenerated file, do not edit
+;;; org-install.el --- backward compatibility file for obsolete configuration
 ;;
 ;;; Code:
 (warn "The file org-install is obsolete.
-Please change your configuration to (require 'org) instead.")
+It is provided here so that (require 'org-install) does not
+trigger an error for users with obsolete Emacs configuration.
+You can safely remove (require 'org-install) from your config.")
 
 (provide 'org-install)
 
diff --git a/lisp/org/org-jsinfo.el b/lisp/org/org-jsinfo.el
index 9a4046fff8b..08c01108b98 100644
--- a/lisp/org/org-jsinfo.el
+++ b/lisp/org/org-jsinfo.el
@@ -112,7 +112,7 @@ means to use the maximum value consistent with other options."
  * @licstart  The following is the entire license notice for the
  *  JavaScript code in %SCRIPT_PATH.
  *
- * Copyright (C) 2012  Sebastian Rose
+ * Copyright (C) 2012-2013  Sebastian Rose
  *
  *
  * The JavaScript code in this tag is free software: you can
diff --git a/lisp/org/org-latex.el b/lisp/org/org-latex.el
index 490a49d06e0..609bcbee103 100644
--- a/lisp/org/org-latex.el
+++ b/lisp/org/org-latex.el
@@ -872,7 +872,7 @@ no LaTeX header.
 When BODY-ONLY is set, don't produce the file header and footer,
 simply return the content of \\begin{document}...\\end{document},
 without even the \\begin{document} and \\end{document} commands.
-when PUB-DIR is set, use this as the publishing directory."
+When PUB-DIR is set, use this as the publishing directory."
   (interactive "P")
   (when (and (not body-only) arg (listp arg)) (setq body-only t))
   (run-hooks 'org-export-first-hook)
diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el
index d80e1717ce0..78cb2a621c7 100644
--- a/lisp/org/org-list.el
+++ b/lisp/org/org-list.el
@@ -144,15 +144,15 @@ item.  When the cursor is on an outline heading, plain lists are
 treated as text.  This is the most stable way of handling this,
 which is why it is the default.
 
-When this is the symbol `integrate', then during cycling, plain
-list items will *temporarily* be interpreted as outline headlines
-with a level given by 1000+i where i is the indentation of the
-bullet.  This setting can lead to strange effects when switching
-visibility to `children', because the first \"child\" in a
-subtree decides what children should be listed.  If that first
-\"child\" is a plain list item with an implied large level
-number, all true children and grand children of the outline
-heading will be exposed in a children' view."
+When this is the symbol `integrate', then integrate plain list
+items when cycling, as if they were children of outline headings.
+
+This setting can lead to strange effects when switching visibility
+to `children', because the first \"child\" in a subtree decides
+what children should be listed.  If that first \"child\" is a
+plain list item with an implied large level number, all true
+children and grand children of the outline heading will be
+exposed in a children' view."
   :group 'org-plain-lists
   :type '(choice
           (const :tag "Never" nil)
diff --git a/lisp/org/org-macs.el b/lisp/org/org-macs.el
index 04e26708d69..a44bdbe30fd 100644
--- a/lisp/org/org-macs.el
+++ b/lisp/org/org-macs.el
@@ -126,6 +126,15 @@ Also, do not record undo information."
          (org-move-to-column ,col)))))
 (def-edebug-spec org-preserve-lc (body))
 
+;; Copied from bookmark.el
+(defmacro org-with-buffer-modified-unmodified (&rest body)
+  "Run BODY while preserving the buffer's `buffer-modified-p' state."
+  (org-with-gensyms (was-modified)
+    `(let ((,was-modified (buffer-modified-p)))
+       (unwind-protect
+           (progn ,@body)
+         (set-buffer-modified-p ,was-modified)))))
+
 (defmacro org-without-partial-completion (&rest body)
   `(if (and (boundp 'partial-completion-mode)
             partial-completion-mode
diff --git a/lisp/org/org-mobile.el b/lisp/org/org-mobile.el
index 3f41d45f511..a410de0d775 100644
--- a/lisp/org/org-mobile.el
+++ b/lisp/org/org-mobile.el
@@ -304,12 +304,13 @@ Also exclude files matching `org-mobile-files-exclude-regexp'."
 
 ;;;###autoload
 (defun org-mobile-push ()
-  "Push the current state of Org affairs to the WebDAV directory.
+  "Push the current state of Org affairs to the target directory.
 This will create the index file, copy all agenda files there, and also
 create all custom agenda views, for upload to the mobile phone."
   (interactive)
   (let ((a-buffer (get-buffer org-agenda-buffer-name)))
-    (let ((org-agenda-buffer-name "*SUMO*")
+    (let ((org-agenda-curbuf-name org-agenda-buffer-name)
+          (org-agenda-buffer-name "*SUMO*")
           (org-agenda-tag-filter org-agenda-tag-filter)
           (org-agenda-redo-command org-agenda-redo-command))
       (save-excursion
@@ -329,15 +330,17 @@ create all custom agenda views, for upload to the mobile phone."
           (org-mobile-create-index-file)
           (message "Writing checksums...")
           (org-mobile-write-checksums)
-          (run-hooks 'org-mobile-post-push-hook))))
+          (run-hooks 'org-mobile-post-push-hook)))
+      (setq org-agenda-buffer-name org-agenda-curbuf-name
+            org-agenda-this-buffer-name org-agenda-curbuf-name))
     (redraw-display)
-    (when (and a-buffer (buffer-live-p a-buffer))
+    (when (buffer-live-p a-buffer)
       (if (not (get-buffer-window a-buffer))
-          (kill-buffer a-buffer)
-        (let ((cw (selected-window)))
-          (select-window (get-buffer-window a-buffer))
-          (org-agenda-redo)
-          (select-window cw)))))
+          (kill-buffer a-buffer)
+        (let ((cw (selected-window)))
+          (select-window (get-buffer-window a-buffer))
+          (org-agenda-redo)
+          (select-window cw)))))
   (message "Files for mobile viewer staged"))
 
 (defvar org-mobile-before-process-capture-hook nil
@@ -417,7 +420,8 @@ agenda view showing the flagged items."
         (target-file (expand-file-name org-mobile-index-file
                                        org-mobile-directory))
         file link-name todo-kwds done-kwds tags drawers entry kwds dwds twds)
-
+    (when (stringp (car def-todo))
+      (setq def-todo (list (cons 'sequence def-todo))))
     (org-agenda-prepare-buffers (mapcar 'car files-alist))
     (setq done-kwds (org-uniquify org-done-keywords-for-agenda))
     (setq todo-kwds (org-delete-all
@@ -536,7 +540,7 @@ The table of checksums is written to the file mobile-checksums."
                         (t (cons (car x) (cons "" (cdr x))))))
                 org-agenda-custom-commands)))
         (default-list '(("a" "Agenda" agenda) ("t" "All TODO" alltodo)))
-        thelist new e key desc type match settings cmds gkey gdesc gsettings cnt)
+        thelist atitle new e key desc type match settings cmds gkey gdesc gsettings cnt)
     (cond
      ((eq org-mobile-agendas 'custom)
       (setq thelist custom-list))
@@ -588,12 +592,13 @@ The table of checksums is written to the file mobile-checksums."
         (setq cnt 0)
         (while (setq e (pop cmds))
           (setq type (car e) match (nth 1 e) settings (nth 2 e))
+          (setq atitle (if (string= "" gdesc) match gdesc))
           (setq settings (append gsettings settings))
           (setq settings
                 (cons (list 'org-agenda-title-append
                             (concat "<after>KEYS=" gkey "#" (number-to-string
                                                              (setq cnt (1+ cnt)))
-                                    " TITLE: " gdesc " " match "</after>"))
+                                    " TITLE: " atitle "</after>"))
                       settings))
           (push (list type match settings) new)))))
     (and new (list "X" "SUMO" (reverse new)
@@ -615,12 +620,10 @@ The table of checksums is written to the file mobile-checksums."
           (delete-region (point) (point-at-eol)))
          ((get-text-property (point) 'org-agenda-structural-header)
           (setq in-date nil)
-          (setq app (get-text-property (point)
-                                       'org-agenda-title-append))
-          (setq short (get-text-property (point)
-                                         'short-heading))
+          (setq app (get-text-property (point) 'org-agenda-title-append))
+          (setq short (get-text-property (point) 'short-heading))
           (when (and short (looking-at ".+"))
-            (replace-match short)
+            (replace-match short nil t)
             (beginning-of-line 1))
           (when app
             (end-of-line 1)
@@ -983,7 +986,7 @@ is currently a noop.")
               (goto-char (point-max))
               (newline)
               (goto-char (point-max))
-              (move-marker (make-marker) (point)))))
+              (point-marker))))
       (let ((file (match-string 1 link))
             (path (match-string 2 link)))
         (setq file (org-link-unescape file))
diff --git a/lisp/org/org-odt.el b/lisp/org/org-odt.el
index 028554f5821..92228f37eb8 100644
--- a/lisp/org/org-odt.el
+++ b/lisp/org/org-odt.el
@@ -439,15 +439,15 @@ values.  See Info node `(emacs) File Variables'."
                                 "meta.xml" "styles.xml")))
                ;; kill all xml buffers
                (mapc (lambda (file)
-                       (let ((buf (find-file-noselect
-                                   (expand-file-name file org-odt-zip-dir) t)))
-                         (when (buffer-name buf)
-                           (set-buffer-modified-p nil)
-                           (kill-buffer buf))))
+                       (with-current-buffer
+                           (find-file-noselect
+                            (expand-file-name file org-odt-zip-dir) t)
+                         (set-buffer-modified-p nil)
+                         (kill-buffer)))
                      xml-files))
              ;; delete temporary directory.
-             (delete-directory org-odt-zip-dir t)))))
-     (org-condition-case-unless-debug err
+             (org-delete-directory org-odt-zip-dir t)))))
+     (condition-case err
          (prog1 (progn ,@body)
            (funcall --cleanup-xml-buffers))
        ((quit error)
@@ -474,7 +474,7 @@ emacs   --batch
         --load=$HOME/lib/emacs/org.el
         --eval \"(setq org-export-headline-levels 2)\"
         --visit=MyFile --funcall org-export-as-odt-batch"
-  (org-lparse-batch "odt"))
+  (org-odt-cleanup-xml-buffers (org-lparse-batch "odt")))
 
 ;;; org-export-as-odt
 ;;;###autoload
@@ -1727,6 +1727,7 @@ ATTR is a string of other attributes of the a element."
        ((and (string= type "")
              (or (not thefile) (string= thefile ""))
              (plist-get org-lparse-opt-plist :section-numbers)
+             (get-text-property 0 'org-no-description fragment)
              (setq sec-frag fragment)
              (or (string-match  "\\`sec\\(\\(-[0-9]+\\)+\\)" sec-frag)
                  (and (setq sec-frag
@@ -1756,7 +1757,11 @@ ATTR is a string of other attributes of the a element."
         (when (not (member type '("" "file")))
           (setq thefile (concat type ":" thefile)))
 
-        (let ((org-odt-suppress-xref nil))
+        (let ((org-odt-suppress-xref
+               ;; Typeset link to headlines with description, as a
+               ;; regular hyperlink.
+               (and (string= type "")
+                    (not (get-text-property 0 'org-no-description fragment)))))
           (org-odt-format-link
            (org-xml-format-desc desc) thefile attr)))))))
 
diff --git a/lisp/org/org-publish.el b/lisp/org/org-publish.el
index 1388df47d97..20c6a6860aa 100644
--- a/lisp/org/org-publish.el
+++ b/lisp/org/org-publish.el
@@ -577,7 +577,7 @@ PUB-DIR is the publishing directory."
         (setq export-buf-or-file
               (funcall (intern (concat "org-export-as-" format))
                        (plist-get plist :headline-levels)
-                       nil plist nil
+                       plist nil
                        (plist-get plist :body-only)
                        pub-dir))
         (when (and (bufferp export-buf-or-file)
diff --git a/lisp/org/org-src.el b/lisp/org/org-src.el
index 6dbf6d67fc5..501d30ab1d7 100644
--- a/lisp/org/org-src.el
+++ b/lisp/org/org-src.el
@@ -39,6 +39,8 @@
 
 (declare-function org-do-remove-indentation "org" (&optional n))
 (declare-function org-at-table.el-p "org" ())
+(declare-function org-in-src-block-p "org" (&optional inside))
+(declare-function org-in-block-p "org" (names))
 (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
@@ -201,41 +203,40 @@ There is a mode hook, and keybindings for `org-edit-src-exit' and
 `org-edit-src-save'")
 
 (defun org-edit-src-code (&optional context code edit-buffer-name)
-  "Edit the source CODE example at point.
-The example is copied to a separate buffer, and that buffer is
-switched to the correct language mode.  When done, exit with
-\\[org-edit-src-exit].  This will remove the original code in the
-Org buffer, and replace it with the edited version.  An optional
-argument CONTEXT is used by \\[org-edit-src-save] when calling
-this function.  See `org-src-window-setup' to configure the
-display of windows containing the Org buffer and the code
-buffer."
+  "Edit the source CODE block at point.
+The code is copied to a separate buffer and the appropriate mode
+is turned on.  When done, exit with \\[org-edit-src-exit].  This will
+remove the original code in the Org buffer, and replace it with the
+edited version.  An optional argument CONTEXT is used by \\[org-edit-src-save]
+when calling this function.  See `org-src-window-setup' to configure
+the display of windows containing the Org buffer and the code buffer."
   (interactive)
-  (unless (eq context 'save)
-    (setq org-edit-src-saved-temp-window-config (current-window-configuration)))
-  (let* ((mark (and (org-region-active-p) (mark)))
-         (case-fold-search t)
-         (info
-          ;; If the src region consists in no lines, we insert a blank
-          ;; line.
-          (let* ((temp (org-edit-src-find-region-and-lang))
-                 (beg (nth 0 temp))
-                 (end (nth 1 temp)))
-            (if (>= end beg) temp
-              (goto-char beg)
-              (insert "\n")
-              (org-edit-src-find-region-and-lang))))
-         (full-info (org-babel-get-src-block-info 'light))
-         (org-mode-p (derived-mode-p 'org-mode)) ;; derived-mode-p is reflexive
-         (beg (make-marker))
-         ;; Move marker with inserted text for case when src block is
-         ;; just one empty line, i.e. beg == end.
-         (end (copy-marker nil t))
-         (allow-write-back-p (null code))
-         block-nindent total-nindent ovl lang lang-f single lfmt buffer msg
-         begline markline markcol line col transmitted-variables)
-    (if (not info)
-        nil
+  (if (not (or (org-in-block-p '("src" "example" "latex" "html"))
+               (org-at-table.el-p)))
+      (user-error "Not in a source code or example block")
+    (unless (eq context 'save)
+      (setq org-edit-src-saved-temp-window-config (current-window-configuration)))
+    (let* ((mark (and (org-region-active-p) (mark)))
+           (case-fold-search t)
+           (info
+            ;; If the src region consists in no lines, we insert a blank
+            ;; line.
+            (let* ((temp (org-edit-src-find-region-and-lang))
+                   (beg (nth 0 temp))
+                   (end (nth 1 temp)))
+              (if (>= end beg) temp
+                (goto-char beg)
+                (insert "\n")
+                (org-edit-src-find-region-and-lang))))
+           (full-info (org-babel-get-src-block-info 'light))
+           (org-mode-p (derived-mode-p 'org-mode)) ;; derived-mode-p is reflexive
+           (beg (make-marker))
+           ;; Move marker with inserted text for case when src block is
+           ;; just one empty line, i.e. beg == end.
+           (end (copy-marker (make-marker) t))
+           (allow-write-back-p (null code))
+           block-nindent total-nindent ovl lang lang-f single lfmt buffer msg
+           begline markline markcol line col transmitted-variables)
       (setq beg (move-marker beg (nth 0 info))
             end (move-marker end (nth 1 info))
             msg (if allow-write-back-p
@@ -244,7 +245,7 @@ buffer."
                   "Exit with C-c ' (C-c and single quote)")
             code (or code (buffer-substring-no-properties beg end))
             lang (or (cdr (assoc (nth 2 info) org-src-lang-modes))
-                     (nth 2 info))
+                     (nth 2 info))
             lang (if (symbolp lang) (symbol-name lang) lang)
             single (nth 3 info)
             block-nindent (nth 5 info)
@@ -527,6 +528,14 @@ the language, a switch telling if the content should be in a single line."
         (pos (point))
         re1 re2 single beg end lang lfmt match-re1 ind entry)
     (catch 'exit
+      (when (org-at-table.el-p)
+        (re-search-backward "^[\t]*[^ \t|\\+]" nil t)
+        (setq beg (1+ (point-at-eol)))
+        (goto-char beg)
+        (or (re-search-forward "^[\t]*[^ \t|\\+]" nil t)
+            (progn (goto-char (point-max)) (newline)))
+        (setq end (1- (point-at-bol)))
+        (throw 'exit (list beg end 'table.el nil nil 0)))
       (while (setq entry (pop re-list))
         (setq re1 (car entry) re2 (nth 1 entry) lang (nth 2 entry)
               single (nth 3 entry))
@@ -557,16 +566,7 @@ the language, a switch telling if the content should be in a single line."
                         (throw 'exit
                                (list (match-end 0) end
                                      (org-edit-src-get-lang lang)
-                                     single lfmt ind)))))))))
-      (when (org-at-table.el-p)
-        (re-search-backward "^[\t]*[^ \t|\\+]" nil t)
-        (setq beg (1+ (point-at-eol)))
-        (goto-char beg)
-        (or (re-search-forward "^[\t]*[^ \t|\\+]" nil t)
-            (progn (goto-char (point-max)) (newline)))
-        (setq end (point-at-bol))
-        (setq ind (org-edit-src-get-indentation beg))
-        (throw 'exit (list beg end 'table.el nil nil ind))))))
+                                     single lfmt ind))))))))))))
 
 (defun org-edit-src-get-lang (lang)
   "Extract the src language."
@@ -633,7 +633,8 @@ with \",*\", \",#+\", \",,*\" and \",,#+\"."
   (unless (org-bound-and-true-p org-edit-src-from-org-mode)
     (error "This is not a sub-editing buffer, something is wrong"))
   (widen)
-  (let* ((beg org-edit-src-beg-marker)
+  (let* ((fixed-width-p (string-match "Fixed Width" (buffer-name)))
+         (beg org-edit-src-beg-marker)
          (end org-edit-src-end-marker)
          (ovl org-edit-src-overlay)
          (bufstr (buffer-string))
@@ -670,7 +671,8 @@ with \",*\", \",#+\", \",,*\" and \",,#+\"."
             (goto-char (point-max)) (insert "\\n")))
         (goto-char (point-min))
         (if (looking-at "\\s-*") (replace-match " ")))
-      (when (org-bound-and-true-p org-edit-src-from-org-mode)
+      (when (and (org-bound-and-true-p org-edit-src-from-org-mode)
+                 (not fixed-width-p))
         (org-escape-code-in-region (point-min) (point-max))
         (setq delta (+ delta
                        (save-excursion
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index b024770ce78..00b2eb4d028 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -509,10 +509,10 @@ nil      When nil, the command tries to be smart and figure out the
          re)
     (goto-char beg)
     (beginning-of-line 1)
-    (setq beg (move-marker (make-marker) (point)))
+    (setq beg (point-marker))
     (goto-char end)
     (if (bolp) (backward-char 1) (end-of-line 1))
-    (setq end (move-marker (make-marker) (point)))
+    (setq end (point-marker))
     ;; Get the right field separator
     (unless separator
       (goto-char beg)
@@ -1895,7 +1895,7 @@ it can be edited in place."
       (if (and (boundp 'font-lock-mode) font-lock-mode)
           (font-lock-fontify-block))))
    (t
-    (let ((pos (move-marker (make-marker) (point)))
+    (let ((pos (point-marker))
           (coord
            (if (eq org-table-use-standard-references t)
                (concat (org-number-to-letters (org-table-current-column))
@@ -3219,7 +3219,7 @@ Parameters get priority."
   (let ((key (org-table-current-field-formula 'key 'noerror))
         (eql (sort (org-table-get-stored-formulas 'noerror)
                    'org-table-formula-less-p))
-        (pos (move-marker (make-marker) (point)))
+        (pos (point-marker))
         (startline 1)
         (wc (current-window-configuration))
         (sel-win (selected-window))
@@ -3580,7 +3580,7 @@ With prefix ARG, apply the new formulas to the table."
             (beginning-of-line 1)
             (insert ind))
           (goto-char (point-max))
-          (backward-delete-char 1)))
+          (org-delete-backward-char 1)))
       (goto-char beg))
      (t nil))))
 
@@ -4235,7 +4235,7 @@ overwritten, and the table is not marked as requiring realignment."
            (looking-at "[^|\n]*  +|"))
       (let (org-table-may-need-update)
         (goto-char (1- (match-end 0)))
-        (backward-delete-char 1)
+        (org-delete-backward-char 1)
         (goto-char (match-beginning 0))
         (self-insert-command N))
     (setq org-table-may-need-update t)
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index de434885b12..e62eba3cf83 100644
--- a/lisp/org/org-version.el
+++ b/lisp/org/org-version.el
@@ -5,13 +5,13 @@
 (defun org-release ()
   "The release version of org-mode.
   Inserted by installing org-mode or when a release is made."
-   (let ((org-release "7.9.2+"))
+   (let ((org-release "7.9.3d"))
      org-release))
 ;;;###autoload
 (defun org-git-version ()
   "The Git version of org-mode.
   Inserted by installing org-mode or when a release is made."
-   (let ((org-git-version "7.9.2+-GNU-Emacs-24-3 (commit 488eea)"))
+   (let ((org-git-version "7.9.3d-GNU-Emacs-24-3 (commit e8f5b0ad)"))
      org-git-version))
 ;;;###autoload
 (defvar org-odt-data-dir "/usr/share/emacs/etc/org"
diff --git a/lisp/org/org.el b/lisp/org/org.el
index d4120b4224e..9409feca178 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -1219,7 +1219,15 @@ See also the QUOTE keyword."
   :type 'boolean)
 
 (defcustom org-goto-auto-isearch t
-  "Non-nil means typing characters in `org-goto' starts incremental search."
+  "Non-nil means typing characters in `org-goto' starts incremental search.
+When nil, you can use these keybindings to navigate the buffer:
+
+  q    Quit the org-goto interface
+  n    Go to the next visible heading
+  p    Go to the previous visible heading
+  f    Go one heading forward on same level
+  b    Go one heading backward on same level
+  u    Go one heading up"
   :group 'org-edit-structure
   :type 'boolean)
 
@@ -2236,8 +2244,9 @@ Lisp variable `org-state'."
 (defvar org-blocker-hook nil
   "Hook for functions that are allowed to block a state change.
 
-Each function gets as its single argument a property list, see
-`org-trigger-hook' for more information about this list.
+Functions in this hook should not modify the buffer.
+Each function gets as its single argument a property list,
+see `org-trigger-hook' for more information about this list.
 
 If any of the functions in this hook returns nil, the state change
 is blocked.")
@@ -2245,8 +2254,8 @@ is blocked.")
 (defvar org-trigger-hook nil
   "Hook for functions that are triggered by a state change.
 
-Each function gets as its single argument a property list with at least
-the following elements:
+Each function gets as its single argument a property list with at
+least the following elements:
 
  (:type type-of-change :position pos-at-entry-start
   :from old-state :to new-state)
@@ -2979,7 +2988,7 @@ When nil, only the tags directly given in a specific line apply there.
 This may also be a list of tags that should be inherited, or a regexp that
 matches tags that should be inherited.  Additional control is possible
 with the variable  `org-tags-exclude-from-inheritance' which gives an
-explicit list of tags to be excluded from inheritance., even if the value of
+explicit list of tags to be excluded from inheritance, even if the value of
 `org-use-tag-inheritance' would select it for inheritance.
 
 If this option is t, a match early-on in a tree can lead to a large
@@ -3952,7 +3961,7 @@ If TABLE-TYPE is non-nil, also check for table.el-type tables."
         (beginning-of-line 1)
         (when (and (looking-at org-table-line-regexp)
                    ;; Exclude tables in src/example/verbatim/clocktable blocks
-                   (not (org-in-block-p '("src" "example"))))
+                   (not (org-in-block-p '("src" "example" "verbatim" "clocktable"))))
           (save-excursion (funcall function))
           (or (looking-at org-table-line-regexp)
               (forward-char 1)))
@@ -5007,13 +5016,15 @@ The following commands are available:
 (defun org-find-invisible-foreground ()
   (let ((candidates (remove
                      "unspecified-bg"
-                     (list
-                      (face-background 'default)
-                      (face-background 'org-default)
-                      (cdr (assoc 'background-color default-frame-alist))
-                      (cdr (assoc 'background-color initial-frame-alist))
-                      (cdr (assoc 'background-color window-system-default-frame-alist))
-                      (face-foreground 'org-hide)))))
+                     (nconc
+                      (list (face-background 'default)
+                            (face-background 'org-default))
+                      (mapcar
+                       (lambda (alist)
+                         (when (boundp alist)
+                           (cdr (assoc 'background-color (symbol-value alist)))))
+                       '(default-frame-alist initial-frame-alist window-system-default-frame-alist))
+                      (list (face-foreground 'org-hide))))))
     (car (remove nil candidates))))
 
 (defun org-current-time ()
@@ -5284,7 +5295,7 @@ will be prompted for."
     (and move (backward-char 1))))
 
 (defconst org-nonsticky-props
-  '(mouse-face highlight keymap invisible intangible help-echo org-linked-text))
+  '(mouse-face highlight keymap invisible intangible help-echo org-linked-text htmlize-link))
 
 (defsubst org-rear-nonsticky-at (pos)
   (add-text-properties (1- pos) pos (list 'rear-nonsticky org-nonsticky-props)))
@@ -5293,12 +5304,13 @@ will be prompted for."
   "Run through the buffer and add overlays to links."
   (catch 'exit
     (let (f)
-      (when (re-search-forward (concat org-plain-link-re) limit t)
+      (when (and (re-search-forward (concat org-plain-link-re) limit t)
+                 (not (org-in-src-block-p)))
         (org-remove-flyspell-overlays-in (match-beginning 0) (match-end 0))
         (setq f (get-text-property (match-beginning 0) 'face))
-        (if (or (eq f 'org-tag)
-                (and (listp f) (memq 'org-tag f)))
-            nil
+        (unless (or (org-in-src-block-p)
+                    (eq f 'org-tag)
+                    (and (listp f) (memq 'org-tag f)))
           (add-text-properties (match-beginning 0) (match-end 0)
                                (list 'mouse-face 'highlight
                                      'face 'org-link
@@ -5410,9 +5422,9 @@ by a #."
                  '(font-lock-fontified t invisible t)
                '(font-lock-fontified t face org-document-info-keyword)))
             (add-text-properties
-             (match-beginning 6) (match-end 6)
+             (match-beginning 6) (1+ (match-end 6))
              (if (string-equal dc1 "+title:")
-                 '(font-lock-fontified t face org-document-title)
+                 '(font-lock-fontified t face org-document-title)
                '(font-lock-fontified t face org-document-info))))
            ((or (equal dc1 "+results")
                 (member dc1 '("+begin:" "+end:" "+caption:" "+label:"
@@ -5437,7 +5449,8 @@ by a #."
 
 (defun org-activate-angle-links (limit)
   "Run through the buffer and add overlays to links."
-  (if (re-search-forward org-angle-link-re limit t)
+  (if (and (re-search-forward org-angle-link-re limit t)
+           (not (org-in-src-block-p)))
       (progn
         (org-remove-flyspell-overlays-in (match-beginning 0) (match-end 0))
         (add-text-properties (match-beginning 0) (match-end 0)
@@ -5465,7 +5478,8 @@ by a #."
 
 (defun org-activate-bracket-links (limit)
   "Run through the buffer and add overlays to bracketed links."
-  (if (re-search-forward org-bracket-link-regexp limit t)
+  (if (and (re-search-forward org-bracket-link-regexp limit t)
+           (not (org-in-src-block-p)))
       (let* ((help (concat "LINK: "
                            (org-match-string-no-properties 1)))
              ;; FIXME: above we should remove the escapes.
@@ -6254,11 +6268,7 @@ in special contexts.
             (setq has-children (org-list-has-child-p (point) struct)))
         (org-back-to-heading)
         (setq eoh (save-excursion (outline-end-of-heading) (point)))
-        (setq eos (save-excursion
-                    (org-end-of-subtree t)
-                    (unless (eobp)
-                      (skip-chars-forward " \t\n"))
-                    (if (eobp) (point) (1- (point)))))
+        (setq eos (save-excursion (1- (org-end-of-subtree t t))))
         (setq has-children
               (or (save-excursion
                     (let ((level (funcall outline-level)))
@@ -6283,7 +6293,8 @@ in special contexts.
     (cond
      ((= eos eoh)
       ;; Nothing is hidden behind this heading
-      (run-hook-with-args 'org-pre-cycle-hook 'empty)
+      (unless (org-before-first-heading-p)
+        (run-hook-with-args 'org-pre-cycle-hook 'empty))
       (message "EMPTY ENTRY")
       (setq org-cycle-subtree-status nil)
       (save-excursion
@@ -6296,7 +6307,8 @@ in special contexts.
                (not (setq children-skipped
                           org-cycle-skip-children-state-if-no-children))))
       ;; Entire subtree is hidden in one line: children view
-      (run-hook-with-args 'org-pre-cycle-hook 'children)
+      (unless (org-before-first-heading-p)
+        (run-hook-with-args 'org-pre-cycle-hook 'children))
       (if (org-at-item-p)
           (org-list-set-item-visibility (point-at-bol) struct 'children)
         (org-show-entry)
@@ -6324,24 +6336,28 @@ in special contexts.
         (outline-next-heading)
         (if (outline-invisible-p) (org-flag-heading nil)))
       (setq org-cycle-subtree-status 'children)
-      (run-hook-with-args 'org-cycle-hook 'children))
+      (unless (org-before-first-heading-p)
+        (run-hook-with-args 'org-cycle-hook 'children)))
      ((or children-skipped
           (and (eq last-command this-command)
                (eq org-cycle-subtree-status 'children)))
       ;; We just showed the children, or no children are there,
       ;; now show everything.
-      (run-hook-with-args 'org-pre-cycle-hook 'subtree)
+      (unless (org-before-first-heading-p)
+        (run-hook-with-args 'org-pre-cycle-hook 'subtree))
       (outline-flag-region eoh eos nil)
       (message (if children-skipped "SUBTREE (NO CHILDREN)" "SUBTREE"))
       (setq org-cycle-subtree-status 'subtree)
-      (run-hook-with-args 'org-cycle-hook 'subtree))
+      (unless (org-before-first-heading-p)
+        (run-hook-with-args 'org-cycle-hook 'subtree)))
      (t
       ;; Default action: hide the subtree.
       (run-hook-with-args 'org-pre-cycle-hook 'folded)
       (outline-flag-region eoh eos t)
       (message "FOLDED")
       (setq org-cycle-subtree-status 'folded)
-      (run-hook-with-args 'org-cycle-hook 'folded)))))
+      (unless (org-before-first-heading-p)
+        (run-hook-with-args 'org-cycle-hook 'folded))))))
 
 ;;;###autoload
 (defun org-global-cycle (&optional arg)
@@ -6745,42 +6761,47 @@ Optional arguments START and END can be used to limit the range."
 
 (defvar org-goto-window-configuration nil)
 (defvar org-goto-marker nil)
-(defvar org-goto-map
-  (let ((map (make-sparse-keymap)))
-    (let ((cmds '(isearch-forward isearch-backward kill-ring-save set-mark-command mouse-drag-region universal-argument org-occur)) cmd)
-      (while (setq cmd (pop cmds))
-        (substitute-key-definition cmd cmd map global-map)))
-    (suppress-keymap map)
-    (org-defkey map "\C-m"     'org-goto-ret)
-    (org-defkey map [(return)] 'org-goto-ret)
-    (org-defkey map [(left)]   'org-goto-left)
-    (org-defkey map [(right)]  'org-goto-right)
-    (org-defkey map [(control ?g)] 'org-goto-quit)
-    (org-defkey map "\C-i" 'org-cycle)
-    (org-defkey map [(tab)] 'org-cycle)
-    (org-defkey map [(down)] 'outline-next-visible-heading)
-    (org-defkey map [(up)] 'outline-previous-visible-heading)
-    (if org-goto-auto-isearch
-        (if (fboundp 'define-key-after)
-            (define-key-after map [t] 'org-goto-local-auto-isearch)
-          nil)
-      (org-defkey map "q" 'org-goto-quit)
-      (org-defkey map "n" 'outline-next-visible-heading)
-      (org-defkey map "p" 'outline-previous-visible-heading)
-      (org-defkey map "f" 'outline-forward-same-level)
-      (org-defkey map "b" 'outline-backward-same-level)
-      (org-defkey map "u" 'outline-up-heading))
-    (org-defkey map "/" 'org-occur)
-    (org-defkey map "\C-c\C-n" 'outline-next-visible-heading)
-    (org-defkey map "\C-c\C-p" 'outline-previous-visible-heading)
-    (org-defkey map "\C-c\C-f" 'outline-forward-same-level)
-    (org-defkey map "\C-c\C-b" 'outline-backward-same-level)
-    (org-defkey map "\C-c\C-u" 'outline-up-heading)
-    map))
+(defvar org-goto-map)
+(defun org-goto-map ()
+  "Set the keymap `org-goto'."
+  (setq org-goto-map
+        (let ((map (make-sparse-keymap)))
+          (let ((cmds '(isearch-forward isearch-backward kill-ring-save set-mark-command
+                                        mouse-drag-region universal-argument org-occur))
+                cmd)
+            (while (setq cmd (pop cmds))
+              (substitute-key-definition cmd cmd map global-map)))
+          (suppress-keymap map)
+          (org-defkey map "\C-m"     'org-goto-ret)
+          (org-defkey map [(return)] 'org-goto-ret)
+          (org-defkey map [(left)]   'org-goto-left)
+          (org-defkey map [(right)]  'org-goto-right)
+          (org-defkey map [(control ?g)] 'org-goto-quit)
+          (org-defkey map "\C-i" 'org-cycle)
+          (org-defkey map [(tab)] 'org-cycle)
+          (org-defkey map [(down)] 'outline-next-visible-heading)
+          (org-defkey map [(up)] 'outline-previous-visible-heading)
+          (if org-goto-auto-isearch
+              (if (fboundp 'define-key-after)
+                  (define-key-after map [t] 'org-goto-local-auto-isearch)
+                nil)
+            (org-defkey map "q" 'org-goto-quit)
+            (org-defkey map "n" 'outline-next-visible-heading)
+            (org-defkey map "p" 'outline-previous-visible-heading)
+            (org-defkey map "f" 'outline-forward-same-level)
+            (org-defkey map "b" 'outline-backward-same-level)
+            (org-defkey map "u" 'outline-up-heading))
+          (org-defkey map "/" 'org-occur)
+          (org-defkey map "\C-c\C-n" 'outline-next-visible-heading)
+          (org-defkey map "\C-c\C-p" 'outline-previous-visible-heading)
+          (org-defkey map "\C-c\C-f" 'outline-forward-same-level)
+          (org-defkey map "\C-c\C-b" 'outline-backward-same-level)
+          (org-defkey map "\C-c\C-u" 'outline-up-heading)
+          map)))
 
 (defconst org-goto-help
-  "Browse buffer copy, to find location or copy text.  Just type for auto-isearch.
-RET=jump to location             [Q]uit and return to previous location
+  "Browse buffer copy, to find location or copy text.%s
+RET=jump to location             C-g=quit and return to previous location
 \[Up]/[Down]=next/prev headline   TAB=cycle visibility   [/] org-occur")
 
 (defvar org-goto-start-pos) ; dynamically scoped parameter
@@ -6806,6 +6827,7 @@ in the indirect buffer and expose the headline hierarchy above.
 With a prefix argument, use the alternative interface: e.g. if
 `org-goto-interface' is 'outline use 'outline-path-completion."
   (interactive "P")
+  (org-goto-map)
   (let* ((org-refile-targets `((nil . (:maxlevel . ,org-goto-max-level))))
          (org-refile-use-outline-path t)
          (org-refile-target-verify-function nil)
@@ -6838,48 +6860,46 @@ With a prefix argument, use the alternative interface: e.g. if
   "Let the user select a location in the Org-mode buffer BUF.
 This function uses a recursive edit.  It returns the selected position
 or nil."
-  (let ((isearch-mode-map org-goto-local-auto-isearch-map)
-        (isearch-hide-immediately nil)
-        (isearch-search-fun-function
-         (lambda () 'org-goto-local-search-headings))
-        (org-goto-selected-point org-goto-exit-command)
-        (pop-up-frames nil)
-        (special-display-buffer-names nil)
-        (special-display-regexps nil)
-        (special-display-function nil))
-    (save-excursion
-      (save-window-excursion
-        (delete-other-windows)
-        (and (get-buffer "*org-goto*") (kill-buffer "*org-goto*"))
-        (org-pop-to-buffer-same-window
-         (condition-case nil
-             (make-indirect-buffer (current-buffer) "*org-goto*")
-           (error (make-indirect-buffer (current-buffer) "*org-goto*"))))
-        (with-output-to-temp-buffer "*Help*"
-          (princ help))
-        (org-fit-window-to-buffer (get-buffer-window "*Help*"))
-        (setq buffer-read-only nil)
-        (let ((org-startup-truncated t)
-              (org-startup-folded nil)
-              (org-startup-align-all-tables nil))
-          (org-mode)
-          (org-overview))
-        (setq buffer-read-only t)
-        (if (and (boundp 'org-goto-start-pos)
-                 (integer-or-marker-p org-goto-start-pos))
-            (let ((org-show-hierarchy-above t)
-                  (org-show-siblings t)
-                  (org-show-following-heading t))
-              (goto-char org-goto-start-pos)
-              (and (outline-invisible-p) (org-show-context)))
-          (goto-char (point-min)))
-        (let (org-special-ctrl-a/e) (org-beginning-of-line))
-        (message "Select location and press RET")
-        (use-local-map org-goto-map)
-        (recursive-edit)
-        ))
-    (kill-buffer "*org-goto*")
-    (cons org-goto-selected-point org-goto-exit-command)))
+  (org-no-popups
+   (let ((isearch-mode-map org-goto-local-auto-isearch-map)
+         (isearch-hide-immediately nil)
+         (isearch-search-fun-function
+          (lambda () 'org-goto-local-search-headings))
+         (org-goto-selected-point org-goto-exit-command))
+     (save-excursion
+       (save-window-excursion
+         (delete-other-windows)
+         (and (get-buffer "*org-goto*") (kill-buffer "*org-goto*"))
+         (org-pop-to-buffer-same-window
+          (condition-case nil
+              (make-indirect-buffer (current-buffer) "*org-goto*")
+            (error (make-indirect-buffer (current-buffer) "*org-goto*"))))
+         (with-output-to-temp-buffer "*Org Help*"
+           (princ (format help (if org-goto-auto-isearch
+                                   "  Just type for auto-isearch."
+                                 "  n/p/f/b/u to navigate, q to quit."))))
+         (org-fit-window-to-buffer (get-buffer-window "*Org Help*"))
+         (setq buffer-read-only nil)
+         (let ((org-startup-truncated t)
+               (org-startup-folded nil)
+               (org-startup-align-all-tables nil))
+           (org-mode)
+           (org-overview))
+         (setq buffer-read-only t)
+         (if (and (boundp 'org-goto-start-pos)
+                  (integer-or-marker-p org-goto-start-pos))
+             (let ((org-show-hierarchy-above t)
+                   (org-show-siblings t)
+                   (org-show-following-heading t))
+               (goto-char org-goto-start-pos)
+               (and (outline-invisible-p) (org-show-context)))
+           (goto-char (point-min)))
+         (let (org-special-ctrl-a/e) (org-beginning-of-line))
+         (message "Select location and press RET")
+         (use-local-map org-goto-map)
+         (recursive-edit)))
+     (kill-buffer "*org-goto*")
+     (cons org-goto-selected-point org-goto-exit-command))))
 
 (defvar org-goto-local-auto-isearch-map (make-sparse-keymap))
 (set-keymap-parent org-goto-local-auto-isearch-map isearch-mode-map)
@@ -7672,7 +7692,6 @@ useful if the caller implements cut-and-paste as copy-then-paste-then-cut."
     (if (org-called-interactively-p 'any)
         (org-back-to-heading nil) ; take what looks like a subtree
       (org-back-to-heading t)) ; take what is really there
-    (org-back-over-empty-lines)
     (setq beg (point))
     (skip-chars-forward " \t\r\n")
     (save-match-data
@@ -7682,7 +7701,6 @@ useful if the caller implements cut-and-paste as copy-then-paste-then-cut."
           (org-forward-heading-same-level (1- n) t)
         (error nil))
       (org-end-of-subtree t t))
-    (org-back-over-empty-lines)
     (setq end (point))
     (goto-char beg0)
     (when (> end beg)
@@ -7773,7 +7791,6 @@ the inserted text when done."
          (delete-region (point-at-bol) (point)))
      ;; Paste
      (beginning-of-line (if (bolp) 1 2))
-     (unless for-yank (org-back-over-empty-lines))
      (setq beg (point))
      (and (fboundp 'org-id-paste-tracker) (org-id-paste-tracker txt))
      (insert-before-markers txt)
@@ -8630,6 +8647,24 @@ call CMD."
            (put-text-property beg end 'org-category-position beg)
            (goto-char pos)))))))
 
+(defun org-refresh-properties (dprop tprop)
+  "Refresh buffer text properties.
+DPROP is the drawer property and TPROP is the corresponding text
+property to set."
+  (let ((case-fold-search t)
+        (inhibit-read-only t) p)
+    (org-unmodified
+     (save-excursion
+       (save-restriction
+         (widen)
+         (goto-char (point-min))
+         (while (re-search-forward (concat "^[ \t]*:" dprop ": +\\(.*\\)[ \t]*$") nil t)
+           (setq p (org-match-string-no-properties 1))
+           (save-excursion
+             (org-back-to-heading t)
+             (put-text-property
+              (point-at-bol) (point-at-eol) tprop p))))))))
+
 
 ;;;; Link Stuff
 
@@ -8723,7 +8758,7 @@ type.  For a simple example of an export function, see `org-bbdb.el'."
     (push (list type follow export) org-link-protocols)))
 
 (defvar org-agenda-buffer-name) ; Defined in org-agenda.el
-(defvar org-link-to-org-use-id) ; Defined in org-id.el
+(defvar org-id-link-to-org-use-id) ; Defined in org-id.el
 
 ;;;###autoload
 (defun org-store-link (arg)
@@ -8839,13 +8874,13 @@ For file links, arg negates `org-context-in-file-links'."
                        "::" (match-string 1))
                link cpltxt))
         ((and (featurep 'org-id)
-              (or (eq org-link-to-org-use-id t)
+              (or (eq org-id-link-to-org-use-id t)
                   (and (org-called-interactively-p 'any)
-                       (or (eq org-link-to-org-use-id 'create-if-interactive)
-                           (and (eq org-link-to-org-use-id
+                       (or (eq org-id-link-to-org-use-id 'create-if-interactive)
+                           (and (eq org-id-link-to-org-use-id
                                     'create-if-interactive-and-no-custom-id)
                                 (not custom-id))))
-                  (and org-link-to-org-use-id (org-entry-get nil "ID"))))
+                  (and org-id-link-to-org-use-id (org-entry-get nil "ID"))))
          ;; We can make a link using the ID.
          (setq link (condition-case nil
                         (prog1 (org-id-store-link)
@@ -9318,10 +9353,11 @@ Use TAB to complete link prefixes, then RET for type-specific completion support
         ;; URL-like link, normalize the use of angular brackets.
         (setq link (org-remove-angle-brackets link)))
 
-    ;; Check if we are linking to the current file with a search option
-    ;; If yes, simplify the link by using only the search option.
+    ;; Check if we are linking to the current file with a search
+    ;; option If yes, simplify the link by using only the search
+    ;; option.
     (when (and buffer-file-name
-               (string-match "^file:\\(.+?\\)::\\([^>]+\\)" link))
+               (string-match "^file:\\(.+?\\)::\\(.+\\)" link))
       (let* ((path (match-string 1 link))
              (case-fold-search nil)
              (search (match-string 2 link)))
@@ -9652,7 +9688,15 @@ application the system uses for this file type."
                          org-angle-link-re "\\|"
                          "[ \t]:[^ \t\n]+:[ \t]*$")))
            (not (get-text-property (point) 'org-linked-text)))
-      (or (org-offer-links-in-entry arg)
+      (or (let* ((lkall (org-offer-links-in-entry (current-buffer) (point) arg))
+                 (lk0 (car lkall))
+                 (lk (if (stringp lk0) (list lk0) lk0))
+                 (lkend (cdr lkall)))
+            (mapcar (lambda(l)
+                      (search-forward l nil lkend)
+                      (goto-char (match-beginning 0))
+                      (org-open-at-point))
+                    lk))
           (progn (require 'org-attach) (org-attach-reveal 'if-exists))))
      ((run-hook-with-args-until-success 'org-open-at-point-functions))
      ((and (org-at-timestamp-p t)
@@ -9695,12 +9739,13 @@ application the system uses for this file type."
             (throw 'match t))
 
           (save-excursion
-            (when (or (org-in-regexp org-angle-link-re)
-                      (and (goto-char (car (org-in-regexp org-plain-link-re)))
-                           (save-match-data (not (looking-back "\\[\\[")))))
-              (setq type (match-string 1)
-                    path (org-link-unescape (match-string 2)))
-              (throw 'match t)))
+            (let ((plinkpos (org-in-regexp org-plain-link-re)))
+              (when (or (org-in-regexp org-angle-link-re)
+                        (and plinkpos (goto-char (car plinkpos))
+                             (save-match-data (not (looking-back "\\[\\[")))))
+                (setq type (match-string 1)
+                      path (org-link-unescape (match-string 2)))
+                (throw 'match t))))
           (save-excursion
             (when (org-in-regexp (org-re "\\(:[[:alnum:]_@#%:]+\\):[ \t]*$"))
               (setq type "tags"
@@ -9713,7 +9758,7 @@ application the system uses for this file type."
                   path (match-string 1))
             (throw 'match t)))
         (unless path
-          (error "No link found"))
+          (user-error "No link found"))
 
         ;; switch back to reference buffer
         ;; needed when if called in a temporary buffer through
@@ -9847,68 +9892,67 @@ application the system uses for this file type."
     (move-marker org-open-link-marker nil)
     (run-hook-with-args 'org-follow-link-hook)))
 
-(defun org-offer-links-in-entry (&optional nth zero)
-  "Offer links in the current entry and follow the selected link.
-If there is only one link, follow it immediately as well.
-If NTH is an integer, immediately pick the NTH link found.
+(defun org-offer-links-in-entry (buffer marker &optional nth zero)
+  "Offer links in the current entry and return the selected link.
+If there is only one link, return it.
+If NTH is an integer, return the NTH link found.
 If ZERO is a string, check also this string for a link, and if
-there is one, offer it as link number zero."
-  (let ((re (concat "\\(" org-bracket-link-regexp "\\)\\|"
-                    "\\(" org-angle-link-re "\\)\\|"
-                    "\\(" org-plain-link-re "\\)"))
-        (cnt ?0)
-        (in-emacs (if (integerp nth) nil nth))
-        have-zero end links link c)
-    (when (and (stringp zero) (string-match org-bracket-link-regexp zero))
-      (push (match-string 0 zero) links)
-      (setq cnt (1- cnt) have-zero t))
+there is one, return it."
+  (with-current-buffer buffer
     (save-excursion
-      (org-back-to-heading t)
-      (setq end (save-excursion (outline-next-heading) (point)))
-      (while (re-search-forward re end t)
-        (push (match-string 0) links))
-      (setq links (org-uniquify (reverse links))))
-
-    (cond
-     ((null links)
-      (message "No links"))
-     ((equal (length links) 1)
-      (setq link (list (car links))))
-     ((and (integerp nth) (>= (length links) (if have-zero (1+ nth) nth)))
-      (setq link (list (nth (if have-zero nth (1- nth)) links))))
-     (t ; we have to select a link
-      (save-excursion
-        (save-window-excursion
-          (delete-other-windows)
-          (with-output-to-temp-buffer "*Select Link*"
-            (mapc (lambda (l)
-                    (if (not (string-match org-bracket-link-regexp l))
-                        (princ (format "[%c]  %s\n" (incf cnt)
-                                       (org-remove-angle-brackets l)))
-                      (if (match-end 3)
-                          (princ (format "[%c]  %s (%s)\n" (incf cnt)
-                                         (match-string 3 l) (match-string 1 l)))
-                        (princ (format "[%c]  %s\n" (incf cnt)
-                                       (match-string 1 l))))))
-                  links))
-          (org-fit-window-to-buffer (get-buffer-window "*Select Link*"))
-          (message "Select link to open, RET to open all:")
-          (setq c (read-char-exclusive))
-          (and (get-buffer "*Select Link*") (kill-buffer "*Select Link*"))))
-      (when (equal c ?q) (error "Abort"))
-      (if (equal c ?\C-m)
-          (setq link links)
-        (setq nth (- c ?0))
-        (if have-zero (setq nth (1+ nth)))
-        (unless (and (integerp nth) (>= (length links) nth))
-          (error "Invalid link selection"))
-        (setq link (list (nth (1- nth) links))))))
-    (if link
-        (let ((buf (current-buffer)))
-          (dolist (l link)
-            (org-open-link-from-string l in-emacs buf))
-          t)
-      nil)))
+      (save-restriction
+        (widen)
+        (goto-char marker)
+        (let ((re (concat "\\(" org-bracket-link-regexp "\\)\\|"
+                          "\\(" org-angle-link-re "\\)\\|"
+                          "\\(" org-plain-link-re "\\)"))
+              (cnt ?0)
+              (in-emacs (if (integerp nth) nil nth))
+              have-zero end links link c)
+          (when (and (stringp zero) (string-match org-bracket-link-regexp zero))
+            (push (match-string 0 zero) links)
+            (setq cnt (1- cnt) have-zero t))
+          (save-excursion
+            (org-back-to-heading t)
+            (setq end (save-excursion (outline-next-heading) (point)))
+            (while (re-search-forward re end t)
+              (push (match-string 0) links))
+            (setq links (org-uniquify (reverse links))))
+          (cond
+           ((null links)
+            (message "No links"))
+           ((equal (length links) 1)
+            (setq link (car links)))
+           ((and (integerp nth) (>= (length links) (if have-zero (1+ nth) nth)))
+            (setq link (nth (if have-zero nth (1- nth)) links)))
+           (t ; we have to select a link
+            (save-excursion
+              (save-window-excursion
+                (delete-other-windows)
+                (with-output-to-temp-buffer "*Select Link*"
+                  (mapc (lambda (l)
+                          (if (not (string-match org-bracket-link-regexp l))
+                              (princ (format "[%c]  %s\n" (incf cnt)
+                                             (org-remove-angle-brackets l)))
+                            (if (match-end 3)
+                                (princ (format "[%c]  %s (%s)\n" (incf cnt)
+                                               (match-string 3 l) (match-string 1 l)))
+                              (princ (format "[%c]  %s\n" (incf cnt)
+                                             (match-string 1 l))))))
+                        links))
+                (org-fit-window-to-buffer (get-buffer-window "*Select Link*"))
+                (message "Select link to open, RET to open all:")
+                (setq c (read-char-exclusive))
+                (and (get-buffer "*Select Link*") (kill-buffer "*Select Link*"))))
+            (when (equal c ?q) (error "Abort"))
+            (if (equal c ?\C-m)
+                (setq link links)
+              (setq nth (- c ?0))
+              (if have-zero (setq nth (1+ nth)))
+              (unless (and (integerp nth) (>= (length links) nth))
+                (error "Invalid link selection"))
+              (setq link (nth (1- nth) links)))))
+          (cons link end))))))
 
 ;; Add special file links that specify the way of opening
 
@@ -9930,12 +9974,6 @@ there is one, offer it as link number zero."
   '(add-hook 'org-export-preprocess-before-normalizing-links-hook
              'org-remove-file-link-modifiers))
 
-;;;; Time estimates
-
-(defun org-get-effort (&optional pom)
-  "Get the effort estimate for the current entry."
-  (org-entry-get pom org-effort-property))
-
 ;;; File search
 
 (defvar org-create-file-search-functions nil
@@ -11259,8 +11297,7 @@ This function can be used in a hook."
     " +" t)))
 
 (defcustom org-structure-template-alist
-  '(
-    ("s" "#+BEGIN_SRC ?\n\n#+END_SRC"
+  '(("s" "#+BEGIN_SRC ?\n\n#+END_SRC"
      "<src lang=\"?\">\n\n</src>")
     ("e" "#+BEGIN_EXAMPLE\n?\n#+END_EXAMPLE"
      "<example>\n?\n</example>")
@@ -11268,6 +11305,8 @@ This function can be used in a hook."
      "<quote>\n?\n</quote>")
     ("v" "#+BEGIN_VERSE\n?\n#+END_VERSE"
      "<verse>\n?\n</verse>")
+    ("V" "#+BEGIN_VERBATIM\n?\n#+END_VERBATIM"
+     "<verbatim>\n?\n</verbatim>")
     ("c" "#+BEGIN_CENTER\n?\n#+END_CENTER"
      "<center>\n?\n</center>")
     ("l" "#+BEGIN_LaTeX\n?\n#+END_LaTeX"
@@ -11283,8 +11322,7 @@ This function can be used in a hook."
     ("i" "#+INDEX: ?"
      "#+INDEX: ?")
     ("I" "#+INCLUDE: %file ?"
-     "<include file=%file markup=\"?\">")
-    )
+     "<include file=%file markup=\"?\">"))
   "Structure completion elements.
 This is a list of abbreviation keys and values.  The value gets inserted
 if you type `<' followed by the key and then press the completion key,
@@ -11439,7 +11477,8 @@ For calling through lisp, arg is also interpreted in the following way:
          cl (if (outline-invisible-p) (org-end-of-subtree nil t))))
     (if (equal arg '(16)) (setq arg 'nextset))
     (let ((org-blocker-hook org-blocker-hook)
-          (case-fold-search nil))
+          commentp
+          case-fold-search)
       (when (equal arg '(64))
         (setq arg nil org-blocker-hook nil))
       (when (and org-blocker-hook
@@ -11449,6 +11488,9 @@ For calling through lisp, arg is also interpreted in the following way:
       (save-excursion
         (catch 'exit
           (org-back-to-heading t)
+          (when (looking-at (concat "^\\*+ " org-comment-string))
+            (org-toggle-comment)
+            (setq commentp t))
           (if (looking-at org-outline-regexp) (goto-char (1- (match-end 0))))
           (or (looking-at (concat " +" org-todo-regexp "\\( +\\|[ \t]*$\\)"))
               (looking-at "\\(?: *\\|[ \t]*$\\)"))
@@ -11624,7 +11666,8 @@ For calling through lisp, arg is also interpreted in the following way:
                   (and (looking-at " ") (just-one-space))))
             (when org-trigger-hook
               (save-excursion
-                (run-hook-with-args 'org-trigger-hook change-plist)))))))))
+                (run-hook-with-args 'org-trigger-hook change-plist)))
+            (when commentp (org-toggle-comment))))))))
 
 (defun org-block-todo-from-children-or-siblings-or-parent (change-plist)
   "Block turning an entry into a TODO, using the hierarchy.
@@ -11765,15 +11808,16 @@ changes because there are unchecked boxes in this entry."
 
 (defun org-entry-blocked-p ()
   "Is the current entry blocked?"
-  (if (org-entry-get nil "NOBLOCKING")
-      nil ;; Never block this entry
-    (not
-     (run-hook-with-args-until-failure
-      'org-blocker-hook
-      (list :type 'todo-state-change
-            :position (point)
-            :from 'todo
-            :to 'done)))))
+  (org-with-buffer-modified-unmodified
+   (if (org-entry-get nil "NOBLOCKING")
+       nil ;; Never block this entry
+     (not
+      (run-hook-with-args-until-failure
+       'org-blocker-hook
+       (list :type 'todo-state-change
+             :position (point)
+             :from 'todo
+             :to 'done))))))
 
 (defun org-update-statistics-cookies (all)
   "Update the statistics cookie, either from TODO or from checkboxes.
@@ -11785,7 +11829,7 @@ This should be called with the cursor in a line with a statistics cookie."
         (org-map-entries 'org-update-parent-todo-statistics))
     (if (not (org-at-heading-p))
         (org-update-checkbox-count)
-      (let ((pos (move-marker (make-marker) (point)))
+      (let ((pos (point-marker))
             end l1 l2)
         (ignore-errors (org-back-to-heading t))
         (if (not (org-at-heading-p))
@@ -12666,7 +12710,7 @@ D      Show deadlines and scheduled items between a date range."
   (let (ans kwd value ts-type)
     (setq type (or type org-sparse-tree-default-date-type))
     (setq org-ts-type type)
-    (message "Sparse tree: [r]egexp [/]regexp [t]odo [T]odo-kwd [m]atch [p]roperty\n             [d]eadlines [b]efore-date [a]fter-date [D]ates range\n             [c]ycle through date types: %s"
+    (message "Sparse tree: [/]regexp [t]odo [T]odo-kwd [m]atch [p]roperty\n             [d]eadlines [b]efore-date [a]fter-date [D]ates range\n             [c]ycle through date types: %s"
              (cond ((eq type 'all) "all timestamps")
                    ((eq type 'scheduled) "only scheduled")
                    ((eq type 'deadline) "only deadline")
@@ -12981,9 +13025,9 @@ and by additional input from the age of a schedules or deadline entry."
 
 (defun org-get-priority (s)
   "Find priority cookie and return priority."
-  (if (functionp org-get-priority-function)
-      (funcall org-get-priority-function)
-    (save-match-data
+  (save-match-data
+    (if (functionp org-get-priority-function)
+        (funcall org-get-priority-function)
       (if (not (string-match org-priority-regexp s))
           (* 1000 (- org-lowest-priority org-default-priority))
         (* 1000 (- org-lowest-priority
@@ -13113,18 +13157,9 @@ headlines matching this string."
                  (or (not todo-only)
                      (and (member todo org-not-done-keywords)
                           (or (not org-agenda-tags-todo-honor-ignore-options)
-                              (not (org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item)))))
-
-                 ;; Extra check for the archive tag
-                 ;; FIXME: Does the skipper already do this????
-                 (or
-                  (not (member org-archive-tag tags-list))
-                  ;; we have an archive tag, should we use this anyway?
-                  (or (not org-agenda-skip-archived-trees)
-                      (and (eq action 'agenda) org-agenda-archives-mode))))
+                              (not (org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item))))))
 
             ;; select this headline
-
             (cond
              ((eq action 'sparse-tree)
               (and org-highlight-sparse-tree-matches
@@ -13496,7 +13531,10 @@ ignore inherited ones."
                 (error nil)))))
         (if local
             tags
-          (append (org-remove-uninherited-tags org-file-tags) tags))))))
+          (reverse (delete-dups
+                    (reverse (append
+                              (org-remove-uninherited-tags
+                               org-file-tags) tags)))))))))
 
 (defun org-add-prop-inherited (s)
   (add-text-properties 0 (length s) '(inherited t) s)
@@ -14276,6 +14314,9 @@ When INCREMENT is non-nil, set the property to the next allowed value."
                    existing nil nil "" nil cur))))))
     (unless (equal (org-entry-get nil prop) val)
       (org-entry-put nil prop val))
+    (save-excursion
+      (org-back-to-heading t)
+      (put-text-property (point-at-bol) (point-at-eol) 'org-effort val))
     (message "%s is now %s" prop val)))
 
 (defun org-at-property-p ()
@@ -14454,26 +14495,27 @@ when a \"nil\" value can supersede a non-nil value higher up the hierarchy."
           ;; We need a special property.  Use `org-entry-properties' to
           ;; retrieve it, but specify the wanted property
           (cdr (assoc property (org-entry-properties nil 'special property)))
-        (let* ((range (org-get-property-block))
-               (props (list (or (assoc property org-file-properties)
-                                (assoc property org-global-properties)
-                                (assoc property org-global-properties-fixed))))
-               (ap (lambda (key)
-                     (when (re-search-forward
-                            (org-re-property key) (cdr range) t)
-                       (setq props
-                             (org-update-property-plist
-                              key
-                              (if (match-end 1)
-                                  (org-match-string-no-properties 1) "")
-                              props)))))
-               val)
-          (when (and range (goto-char (car range)))
-            (funcall ap property)
-            (goto-char (car range))
-            (while (funcall ap (concat property "+")))
-            (setq val (cdr (assoc property props)))
-            (when val (if literal-nil val (org-not-nil val)))))))))
+        (let ((range (org-get-property-block)))
+          (when (and range (not (eq (car range) (cdr range))))
+            (let* ((props (list (or (assoc property org-file-properties)
+                                    (assoc property org-global-properties)
+                                    (assoc property org-global-properties-fixed))))
+                   (ap (lambda (key)
+                         (when (re-search-forward
+                                (org-re-property key) (cdr range) t)
+                           (setq props
+                                 (org-update-property-plist
+                                  key
+                                  (if (match-end 1)
+                                      (org-match-string-no-properties 1) "")
+                                  props)))))
+                   val)
+              (goto-char (car range))
+              (funcall ap property)
+              (goto-char (car range))
+              (while (funcall ap (concat property "+")))
+              (setq val (cdr (assoc property props)))
+              (when val (if literal-nil val (org-not-nil val))))))))))
 
 (defun org-property-or-variable-value (var &optional inherit)
   "Check if there is a property fixing the value of VAR.
@@ -14996,7 +15038,8 @@ completion."
   (interactive)
   (unless (org-at-property-p)
     (error "Not at a property"))
-  (let* ((key (match-string 2))
+  (let* ((prop (car (save-match-data (org-split-string (match-string 1) ":"))))
+         (key (match-string 2))
          (value (match-string 3))
          (allowed (or (org-property-get-allowed-values (point) key)
                       (and (member value  '("[ ]" "[-]" "[X]"))
@@ -15015,6 +15058,10 @@ completion."
     (org-indent-line)
     (beginning-of-line 1)
     (skip-chars-forward " \t")
+    (when (equal prop org-effort-property)
+      (save-excursion
+        (org-back-to-heading t)
+        (put-text-property (point-at-bol) (point-at-eol) 'org-effort nval)))
     (run-hook-with-args 'org-property-changed-functions key nval)))
 
 (defun org-find-olp (path &optional this-buffer)
@@ -15060,7 +15107,7 @@ only headings."
             (setq lmin (1+ flevel) lmax (+ lmin (if org-odd-levels-only 1 0)))
             (setq end (save-excursion (org-end-of-subtree t t))))
           (when (org-at-heading-p)
-            (move-marker (make-marker) (point))))))))
+            (point-marker)))))))
 
 (defun org-find-exact-headline-in-buffer (heading &optional buffer pos-only)
   "Find node HEADING in BUFFER.
@@ -15307,6 +15354,7 @@ user."
                     (setcar (nthcdr 1 org-defdecode) 59)
                     (setq org-def (apply 'encode-time org-defdecode)
                           org-defdecode (decode-time org-def)))))
+         (mouse-autoselect-window nil) ; Don't let the mouse jump
          (calendar-frame-setup nil)
          (calendar-setup nil)
          (calendar-move-hook nil)
@@ -16966,6 +17014,8 @@ When a buffer is unmodified, it is just killed.  When modified, it is saved
             (widen)
             (setq bmp (buffer-modified-p))
             (org-refresh-category-properties)
+            (org-refresh-properties org-effort-property 'org-effort)
+            (org-refresh-properties "APPT_WARNTIME" 'org-appt-warntime)
             (setq org-todo-keywords-for-agenda
                   (append org-todo-keywords-for-agenda org-todo-keywords-1))
             (setq org-done-keywords-for-agenda
@@ -18053,7 +18103,7 @@ BEG and END default to the buffer boundaries."
     ("c" . org-cycle)
     ("C" . org-shifttab)
     (" " . org-display-outline-path)
-    (":" . org-columns)
+    ("=" . org-columns)
     ("Outline Structure Editing")
     ("U" . org-shiftmetaup)
     ("D" . org-shiftmetadown)
@@ -18078,7 +18128,7 @@ BEG and END default to the buffer boundaries."
     ("1" . (org-priority ?A))
     ("2" . (org-priority ?B))
     ("3" . (org-priority ?C))
-    (";" . org-set-tags-command)
+    (":" . org-set-tags-command)
     ("e" . org-set-effort)
     ("E" . org-inc-effort)
     ("W" . (lambda(m) (interactive "sMinutes before warning: ")
@@ -18296,25 +18346,26 @@ front of the next \"|\" separator, to keep the table aligned.  The table will
 still be marked for re-alignment if the field did fill the entire column,
 because, in this case the deletion might narrow the column."
   (interactive "p")
-  (org-check-before-invisible-edit 'delete-backward)
-  (if (and (org-table-p)
-           (eq N 1)
-           (string-match "|" (buffer-substring (point-at-bol) (point)))
-           (looking-at ".*?|"))
-      (let ((pos (point))
-            (noalign (looking-at "[^|\n\r]*  |"))
-            (c org-table-may-need-update))
-        (backward-delete-char N)
-        (if (not overwrite-mode)
-            (progn
-              (skip-chars-forward "^|")
-              (insert " ")
-              (goto-char (1- pos))))
-        ;; noalign: if there were two spaces at the end, this field
-        ;; does not determine the width of the column.
-        (if noalign (setq org-table-may-need-update c)))
-    (backward-delete-char N)
-    (org-fix-tags-on-the-fly)))
+  (save-match-data
+    (org-check-before-invisible-edit 'delete-backward)
+    (if (and (org-table-p)
+             (eq N 1)
+             (string-match "|" (buffer-substring (point-at-bol) (point)))
+             (looking-at ".*?|"))
+        (let ((pos (point))
+              (noalign (looking-at "[^|\n\r]*  |"))
+              (c org-table-may-need-update))
+          (backward-delete-char N)
+          (if (not overwrite-mode)
+              (progn
+                (skip-chars-forward "^|")
+                (insert " ")
+                (goto-char (1- pos))))
+          ;; noalign: if there were two spaces at the end, this field
+          ;; does not determine the width of the column.
+          (if noalign (setq org-table-may-need-update c)))
+      (backward-delete-char N)
+      (org-fix-tags-on-the-fly))))
 
 (defun org-delete-char (N)
   "Like `delete-char', but insert whitespace at field end in tables.
@@ -18323,25 +18374,26 @@ front of the next \"|\" separator, to keep the table aligned.  The table will
 still be marked for re-alignment if the field did fill the entire column,
 because, in this case the deletion might narrow the column."
   (interactive "p")
-  (org-check-before-invisible-edit 'delete)
-  (if (and (org-table-p)
-           (not (bolp))
-           (not (= (char-after) ?|))
-           (eq N 1))
-      (if (looking-at ".*?|")
-          (let ((pos (point))
-                (noalign (looking-at "[^|\n\r]*  |"))
-                (c org-table-may-need-update))
-            (replace-match (concat
-                            (substring (match-string 0) 1 -1)
-                            " |"))
-            (goto-char pos)
-            ;; noalign: if there were two spaces at the end, this field
-            ;; does not determine the width of the column.
-            (if noalign (setq org-table-may-need-update c)))
-        (delete-char N))
-    (delete-char N)
-    (org-fix-tags-on-the-fly)))
+  (save-match-data
+    (org-check-before-invisible-edit 'delete)
+    (if (and (org-table-p)
+             (not (bolp))
+             (not (= (char-after) ?|))
+             (eq N 1))
+        (if (looking-at ".*?|")
+            (let ((pos (point))
+                  (noalign (looking-at "[^|\n\r]*  |"))
+                  (c org-table-may-need-update))
+              (replace-match (concat
+                              (substring (match-string 0) 1 -1)
+                              " |"))
+              (goto-char pos)
+              ;; noalign: if there were two spaces at the end, this field
+              ;; does not determine the width of the column.
+              (if noalign (setq org-table-may-need-update c)))
+          (delete-char N))
+      (delete-char N)
+      (org-fix-tags-on-the-fly))))
 
 ;; Make `delete-selection-mode' work with org-mode and orgtbl-mode
 (put 'org-self-insert-command 'delete-selection t)
@@ -18956,15 +19008,22 @@ See the individual commands for more information."
       (org-table-paste-rectangle)
     (org-paste-subtree arg)))
 
+(defsubst org-in-fixed-width-region-p ()
+  "Is point in a fixed-width region?"
+  (save-match-data
+    (eq 'fixed-width (org-element-type (org-element-at-point)))))
+
 (defun org-edit-special (&optional arg)
   "Call a special editor for the stuff at point.
 When at a table, call the formula editor with `org-table-edit-formulas'.
-When at the first line of an src example, call `org-edit-src-code'.
-When in an #+include line, visit the include file.  Otherwise call
-`ffap' to visit the file at point."
+When in a source code block, call `org-edit-src-code'.
+When in a fixed-width region, call `org-edit-fixed-width-region'.
+When in an #+include line, visit the included file.
+On a link, call `ffap' to visit the link at point.
+Otherwise, return a user error."
   (interactive)
   ;; possibly prep session before editing source
-  (when arg
+  (when (and (org-in-src-block-p) arg)
     (let* ((info (org-babel-get-src-block-info))
            (lang (nth 0 info))
            (params (nth 2 info))
@@ -18977,16 +19036,16 @@ When in an #+include line, visit the include file.  Otherwise call
       (beginning-of-line 1)
       (looking-at "\\(?:#\\+\\(?:setupfile\\|include\\):?[ \t]+\"?\\|[ \t]*<include\\>.*?file=\"\\)\\([^\"\n>]+\\)"))
     (find-file (org-trim (match-string 1))))
-   ((org-edit-src-code))
-   ((org-edit-fixed-width-region))
-   ((org-at-table.el-p)
-    (org-edit-src-code))
+   ((org-at-table.el-p) (org-edit-src-code))
    ((or (org-at-table-p)
         (save-excursion
           (beginning-of-line 1)
           (let ((case-fold-search )) (looking-at "[ \t]*#\\+tblfm:"))))
     (call-interactively 'org-table-edit-formulas))
-   (t (call-interactively 'ffap))))
+   ((org-in-block-p '("src" "example" "latex" "html")) (org-edit-src-code))
+   ((org-in-fixed-width-region-p) (org-edit-fixed-width-region))
+   ((org-at-regexp-p org-any-link-re) (call-interactively 'ffap))
+   (t (user-error "No special environment to edit here"))))
 
 (defvar org-table-coordinate-overlays) ; defined in org-table.el
 (defun org-ctrl-c-ctrl-c (&optional arg)
@@ -19103,8 +19162,10 @@ This command does many different things, depending on context:
           (org-list-struct-fix-ind struct parents)
           (setq block-item
                 (org-list-struct-fix-box struct parents prevs orderedp)))
-        (org-list-struct-apply-struct struct old-struct)
-        (org-update-checkbox-count-maybe)
+        (if (equal struct old-struct)
+            (user-error "Cannot toggle this checkbox (unchecked subitems?)")
+          (org-list-struct-apply-struct struct old-struct)
+          (org-update-checkbox-count-maybe))
         (when block-item
           (message
            "Checkboxes were removed due to unchecked box at line %d"
@@ -20238,13 +20299,19 @@ and end of string."
   "Is S an ID created by UUIDGEN?"
   (string-match "\\`[0-9a-f]\\{8\\}-[0-9a-f]\\{4\\}-[0-9a-f]\\{4\\}-[0-9a-f]\\{4\\}-[0-9a-f]\\{12\\}\\'" (downcase s)))
 
-(defun org-in-src-block-p nil
-  "Whether point is in a code source block."
-  (let (ov)
-    (when (setq ov (overlays-at (point)))
-      (memq 'org-block-background
-            (overlay-properties
-             (car ov))))))
+(defun org-in-src-block-p (&optional inside)
+  "Whether point is in a code source block.
+When INSIDE is non-nil, don't consider we are within a src block
+when point is at #+BEGIN_SRC or #+END_SRC."
+  (let ((case-fold-search t) ov)
+    (or (and (setq ov (overlays-at (point)))
+             (memq 'org-block-background
+                   (overlay-properties (car ov))))
+        (and (not inside)
+             (save-match-data
+               (save-excursion
+                 (beginning-of-line)
+                 (looking-at ".*#\\+\\(begin\\|end\\)_src")))))))
 
 (defun org-context ()
   "Return a list of contexts of the current cursor position.
@@ -20587,9 +20654,8 @@ return nil."
   "Switch to buffer in a second window on the current frame.
 In particular, do not allow pop-up frames.
 Returns the newly created buffer."
-  (let (pop-up-frames special-display-buffer-names special-display-regexps
-                      special-display-function)
-    (apply 'switch-to-buffer-other-window args)))
+  (org-no-popups
+   (apply 'switch-to-buffer-other-window args)))
 
 (defun org-combine-plists (&rest plists)
   "Create a single property list from all plists in PLISTS.
@@ -20768,6 +20834,7 @@ hierarchy of headlines by UP levels before marking the subtree."
        (t
         (beginning-of-line 0)
         (while (and (not (bobp))
+                    (not (looking-at org-table-line-regexp))
                     (not (looking-at org-drawer-regexp))
                     ;; When point started in an inline task, do not move
                     ;; above task starting line.
@@ -20898,6 +20965,7 @@ hierarchy of headlines by UP levels before marking the subtree."
               '(org-fill-paragraph-separate-nobreak-p
                 org-fill-line-break-nobreak-p)))))
   (org-set-local 'fill-paragraph-function 'org-fill-paragraph)
+  (org-set-local 'auto-fill-inhibit-regexp nil)
   (org-set-local 'adaptive-fill-function 'org-adaptive-fill-function)
   (org-set-local 'normal-auto-fill-function 'org-auto-fill-function)
   (org-set-local 'comment-line-break-function 'org-comment-line-break-function))
@@ -20920,48 +20988,54 @@ hierarchy of headlines by UP levels before marking the subtree."
   "Compute a fill prefix for the current line.
 Return fill prefix, as a string, or nil if current line isn't
 meant to be filled."
-  (org-with-wide-buffer
-   (unless (and (derived-mode-p 'message-mode) (not (message-in-body-p)))
-     ;; FIXME: This is really the job of orgstruct++-mode
-     (let* ((p (line-beginning-position))
-            (element (save-excursion (beginning-of-line)
-                                     (org-element-at-point)))
-            (type (org-element-type element))
-            (post-affiliated
-             (save-excursion
-               (goto-char (org-element-property :begin element))
-               (while (looking-at org-element--affiliated-re) (forward-line))
-               (point))))
-       (unless (< p post-affiliated)
-         (case type
-           (comment (looking-at "[ \t]*# ?") (match-string 0))
-           (footnote-definition "")
-           ((item plain-list)
-            (make-string (org-list-item-body-column post-affiliated) ? ))
-           (paragraph
-            ;; Fill prefix is usually the same as the current line,
-            ;; except if the paragraph is at the beginning of an item.
-            (let ((parent (org-element-property :parent element)))
-              (cond ((eq (org-element-type parent) 'item)
-                     (make-string (org-list-item-body-column
-                                   (org-element-property :begin parent))
-                                  ? ))
-                    ((save-excursion (beginning-of-line) (looking-at "[ \t]+"))
-                     (match-string 0))
-                    (t  ""))))
-           (comment-block
-            ;; Only fill contents if P is within block boundaries.
-            (let* ((cbeg (save-excursion (goto-char post-affiliated)
-                                         (forward-line)
-                                         (point)))
-                   (cend (save-excursion
-                           (goto-char (org-element-property :end element))
-                           (skip-chars-backward " \r\t\n")
-                           (line-beginning-position))))
-              (when (and (>= p cbeg) (< p cend))
-                (if (save-excursion (beginning-of-line) (looking-at "[ \t]+"))
-                    (match-string 0)
-                  ""))))))))))
+  (let (prefix)
+    (when (and (derived-mode-p 'message-mode) (message-in-body-p))
+      (save-excursion
+        (beginning-of-line)
+        (cond ((looking-at message-cite-prefix-regexp)
+               (setq prefix (match-string-no-properties 0)))
+              ((looking-at org-outline-regexp)
+               (setq prefix "")))))
+    (or prefix
+        (org-with-wide-buffer
+         (let* ((p (line-beginning-position))
+                (element (save-excursion (beginning-of-line) (org-element-at-point)))
+                (type (org-element-type element))
+                (post-affiliated
+                 (save-excursion
+                   (goto-char (org-element-property :begin element))
+                   (while (looking-at org-element--affiliated-re) (forward-line))
+                   (point))))
+           (unless (< p post-affiliated)
+             (case type
+               (comment (looking-at "[ \t]*# ?") (match-string 0))
+               (footnote-definition "")
+               ((item plain-list)
+                (make-string (org-list-item-body-column post-affiliated) ? ))
+               (paragraph
+                ;; Fill prefix is usually the same as the current line,
+                ;; except if the paragraph is at the beginning of an item.
+                (let ((parent (org-element-property :parent element)))
+                  (cond ((eq (org-element-type parent) 'item)
+                         (make-string (org-list-item-body-column
+                                       (org-element-property :begin parent))
+                                      ? ))
+                        ((save-excursion (beginning-of-line) (looking-at "[ \t]+"))
+                         (match-string 0))
+                        (t  ""))))
+               (comment-block
+                ;; Only fill contents if P is within block boundaries.
+                (let* ((cbeg (save-excursion (goto-char post-affiliated)
+                                             (forward-line)
+                                             (point)))
+                       (cend (save-excursion
+                               (goto-char (org-element-property :end element))
+                               (skip-chars-backward " \r\t\n")
+                               (line-beginning-position))))
+                  (when (and (>= p cbeg) (< p cend))
+                    (if (save-excursion (beginning-of-line) (looking-at "[ \t]+"))
+                        (match-string 0)
+                      "")))))))))))
 
 (declare-function message-goto-body "message" ())
 (defvar message-cite-prefix-regexp)     ; From message.el
@@ -20981,12 +21055,12 @@ width for filling.
 
 For convenience, when point is at a plain list, an item or
 a footnote definition, try to fill the first paragraph within."
-  ;; Falls back on message-fill-paragraph when necessary
   (interactive)
   (if (and (derived-mode-p 'message-mode)
            (or (not (message-in-body-p))
                (save-excursion (move-beginning-of-line 1)
                                (looking-at message-cite-prefix-regexp))))
+      ;; First ensure filling is correct in message-mode.
       (let ((fill-paragraph-function
              (cadadr (assoc 'fill-paragraph-function org-fb-vars)))
             (fill-prefix (cadadr (assoc 'fill-prefix org-fb-vars)))
@@ -21003,6 +21077,8 @@ a footnote definition, try to fill the first paragraph within."
         ;; the buffer.  In that case, ignore filling.
         (if (< (point) (org-element-property :begin element)) t
           (case (org-element-type element)
+            ;; Use major mode filling function is src blocks.
+            (src-block (org-babel-do-key-sequence-in-edit-buffer (kbd "M-q")))
             ;; Align Org tables, leave table.el tables as-is.
             (table-row (org-table-align) t)
             (table
diff --git a/lisp/printing.el b/lisp/printing.el
index a8eed066a15..bf50aa8f679 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -1800,7 +1800,7 @@ The alist element has the form:
 Where:
 
 SYMBOL          It's a symbol to identify a text printer.  It's for
-                `pr-txt-name' variable setting and for menu selection.
+                setting option `pr-txt-name' and for menu selection.
                 Examples:
                         'prt_06a
                         'my_printer
@@ -1951,7 +1951,7 @@ The alist element has the form:
 Where:
 
 SYMBOL          It's a symbol to identify a PostScript printer.  It's for
-                `pr-ps-name' variable setting and for menu selection.
+                setting option `pr-ps-name' and for menu selection.
                 Examples:
                         'prt_06a
                         'my_printer
@@ -2935,9 +2935,9 @@ INHERITS	Specify the inheritance for SYMBOL group.  It's a symbol name
 
                 The example above has two setting groups: no-duplex and
                 no-duplex-and-landscape.  When setting no-duplex is activated
-                through `inherits-from:' (see `pr-ps-utility', `pr-mode-alist'
-                and `pr-ps-printer-alist'), the variables pr-file-duplex and
-                pr-file-tumble are both set to nil.
+                through `inherits-from:' (see option `pr-ps-utility',
+                `pr-mode-alist' and `pr-ps-printer-alist'), the variables
+                pr-file-duplex and pr-file-tumble are both set to nil.
 
                 Now when setting no-duplex-and-landscape is activated through
                 `inherits-from:', the variable pr-file-landscape is set to nil
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 6ffa67f59c1..560b66bf3b0 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -2464,8 +2464,12 @@ comment at the start of cc-engine.el for more info."
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Variables which keep track of preprocessor constructs.
+(defvar c-state-old-cpp-beg-marker nil)
+(make-variable-buffer-local 'c-state-old-cpp-beg-marker)
 (defvar c-state-old-cpp-beg nil)
 (make-variable-buffer-local 'c-state-old-cpp-beg)
+(defvar c-state-old-cpp-end-marker nil)
+(make-variable-buffer-local 'c-state-old-cpp-end-marker)
 (defvar c-state-old-cpp-end nil)
 (make-variable-buffer-local 'c-state-old-cpp-end)
 ;; These are the limits of the macro containing point at the previous call of
@@ -2653,13 +2657,21 @@ comment at the start of cc-engine.el for more info."
   ;; reduce the time wasted in repeated fruitless searches in brace deserts.
   (save-excursion
     (save-restriction
-      (let ((bra from) ce               ; Positions of "{" and "}".
-            new-cons
-            (cache-pos (c-state-cache-top-lparen)) ; might be nil.
-            (macro-start-or-from
-             (progn (goto-char from)
-                    (c-beginning-of-macro)
-                    (point))))
+      (let* (new-cons
+             (cache-pos (c-state-cache-top-lparen)) ; might be nil.
+             (macro-start-or-from
+              (progn (goto-char from)
+                     (c-beginning-of-macro)
+                     (point)))
+             (bra                       ; Position of "{".
+              ;; Don't start scanning in the middle of a CPP construct unless
+              ;; it contains HERE - these constructs, in Emacs, are "commented
+              ;; out" with category properties.
+              (if (eq (c-get-char-property macro-start-or-from 'category)
+                        'c-cpp-delimiter)
+                    macro-start-or-from
+                  from))
+             ce)                        ; Position of "}"
         (or upper-lim (setq upper-lim from))
 
         ;; If we're essentially repeating a fruitless search, just give up.
@@ -2899,7 +2911,9 @@ comment at the start of cc-engine.el for more info."
                   (point-max)
                 (min (point-max) c-state-old-cpp-beg)))
         (while (and c-state-cache (>= (c-state-cache-top-lparen) upper-lim))
+          (setq scan-back-pos (car-safe (car c-state-cache)))
           (setq c-state-cache (cdr c-state-cache)))
+
         ;; If `upper-lim' is inside the last recorded brace pair, remove its
         ;; RBrace and indicate we'll need to search backwards for a previous
         ;; brace pair.
@@ -3324,6 +3338,13 @@ comment at the start of cc-engine.el for more info."
      (c-with-cpps-commented-out
       (c-invalidate-state-cache-1 here)))))
 
+(defmacro c-state-maybe-marker (place marker)
+  ;; If PLACE is non-nil, return a marker marking it, otherwise nil.
+  ;; We (re)use MARKER.
+  `(and ,place
+        (or ,marker (setq ,marker (make-marker)))
+        (set-marker ,marker ,place)))
+
 (defun c-parse-state ()
   ;; This is a wrapper over `c-parse-state-1'.  See that function for a
   ;; description of the functionality and return value.
@@ -3350,9 +3371,10 @@ comment at the start of cc-engine.el for more info."
               (c-parse-state-1))
            (c-with-cpps-commented-out
             (c-parse-state-1))))
-      (setq c-state-old-cpp-beg (and here-cpp-beg (copy-marker here-cpp-beg t))
-            c-state-old-cpp-end (and here-cpp-end (copy-marker here-cpp-end t)))
-      )))
+      (setq c-state-old-cpp-beg
+            (c-state-maybe-marker here-cpp-beg c-state-old-cpp-beg-marker)
+            c-state-old-cpp-end
+            (c-state-maybe-marker here-cpp-end c-state-old-cpp-end-marker)))))
 
 ;; Debug tool to catch cache inconsistencies.  This is called from
 ;; 000tests.el.
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index 376edcdc76b..f6c47f5bb4d 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -2049,7 +2049,7 @@ styles specified by `c-doc-comment-style'.")
 
 (defconst c-font-lock-keywords-3 (c-lang-const c-matchers-3 c)
   "Accurate normal font locking for C mode.
-Like `c-font-lock-keywords-2' but detects declarations in a more
+Like the variable `c-font-lock-keywords-2' but detects declarations in a more
 accurate way that works in most cases for arbitrary types without the
 need for `c-font-lock-extra-types'.")
 
@@ -2207,7 +2207,7 @@ styles specified by `c-doc-comment-style'.")
 
 (defconst c++-font-lock-keywords-3 (c-lang-const c-matchers-3 c++)
   "Accurate normal font locking for C++ mode.
-Like `c++-font-lock-keywords-2' but detects declarations in a more
+Like the variable `c++-font-lock-keywords-2' but detects declarations in a more
 accurate way that works in most cases for arbitrary types without the
 need for `c++-font-lock-extra-types'.")
 
@@ -2313,7 +2313,7 @@ comment styles specified by `c-doc-comment-style'.")
 
 (defconst objc-font-lock-keywords-3 (c-lang-const c-matchers-3 objc)
   "Accurate normal font locking for Objective-C mode.
-Like `objc-font-lock-keywords-2' but detects declarations in a more
+Like the variable `objc-font-lock-keywords-2' but detects declarations in a more
 accurate way that works in most cases for arbitrary types without the
 need for `objc-font-lock-extra-types'.")
 
@@ -2356,7 +2356,7 @@ comment styles specified by `c-doc-comment-style'.")
 
 (defconst java-font-lock-keywords-3 (c-lang-const c-matchers-3 java)
   "Accurate normal font locking for Java mode.
-Like `java-font-lock-keywords-2' but detects declarations in a more
+Like variable `java-font-lock-keywords-2' but detects declarations in a more
 accurate way that works in most cases for arbitrary types without the
 need for `java-font-lock-extra-types'.")
 
@@ -2389,7 +2389,7 @@ styles specified by `c-doc-comment-style'.")
 
 (defconst idl-font-lock-keywords-3 (c-lang-const c-matchers-3 idl)
   "Accurate normal font locking for CORBA IDL mode.
-Like `idl-font-lock-keywords-2' but detects declarations in a more
+Like the variable `idl-font-lock-keywords-2' but detects declarations in a more
 accurate way that works in most cases for arbitrary types without the
 need for `idl-font-lock-extra-types'.")
 
@@ -2422,7 +2422,7 @@ comment styles specified by `c-doc-comment-style'.")
 
 (defconst pike-font-lock-keywords-3 (c-lang-const c-matchers-3 pike)
   "Accurate normal font locking for Pike mode.
-Like `pike-font-lock-keywords-2' but detects declarations in a more
+Like the variable `pike-font-lock-keywords-2' but detects declarations in a more
 accurate way that works in most cases for arbitrary types without the
 need for `pike-font-lock-extra-types'.")
 
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 4194d363a3d..eb73b77bf52 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -134,6 +134,7 @@ and a string describing how the process finished.")
 
 ;; If you make any changes to `compilation-error-regexp-alist-alist',
 ;; be sure to run the ERT test in test/automated/compile-tests.el.
+;; emacs -batch -l compile-tests.el -f ert-run-tests-batch-and-exit
 
 (defvar compilation-error-regexp-alist-alist
   '((absoft
@@ -261,11 +262,11 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
      ;; The "in \\|from " exception was added to handle messages from Ruby.
      "^\\(?:[[:alpha:]][-[:alnum:].]+: ?\\|[ \t]+\\(?:in \\|from \\)\\)?\
 \\([0-9]*[^0-9\n]\\(?:[^\n :]\\| [^-/\n]\\|:[^ \n]\\)*?\\): ?\
-\\([0-9]+\\)\\(?:[.:]\\([0-9]+\\)\\)?\
-\\(?:-\\([0-9]+\\)?\\(?:\\.\\([0-9]+\\)\\)?\\)?:\
+\\([0-9]+\\)\\(?:-\\(?4:[0-9]+\\)\\(?:\\.\\(?5:[0-9]+\\)\\)?\
+\\|[.:]\\(?3:[0-9]+\\)\\(?:-\\(?:\\(?4:[0-9]+\\)\\.\\)?\\(?5:[0-9]+\\)\\)?\\)?:\
 \\(?: *\\(\\(?:Future\\|Runtime\\)?[Ww]arning\\|W:\\)\\|\
  *\\([Ii]nfo\\(?:\\>\\|rmationa?l?\\)\\|I:\\|instantiated from\\|[Nn]ote\\)\\|\
- *[Ee]rror\\|\[0-9]?\\(?:[^0-9\n]\\|$\\)\\|[0-9][0-9][0-9]\\)"
+ *[Ee]rror\\|[0-9]?\\(?:[^0-9\n]\\|$\\)\\|[0-9][0-9][0-9]\\)"
      1 (2 . 4) (3 . 5) (6 . 7))
 
     (lcc
@@ -1280,7 +1281,7 @@ to `compilation-error-regexp-alist' if RULES is nil."
       ;; whether or not omake's own error messages are recognized.
       (cond
        ((not (memq 'omake compilation-error-regexp-alist)) nil)
-       ((string-match "\\`\\([^^]\\|^\\( \\*\\|\\[\\)\\)" pat)
+       ((string-match "\\`\\([^^]\\|\\^\\( \\*\\|\\[\\)\\)" pat)
         nil) ;; Not anchored or anchored but already allows empty spaces.
        (t (setq pat (concat "^ *" (substring pat 1)))))
 
@@ -1427,8 +1428,9 @@ and move to the source code that caused it.
 If optional second arg COMINT is t the buffer will be in Comint mode with
 `compilation-shell-minor-mode'.
 
-Interactively, prompts for the command if `compilation-read-command' is
-non-nil; otherwise uses `compile-command'.  With prefix arg, always prompts.
+Interactively, prompts for the command if the variable
+`compilation-read-command' is non-nil; otherwise uses`compile-command'.
+With prefix arg, always prompts.
 Additionally, with universal prefix arg, compilation buffer will be in
 comint mode, i.e. interactive.
 
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 81dc31792c3..92f9447652e 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -199,7 +199,8 @@ Pop back to the last location with \\[negative-argument] \\[find-tag].")
 
 (defvar tags-table-files nil
   "List of file names covered by current tags table.
-nil means it has not yet been computed; use `tags-table-files' to do so.")
+nil means it has not yet been computed;
+use function `tags-table-files' to do so.")
 
 (defvar tags-completion-table nil
   "Obarray of tag names defined in current tags table.")
@@ -224,7 +225,7 @@ of the format-parsing tags function variables if successful.")
 One optional argument, a boolean specifying to return complete path (nil) or
 relative path (non-nil).")
 (defvar tags-table-files-function nil
-  "Function to do the work of `tags-table-files' (which see).")
+  "Function to do the work of function `tags-table-files' (which see).")
 (defvar tags-completion-table-function nil
   "Function to build the `tags-completion-table'.")
 (defvar snarf-tag-function nil
@@ -251,7 +252,7 @@ One argument, the tag info returned by `snarf-tag-function'.")
 (defvar tags-apropos-function nil
   "Function to do the work of `tags-apropos' (which see).")
 (defvar tags-included-tables-function nil
-  "Function to do the work of `tags-included-tables' (which see).")
+  "Function to do the work of function `tags-included-tables' (which see).")
 (defvar verify-tags-table-function nil
   "Function to return t if current buffer contains valid tags file.")
 
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 7ca0ececa78..0f92df95a9d 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -844,13 +844,21 @@ Return t if it has at least one flymake overlay, nil if no overlay."
     has-flymake-overlays))
 
 (defface flymake-errline
-  '((t :inherit error))
+  '((((supports :underline (:style wave)))
+     :underline (:style wave :color "Red1"))
+    (t
+     :inherit error))
   "Face used for marking error lines."
+  :version "24.4"
   :group 'flymake)
 
 (defface flymake-warnline
-  '((t :inherit warning))
+  '((((supports :underline (:style wave)))
+     :underline (:style wave :color "DarkOrange"))
+    (t
+     :inherit warning))
   "Face used for marking warning lines."
+  :version "24.4"
   :group 'flymake)
 
 (defun flymake-highlight-line (line-no line-err-info-list)
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index fc3d336cf99..90c7cfc5008 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -607,12 +607,12 @@ executable followed by command-line options.  The command-line
 options should include \"-i=mi\" to use gdb's MI text interface.
 Note that the old \"--annotate\" option is no longer supported.
 
-If `gdb-many-windows' is nil (the default value) then gdb just
+If option `gdb-many-windows' is nil (the default value) then gdb just
 pops up the GUD buffer unless `gdb-show-main' is t.  In this case
 it starts with two windows: one displaying the GUD buffer and the
 other with the source file with the main routine of the inferior.
 
-If `gdb-many-windows' is t, regardless of the value of
+If option `gdb-many-windows' is t, regardless of the value of
 `gdb-show-main', the layout below will appear.  Keybindings are
 shown in some of the buffers.
 
@@ -4069,7 +4069,7 @@ window is dedicated."
   (set-window-dedicated-p window t))
 
 (defun gdb-setup-windows ()
-  "Layout the window pattern for `gdb-many-windows'."
+  "Layout the window pattern for option `gdb-many-windows'."
   (gdb-get-buffer-create 'gdb-locals-buffer)
   (gdb-get-buffer-create 'gdb-stack-buffer)
   (gdb-get-buffer-create 'gdb-breakpoints-buffer)
@@ -4120,7 +4120,7 @@ of the debugged program.  Non-nil means display the layout shown for
 
 (defun gdb-restore-windows ()
   "Restore the basic arrangement of windows used by gdb.
-This arrangement depends on the value of `gdb-many-windows'."
+This arrangement depends on the value of option `gdb-many-windows'."
   (interactive)
   (switch-to-buffer gud-comint-buffer) ;Select the right window and frame.
   (delete-other-windows)
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 683b3927ae3..96e6039a8c2 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -1680,12 +1680,15 @@ This performs fontification according to `js--class-styles'."
      "each"))
   "Regexp matching keywords optionally followed by an opening brace.")
 
+(defconst js--declaration-keyword-re
+  (regexp-opt '("var" "let" "const") 'words)
+  "Regular expression matching variable declaration keywords.")
+
 (defconst js--indent-operator-re
   (concat "[-+*/%<>=&^|?:.]\\([^-+*/]\\|$\\)\\|"
           (js--regexp-opt-symbol '("in" "instanceof")))
   "Regexp matching operators that affect indentation of continued expressions.")
 
-
 (defun js--looking-at-operator-p ()
   "Return non-nil if point is on a JavaScript operator, other than a comma."
   (save-match-data
@@ -1764,6 +1767,37 @@ nil."
          (list (cons 'c js-comment-lineup-func))))
     (c-get-syntactic-indentation (list (cons symbol anchor)))))
 
+(defun js--multi-line-declaration-indentation ()
+  "Helper function for `js--proper-indentation'.
+Return the proper indentation of the current line if it belongs to a declaration
+statement spanning multiple lines; otherwise, return nil."
+  (let (at-opening-bracket)
+    (save-excursion
+      (back-to-indentation)
+      (when (not (looking-at js--declaration-keyword-re))
+        (when (looking-at js--indent-operator-re)
+          (goto-char (match-end 0)))
+        (while (and (not at-opening-bracket)
+                    (not (bobp))
+                    (let ((pos (point)))
+                      (save-excursion
+                        (js--backward-syntactic-ws)
+                        (or (eq (char-before) ?,)
+                            (and (not (eq (char-before) ?\;))
+                                 (prog2
+                                     (skip-chars-backward "[[:punct:]]")
+                                     (looking-at js--indent-operator-re)
+                                   (js--backward-syntactic-ws))
+                                 (not (eq (char-before) ?\;)))
+                            (and (>= pos (point-at-bol))
+                                 (<= pos (point-at-eol)))))))
+          (condition-case err
+              (backward-sexp)
+            (scan-error (setq at-opening-bracket t))))
+        (when (looking-at js--declaration-keyword-re)
+          (goto-char (match-end 0))
+          (1+ (current-column)))))))
+
 (defun js--proper-indentation (parse-status)
   "Return the proper indentation for the current line."
   (save-excursion
@@ -1772,6 +1806,7 @@ nil."
            (js--get-c-offset 'c (nth 8 parse-status)))
           ((nth 8 parse-status) 0) ; inside string
           ((js--ctrl-statement-indentation))
+          ((js--multi-line-declaration-indentation))
           ((eq (char-after) ?#) 0)
           ((save-excursion (js--beginning-of-macro)) 4)
           ((nth 1 parse-status)
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 172193266ca..0e5f4c82090 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1198,7 +1198,16 @@ of the statement."
                 (not (eobp))
                 (cond ((setq string-start (python-syntax-context 'string))
                        (goto-char string-start)
-                       (python-nav-end-of-statement t))
+                       (if (python-syntax-context 'paren)
+                           ;; Ended up inside a paren, roll again.
+                           (python-nav-end-of-statement t)
+                         ;; This is not inside a paren, move to the
+                         ;; end of this string.
+                         (goto-char (+ (point)
+                                       (python-syntax-count-quotes
+                                        (char-after (point)) (point))))
+                         (or (re-search-forward (rx (syntax string-delimiter)) nil t)
+                             (goto-char (point-max)))))
                       ((python-syntax-context 'paren)
                        ;; The statement won't end before we've escaped
                        ;; at least one level of parenthesis.
@@ -1312,7 +1321,7 @@ backward to previous block."
   "Safe version of standard `forward-sexp'.
 When ARG > 0 move forward, else if ARG is < 0."
   (or arg (setq arg 1))
-  (let ((forward-sexp-function nil)
+  (let ((forward-sexp-function)
         (paren-regexp
          (if (> arg 0) (python-rx close-paren) (python-rx open-paren)))
         (search-fn
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 453386cdba5..781aa241802 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -723,15 +723,15 @@ this variable is nil, that buffer is shown using
 
 (defvar sql-imenu-generic-expression
   ;; Items are in reverse order because they are rendered in reverse.
-  '(("Rules/Defaults" "^\\s-*create\\s-+\\(?:\\w+\\s-+\\)*\\(?:rule\\|default\\)\\(?:if\\s-+not\\s-+exists\\s-+\\)?\\s-+\\(\\w+\\)" 1)
-    ("Sequences" "^\\s-*create\\s-+\\(?:\\w+\\s-+\\)*sequence\\s-+\\(?:if\\s-+not\\s-+exists\\s-+\\)?\\(\\w+\\)" 1)
-    ("Triggers" "^\\s-*create\\s-+\\(?:\\w+\\s-+\\)*trigger\\s-+\\(?:if\\s-+not\\s-+exists\\s-+\\)?\\(\\w+\\)" 1)
-    ("Functions" "^\\s-*\\(?:create\\s-+\\(?:\\w+\\s-+\\)*\\)?function\\s-+\\(?:if\\s-+not\\s-+exists\\s-+\\)?\\(\\w+\\)" 1)
-    ("Procedures" "^\\s-*\\(?:create\\s-+\\(?:\\w+\\s-+\\)*\\)?proc\\(?:edure\\)?\\s-+\\(?:if\\s-+not\\s-+exists\\s-+\\)?\\(\\w+\\)" 1)
-    ("Packages" "^\\s-*create\\s-+\\(?:\\w+\\s-+\\)*package\\s-+\\(?:body\\s-+\\)?\\(?:if\\s-+not\\s-+exists\\s-+\\)?\\(\\w+\\)" 1)
-    ("Types" "^\\s-*create\\s-+\\(?:\\w+\\s-+\\)*type\\s-+\\(?:body\\s-+\\)?\\(?:if\\s-+not\\s-+exists\\s-+\\)?\\(\\w+\\)" 1)
-    ("Indexes" "^\\s-*create\\s-+\\(?:\\w+\\s-+\\)*index\\s-+\\(?:if\\s-+not\\s-+exists\\s-+\\)?\\(\\w+\\)" 1)
-    ("Tables/Views" "^\\s-*create\\s-+\\(?:\\w+\\s-+\\)*\\(?:table\\|view\\)\\s-+\\(?:if\\s-+not\\s-+exists\\s-+\\)?\\(\\w+\\)" 1))
+  '(("Rules/Defaults" "^\\s-*create\\s-+\\(?:\\w+\\s-+\\)*\\(?:rule\\|default\\)\\(?:if\\s-+not\\s-+exists\\s-+\\)?\\s-+\\(\\(?:\\w+\\s-*[.]\\s-*\\)*\\w+\\)" 1)
+    ("Sequences" "^\\s-*create\\s-+\\(?:\\w+\\s-+\\)*sequence\\s-+\\(?:if\\s-+not\\s-+exists\\s-+\\)?\\(\\(?:\\w+\\s-*[.]\\s-*\\)*\\w+\\)" 1)
+    ("Triggers" "^\\s-*create\\s-+\\(?:\\w+\\s-+\\)*trigger\\s-+\\(?:if\\s-+not\\s-+exists\\s-+\\)?\\(\\(?:\\w+\\s-*[.]\\s-*\\)*\\w+\\)" 1)
+    ("Functions" "^\\s-*\\(?:create\\s-+\\(?:\\w+\\s-+\\)*\\)?function\\s-+\\(?:if\\s-+not\\s-+exists\\s-+\\)?\\(\\(?:\\w+\\s-*[.]\\s-*\\)*\\w+\\)" 1)
+    ("Procedures" "^\\s-*\\(?:create\\s-+\\(?:\\w+\\s-+\\)*\\)?proc\\(?:edure\\)?\\s-+\\(?:if\\s-+not\\s-+exists\\s-+\\)?\\(\\(?:\\w+\\s-*[.]\\s-*\\)*\\w+\\)" 1)
+    ("Packages" "^\\s-*create\\s-+\\(?:\\w+\\s-+\\)*package\\s-+\\(?:body\\s-+\\)?\\(?:if\\s-+not\\s-+exists\\s-+\\)?\\(\\(?:\\w+\\s-*[.]\\s-*\\)*\\w+\\)" 1)
+    ("Types" "^\\s-*create\\s-+\\(?:\\w+\\s-+\\)*type\\s-+\\(?:body\\s-+\\)?\\(?:if\\s-+not\\s-+exists\\s-+\\)?\\(\\(?:\\w+\\s-*[.]\\s-*\\)*\\w+\\)" 1)
+    ("Indexes" "^\\s-*create\\s-+\\(?:\\w+\\s-+\\)*index\\s-+\\(?:if\\s-+not\\s-+exists\\s-+\\)?\\(\\(?:\\w+\\s-*[.]\\s-*\\)*\\w+\\)" 1)
+    ("Tables/Views" "^\\s-*create\\s-+\\(?:\\w+\\s-+\\)*\\(?:table\\|view\\)\\s-+\\(?:if\\s-+not\\s-+exists\\s-+\\)?\\(\\(?:\\w+\\s-*[.]\\s-*\\)*\\w+\\)" 1))
   "Define interesting points in the SQL buffer for `imenu'.
 
 This is used to set `imenu-generic-expression' when SQL mode is
@@ -1313,7 +1313,7 @@ Based on `comint-mode-map'.")
                   "\\(?:table\\|view\\|\\(?:package\\|type\\)\\(?:\\s-+body\\)?\\|proc\\(?:edure\\)?"
                   "\\|function\\|trigger\\|sequence\\|rule\\|default\\)\\s-+"
                   "\\(?:if\\s-+not\\s-+exists\\s-+\\)?" ;; IF NOT EXISTS
-                  "\\(\\w+\\)")
+                  "\\(\\w+\\(?:\\s-*[.]\\s-*\\w+\\)*\\)")
           1 'font-lock-function-name-face))
 
   "Pattern to match the names of top-level objects.
@@ -3219,9 +3219,6 @@ Every newline in STRING will be preceded with a space and a backslash."
 
 Allows the suppression of continuation prompts.")
 
-(defvar sql-output-by-send nil
-  "Non-nil if the command in the input was generated by `sql-send-string'.")
-
 (defun sql-input-sender (proc string)
   "Send STRING to PROC after applying filters."
 
@@ -3288,8 +3285,7 @@ to avoid deleting non-prompt output."
 
           (if (= sql-output-newline-count 0)
               (setq sql-output-newline-count nil
-                    oline (concat "\n" oline)
-                    sql-output-by-send nil)
+                    oline (concat "\n" oline))
 
             (setq sql-preoutput-hold oline
                   oline ""))
@@ -3383,8 +3379,7 @@ to avoid deleting non-prompt output."
       (setq sql-output-newline-count
             (if sql-output-newline-count
                 (1+ sql-output-newline-count)
-              1)))
-    (setq sql-output-by-send t)))
+              1)))))
 
 (defun sql-remove-tabs-filter (str)
   "Replace tab characters with spaces."
@@ -3857,7 +3852,6 @@ you entered, right above the output it created.
        (sql-get-product-feature sql-product :prompt-cont-regexp))
   (make-local-variable 'sql-output-newline-count)
   (make-local-variable 'sql-preoutput-hold)
-  (make-local-variable 'sql-output-by-send)
   (add-hook 'comint-preoutput-filter-functions
             'sql-interactive-remove-continuation-prompt nil t)
   (make-local-variable 'sql-input-ring-separator)
@@ -3930,7 +3924,7 @@ is specified in the connection settings."
       ;; Was one selected
       (when connection
         ;; Get connection settings
-        (let ((connect-set  (assoc connection sql-connection-alist)))
+        (let ((connect-set (assoc-string connection sql-connection-alist t)))
           ;; Settings are defined
           (if connect-set
               ;; Set the desired parameters
@@ -4134,9 +4128,17 @@ the call to \\[sql-product-interactive] with
                   (setq sql-buffer (buffer-name new-sqli-buffer))
                   (run-hooks 'sql-set-sqli-hook)))
 
+              ;; Make sure the connection is complete
+              ;; (Sometimes start up can be slow)
+              ;;  and call the login hook
+              (let ((proc (get-buffer-process new-sqli-buffer)))
+                (while (and (memq (process-status proc) '(open run))
+                            (accept-process-output proc 2.5)
+                            (progn (goto-char (point-max))
+                                   (not (looking-back sql-prompt-regexp))))))
+              (run-hooks 'sql-login-hook)
               ;; All done.
               (message "Login...done")
-              (run-hooks 'sql-login-hook)
               (pop-to-buffer new-sqli-buffer)))))
     (message "No default SQL product defined.  Set `sql-product'.")))
 
@@ -4202,7 +4204,7 @@ The default comes from `process-coding-system-alist' and
   ;; is meaningless; database without user/password is meaningless,
   ;; because "@param" will ask sqlplus to interpret the script
   ;; "param".
-  (let ((parameter nil))
+  (let (parameter nlslang coding)
     (if (not (string= "" sql-user))
         (if (not (string= "" sql-password))
             (setq parameter (concat sql-user "/" sql-password))
@@ -4212,7 +4214,29 @@ The default comes from `process-coding-system-alist' and
     (if parameter
         (setq parameter (nconc (list parameter) options))
       (setq parameter options))
-    (sql-comint product parameter)))
+    (sql-comint product parameter)
+    ;; Set process coding system to agree with the interpreter
+    (setq nlslang (or (getenv "NLS_LANG") "")
+          coding  (dolist (cs
+                           ;; Are we missing any common NLS character sets
+                           '(("US8PC437"  . cp437)
+                             ("EL8PC737"  . cp737)
+                             ("WE8PC850"  . cp850)
+                             ("EE8PC852"  . cp852)
+                             ("TR8PC857"  . cp857)
+                             ("WE8PC858"  . cp858)
+                             ("IS8PC861"  . cp861)
+                             ("IW8PC1507" . cp862)
+                             ("N8PC865"   . cp865)
+                             ("RU8PC866"  . cp866)
+                             ("US7ASCII"  . us-ascii)
+                             ("UTF8"      . utf-8)
+                             ("AL32UTF8"  . utf-8)
+                             ("AL16UTF16" . utf-16))
+                           (or coding 'utf-8))
+                    (when (string-match (format "\\.%s\\'" (car cs)) nlslang)
+                      (setq coding (cdr cs)))))
+    (set-buffer-process-coding-system coding coding)))
 
 (defun sql-oracle-save-settings (sqlbuf)
   "Save most SQL*Plus settings so they may be reset by \\[sql-redirect]."
diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el
index 0279319cc89..edfe368479c 100644
--- a/lisp/progmodes/which-func.el
+++ b/lisp/progmodes/which-func.el
@@ -290,7 +290,7 @@ If no function name is found, return nil."
     (when (and (null name)
                (boundp 'imenu--index-alist) (null imenu--index-alist)
                (null which-function-imenu-failed))
-      (imenu--make-index-alist t)
+      (ignore-errors (imenu--make-index-alist t))
       (unless imenu--index-alist
         (set (make-local-variable 'which-function-imenu-failed) t)))
     ;; If we have an index alist, use it.
@@ -319,7 +319,9 @@ If no function name is found, return nil."
                     namestack (cons (car pair) namestack)
                     alist     (cdr pair)))
 
-             ((number-or-marker-p (setq mark (cdr pair)))
+             ((or (number-or-marker-p (setq mark (cdr pair)))
+                  (and (overlayp mark)
+                       (setq mark (overlay-start mark))))
               (when (and (>= (setq offset (- (point) mark)) 0)
                          (< offset minoffset)) ; Find the closest item.
                 (setq minoffset offset
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 99f22df4107..f7c03c2de85 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -1959,13 +1959,13 @@ Valid values are:
 
 Any other value is treated as nil.
 
-If you set `ps-selected-pages' (see it for documentation), first the pages are
-filtered by `ps-selected-pages' and then by `ps-even-or-odd-pages'.  For
-example, if we have:
+If you set option `ps-selected-pages', first the pages are
+filtered by option `ps-selected-pages' and then by `ps-even-or-odd-pages'.
+For example, if we have:
 
    (setq ps-selected-pages '(1 4 (6 . 10) (12 . 16) 20))
 
-Combining with `ps-even-or-odd-pages' and `ps-n-up-printing', we have:
+Combining with `ps-even-or-odd-pages' and option `ps-n-up-printing', we have:
 
 `ps-n-up-printing' = 1:
    `ps-even-or-odd-pages'       PAGES PRINTED
@@ -3566,9 +3566,9 @@ Use the command `ps-despool' to send the spooled images to the printer."
 ;;;###autoload
 (defun ps-spool-buffer-with-faces ()
   "Generate and spool a PostScript image of the buffer.
-Like `ps-spool-buffer', but includes font, color, and underline information in
-the generated image.  This command works only if you are using a window system,
-so it has a way to determine color values.
+Like the command `ps-spool-buffer', but includes font, color, and underline
+information in the generated image.  This command works only if you are using
+a window system, so it has a way to determine color values.
 
 Use the command `ps-despool' to send the spooled images to the printer."
   (interactive)
@@ -5369,7 +5369,7 @@ Each element has the following form:
    (KIND XCOL YCOL XLIN YLIN REPEAT END XSTART YSTART)
 
 Where:
-KIND is a valid value of `ps-n-up-filling'.
+KIND is a valid value of the variable `ps-n-up-filling'.
 XCOL YCOL are the relative position for the next column.
 XLIN YLIN are the relative position for the beginning of next line.
 REPEAT is the number of repetitions for external loop.
diff --git a/lisp/server.el b/lisp/server.el
index 03d4bfc33df..64224d2a310 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -361,7 +361,7 @@ Updates `server-clients'."
 
 (defconst server-buffer " *server*"
   "Buffer used internally by Emacs's server.
-One use is to log the I/O for debugging purposes (see `server-log'),
+One use is to log the I/O for debugging purposes (see option `server-log'),
 the other is to provide a current buffer in which the process filter can
 safely let-bind buffer-local variables like `default-directory'.")
 
@@ -369,7 +369,7 @@ safely let-bind buffer-local variables like `default-directory'.")
   "If non-nil, log the server's inputs and outputs in the `server-buffer'.")
 
 (defun server-log (string &optional client)
-  "If `server-log' is non-nil, log STRING to `server-buffer'.
+  "If option `server-log' is non-nil, log STRING to `server-buffer'.
 If CLIENT is non-nil, add a description of it to the logged message."
   (when server-log
     (with-current-buffer (get-buffer-create server-buffer)
diff --git a/lisp/simple.el b/lisp/simple.el
index 19140cba496..847c07a5c26 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1,4 +1,4 @@
-;;; simple.el --- basic editing commands for Emacs
+;;; simple.el --- basic editing commands for Emacs  -*- lexical-binding: t -*-
 
 ;; Copyright (C) 1985-1987, 1993-2013 Free Software Foundation, Inc.
 
@@ -401,7 +401,7 @@ Other major modes are defined by comparison with this one."
 
 (defun newline (&optional arg)
   "Insert a newline, and move to left margin of the new line if it's blank.
-If `use-hard-newlines' is non-nil, the newline is marked with the
+If option `use-hard-newlines' is non-nil, the newline is marked with the
 text-property `hard'.
 With ARG, insert that many newlines.
 Call `auto-fill-function' if the current column number is greater
@@ -752,7 +752,7 @@ If N is negative, delete newlines as well, leaving -N spaces."
         (n (abs n)))
     (skip-chars-backward skip-characters)
     (constrain-to-field nil orig-pos)
-    (dotimes (i n)
+    (dotimes (_ n)
       (if (= (following-char) ?\s)
           (forward-char 1)
         (insert ?\s)))
@@ -837,7 +837,7 @@ instead of deleted."
   "Delete the previous N characters (following if N is negative).
 If Transient Mark mode is enabled, the mark is active, and N is 1,
 delete the text in the region and deactivate the mark instead.
-To disable this, set `delete-active-region' to nil.
+To disable this, set option `delete-active-region' to nil.
 
 Optional second arg KILLFLAG, if non-nil, means to kill (save in
 kill ring) instead of delete.  Interactively, N is the prefix
@@ -873,7 +873,7 @@ the end of the line."
   "Delete the following N characters (previous if N is negative).
 If Transient Mark mode is enabled, the mark is active, and N is 1,
 delete the text in the region and deactivate the mark instead.
-To disable this, set `delete-active-region' to nil.
+To disable this, set variable `delete-active-region' to nil.
 
 Optional second arg KILLFLAG non-nil means to kill (save in kill
 ring) instead of delete.  Interactively, N is the prefix arg, and
@@ -1391,14 +1391,16 @@ If the value is non-nil and not a number, we wait 2 seconds."
   ;; Aaron S. Hawley <aaron.s.hawley(at)gmail.com> 2009-08-24
   "Read function name, then read its arguments and call it.
 
-To pass a numeric argument to the command you are invoking with, specify
+To pass a numeric argument to the command you are invoking, specify
 the numeric argument to this command.
 
 Noninteractively, the argument PREFIXARG is the prefix argument to
 give to the command you invoke, if it asks for an argument."
   (interactive (list current-prefix-arg (read-extended-command)))
   ;; Emacs<24 calling-convention was with a single `prefixarg' argument.
-  (if (null command-name) (setq command-name (read-extended-command)))
+  (if (null command-name)
+      (setq command-name (let ((current-prefix-arg prefixarg)) ; for prompt
+                           (read-extended-command))))
   (let* ((function (and (stringp command-name) (intern-soft command-name)))
          (binding (and suggest-key-bindings
                        (not executing-kbd-macro)
@@ -1776,7 +1778,7 @@ Intended to be added to `minibuffer-setup-hook'."
 If there are no search errors, this function displays an overlay with
 the isearch prompt which replaces the original minibuffer prompt.
 Otherwise, it displays the standard isearch message returned from
-`isearch-message'."
+the function `isearch-message'."
   (if (not (and (minibufferp) isearch-success (not isearch-error)))
       ;; Use standard function `isearch-message' when not in the minibuffer,
       ;; or search fails, or has an error (like incomplete regexp).
@@ -1813,8 +1815,9 @@ or to the last history element for a backward search."
   "Save a function restoring the state of minibuffer history search.
 Save `minibuffer-history-position' to the additional state parameter
 in the search status stack."
-  `(lambda (cmd)
-     (minibuffer-history-isearch-pop-state cmd ,minibuffer-history-position)))
+  (let ((pos minibuffer-history-position))
+    (lambda (cmd)
+      (minibuffer-history-isearch-pop-state cmd pos))))
 
 (defun minibuffer-history-isearch-pop-state (_cmd hist-pos)
   "Restore the minibuffer history search state.
@@ -1979,6 +1982,117 @@ then call `undo-more' one or more times to undo them."
     (if (null pending-undo-list)
         (setq pending-undo-list t))))
 
+(defun primitive-undo (n list)
+  "Undo N records from the front of the list LIST.
+Return what remains of the list."
+
+  ;; This is a good feature, but would make undo-start
+  ;; unable to do what is expected.
+  ;;(when (null (car (list)))
+  ;;  ;; If the head of the list is a boundary, it is the boundary
+  ;;  ;; preceding this command.  Get rid of it and don't count it.
+  ;;  (setq list (cdr list))))
+
+  (let ((arg n)
+        ;; In a writable buffer, enable undoing read-only text that is
+        ;; so because of text properties.
+        (inhibit-read-only t)
+        ;; Don't let `intangible' properties interfere with undo.
+        (inhibit-point-motion-hooks t)
+        ;; We use oldlist only to check for EQ.  ++kfs
+        (oldlist buffer-undo-list)
+        (did-apply nil)
+        (next nil))
+    (while (> arg 0)
+      (while (setq next (pop list))     ;Exit inner loop at undo boundary.
+        ;; Handle an integer by setting point to that value.
+        (pcase next
+          ((pred integerp) (goto-char next))
+          ;; Element (t . TIME) records previous modtime.
+          ;; Preserve any flag of NONEXISTENT_MODTIME_NSECS or
+          ;; UNKNOWN_MODTIME_NSECS.
+          (`(t . ,time)
+           ;; If this records an obsolete save
+           ;; (not matching the actual disk file)
+           ;; then don't mark unmodified.
+           (when (or (equal time (visited-file-modtime))
+                     (and (consp time)
+                          (equal (list (car time) (cdr time))
+                                 (visited-file-modtime))))
+             (when (fboundp 'unlock-buffer)
+               (unlock-buffer))
+             (set-buffer-modified-p nil)))
+          ;; Element (nil PROP VAL BEG . END) is property change.
+          (`(nil . ,(or `(,prop ,val ,beg . ,end) pcase--dontcare))
+           (when (or (> (point-min) beg) (< (point-max) end))
+             (error "Changes to be undone are outside visible portion of buffer"))
+           (put-text-property beg end prop val))
+          ;; Element (BEG . END) means range was inserted.
+          (`(,(and beg (pred integerp)) . ,(and end (pred integerp)))
+           ;; (and `(,beg . ,end) `(,(pred integerp) . ,(pred integerp)))
+           ;; Ideally: `(,(pred integerp beg) . ,(pred integerp end))
+           (when (or (> (point-min) beg) (< (point-max) end))
+             (error "Changes to be undone are outside visible portion of buffer"))
+           ;; Set point first thing, so that undoing this undo
+           ;; does not send point back to where it is now.
+           (goto-char beg)
+           (delete-region beg end))
+          ;; Element (apply FUN . ARGS) means call FUN to undo.
+          (`(apply . ,fun-args)
+           (let ((currbuff (current-buffer)))
+             (if (integerp (car fun-args))
+                 ;; Long format: (apply DELTA START END FUN . ARGS).
+                 (pcase-let* ((`(,delta ,start ,end ,fun . ,args) fun-args)
+                              (start-mark (copy-marker start nil))
+                              (end-mark (copy-marker end t)))
+                   (when (or (> (point-min) start) (< (point-max) end))
+                     (error "Changes to be undone are outside visible portion of buffer"))
+                   (apply fun args) ;; Use `save-current-buffer'?
+                   ;; Check that the function did what the entry
+                   ;; said it would do.
+                   (unless (and (= start start-mark)
+                                (= (+ delta end) end-mark))
+                     (error "Changes to be undone by function different than announced"))
+                   (set-marker start-mark nil)
+                   (set-marker end-mark nil))
+               (apply fun-args))
+             (unless (eq currbuff (current-buffer))
+               (error "Undo function switched buffer"))
+             (setq did-apply t)))
+          ;; Element (STRING . POS) means STRING was deleted.
+          (`(,(and string (pred stringp)) . ,(and pos (pred integerp)))
+           (when (let ((apos (abs pos)))
+                   (or (< apos (point-min)) (> apos (point-max))))
+             (error "Changes to be undone are outside visible portion of buffer"))
+           (if (< pos 0)
+               (progn
+                 (goto-char (- pos))
+                 (insert string))
+             (goto-char pos)
+             ;; Now that we record marker adjustments
+             ;; (caused by deletion) for undo,
+             ;; we should always insert after markers,
+             ;; so that undoing the marker adjustments
+             ;; put the markers back in the right place.
+             (insert string)
+             (goto-char pos)))
+          ;; (MARKER . OFFSET) means a marker MARKER was adjusted by OFFSET.
+          (`(,(and marker (pred markerp)) . ,(and offset (pred integerp)))
+           (when (marker-buffer marker)
+             (set-marker marker
+                         (- marker offset)
+                         (marker-buffer marker))))
+          (_ (error "Unrecognized entry in undo list %S" next))))
+      (setq arg (1- arg)))
+    ;; Make sure an apply entry produces at least one undo entry,
+    ;; so the test in `undo' for continuing an undo series
+    ;; will work right.
+    (if (and did-apply
+             (eq oldlist buffer-undo-list))
+        (setq buffer-undo-list
+              (cons (list 'apply 'cdr nil) buffer-undo-list))))
+  list)
+
 ;; Deep copy of a list
 (defun undo-copy-list (list)
   "Make a copy of undo list LIST."
@@ -3691,7 +3805,7 @@ If `show-trailing-whitespace' is non-nil, this command will just
 kill the rest of the current line, even if there are only
 nonblanks there.
 
-If `kill-whole-line' is non-nil, then this command kills the whole line
+If option `kill-whole-line' is non-nil, then this command kills the whole line
 including its terminating newline, when used at the beginning of a line
 with no argument.  As a consequence, you can always kill a whole line
 by typing \\[move-beginning-of-line] \\[kill-line].
@@ -4461,13 +4575,13 @@ to use and more reliable (no dependence on goal column, etc.)."
   "Non-nil means vertical motion starting at end of line keeps to ends of lines.
 This means moving to the end of each line moved onto.
 The beginning of a blank line does not count as the end of a line.
-This has no effect when `line-move-visual' is non-nil."
+This has no effect when the variable `line-move-visual' is non-nil."
   :type 'boolean
   :group 'editing-basics)
 
 (defcustom goal-column nil
   "Semipermanent goal column for vertical motion, as set by \\[set-goal-column], or nil.
-A non-nil setting overrides `line-move-visual', which see."
+A non-nil setting overrides the variable `line-move-visual', which see."
   :type '(choice integer
                  (const :tag "None" nil))
   :group 'editing-basics)
@@ -4478,7 +4592,7 @@ A non-nil setting overrides `line-move-visual', which see."
 It is the column where point was at the start of the current run
 of vertical motion commands.
 
-When moving by visual lines via `line-move-visual', it is a cons
+When moving by visual lines via the function `line-move-visual', it is a cons
 cell (COL . HSCROLL), where COL is the x-position, in pixels,
 divided by the default column width, and HSCROLL is the number of
 columns by which window is scrolled from left margin.
diff --git a/lisp/subr.el b/lisp/subr.el
index 7e3c181e878..9f19268c864 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3367,16 +3367,17 @@ If BODY finishes, `while-no-input' returns whatever value BODY produced."
                (progn ,@body)))))))
 
 (defmacro condition-case-unless-debug (var bodyform &rest handlers)
-  "Like `condition-case' except that it does not catch anything when debugging.
-More specifically if `debug-on-error' is set, then it does not catch any signal."
+  "Like `condition-case' except that it does not prevent debugging.
+More specifically if `debug-on-error' is set then the debugger will be invoked
+even if this catches the signal."
   (declare (debug condition-case) (indent 2))
-  (let ((bodysym (make-symbol "body")))
-    `(let ((,bodysym (lambda () ,bodyform)))
-       (if debug-on-error
-           (funcall ,bodysym)
-         (condition-case ,var
-             (funcall ,bodysym)
-           ,@handlers)))))
+  `(condition-case ,var
+       ,bodyform
+     ,@(mapcar (lambda (handler)
+                 `((debug ,@(if (listp (car handler)) (car handler)
+                              (list (car handler))))
+                   ,@(cdr handler)))
+               handlers)))
 
 (define-obsolete-function-alias 'condition-case-no-debug
   'condition-case-unless-debug "24.1")
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index 7e692960dbc..6ab3e3d3f16 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -63,7 +63,7 @@ Non-nil means use highlight, nil means use minibuffer messages."
   "Non-nil means Flyspell reports a repeated word as an error.
 See `flyspell-mark-duplications-exceptions' to add exceptions to this rule.
 Detection of repeated words is not implemented in
-\"large\" regions; see `flyspell-large-region'."
+\"large\" regions; see variable `flyspell-large-region'."
   :group 'flyspell
   :type 'boolean)
 
@@ -145,9 +145,10 @@ whose length is specified by `flyspell-delay'."
 (defcustom flyspell-default-deplacement-commands
   '(next-line previous-line
     handle-switch-frame handle-select-window
-    scroll-up scroll-down)
+    scroll-up
+    scroll-down)
   "The standard list of deplacement commands for Flyspell.
-See `flyspell-deplacement-commands'."
+See variable `flyspell-deplacement-commands'."
   :group 'flyspell
   :version "21.1"
   :type '(repeat (symbol)))
@@ -445,13 +446,23 @@ like <img alt=\"Some thing.\">."
 ;;*---------------------------------------------------------------------*/
 ;;*    Highlighting                                                     */
 ;;*---------------------------------------------------------------------*/
-(defface flyspell-incorrect '((t :underline t :inherit error))
+(defface flyspell-incorrect
+  '((((supports :underline (:style wave)))
+     :underline (:style wave :color "Red1"))
+    (t
+     :underline t :inherit error))
   "Flyspell face for misspelled words."
+  :version "24.4"
   :group 'flyspell)
 
-(defface flyspell-duplicate '((t :underline t :inherit warning))
+(defface flyspell-duplicate
+  '((((supports :underline (:style wave)))
+     :underline (:style wave :color "DarkOrange"))
+    (t
+     :underline t :inherit warning))
   "Flyspell face for words that appear twice in a row.
 See also `flyspell-duplicate-distance'."
+  :version "24.4"
   :group 'flyspell)
 
 (defvar flyspell-overlay nil)
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 067ffdaa1f0..52e97b8248d 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -1594,8 +1594,8 @@ You can set this variable in hooks in your init file -- eg:
 
 (defun ispell-accept-output (&optional timeout-secs timeout-msecs)
   "Wait for output from ispell process, or TIMEOUT-SECS and TIMEOUT-MSECS.
-If asynchronous subprocesses are not supported, call `ispell-filter' and
-pass it the output of the last ispell invocation."
+If asynchronous subprocesses are not supported, call function `ispell-filter'
+and pass it the output of the last ispell invocation."
   (if ispell-async-processp
       (accept-process-output ispell-process timeout-secs timeout-msecs)
     (if (null ispell-process)
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index a7e44402a26..b7288772034 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -1926,7 +1926,7 @@ This takes effect when first loading the library.")
     ("ul" . "Unordered list")
     ("var" . "Math variable face")
     ("wbr" . "Enable <br> within <nobr>"))
-  "Value of `sgml-tag-help' for HTML mode.")
+  "Value of variable `sgml-tag-help' for HTML mode.")
 
 (defvar outline-regexp)
 (defvar outline-heading-end-regexp)
diff --git a/lisp/vc/compare-w.el b/lisp/vc/compare-w.el
index 2423d322460..fa451ccbe20 100644
--- a/lisp/vc/compare-w.el
+++ b/lisp/vc/compare-w.el
@@ -53,13 +53,13 @@ whitespace is considered to match, and is skipped."
   :group 'compare-windows)
 
 (defcustom compare-ignore-whitespace nil
-  "Non-nil means `compare-windows' ignores whitespace."
+  "Non-nil means command `compare-windows' ignores whitespace."
   :type 'boolean
   :group 'compare-windows
   :version "22.1")
 
 (defcustom compare-ignore-case nil
-  "Non-nil means `compare-windows' ignores case differences."
+  "Non-nil means command `compare-windows' ignores case differences."
   :type 'boolean
   :group 'compare-windows)
 
@@ -379,7 +379,7 @@ on third call it again advances points to the next difference and so on."
         (delete-overlay compare-windows-overlay2)))))
 
 (defun compare-windows-dehighlight ()
-  "Remove highlighting created by `compare-windows-highlight'."
+  "Remove highlighting created by function `compare-windows-highlight'."
   (interactive)
   (remove-hook 'pre-command-hook 'compare-windows-dehighlight)
   (mapc 'delete-overlay compare-windows-overlays1)
diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el
index d0e496d2d21..8b4ff792969 100644
--- a/lisp/vc/diff.el
+++ b/lisp/vc/diff.el
@@ -86,7 +86,7 @@ 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
-specified in `diff-switches' are passed to the diff command."
+specified in the variable `diff-switches' are passed to the diff command."
   (interactive
    (let* ((newf (if (and buffer-file-name (file-exists-p buffer-file-name))
                     (read-file-name
diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el
index f8e753772e4..dfc7eee81a6 100644
--- a/lisp/vc/log-edit.el
+++ b/lisp/vc/log-edit.el
@@ -953,13 +953,14 @@ line of MSG."
         (while (re-search-forward (concat "^" (car header)
                                           ":" log-edit-header-contents-regexp)
                                   nil t)
-          (if (eq t (cdr header))
-              (setq summary (match-string 1))
-            (if (functionp (cdr header))
-                (setq res (nconc res (funcall (cdr header) (match-string 1))))
-              (push (match-string 1) res)
-              (push (or (cdr header) (car header)) res)))
-          (replace-match "" t t)))
+          (let ((txt (match-string 1)))
+            (replace-match "" t t)
+            (if (eq t (cdr header))
+                (setq summary txt)
+              (if (functionp (cdr header))
+                  (setq res (nconc res (funcall (cdr header) txt)))
+                (push txt res)
+                (push (or (cdr header) (car header)) res))))))
       ;; Remove header separator if the header is empty.
       (widen)
       (goto-char (point-min))
diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el
index 52dc7edfa2d..208b93d9670 100644
--- a/lisp/vc/pcvs.el
+++ b/lisp/vc/pcvs.el
@@ -856,7 +856,8 @@ the problem."
 (defun cvs-cleanup-collection (c rm-handled rm-dirs rm-msgs)
   "Remove undesired entries.
 C is the collection
-RM-HANDLED if non-nil means remove handled entries.
+RM-HANDLED if non-nil means remove handled entries (if file is currently
+  visited, only remove if value is `all').
 RM-DIRS behaves like `cvs-auto-remove-directories'.
 RM-MSGS if non-nil means remove messages."
   (let (last-fi first-dir (rerun t))
@@ -870,16 +871,17 @@ RM-MSGS if non-nil means remove messages."
                   (subtype (cvs-fileinfo->subtype fi))
                   (keep
                    (pcase type
-                     ;; remove temp messages and keep the others
+                     ;; Remove temp messages and keep the others.
                      (`MESSAGE (not (or rm-msgs (eq subtype 'TEMP))))
-                     ;; remove entries
+                     ;; Remove dead entries.
                      (`DEAD nil)
-                     ;; handled also?
+                     ;; Handled also?
                      (`UP-TO-DATE
-                      (if (find-buffer-visiting (cvs-fileinfo->full-name fi))
-                          t
-                        (not rm-handled)))
-                     ;; keep the rest
+                      (not
+                       (if (find-buffer-visiting (cvs-fileinfo->full-name fi))
+                           (eq rm-handled 'all)
+                         rm-handled)))
+                     ;; Keep the rest.
                      (_ (not (run-hook-with-args-until-success
                               'cvs-cleanup-functions fi))))))
 
@@ -2121,7 +2123,7 @@ if you are convinced that the process that created the lock is dead."
 Empty directories are removed."
   (interactive)
   (cvs-cleanup-collection cvs-cookies
-                          t (or cvs-auto-remove-directories 'handled) t))
+                          'all (or cvs-auto-remove-directories 'handled) t))
 
 
 (defun-cvs-mode cvs-mode-acknowledge ()
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index f436d300089..0968c83ae5f 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -620,15 +620,24 @@ or a superior directory.")
 
 (declare-function log-edit-extract-headers "log-edit" (headers string))
 
+(defun vc-bzr--sanitize-header (arg)
+  ;; Newlines in --fixes (and probably other fields as well) trigger a nasty
+  ;; Bazaar bug; see https://bugs.launchpad.net/bzr/+bug/1094180.
+  (lambda (str) (list arg
+                 (replace-regexp-in-string "\\`[ \t]+\\|[ \t]+\\'"
+                                           "" (replace-regexp-in-string
+                                               "\n[ \t]?" " " str)))))
+
 (defun vc-bzr-checkin (files rev comment)
   "Check FILES in to bzr with log message COMMENT.
 REV non-nil gets an error."
   (if rev (error "Can't check in a specific revision with bzr"))
-  (apply 'vc-bzr-command "commit" nil 0
-         files (cons "-m" (log-edit-extract-headers '(("Author" . "--author")
-                                                      ("Date" . "--commit-time")
-                                                      ("Fixes" . "--fixes"))
-                                                    comment))))
+  (apply 'vc-bzr-command "commit" nil 0 files
+         (cons "-m" (log-edit-extract-headers
+                     `(("Author" . ,(vc-bzr--sanitize-header "--author"))
+                       ("Date" . ,(vc-bzr--sanitize-header "--commit-time"))
+                       ("Fixes" . ,(vc-bzr--sanitize-header "--fixes")))
+                     comment))))
 
 (defun vc-bzr-find-revision (file rev buffer)
   "Fetch revision REV of file FILE and put it into BUFFER."
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 5a2b47bb34f..99436303fa2 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -703,19 +703,21 @@ Before doing that, check if there are any old backups and get rid of them."
   ;; the state to 'edited and redisplay the mode line.
   (let* ((file buffer-file-name)
          (backend (vc-backend file)))
-    (and backend
-         (or (and (equal (vc-file-getprop file 'vc-checkout-time)
-                         (nth 5 (file-attributes file)))
-                  ;; File has been saved in the same second in which
-                  ;; it was checked out.  Clear the checkout-time
-                  ;; to avoid confusion.
-                  (vc-file-setprop file 'vc-checkout-time nil))
-             t)
-         (eq (vc-checkout-model backend (list file)) 'implicit)
-         (vc-state-refresh file backend)
-         (vc-mode-line file backend))
-    ;; Try to avoid unnecessary work, a *vc-dir* buffer is
-    ;; present if this is true.
+    (cond
+     ((null backend))
+     ((eq (vc-checkout-model backend (list file)) 'implicit)
+      ;; If the file was saved in the same second in which it was
+      ;; checked out, clear the checkout-time to avoid confusion.
+      (if (equal (vc-file-getprop file 'vc-checkout-time)
+                 (nth 5 (file-attributes file)))
+          (vc-file-setprop file 'vc-checkout-time nil))
+      (if (vc-state-refresh file backend)
+          (vc-mode-line file backend)))
+     ;; If we saved an unlocked file on a locking based VCS, that
+     ;; file is not longer up-to-date.
+     ((eq (vc-file-getprop file 'vc-state) 'up-to-date)
+      (vc-file-setprop file 'vc-state nil)))
+    ;; Resynch *vc-dir* buffers, if any are present.
     (when vc-dir-buffers
       (vc-dir-resynch-file file))))
 
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index fe259806267..9b8b94916c4 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -659,6 +659,10 @@
 (eval-when-compile
   (require 'dired))
 
+(declare-function dired-get-filename "dired" (&optional localp noerror))
+(declare-function dired-move-to-filename "dired" (&optional err eol))
+(declare-function dired-marker-regexp "dired" ())
+
 (unless (assoc 'vc-parent-buffer minor-mode-alist)
   (setq minor-mode-alist
         (cons '(vc-parent-buffer vc-parent-buffer-name)
@@ -1072,6 +1076,17 @@ For old-style locking-based version control systems, like RCS:
          ;; among all the `files'.
          (model (nth 4 vc-fileset)))
 
+    ;; If a buffer has unsaved changes, a checkout would discard those
+    ;; changes, so treat the buffer as having unlocked changes.
+    (when (and (not (eq model 'implicit)) (eq state 'up-to-date))
+      (let ((files files))
+        (while files
+          (let ((buffer (get-file-buffer (car files))))
+            (and buffer
+                 (buffer-modified-p buffer)
+                 (setq state 'unlocked-changes
+                       files nil))))))
+
     ;; Do the right thing
     (cond
      ((eq state 'missing)
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index e2a726f4264..ed7edbc5a68 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -1271,19 +1271,19 @@ SYMBOL	is a valid symbol associated with CHAR.
 
 (defvar whitespace-point (point)
   "Used to save locally current point value.
-Used by `whitespace-trailing-regexp' function (which see).")
+Used by function `whitespace-trailing-regexp' (which see).")
 
 (defvar whitespace-font-lock-refontify nil
   "Used to save locally the font-lock refontify state.
-Used by `whitespace-post-command-hook' function (which see).")
+Used by function `whitespace-post-command-hook' (which see).")
 
 (defvar whitespace-bob-marker nil
   "Used to save locally the bob marker value.
-Used by `whitespace-post-command-hook' function (which see).")
+Used by function `whitespace-post-command-hook' (which see).")
 
 (defvar whitespace-eob-marker nil
   "Used to save locally the eob marker value.
-Used by `whitespace-post-command-hook' function (which see).")
+Used by function `whitespace-post-command-hook' (which see).")
 
 (defvar whitespace-buffer-changed nil
   "Used to indicate locally if buffer changed.
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 5402b0ec204..fb62b039d79 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -526,7 +526,16 @@ Otherwise, just return the value."
   "Extract the default external value of WIDGET."
   (widget-apply widget :value-to-external
                 (or (widget-get widget :value)
-                    (widget-apply widget :default-get))))
+                    (progn
+                      (when (widget-get widget :args)
+                        (let (args)
+                          (dolist (arg (widget-get widget :args))
+                            (setq args (append args
+                                               (if (widget-get arg :inline)
+                                                   (widget-get arg :args)
+                                                 (list arg)))))
+                          (widget-put widget :args args)))
+                      (widget-apply widget :default-get)))))
 
 (defun widget-match-inline (widget vals)
   "In WIDGET, match the start of VALS."