58 files changed, 2337 insertions, 1064 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 86a27f9b5bd..5451abc2119 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,441 @@
+2013-07-13  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight
+        conversion methods on Kernel.
+
+2013-07-13  Alan Mackenzie  <acm@muc.de>
+
+        * progmodes/cc-engine.el (c-forward-decl-or-cast-1): Label CASE 13
+        and comment it out.  This out-commenting enables certain C++
+        declarations to be parsed correctly.
+
+2013-07-13  Eli Zaretskii  <eliz@gnu.org>
+
+        * international/mule.el (define-coding-system): Doc fix.
+
+        * simple.el (default-font-height): Don't call font-info if the
+        frame's default font didn't change since the frame was created.
+        (Bug#14838)
+
+2013-07-13  Leo Liu  <sdl.web@gmail.com>
+
+        * ido.el (ido-read-file-name): Guard against non-symbol value.
+
+2013-07-13  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+        * progmodes/python.el (python-imenu--build-tree): Fix corner case
+        in nested defuns.
+
+2013-07-13  Leo Liu  <sdl.web@gmail.com>
+
+        * ido.el (ido-exhibit): Handle ido-enter-matching-directory before
+        ido-set-matches call.  (Bug#6852)
+
+2013-07-12  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * progmodes/ruby-mode.el (ruby-percent-literals-beg-re):
+        (ruby-syntax-expansion-allowed-p): Support array of symbols, for
+        Ruby 2.0.
+        (ruby-font-lock-keywords): Distinguish calls to functions with
+        module-like names from module references.  Highlight character
+        literals.
+
+2013-07-12  Sergio Durigan Junior  <sergiodj@riseup.net>  (tiny change)
+
+        * progmodes/gdb-mi.el (gdb-strip-string-backslash): New function.
+        (gdb-send): Handle continued commands.  (Bug#14847)
+
+2013-07-12  Juanma Barranquero  <lekktu@gmail.com>
+
+        * desktop.el (desktop--v2s): Remove unused local variable.
+        (desktop-save-buffer): Make defvar-local; adjust docstring.
+        (desktop-auto-save-timeout, desktop-owner): Use ignore-errors.
+        (desktop-clear, desktop-save-buffer-p): Use string-match-p.
+
+2013-07-12  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * emacs-lisp/map-ynp.el (map-y-or-n-p): Fix last change.
+
+2013-07-12  Eli Zaretskii  <eliz@gnu.org>
+
+        * simple.el (next-line, previous-line): Document TRY-VSCROLL and ARG.
+        (Bug#14842)
+
+2013-07-12  Glenn Morris  <rgm@gnu.org>
+
+        * doc-view.el: Require cl-lib at runtime too.
+        (doc-view-remove-if): Remove.
+        (doc-view-search-next-match, doc-view-search-previous-match):
+        Use cl-remove-if.
+
+        * edmacro.el: Require cl-lib at runtime too.
+        (edmacro-format-keys, edmacro-parse-keys): Use cl-mismatch, cl-subseq.
+        (edmacro-mismatch, edmacro-subseq): Remove.
+
+        * shadowfile.el: Require cl-lib.
+        (shadow-remove-if): Remove.
+        (shadow-set-cluster, shadow-shadows-of-1, shadow-remove-from-todo):
+        Use cl-remove-if.
+
+        * wid-edit.el: Require cl-lib.
+        (widget-choose): Use cl-remove-if.
+        (widget-remove-if): Remove.
+
+        * progmodes/ebrowse.el: Require cl-lib at runtime too.
+        (ebrowse-delete-if-not): Remove.
+        (ebrowse-browser-buffer-list, ebrowse-member-buffer-list)
+        (ebrowse-tree-buffer-list, ebrowse-same-tree-member-buffer-list):
+        Use cl-delete-if-not.
+
+2013-07-12  Juanma Barranquero  <lekktu@gmail.com>
+
+        * emacs-lisp/cl-macs.el (cl-multiple-value-bind, cl-multiple-value-setq)
+        (cl-the, cl-declare, cl-defstruct): Fix typos in docstrings.
+
+2013-07-12  Leo Liu  <sdl.web@gmail.com>
+
+        * ido.el (dired-do-copy, dired): Set 'ido property.  (Bug#11954)
+
+2013-07-11  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/edebug.el: Require cl-lib at run-time too.
+        (edebug-gensym-index, edebug-gensym):
+        Remove reimplementation of cl-gensym.
+        (edebug-make-enter-wrapper, edebug-make-form-wrapper): Use cl-gensym.
+
+        * thumbs.el: Require cl-lib at run-time too.
+        (thumbs-gensym-counter, thumbs-gensym):
+        Remove reimplementation of cl-gensym.
+        (thumbs-temp-file): Use cl-gensym.
+
+        * emacs-lisp/ert.el: Require cl-lib at runtime too.
+        (ert--cl-do-remf, ert--remprop, ert--remove-if-not)
+        (ert--intersection, ert--set-difference, ert--set-difference-eq)
+        (ert--union, ert--gensym-counter, ert--gensym-counter)
+        (ert--coerce-to-vector, ert--remove*, ert--string-position)
+        (ert--mismatch, ert--subseq): Remove reimplementations of cl funcs.
+        (ert-make-test-unbound, ert--expand-should-1)
+        (ert--expand-should, ert--should-error-handle-error)
+        (should-error, ert--explain-equal-rec)
+        (ert--plist-difference-explanation, ert-select-tests)
+        (ert--make-stats, ert--remove-from-list, ert--string-first-line):
+        Use cl-lib functions rather than reimplementations.
+
+2013-07-11  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-methods): Extend docstring.
+        (tramp-connection-timeout): New defcustom.
+        (tramp-error-with-buffer): Reset timestamp only when appropriate.
+        (with-tramp-progress-reporter): Simplify.
+        (tramp-process-actions): Improve messages.
+
+        * net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection):
+        * net/tramp-sh.el (tramp-maybe-open-connection):
+        Use `tramp-connection-timeout'.
+        (tramp-methods) [su, sudo, ksu]: Add method specific timeouts.
+        (Bug#14808)
+
+2013-07-11  Leo Liu  <sdl.web@gmail.com>
+
+        * ido.el (ido-read-file-name): Conform to the requirements of
+        read-file-name.  (Bug#11861)
+        (ido-read-directory-name): Conform to the requirements of
+        read-directory-name.
+
+2013-07-11  Juanma Barranquero  <lekktu@gmail.com>
+
+        * subr.el (delay-warning): New function.
+
+2013-07-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * simple.el (default-line-height): New function.
+        (line-move-partial, line-move): Use it instead of computing the
+        line height inline.
+        (line-move-partial): Always compute ROWH.  If the last line is
+        partially-visible, but its text is completely visible, allow
+        cursor to enter such a partially-visible line.
+
+2013-07-10  Michael Albinus  <michael.albinus@gmx.de>
+
+        Improve error messages.  (Bug#14808)
+
+        * net/tramp.el (tramp-current-connection): New defvar, moved from
+        tramp-sh.el.
+        (tramp-message-show-progress-reporter-message): Removed, not
+        needed anymore.
+        (tramp-error-with-buffer): Show message in minibuffer.  Discard
+        input before waiting.  Reset connection timestamp.
+        (with-tramp-progress-reporter): Improve messages.
+        (tramp-process-actions): Use progress reporter.  Delete process in
+        case of error.  Improve messages.
+
+        * net/tramp-sh.el (tramp-barf-if-no-shell-prompt): Use
+        condition-case.  Call `tramp-error-with-buffer' with vector and buffer.
+        (tramp-current-connection): Removed.
+        (tramp-maybe-open-connection): The car of
+        `tramp-current-connection' are the first 3 slots of the vector.
+
+2013-07-10  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * progmodes/cfengine.el (cfengine3-indent-line): Do not indent
+        inside continued strings.
+
+2013-07-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Timestamp fixes for undo (Bug#14824).
+        * files.el (clear-visited-file-modtime): Move here from fileio.c.
+
+2013-07-10  Leo Liu  <sdl.web@gmail.com>
+
+        * files.el (require-final-newline): Allow safe local value.
+        (Bug#14834)
+
+2013-07-09  Leo Liu  <sdl.web@gmail.com>
+
+        * ido.el (ido-read-directory-name): Handle fallback.
+        (ido-read-file-name): Update DIR to ido-current-directory.
+        (Bug#1516)
+        (ido-add-virtual-buffers-to-list): Robustify.  (Bug#14552)
+
+2013-07-09  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * progmodes/ruby-mode.el (ruby-font-lock-keywords): Remove extra
+        "autoload".  Remove "warn lower camel case" section, previously
+        commented out.  Highlight negation char.  Do not highlight the
+        target in singleton method definitions.
+
+2013-07-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * faces.el (tty-setup-hook): Declare the hook.
+
+        * emacs-lisp/pcase.el (pcase--split-pred): Add `vars' argument to try
+        and detect when a guard/pred depends on local vars (bug#14773).
+        (pcase--u1): Adjust caller.
+
+2013-07-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * simple.el (line-move-partial, line-move): Account for
+        line-spacing.
+        (line-move-partial): Avoid setting vscroll when the last
+        partially-visible line in window is of default height.
+
+2013-07-08  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * net/shr.el (shr-map): Reinstate the `u' key binding, since it's
+        been used a while.
+
+2013-07-07  Juanma Barranquero  <lekktu@gmail.com>
+
+        * subr.el (read-quoted-char): Remove unused local variable `char'.
+
+2013-07-07  Michael Kifer  <kifer@cs.stonybrook.edu>
+
+        * ediff.el (ediff-version): Version update.
+        (ediff-files-command, ediff3-files-command, ediff-merge-command)
+        (ediff-merge-with-ancestor-command, ediff-directories-command)
+        (ediff-directories3-command, ediff-merge-directories-command)
+        (ediff-merge-directories-with-ancestor-command): New functions.
+        All are command-line interfaces to ediff: to facilitate calling
+        Emacs with the appropriate ediff functions invoked.
+
+        * viper-cmd.el (viper-del-forward-char-in-insert): New function.
+        (viper-save-kill-buffer): Check if buffer is modified.
+
+        * viper.el (viper-version): Version update.
+        (viper-emacs-state-mode-list): Add egg-status-buffer-mode.
+
+2013-07-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * faces.el (tty-run-terminal-initialization): Run new tty-setup-hook.
+        * viper-cmd.el (viper-envelop-ESC-key): Remove function.
+        (viper-intercept-ESC-key): Simplify.
+        * viper-keym.el (viper-ESC-key): Make it a constant, don't use kbd.
+        * viper.el (viper--tty-ESC-filter, viper--lookup-key)
+        (viper-catch-tty-ESC, viper-uncatch-tty-ESC)
+        (viper-setup-ESC-to-escape): New functions.
+        (viper-go-away, viper-set-hooks): Call viper-setup-ESC-to-escape.
+        (viper-set-hooks): Do not modify flyspell-mode-hook.  (Bug#13793)
+
+2013-07-07  Eli Zaretskii  <eliz@gnu.org>
+
+        * simple.el (default-font-height, window-screen-lines):
+        New functions.
+        (line-move, line-move-partial): Use them instead of
+        frame-char-height and window-text-height.  This makes scrolling
+        text smoother when the buffer's default face uses a font that is
+        different from the frame's default font.
+
+2013-07-06  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * files.el (write-file): Do not display confirm dialog for NS,
+        it does its own dialog, which can't be cancelled (Bug#14578).
+
+2013-07-06  Eli Zaretskii  <eliz@gnu.org>
+
+        * simple.el (line-move-partial): Adjust the row returned by
+        posn-at-point for the current window-vscroll.  (Bug#14567)
+
+2013-07-06  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-sh-file-gvfs-monitor-dir-process-filter):
+        (tramp-sh-file-inotifywait-process-filter): Handle file names with
+        spaces.
+
+2013-07-06  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (window-state-put-stale-windows): New variable.
+        (window--state-put-2): Save list of windows without matching buffer.
+        (window-state-put): Remove "bufferless" windows if possible.
+
+2013-07-06  Juanma Barranquero  <lekktu@gmail.com>
+
+        * simple.el (alternatives-define): Remove leftover :group keyword.
+        Tweak docstring.
+
+2013-07-06  Leo Liu  <sdl.web@gmail.com>
+
+        * ido.el (ido-use-virtual-buffers): Allow new value 'auto.
+        (ido-enable-virtual-buffers): New variable.
+        (ido-buffer-internal, ido-toggle-virtual-buffers)
+        (ido-make-buffer-list): Use it.
+        (ido-exhibit): Support turning on and off virtual buffers
+        automatically.
+
+2013-07-06  Juanma Barranquero  <lekktu@gmail.com>
+
+        * simple.el (alternatives-define): New macro.
+
+2013-07-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * subr.el (read-quoted-char): Use read-key.
+        (sit-for): Let read-event decode tty input (bug#14782).
+
+2013-07-05  Stephen Berman  <stephen.berman@gmx.net>
+
+        * calendar/todo-mode.el: Add handling of file deletion, both by
+        mode command and externally.  Fix various related bugs.
+        Clarify Commentary and improve some documentation strings and code.
+        (todo-delete-file): New command.
+        (todo-check-file): New function.
+        (todo-show): Handle external deletion of the file we're trying to
+        show (bug#14688).  Replace called-interactively-p by an optional
+        prefix argument to avoid problematic interaction with catch form
+        when byte compiled (bug#14702).
+        (todo-quit): Handle external deletion of the archive's todo file.
+        Make sure the buffer that was visiting the archive file is still
+        live before trying to bury it.
+        (todo-category-completions): Handle external deletion of any
+        category completion files.
+        (todo-jump-to-category, todo-basic-insert-item): Recalculate list
+        of todo files, in case of external deletion.
+        (todo-add-file): Replace unnecessary setq by let-binding.
+        (todo-find-archive): Check whether there are any archives.
+        Replace unnecessary setq by let-binding.
+        (todo-archive-done-item): Use find-file-noselect to get the
+        archive buffer whether or not the archive already exists.
+        Remove superfluous code.  Use file size instead of buffer-file-name to
+        check if the archive is new; if it is, update list of archives.
+        (todo-default-todo-file): Allow nil to be a valid value for when
+        there are no todo files.
+        (todo-reevaluate-default-file-defcustom): Use corrected definition
+        of todo-default-todo-file.
+        (todo-key-bindings-t+a+f): Add key binding for todo-delete-file.
+        (todo-delete-category, todo-show-categories-table)
+        (todo-category-number): Clarify comment.
+        (todo-filter-items): Clarify documentation string.
+        (todo-show-current-file, todo-display-as-todo-file)
+        (todo-reset-and-enable-done-separator): Tweak documentation string.
+        (todo-done-separator): Make separator length window-width, since
+        bug#2749 is now fixed.
+
+2013-07-05  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-sh-handle-file-notify-add-watch):
+        Support both "gvfs-monitor-dir" and "inotifywait".
+        (tramp-sh-file-inotifywait-process-filter): Rename from
+        `tramp-sh-file-notify-process-filter'.
+        (tramp-sh-file-gvfs-monitor-dir-process-filter)
+        (tramp-get-remote-gvfs-monitor-dir): New defuns.
+
+2013-07-05  Leo Liu  <sdl.web@gmail.com>
+
+        * autoinsert.el (auto-insert-alist): Default to lexical-binding.
+
+2013-07-04  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * frame.el (display-pixel-height, display-pixel-width)
+        (display-mm-height, display-mm-width): Mention behavior on
+        multi-monitor setups in docstrings.
+        (w32-display-monitor-attributes-list): Declare function.
+        (display-monitor-attributes-list): Use it.
+
+2013-07-04  Michael Albinus  <michael.albinus@gmx.de>
+
+        * filenotify.el: New package.
+
+        * autorevert.el (top): Require filenotify.el.
+        (auto-revert-notify-enabled): Remove.  Use `file-notify-support'
+        instead.
+        (auto-revert-notify-rm-watch, auto-revert-notify-add-watch)
+        (auto-revert-notify-handler): Use `file-notify-*' functions.
+
+        * subr.el (file-notify-handle-event): Move function to filenotify.el.
+
+        * net/tramp.el (tramp-file-name-for-operation):
+        Handle `file-notify-add-watch' and `file-notify-rm-watch'.
+
+        * net/tramp-sh.el (tramp-sh-file-name-handler-alist): Add handler
+        for `file-notify-add-watch' and `file-notify-rm-watch'.
+        (tramp-process-sentinel): Improve trace.
+        (tramp-sh-handle-file-notify-add-watch)
+        (tramp-sh-file-notify-process-filter)
+        (tramp-sh-handle-file-notify-rm-watch)
+        (tramp-get-remote-inotifywait): New defuns.
+
+2013-07-03  Juri Linkov  <juri@jurta.org>
+
+        * buff-menu.el (Buffer-menu-multi-occur): Add args and move the
+        call of `occur-read-primary-args' to interactive spec.
+
+        * ibuffer.el (ibuffer-mode-map): Bind "M-s a C-o" to
+        `ibuffer-do-occur' like in buff-menu.el.  (Bug#14673)
+
+2013-07-03  Matthias Meulien  <orontee@gmail.com>
+
+        * buff-menu.el (Buffer-menu-mode-map): Bind "M-s a C-o" to
+        `Buffer-menu-multi-occur'.  Add it to the menu.
+        (Buffer-menu-mode): Document it in docstring.
+        (Buffer-menu-multi-occur): New command.  (Bug#14673)
+
+2013-07-03  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight more
+        keywords and built-ins.
+
+2013-07-03  Glenn Morris  <rgm@gnu.org>
+
+        * subr.el (y-or-n-p): Handle empty prompts.  (Bug#14770)
+
+        Make info-xref checks case-sensitive by default
+        * info.el (Info-find-node, Info-find-in-tag-table)
+        (Info-find-node-in-buffer, Info-find-node-2, Info-goto-node):
+        Add option for exact case matching of nodes.
+        * info-xref.el (info-xref): New custom group.
+        (info-xref-case-fold): New option.
+        (info-xref-goto-node-p): Pass info-xref-case-fold to Info-goto-node.
+
+2013-07-03  Leo Liu  <sdl.web@gmail.com>
+
+        * ido.el (ido-delete-file-at-head): Respect delete-by-moving-to-trash.
+
+2013-07-03  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * progmodes/ruby-mode.el (ruby-move-to-block): When we're at a
+        middle of block statement initially, lower the depth.  Remove
+        FIXME comment, not longer valid.  Remove middle of block statement
+        detection, no need to do that anymore since we've been using
+        `ruby-parse-region' here.
+
 2013-07-02  Jan Djärv  <jan.h.d@swipnet.se>
 
         * term/ns-win.el (display-format-alist): Use .* (Bug#14765).
@@ -255,12 +693,12 @@
 
 2013-06-25  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
 
-        * lisp/textmodes/bibtex.el (bibtex-generate-url-list): Add support
+        * textmodes/bibtex.el (bibtex-generate-url-list): Add support
         for DOI URLs.
 
 2013-06-25  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
 
-        * lisp/textmodes/bibtex.el (bibtex-mode, bibtex-set-dialect):
+        * textmodes/bibtex.el (bibtex-mode, bibtex-set-dialect):
         Update imenu-support when dialect changes.
 
 2013-06-25  Leo Liu  <sdl.web@gmail.com>
@@ -361,7 +799,7 @@
         * emacs-lock.el (emacs-lock-mode, emacs-lock--old-mode)
         (emacs-lock--try-unlocking): Make defvar-local.
 
-2013-06-22  Glenn Morris  <rgm@fencepost.gnu.org>
+2013-06-22  Glenn Morris  <rgm@gnu.org>
 
         * play/cookie1.el (cookie-apropos): Minor simplification.
 
@@ -827,7 +1265,7 @@
 
         * net/shr.el (shr-map): Bind [down-mouse-1] to browse URLs.
 
-2013-06-19  Glenn Morris  <rgm@fencepost.gnu.org>
+2013-06-19  Glenn Morris  <rgm@gnu.org>
 
         * emacs-lisp/eieio.el (defclass): Make it eval-and-compile once more.
 
@@ -970,6 +1408,7 @@
 2013-06-18  Matthias Meulien  <orontee@gmail.com>
 
         * tabify.el (untabify, tabify): With prefix, apply to entire buffer.
+        <http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00545.html>
 
 2013-06-18  Glenn Morris  <rgm@gnu.org>
 
diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el
index c45d64e1cd9..daa654889b6 100644
--- a/lisp/autoinsert.el
+++ b/lisp/autoinsert.el
@@ -164,7 +164,10 @@ If this contains a %s, that will be replaced by the matching rule."
 
     (("\\.el\\'" . "Emacs Lisp header")
      "Short description: "
-     ";;; " (file-name-nondirectory (buffer-file-name)) " --- " str "
+     ";;; " (file-name-nondirectory (buffer-file-name)) " --- " str
+     (make-string (max 2 (- 80 (current-column) 27)) ?\s)
+     "-*- lexical-binding: t; -*-"
+     "
 
 ;; Copyright (C) " (format-time-string "%Y") "  "
  (getenv "ORGANIZATION") | (progn user-full-name) "
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index 4a6d4cb4cc0..00e88fc4a3d 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -103,6 +103,7 @@
 
 (eval-when-compile (require 'cl-lib))
 (require 'timer)
+(require 'filenotify)
 
 ;; Custom Group:
 ;;
@@ -270,21 +271,17 @@ This variable becomes buffer local when set in any fashion.")
   :type 'boolean
   :version "24.4")
 
-(defconst auto-revert-notify-enabled
-  (or (featurep 'gfilenotify) (featurep 'inotify) (featurep 'w32notify))
-  "Non-nil when Emacs has been compiled with file notification support.")
-
-(defcustom auto-revert-use-notify auto-revert-notify-enabled
+(defcustom auto-revert-use-notify (and file-notify-support t)
   "If non-nil Auto Revert Mode uses file notification functions.
 This requires Emacs being compiled with file notification
-support (see `auto-revert-notify-enabled').  You should set this
-variable through Custom."
+support (see `file-notify-support').  You should set this variable
+through Custom."
   :group 'auto-revert
   :type 'boolean
   :set (lambda (variable value)
-         (set-default variable (and auto-revert-notify-enabled value))
+         (set-default variable (and file-notify-support value))
          (unless (symbol-value variable)
-           (when auto-revert-notify-enabled
+           (when file-notify-support
              (dolist (buf (buffer-list))
                (with-current-buffer buf
                  (when (symbol-value 'auto-revert-notify-watch-descriptor)
@@ -502,12 +499,7 @@ will use an up-to-date value of `auto-revert-interval'"
              (puthash key value auto-revert-notify-watch-descriptor-hash-list)
            (remhash key auto-revert-notify-watch-descriptor-hash-list)
            (ignore-errors
-             (funcall
-              (cond
-               ((fboundp 'gfile-rm-watch) 'gfile-rm-watch)
-               ((fboundp 'inotify-rm-watch) 'inotify-rm-watch)
-               ((fboundp 'w32notify-rm-watch) 'w32notify-rm-watch))
-              auto-revert-notify-watch-descriptor)))))
+             (file-notify-rm-watch auto-revert-notify-watch-descriptor)))))
      auto-revert-notify-watch-descriptor-hash-list)
     (remove-hook 'kill-buffer-hook 'auto-revert-notify-rm-watch))
   (setq auto-revert-notify-watch-descriptor nil
@@ -522,100 +514,58 @@ will use an up-to-date value of `auto-revert-interval'"
 
   (when (and buffer-file-name auto-revert-use-notify
              (not auto-revert-notify-watch-descriptor))
-    (let ((func
-           (cond
-            ((fboundp 'gfile-add-watch) 'gfile-add-watch)
-            ((fboundp 'inotify-add-watch) 'inotify-add-watch)
-            ((fboundp 'w32notify-add-watch) 'w32notify-add-watch)))
-          (aspect
-           (cond
-            ((fboundp 'gfile-add-watch) '(watch-mounts))
-            ;; `attrib' is needed for file modification time.
-            ((fboundp 'inotify-add-watch) '(attrib create modify moved-to))
-            ((fboundp 'w32notify-add-watch) '(size last-write-time))))
-          (file (if (or (fboundp 'gfile-add-watch) (fboundp 'inotify-add-watch))
-                    (directory-file-name (expand-file-name default-directory))
-                  (buffer-file-name))))
-      (setq auto-revert-notify-watch-descriptor
-            (ignore-errors
-              (funcall func file aspect 'auto-revert-notify-handler)))
-      (if auto-revert-notify-watch-descriptor
-          (progn
-            (puthash
-             auto-revert-notify-watch-descriptor
-             (cons (current-buffer)
-                   (gethash auto-revert-notify-watch-descriptor
-                            auto-revert-notify-watch-descriptor-hash-list))
-             auto-revert-notify-watch-descriptor-hash-list)
-            (add-hook (make-local-variable 'kill-buffer-hook)
-                      'auto-revert-notify-rm-watch))
-        ;; 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 notification event."
-  (and (listp event)
-       (cond ((featurep 'gfilenotify)
-              (and (>= (length event) 3) (stringp (nth 2 event))))
-             ((featurep 'inotify)
-              (= (length event) 4))
-             ((featurep 'w32notify)
-              (and (= (length event) 3) (stringp (nth 2 event)))))))
-
-(defun auto-revert-notify-event-descriptor (event)
-  "Return watch descriptor of file notification event, or nil."
-  (and (auto-revert-notify-event-p event) (car event)))
-
-(defun auto-revert-notify-event-action (event)
-  "Return action of file 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 file notification event, or nil."
-  (and (auto-revert-notify-event-p event)
-       (cond ((featurep 'gfilenotify) (nth 2 event))
-             ((featurep 'inotify) (nth 3 event))
-             ((featurep 'w32notify) (nth 2 event)))))
+    (setq auto-revert-notify-watch-descriptor
+          (ignore-errors
+            (file-notify-add-watch
+             (expand-file-name buffer-file-name default-directory)
+             '(change attribute-change) 'auto-revert-notify-handler)))
+    (if auto-revert-notify-watch-descriptor
+        (progn
+          (puthash
+           auto-revert-notify-watch-descriptor
+           (cons (current-buffer)
+                 (gethash auto-revert-notify-watch-descriptor
+                          auto-revert-notify-watch-descriptor-hash-list))
+           auto-revert-notify-watch-descriptor-hash-list)
+          (add-hook (make-local-variable 'kill-buffer-hook)
+                    'auto-revert-notify-rm-watch))
+      ;; Fallback to file checks.
+      (set (make-local-variable 'auto-revert-use-notify) nil))))
 
 (defun auto-revert-notify-handler (event)
   "Handle an EVENT returned from file notification."
-  (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))
+  (ignore-errors
+    (let* ((descriptor (car event))
+           (action (nth 1 event))
+           (file (nth 2 event))
+           (file1 (nth 3 event)) ;; Target of `renamed'.
            (buffers (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)
-        (cond
-         ((featurep 'gfilenotify)
-          (cl-assert (memq action '(attribute-changed changed created deleted
-                                    ;; FIXME: I keep getting this action, so I
-                                    ;; added it here, but I have no idea what
-                                    ;; I'm doing.  --Stef
-                                    changes-done-hint))
-                     t))
-         ((featurep 'inotify)
-          (cl-assert (or (memq 'attrib action)
-                         (memq 'create action)
-                         (memq 'modify action)
-                         (memq 'moved-to action))))
-         ((featurep 'w32notify) (cl-assert (eq 'modified action))))
-        ;; Since we watch a directory, a file name must be returned.
-        (cl-assert (stringp file))
-        (dolist (buffer buffers)
-          (when (buffer-live-p buffer)
-            (with-current-buffer buffer
-              (when (and (stringp buffer-file-name)
-                         (string-equal
-                          (file-name-nondirectory file)
-                          (file-name-nondirectory buffer-file-name)))
-                ;; Mark buffer modified.
-                (setq auto-revert-notify-modified-p t)
-                ;; No need to check other buffers.
-                (cl-return)))))))))
+      ;; Check, that event is meant for us.
+      (cl-assert descriptor)
+      ;; We do not handle `deleted', because nothing has to be refreshed.
+      (cl-assert (memq action '(attribute-changed changed created renamed)) t)
+      ;; Since we watch a directory, a file name must be returned.
+      (cl-assert (stringp file))
+      (when (eq action 'renamed) (cl-assert (stringp file1)))
+      ;; Loop over all buffers, in order to find the intended one.
+      (dolist (buffer buffers)
+        (when (buffer-live-p buffer)
+          (with-current-buffer buffer
+            (when (and (stringp buffer-file-name)
+                       (or
+                        (and (memq action '(attribute-changed changed created))
+                             (string-equal
+                              (file-name-nondirectory file)
+                              (file-name-nondirectory buffer-file-name)))
+                        (and (eq action 'renamed)
+                             (string-equal
+                              (file-name-nondirectory file1)
+                              (file-name-nondirectory buffer-file-name)))))
+              ;; Mark buffer modified.
+              (setq auto-revert-notify-modified-p t)
+              ;; No need to check other buffers.
+              (cl-return))))))))
 
 (defun auto-revert-active-p ()
   "Check if auto-revert is active (in current buffer or globally)."
diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index 6c02233e1e2..1db9b7229f3 100644
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -129,6 +129,7 @@ commands.")
     (define-key map "T" 'Buffer-menu-toggle-files-only)
     (define-key map (kbd "M-s a C-s")   'Buffer-menu-isearch-buffers)
     (define-key map (kbd "M-s a M-C-s") 'Buffer-menu-isearch-buffers-regexp)
+    (define-key map (kbd "M-s a C-o") 'Buffer-menu-multi-occur)
 
     (define-key map [mouse-2] 'Buffer-menu-mouse-select)
     (define-key map [follow-link] 'mouse-face)
@@ -169,6 +170,9 @@ commands.")
     (bindings--define-key menu-map [ir]
       '(menu-item "Isearch Marked Buffers..." Buffer-menu-isearch-buffers
                  :help "Search for a string through all marked buffers using Isearch"))
+    (bindings--define-key menu-map [mo]
+      '(menu-item "Multi Occur Marked Buffers..." Buffer-menu-multi-occur
+                 :help "Show lines matching a regexp in marked buffers using Occur"))
     (bindings--define-key menu-map [s3] menu-bar-separator)
     (bindings--define-key menu-map [by]
       '(menu-item "Bury" Buffer-menu-bury
@@ -226,6 +230,7 @@ In Buffer Menu mode, the following commands are defined:
      buffer selected before this one in another window.
 \\[Buffer-menu-isearch-buffers]    Incremental search in the marked buffers.
 \\[Buffer-menu-isearch-buffers-regexp]  Isearch for regexp in the marked buffers.
+\\[Buffer-menu-multi-occur] Show lines matching regexp in the marked buffers.
 \\[Buffer-menu-visit-tags-table]    visit-tags-table this buffer.
 \\[Buffer-menu-not-modified]    Clear modified-flag on that buffer.
 \\[Buffer-menu-save]    Mark that buffer to be saved, and move down.
@@ -477,6 +482,11 @@ If UNMARK is non-nil, unmark them."
   (interactive)
   (multi-isearch-buffers-regexp (Buffer-menu-marked-buffers)))
 
+(defun Buffer-menu-multi-occur (regexp &optional nlines)
+  "Show all lines in marked buffers containing a match for a regexp."
+  (interactive (occur-read-primary-args))
+  (multi-occur (Buffer-menu-marked-buffers) regexp nlines))
+
 
 (defun Buffer-menu-visit-tags-table ()
   "Visit the tags table in the buffer on this line.  See `visit-tags-table'."
diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el
index a497f759e87..934dfb92a57 100644
--- a/lisp/calendar/todo-mode.el
+++ b/lisp/calendar/todo-mode.el
@@ -37,11 +37,14 @@
 ;; can edit todo items, reprioritize them within their category, move
 ;; them to another category, delete them, or mark items as done and
 ;; store them separately from the not yet done items in a category.
-;; You can add new todo files and categories, rename categories, move
-;; them to another file or delete them.  You can also display summary
-;; tables of the categories in a file and the types of items they
-;; contain.  And you can build cross-category lists of items that
-;; satisfy various criteria.
+;; You can add new todo files, edit and delete them.  You can add new
+;; categories, rename and delete them, move categories to another file
+;; and merge the items of two categories.  You can also reorder the
+;; sequence of categories in a todo file for the purpose of
+;; navigation.  You can display summary tables of the categories in a
+;; file and the types of items they contain.  And you can compile
+;; lists of existing items from multiple categories in one or more
+;; todo files, which are filtered by various criteria.
 
 ;; To get started, load this package and type `M-x todo-show'.  This
 ;; will prompt you for the name of the first todo file, its first
@@ -169,12 +172,7 @@ the value of `todo-done-separator'."
   "Return string used as value of variable `todo-done-separator'."
   (let ((sep todo-done-separator-string))
     (propertize (if (= 1 (length sep))
-                    ;; Until bug#2749 is fixed, if separator's length
-                    ;; is window-width and todo-wrap-lines is
-                    ;; non-nil, an indented empty line appears between
-                    ;; the separator and the first done item.
-                    ;; (make-string (window-width) (string-to-char sep))
-                    (make-string (1- (window-width)) (string-to-char sep))
+                    (make-string (window-width) (string-to-char sep))
                   todo-done-separator-string)
                 'face 'todo-done-sep)))
 
@@ -578,11 +576,12 @@ This lacks the extension and directory components."
     (file-name-sans-extension (file-name-nondirectory file))))
 
 (defcustom todo-default-todo-file (todo-short-file-name
-                                     (car (funcall todo-files-function)))
+                                   (car (funcall todo-files-function)))
   "Todo file visited by first session invocation of `todo-show'."
-  :type `(radio ,@(mapcar (lambda (f) (list 'const f))
-                          (mapcar 'todo-short-file-name
-                                  (funcall todo-files-function))))
+  :type (when todo-files
+          `(radio ,@(mapcar (lambda (f) (list 'const f))
+                            (mapcar 'todo-short-file-name
+                                    (funcall todo-files-function)))))
   :group 'todo)
 
 (defcustom todo-show-current-file t
@@ -630,7 +629,7 @@ Otherwise, `todo-show' always visits `todo-default-todo-file'."
   :group 'todo)
 
 ;;;###autoload
-(defun todo-show (&optional solicit-file)
+(defun todo-show (&optional solicit-file interactive)
   "Visit a todo file and display one of its categories.
 
 When invoked in Todo mode, prompt for which todo file to visit.
@@ -668,117 +667,124 @@ and done items are always shown on visiting a category.
 
 Invoking this command in Todo Archive mode visits the
 corresponding todo file, displaying the corresponding category."
-  (interactive "P")
+  (interactive "P\np")
+  (when todo-default-todo-file
+    (todo-check-file (todo-absolute-file-name todo-default-todo-file)))
   (catch 'shown
-    ;; If there is a legacy todo file but no todo file in the current
-    ;; format, offer to convert the legacy file and show it.
+    ;; Before initializing the first todo first, check if there is a
+    ;; legacy todo file and if so, offer to convert to the current
+    ;; format and make it the first new todo file.
     (unless todo-default-todo-file
       (let ((legacy-todo-file (if (boundp 'todo-file-do)
-                                  todo-file-do
-                                (locate-user-emacs-file "todo-do" ".todo-do"))))
-        (when (and (file-exists-p legacy-todo-file)
-                   (y-or-n-p (concat "Do you want to convert a copy of your "
-                                     "old todo file to the new format? ")))
-          (when (todo-convert-legacy-files)
-            (throw 'shown nil)))))
-    (let* ((cat)
-           (show-first todo-show-first)
-           (file (cond ((or solicit-file
-                            (and (called-interactively-p 'any)
-                                 (memq major-mode '(todo-mode
-                                                    todo-archive-mode
-                                                    todo-filtered-items-mode))))
-                        (if (funcall todo-files-function)
-                            (todo-read-file-name "Choose a todo file to visit: "
-                                                  nil t)
-                          (user-error "There are no todo files")))
-                       ((and (eq major-mode 'todo-archive-mode)
-                             ;; Called noninteractively via todo-quit
-                             ;; to jump to corresponding category in
-                             ;; todo file.
-                             (not (called-interactively-p 'any)))
-                        (setq cat (todo-current-category))
-                        (concat (file-name-sans-extension
-                                 todo-current-todo-file) ".todo"))
-                       (t
-                        (or todo-current-todo-file
-                            (and todo-show-current-file
-                                 todo-global-current-todo-file)
-                            (todo-absolute-file-name todo-default-todo-file)
-                            (todo-add-file)))))
-           add-item first-file)
-      (unless todo-default-todo-file
-        ;; We just initialized the first todo file, so make it the default.
-        (setq todo-default-todo-file (todo-short-file-name file)
-              first-file t)
-        (todo-reevaluate-default-file-defcustom))
-      (unless (member file todo-visited)
-        ;; Can't setq t-c-t-f here, otherwise wrong file shown when
-        ;; todo-show is called from todo-show-categories-table.
-        (let ((todo-current-todo-file file))
-          (cond ((eq todo-show-first 'table)
-                 (todo-show-categories-table))
-                ((memq todo-show-first '(top diary regexp))
-                 (let* ((shortf (todo-short-file-name file))
-                        (fi-file (todo-absolute-file-name
-                                  shortf todo-show-first)))
-                   (when (eq todo-show-first 'regexp)
-                     (let ((rxfiles (directory-files todo-directory t
-                                                     ".*\\.todr$" t)))
-                       (when (and rxfiles (> (length rxfiles) 1))
-                         (let ((rxf (mapcar 'todo-short-file-name rxfiles)))
-                           (setq fi-file (todo-absolute-file-name
-                                          (completing-read
-                                           "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)))
-                     (message "There is no %s file for %s"
-                              (cond ((eq todo-show-first 'top)
-                                     "top priorities")
-                                    ((eq todo-show-first 'diary)
-                                     "diary items")
-                                    ((eq todo-show-first 'regexp)
-                                     "regexp items"))
-                              shortf)
-                     (setq todo-show-first 'first)))))))
-      (when (or (member file todo-visited)
-                (eq todo-show-first 'first))
-        (set-window-buffer (selected-window)
-                           (set-buffer (find-file-noselect file 'nowarn)))
-        ;; When quitting an archive file, show the corresponding
-        ;; category in the corresponding todo file, if it exists.
-        (when (assoc cat todo-categories)
-          (setq todo-category-number (todo-category-number cat)))
-        ;; If this is a new todo file, add its first category.
-        (when (zerop (buffer-size))
-          (let (cat-added)
-            (unwind-protect
-                (setq todo-category-number
-                      (todo-add-category todo-current-todo-file "")
-                      add-item todo-add-item-if-new-category
-                      cat-added t)
-              (if cat-added
-                  ;; If the category was added, save the file now, so we
-                  ;; don't risk having an empty todo file, which would
-                  ;; signal an error if we tried to visit it later,
-                  ;; since doing that looks for category boundaries.
-                  (save-buffer 0)
-                ;; If user cancels before adding the category, clean up
-                ;; and exit, so we have a fresh slate the next time.
-                (delete-file file)
-                (setq todo-files (delete file todo-files))
-                (when first-file
-                  (setq todo-default-todo-file nil
-                        todo-current-todo-file nil))
-                (kill-buffer)
-                (keyboard-quit)))))
-        (save-excursion (todo-category-select))
-        (when add-item (todo-basic-insert-item)))
-      (setq todo-show-first show-first)
-      (add-to-list 'todo-visited file))))
+                                  todo-file-do
+                                (locate-user-emacs-file "todo-do" ".todo-do"))))
+        (when (and (file-exists-p legacy-todo-file)
+                   (y-or-n-p (concat "Do you want to convert a copy of your "
+                                     "old todo file to the new format? ")))
+          (when (todo-convert-legacy-files)
+            (throw 'shown nil)))))
+    (catch 'end
+      (let* ((cat)
+             (show-first todo-show-first)
+             (file (cond ((or solicit-file
+                              (and interactive
+                                   (memq major-mode '(todo-mode
+                                                      todo-archive-mode
+                                                      todo-filtered-items-mode))))
+                          (if (funcall todo-files-function)
+                              (todo-read-file-name "Choose a todo file to visit: "
+                                                    nil t)
+                            (user-error "There are no todo files")))
+                         ((and (eq major-mode 'todo-archive-mode)
+                               ;; Called noninteractively via todo-quit
+                               ;; to jump to corresponding category in
+                               ;; todo file.
+                               (not interactive))
+                          (setq cat (todo-current-category))
+                          (concat (file-name-sans-extension
+                                   todo-current-todo-file) ".todo"))
+                         (t
+                          (or todo-current-todo-file
+                              (and todo-show-current-file
+                                   todo-global-current-todo-file)
+                              (todo-absolute-file-name todo-default-todo-file)
+                              (todo-add-file)))))
+             add-item first-file)
+        (unless todo-default-todo-file
+          ;; We just initialized the first todo file, so make it the default.
+          (setq todo-default-todo-file (todo-short-file-name file)
+                first-file t)
+          (todo-reevaluate-default-file-defcustom))
+        (unless (member file todo-visited)
+          ;; Can't setq t-c-t-f here, otherwise wrong file shown when
+          ;; todo-show is called from todo-show-categories-table.
+          (let ((todo-current-todo-file file))
+            (cond ((eq todo-show-first 'table)
+                   (todo-show-categories-table))
+                  ((memq todo-show-first '(top diary regexp))
+                   (let* ((shortf (todo-short-file-name file))
+                          (fi-file (todo-absolute-file-name
+                                    shortf todo-show-first)))
+                     (when (eq todo-show-first 'regexp)
+                       (let ((rxfiles (directory-files todo-directory t
+                                                       ".*\\.todr$" t)))
+                         (when (and rxfiles (> (length rxfiles) 1))
+                           (let ((rxf (mapcar 'todo-short-file-name rxfiles)))
+                             (setq fi-file (todo-absolute-file-name
+                                            (completing-read
+                                             "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)))
+                       (message "There is no %s file for %s"
+                                (cond ((eq todo-show-first 'top)
+                                       "top priorities")
+                                      ((eq todo-show-first 'diary)
+                                       "diary items")
+                                      ((eq todo-show-first 'regexp)
+                                       "regexp items"))
+                                shortf)
+                       (setq todo-show-first 'first)))))))
+        (when (or (member file todo-visited)
+                  (eq todo-show-first 'first))
+          (unless (todo-check-file file) (throw 'end nil))
+          (set-window-buffer (selected-window)
+                             (set-buffer (find-file-noselect file 'nowarn)))
+          ;; When quitting an archive file, show the corresponding
+          ;; category in the corresponding todo file, if it exists.
+          (when (assoc cat todo-categories)
+            (setq todo-category-number (todo-category-number cat)))
+          ;; If this is a new todo file, add its first category.
+          (when (zerop (buffer-size))
+            (let (cat-added)
+              (unwind-protect
+                  (setq todo-category-number
+                        (todo-add-category todo-current-todo-file "")
+                        add-item todo-add-item-if-new-category
+                        cat-added t)
+                (if cat-added
+                    ;; If the category was added, save the file now, so we
+                    ;; don't risk having an empty todo file, which would
+                    ;; signal an error if we tried to visit it later,
+                    ;; since doing that looks for category boundaries.
+                    (save-buffer 0)
+                  ;; If user cancels before adding the category, clean up
+                  ;; and exit, so we have a fresh slate the next time.
+                  (delete-file file)
+                  ;; (setq todo-files (funcall todo-files-function))
+                  (setq todo-files (delete file todo-files))
+                  (when first-file
+                    (setq todo-default-todo-file nil
+                          todo-current-todo-file nil)
+                    (todo-reevaluate-default-file-defcustom))
+                  (kill-buffer)
+                  (keyboard-quit)))))
+          (save-excursion (todo-category-select))
+          (when add-item (todo-basic-insert-item)))
+        (setq todo-show-first show-first)
+        (add-to-list 'todo-visited file)))))
 
 (defun todo-save ()
   "Save the current todo file."
@@ -814,8 +820,15 @@ buries it and restores state as needed."
            ;; Have to write a newly created archive to file to avoid
            ;; subsequent errors.
            (todo-save)
-           (todo-show)
-           (bury-buffer buf))
+           (let ((todo-file (concat todo-directory
+                                    (todo-short-file-name todo-current-todo-file)
+                                    ".todo")))
+             (if (todo-check-file todo-file)
+                 (todo-show)
+               (message "There is no todo file for this archive")))
+           ;; When todo-check-file runs in todo-show, it kills the
+           ;; buffer if the archive file was deleted externally.
+           (when (buffer-live-p buf) (bury-buffer buf)))
           ((eq major-mode 'todo-mode)
            (todo-save)
            ;; If we just quit archive mode, just burying the buffer
@@ -893,7 +906,7 @@ Categories mode."
   (interactive "P")
   ;; If invoked outside of Todo mode and there is not yet any Todo
   ;; file, initialize one.
-  (if (null todo-files)
+  (if (null (funcall todo-files-function))
       (todo-show)
     (let* ((archive (eq where 'archive))
            (cat (unless archive where))
@@ -1069,10 +1082,9 @@ option `todo-add-item-if-new-category' is non-nil (the default),
 prompt for the first item.
 Noninteractively, return the name of the new file."
   (interactive)
-  (let ((prompt (concat "Enter name of new todo file "
-                        "(TAB or SPC to see current names): "))
-        file)
-    (setq file (todo-read-file-name prompt))
+  (let* ((prompt (concat "Enter name of new todo file "
+                         "(TAB or SPC to see current names): "))
+         (file (todo-read-file-name prompt)))
     (with-current-buffer (get-buffer-create file)
       (erase-buffer)
       (write-region (point-min) (point-max) file nil 'nomessage nil t)
@@ -1087,6 +1099,55 @@ Noninteractively, return the name of the new file."
           (todo-show))
       file)))
 
+(defun todo-delete-file ()
+  "Delete the current todo, archive or filtered items file.
+If the todo file has a corresponding archive file, or vice versa,
+prompt whether to delete that as well.  Also kill the buffers
+visiting the deleted files."
+  (interactive)
+  (let* ((file1 (buffer-file-name))
+         (todo (eq major-mode 'todo-mode))
+         (archive (eq major-mode 'todo-archive-mode))
+         (filtered (eq major-mode 'todo-filtered-items-mode))
+         (file1-sn (todo-short-file-name file1))
+         (file2 (concat todo-directory file1-sn (cond (todo ".toda")
+                                                      (archive ".todo"))))
+         (buf1 (current-buffer))
+         (buf2 (when file2 (find-buffer-visiting file2)))
+         (prompt1 (concat "Delete " (cond (todo "todo")
+                                          (archive "archive")
+                                          (filtered "filtered items"))
+                          " file \"%s\"? "))
+         (prompt2 (concat "Also delete the corresponding "
+                          (cond (todo "archive") (archive "todo")) " file "
+                          (when buf2 "and kill the buffer visiting it? ")))
+         (delete1 (yes-or-no-p (format prompt1 file1-sn)))
+         (delete2 (when (and delete1 (or (file-exists-p file2) buf2))
+                    (yes-or-no-p prompt2))))
+    (when delete1
+      (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)))
+      (setq todo-files (funcall todo-files-function)
+            todo-archives (funcall todo-files-function t))
+      (when (or (string=  file1-sn todo-default-todo-file)
+                (and delete2 (string= file1-sn todo-default-todo-file)))
+        (setq todo-default-todo-file (todo-short-file-name (car todo-files))))
+      (when (or (string= file1 todo-global-current-todo-file)
+                (and delete2 (string= file2 todo-global-current-todo-file)))
+        (setq todo-global-current-todo-file nil))
+      (todo-reevaluate-filelist-defcustoms)
+      (message (concat (cond (todo "Todo") (archive "Archive")) " file \"%s\" "
+                       (when delete2
+                         (concat "and its "
+                                 (cond (todo "archive") (archive "todo"))
+                                 " file "))
+                       "deleted") file1-sn))))
+
 (defvar todo-edit-buffer "*Todo Edit*"
   "Name of current buffer in Todo Edit mode.")
 
@@ -1190,9 +1251,9 @@ category there as well."
   (save-excursion (todo-category-select)))
 
 (defun todo-delete-category (&optional arg)
-  "Delete current todo category provided it is empty.
-With ARG non-nil delete the category unconditionally,
-i.e. including all existing todo and done items."
+  "Delete current todo category provided it contains no items.
+With prefix ARG delete the category even if it does contain
+todo or done items."
   (interactive "P")
   (let* ((file todo-current-todo-file)
          (cat (todo-current-category))
@@ -1723,7 +1784,7 @@ the new item:
   the item accordingly."
   ;; If invoked outside of Todo mode and there is not yet any Todo
   ;; file, initialize one.
-  (if (null todo-files)
+  (if (null (funcall todo-files-function))
       (todo-show)
     (let ((region (eq region-or-here 'region))
           (here (eq region-or-here 'here)))
@@ -2958,31 +3019,32 @@ first visit in a session displays the first category in the
 archive, subsequent visits return to the last category
 displayed."
   (interactive)
-  (let* ((cat (todo-current-category))
-         (count (todo-get-count 'archived cat))
-         (archive (concat (file-name-sans-extension todo-current-todo-file)
-                          ".toda"))
-         place)
-    (setq place (cond (ask 'other-archive)
-                      ((file-exists-p archive) 'this-archive)
-                      (t (when (todo-y-or-n-p
-                                (concat "This file has no archive; "
-                                        "visit another archive? "))
-                           'other-archive))))
-    (when (eq place 'other-archive)
-      (setq archive (todo-read-file-name "Choose a todo archive: " t t)))
-    (when (and (eq place 'this-archive) (zerop count))
-      (setq place (when (todo-y-or-n-p
-                          (concat "This category has no archived items;"
-                                  " visit archive anyway? "))
-                     'other-cat)))
-    (when place
-      (set-window-buffer (selected-window)
-                         (set-buffer (find-file-noselect archive)))
-      (if (member place '(other-archive other-cat))
-          (setq todo-category-number 1)
-        (todo-category-number cat))
-      (todo-category-select))))
+  (if (null (funcall todo-files-function t))
+      (message "There are no archive files")
+    (let* ((cat (todo-current-category))
+           (count (todo-get-count 'archived cat))
+           (archive (concat (file-name-sans-extension todo-current-todo-file)
+                            ".toda"))
+           (place (cond (ask 'other-archive)
+                        ((file-exists-p archive) 'this-archive)
+                        (t (when (todo-y-or-n-p
+                                  (concat "This file has no archive; "
+                                          "visit another archive? "))
+                             'other-archive)))))
+      (when (eq place 'other-archive)
+        (setq archive (todo-read-file-name "Choose a todo archive: " t t)))
+      (when (and (eq place 'this-archive) (zerop count))
+        (setq place (when (todo-y-or-n-p
+                            (concat "This category has no archived items;"
+                                    " visit archive anyway? "))
+                       'other-cat)))
+      (when place
+        (set-window-buffer (selected-window)
+                           (set-buffer (find-file-noselect archive)))
+        (if (member place '(other-archive other-cat))
+            (setq todo-category-number 1)
+          (todo-category-number cat))
+        (todo-category-select)))))
 
 (defun todo-choose-archive ()
   "Choose an archive and visit it."
@@ -3010,9 +3072,7 @@ this category does not exist in the archive, it is created."
                (marked (assoc cat todo-categories-with-marks))
                (afile (concat (file-name-sans-extension
                                todo-current-todo-file) ".toda"))
-               (archive (if (file-exists-p afile)
-                            (find-file-noselect afile t)
-                          (get-buffer-create afile)))
+               (archive (find-file-noselect afile t))
                (item (and (todo-done-item-p)
                           (concat (todo-item-string) "\n")))
                (count 0)
@@ -3056,7 +3116,6 @@ 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 buffer-file-name (erase-buffer))
               (let (buffer-read-only)
                 (widen)
                 (goto-char (point-min))
@@ -3076,11 +3135,13 @@ this category does not exist in the archive, it is created."
                               (item)))
                 (todo-update-count 'done (if (or marked all) count 1) cat)
                 (todo-update-categories-sexp)
-                ;; If archive is new, save to file now (using write-region in
-                ;; order not to get prompted for file to save to), to let
-                ;; auto-mode-alist take effect below.
-                (unless buffer-file-name
-                  (write-region nil nil afile)
+                ;; 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.
+                (unless (nth 7 (file-attributes afile))
+                  (write-region nil nil afile t t)
+                  (setq todo-archives (funcall todo-files-function t))
                   (kill-buffer))))
             (with-current-buffer tbuf
               (cond
@@ -3286,19 +3347,24 @@ categories display according to priority."
 (defun todo-show-categories-table ()
   "Display a table of the current file's categories and item counts.
 
-In the initial display the categories are numbered, indicating
-their current order for navigating by \\[todo-forward-category]
-and \\[todo-backward-category].  You can permanently change the
-order of the category at point by typing
-\\[todo-set-category-number], \\[todo-raise-category] or
-\\[todo-lower-category].
+In the initial display the lines of the table are numbered,
+indicating the current order of the categories when sequentially
+navigating through the todo file with `\\[todo-forward-category]'
+and `\\[todo-backward-category]'.  You can reorder the lines, and
+hence the category sequence, by typing `\\[todo-raise-category]'
+or `\\[todo-lower-category]' to raise or lower the category at
+point, or by typing `\\[todo-set-category-number]' and entering a
+number at the prompt or by typing `\\[todo-set-category-number]'
+with a numeric prefix.  If you save the todo file after
+reordering the categories, the new order persists in subsequent
+Emacs sessions.
 
 The labels above the category names and item counts are buttons,
 and clicking these changes the display: sorted by category name
 or by the respective item counts (alternately descending or
 ascending).  In these displays the categories are not numbered
-and \\[todo-set-category-number], \\[todo-raise-category] and
-\\[todo-lower-category] are disabled.  (Programmatically, the
+and `\\[todo-set-category-number]', `\\[todo-raise-category]' and
+`\\[todo-lower-category]' are disabled.  (Programmatically, the
 sorting is triggered by passing a non-nil SORTKEY argument.)
 
 In addition, the lines with the category names and item counts
@@ -4019,15 +4085,15 @@ regexp items."
   "Buffer type string for `todo-filter-items'.")
 
 (defun todo-filter-items (filter &optional new multifile)
-  "Display a cross-category list of items filtered by FILTER.
+  "Display a list of items filtered by FILTER.
 The values of FILTER can be `top' for top priority items, a cons
 of `top' and a number passed by the caller, `diary' for diary
-items, or `regexp' for items matching a regular expression entered
-by the user.  The items can be from any categories in the current
-todo file or, with non-nil MULTIFILE, from several files.  If NEW
-is nil, visit an appropriate file containing the list of filtered
-items; if there is no such file, or with non-nil NEW, build the
-list and display it.
+items, or `regexp' for items matching a regular expression
+entered by the user.  The items can come from any categories in
+the current todo file or, with non-nil MULTIFILE, from several
+files.  If NEW is nil, visit an appropriate file containing the
+list of filtered items; if there is no such file, or with non-nil
+NEW, build the list and display it.
 
 See the documentation strings of the commands
 `todo-filter-top-priorities', `todo-filter-diary-items',
@@ -4699,14 +4765,57 @@ short todo archive or top priorities file name, respectively."
                    ((eq type 'regexp) ".todr")
                    (t ".todo"))))))
 
+(defun todo-check-file (file)
+  "Check the state associated with FILE and update it if necessary.
+If FILE exists, return t.  If it does not exist and there is no
+live buffer with its content, return nil; if there is such a
+buffer and the user tries to show it, ask whether to restore
+FILE, and if confirmed, do so and return t; else delete the
+buffer, clean up the state and return nil."
+  (setq todo-files (funcall todo-files-function))
+  (setq todo-archives (funcall todo-files-function t))
+  (if (file-exists-p file)
+      t
+    (setq todo-visited (delete file todo-visited))
+    (let ((buf (find-buffer-visiting file)))
+      (if (and buf
+               (y-or-n-p
+                (concat
+                 (format (concat "Todo file \"%s\" has been deleted but "
+                                 "its content is still in a buffer!\n")
+                         (todo-short-file-name file))
+                 "Save that buffer and restore the todo file? ")))
+          (progn
+            (with-current-buffer buf (save-buffer))
+            (setq todo-files (funcall todo-files-function))
+            (setq todo-archives (funcall todo-files-function t))
+            t)
+        (let* ((files (append todo-files todo-archives))
+               (tctf todo-current-todo-file)
+               (tgctf todo-global-current-todo-file)
+               (tdtf (todo-absolute-file-name todo-default-todo-file)))
+          (unless (or (not todo-current-todo-file)
+                      (member todo-current-todo-file files))
+            (setq todo-current-todo-file nil))
+          (unless (or (not todo-global-current-todo-file)
+                      (member todo-global-current-todo-file files))
+            (setq todo-global-current-todo-file nil))
+          (unless (or (not todo-default-todo-file)
+                      (member todo-default-todo-file files))
+            (setq todo-default-todo-file (todo-short-file-name
+                                          (car todo-files))))
+          (todo-reevaluate-filelist-defcustoms)
+          (when buf (kill-buffer buf))
+          nil)))))
+
 (defun todo-category-number (cat)
   "Return the number of category CAT in this todo file.
 The buffer-local variable `todo-category-number' holds this
 number as its value."
   (let ((categories (mapcar 'car todo-categories)))
     (setq todo-category-number
-          ;; Increment by one, so that the highest priority category in Todo
-          ;; Categories mode is numbered one rather than zero.
+          ;; Increment by one, so that the number of the first
+          ;; category is one rather than zero.
           (1+ (- (length categories)
                  (length (member cat categories)))))))
 
@@ -5384,7 +5493,27 @@ Each element of the list is a cons of a category name and the
 file or list of files (as short file names) it is in.  The files
 are either the current (or if there is none, the default) todo
 file plus the files listed in `todo-category-completions-files',
-or, with non-nil ARCHIVE, the current archive file."
+or, with non-nil ARCHIVE, the current archive file.
+
+Before calculating the completions, update the value of
+`todo-category-completions-files' in case any files named in it
+have been removed."
+  (let (deleted)
+    (dolist (f todo-category-completions-files)
+      (unless (file-exists-p (todo-absolute-file-name f))
+        (setq todo-category-completions-files
+              (delete f todo-category-completions-files))
+        (push f deleted)))
+    (when deleted
+      (let ((pl (> (length deleted) 1))
+            (names (mapconcat (lambda (f) (concat "\"" f "\"")) deleted ", ")))
+        (message (concat "File" (if pl "s" "") " " names " ha" (if pl "ve" "s")
+                         " been deleted and removed from\n"
+                         "the list of category completion files")))
+      (todo-reevaluate-category-completions-files-defcustom)
+      (custom-set-default 'todo-category-completions-files
+                          (symbol-value 'todo-category-completions-files))
+      (sleep-for 1.5)))
   (let* ((curfile (or todo-current-todo-file
                       (and todo-show-current-file
                            todo-global-current-todo-file)
@@ -5435,6 +5564,7 @@ MUSTMATCH the name of an existing file must be chosen;
 otherwise, a new file name is allowed."
   (let* ((completion-ignore-case todo-completion-ignore-case)
          (files (mapcar 'todo-short-file-name
+                        ;; (funcall todo-files-function archive)))
                         (if archive todo-archives todo-files)))
          (file (completing-read prompt files nil mustmatch nil nil
                                 (if files
@@ -5529,7 +5659,7 @@ categories from `todo-category-completions-files'."
         ;; Validate only against completion categories.
         (let ((todo-categories categories))
           (setq cat (todo-validate-name cat 'category)))
-        ;; When user enters a nonexistest category name by jumping or
+        ;; When user enters a nonexistent category name by jumping or
         ;; moving, confirm that it should be added, then validate.
         (unless add
           (if (todo-y-or-n-p (format "Add new category \"%s\" to file \"%s\"? "
@@ -5867,13 +5997,24 @@ the empty string (i.e., no time string)."
 
 (defun todo-reevaluate-default-file-defcustom ()
   "Reevaluate defcustom of `todo-default-todo-file'.
-Called after adding or deleting a todo file."
-  (eval (defcustom todo-default-todo-file (car (funcall todo-files-function))
-          "Todo file visited by first session invocation of `todo-show'."
-          :type `(radio ,@(mapcar (lambda (f) (list 'const f))
-                                  (mapcar 'todo-short-file-name
-                                          (funcall todo-files-function))))
-          :group 'todo)))
+Called after adding or deleting a todo file.  If the value of
+`todo-default-todo-file' before calling this function was
+associated with an existing file, keep that value."
+  ;; (let ((curval todo-default-todo-file))
+    (eval
+     (defcustom todo-default-todo-file (todo-short-file-name
+                                        (car (funcall todo-files-function)))
+       "Todo file visited by first session invocation of `todo-show'."
+       :type (when todo-files
+               `(radio ,@(mapcar (lambda (f) (list 'const f))
+                                 (mapcar 'todo-short-file-name
+                                         (funcall todo-files-function)))))
+       :group 'todo))
+    ;; (when (and curval (file-exists-p (todo-absolute-file-name curval)))
+    ;;   (custom-set-default 'todo-default-todo-file curval)
+    ;;   ;; (custom-reevaluate-setting 'todo-default-todo-file)
+    ;;   )))
+    )
 
 (defun todo-reevaluate-category-completions-files-defcustom ()
   "Reevaluate defcustom of `todo-category-completions-files'.
@@ -6060,6 +6201,7 @@ Filtered Items mode following todo (not done) items."
     ("Cu" todo-unmark-category)
     ("Fh" todo-toggle-item-header)
     ("h"  todo-toggle-item-header)
+    ("Fk" todo-delete-file)
     ("Fe" todo-edit-file)
     ("FH" todo-toggle-item-highlighting)
     ("H"  todo-toggle-item-highlighting)
@@ -6226,12 +6368,13 @@ Filtered Items mode following todo (not done) items."
 
 (defun todo-show-current-file ()
   "Visit current instead of default todo file with `todo-show'.
-This function is added to `pre-command-hook' when user option
+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."
+  "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))
@@ -6265,7 +6408,7 @@ This function is added to `kill-buffer-hook' in Todo mode."
 
 (defun todo-reset-and-enable-done-separator ()
   "Show resized done items separator overlay after window change.
-Added to `window-configuration-change-hook' in `todo-mode'."
+Added to `window-configuration-change-hook' in Todo mode."
   (when (= 1 (length todo-done-separator-string))
     (let ((sep todo-done-separator))
       (setq todo-done-separator (todo-done-separator))
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 7a2c5755cc0..705277c97a0 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -2,7 +2,7 @@
 
         * data-debug.el, cedet-idutils.el: Neuter the "Version:" header.
 
-2013-06-19  Glenn Morris  <rgm@fencepost.gnu.org>
+2013-06-19  Glenn Morris  <rgm@gnu.org>
 
         * semantic/idle.el (define-semantic-idle-service):
         No need to use eval-and-compile, progn will do.
diff --git a/lisp/desktop.el b/lisp/desktop.el
index db77d7c3f5a..fcd032a64d0 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -196,9 +196,7 @@ Zero or nil means disable timer-based auto-saving."
                  (integer :tag "Seconds"))
   :set (lambda (symbol value)
          (set-default symbol value)
-         (condition-case nil
-             (desktop-auto-save-set-timer)
-           (error nil)))
+         (ignore-errors (desktop-auto-save-set-timer)))
   :group 'desktop
   :version "24.4")
 
@@ -416,9 +414,8 @@ See `desktop-restore-eager'."
   :version "22.1")
 
 ;;;###autoload
-(defvar desktop-save-buffer nil
+(defvar-local desktop-save-buffer nil
   "When non-nil, save buffer status in desktop file.
-This variable becomes buffer local when set.
 
 If the value is a function, it is called by `desktop-save' with argument
 DESKTOP-DIRNAME to obtain auxiliary information to save in the desktop
@@ -430,7 +427,6 @@ When file names are returned, they should be formatted using the call
 Later, when `desktop-read' evaluates the desktop file, auxiliary information
 is passed as the argument DESKTOP-BUFFER-MISC to functions in
 `desktop-buffer-mode-handlers'.")
-(make-variable-buffer-local 'desktop-save-buffer)
 (make-obsolete-variable 'desktop-buffer-modes-to-save
                         'desktop-save-buffer "22.1")
 (make-obsolete-variable 'desktop-buffer-misc-functions
@@ -582,15 +578,15 @@ Used to detect desktop file conflicts.")
   "Return the PID of the Emacs process that owns the desktop file in DIRNAME.
 Return nil if no desktop file found or no Emacs process is using it.
 DIRNAME omitted or nil means use `desktop-dirname'."
-  (let (owner)
-    (and (file-exists-p (desktop-full-lock-name dirname))
-         (condition-case nil
-             (with-temp-buffer
-               (insert-file-contents-literally (desktop-full-lock-name dirname))
-               (goto-char (point-min))
-               (setq owner (read (current-buffer)))
-               (integerp owner))
-           (error nil))
+  (let (owner
+        (file (desktop-full-lock-name dirname)))
+    (and (file-exists-p file)
+         (ignore-errors
+           (with-temp-buffer
+             (insert-file-contents-literally file)
+             (goto-char (point-min))
+             (setq owner (read (current-buffer)))
+             (integerp owner)))
          owner)))
 
 (defun desktop-claim-lock (&optional dirname)
@@ -636,7 +632,7 @@ Furthermore, it clears the variables listed in `desktop-globals-to-clear'."
       (let ((bufname (buffer-name (car buffers))))
          (or
            (null bufname)
-           (string-match preserve-regexp bufname)
+           (string-match-p preserve-regexp bufname)
            ;; Don't kill buffers made for internal purposes.
            (and (not (equal bufname "")) (eq (aref bufname 0) ?\s))
            (kill-buffer (car buffers))))
@@ -758,8 +754,7 @@ QUOTE may be `may' (value may be quoted),
     ((consp value)
      (let ((p value)
            newlist
-           use-list*
-           anynil)
+           use-list*)
        (while (consp p)
          (let ((q.sexp (desktop--v2s (car p))))
            (push q.sexp newlist))
@@ -841,17 +836,17 @@ MODE is the major mode.
         dired-skip)
     (and (not (and (stringp desktop-buffers-not-to-save)
                    (not filename)
-                   (string-match desktop-buffers-not-to-save bufname)))
+                   (string-match-p desktop-buffers-not-to-save bufname)))
          (not (memq mode desktop-modes-not-to-save))
          ;; FIXME this is broken if desktop-files-not-to-save is nil.
          (or (and filename
                   (stringp desktop-files-not-to-save)
-                  (not (string-match desktop-files-not-to-save filename)))
+                  (not (string-match-p desktop-files-not-to-save filename)))
              (and (memq mode '(dired-mode vc-dir-mode))
                   (with-current-buffer bufname
                     (not (setq dired-skip
-                               (string-match desktop-files-not-to-save
-                                             default-directory)))))
+                               (string-match-p desktop-files-not-to-save
+                                               default-directory)))))
              (and (null filename)
                   (null dired-skip)     ; bug#5755
                   (with-current-buffer bufname desktop-save-buffer))))))
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index e4434c3a0d8..10968f7f8dd 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -136,7 +136,7 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl-lib))
+(require 'cl-lib)
 (require 'dired)
 (require 'image-mode)
 (require 'jka-compr)
@@ -698,14 +698,6 @@ It's a subdirectory of `doc-view-cache-directory'."
                         (md5 (current-buffer)))))
             doc-view-cache-directory)))))
 
-(defun doc-view-remove-if (predicate list)
-  "Return LIST with all items removed that satisfy PREDICATE."
-  (let (new-list)
-    (dolist (item list)
-      (when (not (funcall predicate item))
-        (setq new-list (cons item new-list))))
-     (nreverse new-list)))
-
 ;;;###autoload
 (defun doc-view-mode-p (type)
   "Return non-nil if document type TYPE is available for `doc-view'.
@@ -1488,7 +1480,7 @@ If BACKWARD is non-nil, jump to the previous match."
 (defun doc-view-search-next-match (arg)
   "Go to the ARGth next matching page."
   (interactive "p")
-  (let* ((next-pages (doc-view-remove-if
+  (let* ((next-pages (cl-remove-if
                       (lambda (i) (<= (car i) (doc-view-current-page)))
                       doc-view--current-search-matches))
          (page (car (nth (1- arg) next-pages))))
@@ -1502,7 +1494,7 @@ If BACKWARD is non-nil, jump to the previous match."
 (defun doc-view-search-previous-match (arg)
   "Go to the ARGth previous matching page."
   (interactive "p")
-  (let* ((prev-pages (doc-view-remove-if
+  (let* ((prev-pages (cl-remove-if
                       (lambda (i) (>= (car i) (doc-view-current-page)))
                       doc-view--current-search-matches))
          (page (car (nth (1- arg) (nreverse prev-pages)))))
diff --git a/lisp/edmacro.el b/lisp/edmacro.el
index 6ef2e29dc83..67992d16527 100644
--- a/lisp/edmacro.el
+++ b/lisp/edmacro.el
@@ -62,9 +62,8 @@
 ;; macro in a more concise way that omits the comments.
 
 ;;; Code:
-
-(eval-when-compile (require 'cl-lib))
 
+(require 'cl-lib)
 (require 'kmacro)
 
 ;;; The user-level commands for editing macros.
@@ -444,14 +443,14 @@ doubt, use whitespace."
       (let* ((prefix
               (or (and (integerp (aref rest-mac 0))
                        (memq (aref rest-mac 0) mdigs)
-                       (memq (key-binding (edmacro-subseq rest-mac 0 1))
+                       (memq (key-binding (cl-subseq rest-mac 0 1))
                              '(digit-argument negative-argument))
                        (let ((i 1))
                          (while (memq (aref rest-mac i) (cdr mdigs))
                            (cl-incf i))
                          (and (not (memq (aref rest-mac i) pkeys))
-                              (prog1 (vconcat "M-" (edmacro-subseq rest-mac 0 i) " ")
-                                (cl-callf edmacro-subseq rest-mac i)))))
+                              (prog1 (vconcat "M-" (cl-subseq rest-mac 0 i) " ")
+                                (cl-callf cl-subseq rest-mac i)))))
                   (and (eq (aref rest-mac 0) ?\C-u)
                        (eq (key-binding [?\C-u]) 'universal-argument)
                        (let ((i 1))
@@ -459,7 +458,7 @@ doubt, use whitespace."
                            (cl-incf i))
                          (and (not (memq (aref rest-mac i) pkeys))
                               (prog1 (cl-loop repeat i concat "C-u ")
-                                (cl-callf edmacro-subseq rest-mac i)))))
+                                (cl-callf cl-subseq rest-mac i)))))
                   (and (eq (aref rest-mac 0) ?\C-u)
                        (eq (key-binding [?\C-u]) 'universal-argument)
                        (let ((i 1))
@@ -469,18 +468,18 @@ doubt, use whitespace."
                                       '(?0 ?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9))
                            (cl-incf i))
                          (and (not (memq (aref rest-mac i) pkeys))
-                              (prog1 (vconcat "C-u " (edmacro-subseq rest-mac 1 i) " ")
-                                (cl-callf edmacro-subseq rest-mac i)))))))
+                              (prog1 (vconcat "C-u " (cl-subseq rest-mac 1 i) " ")
+                                (cl-callf cl-subseq rest-mac i)))))))
              (bind-len (apply 'max 1
                               (cl-loop for map in maps
                                        for b = (lookup-key map rest-mac)
                                        when b collect b)))
-             (key (edmacro-subseq rest-mac 0 bind-len))
+             (key (cl-subseq rest-mac 0 bind-len))
              (fkey nil) tlen tkey
              (bind (or (cl-loop for map in maps for b = (lookup-key map key)
                                 thereis (and (not (integerp b)) b))
                        (and (setq fkey (lookup-key local-function-key-map rest-mac))
-                            (setq tlen fkey tkey (edmacro-subseq rest-mac 0 tlen)
+                            (setq tlen fkey tkey (cl-subseq rest-mac 0 tlen)
                                   fkey (lookup-key local-function-key-map tkey))
                             (cl-loop for map in maps
                                      for b = (lookup-key map fkey)
@@ -507,7 +506,7 @@ doubt, use whitespace."
                     (> first 32) (<= first maxkey) (/= first 92)
                     (progn
                       (if (> text 30) (setq text 30))
-                      (setq desc (concat (edmacro-subseq rest-mac 0 text)))
+                      (setq desc (concat (cl-subseq rest-mac 0 text)))
                       (when (string-match "^[ACHMsS]-." desc)
                         (setq text 2)
                         (cl-callf substring desc 0 2))
@@ -524,7 +523,7 @@ doubt, use whitespace."
                     (> text bind-len)
                     (memq (aref rest-mac text) '(return 13))
                     (progn
-                      (setq desc (concat (edmacro-subseq rest-mac bind-len text)))
+                      (setq desc (concat (cl-subseq rest-mac bind-len text)))
                       (commandp (intern-soft desc))))
                (if (commandp (intern-soft desc)) (setq bind desc))
                (setq desc (format "<<%s>>" desc))
@@ -562,14 +561,14 @@ doubt, use whitespace."
             (setq desc (concat (edmacro-sanitize-for-string prefix) desc)))
         (unless (string-match " " desc)
           (let ((times 1) (pos bind-len))
-            (while (not (edmacro-mismatch rest-mac rest-mac
+            (while (not (cl-mismatch rest-mac rest-mac
                                           0 bind-len pos (+ bind-len pos)))
               (cl-incf times)
               (cl-incf pos bind-len))
             (when (> times 1)
               (setq desc (format "%d*%s" times desc))
               (setq bind-len (* bind-len times)))))
-        (setq rest-mac (edmacro-subseq rest-mac bind-len))
+        (setq rest-mac (cl-subseq rest-mac bind-len))
         (if verbose
             (progn
               (unless (equal res "") (cl-callf concat res "\n"))
@@ -590,50 +589,6 @@ doubt, use whitespace."
           (cl-incf len (length desc)))))
     res))
 
-(defun edmacro-mismatch (cl-seq1 cl-seq2 cl-start1 cl-end1 cl-start2 cl-end2)
-  "Compare SEQ1 with SEQ2, return index of first mismatching element.
-Return nil if the sequences match.  If one sequence is a prefix of the
-other, the return value indicates the end of the shorted sequence.
-\n(fn SEQ1 SEQ2 START1 END1 START2 END2)"
-  (or cl-end1 (setq cl-end1 (length cl-seq1)))
-  (or cl-end2 (setq cl-end2 (length cl-seq2)))
-  (let ((cl-p1 (and (listp cl-seq1) (nthcdr cl-start1 cl-seq1)))
-        (cl-p2 (and (listp cl-seq2) (nthcdr cl-start2 cl-seq2))))
-    (while (and (< cl-start1 cl-end1) (< cl-start2 cl-end2)
-                (eql (if cl-p1 (car cl-p1)
-                       (aref cl-seq1 cl-start1))
-                     (if cl-p2 (car cl-p2)
-                       (aref cl-seq2 cl-start2))))
-      (setq cl-p1 (cdr cl-p1) cl-p2 (cdr cl-p2)
-            cl-start1 (1+ cl-start1) cl-start2 (1+ cl-start2)))
-    (and (or (< cl-start1 cl-end1) (< cl-start2 cl-end2))
-         cl-start1)))
-
-(defun edmacro-subseq (seq start &optional end)
-  "Return the subsequence of SEQ from START to END.
-If END is omitted, it defaults to the length of the sequence.
-If START or END is negative, it counts from the end."
-  (if (stringp seq) (substring seq start end)
-    (let (len)
-      (and end (< end 0) (setq end (+ end (setq len (length seq)))))
-      (if (< start 0) (setq start (+ start (or len (setq len (length seq))))))
-      (cond ((listp seq)
-             (if (> start 0) (setq seq (nthcdr start seq)))
-             (if end
-                 (let ((res nil))
-                   (while (>= (setq end (1- end)) start)
-                     (push (pop seq) res))
-                   (nreverse res))
-               (copy-sequence seq)))
-            (t
-             (or end (setq end (or len (length seq))))
-             (let ((res (make-vector (max (- end start) 0) nil))
-                   (i 0))
-               (while (< start end)
-                 (aset res i (aref seq start))
-                 (setq i (1+ i) start (1+ start)))
-               res))))))
-
 (defun edmacro-sanitize-for-string (seq)
   "Convert a key sequence vector SEQ into a string.
 The string represents the same events; Meta is indicated by bit 7.
@@ -760,7 +715,7 @@ This function assumes that the events can be stored in a string."
                (eq (aref res 1) ?\()
                (eq (aref res (- (length res) 2)) ?\C-x)
                (eq (aref res (- (length res) 1)) ?\)))
-      (setq res (edmacro-subseq res 2 -2)))
+      (setq res (cl-subseq res 2 -2)))
     (if (and (not need-vector)
              (cl-loop for ch across res
                       always (and (characterp ch)
diff --git a/lisp/emacs-lisp/.gitignore b/lisp/emacs-lisp/.gitignore
deleted file mode 100644
index 133e79e817a..00000000000
--- a/lisp/emacs-lisp/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-!*-loaddefs.el
-
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 3cf744f1245..c47c9b61030 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -1957,7 +1957,7 @@ by EXPANSION, and (setq NAME ...) will act like (setf EXPANSION ...).
   "Collect multiple return values.
 FORM must return a list; the BODY is then executed with the first N elements
 of this list bound (`let'-style) to each of the symbols SYM in turn.  This
-is analogous to the Common Lisp `cl-multiple-value-bind' macro, using lists to
+is analogous to the Common Lisp `multiple-value-bind' macro, using lists to
 simulate true multiple return values.  For compatibility, (cl-values A B C) is
 a synonym for (list A B C).
 
@@ -1975,7 +1975,7 @@ a synonym for (list A B C).
   "Collect multiple return values.
 FORM must return a list; the first N elements of this list are stored in
 each of the symbols SYM in turn.  This is analogous to the Common Lisp
-`cl-multiple-value-setq' macro, using lists to simulate true multiple return
+`multiple-value-setq' macro, using lists to simulate true multiple return
 values.  For compatibility, (cl-values A B C) is a synonym for (list A B C).
 
 \(fn (SYM...) FORM)"
@@ -2002,7 +2002,7 @@ values.  For compatibility, (cl-values A B C) is a synonym for (list A B C).
   (cons 'progn body))
 ;;;###autoload
 (defmacro cl-the (_type form)
-  "At present this ignores _TYPE and is simply equivalent to FORM."
+  "At present this ignores TYPE and is simply equivalent to FORM."
   (declare (indent 1) (debug (cl-type-spec form)))
   form)
 
@@ -2059,7 +2059,7 @@ values.  For compatibility, (cl-values A B C) is a synonym for (list A B C).
   "Declare SPECS about the current function while compiling.
 For instance
 
-  \(cl-declare (warn 0))
+  (cl-declare (warn 0))
 
 will turn off byte-compile warnings in the function.
 See Info node `(cl)Declarations' for details."
@@ -2279,8 +2279,8 @@ KEYWORD can be one of :conc-name, :constructor, :copier, :predicate,
 Each SLOT may instead take the form (SNAME SDEFAULT SOPTIONS...), where
 SDEFAULT is the default value of that slot and SOPTIONS are keyword-value
 pairs for that slot.
-Currently, only one keyword is supported, `:read-only'.  If this has a non-nil
-value, that slot cannot be set via `setf'.
+Currently, only one keyword is supported, `:read-only'.  If this has a
+non-nil value, that slot cannot be set via `setf'.
 
 \(fn NAME SLOTS...)"
   (declare (doc-string 2) (indent 1)
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 319af588eac..36c72f3a3bd 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -53,7 +53,7 @@
 ;;; Code:
 
 (require 'macroexp)
-(eval-when-compile (require 'cl-lib))
+(require 'cl-lib)
 (eval-when-compile (require 'pcase))
 
 ;;; Options
@@ -263,26 +263,6 @@ An extant spec symbol is a symbol that is not a function and has a
 
 ;;; Utilities
 
-;; Define edebug-gensym - from old cl.el
-(defvar edebug-gensym-index 0
-  "Integer used by `edebug-gensym' to produce new names.")
-
-(defun edebug-gensym (&optional prefix)
-  "Generate a fresh uninterned symbol.
-There is an optional argument, PREFIX.  PREFIX is the string
-that begins the new name.  Most people take just the default,
-except when debugging needs suggest otherwise."
-  (if (null prefix)
-      (setq prefix "G"))
-  (let ((newsymbol nil)
-        (newname   ""))
-    (while (not newsymbol)
-      (setq newname (concat prefix (int-to-string edebug-gensym-index)))
-      (setq edebug-gensym-index (+ edebug-gensym-index 1))
-      (if (not (intern-soft newname))
-          (setq newsymbol (make-symbol newname))))
-    newsymbol))
-
 (defun edebug-lambda-list-keywordp (object)
   "Return t if OBJECT is a lambda list keyword.
 A lambda list keyword is a symbol that starts with `&'."
@@ -1186,7 +1166,7 @@ Maybe clear the markers and delete the symbol's edebug property?"
   ;; Uses the dynamically bound vars edebug-def-name and edebug-def-args.
   ;; Do this after parsing since that may find a name.
   (setq edebug-def-name
-        (or edebug-def-name edebug-old-def-name (edebug-gensym "edebug-anon")))
+        (or edebug-def-name edebug-old-def-name (cl-gensym "edebug-anon")))
   `(edebug-enter
     (quote ,edebug-def-name)
     ,(if edebug-inside-func
@@ -1299,7 +1279,7 @@ expressions; a `progn' form will be returned enclosing these forms."
 
       ;; Set the name here if it was not set by edebug-make-enter-wrapper.
       (setq edebug-def-name
-            (or edebug-def-name edebug-old-def-name (edebug-gensym "edebug-anon")))
+            (or edebug-def-name edebug-old-def-name (cl-gensym "edebug-anon")))
 
       ;; Add this def as a dependent of containing def.  Buggy.
       '(if (and edebug-containing-def-name
diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index 656cb0a6a14..1f5edefea08 100644
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -54,7 +54,7 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl-lib))
+(require 'cl-lib)
 (require 'button)
 (require 'debug)
 (require 'easymenu)
@@ -87,127 +87,6 @@
 
 ;;; Copies/reimplementations of cl functions.
 
-(defun ert--cl-do-remf (plist tag)
-  "Copy of `cl-do-remf'.  Modify PLIST by removing TAG."
-  (let ((p (cdr plist)))
-    (while (and (cdr p) (not (eq (car (cdr p)) tag))) (setq p (cdr (cdr p))))
-    (and (cdr p) (progn (setcdr p (cdr (cdr (cdr p)))) t))))
-
-(defun ert--remprop (sym tag)
-  "Copy of `cl-remprop'.  Modify SYM's plist by removing TAG."
-  (let ((plist (symbol-plist sym)))
-    (if (and plist (eq tag (car plist)))
-        (progn (setplist sym (cdr (cdr plist))) t)
-      (ert--cl-do-remf plist tag))))
-
-(defun ert--remove-if-not (ert-pred ert-list)
-  "A reimplementation of `remove-if-not'.
-
-ERT-PRED is a predicate, ERT-LIST is the input list."
-  (cl-loop for ert-x in ert-list
-           if (funcall ert-pred ert-x)
-           collect ert-x))
-
-(defun ert--intersection (a b)
-  "A reimplementation of `intersection'.  Intersect the sets A and B.
-
-Elements are compared using `eql'."
-  (cl-loop for x in a
-           if (memql x b)
-           collect x))
-
-(defun ert--set-difference (a b)
-  "A reimplementation of `set-difference'.  Subtract the set B from the set A.
-
-Elements are compared using `eql'."
-  (cl-loop for x in a
-           unless (memql x b)
-           collect x))
-
-(defun ert--set-difference-eq (a b)
-  "A reimplementation of `set-difference'.  Subtract the set B from the set A.
-
-Elements are compared using `eq'."
-  (cl-loop for x in a
-           unless (memq x b)
-           collect x))
-
-(defun ert--union (a b)
-  "A reimplementation of `union'.  Compute the union of the sets A and B.
-
-Elements are compared using `eql'."
-  (append a (ert--set-difference b a)))
-
-(eval-and-compile
-  (defvar ert--gensym-counter 0))
-
-(eval-and-compile
-  (defun ert--gensym (&optional prefix)
-    "Only allows string PREFIX, not compatible with CL."
-    (unless prefix (setq prefix "G"))
-    (make-symbol (format "%s%s"
-                         prefix
-                         (prog1 ert--gensym-counter
-                           (cl-incf ert--gensym-counter))))))
-
-(defun ert--coerce-to-vector (x)
-  "Coerce X to a vector."
-  (when (char-table-p x) (error "Not supported"))
-  (if (vectorp x)
-      x
-    (vconcat x)))
-
-(cl-defun ert--remove* (x list &key key test)
-  "Does not support all the keywords of remove*."
-  (unless key (setq key #'identity))
-  (unless test (setq test #'eql))
-  (cl-loop for y in list
-           unless (funcall test x (funcall key y))
-           collect y))
-
-(defun ert--string-position (c s)
-  "Return the position of the first occurrence of C in S, or nil if none."
-  (cl-loop for i from 0
-           for x across s
-           when (eql x c) return i))
-
-(defun ert--mismatch (a b)
-  "Return index of first element that differs between A and B.
-
-Like `mismatch'.  Uses `equal' for comparison."
-  (cond ((or (listp a) (listp b))
-         (ert--mismatch (ert--coerce-to-vector a)
-                        (ert--coerce-to-vector b)))
-        ((> (length a) (length b))
-         (ert--mismatch b a))
-        (t
-         (let ((la (length a))
-               (lb (length b)))
-           (cl-assert (arrayp a) t)
-           (cl-assert (arrayp b) t)
-           (cl-assert (<= la lb) t)
-           (cl-loop for i below la
-                    when (not (equal (aref a i) (aref b i))) return i
-                    finally (cl-return (if (/= la lb)
-                                           la
-                                         (cl-assert (equal a b) t)
-                                         nil)))))))
-
-(defun ert--subseq (seq start &optional end)
-  "Return a subsequence of SEQ from START to END."
-  (when (char-table-p seq) (error "Not supported"))
-  (let ((vector (substring (ert--coerce-to-vector seq) start end)))
-    (cl-etypecase seq
-      (vector vector)
-      (string (concat vector))
-      (list (append vector nil))
-      (bool-vector (cl-loop with result
-                            = (make-bool-vector (length vector) nil)
-                            for i below (length vector) do
-                            (setf (aref result i) (aref vector i))
-                            finally (cl-return result)))
-      (char-table (cl-assert nil)))))
-
 (defun ert-equal-including-properties (a b)
   "Return t if A and B have similar structure and contents.
 
@@ -258,7 +137,7 @@ Emacs bug 6581 at URL `http://debbugs.gnu.org/cgi/bugreport.cgi?bug=6581'."
 
 (defun ert-make-test-unbound (symbol)
   "Make SYMBOL name no test.  Return SYMBOL."
-  (ert--remprop symbol 'ert--test)
+  (cl-remprop symbol 'ert--test)
   symbol)
 
 (defun ert--parse-keys-and-body (keys-and-body)
@@ -396,8 +275,8 @@ DATA is displayed to the user and should state the reason of the failure."
                              cl-macro-environment)))))
     (cond
      ((or (atom form) (ert--special-operator-p (car form)))
-      (let ((value (ert--gensym "value-")))
-        `(let ((,value (ert--gensym "ert-form-evaluation-aborted-")))
+      (let ((value (cl-gensym "value-")))
+        `(let ((,value (cl-gensym "ert-form-evaluation-aborted-")))
            ,(funcall inner-expander
                      `(setq ,value ,form)
                      `(list ',whole :form ',form :value ,value)
@@ -410,10 +289,10 @@ DATA is displayed to the user and should state the reason of the failure."
                        (and (consp fn-name)
                             (eql (car fn-name) 'lambda)
                             (listp (cdr fn-name)))))
-        (let ((fn (ert--gensym "fn-"))
-              (args (ert--gensym "args-"))
-              (value (ert--gensym "value-"))
-              (default-value (ert--gensym "ert-form-evaluation-aborted-")))
+        (let ((fn (cl-gensym "fn-"))
+              (args (cl-gensym "args-"))
+              (value (cl-gensym "value-"))
+              (default-value (cl-gensym "ert-form-evaluation-aborted-")))
           `(let ((,fn (function ,fn-name))
                  (,args (list ,@arg-forms)))
              (let ((,value ',default-value))
@@ -450,7 +329,7 @@ FORM-DESCRIPTION-FORM before it has called INNER-FORM."
   (ert--expand-should-1
    whole form
    (lambda (inner-form form-description-form value-var)
-     (let ((form-description (ert--gensym "form-description-")))
+     (let ((form-description (cl-gensym "form-description-")))
        `(let (,form-description)
           ,(funcall inner-expander
                     `(unwind-protect
@@ -491,7 +370,7 @@ and aborts the current test as failed if it doesn't."
                               (list type)
                               (symbol (list type)))))
     (cl-assert signaled-conditions)
-    (unless (ert--intersection signaled-conditions handled-conditions)
+    (unless (cl-intersection signaled-conditions handled-conditions)
       (ert-fail (append
                  (funcall form-description-fn)
                  (list
@@ -528,8 +407,8 @@ failed."
    `(should-error ,form ,@keys)
    form
    (lambda (inner-form form-description-form value-var)
-     (let ((errorp (ert--gensym "errorp"))
-           (form-description-fn (ert--gensym "form-description-fn-")))
+     (let ((errorp (cl-gensym "errorp"))
+           (form-description-fn (cl-gensym "form-description-fn-")))
        `(let ((,errorp nil)
               (,form-description-fn (lambda () ,form-description-form)))
           (condition-case -condition-
@@ -591,7 +470,7 @@ Returns nil if they are."
                    `(proper-lists-of-different-length ,(length a) ,(length b)
                                                       ,a ,b
                                                       first-mismatch-at
-                                                      ,(ert--mismatch a b))
+                                                      ,(cl-mismatch a b :test 'equal))
                  (cl-loop for i from 0
                           for ai in a
                           for bi in b
@@ -611,7 +490,7 @@ Returns nil if they are."
                                               ,a ,b
                                               ,@(unless (char-table-p a)
                                                   `(first-mismatch-at
-                                                    ,(ert--mismatch a b))))
+                                                    ,(cl-mismatch a b :test 'equal))))
                (cl-loop for i from 0
                         for ai across a
                         for bi across b
@@ -656,8 +535,8 @@ key/value pairs in each list does not matter."
   ;; work, so let's punt on it for now.
   (let* ((keys-a (ert--significant-plist-keys a))
          (keys-b (ert--significant-plist-keys b))
-         (keys-in-a-not-in-b (ert--set-difference-eq keys-a keys-b))
-         (keys-in-b-not-in-a (ert--set-difference-eq keys-b keys-a)))
+         (keys-in-a-not-in-b (cl-set-difference keys-a keys-b :test 'eq))
+         (keys-in-b-not-in-a (cl-set-difference keys-b keys-a :test 'eq)))
     (cl-flet ((explain-with-key (key)
                 (let ((value-a (plist-get a key))
                       (value-b (plist-get b key)))
@@ -1090,7 +969,7 @@ contained in UNIVERSE."
      (cl-etypecase universe
        ((member t) (mapcar #'ert-get-test
                            (apropos-internal selector #'ert-test-boundp)))
-       (list (ert--remove-if-not (lambda (test)
+       (list (cl-remove-if-not (lambda (test)
                                    (and (ert-test-name test)
                                         (string-match selector
                                                       (ert-test-name test))))
@@ -1123,13 +1002,13 @@ contained in UNIVERSE."
          (not
           (cl-assert (eql (length operands) 1))
           (let ((all-tests (ert-select-tests 't universe)))
-            (ert--set-difference all-tests
+            (cl-set-difference all-tests
                                  (ert-select-tests (car operands)
                                                    all-tests))))
          (or
           (cl-case (length operands)
             (0 (ert-select-tests 'nil universe))
-            (t (ert--union (ert-select-tests (car operands) universe)
+            (t (cl-union (ert-select-tests (car operands) universe)
                            (ert-select-tests `(or ,@(cdr operands))
                                              universe)))))
          (tag
@@ -1141,7 +1020,7 @@ contained in UNIVERSE."
                               universe)))
          (satisfies
           (cl-assert (eql (length operands) 1))
-          (ert--remove-if-not (car operands)
+          (cl-remove-if-not (car operands)
                               (ert-select-tests 't universe))))))))
 
 (defun ert--insert-human-readable-selector (selector)
@@ -1285,7 +1164,7 @@ Also changes the counters in STATS to match."
   "Create a new `ert--stats' object for running TESTS.
 
 SELECTOR is the selector that was used to select TESTS."
-  (setq tests (ert--coerce-to-vector tests))
+  (setq tests (cl-coerce tests 'vector))
   (let ((map (make-hash-table :size (length tests))))
     (cl-loop for i from 0
              for test across tests
@@ -1548,10 +1427,10 @@ This can be used as an inverse of `add-to-list'."
   (unless key (setq key #'identity))
   (unless test (setq test #'equal))
   (setf (symbol-value list-var)
-        (ert--remove* element
-                      (symbol-value list-var)
-                      :key key
-                      :test test)))
+        (cl-remove element
+                   (symbol-value list-var)
+                   :key key
+                   :test test)))
 
 
 ;;; Some basic interactive functions.
@@ -1810,7 +1689,7 @@ BEGIN and END specify a region in the current buffer."
   "Return the first line of S, or S if it contains no newlines.
 
 The return value does not include the line terminator."
-  (substring s 0 (ert--string-position ?\n s)))
+  (substring s 0 (cl-position ?\n s)))
 
 (defun ert-face-for-test-result (expectedp)
   "Return a face that shows whether a test result was expected or unexpected.
diff --git a/lisp/emacs-lisp/map-ynp.el b/lisp/emacs-lisp/map-ynp.el
index 1919d47687b..56bfe04f9ce 100644
--- a/lisp/emacs-lisp/map-ynp.el
+++ b/lisp/emacs-lisp/map-ynp.el
@@ -131,8 +131,9 @@ Returns the number of actions taken."
     (unwind-protect
         (progn
           (if (stringp prompter)
-              (setq prompter (lambda (object)
-                               (format prompter object))))
+              (setq prompter (let ((prompter prompter))
+                               (lambda (object)
+                                 (format prompter object)))))
           (while (funcall next)
             (setq prompt (funcall prompter elt))
             (cond ((stringp prompt)
diff --git a/lisp/emacs-lisp/pcase.el b/lisp/emacs-lisp/pcase.el
index e000c343721..511f1480099 100644
--- a/lisp/emacs-lisp/pcase.el
+++ b/lisp/emacs-lisp/pcase.el
@@ -482,12 +482,19 @@ MATCH is the pattern that needs to be matched, of the form:
            all))
     '(: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'.
+(defun pcase--split-pred (vars upat pat)
   (let (test)
     (cond
-     ((equal upat pat) '(:pcase--succeed . :pcase--fail))
+     ((and (equal upat pat)
+           ;; For predicates like (pred (> a)), two such predicates may
+           ;; actually refer to different variables `a'.
+           (or (and (eq 'pred (car upat)) (symbolp (cadr upat)))
+               ;; FIXME: `vars' gives us the environment in which `upat' will
+               ;; run, but we don't have the environment in which `pat' will
+               ;; run, so we can't do a reliable verification.  But let's try
+               ;; and catch at least the easy cases such as (bug#14773).
+               (not (pcase--fgrep (mapcar #'car vars) (cadr upat)))))
+      '(:pcase--succeed . :pcase--fail))
      ((and (eq 'pred (car upat))
            (eq 'pred (car-safe pat))
            (or (member (cons (cadr upat) (cadr pat))
@@ -589,7 +596,7 @@ Otherwise, it defers to REST which is a list of branches of the form
         (if (eq (car upat) 'pred) (pcase--mark-used sym))
         (let* ((splitrest
                 (pcase--split-rest
-                 sym (lambda (pat) (pcase--split-pred upat pat)) rest))
+                 sym (lambda (pat) (pcase--split-pred vars upat pat)) rest))
                (then-rest (car splitrest))
                (else-rest (cdr splitrest)))
           (pcase--if (if (and (eq (car upat) 'pred) (symbolp (cadr upat)))
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index e7b371365e4..c39d896f3d3 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -996,93 +996,7 @@ as a Meta key and any number of multiple escapes are allowed."
         (suspend-emacs))
     (viper-change-state-to-emacs)))
 
-
-;; Intercept ESC sequences on dumb terminals.
-;; Based on the idea contributed by Marcelino Veiga Tuimil <mveiga@dit.upm.es>
-
-;; Check if last key was ESC and if so try to reread it as a function key.
-;; But only if there are characters to read during a very short time.
-;; Returns the last event, if any.
-(defun viper-envelop-ESC-key ()
-  (let ((event last-input-event)
-        (keyseq [nil])
-        (inhibit-quit t))
-    (if (viper-ESC-event-p event)
-        (progn
-          ;; Some versions of Emacs (eg., 22.50.8 (?)) have a bug, which makes
-          ;; even a single ESC into a fast keyseq. To guard against this, we
-          ;; added a check if there are other events as well.  Keep the next
-          ;; line for the next time the bug reappears, so that will remember to
-          ;; report it.
-          ;;(if (and (viper-fast-keysequence-p) unread-command-events)
-          (if (viper-fast-keysequence-p) ;; for Emacsen without the above bug
-              (progn
-                (let (minor-mode-map-alist emulation-mode-map-alists)
-                  (viper-set-unread-command-events event)
-                  (setq keyseq (read-key-sequence nil 'continue-echo))
-                  ) ; let
-                ;; If keyseq translates into something that still has ESC
-                ;; at the beginning, separate ESC from the rest of the seq.
-                ;; In XEmacs we check for events that are keypress meta-key
-                ;; and convert them into [escape key]
-                ;;
-                ;; This is needed for the following reason:
-                ;; If ESC is the first symbol, we interpret it as if the
-                ;; user typed ESC and then quickly some other symbols.
-                ;; If ESC is not the first one, then the key sequence
-                ;; entered was apparently translated into a function key or
-                ;; something (e.g., one may have
-                ;; (define-key function-key-map "\e[192z" [f11])
-                ;; which would translate the escape-sequence generated by
-                ;; f11 in an xterm window into the symbolic key f11.
-                ;;
-                ;; If `first-key' is not an ESC event, we make it into the
-                ;; last-command-event in order to pretend that this key was
-                ;; pressed.  This is needed to allow arrow keys to be bound to
-                ;; macros.  Otherwise, viper-exec-mapped-kbd-macro will think
-                ;; that the last event was ESC and so it'll execute whatever is
-                ;; bound to ESC. (Viper macros can't be bound to
-                ;; ESC-sequences).
-                (let* ((first-key (elt keyseq 0))
-                       (key-mod (event-modifiers first-key)))
-                  (cond ((and (viper-ESC-event-p first-key)
-                              (not (viper-translate-all-ESC-keysequences)))
-                         ;; put keys following ESC on the unread list
-                         ;; and return ESC as the key-sequence
-                         (viper-set-unread-command-events (viper-subseq keyseq 1))
-                         (setq last-input-event event
-                               keyseq (if (featurep 'emacs)
-                                          "\e"
-                                        (vector (character-to-event ?\e)))))
-                        ((and (featurep 'xemacs)
-                              (key-press-event-p first-key)
-                              (equal '(meta) key-mod))
-                         (viper-set-unread-command-events
-                          (vconcat (vector
-                                    (character-to-event (event-key first-key)))
-                                   (viper-subseq keyseq 1)))
-                         (setq last-input-event event
-                               keyseq (vector (character-to-event ?\e))))
-                        ((eventp first-key)
-                         (setq last-command-event
-                               (viper-copy-event first-key)))
-                        ))
-                ) ; end progn
-
-            ;; this is escape event with nothing after it
-            ;; put in unread-command-event and then re-read
-            (viper-set-unread-command-events event)
-            (setq keyseq (read-key-sequence nil))
-            ))
-      ;; not an escape event
-      (setq keyseq (vector event)))
-    keyseq))
-
-
-
 ;; Listen to ESC key.
-;; If a sequence of keys starting with ESC is issued with very short delays,
-;; interpret these keys in Emacs mode, so ESC won't be interpreted as a Vi key.
 (defun viper-intercept-ESC-key ()
   "Function that implements ESC key in Viper emulation of Vi."
   (interactive)
@@ -1090,13 +1004,7 @@ as a Meta key and any number of multiple escapes are allowed."
   ;; minor-mode map(s) have been temporarily disabled so the ESC
   ;; binding to viper-intercept-ESC-key doesn't hide the binding we're
   ;; looking for (Bug#9146):
-  (let* ((event (viper-envelop-ESC-key))
-         (cmd (cond ((equal event viper-ESC-key)
-                     'viper-intercept-ESC-key)
-                    ((let ((emulation-mode-map-alists nil))
-                       (key-binding event)))
-                    (t
-                     (error "Viper bell")))))
+  (let* ((cmd 'viper-intercept-ESC-key))
 
     ;; call the actual function to execute ESC (if no other symbols followed)
     ;; or the key bound to the ESC sequence (if the sequence was issued
@@ -4289,6 +4197,11 @@ cursor move past the beginning of line."
         (t
          (backward-char 1))))
 
+(defun viper-del-forward-char-in-insert ()
+  "Delete 1 char forward if in insert or replace state."
+  (interactive)
+  ;; don't put on kill ring
+  (delete-char 1 nil))
 
 
 ;; join lines.
@@ -4947,7 +4860,7 @@ Please, specify your level now: ")
   (interactive)
   (if (< viper-expert-level 2)
       (save-buffers-kill-emacs)
-    (save-buffer)
+    (if (buffer-modified-p) (save-buffer))
     (kill-buffer (current-buffer))))
 
 
diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el
index 0d9d300ab1a..d33b5f4ed58 100644
--- a/lisp/emulation/viper-keym.el
+++ b/lisp/emulation/viper-keym.el
@@ -192,7 +192,7 @@ Enter as a sexp.  Examples: \"\\C-z\", [(control ?z)]."
   :type 'string
   :group 'viper)
 
-(defvar viper-ESC-key (kbd "ESC")
+(defconst viper-ESC-key [escape]
   "Key used to ESC.")
 
 
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index 7f432cdc143..266af1abf2b 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -14,7 +14,7 @@
 ;; filed in the Emacs bug reporting system against this file, a copy
 ;; of the bug report be sent to the maintainer's email address.
 
-(defconst viper-version "3.14.1 of August 15, 2009"
+(defconst viper-version "3.14.2 of July 4, 2013"
   "The current version of Viper")
 
 ;; This file is part of GNU Emacs.
@@ -411,6 +411,7 @@ widget."
     dired-mode
     efs-mode
     tar-mode
+    egg-status-buffer-mode
 
     browse-kill-ring-mode
     recentf-mode
@@ -660,7 +661,7 @@ user customization, unrelated to Viper.  For instance, if the user advised
 undone.
 It also can't undo some Viper settings."
   (interactive)
-
+  (viper-setup-ESC-to-escape nil)
   ;; restore non-viper vars
   (setq-default
    next-line-add-newlines
@@ -825,6 +826,58 @@ It also can't undo some Viper settings."
   (add-hook 'viper-post-command-hooks 'set-viper-state-in-major-mode t))
 
 
+;;; Handling of tty's ESC event
+
+;; On a tty, an ESC event can either be the user hitting the escape key, or
+;; some element of a byte sequence used to encode for example cursor keys.
+;; So we try to recognize those events that correspond to the escape key and
+;; turn them into `escape' events (same as used under GUIs).  The heuristic we
+;; use to distinguish the two cases is based, as usual, on a timeout, and on
+;; the fact that the special ESC=>escape mapping only takes place if the whole
+;; last key-sequence so far is just [?\e], i.e. either we're still in
+;; read-key-sequence, or the last read-key-sequence only read [?\e], which
+;; should ideally never happen because it should have been mapped to [escape].
+
+(defun viper--tty-ESC-filter (map)
+  (if (and (equal (this-single-command-keys) [?\e])
+           (sit-for (/ viper-fast-keyseq-timeout 1000)))
+      [escape] map))
+
+(defun viper--lookup-key (map key)
+  "Kind of like `lookup-key'.
+Two differences:
+- KEY is a single key, not a sequence.
+- the result is the \"raw\" binding, so it can be a `menu-item', rather than the
+  binding contained in that menu item."
+  (catch 'found
+    (map-keymap (lambda (k b) (if (equal key k) (throw 'found b))) map)))
+
+(defun viper-catch-tty-ESC ()
+  "Setup key mappings of current terminal to turn a tty's ESC into `escape'."
+  (when (memq (terminal-live-p (frame-terminal)) '(t pc))
+    (let ((esc-binding (viper-uncatch-tty-ESC)))
+      (define-key input-decode-map
+        [?\e] `(menu-item "" ,esc-binding :filter viper--tty-ESC-filter)))))
+
+(defun viper-uncatch-tty-ESC ()
+  "Don't hack ESC into `escape' any more."
+  (let ((b (viper--lookup-key input-decode-map ?\e)))
+    (and (eq 'menu-item (car-safe b))
+         (eq 'viper--tty-ESC-filter (nth 4 b))
+         (define-key input-decode-map [?\e] (setq b (nth 2 b))))
+    b))
+
+(defun viper-setup-ESC-to-escape (enable)
+  (if enable
+      (add-hook 'tty-setup-hook 'viper-catch-tty-ESC)
+    (remove-hook 'tty-setup-hook 'viper-catch-tty-ESC))
+  (let ((seen ()))
+    (dolist (frame (frame-list))
+      (let ((terminal (frame-terminal frame)))
+        (unless (memq terminal seen)
+          (push terminal seen)
+          (with-selected-frame frame
+            (if enable (viper-catch-tty-ESC) (viper-uncatch-tty-ESC))))))))
 
 ;; This sets major mode hooks to make them come up in vi-state.
 (defun viper-set-hooks ()
@@ -837,6 +890,8 @@ It also can't undo some Viper settings."
   (if (eq (default-value 'major-mode) 'fundamental-mode)
       (setq-default major-mode 'viper-mode))
 
+  (viper-setup-ESC-to-escape t)
+
   (add-hook 'change-major-mode-hook 'viper-major-mode-change-sentinel)
   (add-hook 'find-file-hooks 'set-viper-state-in-major-mode)
 
@@ -847,13 +902,6 @@ It also can't undo some Viper settings."
   (defvar emerge-startup-hook)
   (add-hook 'emerge-startup-hook 'viper-change-state-to-emacs)
 
-  ;; Zap bad bindings in flyspell-mouse-map, which prevent ESC from working
-  ;; over misspelled words (due to the overlay keymaps)
-  (defvar flyspell-mode-hook)
-  (defvar flyspell-mouse-map)
-  (add-hook 'flyspell-mode-hook
-            (lambda ()
-              (define-key flyspell-mouse-map viper-ESC-key nil)))
   ;; if viper is started from .emacs, it might be impossible to get certain
   ;; info about the display and windows until emacs initialization is complete
   ;; So do it via the window-setup-hook
diff --git a/lisp/faces.el b/lisp/faces.el
index 0a3f0551325..9a34aec2549 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2097,6 +2097,10 @@ the above example."
               nil))))
   type)
 
+(defvar tty-setup-hook nil
+  "Hook run after running the initialization function of a new text terminal.
+This can be used to fine tune the `input-decode-map', for example.")
+
 (defun tty-run-terminal-initialization (frame &optional type)
   "Run the special initialization code for the terminal type of FRAME.
 The optional TYPE parameter may be used to override the autodetected
@@ -2122,7 +2126,8 @@ terminal type to a different value."
                        type)
         (when (fboundp term-init-func)
           (funcall term-init-func))
-        (set-terminal-parameter frame 'terminal-initted term-init-func)))))
+        (set-terminal-parameter frame 'terminal-initted term-init-func)
+        (run-hooks 'tty-setup-hook)))))
 
 ;; Called from C function init_display to initialize faces of the
 ;; dumped terminal frame on startup.
diff --git a/lisp/filenotify.el b/lisp/filenotify.el
new file mode 100644
index 00000000000..e170db2dd5f
--- /dev/null
+++ b/lisp/filenotify.el
@@ -0,0 +1,324 @@
+;;; filenotify.el --- watch files for changes on disk
+
+;; Copyright (C) 2013 Free Software Foundation, Inc.
+
+;; Author: Michael Albinus <michael.albinus@gmx.de>
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary
+
+;; This package is an abstraction layer from the different low-level
+;; file notification packages `gfilenotify', `inotify' and
+;; `w32notify'.
+
+;;; Code:
+
+;;;###autoload
+(defconst file-notify-support
+  (cond
+   ((featurep 'gfilenotify) 'gfilenotify)
+   ((featurep 'inotify) 'inotify)
+   ((featurep 'w32notify) 'w32notify))
+  "Non-nil when Emacs has been compiled with file notification support.
+The value is the name of the low-level file notification package
+to be used for local file systems.  Remote file notifications
+could use another implementation.")
+
+(defvar file-notify-descriptors (make-hash-table :test 'equal)
+  "Hash table for registered file notification descriptors.
+A key in this hash table is the descriptor as returned from
+`gfilenotify', `inotify', `w32notify' or a file name handler.
+The value in the hash table is the cons cell (DIR FILE CALLBACK).")
+
+;; This function is used by `gfilenotify', `inotify' and `w32notify' events.
+;;;###autoload
+(defun file-notify-handle-event (event)
+  "Handle file system monitoring event.
+If EVENT is a filewatch event, call its callback.
+Otherwise, signal a `file-notify-error'."
+  (interactive "e")
+  (if (and (eq (car event) 'file-notify)
+           (>= (length event) 3))
+      (funcall (nth 2 event) (nth 1 event))
+    (signal 'file-notify-error
+            (cons "Not a valid file-notify event" event))))
+
+(defvar file-notify--pending-events nil
+  "List of pending file notification events for a future `renamed' action.
+The entries are a list (DESCRIPTOR ACTION FILE COOKIE).  ACTION
+is either `moved-from' or `renamed-from'.")
+
+(defun file-notify--event-file-name (event)
+  "Return file name of file notification event, or nil."
+  (expand-file-name
+   (or  (and (stringp (nth 2 event)) (nth 2 event)) "")
+   (car (gethash (car event) file-notify-descriptors))))
+
+;; Only `gfilenotify' could return two file names.
+(defun file-notify--event-file1-name (event)
+  "Return second file name of file notification event, or nil.
+This is available in case a file has been moved."
+  (and (stringp (nth 3 event))
+       (expand-file-name
+        (nth 3 event) (car (gethash (car event) file-notify-descriptors)))))
+
+;; Cookies are offered by `inotify' only.
+(defun file-notify--event-cookie (event)
+  "Return cookie of file notification event, or nil.
+This is available in case a file has been moved."
+  (nth 3 event))
+
+;; The callback function used to map between specific flags of the
+;; respective file notifications, and the ones we return.
+(defun file-notify-callback (event)
+  "Handle an EVENT returned from file notification.
+EVENT is the same one as in `file-notify-handle-event' except the
+car of that event, which is the symbol `file-notify'."
+  (let* ((desc (car event))
+         (registered (gethash desc file-notify-descriptors))
+         (pending-event (assoc desc file-notify--pending-events))
+         (actions (nth 1 event))
+         (file (file-notify--event-file-name event))
+         file1 cookie callback)
+
+    ;; Make actions a list.
+    (unless (consp actions) (setq actions (cons actions nil)))
+
+    ;; Check, that event is meant for us.
+    (unless (setq callback (nth 2 registered))
+      (setq actions nil))
+
+    ;; Loop over actions.  In fact, more than one action happens only
+    ;; for `inotify'.
+    (dolist (action actions)
+
+      ;; Send pending event, if it doesn't match.
+      (when (and pending-event
+                 ;; The cookie doesn't match.
+                 (not (eq (file-notify--event-cookie pending-event)
+                          (file-notify--event-cookie event)))
+                 (or
+                  ;; inotify.
+                  (and (eq (nth 1 pending-event) 'moved-from)
+                       (not (eq action 'moved-to)))
+                  ;; w32notify.
+                  (and (eq (nth 1 pending-event) 'renamed-from)
+                       (not (eq action 'renamed-to)))))
+        (funcall callback
+                 (list desc 'deleted
+                       (file-notify--event-file-name pending-event)))
+        (setq file-notify--pending-events
+              (delete pending-event file-notify--pending-events)))
+
+      ;; Map action.  We ignore all events which cannot be mapped.
+      (setq action
+            (cond
+             ;; gfilenotify.
+             ((memq action '(attribute-changed changed created deleted)) action)
+             ((eq action 'moved)
+              (setq file1 (file-notify--event-file1-name event))
+              'renamed)
+
+             ;; inotify.
+             ((eq action 'attrib) 'attribute-changed)
+             ((eq action 'create) 'created)
+             ((eq action 'modify) 'changed)
+             ((memq action '(delete 'delete-self move-self)) 'deleted)
+             ;; Make the event pending.
+             ((eq action 'moved-from)
+              (add-to-list 'file-notify--pending-events
+                           (list desc action file
+                                 (file-notify--event-cookie event)))
+              nil)
+             ;; Look for pending event.
+             ((eq action 'moved-to)
+              (if (null pending-event)
+                  'created
+                (setq file1 file
+                      file (file-notify--event-file-name pending-event)
+                      file-notify--pending-events
+                      (delete pending-event file-notify--pending-events))
+                'renamed))
+
+             ;; w32notify.
+             ((eq action 'added) 'created)
+             ((eq action 'modified) 'changed)
+             ((eq action 'removed) 'deleted)
+             ;; Make the event pending.
+             ((eq 'renamed-from action)
+              (add-to-list 'file-notify--pending-events
+                           (list desc action file
+                                 (file-notify--event-cookie event)))
+              nil)
+             ;; Look for pending event.
+             ((eq 'renamed-to action)
+              (if (null pending-event)
+                  'created
+                (setq file1 file
+                      file (file-notify--event-file-name pending-event)
+                      file-notify--pending-events
+                      (delete pending-event file-notify--pending-events))
+                'renamed))))
+
+      ;; Apply callback.
+      (when (and action
+                 (or
+                  ;; If there is no relative file name for that watch,
+                  ;; we watch the whole directory.
+                  (null (nth 1 registered))
+                  ;; File matches.
+                  (string-equal
+                   (nth 1 registered) (file-name-nondirectory file))
+                  ;; File1 matches.
+                  (and (stringp file1)
+                       (string-equal
+                        (nth 1 registered) (file-name-nondirectory file1)))))
+        (if file1
+            (funcall callback (list desc action file file1))
+          (funcall callback (list desc action file)))))))
+
+(defun file-notify-add-watch (file flags callback)
+  "Add a watch for filesystem events pertaining to FILE.
+This arranges for filesystem events pertaining to FILE to be reported
+to Emacs.  Use `file-notify-rm-watch' to cancel the watch.
+
+The returned value is a descriptor for the added watch.  If the
+file cannot be watched for some reason, this function signals a
+`file-notify-error' error.
+
+FLAGS is a list of conditions to set what will be watched for.  It can
+include the following symbols:
+
+  `change'           -- watch for file changes
+  `attribute-change' -- watch for file attributes changes, like
+                        permissions or modification time
+
+If FILE is a directory, 'change' watches for file creation or
+deletion in that directory.
+
+When any event happens, Emacs will call the CALLBACK function passing
+it a single argument EVENT, which is of the form
+
+  (DESCRIPTOR ACTION FILE [FILE1])
+
+DESCRIPTOR is the same object as the one returned by this function.
+ACTION is the description of the event.  It could be any one of the
+following:
+
+  `created'           -- FILE was created
+  `deleted'           -- FILE was deleted
+  `changed'           -- FILE has changed
+  `renamed'           -- FILE has been renamed to FILE1
+  `attribute-changed' -- a FILE attribute was changed
+
+FILE is the name of the file whose event is being reported."
+  ;; Check arguments.
+  (unless (stringp file)
+    (signal 'wrong-type-argument (list file)))
+  (setq file (expand-file-name file))
+  (unless (and (consp flags)
+               (null (delq 'change (delq 'attribute-change (copy-tree flags)))))
+    (signal 'wrong-type-argument (list flags)))
+  (unless (functionp callback)
+    (signal 'wrong-type-argument (list callback)))
+
+  (let* ((handler (find-file-name-handler file 'file-notify-add-watch))
+         (dir (directory-file-name
+               (if (or (and (not handler) (eq file-notify-support 'w32notify))
+                       (file-directory-p file))
+                   file
+                 (file-name-directory file))))
+        desc func l-flags)
+
+    ;; Check, whether this has been registered already.
+;    (maphash
+;     (lambda (key value)
+;       (when (equal (cons file callback) value) (setq desc key)))
+;     file-notify-descriptors)
+
+    (unless desc
+      (if handler
+          ;; A file name handler could exist even if there is no local
+          ;; file notification support.
+          (setq desc (funcall
+                      handler 'file-notify-add-watch dir flags callback))
+
+        ;; Check, whether Emacs has been compiled with file
+        ;; notification support.
+        (unless file-notify-support
+          (signal 'file-notify-error
+                  '("No file notification package available")))
+
+        ;; Determine low-level function to be called.
+        (setq func (cond
+                    ((eq file-notify-support 'gfilenotify) 'gfile-add-watch)
+                    ((eq file-notify-support 'inotify) 'inotify-add-watch)
+                    ((eq file-notify-support 'w32notify) 'w32notify-add-watch)))
+
+        ;; Determine respective flags.
+        (if (eq file-notify-support 'gfilenotify)
+            (setq l-flags '(watch-mounts send-moved))
+          (when (memq 'change flags)
+            (setq
+             l-flags
+             (cond
+              ((eq file-notify-support 'inotify) '(create modify move delete))
+              ((eq file-notify-support 'w32notify)
+               '(file-name directory-name size last-write-time)))))
+          (when (memq 'attribute-change flags)
+            (add-to-list
+             'l-flags
+             (cond
+              ((eq file-notify-support 'inotify) 'attrib)
+              ((eq file-notify-support 'w32notify) 'attributes)))))
+
+        ;; Call low-level function.
+        (setq desc (funcall func dir l-flags 'file-notify-callback))))
+
+    ;; Return descriptor.
+    (puthash desc
+             (list (directory-file-name
+                    (if (file-directory-p dir) dir (file-name-directory dir)))
+                   (unless (file-directory-p file)
+                     (file-name-nondirectory file))
+                   callback)
+             file-notify-descriptors)
+    desc))
+
+(defun file-notify-rm-watch (descriptor)
+  "Remove an existing watch specified by its DESCRIPTOR.
+DESCRIPTOR should be an object returned by `file-notify-add-watch'."
+  (let ((file (car (gethash descriptor file-notify-descriptors)))
+        handler)
+
+    (when (stringp file)
+      (setq handler (find-file-name-handler file 'file-notify-rm-watch))
+      (if handler
+          (funcall handler 'file-notify-rm-watch descriptor)
+        (funcall
+         (cond
+          ((eq file-notify-support 'gfilenotify) 'gfile-rm-watch)
+          ((eq file-notify-support 'inotify) 'inotify-rm-watch)
+          ((eq file-notify-support 'w32notify) 'w32notify-rm-watch))
+         descriptor)))
+
+    (remhash descriptor file-notify-descriptors)))
+
+;; The end:
+(provide 'filenotify)
+
+;;; filenotify.el ends here
diff --git a/lisp/files.el b/lisp/files.el
index e59a9acb7b9..ff4ccec2279 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -316,6 +316,7 @@ A value of nil means don't add newlines.
 
 Certain major modes set this locally to the value obtained
 from `mode-require-final-newline'."
+  :safe #'symbolp
   :type '(choice (const :tag "When visiting" visit)
                  (const :tag "When saving" t)
                  (const :tag "When visiting or saving" visit-save)
@@ -3878,6 +3879,10 @@ Interactively, confirmation is required unless you supply a prefix argument."
                                     (or buffer-file-name (buffer-name))))))
         (and confirm
              (file-exists-p filename)
+             ;; NS does its own confirm dialog.
+             (not (and (eq (framep-on-display) 'ns)
+                       (listp last-nonmenu-event)
+                       use-dialog-box))
              (or (y-or-n-p (format "File `%s' exists; overwrite? " filename))
                  (error "Canceled")))
         (set-visited-file-name filename (not confirm))))
@@ -4912,6 +4917,11 @@ change the additional actions you can take on files."
                      (length autosaved-buffers)
                      (mapconcat 'identity autosaved-buffers ", "))))))))
 
+(defun clear-visited-file-modtime ()
+  "Clear out records of last mod time of visited file.
+Next attempt to save will certainly not complain of a discrepancy."
+  (set-visited-file-modtime 0))
+
 (defun not-modified (&optional arg)
   "Mark current buffer as unmodified, not needing to be saved.
 With prefix ARG, mark buffer as modified, so \\[save-buffer] will save.
diff --git a/lisp/filesets.el b/lisp/filesets.el
index 978512bd3a4..fbf28dbecbc 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -149,7 +149,7 @@ is loaded before custom.el, set this variable to t.")
 (defun filesets-filter-list (lst cond-fn)
   "Remove all elements not conforming to COND-FN from list LST.
 COND-FN takes one argument: the current element."
-;  (remove* 'dummy lst :test (lambda (dummy elt)
+;  (cl-remove 'dummy lst :test (lambda (dummy elt)
 ;                             (not (funcall cond-fn elt)))))
   (let ((rv nil))
     (dolist (elt lst rv)
@@ -175,7 +175,7 @@ Like `some', return the first value of FSS-PRED that is non-nil."
       (let ((fss-rv (funcall fss-pred fss-this)))
         (when fss-rv
           (throw 'exit fss-rv))))))
-;(fset 'filesets-some 'some) ;; or use the cl function
+;(fset 'filesets-some 'cl-some) ;; or use the cl function
 
 (defun filesets-member (fsm-item fsm-lst &rest fsm-keys)
   "Find the first occurrence of FSM-ITEM in FSM-LST.
@@ -186,7 +186,7 @@ key is supported."
     (filesets-ormap (lambda (fsm-this)
                       (funcall fsm-test fsm-item fsm-this))
                     fsm-lst)))
-;(fset 'filesets-member 'member*) ;; or use the cl function
+;(fset 'filesets-member 'cl-member) ;; or use the cl function
 
 (defun filesets-sublist (lst beg &optional end)
   "Get the sublist of LST from BEG to END - 1."
diff --git a/lisp/frame.el b/lisp/frame.el
index 0f8fc523a1b..3ac24a509a0 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1365,7 +1365,11 @@ frame's display)."
 
 (defun display-pixel-height (&optional display)
   "Return the height of DISPLAY's screen in pixels.
-For character terminals, each character counts as a single pixel."
+For character terminals, each character counts as a single pixel.
+For graphical terminals, note that on \"multi-monitor\" setups this
+refers to the pixel height for all physical monitors associated
+with DISPLAY.  To get information for each physical monitor, use
+`display-monitor-attributes-list'."
   (let ((frame-type (framep-on-display display)))
     (cond
      ((memq frame-type '(x w32 ns))
@@ -1377,7 +1381,11 @@ For character terminals, each character counts as a single pixel."
 
 (defun display-pixel-width (&optional display)
   "Return the width of DISPLAY's screen in pixels.
-For character terminals, each character counts as a single pixel."
+For character terminals, each character counts as a single pixel.
+For graphical terminals, note that on \"multi-monitor\" setups this
+refers to the pixel width for all physical monitors associated
+with DISPLAY.  To get information for each physical monitor, use
+`display-monitor-attributes-list'."
   (let ((frame-type (framep-on-display display)))
     (cond
      ((memq frame-type '(x w32 ns))
@@ -1408,7 +1416,11 @@ displays not explicitly specified."
 (defun display-mm-height (&optional display)
   "Return the height of DISPLAY's screen in millimeters.
 System values can be overridden by `display-mm-dimensions-alist'.
-If the information is unavailable, value is nil."
+If the information is unavailable, value is nil.
+For graphical terminals, note that on \"multi-monitor\" setups this
+refers to the height in millimeters for all physical monitors
+associated with DISPLAY.  To get information for each physical
+monitor, use `display-monitor-attributes-list'."
   (and (memq (framep-on-display display) '(x w32 ns))
        (or (cddr (assoc (or display (frame-parameter nil 'display))
                         display-mm-dimensions-alist))
@@ -1420,7 +1432,11 @@ If the information is unavailable, value is nil."
 (defun display-mm-width (&optional display)
   "Return the width of DISPLAY's screen in millimeters.
 System values can be overridden by `display-mm-dimensions-alist'.
-If the information is unavailable, value is nil."
+If the information is unavailable, value is nil.
+For graphical terminals, note that on \"multi-monitor\" setups this
+refers to the width in millimeters for all physical monitors
+associated with DISPLAY.  To get information for each physical
+monitor, use `display-monitor-attributes-list'."
   (and (memq (framep-on-display display) '(x w32 ns))
        (or (cadr (assoc (or display (frame-parameter nil 'display))
                         display-mm-dimensions-alist))
@@ -1495,6 +1511,8 @@ The value is one of the symbols `static-gray', `gray-scale',
 
 (declare-function x-display-monitor-attributes-list "xfns.c"
                   (&optional terminal))
+(declare-function w32-display-monitor-attributes-list "w32fns.c"
+                  (&optional display))
 (declare-function ns-display-monitor-attributes-list "nsfns.m"
                   (&optional terminal))
 
@@ -1530,6 +1548,8 @@ monitors."
     (cond
      ((eq frame-type 'x)
       (x-display-monitor-attributes-list display))
+     ((eq frame-type 'w32)
+      (w32-display-monitor-attributes-list display))
      ((eq frame-type 'ns)
       (ns-display-monitor-attributes-list display))
      (t
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 49b45380575..eade6273e95 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,58 @@
+2013-07-10  David Engster  <deng@randomsample.de>
+
+        * gnus-start.el (gnus-clean-old-newsrc): Always remove 'unexist' marks
+        if `gnus-newsrc-file-version' does not match `gnus-version'.  This
+        fixes a bug in Emacs trunk where the 'unexist' marks were always
+        removed at startup because "Gnus v5.13" was considered smaller than "Ma
+        Gnus v0.03".
+
+2013-07-10  Tassilo Horn  <tsdh@gnu.org>
+
+        * gnus.el (gnus-summary-line-format): Reference
+        `gnus-user-date-format-alist' for the &user-date; format, not
+        `gnus-summary-user-date-format-alist'.
+
+2013-07-08  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * nnml.el (nnml-request-compact-group): Don't bug out if we can't
+        delete files (bug#13481).
+
+2013-07-08  Tassilo Horn  <tsdh@gnu.org>
+
+        * gnus-registry.el (gnus-registry-remove-extra-data): New function.
+
+2013-07-06  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-art.el (gnus-block-private-groups): Allow `global' methods to
+        display images.
+
+        * gnus.el (gnus-valid-select-methods): Mark nnrss as global.
+
+        * message.el (message-cancel-news): According to
+        <mailman.216.1372942181.12400.help-gnu-emacs@gnu.org>, "cancel" is
+        preferred over "cmsg cancel" in the Subject.
+
+        * nnir.el (nnir-engines): Note that the group specs are regexps
+        (bug#13238).
+
+        * gnus-msg.el (gnus-copy-article-buffer): If the article buffer has
+        gotten read-only text properties, ensure that those aren't heeded when
+        copying stuff over (bug#13434).
+
+        * mm-view.el (mm-inline-text-html): Don't bug out on multipart messages
+        (bug#13762).
+
+2013-07-05  David Kastrup  <dak@gnu.org>
+
+        * auth-source.el (auth-source-netrc-parse-one): Allow empty strings in
+        authinfo file again (important for blank passwords).  This had been
+        broken with 2013-06-15 change.
+
+2013-07-03  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-sum.el (gnus-summary-from-or-to-or-newsgroups):
+        Revert 2013-01-14 change.
+
 2013-07-02  David Engster  <deng@randomsample.de>
 
         * gnus-sum.el (gnus-update-marks): Do not remove empty 'unexist'
@@ -88,7 +143,7 @@
 2013-07-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnus-sum.el (gnus-summary-insert-old-articles):
-        Don't include unexistent messages.
+        Don't include unexisting messages.
 
 2013-07-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el
index 8cef741cda2..54429b5cfda 100644
--- a/lisp/gnus/auth-source.el
+++ b/lisp/gnus/auth-source.el
@@ -1048,8 +1048,8 @@ Note that the MAX parameter is used so we can exit the parse early."
   "Read one thing from the current buffer."
   (auth-source-netrc-parse-next-interesting)
 
-  (when (or (looking-at "'\\([^']+\\)'")
-            (looking-at "\"\\([^\"]+\\)\"")
+  (when (or (looking-at "'\\([^']*\\)'")
+            (looking-at "\"\\([^\"]*\\)\"")
             (looking-at "\\([^ \t\n]+\\)"))
     (forward-char (length (match-string 0)))
     (auth-source-netrc-parse-next-interesting)
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 5840aacd7a3..b41ff9c0550 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -6947,7 +6947,8 @@ If given a prefix, show the hidden text instead."
           (set-buffer buf))))))
 
 (defun gnus-block-private-groups (group)
-  (if (gnus-news-group-p group)
+  (if (or (gnus-news-group-p group)
+          (gnus-member-of-valid 'global group))
       ;; Block nothing in news groups.
       nil
     ;; Block everything anywhere else.
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index fce9a3633c2..e3f18662af4 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -920,6 +920,7 @@ header line with the old Message-ID."
       (with-current-buffer article-buffer
         (let ((gnus-newsgroup-charset (or gnus-article-charset
                                           gnus-newsgroup-charset))
+              (inhibit-read-only t)
               (gnus-newsgroup-ignored-charsets
                (or gnus-article-ignored-charsets
                    gnus-newsgroup-ignored-charsets)))
diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el
index 5a7dfd82d28..6f2fe78c3d8 100644
--- a/lisp/gnus/gnus-registry.el
+++ b/lisp/gnus/gnus-registry.el
@@ -1186,6 +1186,29 @@ data stored in the registry."
                   (gnus-select-group-with-message-id group message-id) t)
               (throw 'found t))))))))
 
+(defun gnus-registry-remove-extra-data (extra)
+  "Remove tracked EXTRA data from the gnus registry.
+EXTRA is a list of symbols.  Valid symbols are those contained in
+the docs of `gnus-registry-track-extra'.  This command is useful
+when you stop tracking some extra data and now want to purge it
+from your existing entries."
+  (interactive (list (mapcar 'intern
+                             (completing-read-multiple
+                              "Extra data: "
+                              '("subject" "sender" "recipient")))))
+  (when extra
+    (let ((db gnus-registry-db))
+      (registry-reindex db)
+      (loop for k being the hash-keys of (oref db :data)
+            using (hash-value v)
+            do (let ((newv (delq nil (mapcar #'(lambda (entry)
+                                                 (unless (member (car entry) extra)
+                                                   entry))
+                                             v))))
+                 (registry-delete db (list k) nil)
+                 (gnus-registry-insert db k newv)))
+      (registry-reindex db))))
+
 ;; TODO: a few things
 
 (provide 'gnus-registry)
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 084af884930..94803800e0b 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -2314,8 +2314,9 @@ If FORCE is non-nil, the .newsrc file is read."
           (gnus-info-set-marks
            info (delete exist (gnus-info-marks info))))))
     (when (or force
-              (< (gnus-continuum-version gnus-newsrc-file-version)
-                 (gnus-continuum-version "Ma Gnus v0.03")))
+              (not (string= gnus-newsrc-file-version gnus-version)))
+      (message (concat "Removing unexist marks because newsrc "
+                       "version does not match Gnus version."))
       ;; Remove old `exist' marks from old nnimap groups.
       (dolist (info (cdr gnus-newsrc-alist))
         (let ((exist (assoc 'unexist (gnus-info-marks info))))
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index e136d4f8173..f3918b0a215 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -1525,7 +1525,7 @@ This list will always be a subset of gnus-newsgroup-undownloaded.")
   "Range of seen articles in the current newsgroup.")
 
 (defvar gnus-newsgroup-unexist nil
-  "Range of unexistent articles in the current newsgroup.")
+  "Range of unexisting articles in the current newsgroup.")
 
 (defvar gnus-newsgroup-articles nil
   "List of articles in the current newsgroup.")
@@ -3657,18 +3657,17 @@ 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 from)
+(defun gnus-summary-from-or-to-or-newsgroups (header gnus-tmp-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))
-        (address (cadr (gnus-extract-address-components from))))
+        (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)))
     (or
      (and ignored-from-addresses
-          (string-match ignored-from-addresses address)
+          (string-match ignored-from-addresses gnus-tmp-from)
           (let ((extra-headers (mail-header-extra header))
                 to
                 newsgroups)
@@ -3683,11 +3682,13 @@ buffer that was in action when the last article was fetched."
                      (cdr (assq 'Newsgroups extra-headers))
                      (and
                       (memq 'Newsgroups gnus-extra-headers)
-                      (eq (car (gnus-find-method-for-group
-                                gnus-newsgroup-name)) 'nntp)
+                      (eq (car (gnus-find-method-for-group
+                                gnus-newsgroup-name)) 'nntp)
                       (gnus-group-real-name gnus-newsgroup-name))))
               (concat gnus-summary-newsgroup-prefix newsgroups)))))
-     (gnus-string-mark-left-to-right (gnus-summary-extract-address-component from)))))
+     (gnus-string-mark-left-to-right
+      (inline
+        (gnus-summary-extract-address-component gnus-tmp-from))))))
 
 (defun gnus-summary-insert-line (gnus-tmp-header
                                  gnus-tmp-level gnus-tmp-current
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 9a927a1cfab..8741a03b54d 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -1628,7 +1628,7 @@ slower."
     ("nnfolder" mail respool address)
     ("nngateway" post-mail address prompt-address physical-address)
     ("nnweb" none)
-    ("nnrss" none)
+    ("nnrss" none global)
     ("nnagent" post-mail)
     ("nnimap" post-mail address prompt-address physical-address respool
      server-marks)
@@ -3007,7 +3007,7 @@ with some simple extensions.
             summary just like information from any other summary
             specifier.
 &user-date; Age sensitive date format. Various date format is
-            defined in `gnus-summary-user-date-format-alist'.
+            defined in `gnus-user-date-format-alist'.
 
 
 The %U (status), %R (replied) and %z (zcore) specs have to be handled
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index c6f5d904677..b35eb9dca12 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -7145,7 +7145,7 @@ If ARG, allow editing of the cancellation message."
         (erase-buffer)
         (insert "Newsgroups: " newsgroups "\n"
                 "From: " from "\n"
-                "Subject: cmsg cancel " message-id "\n"
+                "Subject: cancel " message-id "\n"
                 "Control: cancel " message-id "\n"
                 (if distribution
                     (concat "Distribution: " distribution "\n")
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index b1cba27c335..9512a411d81 100644
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -419,16 +419,18 @@
        (buffer-string)))))
 
 (defun mm-inline-text-html (handle)
-  (let* ((func mm-text-html-renderer)
-         (entry (assq func mm-text-html-renderer-alist))
-         (inhibit-read-only t))
-    (if entry
-        (setq func (cdr entry)))
-    (cond
-     ((functionp func)
-      (funcall func handle))
-     (t
-      (apply (car func) handle (cdr func))))))
+  (if (stringp (car handle))
+      (mapcar 'mm-inline-text-html (cdr handle))
+    (let* ((func mm-text-html-renderer)
+           (entry (assq func mm-text-html-renderer-alist))
+           (inhibit-read-only t))
+      (if entry
+          (setq func (cdr entry)))
+      (cond
+       ((functionp func)
+        (funcall func handle))
+       (t
+        (apply (car func) handle (cdr func)))))))
 
 (defun mm-inline-text-vcard (handle)
   (let ((inhibit-read-only t))
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index 22dee30e8fa..4dd123bf2c7 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -548,15 +548,15 @@ that it is for notmuch, not Namazu."
     (gmane   nnir-run-gmane
              ((gmane-author . "Gmane Author: ")))
     (swish++ nnir-run-swish++
-             ((swish++-group . "Swish++ Group spec: ")))
+             ((swish++-group . "Swish++ Group spec (regexp): ")))
     (swish-e nnir-run-swish-e
-             ((swish-e-group . "Swish-e Group spec: ")))
+             ((swish-e-group . "Swish-e Group spec (regexp): ")))
     (namazu  nnir-run-namazu
              ())
     (notmuch nnir-run-notmuch
              ())
     (hyrex   nnir-run-hyrex
-             ((hyrex-group . "Hyrex Group spec: ")))
+             ((hyrex-group . "Hyrex Group spec (regexp): ")))
     (find-grep nnir-run-find-grep
                ((grep-options . "Grep options: "))))
   "Alist of supported search engines.
diff --git a/lisp/gnus/nnml.el b/lisp/gnus/nnml.el
index 64e1ee11977..05d0c902340 100644
--- a/lisp/gnus/nnml.el
+++ b/lisp/gnus/nnml.el
@@ -1094,7 +1094,10 @@ Use the nov database for the current group if available."
                        (concat group ":" new-number-string)))
                     ;; Save to the new file:
                     (nnmail-write-region (point-min) (point-max) newfile))
-                  (funcall nnmail-delete-file-function oldfile))
+                  (condition-case ()
+                      (funcall nnmail-delete-file-function oldfile)
+                    (file-error
+                     (message "Couldn't delete %s" oldfile))))
                 ;; 2/ Update all marks for this article:
                 ;; #### NOTE: it is possible that the new article number
                 ;; #### already belongs to a range, whereas the corresponding
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 8f7d584d00b..a4f18201a3f 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -462,6 +462,7 @@ directory, like `default-directory'."
     (define-key map (kbd "M-g") 'ibuffer-jump-to-buffer)
     (define-key map (kbd "M-s a C-s") 'ibuffer-do-isearch)
     (define-key map (kbd "M-s a M-C-s") 'ibuffer-do-isearch-regexp)
+    (define-key map (kbd "M-s a C-o") 'ibuffer-do-occur)
     (define-key map (kbd "DEL") 'ibuffer-unmark-backward)
     (define-key map (kbd "M-DEL") 'ibuffer-unmark-all)
     (define-key map (kbd "* *") 'ibuffer-unmark-all)
diff --git a/lisp/ido.el b/lisp/ido.el
index 4a4ecdcdb1a..43a0cc0a665 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -782,21 +782,29 @@ remaining completion.  If absent, elements 5 and 6 are used instead."
   :group 'ido)
 
 (defcustom ido-use-virtual-buffers nil
-  "If non-nil, refer to past buffers as well as existing ones.
+  "Specify how virtual buffers should be used.
+The value can be one of the following:
+
+  nil:  No virtual buffers are used.
+  auto: Use virtual bufferw when the current input matches no
+        existing buffers.
+  t:    Always use virtual buffers.
+
 Essentially it works as follows: Say you are visiting a file and
 the buffer gets cleaned up by midnight.el.  Later, you want to
-switch to that buffer, but find it's no longer open.  With
-virtual buffers enabled, the buffer name stays in the buffer
-list (using the `ido-virtual' face, and always at the end), and if
-you select it, it opens the file back up again.  This allows you
-to think less about whether recently opened files are still open
-or not.  Most of the time you can quit Emacs, restart, and then
-switch to a file buffer that was previously open as if it still
-were.
-    This feature relies upon the `recentf' package, which will be
-enabled if this variable is configured to a non-nil value."
-  :version "24.1"
-  :type 'boolean
+switch to that buffer, but find it's no longer open.  With virtual
+buffers enabled, the buffer name stays in the buffer list (using
+the `ido-virtual' face, and always at the end), and if you select
+it, it opens the file back up again.  This allows you to think
+less about whether recently opened files are still open or not.
+Most of the time you can quit Emacs, restart, and then switch to
+a file buffer that was previously open as if it still were.  This
+feature relies upon the `recentf' package, which will be enabled
+if this variable is configured to a non-nil value."
+  :version "24.4"
+  :type '(choice (const :tag "Always" t)
+                 (const :tag "Automatic" auto)
+                 (const :tag "Never" nil))
   :group 'ido)
 
 (defcustom ido-use-faces t
@@ -1103,6 +1111,9 @@ Only used if `ido-use-virtual-buffers' is non-nil.")
 ;; Don't process ido-ignore- lists once.
 (defvar ido-process-ignore-lists-inhibit)
 
+;; Is ido using virtual buffers?
+(defvar ido-enable-virtual-buffers)
+
 ;; Buffer from which ido was entered.
 (defvar ido-entry-buffer)
 
@@ -2202,7 +2213,8 @@ If cursor is not at the end of the user input, move to end of input."
            (ido-current-directory nil)
            (ido-directory-nonreadable nil)
            (ido-directory-too-big nil)
-           (ido-use-virtual-buffers ido-use-virtual-buffers)
+           (ido-enable-virtual-buffers (and ido-use-virtual-buffers
+                                            (not (eq ido-use-virtual-buffers 'auto))))
            (require-match (confirm-nonexistent-file-or-buffer))
            (buf (ido-read-internal 'buffer (or prompt "Buffer: ") 'ido-buffer-history default
                                    require-match initial))
@@ -2243,7 +2255,8 @@ If cursor is not at the end of the user input, move to end of input."
           (ido-visit-buffer buf method t)))
 
        ;; check for a virtual buffer reference
-       ((and ido-use-virtual-buffers ido-virtual-buffers
+       ((and ido-enable-virtual-buffers
+             ido-virtual-buffers
              (setq filename (assoc buf ido-virtual-buffers)))
         (ido-visit-buffer (find-file-noselect (cdr filename)) method t))
 
@@ -2734,7 +2747,11 @@ C-x C-f ... C-d  enter `dired' on current directory."
 See `ido-use-virtual-buffers' for explanation of virtual buffer."
   (interactive)
   (when (and ido-mode (eq ido-cur-item 'buffer))
-    (setq ido-use-virtual-buffers (not ido-use-virtual-buffers))
+    (setq ido-enable-virtual-buffers
+          (if ido-enable-virtual-buffers
+              nil
+            ;; Use `always' instead of t for `ido-exhibit'.
+            'always))
     (setq ido-text-init ido-text)
     (setq ido-exit 'refresh)
     (exit-minibuffer)))
@@ -3427,9 +3444,9 @@ it is put to the start of the list."
         (nconc ido-temp-list ido-current-buffers)
       (setq ido-temp-list ido-current-buffers))
     (if default
-        (setq ido-temp-list
-              (cons default (delete default ido-temp-list))))
-    (if ido-use-virtual-buffers
+        (setq ido-temp-list
+              (cons default (delete default ido-temp-list))))
+    (if (bound-and-true-p ido-enable-virtual-buffers)
         (ido-add-virtual-buffers-to-list))
     (run-hooks 'ido-make-buffer-list-hook)
     ido-temp-list))
@@ -3444,8 +3461,14 @@ This is to make them appear as if they were \"virtual buffers\"."
   (setq ido-virtual-buffers nil)
   (let (name)
     (dolist (head recentf-list)
-      (and (setq name (file-name-nondirectory head))
-           (null (get-file-buffer head))
+      (setq name (file-name-nondirectory head))
+      ;; In case HEAD is a directory with trailing /.  See bug#14552.
+      (when (equal name "")
+        (setq name (file-name-nondirectory (directory-file-name head))))
+      (when (equal name "")
+        (setq name head))
+      (and (not (equal name ""))
+           (null (get-file-buffer head))
            (not (assoc name ido-virtual-buffers))
            (not (member name ido-temp-list))
            (not (ido-ignore-item-p name ido-ignore-buffers))
@@ -3986,6 +4009,7 @@ If cursor is not at the end of the user input, delete to end of input."
 ;;; DELETE CURRENT FILE
 (defun ido-delete-file-at-head ()
   "Delete the file at the head of `ido-matches'.
+Trash the file if `delete-by-moving-to-trash' is non-nil.
 If cursor is not at the end of the user input, delete to end of input."
   (interactive)
   (if (not (eobp))
@@ -3998,8 +4022,9 @@ If cursor is not at the end of the user input, delete to end of input."
                  (file-exists-p file)
                  (not (file-directory-p file))
                  (file-writable-p ido-current-directory)
-                 (yes-or-no-p (concat "Delete " file "? ")))
-        (delete-file file)
+                 (or delete-by-moving-to-trash
+                     (yes-or-no-p (concat "Delete " file "? "))))
+        (delete-file file 'trash)
         ;; Check if file still exists.
         (if (file-exists-p file)
             ;; file could not be deleted
@@ -4457,11 +4482,6 @@ For details of keybindings, see `ido-find-file'."
           (setq ido-exit 'refresh)
           (exit-minibuffer))
 
-        ;; Update the list of matches
-        (setq ido-text contents)
-        (ido-set-matches)
-        (ido-trace "new    " ido-matches)
-
         (when (and ido-enter-matching-directory
                    ido-matches
                    (or (eq ido-enter-matching-directory 'first)
@@ -4475,6 +4495,32 @@ For details of keybindings, see `ido-find-file'."
           (setq ido-exit 'refresh)
           (exit-minibuffer))
 
+        ;; Update the list of matches
+        (setq ido-text contents)
+        (ido-set-matches)
+        (ido-trace "new    " ido-matches)
+
+        (when (and (boundp 'ido-enable-virtual-buffers)
+                   (not (eq ido-enable-virtual-buffers 'always))
+                   (eq ido-cur-item 'buffer)
+                   (eq ido-use-virtual-buffers 'auto))
+
+          (when (and (not ido-enable-virtual-buffers)
+                     (not ido-matches))
+            (setq ido-text-init ido-text)
+            (setq ido-enable-virtual-buffers t)
+            (setq ido-exit 'refresh)
+            (exit-minibuffer))
+
+          ;; If input matches real buffers turn off virtual buffers.
+          (when (and ido-enable-virtual-buffers
+                     ido-matches
+                     (ido-set-matches-1 (ido-make-buffer-list-1)))
+            (setq ido-enable-virtual-buffers nil)
+            (setq ido-text-init ido-text)
+            (setq ido-exit 'refresh)
+            (exit-minibuffer)))
+
         (when (and (not ido-matches)
                    (not ido-directory-nonreadable)
                    (not ido-directory-too-big)
@@ -4681,9 +4727,12 @@ Modified from `icomplete-completions'."
 
 ;;; Helper functions for other programs
 
-(put 'dired-do-rename 'ido 'ignore)
 (put 'ibuffer-find-file 'ido 'find-file)
+(put 'dired 'ido 'dir)
 (put 'dired-other-window 'ido 'dir)
+;; See http://debbugs.gnu.org/11954 for reasons.
+(put 'dired-do-copy 'ido 'ignore)
+(put 'dired-do-rename 'ido 'ignore)
 
 ;;;###autoload
 (defun ido-read-buffer (prompt &optional default require-match)
@@ -4711,18 +4760,20 @@ See `read-file-name' for additional parameters."
   (let (filename)
     (cond
      ((or (eq predicate 'file-directory-p)
-          (eq (get this-command 'ido) 'dir)
+          (eq (and (symbolp this-command)
+                   (get this-command 'ido)) 'dir)
           (memq this-command ido-read-file-name-as-directory-commands))
       (setq filename
-            (ido-read-directory-name prompt dir default-filename mustmatch initial))
-      (if (eq ido-exit 'fallback)
-          (setq filename 'fallback)))
-     ((and (not (eq (get this-command 'ido) 'ignore))
+            (ido-read-directory-name prompt dir default-filename mustmatch initial)))
+     ((and (not (eq (and (symbolp this-command)
+                         (get this-command 'ido)) 'ignore))
            (not (memq this-command ido-read-file-name-non-ido))
            (or (null predicate) (eq predicate 'file-exists-p)))
       (let* (ido-saved-vc-hb
              (ido-context-switch-command
-              (if (eq (get this-command 'ido) 'find-file) nil 'ignore))
+              (if (eq (and (symbolp this-command)
+                           (get this-command 'ido)) 'find-file)
+                  nil 'ignore))
              (vc-handled-backends (and (boundp 'vc-handled-backends) vc-handled-backends))
              (minibuffer-completing-file-name t)
              (ido-current-directory (ido-expand-directory dir))
@@ -4736,7 +4787,15 @@ See `read-file-name' for additional parameters."
              (ido-find-literal nil))
         (setq ido-exit nil)
         (setq filename
-              (ido-read-internal 'file prompt 'ido-file-history default-filename mustmatch initial))
+              (ido-read-internal 'file prompt 'ido-file-history
+                                 (cond  ; Bug#11861.
+                                  ((stringp default-filename) default-filename)
+                                  ((consp default-filename) (car default-filename))
+                                  ((and (not default-filename) initial)
+                                   (expand-file-name initial dir))
+                                  (buffer-file-name buffer-file-name))
+                                 mustmatch initial))
+        (setq dir ido-current-directory) ; See bug#1516.
         (cond
          ((eq ido-exit 'fallback)
           (setq filename 'fallback))
@@ -4768,12 +4827,21 @@ See `read-directory-name' for additional parameters."
                                      (ido-directory-too-big-p ido-current-directory)))
          (ido-work-directory-index -1)
          (ido-work-file-index -1))
-    (setq filename
-          (ido-read-internal 'dir prompt 'ido-file-history default-dirname mustmatch initial))
-    (if filename
-        (if (and (stringp filename) (string-equal filename "."))
-            ido-current-directory
-          (concat ido-current-directory filename)))))
+    (setq filename (ido-read-internal
+                    'dir prompt 'ido-file-history
+                    (or default-dirname ; Bug#11861.
+                        (if initial
+                            (expand-file-name initial ido-current-directory)
+                          ido-current-directory))
+                    mustmatch initial))
+    (cond
+     ((eq ido-exit 'fallback)
+      (let ((read-file-name-function nil))
+        (run-hook-with-args 'ido-before-fallback-functions 'read-directory-name)
+        (read-directory-name prompt ido-current-directory
+                             default-dirname mustmatch initial)))
+     ((equal filename ".") ido-current-directory)
+     (t (concat ido-current-directory filename)))))
 
 ;;;###autoload
 (defun ido-completing-read (prompt choices &optional _predicate require-match
diff --git a/lisp/info-xref.el b/lisp/info-xref.el
index c38e23bab8a..21fb592ff19 100644
--- a/lisp/info-xref.el
+++ b/lisp/info-xref.el
@@ -45,7 +45,25 @@
 ;;; Code:
 
 (require 'info)
-(eval-when-compile (require 'cl-lib)) ;; for `incf'
+(eval-when-compile (require 'cl-lib))   ; for `cl-incf'
+
+(defgroup info-xref nil
+  "Check external cross-references in Info documents."
+  :group 'docs)                         ; FIXME right parent?
+
+;; Should this even be an option?
+(defcustom info-xref-case-fold nil
+  "Non-nil means node checks should ignore case.
+When following cross-references, the Emacs Info reader first tries a
+case-sensitive match, then if that fails a case-insensitive one.
+The standalone Info reader does not do this, nor does this work
+for links in the html versions of Texinfo manuals.  Therefore
+to ensure your cross-references work on the widest range of platforms,
+you should set this variable to nil."
+  :group 'info-xref
+  :type 'boolean
+  :version "24.4")
+
 
 ;;-----------------------------------------------------------------------------
 ;; vaguely generic
@@ -204,7 +222,8 @@ buffer's line and column of point."
                   (Info-goto-node node
                                   (when (get-buffer "*info*")
                                     (set-buffer "*info*")
-                                    "xref - temporary"))
+                                    "xref - temporary")
+                                  (not info-xref-case-fold))
                   t)
               (error nil))
           (unless (equal (current-buffer) oldbuf)
diff --git a/lisp/info.el b/lisp/info.el
index f9851a0c1e8..0e0a11753ba 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -920,10 +920,14 @@ just return nil (no error)."
           (error "Info file %s does not exist" filename)))
       filename))))
 
-(defun Info-find-node (filename nodename &optional no-going-back)
+(defun Info-find-node (filename nodename &optional no-going-back strict-case)
   "Go to an Info node specified as separate FILENAME and NODENAME.
 NO-GOING-BACK is non-nil if recovering from an error in this function;
-it says do not attempt further (recursive) error recovery."
+it says do not attempt further (recursive) error recovery.
+
+This function first looks for a case-sensitive match for NODENAME;
+if none is found it then tries a case-insensitive match (unless
+STRICT-CASE is non-nil)."
   (info-initialize)
   (setq filename (Info-find-file filename))
   ;; Go into Info buffer.
@@ -933,7 +937,7 @@ it says do not attempt further (recursive) error recovery."
        Info-current-file
        (push (list Info-current-file Info-current-node (point))
              Info-history))
-  (Info-find-node-2 filename nodename no-going-back))
+  (Info-find-node-2 filename nodename no-going-back strict-case))
 
 ;;;###autoload
 (defun Info-on-current-buffer (&optional nodename)
@@ -1010,7 +1014,7 @@ which the match was found."
               (+ (point-min) (read (current-buffer)))
               major-mode)))))
 
-(defun Info-find-in-tag-table (marker regexp)
+(defun Info-find-in-tag-table (marker regexp &optional strict-case)
   "Find a node in a tag table.
 MARKER specifies the buffer and position to start searching at.
 REGEXP is a regular expression matching nodes or references.  Its first
@@ -1020,10 +1024,11 @@ FOUND-ANCHOR is non-nil if a `Ref:' was matched, POS is the position
 where the match was found, and MODE is `major-mode' of the buffer in
 which the match was found.
 This function tries to find a case-sensitive match first, then a
-case-insensitive match is tried."
+case-insensitive match is tried (unless optional argument STRICT-CASE
+is non-nil)."
   (let ((result (Info-find-in-tag-table-1 marker regexp nil)))
-    (when (null (car result))
-      (setq result (Info-find-in-tag-table-1 marker regexp t)))
+    (or strict-case (car result)
+        (setq result (Info-find-in-tag-table-1 marker regexp t)))
     result))
 
 (defun Info-find-node-in-buffer-1 (regexp case-fold)
@@ -1046,17 +1051,19 @@ Value is the position at which a match was found, or nil if not found."
                 (setq found (line-beginning-position)))))))
     found))
 
-(defun Info-find-node-in-buffer (regexp)
+(defun Info-find-node-in-buffer (regexp &optional strict-case)
   "Find a node or anchor in the current buffer.
 REGEXP is a regular expression matching nodes or references.  Its first
 group should match `Node:' or `Ref:'.
 Value is the position at which a match was found, or nil if not found.
 This function looks for a case-sensitive match first.  If none is found,
-a case-insensitive match is tried."
+a case-insensitive match is tried (unless optional argument STRICT-CASE
+is non-nil)."
   (or (Info-find-node-in-buffer-1 regexp nil)
-      (Info-find-node-in-buffer-1 regexp t)))
+      (and (not strict-case)
+           (Info-find-node-in-buffer-1 regexp t))))
 
-(defun Info-find-node-2 (filename nodename &optional no-going-back)
+(defun Info-find-node-2 (filename nodename &optional no-going-back strict-case)
   (buffer-disable-undo (current-buffer))
   (or (eq major-mode 'Info-mode)
       (Info-mode))
@@ -1167,7 +1174,7 @@ a case-insensitive match is tried."
               ;; First, search a tag table, if any
               (when (marker-position Info-tag-table-marker)
                 (let* ((m Info-tag-table-marker)
-                       (found (Info-find-in-tag-table m regexp)))
+                       (found (Info-find-in-tag-table m regexp strict-case)))
 
                   (when found
                     ;; FOUND is (ANCHOR POS MODE).
@@ -1194,7 +1201,7 @@ a case-insensitive match is tried."
               ;; buffer) to find the actual node.  First, check
               ;; whether the node is right where we are, in case the
               ;; buffer begins with a node.
-              (let ((pos (Info-find-node-in-buffer regexp)))
+              (let ((pos (Info-find-node-in-buffer regexp strict-case)))
                 (when pos
                   (goto-char pos)
                   (throw 'foo t)))
@@ -1701,7 +1708,7 @@ escaped (\\\",\\\\)."
 ;; Don't autoload this function: the correct entry point for other packages
 ;; to use is `info'.  --Stef
 ;; ;;;###autoload
-(defun Info-goto-node (nodename &optional fork)
+(defun Info-goto-node (nodename &optional fork strict-case)
   "Go to Info node named NODENAME.  Give just NODENAME or (FILENAME)NODENAME.
 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
@@ -1711,7 +1718,11 @@ 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."
+If FORK is a string, it is the name to use for the new buffer.
+
+This function first looks for a case-sensitive match for the node part
+of NODENAME; if none is found it then tries a case-insensitive match
+\(unless STRICT-CASE is non-nil)."
   (interactive (list (Info-read-node-name "Go to node: ") current-prefix-arg))
   (info-initialize)
   (if fork
@@ -1730,7 +1741,7 @@ If FORK is a string, it is the name to use for the new buffer."
       (if trim (setq nodename (substring nodename 0 trim))))
     (if transient-mark-mode (deactivate-mark))
     (Info-find-node (if (equal filename "") nil filename)
-                    (if (equal nodename "") "Top" nodename))))
+                    (if (equal nodename "") "Top" nodename) nil strict-case)))
 
 (defvar Info-read-node-completion-table)
 
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 3577e0e9152..28542835a5f 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -672,7 +672,7 @@ is unsuitable for the top-level media type \"text\".
 
 VALUE must be a list of symbols that control the ISO-2022 converter.
 Each must be a member of the list `coding-system-iso-2022-flags'
-\(which see).  This attribute has a meaning only when `:coding-type'
+\(which see).  This attribute is meaningful only when `:coding-type'
 is `iso-2022'.
 
 `:designation'
@@ -692,7 +692,7 @@ to GN.  If the list contains 96, any charsets whose whose ranges are
 96 long can be designated to GN.  If the first element is a charset,
 that charset is initially designated to GN.
 
-This attribute has a meaning only when `:coding-type' is `iso-2022'.
+This attribute is meaningful only when `:coding-type' is `iso-2022'.
 
 `:bom'
 
@@ -712,7 +712,7 @@ are 0xFF 0xFE, use the cdr part coding system of the value.
 Otherwise, treat them as bytes for a normal character.  On encoding,
 produce BOM bytes according to the value of `:endian'.
 
-This attribute has a meaning only when `:coding-type' is `utf-16' or
+This attribute is meaningful only when `:coding-type' is `utf-16' or
 `utf-8'.
 
 `:endian'
@@ -720,37 +720,37 @@ This attribute has a meaning only when `:coding-type' is `utf-16' or
 VALUE must be `big' or `little' specifying big-endian and
 little-endian respectively.  The default value is `big'.
 
-This attribute has a meaning only when `:coding-type' is `utf-16'.
+This attribute is meaningful only when `:coding-type' is `utf-16'.
 
 `:ccl-decoder'
 
 VALUE is a symbol representing the registered CCL program used for
-decoding.  This attribute has a meaning only when `:coding-type' is
+decoding.  This attribute is meaningful only when `:coding-type' is
 `ccl'.
 
 `:ccl-encoder'
 
 VALUE is a symbol representing the registered CCL program used for
-encoding.  This attribute has a meaning only when `:coding-type' is
+encoding.  This attribute is meaningful only when `:coding-type' is
 `ccl'.
 
-:inhibit-null-byte-detection
+`:inhibit-null-byte-detection'
 
 VALUE non-nil means Emacs ignore null bytes on code detection.
 See the variable `inhibit-null-byte-detection'.  This attribute
-has a meaning only when `:coding-type' is `undecided'.
+is meaningful only when `:coding-type' is `undecided'.
 
-:inhibit-iso-escape-detection
+`:inhibit-iso-escape-detection'
 
 VALUE non-nil means Emacs ignores ISO-2022 escape sequences on
 code detection.  See the variable `inhibit-iso-escape-detection'.
-This attribute has a meaning only when `:coding-type' is
+This attribute is meaningful only when `:coding-type' is
 `undecided'.
 
-:prefer-utf-8
+`:prefer-utf-8'
 
 VALUE non-nil means Emacs prefers UTF-8 on code detection for
-non-ASCII files.  This attribute has a meaning only when
+non-ASCII files.  This attribute is meaningful only when
 `:coding-type' is `undecided'."
   (let* ((common-attrs (mapcar 'list
                                '(:mnemonic
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index bdc30bc9292..4506ede8722 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -145,6 +145,7 @@ cid: URL as the argument.")
     (define-key map [follow-link] 'mouse-face)
     (define-key map "I" 'shr-insert-image)
     (define-key map "w" 'shr-copy-url)
+    (define-key map "u" 'shr-copy-url)
     (define-key map "v" 'shr-browse-url)
     (define-key map "o" 'shr-save-contents)
     (define-key map "\r" 'shr-browse-url)
diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el
index 4c6141fe42b..f7f570590c8 100644
--- a/lisp/net/tramp-cache.el
+++ b/lisp/net/tramp-cache.el
@@ -38,9 +38,11 @@
 ;;
 ;; - localname is a string.  This are temporary properties, which are
 ;;   related to the file localname is referring to.  Examples:
-;;   "file-exists-p" is t or nile, depending on the file existence, or
+;;   "file-exists-p" is t or nil, depending on the file existence, or
 ;;   "file-attributes" caches the result of the function
-;;  `file-attributes'.
+;;   `file-attributes'.  These entries have a timestamp, and they
+;;   expire after `remote-file-name-inhibit-cache' seconds if this
+;;   variable is set.
 ;;
 ;; - The key is a process.  This are temporary properties related to
 ;;   an open connection.  Examples: "scripts" keeps shell script
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index 6ba055b8bb8..c2fdc0491b6 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -1539,7 +1539,8 @@ connection if a previous connection has died for some reason."
         ;; indicated by the "mounted" signal, i.e. the "fuse-mountpoint"
         ;; file property.
         (with-timeout
-            (60
+            ((or (tramp-get-method-parameter method 'tramp-connection-timeout)
+                 tramp-connection-timeout)
              (if (zerop (length (tramp-file-name-user vec)))
                  (tramp-error
                   vec 'file-error
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 387084a807b..281f497692d 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -222,21 +222,24 @@ detected as prompt when being sent on echoing hosts, therefore.")
     (tramp-login-program        "su")
     (tramp-login-args           (("-") ("%u")))
     (tramp-remote-shell         "/bin/sh")
-    (tramp-remote-shell-args    ("-c"))))
+    (tramp-remote-shell-args    ("-c"))
+    (tramp-connection-timeout   10)))
 ;;;###tramp-autoload
 (add-to-list 'tramp-methods
   '("sudo"
     (tramp-login-program        "sudo")
     (tramp-login-args           (("-u" "%u") ("-s") ("-H") ("-p" "Password:")))
     (tramp-remote-shell         "/bin/sh")
-    (tramp-remote-shell-args    ("-c"))))
+    (tramp-remote-shell-args    ("-c"))
+    (tramp-connection-timeout   10)))
 ;;;###tramp-autoload
 (add-to-list 'tramp-methods
   '("ksu"
     (tramp-login-program        "ksu")
     (tramp-login-args           (("%u") ("-q")))
     (tramp-remote-shell         "/bin/sh")
-    (tramp-remote-shell-args    ("-c"))))
+    (tramp-remote-shell-args    ("-c"))
+    (tramp-connection-timeout   10)))
 ;;;###tramp-autoload
 (add-to-list 'tramp-methods
   '("krlogin"
@@ -862,7 +865,9 @@ of command line.")
     (set-file-selinux-context . tramp-sh-handle-set-file-selinux-context)
     (file-acl . tramp-sh-handle-file-acl)
     (set-file-acl . tramp-sh-handle-set-file-acl)
-    (vc-registered . tramp-sh-handle-vc-registered))
+    (vc-registered . tramp-sh-handle-vc-registered)
+    (file-notify-add-watch . tramp-sh-handle-file-notify-add-watch)
+    (file-notify-rm-watch . tramp-sh-handle-file-notify-rm-watch))
   "Alist of handler functions.
 Operations not mentioned here will be handled by the normal Emacs functions.")
 
@@ -2669,7 +2674,7 @@ the result will be a local, non-Tramp, filename."
   (unless (memq (process-status proc) '(run open))
     (let ((vec (tramp-get-connection-property proc "vector" nil)))
       (when vec
-        (tramp-message vec 5 "Sentinel called: `%s' `%s'" proc event)
+        (tramp-message vec 5 "Sentinel called: `%S' `%s'" proc event)
         (tramp-flush-connection-property proc)
         (tramp-flush-directory-property vec "")))))
 
@@ -3376,6 +3381,122 @@ Fall back to normal file name handler if no Tramp handler exists."
          ;; Default file name handlers, we don't care.
          (t (tramp-run-real-handler operation args)))))))
 
+(defun tramp-sh-handle-file-notify-add-watch (file-name flags callback)
+  "Like `file-notify-add-watch' for Tramp files."
+  (setq file-name (expand-file-name file-name))
+  (with-parsed-tramp-file-name file-name nil
+    (let* ((default-directory (file-name-directory file-name))
+           command events filter p)
+      (cond
+       ;; gvfs-monitor-dir.
+       ((setq command (tramp-get-remote-gvfs-monitor-dir v))
+        (setq filter 'tramp-sh-file-gvfs-monitor-dir-process-filter
+              p (start-file-process
+                 "gvfs-monitor-dir" (generate-new-buffer " *gvfs-monitor-dir*")
+                 command localname)))
+       ;; inotifywait.
+       ((setq command (tramp-get-remote-inotifywait v))
+        (setq filter 'tramp-sh-file-inotifywait-process-filter
+              events
+              (cond
+               ((and (memq 'change flags) (memq 'attribute-change flags))
+                "create,modify,move,delete,attrib")
+               ((memq 'change flags) "create,modify,move,delete")
+               ((memq 'attribute-change flags) "attrib"))
+              p (start-file-process
+                  "inotifywait" (generate-new-buffer " *inotifywait*")
+                  command "-mq" "-e" events localname)))
+       ;; None.
+       (t (tramp-error
+           v 'file-notify-error
+           "No file notification program found on %s"
+           (file-remote-p file-name))))
+      ;; Return the process object as watch-descriptor.
+      (if (not (processp p))
+          (tramp-error
+           v 'file-notify-error "`%s' failed to start on remote host" command)
+        (tramp-compat-set-process-query-on-exit-flag p nil)
+        (set-process-filter p filter)
+        p))))
+
+(defun tramp-sh-file-gvfs-monitor-dir-process-filter (proc string)
+  "Read output from \"gvfs-monitor-dir\" and add corresponding file-notify events."
+  (let ((remote-prefix
+         (with-current-buffer (process-buffer proc)
+           (file-remote-p default-directory)))
+        (rest-string (tramp-compat-process-get proc 'rest-string)))
+    (when rest-string
+      (tramp-message proc 10 (format "Previous string:\n%s" rest-string)))
+    (tramp-message proc 6 (format "%S\n%s" proc string))
+    (setq string (concat rest-string string)
+          ;; Attribute change is returned in unused wording.
+          string (replace-regexp-in-string
+                  "ATTRIB CHANGED" "ATTRIBUTE_CHANGED" string))
+
+    (while (string-match
+            (concat "^[\n\r]*"
+                    "Directory Monitor Event:[\n\r]+"
+                    "Child = \\([^\n\r]+\\)[\n\r]+"
+                    "\\(Other = \\([^\n\r]+\\)[\n\r]+\\)?"
+                    "Event = \\([^[:blank:]]+\\)[\n\r]+")
+            string)
+      (let ((object
+             (list
+              proc
+              (intern-soft
+               (replace-regexp-in-string
+                "_" "-" (downcase (match-string 4 string))))
+              ;; File names are returned as absolute paths.  We must
+              ;; add the remote prefix.
+              (concat remote-prefix (match-string 1 string))
+              (when (match-string 3 string)
+                (concat remote-prefix (match-string 3 string))))))
+        (setq string (replace-match "" nil nil string))
+        ;; Usually, we would add an Emacs event now.  Unfortunately,
+        ;; `unread-command-events' does not accept several events at
+        ;; once.  Therefore, we apply the callback directly.
+        (tramp-compat-funcall 'file-notify-callback object)))
+
+    ;; Save rest of the string.
+    (when (zerop (length string)) (setq string nil))
+    (when string (tramp-message proc 10 (format "Rest string:\n%s" string)))
+    (tramp-compat-process-put proc 'rest-string string)))
+
+(defun tramp-sh-file-inotifywait-process-filter (proc string)
+  "Read output from \"inotifywait\" and add corresponding file-notify events."
+  (tramp-message proc 6 (format "%S\n%s" proc string))
+  (dolist (line (split-string string "[\n\r]+" 'omit-nulls))
+    ;; Check, whether there is a problem.
+    (unless
+        (string-match
+         (concat "^[^[:blank:]]+"
+                 "[[:blank:]]+\\([^[:blank:]]+\\)+"
+                 "\\([[:blank:]]+\\([^\n\r]+\\)\\)?")
+         line)
+      (tramp-error proc 'file-notify-error "%s" line))
+
+    (let ((object
+           (list
+            proc
+            (mapcar
+             (lambda (x)
+               (intern-soft (replace-regexp-in-string "_" "-" (downcase x))))
+             (split-string (match-string 1 line) "," 'omit-nulls))
+            (match-string 3 line))))
+      ;; Usually, we would add an Emacs event now.  Unfortunately,
+      ;; `unread-command-events' does not accept several events at
+      ;; once.  Therefore, we apply the callback directly.
+      (tramp-compat-funcall 'file-notify-callback object))))
+
+(defvar file-notify-descriptors)
+(defun tramp-sh-handle-file-notify-rm-watch (proc)
+  "Like `file-notify-rm-watch' for Tramp files."
+  ;; The descriptor must be a process object.
+  (unless (and (processp proc) (gethash proc file-notify-descriptors))
+    (tramp-error proc 'file-notify-error "Not a valid descriptor %S" proc))
+  (tramp-message proc 6 (format "Kill %S" proc))
+  (kill-process proc))
+
 ;;; Internal Functions:
 
 (defun tramp-maybe-send-script (vec script name)
@@ -3634,12 +3755,16 @@ file exists and nonzero exit status otherwise."
   "Wait for shell prompt and barf if none appears.
 Looks at process PROC to see if a shell prompt appears in TIMEOUT
 seconds.  If not, it produces an error message with the given ERROR-ARGS."
-  (unless
-      (tramp-wait-for-regexp
-       proc timeout
-       (format
-        "\\(%s\\|%s\\)\\'" shell-prompt-pattern tramp-shell-prompt-pattern))
-    (apply 'tramp-error-with-buffer nil proc 'file-error error-args)))
+  (let ((vec (tramp-get-connection-property proc "vector" nil)))
+    (condition-case err
+        (tramp-wait-for-regexp
+         proc timeout
+         (format
+          "\\(%s\\|%s\\)\\'" shell-prompt-pattern tramp-shell-prompt-pattern))
+      (error
+       (delete-process proc)
+       (apply 'tramp-error-with-buffer
+              (tramp-get-connection-buffer vec) vec 'file-error error-args)))))
 
 (defun tramp-open-connection-setup-interactive-shell (proc vec)
   "Set up an interactive shell.
@@ -4214,9 +4339,6 @@ Gateway hops are already opened."
     ;; Result.
     target-alist))
 
-(defvar tramp-current-connection nil
-  "Last connection timestamp.")
-
 (defun tramp-maybe-open-connection (vec)
   "Maybe open a connection VEC.
 Does not do anything if a connection is already open, but re-opens the
@@ -4230,7 +4352,7 @@ connection if a previous connection has died for some reason."
       ;; If Tramp opens the same connection within a short time frame,
       ;; there is a problem.  We shall signal this.
       (unless (or (and p (processp p) (memq (process-status p) '(run open)))
-                  (not (equal (butlast (append vec nil))
+                  (not (equal (butlast (append vec nil) 2)
                               (car tramp-current-connection)))
                   (> (tramp-time-diff
                       (current-time) (cdr tramp-current-connection))
@@ -4315,7 +4437,7 @@ connection if a previous connection has died for some reason."
                 (set-process-sentinel p 'tramp-process-sentinel)
                 (tramp-compat-set-process-query-on-exit-flag p nil)
                 (setq tramp-current-connection
-                      (cons (butlast (append vec nil)) (current-time))
+                      (cons (butlast (append vec nil) 2) (current-time))
                       tramp-current-host (system-name))
 
                 (tramp-message
@@ -4323,8 +4445,8 @@ connection if a previous connection has died for some reason."
 
                 ;; Check whether process is alive.
                 (tramp-barf-if-no-shell-prompt
-                 p 60
-                 "Couldn't find local shell prompt %s" tramp-encoding-shell)
+                 p 10
+                 "Couldn't find local shell prompt for %s" tramp-encoding-shell)
 
                 ;; Now do all the connections as specified.
                 (while target-alist
@@ -4342,6 +4464,9 @@ connection if a previous connection has died for some reason."
                          (async-args
                           (tramp-get-method-parameter
                            l-method 'tramp-async-args))
+                         (connection-timeout
+                          (tramp-get-method-parameter
+                           l-method 'tramp-connection-timeout))
                          (gw-args
                           (tramp-get-method-parameter l-method 'tramp-gw-args))
                          (gw (tramp-get-file-property hop "" "gateway" nil))
@@ -4424,7 +4549,8 @@ connection if a previous connection has died for some reason."
                     (tramp-message vec 3 "Sending command `%s'" command)
                     (tramp-send-command vec command t t)
                     (tramp-process-actions
-                     p vec pos tramp-actions-before-shell 60)
+                     p vec pos tramp-actions-before-shell
+                     (or connection-timeout tramp-connection-timeout))
                     (tramp-message
                      vec 3 "Found remote shell prompt on `%s'" l-host))
                   ;; Next hop.
@@ -4864,6 +4990,17 @@ Return ATTR."
     (tramp-message vec 5 "Finding a suitable `trash' command")
     (tramp-find-executable vec "trash" (tramp-get-remote-path vec))))
 
+(defun tramp-get-remote-gvfs-monitor-dir (vec)
+  (with-tramp-connection-property vec "gvfs-monitor-dir"
+    (tramp-message vec 5 "Finding a suitable `gvfs-monitor-dir' command")
+    (tramp-find-executable
+     vec "gvfs-monitor-dir" (tramp-get-remote-path vec) t t)))
+
+(defun tramp-get-remote-inotifywait (vec)
+  (with-tramp-connection-property vec "inotifywait"
+    (tramp-message vec 5 "Finding a suitable `inotifywait' command")
+    (tramp-find-executable vec "inotifywait" (tramp-get-remote-path vec) t t)))
+
 (defun tramp-get-remote-id (vec)
   (with-tramp-connection-property vec "id"
     (tramp-message vec 5 "Finding POSIX `id' command")
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 4ec3a4b7829..3513701d20e 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -252,6 +252,11 @@ pair of the form (KEY VALUE).  The following KEYs are defined:
   * `tramp-tmpdir'
     A directory on the remote host for temporary files.  If not
     specified, \"/tmp\" is taken as default.
+  * `tramp-connection-timeout'
+    This is the maximum time to be spent for establishing a connection.
+    In general, the global default value shall be used, but for
+    some methods, like \"su\" or \"sudo\", a shorter timeout
+    might be desirable.
 
 What does all this mean?  Well, you should specify `tramp-login-program'
 for all methods; this program is used to log in to the remote site.  Then,
@@ -1034,6 +1039,13 @@ opening a connection to a remote host."
   :group 'tramp
   :type '(choice (const nil) (const t) (const pty)))
 
+(defcustom tramp-connection-timeout 60
+  "Defines the max time to wait for establishing a connection (in seconds).
+This can be overwritten for different connection types in `tramp-methods'."
+  :group 'tramp
+  :version "24.4"
+  :type 'integer)
+
 (defcustom tramp-connection-min-time-diff 5
   "Defines seconds between two consecutive connection attempts.
 This is necessary as self defense mechanism, in order to avoid
@@ -1071,6 +1083,9 @@ means to use always cached values for the directory contents."
 (defvar tramp-current-host nil
   "Remote host for this *tramp* buffer.")
 
+(defvar tramp-current-connection nil
+  "Last connection timestamp.")
+
 ;;;###autoload
 (defconst tramp-completion-file-name-handler-alist
   '((file-name-all-completions . tramp-completion-handle-file-name-all-completions)
@@ -1464,10 +1479,6 @@ ARGS to actually emit the message (if applicable)."
 This variable is used to disable messages from `tramp-error'.
 The messages are visible anyway, because an error is raised.")
 
-(defvar tramp-message-show-progress-reporter-message t
-  "Show Tramp progress reporter message in the minibuffer.
-This variable is used to disable recursive progress reporter messages.")
-
 (defsubst tramp-message (vec-or-proc level fmt-string &rest args)
   "Emit a message depending on verbosity level.
 VEC-OR-PROC identifies the Tramp buffer to use.  It can be either a
@@ -1536,23 +1547,32 @@ signal identifier to be raised, remaining args passed to
 If BUFFER is nil, show the connection buffer.  Wait for 30\", or until
 an input event arrives.  The other arguments are passed to `tramp-error'."
   (save-window-excursion
-    (unwind-protect
-        (apply 'tramp-error vec-or-proc signal fmt-string args)
-      (when (and vec-or-proc
-                 tramp-message-show-message
-                 (not (zerop tramp-verbose))
-                 (not (tramp-completion-mode-p)))
-        (let ((enable-recursive-minibuffers t))
-          (pop-to-buffer
-           (or (and (bufferp buffer) buffer)
-               (and (processp vec-or-proc) (process-buffer vec-or-proc))
-               (tramp-get-connection-buffer vec-or-proc)))
-          (when (string-equal fmt-string "Process died")
-            (message
-             "%s\n    %s"
-             "Tramp failed to connect.  If this happens repeatedly, try"
-             "`M-x tramp-cleanup-this-connection'"))
-          (sit-for 30))))))
+    (let* ((buf (or (and (bufferp buffer) buffer)
+                    (and (processp vec-or-proc) (process-buffer vec-or-proc))
+                    (and (vectorp vec-or-proc)
+                         (tramp-get-connection-buffer vec-or-proc))))
+           (vec (or (and (vectorp vec-or-proc) vec-or-proc)
+                    (and buf (with-current-buffer buf
+                               (tramp-dissect-file-name default-directory))))))
+      (unwind-protect
+          (apply 'tramp-error vec-or-proc signal fmt-string args)
+        ;; Save exit.
+        (when (and buf
+                   tramp-message-show-message
+                   (not (zerop tramp-verbose))
+                   (not (tramp-completion-mode-p)))
+          (let ((enable-recursive-minibuffers t))
+            ;; `tramp-error' does not show messages.  So we must do it
+            ;; ourselves.
+            (message fmt-string args)
+            ;; Show buffer.
+            (pop-to-buffer buf)
+            (discard-input)
+            (sit-for 30)))
+        ;; Reset timestamp.  It would be wrong after waiting for a while.
+        (when (equal (butlast (append vec nil) 2)
+                     (car tramp-current-connection))
+          (setcdr tramp-current-connection (current-time)))))))
 
 (defmacro with-parsed-tramp-file-name (filename var &rest body)
   "Parse a Tramp filename and make components available in the body.
@@ -1596,16 +1616,15 @@ If VAR is nil, then we bind `v' to the structure and `method', `user',
 
 (defmacro with-tramp-progress-reporter (vec level message &rest body)
   "Executes BODY, spinning a progress reporter with MESSAGE.
-If LEVEL does not fit for visible messages, or if this is a
-nested call of the macro, there are only traces without a visible
-progress reporter."
+If LEVEL does not fit for visible messages, there are only traces
+without a visible progress reporter."
   (declare (indent 3) (debug t))
-  `(let (pr tm)
+  `(let ((result "failed")
+         pr tm)
      (tramp-message ,vec ,level "%s..." ,message)
      ;; We start a pulsing progress reporter after 3 seconds.  Feature
      ;; introduced in Emacs 24.1.
-     (when (and tramp-message-show-progress-reporter-message
-                tramp-message-show-message
+     (when (and tramp-message-show-message
                 ;; Display only when there is a minimum level.
                 (<= ,level (min tramp-verbose 3)))
        (ignore-errors
@@ -1613,14 +1632,11 @@ progress reporter."
                tm (when pr
                     (run-at-time 3 0.1 'tramp-progress-reporter-update pr)))))
      (unwind-protect
-         ;; Execute the body.  Suppress concurrent progress reporter
-         ;; messages.
-         (let ((tramp-message-show-progress-reporter-message
-                (and tramp-message-show-progress-reporter-message (not tm))))
-           ,@body)
+         ;; Execute the body.
+         (prog1 (progn ,@body) (setq result "done"))
        ;; Stop progress reporter.
        (if tm (tramp-compat-funcall 'cancel-timer tm))
-       (tramp-message ,vec ,level "%s...done" ,message))))
+       (tramp-message ,vec ,level "%s...%s" ,message result))))
 
 (tramp-compat-font-lock-add-keywords
  'emacs-lisp-mode '("\\<with-tramp-progress-reporter\\>"))
@@ -1964,7 +1980,7 @@ ARGS are the arguments OPERATION has been called with."
                   ;; Emacs 22+ only.
                   'set-file-times
                   ;; Emacs 24+ only.
-                  'file-acl 'file-selinux-context
+                  'file-acl 'file-notify-add-watch 'file-selinux-context
                   'set-file-acl 'set-file-selinux-context
                   ;; XEmacs only.
                   'abbreviate-file-name 'create-file-buffer
@@ -2018,6 +2034,10 @@ ARGS are the arguments OPERATION has been called with."
                   ;; XEmacs only.
                   'dired-print-file 'dired-shell-call-process))
     default-directory)
+   ;; PROC.
+   ((eq operation 'file-notify-rm-watch)
+    (with-current-buffer (process-buffer (nth 0 args))
+      default-directory))
    ;; Unknown file primitive.
    (t (error "unknown file I/O primitive: %s" operation))))
 
@@ -3389,39 +3409,49 @@ The terminal type can be configured with `tramp-terminal-type'."
 PROC and VEC indicate the remote connection to be used.  POS, if
 set, is the starting point of the region to be deleted in the
 connection buffer."
-  ;; Preserve message for `progress-reporter'.
-  (tramp-compat-with-temp-message ""
-    ;; Enable `auth-source' and `password-cache'.  We must use
-    ;; tramp-current-* variables in case we have several hops.
-    (tramp-set-connection-property
-     (tramp-dissect-file-name
-      (tramp-make-tramp-file-name
-       tramp-current-method tramp-current-user tramp-current-host ""))
-     "first-password-request" t)
-    (save-restriction
+  ;; Enable `auth-source' and `password-cache'.  We must use
+  ;; tramp-current-* variables in case we have several hops.
+  (tramp-set-connection-property
+   (tramp-dissect-file-name
+    (tramp-make-tramp-file-name
+     tramp-current-method tramp-current-user tramp-current-host ""))
+   "first-password-request" t)
+  (save-restriction
+    (with-tramp-progress-reporter
+        proc 3 "Waiting for prompts from remote shell"
       (let (exit)
-        (while (not exit)
-          (tramp-message proc 3 "Waiting for prompts from remote shell")
-          (setq exit
-                (catch 'tramp-action
-                  (if timeout
-                      (with-timeout (timeout)
-                        (tramp-process-one-action proc vec actions))
+        (if timeout
+            (with-timeout (timeout (setq exit 'timeout))
+              (while (not exit)
+                (setq exit
+                      (catch 'tramp-action
+                        (tramp-process-one-action proc vec actions)))))
+          (while (not exit)
+            (setq exit
+                  (catch 'tramp-action
                     (tramp-process-one-action proc vec actions)))))
         (with-current-buffer (tramp-get-connection-buffer vec)
           (widen)
           (tramp-message vec 6 "\n%s" (buffer-string)))
         (unless (eq exit 'ok)
           (tramp-clear-passwd vec)
+          (delete-process proc)
           (tramp-error-with-buffer
-           nil vec 'file-error
+           (tramp-get-connection-buffer vec) vec 'file-error
            (cond
             ((eq exit 'permission-denied) "Permission denied")
-            ((eq exit 'process-died) "Process died")
-            (t "Login failed"))))
-        (when (numberp pos)
-          (with-current-buffer (tramp-get-connection-buffer vec)
-            (let (buffer-read-only) (delete-region pos (point)))))))))
+            ((eq exit 'process-died)
+             (concat
+              "Tramp failed to connect.  If this happens repeatedly, try\n"
+              "    `M-x tramp-cleanup-this-connection'"))
+            ((eq exit 'timeout)
+             (format
+              "Timeout reached, see buffer `%s' for details"
+              (tramp-get-connection-buffer vec)))
+            (t "Login failed")))))
+      (when (numberp pos)
+        (with-current-buffer (tramp-get-connection-buffer vec)
+          (let (buffer-read-only) (delete-region pos (point))))))))
 
 :;; Utility functions:
 
@@ -4156,6 +4186,9 @@ Only works for Bourne-like shells."
 ;; * Run emerge on two remote files.  Bug is described here:
 ;;   <http://www.mail-archive.com/tramp-devel@nongnu.org/msg01041.html>.
 ;;   (Bug#6850)
+;; * Use also port to distinguish connections.  This is needed for
+;;   different hosts sitting behind a single router (distinguished by
+;;   different port numbers).  (Tzvi Edelman)
 
 ;;; tramp.el ends here
 
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 9077bdbb513..a3bd000a4f3 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -6892,7 +6892,7 @@ comment at the start of cc-engine.el for more info."
       (while (and (looking-at c-type-decl-prefix-key)
                   (if (and (c-major-mode-is 'c++-mode)
                            (match-beginning 3))
-                      ;; If the second submatch matches in C++ then
+                      ;; If the third submatch matches in C++ then
                       ;; we're looking at an identifier that's a
                       ;; prefix only if it specifies a member pointer.
                       (when (setq got-identifier (c-forward-name))
@@ -7193,19 +7193,23 @@ comment at the start of cc-engine.el for more info."
         ;; uncommon (e.g. some placements of "const" in C++) it's not worth
         ;; the effort to look for them.)
 
-        (unless (or at-decl-end (looking-at "=[^=]"))
-          ;; If this is a declaration it should end here or its initializer(*)
-          ;; should start here, so check for allowed separation tokens.  Note
-          ;; that this rule doesn't work e.g. with a K&R arglist after a
-          ;; function header.
-          ;;
-          ;; *) Don't check for C++ style initializers using parens
-          ;; since those already have been matched as suffixes.
-          ;;
-          ;; If `at-decl-or-cast' is then we've found some other sign that
-          ;; it's a declaration or cast, so then it's probably an
-          ;; invalid/unfinished one.
-          (throw 'at-decl-or-cast at-decl-or-cast))
+;;; 2008-04-16: commented out the next form, to allow the function to recognize
+;;; "foo (int bar)" in CC (an implicit type (in class foo) without a semicolon)
+;;; as a(n almost complete) declaration, enabling it to be fontified.
+        ;; CASE 13
+        ;; (unless (or at-decl-end (looking-at "=[^=]"))
+        ;; If this is a declaration it should end here or its initializer(*)
+        ;; should start here, so check for allowed separation tokens.  Note
+        ;; that this rule doesn't work e.g. with a K&R arglist after a
+        ;; function header.
+        ;;
+        ;; *) Don't check for C++ style initializers using parens
+        ;; since those already have been matched as suffixes.
+        ;;
+        ;; If `at-decl-or-cast' is then we've found some other sign that
+        ;; it's a declaration or cast, so then it's probably an
+        ;; invalid/unfinished one.
+        ;;  (throw 'at-decl-or-cast at-decl-or-cast))
 
         ;; Below are tests that only should be applied when we're certain to
         ;; not have parsed halfway through an expression.
diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el
index 55d5b8b0be7..85a9074760d 100644
--- a/lisp/progmodes/cfengine.el
+++ b/lisp/progmodes/cfengine.el
@@ -387,10 +387,10 @@ Intended as the value of `indent-line-function'."
                               (skip-chars-forward " \t")
                               (current-column)))
           (error nil)))
-       ;; Inside a string and it starts before this line.
+       ;; Inside a string and it starts before this line: do nothing.
        ((and (nth 3 parse)
              (< (nth 8 parse) (save-excursion (beginning-of-line) (point))))
-        (indent-line-to 0))
+        )
 
        ;; Inside a defun, but not a nested list (depth is 1).  This is
        ;; a promise, usually.
diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el
index 4957b58d469..6a71ab330a8 100644
--- a/lisp/progmodes/ebrowse.el
+++ b/lisp/progmodes/ebrowse.el
@@ -33,12 +33,12 @@
 
 ;;; Code:
 
+(require 'cl-lib)
 (require 'easymenu)
 (require 'view)
 (require 'ebuff-menu)
 
 (eval-when-compile
-  (require 'cl-lib)
   (require 'helper))
 
 
@@ -233,19 +233,6 @@ Compare items with `eq' or TEST if specified."
     found))
 
 
-(defun ebrowse-delete-if-not (predicate list)
-  "Remove elements not satisfying PREDICATE from LIST and return the result.
-This is a destructive operation."
-  (let (result)
-    (while list
-      (let ((next (cdr list)))
-        (when (funcall predicate (car list))
-          (setq result (nconc result list))
-          (setf (cdr list) nil))
-        (setq list next)))
-    result))
-
-
 (defmacro ebrowse-output (&rest body)
   "Eval BODY with a writable current buffer.
 Preserve buffer's modified state."
@@ -1310,17 +1297,17 @@ With PREFIX, insert that many filenames."
 
 (defun ebrowse-browser-buffer-list ()
   "Return a list of all tree or member buffers."
-  (ebrowse-delete-if-not 'ebrowse-buffer-p (buffer-list)))
+  (cl-delete-if-not 'ebrowse-buffer-p (buffer-list)))
 
 
 (defun ebrowse-member-buffer-list ()
   "Return a list of all member buffers."
-  (ebrowse-delete-if-not 'ebrowse-member-buffer-p (buffer-list)))
+  (cl-delete-if-not 'ebrowse-member-buffer-p (buffer-list)))
 
 
 (defun ebrowse-tree-buffer-list ()
   "Return a list of all tree buffers."
-  (ebrowse-delete-if-not 'ebrowse-tree-buffer-p (buffer-list)))
+  (cl-delete-if-not 'ebrowse-tree-buffer-p (buffer-list)))
 
 
 (defun ebrowse-known-class-trees-buffer-list ()
@@ -1341,7 +1328,7 @@ one buffer.  Prefer tree buffers over member buffers."
 
 (defun ebrowse-same-tree-member-buffer-list ()
   "Return a list of members buffers with same tree as current buffer."
-  (ebrowse-delete-if-not
+  (cl-delete-if-not
    (lambda (buffer)
      (eq (buffer-local-value 'ebrowse--tree buffer)
          ebrowse--tree))
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 2c4d6a0e3d7..10472ec5815 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -1759,6 +1759,9 @@ static char *magick[] = {
 As long as GDB is in the recursive reading loop, it does not expect
 commands to be prefixed by \"-interpreter-exec console\".")
 
+(defun gdb-strip-string-backslash (string)
+  (replace-regexp-in-string "\\\\$" "" string))
+
 (defun gdb-send (proc string)
   "A comint send filter for gdb."
   (with-current-buffer gud-comint-buffer
@@ -1766,10 +1769,15 @@ commands to be prefixed by \"-interpreter-exec console\".")
       (remove-text-properties (point-min) (point-max) '(face))))
   ;; mimic <RET> key to repeat previous command in GDB
   (if (not (string= "" string))
-      (setq gdb-last-command string)
-    (if gdb-last-command (setq string gdb-last-command)))
-  (if (or (string-match "^-" string)
-          (> gdb-control-level 0))
+      (if gdb-continuation
+          (setq gdb-last-command (concat gdb-continuation
+                                         (gdb-strip-string-backslash string)
+                                         " "))
+        (setq gdb-last-command (gdb-strip-string-backslash string)))
+    (if gdb-last-command (setq string gdb-last-command))
+    (setq gdb-continuation nil))
+  (if (and (not gdb-continuation) (or (string-match "^-" string)
+          (> gdb-control-level 0)))
       ;; Either MI command or we are feeding GDB's recursive reading loop.
       (progn
         (setq gdb-first-done-or-error t)
@@ -1779,10 +1787,13 @@ commands to be prefixed by \"-interpreter-exec console\".")
             (setq gdb-control-level (1- gdb-control-level))))
     ;; CLI command
     (if (string-match "\\\\$" string)
-        (setq gdb-continuation (concat gdb-continuation string "\n"))
+        (setq gdb-continuation
+              (concat gdb-continuation (gdb-strip-string-backslash
+                                        string)
+                      " "))
       (setq gdb-first-done-or-error t)
       (let ((to-send (concat "-interpreter-exec console "
-                             (gdb-mi-quote string)
+                             (gdb-mi-quote (concat gdb-continuation string " "))
                              "\n")))
         (if gdb-enable-debug
             (push (cons 'mi-send to-send) gdb-debug-log))
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 915b52ce04d..62870f9085b 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -3091,7 +3091,12 @@ you are doing."
            ;; Stop collecting nodes after moving to a position with
            ;; indentation equaling min-indent. This is specially
            ;; useful for navigating nested definitions recursively.
-           tree)
+           (if (> num-children 0)
+               tree
+             ;; When there are no children, the collected tree is a
+             ;; single node intended to be added in the list of defuns
+             ;; of its parent.
+             (car tree)))
           (t
            (python-imenu--build-tree
             min-indent
@@ -3131,7 +3136,7 @@ you are doing."
                    (cons
                     (prog1
                         (python-imenu--build-tree
-                         prev-indent indent 1 (list (cons label pos)))
+                         prev-indent indent 0 (list (cons label pos)))
                       ;; Adjustment: after scanning backwards
                       ;; for all deeper children, we need to
                       ;; continue our scan for a parent from
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 0292e40b986..0b83921504b 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -990,13 +990,14 @@ calculating indentation on the lines after it."
 (defun ruby-move-to-block (n)
   "Move to the beginning (N < 0) or the end (N > 0) of the
 current block, a sibling block, or an outer block.  Do that (abs N) times."
+  (back-to-indentation)
   (let ((signum (if (> n 0) 1 -1))
         (backward (< n 0))
-        (depth (or (nth 2 (ruby-parse-region (line-beginning-position)
-                                             (line-end-position)))
-                   0))
+        (depth (or (nth 2 (ruby-parse-region (point) (line-end-position))) 0))
         case-fold-search
         down done)
+    (when (looking-at ruby-block-mid-re)
+      (setq depth (+ depth signum)))
     (when (< (* depth signum) 0)
       ;; Moving end -> end or beginning -> beginning.
       (setq depth 0))
@@ -1033,22 +1034,16 @@ current block, a sibling block, or an outer block.  Do that (abs N) times."
             (unless (car state) ; Line ends with unfinished string.
               (setq depth (+ (nth 2 state) depth))))
           (cond
-           ;; Deeper indentation, we found a block.
-           ;; FIXME: We can't recognize empty blocks this way.
+           ;; Increased depth, we found a block.
            ((> (* signum depth) 0)
             (setq down t))
-           ;; Block found, and same indentation as when started, stop.
+           ;; We're at the same depth as when we started, and we've
+           ;; encountered a block before.  Stop.
            ((and down (zerop depth))
             (setq done t))
-           ;; Shallower indentation, means outer block, can stop now.
+           ;; Lower depth, means outer block, can stop now.
            ((< (* signum depth) 0)
-            (setq done t)))))
-        (if done
-            (save-excursion
-              (back-to-indentation)
-              ;; Not really at the first or last line of the block, move on.
-              (if (looking-at (concat "\\<\\(" ruby-block-mid-re "\\)\\>"))
-                  (setq done nil))))))
+            (setq done t)))))))
     (back-to-indentation)))
 
 (defun ruby-beginning-of-block (&optional arg)
@@ -1356,7 +1351,7 @@ If the result is do-end block, it will always be multiline."
     (progn
       (eval-and-compile
         (defconst ruby-percent-literal-beg-re
-          "\\(%\\)[qQrswWx]?\\([[:punct:]]\\)"
+          "\\(%\\)[qQrswWxIi]?\\([[:punct:]]\\)"
           "Regexp to match the beginning of percent literal.")
 
         (defconst ruby-syntax-methods-before-regexp
@@ -1392,7 +1387,7 @@ It will be properly highlighted even when the call omits parens.")
           (funcall
            (syntax-propertize-rules
             ;; $' $" $` .... are variables.
-            ;; ?' ?" ?` are ascii codes.
+            ;; ?' ?" ?` are character literals (one-char strings in 1.9+).
             ("\\([?$]\\)[#\"'`]"
              (1 (unless (save-excursion
                           ;; Not within a string.
@@ -1523,7 +1518,7 @@ It will be properly highlighted even when the call omits parens.")
             (save-match-data
               (save-excursion
                 (goto-char (nth 8 parse-state))
-                (looking-at "%\\(?:[QWrx]\\|\\W\\)")))))))
+                (looking-at "%\\(?:[QWrxI]\\|\\W\\)")))))))
 
       (defun ruby-syntax-propertize-expansions (start end)
         (save-excursion
@@ -1726,7 +1721,7 @@ See `font-lock-syntax-table'.")
 (defconst ruby-font-lock-keywords
   (list
    ;; functions
-   '("^\\s *def\\s +\\([^( \t\n]+\\)"
+   '("^\\s *def\\s +\\(?:[^( \t\n.]*\\.\\)?\\([^( \t\n]+\\)"
      1 font-lock-function-name-face)
    (list (concat
           "\\(^\\|[^.@$]\\|\\.\\.\\)\\("
@@ -1767,31 +1762,66 @@ See `font-lock-syntax-table'.")
              "yield")
            'symbols)
           "\\|"
-          ;; keyword-like methods on Kernel and Module
           (regexp-opt
-           '("alias_method"
+           ;; built-in methods on Kernel
+           '("__callee__"
+             "__dir__"
+             "__method__"
+             "abort"
+             "at_exit"
              "autoload"
+             "autoload?"
+             "binding"
+             "block_given?"
+             "caller"
+             "catch"
+             "eval"
+             "exec"
+             "exit"
+             "exit!"
+             "fail"
+             "fork"
+             "format"
+             "lambda"
+             "load"
+             "loop"
+             "open"
+             "p"
+             "print"
+             "printf"
+             "proc"
+             "putc"
+             "puts"
+             "raise"
+             "rand"
+             "readline"
+             "readlines"
+             "require"
+             "require_relative"
+             "sleep"
+             "spawn"
+             "sprintf"
+             "srand"
+             "syscall"
+             "system"
+             "throw"
+             "trap"
+             "warn"
+             ;; keyword-like private methods on Module
+             "alias_method"
              "attr"
              "attr_accessor"
              "attr_reader"
              "attr_writer"
-             "catch"
              "define_method"
              "extend"
-             "fail"
              "include"
-             "lambda"
-             "loop"
              "module_function"
+             "prepend"
              "private"
-             "proc"
              "protected"
              "public"
-             "raise"
              "refine"
-             "require"
-             "require_relative"
-             "throw"
              "using")
            'symbols)
           "\\)")
@@ -1799,12 +1829,16 @@ See `font-lock-syntax-table'.")
          '(if (match-beginning 4)
               font-lock-builtin-face
             font-lock-keyword-face))
+   ;; Perl-ish keywords
+   "\\_<\\(?:BEGIN\\|END\\)\\_>\\|^__END__$"
    ;; here-doc beginnings
    `(,ruby-here-doc-beg-re 0 (unless (ruby-singleton-class-p (match-beginning 0))
                                'font-lock-string-face))
    ;; variables
    '("\\(^\\|[^.@$]\\|\\.\\.\\)\\_<\\(nil\\|self\\|true\\|false\\)\\>"
      2 font-lock-variable-name-face)
+   ;; keywords that evaluate to certain values
+   '("\\_<__\\(?:LINE\\|ENCODING\\|FILE\\)__\\_>" 0 font-lock-variable-name-face)
    ;; symbols
    '("\\(^\\|[^:]\\)\\(:\\([-+~]@?\\|[/%&|^`]\\|\\*\\*?\\|<\\(<\\|=>?\\)?\\|>[>=]?\\|===?\\|=~\\|![~=]?\\|\\[\\]=?\\|@?\\(\\w\\|_\\)+\\([!?=]\\|\\b_*\\)\\|#{[^}\n\\\\]*\\(\\\\.[^}\n\\\\]*\\)*}\\)\\)"
      2 font-lock-constant-face)
@@ -1815,14 +1849,22 @@ See `font-lock-syntax-table'.")
      0 font-lock-variable-name-face)
    ;; constants
    '("\\(?:\\_<\\|::\\)\\([A-Z]+\\(\\w\\|_\\)*\\)"
-     1 font-lock-type-face)
+     1 (unless (eq ?\( (char-after)) font-lock-type-face))
    '("\\(^\\s *\\|[\[\{\(,]\\s *\\|\\sw\\s +\\)\\(\\(\\sw\\|_\\)+\\):[^:]" 2 font-lock-constant-face)
+   ;; conversion methods on Kernel
+   (list (concat "\\(?:^\\|[^.@$]\\|\\.\\.\\)"
+                 (regexp-opt '("Array" "Complex" "Float" "Hash"
+                               "Integer" "Rational" "String") 'symbols))
+         1 font-lock-builtin-face)
    ;; expression expansion
    '(ruby-match-expression-expansion
      2 font-lock-variable-name-face t)
-   ;; warn lower camel case
-                                        ;'("\\<[a-z]+[a-z0-9]*[A-Z][A-Za-z0-9]*\\([!?]?\\|\\>\\)"
-                                        ;  0 font-lock-warning-face)
+   ;; negation char
+   '("[^[:alnum:]_]\\(!\\)[^=]"
+     1 font-lock-negation-char-face)
+   ;; character literals
+   ;; FIXME: Support longer escape sequences.
+   '("\\?\\\\?\\S " 0 font-lock-string-face)
    )
   "Additional expressions to highlight in Ruby mode.")
 
diff --git a/lisp/shadowfile.el b/lisp/shadowfile.el
index ec6e6e7ff10..3e7789069f9 100644
--- a/lisp/shadowfile.el
+++ b/lisp/shadowfile.el
@@ -74,6 +74,7 @@
 
 ;;; Code:
 
+(require 'cl-lib)
 (require 'ange-ftp)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -180,15 +181,6 @@ created by `shadow-define-regexp-group'.")
     (setq list (cdr list)))
   (car list))
 
-(defun shadow-remove-if (func list)
-  "Remove elements satisfying FUNC from LIST.
-Nondestructive; actually returns a copy of the list with the elements removed."
-  (if list
-      (if (funcall func (car list))
-          (shadow-remove-if func (cdr list))
-        (cons (car list) (shadow-remove-if func (cdr list))))
-    nil))
-
 (defun shadow-regexp-superquote (string)
   "Like `regexp-quote', but includes the ^ and $.
 This makes sure regexp matches nothing but STRING."
@@ -238,9 +230,8 @@ instead."
 Replace old definition, if any.  PRIMARY and REGEXP are the
 information defining the cluster.  For interactive use, call
 `shadow-define-cluster' instead."
-  (let ((rest (shadow-remove-if
-               (function (lambda (x) (equal name (car x))))
-               shadow-clusters)))
+  (let ((rest (cl-remove-if (lambda (x) (equal name (car x)))
+                            shadow-clusters)))
     (setq shadow-clusters
           (cons (shadow-make-cluster name primary regexp)
                 rest))))
@@ -602,9 +593,8 @@ and to are absolute file names."
 Consider them as regular expressions if third arg REGEXP is true."
   (if groups
       (let ((nonmatching
-             (shadow-remove-if
-              (function (lambda (x) (shadow-file-match x file regexp)))
-              (car groups))))
+             (cl-remove-if (lambda (x) (shadow-file-match x file regexp))
+                           (car groups))))
         (append (cond ((equal nonmatching (car groups)) nil)
                       (regexp
                        (let ((realname (nth 2 (shadow-parse-fullname file))))
@@ -635,8 +625,7 @@ Consider them as regular expressions if third arg REGEXP is true."
   "Remove PAIR from `shadow-files-to-copy'.
 PAIR must be `eq' to one of the elements of that list."
   (setq shadow-files-to-copy
-        (shadow-remove-if (function (lambda (s) (eq s pair)))
-                          shadow-files-to-copy)))
+        (cl-remove-if (lambda (s) (eq s pair)) shadow-files-to-copy)))
 
 (defun shadow-read-files ()
   "Visit and load `shadow-info-file' and `shadow-todo-file'.
diff --git a/lisp/simple.el b/lisp/simple.el
index 61f32363dbe..3e3ff485c5e 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4602,6 +4602,12 @@ for it.")
 (defun next-line (&optional arg try-vscroll)
   "Move cursor vertically down ARG lines.
 Interactively, vscroll tall lines if `auto-window-vscroll' is enabled.
+Non-interactively, use TRY-VSCROLL to control whether to vscroll tall
+lines: if either `auto-window-vscroll' or TRY-VSCROLL is nil, this
+function will not vscroll.
+
+ARG defaults to 1.
+
 If there is no character in the target line exactly under the current column,
 the cursor is positioned after the character in that line which spans this
 column, or at the end of the line if it is not long enough.
@@ -4646,6 +4652,12 @@ and more reliable (no dependence on goal column, etc.)."
 (defun previous-line (&optional arg try-vscroll)
   "Move cursor vertically up ARG lines.
 Interactively, vscroll tall lines if `auto-window-vscroll' is enabled.
+Non-interactively, use TRY-VSCROLL to control whether to vscroll tall
+lines: if either `auto-window-vscroll' or TRY-VSCROLL is nil, this
+function will not vscroll.
+
+ARG defaults to 1.
+
 If there is no character in the target line exactly over the current column,
 the cursor is positioned after the character in that line which spans this
 column, or at the end of the line if it is not long enough.
@@ -4725,33 +4737,81 @@ lines."
   :group 'editing-basics
   :version "23.1")
 
+(defun default-font-height ()
+  "Return the height in pixels of the current buffer's default face font."
+  (let ((default-font (face-font 'default)))
+    (cond
+     ((and (display-multi-font-p)
+           ;; Avoid calling font-info if the frame's default font was
+           ;; not changed since the frame was created.  That's because
+           ;; font-info is expensive for some fonts, see bug #14838.
+           (not (string= (frame-parameter nil 'font) default-font)))
+      (aref (font-info default-font) 3))
+     (t (frame-char-height)))))
+
+(defun default-line-height ()
+  "Return the pixel height of current buffer's default-face text line.
+
+The value includes `line-spacing', if any, defined for the buffer
+or the frame."
+  (let ((dfh (default-font-height))
+        (lsp (if (display-graphic-p)
+                 (or line-spacing
+                     (default-value 'line-spacing)
+                     (frame-parameter nil 'line-spacing)
+                     0)
+               0)))
+    (if (floatp lsp)
+        (setq lsp (* dfh lsp)))
+    (+ dfh lsp)))
+
+(defun window-screen-lines ()
+  "Return the number of screen lines in the text area of the selected window.
+
+This is different from `window-text-height' in that this function counts
+lines in units of the height of the font used by the default face displayed
+in the window, not in units of the frame's default font, and also accounts
+for `line-spacing', if any, defined for the window's buffer or frame.
+
+The value is a floating-point number."
+  (let ((canonical (window-text-height))
+        (fch (frame-char-height))
+        (dlh (default-line-height)))
+    (/ (* (float canonical) fch) dlh)))
+
 ;; Returns non-nil if partial move was done.
 (defun line-move-partial (arg noerror to-end)
   (if (< arg 0)
       ;; Move backward (up).
       ;; If already vscrolled, reduce vscroll
-      (let ((vs (window-vscroll nil t)))
-        (when (> vs (frame-char-height))
-          (set-window-vscroll nil (- vs (frame-char-height)) t)))
+      (let ((vs (window-vscroll nil t))
+            (dlh (default-line-height)))
+        (when (> vs dlh)
+          (set-window-vscroll nil (- vs dlh) t)))
 
     ;; Move forward (down).
     (let* ((lh (window-line-height -1))
+           (rowh (car lh))
            (vpos (nth 1 lh))
            (ypos (nth 2 lh))
            (rbot (nth 3 lh))
            (this-lh (window-line-height))
-           (this-height (nth 0 this-lh))
+           (this-height (car this-lh))
            (this-ypos (nth 2 this-lh))
-           (fch (frame-char-height))
-           py vs)
+           (dlh (default-line-height))
+           (wslines (window-screen-lines))
+           py vs last-line)
+      (if (> (mod wslines 1.0) 0.0)
+          (setq wslines (round (+ wslines 0.5))))
       (when (or (null lh)
-                (>= rbot fch)
-                (<= ypos (- fch))
+                (>= rbot dlh)
+                (<= ypos (- dlh))
                 (null this-lh)
-                (<= this-ypos (- fch)))
+                (<= this-ypos (- dlh)))
         (unless lh
           (let ((wend (pos-visible-in-window-p t nil t)))
             (setq rbot (nth 3 wend)
+                  rowh  (nth 4 wend)
                   vpos (nth 5 wend))))
         (unless this-lh
           (let ((wstart (pos-visible-in-window-p nil nil t)))
@@ -4759,38 +4819,63 @@ lines."
                   this-height (nth 4 wstart))))
         (setq py
               (or (nth 1 this-lh)
-                  (let ((ppos (posn-at-point)))
-                    (cdr (or (posn-actual-col-row ppos)
-                             (posn-col-row ppos))))))
+                  (let ((ppos (posn-at-point))
+                        col-row)
+                    (setq col-row (posn-actual-col-row ppos))
+                    (if col-row
+                        (- (cdr col-row) (window-vscroll))
+                      (cdr (posn-col-row ppos))))))
+        ;; VPOS > 0 means the last line is only partially visible.
+        ;; But if the part that is visible is at least as tall as the
+        ;; default font, that means the line is actually fully
+        ;; readable, and something like line-spacing is hidden.  So in
+        ;; that case we accept the last line in the window as still
+        ;; visible, and consider the margin as starting one line
+        ;; later.
+        (if (and vpos (> vpos 0))
+            (if (and rowh
+                     (>= rowh (default-font-height))
+                     (< rowh dlh))
+                (setq last-line (min (- wslines scroll-margin) vpos))
+              (setq last-line (min (- wslines scroll-margin 1) (1- vpos)))))
         (cond
          ;; If last line of window is fully visible, and vscrolling
          ;; more would make this line invisible, move forward.
-         ((and (or (< (setq vs (window-vscroll nil t)) fch)
+         ((and (or (< (setq vs (window-vscroll nil t)) dlh)
                    (null this-height)
-                   (<= this-height fch))
+                   (<= this-height dlh))
                (or (null rbot) (= rbot 0)))
           nil)
          ;; If cursor is not in the bottom scroll margin, and the
          ;; current line is is not too tall, move forward.
-         ((and (or (null this-height) (<= this-height fch))
+         ((and (or (null this-height) (<= this-height dlh))
                vpos
                (> vpos 0)
-               (< py
-                  (min (- (window-text-height) scroll-margin 1) (1- vpos))))
+               (< py last-line))
           nil)
          ;; When already vscrolled, we vscroll some more if we can,
          ;; or clear vscroll and move forward at end of tall image.
          ((> vs 0)
           (when (or (and rbot (> rbot 0))
-                    (and this-height (> this-height fch)))
-            (set-window-vscroll nil (+ vs fch) t)))
+                    (and this-height (> this-height dlh)))
+            (set-window-vscroll nil (+ vs dlh) t)))
          ;; If cursor just entered the bottom scroll margin, move forward,
-         ;; but also vscroll one line so redisplay won't recenter.
+         ;; but also optionally vscroll one line so redisplay won't recenter.
          ((and vpos
                (> vpos 0)
-               (= py (min (- (window-text-height) scroll-margin 1)
-                          (1- vpos))))
-          (set-window-vscroll nil (frame-char-height) t)
+               (= py last-line))
+          ;; Don't vscroll if the partially-visible line at window
+          ;; bottom has the default height (a.k.a. "just one more text
+          ;; line"): in that case, we do want redisplay to behave
+          ;; normally, i.e. recenter or whatever.
+          ;;
+          ;; Note: ROWH + RBOT from the value returned by
+          ;; pos-visible-in-window-p give the total height of the
+          ;; partially-visible glyph row at the end of the window.  As
+          ;; we are dealing with floats, we disregard sub-pixel
+          ;; discrepancies between that and DLH.
+          (if (and rowh rbot (>= (- (+ rowh rbot) dlh) 1))
+              (set-window-vscroll nil dlh t))
           (line-move-1 arg noerror to-end)
           t)
          ;; If there are lines above the last line, scroll-up one line.
@@ -4799,7 +4884,7 @@ lines."
           t)
          ;; Finally, start vscroll.
          (t
-          (set-window-vscroll nil (frame-char-height) t)))))))
+          (set-window-vscroll nil dlh t)))))))
 
 
 ;; This is like line-move-1 except that it also performs
@@ -4832,11 +4917,14 @@ lines."
           (prog1 (line-move-visual arg noerror)
             ;; If we moved into a tall line, set vscroll to make
             ;; scrolling through tall images more smooth.
-            (let ((lh (line-pixel-height)))
+            (let ((lh (line-pixel-height))
+                  (dlh (default-line-height)))
               (if (and (< arg 0)
                        (< (point) (window-start))
-                       (> lh (frame-char-height)))
-                  (set-window-vscroll nil (- lh (frame-char-height)) t))))
+                       (> lh dlh))
+                  (set-window-vscroll
+                   nil
+                   (- lh dlh) t))))
         (line-move-1 arg noerror to-end)))))
 
 ;; Display-based alternative to line-move-1.
@@ -7346,6 +7434,66 @@ warning using STRING as the message.")
     (with-eval-after-load pkg
       (bad-package-check pkg))))
 
+
+;;; Generic dispatcher commands
+
+;; Macro `alternatives-define' is used to create generic commands.
+;; Generic commands are these (like web, mail, news, encrypt, irc, etc.)
+;; that can have different alternative implementations where choosing
+;; among them is exclusively a matter of user preference.
+
+;; (alternatives-define COMMAND) creates a new interactive command
+;; M-x COMMAND and a customizable variable COMMAND-alternatives.
+;; Typically, the user will not need to customize this variable; packages
+;; wanting to add alternative implementations should use
+;;
+;; ;;;###autoload (push '("My impl name" . my-impl-symbol) COMMAND-alternatives
+
+(defmacro alternatives-define (command &rest customizations)
+  "Define new command `COMMAND'.
+The variable `COMMAND-alternatives' will contain alternative
+implementations of COMMAND, so that running `C-u M-x COMMAND'
+will allow the user to chose among them.
+CUSTOMIZATIONS, if non-nil, should be composed of alternating
+`defcustom' keywords and values to add to the declaration of
+`COMMAND-alternatives' (typically :group and :version)."
+  (let* ((command-name (symbol-name command))
+         (varalt-name (concat command-name "-alternatives"))
+         (varalt-sym (intern varalt-name))
+         (varimp-sym (intern (concat command-name "--implementation"))))
+    `(progn
+
+       (defcustom ,varalt-sym nil
+         ,(format "Alist of alternative implementations for the `%s' command.
+
+Each entry must be a pair (ALTNAME . ALTFUN), where:
+ALTNAME - The name shown at user to describe the alternative implementation.
+ALTFUN  - The function called to implement this alternative."
+                  command-name)
+         :type '(alist :key-type string :value-type function)
+         ,@customizations)
+
+       (defvar ,varimp-sym nil "Internal use only.")
+
+       (defun ,command (&optional arg)
+         ,(format "Run generic command `%s'.
+If used for the first time, or with interactive ARG, ask the user which
+implementation to use for `%s'.  The variable `%s'
+contains the list of implementations currently supported for this command."
+                  command-name command-name varalt-name)
+         (interactive "P")
+         (when (or arg (null ,varimp-sym))
+           (let ((val (completing-read
+                       ,(format "Select implementation for command `%s': " command-name)
+                       ,varalt-sym nil t)))
+             (unless (string-equal val "")
+               (customize-save-variable ',varimp-sym
+                                        (cdr (assoc-string val ,varalt-sym))))))
+         (if ,varimp-sym
+             (funcall ,varimp-sym)
+           (message ,(format "No implementation selected for command `%s'"
+                             command-name)))))))
+
 (provide 'simple)
 
 ;;; simple.el ends here
diff --git a/lisp/subr.el b/lisp/subr.el
index b8a62023805..b6ee96f879e 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1980,7 +1980,7 @@ any other terminator is used itself as input.
 The optional argument PROMPT specifies a string to use to prompt the user.
 The variable `read-quoted-char-radix' controls which radix to use
 for numeric input."
-  (let ((message-log-max nil) done (first t) (code 0) char translated)
+  (let ((message-log-max nil) done (first t) (code 0) translated)
     (while (not done)
       (let ((inhibit-quit first)
             ;; Don't let C-h get the help message--only help function keys.
@@ -1990,20 +1990,14 @@ for numeric input."
 or the octal character code.
 RET terminates the character code and is discarded;
 any other non-digit terminates the character code and is then used as input."))
-        (setq char (read-event (and prompt (format "%s-" prompt)) t))
+        (setq translated (read-key (and prompt (format "%s-" prompt))))
         (if inhibit-quit (setq quit-flag nil)))
-      ;; Translate TAB key into control-I ASCII character, and so on.
-      ;; Note: `read-char' does it using the `ascii-character' property.
-      ;; We should try and use read-key instead.
-      (let ((translation (lookup-key local-function-key-map (vector char))))
-        (setq translated (if (arrayp translation)
-                             (aref translation 0)
-                           char)))
       (if (integerp translated)
           (setq translated (char-resolve-modifiers translated)))
       (cond ((null translated))
             ((not (integerp translated))
-             (setq unread-command-events (list char)
+             (setq unread-command-events
+                   (listify-key-sequence (this-single-command-raw-keys))
                    done t))
             ((/= (logand translated ?\M-\^@) 0)
              ;; Turn a meta-character into a character with the 0200 bit set.
@@ -2022,7 +2016,8 @@ any other non-digit terminates the character code and is then used as input."))
             ((and (not first) (eq translated ?\C-m))
              (setq done t))
             ((not first)
-             (setq unread-command-events (list char)
+             (setq unread-command-events
+                   (listify-key-sequence (this-single-command-raw-keys))
                    done t))
             (t (setq code translated
                      done t)))
@@ -2186,6 +2181,7 @@ An obsolete, but still supported form is
 where the optional arg MILLISECONDS specifies an additional wait period,
 in milliseconds; this was useful when Emacs was built without
 floating point support."
+  (declare (advertised-calling-convention (seconds &optional nodisp) "22.1"))
   (if (numberp nodisp)
       (setq seconds (+ seconds (* 1e-3 nodisp))
             nodisp obsolete)
@@ -2200,7 +2196,10 @@ floating point support."
     (or nodisp (redisplay)))
    (t
     (or nodisp (redisplay))
-    (let ((read (read-event nil nil seconds)))
+    ;; FIXME: we should not read-event here at all, because it's much too
+    ;; difficult to reliably "undo" a read-event by pushing it onto
+    ;; unread-command-events.
+    (let ((read (read-event nil t seconds)))
       (or (null read)
           (progn
             ;; If last command was a prefix arg, e.g. C-u, push this event onto
@@ -2210,7 +2209,6 @@ floating point support."
                 (setq read (cons t read)))
             (push read unread-command-events)
             nil))))))
-(set-advertised-calling-convention 'sit-for '(seconds &optional nodisp) "22.1")
 
 (defun y-or-n-p (prompt)
   "Ask user a \"y or n\" question.  Return t if answer is \"y\".
@@ -2240,7 +2238,8 @@ is nil and `use-dialog-box' is non-nil."
     (cond
      (noninteractive
       (setq prompt (concat prompt
-                           (if (eq ?\s (aref prompt (1- (length prompt))))
+                           (if (or (zerop (length prompt))
+                                   (eq ?\s (aref prompt (1- (length prompt)))))
                                "" " ")
                            "(y or n) "))
       (let ((temp-prompt prompt))
@@ -2257,7 +2256,8 @@ is nil and `use-dialog-box' is non-nil."
             (x-popup-dialog t `(,prompt ("Yes" . act) ("No" . skip)))))
      (t
       (setq prompt (concat prompt
-                           (if (eq ?\s (aref prompt (1- (length prompt))))
+                           (if (or (zerop (length prompt))
+                                   (eq ?\s (aref prompt (1- (length prompt)))))
                                "" " ")
                            "(y or n) "))
       (while
@@ -2449,11 +2449,12 @@ If MESSAGE is nil, instructions to type EXIT-CHAR are displayed there."
                 (recenter (/ (window-height) 2))))
           (message (or message "Type %s to continue editing.")
                    (single-key-description exit-char))
-          (let ((event (read-event)))
+          (let ((event (read-key)))
             ;; `exit-char' can be an event, or an event description list.
             (or (eq event exit-char)
                 (eq event (event-convert-list exit-char))
-                (setq unread-command-events (list event)))))
+                (setq unread-command-events
+                      (append (this-single-command-raw-keys))))))
       (delete-overlay ol))))
 
 
@@ -3852,6 +3853,7 @@ FILE should be the name of a library, with no directory name."
   (declare (obsolete eval-after-load "23.2"))
   (eval-after-load file (read)))
 
+
 (defun display-delayed-warnings ()
   "Display delayed warnings from `delayed-warnings-list'.
 Used from `delayed-warnings-hook' (which see)."
@@ -3885,6 +3887,12 @@ By default, this hook contains functions to consolidate the
 warnings listed in `delayed-warnings-list', display them, and set
 `delayed-warnings-list' back to nil.")
 
+(defun delay-warning (type message &optional level buffer-name)
+  "Display a delayed warning.
+Aside from going through `delayed-warnings-list', this is equivalent
+to `display-warning'."
+  (push (list type message level buffer-name) delayed-warnings-list))
+
 
 ;;;; invisibility specs
 
@@ -4494,20 +4502,6 @@ convenience wrapper around `make-progress-reporter' and friends.
        nil ,@(cdr (cdr spec)))))
 
 
-;;;; Support for watching filesystem events.
-
-(defun file-notify-handle-event (event)
-  "Handle file system monitoring event.
-If EVENT is a filewatch event, call its callback.
-Otherwise, signal a `filewatch-error'."
-  (interactive "e")
-  (if (and (eq (car event) 'file-notify)
-           (>= (length event) 3))
-      (funcall (nth 2 event) (nth 1 event))
-    (signal 'filewatch-error
-            (cons "Not a valid file-notify event" event))))
-
-
 ;;;; Comparing version strings.
 
 (defconst version-separator "."
diff --git a/lisp/thumbs.el b/lisp/thumbs.el
index 3d591303414..8032de85b01 100644
--- a/lisp/thumbs.el
+++ b/lisp/thumbs.el
@@ -57,6 +57,7 @@
 ;;; Code:
 
 (require 'dired)
+(require 'cl-lib)                       ; for cl-gensym
 
 ;; CUSTOMIZATIONS
 
@@ -179,21 +180,6 @@ this value can let another user see some of your images."
 (make-variable-buffer-local 'thumbs-marked-list)
 (put 'thumbs-marked-list 'permanent-local t)
 
-(defalias 'thumbs-gensym
-    (if (fboundp 'gensym)
-        'gensym
-      ;; Copied from cl-macs.el
-      (defvar thumbs-gensym-counter 0)
-      (lambda (&optional prefix)
-        "Generate a new uninterned symbol.
-The name is made by appending a number to PREFIX, default \"G\"."
-        (let ((pfix (if (stringp prefix) prefix "G"))
-              (num (if (integerp prefix) prefix
-                     (prog1 thumbs-gensym-counter
-                       (setq thumbs-gensym-counter
-                             (1+ thumbs-gensym-counter))))))
-          (make-symbol (format "%s%d" pfix num))))))
-
 (defsubst thumbs-temp-dir ()
   (file-name-as-directory (expand-file-name thumbs-temp-dir)))
 
@@ -202,7 +188,7 @@ The name is made by appending a number to PREFIX, default \"G\"."
   (format "%s%s-%s.jpg"
           (thumbs-temp-dir)
           thumbs-temp-prefix
-          (thumbs-gensym "T")))
+          (cl-gensym "T")))
 
 (defun thumbs-thumbsdir ()
   "Return the current thumbnails directory (from `thumbs-thumbsdir').
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el
index 7a8f399a6ce..e9a6a97409c 100644
--- a/lisp/vc/ediff.el
+++ b/lisp/vc/ediff.el
@@ -12,8 +12,8 @@
 ;; filed in the Emacs bug reporting system against this file, a copy
 ;; of the bug report be sent to the maintainer's email address.
 
-(defconst ediff-version "2.81.4" "The current version of Ediff")
-(defconst ediff-date "December 7, 2009" "Date of last update")
+(defconst ediff-version "2.81.5" "The current version of Ediff")
+(defconst ediff-date "July 4, 2013" "Date of last update")
 
 
 ;; This file is part of GNU Emacs.
@@ -1560,6 +1560,75 @@ With optional NODE, goes to that node."
   (add-to-list 'debug-ignored-errors mess))
 
 
+
+;;; Command line interface
+
+;;;###autoload
+(defun ediff-files-command ()
+  (let ((file-a (nth 0 command-line-args-left))
+        (file-b (nth 1 command-line-args-left)))
+    (setq command-line-args-left (nthcdr 2 command-line-args-left))
+    (ediff file-a file-b)))
+
+;;;###autoload
+(defun ediff3-files-command ()
+  (let ((file-a (nth 0 command-line-args-left))
+        (file-b (nth 1 command-line-args-left))
+        (file-c (nth 2 command-line-args-left)))
+    (setq command-line-args-left (nthcdr 3 command-line-args-left))
+    (ediff3 file-a file-b file-c)))
+
+;;;###autoload
+(defun ediff-merge-command ()
+  (let ((file-a (nth 0 command-line-args-left))
+        (file-b (nth 1 command-line-args-left)))
+    (setq command-line-args-left (nthcdr 2 command-line-args-left))
+    (ediff-merge-files file-a file-b)))
+
+;;;###autoload
+(defun ediff-merge-with-ancestor-command ()
+  (let ((file-a (nth 0 command-line-args-left))
+        (file-b (nth 1 command-line-args-left))
+        (ancestor (nth 2 command-line-args-left)))
+    (setq command-line-args-left (nthcdr 3 command-line-args-left))
+    (ediff-merge-files-with-ancestor file-a file-b ancestor)))
+
+;;;###autoload
+(defun ediff-directories-command ()
+  (let ((file-a (nth 0 command-line-args-left))
+        (file-b (nth 1 command-line-args-left))
+        (regexp (nth 2 command-line-args-left)))
+    (setq command-line-args-left (nthcdr 3 command-line-args-left))
+    (ediff-directories file-a file-b regexp)))
+
+;;;###autoload
+(defun ediff-directories3-command ()
+  (let ((file-a (nth 0 command-line-args-left))
+        (file-b (nth 1 command-line-args-left))
+        (file-c (nth 2 command-line-args-left))
+        (regexp (nth 3 command-line-args-left)))
+    (setq command-line-args-left (nthcdr 4 command-line-args-left))
+    (ediff-directories3 file-a file-b file-c regexp)))
+
+;;;###autoload
+(defun ediff-merge-directories-command ()
+  (let ((file-a (nth 0 command-line-args-left))
+        (file-b (nth 1 command-line-args-left))
+        (regexp (nth 2 command-line-args-left)))
+    (setq command-line-args-left (nthcdr 3 command-line-args-left))
+    (ediff-merge-directories file-a file-b regexp)))
+
+;;;###autoload
+(defun ediff-merge-directories-with-ancestor-command ()
+  (let ((file-a (nth 0 command-line-args-left))
+        (file-b (nth 1 command-line-args-left))
+        (ancestor (nth 2 command-line-args-left))
+        (regexp (nth 3 command-line-args-left)))
+    (setq command-line-args-left (nthcdr 4 command-line-args-left))
+    (ediff-merge-directories-with-ancestor file-a file-b ancestor regexp)))
+
+
+
 (require 'ediff-util)
 
 (run-hooks 'ediff-load-hook)
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 2dc1e502171..b351d896911 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -55,6 +55,7 @@
 ;; See `widget.el'.
 
 ;;; Code:
+(require 'cl-lib)
 
 ;;; Compatibility.
 
@@ -221,7 +222,7 @@ minibuffer."
         ((or widget-menu-minibuffer-flag
              (> (length items) widget-menu-max-shortcuts))
          ;; Read the choice of name from the minibuffer.
-         (setq items (widget-remove-if 'stringp items))
+         (setq items (cl-remove-if 'stringp items))
          (let ((val (completing-read (concat title ": ") items nil t)))
            (if (stringp val)
                (let ((try (try-completion val items)))
@@ -295,14 +296,6 @@ minibuffer."
              (error "Canceled"))
            value))))
 
-(defun widget-remove-if (predicate list)
-  (let (result (tail list))
-    (while tail
-      (or (funcall predicate (car tail))
-          (setq result (cons (car tail) result)))
-      (setq tail (cdr tail)))
-    (nreverse result)))
-
 ;;; Widget text specifications.
 ;;
 ;; These functions are for specifying text properties.
diff --git a/lisp/window.el b/lisp/window.el
index fc50bbb0d49..a2acd2a81b0 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -4347,6 +4347,9 @@ value can be also stored on disk and read back in a new session."
 (defvar window-state-put-list nil
   "Helper variable for `window-state-put'.")
 
+(defvar window-state-put-stale-windows nil
+  "Helper variable for `window-state-put'.")
+
 (defun window--state-put-1 (state &optional window ignore totals)
   "Helper function for `window-state-put'."
   (let ((type (car state)))
@@ -4429,9 +4432,14 @@ value can be also stored on disk and read back in a new session."
           (set-window-parameter window (car parameter) (cdr parameter))))
       ;; Process buffer related state.
       (when state
-        ;; We don't want to raise an error here so we create a buffer if
-        ;; there's none.
-        (set-window-buffer window (get-buffer-create (car state)))
+        ;; We don't want to raise an error in case the buffer does not
+        ;; exist anymore, so we switch to a previous one and save the
+        ;; window with the intention of deleting it later if possible.
+        (let ((buffer (get-buffer (car state))))
+          (if buffer
+              (set-window-buffer window buffer)
+            (switch-to-prev-buffer window)
+            (push window window-state-put-stale-windows)))
         (with-current-buffer (window-buffer window)
           (set-window-hscroll window (cdr (assq 'hscroll state)))
           (apply 'set-window-fringes
@@ -4491,6 +4499,7 @@ Optional argument IGNORE non-nil means ignore minimum window
 sizes and fixed size restrictions.  IGNORE equal `safe' means
 windows can get as small as `window-safe-min-height' and
 `window-safe-min-width'."
+  (setq window-state-put-stale-windows nil)
   (setq window (window-normalize-window window t))
   (let* ((frame (window-frame window))
          (head (car state))
@@ -4539,6 +4548,10 @@ windows can get as small as `window-safe-min-height' and
         (set-window-buffer window (current-buffer))
         (window--state-put-1 state window nil totals)
         (window--state-put-2 ignore))
+      (while window-state-put-stale-windows
+        (let ((window (pop window-state-put-stale-windows)))
+          (when (eq (window-deletable-p window) t)
+            (delete-window window))))
       (window--check frame))))
 
 (defun display-buffer-record-window (type window buffer)