Merge from emacs-24; up to 2014-05-26T10:21:18Z!rgm@gnu.org

21 files changed, 595 insertions, 340 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 78dcac1399e..594feb08980 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,145 @@
+2014-05-26  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * cus-face.el (custom-face-attributes): Add :distant-foreground.
+
+2014-05-26  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (window--dump-frame): Remove interactive specification.
+
+2014-05-26  Glenn Morris  <rgm@gnu.org>
+
+        * hippie-exp.el (he-line-search-regexp):
+        Handle comint-prompt-regexp containing subgroups.  (Bug#17529)
+
+2014-05-26  Stephen Berman  <stephen.berman@gmx.net>
+
+        * calendar/todo-mode.el: Remove dependence on auto-mode-alist,
+        to avoid errors when trying to create or visit a file foo.todo
+        located outside to todo-directory, and to allow having such files
+        without them being tied to Todo mode (bug#17482).
+        (todo-show, todo-move-category, todo-merge-category, todo-find-archive)
+        (todo-archive-done-item, todo-find-filtered-items-file)
+        (todo-filter-items, todo-find-item, todo-diary-goto-entry)
+        (todo-category-completions, todo-read-category): When visiting a
+        Todo file, make sure we're in the right mode and the buffer local
+        variables are set.
+        (todo-make-categories-list, todo-reset-nondiary-marker)
+        (todo-reset-done-string, todo-reset-comment-string): After
+        processing all Todo files, kill the buffers of those files that
+        weren't being visited before the processing.
+        (todo-display-as-todo-file, todo-add-to-buffer-list)
+        (todo-visit-files-commands): Comment out.
+        (todo-modes-set-3, todo-mode): Comment out additions to find-file-hook.
+        (auto-mode-alist): Remove add-to-list calls making Todo file
+        extensions unrestrictedly tied to Todo modes.
+
+2014-05-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/nadvice.el (advice--member-p): Change second arg.
+        (advice-function-member-p): Tell it to check both names and functions
+        (bug#17531).
+        (advice--add-function): Adjust call accordingly.
+
+2014-05-26  Stephen Berman  <stephen.berman@gmx.net>
+
+        * calendar/todo-mode.el: Miscellaneous bug fixes.
+        (todo-delete-file): When deleting an archive but not its todo
+        file, make sure to update the todo file's category sexp.
+        (todo-move-category): Keep the moved category's name unless the
+        file moved to already has a category with that name.  If the
+        numerically last category of the source file was moved, make the
+        first category current to avoid selecting a nonexisting category.
+        (todo-merge-category): Fix implementation to make merging to a
+        category in another file work as documented.  Eliminate now
+        insufficient and unnecessary renaming of archive category, correct
+        document string accordingly, and clarify it.  If the numerically
+        last category of the source file was merged, make the first
+        category current to avoid selecting a nonexisting category.
+        (todo-archive-done-item): When there are marked items and point
+        happens to be on an unmarked item, ignore the latter.  Don't leave
+        point below last item after archiving marked items.
+        (todo-unarchive-items): Fix logic to ensure unarchiving an item
+        from an archive with only one category deletes the archive only
+        when the category is empty after unarchiving.  Make sure the todo
+        file's category sexp is updated.
+        (todo-read-file-name): Allow an existing file name even when it is
+        not required (todo-move-category needs this to work as documented).
+        (todo-add-file): Call todo-validate-name to reject the name of an
+        existing todo file (needed due to fix in todo-read-file-name).
+        (todo-reset-nondiary-marker): Also reset in filtered items files.
+        (todo-reset-done-string, todo-reset-comment-string): Also reset in
+        regexp filtered items files.
+        (todo-reset-highlight-item): Also reset in filtered items files.
+        Fix incorrect variable reference in document string.
+
+2014-05-26  Glenn Morris  <rgm@gnu.org>
+
+        * window.el (window--dump-frame): Avoid error in --without-x builds.
+
+2014-05-26  Glenn Morris  <rgm@gnu.org>
+
+        * nxml/nxml-mode.el (xml-mode): Only define this alias once.
+
+2014-05-26  Eli Zaretskii  <eliz@gnu.org>
+
+        * frame.el (set-frame-font): Doc fix.
+
+        * menu-bar.el (menu-set-font): Doc fix.  (Bug#17532)
+
+2014-05-26  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * emacs-lisp/package.el (package--download-one-archive): Use
+        `write-region' instead of `save-buffer' to avoid running various
+        hooks.  (Bug#17155)
+        (describe-package-1): Same.  Insert newline at the end of the
+        buffer if appropriate.
+
+2014-05-26  Juri Linkov  <juri@jurta.org>
+
+        * avoid.el (mouse-avoidance-set-mouse-position): Don't raise frame.
+        (mouse-avoidance-ignore-p): Remove `switch-frame', add `focus-out'.
+        Add more modifiers: meta, control, shift, hyper, super, alt.
+        (Bug#17439)
+
+        * avoid.el (mouse-avoidance-banish-position): Fix defcustom :options
+        to allow changing its value with `set-variable'.
+
+2014-05-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/scheme.el (scheme-mode-syntax-table): Remove hack for
+        #; comments.
+        (scheme-syntax-propertize, scheme-syntax-propertize-sexp-comment):
+        New functions.
+        (scheme-mode-variables): Set syntax-propertize-function instead of
+        font-lock-syntactic-face-function.
+        (scheme-font-lock-syntactic-face-function): Delete.
+
+        * emacs-lisp/lisp.el (end-of-defun): Ensure we move (bug#17274).
+
+        * emacs-lisp/timer.el (timer-event-handler): Don't run if canceled
+        (bug#17392).
+
+2014-05-26  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-find-inline-encoding): Do not match "%%t"
+        for a temporary file name.
+
+2014-05-26  Eli Zaretskii  <eliz@gnu.org>
+
+        * simple.el (line-move-ignore-invisible): Doc fix.  (Bug#17511)
+
+2014-05-26  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/dbus.el (dbus-init-bus, dbus-call-method)
+        (dbus-call-method-asynchronously, dbus-send-signal)
+        (dbus-method-return-internal, dbus-method-error-internal):
+        Check, whether Emacs has been compiled with D-Bus support.  (Bug#17508)
+
+2014-05-26  Nicolas Richard  <theonewiththeevillook@yahoo.fr>
+
+        * emacs-lisp/eieio-opt.el (eieio-help-class): Correctly deal with
+        methods which do not have a doc string.  (Bug#17490)
+
 2014-05-25  Tassilo Horn  <tsdh@gnu.org>
 
         * textmodes/reftex-ref.el (reftex-format-special): Make it work
diff --git a/lisp/avoid.el b/lisp/avoid.el
index f3013728931..680e509ceba 100644
--- a/lisp/avoid.el
+++ b/lisp/avoid.el
@@ -52,9 +52,6 @@
 ;;
 ;; - Using this code does slow Emacs down.  "banish" mode shouldn't
 ;;   be too bad, and on my workstation even "animate" is reasonable.
-;;
-;; - It ought to find out where any overlapping frames are and avoid them,
-;;   rather than always raising the frame.
 
 ;; Credits:
 ;; This code was helped by all those who contributed suggestions,
@@ -129,9 +126,9 @@ TOP-OR-BOTTOM: banish the mouse to top or bottom of frame or window.
 TOP-OR-BOTTOM-POS: Distance from top or bottom edge of frame or window."
   :group   'avoid
   :version "24.3"
-  :type    '(alist :key-type symbol :value-type symbol)
-  :options '(frame-or-window side (side-pos integer)
-             top-or-bottom (top-or-bottom-pos integer)))
+  :type    '(alist :key-type symbol :value-type (choice symbol integer))
+  :options '((frame-or-window symbol) (side symbol) (side-pos integer)
+             (top-or-bottom symbol) (top-or-bottom-pos integer)))
 
 ;; Internal variables
 (defvar mouse-avoidance-state nil)
@@ -172,12 +169,8 @@ Analogous to `mouse-position'."
 
 (defun mouse-avoidance-set-mouse-position (pos)
   ;; Carefully set mouse position to given position (X . Y)
-  ;; Ideally, should check if X,Y is in the current frame, and if not,
-  ;; leave the mouse where it was.  However, this is currently
-  ;; difficult to do, so we just raise the frame to avoid frame switches.
   ;; Returns t if it moved the mouse.
   (let ((f (selected-frame)))
-    (raise-frame f)
     (set-mouse-position f (car pos) (cdr pos))
     t))
 
@@ -342,12 +335,18 @@ redefine this function to suit your own tastes."
              (let ((modifiers (event-modifiers (car last-input-event))))
                (or (memq (car last-input-event)
                          '(mouse-movement scroll-bar-movement
-                           select-window switch-frame))
+                           select-window focus-out))
                    (memq 'click modifiers)
                    (memq 'double modifiers)
                    (memq 'triple modifiers)
                    (memq 'drag modifiers)
-                   (memq 'down modifiers)))))))
+                   (memq 'down modifiers)
+                   (memq 'meta modifiers)
+                   (memq 'control modifiers)
+                   (memq 'shift modifiers)
+                   (memq 'hyper modifiers)
+                   (memq 'super modifiers)
+                   (memq 'alt modifiers)))))))
 
 (defun mouse-avoidance-banish ()
   (if (not (mouse-avoidance-ignore-p))
@@ -403,8 +402,6 @@ Effects of the different modes:
  * cat-and-mouse: Same as `animate'.
  * proteus: As `animate', but changes the shape of the mouse pointer too.
 
-Whenever the mouse is moved, the frame is also raised.
-
 \(See `mouse-avoidance-threshold' for definition of \"too close\",
 and `mouse-avoidance-nudge-dist' and `mouse-avoidance-nudge-var' for
 definition of \"random distance\".)"
diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el
index f7f2b1d1539..ab2ab3e4cb8 100644
--- a/lisp/calendar/todo-mode.el
+++ b/lisp/calendar/todo-mode.el
@@ -566,13 +566,13 @@ less than or equal the category's top priority setting."
 ;;; Entering and exiting
 ;; -----------------------------------------------------------------------------
 
-(defcustom todo-visit-files-commands (list 'find-file 'dired-find-file)
-  "List of file finding commands for `todo-display-as-todo-file'.
-Invoking these commands to visit a todo file or todo archive file
-calls `todo-show' or `todo-find-archive', so that the file is
-displayed correctly."
-  :type '(repeat function)
-  :group 'todo)
+;; (defcustom todo-visit-files-commands (list 'find-file 'dired-find-file)
+;;   "List of file finding commands for `todo-display-as-todo-file'.
+;; Invoking these commands to visit a todo file or todo archive file
+;; calls `todo-show' or `todo-find-archive', so that the file is
+;; displayed correctly."
+;;   :type '(repeat function)
+;;   :group 'todo)
 
 (defun todo-short-file-name (file)
   "Return the short form of todo file FILE's name.
@@ -740,9 +740,12 @@ corresponding todo file, displaying the corresponding category."
                                              "Choose a regexp items file: "
                                              rxf) 'regexp))))))
                      (if (file-exists-p fi-file)
-                         (set-window-buffer
-                          (selected-window)
-                          (set-buffer (find-file-noselect fi-file 'nowarn)))
+                         (progn
+                           (set-window-buffer
+                            (selected-window)
+                            (set-buffer (find-file-noselect fi-file 'nowarn)))
+                           (unless (derived-mode-p 'todo-filtered-items-mode)
+                             (todo-filtered-items-mode)))
                        (message "There is no %s file for %s"
                                 (cond ((eq todo-show-first 'top)
                                        "top priorities")
@@ -757,6 +760,9 @@ corresponding todo file, displaying the corresponding category."
           (unless (todo-check-file file) (throw 'end nil))
           (set-window-buffer (selected-window)
                              (set-buffer (find-file-noselect file 'nowarn)))
+          (if (equal (file-name-extension (buffer-file-name)) "toda")
+              (unless (derived-mode-p 'todo-archive-mode) (todo-archive-mode))
+            (unless (derived-mode-p 'todo-mode) (todo-mode)))
           ;; When quitting an archive file, show the corresponding
           ;; category in the corresponding todo file, if it exists.
           (when (assoc cat todo-categories)
@@ -1090,6 +1096,9 @@ Noninteractively, return the name of the new file."
   (let* ((prompt (concat "Enter name of new todo file "
                          "(TAB or SPC to see current names): "))
          (file (todo-read-file-name prompt)))
+    ;; Don't accept the name of an existing todo file.
+    (setq file (todo-absolute-file-name
+                (todo-validate-name (todo-short-file-name file) 'file)))
     (with-current-buffer (get-buffer-create file)
       (erase-buffer)
       (write-region (point-min) (point-max) file nil 'nomessage nil t)
@@ -1179,10 +1188,28 @@ visiting the deleted files."
       (when (file-exists-p file1) (delete-file file1))
       (setq todo-visited (delete file1 todo-visited))
       (kill-buffer buf1)
-      (when delete2
-        (when (file-exists-p file2) (delete-file file2))
-        (setq todo-visited (delete file2 todo-visited))
-        (and buf2 (kill-buffer buf2)))
+      (if delete2
+          (progn
+            (when (file-exists-p file2) (delete-file file2))
+            (setq todo-visited (delete file2 todo-visited))
+            (and buf2 (kill-buffer buf2)))
+        ;; If we deleted an archive but not its todo file, update the
+        ;; latter's category sexp.
+        (when (equal (file-name-extension file2) "todo")
+          (with-current-buffer (or buf2 (find-file-noselect file2))
+            (save-excursion
+              (save-restriction
+                (widen)
+                (goto-char (point-min))
+                (let ((sexp (read (buffer-substring-no-properties
+                                   (line-beginning-position)
+                                   (line-end-position))))
+                      (buffer-read-only nil))
+                  (mapc (lambda (x) (aset (cdr x) 3 0)) sexp)
+                  (delete-region (line-beginning-position) (line-end-position))
+                  (prin1 sexp (current-buffer)))))
+            (todo-set-categories)
+            (unless buf2 (kill-buffer)))))
       (setq todo-files (funcall todo-files-function)
             todo-archives (funcall todo-files-function t))
       (when (or (string=  file1-sn todo-default-todo-file)
@@ -1197,7 +1224,8 @@ visiting the deleted files."
                          (concat "and its "
                                  (cond (todo "archive") (archive "todo"))
                                  " file "))
-                       "deleted") file1-sn))))
+                       "deleted")
+               file1-sn))))
 
 (defvar todo-edit-buffer "*Todo Edit*"
   "Name of current buffer in Todo Edit mode.")
@@ -1385,8 +1413,7 @@ the archive of the file moved to, creating it if it does not exist."
                                     "Do you want to proceed? ")))
     (let* ((ofile todo-current-todo-file)
            (cat (todo-current-category))
-           (nfile (todo-read-file-name
-                   "Todo file to move this category to: " nil))
+           (nfile (todo-read-file-name "Todo file to move this category to: "))
            (archive (concat (file-name-sans-extension ofile) ".toda"))
            (buffers (append (list ofile)
                             (unless (zerop (todo-get-count 'archived cat))
@@ -1394,7 +1421,7 @@ the archive of the file moved to, creating it if it does not exist."
            new)
       (while (equal nfile (file-truename ofile))
         (setq nfile (todo-read-file-name
-                     "Choose a file distinct from this file: " nil)))
+                     "Choose a file distinct from this file: ")))
       (unless (member nfile todo-files)
         (with-current-buffer (get-buffer-create nfile)
           (erase-buffer)
@@ -1428,6 +1455,10 @@ the archive of the file moved to, creating it if it does not exist."
                  (if (member buf (funcall todo-files-function t))
                      (concat (file-name-sans-extension nfile) ".toda")
                    nfile))
+              (if (equal (file-name-extension (buffer-file-name)) "toda")
+                  (unless (derived-mode-p 'todo-archive-mode)
+                    (todo-archive-mode))
+                (unless (derived-mode-p 'todo-mode) (todo-mode)))
               (let* ((nfile-short (todo-short-file-name nfile))
                      (prompt (concat
                               (format "Todo file \"%s\" already has "
@@ -1453,7 +1484,7 @@ the archive of the file moved to, creating it if it does not exist."
                            "\\(" (regexp-quote cat) "\\)$") nil t)
                   (replace-match new nil nil nil 1)))
               (setq todo-categories
-                    (append todo-categories (list (cons new counts))))
+                    (append todo-categories (list (cons (or new cat) counts))))
               (todo-update-categories-sexp)
               ;; If archive was just created, save it to avoid "File
               ;; <xyz> no longer exists!" message on invoking
@@ -1481,6 +1512,8 @@ the archive of the file moved to, creating it if it does not exist."
               (setq todo-categories (delete (assoc cat todo-categories)
                                              todo-categories))
               (todo-update-categories-sexp)
+              (when (> todo-category-number (length todo-categories))
+                (setq todo-category-number 1))
               (todo-category-select)))))
       (set-window-buffer (selected-window)
                          (set-buffer (find-file-noselect nfile)))
@@ -1495,25 +1528,25 @@ choose (with TAB completion) a category in it to merge into;
 otherwise, choose and merge into a category in either the
 current todo file or a file in `todo-category-completions-files'.
 
-After merging, the current category's todo and done items are
+After merging, the source category's todo and done items are
 appended to the chosen goal category's todo and done items,
 respectively.  The goal category becomes the current category,
-and the previous current category is deleted.
+and the source category is deleted.
 
-If both the first and goal categories also have archived items,
-the former are merged to the latter.  If only the first category
-has archived items, the archived category is renamed to the goal
-category."
+If both the source and goal categories also have archived items,
+they are also merged.  If only the source category has archived
+items, the goal category is added as a new category to the
+archive file and the source category is deleted."
   (interactive "P")
   (let* ((tfile todo-current-todo-file)
          (cat (todo-current-category))
          (cat+file (todo-read-category "Merge into category: " 'todo file))
          (goal (car cat+file))
          (gfile  (cdr cat+file))
-         (archive (concat (file-name-sans-extension (if file gfile tfile))
-                          ".toda"))
-         archived-count here)
-    ;; Merge in todo file.
+         (tarchive (concat (file-name-sans-extension tfile) ".toda"))
+         (garchive (concat (file-name-sans-extension gfile) ".toda"))
+         (archived-count (todo-get-count 'archived))
+         here)
     (with-current-buffer (get-buffer (find-file-noselect tfile))
       (widen)
       (let* ((buffer-read-only nil)
@@ -1536,94 +1569,102 @@ category."
                            (point-marker))
                        (point-max-marker))))
              (todo (buffer-substring-no-properties tbeg tend))
-             (done (buffer-substring-no-properties dbeg cend)))
-        (goto-char (point-min))
-        ;; Merge any todo items.
-        (unless (zerop (length todo))
-          (re-search-forward
-           (concat "^" (regexp-quote (concat todo-category-beg goal)) "$")
-           nil t)
-          (re-search-forward
-           (concat "^" (regexp-quote todo-category-done)) nil t)
-          (forward-line -1)
-          (setq here (point-marker))
-          (insert todo)
-          (todo-update-count 'todo (todo-get-count 'todo cat) goal))
-        ;; Merge any done items.
-        (unless (zerop (length done))
-          (goto-char (if (re-search-forward
-                          (concat "^" (regexp-quote todo-category-beg)) nil t)
-                         (match-beginning 0)
-                       (point-max)))
-          (when (zerop (length todo)) (setq here (point-marker)))
-          (insert done)
-          (todo-update-count 'done (todo-get-count 'done cat) goal))
+             (done (buffer-substring-no-properties dbeg cend))
+             (todo-count (todo-get-count 'todo cat))
+             (done-count (todo-get-count 'done cat)))
+        ;; Merge into goal todo category.
+        (with-current-buffer (get-buffer (find-file-noselect gfile))
+          (unless (derived-mode-p 'todo-mode) (todo-mode))
+          (widen)
+          (goto-char (point-min))
+          (let ((buffer-read-only nil))
+            ;; Merge any todo items.
+            (unless (zerop (length todo))
+              (re-search-forward
+               (concat "^" (regexp-quote (concat todo-category-beg goal)) "$")
+               nil t)
+              (re-search-forward
+               (concat "^" (regexp-quote todo-category-done)) nil t)
+              (forward-line -1)
+              (setq here (point-marker))
+              (insert todo)
+              (todo-update-count 'todo todo-count goal))
+            ;; Merge any done items.
+            (unless (zerop (length done))
+              (goto-char (if (re-search-forward
+                              (concat "^" (regexp-quote todo-category-beg))
+                              nil t)
+                             (match-beginning 0)
+                           (point-max)))
+              (when (zerop (length todo)) (setq here (point-marker)))
+              (insert done)
+              (todo-update-count 'done done-count goal)))
+          (todo-update-categories-sexp))
+        ;; Update and clean up source todo file.
         (remove-overlays cbeg cend)
         (delete-region cbeg cend)
         (setq todo-categories (delete (assoc cat todo-categories)
-                                       todo-categories))
+                                      todo-categories))
         (todo-update-categories-sexp)
-        (mapc (lambda (m) (set-marker m nil)) (list cbeg tbeg dbeg tend cend))))
-    (when (file-exists-p archive)
-      ;; Merge in archive file.
-      (with-current-buffer (get-buffer (find-file-noselect archive))
+        (when (> todo-category-number (length todo-categories))
+                (setq todo-category-number 1))
+        (todo-category-select)
+        (mapc (lambda (m) (set-marker m nil))
+              (list cbeg tbeg dbeg tend cend))))
+    (when (> archived-count 0)
+      (with-current-buffer (get-buffer (find-file-noselect tarchive))
         (widen)
         (goto-char (point-min))
-        (let ((buffer-read-only nil)
-              (cbeg (save-excursion
-                      (when (re-search-forward
-                             (concat "^" (regexp-quote
-                                          (concat todo-category-beg cat)) "$")
-                             nil t)
-                        (goto-char (match-beginning 0))
-                        (point-marker))))
-              (gbeg (save-excursion
-                      (when (re-search-forward
-                             (concat "^" (regexp-quote
-                                          (concat todo-category-beg goal)) "$")
-                             nil t)
-                        (goto-char (match-beginning 0))
-                        (point-marker))))
-              cend carch)
-          (when cbeg
-            (setq archived-count (todo-get-count 'done cat))
-            (setq cend (save-excursion
-                         (if (re-search-forward
-                              (concat "^" (regexp-quote todo-category-beg))
+        (let* ((buffer-read-only nil)
+               (cbeg (progn
+                       (when (re-search-forward
+                              (concat "^" (regexp-quote
+                                           (concat todo-category-beg cat)) "$")
                               nil t)
+                         (goto-char (match-beginning 0))
+                         (point-marker))))
+               (cend (if (re-search-forward
+                          (concat "^" (regexp-quote todo-category-beg)) nil t)
+                         (match-beginning 0)
+                       (point-max)))
+               (carch (progn
+                        (goto-char cbeg)
+                        (forward-line)
+                        (buffer-substring-no-properties (point) cend))))
+          ;; Merge into goal archive category, if it exists, else create it.
+          (with-current-buffer (get-buffer (find-file-noselect garchive))
+            (let ((gbeg (when (re-search-forward
+                               (concat "^" (regexp-quote
+                                            (concat todo-category-beg goal))
+                                       "$")
+                               nil t)
+                          (goto-char (match-beginning 0))
+                          (point-marker))))
+              (goto-char (if (and gbeg
+                                  (re-search-forward
+                                   (concat "^" (regexp-quote todo-category-beg))
+                                   nil t))
                              (match-beginning 0)
-                           (point-max))))
-            (setq carch (save-excursion (goto-char cbeg) (forward-line)
-                          (buffer-substring-no-properties (point) cend)))
-            ;; If both categories of the merge have archived items, merge the
-            ;; source items to the goal items, else "merge" by renaming the
-            ;; source category to goal.
-            (if gbeg
-                (progn
-                  (goto-char (if (re-search-forward
-                                  (concat "^" (regexp-quote todo-category-beg))
-                                  nil t)
-                                 (match-beginning 0)
-                               (point-max)))
-                  (insert carch)
-                  (remove-overlays cbeg cend)
-                  (delete-region cbeg cend))
-              (goto-char cbeg)
-              (search-forward cat)
-              (replace-match goal))
-            (setq todo-categories (todo-make-categories-list t))
-            (todo-update-categories-sexp)))))
-    (with-current-buffer (get-file-buffer tfile)
-      (when archived-count
-        (unless (zerop archived-count)
-          (todo-update-count 'archived archived-count goal)
-          (todo-update-categories-sexp)))
-      (todo-category-number goal)
-      ;; If there are only merged done items, show them.
-      (let ((todo-show-with-done (zerop (todo-get-count 'todo goal))))
-        (todo-category-select)
-        ;; Put point on the first merged item.
-        (goto-char here)))
+                           (point-max)))
+              (unless gbeg (todo-add-category nil goal))
+              (insert carch)
+              (todo-update-categories-sexp)))
+          ;; Update and clean up source archive file.
+          (remove-overlays cbeg cend)
+          (delete-region cbeg cend)
+          (setq todo-categories (todo-make-categories-list t))
+          (todo-update-categories-sexp))))
+    ;; Update goal todo file for merged archived items and display it.
+    (set-window-buffer (selected-window) (set-buffer (get-file-buffer gfile)))
+    (unless (zerop archived-count)
+      (todo-update-count 'archived archived-count goal)
+      (todo-update-categories-sexp))
+    (todo-category-number goal)
+    ;; If there are only merged done items, show them.
+    (let ((todo-show-with-done (zerop (todo-get-count 'todo goal))))
+      (todo-category-select)
+      ;; Put point on the first merged item.
+      (goto-char here))
     (set-marker here nil)))
 
 ;; -----------------------------------------------------------------------------
@@ -2965,6 +3006,7 @@ displayed."
       (when place
         (set-window-buffer (selected-window)
                            (set-buffer (find-file-noselect archive)))
+        (unless (derived-mode-p 'todo-archive-mode) (todo-archive-mode))
         (if (member place '(other-archive other-cat))
             (setq todo-category-number 1)
           (todo-category-number cat))
@@ -2997,7 +3039,7 @@ this category does not exist in the archive, it is created."
                (afile (concat (file-name-sans-extension
                                todo-current-todo-file) ".toda"))
                (archive (find-file-noselect afile t))
-               (item (and (todo-done-item-p)
+               (item (and (not marked) (todo-done-item-p)
                           (concat (todo-item-string) "\n")))
                (count 0)
                (opoint (unless (todo-done-item-p) (point)))
@@ -3040,6 +3082,7 @@ this category does not exist in the archive, it is created."
           (if (not (or marked all item))
               (throw 'end (message "Only done items can be archived"))
             (with-current-buffer archive
+              (unless (derived-mode-p 'todo-archive-mode) (todo-archive-mode))
               (let (buffer-read-only)
                 (widen)
                 (goto-char (point-min))
@@ -3061,12 +3104,12 @@ this category does not exist in the archive, it is created."
                 (todo-update-categories-sexp)
                 ;; If archive is new, save to file now (with
                 ;; write-region to avoid prompt for file to save to)
-                ;; to update todo-archives, and to let auto-mode-alist
-                ;; take effect below on visiting the archive.
+                ;; to update todo-archives, and set the mode for
+                ;; visiting the archive below.
                 (unless (nth 7 (file-attributes afile))
                   (write-region nil nil afile t t)
                   (setq todo-archives (funcall todo-files-function t))
-                  (kill-buffer))))
+                  (todo-archive-mode))))
             (with-current-buffer tbuf
               (cond
                (all
@@ -3092,7 +3135,8 @@ this category does not exist in the archive, it is created."
                           (todo-update-count 'done -1)
                           (todo-update-count 'archived 1)
                           ;; Don't leave point below last item.
-                          (and item (bolp) (eolp) (< (point-min) (point-max))
+                          (and (or marked item) (bolp) (eolp)
+                               (< (point-min) (point-max))
                                (todo-backward-item))
                           (when item
                             (throw 'done (setq item nil))))
@@ -3182,15 +3226,16 @@ the only category in the archive, the archive file is deleted."
                   (throw 'done (setq item nil))))
             (todo-forward-item))))
       (todo-update-count 'done (if marked (- marked-count) -1) cat)
-      ;; If that was the last category in the archive, delete the whole file.
-      (if (= (length todo-categories) 1)
-          (progn
-            (delete-file todo-current-todo-file)
-            ;; Kill the archive buffer silently.
-            (set-buffer-modified-p nil)
-            (kill-buffer))
-        ;; Otherwise, if the archive category is now empty, delete it.
-        (when (eq (point-min) (point-max))
+      ;; If we unarchived the last item in category, then if that was
+      ;; the only category, delete the whole file, otherwise, just
+      ;; delete the category.
+      (when (= 0 (todo-get-count 'done))
+        (if (= 1 (length todo-categories))
+            (progn
+              (delete-file todo-current-todo-file)
+              ;; Kill the archive buffer silently.
+              (set-buffer-modified-p nil)
+              (kill-buffer))
           (widen)
           (let ((beg (re-search-backward
                       (concat "^" (regexp-quote todo-category-beg) cat "$")
@@ -3203,8 +3248,8 @@ the only category in the archive, the archive file is deleted."
             (remove-overlays beg end)
             (delete-region beg end)
             (setq todo-categories (delete (assoc cat todo-categories)
-                                           todo-categories))
-            (todo-update-categories-sexp))))
+                                          todo-categories)))))
+      (todo-update-categories-sexp)
       ;; Visit category in todo file and show restored done items.
       (let ((tfile (buffer-file-name tbuf))
             (todo-show-with-done t))
@@ -3925,7 +3970,9 @@ regexp items."
     (setq file (completing-read "Choose a filtered items file: "
                                 falist nil t nil nil (car falist)))
     (setq file (cdr (assoc-string file falist)))
-    (find-file file)))
+    (find-file file)
+    (unless (derived-mode-p 'todo-filtered-items-mode)
+      (todo-filtered-items-mode))))
 
 (defun todo-go-to-source-item ()
   "Display the file and category of the filtered item at point."
@@ -4056,6 +4103,8 @@ multifile commands for further details."
                             (completing-read "Choose a regexp items file: "
                                              rxf) 'regexp))))
            (find-file fname)
+           (unless (derived-mode-p 'todo-filtered-items-mode)
+             (todo-filtered-items-mode))
            (todo-prefix-overlays)
            (todo-check-filtered-items-file))
           (t
@@ -4309,6 +4358,9 @@ its priority has changed, and `same' otherwise."
                    todo-global-current-todo-file)))
     (find-file-noselect file)
     (with-current-buffer (find-buffer-visiting file)
+      (if archive
+          (unless (derived-mode-p 'todo-archive-mode) (todo-archive-mode))
+        (unless (derived-mode-p 'todo-mode) (todo-mode)))
       (save-restriction
         (widen)
         (goto-char (point-min))
@@ -4885,23 +4937,28 @@ the file."
                  ;; Make sure to include newly created archives, e.g. due to
                  ;; todo-move-category.
                  (when (member archive (funcall todo-files-function t))
-                   (let ((archive-count 0))
-                     (with-current-buffer (find-file-noselect archive)
-                       (widen)
-                       (goto-char (point-min))
-                       (when (re-search-forward
-                              (concat "^" (regexp-quote todo-category-beg)
-                                      cat "$")
-                              (point-max) t)
-                         (forward-line)
-                         (while (not (or (looking-at
-                                          (concat
-                                           (regexp-quote todo-category-beg)
-                                           "\\(.*\\)\n"))
-                                         (eobp)))
-                           (when (looking-at todo-done-string-start)
-                             (setq archive-count (1+ archive-count)))
-                           (forward-line))))
+                   (let ((archive-count 0)
+                         (visiting (find-buffer-visiting archive)))
+                     (with-current-buffer (or visiting
+                                              (find-file-noselect archive))
+                       (save-excursion
+                         (save-restriction
+                           (widen)
+                           (goto-char (point-min))
+                           (when (re-search-forward
+                                  (concat "^" (regexp-quote todo-category-beg)
+                                          cat "$")
+                                  (point-max) t)
+                             (forward-line)
+                             (while (not (or (looking-at
+                                              (concat
+                                               (regexp-quote todo-category-beg)
+                                               "\\(.*\\)\n"))
+                                             (eobp)))
+                               (when (looking-at todo-done-string-start)
+                                 (setq archive-count (1+ archive-count)))
+                               (forward-line)))))
+                       (unless visiting (kill-buffer)))
                      (todo-update-count 'archived archive-count cat))))
                 ((looking-at todo-done-string-start)
                  (todo-update-count 'done 1 cat))
@@ -5125,6 +5182,11 @@ Overrides `diary-goto-entry'."
     (if (not (and (file-exists-p file)
                   (find-file-other-window file)))
         (message "Unable to locate this diary entry")
+      ;; If it's a Todo file, make sure it's in Todo mode.
+      (when (and (equal (file-name-directory (file-truename file))
+                        (file-truename todo-directory))
+                 (not (derived-mode-p 'todo-mode)))
+        (todo-mode))
       (when (eq major-mode 'todo-mode) (widen))
       (goto-char (point-min))
       (when (re-search-forward (format "%s.*\\(%s\\)" date content) nil t)
@@ -5564,6 +5626,9 @@ have been removed."
         (add-to-list 'files curfile))
       (dolist (f files listall)
         (with-current-buffer (find-file-noselect f 'nowarn)
+          (if archive
+              (unless (derived-mode-p 'todo-archive-mode) (todo-archive-mode))
+            (unless (derived-mode-p 'todo-mode) (todo-mode)))
           ;; Ensure category is properly displayed in case user
           ;; switches to file via a non-Todo mode command.  And if
           ;; done items in category are visible, keep them visible.
@@ -5616,7 +5681,7 @@ otherwise, a new file name is allowed."
                                   ""))))
     (unless (file-exists-p todo-directory)
       (make-directory todo-directory))
-    (unless mustmatch
+    (unless (or mustmatch (member file files))
       (setq file (todo-validate-name file 'file)))
     (setq file (file-truename (concat todo-directory file
                                       (if archive ".toda" ".todo"))))))
@@ -5649,6 +5714,7 @@ categories from `todo-category-completions-files'."
            (categories (cond (file0
                               (with-current-buffer
                                   (find-file-noselect file0 'nowarn)
+                                (unless (derived-mode-p 'todo-mode) (todo-mode))
                                 (let ((todo-current-todo-file file0))
                                   todo-categories)))
                              ((and add (not file))
@@ -5915,8 +5981,9 @@ the empty string (i.e., no time string)."
 
 (defun todo-reset-nondiary-marker (symbol value)
   "The :set function for user option `todo-nondiary-marker'."
-  (let ((oldvalue (symbol-value symbol))
-        (files (append todo-files todo-archives)))
+  (let* ((oldvalue (symbol-value symbol))
+         (files (append todo-files todo-archives
+                        (directory-files todo-directory t "\.tod[rty]$" t))))
     (custom-set-default symbol value)
     ;; Need to reset these to get font-locking right.
     (setq todo-nondiary-start (nth 0 todo-nondiary-marker)
@@ -5927,23 +5994,28 @@ the empty string (i.e., no time string)."
                   (regexp-quote diary-nonmarking-symbol) "\\)?"))
     (when (not (equal value oldvalue))
       (dolist (f files)
-        (with-current-buffer (find-file-noselect f)
-          (let (buffer-read-only)
-            (widen)
-            (goto-char (point-min))
-            (while (not (eobp))
-              (if (re-search-forward
-                   (concat "^\\(" todo-done-string-start "[^][]+] \\)?"
-                           "\\(?1:" (regexp-quote (car oldvalue))
-                           "\\)" todo-date-pattern "\\( "
-                           diary-time-regexp "\\)?\\(?2:"
-                           (regexp-quote (cadr oldvalue)) "\\)")
-                   nil t)
-                  (progn
-                    (replace-match (nth 0 value) t t nil 1)
-                    (replace-match (nth 1 value) t t nil 2))
-                (forward-line)))
-            (todo-category-select)))))))
+        (let ((buf (find-buffer-visiting f)))
+          (with-current-buffer (find-file-noselect f)
+            (let (buffer-read-only)
+              (widen)
+              (goto-char (point-min))
+              (while (not (eobp))
+                (if (re-search-forward
+                     (concat "^\\(" todo-done-string-start "[^][]+] \\)?"
+                             "\\(?1:" (regexp-quote (car oldvalue))
+                             "\\)" todo-date-pattern "\\( "
+                             diary-time-regexp "\\)?\\(?2:"
+                             (regexp-quote (cadr oldvalue)) "\\)")
+                     nil t)
+                    (progn
+                      (replace-match (nth 0 value) t t nil 1)
+                      (replace-match (nth 1 value) t t nil 2))
+                  (forward-line)))
+              (if buf
+                  (when (derived-mode-p 'todo-mode 'todo-archive-mode)
+                    (todo-category-select))
+                (save-buffer)
+                (kill-buffer)))))))))
 
 (defun todo-reset-done-separator-string (symbol value)
   "The :set function for `todo-done-separator-string'."
@@ -5963,51 +6035,63 @@ the empty string (i.e., no time string)."
 (defun todo-reset-done-string (symbol value)
   "The :set function for user option `todo-done-string'."
   (let ((oldvalue (symbol-value symbol))
-        (files (append todo-files todo-archives)))
+        (files (append todo-files todo-archives
+                       (directory-files todo-directory t "\.todr$" t))))
     (custom-set-default symbol value)
     ;; Need to reset this to get font-locking right.
     (setq todo-done-string-start
           (concat "^\\[" (regexp-quote todo-done-string)))
     (when (not (equal value oldvalue))
       (dolist (f files)
-        (with-current-buffer (find-file-noselect f)
-          (let (buffer-read-only)
-            (widen)
-            (goto-char (point-min))
-            (while (not (eobp))
-              (if (re-search-forward
-                   (concat "^" (regexp-quote todo-nondiary-start)
-                           "\\(" (regexp-quote oldvalue) "\\)")
-                   nil t)
-                  (replace-match value t t nil 1)
-                (forward-line)))
-            (todo-category-select)))))))
+        (let ((buf (find-buffer-visiting f)))
+          (with-current-buffer (find-file-noselect f)
+            (let (buffer-read-only)
+              (widen)
+              (goto-char (point-min))
+              (while (not (eobp))
+                (if (re-search-forward
+                     (concat "^" (regexp-quote todo-nondiary-start)
+                             "\\(" (regexp-quote oldvalue) "\\)")
+                     nil t)
+                    (replace-match value t t nil 1)
+                  (forward-line)))
+              (if buf
+                  (when (derived-mode-p 'todo-mode 'todo-archive-mode)
+                    (todo-category-select))
+                (save-buffer)
+                (kill-buffer)))))))))
 
 (defun todo-reset-comment-string (symbol value)
   "The :set function for user option `todo-comment-string'."
   (let ((oldvalue (symbol-value symbol))
-        (files (append todo-files todo-archives)))
+        (files (append todo-files todo-archives
+                       (directory-files todo-directory t "\.todr$" t))))
     (custom-set-default symbol value)
     (when (not (equal value oldvalue))
       (dolist (f files)
-        (with-current-buffer (find-file-noselect f)
-          (let (buffer-read-only)
-            (save-excursion
+        (let ((buf (find-buffer-visiting f)))
+          (with-current-buffer (find-file-noselect f)
+            (let (buffer-read-only)
               (widen)
               (goto-char (point-min))
               (while (not (eobp))
                 (if (re-search-forward
-                     (concat
-                             "\\[\\(" (regexp-quote oldvalue) "\\): [^]]*\\]")
+                     (concat "\\[\\(" (regexp-quote oldvalue)
+                             "\\): [^]]*\\]")
                      nil t)
                     (replace-match value t t nil 1)
                   (forward-line)))
-              (todo-category-select))))))))
+              (if buf
+                  (when (derived-mode-p 'todo-mode 'todo-archive-mode)
+                    (todo-category-select))
+                (save-buffer)
+                (kill-buffer)))))))))
 
 (defun todo-reset-highlight-item (symbol value)
-  "The :set function for `todo-toggle-item-highlighting'."
+  "The :set function for user option `todo-highlight-item'."
   (let ((oldvalue (symbol-value symbol))
-        (files (append todo-files todo-archives)))
+        (files (append todo-files todo-archives
+                       (directory-files todo-directory t "\.tod[rty]$" t))))
     (custom-set-default symbol value)
     (when (not (equal value oldvalue))
       (dolist (f files)
@@ -6399,20 +6483,20 @@ Added to `pre-command-hook' in Todo mode when user option
 `todo-show-current-file' is set to non-nil."
   (setq todo-global-current-todo-file todo-current-todo-file))
 
-(defun todo-display-as-todo-file ()
-  "Show todo files correctly when visited from outside of Todo mode.
-Added to `find-file-hook' in Todo mode and Todo Archive mode."
-  (and (member this-command todo-visit-files-commands)
-       (= (- (point-max) (point-min)) (buffer-size))
-       (member major-mode '(todo-mode todo-archive-mode))
-       (todo-category-select)))
-
-(defun todo-add-to-buffer-list ()
-  "Add name of just visited todo file to `todo-file-buffers'.
-This function is added to `find-file-hook' in Todo mode."
-  (let ((filename (file-truename (buffer-file-name))))
-    (when (member filename todo-files)
-      (add-to-list 'todo-file-buffers filename))))
+;; (defun todo-display-as-todo-file ()
+;;   "Show todo files correctly when visited from outside of Todo mode.
+;; Added to `find-file-hook' in Todo mode and Todo Archive mode."
+;;   (and (member this-command todo-visit-files-commands)
+;;        (= (- (point-max) (point-min)) (buffer-size))
+;;        (member major-mode '(todo-mode todo-archive-mode))
+;;        (todo-category-select)))
+
+;; (defun todo-add-to-buffer-list ()
+;;   "Add name of just visited todo file to `todo-file-buffers'.
+;; This function is added to `find-file-hook' in Todo mode."
+;;   (let ((filename (file-truename (buffer-file-name))))
+;;     (when (member filename todo-files)
+;;       (add-to-list 'todo-file-buffers filename))))
 
 (defun todo-update-buffer-list ()
   "Make current Todo mode buffer file car of `todo-file-buffers'.
@@ -6467,7 +6551,8 @@ Added to `window-configuration-change-hook' in Todo mode."
   "Make some settings that apply to multiple Todo modes."
   (setq-local todo-categories (todo-set-categories))
   (setq-local todo-category-number 1)
-  (add-hook 'find-file-hook 'todo-display-as-todo-file nil t))
+  ;; (add-hook 'find-file-hook 'todo-display-as-todo-file nil t)
+  )
 
 (put 'todo-mode 'mode-class 'special)
 
@@ -6486,7 +6571,7 @@ Added to `window-configuration-change-hook' in Todo mode."
     (setq-local todo-current-todo-file (file-truename (buffer-file-name))))
   (setq-local todo-show-done-only nil)
   (setq-local todo-categories-with-marks nil)
-  (add-hook 'find-file-hook 'todo-add-to-buffer-list nil t)
+  ;; (add-hook 'find-file-hook 'todo-add-to-buffer-list nil t)
   (add-hook 'post-command-hook 'todo-update-buffer-list nil t)
   (when todo-show-current-file
     (add-hook 'pre-command-hook 'todo-show-current-file nil t))
@@ -6555,13 +6640,6 @@ Added to `window-configuration-change-hook' in Todo mode."
   (todo-modes-set-1)
   (todo-modes-set-2))
 
-;;;###autoload
-(add-to-list 'auto-mode-alist '("\\.todo\\'" . todo-mode))
-;;;###autoload
-(add-to-list 'auto-mode-alist '("\\.toda\\'" . todo-archive-mode))
-;;;###autoload
-(add-to-list 'auto-mode-alist '("\\.tod[tyr]\\'" . todo-filtered-items-mode))
-
 ;; -----------------------------------------------------------------------------
 (provide 'todo-mode)
 
diff --git a/lisp/cus-face.el b/lisp/cus-face.el
index 913ef4cb8bf..a9e6f3f5b56 100644
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@ -218,6 +218,10 @@
      (color :tag "Foreground"
             :help-echo "Set foreground color (name or #RRGGBB hex spec)."))
 
+    (:distant-foreground
+     (color :tag "Distant Foreground"
+            :help-echo "Set distant foreground color (name or #RRGGBB hex spec)."))
+
     (:background
      (color :tag "Background"
             :help-echo "Set background color (name or #RRGGBB hex spec)."))
diff --git a/lisp/emacs-lisp/eieio-opt.el b/lisp/emacs-lisp/eieio-opt.el
index a502901a469..ca9b91bed58 100644
--- a/lisp/emacs-lisp/eieio-opt.el
+++ b/lisp/emacs-lisp/eieio-opt.el
@@ -141,7 +141,7 @@ If CLASS is actually an object, then also display current values of that object.
               (insert " " (aref type counter) " "
                       (prin1-to-string (car cur) (current-buffer))
                       "\n"
-                      (cdr cur)))
+                      (or (cdr cur) "")))
             (setq counter (1+ counter))))
         (insert "\n\n")
         (setq methods (cdr methods))))))
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index 3ff65ff11cd..23b021df177 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -431,16 +431,18 @@ is called as a function to find the defun's end."
       (push-mark))
   (if (or (null arg) (= arg 0)) (setq arg 1))
   (let ((pos (point))
-        (beg (progn (end-of-line 1) (beginning-of-defun-raw 1) (point))))
+        (beg (progn (end-of-line 1) (beginning-of-defun-raw 1) (point)))
+        (skip (lambda ()
+                ;; When comparing point against pos, we want to consider that if
+                ;; point was right after the end of the function, it's still
+                ;; considered as "in that function".
+                ;; E.g. `eval-defun' from right after the last close-paren.
+                (unless (bolp)
+                  (skip-chars-forward " \t")
+                  (if (looking-at "\\s<\\|\n")
+                      (forward-line 1))))))
     (funcall end-of-defun-function)
-    ;; When comparing point against pos, we want to consider that if
-    ;; point was right after the end of the function, it's still
-    ;; considered as "in that function".
-    ;; E.g. `eval-defun' from right after the last close-paren.
-    (unless (bolp)
-      (skip-chars-forward " \t")
-      (if (looking-at "\\s<\\|\n")
-          (forward-line 1)))
+    (funcall skip)
     (cond
      ((> arg 0)
       ;; Moving forward.
@@ -463,11 +465,19 @@ is called as a function to find the defun's end."
         (goto-char beg))
       (unless (zerop arg)
         (beginning-of-defun-raw (- arg))
+        (setq beg (point))
         (funcall end-of-defun-function))))
-    (unless (bolp)
-      (skip-chars-forward " \t")
-      (if (looking-at "\\s<\\|\n")
-          (forward-line 1)))))
+    (funcall skip)
+    (while (and (< arg 0) (>= (point) pos))
+      ;; We intended to move backward, but this ended up not doing so:
+      ;; Try harder!
+      (goto-char beg)
+      (beginning-of-defun-raw (- arg))
+      (if (>= (point) beg)
+          (setq arg 0)
+        (setq beg (point))
+        (funcall end-of-defun-function)
+        (funcall skip)))))
 
 (defun mark-defun (&optional allow-extend)
   "Put mark at end of this defun, point at beginning.
diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el
index 66a4f8fdea7..bfd939d69e2 100644
--- a/lisp/emacs-lisp/nadvice.el
+++ b/lisp/emacs-lisp/nadvice.el
@@ -180,12 +180,16 @@ WHERE is a symbol to select an entry in `advice--where-alist'."
         (advice--make-1 (nth 1 desc) (nth 2 desc)
                         function main props)))))
 
-(defun advice--member-p (function name definition)
+(defun advice--member-p (function use-name definition)
   (let ((found nil))
     (while (and (not found) (advice--p definition))
-      (if (if name
-              (equal name (cdr (assq 'name (advice--props definition))))
-            (equal function (advice--car definition)))
+      (if (if (eq use-name :use-both)
+              (or (equal function
+                         (cdr (assq 'name (advice--props definition))))
+                  (equal function (advice--car definition)))
+            (equal function (if use-name
+                                (cdr (assq 'name (advice--props definition)))
+                              (advice--car definition))))
           (setq found definition)
         (setq definition (advice--cdr definition))))
     found))
@@ -292,7 +296,7 @@ is also interactive.  There are 3 cases:
 ;;;###autoload
 (defun advice--add-function (where ref function props)
   (let* ((name (cdr (assq 'name props)))
-         (a (advice--member-p function name (gv-deref ref))))
+         (a (advice--member-p (or name function) (if name t) (gv-deref ref))))
     (when a
       ;; The advice is already present.  Remove the old one, first.
       (setf (gv-deref ref)
@@ -324,7 +328,7 @@ properties alist that was specified when it was added."
   "Return non-nil if ADVICE is already in FUNCTION-DEF.
 Instead of ADVICE being the actual function, it can also be the `name'
 of the piece of advice."
-  (advice--member-p advice advice function-def))
+  (advice--member-p advice :use-both function-def))
 
 ;;;; Specific application of add-function to `symbol-function' for advice.
 
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 5843724a596..e6bc8f9b485 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1266,10 +1266,7 @@ similar to an entry in `package-alist'.  Save the cached copy to
       ;; may fetch a URL redirect page).
       (when (listp (read (current-buffer)))
         (make-directory dir t)
-        (setq buffer-file-name (expand-file-name file dir))
-        (let ((version-control 'never)
-              (require-final-newline nil))
-          (save-buffer))))
+        (write-region nil nil (expand-file-name file dir) nil 'silent)))
     (when good-signatures
       ;; Write out good signatures into archive-contents.signed file.
       (write-region (mapconcat #'epg-signature-to-string good-signatures "\n")
@@ -1515,11 +1512,13 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages."
                      (package--with-work-buffer
                          (package-archive-base desc)
                          (format "%s-readme.txt" name)
-                       (setq buffer-file-name
-                             (expand-file-name readme package-user-dir))
-                       (let ((version-control 'never)
-                             (require-final-newline t))
-                         (save-buffer))
+                       (save-excursion
+                         (goto-char (point-max))
+                         (unless (bolp)
+                           (insert ?\n)))
+                       (write-region nil nil
+                                     (expand-file-name readme package-user-dir)
+                                     nil 'silent)
                        (setq readme-string (buffer-string))
                        t))
                  (error nil))
diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el
index 515bbc36a06..7fc6bf7b920 100644
--- a/lisp/emacs-lisp/timer.el
+++ b/lisp/emacs-lisp/timer.el
@@ -290,42 +290,50 @@ This function is called, by name, directly by the C code."
           (cell
            ;; Delete from queue.  Record the cons cell that was used.
            (cancel-timer-internal timer)))
-      ;; Re-schedule if requested.
-      (if (timer--repeat-delay timer)
-          (if (timer--idle-delay timer)
-              (timer-activate-when-idle timer nil cell)
-            (timer-inc-time timer (timer--repeat-delay timer) 0)
-            ;; If real time has jumped forward,
-            ;; perhaps because Emacs was suspended for a long time,
-            ;; limit how many times things get repeated.
-            (if (and (numberp timer-max-repeats)
-                     (< 0 (timer-until timer (current-time))))
-                (let ((repeats (/ (timer-until timer (current-time))
-                                  (timer--repeat-delay timer))))
-                  (if (> repeats timer-max-repeats)
-                      (timer-inc-time timer (* (timer--repeat-delay timer)
-                                               repeats)))))
-            ;; Place it back on the timer-list before running
-            ;; timer--function, so it can cancel-timer itself.
-            (timer-activate timer t cell)
-            (setq retrigger t)))
-      ;; Run handler.
-      (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 (message "Error running timer%s: %S"
-                        (if (symbolp (timer--function timer))
-                            (format " `%s'" (timer--function timer)) "")
-                        err)))
-      (when (and retrigger
-                 ;; If the timer's been canceled, don't "retrigger" it
-                 ;; since it might still be in the copy of timer-list kept
-                 ;; by keyboard.c:timer_check (bug#14156).
-                 (memq timer timer-list))
-        (setf (timer--triggered timer) nil)))))
+      ;; If `cell' is nil, it means the timer was already canceled, so we
+      ;; shouldn't be running it at all.  This can happen for example with the
+      ;; following scenario (bug#17392):
+      ;; - we run timers, starting with A (and remembering the rest as (B C)).
+      ;; - A runs and a does a sit-for.
+      ;; - during sit-for we run timer D which cancels timer B.
+      ;; - timer A finally finishes, so we move on to timers B and C.
+      (when cell
+        ;; Re-schedule if requested.
+        (if (timer--repeat-delay timer)
+            (if (timer--idle-delay timer)
+                (timer-activate-when-idle timer nil cell)
+              (timer-inc-time timer (timer--repeat-delay timer) 0)
+              ;; If real time has jumped forward,
+              ;; perhaps because Emacs was suspended for a long time,
+              ;; limit how many times things get repeated.
+              (if (and (numberp timer-max-repeats)
+                       (< 0 (timer-until timer (current-time))))
+                  (let ((repeats (/ (timer-until timer (current-time))
+                                    (timer--repeat-delay timer))))
+                    (if (> repeats timer-max-repeats)
+                        (timer-inc-time timer (* (timer--repeat-delay timer)
+                                                 repeats)))))
+              ;; Place it back on the timer-list before running
+              ;; timer--function, so it can cancel-timer itself.
+              (timer-activate timer t cell)
+              (setq retrigger t)))
+        ;; Run handler.
+        (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 (message "Error running timer%s: %S"
+                          (if (symbolp (timer--function timer))
+                              (format " `%s'" (timer--function timer)) "")
+                          err)))
+        (when (and retrigger
+                   ;; If the timer's been canceled, don't "retrigger" it
+                   ;; since it might still be in the copy of timer-list kept
+                   ;; by keyboard.c:timer_check (bug#14156).
+                   (memq timer timer-list))
+          (setf (timer--triggered timer) nil))))))
 
 ;; This function is incompatible with the one in levents.el.
 (defun timeout-event-p (event)
diff --git a/lisp/frame.el b/lisp/frame.el
index f081df788ec..5e9b5351005 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1107,10 +1107,10 @@ number of lines and columns.
 
 If FRAMES is nil, apply the font to the selected frame only.
 If FRAMES is non-nil, it should be a list of frames to act upon,
-or t meaning all graphical frames.  Also, if FRAME is non-nil,
-alter the user's Customization settings as though the
-font-related attributes of the `default' face had been \"set in
-this session\", so that the font is applied to future frames."
+or t meaning all existing graphical frames.
+Also, if FRAMES is non-nil, alter the user's Customization settings
+as though the font-related attributes of the `default' face had been
+\"set in this session\", so that the font is applied to future frames."
   (interactive
    (let* ((completion-ignore-case t)
           (font (completing-read "Font name: "
@@ -1822,9 +1822,7 @@ terminals, cursor blinking is controlled by the terminal."
   :initialize 'custom-initialize-delay
   :group 'cursor
   :global t
-  (if blink-cursor-idle-timer (cancel-timer blink-cursor-idle-timer))
-  (setq blink-cursor-idle-timer nil)
-  (blink-cursor-end)
+  (blink-cursor-suspend)
   (remove-hook 'focus-in-hook #'blink-cursor-check)
   (remove-hook 'focus-out-hook #'blink-cursor-suspend)
   (when blink-cursor-mode
diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el
index 51c8c3c3d7e..d3b8a2cf6c5 100644
--- a/lisp/hippie-exp.el
+++ b/lisp/hippie-exp.el
@@ -715,7 +715,7 @@ string).  It returns t if a new completion is found, nil otherwise."
 
 (defun he-line-search-regexp (pat strip-prompt)
   (if strip-prompt
-      (concat "\\(" comint-prompt-regexp "\\|^\\s-*\\)\\("
+      (concat "\\(" comint-prompt-regexp "\\|^\\s-*\\)\\(?2:"
               (regexp-quote pat)
               "[^\n]*[^ \t\n]\\)")
       (concat "^\\(\\s-*\\)\\("
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 436d8f611a8..f9cbc62b464 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -662,7 +662,7 @@ by \"Save Options\" in Custom buffers.")
 ;; Function for setting/saving default font.
 
 (defun menu-set-font ()
-  "Interactively select a font and make it the default."
+  "Interactively select a font and make it the default on all existing frames."
   (interactive)
   (set-frame-font (if (fboundp 'x-select-font)
                       (x-select-font)
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 2f898fa1ba5..cfff1533e48 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -529,7 +529,7 @@ for use at QPOS."
       (let* ((qpos pred)
              (ustring (funcall unquote string))
              (uprefix (funcall unquote (substring string 0 qpos)))
-             ;; FIXME: we really should pass `qpos' to `unuote' and have that
+             ;; FIXME: we really should pass `qpos' to `unquote' and have that
              ;; function give us the corresponding `uqpos'.  But for now we
              ;; presume (more or less) that `concat' and `unquote' commute.
              (uqpos (if (string-prefix-p uprefix ustring)
diff --git a/lisp/mouse.el b/lisp/mouse.el
index ca94a343c1a..15f89291af9 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -26,8 +26,6 @@
 ;; This package provides various useful commands (including help
 ;; system access) through the mouse.  All this code assumes that mouse
 ;; interpretation has been abstracted into Emacs input events.
-;;
-;; The code is rather X-dependent.
 
 ;;; Code:
 
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index 4d146a33248..7f230a9d2ab 100644
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -277,6 +277,8 @@ object is returned instead of a list containing this single Lisp object.
 
   => \"i686\""
 
+  (or (featurep 'dbusbind)
+      (signal 'dbus-error (list "Emacs not compiled with dbus support")))
   (or (memq bus '(:system :session)) (stringp bus)
       (signal 'wrong-type-argument (list 'keywordp bus)))
   (or (stringp service)
@@ -380,6 +382,8 @@ Example:
 
   -| i686"
 
+  (or (featurep 'dbusbind)
+      (signal 'dbus-error (list "Emacs not compiled with dbus support")))
   (or (memq bus '(:system :session)) (stringp bus)
       (signal 'wrong-type-argument (list 'keywordp bus)))
   (or (stringp service)
@@ -428,6 +432,8 @@ Example:
   :session nil \"/org/gnu/Emacs\" \"org.gnu.Emacs.FileManager\"
   \"FileModified\" \"/home/albinus/.emacs\")"
 
+  (or (featurep 'dbusbind)
+      (signal 'dbus-error (list "Emacs not compiled with dbus support")))
   (or (memq bus '(:system :session)) (stringp bus)
       (signal 'wrong-type-argument (list 'keywordp bus)))
   (or (null service) (stringp service)
@@ -446,6 +452,8 @@ Example:
   "Return for message SERIAL on the D-Bus BUS.
 This is an internal function, it shall not be used outside dbus.el."
 
+  (or (featurep 'dbusbind)
+      (signal 'dbus-error (list "Emacs not compiled with dbus support")))
   (or (memq bus '(:system :session)) (stringp bus)
       (signal 'wrong-type-argument (list 'keywordp bus)))
   (or (stringp service)
@@ -460,6 +468,8 @@ This is an internal function, it shall not be used outside dbus.el."
   "Return error message for message SERIAL on the D-Bus BUS.
 This is an internal function, it shall not be used outside dbus.el."
 
+  (or (featurep 'dbusbind)
+      (signal 'dbus-error (list "Emacs not compiled with dbus support")))
   (or (memq bus '(:system :session)) (stringp bus)
       (signal 'wrong-type-argument (list 'keywordp bus)))
   (or (stringp service)
@@ -1763,6 +1773,8 @@ connection used in the same Emacs process, like the one established by
 GTK+.  It should be used with care for at least the `:system' and
 `:session' buses, because other Emacs Lisp packages might already use
 this connection to those buses."
+  (or (featurep 'dbusbind)
+      (signal 'dbus-error (list "Emacs not compiled with dbus support")))
   (dbus--init-bus bus private)
   (dbus-register-signal
    bus nil dbus-path-local dbus-interface-local
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 900e1c812ae..15aa1329817 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -4137,7 +4137,7 @@ Goes through the list `tramp-local-coding-commands' and
                           tmpfile)
                       (while (string-match (regexp-quote "-") name)
                         (setq name (replace-match "_" nil t name)))
-                      (when (string-match "%t" value)
+                      (when (string-match "\\(^\\|[^%]\\)%t" value)
                         (setq tmpfile
                               (make-temp-name
                                (expand-file-name
diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index cd50bce2152..b3ce7aaac25 100644
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -2630,8 +2630,9 @@ With a prefix argument, inserts the character directly."
 (put 'entity-ref 'nxml-friendly-name "entity reference")
 (put 'char-ref 'nxml-friendly-name "character reference")
 
-;;;###autoload
-(defalias 'xml-mode 'nxml-mode)
+;; Only do this in loaddefs, so that if someone defines a different
+;; alias in .emacs, loading this file afterwards does not clobber it.
+;;;###autoload(defalias 'xml-mode 'nxml-mode)
 
 (provide 'nxml-mode)
 
diff --git a/lisp/progmodes/scheme.el b/lisp/progmodes/scheme.el
index 14f8dd65083..c47a3bd6fbe 100644
--- a/lisp/progmodes/scheme.el
+++ b/lisp/progmodes/scheme.el
@@ -99,7 +99,7 @@
     (modify-syntax-entry ?\( "()  " st)
     (modify-syntax-entry ?\) ")(  " st)
     ;; It's used for single-line comments as well as for #;(...) sexp-comments.
-    (modify-syntax-entry ?\; "< 2 " st)
+    (modify-syntax-entry ?\; "<"    st)
     (modify-syntax-entry ?\" "\"   " st)
     (modify-syntax-entry ?' "'   " st)
     (modify-syntax-entry ?` "'   " st)
@@ -147,19 +147,15 @@
   (setq-local lisp-indent-function 'scheme-indent-function)
   (setq mode-line-process '("" scheme-mode-line-process))
   (setq-local imenu-case-fold-search t)
-  (setq imenu-generic-expression scheme-imenu-generic-expression)
-  (setq-local imenu-syntax-alist
-        '(("+-*/.<>=?!$%_&~^:" . "w")))
+  (setq-local imenu-generic-expression scheme-imenu-generic-expression)
+  (setq-local imenu-syntax-alist '(("+-*/.<>=?!$%_&~^:" . "w")))
+  (setq-local syntax-propertize-function #'scheme-syntax-propertize)
   (setq font-lock-defaults
         '((scheme-font-lock-keywords
            scheme-font-lock-keywords-1 scheme-font-lock-keywords-2)
           nil t (("+-*/.<>=!?$%_&~^:" . "w") (?#. "w 14"))
           beginning-of-defun
-          (font-lock-mark-block-function . mark-defun)
-          (font-lock-syntactic-face-function
-           . scheme-font-lock-syntactic-face-function)
-          (parse-sexp-lookup-properties . t)
-          (font-lock-extra-managed-props syntax-table)))
+          (font-lock-mark-block-function . mark-defun)))
   (setq-local lisp-doc-string-elt-property 'scheme-doc-string-elt))
 
 (defvar scheme-mode-line-process "")
@@ -354,28 +350,28 @@ See `run-hooks'."
        (forward-comment (point-max))
        (if (eq (char-after) ?\() 2 0)))
 
-(defun scheme-font-lock-syntactic-face-function (state)
-  (when (and (null (nth 3 state))
-             (eq (char-after (nth 8 state)) ?#)
-             (eq (char-after (1+ (nth 8 state))) ?\;))
-    ;; It's a sexp-comment.  Tell parse-partial-sexp where it ends.
-    (save-excursion
-      (let ((pos (point))
-            (end
-             (condition-case err
-                 (let ((parse-sexp-lookup-properties nil))
-                   (goto-char (+ 2 (nth 8 state)))
-                   ;; FIXME: this doesn't handle the case where the sexp
-                   ;; itself contains a #; comment.
-                   (forward-sexp 1)
-                   (point))
-               (scan-error (nth 2 err)))))
-        (when (< pos (- end 2))
-          (put-text-property pos (- end 2)
-                             'syntax-table scheme-sexp-comment-syntax-table))
-        (put-text-property (- end 1) end 'syntax-table '(12)))))
-  ;; Choose the face to use.
-  (lisp-font-lock-syntactic-face-function state))
+(defun scheme-syntax-propertize (beg end)
+  (goto-char beg)
+  (scheme-syntax-propertize-sexp-comment (point) end)
+  (funcall
+   (syntax-propertize-rules
+    ("\\(#\\);" (1 (prog1 "< cn"
+                     (scheme-syntax-propertize-sexp-comment (point) end)))))
+   (point) end))
+
+(defun scheme-syntax-propertize-sexp-comment (_ end)
+  (let ((state (syntax-ppss)))
+    (when (eq 2 (nth 7 state))
+      ;; It's a sexp-comment.  Tell parse-partial-sexp where it ends.
+      (condition-case nil
+          (progn
+            (goto-char (+ 2 (nth 8 state)))
+            ;; FIXME: this doesn't handle the case where the sexp
+            ;; itself contains a #; comment.
+            (forward-sexp 1)
+            (put-text-property (1- (point)) (point)
+                               'syntax-table (string-to-syntax "> cn")))
+        (scan-error (goto-char end))))))
 
 ;;;###autoload
 (define-derived-mode dsssl-mode scheme-mode "DSSSL"
diff --git a/lisp/simple.el b/lisp/simple.el
index af8e47c2383..e5b0203866c 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -5069,7 +5069,15 @@ When the `track-eol' feature is doing its job, the value is
 `most-positive-fixnum'.")
 
 (defcustom line-move-ignore-invisible t
-  "Non-nil means \\[next-line] and \\[previous-line] ignore invisible lines.
+  "Non-nil means commands that move by lines ignore invisible newlines.
+When this option is non-nil, \\[next-line], \\[previous-line], \\[move-end-of-line], and \\[move-beginning-of-line] behave
+as if newlines that are invisible didn't exist, and count
+only visible newlines.  Thus, moving across across 2 newlines
+one of which is invisible will be counted as a one-line move.
+Also, a non-nil value causes invisible text to be ignored when
+counting columns for the purposes of keeping point in the same
+column by \\[next-line] and \\[previous-line].
+
 Outline mode sets this."
   :type 'boolean
   :group 'editing-basics)
diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el
index 703b46eb113..6b064260f95 100644
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -886,10 +886,9 @@ and CVS."
           (minor-num (string-to-number (vc-rcs-minor-part rev))))
       (concat branch "." (number-to-string (1+ minor-num))))))
 
-;; Note that most GNU/Linux distributions seem to supply rcs2log in a
-;; standard bin directory.  Eg both Red Hat and Debian include it in
-;; their cvs packages.  It's not obvious why Emacs still needs to
-;; provide it as well...
+;; You might think that this should be distributed with RCS, but
+;; apparently not.  CVS sometimes provides a version of it.
+;; http://lists.gnu.org/archive/html/emacs-devel/2014-05/msg00288.html
 (defvar vc-rcs-rcs2log-program
   (let (exe)
     (cond ((file-executable-p
diff --git a/lisp/window.el b/lisp/window.el
index 60f13e65c4e..c5093ca51a5 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -1079,7 +1079,6 @@ WINDOW-OR-FRAME can be a frame or a window and defaults to the
 selected frame.  When WINDOW-OR-FRAME is a window, dump that
 window's frame.  The buffer *window-frame-dump* is erased before
 dumping to it."
-  (interactive)
   (let* ((window
           (cond
            ((or (not window-or-frame)
@@ -1102,7 +1101,9 @@ dumping to it."
                (frame-text-width frame) (frame-text-height frame)
                (frame-text-cols frame) (frame-text-lines frame))
        (format "tool: %s  scroll: %s  fringe: %s  border: %s  right: %s  bottom: %s\n\n"
-               (tool-bar-height frame t)
+               (if (fboundp 'tool-bar-height)
+                   (tool-bar-height frame t)
+                 "0")
                (frame-scroll-bar-width frame)
                (frame-fringe-width frame)
                (frame-border-width frame)