Merge from mainline.

227 files changed, 6504 insertions, 4287 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9292732dc4c..bc34cbdcf0b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -9,6 +9,1265 @@
         * vc/vc-hg.el (vc-hg-ignore, vc-hg-ignore-completion-table):
         Remove.  Most code moved to vc.el.
 
+2013-09-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * net/tramp-gvfs.el (tramp-gvfs-mount-spec, tramp-synce-list-devices): 
+        * net/tramp-smb.el (tramp-smb-get-file-entries):
+        * net/tramp-sh.el (tramp-sh-handle-insert-directory)
+        (tramp-compute-multi-hops): Fix misuses of `add-to-list'.
+
+        * net/eww.el (eww-display-raw): Remove unused argument `charset'.
+        Update call to it.
+        (eww-change-select): Remove unused var `properties'.
+        (eww-make-unique-file-name): Remove unused var `base'.
+
+        * finder.el (finder-compile-keywords): Don't mess with windows.
+
+        * calculator.el (calculator-funcall): Fix typo in last change.
+
+        * vc/vc-git.el (vc-git-checkin): Make it possible to commit a merge.
+
+        * emacs-lisp/package.el (package-activate-1): Don't let a missing
+        <pkg>-autoloads.el file stop us.
+
+        * net/tramp.el (with-parsed-tramp-file-name): Silence compiler
+        warnings, and factor out common code.
+
+2013-09-03  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * progmodes/ruby-mode.el (ruby-calculate-indent): Consider
+        two-character operators and whether the character preceding them
+        changes their meaning (Bug#15208).
+
+2013-09-02  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+        Format code sent to Python shell for robustness.
+        * progmodes/python.el (python-shell-buffer-substring):
+        New function.
+        (python-shell-send-region, python-shell-send-buffer): Use it.
+
+2013-09-02  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-compat.el (tramp-compat-user-error): Move it ...
+        * net/tramp.el (tramp-user-error): ... here.
+        (tramp-find-method, tramp-check-proper-host)
+        (tramp-dissect-file-name, tramp-debug-message)
+        (tramp-handle-shell-command):
+        * net/tramp-adb.el (tramp-adb-handle-shell-command):
+        * net/tramp-gvfs.el (tramp-gvfs-file-name-handler): Adapt callees.
+
+        * net/tramp-cache.el (tramp-cache-print): Don't print text properties.
+
+2013-09-02  Martin Rudalics  <rudalics@gmx.at>
+
+        * avoid.el (mouse-avoidance-point-position)
+        (mouse-avoidance-too-close-p): Handle case where posn-at-point
+        returns nil.
+
+2013-09-02  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+        * progmodes/python.el (python-shell-completion-get-completions):
+        Drop use of deleted `comint-last-prompt-overlay'.
+        (python-nav-if-name-main): New command.
+
+2013-09-01  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (setwins, setwins_almost, setwins_for_subdirs):
+        Avoid leading space in $wins.  Otherwise the sed command used by
+        eg compile-main ends up containing "/*.el".  (Bug#15170)
+
+        * frame.el (frame-background-mode): Doc fix.  (Bug#15226)
+
+2013-08-30  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/bytecomp.el (byte-recompile-directory):
+        Fix is-this-a-directory logic.  (Bug#15220)
+
+2013-08-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * textmodes/css-mode.el: Use SMIE.
+        (css-smie-grammar): New var.
+        (css-smie--forward-token, css-smie--backward-token)
+        (css-smie-rules): New functions.
+        (css-mode): Use them.
+        (css-navigation-syntax-table): Remove var.
+        (css-backward-sexp, css-forward-sexp, css-indent-calculate-virtual)
+        (css-indent-calculate, css-indent-line): Remove functions.
+
+        Misc changes to reduce use of `(lambda...); and other cleanups.
+        * cus-edit.el: Use lexical-binding.
+        (customize-push-and-save, customize-apropos)
+        (custom-buffer-create-internal): Use closures.
+        * progmodes/bat-mode.el (bat-mode-syntax-table): "..." are strings.
+        * progmodes/ada-xref.el: Use setq.
+        * net/tramp.el (with-tramp-progress-reporter): Avoid setq.
+        * dframe.el: Use lexical-binding.
+        (dframe-frame-mode): Fix calling convention for hooks.  Use a closure.
+        * speedbar.el (speedbar-frame-mode): Adjust call accordingly.
+        * descr-text.el: Use lexical-binding.
+        (describe-text-widget, describe-text-sexp, describe-property-list):
+        Use closures.
+        * comint.el (comint-history-isearch-push-state): Use a closure.
+        * calculator.el: Use lexical-binding.
+        (calculator-number-to-string): Make it work with lexical-binding.
+        (calculator-funcall): Same and use cl-letf.
+
+        * emacs-lisp/lisp.el (lisp--company-doc-buffer)
+        (lisp--company-doc-string, lisp--company-location): New functions.
+        (lisp-completion-at-point): Use them to improve Company support.
+
+        * progmodes/ruby-mode.el (ruby-smie-grammar): Add rule for formal
+        params of lambda expressions.
+        (ruby-smie--implicit-semi-p): Refine rule (bug#15208).
+        (ruby-smie--opening-pipe-p): New function.
+        (ruby-smie--forward-token, ruby-smie--backward-token): Handle Ruby
+        symbols and matched |...| for formal params.
+        (ruby-smie-rules): Don't let the formal params of a "do" prevent it
+        from being treated as hanging.  Handle "rescue".
+
+2013-08-29  Glenn Morris  <rgm@gnu.org>
+
+        * progmodes/cc-engine.el (c-pull-open-brace):
+        Move definition before use.
+
+2013-08-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/cl-macs.el (cl-defsubst): Make it clear that args
+        are immutable.  Don't use `unsafe' any more.
+        (cl--defsubst-expand): Don't substitute at the same time as keeping
+        a residual unused let-binding.  Don't use `unsafe' any more.
+
+2013-08-29  Glenn Morris  <rgm@gnu.org>
+
+        * calendar/cal-china.el (calendar-chinese-year-cache):
+        Recenter on 2015.
+
+        * nxml/nxml-util.el (nxml-debug-clear-inside):
+        Use cl-loop rather than loop.
+
+        * net/eww.el (eww-mode-map): Lower-case menu bar entries look bad.
+
+        * progmodes/sh-script.el (sh-builtins) <bash>: Add some bash4-isms.
+
+2013-08-28  Glenn Morris  <rgm@gnu.org>
+
+        * progmodes/antlr-mode.el: No need to require cc-mode twice.
+
+        * progmodes/cc-bytecomp.el (cc-require): Handle uncompiled case.
+
+        * progmodes/cc-mode.el (c-define-abbrev-table): Handle NAME unbound.
+
+2013-08-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * simple.el (repeat-complex-command--called-interactively-skip):
+        New function.
+        (repeat-complex-command): Use it (bug#14136).
+
+        * progmodes/cc-mode.el: Minor cleanup of var declarations.
+        (c-define-abbrev-table): Add `doc' argument.
+        (c-mode-abbrev-table, c++-mode-abbrev-table)
+        (objc-mode-abbrev-table, java-mode-abbrev-table)
+        (idl-mode-abbrev-table, pike-mode-abbrev-table)
+        (awk-mode-abbrev-table): Use it.
+        (c-mode-syntax-table, c-mode-map, c++-mode-syntax-table)
+        (c++-mode-map, objc-mode-syntax-table, objc-mode-map)
+        (java-mode-syntax-table, java-mode-map, idl-mode-syntax-table)
+        (idl-mode-map, pike-mode-syntax-table, pike-mode-map, awk-mode-map):
+        Move initialization into the declaration; and remove any
+        autoload cookie.
+
+        * epg.el (epg--process-filter): Use with-current-buffer, save-excursion
+        and dynamic let binding.
+
+        * vc/smerge-mode.el: Remove redundant :group args.
+
+        * emacs-lisp/package.el (package-activate-1): Don't add unnecessarily
+        to load-path.
+
+2013-08-28  Juri Linkov  <juri@jurta.org>
+
+        * isearch.el (isearch-reread-key-sequence-naturally): Use non-nil
+        arg DONT-DOWNCASE-LAST of `read-key-sequence'.
+        (isearch-other-meta-char): Handle an undefined shifted printing
+        character by downshifting it.  (Bug#15200)
+
+2013-08-28  Juri Linkov  <juri@jurta.org>
+
+        * isearch.el (isearch-search): Change regexp error message for
+        non-regexp searches.  (Bug#15166)
+
+2013-08-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * Makefile.in (SHELL): Now @SHELL@, not /bin/sh,
+        for portability to hosts where /bin/sh has problems.
+
+2013-08-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/cconv.el (cconv--analyse-function): Improve warning.
+
+2013-08-27  Juri Linkov  <juri@jurta.org>
+
+        * isearch.el (isearch-other-meta-char): Don't store kmacro commands
+        in the keyboard macro.  (Bug#15126)
+
+2013-08-27  Juri Linkov  <juri@jurta.org>
+
+        * isearch.el (isearch-quote-char): Comment out converting unibyte
+        to multibyte, thus syncing with its `quoted-insert' counterpart.
+        (Bug#15166)
+
+2013-08-27  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (display-buffer-use-some-window): Add missing
+        argument in call of get-largest-window (Bug#15185).
+        Reported by Stephen Leake.
+
+2013-08-27  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/package.el (package-buffer-info): Fix message typo.
+
+2013-08-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/python.el (python-font-lock-keywords): Don't return nil
+        from a matcher-function unless there's no more matches (bug#15161).
+
+2013-08-26  Michael Albinus  <michael.albinus@gmx.de>
+
+        * minibuffer.el: Revert change from 2013-08-20.
+
+        * net/tramp.el (tramp-find-method, tramp-find-user): Mark result
+        with text property `tramp-default', if appropriate.
+        (tramp-check-proper-host): New defun.
+        (tramp-dissect-file-name): Do not check hostname.  Revert change
+        of 2013-03-18.
+        (tramp-backtrace): Make VEC-OR-PROC optional.
+
+        * net/tramp-adb.el (tramp-adb-maybe-open-connection):
+        * net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection):
+        * net/tramp-sh.el (tramp-maybe-open-connection):
+        * net/tramp-smb.el (tramp-smb-maybe-open-connection):
+        Apply `tramp-check-proper-host'.
+
+2013-08-26  Tassilo Horn  <tsdh@gnu.org>
+
+        * epa-hook.el (epa-file-encrypt-to): Quote `safe-local-variable'
+        lambda expression in order to have `describe-variable' display it.
+
+2013-08-26  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-sh-handle-verify-visited-file-modtime):
+        BUF can be optional.  (Bug#15186)
+
+2013-08-25  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * progmodes/flymake.el (flymake-get-real-file-name-function):
+        Fix broken customization.  (Bug#15184)
+
+2013-08-25  Alan Mackenzie  <acm@muc.de>
+
+        Improve indentation of bracelists defined by macros (without "=").
+
+        * progmodes/cc-engine.el (c-inside-bracelist-p): When a macro
+        expansion begins with "{", regard it as bracelist when it doesn't
+        contain a ";".
+
+        Parse C++ inher-intro when there's a template split over 2 lines.
+
+        * progmodes/cc-engine.el (c-guess-basic-syntax CASE 5C): Code more
+        rigorously the search for "class" etc. followed by ":".
+
+        * progmodes/cc-langs.el (c-opt-<>-sexp-key): Make the value for
+        random languages a regexp which never matches rather than nil.
+
+        Handle "/"s more accurately in test for virtual semicolons (AWK Mode).
+
+        * progmodes/cc-awk.el (c-awk-one-line-possibly-open-string-re)
+        (c-awk-regexp-one-line-possibly-open-char-list-re)
+        (c-awk-one-line-possibly-open-regexp-re)
+        (c-awk-one-line-non-syn-ws*-re): Remove.
+        (c-awk-possibly-open-string-re, c-awk-non-/-syn-ws*-re)
+        (c-awk-space*-/-re, c-awk-space*-regexp-/-re)
+        (c-awk-space*-unclosed-regexp-/-re): New constants.
+        (c-awk-at-vsemi-p): Reformulate better to recognize "/"s which
+        aren't regexp delimiters.
+
+        * progmodes/cc-engine.el (c-crosses-statement-barrier-p): Add in
+        handling for a rare situation in AWK Mode involving unterminated
+        strings/regexps.
+
+2013-08-23  Glenn Morris  <rgm@gnu.org>
+
+        * files.el (auto-mode-alist): Use sh-mode for .bash_history.
+
+        * files.el (interpreter-mode-alist): Use tcl-mode for expect scripts.
+
+        * files.el (create-file-buffer): If the result would begin with
+        spaces, prepend a "|" instead of removing them.  (Bug#15162)
+
+2013-08-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * textmodes/fill.el (fill-match-adaptive-prefix): Don't throw away
+        text-properties (bug#15155).
+
+        * calc/calc-keypd.el (calc-keypad-execute): `x-flush-mouse-queue' doesn't
+        exist any more.
+        (calc-keypad-redraw): Remove unused var `pad'.
+        (calc-keypad-press): Remove unused var `menu'.
+
+2013-08-23  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (display-buffer-pop-up-frame):
+        Call pop-up-frame-function with BUFFER current so `make-frame' will
+        use it as the new frame's buffer (Bug#15133).
+
+2013-08-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * calendar/timeclock.el: Minor cleanups.
+        (timeclock-ask-before-exiting, timeclock-use-display-time):
+        Use `symbol'.
+        (timeclock-modeline-display): Define as alias before the
+        actual definition.
+        (timeclock-mode-line-display): Use define-minor-mode.
+        (timeclock-day-list-template): Make it a function, add an argument.
+        (timeclock-day-list-required, timeclock-day-list-length)
+        (timeclock-day-list-debt, timeclock-day-list-span)
+        (timeclock-day-list-break): Adjust calls accordingly.
+
+2013-08-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/pp.el (pp-eval-expression, pp-macroexpand-expression):
+        Use read--expression so that completion works again.
+
+2013-08-21  Sam Steingold  <sds@gnu.org>
+
+        Add rudimentary inferior shell interaction
+        * progmodes/sh-script.el (sh-shell-process): New buffer-local variable.
+        (sh-set-shell): Reset it.
+        (sh-show-shell, sh-cd-here, sh-send-line-or-region-and-step):
+        New commands (bound to C-c C-z, C-c C-d, and C-c C-n).
+
+2013-08-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * align.el: Use lexical-binding.
+        (align-region): Simplify accordingly.
+
+2013-08-20  Michael Albinus  <michael.albinus@gmx.de>
+
+        * minibuffer.el (completion--sifn-requote): Bind `non-essential'.
+
+        * rfn-eshadow.el (rfn-eshadow-update-overlay): Move binding of
+        `non-essential' up.
+
+2013-08-17  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el:
+        * net/tramp-adb.el:
+        * net/tramp-cmds.el:
+        * net/tramp-ftp.el:
+        * net/tramp-gvfs.el:
+        * net/tramp-gw.el:
+        * net/tramp-sh.el: Don't wrap external variable declarations by
+        `eval-when-compile'.
+
+2013-08-16  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * net/shr.el (shr-rescale-image): Use ImageMagick even for GIFs
+        now that Emacs supports ImageMagick animations.
+
+2013-08-16  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-cmds.el (top): Don't declare `buffer-name'.
+        (tramp-append-tramp-buffers): Rewrite buffer local variables part.
+
+2013-08-16  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (mouse-autoselect-window-select): Do autoselect when
+        mouse pointer is on margin.
+
+2013-08-16  William Parsons  <wbparsons@alum.mit.edu>  (tiny change)
+
+        * net/ange-ftp.el (ange-ftp-skip-msgs): Add 500 EPSV.  (Bug#1972)
+
+2013-08-16  Glenn Morris  <rgm@gnu.org>
+
+        * net/ange-ftp.el (ange-ftp-good-msgs, ange-ftp-get-pwd):
+        Handle "Remote Directory" response of some clients.  (Bug#15058)
+
+        * emacs-lisp/bytecomp.el (byte-compile-make-variable-buffer-local):
+        Tweak warning.  (Bug#14926)
+
+        * menu-bar.el (send-mail-item-name, read-mail-item-name): Remove.
+        (menu-bar-tools-menu): Simplify news and mail items.  (Bug#15095)
+
+        * image-mode.el (image-mode-map): Add menu items to reverse,
+        increase, decrease, reset animation speed.
+        (image--set-speed, image-increase-speed, image-decrease-speed)
+        (image-reverse-speed, image-reset-speed): New functions.
+        (image-mode-map): Add bindings for speed commands.
+
+        * image.el (image-animate-get-speed, image-animate-set-speed):
+        New functions.
+        (image-animate-timeout): Respect image :speed property.
+
+2013-08-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/debug.el (debugger-setup-buffer): Put point on the
+        previous line (bug#15101).
+        (debugger-eval-expression, debugger-record-expression):
+        Use read--expression (bug#15102).
+
+2013-08-15  Michael Albinus  <michael.albinus@gmx.de>
+
+        Remove byte compiler warnings, visible when compiling with
+        `byte-compile-force-lexical-warnings' set to t.
+
+        * net/tramp.el (tramp-debug-message, tramp-message, tramp-error)
+        (tramp-error-with-buffer): Rename ARGS to ARGUMENTS and BUFFER to BUF.
+        (tramp-handle-unhandled-file-name-directory)
+        (tramp-handle-file-notify-add-watch, tramp-action-login)
+        (tramp-action-succeed, tramp-action-permission-denied)
+        (tramp-action-terminal, tramp-action-process-alive): Prefix unused
+        arguments with "_".
+
+        * net/tramp-adb.el (tramp-adb-parse-device-names)
+        (tramp-adb-handle-insert-directory, tramp-adb-handle-delete-file)
+        (tramp-adb-handle-copy-file): Prefix unused arguments with "_".
+        (tramp-adb-handle-file-truename): Remove unused arguments.
+
+        * net/tramp-cache.el (tramp-flush-directory-property)
+        (tramp-flush-connection-property, tramp-list-connections)
+        (tramp-parse-connection-properties): Prefix unused arguments with "_".
+
+        * net/tramp-compat.el (tramp-compat-make-temp-file):
+        Rename FILENAME to F.
+
+        * net/tramp-gvfs.el (tramp-gvfs-handle-file-notify-add-watch)
+        (tramp-gvfs-handle-write-region, tramp-bluez-parse-device-names)
+        (tramp-zeroconf-parse-workstation-device-names)
+        (tramp-zeroconf-parse-webdav-device-names)
+        (tramp-synce-parse-device-names): Prefix unused arguments with "_".
+
+        * net/tramp-gw.el (tramp-gw-gw-proc-sentinel)
+        (tramp-gw-aux-proc-sentinel): Prefix unused arguments with "_".
+
+        * net/tramp-sh.el (tramp-sh-handle-file-truename): Remove unused
+        arguments.
+        (tramp-sh-handle-copy-file, tramp-sh-handle-dired-compress-file)
+        (tramp-sh-handle-insert-file-contents-literally)
+        (tramp-sh-handle-file-notify-add-watch): Prefix unused arguments
+        with "_".
+        (tramp-do-copy-or-rename-file, tramp-barf-if-no-shell-prompt):
+        Remove unused variables.
+
+        * net/tramp-smb.el (tramp-smb-handle-copy-directory)
+        (tramp-smb-handle-copy-file, tramp-smb-handle-delete-file)
+        (tramp-smb-read-file-entry): Prefix unused arguments with "_".
+
+        * net/tramp-uu.el (tramp-uu-b64-alphabet, tramp-uu-b64-char-to-byte):
+        Make them a defconst.
+        (tramp-uuencode-region): Remove unused variable.
+
+2013-08-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * frameset.el (frameset--prop-setter): New function.
+        (frameset-prop): Add gv-setter declaration.
+        (frameset-filter-minibuffer): Deal with the case that the minibuffer
+        parameter was already set in FILTERED.  Doc fix.
+        (frameset--record-minibuffer-relationships): Allow saving a
+        minibufferless frame without its corresponding minibuffer frame.
+        (frameset--reuse-frame): Accept a match from an orphaned minibufferless
+        frame, if the frame id matches.
+        (frameset--minibufferless-last-p): Sort non-orphaned minibufferless
+        frames before orphaned ones.
+        (frameset-restore): Warn about orphaned windows, instead of error out.
+
+2013-08-14  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (window-make-atom): Don't overwrite parameter
+        already present.
+        (display-buffer-in-atom-window): Handle special case where we
+        split an already atomic window.
+        (window--major-non-side-window, display-buffer-in-side-window)
+        (window--side-check): Ignore minibuffer window when walking
+        window tree.
+        (window-deletable-p): Return 'frame only if no other frame uses
+        our minibuffer window.
+        (record-window-buffer): Run buffer-list-update-hook.
+        (split-window): Make sure window--check-frame won't destroy an
+        existing atomic window in case the new window gets nested
+        inside.
+        (display-buffer-at-bottom): Ignore minibuffer window when
+        walking window tree.  Don't split a side window.
+        (pop-to-buffer): Don't set-buffer here, the select-window call
+        should do that.
+        (mouse-autoselect-window-select): Autoselect only if we are in the
+        text portion of the window.
+
+2013-08-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * net/shr.el (shr-parse-image-data): New function to grab both the
+        data itself and the Content-Type.
+        (shr-put-image): Use it.
+
+        * net/eww.el (eww-display-image): Ditto.
+
+        * image.el (image-content-type-suffixes): New variable.
+
+2013-08-13  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+        * progmodes/python.el (python-imenu--build-tree)
+        (python-imenu--put-parent): Simplify and Fix (GH bug 146).
+
+2013-08-13  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * simple.el (backward-word): Mention the optional argument.
+
+2013-08-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * frameset.el (frameset--make): Rename constructor from make-frameset.
+        (frameset-p, frameset-valid-p): Don't autoload.
+        (frameset-valid-p): Use normal accessors.
+
+2013-08-13  Glenn Morris  <rgm@gnu.org>
+
+        * progmodes/compile.el (compile-command): Tweak example in doc.
+        * obsolete/scribe.el (scribe-mode):
+        * progmodes/mixal-mode.el (mixal-mode): Quote buffer name.  (Bug#15053)
+
+        * mail/feedmail.el (feedmail-confirm-outgoing)
+        (feedmail-display-full-frame, feedmail-deduce-bcc-where): Fix types.
+
+        * cus-start.el (truncate-partial-width-windows): Fix type.
+
+        * emulation/viper-init.el (viper-search-scroll-threshold): Fix type.
+
+        * net/shr.el (shr-table-horizontal-line): Fix custom type.
+
+2013-08-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/timer.el (timer--time-setter): New function.
+        (timer--time): Use it as gv-setter.
+
+        * emacs-lisp/gv.el (gv-define-simple-setter): Output warning when
+        setter is not a symbol.
+
+2013-08-12  Grégoire Jadi  <daimrod@gmail.com>
+
+        * mail/sendmail.el (sendmail-send-it): Don't kill the error buffer
+        if sending fails.  This makes debugging easier.
+
+2013-08-12  Juanma Barranquero  <lekktu@gmail.com>
+
+        * xml.el (xml-parse-tag-1): Use looking-at (this reverts change in
+        2013-08-11T00:07:48Z!lekktu@gmail.com, which breaks the test suite).
+        https://lists.gnu.org/archive/html/emacs-devel/2013-08/msg00263.html
+
+2013-08-12  Eli Zaretskii  <eliz@gnu.org>
+
+        * term/w32-win.el (dynamic-library-alist): Add DLLs for zlib.
+
+2013-08-12  Glenn Morris  <rgm@gnu.org>
+
+        * format.el (format-annotate-function):
+        Handle read-only text properties in the source.  (Bug#14887)
+
+2013-08-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * net/eww.el (eww-display-html): Ignore coding system errors.
+        One web site uses "utf-8lias" as the coding system.
+
+2013-08-11  Juanma Barranquero  <lekktu@gmail.com>
+
+        * frameset.el (frameset-valid-p): Fix check; STATES can indeed be nil.
+
+2013-08-10  Juanma Barranquero  <lekktu@gmail.com>
+
+        * tutorial.el (tutorial--describe-nonstandard-key): Use string-match-p.
+        (tutorial--detailed-help): Remove unused local variables.
+        (tutorial--save-tutorial-to): Use ignore-errors.
+        (help-with-tutorial): Use looking-at-p.
+
+        * view.el (view-buffer-other-window, view-buffer-other-frame):
+        Mark unused arguments.
+
+        * woman.el (woman-parse-colon-path, woman-parse-colon-path)
+        (woman-select-symbol-fonts, woman, woman-find-file)
+        (woman-insert-file-contents, woman-non-underline-faces):
+        Use string-match-p.
+        (woman1-unquote): Move declaration.
+
+        * xml.el (xml-parse-tag-1, xml-parse-string): Use looking-at-p.
+        (xml-parse-dtd): Use looking-at-p, string-match-p.  Mark unused
+        argument.  Remove unused local variable.
+        (xml-parse-elem-type): Use string-match-p.
+        (xml-substitute-numeric-entities): Use ignore-errors.
+
+        * calculator.el (calculator): Mark unused argument.
+        (calculator-paste, calculator-quit, calculator-integer-p):
+        Use ignore-errors.
+        (calculator-string-to-number, calculator-decimal, calculator-exp)
+        (calculator-op-or-exp): Use string-match-p.
+
+        * dired.el (dired-buffer-more-recently-used-p): Declare.
+        (dired-insert-set-properties, dired-insert-old-subdirs):
+        Use ignore-errors.
+
+        * dired-aux.el (dired-compress): Use ignore-errors.
+        (dired-do-chxxx, dired-do-chmod, dired-trample-file-versions)
+        (dired-do-async-shell-command, dired-do-shell-command)
+        (dired-shell-stuff-it, dired-compress-file, dired-insert-subdir)
+        (dired-insert-subdir-validate): Use string-match-p.
+        (dired-map-dired-file-lines, dired-subdir-hidden-p): Use looking-at-p.
+        (dired-add-entry): Use string-match-p, looking-at-p.
+        (dired-insert-subdir-newpos): Remove unused local variable.
+
+        * filenotify.el (file-notify-callback): Remove unused local variable.
+
+        * filesets.el (filesets-error): Mark unused argument.
+        (filesets-which-command-p, filesets-filter-dir-names)
+        (filesets-directory-files, filesets-get-external-viewer)
+        (filesets-ingroup-get-data): Use string-match-p.
+
+        * find-file.el (ff-other-file-name, ff-other-file-name)
+        (ff-find-the-other-file, ff-cc-hh-converter):
+        Remove unused local variables.
+        (ff-get-file-name): Use string-match-p.
+        (ff-all-dirs-under): Use ignore-errors.
+
+        * follow.el (follow-comint-scroll-to-bottom): Mark unused argument.
+        (follow-select-if-visible): Remove unused local variable.
+
+        * forms.el (read-file-filter): Move declaration.
+        (forms--make-format, forms--make-parser, forms-insert-record):
+        Quote function with #'.
+        (forms--update): Use string-match-p.  Quote function with #'.
+
+        * help-mode.el (help-dir-local-var-def): Mark unused argument.
+        (help-make-xrefs): Use looking-at-p.
+        (help-xref-on-pp): Use looking-at-p, ignore-errors.
+
+        * ibuffer.el (ibuffer-ext-visible-p): Declare.
+        (ibuffer-confirm-operation-on): Use string-match-p.
+
+        * msb.el (msb-item-handler, msb-dired-item-handler):
+        Mark unused arguments.
+
+        * ses.el (ses-decode-cell-symbol)
+        (ses-kill-override): Remove unused local variable.
+        (ses-create-cell-variable, ses-relocate-formula): Use string-match-p.
+        (ses-load): Use ignore-errors, looking-at-p.
+        (ses-jump-safe): Use ignore-errors.
+        (ses-export-tsv, ses-export-tsf, ses-unsafe): Mark unused arguments.
+
+        * tabify.el (untabify, tabify): Mark unused arguments.
+
+        * thingatpt.el (thing-at-point--bounds-of-well-formed-url):
+        Mark unused argument.
+        (bounds-of-thing-at-point, thing-at-point-bounds-of-list-at-point)
+        (thing-at-point-newsgroup-p, form-at-point): Use ignore-errors.
+
+        * emacs-lisp/timer.el (timer--time): Define setter with
+        gv-define-setter to avoid deprecation warning.
+
+        * completion.el: Remove stuff unused since revno:3176 (1993-05-27).
+        (*record-cmpl-statistics-p*): Remove (was commented out).
+        (cmpl-statistics-block): Remove (body was commented out).
+        All callers changed.
+        (add-completions-from-buffer, load-completions-from-file):
+        Remove unused variables.
+
+2013-08-09  Juanma Barranquero  <lekktu@gmail.com>
+
+        * filecache.el (file-cache-delete-file-list):
+        Print message only when told so.
+        (file-cache-files-matching): Use #' in mapconcat argument.
+
+        * ffap.el (ffap-url-at-point): Fix reference to variable
+        thing-at-point-default-mail-uri-scheme.
+
+2013-08-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * subr.el (define-error): New function.
+        * progmodes/ada-xref.el (ada-error-file-not-found): Rename from
+        error-file-not-found and define with define-error.
+        * emacs-lisp/cl-lib.el (cl-assertion-failed): Move here from subr.el
+        and define with define-error.
+        * userlock.el (file-locked, file-supersession):
+        * simple.el (mark-inactive):
+        * progmodes/js.el (js-moz-bad-rpc, js-js-error):
+        * progmodes/ada-mode.el (ada-mode-errors):
+        * play/life.el (life-extinct):
+        * nxml/xsd-regexp.el (xsdre-invalid-regexp, xsdre-parse-error):
+        * nxml/xmltok.el (xmltok-markup-declaration-parse-error):
+        * nxml/rng-util.el (rng-error):
+        * nxml/rng-uri.el (rng-uri-error):
+        * nxml/rng-match.el (rng-compile-error):
+        * nxml/rng-cmpct.el (rng-c-incorrect-schema):
+        * nxml/nxml-util.el (nxml-error, nxml-file-parse-error):
+        * nxml/nxml-rap.el (nxml-scan-error):
+        * nxml/nxml-outln.el (nxml-outline-error):
+        * net/soap-client.el (soap-error):
+        * net/gnutls.el (gnutls-error):
+        * net/ange-ftp.el (ftp-error):
+        * mpc.el (mpc-proc-error):
+        * json.el (json-error, json-readtable-error, json-unknown-keyword)
+        (json-number-format, json-string-escape, json-string-format)
+        (json-key-format, json-object-format):
+        * jka-compr.el (compression-error):
+        * international/quail.el (quail-error):
+        * international/kkc.el (kkc-error):
+        * emacs-lisp/ert.el (ert-test-failed):
+        * calc/calc.el (calc-error, inexact-result, math-overflow)
+        (math-underflow):
+        * bookmark.el (bookmark-error-no-filename):
+        * epg.el (epg-error): Define with define-error.
+
+        * time.el (display-time-event-handler)
+        (display-time-next-load-average): Don't call sit-for since it seems
+        unnecessary (bug#15045).
+
+        * emacs-lisp/checkdoc.el: Remove redundant :group keywords.
+        Use #' instead of ' to quote functions.
+        (checkdoc-output-mode): Use setq-local.
+        (checkdoc-spellcheck-documentation-flag, checkdoc-ispell-lisp-words)
+        (checkdoc-verb-check-experimental-flag, checkdoc-proper-noun-regexp)
+        (checkdoc-common-verbs-regexp): Mark safe-local-variable (bug#15010).
+        (checkdoc-ispell, checkdoc-ispell-current-buffer)
+        (checkdoc-ispell-interactive, checkdoc-ispell-message-interactive)
+        (checkdoc-ispell-message-text, checkdoc-ispell-start)
+        (checkdoc-ispell-continue, checkdoc-ispell-comments)
+        (checkdoc-ispell-defun): Remove unused arg `take-notes'.
+
+        * ido.el (ido-completion-help): Fix up compiler warning.
+
+2013-08-09  Juanma Barranquero  <lekktu@gmail.com>
+
+        * frameset.el (frameset-p): Add autoload cookie.
+        (frameset--jump-to-register): New function, based on code moved from
+        register.el.
+        (frameset-to-register): Move from register.el.  Adapt to `registerv'.
+
+        * register.el (frameset-frame-id, frameset-frame-with-id, frameset-p)
+        (frameset-restore, frameset-save, frameset-session-filter-alist):
+        Remove declarations.
+        (register-alist): Doc fix.
+        (frameset-to-register): Move to frameset.el.
+        (jump-to-register, describe-register-1): Remove frameset-specific code.
+
+2013-08-08  Juanma Barranquero  <lekktu@gmail.com>
+
+        * allout-widgets.el (allout-widgets-pre-command-business)
+        (allout-widgets-post-command-business)
+        (allout-widgets-after-change-handler)
+        (allout-decorate-item-and-context, allout-set-boundary-marker)
+        (allout-body-modification-handler)
+        (allout-graphics-modification-handler): Mark ignored arguments.
+        (allout-widgets-post-command-business)
+        (allout-widgets-exposure-change-processor)
+        (allout-widgets-exposure-undo-processor)
+        (allout-decorate-item-and-context, allout-redecorate-visible-subtree)
+        (allout-parse-item-at-point, allout-decorate-item-guides)
+        (allout-decorate-item-cue, allout-item-span): Remove unused variables.
+        * allout.el (epa-passphrase-callback-function): Declare.
+        (allout-overlay-insert-in-front-handler)
+        (allout-overlay-interior-modification-handler)
+        (allout-isearch-end-handler, allout-chart-siblings)
+        (allout-up-current-level, allout-end-of-level, allout-reindent-body)
+        (allout-yank-processing, allout-process-exposed)
+        (allout-latex-verb-quote, allout-latexify-one-item, outlineify-sticky)
+        (allout-latex-verbatim-quote-curr-line): Remove unused variables.
+        * emacs-lisp/lisp-mode.el (lisp-eval-defun, last-sexp-toggle-display)
+        (lisp-indent-defform): Mark ignored arguments.
+        (lisp-indent-line): Mark ignored arguments.  Remove unused variables.
+        (calculate-lisp-indent): Remove unused variables.
+        * international/characters.el (indian-2-column, arabic-2-column)
+        (tibetan): Mark ignored arguments.
+        (use-cjk-char-width-table): Mark ignored arguments.
+        Remove unused variables.
+        * international/fontset.el (build-default-fontset-data)
+        (x-compose-font-name, create-fontset-from-fontset-spec):
+        Mark ignored arguments.
+        (fontset-plain-name): Remove unused variables.
+        * international/mule.el (charset-id, charset-bytes, generic-char-p)
+        (keyboard-coding-system): Mark ignored arguments.
+        (find-auto-coding): Remove unused variables.  Use `ignore-errors'.
+        * help.el (resize-temp-buffer-window):
+        * window.el (display-buffer-in-major-side-window)
+        (display-buffer-in-side-window, display-buffer-in-previous-window):
+        Remove unused variables.
+        * isearch.el (isearch-forward-symbol):
+        * version.el (emacs-bzr-version-bzr):
+        * international/mule-cmds.el (current-language-environment):
+        * term/common-win.el (x-handle-iconic, x-handle-geometry)
+        (x-handle-display):
+        * term/pc-win.el (x-list-fonts, x-display-planes)
+        (x-display-color-cells, x-server-max-request-size, x-server-vendor)
+        (x-server-version, x-display-screens, x-display-mm-height)
+        (x-display-mm-width, x-display-backing-store, x-display-visual-class)
+        (x-selection-owner-p, x-own-selection-internal)
+        (x-disown-selection-internal, x-get-selection-internal)
+        (msdos-initialize-window-system):
+        * term/tty-colors.el (tty-color-alist, tty-color-clear):
+        * term/x-win.el (x-handle-no-bitmap-icon):
+        * vc/vc-hooks.el (vc-mode, vc-default-make-version-backups-p)
+        (vc-default-find-file-hook, vc-default-extra-menu):
+        Mark ignored arguments.
+
+2013-08-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/edebug.el (edebug-debugger): Use edebug-eval to run the
+        break-condition in the context of the debugged code (bug#12685).
+
+2013-08-08  Christopher Schmidt  <christopher@ch.ristopher.com>
+
+        * comint.el:
+        Do not use an overlay to highlight the last prompt.  (Bug#14744)
+        (comint-mode): Make comint-last-prompt buffer local.
+        (comint-last-prompt): New variable.
+        (comint-last-prompt-overlay): Remove.  Superseded by
+        comint-last-prompt.
+        (comint-snapshot-last-prompt, comint-output-filter):
+        Use comint-last-prompt.
+
+2013-08-08  Juanma Barranquero  <lekktu@gmail.com>
+
+        * frameset.el (frameset-valid-p): Check vector length.  Doc fix.
+        (frameset-save): Check validity of the resulting frameset.
+
+2013-08-08  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * ido.el (ido-record-command): Add doc string.
+
+2013-08-08  Juanma Barranquero  <lekktu@gmail.com>
+
+        * frameset.el (frameset): Do not disable creation of the default
+        frameset-p predicate.  Doc fix.
+        (frameset-valid-p): New function, copied from the old predicate-p.
+        Add additional checks.
+        (frameset-restore): Check with frameset-valid-p.
+        (frameset-p, frameset-version, frameset-timestamp, frameset-app)
+        (frameset-name, frameset-description, frameset-properties)
+        (frameset-states): Add docstring.
+        (frameset-session-filter-alist, frameset-persistent-filter-alist)
+        (frameset-filter-alist): Doc fixes.
+
+2013-08-08  Juanma Barranquero  <lekktu@gmail.com>
+
+        * frameset.el (frameset-p, frameset-prop): Doc fixes.
+
+2013-08-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/bytecomp.el (byte-compile-function-warn): New function,
+        extracted from byte-compile-callargs-warn and byte-compile-normal-call.
+        (byte-compile-callargs-warn, byte-compile-function-form): Use it.
+        (byte-compile-normal-call): Remove obsolescence check.
+
+2013-08-08  Juanma Barranquero  <lekktu@gmail.com>
+
+        * frameset.el (frameset-restore): Doc fix.
+
+        * register.el (frameset-frame-id, frameset-frame-with-id)
+        (frameset-p, frameset-restore, frameset-save): Declare.
+        (register-alist): Document framesets.
+        (frameset-session-filter-alist): Declare.
+        (frameset-to-register): New function.
+        (jump-to-register): Implement jumping to framesets.  Doc fix.
+        (describe-register-1): Describe framesets.
+
+        * bindings.el (ctl-x-r-map): Bind ?f to frameset-to-register.
+
+2013-08-07  Juanma Barranquero  <lekktu@gmail.com>
+
+        * desktop.el (desktop-save-frameset): Use new frameset-save args.
+        Use lexical-binding.
+
+        * frameset.el (frameset): Use type vector, not list (incompatible
+        change).  Do not declare a new constructor, use the default one.
+        Upgrade suggested properties `app', `name' and `desc' to slots `app',
+        `name' and `description', respectively, and add read-only slot
+        `timestamp'.  Doc fixes.
+        (frameset-copy, frameset-persistent-filter-alist)
+        (frameset-filter-alist, frameset-switch-to-gui-p)
+        (frameset-switch-to-tty-p, frameset-filter-tty-to-GUI)
+        (frameset-filter-sanitize-color, frameset-filter-minibuffer)
+        (frameset-filter-iconified, frameset-keep-original-display-p):
+        Doc fixes.
+        (frameset-filter-shelve-param, frameset-filter-unshelve-param):
+        Rename from frameset-filter-(save|restore)-param.  All callers changed.
+        Doc fix.
+        (frameset-p): Adapt to change to vector and be more thorough.
+        Change arg name to OBJECT.  Doc fix.
+        (frameset-prop): Rename arg PROP to PROPERTY.  Doc fix.
+        (frameset-session-filter-alist): Rename from frameset-live-filter-alist.
+        All callers changed.
+        (frameset-frame-with-id): Rename from frameset-locate-frame-id.
+        All callers changed.
+        (frameset--record-minibuffer-relationships): Rename from
+        frameset--process-minibuffer-frames.  All callers changed.
+        (frameset-save): Add new keyword arguments APP, NAME and DESCRIPTION.
+        Use new default constructor (again).  Doc fix.
+        (frameset--find-frame-if): Rename from `frameset--find-frame.
+        All callers changed.
+        (frameset--reuse-frame): Rename arg FRAME-CFG to PARAMETERS.
+        (frameset--initial-params): Rename arg FRAME-CFG to PARAMETERS.
+        Doc fix.
+        (frameset--restore-frame): Rename args FRAME-CFG and WINDOW-CFG to
+        PARAMETERS and WINDOW-STATE, respectively.
+        (frameset-restore): Add new keyword argument PREDICATE.
+        Reset frameset--target-display to nil.  Doc fix.
+
+2013-08-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/bat-mode.el (bat--syntax-propertize): New var.
+        (bat-mode): Use it.
+        (bat-mode-syntax-table): Mark \n as end-of-comment.
+        (bat-font-lock-keywords): Remove comment rule.
+
+        * progmodes/bat-mode.el: Rename from dos.el.  Use "bat-" prefix.
+        (dos-mode-help): Remove.  Use describe-mode (C-h m) instead.
+
+        * emacs-lisp/bytecomp.el: Check existence of f in #'f.
+        (byte-compile-callargs-warn): Use `push'.
+        (byte-compile-arglist-warn): Ignore higher-order "calls".
+        (byte-compile-file-form-autoload): Use `pcase'.
+        (byte-compile-function-form): If quoting a symbol, check that it exists.
+
+2013-08-07  Eli Zaretskii  <eliz@gnu.org>
+
+        * progmodes/dos.el (dos-font-lock-keywords): Rename LINUX to UNIX
+        and add a few popular commands found in batch files.
+        (dos, dos-label-face, dos-cmd-help, dos-run, dos-run-args)
+        (dos-mode): Doc fixes.
+
+2013-08-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/dos.el (auto-mode-alist): Add entries for dos-mode.
+        (dos-mode): Use setq-local.  Add space after "rem".
+        (dos-mode-syntax-table): Don't use "w" for symbol chars.
+        (dos-font-lock-keywords): Try to adjust font-lock rules accordingly.
+
+2013-08-07  Arni Magnusson  <arnima@hafro.is>
+
+        * progmodes/dos.el: New file.
+        * generic-x.el (bat-generic-mode): Redefine as an obsolete alias to
+        dos-mode.
+
+2013-08-06  Glenn Morris  <rgm@gnu.org>
+
+        * calendar/calendar.el: Add new faces, and day-header-array.
+        (calendar-weekday-header, calendar-weekend-header)
+        (calendar-month-header): New faces.
+        (calendar-day-header-construct): New function.
+        (calendar-day-header-width): Also :set calendar-day-header-array.
+        (calendar-american-month-header, calendar-european-month-header)
+        (calendar-iso-month-header): Use calendar- faces.
+        (calendar-generate-month):
+        Use calendar-day-header-array for day headers; apply faces to them.
+        (calendar-mode): Check calendar-font-lock-keywords non-nil.
+        (calendar-abbrev-construct): Add optional maxlen argument.
+        (calendar-day-name-array): Doc fix.
+        (calendar-day-name-array, calendar-abbrev-length)
+        (calendar-day-abbrev-array):
+        Also :set calendar-day-header-array, and maybe redraw.
+        (calendar-day-header-array): New option.  (Bug#15007)
+        (calendar-font-lock-keywords): Set to nil and make obsolete.
+        (calendar-day-name): Add option to use header array.
+
+2013-08-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * net/shr.el (shr-render-td): Remove debugging.
+        (shr-render-td): Make width computation consistent by defaulting
+        all zero-width columns to 10 characters.  This may not be optimal,
+        but it's at least consistent.
+        (shr-make-table-1): Redo last change to fix the real problem in
+        colspan handling.
+
+2013-08-06  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * files.el (cache-long-line-scans):
+        Make obsolete alias to `cache-long-scans'.
+
+2013-08-06  Juanma Barranquero  <lekktu@gmail.com>
+
+        * frameset.el (frameset, frameset-filter-alist)
+        (frameset-filter-params, frameset-save, frameset--reuse-frame)
+        (frameset--minibufferless-last-p, frameset-restore): Doc fixes.
+        (frameset-compute-pos): Rename from frameset--compute-pos,
+        and add docstring.
+        (frameset-move-onscreen): Use frameset-compute-pos.
+        Most changes suggested by Drew Adams <drew.adams@oracle.com>.
+
+        * find-lisp.el (find-lisp-line-indent, find-lisp-find-dired-filter):
+        Fix typos in docstrings.
+
+2013-08-06  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * frame.el (get-other-frame): Tiny cleanup.
+
+2013-08-06  Juanma Barranquero  <lekktu@gmail.com>
+
+        * vc/vc.el (vc-default-ignore-completion-table):
+        Silence byte-compiler warning.
+
+        * frameset.el (frameset-p): Don't check non-nullness of the `properties'
+        slot , which can indeed be nil.
+        (frameset-live-filter-alist, frameset-persistent-filter-alist):
+        Move entry for `left' from persistent to live filter alist.
+        (frameset-filter-alist, frameset--minibufferless-last-p, frameset-save):
+        Doc fixes.
+        (frameset-filter-params): When restoring a frame, copy items added to
+        `filtered', to avoid unwittingly modifying the original parameters.
+        (frameset-move-onscreen): Rename from frameset--move-onscreen.  Doc fix.
+        (frameset--restore-frame): Fix reference to frameset-move-onscreen.
+
+        * dired.el (dired-insert-directory): Revert change in 2013-06-21T12:24:37Z!lekktu@gmail.com
+        to use looking-at-p instead of looking-at.  (Bug#15028)
+
+2013-08-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        Revert introduction of isearch-filter-predicates (bug#14714).
+        Rely on add-function instead.
+        * isearch.el (isearch-filter-predicates): Rename it back to
+        isearch-filter-predicate.
+        (isearch-message-prefix): Use advice-function-mapc and advice
+        properties to get the isearch-message-prefix.
+        (isearch-search, isearch-lazy-highlight-search): Revert to funcall
+        instead of run-hook-with-args-until-failure.
+        (isearch-filter-visible): Not obsolete any more.
+        * loadup.el: Preload nadvice.
+        * replace.el (perform-replace): Revert to funcall
+        instead of run-hook-with-args-until-failure.
+        * wdired.el (wdired-change-to-wdired-mode): Use add-function.
+        * dired-aux.el (dired-isearch-filenames-mode): Rename from
+        dired-isearch-filenames-toggle; make it into a proper minor mode.
+        Use add/remove-function.
+        (dired-isearch-filenames-setup, dired-isearch-filenames-end):
+        Call the minor-mode rather than add/remove-hook.
+        (dired-isearch-filter-filenames):
+        Remove isearch-message-prefix property.
+        * info.el (Info--search-loop): New function, extracted from Info-search.
+        Funcall isearch-filter-predicate instead of
+        run-hook-with-args-until-failure isearch-filter-predicates.
+        (Info-search): Use it.
+        (Info-mode): Use isearch-filter-predicate instead of
+        isearch-filter-predicates.
+
+2013-08-05  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        Do not call to `selected-window' where it is assumed by default.
+        Affected functions are `window-minibuffer-p', `window-dedicated-p',
+        `window-hscroll', `window-width', `window-height', `window-buffer',
+        `window-frame', `window-start', `window-point', `next-window'
+        and `window-display-table'.
+        * abbrev.el (abbrev--default-expand):
+        * bs.el (bs--show-with-configuration):
+        * buff-menu.el (Buffer-menu-mouse-select):
+        * calc/calc.el (calc):
+        * calendar/calendar.el (calendar-generate-window):
+        * calendar/diary-lib.el (diary-simple-display, diary-show-all-entries)
+        (diary-make-entry):
+        * comint.el (send-invisible, comint-dynamic-complete-filename)
+        (comint-dynamic-simple-complete, comint-dynamic-list-completions):
+        * completion.el (complete):
+        * dabbrev.el (dabbrev-expand, dabbrev--make-friend-buffer-list):
+        * disp-table.el (describe-current-display-table):
+        * doc-view.el (doc-view-insert-image):
+        * ebuff-menu.el (Electric-buffer-menu-mouse-select):
+        * ehelp.el (with-electric-help):
+        * emacs-lisp/easy-mmode.el (easy-mmode-define-navigation):
+        * emacs-lisp/edebug.el (edebug-two-window-p, edebug-pop-to-buffer):
+        * emacs-lisp/helper.el (Helper-help-scroller):
+        * emulation/cua-base.el (cua--post-command-handler-1):
+        * eshell/esh-mode.el (eshell-output-filter):
+        * ffap.el (ffap-gnus-wrapper):
+        * help-macro.el (make-help-screen):
+        * hilit-chg.el (highlight-compare-buffers):
+        * hippie-exp.el (hippie-expand, try-expand-dabbrev-visible):
+        * hl-line.el (global-hl-line-highlight):
+        * icomplete.el (icomplete-simple-completing-p):
+        * isearch.el (isearch-done):
+        * jit-lock.el (jit-lock-stealth-fontify):
+        * mail/rmailsum.el (rmail-summary-scroll-msg-up):
+        * lisp/mouse-drag.el (mouse-drag-should-do-col-scrolling):
+        * mpc.el (mpc-tagbrowser, mpc):
+        * net/rcirc.el (rcirc-any-buffer):
+        * play/gomoku.el (gomoku-max-width, gomoku-max-height):
+        * play/landmark.el (landmark-max-width, landmark-max-height):
+        * play/zone.el (zone):
+        * progmodes/compile.el (compilation-goto-locus):
+        * progmodes/ebrowse.el (ebrowse-view/find-file-and-search-pattern):
+        * progmodes/etags.el (find-tag-other-window):
+        * progmodes/fortran.el (fortran-column-ruler):
+        * progmodes/gdb-mi.el (gdb-mouse-toggle-breakpoint-fringe):
+        * progmodes/verilog-mode.el (verilog-point-text):
+        * reposition.el (reposition-window):
+        * rot13.el (toggle-rot13-mode):
+        * server.el (server-switch-buffer):
+        * shell.el (shell-dynamic-complete-command)
+        (shell-dynamic-complete-environment-variable):
+        * simple.el (insert-buffer, set-selective-display)
+        (delete-completion-window):
+        * speedbar.el (speedbar-timer-fn, speedbar-center-buffer-smartly)
+        (speedbar-recenter):
+        * startup.el (fancy-splash-head):
+        * textmodes/ispell.el (ispell-command-loop):
+        * textmodes/makeinfo.el (makeinfo-compilation-sentinel-region):
+        * tutorial.el (help-with-tutorial):
+        * vc/add-log.el (add-change-log-entry):
+        * vc/compare-w.el (compare-windows):
+        * vc/ediff-help.el (ediff-indent-help-message):
+        * vc/ediff-util.el (ediff-setup-control-buffer, ediff-position-region):
+        * vc/ediff-wind.el (ediff-skip-unsuitable-frames)
+        (ediff-setup-control-frame):
+        * vc/emerge.el (emerge-position-region):
+        * vc/pcvs-util.el (cvs-bury-buffer):
+        * window.el (walk-windows, mouse-autoselect-window-select):
+        * winner.el (winner-set-conf, winner-undo): Related users changed.
+
+2013-08-05  Juanma Barranquero  <lekktu@gmail.com>
+
+        * frameset.el (frameset--set-id): Doc fix.
+        (frameset-frame-id, frameset-frame-id-equal-p)
+        (frameset-locate-frame-id): New functions.
+        (frameset--process-minibuffer-frames, frameset--reuse-frame)
+        (frameset-restore): Use them.
+
+2013-08-05  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        Do not call to `selected-frame' where it is assumed by default.
+        Affected functions are `raise-frame', `redraw-frame',
+        `frame-first-window', `frame-terminal' and `delete-frame'.
+        * calendar/appt.el (appt-disp-window):
+        * epg.el (epg-wait-for-completion):
+        * follow.el (follow-delete-other-windows-and-split)
+        (follow-avoid-tail-recenter):
+        * international/mule.el (set-terminal-coding-system):
+        * mail/rmail.el (rmail-mail-return):
+        * net/newst-plainview.el (newsticker--buffer-set-uptodate):
+        * progmodes/f90.el (f90-add-imenu-menu):
+        * progmodes/idlw-toolbar.el (idlwave-toolbar-toggle):
+        * server.el (server-switch-buffer):
+        * simple.el (delete-completion-window):
+        * talk.el (talk):
+        * term/xterm.el (terminal-init-xterm-modify-other-keys)
+        (xterm-turn-on-modify-other-keys, xterm-remove-modify-other-keys):
+        * vc/ediff-util.el (ediff-status-info, ediff-show-diff-output):
+        * vc/ediff.el (ediff-documentation): Related users changed.
+        * frame.el (selected-terminal): Remove the leftover.
+
+2013-08-05  Glenn Morris  <rgm@gnu.org>
+
+        * calendar/calendar.el (calendar-generate-month):
+        Fix for calendar-column-width != 1 + calendar-day-digit-width.
+        (calendar-generate-month, calendar-font-lock-keywords):
+        Fix for calendar-day-header-width > length of any day name.
+
+2013-08-05  Juanma Barranquero  <lekktu@gmail.com>
+
+        * desktop.el (desktop-clear): Use new name of sort predicate.
+
+        * frameset.el (frameset): Add docstring.  Move :version property to its
+        own `version' slot.
+        (frameset-copy): Rename from copy-frameset.
+        (frameset-p): Check more thoroughly.
+        (frameset-prop): Do not check for :version, which is no longer a prop.
+        (frameset-live-filter-alist, frameset-persistent-filter-alist):
+        Use new :never value instead of t.
+        (frameset-filter-alist): Expand and clarify docstring.
+        (frameset-filter-tty-to-GUI, frameset-filter-sanitize-color)
+        (frameset-filter-minibuffer, frameset-filter-save-param)
+        (frameset-filter-restore-param, frameset-filter-iconified):
+        Add pointer to docstring of frameset-filter-alist.
+        (frameset-filter-params): Rename filter values to be more meaningful:
+        :never instead of t, and reverse the meanings of :save and :restore.
+        (frameset--process-minibuffer-frames): Clarify error message.
+        (frameset-save): Avoid unnecessary and confusing call to framep.
+        Use new BOA constructor for framesets.
+        (frameset--reuse-list): Doc fix.
+        (frameset--restore-frame): Rename from frameset--get-frame.  Doc fix.
+        (frameset--minibufferless-last-p): Rename from frameset--sort-states.
+        (frameset-minibufferless-first-p): Doc fix.
+        Rename from frameset-sort-frames-for-deletion.
+        (frameset-restore): Doc fixes.  Use new function names.
+        Most changes suggested by Drew Adams <drew.adams@oracle.com>.
+
+2013-08-04  Juanma Barranquero  <lekktu@gmail.com>
+
+        * desktop.el (desktop-restore-forces-onscreen)
+        (desktop-restore-reuses-frames): Document :keyword constant values.
+        (desktop-filter-parameters-alist): Remove, now identical to
+        frameset-filter-alist.
+        (desktop--filter-tty*): Remove, moved to frameset.el.
+        (desktop-save-frameset, desktop-restore-frameset):
+        Do not pass :filters argument.
+
+        * frameset.el (frameset-live-filter-alist)
+        (frameset-persistent-filter-alist): New variables.
+        (frameset-filter-alist): Use them.  Add autoload cookie.
+        (frameset-filter-tty-to-GUI): Move from desktop.el and rename.
+        (frameset--set-id, frameset--reuse-frame): Rename `frame-id' to
+        `frameset--id' (it's supposed to be internal to frameset.el).
+        (frameset--process-minibuffer-frames): Ditto.  Doc fix.
+        (frameset--initial-params): New function.
+        (frameset--get-frame): Use it.  Doc fix.
+        (frameset--move-onscreen): Accept new PRED value for FORCE-ONSCREEN.
+        Accept :all, not 'all.
+        (frameset-restore): Add new predicate values for FORCE-ONSCREEN and
+        FORCE-DISPLAY.  Use :keywords for constant arguments to avoid collision
+        with fbound symbols.  Fix frame id matching, and remove matching ids if
+        the frame being restored is deleted.  Obey :delete.
+
+2013-08-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * subr.el (macrop): New function.
+        (text-clone--maintaining): New var.
+        (text-clone--maintain): Rename from text-clone-maintain.  Use it
+        instead of inhibit-modification-hooks.
+
+        * emacs-lisp/nadvice.el (advice--normalize): For aliases to macros, use
+        a proxy, so as handle autoloads and redefinitions of the target.
+        (advice--defalias-fset, advice-remove): Use advice--symbol-function.
+
+        * emacs-lisp/pcase.el (pcase-mutually-exclusive-predicates):
+        Remove bogus (arrayp . stringp) pair.  Add entries for `vectorp'.
+        (pcase--mutually-exclusive-p): New function.
+        (pcase--split-consp): Use it.
+        (pcase--split-pred): Use it.  Optimize the case where `pat' is a qpat
+        mutually exclusive with the current predicate.
+
+        * emacs-lisp/edebug.el (edebug-lookup-function): Remove function.
+        (edebug-macrop): Remove.  Use `macrop' instead.
+        * emacs-lisp/advice.el (ad-subr-p): Remove.  Use `subrp' instead.
+        (ad-macro-p):
+        * eshell/esh-cmd.el (eshell-macrop):
+        * apropos.el (apropos-macrop): Remove.  Use `macrop' instead.
+
+2013-08-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/nadvice.el (advice-function-mapc): Rename from advice-mapc.
+        (advice-mapc): New function, using it.
+        (advice-function-member-p): New function.
+        (advice--normalize): Store the cdr in advice--saved-rewrite since
+        that's the part that will be changed.
+        (advice--symbol-function): New function.
+        (advice-remove): Handle removal before the function is defined.
+        Adjust to new advice--saved-rewrite.
+        (advice-member-p): Use advice-function-member-p and
+        advice--symbol-function.
+
+2013-08-04  Juanma Barranquero  <lekktu@gmail.com>
+
+        * frameset.el (frameset-p, frameset-save): Fix autoload cookies.
+        (frameset-filter-minibuffer): Doc fix.
+        (frameset-restore): Fix autoload cookie.  Fix typo in docstring.
+        (frameset--set-id, frameset--process-minibuffer-frames)
+        (frameset-restore): Rename parameter `frameset-id' to `frame-id'.
+        (frameset--reuse-frame): Pass correct frame-id to frameset--find-frame.
+
+        * desktop.el (desktop-clear): Only delete frames when called
+        interactively and desktop-restore-frames is non-nil.  Doc fix.
+        (desktop-read): Set desktop-saved-frameset to nil.
+
 2013-08-04  Xue Fuqiao  <xfq.free@gmail.com>
 
         * vc/vc.el (vc-ignore): Rewrite.
@@ -33,16 +1292,6 @@
         (vc-bzr-ignore-completion-table):
         (vc-bzr-find-ignore-file): New functions.
 
-2013-08-04  Juanma Barranquero  <lekktu@gmail.com>
-
-        * frameset.el (frameset-p, frameset-save): Fix autoload cookies.
-        (frameset-filter-minibuffer): Doc fix.
-        (frameset-restore): Fix autoload cookie.  Fix typo in docstring.
-
-        * desktop.el (desktop-clear): Only delete frames when called
-        interactively and desktop-restore-frames is non-nil.  Doc fix.
-        (desktop-read): Set desktop-saved-frameset to nil.
-
 2013-08-03  Juanma Barranquero  <lekktu@gmail.com>
 
         * frameset.el (frameset-prop): New function and setter.
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12
index 6b34ef55783..7fcc4ff0caf 100644
--- a/lisp/ChangeLog.12
+++ b/lisp/ChangeLog.12
@@ -17355,7 +17355,7 @@
 
         * calc/calc-embed.el (calc-do-embedded): Update help message.
 
-        * calc/calc-prog.el (calc-user-define-invokation): Update help message.
+        * calc/calc-prog.el (calc-user-define-invocation): Update help message.
 
 2005-11-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 066e15368da..4fba1053dfa 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -118,7 +118,7 @@ emacs = EMACSLOADPATH=$(lisp) LC_ALL=C $(EMACS) $(EMACSOPT)
 setwins=subdirs=`find . -type d -print`; \
         for file in $$subdirs; do \
            case $$file in */.* | */.*/* | */=* ) ;; \
-                *) wins="$$wins $$file" ;; \
+                *) wins="$$wins$${wins:+ }$$file" ;; \
            esac; \
         done
 
@@ -126,7 +126,7 @@ setwins=subdirs=`find . -type d -print`; \
 setwins_almost=subdirs=`find . -type d -print`; \
         for file in $$subdirs; do \
            case $$file in */.* | */.*/* | */=* | */obsolete | */term ) ;; \
-                *) wins="$$wins $$file" ;; \
+                *) wins="$$wins$${wins:+ }$$file" ;; \
            esac; \
         done
 
@@ -134,7 +134,7 @@ setwins_almost=subdirs=`find . -type d -print`; \
 setwins_for_subdirs=subdirs=`find . -type d -print`; \
         for file in $$subdirs; do \
            case $$file in */.* | */.*/* | */=* | */cedet* ) ;; \
-                *) wins="$$wins $$file" ;; \
+                *) wins="$$wins$${wins:+ }$$file" ;; \
            esac; \
         done
 
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index 27cd7089a07..d82e2eabd84 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -856,7 +856,7 @@ return value is that of `abbrev-insert'.)"
               (endmark (copy-marker wordend t)))
           (unless (or ;; executing-kbd-macro
                    noninteractive
-                   (window-minibuffer-p (selected-window)))
+                   (window-minibuffer-p))
             ;; Add an undo boundary, in case we are doing this for
             ;; a self-inserting command which has avoided making one so far.
             (undo-boundary))
diff --git a/lisp/align.el b/lisp/align.el
index 3d2ca192245..6f55ac9faf1 100644
--- a/lisp/align.el
+++ b/lisp/align.el
@@ -1,4 +1,4 @@
-;;; align.el --- align text to a specific column, by regexp
+;;; align.el --- align text to a specific column, by regexp -*- lexical-binding:t -*-
 
 ;; Copyright (C) 1999-2013 Free Software Foundation, Inc.
 
@@ -1325,7 +1325,7 @@ aligner would have dealt with are."
         (unless (or (and modes (not (memq major-mode
                                           (eval (cdr modes)))))
                     (and run-if (not (funcall (cdr run-if)))))
-          (let* ((current-case-fold case-fold-search)
+          (let* ((case-fold-search case-fold-search)
                  (case-fold (assq 'case-fold rule))
                  (regexp  (cdr (assq 'regexp rule)))
                  (regfunc (and (functionp regexp) regexp))
@@ -1403,215 +1403,202 @@ aligner would have dealt with are."
               ;; reports back that the region is ok, then align it.
               (when (or (not func)
                         (funcall func beg end rule))
-                (unwind-protect
-                    (let (rule-beg exclude-areas)
-                      ;; determine first of all where the exclusions
-                      ;; lie in this region
-                      (when exclude-rules
-                        ;; guard against a problem with recursion and
-                        ;; dynamic binding vs. lexical binding, since
-                        ;; the call to `align-region' below will
-                        ;; re-enter this function, and rebind
-                        ;; `exclude-areas'
-                        (set (setq exclude-areas
-                                   (make-symbol "align-exclude-areas"))
-                             nil)
-                        (align-region
-                         beg end 'entire
-                         exclude-rules nil
-                         `(lambda (b e mode)
-                            (or (and mode (listp mode))
-                                (set (quote ,exclude-areas)
-                                     (cons (cons b e)
-                                           ,exclude-areas)))))
-                        (setq exclude-areas
-                              (sort (symbol-value exclude-areas)
-                                    (function
-                                     (lambda (l r)
-                                       (>= (car l) (car r)))))))
-
-                      ;; set `case-fold-search' according to the
-                      ;; (optional) `case-fold' property
-                      (and case-fold
-                           (setq case-fold-search (cdr case-fold)))
-
-                      ;; while we can find the rule in the alignment
-                      ;; region..
-                      (while (and (< (point) end-mark)
-                                  (setq search-start (point))
-                                  (if regfunc
-                                      (funcall regfunc end-mark nil)
-                                    (re-search-forward regexp
-                                                       end-mark t)))
-
-                        ;; give the user some indication of where we
-                        ;; are, if it's a very large region being
-                        ;; aligned
-                        (if report
-                            (let ((symbol (car rule)))
-                              (if (and symbol (symbolp symbol))
-                                  (message
-                                   "Aligning `%s' (rule %d of %d) %d%%..."
-                                   (symbol-name symbol) rule-index rule-count
-                                   (/ (* (- (point) real-beg) 100)
-                                      (- end-mark real-beg)))
-                                (message
-                                 "Aligning %d%%..."
-                                 (/ (* (- (point) real-beg) 100)
-                                    (- end-mark real-beg))))))
-
-                        ;; if the search ended us on the beginning of
-                        ;; the next line, move back to the end of the
-                        ;; previous line.
-                        (if (and (bolp) (> (point) search-start))
-                            (forward-char -1))
-
-                        ;; lookup the `group' attribute the first time
-                        ;; that we need it
-                        (unless group-c
-                          (setq groups (or (cdr (assq 'group rule)) 1))
-                          (unless (listp groups)
-                            (setq groups (list groups)))
-                          (setq first (car groups)))
-
-                        (unless spacing-c
-                          (setq spacing (cdr (assq 'spacing rule))
-                                spacing-c t))
-
-                        (unless tab-stop-c
-                          (setq tab-stop
-                                (let ((rule-ts (assq 'tab-stop rule)))
-                                  (cond (rule-ts
-                                         (cdr rule-ts))
-                                        ((symbolp align-to-tab-stop)
-                                         (symbol-value align-to-tab-stop))
-                                        (t
-                                         align-to-tab-stop)))
-                                tab-stop-c t))
-
-                        ;; test whether we have found a match on the same
-                        ;; line as a previous match
-                        (when (> (point) eol)
-                          (setq same nil)
-                          (align--set-marker eol (line-end-position)))
-
-                        ;; lookup the `repeat' attribute the first time
-                        (or repeat-c
-                            (setq repeat (cdr (assq 'repeat rule))
-                                  repeat-c t))
-
-                        ;; lookup the `valid' attribute the first time
-                        (or valid-c
-                            (setq valid (assq 'valid rule)
-                                  valid-c t))
-
-                        ;; remember the beginning position of this rule
-                        ;; match, and save the match-data, since either
-                        ;; the `valid' form, or the code that searches for
-                        ;; section separation, might alter it
-                        (setq rule-beg (match-beginning first)
-                              save-match-data (match-data))
-
-                        (or rule-beg
-                            (error "No match for subexpression %s" first))
-
-                        ;; unless the `valid' attribute is set, and tells
-                        ;; us that the rule is not valid at this point in
-                        ;; the code..
-                        (unless (and valid (not (funcall (cdr valid))))
-
-                          ;; look to see if this match begins a new
-                          ;; section.  If so, we should align what we've
-                          ;; collected so far, and then begin collecting
-                          ;; anew for the next alignment section
-                          (when (and last-point
-                                     (align-new-section-p last-point rule-beg
-                                                          thissep))
-                            (align-regions regions align-props rule func)
-                            (setq regions nil)
-                            (setq align-props nil))
-                          (align--set-marker last-point rule-beg t)
-
-                          ;; restore the match data
-                          (set-match-data save-match-data)
-
-                          ;; check whether the region to be aligned
-                          ;; straddles an exclusion area
-                          (let ((excls exclude-areas))
-                            (setq exclude-p nil)
-                            (while excls
-                              (if (and (< (match-beginning (car groups))
-                                          (cdar excls))
-                                       (> (match-end (car (last groups)))
-                                          (caar excls)))
-                                  (setq exclude-p t
-                                        excls nil)
-                                (setq excls (cdr excls)))))
-
-                          ;; go through the parenthesis groups
-                          ;; matching whitespace to be contracted or
-                          ;; expanded (or possibly justified, if the
-                          ;; `justify' attribute was set)
-                          (unless exclude-p
-                            (dolist (g groups)
-                              ;; We must use markers, since
-                              ;; `align-areas' may modify the buffer.
-                              ;; Avoid polluting the markers.
-                              (let* ((group-beg (copy-marker
-                                                 (match-beginning g) t))
-                                     (group-end (copy-marker
-                                                 (match-end g) t))
-                                     (region (cons group-beg group-end))
-                                     (props (cons (if (listp spacing)
-                                                      (car spacing)
-                                                    spacing)
-                                                  (if (listp tab-stop)
-                                                      (car tab-stop)
-                                                    tab-stop))))
-                                (push group-beg markers)
-                                (push group-end markers)
-                                (setq index (if same (1+ index) 0))
-                                (cond
-                                 ((nth index regions)
-                                  (setcar (nthcdr index regions)
-                                          (cons region
-                                                (nth index regions))))
-                                 (regions
-                                  (nconc regions
-                                         (list (list region)))
-                                  (nconc align-props (list props)))
-                                 (t
-                                  (setq regions
-                                        (list (list region)))
-                                  (setq align-props (list props)))))
-                              ;; If any further rule matches are found
-                              ;; before `eol', they are on the same
-                              ;; line as this one; this can only
-                              ;; happen if the `repeat' attribute is
-                              ;; non-nil.
-                              (if (listp spacing)
-                                  (setq spacing (cdr spacing)))
-                              (if (listp tab-stop)
-                                  (setq tab-stop (cdr tab-stop)))
-                              (setq same t))
-
-                            ;; if `repeat' has not been set, move to
-                            ;; the next line; don't bother searching
-                            ;; anymore on this one
-                            (if (and (not repeat) (not (bolp)))
-                                (forward-line))
-
-                            ;; if the search did not change point,
-                            ;; move forward to avoid an infinite loop
-                            (if (= (point) search-start)
-                                (forward-char)))))
-
-                      ;; when they are no more matches for this rule,
-                      ;; align whatever was left over
-                      (if regions
-                          (align-regions regions align-props rule func)))
-
-                  (setq case-fold-search current-case-fold)))))))
+                (let (rule-beg exclude-areas)
+                  ;; determine first of all where the exclusions
+                  ;; lie in this region
+                  (when exclude-rules
+                    (align-region
+                     beg end 'entire
+                     exclude-rules nil
+                     (lambda (b e mode)
+                       (or (and mode (listp mode))
+                           (setq exclude-areas
+                                 (cons (cons b e)
+                                       exclude-areas)))))
+                    (setq exclude-areas
+                          (nreverse
+                           (sort exclude-areas #'car-less-than-car))))
+
+                  ;; set `case-fold-search' according to the
+                  ;; (optional) `case-fold' property
+                  (and case-fold
+                       (setq case-fold-search (cdr case-fold)))
+
+                  ;; while we can find the rule in the alignment
+                  ;; region..
+                  (while (and (< (point) end-mark)
+                              (setq search-start (point))
+                              (if regfunc
+                                  (funcall regfunc end-mark nil)
+                                (re-search-forward regexp
+                                                   end-mark t)))
+
+                    ;; give the user some indication of where we
+                    ;; are, if it's a very large region being
+                    ;; aligned
+                    (if report
+                        (let ((symbol (car rule)))
+                          (if (and symbol (symbolp symbol))
+                              (message
+                               "Aligning `%s' (rule %d of %d) %d%%..."
+                               (symbol-name symbol) rule-index rule-count
+                               (/ (* (- (point) real-beg) 100)
+                                  (- end-mark real-beg)))
+                            (message
+                             "Aligning %d%%..."
+                             (/ (* (- (point) real-beg) 100)
+                                (- end-mark real-beg))))))
+
+                    ;; if the search ended us on the beginning of
+                    ;; the next line, move back to the end of the
+                    ;; previous line.
+                    (if (and (bolp) (> (point) search-start))
+                        (forward-char -1))
+
+                    ;; lookup the `group' attribute the first time
+                    ;; that we need it
+                    (unless group-c
+                      (setq groups (or (cdr (assq 'group rule)) 1))
+                      (unless (listp groups)
+                        (setq groups (list groups)))
+                      (setq first (car groups)))
+
+                    (unless spacing-c
+                      (setq spacing (cdr (assq 'spacing rule))
+                            spacing-c t))
+
+                    (unless tab-stop-c
+                      (setq tab-stop
+                            (let ((rule-ts (assq 'tab-stop rule)))
+                              (cond (rule-ts
+                                     (cdr rule-ts))
+                                    ((symbolp align-to-tab-stop)
+                                     (symbol-value align-to-tab-stop))
+                                    (t
+                                     align-to-tab-stop)))
+                            tab-stop-c t))
+
+                    ;; test whether we have found a match on the same
+                    ;; line as a previous match
+                    (when (> (point) eol)
+                      (setq same nil)
+                      (align--set-marker eol (line-end-position)))
+
+                    ;; lookup the `repeat' attribute the first time
+                    (or repeat-c
+                        (setq repeat (cdr (assq 'repeat rule))
+                              repeat-c t))
+
+                    ;; lookup the `valid' attribute the first time
+                    (or valid-c
+                        (setq valid (assq 'valid rule)
+                              valid-c t))
+
+                    ;; remember the beginning position of this rule
+                    ;; match, and save the match-data, since either
+                    ;; the `valid' form, or the code that searches for
+                    ;; section separation, might alter it
+                    (setq rule-beg (match-beginning first)
+                          save-match-data (match-data))
+
+                    (or rule-beg
+                        (error "No match for subexpression %s" first))
+
+                    ;; unless the `valid' attribute is set, and tells
+                    ;; us that the rule is not valid at this point in
+                    ;; the code..
+                    (unless (and valid (not (funcall (cdr valid))))
+
+                      ;; look to see if this match begins a new
+                      ;; section.  If so, we should align what we've
+                      ;; collected so far, and then begin collecting
+                      ;; anew for the next alignment section
+                      (when (and last-point
+                                 (align-new-section-p last-point rule-beg
+                                                      thissep))
+                        (align-regions regions align-props rule func)
+                        (setq regions nil)
+                        (setq align-props nil))
+                      (align--set-marker last-point rule-beg t)
+
+                      ;; restore the match data
+                      (set-match-data save-match-data)
+
+                      ;; check whether the region to be aligned
+                      ;; straddles an exclusion area
+                      (let ((excls exclude-areas))
+                        (setq exclude-p nil)
+                        (while excls
+                          (if (and (< (match-beginning (car groups))
+                                      (cdar excls))
+                                   (> (match-end (car (last groups)))
+                                      (caar excls)))
+                              (setq exclude-p t
+                                    excls nil)
+                            (setq excls (cdr excls)))))
+
+                      ;; go through the parenthesis groups
+                      ;; matching whitespace to be contracted or
+                      ;; expanded (or possibly justified, if the
+                      ;; `justify' attribute was set)
+                      (unless exclude-p
+                        (dolist (g groups)
+                          ;; We must use markers, since
+                          ;; `align-areas' may modify the buffer.
+                          ;; Avoid polluting the markers.
+                          (let* ((group-beg (copy-marker
+                                             (match-beginning g) t))
+                                 (group-end (copy-marker
+                                             (match-end g) t))
+                                 (region (cons group-beg group-end))
+                                 (props (cons (if (listp spacing)
+                                                  (car spacing)
+                                                spacing)
+                                              (if (listp tab-stop)
+                                                  (car tab-stop)
+                                                tab-stop))))
+                            (push group-beg markers)
+                            (push group-end markers)
+                            (setq index (if same (1+ index) 0))
+                            (cond
+                             ((nth index regions)
+                              (setcar (nthcdr index regions)
+                                      (cons region
+                                            (nth index regions))))
+                             (regions
+                              (nconc regions
+                                     (list (list region)))
+                              (nconc align-props (list props)))
+                             (t
+                              (setq regions
+                                    (list (list region)))
+                              (setq align-props (list props)))))
+                          ;; If any further rule matches are found
+                          ;; before `eol', they are on the same
+                          ;; line as this one; this can only
+                          ;; happen if the `repeat' attribute is
+                          ;; non-nil.
+                          (if (listp spacing)
+                              (setq spacing (cdr spacing)))
+                          (if (listp tab-stop)
+                              (setq tab-stop (cdr tab-stop)))
+                          (setq same t))
+
+                        ;; if `repeat' has not been set, move to
+                        ;; the next line; don't bother searching
+                        ;; anymore on this one
+                        (if (and (not repeat) (not (bolp)))
+                            (forward-line))
+
+                        ;; if the search did not change point,
+                        ;; move forward to avoid an infinite loop
+                        (if (= (point) search-start)
+                            (forward-char)))))
+
+                  ;; when they are no more matches for this rule,
+                  ;; align whatever was left over
+                  (if regions
+                      (align-regions regions align-props rule func))))))))
       (setq rules (cdr rules)
             rule-index (1+ rule-index)))
     ;; This function can use a lot of temporary markers, so instead of
diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el
index fd8e5f8ff94..1c76156b91a 100644
--- a/lisp/allout-widgets.el
+++ b/lisp/allout-widgets.el
@@ -720,17 +720,17 @@ icon/bullet.")
 ;;;_  . Hooks and hook helpers
 ;;;_   , major command-loop business:
 ;;;_    > allout-widgets-pre-command-business (&optional recursing)
-(defun allout-widgets-pre-command-business (&optional recursing)
+(defun allout-widgets-pre-command-business (&optional _recursing)
   "Handle actions pending before `allout-mode' activity."
 )
 ;;;_    > allout-widgets-post-command-business (&optional recursing)
-(defun allout-widgets-post-command-business (&optional recursing)
+(defun allout-widgets-post-command-business (&optional _recursing)
   "Handle actions pending after any `allout-mode' commands.
 
 Optional RECURSING is for internal use, to limit recursion."
   ;; - check changed text for nesting discontinuities and escape anything
   ;;   that's: (1) asterisks at bol or (2) excessively nested.
-  (condition-case failure
+  (condition-case nil
 
       (when (and (boundp 'allout-mode) allout-mode)
 
@@ -811,7 +811,7 @@ Optional RECURSING is for internal use, to limit recursion."
                      (goto-char (widget-get this-widget :from))
                      (not (bolp)))
                 (if (not
-                     (condition-case err
+                     (condition-case nil
                          (yes-or-no-p
                           (concat "Misplaced item won't be recognizable "
                                   " as part of outline - rectify? "))
@@ -873,7 +873,7 @@ Optional RECURSING is for internal use, to limit recursion."
     (error
      (substitute-command-keys allout-structure-unruly-deletion-message)))))
 ;;;_    > allout-widgets-after-change-handler
-(defun allout-widgets-after-change-handler (beg end prelength)
+(defun allout-widgets-after-change-handler (_beg _end _prelength)
   "Reconcile what needs to be reconciled for allout widgets after edits."
   )
 ;;;_   > allout-current-decorated-p ()
@@ -999,7 +999,6 @@ Generally invoked via `allout-exposure-change-functions'."
         ;; have to distinguish between concealing and exposing so that, eg,
         ;; `allout-expose-topic's mix is handled properly.
         handled-expose
-        handled-conceal
         covered
         deactivate-mark)
 
@@ -1188,7 +1187,7 @@ Dispatched by `allout-widgets-post-command-business' in response to
   (let* ((allout-undo-exposure-in-progress t)
          ;; inhibit undo recording while twiddling exposure to track undo:
          (widgets allout-widgets-undo-exposure-record)
-         widget widget-start-marker widget-end-marker
+         widget-start-marker widget-end-marker
          from-state icon-start-point to-state
          handled covered)
     (setq allout-widgets-undo-exposure-record nil)
@@ -1552,7 +1551,7 @@ recursive operation."
 ;;;_   > allout-decorate-item-and-context (item-widget &optional redecorate
 ;;;                                                   blank-container parent)
 (defun allout-decorate-item-and-context (item-widget &optional redecorate
-                                                     blank-container parent)
+                                                     blank-container _parent)
   "Create or adjust widget decorations for ITEM-WIDGET and neighbors at point.
 
 The neighbors include its siblings and parent.
@@ -1593,12 +1592,8 @@ We return the item-widget corresponding to the item at point."
                                 steady-point))
            (parent (and (not is-container)
                         (allout-get-or-create-parent-widget)))
-           parent-flags parent-depth
            successor-sibling
-           body
            doing-item
-           sub-item-widget
-           depth
            reverse-siblings-chart
            (buffer-undo-list t))
 
@@ -1615,7 +1610,6 @@ We return the item-widget corresponding to the item at point."
             ;; `allout-goto-prefix' will go to first non-container item:
             (allout-goto-prefix)
           (allout-next-heading))
-        (setq depth (allout-recent-depth))
         (setq reverse-siblings-chart (list allout-recent-prefix-beginning))
         (while (allout-next-sibling)
           (push allout-recent-prefix-beginning reverse-siblings-chart)))
@@ -1702,7 +1696,6 @@ Point is left at the last sibling in the visible subtree."
         (pending-chart (or chart (allout-chart-subtree nil 'visible)))
         item-widget
         previous-sibling-point
-        previous-sibling
         recent-sibling-point)
     (setq pending-chart (nreverse pending-chart))
     (dolist (sibling-point pending-chart)
@@ -1753,9 +1746,7 @@ may have subitems.)"
          (icon-start (1- icon-end))
          body-start
          body-end
-         bullet
          has-subitems
-         (contents-depth (1+ depth))
          )
     (widget-put item-widget :depth depth)
     (if is-container
@@ -1783,7 +1774,7 @@ may have subitems.)"
 
       ;; cue area:
       (setq body-start icon-end)
-      (widget-put item-widget :bullet (setq bullet (allout-get-bullet)))
+      (widget-put item-widget :bullet (allout-get-bullet))
       (if (equal (char-after body-start) ? )
           (setq body-start (1+ body-start)))
       (widget-put item-widget :body-start body-start)
@@ -1809,7 +1800,7 @@ may have subitems.)"
                        ;; has a subsequent item:
                        (not (= body-end (point-max)))
                        ;; subsequent item is deeper:
-                       (< depth (setq contents-depth (allout-recent-depth))))))
+                       (< depth (allout-recent-depth)))))
     ;; note :expanded - true if widget item's content is currently visible?
     (widget-put item-widget :expanded
                 (and has-subitems
@@ -1818,7 +1809,7 @@ may have subitems.)"
                        (goto-char allout-recent-prefix-beginning)
                        (not (allout-hidden-p)))))))
 ;;;_   > allout-set-boundary-marker (boundary position &optional current-marker)
-(defun allout-set-boundary-marker (boundary position &optional current-marker)
+(defun allout-set-boundary-marker (_boundary position &optional current-marker)
   "Set or create item widget BOUNDARY type marker at POSITION.
 
 Optional CURRENT-MARKER is the marker currently being used for
@@ -1872,8 +1863,8 @@ reapplying this method will rectify the glyphs."
 
   (when (not (widget-get item-widget :is-container))
     (let* ((depth (widget-get item-widget :depth))
-           (parent-depth (and parent-widget
-                              (widget-get parent-widget :depth)))
+           ;; (parent-depth (and parent-widget
+           ;;                    (widget-get parent-widget :depth)))
            (parent-flags (and parent-widget
                               (widget-get parent-widget :guide-column-flags)))
            (parent-flags-depth (length parent-flags))
@@ -1894,7 +1885,7 @@ reapplying this method will rectify the glyphs."
            (increment (length allout-header-prefix))
            reverse-flags
            guide-name
-           extenders paint-extenders
+           extenders
            (inhibit-read-only t))
 
       (when (not (equal was-flags flags))
@@ -2017,8 +2008,8 @@ reapplying this method will rectify the glyphs."
     (let* ((cue-start (or (widget-get item-widget :distinctive-end)
                           (widget-get item-widget :icon-end)))
            (body-start (widget-get item-widget :body-start))
-           (expanded (widget-get item-widget :expanded))
-           (has-subitems (widget-get item-widget :has-subitems))
+           ;(expanded (widget-get item-widget :expanded))
+           ;(has-subitems (widget-get item-widget :has-subitems))
            (inhibit-read-only t))
 
       (allout-item-element-span-is item-widget :cue-span cue-start body-start)
@@ -2032,7 +2023,6 @@ Optional FORCE means force reassignment of the region property."
   (let* ((allout-inhibit-body-modification-hook t)
          (body-start (widget-get item-widget :body-start))
          (body-end (widget-get item-widget :body-end))
-         (body-text-end body-end)
          (inhibit-read-only t))
 
     (allout-item-element-span-is item-widget :body-span
@@ -2135,9 +2125,7 @@ of the current span, if established, or nil if not yet set.
 When the START and END are passed, return the distance that the
 start of the item moved.  We return 0 if the span was not
 previously established or is not moved."
-  (let ((overlay (widget-get item-widget :span-overlay))
-        was-start was-end
-        changed)
+  (let ((overlay (widget-get item-widget :span-overlay)))
     (cond ((not overlay) (when start
                            (setq overlay (make-overlay start end nil t nil))
                            (overlay-put overlay 'button item-widget)
@@ -2259,7 +2247,7 @@ of the buffer."
     (allout-get-or-create-item-widget redecorate)))
 ;;;_  : X- Item ancillaries
 ;;;_   >X allout-body-modification-handler (beg end)
-(defun allout-body-modification-handler (beg end)
+(defun allout-body-modification-handler (_beg _end)
   "Do routine processing of body text before and after modification.
 
 Operation is inhibited by `allout-inhibit-body-modification-handler'."
@@ -2281,7 +2269,7 @@ Operation is inhibited by `allout-inhibit-body-modification-handler'."
 ;; operation.
   (cond (allout-inhibit-body-modification-hook nil)))
 ;;;_   >X allout-graphics-modification-handler (beg end)
-(defun allout-graphics-modification-handler (beg end)
+(defun allout-graphics-modification-handler (beg _end)
   "Protect against incoherent deletion of decoration graphics.
 
 Deletes allowed only when `inhibit-read-only' is t."
diff --git a/lisp/allout.el b/lisp/allout.el
index a0d61eb6f35..0896ace5872 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -74,6 +74,9 @@
 
 ;;; Code:
 
+(declare-function epa-passphrase-callback-function
+                  "epa" (context key-id handback))
+
 ;;;_* Dependency loads
 (require 'overlay)
 (eval-when-compile
@@ -2121,8 +2124,8 @@ OPEN:	A TOPIC that is not CLOSED, though its OFFSPRING or BODY may be."
 
 ;;;_  > allout-overlay-insert-in-front-handler (ol after beg end
 ;;;                                                &optional prelen)
-(defun allout-overlay-insert-in-front-handler (ol after beg end
-                                                  &optional prelen)
+(defun allout-overlay-insert-in-front-handler (ol after beg _end
+                                                  &optional _prelen)
   "Shift the overlay so stuff inserted in front of it is excluded."
   (if after
       ;; ??? Shouldn't moving the overlay should be unnecessary, if overlay
@@ -2131,7 +2134,7 @@ OPEN:	A TOPIC that is not CLOSED, though its OFFSPRING or BODY may be."
 ;;;_  > allout-overlay-interior-modification-handler (ol after beg end
 ;;;                                                      &optional prelen)
 (defun allout-overlay-interior-modification-handler (ol after beg end
-                                                        &optional prelen)
+                                                        &optional _prelen)
   "Get confirmation before making arbitrary changes to invisible text.
 
 We expose the invisible text and ask for confirmation.  Refusal or
@@ -2194,7 +2197,7 @@ See `allout-overlay-interior-modification-handler' for details."
             (allout-overlay-interior-modification-handler
              overlay nil beg end nil))))))
 ;;;_  > allout-isearch-end-handler (&optional overlay)
-(defun allout-isearch-end-handler (&optional overlay)
+(defun allout-isearch-end-handler (&optional _overlay)
   "Reconcile allout outline exposure on arriving in hidden text after isearch.
 
 Optional OVERLAY parameter is for when this function is used by
@@ -2733,7 +2736,7 @@ starting point, and PREV-DEPTH is depth of prior topic."
                                         ; and maybe not preferable.
     ))
 ;;;_   > allout-chart-siblings (&optional start end)
-(defun allout-chart-siblings (&optional start end)
+(defun allout-chart-siblings (&optional _start _end)
   "Produce a list of locations of this and succeeding sibling topics.
 Effectively a top-level chart of siblings.  See `allout-chart-subtree'
 for an explanation of charts."
@@ -3051,7 +3054,7 @@ Returning depth if successful, nil if not."
       nil))
   )
 ;;;_   > allout-up-current-level (arg)
-(defun allout-up-current-level (arg)
+(defun allout-up-current-level (_arg)
   "Move out ARG levels from current visible topic."
   (interactive "p")
   (let ((start-point (point)))
@@ -3198,7 +3201,7 @@ Presumes point is at the start of a topic prefix."
   "Go back to the first sibling at this level, visible or not."
   (allout-end-of-level 'backward))
 ;;;_   > allout-end-of-level (&optional backward)
-(defun allout-end-of-level (&optional backward)
+(defun allout-end-of-level (&optional _backward)
   "Go to the last sibling at this level, visible or not."
 
   (let ((depth (allout-depth)))
@@ -3930,7 +3933,7 @@ Maintains outline hanging topic indentation if
       (if (or allout-former-auto-filler allout-use-hanging-indents)
           (funcall use-auto-fill-function)))))
 ;;;_    > allout-reindent-body (old-depth new-depth &optional number)
-(defun allout-reindent-body (old-depth new-depth &optional number)
+(defun allout-reindent-body (old-depth new-depth &optional _number)
   "Reindent body lines which were indented at OLD-DEPTH to NEW-DEPTH.
 
 Optional arg NUMBER indicates numbering is being added, and it must
@@ -4559,7 +4562,7 @@ Topic exposure is marked with text-properties, to be used by
             (if next (goto-char next)))))
       (set-buffer-modified-p was-modified))))
 ;;;_    > allout-yank-processing ()
-(defun allout-yank-processing (&optional arg)
+(defun allout-yank-processing (&optional _arg)
 
   "Incidental allout-specific business to be done just after text yanks.
 
@@ -5521,7 +5524,7 @@ header and body.  The elements of that list are:
 ;;_   > allout-process-exposed (&optional func from to frombuf
 ;;;                                         tobuf format)
 (defun allout-process-exposed (&optional func from to frombuf tobuf
-                                          format start-num)
+                                         format _start-num)
   "Map function on exposed parts of current topic; results to another buffer.
 
 All args are options; default values itemized below.
@@ -5685,7 +5688,7 @@ used verbatim."
 
 ;;;_  - LaTeX formatting
 ;;;_   > allout-latex-verb-quote (string &optional flow)
-(defun allout-latex-verb-quote (string &optional flow)
+(defun allout-latex-verb-quote (string &optional _flow)
   "Return copy of STRING for literal reproduction across LaTeX processing.
 Expresses the original characters (including carriage returns) of the
 string across LaTeX processing."
@@ -5706,7 +5709,7 @@ across LaTeX processing, within the context of a `verbatim'
 environment.  Leaves point at the end of the line."
   (let ((inhibit-field-text-motion t))
     (beginning-of-line)
-    (let ((beg (point))
+    (let (;(beg (point))
           (end (point-at-eol)))
       (save-match-data
         (while (re-search-forward "\\\\"
@@ -5790,7 +5793,7 @@ environment.  Leaves point at the end of the line."
   (set-buffer buffer)
   (insert "\n\\end{document}\n"))
 ;;;_   > allout-latexify-one-item (depth prefix bullet text)
-(defun allout-latexify-one-item (depth prefix bullet text)
+(defun allout-latexify-one-item (depth _prefix bullet text)
   "Insert LaTeX commands for formatting one outline item.
 
 Args are the topics numeric DEPTH, the header PREFIX lead string, the
@@ -6359,7 +6362,7 @@ save.  See `allout-encrypt-unencrypted-on-saves' for more info."
 ;;;###autoload
 (defalias 'outlinify-sticky 'outlineify-sticky)
 ;;;###autoload
-(defun outlineify-sticky (&optional arg)
+(defun outlineify-sticky (&optional _arg)
   "Activate outline mode and establish file var so it is started subsequently.
 
 See `allout-layout' and customization of `allout-auto-activation'
diff --git a/lisp/apropos.el b/lisp/apropos.el
index 000d2d87d05..7a1a6f6a75a 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -1121,7 +1121,7 @@ If non-nil TEXT is a string that will be printed as a heading."
           (apropos-print-doc 2
                              (if (commandp symbol)
                                  'apropos-command
-                               (if (apropos-macrop symbol)
+                               (if (macrop symbol)
                                    'apropos-macro
                                  'apropos-function))
                              (not nosubst))
@@ -1139,17 +1139,6 @@ If non-nil TEXT is a string that will be printed as a heading."
   (prog1 apropos-accumulator
     (setq apropos-accumulator ())))     ; permit gc
 
-(defun apropos-macrop (symbol)
-  "Return t if SYMBOL is a Lisp macro."
-  (and (fboundp symbol)
-       (consp (setq symbol
-                    (symbol-function symbol)))
-       (or (eq (car symbol) 'macro)
-           (if (autoloadp symbol)
-               (memq (nth 4 symbol)
-                     '(macro t))))))
-
-
 (defun apropos-print-doc (i type do-keys)
   (let ((doc (nth i apropos-item)))
     (when (stringp doc)
diff --git a/lisp/avoid.el b/lisp/avoid.el
index c92d456ef0c..72f90a30ff5 100644
--- a/lisp/avoid.el
+++ b/lisp/avoid.el
@@ -41,9 +41,9 @@
 ;;
 ;; (if (eq window-system 'x)
 ;;     (mouse-avoidance-set-pointer-shape
-;;           (eval (nth (random 4)
-;;                      '(x-pointer-man x-pointer-spider
-;;                        x-pointer-gobbler x-pointer-gumby)))))
+;;           (nth (random 4)
+;;                (list x-pointer-man x-pointer-spider
+;;                      x-pointer-gobbler x-pointer-gumby))))
 ;;
 ;; For completely random pointer shape, replace the setq above with:
 ;; (setq x-pointer-shape (mouse-avoidance-random-shape))
@@ -154,13 +154,15 @@ TOP-OR-BOTTOM-POS: Distance from top or bottom edge of frame or window."
 (defun mouse-avoidance-point-position ()
   "Return the position of point as (FRAME X . Y).
 Analogous to `mouse-position'."
-  (let ((edges (window-inside-edges))
-        (x-y (posn-x-y (posn-at-point))))
-    (cons (selected-frame)
-          (cons (+ (car edges)
-                   (/ (car x-y) (frame-char-width)))
-                (+ (car (cdr edges))
-                   (/ (cdr x-y) (frame-char-height)))))))
+  (let* ((edges (window-inside-edges))
+         (posn-at-point (posn-at-point))
+         (x-y (and posn-at-point (posn-x-y posn-at-point))))
+    (when x-y
+      (cons (selected-frame)
+            (cons (+ (car edges)
+                     (/ (car x-y) (frame-char-width)))
+                  (+ (car (cdr edges))
+                     (/ (cdr x-y) (frame-char-height))))))))
 
 ;(defun mouse-avoidance-point-position-test ()
 ;  (interactive)
@@ -185,19 +187,21 @@ MOUSE is the current mouse position as returned by `mouse-position'.
 Acceptable distance is defined by `mouse-avoidance-threshold'."
   (let* ((frame (car mouse))
          (mouse-y (cdr (cdr mouse)))
-         (tool-bar-lines (frame-parameter nil 'tool-bar-lines)))
+         (tool-bar-lines (frame-parameter nil 'tool-bar-lines))
+         point)
     (or tool-bar-lines
         (setq tool-bar-lines 0))
-    (if (and mouse-y (< mouse-y tool-bar-lines))
-        nil
-      (let ((point (mouse-avoidance-point-position))
-            (mouse-x (car (cdr mouse))))
+    (cond
+     ((and mouse-y (< mouse-y tool-bar-lines))
+      nil)
+     ((setq point (mouse-avoidance-point-position))
+      (let ((mouse-x (car (cdr mouse))))
         (and (eq frame (car point))
              (not (null mouse-x))
              (< (abs (- mouse-x (car (cdr point))))
                 mouse-avoidance-threshold)
              (< (abs (- mouse-y (cdr (cdr point))))
-                mouse-avoidance-threshold))))))
+                mouse-avoidance-threshold)))))))
 
 (defun mouse-avoidance-banish-destination ()
   "The position to which Mouse Avoidance mode `banish' moves the mouse.
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 005e43b3059..2ea6713216d 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -1220,7 +1220,7 @@ if `inhibit-field-text-motion' is non-nil."
     (define-key map "n" 'number-to-register)
     (define-key map "+" 'increment-register)
     (define-key map "w" 'window-configuration-to-register)
-    (define-key map "f" 'frame-configuration-to-register)
+    (define-key map "f" 'frameset-to-register)
     map)
   "Keymap for subcommands of C-x r.")
 (define-key ctl-x-map "r" ctl-x-r-map)
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index b1cdedb83c5..9514317809b 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1112,12 +1112,9 @@ then offer interactively to relocate BOOKMARK-NAME-OR-RECORD."
     (setq bookmark-current-bookmark bookmark-name-or-record))
   nil)
 
-(put 'bookmark-error-no-filename
-     'error-conditions
-     '(error bookmark-errors bookmark-error-no-filename))
-(put 'bookmark-error-no-filename
-     'error-message
-     "Bookmark has no associated file (or directory)")
+(define-error 'bookmark-errors nil)
+(define-error 'bookmark-error-no-filename
+  "Bookmark has no associated file (or directory)" 'bookmark-errors)
 
 (defun bookmark-default-handler (bmk-record)
   "Default handler to jump to a particular bookmark location.
diff --git a/lisp/bs.el b/lisp/bs.el
index af213333a79..6871a7eeb83 100644
--- a/lisp/bs.el
+++ b/lisp/bs.el
@@ -1406,7 +1406,7 @@ for buffer selection."
           (select-window active-window)
         (bs--restore-window-config)
         (setq bs--window-config-coming-from (current-window-configuration))
-        (when (> (window-height (selected-window)) 7)
+        (when (> (window-height) 7)
           ;; Errors would mess with the window configuration (bug#10882).
           (ignore-errors (select-window (split-window-below)))))
       (bs-show-in-buffer liste)
diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index 1db9b7229f3..58fde695b39 100644
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -591,7 +591,7 @@ means list those buffers and no others."
   (select-window (posn-window (event-end event)))
   (let ((buffer (tabulated-list-get-id (posn-point (event-end event)))))
     (when (buffer-live-p buffer)
-      (if (and (window-dedicated-p (selected-window))
+      (if (and (window-dedicated-p)
                (eq (selected-window) (frame-root-window)))
           (switch-to-buffer-other-frame buffer)
         (switch-to-buffer buffer)))))
diff --git a/lisp/calc/calc-keypd.el b/lisp/calc/calc-keypd.el
index a720f12a573..bd24bf7f15d 100644
--- a/lisp/calc/calc-keypd.el
+++ b/lisp/calc/calc-keypd.el
@@ -349,8 +349,7 @@
                          (if (> (length (car key)) cwid)
                              (substring (car key) 0 cwid)
                            (car key))))
-                 (wid (length name))
-                 (pad (- cwid (/ wid 2))))
+                 (wid (length name)))
             (insert (make-string (/ (- cwid wid) 2) 32)
                     name
                     (make-string (/ (- cwid wid -1) 2) 32)
@@ -399,7 +398,6 @@
                       inv calc-inverse-flag)
                 calc-hyperbolic-flag))
          (invhyp t)
-         (menu (symbol-value (nth calc-keypad-menu calc-keypad-menus)))
          (input calc-keypad-input)
          (iexpon (and input
                       (or (string-match "\\*[0-9]+\\.\\^" input)
@@ -535,19 +533,22 @@
 
 (defun calc-keypad-left-click (event)
   "Handle a left-button mouse click in Calc Keypad window."
+  ;; FIXME: Why not use "@e" instead to select the buffer?
   (interactive "e")
   (with-current-buffer calc-keypad-buffer
     (goto-char (posn-point (event-start event)))
     (calc-keypad-press)))
 
-(defun calc-keypad-right-click (event)
+(defun calc-keypad-right-click (_event)
   "Handle a right-button mouse click in Calc Keypad window."
+  ;; FIXME: Why not use "@e" instead to select the buffer?
   (interactive "e")
   (with-current-buffer calc-keypad-buffer
     (calc-keypad-menu)))
 
-(defun calc-keypad-middle-click (event)
+(defun calc-keypad-middle-click (_event)
   "Handle a middle-button mouse click in Calc Keypad window."
+  ;; FIXME: Why not use "@e" instead to select the buffer?
   (interactive "e")
   (with-current-buffer calc-keypad-buffer
     (calc-keypad-menu-back)))
@@ -588,7 +589,6 @@
 (defun calc-keypad-execute ()
   (interactive)
   (let* ((prompt "Calc keystrokes: ")
-         (flush 'x-flush-mouse-queue)
          (prefix nil)
          keys cmd)
     (save-excursion
@@ -605,10 +605,9 @@
                    (progn
                      (setq last-command-event (aref keys (1- (length keys))))
                      (command-execute cmd)
-                     (setq flush 'not-any-more
-                           prefix t
+                     (setq prefix t
                            prompt (concat prompt (key-description keys) " ")))
-                 (eq cmd flush)))))  ; skip mouse-up event
+                 nil))))  ; skip mouse-up event
     (message "")
     (if (commandp cmd)
         (command-execute cmd)
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index 8a17ad7ce30..2eeb880c34d 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -921,15 +921,12 @@ Used by `calc-user-invocation'.")
 (put 'calc-mode 'mode-class 'special)
 (put 'calc-trail-mode 'mode-class 'special)
 
-;; Define "inexact-result" as an e-lisp error symbol.
-(put 'inexact-result 'error-conditions '(error inexact-result calc-error))
-(put 'inexact-result 'error-message "Calc internal error (inexact-result)")
+(define-error 'calc-error "Calc internal error")
+(define-error 'inexact-result
+  "Calc internal error (inexact-result)" 'calc-error)
 
-;; Define "math-overflow" and "math-underflow" as e-lisp error symbols.
-(put 'math-overflow 'error-conditions '(error math-overflow calc-error))
-(put 'math-overflow 'error-message "Floating-point overflow occurred")
-(put 'math-underflow 'error-conditions '(error math-underflow calc-error))
-(put 'math-underflow 'error-message "Floating-point underflow occurred")
+(define-error 'math-overflow "Floating-point overflow occurred" 'calc-error)
+(define-error 'math-underflow "Floating-point underflow occurred" 'calc-error)
 
 (defvar calc-trail-pointer nil
   "The \"current\" entry in trail buffer.")
@@ -1441,7 +1438,7 @@ commands given here will actually operate on the *Calculator* stack."
             (calc-keypad))))
     (when (get-buffer-window "*Calc Keypad*")
       (calc-keypad)
-      (set-buffer (window-buffer (selected-window))))
+      (set-buffer (window-buffer)))
     (if (eq major-mode 'calc-mode)
         (calc-quit)
       (let ((oldbuf (current-buffer)))
diff --git a/lisp/calculator.el b/lisp/calculator.el
index 8b253b810f5..c4611c12d87 100644
--- a/lisp/calculator.el
+++ b/lisp/calculator.el
@@ -1,4 +1,4 @@
-;;; calculator.el --- a [not so] simple calculator for Emacs
+;;; calculator.el --- a [not so] simple calculator for Emacs  -*- lexical-binding: t -*-
 
 ;; Copyright (C) 1998, 2000-2013 Free Software Foundation, Inc.
 
@@ -131,8 +131,8 @@ The displayer is a symbol, a string or an expression.  A symbol should
 be the name of a one-argument function, a string is used with a single
 argument and an expression will be evaluated with the variable `num'
 bound to whatever should be displayed.  If it is a function symbol, it
-should be able to handle special symbol arguments, currently 'left and
-'right which will be sent by special keys to modify display parameters
+should be able to handle special symbol arguments, currently `left' and
+`right' which will be sent by special keys to modify display parameters
 associated with the displayer function (for example to change the number
 of digits displayed).
 
@@ -241,6 +241,8 @@ Examples:
 ;;;=====================================================================
 ;;; Code:
 
+(eval-when-compile (require 'cl-lib))
+
 ;;;---------------------------------------------------------------------
 ;;; Variables
 
@@ -708,7 +710,7 @@ See the documentation for `calculator-mode' for more information."
                ;; can't use 'noprompt, bug in electric.el
                (lambda () 'noprompt)
                nil
-               (lambda (x y) (calculator-update-display))))
+               (lambda (_x _y) (calculator-update-display))))
           (and calculator-buffer
                (catch 'calculator-done (calculator-quit)))
           (use-local-map old-l-map)
@@ -905,9 +907,9 @@ The string is set not to exceed the screen width."
       value)
     (car (read-from-string
           (cond ((equal "." str) "0.0")
-                ((string-match "[eE][+-]?$" str) (concat str "0"))
-                ((string-match "\\.[0-9]\\|[eE]" str) str)
-                ((string-match "\\." str)
+                ((string-match-p "[eE][+-]?$" str) (concat str "0"))
+                ((string-match-p "\\.[0-9]\\|[eE]" str) str)
+                ((string-match-p "\\." str)
                  ;; do this because Emacs reads "23." as an integer
                  (concat str "0"))
                 ((stringp str) (concat str ".0"))
@@ -1124,11 +1126,10 @@ the 'left or 'right when one of the standard modes is used."
         (format calculator-displayer num))
        ((symbolp calculator-displayer)
         (funcall calculator-displayer num))
-       ((and (consp calculator-displayer)
-             (eq 'std (car calculator-displayer)))
+       ((eq 'std (car-safe calculator-displayer))
         (calculator-standard-displayer num (cadr calculator-displayer)))
        ((listp calculator-displayer)
-        (eval calculator-displayer))
+        (eval calculator-displayer `((num. ,num))))
        (t (prin1-to-string num t))))
     ;; operators are printed here
     (t (prin1-to-string (nth 1 num) t))))
@@ -1273,29 +1274,24 @@ arguments."
       ;; smaller than calculator-epsilon (1e-15).  I don't think this is
       ;; necessary now.
       (if (symbolp f)
-        (cond ((and X Y) (funcall f X Y))
-              (X         (funcall f X))
-              (t         (funcall f)))
+          (cond ((and X Y) (funcall f X Y))
+                (X         (funcall f X))
+                (t         (funcall f)))
         ;; f is an expression
-        (let* ((__f__ f) ; so we can get this value below...
-               (TX (calculator-truncate X))
+        (let* ((TX (calculator-truncate X))
                (TY (and Y (calculator-truncate Y)))
                (DX (if calculator-deg (/ (* X pi) 180) X))
-               (L  calculator-saved-list)
-               (Fbound (fboundp 'F))
-               (Fsave  (and Fbound (symbol-function 'F)))
-               (Dbound (fboundp 'D))
-               (Dsave  (and Dbound (symbol-function 'D))))
-          ;; a shortened version of flet
-          (fset 'F (function
-                    (lambda (&optional x y)
-                      (calculator-funcall __f__ x y))))
-          (fset 'D (function
-                    (lambda (x)
-                      (if calculator-deg (/ (* x 180) float-pi) x))))
-          (unwind-protect (eval f)
-            (if Fbound (fset 'F Fsave) (fmakunbound 'F))
-            (if Dbound (fset 'D Dsave) (fmakunbound 'D)))))
+               (L  calculator-saved-list))
+          (cl-letf (((symbol-function 'F)
+                     (lambda (&optional x y) (calculator-funcall f x y)))
+                    ((symbol-function 'D)
+                     (lambda (x) (if calculator-deg (/ (* x 180) float-pi) x))))
+            (eval f `((X . ,X)
+                      (Y . ,Y)
+                      (TX . ,TX)
+                      (TY . ,TY)
+                      (DX . ,DX)
+                      (L . ,L))))))
     (error 0)))
 
 ;;;---------------------------------------------------------------------
@@ -1366,7 +1362,7 @@ OP is the operator (if any) that caused this call."
            (or calculator-display-fragile
                (not (numberp (car calculator-stack))))
            (not (and calculator-curnum
-                     (string-match "[.eE]" calculator-curnum))))
+                     (string-match-p "[.eE]" calculator-curnum))))
     ;; enter the period on the same condition as a digit, only if no
     ;; period or exponent entered yet
     (progn
@@ -1382,7 +1378,7 @@ OP is the operator (if any) that caused this call."
     (if (and (or calculator-display-fragile
                  (not (numberp (car calculator-stack))))
              (not (and calculator-curnum
-                       (string-match "[eE]" calculator-curnum))))
+                       (string-match-p "[eE]" calculator-curnum))))
       ;; same condition as above, also no E so far
       (progn
         (calculator-clear-fragile)
@@ -1452,7 +1448,7 @@ no need for negative numbers since these are handled by unary operators)."
   (interactive)
   (if (and (not calculator-display-fragile)
            calculator-curnum
-           (string-match "[eE]$" calculator-curnum))
+           (string-match-p "[eE]$" calculator-curnum))
     (calculator-digit)
     (calculator-op)))
 
@@ -1661,8 +1657,7 @@ Used by `calculator-paste' and `get-register'."
           (setq str (concat (or (match-string 1 str) "0")
                             (or (match-string 2 str) ".0")
                             (or (match-string 3 str) ""))))
-     (condition-case nil (calculator-string-to-number str)
-       (error nil)))))
+     (ignore-errors (calculator-string-to-number str)))))
 
 (defun calculator-get-register (reg)
   "Get a value from a register REG."
@@ -1728,13 +1723,11 @@ Used by `calculator-paste' and `get-register'."
   (interactive)
   (set-buffer calculator-buffer)
   (let ((inhibit-read-only t)) (erase-buffer))
-  (if (not calculator-electric-mode)
-    (progn
-      (condition-case nil
-          (while (get-buffer-window calculator-buffer)
-            (delete-window (get-buffer-window calculator-buffer)))
-        (error nil))
-      (kill-buffer calculator-buffer)))
+  (unless calculator-electric-mode
+    (ignore-errors
+      (while (get-buffer-window calculator-buffer)
+        (delete-window (get-buffer-window calculator-buffer))))
+    (kill-buffer calculator-buffer))
   (setq calculator-buffer nil)
   (message "Calculator done.")
   (if calculator-electric-mode (throw 'calculator-done nil)))
@@ -1768,14 +1761,11 @@ To use this, apply a binary operator (evaluate it), then call this."
 
 (defun calculator-integer-p (x)
   "Non-nil if X is equal to an integer."
-  (condition-case nil
-      (= x (ftruncate x))
-    (error nil)))
+  (ignore-errors (= x (ftruncate x))))
 
 (defun calculator-expt (x y)
   "Compute X^Y, dealing with errors appropriately."
-  (condition-case
-      nil
+  (condition-case nil
       (expt x y)
     (domain-error 0.0e+NaN)
     (range-error
diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index ea3a5b2caf2..97b20f6b02b 100644
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -472,7 +472,7 @@ separate appointment."
     (shrink-window-if-larger-than-buffer (get-buffer-window appt-disp-buf t))
     (set-buffer-modified-p nil)
     (setq buffer-read-only t)
-    (raise-frame (selected-frame))
+    (raise-frame)
     (select-window this-window)))
 
 (defun appt-delete-window ()
diff --git a/lisp/calendar/cal-china.el b/lisp/calendar/cal-china.el
index 86e6efa9696..ca9af673cc2 100644
--- a/lisp/calendar/cal-china.el
+++ b/lisp/calendar/cal-china.el
@@ -327,19 +327,7 @@ Gregorian year Y-1 to the Chinese month of the solstice of Gregorian year Y."
 (defvar calendar-chinese-year-cache
   ;; Maintainers: delete existing value, position point at start of
   ;; empty line, then call  M-: (calendar-chinese-year-cache-init N)
-  '((2000 (12 730126) (1 730155) (2 730185) (3 730215) (4 730244) (5 730273)
-          (6 730303) (7 730332) (8 730361) (9 730391) (10 730420) (11 730450))
-    (2001 (12 730480) (1 730509) (2 730539) (3 730569) (4 730598) (4.5 730628)
-          (5 730657) (6 730687) (7 730716) (8 730745) (9 730775) (10 730804)
-          (11 730834))
-    (2002 (12 730863) (1 730893) (2 730923) (3 730953) (4 730982) (5 731012)
-          (6 731041) (7 731071) (8 731100) (9 731129) (10 731159) (11 731188))
-    (2003 (12 731218) (1 731247) (2 731277) (3 731307) (4 731336) (5 731366)
-          (6 731396) (7 731425) (8 731455) (9 731484) (10 731513) (11 731543))
-    (2004 (12 731572) (1 731602) (2 731631) (2.5 731661) (3 731690) (4 731720)
-          (5 731750) (6 731779) (7 731809) (8 731838) (9 731868) (10 731897)
-          (11 731927))
-    (2005 (12 731956) (1 731986) (2 732015) (3 732045) (4 732074) (5 732104)
+  '((2005 (12 731956) (1 731986) (2 732015) (3 732045) (4 732074) (5 732104)
           (6 732133) (7 732163) (8 732193) (9 732222) (10 732252) (11 732281))
     (2006 (12 732311) (1 732340) (2 732370) (3 732399) (4 732429) (5 732458)
           (6 732488) (7 732517) (7.5 732547) (8 732576) (9 732606) (10 732636)
@@ -376,7 +364,19 @@ Gregorian year Y-1 to the Chinese month of the solstice of Gregorian year Y."
           (6 737243) (7 737272) (8 737301) (9 737331) (10 737360) (11 737389))
     (2020 (12 737419) (1 737449) (2 737478) (3 737508) (4 737538) (4.5 737568)
           (5 737597) (6 737627) (7 737656) (8 737685) (9 737715) (10 737744)
-          (11 737774)))
+          (11 737774))
+    (2021 (12 737803) (1 737833) (2 737862) (3 737892) (4 737922) (5 737951)
+          (6 737981) (7 738010) (8 738040) (9 738069) (10 738099) (11 738128))
+    (2022 (12 738158) (1 738187) (2 738217) (3 738246) (4 738276) (5 738305)
+          (6 738335) (7 738365) (8 738394) (9 738424) (10 738453) (11 738483))
+    (2023 (12 738512) (1 738542) (2 738571) (2.5 738601) (3 738630) (4 738659)
+          (5 738689) (6 738719) (7 738748) (8 738778) (9 738808) (10 738837)
+          (11 738867))
+    (2024 (12 738896) (1 738926) (2 738955) (3 738985) (4 739014) (5 739043)
+          (6 739073) (7 739102) (8 739132) (9 739162) (10 739191) (11 739221))
+    (2025 (12 739251) (1 739280) (2 739310) (3 739339) (4 739369) (5 739398)
+          (6 739427) (6.5 739457) (7 739486) (8 739516) (9 739545) (10 739575)
+          (11 739605)))
   "Alist of Chinese year structures as determined by `chinese-year'.
 The default can be nil, but some values are precomputed for efficiency.")
 
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 20a8684e387..e1f85832dc4 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -259,6 +259,23 @@ See `calendar-holiday-marker'."
 
 (define-obsolete-face-alias 'holiday-face 'holiday "22.1")
 
+(defface calendar-weekday-header '((t :inherit font-lock-constant-face))
+  "Face used for weekday column headers in the calendar.
+See also the face `calendar-weekend-header'."
+  :version "24.4"
+  :group 'calendar-faces)
+
+(defface calendar-weekend-header '((t :inherit font-lock-comment-face))
+  "Face used for weekend column headers in the calendar.
+See also the face `calendar-weekday-header'."
+  :version "24.4"
+  :group 'calendar-faces)
+
+(defface calendar-month-header '((t :inherit font-lock-function-name-face))
+  "Face used for month headers in the calendar."
+  :version "24.4"
+  :group 'calendar-faces)
+
 ;; These briefly checked font-lock-mode, but that is broken, since it
 ;; is a buffer-local variable, and which buffer happens to be current
 ;; when this file is loaded shouldn't make a difference.  One could
@@ -447,7 +464,6 @@ rightmost column."
     (push (cons i (calendar-month-edges i)) calendar-month-edges))
   (setq calendar-month-edges (reverse calendar-month-edges)))
 
-;; FIXME add font-lock-keywords.
 (defun calendar-set-layout-variable (symbol value &optional minmax)
   "Set SYMBOL's value to VALUE, an integer.
 A positive/negative MINMAX enforces a minimum/maximum value.
@@ -491,12 +507,25 @@ Then redraw the calendar, if necessary."
   :type 'integer
   :version "23.1")
 
+(defun calendar-day-header-construct (&optional width)
+  "Return the default value for `calendar-day-header-array'.
+WIDTH defaults to `calendar-day-header-width'."
+  (or width (setq width calendar-day-header-width))
+  (calendar-abbrev-construct (if (<= width calendar-abbrev-length)
+                                 calendar-day-abbrev-array
+                               calendar-day-name-array)
+                             width))
+
+;; FIXME better to use a format spec?
 (defcustom calendar-day-header-width 2
   "Width of the day column headers in the calendar.
 Must be at least one less than `calendar-column-width'."
   :group 'calendar
   :initialize 'custom-initialize-default
   :set (lambda (sym val)
+         (or (calendar-customized-p 'calendar-day-header-array)
+             (setq calendar-day-header-array
+                   (calendar-day-header-construct val)))
          (calendar-set-layout-variable sym val (- 1 calendar-column-width)))
   :type 'integer
   :version "23.1")
@@ -924,33 +953,33 @@ styles."
 
 (defcustom calendar-american-month-header
   '(propertize (format "%s %d" (calendar-month-name month) year)
-               'font-lock-face 'font-lock-function-name-face)
+               'font-lock-face 'calendar-month-header)
   "Default format for calendar month headings with the American date style.
 Normally you should not customize this, but `calender-month-header'."
   :group 'calendar
   :risky t
   :type 'sexp
-  :version "24.3")
+  :version "24.4") ; font-lock-function-name-face -> calendar-month-header
 
 (defcustom calendar-european-month-header
   '(propertize (format "%s %d" (calendar-month-name month) year)
-               'font-lock-face 'font-lock-function-name-face)
+               'font-lock-face 'calendar-month-header)
   "Default format for calendar month headings with the European date style.
 Normally you should not customize this, but `calender-month-header'."
   :group 'calendar
   :risky t
   :type 'sexp
-  :version "24.3")
+  :version "24.4") ; font-lock-function-name-face -> calendar-month-header
 
 (defcustom calendar-iso-month-header
   '(propertize (format "%d %s" year (calendar-month-name month))
-               'font-lock-face 'font-lock-function-name-face)
+               'font-lock-face 'calendar-month-header)
   "Default format for calendar month headings with the ISO date style.
 Normally you should not customize this, but `calender-month-header'."
   :group 'calendar
   :risky t
   :type 'sexp
-  :version "24.3")
+  :version "24.4") ; font-lock-function-name-face -> calendar-month-header
 
 (defcustom calendar-month-header
   (cond ((eq calendar-date-style 'iso)
@@ -1422,7 +1451,7 @@ Optional integers MON and YR are used instead of today's date."
          (year (calendar-extract-year today))
          (today-visible (or (not mon)
                             (<= (abs (calendar-interval mon yr month year)) 1)))
-         (in-calendar-window (eq (window-buffer (selected-window))
+         (in-calendar-window (eq (window-buffer)
                                  (get-buffer calendar-buffer))))
     (calendar-generate (or mon month) (or yr year))
     (calendar-update-mode-line)
@@ -1517,8 +1546,7 @@ line."
          (last (calendar-last-day-of-month month year))
          (trunc (min calendar-intermonth-spacing
                      (1- calendar-left-margin)))
-         (day 1)
-         string)
+         (day 1))
    (goto-char (point-min))
    (calendar-move-to-column indent)
    (insert
@@ -1526,15 +1554,16 @@ line."
                             ?\s calendar-month-digit-width))
    (calendar-ensure-newline)
    (calendar-insert-at-column indent calendar-intermonth-header trunc)
-   ;; Use the first two characters of each day to head the columns.
+   ;; Use the first N characters of each day to head the columns.
    (dotimes (i 7)
      (insert
-      (progn
-        (setq string
-              (calendar-day-name (mod (+ calendar-week-start-day i) 7) nil t))
-        (if enable-multibyte-characters
-            (truncate-string-to-width string calendar-day-header-width)
-          (substring string 0 calendar-day-header-width)))
+      (truncate-string-to-width
+       (propertize (calendar-day-name (mod (+ calendar-week-start-day i) 7)
+                                      'header t)
+                   'font-lock-face (if (memq i '(0 6))
+                                       'calendar-weekend-header
+                                     'calendar-weekday-header))
+       calendar-day-header-width nil ?\s)
       (make-string (- calendar-column-width calendar-day-header-width) ?\s)))
    (calendar-ensure-newline)
    (calendar-insert-at-column indent calendar-intermonth-text trunc)
@@ -1544,15 +1573,15 @@ line."
    (dotimes (i last)
      (setq day (1+ i))
      ;; TODO should numbers be left-justified, centered...?
-     (insert (format (format "%%%dd%%s" calendar-day-digit-width) day
-                     (make-string
-                      (- calendar-column-width calendar-day-digit-width) ?\s)))
-     ;; 'date property prevents intermonth text confusing re-searches.
-     ;; (Tried intangible, it did not really work.)
-     (set-text-properties
-      (- (point) (1+ calendar-day-digit-width)) (1- (point))
-      `(mouse-face highlight help-echo ,(eval calendar-date-echo-text)
-                   date t))
+     (insert (propertize
+              (format (format "%%%dd" calendar-day-digit-width) day)
+              'mouse-face 'highlight
+              'help-echo (eval calendar-date-echo-text)
+              ;; 'date property prevents intermonth text confusing re-searches.
+              ;; (Tried intangible, it did not really work.)
+              'date t)
+             (make-string
+              (- calendar-column-width calendar-day-digit-width) ?\s))
      (when (and (zerop (mod (+ day blank-days) 7))
                 (/= day last))
        (calendar-ensure-newline)
@@ -1810,8 +1839,9 @@ For a complete description, see the info node `Calendar/Diary'.
   ;; soon in calendar-generate, but better safe than sorry.
   (unless (boundp 'displayed-month) (setq displayed-month 1))
   (unless (boundp 'displayed-year)  (setq displayed-year  2001))
-  (set (make-local-variable 'font-lock-defaults)
-       '(calendar-font-lock-keywords t)))
+  (if (bound-and-true-p calendar-font-lock-keywords)
+      (set (make-local-variable 'font-lock-defaults)
+           '(calendar-font-lock-keywords t))))
 
 (defun calendar-string-spread (strings char length)
   "Concatenate list of STRINGS separated with copies of CHAR to fill LENGTH.
@@ -2081,33 +2111,41 @@ is a string to insert in the minibuffer before reading."
          (and standard
               (not (equal (eval (car standard)) (default-value symbol)))))))
 
-(defun calendar-abbrev-construct (full)
+(defun calendar-abbrev-construct (full &optional maxlen)
   "From sequence FULL, return a vector of abbreviations.
-Each abbreviation is no longer than `calendar-abbrev-length' characters."
+Each abbreviation is no longer than MAXLEN (default `calendar-abbrev-length')
+characters."
+  (or maxlen (setq maxlen calendar-abbrev-length))
   (apply 'vector (mapcar
                   (lambda (f)
-                    (substring f 0 (min calendar-abbrev-length (length f))))
+                    ;; TODO? truncate-string-to-width?
+                    (substring f 0 (min maxlen (length f))))
                   full)))
 
 (defcustom calendar-day-name-array
   ["Sunday" "Monday" "Tuesday" "Wednesday" "Thursday" "Friday" "Saturday"]
   "Array of capitalized strings giving, in order from Sunday, the day names.
-The first two characters of each string will be used to head the
-day columns in the calendar.
 If you change this without using customize after the calendar has loaded,
-then you may also want to change `calendar-day-abbrev-array'."
+then you may also want to change `calendar-day-abbrev-array'
+and `calendar-day-header-array'."
   :group 'calendar
   :initialize 'custom-initialize-default
   :set (lambda (symbol value)
          (let ((dcustomized (calendar-customized-p 'calendar-day-abbrev-array))
-               (hcustomized (calendar-customized-p 'cal-html-day-abbrev-array)))
+               (hcustomized (calendar-customized-p 'cal-html-day-abbrev-array))
+               (ccustomized (calendar-customized-p 'calendar-day-header-array)))
            (set symbol value)
            (or dcustomized
                (setq calendar-day-abbrev-array
                      (calendar-abbrev-construct calendar-day-name-array)))
            (and (not hcustomized)
                 (boundp 'cal-html-day-abbrev-array)
-                (setq cal-html-day-abbrev-array calendar-day-abbrev-array))))
+                (setq cal-html-day-abbrev-array calendar-day-abbrev-array))
+           (or ccustomized
+               (equal calendar-day-header-array
+                      (setq calendar-day-header-array
+                            (calendar-day-header-construct)))
+               (calendar-redraw))))
   :type '(vector (string :tag "Sunday")
                  (string :tag "Monday")
                  (string :tag "Tuesday")
@@ -2127,7 +2165,8 @@ then you may also want to change `calendar-day-abbrev-array' and
          (let ((dcustomized (calendar-customized-p 'calendar-day-abbrev-array))
                (mcustomized (calendar-customized-p
                              'calendar-month-abbrev-array))
-               (hcustomized (calendar-customized-p 'cal-html-day-abbrev-array)))
+               (hcustomized (calendar-customized-p 'cal-html-day-abbrev-array))
+               (ccustomized (calendar-customized-p 'calendar-day-header-array)))
            (set symbol value)
            (or dcustomized
                (setq calendar-day-abbrev-array
@@ -2137,7 +2176,12 @@ then you may also want to change `calendar-day-abbrev-array' and
                      (calendar-abbrev-construct calendar-month-name-array)))
            (and (not hcustomized)
                 (boundp 'cal-html-day-abbrev-array)
-                (setq cal-html-day-abbrev-array calendar-day-abbrev-array))))
+                (setq cal-html-day-abbrev-array calendar-day-abbrev-array))
+           (or ccustomized
+               (equal calendar-day-header-array
+                      (setq calendar-day-header-array
+                            (calendar-day-header-construct)))
+               (calendar-redraw))))
   :type 'integer)
 
 (defcustom calendar-day-abbrev-array
@@ -2154,11 +2198,17 @@ full name."
   :initialize 'custom-initialize-default
   :set-after '(calendar-abbrev-length calendar-day-name-array)
   :set (lambda (symbol value)
-         (let ((hcustomized (calendar-customized-p 'cal-html-day-abbrev-array)))
+         (let ((hcustomized (calendar-customized-p 'cal-html-day-abbrev-array))
+               (ccustomized (calendar-customized-p 'calendar-day-header-array)))
            (set symbol value)
            (and (not hcustomized)
                 (boundp 'cal-html-day-abbrev-array)
-                (setq cal-html-day-abbrev-array calendar-day-abbrev-array))))
+                (setq cal-html-day-abbrev-array calendar-day-abbrev-array))
+           (or ccustomized
+               (equal calendar-day-header-array
+                      (setq calendar-day-header-array
+                            (calendar-day-header-construct)))
+               (calendar-redraw))))
   :type '(vector (string :tag "Sun")
                  (string :tag "Mon")
                  (string :tag "Tue")
@@ -2169,6 +2219,33 @@ full name."
   ;; Made defcustom, changed defaults from nil nil...
   :version "24.1")
 
+(defcustom calendar-day-header-array (calendar-day-header-construct)
+  "Array of strings to use for the headers of the calendar's day columns.
+The order should be the same as in `calendar-day-name-array'.
+In use, the calendar truncates elements to no more than
+`calendar-day-header-width' columns wide.
+Emacs constructs the default from either `calendar-day-name-array'
+\(if `calendar-day-header-width' is more than `calendar-abbrev-length'),
+or from `calendar-day-abbrev-array' (assuming that the abbreviated
+name are more likely to be unique when truncated)."
+  :group 'calendar
+  :initialize 'custom-initialize-default
+  :set-after '(calendar-day-header-width
+               calendar-abbrev-length calendar-day-name-array
+               calendar-day-abbrev-array)
+  :set (lambda (symbol value)
+         (or (equal calendar-day-header-array
+                    (set symbol value))
+             (calendar-redraw)))
+  :type '(vector (string :tag "Su")
+                 (string :tag "Mo")
+                 (string :tag "Tu")
+                 (string :tag "We")
+                 (string :tag "Th")
+                 (string :tag "Fr")
+                 (string :tag "Sa"))
+  :version "24.4")
+
 (defcustom calendar-month-name-array
   ["January" "February" "March"     "April"   "May"      "June"
    "July"    "August"   "September" "October" "November" "December"]
@@ -2283,35 +2360,25 @@ Negative years are interpreted as years BC; -1 being 1 BC, and so on."
   (+ (* 12 (- yr2 yr1))
      (- mon2 mon1)))
 
-(defvar calendar-font-lock-keywords
-  ;; Month and year.  Not really needed now that calendar-month-header
-  ;; contains propertize, and not correct for non-american forms
-  ;; of that variable.
-  `((,(concat (regexp-opt (mapcar 'identity calendar-month-name-array) t)
-              " -?[0-9]+")
-     . font-lock-function-name-face)
-    (,(regexp-opt
-       (list (substring (aref calendar-day-name-array 6)
-                        0 calendar-day-header-width)
-             (substring (aref calendar-day-name-array 0)
-                        0 calendar-day-header-width)))
-     ;; Saturdays and Sundays are highlighted differently.
-     . font-lock-comment-face)
-    ;; First two chars of each day are used in the calendar.
-    (,(regexp-opt (mapcar (lambda (x) (substring x 0 calendar-day-header-width))
-                          calendar-day-name-array))
-     . font-lock-constant-face))
+(defvar calendar-font-lock-keywords nil
   "Default keywords to highlight in Calendar mode.")
 
+(make-obsolete-variable 'calendar-font-lock-keywords
+                        "set font-lock keywords in `calendar-mode-hook', \
+or customize calendar faces." "24.4")
+
 (defun calendar-day-name (date &optional abbrev absolute)
   "Return a string with the name of the day of the week of DATE.
 DATE should be a list in the format (MONTH DAY YEAR), unless the
 optional argument ABSOLUTE is non-nil, in which case DATE should
 be an integer in the range 0 to 6 corresponding to the day of the
 week.  Day names are taken from the variable `calendar-day-name-array',
-unless the optional argument ABBREV is non-nil, in which case
-the variable `calendar-day-abbrev-array' is used."
-  (aref (if abbrev calendar-day-abbrev-array calendar-day-name-array)
+unless the optional argument ABBREV is non-nil:
+`header' means to use `calendar-day-header-array';
+t to use `calendar-day-abbrev-array'."
+  (aref (cond ((eq abbrev 'header) calendar-day-header-array)
+              (abbrev calendar-day-abbrev-array)
+              (t calendar-day-name-array))
         (if absolute date (calendar-day-of-week date))))
 
 (defun calendar-month-name (month &optional abbrev)
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 7bdb3cd49f6..6b89677554f 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -1011,8 +1011,7 @@ Entries that do not apply are made invisible.  Holidays are shown
 in the mode line.  This is an option for `diary-display-function'."
   ;; If selected window is dedicated (to the calendar), need a new one
   ;; to display the diary.
-  (let* ((pop-up-frames (or pop-up-frames
-                            (window-dedicated-p (selected-window))))
+  (let* ((pop-up-frames (or pop-up-frames (window-dedicated-p)))
          (dbuff (find-buffer-visiting diary-file))
          (empty (diary-display-no-entries)))
     ;; This may be too wide, but when simple diary is used there is
@@ -1216,8 +1215,7 @@ all entries, not just some, are visible.  If there is no diary buffer, one
 is created."
   (interactive)
   (let* ((d-file (diary-check-diary-file))
-         (pop-up-frames (or pop-up-frames
-                            (window-dedicated-p (selected-window))))
+         (pop-up-frames (or pop-up-frames (window-dedicated-p)))
          (win (selected-window))
          (height (window-height)))
     (with-current-buffer (or (find-buffer-visiting d-file)
@@ -2116,8 +2114,7 @@ calendar."
   "Insert a diary entry STRING which may be NONMARKING in FILE.
 If omitted, NONMARKING defaults to nil and FILE defaults to
 `diary-file'."
-  (let ((pop-up-frames (or pop-up-frames
-                           (window-dedicated-p (selected-window)))))
+  (let ((pop-up-frames (or pop-up-frames (window-dedicated-p))))
     (find-file-other-window (or file diary-file)))
   (when (eq major-mode (default-value 'major-mode)) (diary-mode))
   (widen)
diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el
index 70d064143dc..da074d377b5 100644
--- a/lisp/calendar/timeclock.el
+++ b/lisp/calendar/timeclock.el
@@ -136,7 +136,7 @@ This variable only has effect if set with \\[customize]."
          (if value
              (add-hook 'kill-emacs-query-functions 'timeclock-query-out)
            (remove-hook 'kill-emacs-query-functions 'timeclock-query-out))
-         (setq timeclock-ask-before-exiting value))
+         (set symbol value))
   :type 'boolean
   :group 'timeclock)
 
@@ -174,11 +174,12 @@ a positive argument to force an update."
                              timeclock-update-timer)))
                (setq currently-displaying nil))
            (and currently-displaying
-                (set-variable 'timeclock-mode-line-display nil))
-           (setq timeclock-use-display-time value)
+                (setq timeclock-mode-line-display nil))
+           (set symbol value)
            (and currently-displaying
-                (set-variable 'timeclock-mode-line-display t))
-           timeclock-use-display-time))
+                (setq timeclock-mode-line-display t))
+           ;; FIXME: The return value isn't used, AFAIK!
+           value))
   :type 'boolean
   :group 'timeclock
   :require 'time)
@@ -269,9 +270,11 @@ The time is bracketed by <> if you are clocked in, otherwise by [].")
 
 (define-obsolete-function-alias 'timeclock-modeline-display
   'timeclock-mode-line-display "24.3")
+(define-obsolete-variable-alias 'timeclock-modeline-display
+  'timeclock-mode-line-display "24.3")
 
 ;;;###autoload
-(defun timeclock-mode-line-display (&optional arg)
+(define-minor-mode timeclock-mode-line-display
   "Toggle display of the amount of time left today in the mode line.
 If `timeclock-use-display-time' is non-nil (the default), then
 the function `display-time-mode' must be active, and the mode line
@@ -280,61 +283,41 @@ the timeclock will use its own sixty second timer to do its
 updating.  With prefix ARG, turn mode line display on if and only
 if ARG is positive.  Returns the new status of timeclock mode line
 display (non-nil means on)."
-  (interactive "P")
+  :global t
   ;; cf display-time-mode.
   (setq timeclock-mode-string "")
   (or global-mode-string (setq global-mode-string '("")))
-  (let ((on-p (if arg
-                  (> (prefix-numeric-value arg) 0)
-                (not timeclock-mode-line-display))))
-    (if on-p
-        (progn
-          (or (memq 'timeclock-mode-string global-mode-string)
-              (setq global-mode-string
-                    (append global-mode-string '(timeclock-mode-string))))
-          (add-hook 'timeclock-event-hook 'timeclock-update-mode-line)
-          (when timeclock-update-timer
-            (cancel-timer timeclock-update-timer)
-            (setq timeclock-update-timer nil))
-          (if (boundp 'display-time-hook)
-              (remove-hook 'display-time-hook 'timeclock-update-mode-line))
-          (if timeclock-use-display-time
-              (progn
-                ;; Update immediately so there is a visible change
-                ;; on calling this function.
-                (if display-time-mode
-                    (timeclock-update-mode-line)
-                  (message "Activate `display-time-mode' or turn off \
+  (if timeclock-mode-line-display
+      (progn
+        (or (memq 'timeclock-mode-string global-mode-string)
+            (setq global-mode-string
+                  (append global-mode-string '(timeclock-mode-string))))
+        (add-hook 'timeclock-event-hook 'timeclock-update-mode-line)
+        (when timeclock-update-timer
+          (cancel-timer timeclock-update-timer)
+          (setq timeclock-update-timer nil))
+        (if (boundp 'display-time-hook)
+            (remove-hook 'display-time-hook 'timeclock-update-mode-line))
+        (if timeclock-use-display-time
+            (progn
+              ;; Update immediately so there is a visible change
+              ;; on calling this function.
+              (if display-time-mode
+                  (timeclock-update-mode-line)
+                (message "Activate `display-time-mode' or turn off \
 `timeclock-use-display-time' to see timeclock information"))
-                (add-hook 'display-time-hook 'timeclock-update-mode-line))
-            (setq timeclock-update-timer
-                  (run-at-time nil 60 'timeclock-update-mode-line))))
-      (setq global-mode-string
-            (delq 'timeclock-mode-string global-mode-string))
-      (remove-hook 'timeclock-event-hook 'timeclock-update-mode-line)
-      (if (boundp 'display-time-hook)
-          (remove-hook 'display-time-hook
-                       'timeclock-update-mode-line))
-      (when timeclock-update-timer
-        (cancel-timer timeclock-update-timer)
-        (setq timeclock-update-timer nil)))
-    (force-mode-line-update)
-    (setq timeclock-mode-line-display on-p)))
-
-(define-obsolete-variable-alias 'timeclock-modeline-display
-  'timeclock-mode-line-display "24.3")
-
-;; This has to be here so that the function definition of
-;; `timeclock-mode-line-display' is known to the "set" function.
-(defcustom timeclock-mode-line-display nil
-  "Toggle mode line display of time remaining.
-You must modify via \\[customize] for this variable to have an effect."
-  :set (lambda (symbol value)
-         (setq timeclock-mode-line-display
-               (timeclock-mode-line-display (or value 0))))
-  :type 'boolean
-  :group 'timeclock
-  :require 'timeclock)
+              (add-hook 'display-time-hook 'timeclock-update-mode-line))
+          (setq timeclock-update-timer
+                (run-at-time nil 60 'timeclock-update-mode-line))))
+    (setq global-mode-string
+          (delq 'timeclock-mode-string global-mode-string))
+    (remove-hook 'timeclock-event-hook 'timeclock-update-mode-line)
+    (if (boundp 'display-time-hook)
+        (remove-hook 'display-time-hook
+                     'timeclock-update-mode-line))
+    (when timeclock-update-timer
+      (cancel-timer timeclock-update-timer)
+      (setq timeclock-update-timer nil))))
 
 (defsubst timeclock-time-to-date (time)
   "Convert the TIME value to a textual date string."
@@ -835,25 +818,24 @@ This is only provided for coherency when used by
   "Return a list of all the projects in DAY."
   (timeclock-entry-list-projects (cddr day)))
 
-(defmacro timeclock-day-list-template (func)
+(defun timeclock-day-list-template (func day-list)
   "Template for summing the result of FUNC on each element of DAY-LIST."
-  `(let ((length 0))
-     (while day-list
-       (setq length (+ length (,(eval func) (car day-list)))
-             day-list (cdr day-list)))
-     length))
+  (let ((length 0))
+    (dolist (day day-list)
+      (setq length (+ length (funcall func day))))
+    length))
 
 (defun timeclock-day-list-required (day-list)
   "Return total required length of DAY-LIST, in seconds."
-  (timeclock-day-list-template 'timeclock-day-required))
+  (timeclock-day-list-template #'timeclock-day-required day-list))
 
 (defun timeclock-day-list-length (day-list)
   "Return actual length of DAY-LIST, in seconds."
-  (timeclock-day-list-template 'timeclock-day-length))
+  (timeclock-day-list-template #'timeclock-day-length day-list))
 
 (defun timeclock-day-list-debt (day-list)
   "Return total debt (required - actual) of DAY-LIST."
-  (timeclock-day-list-template 'timeclock-day-debt))
+  (timeclock-day-list-template #'timeclock-day-debt day-list))
 
 (defsubst timeclock-day-list-begin (day-list)
   "Return the start time of DAY-LIST."
@@ -865,11 +847,11 @@ This is only provided for coherency when used by
 
 (defun timeclock-day-list-span (day-list)
   "Return the span of DAY-LIST."
-  (timeclock-day-list-template 'timeclock-day-span))
+  (timeclock-day-list-template #'timeclock-day-span day-list))
 
 (defun timeclock-day-list-break (day-list)
   "Return the total break of DAY-LIST."
-  (timeclock-day-list-template 'timeclock-day-break))
+  (timeclock-day-list-template #'timeclock-day-break day-list))
 
 (defun timeclock-day-list-projects (day-list)
   "Return a list of all the projects in DAY-LIST."
diff --git a/lisp/comint.el b/lisp/comint.el
index 217bd4e8b6d..0ce7053c031 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -636,7 +636,7 @@ Entry to this mode runs the hooks on `comint-mode-hook'."
   (setq-local comint-last-input-start (point-min-marker))
   (setq-local comint-last-input-end (point-min-marker))
   (setq-local comint-last-output-start (make-marker))
-  (make-local-variable 'comint-last-prompt-overlay)
+  (make-local-variable 'comint-last-prompt)
   (make-local-variable 'comint-prompt-regexp)        ; Don't set; default
   (make-local-variable 'comint-input-ring-size)      ; ...to global val.
   (make-local-variable 'comint-input-ring)
@@ -1562,8 +1562,9 @@ or to the last history element for a backward search."
   "Save a function restoring the state of input history search.
 Save `comint-input-ring-index' to the additional state parameter
 in the search status stack."
-  `(lambda (cmd)
-     (comint-history-isearch-pop-state cmd ,comint-input-ring-index)))
+  (let ((index comint-input-ring-index))
+    (lambda (cmd)
+      (comint-history-isearch-pop-state cmd index))))
 
 (defun comint-history-isearch-pop-state (_cmd hist-pos)
   "Restore the input history search state.
@@ -1902,21 +1903,24 @@ either globally or locally.")
   "If nil, Comint will interpret `carriage control' characters in output.
 See `comint-carriage-motion' for details.")
 
-;; When non-nil, this is an overlay over the last recognized prompt in
-;; the buffer; it is used when highlighting the prompt.
-(defvar comint-last-prompt-overlay nil)
+(defvar comint-last-prompt nil
+  "Markers pointing to the last prompt.
+If non-nil, a cons cell containing markers.  The car points to
+the start, the cdr to the end of the last prompt recognized.")
 
 (defun comint-snapshot-last-prompt ()
-  "`snapshot' any current `comint-last-prompt-overlay'.
-Freeze its attributes in place, even when more input comes along
-and moves the prompt overlay."
-  (when comint-last-prompt-overlay
-    (let ((inhibit-read-only t))
-      (with-silent-modifications
-        (add-text-properties
-         (overlay-start comint-last-prompt-overlay)
-         (overlay-end comint-last-prompt-overlay)
-         (overlay-properties comint-last-prompt-overlay))))))
+  "Snapshot the current `comint-last-prompt'.
+Freezes the `font-lock-face' text property in place."
+  (when comint-last-prompt
+    (with-silent-modifications
+      (add-text-properties
+       (car comint-last-prompt)
+       (cdr comint-last-prompt)
+       '(font-lock-face comint-highlight-prompt)))
+    ;; Reset comint-last-prompt so later on comint-output-filter does
+    ;; not remove the font-lock-face text property of the previous
+    ;; (this) prompt.
+    (setq comint-last-prompt nil)))
 
 (defun comint-carriage-motion (start end)
   "Interpret carriage control characters in the region from START to END.
@@ -2063,20 +2067,15 @@ Make backspaces delete the previous character."
                   (add-text-properties
                    prompt-start (point)
                    '(read-only t rear-nonsticky t front-sticky (read-only)))))
-              (unless (and (bolp) (null comint-last-prompt-overlay))
-                ;; Need to create or move the prompt overlay (in the case
-                ;; where there is no prompt ((bolp) == t), we still do
-                ;; this if there's already an existing overlay).
-                (if comint-last-prompt-overlay
-                    ;; Just move an existing overlay
-                    (move-overlay comint-last-prompt-overlay
-                                  prompt-start (point))
-                  ;; Need to create the overlay
-                  (setq comint-last-prompt-overlay
-                        (make-overlay prompt-start (point)))
-                  (overlay-put comint-last-prompt-overlay
-                               'font-lock-face 'comint-highlight-prompt))))
-
+              (when comint-last-prompt
+                (remove-text-properties (car comint-last-prompt)
+                                        (cdr comint-last-prompt)
+                                        '(font-lock-face)))
+              (setq comint-last-prompt
+                    (cons (copy-marker prompt-start) (point-marker)))
+              (add-text-properties (car comint-last-prompt)
+                                   (cdr comint-last-prompt)
+                                   '(font-lock-face comint-highlight-prompt)))
             (goto-char saved-point)))))))
 
 (defun comint-preinput-scroll-to-bottom ()
@@ -2296,7 +2295,7 @@ Security bug: your string can still be temporarily recovered with
   (interactive "P")                     ; Defeat snooping via C-x ESC ESC
   (let ((proc (get-buffer-process (current-buffer)))
         (prefix
-         (if (eq (window-buffer (selected-window)) (current-buffer))
+         (if (eq (window-buffer) (current-buffer))
              ""
            (format "(In buffer %s) "
                    (current-buffer)))))
@@ -3108,7 +3107,7 @@ completions listing is dependent on the value of `comint-completion-autolist'.
 Returns t if successful."
   (interactive)
   (when (comint--match-partial-filename)
-    (unless (window-minibuffer-p (selected-window))
+    (unless (window-minibuffer-p)
       (message "Completing file name..."))
     (let ((data (comint--complete-file-name-data)))
       (completion-in-region (nth 0 data) (nth 1 data) (nth 2 data)))))
@@ -3211,7 +3210,7 @@ Return `listed' if a completion listing was shown.
 See also `comint-dynamic-complete-filename'."
   (declare (obsolete completion-in-region "24.1"))
   (let* ((completion-ignore-case (memq system-type '(ms-dos windows-nt cygwin)))
-         (minibuffer-p (window-minibuffer-p (selected-window)))
+         (minibuffer-p (window-minibuffer-p))
          (suffix (cond ((not comint-completion-addsuffix) "")
                        ((not (consp comint-completion-addsuffix)) " ")
                        (t (cdr comint-completion-addsuffix))))
@@ -3308,7 +3307,7 @@ Typing SPC flushes the completions buffer."
             (current-window-configuration))
       (with-output-to-temp-buffer "*Completions*"
         (display-completion-list completions common-substring))
-      (if (window-minibuffer-p (selected-window))
+      (if (window-minibuffer-p)
           (minibuffer-message "Type space to flush; repeat completion command to scroll")
         (message "Type space to flush; repeat completion command to scroll")))
 
diff --git a/lisp/completion.el b/lisp/completion.el
index 3fbc3c05fb4..ee0234536aa 100644
--- a/lisp/completion.el
+++ b/lisp/completion.el
@@ -343,9 +343,6 @@ are automatically added to the completion database."
   :type '(set (const lisp) (const c))
   :group 'completion)
 
-;;(defvar *record-cmpl-statistics-p* nil
-;;  "If non-nil, record completion statistics.")
-
 ;;(defvar *completion-auto-save-period* 1800
 ;;  "The period in seconds to wait for emacs to be idle before autosaving
 ;;the completions.  Default is a 1/2 hour.")
@@ -692,16 +689,6 @@ Returns nil if there isn't one longer than `completion-min-length'."
 ;; are in completion-stats.el.
 
 ;;-----------------------------------------------
-;; Conditionalizing code on *record-cmpl-statistics-p*
-;;-----------------------------------------------
-;; All statistics code outside this block should use this
-(defmacro cmpl-statistics-block (&rest _body))
-;;  "Only executes body if we are recording statistics."
-;;  (list 'cond
-;;      (list* '*record-cmpl-statistics-p* body)
-;;      ))
-
-;;-----------------------------------------------
 ;; Completion Sources
 ;;-----------------------------------------------
 
@@ -1004,9 +991,7 @@ Each symbol is bound to a single completion entry.")
   "Initialize the completion storage.  All existing completions are lost."
   (interactive)
   (setq cmpl-prefix-obarray (make-vector cmpl-obarray-length 0))
-  (setq cmpl-obarray (make-vector cmpl-obarray-length 0))
-  (cmpl-statistics-block
-    (record-clear-all-completions)))
+  (setq cmpl-obarray (make-vector cmpl-obarray-length 0)))
 
 (defvar completions-list-return-value)
 
@@ -1154,9 +1139,6 @@ Returns the completion entry."
                (set-cmpl-prefix-entry-tail prefix-entry entry))
               (t
                (set cmpl-db-prefix-symbol (make-cmpl-prefix-entry entry))))
-        ;; statistics
-        (cmpl-statistics-block
-          (note-added-completion))
         ;; set symbol
         (set cmpl-db-symbol (car entry)))))
 
@@ -1206,9 +1188,6 @@ Returns the completion entry."
             (t
              ;; Start new prefix entry
              (set cmpl-db-prefix-symbol (make-cmpl-prefix-entry entry))))
-      ;; statistics
-      (cmpl-statistics-block
-        (note-added-completion))
       ;; Add it to the symbol
       (set cmpl-db-symbol (car entry)))))
 
@@ -1236,9 +1215,7 @@ String must be longer than `completion-prefix-min-length'."
                 (or (set-cmpl-prefix-entry-head
                       prefix-entry (cdr (cmpl-prefix-entry-head prefix-entry)))
                     ;; List is now empty
-                    (set cmpl-db-prefix-symbol nil))))
-         (cmpl-statistics-block
-           (note-completion-deleted)))
+                    (set cmpl-db-prefix-symbol nil)))))
       (error "Unknown completion `%s'" completion-string)))
 
 ;; Tests --
@@ -1372,8 +1349,6 @@ Completions added this way will automatically be saved if
   (let ((string (and enable-completion (symbol-before-point)))
         (current-completion-source cmpl-source-separator)
         entry)
-    (cmpl-statistics-block
-      (note-separator-character string))
     (cond (string
            (setq entry (add-completion-to-head string))
            (if (and completion-on-separator-character
@@ -1614,9 +1589,6 @@ Prefix args ::
                        completion-prefix-min-length)))
          ;; get index
          (setq cmpl-current-index (if current-prefix-arg arg 0))
-         ;; statistics
-         (cmpl-statistics-block
-           (note-complete-entered-afresh cmpl-original-string))
          ;; reset database
          (completion-search-reset cmpl-original-string)
          ;; erase what we've got
@@ -1626,7 +1598,7 @@ Prefix args ::
   ;; Get the next completion
   (let* ((print-status-p
           (and (>= baud-rate completion-prompt-speed-threshold)
-               (not (window-minibuffer-p (selected-window)))))
+               (not (window-minibuffer-p))))
          (insert-point (point))
          (entry (completion-search-next cmpl-current-index))
          string)
@@ -1649,9 +1621,6 @@ Prefix args ::
                   (goto-char insert-point))
                  (t;; point at end,
                   (setq cmpl-last-insert-location insert-point)))
-           ;; statistics
-           (cmpl-statistics-block
-             (note-complete-inserted entry cmpl-current-index))
            ;; Done ! cmpl-stat-complete-successful
            ;;display the next completion
            (cond
@@ -1677,9 +1646,6 @@ Prefix args ::
            (if (and print-status-p (sit-for 0))
                (message "No %scompletions."
                         (if (eq this-command last-command) "more " "")))
-           ;; statistics
-           (cmpl-statistics-block
-             (record-complete-failed cmpl-current-index))
            ;; Pretend that we were never here
            (setq this-command 'failed-complete)))))
 
@@ -1709,25 +1675,14 @@ Prefix args ::
 
 (defun add-completions-from-buffer ()
   (interactive)
-  (let ((current-completion-source cmpl-source-file-parsing)
-        (start-num
-         (cmpl-statistics-block
-          (aref completion-add-count-vector cmpl-source-file-parsing)))
-        mode)
+  (let ((current-completion-source cmpl-source-file-parsing))
     (cond ((memq major-mode '(emacs-lisp-mode lisp-mode))
-           (add-completions-from-lisp-buffer)
-           (setq mode 'lisp))
+           (add-completions-from-lisp-buffer))
           ((memq major-mode '(c-mode))
-           (add-completions-from-c-buffer)
-           (setq mode 'c))
+           (add-completions-from-c-buffer))
           (t
            (error "Cannot parse completions in %s buffers"
-                  major-mode)))
-    (cmpl-statistics-block
-      (record-cmpl-parse-file
-        mode (point-max)
-        (- (aref completion-add-count-vector cmpl-source-file-parsing)
-           start-num)))))
+                  major-mode)))))
 
 ;; Find file hook
 (defun completion-find-file-hook ()
@@ -1960,8 +1915,7 @@ Prefix args ::
         ((not cmpl-completions-accepted-p)
          (message "Completions database has not changed - not writing."))
         (t
-         (save-completions-to-file))))
-  (cmpl-statistics-block (record-cmpl-kill-emacs)))
+         (save-completions-to-file)))))
 
 ;; There is no point bothering to change this again
 ;; unless the package changes so much that it matters
@@ -2066,9 +2020,7 @@ If file name is not specified, use `save-completions-file-name'."
                (set-buffer-modified-p nil)
                (message "Couldn't save completion file `%s'" filename)))
             ;; Reset accepted-p flag
-            (setq cmpl-completions-accepted-p nil) )
-          (cmpl-statistics-block
-           (record-save-completions total-in-db total-perm total-saved))))))
+            (setq cmpl-completions-accepted-p nil) )))))
 
 ;;(defun auto-save-completions ()
 ;;  (if (and save-completions-flag enable-completion cmpl-initialized-p
@@ -2103,9 +2055,6 @@ If file is not specified, then use `save-completions-file-name'."
                   string entry last-use-time
                   cmpl-entry cmpl-last-use-time
                   (current-completion-source cmpl-source-init-file)
-                  (start-num
-                   (cmpl-statistics-block
-                    (aref completion-add-count-vector cmpl-source-file-parsing)))
                   (total-in-file 0) (total-perm 0))
               ;; insert the file into a buffer
               (condition-case nil
@@ -2163,12 +2112,6 @@ If file is not specified, then use `save-completions-file-name'."
                                (message "Loading completions from file %s . . . Done."
                                         filename))
                          (message "End of file while reading completions."))))))
-
-              (cmpl-statistics-block
-               (record-load-completions
-                total-in-file total-perm
-                (- (aref completion-add-count-vector cmpl-source-init-file)
-                   start-num)))
 ))))))
 
 (defun completion-initialize ()
@@ -2201,9 +2144,7 @@ Patched to remove the most recent completion."
   (cond ((eq last-command 'complete)
          (delete-region (point) cmpl-last-insert-location)
          (insert cmpl-original-string)
-         (setq completion-to-accept nil)
-         (cmpl-statistics-block
-           (record-complete-failed)))
+         (setq completion-to-accept nil))
         (t
          (kill-region beg end))))
 
@@ -2263,15 +2204,10 @@ TYPE is the type of the wrapper to be added.  Can be :before or :under."
     (use-completion-before-separator)))
 
 (defun use-completion-backward-under ()
-  (use-completion-under-point)
-  (if (eq last-command 'complete)
-      ;; probably a failed completion if you have to back up
-      (cmpl-statistics-block (record-complete-failed))))
+  (use-completion-under-point))
 
 (defun use-completion-backward ()
-  (if (eq last-command 'complete)
-      ;; probably a failed completion if you have to back up
-      (cmpl-statistics-block (record-complete-failed))))
+  nil)
 
 (defun completion-before-command ()
   (funcall (or (and (symbolp this-command)
@@ -2428,9 +2364,6 @@ if ARG is omitted or nil."
     ;; fooquux
     ;; fooper
 
-    (cmpl-statistics-block
-     (record-completion-file-loaded))
-
     (completion-initialize)))
 
 ;;-----------------------------------------------
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index b50c1a5155b..176440f91bb 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1,4 +1,4 @@
-;;; cus-edit.el --- tools for customizing Emacs and Lisp packages
+;;; cus-edit.el --- tools for customizing Emacs and Lisp packages -*- lexical-binding:t -*-
 ;;
 ;; Copyright (C) 1996-1997, 1999-2013 Free Software Foundation, Inc.
 ;;
@@ -1057,8 +1057,8 @@ the resulting list value now.  Otherwise, add an entry to
       (let ((coding-system-for-read nil))
         (customize-save-variable list-var (eval list-var)))
     (add-hook 'after-init-hook
-              `(lambda ()
-                 (customize-push-and-save ',list-var ',elts)))))
+              (lambda ()
+                (customize-push-and-save list-var elts)))))
 
 ;;;###autoload
 (defun customize ()
@@ -1415,6 +1415,7 @@ suggest to customize that face, if it's customizable."
                             "*Customize Saved*"))))
 
 (declare-function apropos-parse-pattern "apropos" (pattern))
+(defvar apropos-regexp)
 
 ;;;###autoload
 (defun customize-apropos (pattern &optional type)
@@ -1431,23 +1432,23 @@ If TYPE is `groups', include only groups."
   (require 'apropos)
   (unless (memq type '(nil options faces groups))
     (error "Invalid setting type %s" (symbol-name type)))
-  (apropos-parse-pattern pattern)
+  (apropos-parse-pattern pattern)    ;Sets apropos-regexp by side-effect: Yuck!
   (let (found)
     (mapatoms
-     `(lambda (symbol)
-        (when (string-match-p apropos-regexp (symbol-name symbol))
-          ,(if (memq type '(nil groups))
-               '(if (get symbol 'custom-group)
-                    (push (list symbol 'custom-group) found)))
-          ,(if (memq type '(nil faces))
-               '(if (custom-facep symbol)
-                    (push (list symbol 'custom-face) found)))
-          ,(if (memq type '(nil options))
-               `(if (and (boundp symbol)
-                         (eq (indirect-variable symbol) symbol)
-                         (or (get symbol 'saved-value)
-                             (custom-variable-p symbol)))
-                    (push (list symbol 'custom-variable) found))))))
+     (lambda (symbol)
+       (when (string-match-p apropos-regexp (symbol-name symbol))
+         (if (memq type '(nil groups))
+             (if (get symbol 'custom-group)
+                 (push (list symbol 'custom-group) found)))
+         (if (memq type '(nil faces))
+             (if (custom-facep symbol)
+                 (push (list symbol 'custom-face) found)))
+         (if (memq type '(nil options))
+             (if (and (boundp symbol)
+                      (eq (indirect-variable symbol) symbol)
+                      (or (get symbol 'saved-value)
+                          (custom-variable-p symbol)))
+                 (push (list symbol 'custom-variable) found))))))
     (unless found
       (error "No customizable %s matching %s" (symbol-name type) pattern))
     (custom-buffer-create
@@ -1621,8 +1622,8 @@ or a regular expression.")
               (widget-create
                'editable-field
                :size 40 :help-echo echo
-               :action `(lambda (widget &optional event)
-                          (customize-apropos (split-string (widget-value widget)))))))
+               :action (lambda (widget &optional _event)
+                         (customize-apropos (split-string (widget-value widget)))))))
         (widget-insert " ")
         (widget-create-child-and-convert
          search-widget 'push-button
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index cf94b6300dd..24f8ac3bade 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -457,7 +457,12 @@ since it could result in memory overflow and make Emacs crash."
              (scroll-margin windows integer)
              (hscroll-margin windows integer "22.1")
              (hscroll-step windows number "22.1")
-             (truncate-partial-width-windows display boolean "23.1")
+             (truncate-partial-width-windows
+              display
+              (choice (integer :tag "Truncate if narrower than")
+                      (const :tag "Respect `truncate-lines'" nil)
+                      (other :tag "Truncate if not full-width" t))
+              "23.1")
              (make-cursor-line-fully-visible windows boolean)
              (mode-line-in-non-selected-windows mode-line boolean "22.1")
              (line-number-display-limit display
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index d1bdd3f52be..e2aeb4ea19b 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -457,7 +457,7 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]."
                (markerp dabbrev--last-abbrev-location)
                (marker-position dabbrev--last-abbrev-location)
                (or (eq last-command this-command)
-                   (and (window-minibuffer-p (selected-window))
+                   (and (window-minibuffer-p)
                         (= dabbrev--last-abbrev-location
                            (point)))))
           ;; Find a different expansion for the same abbrev as last time.
@@ -793,7 +793,7 @@ of the start of the occurrence."
     ;; In a minibuffer, search the buffer it was activated from,
     ;; first after the minibuffer itself.  Unless we aren't supposed
     ;; to search the current buffer either.
-    (if (and (window-minibuffer-p (selected-window))
+    (if (and (window-minibuffer-p)
              (not dabbrev-search-these-buffers-only))
         (setq list
               (cons (dabbrev--minibuffer-origin)
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index 774ee92a146..134dbdfb33b 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -1,4 +1,4 @@
-;;; descr-text.el --- describe text mode
+;;; descr-text.el --- describe text mode  -*- lexical-binding:t -*-
 
 ;; Copyright (C) 1994-1996, 2001-2013 Free Software Foundation, Inc.
 
@@ -23,7 +23,7 @@
 
 ;;; Commentary:
 
-;;; Describe-Text Mode.
+;; Describe-Text Mode.
 
 ;;; Code:
 
@@ -36,8 +36,7 @@
   "Insert text to describe WIDGET in the current buffer."
   (insert-text-button
    (symbol-name (if (symbolp widget) widget (car widget)))
-   'action `(lambda (&rest ignore)
-              (widget-browse ',widget))
+   'action (lambda (&rest _ignore) (widget-browse widget))
    'help-echo "mouse-2, RET: browse this widget")
   (insert " ")
   (insert-text-button
@@ -55,10 +54,10 @@
              (<= (length pp) (- (window-width) (current-column))))
         (insert pp)
       (insert-text-button
-       "[Show]" 'action `(lambda (&rest ignore)
-                           (with-output-to-temp-buffer
-                               "*Pp Eval Output*"
-                             (princ ',pp)))
+       "[Show]" 'action (lambda (&rest _ignore)
+                          (with-output-to-temp-buffer
+                              "*Pp Eval Output*"
+                            (princ pp)))
        'help-echo "mouse-2, RET: pretty print value in another buffer"))))
 
 (defun describe-property-list (properties)
@@ -81,8 +80,8 @@ into help buttons that call `describe-text-category' or
       (cond ((eq key 'category)
              (insert-text-button
               (symbol-name value)
-              'action `(lambda (&rest ignore)
-                         (describe-text-category ',value))
+              'action (lambda (&rest _ignore)
+                        (describe-text-category value))
               'follow-link t
               'help-echo "mouse-2, RET: describe this category"))
             ((memq key '(face font-lock-face mouse-face))
@@ -663,7 +662,7 @@ relevant to POS."
                             ((and (< char 32) (not (memq char '(9 10))))
                              'escape-glyph)))))
                   (if face (list (list "hardcoded face"
-                                       `(insert-text-button
+                                       `(insert-text-button ;FIXME: Wrap in lambda!
                                          ,(symbol-name face)
                                          'type 'help-face
                                          'help-args '(,face))))))
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 778c37484e1..1bbc33cb244 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1,4 +1,4 @@
-;;; desktop.el --- save partial status of Emacs when killed
+;;; desktop.el --- save partial status of Emacs when killed -*- lexical-binding: t -*-
 
 ;; Copyright (C) 1993-1995, 1997, 2000-2013 Free Software Foundation,
 ;; Inc.
@@ -390,12 +390,12 @@ If `delete', frames on other displays are deleted instead of restored."
 
 (defcustom desktop-restore-forces-onscreen t
   "If t, offscreen frames are restored onscreen instead.
-If `all', frames that are partially offscreen are also forced onscren.
+If `:all', frames that are partially offscreen are also forced onscreen.
 NOTE: Checking of frame boundaries is only approximate and can fail
 to reliably detect frames whose onscreen/offscreen state depends on a
 few pixels, especially near the right / bottom borders of the screen."
   :type '(choice (const :tag "Only fully offscreen frames" t)
-                 (const :tag "Also partially offscreen frames" 'all)
+                 (const :tag "Also partially offscreen frames" :all)
                  (const :tag "Do not force frames onscreen" nil))
   :group 'desktop
   :version "24.4")
@@ -403,10 +403,10 @@ few pixels, especially near the right / bottom borders of the screen."
 (defcustom desktop-restore-reuses-frames t
   "If t, restoring frames reuses existing frames.
 If nil, existing frames are deleted.
-If `keep', existing frames are kept and not reused."
+If `:keep', existing frames are kept and not reused."
   :type '(choice (const :tag "Reuse existing frames" t)
                  (const :tag "Delete existing frames" nil)
-                 (const :tag "Keep existing frames" 'keep))
+                 (const :tag "Keep existing frames" :keep))
   :group 'desktop
   :version "24.4")
 
@@ -670,8 +670,8 @@ if different)."
              ;; which already takes care of frame restoration and deletion.
              (called-interactively-p 'any))
     (let* ((this (selected-frame))
-           (mini (window-frame (minibuffer-window this)))) ; in case they difer
-      (dolist (frame (sort (frame-list) #'frameset-sort-frames-for-deletion))
+           (mini (window-frame (minibuffer-window this)))) ; in case they differ
+      (dolist (frame (sort (frame-list) #'frameset-minibufferless-first-p))
         (condition-case err
             (unless (or (eq frame this)
                         (eq frame mini)
@@ -900,25 +900,6 @@ DIRNAME must be the directory in which the desktop file will be saved."
 
 
 ;; ----------------------------------------------------------------------------
-(defvar desktop-filter-parameters-alist
-  (append '((font-backend        . t)
-            (name                . t)
-            (outer-window-id     . t)
-            (parent-id           . t)
-            (tty                 . desktop--filter-tty*)
-            (tty-type            . desktop--filter-tty*)
-            (window-id           . t)
-            (window-system       . t))
-          frameset-filter-alist)
-  "Alist of frame parameters and filtering functions.
-Its format is identical to `frameset-filter-alist' (which see).")
-
-(defun desktop--filter-tty* (_current parameters saving)
-  ;; Remove tty and tty-type parameters when switching
-  ;; to a GUI frame.
-  (or saving
-      (not (frameset-switch-to-gui-p parameters))))
-
 (defun desktop--check-dont-save (frame)
   (not (frame-parameter frame 'desktop-dont-save)))
 
@@ -929,13 +910,10 @@ Its format is identical to `frameset-filter-alist' (which see).")
 Frames with a non-nil `desktop-dont-save' parameter are not saved."
   (setq desktop-saved-frameset
         (and desktop-restore-frames
-             (let ((name (concat user-login-name "@" system-name
-                                 (format-time-string " %Y-%m-%d %T"))))
-               (frameset-save nil
-                              :filters desktop-filter-parameters-alist
-                              :predicate #'desktop--check-dont-save
-                              :properties (list :app desktop--app-id
-                                                :name name))))))
+             (frameset-save nil
+                            :app desktop--app-id
+                            :name (concat user-login-name "@" system-name)
+                            :predicate #'desktop--check-dont-save))))
 
 ;;;###autoload
 (defun desktop-save (dirname &optional release auto-save)
@@ -1049,13 +1027,12 @@ This function depends on the value of `desktop-saved-frameset'
 being set (usually, by reading it from the desktop)."
   (when (desktop-restoring-frameset-p)
     (frameset-restore desktop-saved-frameset
-                      :filters desktop-filter-parameters-alist
                       :reuse-frames desktop-restore-reuses-frames
                       :force-display desktop-restore-in-current-display
                       :force-onscreen desktop-restore-forces-onscreen)))
 
 ;; Just to silence the byte compiler.
-;; Dynamicaly bound in `desktop-read'.
+;; Dynamically bound in `desktop-read'.
 (defvar desktop-first-buffer)
 (defvar desktop-buffer-ok-count)
 (defvar desktop-buffer-fail-count)
diff --git a/lisp/dframe.el b/lisp/dframe.el
index 21b508512d3..66967075e34 100644
--- a/lisp/dframe.el
+++ b/lisp/dframe.el
@@ -1,4 +1,4 @@
-;;; dframe --- dedicate frame support modes
+;;; dframe --- dedicate frame support modes  -*- lexical-binding:t -*-
 
 ;; Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
@@ -259,9 +259,15 @@ This buffer will have `dframe-frame-mode' run on it.
 FRAME-NAME is the name of the frame to create.
 LOCAL-MODE-FN is the function used to call this one.
 PARAMETERS are frame parameters to apply to this dframe.
-DELETE-HOOK are hooks to run when deleting a frame.
-POPUP-HOOK are hooks to run before showing a frame.
-CREATE-HOOK are hooks to run after creating a frame."
+DELETE-HOOK is a hook to run when deleting a frame.
+POPUP-HOOK is a hook to run before showing a frame.
+CREATE-HOOK is a hook to run after creating a frame."
+  (let ((conv-hook (lambda (val)
+                     (let ((sym (make-symbol "hook")))
+                       (set sym val) sym))))
+    (if (consp delete-hook) (setq delete-hook (funcall conv-hook delete-hook)))
+    (if (consp create-hook) (setq create-hook (funcall conv-hook create-hook)))
+    (if (consp popup-hook)  (setq popup-hook  (funcall conv-hook popup-hook))))
   ;; toggle frame on and off.
   (if (not arg) (if (dframe-live-p (symbol-value frame-var))
                     (setq arg -1) (setq arg 1)))
@@ -270,7 +276,7 @@ CREATE-HOOK are hooks to run after creating a frame."
   ;; turn the frame off on neg number
   (if (and (numberp arg) (< arg 0))
       (progn
-        (run-hooks 'delete-hook)
+        (run-hooks delete-hook)
         (if (and (symbol-value frame-var)
                  (frame-live-p (symbol-value frame-var)))
             (progn
@@ -279,7 +285,7 @@ CREATE-HOOK are hooks to run after creating a frame."
         (set frame-var nil))
     ;; Set this as our currently attached frame
     (setq dframe-attached-frame (selected-frame))
-    (run-hooks 'popup-hook)
+    (run-hooks popup-hook)
     ;; Updated the buffer passed in to contain all the hacks needed
     ;; to make it work well in a dedicated window.
     (with-current-buffer (symbol-value buffer-var)
@@ -331,15 +337,15 @@ CREATE-HOOK are hooks to run after creating a frame."
       (setq temp-buffer-show-function 'dframe-temp-buffer-show-function)
       ;; If this buffer is killed, we must make sure that we destroy
       ;; the frame the dedicated window is in.
-      (add-hook 'kill-buffer-hook `(lambda ()
-                                     (let ((skilling (boundp 'skilling)))
-                                       (if skilling
-                                           nil
-                                         (if dframe-controlled
-                                             (progn
-                                               (funcall dframe-controlled -1)
-                                               (setq ,buffer-var nil)
-                                               )))))
+      (add-hook 'kill-buffer-hook (lambda ()
+                                    (let ((skilling (boundp 'skilling)))
+                                      (if skilling
+                                          nil
+                                        (if dframe-controlled
+                                            (progn
+                                              (funcall dframe-controlled -1)
+                                              (set buffer-var nil)
+                                              )))))
                 t t)
       )
     ;; Get the frame to work in
@@ -396,7 +402,7 @@ CREATE-HOOK are hooks to run after creating a frame."
           (switch-to-buffer (symbol-value buffer-var))
           (set-window-dedicated-p (selected-window) t))
         ;; Run hooks (like reposition)
-        (run-hooks 'create-hook)
+        (run-hooks create-hook)
         ;; Frame name
         (if (and (or (null window-system) (eq window-system 'pc))
                  (fboundp 'set-frame-name))
@@ -602,7 +608,7 @@ Argument E is the event deleting the frame."
 If the selected frame is not in the symbol FRAME-VAR, then FRAME-VAR
 frame is selected.  If the FRAME-VAR is active, then select the
 attached frame.  If FRAME-VAR is nil, ACTIVATOR is called to
-created it.  HOOK is an optional argument of hooks to run when
+created it.  HOOK is an optional hook to run when
 selecting FRAME-VAR."
   (interactive)
   (if (eq (selected-frame) (symbol-value frame-var))
@@ -616,7 +622,7 @@ selecting FRAME-VAR."
     )
   (other-frame 0)
   ;; If updates are off, then refresh the frame (they want it now...)
-  (run-hooks 'hook))
+  (run-hooks hook))
 
 
 (defun dframe-close-frame ()
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 7cb63f6b012..31d0495175a 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -286,7 +286,7 @@ List has a form of (file-name full-file-name (attribute-list))."
                                 (if (eq op-symbol 'touch)
                                     (list "-t" new-attribute)
                                   (list new-attribute)))
-                              (if (string-match "gnu" system-configuration)
+                              (if (string-match-p "gnu" system-configuration)
                                   '("--") nil))
                              files))
     (dired-do-redisplay arg);; moves point if ARG is an integer
@@ -327,7 +327,7 @@ into the minibuffer."
            ;; We used to treat empty input as DEFAULT, but that is not
            ;; such a good idea (Bug#9361).
            (error "No file mode specified"))
-          ((string-match "^[0-7]+" modes)
+          ((string-match-p "^[0-7]+" modes)
            (setq num-modes (string-to-number modes 8))))
 
     (dolist (file files)
@@ -500,7 +500,7 @@ with a prefix argument."
       (goto-char (point-min))
       (while (not (eobp))
         (save-excursion
-          (and (not (looking-at dired-re-dir))
+          (and (not (looking-at-p dired-re-dir))
                (not (eolp))
                (setq file (dired-get-filename nil t)) ; nil on non-file
                (progn (end-of-line)
@@ -530,7 +530,7 @@ with a prefix argument."
                         dired-file-version-alist)))))))
 
 (defun dired-trample-file-versions (fn)
-  (let* ((start-vn (string-match "\\.~[0-9]+~$" fn))
+  (let* ((start-vn (string-match-p "\\.~[0-9]+~$" fn))
          base-version-list)
     (and start-vn
          (setq base-version-list        ; there was a base version to which
@@ -602,7 +602,7 @@ The output appears in the buffer `*Async Shell Command*'."
       (dired-read-shell-command "& on %s: " current-prefix-arg files)
       current-prefix-arg
       files)))
-  (unless (string-match "&[ \t]*\\'" command)
+  (unless (string-match-p "&[ \t]*\\'" command)
     (setq command (concat command " &")))
   (dired-do-shell-command command arg file-list))
 
@@ -663,10 +663,10 @@ can be produced by `dired-get-marked-files', for example."
       (dired-read-shell-command "! on %s: " current-prefix-arg files)
       current-prefix-arg
       files)))
-  (let* ((on-each (not (string-match dired-star-subst-regexp command)))
-         (no-subst (not (string-match dired-quark-subst-regexp command)))
-         (star (string-match "\\*" command))
-         (qmark (string-match "\\?" command)))
+  (let* ((on-each (not (string-match-p dired-star-subst-regexp command)))
+         (no-subst (not (string-match-p dired-quark-subst-regexp command)))
+         (star (string-match-p "\\*" command))
+         (qmark (string-match-p "\\?" command)))
     ;; Get confirmation for wildcards that may have been meant
     ;; to control substitution of a file name or the file name list.
     (if (cond ((not (or on-each no-subst))
@@ -713,8 +713,8 @@ can be produced by `dired-get-marked-files', for example."
                       (substring command 0 (match-beginning 0))
                     command))
          (stuff-it
-          (if (or (string-match dired-star-subst-regexp command)
-                  (string-match dired-quark-subst-regexp command))
+          (if (or (string-match-p dired-star-subst-regexp command)
+                  (string-match-p dired-quark-subst-regexp command))
               (lambda (x)
                 (let ((retval command))
                   (while (string-match
@@ -840,9 +840,7 @@ command with a prefix argument (the value does not matter)."
     (if new-file
         (let ((start (point)))
           ;; Remove any preexisting entry for the name NEW-FILE.
-          (condition-case nil
-              (dired-remove-entry new-file)
-            (error nil))
+          (ignore-errors (dired-remove-entry new-file))
           (goto-char start)
           ;; Now replace the current line with an entry for NEW-FILE.
           (dired-update-file-line new-file) nil)
@@ -883,7 +881,7 @@ Otherwise, the rule is a compression rule, and compression is done with gzip.")
     ;; See if any suffix rule matches this file name.
     (while suffixes
       (let (case-fold-search)
-        (if (string-match (car (car suffixes)) file)
+        (if (string-match-p (car (car suffixes)) file)
             (setq suffix (car suffixes) suffixes nil))
         (setq suffixes (cdr suffixes))))
     ;; If so, compute desired new name.
@@ -1143,16 +1141,16 @@ files matching `dired-omit-regexp'."
           ;; Avoid calling ls for files that are going to be omitted anyway.
           (let ((omit-re (dired-omit-regexp)))
             (or (string= omit-re "")
-                (not (string-match omit-re
-                                   (cond
-                                    ((eq 'no-dir dired-omit-localp)
-                                     filename)
-                                    ((eq t dired-omit-localp)
-                                     (dired-make-relative filename))
-                                    (t
-                                     (dired-make-absolute
-                                      filename
-                                      (file-name-directory filename)))))))))
+                (not (string-match-p omit-re
+                                     (cond
+                                      ((eq 'no-dir dired-omit-localp)
+                                       filename)
+                                      ((eq t dired-omit-localp)
+                                       (dired-make-relative filename))
+                                      (t
+                                       (dired-make-absolute
+                                        filename
+                                        (file-name-directory filename)))))))))
       ;; Do it!
       (progn
         (setq filename (directory-file-name filename))
@@ -1180,7 +1178,7 @@ files matching `dired-omit-regexp'."
                     ;; else try to find correct place to insert
                     (if (dired-goto-subdir directory)
                         (progn ;; unhide if necessary
-                          (if (looking-at "\r")
+                          (if (looking-at-p "\r")
                               ;; Point is at end of subdir line.
                               (dired-unhide-subdir))
                           ;; found - skip subdir and `total' line
@@ -2090,7 +2088,7 @@ This function takes some pains to conform to `ls -lR' output."
     (and (not switches) cons (setq switches (cdr cons)))
     (dired-insert-subdir-validate dirname switches)
     ;; case-fold-search is nil now, so we can test for capital `R':
-    (if (setq switches-have-R (and switches (string-match "R" switches)))
+    (if (setq switches-have-R (and switches (string-match-p "R" switches)))
         ;; avoid duplicated subdirs
         (setq mark-alist (dired-kill-tree dirname t)))
     (if elt
@@ -2128,8 +2126,8 @@ This function takes some pains to conform to `ls -lR' output."
         (mapcar
          (function
           (lambda (x)
-            (or (eq (null (string-match x real-switches))
-                    (null (string-match x dired-actual-switches)))
+            (or (eq (null (string-match-p x real-switches))
+                    (null (string-match-p x dired-actual-switches)))
                 (error
                  "Can't have dirs with and without -%s switches together" x))))
          ;; all switches that make a difference to dired-get-filename:
@@ -2170,7 +2168,7 @@ of marked files.  If KILL-ROOT is non-nil, kill DIRNAME as well."
 (defun dired-insert-subdir-newpos (new-dir)
   ;; Find pos for new subdir, according to tree order.
   ;;(goto-char (point-max))
-  (let ((alist dired-subdir-alist) elt dir pos new-pos)
+  (let ((alist dired-subdir-alist) elt dir new-pos)
     (while alist
       (setq elt (car alist)
             alist (cdr alist)
@@ -2421,7 +2419,7 @@ Lower levels are unaffected."
   (and selective-display
        (save-excursion
          (dired-goto-subdir dir)
-         (looking-at "\r"))))
+         (looking-at-p "\r"))))
 
 ;;;###autoload
 (defun dired-hide-subdir (arg)
@@ -2491,18 +2489,21 @@ a file name.  Otherwise, it searches the whole buffer without restrictions."
   :group 'dired
   :version "23.1")
 
-(defun dired-isearch-filenames-toggle ()
+(define-minor-mode dired-isearch-filenames-mode
   "Toggle file names searching on or off.
 When on, Isearch skips matches outside file names using the predicate
 `dired-isearch-filter-filenames' that matches only at file names.
 When off, it uses the original predicate."
-  (interactive)
-  (setq isearch-filter-predicates
-        (if (memq 'dired-isearch-filter-filenames isearch-filter-predicates)
-            (delq 'dired-isearch-filter-filenames isearch-filter-predicates)
-          (cons 'dired-isearch-filter-filenames isearch-filter-predicates)))
-  (setq isearch-success t isearch-adjusted t)
-  (isearch-update))
+  nil nil nil
+  (if dired-isearch-filenames-mode
+      (add-function :before-while (local 'isearch-filter-predicate)
+                  #'dired-isearch-filter-filenames
+                  '((isearch-message-prefix . "filename ")))
+    (remove-function (local 'isearch-filter-predicate)
+                     #'dired-isearch-filter-filenames))
+  (when isearch-mode
+    (setq isearch-success t isearch-adjusted t)
+    (isearch-update)))
 
 ;;;###autoload
 (defun dired-isearch-filenames-setup ()
@@ -2511,15 +2512,14 @@ Intended to be added to `isearch-mode-hook'."
   (when (or (eq dired-isearch-filenames t)
             (and (eq dired-isearch-filenames 'dwim)
                  (get-text-property (point) 'dired-filename)))
-    (define-key isearch-mode-map "\M-sff" 'dired-isearch-filenames-toggle)
-    (add-hook 'isearch-filter-predicates 'dired-isearch-filter-filenames nil t)
+    (define-key isearch-mode-map "\M-sff" 'dired-isearch-filenames-mode)
+    (dired-isearch-filenames-mode 1)
     (add-hook 'isearch-mode-end-hook 'dired-isearch-filenames-end nil t)))
 
 (defun dired-isearch-filenames-end ()
   "Clean up the Dired file name search after terminating isearch."
-  (setq isearch-message-prefix-add nil)
   (define-key isearch-mode-map "\M-sff" nil)
-  (remove-hook 'isearch-filter-predicates 'dired-isearch-filter-filenames t)
+  (dired-isearch-filenames-mode -1)
   (remove-hook 'isearch-mode-end-hook 'dired-isearch-filenames-end t))
 
 (defun dired-isearch-filter-filenames (beg end)
@@ -2531,8 +2531,6 @@ name (has the text property `dired-filename')."
                              'dired-filename nil)
     t))
 
-(put 'dired-isearch-filter-filenames 'isearch-message-prefix "filename ")
-
 ;;;###autoload
 (defun dired-isearch-filenames ()
   "Search for a string using Isearch only in file names in the Dired buffer."
diff --git a/lisp/dired.el b/lisp/dired.el
index c871761bb3c..f830623a255 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -34,6 +34,9 @@
 
 ;;; Code:
 
+(declare-function dired-buffer-more-recently-used-p
+                  "dired-x" (buffer1 buffer2))
+
 ;;; Customizable variables
 
 (defgroup dired nil
@@ -1225,7 +1228,7 @@ see `dired-use-ls-dired' for more details.")
       (save-excursion
         (goto-char opoint)
         (when (and (or hdr wildcard)
-                   (not (and (looking-at-p "^  \\(.*\\):$")
+                   (not (and (looking-at "^  \\(.*\\):$")
                              (file-name-absolute-p (match-string 1)))))
           ;; Note that dired-build-subdir-alist will replace the name
           ;; by its expansion, so it does not matter whether what we insert
@@ -1242,26 +1245,25 @@ see `dired-use-ls-dired' for more details.")
   (save-excursion
     (goto-char beg)
     (while (< (point) end)
-      (condition-case nil
-          (if (not (dired-move-to-filename))
-              (put-text-property (line-beginning-position)
-                                 (1+ (line-end-position))
-                                 'invisible 'dired-hide-details-information)
-            (put-text-property (+ (line-beginning-position) 1) (1- (point))
-                               'invisible 'dired-hide-details-detail)
-            (add-text-properties
-             (point)
-             (progn
-               (dired-move-to-end-of-filename)
-               (point))
-             '(mouse-face
-               highlight
-               dired-filename t
-               help-echo "mouse-2: visit this file in other window"))
-            (when (< (+ (point) 4) (line-end-position))
-              (put-text-property (+ (point) 4) (line-end-position)
-                                 'invisible 'dired-hide-details-link)))
-        (error nil))
+      (ignore-errors
+        (if (not (dired-move-to-filename))
+            (put-text-property (line-beginning-position)
+                               (1+ (line-end-position))
+                               'invisible 'dired-hide-details-information)
+          (put-text-property (+ (line-beginning-position) 1) (1- (point))
+                             'invisible 'dired-hide-details-detail)
+          (add-text-properties
+           (point)
+           (progn
+             (dired-move-to-end-of-filename)
+             (point))
+           '(mouse-face
+             highlight
+             dired-filename t
+             help-echo "mouse-2: visit this file in other window"))
+          (when (< (+ (point) 4) (line-end-position))
+            (put-text-property (+ (point) 4) (line-end-position)
+                               'invisible 'dired-hide-details-link))))
       (forward-line 1))))
 
 ;; Reverting a dired buffer
@@ -1401,11 +1403,9 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST."
           (setq elt (car old-subdir-alist)
                 old-subdir-alist (cdr old-subdir-alist)
                 dir (car elt))
-          (condition-case ()
-              (progn
-                (dired-uncache dir)
-                (dired-insert-subdir dir))
-            (error nil))))))
+          (ignore-errors
+            (dired-uncache dir)
+            (dired-insert-subdir dir))))))
 
 (defun dired-uncache (dir)
   "Remove directory DIR from any directory cache."
@@ -3849,22 +3849,7 @@ Ask means pop up a menu for the user to select one of copy, move or link."
 
 ;;; Start of automatically extracted autoloads.
 
-;;;### (autoloads (dired-show-file-type dired-do-query-replace-regexp
-;;;;;;  dired-do-search dired-do-isearch-regexp dired-do-isearch
-;;;;;;  dired-isearch-filenames-regexp dired-isearch-filenames dired-isearch-filenames-setup
-;;;;;;  dired-hide-all dired-hide-subdir dired-tree-down dired-tree-up
-;;;;;;  dired-kill-subdir dired-mark-subdir-files dired-goto-subdir
-;;;;;;  dired-prev-subdir dired-insert-subdir dired-maybe-insert-subdir
-;;;;;;  dired-downcase dired-upcase dired-do-symlink-regexp dired-do-hardlink-regexp
-;;;;;;  dired-do-copy-regexp dired-do-rename-regexp dired-do-rename
-;;;;;;  dired-do-hardlink dired-do-symlink dired-do-copy dired-create-directory
-;;;;;;  dired-rename-file dired-copy-file dired-relist-file dired-remove-file
-;;;;;;  dired-add-file dired-do-redisplay dired-do-load dired-do-byte-compile
-;;;;;;  dired-do-compress dired-query dired-compress-file dired-do-kill-lines
-;;;;;;  dired-run-shell-command dired-do-shell-command dired-do-async-shell-command
-;;;;;;  dired-clean-directory dired-do-print dired-do-touch dired-do-chown
-;;;;;;  dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff
-;;;;;;  dired-diff) "dired-aux" "dired-aux.el" "8f5af3aa4eee1b3448525896fa6f39a3")
+;;;### (autoloads nil "dired-aux" "dired-aux.el" "04b4cb6bde3220f55574eb1d99ac0d29")
 ;;; Generated autoloads from dired-aux.el
 
 (autoload 'dired-diff "dired-aux" "\
diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index 423648f70b5..7c75b38c9d4 100644
--- a/lisp/disp-table.el
+++ b/lisp/disp-table.el
@@ -119,7 +119,7 @@ Valid symbols are `truncation', `wrap', `escape', `control',
 (defun describe-current-display-table ()
   "Describe the display table in use in the selected window and buffer."
   (interactive)
-  (let ((disptab (or (window-display-table (selected-window))
+  (let ((disptab (or (window-display-table)
                      buffer-display-table
                      standard-display-table)))
     (if disptab
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 10968f7f8dd..589a57b64c2 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -1262,7 +1262,7 @@ ARGS is a list of image descriptors."
                                             (car (image-size image 'pixels)))
                                          img-width)
                                     img-width))
-             (window-width (window-width (selected-window))))
+             (window-width (window-width)))
         (setf (doc-view-current-image) image)
         (move-overlay ol (point-min) (point-max))
         ;; In case the window is wider than the image, center the image
diff --git a/lisp/ebuff-menu.el b/lisp/ebuff-menu.el
index 10d8e025067..9ac62b68272 100644
--- a/lisp/ebuff-menu.el
+++ b/lisp/ebuff-menu.el
@@ -227,7 +227,7 @@ Select buffer at point and display buffers marked \">\" in other windows."
 (defun Electric-buffer-menu-mouse-select (event)
   (interactive "e")
   (select-window (posn-window (event-end event)))
-  (set-buffer (window-buffer (selected-window)))
+  (set-buffer (window-buffer))
   (goto-char (posn-point (event-end event)))
   (throw 'electric-buffer-menu-select (point)))
 
diff --git a/lisp/ehelp.el b/lisp/ehelp.el
index 88fc87b5b7a..b2007909209 100644
--- a/lisp/ehelp.el
+++ b/lisp/ehelp.el
@@ -146,7 +146,7 @@ BUFFER is put back into its original major mode."
     (unwind-protect
          (save-excursion
            (when one
-             (goto-char (window-start (selected-window))))
+             (goto-char (window-start)))
            (let ((pop-up-windows t))
              (pop-to-buffer buffer))
            (with-current-buffer buffer
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index eb1d63e788b..861054e777f 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -2140,14 +2140,6 @@ See Info node `(elisp)Computed Advice' for detailed documentation."
   "Take a macro function DEFINITION and make a lambda out of it."
   `(cdr ,definition))
 
-(defmacro ad-subr-p (definition)
-  ;;"non-nil if DEFINITION is a subr."
-  (list 'subrp definition))
-
-(defmacro ad-macro-p (definition)
-  ;;"non-nil if DEFINITION is a macro."
-  `(eq (car-safe ,definition) 'macro))
-
 (defmacro ad-lambda-p (definition)
   ;;"non-nil if DEFINITION is a lambda expression."
   `(eq (car-safe ,definition) 'lambda))
@@ -2160,12 +2152,12 @@ See Info node `(elisp)Computed Advice' for detailed documentation."
 (defmacro ad-compiled-p (definition)
   "Return non-nil if DEFINITION is a compiled byte-code object."
   `(or (byte-code-function-p ,definition)
-    (and (ad-macro-p ,definition)
-     (byte-code-function-p (ad-lambdafy ,definition)))))
+       (and (macrop ,definition)
+            (byte-code-function-p (ad-lambdafy ,definition)))))
 
 (defmacro ad-compiled-code (compiled-definition)
   "Return the byte-code object of a COMPILED-DEFINITION."
-  `(if (ad-macro-p ,compiled-definition)
+  `(if (macrop ,compiled-definition)
     (ad-lambdafy ,compiled-definition)
     ,compiled-definition))
 
@@ -2173,7 +2165,7 @@ See Info node `(elisp)Computed Advice' for detailed documentation."
   "Return the lambda expression of a function/macro/advice DEFINITION."
   (cond ((ad-lambda-p definition)
          definition)
-        ((ad-macro-p definition)
+        ((macrop definition)
          (ad-lambdafy definition))
         ((ad-advice-p definition)
          (cdr definition))
@@ -2183,7 +2175,7 @@ See Info node `(elisp)Computed Advice' for detailed documentation."
   "Return the argument list of DEFINITION."
   (require 'help-fns)
   (help-function-arglist
-   (if (or (ad-macro-p definition) (ad-advice-p definition))
+   (if (or (macrop definition) (ad-advice-p definition))
        (cdr definition)
      definition)
    'preserve-names))
@@ -2229,7 +2221,7 @@ definition (see the code for `documentation')."
 (defun ad-advised-definition-p (definition)
   "Return non-nil if DEFINITION was generated from advice information."
   (if (or (ad-lambda-p definition)
-          (ad-macro-p definition)
+          (macrop definition)
           (ad-compiled-p definition))
       (let ((docstring (ad-docstring definition)))
         (and (stringp docstring)
@@ -2242,8 +2234,8 @@ definition (see the code for `documentation')."
   ;; representations, so cache entries preactivated with version
   ;; 1 can't be used.
   (cond
-   ((ad-macro-p definition) 'macro2)
-   ((ad-subr-p definition) 'subr2)
+   ((macrop definition) 'macro2)
+   ((subrp definition) 'subr2)
    ((or (ad-lambda-p definition) (ad-compiled-p definition)) 'fun2)
    ((ad-advice-p definition) 'advice2))) ;; FIXME: Can this ever happen?
 
@@ -2273,7 +2265,7 @@ For that it has to be fbound with a non-autoload definition."
   "True if FUNCTION has an interpreted definition that can be compiled."
   (and (ad-has-proper-definition function)
        (or (ad-lambda-p (symbol-function function))
-           (ad-macro-p (symbol-function function)))
+           (macrop (symbol-function function)))
        (not (ad-compiled-p (symbol-function function)))))
 
 (defvar warning-suppress-types)         ;From warnings.el.
@@ -2902,7 +2894,7 @@ If COMPILE is nil then the result depends on the value of
    ((eq ad-default-compilation-action 'never) nil)
    ((eq ad-default-compilation-action 'always) t)
    ((eq ad-default-compilation-action 'like-original)
-    (or (ad-subr-p (ad-get-orig-definition function))
+    (or (subrp (ad-get-orig-definition function))
         (ad-compiled-p (ad-get-orig-definition function))))
    ;; everything else means `maybe':
    (t (featurep 'byte-compile))))
@@ -3249,7 +3241,7 @@ usage: (defadvice FUNCTION (CLASS NAME [POSITION] [ARGLIST] FLAG...)
              `((ad-set-cache
                 ',function
                 ;; the function will get compiled:
-                ,(cond ((ad-macro-p (car preactivation))
+                ,(cond ((macrop (car preactivation))
                         `(ad-macrofy
                           (function
                            ,(ad-lambdafy
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 8f0999b2f80..0bb04950dfd 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -83,7 +83,6 @@ The return value of this function is not used."
                    (list 'quote f) (list 'quote new-name) (list 'quote when))))
    (list 'compiler-macro
          #'(lambda (f args compiler-function)
-             ;; FIXME: Make it possible to just reuse `args'.
              `(eval-and-compile
                 (put ',f 'compiler-macro
                      ,(if (eq (car-safe compiler-function) 'lambda)
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index f4e79dc4886..164cdb12952 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1,7 +1,7 @@
 ;;; bytecomp.el --- compilation of Lisp code into byte code -*- lexical-binding: t -*-
 
-;; Copyright (C) 1985-1987, 1992, 1994, 1998, 2000-2013 Free Software
-;; Foundation, Inc.
+;; Copyright (C) 1985-1987, 1992, 1994, 1998, 2000-2013
+;;   Free Software Foundation, Inc.
 
 ;; Author: Jamie Zawinski <jwz@lucid.com>
 ;;      Hallvard Furuseth <hbf@ulrik.uio.no>
@@ -1224,6 +1224,24 @@ Each function's symbol gets added to `byte-compile-noruntime-functions'."
          (format "%d" (car signature)))
         (t (format "%d-%d" (car signature) (cdr signature)))))
 
+(defun byte-compile-function-warn (f nargs def)
+  (when (get f 'byte-obsolete-info)
+    (byte-compile-warn-obsolete f))
+
+  ;; Check to see if the function will be available at runtime
+  ;; and/or remember its arity if it's unknown.
+  (or (and (or def (fboundp f))         ; might be a subr or autoload.
+           (not (memq f byte-compile-noruntime-functions)))
+      (eq f byte-compile-current-form)  ; ## This doesn't work
+                                        ; with recursion.
+      ;; It's a currently-undefined function.
+      ;; Remember number of args in call.
+      (let ((cons (assq f byte-compile-unresolved-functions)))
+        (if cons
+            (or (memq nargs (cdr cons))
+                (push nargs (cdr cons)))
+          (push (list f nargs)
+                byte-compile-unresolved-functions)))))
 
 ;; Warn if the form is calling a function with the wrong number of arguments.
 (defun byte-compile-callargs-warn (form)
@@ -1261,21 +1279,7 @@ Each function's symbol gets added to `byte-compile-noruntime-functions'."
              "accepts only")
            (byte-compile-arglist-signature-string sig))))
     (byte-compile-format-warn form)
-    ;; Check to see if the function will be available at runtime
-    ;; and/or remember its arity if it's unknown.
-    (or (and (or def (fboundp (car form))) ; might be a subr or autoload.
-             (not (memq (car form) byte-compile-noruntime-functions)))
-        (eq (car form) byte-compile-current-form) ; ## This doesn't work
-                                                  ; with recursion.
-        ;; It's a currently-undefined function.
-        ;; Remember number of args in call.
-        (let ((cons (assq (car form) byte-compile-unresolved-functions))
-              (n (length (cdr form))))
-          (if cons
-              (or (memq n (cdr cons))
-                  (setcdr cons (cons n (cdr cons))))
-            (push (list (car form) n)
-                  byte-compile-unresolved-functions))))))
+    (byte-compile-function-warn (car form) (length (cdr form)) def)))
 
 (defun byte-compile-format-warn (form)
   "Warn if FORM is `format'-like with inconsistent args.
@@ -1364,7 +1368,10 @@ extra args."
       ;; This is the first definition.  See if previous calls are compatible.
       (let ((calls (assq name byte-compile-unresolved-functions))
             nums sig min max)
-        (when calls
+        (setq byte-compile-unresolved-functions
+              (delq calls byte-compile-unresolved-functions))
+        (setq calls (delq t calls))  ;Ignore higher-order uses of the function.
+        (when (cdr calls)
           (when (and (symbolp name)
                      (eq (function-get name 'byte-optimizer)
                          'byte-compile-inline-expand))
@@ -1382,10 +1389,7 @@ extra args."
              name
              (byte-compile-arglist-signature-string sig)
              (if (equal sig '(1 . 1)) " arg" " args")
-             (byte-compile-arglist-signature-string (cons min max))))
-
-          (setq byte-compile-unresolved-functions
-                (delq calls byte-compile-unresolved-functions)))))))
+             (byte-compile-arglist-signature-string (cons min max)))))))))
 
 (defvar byte-compile-cl-functions nil
   "List of functions defined in CL.")
@@ -1589,14 +1593,14 @@ that already has a `.elc' file."
          (message "Checking %s..." directory)
          (dolist (file (directory-files directory))
            (let ((source (expand-file-name file directory)))
-             (if (and (not (member file '("RCS" "CVS")))
-                      (not (eq ?\. (aref file 0)))
-                      (file-directory-p source)
-                      (not (file-symlink-p source)))
-                 ;; This file is a subdirectory.  Handle them differently.
-                 (when (or (null arg) (eq 0 arg)
-                           (y-or-n-p (concat "Check " source "? ")))
-                   (setq directories (nconc directories (list source))))
+             (if (file-directory-p source)
+                 (and (not (member file '("RCS" "CVS")))
+                      (not (eq ?\. (aref file 0)))
+                      (not (file-symlink-p source))
+                      ;; This file is a subdirectory.  Handle them differently.
+                      (or (null arg) (eq 0 arg)
+                          (y-or-n-p (concat "Check " source "? ")))
+                      (setq directories (nconc directories (list source))))
                ;; It is an ordinary file.  Decide whether to compile it.
                (if (and (string-match emacs-lisp-file-regexp source)
                         ;; The next 2 tests avoid compiling lock files
@@ -2214,37 +2218,33 @@ list that represents a doc string reference.
 (defun byte-compile-file-form-autoload (form)
   (and (let ((form form))
          (while (if (setq form (cdr form)) (macroexp-const-p (car form))))
-         (null form))                   ;Constants only
+         (null form))                        ;Constants only
        (memq (eval (nth 5 form)) '(t macro)) ;Macro
-       (eval form))                     ;Define the autoload.
+       (eval form))                          ;Define the autoload.
   ;; Avoid undefined function warnings for the autoload.
-  (when (and (consp (nth 1 form))
-           (eq (car (nth 1 form)) 'quote)
-           (consp (cdr (nth 1 form)))
-           (symbolp (nth 1 (nth 1 form))))
-    ;; Don't add it if it's already defined.  Otherwise, it might
-    ;; hide the actual definition.  However, do remove any entry from
-    ;; byte-compile-noruntime-functions, in case we have an autoload
-    ;; of foo-func following an (eval-when-compile (require 'foo)).
-    (unless (fboundp (nth 1 (nth 1 form)))
-      (push (cons (nth 1 (nth 1 form))
-                  (cons 'autoload (cdr (cdr form))))
-            byte-compile-function-environment))
-    ;; If an autoload occurs _before_ the first call to a function,
-    ;; byte-compile-callargs-warn does not add an entry to
-    ;; byte-compile-unresolved-functions.  Here we mimic the logic
-    ;; of byte-compile-callargs-warn so as not to warn if the
-    ;; autoload comes _after_ the function call.
-    ;; Alternatively, similar logic could go in
-    ;; byte-compile-warn-about-unresolved-functions.
-    (if (memq (nth 1 (nth 1 form)) byte-compile-noruntime-functions)
-        (setq byte-compile-noruntime-functions
-              (delq (nth 1 (nth 1 form)) byte-compile-noruntime-functions)
-              byte-compile-noruntime-functions)
-      (setq byte-compile-unresolved-functions
-            (delq (assq (nth 1 (nth 1 form))
-                        byte-compile-unresolved-functions)
-                  byte-compile-unresolved-functions))))
+  (pcase (nth 1 form)
+    (`',(and (pred symbolp) funsym)
+     ;; Don't add it if it's already defined.  Otherwise, it might
+     ;; hide the actual definition.  However, do remove any entry from
+     ;; byte-compile-noruntime-functions, in case we have an autoload
+     ;; of foo-func following an (eval-when-compile (require 'foo)).
+     (unless (fboundp funsym)
+       (push (cons funsym (cons 'autoload (cdr (cdr form))))
+             byte-compile-function-environment))
+     ;; If an autoload occurs _before_ the first call to a function,
+     ;; byte-compile-callargs-warn does not add an entry to
+     ;; byte-compile-unresolved-functions.  Here we mimic the logic
+     ;; of byte-compile-callargs-warn so as not to warn if the
+     ;; autoload comes _after_ the function call.
+     ;; Alternatively, similar logic could go in
+     ;; byte-compile-warn-about-unresolved-functions.
+     (if (memq funsym byte-compile-noruntime-functions)
+         (setq byte-compile-noruntime-functions
+               (delq funsym byte-compile-noruntime-functions)
+               byte-compile-noruntime-functions)
+       (setq byte-compile-unresolved-functions
+             (delq (assq funsym byte-compile-unresolved-functions)
+                   byte-compile-unresolved-functions)))))
   (if (stringp (nth 3 form))
       form
     ;; No doc string, so we can compile this as a normal form.
@@ -2964,8 +2964,6 @@ That command is designed for interactive use only" fn))
               '(custom-declare-group custom-declare-variable
                                      custom-declare-face))
         (byte-compile-nogroup-warn form))
-    (when (get (car form) 'byte-obsolete-info)
-      (byte-compile-warn-obsolete (car form)))
     (byte-compile-callargs-warn form))
   (if byte-compile-generate-call-tree
       (byte-compile-annotate-call-tree form))
@@ -3574,10 +3572,15 @@ discarding."
 ;; and (funcall (function foo)) will lose with autoloads.
 
 (defun byte-compile-function-form (form)
-  (byte-compile-constant (if (eq 'lambda (car-safe (nth 1 form)))
-                             (byte-compile-lambda (nth 1 form))
-                           (nth 1 form))))
-
+  (let ((f (nth 1 form)))
+    (when (and (symbolp f)
+               (byte-compile-warning-enabled-p 'callargs))
+      (byte-compile-function-warn f t (byte-compile-fdefinition f nil)))
+
+    (byte-compile-constant (if (eq 'lambda (car-safe f))
+                               (byte-compile-lambda f)
+                             f))))
+  
 (defun byte-compile-indent-to (form)
   (let ((len (length form)))
     (cond ((= len 2)
@@ -4271,7 +4274,7 @@ binding slots have been popped."
   (if (and (eq (car-safe (car-safe (cdr-safe form))) 'quote)
            (byte-compile-warning-enabled-p 'make-local))
       (byte-compile-warn
-       "`make-variable-buffer-local' should be called at toplevel"))
+       "`make-variable-buffer-local' not called at toplevel"))
   (byte-compile-normal-call form))
 (put 'make-variable-buffer-local
      'byte-hunk-handler 'byte-compile-form-make-variable-buffer-local)
diff --git a/lisp/emacs-lisp/cconv.el b/lisp/emacs-lisp/cconv.el
index 70fa71a0da4..f688bff6f85 100644
--- a/lisp/emacs-lisp/cconv.el
+++ b/lisp/emacs-lisp/cconv.el
@@ -552,7 +552,8 @@ FORM is the parent form that binds this var."
       (cond
        ((byte-compile-not-lexical-var-p arg)
         (byte-compile-log-warning
-         (format "Argument %S is not a lexical variable" arg)))
+         (format "Lexical argument shadows the dynamic variable %S"
+                 arg)))
        ((eq ?& (aref (symbol-name arg) 0)) nil) ;Ignore &rest, &optional, ...
        (t (let ((varstruct (list arg nil nil nil nil)))
             (cl-pushnew arg byte-compile-lexical-variables)
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index 6540a8e9f14..9c5b408637f 100644
--- a/lisp/emacs-lisp/checkdoc.el
+++ b/lisp/emacs-lisp/checkdoc.el
@@ -186,7 +186,6 @@
 (defcustom checkdoc-minor-mode-string " CDoc"
   "String to display in mode line when Checkdoc mode is enabled; nil for none."
   :type '(choice string (const :tag "None" nil))
-  :group 'checkdoc
   :version "23.1")
 
 (defcustom checkdoc-autofix-flag 'semiautomatic
@@ -197,7 +196,6 @@ made without asking unless the change is very-complex.  If the value
 is `semiautomatic' or any other value, then simple fixes are made
 without asking, and complex changes are made by asking the user first.
 The value `never' is the same as nil, never ask or change anything."
-  :group 'checkdoc
   :type '(choice (const automatic)
           (const query)
           (const never)
@@ -207,7 +205,6 @@ The value `never' is the same as nil, never ask or change anything."
   "Non-nil means to \"bounce\" to auto-fix locations.
 Setting this to nil will silently make fixes that require no user
 interaction.  See `checkdoc-autofix-flag' for auto-fixing details."
-  :group 'checkdoc
   :type 'boolean)
 
 (defcustom checkdoc-force-docstrings-flag t
@@ -215,16 +212,14 @@ interaction.  See `checkdoc-autofix-flag' for auto-fixing details."
 Style guide dictates that interactive functions MUST have documentation,
 and that it's good but not required practice to make non user visible items
 have doc strings."
-  :group 'checkdoc
   :type 'boolean)
-;;;###autoload(put 'checkdoc-force-docstrings-flag 'safe-local-variable 'booleanp)
+;;;###autoload(put 'checkdoc-force-docstrings-flag 'safe-local-variable #'booleanp)
 
 (defcustom checkdoc-force-history-flag nil
   "Non-nil means that files should have a History section or ChangeLog file.
 This helps document the evolution of, and recent changes to, the package."
-  :group 'checkdoc
   :type 'boolean)
-;;;###autoload(put 'checkdoc-force-history-flag 'safe-local-variable 'booleanp)
+;;;###autoload(put 'checkdoc-force-history-flag 'safe-local-variable #'booleanp)
 
 (defcustom checkdoc-permit-comma-termination-flag nil
   "Non-nil means the first line of a docstring may end with a comma.
@@ -232,9 +227,8 @@ Ordinarily, a full sentence is required.  This may be misleading when
 there is a substantial caveat to the one-line description -- the comma
 should be used when the first part could stand alone as a sentence, but
 it indicates that a modifying clause follows."
-  :group 'checkdoc
   :type 'boolean)
-;;;###autoload(put 'checkdoc-permit-comma-termination-flag 'safe-local-variable 'booleanp)
+;;;###autoload(put 'checkdoc-permit-comma-termination-flag 'safe-local-variable #'booleanp)
 
 (defcustom checkdoc-spellcheck-documentation-flag nil
   "Non-nil means run Ispell on text based on value.
@@ -246,22 +240,22 @@ system.  Possible values are:
   buffer      - Spell-check when style checking the whole buffer
   interactive - Spell-check during any interactive check.
   t           - Always spell-check"
-  :group 'checkdoc
   :type '(choice (const nil)
           (const defun)
           (const buffer)
           (const interactive)
           (const t)))
+;;;###autoload(put 'checkdoc-spellcheck-documentation-flag 'safe-local-variable #'booleanp)
 
 (defvar checkdoc-ispell-lisp-words
   '("alist" "emacs" "etags" "keymap" "paren" "regexp" "sexp" "xemacs")
   "List of words that are correct when spell-checking Lisp documentation.")
+;;;###autoload(put 'checkdoc-ispell-list-words 'safe-local-variable #'checkdoc-list-of-strings-p)
 
 (defcustom checkdoc-max-keyref-before-warn 10
   "The number of \\ [command-to-keystroke] tokens allowed in a doc string.
 Any more than this and a warning is generated suggesting that the construct
 \\ {keymap} be used instead."
-  :group 'checkdoc
   :type 'integer)
 
 (defcustom checkdoc-arguments-in-order-flag t
@@ -270,9 +264,8 @@ Setting this to nil will mean only checking that all the arguments
 appear in the proper form in the documentation, not that they are in
 the same order as they appear in the argument list.  No mention is
 made in the style guide relating to order."
-  :group 'checkdoc
   :type 'boolean)
-;;;###autoload(put 'checkdoc-arguments-in-order-flag 'safe-local-variable 'booleanp)
+;;;###autoload(put 'checkdoc-arguments-in-order-flag 'safe-local-variable #'booleanp)
 
 (define-obsolete-variable-alias 'checkdoc-style-hooks
   'checkdoc-style-functions "24.3")
@@ -305,8 +298,8 @@ A search leaves the cursor in front of the parameter list.")
   "Non-nil means to attempt to check the voice of the doc string.
 This check keys off some words which are commonly misused.  See the
 variable `checkdoc-common-verbs-wrong-voice' if you wish to add your own."
-  :group 'checkdoc
   :type 'boolean)
+;;;###autoload(put 'checkdoc-verb-check-experimental-flag 'safe-local-variable #'booleanp)
 
 (defvar checkdoc-generate-compile-warnings-flag nil
   "Non-nil means generate warnings in a buffer for browsing.
@@ -317,16 +310,15 @@ with a universal argument.")
   "A list of symbol names (strings) which also happen to make good words.
 These words are ignored when unquoted symbols are searched for.
 This should be set in an Emacs Lisp file's local variables."
-  :group 'checkdoc
   :type '(repeat (symbol :tag "Word")))
-;;;###autoload(put 'checkdoc-symbol-words 'safe-local-variable 'checkdoc-list-of-strings-p)
+;;;###autoload(put 'checkdoc-symbol-words 'safe-local-variable #'checkdoc-list-of-strings-p)
 
 ;;;###autoload
 (defun checkdoc-list-of-strings-p (obj)
   ;; this is a function so it might be shared by checkdoc-proper-noun-list
   ;; and/or checkdoc-ispell-lisp-words in the future
   (and (listp obj)
-       (not (memq nil (mapcar 'stringp obj)))))
+       (not (memq nil (mapcar #'stringp obj)))))
 
 (defvar checkdoc-proper-noun-list
   '("ispell" "xemacs" "emacs" "lisp")
@@ -340,9 +332,11 @@ This should be set in an Emacs Lisp file's local variables."
           (regexp-opt checkdoc-proper-noun-list t)
           "\\(\\_>\\|[.!?][ \t\n\"]\\)")
   "Regular expression derived from `checkdoc-proper-noun-regexp'.")
+;;;###autoload(put 'checkdoc-proper-noun-regexp 'safe-local-variable 'stringp)
 
 (defvar checkdoc-common-verbs-regexp nil
   "Regular expression derived from `checkdoc-common-verbs-regexp'.")
+;;;###autoload(put 'checkdoc-common-verbs-regexp 'safe-local-variable 'stringp)
 
 (defvar checkdoc-common-verbs-wrong-voice
   '(("adds" . "add")
@@ -443,19 +437,19 @@ be re-created.")
 ;;; Compatibility
 ;;
 (defalias 'checkdoc-make-overlay
-  (if (featurep 'xemacs) 'make-extent 'make-overlay))
+  (if (featurep 'xemacs) #'make-extent #'make-overlay))
 (defalias 'checkdoc-overlay-put
-  (if (featurep 'xemacs) 'set-extent-property 'overlay-put))
+  (if (featurep 'xemacs) #'set-extent-property #'overlay-put))
 (defalias 'checkdoc-delete-overlay
-  (if (featurep 'xemacs) 'delete-extent 'delete-overlay))
+  (if (featurep 'xemacs) #'delete-extent #'delete-overlay))
 (defalias 'checkdoc-overlay-start
-  (if (featurep 'xemacs) 'extent-start 'overlay-start))
+  (if (featurep 'xemacs) #'extent-start #'overlay-start))
 (defalias 'checkdoc-overlay-end
-  (if (featurep 'xemacs) 'extent-end 'overlay-end))
+  (if (featurep 'xemacs) #'extent-end #'overlay-end))
 (defalias 'checkdoc-mode-line-update
-  (if (featurep 'xemacs) 'redraw-modeline 'force-mode-line-update))
+  (if (featurep 'xemacs) #'redraw-modeline #'force-mode-line-update))
 (defalias 'checkdoc-char=
-  (if (featurep 'xemacs) 'char= '=))
+  (if (featurep 'xemacs) #'char= #'=))
 
 ;;; User level commands
 ;;
@@ -540,7 +534,7 @@ checkdoc status window instead of the usual behavior."
         ;; Due to a design flaw, this will never spell check
         ;; docstrings.
         (checkdoc-interactive-loop start-here showstatus
-                                   'checkdoc-next-error)
+                                   #'checkdoc-next-error)
       ;; This is a workaround to perform spell checking.
       (checkdoc-interactive-ispell-loop start-here))))
 
@@ -560,7 +554,7 @@ checkdoc status window instead of the usual behavior."
     (prog1
         ;; Due to a design flaw, this will never spell check messages.
         (checkdoc-interactive-loop start-here showstatus
-                                   'checkdoc-next-message-error)
+                                   #'checkdoc-next-message-error)
       ;; This is a workaround to perform spell checking.
       (checkdoc-message-interactive-ispell-loop start-here))))
 
@@ -639,7 +633,7 @@ style."
                 (goto-char (cdr (car err-list)))
                 ;; `automatic-then-never' tells the autofix function
                 ;; to only allow one fix to be automatic.  The autofix
-                ;; function will then set the flag to 'never, allowing
+                ;; function will then set the flag to `never', allowing
                 ;; the checker to return a different error.
                 (let ((checkdoc-autofix-flag 'automatic-then-never)
                       (fixed nil))
@@ -1004,7 +998,7 @@ Evaluation is done first so the form will be read before the
 documentation is checked.  If there is a documentation error, then the display
 of what was evaluated will be overwritten by the diagnostic message."
   (interactive)
-  (call-interactively 'eval-defun)
+  (call-interactively #'eval-defun)
   (checkdoc-defun))
 
 ;;;###autoload
@@ -1046,85 +1040,86 @@ space at the end of each line."
 ;;
 
 ;;;###autoload
-(defun checkdoc-ispell (&optional take-notes)
+(defun checkdoc-ispell ()
   "Check the style and spelling of everything interactively.
 Calls `checkdoc' with spell-checking turned on.
-Prefix argument TAKE-NOTES is the same as for `checkdoc'"
+Prefix argument is the same as for `checkdoc'"
   (interactive)
   (let ((checkdoc-spellcheck-documentation-flag t))
-    (call-interactively 'checkdoc nil current-prefix-arg)))
+    (call-interactively #'checkdoc nil current-prefix-arg)))
 
 ;;;###autoload
-(defun checkdoc-ispell-current-buffer (&optional take-notes)
+(defun checkdoc-ispell-current-buffer ()
   "Check the style and spelling of the current buffer.
 Calls `checkdoc-current-buffer' with spell-checking turned on.
-Prefix argument TAKE-NOTES is the same as for `checkdoc-current-buffer'"
+Prefix argument is the same as for `checkdoc-current-buffer'"
   (interactive)
   (let ((checkdoc-spellcheck-documentation-flag t))
-    (call-interactively 'checkdoc-current-buffer nil current-prefix-arg)))
+    (call-interactively #'checkdoc-current-buffer nil current-prefix-arg)))
 
 ;;;###autoload
-(defun checkdoc-ispell-interactive (&optional take-notes)
+(defun checkdoc-ispell-interactive ()
   "Check the style and spelling of the current buffer interactively.
 Calls `checkdoc-interactive' with spell-checking turned on.
-Prefix argument TAKE-NOTES is the same as for `checkdoc-interactive'"
+Prefix argument is the same as for `checkdoc-interactive'"
   (interactive)
   (let ((checkdoc-spellcheck-documentation-flag t))
-    (call-interactively 'checkdoc-interactive nil current-prefix-arg)))
+    (call-interactively #'checkdoc-interactive nil current-prefix-arg)))
 
 ;;;###autoload
-(defun checkdoc-ispell-message-interactive (&optional take-notes)
+(defun checkdoc-ispell-message-interactive ()
   "Check the style and spelling of message text interactively.
 Calls `checkdoc-message-interactive' with spell-checking turned on.
-Prefix argument TAKE-NOTES is the same as for `checkdoc-message-interactive'"
+Prefix argument is the same as for `checkdoc-message-interactive'"
   (interactive)
   (let ((checkdoc-spellcheck-documentation-flag t))
-    (call-interactively 'checkdoc-message-interactive nil current-prefix-arg)))
+    (call-interactively #'checkdoc-message-interactive
+                        nil current-prefix-arg)))
 
 ;;;###autoload
-(defun checkdoc-ispell-message-text (&optional take-notes)
+(defun checkdoc-ispell-message-text ()
   "Check the style and spelling of message text interactively.
 Calls `checkdoc-message-text' with spell-checking turned on.
-Prefix argument TAKE-NOTES is the same as for `checkdoc-message-text'"
+Prefix argument is the same as for `checkdoc-message-text'"
   (interactive)
   (let ((checkdoc-spellcheck-documentation-flag t))
-    (call-interactively 'checkdoc-message-text nil current-prefix-arg)))
+    (call-interactively #'checkdoc-message-text nil current-prefix-arg)))
 
 ;;;###autoload
-(defun checkdoc-ispell-start (&optional take-notes)
+(defun checkdoc-ispell-start ()
   "Check the style and spelling of the current buffer.
 Calls `checkdoc-start' with spell-checking turned on.
-Prefix argument TAKE-NOTES is the same as for `checkdoc-start'"
+Prefix argument is the same as for `checkdoc-start'"
   (interactive)
   (let ((checkdoc-spellcheck-documentation-flag t))
-    (call-interactively 'checkdoc-start nil current-prefix-arg)))
+    (call-interactively #'checkdoc-start nil current-prefix-arg)))
 
 ;;;###autoload
-(defun checkdoc-ispell-continue (&optional take-notes)
+(defun checkdoc-ispell-continue ()
   "Check the style and spelling of the current buffer after point.
 Calls `checkdoc-continue' with spell-checking turned on.
-Prefix argument TAKE-NOTES is the same as for `checkdoc-continue'"
+Prefix argument is the same as for `checkdoc-continue'"
   (interactive)
   (let ((checkdoc-spellcheck-documentation-flag t))
-    (call-interactively 'checkdoc-continue nil current-prefix-arg)))
+    (call-interactively #'checkdoc-continue nil current-prefix-arg)))
 
 ;;;###autoload
-(defun checkdoc-ispell-comments (&optional take-notes)
+(defun checkdoc-ispell-comments ()
   "Check the style and spelling of the current buffer's comments.
 Calls `checkdoc-comments' with spell-checking turned on.
-Prefix argument TAKE-NOTES is the same as for `checkdoc-comments'"
+Prefix argument is the same as for `checkdoc-comments'"
   (interactive)
   (let ((checkdoc-spellcheck-documentation-flag t))
-    (call-interactively 'checkdoc-comments nil current-prefix-arg)))
+    (call-interactively #'checkdoc-comments nil current-prefix-arg)))
 
 ;;;###autoload
-(defun checkdoc-ispell-defun (&optional take-notes)
+(defun checkdoc-ispell-defun ()
   "Check the style and spelling of the current defun with Ispell.
 Calls `checkdoc-defun' with spell-checking turned on.
-Prefix argument TAKE-NOTES is the same as for `checkdoc-defun'"
+Prefix argument is the same as for `checkdoc-defun'"
   (interactive)
   (let ((checkdoc-spellcheck-documentation-flag t))
-    (call-interactively 'checkdoc-defun nil current-prefix-arg)))
+    (call-interactively #'checkdoc-defun nil current-prefix-arg)))
 
 ;;; Error Management
 ;;
@@ -1254,10 +1249,10 @@ checking of documentation strings.
 (defsubst checkdoc-run-hooks (hookvar &rest args)
   "Run hooks in HOOKVAR with ARGS."
   (if (fboundp 'run-hook-with-args-until-success)
-      (apply 'run-hook-with-args-until-success hookvar args)
+      (apply #'run-hook-with-args-until-success hookvar args)
     ;; This method was similar to above.  We ignore the warning
     ;; since we will use the above for future Emacs versions
-    (apply 'run-hook-with-args hookvar args)))
+    (apply #'run-hook-with-args hookvar args)))
 
 (defsubst checkdoc-create-common-verbs-regexp ()
   "Rebuild the contents of `checkdoc-common-verbs-regexp'."
@@ -2198,8 +2193,8 @@ Code:, and others referenced in the style guide."
       nil
     (require 'lisp-mnt)
     ;; Old XEmacs don't have `lm-commentary-mark'
-    (if (and (not (fboundp 'lm-commentary-mark)) (boundp 'lm-commentary))
-        (defalias 'lm-commentary-mark 'lm-commentary)))
+    (if (and (not (fboundp 'lm-commentary-mark)) (fboundp 'lm-commentary))
+        (defalias 'lm-commentary-mark #'lm-commentary)))
   (save-excursion
     (let* ((f1 (file-name-nondirectory (buffer-file-name)))
            (fn (file-name-sans-extension f1))
@@ -2260,8 +2255,7 @@ Code:, and others referenced in the style guide."
         (if (or (not checkdoc-force-history-flag)
                 (file-exists-p "ChangeLog")
                 (file-exists-p "../ChangeLog")
-                (let ((fn 'lm-history-mark)) ;bestill byte-compiler
-                  (and (fboundp fn) (funcall fn))))
+                (and (fboundp 'lm-history-mark) (funcall #'lm-history-mark)))
             nil
           (progn
             (goto-char (or (lm-commentary-mark) (point-min)))
@@ -2585,10 +2579,10 @@ This function will not modify `match-data'."
 
 (define-derived-mode checkdoc-output-mode compilation-mode "Checkdoc"
   "Set up the major mode for the buffer containing the list of errors."
-  (set (make-local-variable 'compilation-error-regexp-alist)
-       checkdoc-output-error-regex-alist)
-  (set (make-local-variable 'compilation-mode-font-lock-keywords)
-       checkdoc-output-font-lock-keywords))
+  (setq-local compilation-error-regexp-alist
+              checkdoc-output-error-regex-alist)
+  (setq-local compilation-mode-font-lock-keywords
+              checkdoc-output-font-lock-keywords))
 
 (defun checkdoc-buffer-label ()
   "The name to use for a checkdoc buffer in the error list."
@@ -2620,7 +2614,7 @@ function called to create the messages."
     (with-current-buffer (get-buffer checkdoc-diagnostic-buffer)
       (goto-char (point-max))
       (let ((inhibit-read-only t))
-        (apply 'insert text)))))
+        (apply #'insert text)))))
 
 (defun checkdoc-show-diagnostics ()
   "Display the checkdoc diagnostic buffer in a temporary window."
diff --git a/lisp/emacs-lisp/cl-lib.el b/lisp/emacs-lisp/cl-lib.el
index 2ab6b7ad089..e826cf4375a 100644
--- a/lisp/emacs-lisp/cl-lib.el
+++ b/lisp/emacs-lisp/cl-lib.el
@@ -714,6 +714,9 @@ If ALIST is non-nil, the new pairs are prepended to it."
 
 ;;;###autoload
 (progn
+  ;; The `assert' macro from the cl package signals
+  ;; `cl-assertion-failed' at runtime so always define it.
+  (define-error 'cl-assertion-failed (purecopy "Assertion failed"))
   ;; Make sure functions defined with cl-defsubst can be inlined even in
   ;; packages which do not require CL.  We don't put an autoload cookie
   ;; directly on that function, since those cookies only go to cl-loaddefs.
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index c47c9b61030..af7c41d5c4c 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -616,7 +616,7 @@ The result of the body appears to the compiler as a quoted constant."
   (declare (debug (form &optional sexp)))
   (if (cl--compiling-file)
       (let* ((temp (cl-gentemp "--cl-load-time--"))
-             (set `(set ',temp ,form)))
+             (set `(setq ,temp ,form)))
         (if (and (fboundp 'byte-compile-file-form-defmumble)
                  (boundp 'this-kind) (boundp 'that-one))
             (fset 'byte-compile-file-form
@@ -2693,15 +2693,16 @@ macro that returns its `&whole' argument."
 ;;;###autoload
 (defmacro cl-defsubst (name args &rest body)
   "Define NAME as a function.
-Like `defun', except the function is automatically declared `inline',
+Like `defun', except the function is automatically declared `inline' and
+the arguments are immutable.
 ARGLIST allows full Common Lisp conventions, and BODY is implicitly
 surrounded by (cl-block NAME ...).
+The function's arguments should be treated as immutable.
 
 \(fn NAME ARGLIST [DOCSTRING] BODY...)"
   (declare (debug cl-defun) (indent 2))
   (let* ((argns (cl--arglist-args args)) (p argns)
-         (pbody (cons 'progn body))
-         (unsafe (not (cl--safe-expr-p pbody))))
+         (pbody (cons 'progn body)))
     (while (and p (eq (cl--expr-contains args (car p)) 1)) (pop p))
     `(progn
        ,(if p nil   ; give up if defaults refer to earlier args
@@ -2717,10 +2718,10 @@ surrounded by (cl-block NAME ...).
               ;; does not pay attention to the argvs (and
               ;; cl-expr-access-order itself is also too naive).
               nil
-              ,(and (memq '&key args) 'cl-whole) ,unsafe ,@argns)))
+              ,(and (memq '&key args) 'cl-whole) nil ,@argns)))
        (cl-defun ,name ,args ,@body))))
 
-(defun cl--defsubst-expand (argns body simple whole unsafe &rest argvs)
+(defun cl--defsubst-expand (argns body simple whole _unsafe &rest argvs)
   (if (and whole (not (cl--safe-expr-p (cons 'progn argvs)))) whole
     (if (cl--simple-exprs-p argvs) (setq simple t))
     (let* ((substs ())
@@ -2728,7 +2729,7 @@ surrounded by (cl-block NAME ...).
                        (cl-mapcar (lambda (argn argv)
                                     (if (or simple (macroexp-const-p argv))
                                         (progn (push (cons argn argv) substs)
-                                               (and unsafe (list argn argv)))
+                                               nil)
                                       (list argn argv)))
                                   argns argvs))))
       ;; FIXME: `sublis/subst' will happily substitute the symbol
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index aee48eef668..709a094e73b 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -288,33 +288,41 @@ That buffer should be current already."
   (insert "Debugger entered")
   ;; lambda is for debug-on-call when a function call is next.
   ;; debug is for debug-on-entry function called.
-  (pcase (car args)
-    ((or `lambda `debug)
-     (insert "--entering a function:\n"))
-    ;; Exiting a function.
-    (`exit
-     (insert "--returning value: ")
-     (setq debugger-value (nth 1 args))
-     (prin1 debugger-value (current-buffer))
-     (insert ?\n)
-     (delete-char 1)
-     (insert ? )
-     (beginning-of-line))
-    ;; Debugger entered for an error.
-    (`error
-     (insert "--Lisp error: ")
-     (prin1 (nth 1 args) (current-buffer))
-     (insert ?\n))
-    ;; debug-on-call, when the next thing is an eval.
-    (`t
-     (insert "--beginning evaluation of function call form:\n"))
-    ;; User calls debug directly.
-    (_
-     (insert ": ")
-     (prin1 (if (eq (car args) 'nil)
-                (cdr args) args)
-            (current-buffer))
-     (insert ?\n)))
+  (let ((pos (point)))
+    (pcase (car args)
+      ((or `lambda `debug)
+       (insert "--entering a function:\n")
+       (setq pos (1- (point))))
+      ;; Exiting a function.
+      (`exit
+       (insert "--returning value: ")
+       (setq pos (point))
+       (setq debugger-value (nth 1 args))
+       (prin1 debugger-value (current-buffer))
+       (insert ?\n)
+       (delete-char 1)
+       (insert ? )
+       (beginning-of-line))
+      ;; Debugger entered for an error.
+      (`error
+       (insert "--Lisp error: ")
+       (setq pos (point))
+       (prin1 (nth 1 args) (current-buffer))
+       (insert ?\n))
+      ;; debug-on-call, when the next thing is an eval.
+      (`t
+       (insert "--beginning evaluation of function call form:\n")
+       (setq pos (1- (point))))
+      ;; User calls debug directly.
+      (_
+       (insert ": ")
+       (setq pos (point))
+       (prin1 (if (eq (car args) 'nil)
+                  (cdr args) args)
+              (current-buffer))
+       (insert ?\n)))
+    ;; Place point on "stack frame 0" (bug#15101).
+    (goto-char pos))
   ;; After any frame that uses eval-buffer,
   ;; insert a line that states the buffer position it's reading at.
   (save-excursion
@@ -533,16 +541,15 @@ Applies to the frame whose line point is on in the backtrace."
         (progn ,@body)
       (setq debugger-outer-match-data (match-data)))))
 
-(defun debugger-eval-expression (exp)
+(defun debugger-eval-expression (exp &optional nframe)
   "Eval an expression, in an environment like that outside the debugger.
 The environment used is the one when entering the activation frame at point."
   (interactive
-   (list (read-from-minibuffer "Eval: "
-                               nil read-expression-map t
-                               'read-expression-history)))
-  (let ((nframe (condition-case nil (1+ (debugger-frame-number 'skip-base))
-                  (error 0))) ;; If on first line.
-        (base (if (eq 'debug--implement-debug-on-entry
+   (list (read--expression "Eval in stack frame: ")))
+  (let ((nframe (or nframe
+                    (condition-case nil (1+ (debugger-frame-number 'skip-base))
+                      (error 0)))) ;; If on first line.
+         (base (if (eq 'debug--implement-debug-on-entry
                       (cadr (backtrace-frame 1 'debug)))
                   'debug--implement-debug-on-entry 'debug)))
     (debugger-env-macro
@@ -651,11 +658,7 @@ Complete list of commands:
 (defun debugger-record-expression  (exp)
   "Display a variable's value and record it in `*Backtrace-record*' buffer."
   (interactive
-   (list (read-from-minibuffer
-          "Record Eval: "
-          nil
-          read-expression-map t
-          'read-expression-history)))
+   (list (read--expression "Record Eval: ")))
   (let* ((buffer (get-buffer-create debugger-record-buffer))
          (standard-output buffer))
     (princ (format "Debugger Eval (%s): " exp))
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index f8fb65be4d3..1301b70bb85 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -604,7 +604,7 @@ BODY is executed after moving to the destination location."
                       (goto-char (or ,(if endfun `(funcall #',endfun)) (point-max)))
                     (user-error "No next %s" ,name))
                 (goto-char (match-beginning 0))
-                (when (and (eq (current-buffer) (window-buffer (selected-window)))
+                (when (and (eq (current-buffer) (window-buffer))
                            (called-interactively-p 'interactive))
                   (let ((endpt (or (save-excursion
                                      ,(if endfun `(funcall #',endfun)
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index ae20e5270e1..ec343eab631 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -293,20 +293,7 @@ A lambda list keyword is a symbol that starts with `&'."
   "Return t if there are two windows."
   (and (not (one-window-p))
        (eq (selected-window)
-           (next-window (next-window (selected-window))))))
-
-(defsubst edebug-lookup-function (object)
-  (while (and (symbolp object) (fboundp object))
-    (setq object (symbol-function object)))
-  object)
-
-(defun edebug-macrop (object)
-  "Return the macro named by OBJECT, or nil if it is not a macro."
-  (setq object (edebug-lookup-function object))
-  (if (and (listp object)
-           (eq 'macro (car object))
-           (functionp (cdr object)))
-      object))
+           (next-window (next-window)))))
 
 (defun edebug-sort-alist (alist function)
   ;; Return the ALIST sorted with comparison function FUNCTION.
@@ -347,7 +334,7 @@ Return the result of the last expression in BODY."
          ((and (edebug-window-live-p window)
                (eq (window-buffer window) buffer))
           window)
-         ((eq (window-buffer (selected-window)) buffer)
+         ((eq (window-buffer) buffer)
           ;; Selected window already displays BUFFER.
           (selected-window))
          ((get-buffer-window buffer 0))
@@ -1416,7 +1403,7 @@ expressions; a `progn' form will be returned enclosing these forms."
                                         ; but leave it in for compatibility.
        ))
      ;; No edebug-form-spec provided.
-     ((edebug-macrop head)
+     ((macrop head)
       (if edebug-eval-macro-args
           (edebug-forms cursor)
         (edebug-sexps cursor)))
@@ -2327,8 +2314,7 @@ MSG is printed after `::::} '."
             (if edebug-global-break-condition
                 (condition-case nil
                     (setq edebug-global-break-result
-                          ;; FIXME: lexbind.
-                          (eval edebug-global-break-condition))
+                          (edebug-eval edebug-global-break-condition))
                   (error nil))))
            (edebug-break))
 
@@ -2339,8 +2325,7 @@ MSG is printed after `::::} '."
                 (and edebug-break-data
                      (or (not edebug-break-condition)
                          (setq edebug-break-result
-                               ;; FIXME: lexbind.
-                               (eval edebug-break-condition))))))
+                               (edebug-eval edebug-break-condition))))))
       (if (and edebug-break
                (nth 2 edebug-break-data)) ; is it temporary?
           ;; Delete the breakpoint.
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 4efbdcb22cb..9b9fd325941 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -185,6 +185,7 @@ expression point is on."
         (add-hook 'post-self-insert-hook prn-info nil t)
       (remove-hook 'post-self-insert-hook prn-info t))))
 
+;; FIXME: This changes Emacs's behavior when the file is loaded!
 (add-hook 'eval-expression-minibuffer-setup-hook 'eldoc-post-insert-mode)
 
 ;;;###autoload
@@ -487,11 +488,11 @@ In the absence of INDEX, just call `eldoc-docstring-format-sym-doc'."
 (defun eldoc-beginning-of-sexp ()
   (let ((parse-sexp-ignore-comments t)
         (num-skipped-sexps 0))
-    (condition-case err
+    (condition-case _
         (progn
           ;; First account for the case the point is directly over a
           ;; beginning of a nested sexp.
-          (condition-case err
+          (condition-case _
               (let ((p (point)))
                 (forward-sexp -1)
                 (forward-sexp 1)
@@ -518,7 +519,7 @@ In the absence of INDEX, just call `eldoc-docstring-format-sym-doc'."
   (let ((defn (and (fboundp fsym)
                    (symbol-function fsym))))
     (and (symbolp defn)
-         (condition-case err
+         (condition-case _
              (setq defn (indirect-function fsym))
            (error (setq defn nil))))
     defn))
diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index 1f5edefea08..98576687f3d 100644
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -236,8 +236,7 @@ description of valid values for RESULT-TYPE.
   "The regexp the `find-function' mechanisms use for finding test definitions.")
 
 
-(put 'ert-test-failed 'error-conditions '(error ert-test-failed))
-(put 'ert-test-failed 'error-message "Test failed")
+(define-error 'ert-test-failed "Test failed")
 
 (defun ert-pass ()
   "Terminate the current test and mark it passed.  Does not return."
diff --git a/lisp/emacs-lisp/gv.el b/lisp/emacs-lisp/gv.el
index cf090e5e758..279ae582a05 100644
--- a/lisp/emacs-lisp/gv.el
+++ b/lisp/emacs-lisp/gv.el
@@ -217,13 +217,15 @@ instead the assignment is turned into something equivalent to
     temp)
 so as to preserve the semantics of `setf'."
   (declare (debug (sexp (&or symbolp lambda-expr) &optional sexp)))
+  (when (eq 'lambda (car-safe setter))
+    (message "Use `gv-define-setter' or name %s's setter function" name))
   `(gv-define-setter ,name (val &rest args)
      ,(if fix-return
           `(macroexp-let2 nil v val
              `(progn
-                (,',setter ,@(append args (list v)))
+                (,',setter ,@args ,v)
                 ,v))
-        `(cons ',setter (append args (list val))))))
+        ``(,',setter ,@args ,val))))
 
 ;;; Typical operations on generalized variables.
 
diff --git a/lisp/emacs-lisp/helper.el b/lisp/emacs-lisp/helper.el
index f3b7de521cf..5bef0b06fd4 100644
--- a/lisp/emacs-lisp/helper.el
+++ b/lisp/emacs-lisp/helper.el
@@ -59,7 +59,7 @@
                         Helper-return-blurb)
                    "return")))
     (save-window-excursion
-      (goto-char (window-start (selected-window)))
+      (goto-char (window-start))
       (if (get-buffer-window "*Help*")
           (pop-to-buffer "*Help*")
         (switch-to-buffer "*Help*"))
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 3cbd6d4a585..f7105b7d3b4 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -575,7 +575,7 @@ if that value is non-nil."
 (defalias 'common-lisp-mode 'lisp-mode)
 
 ;; This will do unless inf-lisp.el is loaded.
-(defun lisp-eval-defun (&optional and-go)
+(defun lisp-eval-defun (&optional _and-go)
   "Send the current defun to the Lisp process made by \\[run-lisp]."
   (interactive)
   (error "Process lisp does not exist"))
@@ -662,7 +662,7 @@ alternative printed representations that can be displayed."
                                                 printed-value)))))
 
 
-(defun last-sexp-toggle-display (&optional arg)
+(defun last-sexp-toggle-display (&optional _arg)
   "Toggle between abbreviated and unabbreviated printed representations."
   (interactive "P")
   (save-restriction
@@ -1002,12 +1002,12 @@ function is `common-lisp-indent-function'."
   :type 'function
   :group 'lisp)
 
-(defun lisp-indent-line (&optional whole-exp)
+(defun lisp-indent-line (&optional _whole-exp)
   "Indent current line as Lisp code.
 With argument, indent any additional lines of the same expression
 rigidly along with this one."
   (interactive "P")
-  (let ((indent (calculate-lisp-indent)) shift-amt end
+  (let ((indent (calculate-lisp-indent)) shift-amt
         (pos (- (point-max) (point)))
         (beg (progn (beginning-of-line) (point))))
     (skip-chars-forward " \t")
@@ -1047,7 +1047,7 @@ is the buffer position of the start of the containing expression."
   (save-excursion
     (beginning-of-line)
     (let ((indent-point (point))
-          state paren-depth
+          state
           ;; setting this to a number inhibits calling hook
           (desired-indent nil)
           (retry t)
@@ -1061,7 +1061,7 @@ is the buffer position of the start of the containing expression."
       ;; Find innermost containing sexp
       (while (and retry
                   state
-                  (> (setq paren-depth (elt state 0)) 0))
+                  (> (elt state 0) 0))
         (setq retry nil)
         (setq calculate-lisp-indent-last-sexp (elt state 2))
         (setq containing-sexp (elt state 1))
@@ -1290,7 +1290,7 @@ Lisp function does not specify a special indentation."
           body-indent
           normal-indent))))
 
-(defun lisp-indent-defform (state indent-point)
+(defun lisp-indent-defform (state _indent-point)
   (goto-char (car (cdr state)))
   (forward-line 1)
   (if (> (point) (car (cdr (cdr state))))
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index b37a811b8d5..11891679202 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -752,6 +752,57 @@ considered."
                      (mapcar #'symbol-name (lisp--local-variables))))))
          lastvars)))))
 
+;; FIXME: Support for Company brings in features which straddle eldoc.
+;; We should consolidate this, so that major modes can provide all that
+;; data all at once:
+;; - a function to extract "the reference at point" (may be more complex
+;;     than a mere string, to distinguish various namespaces).
+;; - a function to jump to such a reference.
+;; - a function to show the signature/interface of such a reference.
+;; - a function to build a help-buffer about that reference.
+;; FIXME: Those functions should also be used by the normal completion code in
+;; the *Completions* buffer.
+
+(defun lisp--company-doc-buffer (str)
+  (let ((symbol (intern-soft str)))
+    ;; FIXME: we really don't want to "display-buffer and then undo it".
+    (save-window-excursion
+      ;; Make sure we don't display it in another frame, otherwise
+      ;; save-window-excursion won't be able to undo it.
+      (let ((display-buffer-overriding-action
+             '(nil . ((inhibit-switch-frame . t)))))
+        (ignore-errors
+          (cond
+           ((fboundp symbol) (describe-function symbol))
+           ((boundp symbol) (describe-variable symbol))
+           ((featurep symbol) (describe-package symbol))
+           ((facep symbol) (describe-face symbol))
+           (t (signal 'user-error nil)))
+          (help-buffer))))))
+
+(defun lisp--company-doc-string (str)
+  (let* ((symbol (intern-soft str))
+         (doc (if (fboundp symbol)
+                  (documentation symbol t)
+                (documentation-property symbol 'variable-documentation t))))
+    (and (stringp doc)
+         (string-match ".*$" doc)
+         (match-string 0 doc))))
+
+(declare-function find-library-name "find-func" (library))
+
+(defun lisp--company-location (str)
+  (let ((sym (intern-soft str)))
+    (cond
+     ((fboundp sym) (find-definition-noselect sym nil))
+     ((boundp sym) (find-definition-noselect sym 'defvar))
+     ((featurep sym)
+      (require 'find-func)
+      (cons (find-file-noselect (find-library-name
+                                 (symbol-name sym)))
+            0))
+     ((facep sym) (find-definition-noselect sym 'defface)))))
+
 (defun lisp-completion-at-point (&optional _predicate)
   "Function used for `completion-at-point-functions' in `emacs-lisp-mode'."
   (with-syntax-table emacs-lisp-mode-syntax-table
@@ -783,7 +834,10 @@ considered."
                            lisp--local-variables-completion-table
                            obarray)       ;Could be anything.
                       :annotation-function
-                      (lambda (str) (if (fboundp (intern-soft str)) " <f>")))
+                      (lambda (str) (if (fboundp (intern-soft str)) " <f>"))
+                      :company-doc-buffer #'lisp--company-doc-buffer
+                      :company-docsig #'lisp--company-doc-string
+                      :company-location #'lisp--company-location)
               ;; Looks like a funcall position.  Let's double check.
               (save-excursion
                 (goto-char (1- beg))
@@ -800,10 +854,12 @@ considered."
                     ;; we should use something like a symbol-property.
                     (`declare
                      (list t (mapcar (lambda (x) (symbol-name (car x)))
-                                   (delete-dups
-                                    (append
-                                     macro-declarations-alist
-                                     defun-declarations-alist)))))
+                                     (delete-dups
+                                      ;; FIXME: We should include some
+                                      ;; docstring with each entry.
+                                      (append
+                                       macro-declarations-alist
+                                       defun-declarations-alist)))))
                     ((and (or `condition-case `condition-case-unless-debug)
                           (guard (save-excursion
                                    (ignore-errors
@@ -811,7 +867,12 @@ considered."
                                      (< (point) beg)))))
                      (list t obarray
                            :predicate (lambda (sym) (get sym 'error-conditions))))
-                    (_ (list nil obarray #'fboundp))))))))
+                    (_ (list nil obarray
+                             :predicate #'fboundp
+                             :company-doc-buffer #'lisp--company-doc-buffer
+                             :company-docsig #'lisp--company-doc-string
+                             :company-location #'lisp--company-location
+                             ))))))))
       (when end
         (let ((tail (if (null (car table-etc))
                         (cdr table-etc)
diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el
index edcfc409085..576e72088e9 100644
--- a/lisp/emacs-lisp/nadvice.el
+++ b/lisp/emacs-lisp/nadvice.el
@@ -193,7 +193,11 @@ WHERE is a symbol to select an entry in `advice--where-alist'."
                            (equal function (cdr (assq 'name props))))
                           (list rest))))))
 
-(defvar advice--buffer-local-function-sample nil)
+(defvar advice--buffer-local-function-sample nil
+  "keeps an example of the special \"run the default value\" functions.
+These functions play the same role as t in buffer-local hooks, and to recognize
+them, we keep a sample here against which to compare.  Each instance is
+different, but `function-equal' will hopefully ignore those differences.")
 
 (defun advice--set-buffer-local (var val)
   (if (function-equal val advice--buffer-local-function-sample)
@@ -206,6 +210,7 @@ WHERE is a symbol to select an entry in `advice--where-alist'."
   (declare (gv-setter advice--set-buffer-local))
   (if (local-variable-p var) (symbol-value var)
     (setq advice--buffer-local-function-sample
+          ;; This function acts like the t special value in buffer-local hooks.
           (lambda (&rest args) (apply (default-value var) args)))))
 
 ;;;###autoload
@@ -284,6 +289,20 @@ of the piece of advice."
     (macroexp-let2 nil new `(advice--remove-function ,getter ,function)
       `(unless (eq ,new ,getter) ,(funcall setter new)))))
 
+(defun advice-function-mapc (f function-def)
+  "Apply F to every advice function in FUNCTION-DEF.
+F is called with two arguments: the function that was added, and the
+properties alist that was specified when it was added."
+  (while (advice--p function-def)
+    (funcall f (advice--car function-def) (advice--props function-def))
+    (setq function-def (advice--cdr function-def))))
+
+(defun advice-function-member-p (advice function-def)
+  "Return non-nil if ADVICE is already in FUNCTION-DEF.
+Instead of ADVICE being the actual function, it can also be the `name'
+of the piece of advice."
+  (advice--member-p advice advice function-def))
+
 ;;;; Specific application of add-function to `symbol-function' for advice.
 
 (defun advice--subst-main (old new)
@@ -294,11 +313,10 @@ of the piece of advice."
   (cond
    ((special-form-p def)
     ;; Not worth the trouble trying to handle this, I think.
-    (error "advice-add failure: %S is a special form" symbol))
-   ((and (symbolp def)
-         (eq 'macro (car-safe (ignore-errors (indirect-function def)))))
-    (let ((newval (cons 'macro (cdr (indirect-function def)))))
-      (put symbol 'advice--saved-rewrite (cons def newval))
+    (error "Advice impossible: %S is a special form" symbol))
+   ((and (symbolp def) (macrop def))
+    (let ((newval `(macro . ,(lambda (&rest r) (macroexpand `(,def . ,r))))))
+      (put symbol 'advice--saved-rewrite (cons def (cdr newval)))
       newval))
    ;; `f' might be a pure (hence read-only) cons!
    ((and (eq 'macro (car-safe def))
@@ -309,32 +327,39 @@ of the piece of advice."
 (defsubst advice--strip-macro (x)
   (if (eq 'macro (car-safe x)) (cdr x) x))
 
+(defun advice--symbol-function (symbol)
+  ;; The value conceptually stored in `symbol-function' is split into two
+  ;; parts:
+  ;; - the normal function definition.
+  ;; - the list of advice applied to it.
+  ;; `advice--symbol-function' is intended to return the second part (i.e. the
+  ;; list of advice, which includes a hole at the end which typically holds the
+  ;; first part, but this function doesn't care much which value is found
+  ;; there).
+  ;; In the "normal" state both parts are combined into a single value stored
+  ;; in the "function slot" of the symbol.  But the way they are combined is
+  ;; different depending on whether the definition is a function or a macro.
+  ;; Also if the function definition is nil (i.e. unbound) or is an autoload,
+  ;; the second part is stashed away temporarily in the `advice--pending'
+  ;; symbol property.
+  (or (get symbol 'advice--pending)
+      (advice--strip-macro (symbol-function symbol))))
+
 (defun advice--defalias-fset (fsetfun symbol newdef)
+  (unless fsetfun (setq fsetfun #'fset))
   (when (get symbol 'advice--saved-rewrite)
     (put symbol 'advice--saved-rewrite nil))
   (setq newdef (advice--normalize symbol newdef))
-  (let* ((olddef (advice--strip-macro (symbol-function symbol)))
-         (oldadv
-          (cond
-           ((null (get symbol 'advice--pending))
-            (or olddef
-                (progn
-                  (message "Delayed advice activation failed for %s: no data"
-                           symbol)
-                  nil)))
-           ((or (not olddef) (autoloadp olddef))
-            (get symbol 'advice--pending))
-           (t (message "Dropping left-over advice--pending for %s" symbol)
-              olddef))))
+  (let ((oldadv (advice--symbol-function symbol)))
     (if (and newdef (not (autoloadp newdef)))
         (let* ((snewdef (advice--strip-macro newdef))
                (snewadv (advice--subst-main oldadv snewdef)))
           (put symbol 'advice--pending nil)
-          (funcall (or fsetfun #'fset) symbol
+          (funcall fsetfun symbol
                    (if (eq snewdef newdef) snewadv (cons 'macro snewadv))))
       (unless (eq oldadv (get symbol 'advice--pending))
         (put symbol 'advice--pending (advice--subst-main oldadv nil)))
-      (funcall (or fsetfun #'fset) symbol newdef))))
+      (funcall fsetfun symbol newdef))))
     
 
 ;;;###autoload
@@ -345,12 +370,10 @@ is defined as a macro, alias, command, ..."
   ;; TODO:
   ;; - record the advice location, to display in describe-function.
   ;; - change all defadvice in lisp/**/*.el.
-  ;; - rewrite advice.el on top of this.
   ;; - obsolete advice.el.
   (let* ((f (symbol-function symbol))
          (nf (advice--normalize symbol f)))
-    (unless (eq f nf) ;; Most importantly, if nf == nil!
-      (fset symbol nf))
+    (unless (eq f nf) (fset symbol nf))
     (add-function where (cond
                          ((eq (car-safe nf) 'macro) (cdr nf))
                          ;; Reasons to delay installation of the advice:
@@ -377,39 +400,34 @@ or an autoload and it preserves `fboundp'.
 Instead of the actual function to remove, FUNCTION can also be the `name'
 of the piece of advice."
   (let ((f (symbol-function symbol)))
-    ;; Can't use the `if' place here, because the body is too large,
-    ;; resulting in use of code that only works with lexical-scoping.
-    (remove-function (if (eq (car-safe f) 'macro)
-                         (cdr f)
-                       (symbol-function symbol))
+    (remove-function (cond ;This is `advice--symbol-function' but as a "place".
+                      ((get symbol 'advice--pending)
+                       (get symbol 'advice--pending))
+                      ((eq (car-safe f) 'macro) (cdr f))
+                      (t (symbol-function symbol)))
                      function)
-    (unless (advice--p
-             (if (eq (car-safe f) 'macro) (cdr f) (symbol-function symbol)))
+    (unless (advice--p (advice--symbol-function symbol))
       ;; Not advised any more.
       (remove-function (get symbol 'defalias-fset-function)
                        #'advice--defalias-fset)
-      (if (eq (symbol-function symbol)
-              (cdr (get symbol 'advice--saved-rewrite)))
-          (fset symbol (car (get symbol 'advice--saved-rewrite))))))
+      (let ((asr (get symbol 'advice--saved-rewrite)))
+        (and asr (eq (cdr-safe (symbol-function symbol))
+                     (cdr asr))
+             (fset symbol (car (get symbol 'advice--saved-rewrite)))))))
   nil)
 
-(defun advice-mapc (fun def)
-  "Apply FUN to every advice function in DEF.
+(defun advice-mapc (fun symbol)
+  "Apply FUN to every advice function in SYMBOL.
 FUN is called with a two arguments: the function that was added, and the
 properties alist that was specified when it was added."
-  (while (advice--p def)
-    (funcall fun (advice--car def) (advice--props def))
-    (setq def (advice--cdr def))))
+  (advice-function-mapc fun (advice--symbol-function symbol)))
 
 ;;;###autoload
-(defun advice-member-p (advice function-name)
-  "Return non-nil if ADVICE has been added to FUNCTION-NAME.
+(defun advice-member-p (advice symbol)
+  "Return non-nil if ADVICE has been added to SYMBOL.
 Instead of ADVICE being the actual function, it can also be the `name'
 of the piece of advice."
-  (advice--member-p advice advice
-                    (or (get function-name 'advice--pending)
-                        (advice--strip-macro
-                         (symbol-function function-name)))))
+  (advice-function-member-p advice (advice--symbol-function symbol)))
 
 ;; When code is advised, called-interactively-p needs to be taught to skip
 ;; the advising frames.
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index add73fd4bde..7799ee23d62 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -457,19 +457,27 @@ Return the max version (as a string) if the package is held at a lower version."
 
 (defun package-activate-1 (pkg-desc)
   (let* ((name (package-desc-name pkg-desc))
-         (pkg-dir (package-desc-dir pkg-desc)))
+         (pkg-dir (package-desc-dir pkg-desc))
+         (pkg-dir-dir (file-name-as-directory pkg-dir)))
     (unless pkg-dir
       (error "Internal error: unable to find directory for `%s'"
              (package-desc-full-name pkg-desc)))
+    ;; Add to load path, add autoloads, and activate the package.
+    (let ((old-lp load-path))
+      (with-demoted-errors
+        (load (expand-file-name (format "%s-autoloads" name) pkg-dir) nil t))
+      (when (and (eq old-lp load-path)
+                 (not (or (member pkg-dir load-path)
+                          (member pkg-dir-dir load-path))))
+        ;; Old packages don't add themselves to the `load-path', so we have to
+        ;; do it ourselves.
+        (push pkg-dir load-path)))
     ;; Add info node.
     (when (file-exists-p (expand-file-name "dir" pkg-dir))
       ;; FIXME: not the friendliest, but simple.
       (require 'info)
       (info-initialize)
       (push pkg-dir Info-directory-list))
-    ;; Add to load path, add autoloads, and activate the package.
-    (push pkg-dir load-path)
-    (load (expand-file-name (format "%s-autoloads" name) pkg-dir) nil t)
     (push name package-activated-list)
     ;; Don't return nil.
     t))
@@ -981,7 +989,7 @@ error.  If there is a package, narrow the buffer to the file's
 boundaries."
   (goto-char (point-min))
   (unless (re-search-forward "^;;; \\([^ ]*\\)\\.el ---[ \t]*\\(.*?\\)[ \t]*\\(-\\*-.*-\\*-[ \t]*\\)?$" nil t)
-    (error "Packages lacks a file header"))
+    (error "Package lacks a file header"))
   (let ((file-name (match-string-no-properties 1))
         (desc      (match-string-no-properties 2))
         (start     (line-beginning-position)))
diff --git a/lisp/emacs-lisp/pcase.el b/lisp/emacs-lisp/pcase.el
index 50c92518b02..eb2c7f002e8 100644
--- a/lisp/emacs-lisp/pcase.el
+++ b/lisp/emacs-lisp/pcase.el
@@ -353,23 +353,34 @@ MATCH is the pattern that needs to be matched, of the form:
     (symbolp . numberp)
     (symbolp . consp)
     (symbolp . arrayp)
+    (symbolp . vectorp)
     (symbolp . stringp)
     (symbolp . byte-code-function-p)
     (integerp . consp)
     (integerp . arrayp)
+    (integerp . vectorp)
     (integerp . stringp)
     (integerp . byte-code-function-p)
     (numberp . consp)
     (numberp . arrayp)
+    (numberp . vectorp)
     (numberp . stringp)
     (numberp . byte-code-function-p)
     (consp . arrayp)
+    (consp . vectorp)
     (consp . stringp)
     (consp . byte-code-function-p)
-    (arrayp . stringp)
     (arrayp . byte-code-function-p)
+    (vectorp . byte-code-function-p)
+    (stringp . vectorp)
     (stringp . byte-code-function-p)))
 
+(defun pcase--mutually-exclusive-p (pred1 pred2)
+  (or (member (cons pred1 pred2)
+              pcase-mutually-exclusive-predicates)
+      (member (cons pred2 pred1)
+              pcase-mutually-exclusive-predicates)))
+
 (defun pcase--split-match (sym splitter match)
   (cond
     ((eq (car match) 'match)
@@ -433,10 +444,7 @@ MATCH is the pattern that needs to be matched, of the form:
    ;; A QPattern but not for a cons, can only go to the `else' side.
    ((eq (car-safe pat) '\`) '(:pcase--fail . nil))
    ((and (eq (car-safe pat) 'pred)
-         (or (member (cons 'consp (cadr pat))
-                     pcase-mutually-exclusive-predicates)
-             (member (cons (cadr pat) 'consp)
-                     pcase-mutually-exclusive-predicates)))
+         (pcase--mutually-exclusive-p #'consp (cadr pat)))
     '(:pcase--fail . nil))))
 
 (defun pcase--split-equal (elem pat)
@@ -496,11 +504,14 @@ MATCH is the pattern that needs to be matched, of the form:
                (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))
-                       pcase-mutually-exclusive-predicates)
-               (member (cons (cadr pat) (cadr upat))
-                       pcase-mutually-exclusive-predicates)))
+           (let ((otherpred
+                  (cond ((eq 'pred (car-safe pat)) (cadr pat))
+                        ((not (eq '\` (car-safe pat))) nil)
+                        ((consp (cadr pat)) #'consp)
+                        ((vectorp (cadr pat)) #'vectorp)
+                        ((byte-code-function-p (cadr pat))
+                         #'byte-code-function-p))))
+             (pcase--mutually-exclusive-p (cadr upat) otherpred)))
       '(:pcase--fail . nil))
      ((and (eq 'pred (car upat))
            (eq '\` (car-safe pat))
diff --git a/lisp/emacs-lisp/pp.el b/lisp/emacs-lisp/pp.el
index b7e553272f2..4cb089aca97 100644
--- a/lisp/emacs-lisp/pp.el
+++ b/lisp/emacs-lisp/pp.el
@@ -127,8 +127,7 @@ after OUT-BUFFER-NAME."
   "Evaluate EXPRESSION and pretty-print its value.
 Also add the value to the front of the list in the variable `values'."
   (interactive
-   (list (read-from-minibuffer "Eval: " nil read-expression-map t
-                               'read-expression-history)))
+   (list (read--expression "Eval: ")))
   (message "Evaluating...")
   (setq values (cons (eval expression) values))
   (pp-display-expression (car values) "*Pp Eval Output*"))
@@ -137,8 +136,7 @@ Also add the value to the front of the list in the variable `values'."
 (defun pp-macroexpand-expression (expression)
   "Macroexpand EXPRESSION and pretty-print its value."
   (interactive
-   (list (read-from-minibuffer "Macroexpand: " nil read-expression-map t
-                               'read-expression-history)))
+   (list (read--expression "Macroexpand: ")))
   (pp-display-expression (macroexpand expression) "*Pp Macroexpand Output*"))
 
 (defun pp-last-sexp ()
diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el
index 0aa31f717ed..1ee3cec15a6 100644
--- a/lisp/emacs-lisp/timer.el
+++ b/lisp/emacs-lisp/timer.el
@@ -55,31 +55,29 @@
 (defsubst timer--check (timer)
   (or (timerp timer) (signal 'wrong-type-argument (list #'timerp timer))))
 
+(defun timer--time-setter (timer time)
+  (timer--check timer)
+  (setf (timer--high-seconds timer) (pop time))
+  (let ((low time) (usecs 0) (psecs 0))
+    (when (consp time)
+      (setq low (pop time))
+      (when time
+        (setq usecs (pop time))
+        (when time
+          (setq psecs (car time)))))
+    (setf (timer--low-seconds timer) low)
+    (setf (timer--usecs timer) usecs)
+    (setf (timer--psecs timer) psecs)
+    time))
+
 ;; Pseudo field `time'.
 (defun timer--time (timer)
+  (declare (gv-setter timer--time-setter))
   (list (timer--high-seconds timer)
         (timer--low-seconds timer)
         (timer--usecs timer)
         (timer--psecs timer)))
 
-(gv-define-simple-setter timer--time
-  (lambda (timer time)
-    (timer--check timer)
-    (setf (timer--high-seconds timer) (pop time))
-    (let ((low time) (usecs 0) (psecs 0))
-      (if (consp time)
-          (progn
-            (setq low (pop time))
-            (if time
-                (progn
-                  (setq usecs (pop time))
-                  (if time
-                      (setq psecs (car time)))))))
-      (setf (timer--low-seconds timer) low)
-      (setf (timer--usecs timer) usecs)
-      (setf (timer--psecs timer) psecs))))
-
-
 (defun timer-set-time (timer time &optional delta)
   "Set the trigger time of TIMER to TIME.
 TIME must be in the internal format returned by, e.g., `current-time'.
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 973768b50ef..292fd401a56 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -1298,7 +1298,7 @@ If ARG is the atom `-', scroll upward by nearly full screen."
                              (mark t) (point) cua--explicit-region-start))))
 
   ;; Disable transient-mark-mode if rectangle active in current buffer.
-  (if (not (window-minibuffer-p (selected-window)))
+  (if (not (window-minibuffer-p))
       (setq transient-mark-mode (and (not cua--rectangle)
                                      (if cua-highlight-region-shift-only
                                          (not cua--explicit-region-start)
diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index 76d4632f8c0..aa90344d195 100644
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -690,7 +690,7 @@ to a new place after repeating previous Vi command."
 the window will be scrolled up or down appropriately, to reveal context.
 If you want Viper search to behave as usual in Vi, set this variable to a
 negative number."
-  :type 'boolean
+  :type 'integer
   :group 'viper-search)
 
 (defcustom viper-re-query-replace t
diff --git a/lisp/epa-hook.el b/lisp/epa-hook.el
index fc0aa3677bf..f320823a5ab 100644
--- a/lisp/epa-hook.el
+++ b/lisp/epa-hook.el
@@ -53,15 +53,15 @@ does that automatically."
 May either be a string or a list of strings.")
 
 (put 'epa-file-encrypt-to 'safe-local-variable
-     (lambda (val)
-       (or (stringp val)
-           (and (listp val)
-                (catch 'safe
-                  (mapc (lambda (elt)
-                          (unless (stringp elt)
-                            (throw 'safe nil)))
-                        val)
-                  t)))))
+     #'(lambda (val)
+         (or (stringp val)
+             (and (listp val)
+                  (catch 'safe
+                    (mapc (lambda (elt)
+                            (unless (stringp elt)
+                              (throw 'safe nil)))
+                          val)
+                    t)))))
 
 (put 'epa-file-encrypt-to 'permanent-local t)
 
diff --git a/lisp/epg.el b/lisp/epg.el
index 06d972d6ffa..bcd91d8abba 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -162,8 +162,7 @@
 
 (defvar epg-prompt-alist nil)
 
-(put 'epg-error 'error-conditions '(epg-error error))
-(put 'epg-error 'error-message "GPG error")
+(define-error 'epg-error "GPG error")
 
 (defun epg-make-data-from-file (file)
   "Make a data object from FILE."
@@ -1279,37 +1278,34 @@ This function is for internal use only."
 
 (defun epg--process-filter (process input)
   (if epg-debug
-      (save-excursion
-        (unless epg-debug-buffer
-          (setq epg-debug-buffer (generate-new-buffer " *epg-debug*")))
-        (set-buffer epg-debug-buffer)
+      (with-current-buffer
+          (or epg-debug-buffer
+              (setq epg-debug-buffer (generate-new-buffer " *epg-debug*")))
         (goto-char (point-max))
         (insert input)))
   (if (buffer-live-p (process-buffer process))
       (with-current-buffer (process-buffer process)
-        (goto-char (point-max))
-        (insert input)
-        (unless epg-process-filter-running
-          (unwind-protect
-              (progn
-                (setq epg-process-filter-running t)
-                (goto-char epg-read-point)
-                (beginning-of-line)
-                (while (looking-at ".*\n") ;the input line finished
-                  (if (looking-at "\\[GNUPG:] \\([A-Z_]+\\) ?\\(.*\\)")
-                      (let* ((status (match-string 1))
-                             (string (match-string 2))
-                             (symbol (intern-soft (concat "epg--status-"
-                                                          status))))
-                        (if (member status epg-pending-status-list)
-                            (setq epg-pending-status-list nil))
-                        (if (and symbol
-                                 (fboundp symbol))
-                            (funcall symbol epg-context string))
-                        (setq epg-last-status (cons status string))))
-                  (forward-line)
-                  (setq epg-read-point (point))))
-            (setq epg-process-filter-running nil))))))
+        (save-excursion
+          (goto-char (point-max))
+          (insert input)
+          (unless epg-process-filter-running
+            (let ((epg-process-filter-running t))
+              (goto-char epg-read-point)
+              (beginning-of-line)
+              (while (looking-at ".*\n") ;the input line finished
+                (if (looking-at "\\[GNUPG:] \\([A-Z_]+\\) ?\\(.*\\)")
+                    (let* ((status (match-string 1))
+                           (string (match-string 2))
+                           (symbol (intern-soft (concat "epg--status-"
+                                                        status))))
+                      (if (member status epg-pending-status-list)
+                          (setq epg-pending-status-list nil))
+                      (if (and symbol
+                               (fboundp symbol))
+                          (funcall symbol epg-context string))
+                      (setq epg-last-status (cons status string))))
+                (forward-line)
+                (setq epg-read-point (point)))))))))
 
 (defun epg-read-output (context)
   "Read the output file CONTEXT and return the content as a string."
@@ -1346,7 +1342,7 @@ This function is for internal use only."
              (> (float-time (or (nth 5 (file-attributes epg-agent-file))
                                 '(0 0 0 0)))
                 (float-time epg-agent-mtime))))
-      (redraw-frame (selected-frame)))
+      (redraw-frame))
   (epg-context-set-result-for
    context 'error
    (nreverse (epg-context-result-for context 'error))))
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index a23fa508c46..e0628dbb80a 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,34 @@
+2013-08-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * erc.el: Use lexical-binding.
+        (erc-user-full-name): Minor CSE simplification.
+        (erc-mode-map): Assume command-remapping is available.
+        (erc-once-with-server-event): Replace `forms' arg with a function arg.
+        (erc-once-with-server-event-global): Remove.
+        (erc-ison-p): Adjust to change in erc-once-with-server-event.
+        (erc-get-buffer-create): Remove arg `proc'.
+        (iswitchb-make-buflist-hook): Declare.
+        (erc-setup-buffer): Use pcase; avoid ((lambda ..) ..).
+        (read-passwd): Assume it exists.
+        (erc-display-line, erc-cmd-IDLE): Avoid add-to-list, adjust to change
+        in erc-once-with-server-event.
+        (erc-cmd-JOIN, erc-set-channel-limit, erc-set-channel-key)
+        (erc-add-query): Minor CSE simplification.
+        (erc-cmd-BANLIST, erc-cmd-MASSUNBAN): Adjust to change
+        in erc-once-with-server-event.
+        (erc-echo-notice-in-user-and-target-buffers): Avoid add-to-list.
+        * erc-track.el: Use lexical-binding.
+        (erc-make-mode-line-buffer-name): Use closures instead of `(lambda...).
+        (erc-faces-in): Avoid add-to-list.
+        * erc-notify.el: Use lexical-binding.
+        (erc-notify-timer): Adjust to change in erc-once-with-server-event.
+        (erc-notify-QUIT): Use a closure instead of `(lambda...).
+        * erc-list.el: Use lexical-binding.
+        (erc-list-install-322-handler, erc-cmd-LIST): Adjust to change in
+        erc-once-with-server-event.
+        * erc-button.el: Use lexical-binding.
+        (erc-button-next-function): Use a closure instead of `(lambda...).
+
 2013-05-30  Glenn Morris  <rgm@gnu.org>
 
         * erc-backend.el: Require erc at run-time too.
diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el
index 24150138e12..ac8600c57fd 100644
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -1,4 +1,4 @@
-;; erc-button.el --- A way of buttonizing certain things in ERC buffers
+;; erc-button.el --- A way of buttonizing certain things in ERC buffers  -*- lexical-binding:t -*-
 
 ;; Copyright (C) 1996-2004, 2006-2013 Free Software Foundation, Inc.
 
@@ -432,19 +432,22 @@ call it with the value of the `erc-data' text property."
 (defun erc-button-next-function ()
   "Pseudo completion function that actually jumps to the next button.
 For use on `completion-at-point-functions'."
-    (when (< (point) (erc-beg-of-input-line))
-      `(lambda ()
-         (let ((here ,(point)))
-           (while (and (get-text-property here 'erc-callback)
-                       (not (= here (point-max))))
-             (setq here (1+ here)))
-           (while (and (not (get-text-property here 'erc-callback))
-                       (not (= here (point-max))))
-             (setq here (1+ here)))
-           (if (< here (point-max))
-               (goto-char here)
-             (error "No next button"))
-           t))))
+  ;; FIXME: This is an abuse of completion-at-point-functions.
+  (when (< (point) (erc-beg-of-input-line))
+    (let ((start (point)))
+      (lambda ()
+        (let ((here start))
+          ;; FIXME: Use next-single-property-change.
+          (while (and (get-text-property here 'erc-callback)
+                      (not (= here (point-max))))
+            (setq here (1+ here)))
+          (while (not (or (get-text-property here 'erc-callback)
+                          (= here (point-max))))
+            (setq here (1+ here)))
+          (if (< here (point-max))
+              (goto-char here)
+            (error "No next button"))
+          t)))))
 
 (defun erc-button-next ()
   "Go to the next button in this buffer."
diff --git a/lisp/erc/erc-list.el b/lisp/erc/erc-list.el
index f11dd98ca37..c243073790e 100644
--- a/lisp/erc/erc-list.el
+++ b/lisp/erc/erc-list.el
@@ -1,4 +1,4 @@
-;;; erc-list.el --- /list support for ERC
+;;; erc-list.el --- /list support for ERC  -*- lexical-binding:t -*-
 
 ;; Copyright (C) 2008-2013 Free Software Foundation, Inc.
 
@@ -183,7 +183,7 @@
     ;; Arrange for 323 (end of list) to end this.
     (erc-once-with-server-event
      323
-     '(progn
+     (lambda (_proc _parsed)
         (remove-hook 'erc-server-322-functions 'erc-list-handle-322 t)))
     ;; Find the list buffer, empty it, and display it.
     (set (make-local-variable 'erc-list-buffer)
@@ -209,11 +209,12 @@ should usually be one or more channels, separated by commas.
 Please note that this function only works with IRC servers which conform
 to RFC and send the LIST header (#321) at start of list transmission."
   (erc-with-server-buffer
-    (set (make-local-variable 'erc-list-last-argument) line)
-    (erc-once-with-server-event
-     321
-     (list 'progn
-           (list 'erc-list-install-322-handler (current-buffer)))))
+   (set (make-local-variable 'erc-list-last-argument) line)
+   (erc-once-with-server-event
+    321
+    (let ((buf (current-buffer)))
+      (lambda (_proc _parsed)
+        (erc-list-install-322-handler buf)))))
   (erc-server-send (concat "LIST :" (or (and line (substring line 1))
                                         ""))))
 (put 'erc-cmd-LIST 'do-not-parse-args t)
diff --git a/lisp/erc/erc-notify.el b/lisp/erc/erc-notify.el
index db7067eec08..064bb53f215 100644
--- a/lisp/erc/erc-notify.el
+++ b/lisp/erc/erc-notify.el
@@ -1,4 +1,4 @@
-;;; erc-notify.el --- Online status change notification
+;;; erc-notify.el --- Online status change notification  -*- lexical-binding:t -*-
 
 ;; Copyright (C) 2002-2004, 2006-2013 Free Software Foundation, Inc.
 
@@ -115,27 +115,28 @@ changes."
                 erc-notify-interval))
     (erc-once-with-server-event
      303
-     '(let* ((server (erc-response.sender parsed))
-             (ison-list (delete "" (split-string
-                                    (erc-response.contents parsed))))
-             (new-list ison-list)
-             (old-list (erc-with-server-buffer erc-last-ison)))
-        (while new-list
-          (when (not (erc-member-ignore-case (car new-list) old-list))
-            (run-hook-with-args 'erc-notify-signon-hook server (car new-list))
-            (erc-display-message
-             parsed 'notice proc
-             'notify_on ?n (car new-list) ?m (erc-network-name)))
-          (setq new-list (cdr new-list)))
-        (while old-list
-          (when (not (erc-member-ignore-case (car old-list) ison-list))
-            (run-hook-with-args 'erc-notify-signoff-hook server (car old-list))
-            (erc-display-message
-             parsed 'notice proc
-             'notify_off ?n (car old-list) ?m (erc-network-name)))
-          (setq old-list (cdr old-list)))
-        (setq erc-last-ison ison-list)
-        t))
+     (lambda (proc parsed)
+       (let* ((server (erc-response.sender parsed))
+              (ison-list (delete "" (split-string
+                                     (erc-response.contents parsed))))
+              (new-list ison-list)
+              (old-list (erc-with-server-buffer erc-last-ison)))
+         (while new-list
+           (when (not (erc-member-ignore-case (car new-list) old-list))
+             (run-hook-with-args 'erc-notify-signon-hook server (car new-list))
+             (erc-display-message
+              parsed 'notice proc
+              'notify_on ?n (car new-list) ?m (erc-network-name)))
+           (setq new-list (cdr new-list)))
+         (while old-list
+           (when (not (erc-member-ignore-case (car old-list) ison-list))
+             (run-hook-with-args 'erc-notify-signoff-hook server (car old-list))
+             (erc-display-message
+              parsed 'notice proc
+              'notify_off ?n (car old-list) ?m (erc-network-name)))
+           (setq old-list (cdr old-list)))
+         (setq erc-last-ison ison-list)
+         t)))
     (erc-server-send
      (concat "ISON " (mapconcat 'identity erc-notify-list " ")))
     (setq erc-last-ison-time now)))
@@ -179,10 +180,11 @@ nick from `erc-last-ison' to prevent any further notifications."
   (let ((nick (erc-extract-nick (erc-response.sender parsed))))
     (when (and (erc-member-ignore-case nick erc-notify-list)
                (erc-member-ignore-case nick erc-last-ison))
-      (setq erc-last-ison (erc-delete-if `(lambda (el)
-                                            (string= ,(erc-downcase nick)
-                                                     (erc-downcase el)))
-                                         erc-last-ison))
+      (setq erc-last-ison (erc-delete-if
+                           (let ((nick-down (erc-downcase nick)))
+                             (lambda (el)
+                               (string= nick-down (erc-downcase el))))
+                           erc-last-ison))
       (run-hook-with-args 'erc-notify-signoff-hook
                           (or erc-server-announced-name erc-session-server)
                           nick)
diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el
index 054c135fa67..e6d5b3119a2 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -1,4 +1,4 @@
-;;; erc-track.el --- Track modified channel buffers
+;;; erc-track.el --- Track modified channel buffers  -*- lexical-binding:t -*-
 
 ;; Copyright (C) 2002-2013 Free Software Foundation, Inc.
 
@@ -710,7 +710,7 @@ inactive."
 to consider when `erc-track-visibility' is set to
 only consider active buffers visible.")
 
-(defun erc-user-is-active (&rest ignore)
+(defun erc-user-is-active (&rest _ignore)
   "Set `erc-buffer-activity'."
   (when erc-server-connected
     (setq erc-buffer-activity (erc-current-time))
@@ -745,7 +745,7 @@ only consider active buffers visible.")
 times.  Without it, you cannot debug `erc-modified-channels-display',
 because the debugger also cases changes to the window-configuration.")
 
-(defun erc-modified-channels-update (&rest args)
+(defun erc-modified-channels-update (&rest _args)
   "This function updates the information in `erc-modified-channels-alist'
 according to buffer visibility.  It calls
 `erc-modified-channels-display' at the end. This should usually be
@@ -791,19 +791,19 @@ If FACES are provided, color STRING with them."
                           (int-to-string count))
                 (copy-sequence string))))
     (define-key map (vector 'mode-line 'mouse-2)
-      `(lambda (e)
-         (interactive "e")
-         (save-selected-window
-           (select-window
-            (posn-window (event-start e)))
-           (switch-to-buffer ,buffer))))
+      (lambda (e)
+        (interactive "e")
+        (save-selected-window
+          (select-window
+           (posn-window (event-start e)))
+          (switch-to-buffer buffer))))
     (define-key map (vector 'mode-line 'mouse-3)
-      `(lambda (e)
-         (interactive "e")
-         (save-selected-window
-           (select-window
-            (posn-window (event-start e)))
-           (switch-to-buffer-other-window ,buffer))))
+      (lambda (e)
+        (interactive "e")
+        (save-selected-window
+          (select-window
+           (posn-window (event-start e)))
+          (switch-to-buffer-other-window buffer))))
     (put-text-property 0 (length name) 'local-map map name)
     (put-text-property
      0 (length name)
@@ -976,8 +976,9 @@ is in `erc-mode'."
         cur)
     (while (and (setq i (next-single-property-change i 'face str m))
                 (not (= i m)))
-      (when (setq cur (get-text-property i 'face str))
-        (add-to-list 'faces cur)))
+      (and (setq cur (get-text-property i 'face str))
+           (not (member cur faces))
+           (push cur faces)))
     faces))
 
 (cl-assert
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index b2724b9737f..0bfd21d6c3a 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -1,4 +1,4 @@
-;; erc.el --- An Emacs Internet Relay Chat client
+;; erc.el --- An Emacs Internet Relay Chat client  -*- lexical-binding:t -*-
 
 ;; Copyright (C) 1997-2013 Free Software Foundation, Inc.
 
@@ -125,20 +125,11 @@
 
 ;; compatibility with older ERC releases
 
-(if (fboundp 'defvaralias)
-    (progn
-      (defvaralias 'erc-announced-server-name 'erc-server-announced-name)
-      (erc-make-obsolete-variable 'erc-announced-server-name
-                                  'erc-server-announced-name
-                                  "ERC 5.1")
-      (defvaralias 'erc-process 'erc-server-process)
-      (erc-make-obsolete-variable 'erc-process 'erc-server-process "ERC 5.1")
-      (defvaralias 'erc-default-coding-system 'erc-server-coding-system)
-      (erc-make-obsolete-variable 'erc-default-coding-system
-                                  'erc-server-coding-system
-                                  "ERC 5.1"))
-  (message (concat "ERC: The function `defvaralias' is not bound.  See the "
-                   "NEWS file for variable name changes since ERC 5.0.4.")))
+(define-obsolete-variable-alias 'erc-announced-server-name
+  'erc-server-announced-name "ERC 5.1")
+(define-obsolete-variable-alias 'erc-process 'erc-server-process "ERC 5.1")
+(define-obsolete-variable-alias 'erc-default-coding-system
+  'erc-server-coding-system "ERC 5.1")
 
 (define-obsolete-function-alias 'erc-send-command
   'erc-server-send "ERC 5.1")
@@ -201,9 +192,7 @@ parameters and authentication."
                  (string :tag "Name")
                  (function :tag "Get from function"))
   :set (lambda (sym val)
-         (if (functionp val)
-             (set sym (funcall val))
-           (set sym val))))
+         (set sym (if (functionp val) (funcall val) val))))
 
 (defvar erc-password nil
   "Password to use when authenticating to an IRC server.
@@ -388,12 +377,12 @@ If no server buffer exists, return nil."
   (last-message-time nil))
 
 (defsubst erc-get-channel-user (nick)
-  "Finds the (USER . CHANNEL-DATA) element corresponding to NICK
+  "Find the (USER . CHANNEL-DATA) element corresponding to NICK
 in the current buffer's `erc-channel-users' hash table."
   (gethash (erc-downcase nick) erc-channel-users))
 
 (defsubst erc-get-server-user (nick)
-  "Finds the USER corresponding to NICK in the current server's
+  "Find the USER corresponding to NICK in the current server's
 `erc-server-users' hash table."
   (erc-with-server-buffer
     (gethash (erc-downcase nick) erc-server-users)))
@@ -480,7 +469,7 @@ Removes all users in the current channel.  This is called by
   (when (and erc-server-connected
              (erc-server-process-alive)
              (hash-table-p erc-channel-users))
-    (maphash (lambda (nick cdata)
+    (maphash (lambda (nick _cdata)
                (erc-remove-channel-user nick))
              erc-channel-users)
     (clrhash erc-channel-users)))
@@ -502,25 +491,25 @@ Removes all users in the current channel.  This is called by
               (erc-channel-user-voice (cdr cdata))))))
 
 (defun erc-get-channel-user-list ()
-  "Returns a list of users in the current channel.  Each element
+  "Return a list of users in the current channel.  Each element
 of the list is of the form (USER . CHANNEL-DATA), where USER is
-an erc-server-user struct, and CHANNEL-DATA is either `nil' or an
+an erc-server-user struct, and CHANNEL-DATA is either nil or an
 erc-channel-user struct.
 
 See also: `erc-sort-channel-users-by-activity'"
   (let (users)
     (if (hash-table-p erc-channel-users)
-      (maphash (lambda (nick cdata)
+      (maphash (lambda (_nick cdata)
                  (setq users (cons cdata users)))
                erc-channel-users))
     users))
 
 (defun erc-get-server-nickname-list ()
-  "Returns a list of known nicknames on the current server."
+  "Return a list of known nicknames on the current server."
   (erc-with-server-buffer
     (let (nicks)
       (when (hash-table-p erc-server-users)
-        (maphash (lambda (n user)
+        (maphash (lambda (_n user)
                    (setq nicks
                          (cons (erc-server-user-nickname user)
                                nicks)))
@@ -528,10 +517,10 @@ See also: `erc-sort-channel-users-by-activity'"
         nicks))))
 
 (defun erc-get-channel-nickname-list ()
-  "Returns a list of known nicknames on the current channel."
+  "Return a list of known nicknames on the current channel."
   (let (nicks)
     (when (hash-table-p erc-channel-users)
-      (maphash (lambda (n cdata)
+      (maphash (lambda (_n cdata)
                  (setq nicks
                        (cons (erc-server-user-nickname (car cdata))
                              nicks)))
@@ -539,11 +528,11 @@ See also: `erc-sort-channel-users-by-activity'"
       nicks)))
 
 (defun erc-get-server-nickname-alist ()
-  "Returns an alist of known nicknames on the current server."
+  "Return an alist of known nicknames on the current server."
   (erc-with-server-buffer
     (let (nicks)
       (when (hash-table-p erc-server-users)
-        (maphash (lambda (n user)
+        (maphash (lambda (_n user)
                    (setq nicks
                          (cons (cons (erc-server-user-nickname user) nil)
                                nicks)))
@@ -551,10 +540,10 @@ See also: `erc-sort-channel-users-by-activity'"
         nicks))))
 
 (defun erc-get-channel-nickname-alist ()
-  "Returns an alist of known nicknames on the current channel."
+  "Return an alist of known nicknames on the current channel."
   (let (nicks)
     (when (hash-table-p erc-channel-users)
-      (maphash (lambda (n cdata)
+      (maphash (lambda (_n cdata)
                  (setq nicks
                        (cons (cons (erc-server-user-nickname (car cdata)) nil)
                              nicks)))
@@ -562,21 +551,18 @@ See also: `erc-sort-channel-users-by-activity'"
       nicks)))
 
 (defun erc-sort-channel-users-by-activity (list)
-  "Sorts LIST such that users which have spoken most recently are
-listed first.  LIST must be of the form (USER . CHANNEL-DATA).
+  "Sort LIST such that users which have spoken most recently are listed first.
+LIST must be of the form (USER . CHANNEL-DATA).
 
 See also: `erc-get-channel-user-list'."
   (sort list
         (lambda (x y)
-          (when (and
-                 (cdr x) (cdr y))
+          (when (and (cdr x) (cdr y))
             (let ((tx (erc-channel-user-last-message-time (cdr x)))
                   (ty (erc-channel-user-last-message-time (cdr y))))
-              (if tx
-                  (if ty
-                      (time-less-p ty tx)
-                    t)
-                nil))))))
+              (and tx
+                   (or (not ty)
+                       (time-less-p ty tx))))))))
 
 (defun erc-sort-channel-users-alphabetically (list)
   "Sort LIST so that users' nicknames are in alphabetical order.
@@ -585,15 +571,12 @@ LIST must be of the form (USER . CHANNEL-DATA).
 See also: `erc-get-channel-user-list'."
   (sort list
         (lambda (x y)
-          (when (and
-                 (cdr x) (cdr y))
+          (when (and (cdr x) (cdr y))
             (let ((nickx (downcase (erc-server-user-nickname (car x))))
                   (nicky (downcase (erc-server-user-nickname (car y)))))
-              (if nickx
-                  (if nicky
-                      (string-lessp nickx nicky)
-                    t)
-                nil))))))
+              (and nickx
+                   (or (not nicky)
+                       (string-lessp nickx nicky))))))))
 
 (defvar erc-channel-topic nil
   "A topic string for the channel.  Should only be used in channel-buffers.")
@@ -678,8 +661,8 @@ Any other value disables notice's highlighting altogether."
                  (const :tag "don't highlight notices at all" nil)))
 
 (defcustom erc-echo-notice-hook nil
-  "Specifies a list of functions to call to echo a private
-notice.  Each function is called with four arguments, the string
+  "List of functions to call to echo a private notice.
+Each function is called with four arguments, the string
 to display, the parsed server message, the target buffer (or
 nil), and the sender.  The functions are called in order, until a
 function evaluates to non-nil.  These hooks are called after
@@ -709,8 +692,8 @@ See also: `erc-echo-notice-always-hook',
 
 (defcustom erc-echo-notice-always-hook
   '(erc-echo-notice-in-default-buffer)
-  "Specifies a list of functions to call to echo a private
-notice.  Each function is called with four arguments, the string
+  "List of functions to call to echo a private notice.
+Each function is called with four arguments, the string
 to display, the parsed server message, the target buffer (or
 nil), and the sender.  The functions are called in order, and all
 functions are called.  These hooks are called before those
@@ -1062,9 +1045,9 @@ This function is called with narrowing, ala `erc-send-modify-hook'."
   :options '(erc-make-read-only))
 
 (defcustom erc-send-completed-hook
-  (when (featurep 'emacspeak)
+  (when (fboundp 'emacspeak-auditory-icon)
     (list (byte-compile
-           (lambda (str)
+           (lambda (_str)
              (emacspeak-auditory-icon 'select-object)))))
   "Hook called after a message has been parsed by ERC.
 
@@ -1115,10 +1098,7 @@ which the local user typed."
 
     ;; Suppress `font-lock-fontify-block' key binding since it
     ;; destroys face properties.
-    (if (fboundp 'command-remapping)
-        (define-key map [remap font-lock-fontify-block] 'undefined)
-      (substitute-key-definition
-       'font-lock-fontify-block 'undefined map global-map))
+    (define-key map [remap font-lock-fontify-block] 'undefined)
 
     map)
   "ERC keymap.")
@@ -1277,14 +1257,14 @@ if ARG is omitted or nil.
        (put ',enable  'definition-name ',name)
        (put ',disable 'definition-name ',name))))
 
-(defun erc-once-with-server-event (event &rest forms)
-  "Execute FORMS the next time EVENT occurs in the `current-buffer'.
+(defun erc-once-with-server-event (event f)
+  "Run function F the next time EVENT occurs in the `current-buffer'.
 
 You should make sure that `current-buffer' is a server buffer.
 
-This function temporarily adds a function to EVENT's hook to
-execute FORMS.  After FORMS are run, the function is removed from
-EVENT's hook.  The last expression of FORMS should be either nil
+This function temporarily adds a function to EVENT's hook to call F with
+two arguments (`proc' and `parsed').  After F is called, the function is
+removed from EVENT's hook.  F should return either nil
 or t, where nil indicates that the other functions on EVENT's hook
 should be run too, and t indicates that other functions should
 not be run.
@@ -1298,35 +1278,14 @@ capabilities."
      "You should only run `erc-once-with-server-event' in a server buffer"))
   (let ((fun (make-symbol "fun"))
         (hook (erc-get-hook event)))
-     (put fun 'erc-original-buffer (current-buffer))
-     (fset fun `(lambda (proc parsed)
-                  (with-current-buffer (get ',fun 'erc-original-buffer)
-                    (remove-hook ',hook ',fun t))
-                  (fmakunbound ',fun)
-                  ,@forms))
-     (add-hook hook fun nil t)
-     fun))
-
-(defun erc-once-with-server-event-global (event &rest forms)
-  "Execute FORMS the next time EVENT occurs in any server buffer.
-
-This function temporarily prepends a function to EVENT's hook to
-execute FORMS.  After FORMS are run, the function is removed from
-EVENT's hook.  The last expression of FORMS should be either nil
-or t, where nil indicates that the other functions on EVENT's hook
-should be run too, and t indicates that other functions should
-not be run.
-
-When FORMS execute, the current buffer is the server buffer associated with the
-connection over which the data was received that triggered EVENT."
-  (let ((fun (make-symbol "fun"))
-        (hook (erc-get-hook event)))
-     (fset fun `(lambda (proc parsed)
-                  (remove-hook ',hook ',fun)
-                  (fmakunbound ',fun)
-                  ,@forms))
-     (add-hook hook fun nil nil)
-     fun))
+    (put fun 'erc-original-buffer (current-buffer))
+    (fset fun (lambda (proc parsed)
+                (with-current-buffer (get fun 'erc-original-buffer)
+                  (remove-hook hook fun t))
+                (fmakunbound fun)
+                (funcall f proc parsed)))
+    (add-hook hook fun nil t)
+    fun))
 
 (defsubst erc-log (string)
   "Logs STRING if logging is on (see `erc-log-p')."
@@ -1353,7 +1312,7 @@ If BUFFER is nil, the current buffer is used."
     (and (eq major-mode 'erc-mode)
          (null (erc-default-target)))))
 
-(defun erc-open-server-buffer-p (&optional buffer)
+(defun erc-open-server-buffer-p (&optional buffer) ;FIXME: `buffer' is ignored!
   "Return non-nil if argument BUFFER is an ERC server buffer that
 has an open IRC process.
 
@@ -1377,9 +1336,10 @@ If BUFFER is nil, the current buffer is used."
     (let ((erc-online-p 'unknown))
       (erc-once-with-server-event
        303
-       `(let ((ison (split-string (aref parsed 3))))
-          (setq erc-online-p (car (erc-member-ignore-case ,nick ison)))
-          t))
+       (lambda (_proc parsed)
+         (let ((ison (split-string (aref parsed 3))))
+           (setq erc-online-p (car (erc-member-ignore-case nick ison)))
+           t)))
       (erc-server-send (format "ISON %s" nick))
       (while (eq erc-online-p 'unknown) (accept-process-output))
       (if (called-interactively-p 'interactive)
@@ -1551,7 +1511,7 @@ symbol, it may have these values:
   "Check whether ports A and B are equal."
   (= (erc-normalize-port a) (erc-normalize-port b)))
 
-(defun erc-generate-new-buffer-name (server port target &optional proc)
+(defun erc-generate-new-buffer-name (server port target)
   "Create a new buffer name based on the arguments."
   (when (numberp port) (setq port (number-to-string port)))
   (let ((buf-name (or target
@@ -1582,9 +1542,9 @@ symbol, it may have these values:
     ;; fallback to the old <N> uniquification method:
     (or buffer-name (generate-new-buffer-name buf-name)) ))
 
-(defun erc-get-buffer-create (server port target &optional proc)
+(defun erc-get-buffer-create (server port target)
   "Create a new buffer based on the arguments."
-  (get-buffer-create (erc-generate-new-buffer-name server port target proc)))
+  (get-buffer-create (erc-generate-new-buffer-name server port target)))
 
 
 (defun erc-member-ignore-case (string list)
@@ -1700,6 +1660,7 @@ nil."
 (defvar iswitchb-temp-buflist)
 (declare-function iswitchb-read-buffer "iswitchb"
                  (prompt &optional default require-match start matches-set))
+(defvar iswitchb-make-buflist-hook)
 
 (defun erc-iswitchb (&optional arg)
   "Use `iswitchb-read-buffer' to prompt for a ERC buffer to switch to.
@@ -1906,29 +1867,29 @@ removed from the list will be disabled."
 
 (defun erc-setup-buffer (buffer)
   "Consults `erc-join-buffer' to find out how to display `BUFFER'."
-  (cond ((eq erc-join-buffer 'window)
-         (if (active-minibuffer-window)
-             (display-buffer buffer)
-           (switch-to-buffer-other-window buffer)))
-        ((eq erc-join-buffer 'window-noselect)
-         (display-buffer buffer))
-        ((eq erc-join-buffer 'bury)
-         nil)
-        ((eq erc-join-buffer 'frame)
-         (when (or (not erc-reuse-frames)
-                   (not (get-buffer-window buffer t)))
-           ((lambda (frame)
-                     (raise-frame frame)
-                     (select-frame frame))
-                  (make-frame (or erc-frame-alist
-                                  default-frame-alist)))
-         (switch-to-buffer buffer)
-         (when erc-frame-dedicated-flag
-           (set-window-dedicated-p (selected-window) t))))
-        (t
-         (if (active-minibuffer-window)
-             (display-buffer buffer)
-           (switch-to-buffer buffer)))))
+  (pcase erc-join-buffer
+    (`window
+     (if (active-minibuffer-window)
+         (display-buffer buffer)
+       (switch-to-buffer-other-window buffer)))
+    (`window-noselect
+     (display-buffer buffer))
+    (`bury
+     nil)
+    (`frame
+     (when (or (not erc-reuse-frames)
+               (not (get-buffer-window buffer t)))
+       (let ((frame (make-frame (or erc-frame-alist
+                                    default-frame-alist))))
+         (raise-frame frame)
+         (select-frame frame))
+       (switch-to-buffer buffer)
+       (when erc-frame-dedicated-flag
+         (set-window-dedicated-p (selected-window) t))))
+    (_
+     (if (active-minibuffer-window)
+         (display-buffer buffer)
+       (switch-to-buffer buffer)))))
 
 (defun erc-open (&optional server port nick full-name
                            connect passwd tgt-list channel process)
@@ -2006,19 +1967,20 @@ Returns the buffer for the given server or channel."
     ;; The local copy of `erc-nick' - the list of nicks to choose
     (setq erc-default-nicks (if (consp erc-nick) erc-nick (list erc-nick)))
     ;; password stuff
-    (setq erc-session-password (or passwd
-                                   (let ((secret
-                                          (plist-get
-                                           (nth 0
-                                                (auth-source-search :host server
-                                                                    :max 1
-                                                                    :user nick
-                                                                    :port port
-                                                                    :require '(:secret)))
-                                           :secret)))
-                                     (if (functionp secret)
-                                         (funcall secret)
-                                       secret))))
+    (setq erc-session-password
+          (or passwd
+              (let ((secret
+                     (plist-get
+                      (nth 0
+                           (auth-source-search :host server
+                                               :max 1
+                                               :user nick
+                                               :port port
+                                               :require '(:secret)))
+                      :secret)))
+                (if (functionp secret)
+                    (funcall secret)
+                  secret))))
     ;; debug output buffer
     (setq erc-dbuf
           (when erc-log-p
@@ -2080,11 +2042,6 @@ If no buffer matches, return nil."
           (erc-port-equal erc-session-port port)
           (erc-current-nick-p nick)))))
 
-(if (not (fboundp 'read-passwd))
-    (defun read-passwd (prompt)
-      "Substitute for `read-passwd' in early emacsen."
-      (read-from-minibuffer prompt)))
-
 (defcustom erc-before-connect nil
   "Hook called before connecting to a server.
 This hook gets executed before `erc' actually invokes `erc-mode'
@@ -2433,11 +2390,11 @@ If STRING is nil, the function does nothing."
                   (t (list (current-buffer)))))
       (when (buffer-live-p buf)
         (erc-display-line-1 string buf)
-        (add-to-list 'new-bufs buf)))
+        (push buf new-bufs)))
     (when (null new-bufs)
-      (if (erc-server-buffer-live-p)
-          (erc-display-line-1 string (process-buffer erc-server-process))
-        (erc-display-line-1 string (current-buffer))))))
+      (erc-display-line-1 string (if (erc-server-buffer-live-p)
+                                     (process-buffer erc-server-process)
+                                   (current-buffer))))))
 
 (defun erc-display-message-highlight (type string)
   "Highlight STRING according to TYPE, where erc-TYPE-face is an ERC face.
@@ -2544,7 +2501,7 @@ consumption for long-lived IRC or Emacs sessions."
   "Internal counter variable for use with `erc-lurker-cleanup-interval'.")
 
 (defvar erc-lurker-cleanup-interval 100
-  "Specifies frequency of cleaning up stale erc-lurker state.
+  "Frequency of cleaning up stale erc-lurker state.
 
 `erc-lurker-update-status' calls `erc-lurker-cleanup' once for
 every `erc-lurker-cleanup-interval' updates to
@@ -2552,7 +2509,7 @@ every `erc-lurker-cleanup-interval' updates to
 consumption of lurker state during long Emacs sessions and/or ERC
 sessions with large numbers of incoming PRIVMSGs.")
 
-(defun erc-lurker-update-status (message)
+(defun erc-lurker-update-status (_message)
   "Update `erc-lurker-state' if necessary.
 
 This function is called from `erc-insert-pre-hook'.  If the
@@ -2614,7 +2571,7 @@ displayed hostnames."
   :type 'alist)
 
 (defun erc-canonicalize-server-name (server)
-  "Returns the canonical network name for SERVER if any,
+  "Return the canonical network name for SERVER if any,
 otherwise `erc-server-announced-name'.  SERVER is matched against
 `erc-common-server-suffixes'."
   (when server
@@ -2877,7 +2834,7 @@ If no USER argument is specified, list the contents of `erc-ignore-list'."
   (interactive)
   (let ((ops nil))
     (if erc-channel-users
-        (maphash (lambda (nick user-data)
+        (maphash (lambda (_nick user-data)
                    (let ((cuser (cdr user-data)))
                      (if (and cuser
                               (erc-channel-user-op cuser))
@@ -3007,9 +2964,9 @@ were most recently invited.  See also `invitation'."
             (switch-to-buffer (car (erc-member-ignore-case chnl
                                                            joined-channels)))
           (erc-log (format "cmd: JOIN: %s" chnl))
-          (if (and chnl key)
-              (erc-server-send (format "JOIN %s %s" chnl key))
-            (erc-server-send (format "JOIN %s" chnl)))))))
+          (erc-server-send (if (and chnl key)
+                               (format "JOIN %s %s" chnl key)
+                             (format "JOIN %s" chnl)))))))
   t)
 
 (defalias 'erc-cmd-CHANNEL 'erc-cmd-JOIN)
@@ -3120,68 +3077,76 @@ If SERVER is non-nil, use that, rather than the current server."
   (let ((origbuf (current-buffer))
         symlist)
     (erc-with-server-buffer
-      (add-to-list 'symlist
-                   (cons (erc-once-with-server-event
-                          311 `(string= ,nick
-                                        (nth 1
-                                         (erc-response.command-args parsed))))
-                         'erc-server-311-functions))
-      (add-to-list 'symlist
-                   (cons (erc-once-with-server-event
-                          312 `(string= ,nick
-                                        (nth 1
-                                         (erc-response.command-args parsed))))
-                         'erc-server-312-functions))
-      (add-to-list 'symlist
-                   (cons (erc-once-with-server-event
-                          318 `(string= ,nick
-                                        (nth 1
-                                         (erc-response.command-args parsed))))
-                         'erc-server-318-functions))
-      (add-to-list 'symlist
-                   (cons (erc-once-with-server-event
-                          319 `(string= ,nick
-                                        (nth 1
-                                         (erc-response.command-args parsed))))
-                         'erc-server-319-functions))
-      (add-to-list 'symlist
-                   (cons (erc-once-with-server-event
-                          320 `(string= ,nick
-                                        (nth 1
-                                         (erc-response.command-args parsed))))
-                         'erc-server-320-functions))
-      (add-to-list 'symlist
-                   (cons (erc-once-with-server-event
-                          330 `(string= ,nick
-                                        (nth 1
-                                         (erc-response.command-args parsed))))
-                         'erc-server-330-functions))
-      (add-to-list 'symlist
-                   (cons (erc-once-with-server-event
-                          317
-                          `(let ((idleseconds
-                                  (string-to-number
-                                   (third
-                                    (erc-response.command-args parsed)))))
-                             (erc-display-line
-                              (erc-make-notice
-                               (format "%s has been idle for %s."
-                                       (erc-string-no-properties ,nick)
-                                       (erc-seconds-to-string idleseconds)))
-                              ,origbuf))
-                          t)
-                         'erc-server-317-functions))
-
-      ;; Send the WHOIS command.
-      (erc-cmd-WHOIS nick)
-
-      ;; Remove the uninterned symbols from the server hooks that did not run.
-      (run-at-time 20 nil `(lambda ()
-                             (with-current-buffer ,(current-buffer)
-                               (dolist (sym ',symlist)
-                                 (let ((hooksym (cdr sym))
-                                       (funcsym (car sym)))
-                                   (remove-hook hooksym funcsym t))))))))
+     (push (cons (erc-once-with-server-event
+                  311 (lambda (_proc parsed)
+                        (string= nick
+                                 (nth 1 (erc-response.command-args
+                                         parsed)))))
+                 'erc-server-311-functions)
+           symlist)
+     (push (cons (erc-once-with-server-event
+                  312 (lambda (_proc parsed)
+                        (string= nick
+                                 (nth 1 (erc-response.command-args
+                                         parsed)))))
+                 'erc-server-312-functions)
+           symlist)
+     (push (cons (erc-once-with-server-event
+                  318 (lambda (_proc parsed)
+                        (string= nick
+                                 (nth 1 (erc-response.command-args
+                                         parsed)))))
+                 'erc-server-318-functions)
+           symlist)
+     (push (cons (erc-once-with-server-event
+                  319 (lambda (_proc parsed)
+                        (string= nick
+                                 (nth 1 (erc-response.command-args
+                                         parsed)))))
+                 'erc-server-319-functions)
+           symlist)
+     (push (cons (erc-once-with-server-event
+                  320 (lambda (_proc parsed)
+                        (string= nick
+                                 (nth 1 (erc-response.command-args
+                                         parsed)))))
+                 'erc-server-320-functions)
+           symlist)
+     (push (cons (erc-once-with-server-event
+                  330 (lambda (_proc parsed)
+                        (string= nick
+                                 (nth 1 (erc-response.command-args
+                                         parsed)))))
+                 'erc-server-330-functions)
+           symlist)
+     (push (cons (erc-once-with-server-event
+                  317
+                  (lambda (_proc parsed)
+                    (let ((idleseconds
+                           (string-to-number
+                            (cl-third
+                             (erc-response.command-args parsed)))))
+                      (erc-display-line
+                       (erc-make-notice
+                        (format "%s has been idle for %s."
+                                (erc-string-no-properties nick)
+                                (erc-seconds-to-string idleseconds)))
+                       origbuf)
+                      t)))
+                 'erc-server-317-functions)
+           symlist)
+
+     ;; Send the WHOIS command.
+     (erc-cmd-WHOIS nick)
+
+     ;; Remove the uninterned symbols from the server hooks that did not run.
+     (run-at-time 20 nil (lambda (buf symlist)
+                           (with-current-buffer buf
+                             (dolist (sym symlist)
+                               (let ((hooksym (cdr sym))
+                                     (funcsym (car sym)))
+                                 (remove-hook hooksym funcsym t)))))
+                  (current-buffer) symlist)))
   t)
 
 (defun erc-cmd-DESCRIBE (line)
@@ -3690,11 +3655,12 @@ The ban list is fetched from the server if necessary."
         (erc-with-server-buffer
           (erc-once-with-server-event
            368
-           `(with-current-buffer ,chnl-name
+           (lambda (_proc _parsed)
+             (with-current-buffer chnl-name
               (put 'erc-channel-banlist 'received-from-server t)
-              (setq erc-server-367-functions ',old-367-hook)
+              (setq erc-server-367-functions old-367-hook)
               (erc-cmd-BANLIST)
-              t))
+              t)))
           (erc-server-send (format "MODE %s b" chnl)))))
 
      ((null erc-channel-banlist)
@@ -3756,28 +3722,29 @@ Unban all currently banned users in the current channel."
      ((not (get 'erc-channel-banlist 'received-from-server))
       (let ((old-367-hook erc-server-367-functions))
         (setq erc-server-367-functions 'erc-banlist-store)
-      ;; fetch the ban list then callback
-      (erc-with-server-buffer
-        (erc-once-with-server-event
-         368
-         `(with-current-buffer ,chnl
-            (put 'erc-channel-banlist 'received-from-server t)
-              (setq erc-server-367-functions ,old-367-hook)
-            (erc-cmd-MASSUNBAN)
-            t))
-          (erc-server-send (format "MODE %s b" chnl)))))
+        ;; fetch the ban list then callback
+        (erc-with-server-buffer
+         (erc-once-with-server-event
+          368
+          (lambda (_proc _parsed)
+            (with-current-buffer chnl
+              (put 'erc-channel-banlist 'received-from-server t)
+              (setq erc-server-367-functions old-367-hook)
+              (erc-cmd-MASSUNBAN)
+              t)))
+         (erc-server-send (format "MODE %s b" chnl)))))
 
      (t (let ((bans (mapcar 'cdr erc-channel-banlist)))
-    (when bans
-      ;; Glob the bans into groups of three, and carry out the unban.
-      ;; eg. /mode #foo -bbb a*!*@* b*!*@* c*!*@*
-      (mapc
-       (lambda (x)
-         (erc-server-send
-          (format "MODE %s -%s %s" (erc-default-target)
-                  (make-string (length x) ?b)
+          (when bans
+            ;; Glob the bans into groups of three, and carry out the unban.
+            ;; eg. /mode #foo -bbb a*!*@* b*!*@* c*!*@*
+            (mapc
+             (lambda (x)
+               (erc-server-send
+                (format "MODE %s -%s %s" (erc-default-target)
+                        (make-string (length x) ?b)
                         (mapconcat 'identity x " "))))
-       (erc-group-list bans 3))))
+             (erc-group-list bans 3))))
         t))))
 
 (defalias 'erc-cmd-MUB 'erc-cmd-MASSUNBAN)
@@ -3933,9 +3900,9 @@ Prompt for one if called interactively."
                       (format "Limit for %s (RET to remove limit): "
                               (erc-default-target)))))
   (let ((tgt (erc-default-target)))
-    (if (and limit (>= (length limit) 1))
-        (erc-server-send (format "MODE %s +l %s" tgt limit))
-      (erc-server-send (format "MODE %s -l" tgt)))))
+    (erc-server-send (if (and limit (>= (length limit) 1))
+                         (format "MODE %s +l %s" tgt limit)
+                       (format "MODE %s -l" tgt)))))
 
 (defun erc-set-channel-key (&optional key)
   "Set a KEY for the current channel.  Remove key if nil.
@@ -3944,9 +3911,9 @@ Prompt for one if called interactively."
                       (format "Key for %s (RET to remove key): "
                               (erc-default-target)))))
   (let ((tgt (erc-default-target)))
-    (if (and key (>= (length key) 1))
-        (erc-server-send (format "MODE %s +k %s" tgt key))
-      (erc-server-send (format "MODE %s -k" tgt)))))
+    (erc-server-send (if (and key (>= (length key) 1))
+                         (format "MODE %s +k %s" tgt key)
+                       (format "MODE %s -k" tgt)))))
 
 (defun erc-quit-server (reason)
   "Disconnect from current server after prompting for REASON.
@@ -4023,7 +3990,7 @@ Displays PROC and PARSED appropriately using `erc-display-message'."
 See `erc-debug-missing-hooks'.")
 ;(make-variable-buffer-local 'erc-server-vectors)
 
-(defun erc-debug-missing-hooks (proc parsed)
+(defun erc-debug-missing-hooks (_proc parsed)
   "Add PARSED server message ERC does not yet handle to `erc-server-vectors'.
 These vectors can be helpful when adding new server message handlers to ERC.
 See `erc-default-server-hook'."
@@ -4163,7 +4130,7 @@ originated from,
 and as second argument the event parsed as a vector."
   :group 'erc-hooks)
 
-(defun erc-display-server-message (proc parsed)
+(defun erc-display-server-message (_proc parsed)
   "Display the message sent by the server as a notice."
   (erc-display-message
    parsed 'notice 'active (erc-response.contents parsed)))
@@ -4219,7 +4186,7 @@ and as second argument the event parsed as a vector."
   :group 'erc-display
   :type 'function)
 
-(defun erc-format-nick (&optional user channel-data)
+(defun erc-format-nick (&optional user _channel-data)
   "Return the nickname of USER.
 See also `erc-format-nick-function'."
   (when user (erc-server-user-nickname user)))
@@ -4247,7 +4214,7 @@ See also `erc-format-nick-function'."
     (let ((prefix "> "))
       (erc-propertize prefix 'face 'erc-default-face))))
 
-(defun erc-echo-notice-in-default-buffer (s parsed buffer sender)
+(defun erc-echo-notice-in-default-buffer (s parsed buffer _sender)
   "Echos a private notice in the default buffer, namely the
 target buffer specified by BUFFER, or there is no target buffer,
 the server buffer.  This function is designed to be added to
@@ -4256,7 +4223,7 @@ and always returns t."
   (erc-display-message parsed nil buffer s)
   t)
 
-(defun erc-echo-notice-in-target-buffer (s parsed buffer sender)
+(defun erc-echo-notice-in-target-buffer (s parsed buffer _sender)
   "Echos a private notice in BUFFER, if BUFFER is non-nil.  This
 function is designed to be added to either `erc-echo-notice-hook'
 or `erc-echo-notice-always-hook', and returns non-nil if BUFFER
@@ -4265,21 +4232,21 @@ is non-nil."
       (progn (erc-display-message parsed nil buffer s) t)
     nil))
 
-(defun erc-echo-notice-in-minibuffer (s parsed buffer sender)
+(defun erc-echo-notice-in-minibuffer (s _parsed _buffer _sender)
   "Echos a private notice in the minibuffer.  This function is
 designed to be added to either `erc-echo-notice-hook' or
 `erc-echo-notice-always-hook', and always returns t."
   (message "%s" (concat "NOTICE: " s))
   t)
 
-(defun erc-echo-notice-in-server-buffer (s parsed buffer sender)
+(defun erc-echo-notice-in-server-buffer (s parsed _buffer _sender)
   "Echos a private notice in the server buffer.  This function is
 designed to be added to either `erc-echo-notice-hook' or
 `erc-echo-notice-always-hook', and always returns t."
   (erc-display-message parsed nil nil s)
   t)
 
-(defun erc-echo-notice-in-active-non-server-buffer (s parsed buffer sender)
+(defun erc-echo-notice-in-active-non-server-buffer (s parsed _buffer _sender)
   "Echos a private notice in the active buffer if the active
 buffer is not the server buffer.  This function is designed to be
 added to either `erc-echo-notice-hook' or
@@ -4289,14 +4256,14 @@ buffer is not the server buffer."
       (progn (erc-display-message parsed nil 'active s) t)
     nil))
 
-(defun erc-echo-notice-in-active-buffer (s parsed buffer sender)
+(defun erc-echo-notice-in-active-buffer (s parsed _buffer _sender)
   "Echos a private notice in the active buffer.  This function is
 designed to be added to either `erc-echo-notice-hook' or
 `erc-echo-notice-always-hook', and always returns t."
   (erc-display-message parsed nil 'active s)
   t)
 
-(defun erc-echo-notice-in-user-buffers (s parsed buffer sender)
+(defun erc-echo-notice-in-user-buffers (s parsed _buffer sender)
   "Echos a private notice in all of the buffers for which SENDER
 is a member.  This function is designed to be added to either
 `erc-echo-notice-hook' or `erc-echo-notice-always-hook', and
@@ -4321,12 +4288,12 @@ default target.
 See also: `erc-echo-notice-in-user-buffers',
 `erc-buffer-list-with-nick'."
   (let ((buffers (erc-buffer-list-with-nick sender erc-server-process)))
-    (add-to-list 'buffers buffer)
-    (if buffers
+    (unless (memq buffer buffers) (push buffer buffers))
+    (if buffers                         ;FIXME: How could it be nil?
         (progn (erc-display-message parsed nil buffers s) t)
       nil)))
 
-(defun erc-echo-notice-in-first-user-buffer (s parsed buffer sender)
+(defun erc-echo-notice-in-first-user-buffer (s parsed _buffer sender)
   "Echos a private notice in one of the buffers for which SENDER
 is a member.  This function is designed to be added to either
 `erc-echo-notice-hook' or `erc-echo-notice-always-hook', and
@@ -4504,7 +4471,7 @@ See also `erc-display-message'."
 
 (defvar erc-ctcp-query-CLIENTINFO-hook '(erc-ctcp-query-CLIENTINFO))
 
-(defun erc-ctcp-query-CLIENTINFO (proc nick login host to msg)
+(defun erc-ctcp-query-CLIENTINFO (_proc nick _login _host _to msg)
   "Respond to a CTCP CLIENTINFO query."
   (when (string-match "^CLIENTINFO\\(\\s-*\\|\\s-+.*\\)$" msg)
     (let ((s (erc-client-info (erc-trim-string (match-string 1 msg)))))
@@ -4513,7 +4480,7 @@ See also `erc-display-message'."
   nil)
 
 (defvar erc-ctcp-query-ECHO-hook '(erc-ctcp-query-ECHO))
-(defun erc-ctcp-query-ECHO (proc nick login host to msg)
+(defun erc-ctcp-query-ECHO (_proc nick _login _host _to msg)
   "Respond to a CTCP ECHO query."
   (when (string-match "^ECHO\\s-+\\(.*\\)\\s-*$" msg)
     (let ((s (match-string 1 msg)))
@@ -4522,7 +4489,7 @@ See also `erc-display-message'."
   nil)
 
 (defvar erc-ctcp-query-FINGER-hook '(erc-ctcp-query-FINGER))
-(defun erc-ctcp-query-FINGER (proc nick login host to msg)
+(defun erc-ctcp-query-FINGER (_proc nick _login _host _to _msg)
   "Respond to a CTCP FINGER query."
   (unless erc-disable-ctcp-replies
     (let ((s (if erc-anonymous-login
@@ -4538,7 +4505,7 @@ See also `erc-display-message'."
   nil)
 
 (defvar erc-ctcp-query-PING-hook '(erc-ctcp-query-PING))
-(defun erc-ctcp-query-PING (proc nick login host to msg)
+(defun erc-ctcp-query-PING (_proc nick _login _host _to msg)
   "Respond to a CTCP PING query."
   (when (string-match "^PING\\s-+\\(.*\\)" msg)
     (unless erc-disable-ctcp-replies
@@ -4547,21 +4514,21 @@ See also `erc-display-message'."
   nil)
 
 (defvar erc-ctcp-query-TIME-hook '(erc-ctcp-query-TIME))
-(defun erc-ctcp-query-TIME (proc nick login host to msg)
+(defun erc-ctcp-query-TIME (_proc nick _login _host _to _msg)
   "Respond to a CTCP TIME query."
   (unless erc-disable-ctcp-replies
     (erc-send-ctcp-notice nick (format "TIME %s" (current-time-string))))
   nil)
 
 (defvar erc-ctcp-query-USERINFO-hook '(erc-ctcp-query-USERINFO))
-(defun erc-ctcp-query-USERINFO (proc nick login host to msg)
+(defun erc-ctcp-query-USERINFO (_proc nick _login _host _to _msg)
   "Respond to a CTCP USERINFO query."
   (unless erc-disable-ctcp-replies
     (erc-send-ctcp-notice nick (format "USERINFO %s" erc-user-information)))
   nil)
 
 (defvar erc-ctcp-query-VERSION-hook '(erc-ctcp-query-VERSION))
-(defun erc-ctcp-query-VERSION (proc nick login host to msg)
+(defun erc-ctcp-query-VERSION (_proc nick _login _host _to _msg)
   "Respond to a CTCP VERSION query."
   (unless erc-disable-ctcp-replies
     (erc-send-ctcp-notice
@@ -4584,7 +4551,7 @@ See also `erc-display-message'."
        'CTCP-UNKNOWN ?n nick ?u login ?h host ?m msg))))
 
 (defvar erc-ctcp-reply-ECHO-hook '(erc-ctcp-reply-ECHO))
-(defun erc-ctcp-reply-ECHO (proc nick login host to msg)
+(defun erc-ctcp-reply-ECHO (_proc nick _login _host _to msg)
   "Handle a CTCP ECHO reply."
   (when (string-match "^ECHO\\s-+\\(.*\\)\\s-*$" msg)
     (let ((message (match-string 1 msg)))
@@ -4594,7 +4561,7 @@ See also `erc-display-message'."
   nil)
 
 (defvar erc-ctcp-reply-CLIENTINFO-hook '(erc-ctcp-reply-CLIENTINFO))
-(defun erc-ctcp-reply-CLIENTINFO (proc nick login host to msg)
+(defun erc-ctcp-reply-CLIENTINFO (_proc nick _login _host _to msg)
   "Handle a CTCP CLIENTINFO reply."
   (when (string-match "^CLIENTINFO\\s-+\\(.*\\)\\s-*$" msg)
     (let ((message (match-string 1 msg)))
@@ -4604,7 +4571,7 @@ See also `erc-display-message'."
   nil)
 
 (defvar erc-ctcp-reply-FINGER-hook '(erc-ctcp-reply-FINGER))
-(defun erc-ctcp-reply-FINGER (proc nick login host to msg)
+(defun erc-ctcp-reply-FINGER (_proc nick _login _host _to msg)
   "Handle a CTCP FINGER reply."
   (when (string-match "^FINGER\\s-+\\(.*\\)\\s-*$" msg)
     (let ((message (match-string 1 msg)))
@@ -4614,7 +4581,7 @@ See also `erc-display-message'."
   nil)
 
 (defvar erc-ctcp-reply-PING-hook '(erc-ctcp-reply-PING))
-(defun erc-ctcp-reply-PING (proc nick login host to msg)
+(defun erc-ctcp-reply-PING (_proc nick _login _host _to msg)
   "Handle a CTCP PING reply."
   (if (not (string-match "^PING\\s-+\\([0-9.]+\\)" msg))
       nil
@@ -4632,7 +4599,7 @@ See also `erc-display-message'."
           'bad-ping-response ?n nick ?t time))))))
 
 (defvar erc-ctcp-reply-TIME-hook '(erc-ctcp-reply-TIME))
-(defun erc-ctcp-reply-TIME (proc nick login host to msg)
+(defun erc-ctcp-reply-TIME (_proc nick _login _host _to msg)
   "Handle a CTCP TIME reply."
   (when (string-match "^TIME\\s-+\\(.*\\)\\s-*$" msg)
     (let ((message (match-string 1 msg)))
@@ -4642,7 +4609,7 @@ See also `erc-display-message'."
   nil)
 
 (defvar erc-ctcp-reply-VERSION-hook '(erc-ctcp-reply-VERSION))
-(defun erc-ctcp-reply-VERSION (proc nick login host to msg)
+(defun erc-ctcp-reply-VERSION (_proc nick _login _host _to msg)
   "Handle a CTCP VERSION reply."
   (when (string-match "^VERSION\\s-+\\(.*\\)\\s-*$" msg)
     (let ((message (match-string 1 msg)))
@@ -4705,7 +4672,7 @@ received.  Should be called with the current buffer set to the
 channel buffer.
 
 See also `erc-channel-begin-receiving-names'."
-  (maphash (lambda (nick user)
+  (maphash (lambda (nick _user)
              (if (null (gethash nick erc-channel-new-member-names))
                  (erc-remove-channel-user nick)))
            erc-channel-users)
@@ -4746,8 +4713,7 @@ channel."
     (setq names (delete "" (split-string names-string)))
     (let ((erc-channel-members-changed-hook nil))
       (dolist (item names)
-        (let ((updatep t)
-              ch)
+        (let ((updatep t))
           (if (rassq (elt item 0) prefix)
               (cond ((= (length item) 1)
                      (setq updatep nil))
@@ -4780,8 +4746,7 @@ The buffer where the change happened is current while this hook is called."
 
 (defun erc-update-user-nick (nick &optional new-nick
                                   host login full-name info)
-  "Updates the stored user information for the user with nickname
-NICK.
+  "Update the stored user information for the user with nickname NICK.
 
 See also: `erc-update-user'."
   (erc-update-user (erc-get-server-user nick) new-nick
@@ -4831,8 +4796,8 @@ which USER is a member, and t is returned."
 (defun erc-update-current-channel-member
   (nick new-nick &optional add op voice host login full-name info
         update-message-time)
-  "Updates the stored user information for the user with nickname
-NICK.  `erc-update-user' is called to handle changes to nickname,
+  "Update the stored user information for the user with nickname NICK.
+`erc-update-user' is called to handle changes to nickname,
 HOST, LOGIN, FULL-NAME, and INFO.  If OP or VOICE are non-nil,
 they must be equal to either `on' or `off', in which case the
 operator or voice status of the user in the current channel is
@@ -4850,7 +4815,7 @@ If, and only if, changes are made, or the user is added,
 See also: `erc-update-user' and `erc-update-channel-member'."
   (let* (changed user-changed
          (channel-data (erc-get-channel-user nick))
-         (cuser (if channel-data (cdr channel-data)))
+         (cuser (cdr channel-data))
          (user (if channel-data (car channel-data)
                  (erc-get-server-user nick))))
     (if cuser
@@ -4908,7 +4873,7 @@ See also: `erc-update-user' and `erc-update-channel-member'."
 (defun erc-update-channel-member (channel nick new-nick
                                   &optional add op voice host login
                                   full-name info update-message-time)
-  "Updates user and channel information for the user with
+  "Update user and channel information for the user with
 nickname NICK in channel CHANNEL.
 
 See also: `erc-update-current-channel-member'."
@@ -4951,7 +4916,6 @@ TOPIC string to the current topic."
   "Set the modes for the TGT provided as MODE-STRING."
   (let* ((modes (erc-parse-modes mode-string))
          (add-modes (nth 0 modes))
-         (remove-modes (nth 1 modes))
          ;; list of triples: (mode-char 'on/'off argument)
          (arg-modes (nth 2 modes)))
     (cond ((erc-channel-p tgt); channel modes
@@ -5040,6 +5004,7 @@ arg-modes is a list of triples of the form:
   "Update the mode information for TGT, provided as MODE-STRING.
 Optional arguments: NICK, HOST and LOGIN - the attributes of the
 person who changed the modes."
+  ;; FIXME: neither of nick, host, and login are used!
   (let* ((modes (erc-parse-modes mode-string))
          (add-modes (nth 0 modes))
          (remove-modes (nth 1 modes))
@@ -5197,8 +5162,7 @@ START and END describe positions in OBJECT.
 If VALUE-LIST is nil, set each property in PROPERTIES to t, else set
 each property to the corresponding value in VALUE-LIST."
   (unless value-list
-    (setq value-list (mapcar (lambda (x)
-                               t)
+    (setq value-list (mapcar (lambda (_x) t)
                              properties)))
   (while (and properties value-list)
     (erc-put-text-property
@@ -5290,7 +5254,7 @@ submitted line to be intentional."
   "Regular expression used for matching commands in ERC.")
 
 (defun erc-send-input (input)
-  "Treat INPUT as typed in by the user. It is assumed that the input
+  "Treat INPUT as typed in by the user.  It is assumed that the input
 and the prompt is already deleted.
 This returns non-nil only if we actually send anything."
   ;; Handle different kinds of inputs
@@ -5380,8 +5344,8 @@ list of the form: (command args) where both elements are strings."
   (when (string-match erc-command-regexp line)
     (let* ((cmd (erc-command-symbol (match-string 1 line)))
            ;; note: return is nil, we apply this simply for side effects
-           (canon-defun (while (and cmd (symbolp (symbol-function cmd)))
-                          (setq cmd (symbol-function cmd))))
+           (_canon-defun (while (and cmd (symbolp (symbol-function cmd)))
+                           (setq cmd (symbol-function cmd))))
            (cmd-fun (or cmd #'erc-cmd-default))
            (arg (if cmd
                     (if (get cmd-fun 'do-not-parse-args)
@@ -5449,22 +5413,18 @@ See also `erc-downcase'."
 
 (defun erc-add-default-channel (channel)
   "Add CHANNEL to the default channel list."
-
-  (let ((d1 (car erc-default-recipients))
-        (d2 (cdr erc-default-recipients))
-        (chl (downcase channel)))
+  (let ((chl (downcase channel)))
       (setq erc-default-recipients
             (cons chl erc-default-recipients))))
 
 (defun erc-delete-default-channel (channel &optional buffer)
   "Delete CHANNEL from the default channel list."
-  (let ((ob (current-buffer)))
-    (with-current-buffer (if (and buffer
-                                  (bufferp buffer))
-                             buffer
-                           (current-buffer))
-      (setq erc-default-recipients (delete (downcase channel)
-                                           erc-default-recipients)))))
+  (with-current-buffer (if (and buffer
+                                (bufferp buffer))
+                           buffer
+                         (current-buffer))
+    (setq erc-default-recipients (delete (downcase channel)
+                                         erc-default-recipients))))
 
 (defun erc-add-query (nickname)
   "Add QUERY'd NICKNAME to the default channel list.
@@ -5473,10 +5433,10 @@ The previous default target of QUERY type gets removed."
   (let ((d1 (car erc-default-recipients))
         (d2 (cdr erc-default-recipients))
         (qt (cons 'QUERY (downcase nickname))))
-    (if (and (listp d1)
-             (eq (car d1) 'QUERY))
-        (setq erc-default-recipients (cons qt d2))
-      (setq erc-default-recipients (cons qt erc-default-recipients)))))
+    (setq erc-default-recipients (cons qt (if (and (listp d1)
+                                                   (eq (car d1) 'QUERY))
+                                              d2
+                                            erc-default-recipients)))))
 
 (defun erc-delete-query ()
   "Delete the topmost target if it is a QUERY."
@@ -5527,17 +5487,11 @@ The addressed target is the string before the first colon in MSG."
   (let ((nick (erc-server-user-nickname user))
         (host (erc-server-user-host user))
         (login (erc-server-user-login user)))
-  (concat (if nick
-              nick
-            "")
+  (concat (or nick "")
           "!"
-          (if login
-              login
-            "")
+          (or login "")
           "@"
-          (if host
-              host
-            ""))))
+          (or host ""))))
 
 (defun erc-list-match (lst str)
   "Return non-nil if any regexp in LST matches STR."
@@ -5588,7 +5542,7 @@ This command is sent even if excess flood is detected."
   (interactive "P")
   (erc-set-active-buffer (current-buffer))
   (let ((tgt (erc-default-target))
-        (erc-force-send t))
+        (erc-force-send t))             ;FIXME: Not used anywhere!
     (cond ((or (not tgt) (not (erc-channel-p tgt)))
            (erc-display-message nil 'error (current-buffer) 'no-target))
           (arg (erc-load-irc-script-lines (list (concat "/mode " tgt " -i"))
@@ -5626,7 +5580,7 @@ If CHANNEL is non-nil, toggle MODE for that channel, otherwise use
   (interactive "P")
   (erc-set-active-buffer (current-buffer))
   (let ((tgt (or channel (erc-default-target)))
-        (erc-force-send t))
+        (erc-force-send t))             ;FIXME: Not used anywhere!
     (cond ((or (null tgt) (null (erc-channel-p tgt)))
            (erc-display-message nil 'error 'active 'no-target))
           ((member mode erc-channel-modes)
@@ -5670,12 +5624,11 @@ specified in the list PATH.
 If FILE is found, return the path to it."
   (let ((filepath file))
     (if (file-readable-p filepath) filepath
-      (progn
-        (while (and path
-                    (progn (setq filepath (expand-file-name file (car path)))
-                           (not (file-readable-p filepath))))
-          (setq path (cdr path)))
-        (if path filepath nil)))))
+      (while (and path
+                  (progn (setq filepath (expand-file-name file (car path)))
+                         (not (file-readable-p filepath))))
+        (setq path (cdr path)))
+      (if path filepath nil))))
 
 (defun erc-select-startup-file ()
   "Select an ERC startup file.
@@ -5789,7 +5742,6 @@ If optional NOEXPAND is non-nil, do not expand script-specific
 sequences, process the lines verbatim.  Use this for multiline
 user input."
   (let* ((cb (current-buffer))
-         (pnt (point))
          (s "")
          (sp (or (erc-command-indicator) (erc-prompt)))
          (args (and (boundp 'erc-script-args) erc-script-args)))
@@ -6030,13 +5982,12 @@ entry of `channel-members'."
          (user (if channel-data
                    (car channel-data)
                  (erc-get-server-user word)))
-         host login full-name info nick op voice)
+         host login full-name nick op voice)
     (when user
       (setq nick (erc-server-user-nickname user)
             host (erc-server-user-host user)
             login (erc-server-user-login user)
-            full-name (erc-server-user-full-name user)
-            info (erc-server-user-info user))
+            full-name (erc-server-user-full-name user))
       (if cuser
           (setq op (erc-channel-user-op cuser)
                 voice (erc-channel-user-voice cuser)))
@@ -6048,7 +5999,7 @@ entry of `channel-members'."
                                (format " and is +%s%s on %s"
                                (if op "o" "")
                                (if voice "v" "")
-                                       (erc-default-target))
+                               (erc-default-target))
                              ""))
         user))))
 
@@ -6597,7 +6548,7 @@ See also `format-spec'."
 (add-hook 'kill-buffer-hook 'erc-kill-buffer-function)
 
 (defcustom erc-kill-server-hook '(erc-kill-server)
-  "Invoked whenever a server-buffer is killed via `kill-buffer'."
+  "Invoked whenever a server buffer is killed via `kill-buffer'."
   :group 'erc-hooks
   :type 'hook)
 
@@ -6702,9 +6653,9 @@ Otherwise, connect to HOST:PORT as USER and /join CHANNEL."
 
 (provide 'erc)
 
-;;; Deprecated. We might eventually stop requiring the goodies automatically.
-;;; IMPORTANT: This require must appear _after_ the above (provide 'erc) to
-;;; avoid a recursive require error when byte-compiling the entire package.
+;; Deprecated. We might eventually stop requiring the goodies automatically.
+;; IMPORTANT: This require must appear _after_ the above (provide 'erc) to
+;; avoid a recursive require error when byte-compiling the entire package.
 (require 'erc-goodies)
 
 ;;; erc.el ends here
diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el
index 69dc6c76b41..ef8a53f3c0b 100644
--- a/lisp/eshell/esh-cmd.el
+++ b/lisp/eshell/esh-cmd.el
@@ -993,14 +993,6 @@ at the moment are:
        ,@commands
        (eshell-debug-command ,(concat "done " (eval tag)) form))))
 
-(defsubst eshell-macrop (object)
-  "Return t if OBJECT is a macro or nil otherwise."
-  (and (symbolp object) (fboundp object)
-       (setq object (indirect-function object))
-       (listp object)
-       (eq 'macro (car object))
-       (functionp (cdr object))))
-
 (defun eshell-do-eval (form &optional synchronous-p)
   "Evaluate form, simplifying it as we go.
 Unless SYNCHRONOUS-P is non-nil, throws `eshell-defer' if it needs to
@@ -1016,7 +1008,7 @@ be finished later after the completion of an asynchronous subprocess."
       (setq form (cadr (cadr form))))
     ;; expand any macros directly into the form.  This is done so that
     ;; we can modify any `let' forms to evaluate only once.
-    (if (eshell-macrop (car form))
+    (if (macrop (car form))
         (let ((exp (eshell-copy-tree (macroexpand form))))
           (eshell-manipulate (format "expanding macro `%s'"
                                      (symbol-name (car form)))
diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index 5346bd16fd2..ed5fecf09ff 100644
--- a/lisp/eshell/esh-mode.el
+++ b/lisp/eshell/esh-mode.el
@@ -740,7 +740,7 @@ This is done after all necessary filtering has been done."
               (if (<= (point) oend)
                   (setq oend (+ oend nchars)))
               (insert-before-markers string)
-              (if (= (window-start (selected-window)) (point))
+              (if (= (window-start) (point))
                   (set-window-start (selected-window)
                                     (- (point) nchars)))
               (if (= (point) eshell-last-input-end)
diff --git a/lisp/ffap.el b/lisp/ffap.el
index 70096248e19..737de8b5991 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -1073,7 +1073,7 @@ Assumes the buffer has not changed."
     (or (and (eq major-mode 'w3-mode) ; In a w3 buffer button?
              (w3-view-this-url t))
         (let ((thing-at-point-beginning-of-url-regexp ffap-url-regexp)
-              (thing-at-point-default-mail-scheme ffap-foo-at-bar-prefix))
+              (thing-at-point-default-mail-uri-scheme ffap-foo-at-bar-prefix))
           (thing-at-point-url-at-point t
                                        (if (use-region-p)
                                            (cons (region-beginning)
@@ -1736,7 +1736,7 @@ Only intended for interactive use."
   ;; Preserve selected buffer, but do not do save-window-excursion,
   ;; since we want to see any window created by the form.  Temporarily
   ;; select the article buffer, so we can see any point movement.
-  (let ((sb (window-buffer (selected-window))))
+  (let ((sb (window-buffer)))
     (gnus-configure-windows 'article)
     (pop-to-buffer gnus-article-buffer)
     (widen)
diff --git a/lisp/filecache.el b/lisp/filecache.el
index ae3cb8d074a..69649e105bc 100644
--- a/lisp/filecache.el
+++ b/lisp/filecache.el
@@ -453,8 +453,9 @@ message reporting the number of file names deleted."
     (dolist (f files)
       (if (file-cache-delete-file f)
           (setq n (1+ n))))
-    (message "Filecache: uncached %d file name%s."
-             n (if (= n 1) "" "s"))))
+    (when message
+      (message "Filecache: uncached %d file name%s."
+               n (if (= n 1) "" "s")))))
 
 (defun file-cache-delete-file-regexp (regexp)
   "Delete files matching REGEXP from the file cache."
@@ -679,10 +680,7 @@ match REGEXP."
                 "*File Cache Files Matching*")))
     (erase-buffer)
     (insert
-     (mapconcat
-      'identity
-      results
-      "\n"))
+     (mapconcat #'identity results "\n"))
     (goto-char (point-min))
     (display-buffer buf)))
 
diff --git a/lisp/filenotify.el b/lisp/filenotify.el
index d2f37b99107..5a5435bb4cb 100644
--- a/lisp/filenotify.el
+++ b/lisp/filenotify.el
@@ -92,7 +92,7 @@ car of that event, which is the symbol `file-notify'."
          (pending-event (assoc desc file-notify--pending-events))
          (actions (nth 1 event))
          (file (file-notify--event-file-name event))
-         file1 cookie callback)
+         file1 callback)
 
     ;; Make actions a list.
     (unless (consp actions) (setq actions (cons actions nil)))
diff --git a/lisp/files.el b/lisp/files.el
index 526c535450b..f9ff3c936bd 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1603,13 +1603,16 @@ killed."
   "Create a suitably named buffer for visiting FILENAME, and return it.
 FILENAME (sans directory) is used unchanged if that name is free;
 otherwise a string <2> or <3> or ... is appended to get an unused name.
-Spaces at the start of FILENAME (sans directory) are removed."
+
+Emacs treats buffers whose names begin with a space as internal buffers.
+To avoid confusion when visiting a file whose name begins with a space,
+this function prepends a \"|\" to the final result if necessary."
   (let ((lastname (file-name-nondirectory filename)))
     (if (string= lastname "")
         (setq lastname filename))
-    (save-match-data
-      (string-match "^ *\\(.*\\)" lastname)
-      (generate-new-buffer (match-string 1 lastname)))))
+    (generate-new-buffer (if (string-match-p "\\` " lastname)
+                             (concat "|" lastname)
+                           lastname))))
 
 (defun generate-new-buffer (name)
   "Create and return a buffer with a name based on NAME.
@@ -2272,8 +2275,8 @@ since only a single case-insensitive search through the alist is made."
      ("\\.scm\\.[0-9]*\\'" . scheme-mode)
      ("\\.[ck]?sh\\'\\|\\.shar\\'\\|/\\.z?profile\\'" . sh-mode)
      ("\\.bash\\'" . sh-mode)
-     ("\\(/\\|\\`\\)\\.\\(bash_profile\\|z?login\\|bash_login\\|z?logout\\)\\'" . sh-mode)
-     ("\\(/\\|\\`\\)\\.\\(bash_logout\\|shrc\\|[kz]shrc\\|bashrc\\|t?cshrc\\|esrc\\)\\'" . sh-mode)
+     ("\\(/\\|\\`\\)\\.\\(bash_\\(profile\\|history\\|log\\(in\\|out\\)\\)\\|z?log\\(in\\|out\\)\\)\\'" . sh-mode)
+     ("\\(/\\|\\`\\)\\.\\(shrc\\|[kz]shrc\\|bashrc\\|t?cshrc\\|esrc\\)\\'" . sh-mode)
      ("\\(/\\|\\`\\)\\.\\([kz]shenv\\|xinitrc\\|startxrc\\|xsession\\)\\'" . sh-mode)
      ("\\.m?spec\\'" . sh-mode)
      ("\\.m[mes]\\'" . nroff-mode)
@@ -2451,6 +2454,7 @@ and `magic-mode-alist', which determines modes based on file contents.")
      ("wishx" . tcl-mode)
      ("tcl" . tcl-mode)
      ("tclsh" . tcl-mode)
+     ("expect" . tcl-mode)
      ("scm" . scheme-mode)
      ("ash" . sh-mode)
      ("bash" . sh-mode)
@@ -6690,7 +6694,9 @@ based on existing mode bits, as in \"og+rX-w\"."
           (string-to-number value 8)
         (file-modes-symbolic-to-number value modes)))))
 
-
+(define-obsolete-variable-alias 'cache-long-line-scans
+  'cache-long-scans "24.4")
+
 ;; Trashcan handling.
 (defcustom trash-directory nil
   "Directory for `move-file-to-trash' to move files and directories to.
diff --git a/lisp/filesets.el b/lisp/filesets.el
index fbf28dbecbc..82891770f12 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -214,8 +214,8 @@ key is supported."
 
 (defun filesets-which-command-p (cmd)
   "Call \"which CMD\" and return non-nil if the command was found."
-  (when (string-match (format "\\(/[^/]+\\)?/%s" cmd)
-                      (filesets-which-command cmd))
+  (when (string-match-p (format "\\(/[^/]+\\)?/%s" cmd)
+                        (filesets-which-command cmd))
     cmd))
 
 (defun filesets-message (level &rest args)
@@ -1082,7 +1082,7 @@ defined in `filesets-ingroup-patterns'."
 
     (require 'easymenu)
 
-    (defun filesets-error (class &rest args)
+    (defun filesets-error (_class &rest args)
       "`error' wrapper."
       (error "%s" (mapconcat 'identity args " ")))
 
@@ -1093,10 +1093,10 @@ defined in `filesets-ingroup-patterns'."
 If NEGATIVE is non-nil, remove all directory names."
   (filesets-filter-list lst
                         (lambda (x)
-                          (and (not (string-match "^\\.+/$" x))
+                          (and (not (string-match-p "^\\.+/$" x))
                                (if negative
-                                   (not (string-match "[:/\\]$" x))
-                                 (string-match "[:/\\]$" x))))))
+                                   (not (string-match-p "[:/\\]$" x))
+                                 (string-match-p "[:/\\]$" x))))))
 
 (defun filesets-conditional-sort (lst &optional access-fn)
   "Return a sorted copy of LST, LST being a list of strings.
@@ -1130,18 +1130,18 @@ Return full path if FULL-FLAG is non-nil."
           (dirs  nil))
       (dolist (this (file-name-all-completions "" dir))
         (cond
-         ((string-match "^\\.+/$" this)
+         ((string-match-p "^\\.+/$" this)
           nil)
-         ((string-match "[:/\\]$" this)
+         ((string-match-p "[:/\\]$" this)
           (when (or (not match-dirs-flag)
                     (not pattern)
-                    (string-match pattern this))
+                    (string-match-p pattern this))
             (filesets-message 5 "Filesets: matched dir %S with pattern %S"
                               this pattern)
             (setq dirs (cons this dirs))))
          (t
           (when (or (not pattern)
-                    (string-match pattern this))
+                    (string-match-p pattern this))
             (filesets-message 5 "Filesets: matched file %S with pattern %S"
                               this pattern)
             (setq files (cons (if full-flag
@@ -1249,7 +1249,7 @@ Return full path if FULL-FLAG is non-nil."
   (let ((filename (file-name-nondirectory file)))
     (filesets-some
      (lambda (entry)
-       (when (and (string-match (nth 0 entry) filename)
+       (when (and (string-match-p (nth 0 entry) filename)
                   (filesets-eviewer-constraint-p entry))
          entry))
      filesets-external-viewers)))
@@ -2004,7 +2004,7 @@ LOOKUP-NAME is used as lookup name for retrieving fileset specific settings."
         (fn (or fun (lambda (a b)
                       (and (stringp a)
                            (stringp b)
-                           (string-match a b))))))
+                           (string-match-p a b))))))
     (filesets-some (lambda (x)
                      (if (funcall fn (car x) masterfile)
                          (nth pos x)
diff --git a/lisp/find-file.el b/lisp/find-file.el
index 9f7d877ec3b..d9a9f08f19b 100644
--- a/lisp/find-file.el
+++ b/lisp/find-file.el
@@ -528,11 +528,9 @@ the `ff-ignore-include' variable."
         stub            ;; name of the file without extension
         alist           ;; working copy of the list of file extensions
         pathname        ;; the pathname of the file or the #include line
-        default-name    ;; file we should create if none found
         format          ;; what we have to match
         found           ;; name of the file or buffer found - nil if none
-        dirs            ;; local value of ff-search-directories
-        no-match)       ;; whether we know about this kind of file
+        dirs)           ;; local value of ff-search-directories
 
     (message "Working...")
 
@@ -545,7 +543,6 @@ the `ff-ignore-include' variable."
 
     (cond
      ((and (not ff-ignore-include) fname)
-      (setq default-name fname)
       (setq found (ff-get-file-name dirs fname nil)))
 
      ;; let's just get the corresponding file
@@ -558,7 +555,6 @@ the `ff-ignore-include' variable."
                        "/none.none"))
 
       (setq fname (file-name-nondirectory pathname)
-            no-match nil
             match (car alist))
 
       ;; find the table entry corresponding to this file
@@ -569,8 +565,7 @@ the `ff-ignore-include' variable."
         (setq pos (ff-string-match (car match) fname)))
 
       ;; no point going on if we haven't found anything
-      (if (not match)
-          (setq no-match t)
+      (when match
 
         ;; otherwise, suffixes contains what we need
         (setq suffixes (car (cdr match))
@@ -583,8 +578,7 @@ the `ff-ignore-include' variable."
             (progn
               (setq suffixes (funcall action (buffer-file-name))
                     match (cons (car match) (list suffixes))
-                    stub nil
-                    default-name (car suffixes)))
+                    stub nil))
 
           ;; otherwise build our filename stub
           (cond
@@ -599,11 +593,7 @@ the `ff-ignore-include' variable."
             (setq format (concat "\\(.+\\)" (car match)))
             (string-match format fname)
             (setq stub (substring fname (match-beginning 1) (match-end 1)))
-            ))
-
-          ;; if we find nothing, we should try to get a file like this one
-          (setq default-name
-                (concat stub (car (car (cdr match))))))
+            )))
 
         ;; do the real work - find the file
         (setq found
@@ -671,7 +661,7 @@ name of the first file found."
       (setq buf (buffer-name (car blist)))
       (while (and blist (not found))
 
-        (if (string-match (concat filename "<[0-9]+>") buf)
+        (if (string-match-p (concat filename "<[0-9]+>") buf)
             (setq found (buffer-file-name (car blist))))
 
         (setq blist (cdr blist))
@@ -797,20 +787,18 @@ See variable `ff-special-constructs'."
   "Get all the directory files under directory HERE.
 Exclude all files in the optional EXCLUDE list."
   (if (file-directory-p here)
-      (condition-case nil
-          (progn
-            (let ((files (directory-files here t))
-                  (dirlist (list))
-                  file)
-              (while files
-                (setq file (car files))
-                (if (and
-                     (file-directory-p file)
-                     (not (member (ff-basename file) exclude)))
-                    (setq dirlist (cons file dirlist)))
-                (setq files (cdr files)))
-              (setq dirlist (reverse dirlist))))
-        (error nil))
+      (ignore-errors
+        (let ((files (directory-files here t))
+              (dirlist (list))
+              file)
+          (while files
+            (setq file (car files))
+            (if (and
+                 (file-directory-p file)
+                 (not (member (ff-basename file) exclude)))
+                (setq dirlist (cons file dirlist)))
+            (setq files (cdr files)))
+          (setq dirlist (reverse dirlist))))
     nil))
 
 (defun ff-switch-file (f1 f2 file &optional in-other-window new-file)
@@ -892,9 +880,7 @@ Given START and/or END, checks between these characters."
 Build up a new file list based possibly on part of the directory name
 and the name of the file passed in."
   (ff-string-match "\\(.*\\)/\\([^/]+\\)/\\([^.]+\\).\\([^/]+\\)$" arg)
-  (let ((path (if (match-beginning 1)
-                  (substring arg (match-beginning 1) (match-end 1)) nil))
-        (dire (if (match-beginning 2)
+  (let ((dire (if (match-beginning 2)
                   (substring arg (match-beginning 2) (match-end 2)) nil))
         (file (if (match-beginning 3)
                   (substring arg (match-beginning 3) (match-end 3)) nil))
diff --git a/lisp/find-lisp.el b/lisp/find-lisp.el
index cac09bb11a8..0eea918dc48 100644
--- a/lisp/find-lisp.el
+++ b/lisp/find-lisp.el
@@ -53,7 +53,7 @@
   "Internal variable.")
 
 (defconst find-lisp-line-indent "  "
-  "Indentation for dired file lines.")
+  "Indentation for Dired file lines.")
 
 (defvar find-lisp-file-predicate nil
   "Predicate for choosing to include files.")
@@ -280,7 +280,7 @@ It is a function which takes two arguments, the directory and its parent."
 
 ;;;###autoload
 (defun find-lisp-find-dired-filter (regexp)
-  "Change the filter on a find-lisp-find-dired buffer to REGEXP."
+  "Change the filter on a `find-lisp-find-dired' buffer to REGEXP."
   (interactive "sSet filter to regexp: ")
   (setq find-lisp-regexp regexp)
   (revert-buffer))
diff --git a/lisp/finder.el b/lisp/finder.el
index e07c6a241ab..c06c01c2c97 100644
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -225,8 +225,8 @@ from; the default is `load-path'."
               (lambda (a b) (string< (symbol-name (car a))
                                      (symbol-name (car b))))))
 
-  (save-excursion
-    (find-file generated-finder-keywords-file)
+  (with-current-buffer
+      (find-file-noselect generated-finder-keywords-file)
     (setq buffer-undo-list t)
     (erase-buffer)
     (insert (autoload-rubric generated-finder-keywords-file
diff --git a/lisp/follow.el b/lisp/follow.el
index ef26788c0b1..2c9365b2ba6 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -515,7 +515,7 @@ Works like `scroll-up' when not in Follow mode."
 (declare-function comint-adjust-point "comint" (window))
 (defvar comint-scroll-show-maximum-output)
 
-(defun follow-comint-scroll-to-bottom (&optional window)
+(defun follow-comint-scroll-to-bottom (&optional _window)
   "Scroll the bottom-most window in the current Follow chain.
 This is to be called by `comint-postoutput-scroll-to-bottom'."
   (let* ((buffer (current-buffer))
@@ -572,7 +572,7 @@ selected if the original window is the first one in the frame."
   (interactive "P")
   (let ((other (or (and (null arg)
                         (not (eq (selected-window)
-                                 (frame-first-window (selected-frame)))))
+                                 (frame-first-window))))
                    (and arg
                         (< (prefix-numeric-value arg) 0))))
         (start (window-start)))
@@ -883,15 +883,14 @@ returned by `follow-windows-start-end'."
 (defun follow-select-if-visible (dest win-start-end)
   "Select and return a window, if DEST is visible in it.
 Return the selected window."
-  (let (win win-end wse)
+  (let (win wse)
     (while (and (not win) win-start-end)
       ;; Don't select a window that was just moved. This makes it
       ;; possible to later select the last window after a
       ;; `end-of-buffer' command.
       (setq wse (car win-start-end))
       (when (follow-pos-visible dest (car wse) win-start-end)
-        (setq win (car wse)
-              win-end (nth 2 wse))
+        (setq win (car wse))
         (select-window win))
       (setq win-start-end (cdr win-start-end)))
     win))
@@ -1083,7 +1082,7 @@ should be a member of WINDOWS, starts at position START."
 This is done by reading and rewriting the start position of
 non-first windows in Follow mode."
   (let* ((orig-buffer (current-buffer))
-         (top (frame-first-window (selected-frame)))
+         (top (frame-first-window))
          (win top)
          who) ; list of (buffer . frame)
     ;; If the only window in the frame is a minibuffer
@@ -1260,6 +1259,8 @@ non-first windows in Follow mode."
 
         ;; If the region is visible, make it look good when spanning
         ;; multiple windows.
+
+        ;; FIXME: Why not use `use-region-p' here?
         (when (region-active-p)
           (follow-maximize-region
            (selected-window) windows win-start-end)))
diff --git a/lisp/format.el b/lisp/format.el
index 221eaadcdd8..fc8dcb97b01 100644
--- a/lisp/format.el
+++ b/lisp/format.el
@@ -225,10 +225,12 @@ For most purposes, consider using `format-encode-region' instead."
                 (setq selective-display sel-disp)
                 (set-buffer-multibyte multibyte)
                 (setq buffer-file-coding-system coding-system))
-              (copy-to-buffer copy-buf from to)
-              (set-buffer copy-buf)
-              (format-insert-annotations write-region-annotations-so-far from)
-              (format-encode-run-method to-fn (point-min) (point-max) orig-buf)
+              (let ((inhibit-read-only t)) ; bug#14887
+                (copy-to-buffer copy-buf from to)
+                (set-buffer copy-buf)
+                (format-insert-annotations write-region-annotations-so-far from)
+                (format-encode-run-method to-fn (point-min) (point-max)
+                                          orig-buf))
               (when (buffer-live-p copy-buf)
                 (with-current-buffer copy-buf
                   ;; Set write-region-post-annotation-function to
diff --git a/lisp/forms.el b/lisp/forms.el
index 37914bf5465..38fc0b320dd 100644
--- a/lisp/forms.el
+++ b/lisp/forms.el
@@ -439,6 +439,8 @@ Also, initial position is at last record."
 (defvar forms--rw-face nil
   "Face used to represent read-write data on the screen.")
 
+(defvar read-file-filter) ; bound in forms--intuit-from-file
+
 ;;;###autoload
 (defun forms-mode (&optional primary)
   "Major mode to visit files in a field-structured manner using a form.
@@ -913,7 +915,7 @@ Commands:                        Equivalent keys in read-only mode:
          `(lambda (arg)
             (let ((inhibit-read-only t))
               ,@(apply 'append
-                       (mapcar 'forms--make-format-elt-using-text-properties
+                       (mapcar #'forms--make-format-elt-using-text-properties
                                forms-format-list))
               ;; Prevent insertion before the first text.
               ,@(if (numberp (car forms-format-list))
@@ -926,7 +928,7 @@ Commands:                        Equivalent keys in read-only mode:
             (setq forms--iif-start nil))
        `(lambda (arg)
           ,@(apply 'append
-                   (mapcar 'forms--make-format-elt forms-format-list)))))
+                   (mapcar #'forms--make-format-elt forms-format-list)))))
 
     ;; We have tallied the number of markers and dynamic texts,
     ;; so we can allocate the arrays now.
@@ -1098,7 +1100,7 @@ Commands:                        Equivalent keys in read-only mode:
             (goto-char (point-min))
             ,@(apply 'append
                      (mapcar
-                      'forms--make-parser-elt
+                      #'forms--make-parser-elt
                       (append forms-format-list (list nil)))))))))
 
   (forms--debug 'forms--parser))
@@ -1198,8 +1200,6 @@ Commands:                        Equivalent keys in read-only mode:
       (setq forms--field nil)))
    ))
 
-(defvar read-file-filter) ; bound in forms--intuit-from-file
-
 (defun forms--intuit-from-file ()
   "Get number of fields and a default form using the data file."
 
@@ -1569,10 +1569,10 @@ As a side effect: sets `forms--the-record-list'."
     ;; Build new record.
     (setq forms--the-record-list (forms--parse-form))
     (setq the-record
-          (mapconcat 'identity forms--the-record-list forms-field-sep))
+          (mapconcat #'identity forms--the-record-list forms-field-sep))
 
-    (if (string-match (regexp-quote forms-field-sep)
-                      (mapconcat 'identity forms--the-record-list ""))
+    (if (string-match-p (regexp-quote forms-field-sep)
+                        (mapconcat #'identity forms--the-record-list ""))
         (error "Field separator occurs in record - update refused"))
 
     ;; Handle multi-line fields, if allowed.
@@ -1580,7 +1580,7 @@ As a side effect: sets `forms--the-record-list'."
         (forms--trans the-record "\n" forms-multi-line))
 
     ;; A final sanity check before updating.
-    (if (string-match "\n" the-record)
+    (if (string-match-p "\n" the-record)
         (error "Multi-line fields in this record - update refused"))
 
     (with-current-buffer forms--file-buffer
@@ -1779,11 +1779,7 @@ after the current record."
           (setq the-list (cdr (append the-fields nil))))
       (setq the-list (make-list forms-number-of-fields "")))
 
-    (setq the-record
-          (mapconcat
-          'identity
-          the-list
-          forms-field-sep))
+    (setq the-record (mapconcat #'identity the-list forms-field-sep))
 
     (with-current-buffer forms--file-buffer
       (forms--goto-record ln)
diff --git a/lisp/frame.el b/lisp/frame.el
index 22cf484e54a..3668f24ba01 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -500,10 +500,7 @@ See help of `modify-frame-parameters' for more information."
   "Return some frame other than the current frame.
 Create one if necessary.  Note that the minibuffer frame, if separate,
 is not considered (see `next-frame')."
-  (let ((s (if (equal (next-frame (selected-frame)) (selected-frame))
-               (make-frame)
-             (next-frame (selected-frame)))))
-    s))
+  (if (equal (next-frame) (selected-frame)) (make-frame) (next-frame)))
 
 (defun next-multiframe-window ()
   "Select the next window, regardless of which frame it is on."
@@ -875,8 +872,11 @@ If there is no frame by that name, signal an error."
   "The brightness of the background.
 Set this to the symbol `dark' if your background color is dark,
 `light' if your background is light, or nil (automatic by default)
-if you want Emacs to examine the brightness for you.  Don't set this
-variable with `setq'; this won't have the expected effect."
+if you want Emacs to examine the brightness for you.
+
+If you change this without using customize, you should use
+`frame-set-background-mode' to update existing frames;
+e.g. (mapc 'frame-set-background-mode (frame-list))."
   :group 'faces
   :set #'(lambda (var value)
            (set-default var value)
@@ -1278,9 +1278,6 @@ keys and their meanings."
 
 
 ;;;; Frame/display capabilities.
-(defun selected-terminal ()
-  "Return the terminal that is now selected."
-  (frame-terminal (selected-frame)))
 
 (declare-function msdos-mouse-p "dosfns.c")
 
@@ -1448,6 +1445,8 @@ monitor, use `display-monitor-attributes-list'."
 
 (declare-function x-display-backing-store "xfns.c" (&optional terminal))
 
+;; In NS port, the return value may be `buffered', `retained', or
+;; `non-retained'.  See src/nsfns.m.
 (defun display-backing-store (&optional display)
   "Return the backing store capability of DISPLAY's screen.
 The value may be `always', `when-mapped', `not-useful', or nil if
diff --git a/lisp/frameset.el b/lisp/frameset.el
index 63ee9af23fc..53ab0a5f081 100644
--- a/lisp/frameset.el
+++ b/lisp/frameset.el
@@ -41,155 +41,560 @@
 (require 'cl-lib)
 
 
-;; Framesets have two fields:
-;; - properties: a property list to store both frameset-specific and
-;;   user-defined serializable data.  Currently defined properties
-;;   include:
-;;     :version ID  - Identifies the version of the frameset struct;
-;;                    this is the only property always present and
-;;                    must not be modified.
-;;     :app APPINFO - Freeform.  Can be used by applications and
-;;                    packages to indicate the intended (but by no
-;;                    means exclusive) use of the frameset.  For
-;;                    example, currently desktop.el sets :app to
-;;                    `(desktop . ,desktop-file-version).
-;;     :name NAME   - The name of the frameset instance; a string.
-;;     :desc TEXT   - A description for user consumption (to choose
-;;                    among framesets, etc.); a string.
-;; - states: an alist of items (FRAME-PARAMETERS . WINDOW-STATE) in
-;;   no particular order.  Each item represents a frame to be
-;;   restored.
-
-(cl-defstruct (frameset (:type list) :named
-                        (:copier nil)
-                        (:predicate nil))
-  properties   ;; property list
-  states)      ;; list of conses (frame-state . window-state)
-
-(defun copy-frameset (frameset)
-  "Return a copy of FRAMESET.
-This is a deep copy done with `copy-tree'."
+(cl-defstruct (frameset (:type vector) :named
+                        (:constructor frameset--make)
+                        ;; Copier is defined below.
+                        (:copier nil))
+
+  "A frameset encapsulates a serializable view of a set of frames and windows.
+
+It contains the following slots, which can be accessed with
+\(frameset-SLOT fs) and set with (setf (frameset-SLOT fs) VALUE):
+
+  version      A read-only version number, identifying the format
+                 of the frameset struct.  Currently its value is 1.
+  timestamp    A read-only timestamp, the output of `current-time'.
+  app          A symbol, or a list whose first element is a symbol, which
+                 identifies the creator of the frameset and related info;
+                 for example, desktop.el sets this slot to a list
+                 `(desktop . ,desktop-file-version).
+  name         A string, the name of the frameset instance.
+  description  A string, a description for user consumption (to show in
+                 menus, messages, etc).
+  properties   A property list, to store both frameset-specific and
+                 user-defined serializable data.
+  states       A list of items (FRAME-PARAMETERS . WINDOW-STATE), in no
+                 particular order.  Each item represents a frame to be
+                 restored.  FRAME-PARAMETERS is a frame's parameter alist,
+                 extracted with (frame-parameters FRAME) and filtered
+                 through `frameset-filter-params'.
+                 WINDOW-STATE is the output of `window-state-get' applied
+                 to the root window of the frame.
+
+To avoid collisions, it is recommended that applications wanting to add
+private serializable data to `properties' either store all info under a
+single, distinctive name, or use property names with a well-chosen prefix.
+
+A frameset is intended to be used through the following simple API:
+
+ - `frameset-save', the type's constructor, captures all or a subset of the
+   live frames, and returns a serializable snapshot of them (a frameset).
+ - `frameset-restore' takes a frameset, and restores the frames and windows
+   it describes, as faithfully as possible.
+ - `frameset-p' is the predicate for the frameset type.
+ - `frameset-valid-p' checks a frameset's validity.
+ - `frameset-copy' returns a deep copy of a frameset.
+ - `frameset-prop' is a `setf'able accessor for the contents of the
+   `properties' slot.
+ - The `frameset-SLOT' accessors described above."
+
+  (version     1              :read-only t)
+  (timestamp   (current-time) :read-only t)
+  (app         nil)
+  (name        nil)
+  (description nil)
+  (properties  nil)
+  (states      nil))
+
+;; Add nicer docstrings for built-in predicate and accessors.
+(put 'frameset-p 'function-documentation
+     "Return non-nil if OBJECT is a frameset, nil otherwise.\n\n(fn OBJECT)")
+(put 'frameset-version 'function-documentation
+     "Return the version number of FRAMESET.\n
+It is an integer that identifies the format of the frameset struct.
+This slot cannot be modified.\n\n(fn FRAMESET)")
+(put 'frameset-timestamp 'function-documentation
+     "Return the creation timestamp of FRAMESET.\n
+The value is in the format returned by `current-time'.
+This slot cannot be modified.\n\n(fn FRAMESET)")
+(put 'frameset-app 'function-documentation
+     "Return the application identifier for FRAMESET.\n
+The value is either a symbol, like `my-app', or a list
+\(my-app ADDITIONAL-DATA...).\n\n(fn FRAMESET)")
+(put 'frameset-name 'function-documentation
+     "Return the name of FRAMESET (a string).\n\n(fn FRAMESET)")
+(put 'frameset-description 'function-documentation
+     "Return the description of FRAMESET (a string).\n\n(fn FRAMESET)")
+(put 'frameset-properties 'function-documentation
+     "Return the property list of FRAMESET.\n
+This list is useful to store both frameset-specific and user-defined
+serializable data.  The simplest way to access and modify it is
+through `frameset-prop' (which see).\n\n(fn FRAMESET)")
+(put 'frameset-states 'function-documentation
+     "Return the list of frame states of FRAMESET.\n
+A frame state is a pair (FRAME-PARAMETERS . WINDOW-STATE), where
+FRAME-PARAMETERS is a frame's parameter alist, extracted with
+\(frame-parameters FRAME) and filtered through `frameset-filter-params',
+and WINDOW-STATE is the output of `window-state-get' applied to the
+root window of the frame.\n
+IMPORTANT: Modifying this slot may cause frameset functions to fail,
+unless the type constraints defined above are respected.\n\n(fn FRAMESET)")
+
+;; We autoloaded this for use in register.el, but now that we use registerv
+;; objects, this autoload is not useful any more.
+;; ;;;###autoload (autoload 'frameset-p "frameset"
+;; ;;;###autoload   "Return non-nil if OBJECT is a frameset, nil otherwise." nil)
+
+(defun frameset-copy (frameset)
+  "Return a deep copy of FRAMESET.
+FRAMESET is copied with `copy-tree'."
   (copy-tree frameset t))
 
-;;;###autoload
-(defun frameset-p (frameset)
-  "If FRAMESET is a frameset, return its :version.
-Else return nil."
-  (and (eq (car-safe frameset) 'frameset)
-       (plist-get (cl-second frameset) :version)))
+(defun frameset-valid-p (object)
+  "Return non-nil if OBJECT is a valid frameset, nil otherwise."
+  (and (frameset-p object)
+       (integerp (frameset-version object))
+       (consp (frameset-timestamp object))
+       (let ((app (frameset-app object)))
+         (or (null app)                   ; APP is nil
+             (symbolp app)                ; or a symbol
+             (and (consp app)             ; or a list
+                  (symbolp (car app)))))  ; starting with a symbol
+       (stringp (or (frameset-name object) ""))
+       (stringp (or (frameset-description object) ""))
+       (listp (frameset-properties object))
+       (let ((states (frameset-states object)))
+         (and (listp states)
+              (cl-every #'consp (frameset-states object))))
+       (frameset-version object)))        ; And VERSION is non-nil.
+
+(defun frameset--prop-setter (frameset property value)
+  "Setter function for `frameset-prop'.  Internal use only."
+  (setf (frameset-properties frameset)
+        (plist-put (frameset-properties frameset) property value))
+  value)
 
 ;; A setf'able accessor to the frameset's properties
-(defun frameset-prop (frameset prop)
-  "Return the value of the PROP property of FRAMESET.
-
-Properties other than :version can be set with
+(defun frameset-prop (frameset property)
+  "Return the value for FRAMESET of PROPERTY.
 
-  (setf (frameset-prop FRAMESET PROP) NEW-VALUE)"
-  (plist-get (frameset-properties frameset) prop))
+Properties can be set with
 
-(gv-define-setter frameset-prop (val fs prop)
-  (macroexp-let2 nil v val
-    `(progn
-       (cl-assert (not (eq ,prop :version)) t ":version can not be set")
-       (setf (frameset-properties ,fs)
-             (plist-put (frameset-properties ,fs) ,prop ,v))
-       ,v)))
+  (setf (frameset-prop FRAMESET PROPERTY) NEW-VALUE)"
+  (declare (gv-setter frameset--prop-setter))
+  (plist-get (frameset-properties frameset) property))
 
 
 ;; Filtering
 
-(defvar frameset-filter-alist
-  '((background-color    . frameset-filter-sanitize-color)
-    (buffer-list         . t)
-    (buffer-predicate    . t)
-    (buried-buffer-list  . t)
-    (font                . frameset-filter-save-parm)
-    (foreground-color    . frameset-filter-sanitize-color)
-    (fullscreen          . frameset-filter-save-parm)
-    (GUI:font            . frameset-filter-restore-parm)
-    (GUI:fullscreen      . frameset-filter-restore-parm)
-    (GUI:height          . frameset-filter-restore-parm)
-    (GUI:width           . frameset-filter-restore-parm)
-    (height              . frameset-filter-save-parm)
-    (left                . frameset-filter-iconified)
-    (minibuffer          . frameset-filter-minibuffer)
-    (top                 . frameset-filter-iconified)
-    (width               . frameset-filter-save-parm))
+;; What's the deal with these "filter alists"?
+;;
+;; Let's say that Emacs' frame parameters were never designed as a tool to
+;; precisely record (or restore) a frame's state.  They grew organically,
+;; and their uses and behaviors reflect their history.  In using them to
+;; implement framesets, the unwary implementer, or the prospective package
+;; writer willing to use framesets in their code, might fall victim of some
+;; unexpected... oddities.
+;;
+;; You can find frame parameters that:
+;;
+;; - can be used to get and set some data from the frame's current state
+;;   (`height', `width')
+;; - can be set at creation time, and setting them afterwards has no effect
+;;   (`window-state', `minibuffer')
+;; - can be set at creation time, and setting them afterwards will fail with
+;;   an error, *unless* you set it to the same value, a noop (`border-width')
+;; - act differently when passed at frame creation time, and when set
+;;   afterwards (`height')
+;; - affect the value of other parameters (`name', `visibility')
+;; - can be ignored by window managers (most positional args, like `height',
+;;   `width', `left' and `top', and others, like `auto-raise', `auto-lower')
+;; - can be set externally in X resources or Window registry (again, most
+;;   positional parameters, and also `toolbar-lines', `menu-bar-lines' etc.)
+;, - can contain references to live objects (`buffer-list', `minibuffer') or
+;;   code (`buffer-predicate')
+;; - are set automatically, and cannot be changed (`window-id', `parent-id'),
+;;   but setting them produces no error
+;; - have a noticeable effect in some window managers, and are ignored in
+;;   others (`menu-bar-lines')
+;; - can not be safely set in a tty session and then copied back to a GUI
+;;   session (`font', `background-color', `foreground-color')
+;;
+;; etc etc.
+;;
+;; Which means that, in order to save a parameter alist to disk and read it
+;; back later to reconstruct a frame, some processing must be done.  That's
+;; what `frameset-filter-params' and the `frameset-*-filter-alist' variables
+;; are for.
+;;
+;; First, a clarification.  The word "filter" in these names refers to both
+;; common meanings of filter: to filter out (i.e., to remove), and to pass
+;; through a transformation function (think `filter-buffer-substring').
+;;
+;; `frameset-filter-params' takes a parameter alist PARAMETERS, a filtering
+;; alist FILTER-ALIST, and a flag SAVING to indicate whether we are filtering
+;; parameters with the intent of saving a frame or restoring it.  It then
+;; accumulates an output alist, FILTERED, by checking each parameter in
+;; PARAMETERS against FILTER-ALIST and obeying any rule found there.  The
+;; absence of a rule just means the parameter/value pair (called CURRENT in
+;; filtering functions) is copied to FILTERED as is.  Keyword values :save,
+;; :restore and :never tell the function to copy CURRENT to FILTERED in the
+;; respective situations, that is, when saving, restoring, or never at all.
+;; Values :save and :restore are not used in this package, because usually if
+;; you don't want to save a parameter, you don't want to restore it either.
+;; But they can be useful, for example, if you already have a saved frameset
+;; created with some intent, and want to reuse it for a different objective
+;; where the expected parameter list has different requirements.
+;;
+;; Finally, the value can also be a filtering function, or a filtering
+;; function plus some arguments.  The function is called for each matching
+;; parameter, and receives CURRENT (the parameter/value pair being processed),
+;; FILTERED (the output alist so far), PARAMETERS (the full parameter alist),
+;; SAVING (the save/restore flag), plus any additional ARGS set along the
+;; function in the `frameset-*-filter-alist' entry.  The filtering function
+;; then has the possibility to pass along CURRENT, or reject it altogether,
+;; or pass back a (NEW-PARAM . NEW-VALUE) pair, which does not even need to
+;; refer to the same parameter (so you can filter `width' and return `height'
+;; and vice versa, if you're feeling silly and want to mess with the user's
+;; mind).  As a help in deciding what to do, the filtering function has
+;; access to PARAMETERS, but must not change it in any way.  It also has
+;; access to FILTERED, which can be modified at will.  This allows two or
+;; more filters to coordinate themselves, because in general there's no way
+;; to predict the order in which they will be run.
+;;
+;; So, which parameters are filtered by default, and why? Let's see.
+;;
+;; - `buffer-list', `buried-buffer-list', `buffer-predicate': They contain
+;;   references to live objects, or in the case of `buffer-predicate', it
+;;   could also contain an fbound symbol (a predicate function) that could
+;;   not be defined in a later session.
+;;
+;; - `window-id', `outer-window-id', `parent-id': They are assigned
+;;   automatically and cannot be set, so keeping them is harmless, but they
+;;   add clutter.  `window-system' is similar: it's assigned at frame
+;;   creation, and does not serve any useful purpose later.
+;;
+;; - `left', `top': Only problematic when saving an iconified frame, because
+;;   when the frame is iconified they are set to (- 32000), which doesn't
+;;   really help in restoring the frame.  Better to remove them and let the
+;;   window manager choose a default position for the frame.
+;;
+;; - `background-color', `foreground-color': In tty frames they can be set
+;;   to "unspecified-bg" and "unspecified-fg", which aren't understood on
+;;   GUI sessions.  They have to be filtered out when switching from tty to
+;;   a graphical display.
+;;
+;; - `tty', `tty-type': These are tty-specific.  When switching to a GUI
+;;   display they do no harm, but they clutter the parameter alist.
+;;
+;; - `minibuffer': It can contain a reference to a live window, which cannot
+;;   be serialized.  Because of Emacs' idiosyncratic treatment of this
+;;   parameter, frames created with (minibuffer . t) have a parameter
+;;   (minibuffer . #<window...>), while frames created with
+;;   (minibuffer . #<window...>) have (minibuffer . nil), which is madness
+;;   but helps to differentiate between minibufferless and "normal" frames.
+;;   So, changing (minibuffer . #<window...>) to (minibuffer . t) allows
+;;   Emacs to set up the new frame correctly.  Nice, uh?
+;;
+;; - `name': If this parameter is directly set, `explicit-name' is
+;;   automatically set to t, and then `name' no longer changes dynamically.
+;;   So, in general, not saving `name' is the right thing to do, though
+;;   surely there are applications that will want to override this filter.
+;;
+;; - `font', `fullscreen', `height' and `width': These parameters suffer
+;;   from the fact that they are badly mangled when going through a
+;;   tty session, though not all in the same way.  When saving a GUI frame
+;;   and restoring it in a tty, the height and width of the new frame are
+;;   those of the tty screen (let's say 80x25, for example); going back
+;;   to a GUI session means getting frames of the tty screen size (so all
+;;   your frames are 80 cols x 25 rows).  For `fullscreen' there's a
+;;   similar problem, because a tty frame cannot really be fullscreen or
+;;   maximized, so the state is lost.  The problem with `font' is a bit
+;;   different, because a valid GUI font spec in `font' turns into
+;;   (font . "tty") in a tty frame, and when read back into a GUI session
+;;   it fails because `font's value is no longer a valid font spec.
+;;
+;; In most cases, the filtering functions just do the obvious thing: remove
+;; CURRENT when it is meaningless to keep it, or pass a modified copy if
+;; that helps (as in the case of `minibuffer').
+;;
+;; The exception are the parameters in the last set, which should survive
+;; the roundtrip though tty-land.  The answer is to add "stashing
+;; parameters", working in pairs, to shelve the GUI-specific contents and
+;; restore it once we're back in pixel country.  That's what functions
+;; `frameset-filter-shelve-param' and `frameset-filter-unshelve-param' do.
+;;
+;; Basically, if you set `frameset-filter-shelve-param' as the filter for
+;; a parameter P, it will detect when it is restoring a GUI frame into a
+;; tty session, and save P's value in the custom parameter X:P, but only
+;; if X:P does not exist already (so it is not overwritten if you enter
+;; the tty session more than once).  If you're not switching to a tty
+;; frame, the filter just passes CURRENT along.
+;;
+;; The parameter X:P, on the other hand, must have been setup to be
+;; filtered by `frameset-filter-unshelve-param', which unshelves the
+;; value: if we're entering a GUI session, returns P instead of CURRENT,
+;; while in other cases it just passes it along.
+;;
+;; The only additional trick is that `frameset-filter-shelve-param' does
+;; not set P if switching back to GUI and P already has a value, because
+;; it assumes that `frameset-filter-unshelve-param' did set it up.  And
+;; `frameset-filter-unshelve-param', when unshelving P, must look into
+;; FILTERED to determine if P has already been set and if so, modify it;
+;; else just returns P.
+;;
+;; Currently, the value of X in X:P is `GUI', but you can use any prefix,
+;; by passing its symbol as argument in the filter:
+;;
+;;   (my-parameter frameset-filter-shelve-param MYPREFIX)
+;;
+;; instead of
+;;
+;;   (my-parameter . frameset-filter-shelve-param)
+;;
+;; Note that `frameset-filter-unshelve-param' does not need MYPREFIX
+;; because it is available from the parameter name in CURRENT.  Also note
+;; that the colon between the prefix and the parameter name is hardcoded.
+;; The reason is that X:P is quite readable, and that the colon is a
+;; very unusual character in symbol names, other than in initial position
+;; in keywords (emacs -Q has only two such symbols, and one of them is a
+;; URL).  So the probability of a collision with existing or future
+;; symbols is quite insignificant.
+;;
+;; Now, what about the filter alist variables? There are three of them,
+;; though only two sets of parameters:
+;;
+;; - `frameset-session-filter-alist' contains these filters that allow to
+;;   save and restore framesets in-session, without the need to serialize
+;;   the frameset or save it to disk (for example, to save a frameset in a
+;;   register and restore it later).  Filters in this list do not remove
+;;   live objects, except in `minibuffer', which is dealt especially by
+;;   `frameset-save' / `frameset-restore'.
+;;
+;; - `frameset-persistent-filter-alist' is the whole deal.  It does all
+;;   the filtering described above, and the result is ready to be saved on
+;;   disk without loss of information.  That's the format used by the
+;;   desktop.el package, for example.
+;;
+;; IMPORTANT: These variables share structure and should NEVER be modified.
+;;
+;; - `frameset-filter-alist': The value of this variable is the default
+;;   value for the FILTERS arguments of `frameset-save' and
+;;   `frameset-restore'.  It is set to `frameset-persistent-filter-alist',
+;;   though it can be changed by specific applications.
+;;
+;; How to use them?
+;;
+;; The simplest way is just do nothing.  The default should work
+;; reasonably and sensibly enough.  But, what if you really need a
+;; customized filter alist?  Then you can create your own variable
+;;
+;;   (defvar my-filter-alist
+;;     '((my-param1 . :never)
+;;       (my-param2 . :save)
+;;       (my-param3 . :restore)
+;;       (my-param4 . my-filtering-function-without-args)
+;;       (my-param5   my-filtering-function-with arg1 arg2)
+;;       ;;; many other parameters
+;;       )
+;;     "My customized parameter filter alist.")
+;;
+;; or, if you're only changing a few items,
+;;
+;;   (defvar my-filter-alist
+;;     (nconc '((my-param1 . :never)
+;;              (my-param2 . my-filtering-function))
+;;            frameset-filter-alist)
+;;     "My brief customized parameter filter alist.")
+;;
+;; and pass it to the FILTER arg of the save/restore functions,
+;; ALWAYS taking care of not modifying the original lists; if you're
+;; going to do any modifying of my-filter-alist, please use
+;;
+;;   (nconc '((my-param1 . :never) ...)
+;;          (copy-sequence frameset-filter-alist))
+;;
+;; One thing you shouldn't forget is that they are alists, so searching
+;; in them is sequential.  If you just want to change the default of
+;; `name' to allow it to be saved, you can set (name . nil) in your
+;; customized filter alist; it will take precedence over the latter
+;; setting.  In case you decide that you *always* want to save `name',
+;; you can add it to `frameset-filter-alist':
+;;
+;;   (push '(name . nil) frameset-filter-alist)
+;;
+;; In certain applications, having a parameter filtering function like
+;; `frameset-filter-params' can be useful, even if you're not using
+;; framesets.  The interface of `frameset-filter-params' is generic
+;; and does not depend of global state, with one exception: it uses
+;; the internal variable `frameset--target-display' to decide if, and
+;; how, to modify the `display' parameter of FILTERED.  But that
+;; should not represent any problem, because it's only meaningful
+;; when restoring, and customized uses of `frameset-filter-params'
+;; are likely to use their own filter alist and just call
+;;
+;;   (setq my-filtered (frameset-filter-params my-params my-filters t))
+;;
+;; In case you want to use it with the standard filters, you can
+;; wrap the call to `frameset-filter-params' in a let form to bind
+;; `frameset--target-display' to nil or the desired value.
+;;
+
+;;;###autoload
+(defvar frameset-session-filter-alist
+  '((name            . :never)
+    (left            . frameset-filter-iconified)
+    (minibuffer      . frameset-filter-minibuffer)
+    (top             . frameset-filter-iconified))
+  "Minimum set of parameters to filter for live (on-session) framesets.
+DO NOT MODIFY.  See `frameset-filter-alist' for a full description.")
+
+;;;###autoload
+(defvar frameset-persistent-filter-alist
+  (nconc
+   '((background-color   . frameset-filter-sanitize-color)
+     (buffer-list        . :never)
+     (buffer-predicate   . :never)
+     (buried-buffer-list . :never)
+     (font               . frameset-filter-shelve-param)
+     (foreground-color   . frameset-filter-sanitize-color)
+     (fullscreen         . frameset-filter-shelve-param)
+     (GUI:font           . frameset-filter-unshelve-param)
+     (GUI:fullscreen     . frameset-filter-unshelve-param)
+     (GUI:height         . frameset-filter-unshelve-param)
+     (GUI:width          . frameset-filter-unshelve-param)
+     (height             . frameset-filter-shelve-param)
+     (outer-window-id    . :never)
+     (parent-id          . :never)
+     (tty                . frameset-filter-tty-to-GUI)
+     (tty-type           . frameset-filter-tty-to-GUI)
+     (width              . frameset-filter-shelve-param)
+     (window-id          . :never)
+     (window-system      . :never))
+   frameset-session-filter-alist)
+  "Parameters to filter for persistent framesets.
+DO NOT MODIFY.  See `frameset-filter-alist' for a full description.")
+
+;;;###autoload
+(defvar frameset-filter-alist frameset-persistent-filter-alist
   "Alist of frame parameters and filtering functions.
 
-Each element is a cons (PARAM . ACTION), where PARAM is a parameter
-name (a symbol identifying a frame parameter), and ACTION can be:
+This alist is the default value of the FILTERS argument of
+`frameset-save' and `frameset-restore' (which see).
+
+Initially, `frameset-filter-alist' is set to, and shares the value of,
+`frameset-persistent-filter-alist'.  You can override any item in
+this alist by `push'ing a new item onto it.  If, for some reason, you
+intend to modify existing values, do
 
- t         The parameter is always removed from the parameter list.
- :save     The parameter is removed when saving the frame.
- :restore  The parameter is removed when restoring the frame.
+  (setq frameset-filter-alist (copy-tree frameset-filter-alist))
+
+before changing anything.
+
+On saving, PARAMETERS is the parameter alist of each frame processed,
+and FILTERED is the parameter alist that gets saved to the frameset.
+
+On restoring, PARAMETERS is the parameter alist extracted from the
+frameset, and FILTERED is the resulting frame parameter alist used
+to restore the frame.
+
+Elements of `frameset-filter-alist' are conses (PARAM . ACTION),
+where PARAM is a parameter name (a symbol identifying a frame
+parameter), and ACTION can be:
+
+ nil       The parameter is copied to FILTERED.
+ :never    The parameter is never copied to FILTERED.
+ :save     The parameter is copied only when saving the frame.
+ :restore  The parameter is copied only when restoring the frame.
  FILTER    A filter function.
 
 FILTER can be a symbol FILTER-FUN, or a list (FILTER-FUN ARGS...).
-It will be called with four arguments CURRENT, FILTERED, PARAMETERS
-and SAVING, plus any additional ARGS:
+FILTER-FUN is invoked with
+
+  (apply FILTER-FUN CURRENT FILTERED PARAMETERS SAVING ARGS)
+
+where
 
  CURRENT     A cons (PARAM . VALUE), where PARAM is the one being
-             filtered and VALUE is its current value.
- FILTERED    The alist of parameters filtered so far.
+             filtered and VALUE is its current value.
+ FILTERED    The resulting alist (so far).
  PARAMETERS  The complete alist of parameters being filtered,
- SAVING      Non-nil if filtering before saving state, nil otherwise.
+ SAVING      Non-nil if filtering before saving state, nil if filtering
+               before restoring it.
+ ARGS        Any additional arguments specified in the ACTION.
+
+FILTER-FUN is allowed to modify items in FILTERED, but no other arguments.
+It must return:
+ nil                      Skip CURRENT (do not add it to FILTERED).
+ t                        Add CURRENT to FILTERED as is.
+ (NEW-PARAM . NEW-VALUE)  Add this to FILTERED instead of CURRENT.
 
-The FILTER-FUN function must return:
- nil                  CURRENT is removed from the list.
- t                    CURRENT is left as is.
- (PARAM' . VALUE')    Replace CURRENT with this.
+Frame parameters not on this alist are passed intact, as if they were
+defined with ACTION = nil.")
 
-Frame parameters not on this list are passed intact.")
 
 (defvar frameset--target-display nil
   ;; Either (minibuffer . VALUE) or nil.
   ;; This refers to the current frame config being processed inside
-  ;; `frame--restore-frames' and its auxiliary functions (like filtering).
+  ;; `frameset-restore' and its auxiliary functions (like filtering).
   ;; If nil, there is no need to change the display.
   ;; If non-nil, display parameter to use when creating the frame.
   "Internal use only.")
 
 (defun frameset-switch-to-gui-p (parameters)
   "True when switching to a graphic display.
-Return t if PARAMETERS describes a text-only terminal and
-the target is a graphic display; otherwise return nil.
-Only meaningful when called from a filtering function in
-`frameset-filter-alist'."
-  (and frameset--target-display                     ; we're switching
-       (null (cdr (assq 'display parameters)))      ; from a tty
-       (cdr frameset--target-display)))             ; to a GUI display
+Return non-nil if the parameter alist PARAMETERS describes a frame on a
+text-only terminal, and the frame is being restored on a graphic display;
+otherwise return nil.  Only meaningful when called from a filtering
+function in `frameset-filter-alist'."
+  (and frameset--target-display                   ; we're switching
+       (null (cdr (assq 'display parameters)))    ; from a tty
+       (cdr frameset--target-display)))           ; to a GUI display
 
 (defun frameset-switch-to-tty-p (parameters)
   "True when switching to a text-only terminal.
-Return t if PARAMETERS describes a graphic display and
-the target is a text-only terminal; otherwise return nil.
-Only meaningful when called from a filtering function in
-`frameset-filter-alist'."
-  (and frameset--target-display                   ; we're switching
-       (cdr (assq 'display parameters))           ; from a GUI display
-       (null (cdr frameset--target-display))))    ; to a tty
+Return non-nil if the parameter alist PARAMETERS describes a frame on a
+graphic display, and the frame is being restored on a text-only terminal;
+otherwise return nil.  Only meaningful when called from a filtering
+function in `frameset-filter-alist'."
+  (and frameset--target-display                   ; we're switching
+       (cdr (assq 'display parameters))           ; from a GUI display
+       (null (cdr frameset--target-display))))    ; to a tty
+
+(defun frameset-filter-tty-to-GUI (_current _filtered parameters saving)
+  "Remove CURRENT when switching from tty to a graphic display.
+
+For the meaning of CURRENT, FILTERED, PARAMETERS and SAVING,
+see `frameset-filter-alist'."
+  (or saving
+      (not (frameset-switch-to-gui-p parameters))))
 
 (defun frameset-filter-sanitize-color (current _filtered parameters saving)
   "When switching to a GUI frame, remove \"unspecified\" colors.
-Useful as a filter function for tty-specific parameters."
+Useful as a filter function for tty-specific parameters.
+
+For the meaning of CURRENT, FILTERED, PARAMETERS and SAVING,
+see `frameset-filter-alist'."
   (or saving
       (not (frameset-switch-to-gui-p parameters))
       (not (stringp (cdr current)))
       (not (string-match-p "^unspecified-[fb]g$" (cdr current)))))
 
-(defun frameset-filter-minibuffer (current _filtered _parameters saving)
-  "When saving, convert (minibuffer . #<window>) parameter to (minibuffer . t)."
-  (or (not saving)
-      (if (windowp (cdr current))
-          '(minibuffer . t)
-        t)))
+(defun frameset-filter-minibuffer (current filtered _parameters saving)
+  "Force the minibuffer parameter to have a sensible value.
+
+When saving, convert (minibuffer . #<window>) to (minibuffer . t).
+When restoring, if there are two copies, keep the one pointing to
+a live window.
+
+For the meaning of CURRENT, FILTERED, PARAMETERS and SAVING,
+see `frameset-filter-alist'."
+  (let ((value (cdr current)) mini)
+    (cond (saving
+           (if (windowp value) '(minibuffer . t) t))
+          ((setq mini (assq 'minibuffer filtered))
+           (when (windowp value) (setcdr mini value))
+           nil)
+          (t t))))
 
-(defun frameset-filter-save-parm (current _filtered parameters saving
-                                          &optional prefix)
+(defun frameset-filter-shelve-param (current _filtered parameters saving
+                                             &optional prefix)
   "When switching to a tty frame, save parameter P as PREFIX:P.
-The parameter can be later restored with `frameset-filter-restore-parm'.
-PREFIX defaults to `GUI'."
+The parameter can be later restored with `frameset-filter-unshelve-param'.
+PREFIX defaults to `GUI'.
+
+For the meaning of CURRENT, FILTERED, PARAMETERS and SAVING,
+see `frameset-filter-alist'."
   (unless prefix (setq prefix 'GUI))
   (cond (saving t)
         ((frameset-switch-to-tty-p parameters)
@@ -201,9 +606,12 @@ PREFIX defaults to `GUI'."
          (not (assq (intern (format "%s:%s" prefix (car current))) parameters)))
         (t t)))
 
-(defun frameset-filter-restore-parm (current filtered parameters saving)
+(defun frameset-filter-unshelve-param (current filtered parameters saving)
   "When switching to a GUI frame, restore PREFIX:P parameter as P.
-CURRENT must be of the form (PREFIX:P . value)."
+CURRENT must be of the form (PREFIX:P . value).
+
+For the meaning of CURRENT, FILTERED, PARAMETERS and SAVING,
+see `frameset-filter-alist'."
   (or saving
       (not (frameset-switch-to-gui-p parameters))
       (let* ((prefix:p (symbol-name (car current)))
@@ -218,38 +626,40 @@ CURRENT must be of the form (PREFIX:P . value)."
 
 (defun frameset-filter-iconified (_current _filtered parameters saving)
   "Remove CURRENT when saving an iconified frame.
-This is used for positions parameters `left' and `top', which are
+This is used for positional parameters `left' and `top', which are
 meaningless in an iconified frame, so the frame is restored in a
-default position."
-  (not (and saving (eq (cdr (assq 'visibility parameters)) 'icon))))
+default position.
 
-(defun frameset-keep-original-display-p (force-display)
-  "True if saved frames' displays should be honored."
-  (cond ((daemonp) t)
-        ((eq system-type 'windows-nt) nil)
-        (t (null force-display))))
+For the meaning of CURRENT, FILTERED, PARAMETERS and SAVING,
+see `frameset-filter-alist'."
+  (not (and saving (eq (cdr (assq 'visibility parameters)) 'icon))))
 
 (defun frameset-filter-params (parameters filter-alist saving)
-  "Filter parameter list PARAMETERS and return a filtered list.
+  "Filter parameter alist PARAMETERS and return a filtered alist.
 FILTER-ALIST is an alist of parameter filters, in the format of
 `frameset-filter-alist' (which see).
 SAVING is non-nil while filtering parameters to save a frameset,
 nil while the filtering is done to restore it."
   (let ((filtered nil))
     (dolist (current parameters)
+      ;; When saving, the parameter alist is temporary, so modifying it
+      ;; is not a problem.  When restoring, the parameter alist is part
+      ;; of a frameset, so we must copy parameters to avoid inadvertent
+      ;; modifications.
       (pcase (cdr (assq (car current) filter-alist))
         (`nil
-         (push current filtered))
-        (`t
+         (push (if saving current (copy-tree current)) filtered))
+        (:never
          nil)
-        (:save
-         (unless saving (push current filtered)))
         (:restore
+         (unless saving (push (copy-tree current) filtered)))
+        (:save
          (when saving (push current filtered)))
         ((or `(,fun . ,args) (and fun (pred fboundp)))
-         (let ((this (apply fun current filtered parameters saving args)))
-           (when this
-             (push (if (eq this t) current this) filtered))))
+         (let* ((this (apply fun current filtered parameters saving args))
+                (val (if (eq this t) current this)))
+           (when val
+             (push (if saving val (copy-tree val)) filtered))))
         (other
          (delay-warning 'frameset (format "Unknown filter %S" other) :error))))
     ;; Set the display parameter after filtering, so that filter functions
@@ -262,21 +672,48 @@ nil while the filtering is done to restore it."
     filtered))
 
 
-;; Saving framesets
+;; Frame ids
 
 (defun frameset--set-id (frame)
-  "Set FRAME's `frameset-id' if not yet set.
+  "Set FRAME's id if not yet set.
 Internal use only."
-  (unless (frame-parameter frame 'frameset-id)
+  (unless (frame-parameter frame 'frameset--id)
     (set-frame-parameter frame
-                         'frameset-id
+                         'frameset--id
                          (mapconcat (lambda (n) (format "%04X" n))
                                     (cl-loop repeat 4 collect (random 65536))
                                     "-"))))
+;;;###autoload
+(defun frameset-frame-id (frame)
+  "Return the frame id of FRAME, if it has one; else, return nil.
+A frame id is a string that uniquely identifies a frame.
+It is persistent across `frameset-save' / `frameset-restore'
+invocations, and once assigned is never changed unless the same
+frame is duplicated (via `frameset-restore'), in which case the
+newest frame keeps the id and the old frame's is set to nil."
+  (frame-parameter frame 'frameset--id))
+
+;;;###autoload
+(defun frameset-frame-id-equal-p (frame id)
+  "Return non-nil if FRAME's id matches ID."
+  (string= (frameset-frame-id frame) id))
+
+;;;###autoload
+(defun frameset-frame-with-id (id &optional frame-list)
+  "Return the live frame with id ID, if exists; else nil.
+If FRAME-LIST is a list of frames, check these frames only.
+If nil, check all live frames."
+  (cl-find-if (lambda (f)
+                (and (frame-live-p f)
+                     (frameset-frame-id-equal-p f id)))
+              (or frame-list (frame-list))))
+
+
+;; Saving framesets
 
-(defun frameset--process-minibuffer-frames (frame-list)
+(defun frameset--record-minibuffer-relationships (frame-list)
   "Process FRAME-LIST and record minibuffer relationships.
-FRAME-LIST is a list of frames."
+FRAME-LIST is a list of frames.  Internal use only."
   ;; Record frames with their own minibuffer
   (dolist (frame (minibuffer-frame-list))
     (when (memq frame frame-list)
@@ -291,73 +728,106 @@ FRAME-LIST is a list of frames."
   (dolist (frame frame-list)
     (unless (frame-parameter frame 'frameset--mini)
       (frameset--set-id frame)
-      (let* ((mb-frame (window-frame (minibuffer-window frame)))
-             (id (and mb-frame (frame-parameter mb-frame 'frameset-id))))
-        (if (null id)
-            (error "Minibuffer frame %S for %S is excluded" mb-frame frame)
-          ;; For minibufferless frames, frameset--mini is a cons
-          ;; (nil . FRAME-ID), where FRAME-ID is the frameset-id of
-          ;; the frame containing its minibuffer window.
-          (set-frame-parameter frame
-                               'frameset--mini
-                               (cons nil id)))))))
+      (let ((mb-frame (window-frame (minibuffer-window frame))))
+        ;; For minibufferless frames, frameset--mini is a cons
+        ;; (nil . FRAME-ID), where FRAME-ID is the frameset--id of
+        ;; the frame containing its minibuffer window.
+        ;; FRAME-ID can be set to nil, if FRAME-LIST doesn't contain
+        ;; the minibuffer frame of a minibufferless frame; we allow
+        ;; it without trying to second-guess the user.
+        (set-frame-parameter frame
+                             'frameset--mini
+                             (cons nil
+                                   (and mb-frame
+                                        (frameset-frame-id mb-frame))))))))
 
 ;;;###autoload
-(cl-defun frameset-save (frame-list &key filters predicate properties)
-  "Return the frameset of FRAME-LIST, a list of frames.
-If nil, FRAME-LIST defaults to all live frames.
-FILTERS is an alist of parameter filters; defaults to `frameset-filter-alist'.
+(cl-defun frameset-save (frame-list
+                         &key app name description
+                              filters predicate properties)
+  "Return a frameset for FRAME-LIST, a list of frames.
+Dead frames and non-frame objects are silently removed from the list.
+If nil, FRAME-LIST defaults to the output of `frame-list' (all live frames).
+APP, NAME and DESCRIPTION are optional data; see the docstring of the
+`frameset' defstruct for details.
+FILTERS is an alist of parameter filters; if nil, the value of the variable
+`frameset-filter-alist' is used instead.
 PREDICATE is a predicate function, which must return non-nil for frames that
-should be saved; it defaults to saving all frames from FRAME-LIST.
+should be saved; if PREDICATE is nil, all frames from FRAME-LIST are saved.
 PROPERTIES is a user-defined property list to add to the frameset."
-  (let ((frames (cl-delete-if-not #'frame-live-p
-                                  (cl-delete-if-not (or predicate #'framep)
-                                                    (or (copy-sequence frame-list)
-                                                        (frame-list))))))
-    (frameset--process-minibuffer-frames frames)
-    (make-frameset :properties (append '(:version 1) properties)
-                   :states (mapcar
-                            (lambda (frame)
-                              (cons
-                               (frameset-filter-params (frame-parameters frame)
-                                                       (or filters
-                                                           frameset-filter-alist)
-                                                       t)
-                               (window-state-get (frame-root-window frame) t)))
-                            frames))))
+  (let* ((list (or (copy-sequence frame-list) (frame-list)))
+         (frames (cl-delete-if-not #'frame-live-p
+                                   (if predicate
+                                       (cl-delete-if-not predicate list)
+                                     list)))
+         fs)
+    (frameset--record-minibuffer-relationships frames)
+    (setq fs (frameset--make
+              :app app
+              :name name
+              :description description
+              :properties properties
+              :states (mapcar
+                       (lambda (frame)
+                         (cons
+                          (frameset-filter-params (frame-parameters frame)
+                                                  (or filters
+                                                      frameset-filter-alist)
+                                                  t)
+                          (window-state-get (frame-root-window frame) t)))
+                       frames)))
+    (cl-assert (frameset-valid-p fs))
+    fs))
 
 
 ;; Restoring framesets
 
 (defvar frameset--reuse-list nil
-  "Internal use only.")
-
-(defun frameset--compute-pos (value left/top right/bottom)
+  "The list of frames potentially reusable.
+Its value is only meaningful during execution of `frameset-restore'.
+Internal use only.")
+
+(defun frameset-compute-pos (value left/top right/bottom)
+  "Return an absolute positioning value for a frame.
+VALUE is the value of a positional frame parameter (`left' or `top').
+If VALUE is relative to the screen edges (like (+ -35) or (-200), it is
+converted to absolute by adding it to the corresponding edge; if it is
+an absolute position, it is returned unmodified.
+LEFT/TOP and RIGHT/BOTTOM indicate the dimensions of the screen in
+pixels along the relevant direction: either the position of the left
+and right edges for a `left' positional parameter, or the position of
+the top and bottom edges for a `top' parameter."
   (pcase value
     (`(+ ,val) (+ left/top val))
     (`(- ,val) (+ right/bottom val))
     (val val)))
 
-(defun frameset--move-onscreen (frame force-onscreen)
+(defun frameset-move-onscreen (frame force-onscreen)
   "If FRAME is offscreen, move it back onscreen and, if necessary, resize it.
 For the description of FORCE-ONSCREEN, see `frameset-restore'.
 When forced onscreen, frames wider than the monitor's workarea are converted
 to fullwidth, and frames taller than the workarea are converted to fullheight.
-NOTE: This only works for non-iconified frames.  Internal use only."
+NOTE: This only works for non-iconified frames."
   (pcase-let* ((`(,left ,top ,width ,height) (cl-cdadr (frame-monitor-attributes frame)))
-               (right (+ left width -1))
-               (bottom (+ top height -1))
-               (fr-left (frameset--compute-pos (frame-parameter frame 'left) left right))
-               (fr-top (frameset--compute-pos (frame-parameter frame 'top) top bottom))
+               (right (+ left width -1))
+               (bottom (+ top height -1))
+               (fr-left (frameset-compute-pos (frame-parameter frame 'left) left right))
+               (fr-top (frameset-compute-pos (frame-parameter frame 'top) top bottom))
                (ch-width (frame-char-width frame))
                (ch-height (frame-char-height frame))
-               (fr-width (max (frame-pixel-width frame) (* ch-width (frame-width frame))))
-               (fr-height (max (frame-pixel-height frame) (* ch-height (frame-height frame))))
-               (fr-right (+ fr-left fr-width -1))
-               (fr-bottom (+ fr-top fr-height -1)))
+               (fr-width (max (frame-pixel-width frame) (* ch-width (frame-width frame))))
+               (fr-height (max (frame-pixel-height frame) (* ch-height (frame-height frame))))
+               (fr-right (+ fr-left fr-width -1))
+               (fr-bottom (+ fr-top fr-height -1)))
     (when (pcase force-onscreen
+            ;; A predicate.
+            ((pred functionp)
+             (funcall force-onscreen
+                      frame
+                      (list fr-left fr-top fr-width fr-height)
+                      (list left top width height)))
             ;; Any corner is outside the screen.
-            (`all (or (< fr-bottom top)  (> fr-bottom bottom)
+            (:all (or (< fr-bottom top)  (> fr-bottom bottom)
                       (< fr-left   left) (> fr-left   right)
                       (< fr-right  left) (> fr-right  right)
                       (< fr-top    top)  (> fr-top    bottom)))
@@ -396,7 +866,7 @@ NOTE: This only works for non-iconified frames.  Internal use only."
         (when params
           (modify-frame-parameters frame params))))))
 
-(defun frameset--find-frame (predicate display &rest args)
+(defun frameset--find-frame-if (predicate display &rest args)
   "Find a frame in `frameset--reuse-list' satisfying PREDICATE.
 Look through available frames whose display property matches DISPLAY
 and return the first one for which (PREDICATE frame ARGS) returns t.
@@ -407,10 +877,10 @@ If PREDICATE is nil, it is always satisfied.  Internal use only."
                          (apply predicate frame args))))
               frameset--reuse-list))
 
-(defun frameset--reuse-frame (display frame-cfg)
-  "Look for an existing frame to reuse.
-DISPLAY is the display where the frame will be shown, and FRAME-CFG
-is the parameter list of the frame being restored.  Internal use only."
+(defun frameset--reuse-frame (display parameters)
+  "Return an existing frame to reuse, or nil if none found.
+DISPLAY is the display where the frame will be shown, and PARAMETERS
+is the parameter alist of the frame being restored.  Internal use only."
   (let ((frame nil)
         mini)
     ;; There are no fancy heuristics there.  We could implement some
@@ -423,19 +893,19 @@ is the parameter list of the frame being restored.  Internal use only."
     ;; will usually have only one frame, and should already work.
     (cond ((null display)
            ;; When the target is tty, every existing frame is reusable.
-           (setq frame (frameset--find-frame nil display)))
-          ((car (setq mini (cdr (assq 'frameset--mini frame-cfg))))
+           (setq frame (frameset--find-frame-if nil display)))
+          ((car (setq mini (cdr (assq 'frameset--mini parameters))))
            ;; If the frame has its own minibuffer, let's see whether
            ;; that frame has already been loaded (which can happen after
            ;; M-x desktop-read).
-           (setq frame (frameset--find-frame
+           (setq frame (frameset--find-frame-if
                         (lambda (f id)
-                          (string= (frame-parameter f 'frameset-id) id))
-                        display (cdr mini)))
+                          (frameset-frame-id-equal-p f id))
+                        display (cdr (assq 'frameset--id parameters))))
            ;; If it has not been loaded, and it is not a minibuffer-only frame,
            ;; let's look for an existing non-minibuffer-only frame to reuse.
-           (unless (or frame (eq (cdr (assq 'minibuffer frame-cfg)) 'only))
-             (setq frame (frameset--find-frame
+           (unless (or frame (eq (cdr (assq 'minibuffer parameters)) 'only))
+             (setq frame (frameset--find-frame-if
                           (lambda (f)
                             (let ((w (frame-parameter f 'minibuffer)))
                               (and (window-live-p w)
@@ -445,29 +915,40 @@ is the parameter list of the frame being restored.  Internal use only."
           (mini
            ;; For minibufferless frames, check whether they already exist,
            ;; and that they are linked to the right minibuffer frame.
-           (setq frame (frameset--find-frame
-                        (lambda (f id mini-id)
-                          (and (string= (frame-parameter f 'frameset-id) id)
-                               (string= (frame-parameter (window-frame (minibuffer-window f))
-                                                         'frameset-id)
-                                        mini-id)))
-                        display (cdr (assq 'frameset-id frame-cfg)) (cdr mini))))
+           (setq frame (frameset--find-frame-if
+                        (lambda (f id mini-id)
+                          (and (frameset-frame-id-equal-p f id)
+                               (or (null mini-id) ; minibuffer frame not saved
+                                   (frameset-frame-id-equal-p
+                                    (window-frame (minibuffer-window f))
+                                    mini-id))))
+                        display
+                        (cdr (assq 'frameset--id parameters)) (cdr mini))))
           (t
            ;; Default to just finding a frame in the same display.
-           (setq frame (frameset--find-frame nil display))))
+           (setq frame (frameset--find-frame-if nil display))))
     ;; If found, remove from the list.
     (when frame
       (setq frameset--reuse-list (delq frame frameset--reuse-list)))
     frame))
 
-(defun frameset--get-frame (frame-cfg window-cfg filters force-onscreen)
+(defun frameset--initial-params (parameters)
+  "Return a list of PARAMETERS that must be set when creating the frame.
+Setting position and size parameters as soon as possible helps reducing
+flickering; other parameters, like `minibuffer' and `border-width', can
+not be changed once the frame has been created.  Internal use only."
+  (cl-loop for param in '(left top with height border-width minibuffer)
+           collect (assq param parameters)))
+
+(defun frameset--restore-frame (parameters window-state filters force-onscreen)
   "Set up and return a frame according to its saved state.
 That means either reusing an existing frame or creating one anew.
-FRAME-CFG is the frame's parameter list; WINDOW-CFG is its window state.
-For the meaning of FORCE-ONSCREEN, see `frameset-restore'."
-  (let* ((fullscreen (cdr (assq 'fullscreen frame-cfg)))
-         (lines (assq 'tool-bar-lines frame-cfg))
-         (filtered-cfg (frameset-filter-params frame-cfg filters nil))
+PARAMETERS is the frame's parameter alist; WINDOW-STATE is its window state.
+For the meaning of FILTERS and FORCE-ONSCREEN, see `frameset-restore'.
+Internal use only."
+  (let* ((fullscreen (cdr (assq 'fullscreen parameters)))
+         (lines (assq 'tool-bar-lines parameters))
+         (filtered-cfg (frameset-filter-params parameters filters nil))
          (display (cdr (assq 'display filtered-cfg))) ;; post-filtering
          alt-cfg frame)
 
@@ -502,14 +983,12 @@ For the meaning of FORCE-ONSCREEN, see `frameset-restore'."
     ;; If a frame needs to be created and it falls partially or fully offscreen,
     ;; sometimes it gets "pushed back" onscreen; however, moving it afterwards is
     ;; allowed.  So we create the frame as invisible and then reapply the full
-    ;; parameter list (including position and size parameters).
+    ;; parameter alist (including position and size parameters).
     (setq frame (or (and frameset--reuse-list
                          (frameset--reuse-frame display filtered-cfg))
                     (make-frame-on-display display
                                            (cons '(visibility)
-                                                 (cl-loop
-                                                  for param in '(left top width height minibuffer)
-                                                  collect (assq param filtered-cfg))))))
+                                                 (frameset--initial-params filtered-cfg)))))
     (modify-frame-parameters frame
                              (if (eq (frame-parameter frame 'fullscreen) fullscreen)
                                  ;; Workaround for bug#14949
@@ -521,76 +1000,102 @@ For the meaning of FORCE-ONSCREEN, see `frameset-restore'."
                ;; FIXME: iconified frames should be checked too,
                ;; but it is impossible without deiconifying them.
                (not (eq (frame-parameter frame 'visibility) 'icon)))
-      (frameset--move-onscreen frame force-onscreen))
+      (frameset-move-onscreen frame force-onscreen))
 
     ;; Let's give the finishing touches (visibility, tool-bar, maximization).
     (when lines (push lines alt-cfg))
     (when alt-cfg (modify-frame-parameters frame alt-cfg))
     ;; Now restore window state.
-    (window-state-put window-cfg (frame-root-window frame) 'safe)
+    (window-state-put window-state (frame-root-window frame) 'safe)
     frame))
 
-(defun frameset--sort-states (state1 state2)
-  "Predicate to sort frame states in a suitable order to be created.
-It sorts minibuffer-owning frames before minibufferless ones."
+(defun frameset--minibufferless-last-p (state1 state2)
+  "Predicate to sort frame states in an order suitable for creating frames.
+It sorts minibuffer-owning frames before minibufferless ones.
+Internal use only."
   (pcase-let ((`(,hasmini1 ,id-def1) (assq 'frameset--mini (car state1)))
               (`(,hasmini2 ,id-def2) (assq 'frameset--mini (car state2))))
     (cond ((eq id-def1 t) t)
           ((eq id-def2 t) nil)
           ((not (eq hasmini1 hasmini2)) (eq hasmini1 t))
-          ((eq hasmini1 nil) (string< id-def1 id-def2))
+          ((eq hasmini1 nil) (or id-def1 id-def2))
           (t t))))
 
-(defun frameset-sort-frames-for-deletion (frame1 _frame2)
-  "Predicate to sort live frames for deletion.
-Minibufferless frames must go first to avoid errors when attempting
-to delete a frame whose minibuffer window is used by another frame."
+(defun frameset-keep-original-display-p (force-display)
+  "True if saved frames' displays should be honored.
+For the meaning of FORCE-DISPLAY, see `frameset-restore'."
+  (cond ((daemonp) t)
+        ((eq system-type 'windows-nt) nil) ;; Does ns support more than one display?
+        (t (not force-display))))
+
+(defun frameset-minibufferless-first-p (frame1 _frame2)
+  "Predicate to sort minibufferless frames before other frames."
   (not (frame-parameter frame1 'minibuffer)))
 
 ;;;###autoload
-(cl-defun frameset-restore (frameset &key filters reuse-frames force-display force-onscreen)
+(cl-defun frameset-restore (frameset
+                            &key predicate filters reuse-frames
+                                 force-display force-onscreen)
   "Restore a FRAMESET into the current display(s).
 
-FILTERS is an alist of parameter filters; defaults to `frameset-filter-alist'.
+PREDICATE is a function called with two arguments, the parameter alist
+and the window-state of the frame being restored, in that order (see
+the docstring of the `frameset' defstruct for additional details).
+If PREDICATE returns nil, the frame described by that parameter alist
+and window-state is not restored.
 
-REUSE-FRAMES describes how to reuse existing frames while restoring a frameset:
-  t       Reuse any existing frame if possible; delete leftover frames.
-  nil     Restore frameset in new frames and delete existing frames.
-  keep    Restore frameset in new frames and keep the existing ones.
-  LIST    A list of frames to reuse; only these will be reused, if possible,
-            and any leftover one will be deleted; other frames not on this
-            list will be kept.
+FILTERS is an alist of parameter filters; if nil, the value of
+`frameset-filter-alist' is used instead.
+
+REUSE-FRAMES selects the policy to use to reuse frames when restoring:
+  t        Reuse existing frames if possible, and delete those not reused.
+  nil      Restore frameset in new frames and delete existing frames.
+  :keep    Restore frameset in new frames and keep the existing ones.
+  LIST     A list of frames to reuse; only these are reused (if possible).
+             Remaining frames in this list are deleted; other frames not
+             included on the list are left untouched.
 
 FORCE-DISPLAY can be:
-  t       Frames will be restored in the current display.
-  nil     Frames will be restored, if possible, in their original displays.
-  delete  Frames in other displays will be deleted instead of restored.
+  t        Frames are restored in the current display.
+  nil      Frames are restored, if possible, in their original displays.
+  :delete  Frames in other displays are deleted instead of restored.
+  PRED     A function called with two arguments, the parameter alist and
+             the window state (in that order).  It must return t, nil or
+             `:delete', as above but affecting only the frame that will
+             be created from that parameter alist.
 
 FORCE-ONSCREEN can be:
-  all     Force onscreen any frame fully or partially offscreen.
-  t       Force onscreen only those frames that are fully offscreen.
-  nil     Do not force any frame back onscreen.
+  t        Force onscreen only those frames that are fully offscreen.
+  nil      Do not force any frame back onscreen.
+  :all     Force onscreen any frame fully or partially offscreen.
+  PRED     A function called with three arguments,
+           - the live frame just restored,
+           - a list (LEFT TOP WIDTH HEIGHT), describing the frame,
+           - a list (LEFT TOP WIDTH HEIGHT), describing the workarea.
+           It must return non-nil to force the frame onscreen, nil otherwise.
+
+Note the timing and scope of the operations described above: REUSE-FRAMES
+affects existing frames; PREDICATE, FILTERS and FORCE-DISPLAY affect the frame
+being restored before that happens; and FORCE-ONSCREEN affects the frame once
+it has been restored.
 
-All keywords default to nil."
+All keyword parameters default to nil."
 
-  (cl-assert (frameset-p frameset))
+  (cl-assert (frameset-valid-p frameset))
 
-  (let* ((delete-saved (eq force-display 'delete))
-         (forcing (not (frameset-keep-original-display-p force-display)))
-         (target (and forcing (cons 'display (frame-parameter nil 'display))))
-         other-frames)
+  (let (other-frames)
 
     ;; frameset--reuse-list is a list of frames potentially reusable.  Later we
     ;; will decide which ones can be reused, and how to deal with any leftover.
     (pcase reuse-frames
-      ((or `nil `keep)
+      ((or `nil `:keep)
        (setq frameset--reuse-list nil
              other-frames (frame-list)))
       ((pred consp)
        (setq frameset--reuse-list (copy-sequence reuse-frames)
              other-frames (cl-delete-if (lambda (frame)
-                                           (memq frame frameset--reuse-list))
-                                         (frame-list))))
+                                          (memq frame frameset--reuse-list))
+                                        (frame-list))))
       (_
        (setq frameset--reuse-list (frame-list)
              other-frames nil)))
@@ -598,96 +1103,140 @@ All keywords default to nil."
     ;; Sort saved states to guarantee that minibufferless frames will be created
     ;; after the frames that contain their minibuffer windows.
     (dolist (state (sort (copy-sequence (frameset-states frameset))
-                         #'frameset--sort-states))
-      (condition-case-unless-debug err
-          (pcase-let* ((`(,frame-cfg . ,window-cfg) state)
-                       ((and d-mini `(,hasmini . ,mb-id))
-                        (cdr (assq 'frameset--mini frame-cfg)))
-                       (default (and (booleanp mb-id) mb-id))
-                       (frame nil) (to-tty nil))
-            ;; Only set target if forcing displays and the target display is different.
-            (if (or (not forcing)
-                    (equal target (or (assq 'display frame-cfg) '(display . nil))))
-                (setq frameset--target-display nil)
-              (setq frameset--target-display target
-                    to-tty (null (cdr target))))
-            ;; If keeping non-reusable frames, and the frame-id of one of them
-            ;; matches the frame-id of a frame being restored (because, for example,
-            ;; the frameset has already been read in the same session), remove the
-            ;; frame-id from the non-reusable frame, which is not useful anymore.
-            (when (and other-frames
-                       (or (eq reuse-frames 'keep) (consp reuse-frames)))
-              (let ((dup (cl-find (cdr (assq 'frameset-frame-id frame-cfg))
-                                  other-frames
-                                  :key (lambda (frame)
-                                         (frame-parameter frame 'frameset-frame-id))
-                                  :test #'string=)))
-                (when dup
-                  (set-frame-parameter dup 'frameset-frame-id nil))))
-            ;; Time to restore frames and set up their minibuffers as they were.
-            ;; We only skip a frame (thus deleting it) if either:
-            ;; - we're switching displays, and the user chose the option to delete, or
-            ;; - we're switching to tty, and the frame to restore is minibuffer-only.
-            (unless (and frameset--target-display
-                         (or delete-saved
-                             (and to-tty
-                                  (eq (cdr (assq 'minibuffer frame-cfg)) 'only))))
-
-              ;; Restore minibuffers.  Some of this stuff could be done in a filter
-              ;; function, but it would be messy because restoring minibuffers affects
-              ;; global state; it's best to do it here than add a bunch of global
-              ;; variables to pass info back-and-forth to/from the filter function.
-              (cond
-               ((null d-mini)) ;; No frameset--mini.  Process as normal frame.
-               (to-tty) ;; Ignore minibuffer stuff and process as normal frame.
-               (hasmini ;; Frame has minibuffer (or it is minibuffer-only).
-                (when (eq (cdr (assq 'minibuffer frame-cfg)) 'only)
-                  (setq frame-cfg (append '((tool-bar-lines . 0) (menu-bar-lines . 0))
-                                          frame-cfg))))
-               (t ;; Frame depends on other frame's minibuffer window.
-                (let* ((mb-frame (or (cl-find-if
-                                      (lambda (f)
-                                        (string= (frame-parameter f 'frameset-id)
-                                                 mb-id))
-                                      (frame-list))
-                                     (error "Minibuffer frame %S not found" mb-id)))
-                       (mb-param (assq 'minibuffer frame-cfg))
-                       (mb-window (minibuffer-window mb-frame)))
-                  (unless (and (window-live-p mb-window)
-                               (window-minibuffer-p mb-window))
-                    (error "Not a minibuffer window %s" mb-window))
-                  (if mb-param
-                      (setcdr mb-param mb-window)
-                    (push (cons 'minibuffer mb-window) frame-cfg))))))
-            ;; OK, we're ready at last to create (or reuse) a frame and
-            ;; restore the window config.
-            (setq frame (frameset--get-frame frame-cfg window-cfg
-                                             (or filters frameset-filter-alist)
-                                             force-onscreen))
-            ;; Set default-minibuffer if required.
-            (when default (setq default-minibuffer-frame frame)))
-        (error
-         (delay-warning 'frameset (error-message-string err) :error))))
+                         #'frameset--minibufferless-last-p))
+      (pcase-let ((`(,frame-cfg . ,window-cfg) state))
+        (when (or (null predicate) (funcall predicate frame-cfg window-cfg))
+          (condition-case-unless-debug err
+              (let* ((d-mini (cdr (assq 'frameset--mini frame-cfg)))
+                     (mb-id (cdr d-mini))
+                     (default (and (car d-mini) mb-id))
+                     (force-display (if (functionp force-display)
+                                        (funcall force-display frame-cfg window-cfg)
+                                      force-display))
+                     frame to-tty)
+                ;; Only set target if forcing displays and the target display is different.
+                (cond ((frameset-keep-original-display-p force-display)
+                       (setq frameset--target-display nil))
+                      ((eq (frame-parameter nil 'display) (cdr (assq 'display frame-cfg)))
+                       (setq frameset--target-display nil))
+                      (t
+                       (setq frameset--target-display (cons 'display
+                                                            (frame-parameter nil 'display))
+                             to-tty (null (cdr frameset--target-display)))))
+                ;; Time to restore frames and set up their minibuffers as they were.
+                ;; We only skip a frame (thus deleting it) if either:
+                ;; - we're switching displays, and the user chose the option to delete, or
+                ;; - we're switching to tty, and the frame to restore is minibuffer-only.
+                (unless (and frameset--target-display
+                             (or (eq force-display :delete)
+                                 (and to-tty
+                                      (eq (cdr (assq 'minibuffer frame-cfg)) 'only))))
+                  ;; If keeping non-reusable frames, and the frameset--id of one of them
+                  ;; matches the id of a frame being restored (because, for example, the
+                  ;; frameset has already been read in the same session), remove the
+                  ;; frameset--id from the non-reusable frame, which is not useful anymore.
+                  (when (and other-frames
+                             (or (eq reuse-frames :keep) (consp reuse-frames)))
+                    (let ((dup (frameset-frame-with-id (cdr (assq 'frameset--id frame-cfg))
+                                                       other-frames)))
+                      (when dup
+                        (set-frame-parameter dup 'frameset--id nil))))
+                  ;; Restore minibuffers.  Some of this stuff could be done in a filter
+                  ;; function, but it would be messy because restoring minibuffers affects
+                  ;; global state; it's best to do it here than add a bunch of global
+                  ;; variables to pass info back-and-forth to/from the filter function.
+                  (cond
+                   ((null d-mini)) ;; No frameset--mini.  Process as normal frame.
+                   (to-tty) ;; Ignore minibuffer stuff and process as normal frame.
+                   ((car d-mini) ;; Frame has minibuffer (or it is minibuffer-only).
+                    (when (eq (cdr (assq 'minibuffer frame-cfg)) 'only)
+                      (setq frame-cfg (append '((tool-bar-lines . 0) (menu-bar-lines . 0))
+                                              frame-cfg))))
+                   (t ;; Frame depends on other frame's minibuffer window.
+                    (when mb-id
+                      (let ((mb-frame (frameset-frame-with-id mb-id))
+                            (mb-window nil))
+                        (if (not mb-frame)
+                            (delay-warning 'frameset
+                                           (format "Minibuffer frame %S not found" mb-id)
+                                           :warning)
+                          (setq mb-window (minibuffer-window mb-frame))
+                          (unless (and (window-live-p mb-window)
+                                       (window-minibuffer-p mb-window))
+                            (delay-warning 'frameset
+                                           (format "Not a minibuffer window %s" mb-window)
+                                           :warning)
+                            (setq mb-window nil)))
+                        (when mb-window
+                          (push (cons 'minibuffer mb-window) frame-cfg))))))
+                  ;; OK, we're ready at last to create (or reuse) a frame and
+                  ;; restore the window config.
+                  (setq frame (frameset--restore-frame frame-cfg window-cfg
+                                                       (or filters frameset-filter-alist)
+                                                       force-onscreen))
+                  ;; Set default-minibuffer if required.
+                  (when default (setq default-minibuffer-frame frame))))
+            (error
+             (delay-warning 'frameset (error-message-string err) :error))))))
 
     ;; In case we try to delete the initial frame, we want to make sure that
     ;; other frames are already visible (discussed in thread for bug#14841).
     (sit-for 0 t)
 
     ;; Delete remaining frames, but do not fail if some resist being deleted.
-    (unless (eq reuse-frames 'keep)
+    (unless (eq reuse-frames :keep)
       (dolist (frame (sort (nconc (if (listp reuse-frames) nil other-frames)
                                   frameset--reuse-list)
-                           #'frameset-sort-frames-for-deletion))
+                           ;; Minibufferless frames must go first to avoid
+                           ;; errors when attempting to delete a frame whose
+                           ;; minibuffer window is used by another frame.
+                           #'frameset-minibufferless-first-p))
         (condition-case err
             (delete-frame frame)
           (error
            (delay-warning 'frameset (error-message-string err))))))
-    (setq frameset--reuse-list nil)
+    (setq frameset--reuse-list nil
+          frameset--target-display nil)
 
     ;; Make sure there's at least one visible frame.
     (unless (or (daemonp) (visible-frame-list))
       (make-frame-visible (car (frame-list))))))
 
+
+;; Register support
+
+(defun frameset--jump-to-register (data)
+  "Restore frameset from DATA stored in register.
+Called from `jump-to-register'.  Internal use only."
+  (let* ((delete (and current-prefix-arg t))
+         (iconify-list (if delete nil (frame-list))))
+    (frameset-restore (aref data 0)
+                      :filters frameset-session-filter-alist
+                      :reuse-frames (if delete t :keep))
+    (mapc #'iconify-frame iconify-list)
+    (let ((frame (frameset-frame-with-id (aref data 1))))
+      (when frame
+        (select-frame-set-input-focus frame)
+        (goto-char (aref data 2))))))
+
+;;;###autoload
+(defun frameset-to-register (register &optional _arg)
+  "Store the current frameset in register REGISTER.
+Use \\[jump-to-register] to restore the frameset.
+Argument is a character, naming the register."
+  (interactive "cFrameset to register: \nP")
+  (set-register register
+                (registerv-make
+                 (vector (frameset-save nil
+                                        :app 'register
+                                        :filters frameset-session-filter-alist)
+                         ;; frameset-save does not include the value of point
+                         ;; in the current buffer, so record that separately.
+                         (frameset-frame-id nil)
+                         (point-marker))
+                 :print-func (lambda (_data) (princ "a frameset."))
+                 :jump-func #'frameset--jump-to-register)))
+
 (provide 'frameset)
 
 ;;; frameset.el ends here
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index 1867759b549..c964b53952e 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -460,130 +460,7 @@ like an INI file.  You can add this hook to `find-file-hook'."
 
 ;;; DOS/Windows BAT files
 (when (memq 'bat-generic-mode generic-extras-enable-list)
-
-(define-generic-mode bat-generic-mode
-  nil
-  nil
-  (eval-when-compile
-    (list
-     ;; Make this one first in the list, otherwise comments will
-     ;; be over-written by other variables
-     '("^[@ \t]*\\([rR][eE][mM][^\n\r]*\\)" 1 font-lock-comment-face t)
-     '("^[ \t]*\\(::.*\\)"                  1 font-lock-comment-face t)
-     '("^[@ \t]*\\([bB][rR][eE][aA][kK]\\|[vV][eE][rR][iI][fF][yY]\\)[ \t]+\\([oO]\\([nN]\\|[fF][fF]\\)\\)"
-       (1 font-lock-builtin-face)
-       (2 font-lock-constant-face t t))
-     ;; Any text (except ON/OFF) following ECHO is a string.
-     '("^[@ \t]*\\([eE][cC][hH][oO]\\)[ \t]+\\(\\([oO]\\([nN]\\|[fF][fF]\\)\\)\\|\\([^>|\r\n]+\\)\\)"
-       (1 font-lock-builtin-face)
-       (3 font-lock-constant-face t t)
-       (5 font-lock-string-face t t))
-     ;; These keywords appear as the first word on a line.  (Actually, they
-     ;; can also appear after "if ..." or "for ..." clause, but since they
-     ;; are frequently used in simple text, we punt.)
-     ;; In `generic-bat-mode-setup-function' we make the keywords
-     ;; case-insensitive
-     '("^[@ \t]*\\_<\\(for\\|if\\)\\_>" 1 font-lock-keyword-face)
-     ;; These keywords can be anywhere on a line
-     ;; In `generic-bat-mode-setup-function' we make the keywords
-     ;; case-insensitive
-     (list (regexp-opt '("do" "exist" "errorlevel" "goto" "not") 'symbols)
-           1 font-lock-keyword-face)
-     ;; These are built-in commands.  Only frequently-used ones are listed.
-     (list (concat "[ \t|\n]"
-                   (regexp-opt '("CALL"     "call"       "Call"
-                                 "CD"       "cd"         "Cd"
-                                 "CLS"      "cls"        "Cls"
-                                 "COPY"     "copy"       "Copy"
-                                 "DEL"      "del"        "Del"
-                                 "ECHO"     "echo"       "Echo"
-                                 "MD"       "md"         "Md"
-                                 "PATH"     "path"       "Path"
-                                 "PAUSE"    "pause"      "Pause"
-                                 "PROMPT"   "prompt"     "Prompt"
-                                 "RD"       "rd"         "Rd"
-                                 "REN"      "ren"        "Ren"
-                                 "SET"      "set"        "Set"
-                                 "START"    "start"      "Start"
-                                 "SHIFT"    "shift"      "Shift") 'symbols))
-           1 font-lock-builtin-face)
-     '("^[ \t]*\\(:\\sw+\\)"         1 font-lock-function-name-face t)
-     '("\\(%\\sw+%\\)"               1 font-lock-variable-name-face t)
-     '("\\(%[0-9]\\)"                1 font-lock-variable-name-face t)
-     '("[\t ]+\\([+-/][^\t\n\" ]+\\)" 1 font-lock-type-face)
-     '("[ \t\n|]\\<\\([gG][oO][tT][oO]\\)\\>[ \t]*\\(\\sw+\\)?"
-       (1 font-lock-keyword-face)
-       (2 font-lock-function-name-face nil t))
-     '("[ \t\n|]\\<\\([sS][eE][tT]\\)\\>[ \t]*\\(\\sw+\\)?[ \t]*=?"
-       (1 font-lock-builtin-face)
-       (2 font-lock-variable-name-face t t))))
-  '("\\.[bB][aA][tT]\\'"
-    "\\.[cC][mM][dD]\\'"
-    "\\`[cC][oO][nN][fF][iI][gG]\\."
-    "\\`[aA][uU][tT][oO][eE][xX][eE][cC]\\.")
-  '(generic-bat-mode-setup-function)
-  "Generic mode for MS-Windows batch files.")
-
-(defvar bat-generic-mode-syntax-table nil
-  "Syntax table in use in `bat-generic-mode' buffers.")
-
-(defvar bat-generic-mode-keymap (make-sparse-keymap)
-  "Keymap for `bat-generic-mode'.")
-
-(defun bat-generic-mode-compile ()
-  "Run the current BAT file in a compilation buffer."
-  (interactive)
-  (let ((compilation-buffer-name-function
-         (function
-          (lambda (_ign)
-            (concat "*" (buffer-file-name) "*")))))
-    (compile
-     (concat (w32-shell-name) " -c " (buffer-file-name)))))
-
-(declare-function comint-mode "comint" ())
-(declare-function comint-exec "comint" (buffer name command startfile switches))
-
-(defun bat-generic-mode-run-as-comint ()
-  "Run the current BAT file in a comint buffer."
-  (interactive)
-  (require 'comint)
-  (let* ((file (buffer-file-name))
-         (buf-name (concat "*" file "*")))
-    (with-current-buffer (get-buffer-create buf-name)
-      (erase-buffer)
-      (comint-mode)
-      (comint-exec
-       buf-name
-       file
-       (w32-shell-name)
-       nil
-       (list "-c" file))
-      (display-buffer buf-name))))
-
-(define-key bat-generic-mode-keymap "\C-c\C-c" 'bat-generic-mode-compile)
-
-;; Make underscores count as words
-(unless bat-generic-mode-syntax-table
-  (setq bat-generic-mode-syntax-table (make-syntax-table))
-  (modify-syntax-entry ?_ "w" bat-generic-mode-syntax-table))
-
-;; bat-generic-mode doesn't use the comment functionality of
-;; define-generic-mode because it has a three-letter comment-string,
-;; so we do it here manually instead
-(defun generic-bat-mode-setup-function ()
-  (make-local-variable 'parse-sexp-ignore-comments)
-  (make-local-variable 'comment-start)
-  (make-local-variable 'comment-start-skip)
-  (make-local-variable 'comment-end)
-  (setq imenu-generic-expression '((nil "^:\\(\\sw+\\)" 1))
-        parse-sexp-ignore-comments t
-        comment-end ""
-        comment-start "REM "
-        comment-start-skip "[Rr][Ee][Mm] *")
-  (set-syntax-table bat-generic-mode-syntax-table)
-  ;; Make keywords case-insensitive
-  (setq font-lock-defaults '(generic-font-lock-keywords nil t))
-  (use-local-map bat-generic-mode-keymap)))
+  (define-obsolete-function-alias 'bat-generic-mode 'bat-mode "24.4"))
 
 ;;; Mailagent
 ;; Mailagent is a Unix mail filtering program.  Anyone wanna do a
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 2164fd96b46..c75588536a4 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,54 @@
+2013-08-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mm-decode.el (mm-temp-files-delete): Fix file deletion logic.
+
+2013-08-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mm-util.el (mm-coding-system-priorities): Exclude iso-2022-jp-2 and
+        shift_jis from the default value set for Japanese users.
+
+2013-08-13  Glenn Morris  <rgm@gnu.org>
+
+        * gnus-icalendar.el (gnus-icalendar-org-capture-file): Fix type.
+
+        * gnus.el (gnus-valid-select-methods): Fix type.
+
+        * nnimap.el (nnimap-request-articles-find-limit): Fix type, version.
+
+2013-08-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mm-decode.el (mm-display-external): Run a timer for the temp files
+        deletion after a viewer exits; add a deletion timer for the needsterm
+        case, too.
+
+        * mm-decode.el (mm-display-external): Try to delete temporary files by
+        using a 1-min. timer.
+
+2013-08-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mm-decode.el (mm-temp-files-to-be-deleted, mm-temp-files-cache-file):
+        New internal variables.
+        (mm-temp-files-delete): New function; add it to gnus-exit-gnus-hook.
+        (mm-display-external): Use it to delete temporary files instead of
+        using timers.
+
+2013-08-06  Jan Tatarik  <jan.tatarik@gmail.com>
+
+        * gnus-icalendar.el (gnus-icalendar-event-from-ical): Replace pcase
+        with cond for backwards compatability.
+
+2013-08-06  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * mm-decode.el (mm-display-external): Bind process-connection-type to
+        nil; don't delete a temp file immediately even if a viewer finishes,
+        since it may be a shell script, like xdg-open, that launches a real
+        viewer program belatedly.
+
+2013-08-05  Dave Abrahams  <dave@boostpro.com>
+
+        * gnus-int.el (gnus-warp-to-article): Allow warping in all groups so
+        that we can create nndoc groups that excerpt other groups.
+
 2013-08-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * gnus-delay.el (gnus-delay-article): Fix typo.
diff --git a/lisp/gnus/gnus-icalendar.el b/lisp/gnus/gnus-icalendar.el
index 0286fd5dd89..a946a586033 100644
--- a/lisp/gnus/gnus-icalendar.el
+++ b/lisp/gnus/gnus-icalendar.el
@@ -183,11 +183,11 @@
                      :end (gnus-icalendar-event--decode-datefield event 'DTEND zone-map)
                      :rsvp (string= (plist-get (cadr attendee) 'RSVP)
                                     "TRUE")))
-         (event-class (pcase method
-                        ("REQUEST" 'gnus-icalendar-event-request)
-                        ("CANCEL" 'gnus-icalendar-event-cancel)
-                        ("REPLY" 'gnus-icalendar-event-reply)
-                        (_ 'gnus-icalendar-event))))
+         (event-class (cond
+                       ((string= method "REQUEST") 'gnus-icalendar-event-request)
+                       ((string= method "CANCEL") 'gnus-icalendar-event-cancel)
+                       ((string= method "REPLY") 'gnus-icalendar-event-reply)
+                       (t 'gnus-icalendar-event))))
 
     (labels ((map-property (prop)
                    (let ((value (icalendar--get-event-property event prop)))
@@ -252,14 +252,15 @@ status will be retrieved from the first matching attendee record."
                             ;; NOTE: not all of the below fields are mandatory,
                             ;; but they are often present in other clients'
                             ;; replies. Can be helpful for debugging, too.
-                            (new-line (pcase key
-                                        ("ATTENDEE" (update-attendee-status line))
-                                        ("SUMMARY" (update-summary line))
-                                        ("DTSTAMP" (update-dtstamp))
-                                        ((or "ORGANIZER" "DTSTART" "DTEND"
-                                             "LOCATION" "DURATION" "SEQUENCE"
-                                             "RECURRENCE-ID" "UID") line)
-                                        (_ nil))))
+                            (new-line
+                             (cond
+                              ((string= key "ATTENDEE") (update-attendee-status line))
+                              ((string= key "SUMMARY") (update-summary line))
+                              ((string= key "DTSTAMP") (update-dtstamp))
+                              ((find key '("ORGANIZER" "DTSTART" "DTEND"
+                                           "LOCATION" "DURATION" "SEQUENCE"
+                                           "RECURRENCE-ID" "UID")) line)
+                              (t nil))))
                        (when new-line
                          (push new-line reply-event-lines))))))
 
@@ -322,7 +323,7 @@ on the IDENTITIES list."
 
 (defcustom gnus-icalendar-org-capture-file nil
   "Target Org file for storing captured calendar events."
-  :type 'file
+  :type '(choice (const nil) file)
   :group 'gnus-icalendar-org)
 
 (defcustom gnus-icalendar-org-capture-headline nil
@@ -405,7 +406,8 @@ Return nil for non-recurring EVENT."
 
 (defun gnus-icalendar--deactivate-org-timestamp (ts)
   (replace-regexp-in-string "[<>]"
-                            (lambda (m) (pcase m ("<" "[") (">" "]")))
+                            (lambda (m) (cond ((string= m "<") "[")
+                                              ((string= m ">") "]")))
                             ts))
 
 (defun gnus-icalendar-find-org-event-file (event &optional org-file)
diff --git a/lisp/gnus/gnus-int.el b/lisp/gnus/gnus-int.el
index 6aa874f0347..f0cf0daed01 100644
--- a/lisp/gnus/gnus-int.el
+++ b/lisp/gnus/gnus-int.el
@@ -582,18 +582,18 @@ This is the string that Gnus uses to identify the group."
    (gnus-group-method group)))
 
 (defun gnus-warp-to-article ()
-  "Jump from an article in a virtual group to the article in its real group.
-Does nothing in a real group."
+  "Look up the current article in the group where it originated.
+This command only makes sense for groups shows articles gathered
+from other groups -- for instance, search results and the like."
   (interactive)
-  (when (gnus-virtual-group-p gnus-newsgroup-name)
-    (let ((gnus-command-method
-           (gnus-find-method-for-group gnus-newsgroup-name)))
-      (or
-       (when (gnus-check-backend-function
-              'warp-to-article (car gnus-command-method))
-         (funcall (gnus-get-function gnus-command-method 'warp-to-article)))
-       (and (bound-and-true-p gnus-registry-enabled)
-            (gnus-try-warping-via-registry))))))
+  (let ((gnus-command-method
+         (gnus-find-method-for-group gnus-newsgroup-name)))
+    (or
+     (when (gnus-check-backend-function
+            'warp-to-article (car gnus-command-method))
+       (funcall (gnus-get-function gnus-command-method 'warp-to-article)))
+     (and (bound-and-true-p gnus-registry-enabled)
+          (gnus-try-warping-via-registry)))))
 
 (defun gnus-request-head (article group)
   "Request the head of ARTICLE in GROUP."
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 409b1cc6255..266ee0fe7cb 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -1649,6 +1649,7 @@ this variable.  I think."
                                              (const post-mail))
                         (checklist :inline t :greedy t
                                    (const :format "%v " address)
+                                   (const global)
                                    (const :format "%v " prompt-address)
                                    (const :format "%v " physical-address)
                                    (const virtual)
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 7274708f014..28d930b55f7 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -47,6 +47,7 @@
 (defvar gnus-current-window-configuration)
 
 (add-hook 'gnus-exit-gnus-hook 'mm-destroy-postponed-undisplay-list)
+(add-hook 'gnus-exit-gnus-hook 'mm-temp-files-delete)
 
 (defgroup mime-display ()
   "Display of MIME in mail and news articles."
@@ -470,6 +471,11 @@ If not set, `default-directory' will be used."
 (defvar mm-content-id-alist nil)
 (defvar mm-postponed-undisplay-list nil)
 (defvar mm-inhibit-auto-detect-attachment nil)
+(defvar mm-temp-files-to-be-deleted nil
+  "List of temporary files scheduled to be deleted.")
+(defvar mm-temp-files-cache-file (concat ".mm-temp-files-" (user-login-name))
+  "Name of a file that caches a list of temporary files to be deleted.
+The file will be saved in the directory `mm-tmp-directory'.")
 
 ;; According to RFC2046, in particular, in a digest, the default
 ;; Content-Type value for a body part is changed from "text/plain" to
@@ -586,6 +592,46 @@ Postpone undisplaying of viewers for types in
     (message "Destroying external MIME viewers")
     (mm-destroy-parts mm-postponed-undisplay-list)))
 
+(defun mm-temp-files-delete ()
+  "Delete temporary files and those parent directories.
+Note that the deletion may fail if a program is catching hold of a file
+under Windows or Cygwin.  In that case, it schedules the deletion of
+files left at the next time."
+  (let* ((coding-system-for-read mm-universal-coding-system)
+         (coding-system-for-write mm-universal-coding-system)
+         (cache-file (expand-file-name mm-temp-files-cache-file
+                                       mm-tmp-directory))
+         (cache (when (file-exists-p cache-file)
+                  (mm-with-multibyte-buffer
+                    (insert-file-contents cache-file)
+                    (split-string (buffer-string) "\n" t))))
+         fails)
+    (dolist (temp (append cache mm-temp-files-to-be-deleted))
+      (when (and (file-exists-p temp)
+                 (if (file-directory-p temp)
+                     ;; A parent directory left at the previous time.
+                     (progn
+                       (ignore-errors (delete-directory temp))
+                       (file-exists-p temp))
+                   ;; Delete a temporary file and its parent directory.
+                   (ignore-errors (delete-file temp))
+                   (or (file-exists-p temp)
+                       (progn
+                         (setq temp (file-name-directory temp))
+                         (ignore-errors (delete-directory temp))
+                         (file-exists-p temp)))))
+        (push temp fails)))
+    (if fails
+        ;; Schedule the deletion of the files left at the next time.
+        (progn
+          (write-region (concat (mapconcat 'identity (nreverse fails) "\n")
+                                "\n")
+                        nil cache-file nil 'silent)
+          (set-file-modes cache-file #o600))
+      (when (file-exists-p cache-file)
+        (ignore-errors (delete-file cache-file))))
+    (setq mm-temp-files-to-be-deleted nil)))
+
 (autoload 'message-fetch-field "message")
 
 (defun mm-dissect-buffer (&optional no-strict-mime loose-mime from)
@@ -908,10 +954,20 @@ external if displayed external."
                             method file (mm-handle-type handle))))
               (unwind-protect
                   (if window-system
-                      (start-process "*display*" nil
-                                     mm-external-terminal-program
-                                     "-e" shell-file-name
-                                     shell-command-switch command)
+                      (set-process-sentinel
+                       (start-process "*display*" nil
+                                      mm-external-terminal-program
+                                      "-e" shell-file-name
+                                      shell-command-switch command)
+                       `(lambda (process state)
+                          (if (eq 'exit (process-status process))
+                              (run-at-time
+                               60.0 nil
+                               (lambda ()
+                                 (ignore-errors (delete-file ,file))
+                                 (ignore-errors (delete-directory
+                                                 ,(file-name-directory
+                                                   file))))))))
                     (require 'term)
                     (require 'gnus-win)
                     (set-buffer
@@ -925,11 +981,15 @@ external if displayed external."
                     (set-process-sentinel
                      (get-buffer-process buffer)
                      `(lambda (process state)
-                        (if (eq 'exit (process-status process))
-                            (gnus-configure-windows
-                             ',gnus-current-window-configuration))))
+                        (when (eq 'exit (process-status process))
+                          (ignore-errors (delete-file ,file))
+                          (ignore-errors
+                            (delete-directory ,(file-name-directory file)))
+                          (gnus-configure-windows
+                           ',gnus-current-window-configuration))))
                     (gnus-configure-windows 'display-term))
-                (mm-handle-set-external-undisplayer handle (cons file buffer)))
+                (mm-handle-set-external-undisplayer handle (cons file buffer))
+                (add-to-list 'mm-temp-files-to-be-deleted file t))
               (message "Displaying %s..." command))
             'external)
            (copiousoutput
@@ -962,7 +1022,7 @@ external if displayed external."
             (let ((command (mm-mailcap-command
                             method file (mm-handle-type handle))))
               (unwind-protect
-                  (progn
+                  (let ((process-connection-type nil))
                     (start-process "*display*"
                                    (setq buffer
                                          (generate-new-buffer " *mm*"))
@@ -975,21 +1035,14 @@ external if displayed external."
                                    (buffer buffer)
                                    (command command)
                                    (handle handle))
-                       (run-at-time
-                        30.0 nil
-                        (lambda ()
-                          (ignore-errors
-                            (delete-file file))
-                          (ignore-errors
-                            (delete-directory (file-name-directory file)))))
                        (lambda (process state)
                          (when (eq (process-status process) 'exit)
-                           (condition-case nil
-                               (delete-file file)
-                             (error))
-                           (condition-case nil
-                               (delete-directory (file-name-directory file))
-                             (error))
+                           (run-at-time
+                            60.0 nil
+                            (lambda ()
+                              (ignore-errors (delete-file file))
+                              (ignore-errors (delete-directory
+                                              (file-name-directory file)))))
                            (when (buffer-live-p outbuf)
                              (with-current-buffer outbuf
                                (let ((buffer-read-only nil)
@@ -1006,7 +1059,8 @@ external if displayed external."
                              (kill-buffer buffer)))
                          (message "Displaying %s...done" command)))))
                 (mm-handle-set-external-undisplayer
-                 handle (cons file buffer)))
+                 handle (cons file buffer))
+                (add-to-list 'mm-temp-files-to-be-deleted file t))
               (message "Displaying %s..." command))
             'external)))))))
 
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index 209c2949ea9..9c2f0df5f59 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -845,17 +845,17 @@ Valid elements include:
            (not lang) nil)
           ;; In XEmacs 21.5 it may be the one like "Japanese (UTF-8)".
           ((string-match "\\`Japanese" lang)
-           ;; Japanese users prefer iso-2022-jp to euc-japan or
-           ;; shift_jis, however iso-8859-1 should be used when
-           ;; there are only ASCII text and Latin-1 characters.
-           '(iso-8859-1 iso-2022-jp iso-2022-jp-2 shift_jis utf-8))))
+           ;; Japanese users prefer iso-2022-jp to others usually used
+           ;; for `buffer-file-coding-system', however iso-8859-1 should
+           ;; be used when there are only ASCII and Latin-1 characters.
+           '(iso-8859-1 iso-2022-jp utf-8))))
   "Preferred coding systems for encoding outgoing messages.
 
 More than one suitable coding system may be found for some text.
 By default, the coding system with the highest priority is used
 to encode outgoing messages (see `sort-coding-systems').  If this
 variable is set, it overrides the default priority."
-  :version "21.2"
+  :version "24.4"
   :type '(repeat (symbol :tag "Coding system"))
   :group 'mime)
 
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 4d9320b995f..f8c2b24cc9f 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -130,8 +130,8 @@ textual parts.")
 
 (defcustom nnimap-request-articles-find-limit nil
   "Limit the number of articles to look for after moving an article."
-  :type 'integer
-  :version "24.3"
+  :type '(choice (const nil) integer)
+  :version "24.4"
   :group 'nnimap)
 
 (defvar nnimap-process nil)
diff --git a/lisp/help-macro.el b/lisp/help-macro.el
index 566f1597596..f0fda357705 100644
--- a/lisp/help-macro.el
+++ b/lisp/help-macro.el
@@ -136,9 +136,9 @@ and then returns."
                      (setq config (current-window-configuration))
                      (pop-to-buffer " *Metahelp*" nil t)
                      (and (fboundp 'make-frame)
-                          (not (eq (window-frame (selected-window))
+                          (not (eq (window-frame)
                                    prev-frame))
-                          (setq new-frame (window-frame (selected-window))
+                          (setq new-frame (window-frame)
                                 config nil))
                      (setq buffer-read-only nil)
                      (let ((inhibit-read-only t))
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index b56adc2a4a9..5553556e03c 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -268,7 +268,7 @@ The format is (FUNCTION ARGS...).")
 
 (define-button-type 'help-dir-local-var-def
   :supertype 'help-xref
-  'help-function (lambda (var &optional file)
+  'help-function (lambda (_var &optional file)
                    ;; FIXME: this should go to the point where the
                    ;; local variable was defined.
                    (find-file file))
@@ -541,7 +541,7 @@ that."
                       (while
                           (and (not (eobp))
                                ;; Stop at a pair of blank lines.
-                               (not (looking-at "\n\\s-*\n")))
+                               (not (looking-at-p "\n\\s-*\n")))
                         ;; Skip a single blank line.
                         (and (eolp) (forward-line))
                         (end-of-line)
@@ -605,26 +605,25 @@ See `help-make-xrefs'."
         (save-restriction
           (narrow-to-region from to)
           (goto-char (point-min))
-          (condition-case nil
-              (while (not (eobp))
-                (cond
-                 ((looking-at "\"") (forward-sexp 1))
-                 ((looking-at "#<") (search-forward ">" nil 'move))
-                 ((looking-at "\\(\\(\\sw\\|\\s_\\)+\\)")
-                  (let* ((sym (intern-soft (match-string 1)))
-                         (type (cond ((fboundp sym) 'help-function)
-                                     ((or (memq sym '(t nil))
-                                          (keywordp sym))
-                                      nil)
-                                     ((and sym
-                                           (or (boundp sym)
-                                               (get sym
-                                                    'variable-documentation)))
-                                      'help-variable))))
-                    (when type (help-xref-button 1 type sym)))
-                  (goto-char (match-end 1)))
-                 (t (forward-char 1))))
-            (error nil)))))))
+          (ignore-errors
+            (while (not (eobp))
+              (cond
+               ((looking-at-p "\"") (forward-sexp 1))
+               ((looking-at-p "#<") (search-forward ">" nil 'move))
+               ((looking-at "\\(\\(\\sw\\|\\s_\\)+\\)")
+                (let* ((sym (intern-soft (match-string 1)))
+                       (type (cond ((fboundp sym) 'help-function)
+                                   ((or (memq sym '(t nil))
+                                        (keywordp sym))
+                                    nil)
+                                   ((and sym
+                                         (or (boundp sym)
+                                             (get sym
+                                                  'variable-documentation)))
+                                    'help-variable))))
+                  (when type (help-xref-button 1 type sym)))
+                (goto-char (match-end 1)))
+               (t (forward-char 1))))))))))
 
 
 ;; Additional functions for (re-)creating types of help buffers.
diff --git a/lisp/help.el b/lisp/help.el
index 25bc9c4b7c6..4ec0b99a593 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -1018,27 +1018,26 @@ smaller than `window-min-height'.  Do nothing if WINDOW is not
 vertically combined, some of its contents are scrolled out of
 view, or WINDOW was not created by `display-buffer'."
   (setq window (window-normalize-window window t))
-  (let ((buffer-name (buffer-name (window-buffer window))))
-    (let ((height (if (functionp temp-buffer-max-height)
-                      (with-selected-window window
-                        (funcall temp-buffer-max-height (window-buffer)))
-                    temp-buffer-max-height))
-          (quit-cadr (cadr (window-parameter window 'quit-restore))))
-      (cond
-       ;; Resize WINDOW iff it was split off by `display-buffer'.
-       ((and (eq quit-cadr 'window)
-             (pos-visible-in-window-p (point-min) window)
-             (window-combined-p window))
-        (fit-window-to-buffer window height))
-       ;; Resize FRAME iff it was created by `display-buffer'.
-       ((and fit-frame-to-buffer
-             (eq quit-cadr 'frame)
-             (eq window (frame-root-window window)))
-        (let ((frame (window-frame window)))
-          (fit-frame-to-buffer
-           frame (+ (frame-height frame)
-                    (- (window-total-size window))
-                    height))))))))
+  (let ((height (if (functionp temp-buffer-max-height)
+                    (with-selected-window window
+                      (funcall temp-buffer-max-height (window-buffer)))
+                  temp-buffer-max-height))
+        (quit-cadr (cadr (window-parameter window 'quit-restore))))
+    (cond
+     ;; Resize WINDOW iff it was split off by `display-buffer'.
+     ((and (eq quit-cadr 'window)
+           (pos-visible-in-window-p (point-min) window)
+           (window-combined-p window))
+      (fit-window-to-buffer window height))
+     ;; Resize FRAME iff it was created by `display-buffer'.
+     ((and fit-frame-to-buffer
+           (eq quit-cadr 'frame)
+           (eq window (frame-root-window window)))
+      (let ((frame (window-frame window)))
+        (fit-frame-to-buffer
+         frame (+ (frame-height frame)
+                  (- (window-total-size window))
+                  height)))))))
 
 ;;; Help windows.
 (defcustom help-window-select 'other
diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el
index 17b91245d60..1da3d68e131 100644
--- a/lisp/hilit-chg.el
+++ b/lisp/hilit-chg.el
@@ -860,7 +860,7 @@ changes are made, so \\[highlight-changes-next-change] and
     (get-buffer (read-buffer "buffer-a " (current-buffer) t))
     (get-buffer
      (read-buffer "buffer-b "
-                  (window-buffer (next-window (selected-window))) t))))
+                  (window-buffer (next-window)) t))))
   (let ((file-a (buffer-file-name buf-a))
         (file-b (buffer-file-name buf-b)))
     (highlight-markup-buffers buf-a file-a buf-b file-b)
diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el
index 7d14d780e2e..ad233b2a507 100644
--- a/lisp/hippie-exp.el
+++ b/lisp/hippie-exp.el
@@ -296,7 +296,7 @@ undoes the expansion."
                   (message "No further expansions found"))
               (ding))
             (if (and hippie-expand-verbose
-                     (not (window-minibuffer-p (selected-window))))
+                     (not (window-minibuffer-p)))
                 (message "Using %s"
                          (nth he-num hippie-expand-try-functions-list)))))
       (if (and (>= he-num 0)
@@ -305,7 +305,7 @@ undoes the expansion."
             (setq he-num -1)
             (he-reset-string)
             (if (and hippie-expand-verbose
-                     (not (window-minibuffer-p (selected-window))))
+                     (not (window-minibuffer-p)))
                 (message "Undoing expansions"))))))
 
 ;; Initializes the region to expand (to between BEG and END).
@@ -978,7 +978,7 @@ The argument OLD has to be nil the first call of this function, and t
 for subsequent calls (for further possible expansions of the same
 string).  It returns t if a new expansion is found, nil otherwise."
   (let ((expansion ())
-        (flag (if (frame-visible-p (window-frame (selected-window)))
+        (flag (if (frame-visible-p (window-frame))
                   'visible t)))
     (unless old
       (he-init-string (he-dabbrev-beg) (point))
diff --git a/lisp/hl-line.el b/lisp/hl-line.el
index 1ed17b4cd8e..e2171a27f5c 100644
--- a/lisp/hl-line.el
+++ b/lisp/hl-line.el
@@ -198,7 +198,7 @@ Global-Hl-Line mode uses the functions `global-hl-line-unhighlight' and
 (defun global-hl-line-highlight ()
   "Highlight the current line in the current window."
   (when global-hl-line-mode     ; Might be changed outside the mode function.
-    (unless (window-minibuffer-p (selected-window))
+    (unless (window-minibuffer-p)
       (unless global-hl-line-overlay
         (setq global-hl-line-overlay (make-overlay 1 1)) ; to be moved
         (overlay-put global-hl-line-overlay 'face hl-line-face))
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 09d7c143346..ce29505d6f2 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -53,6 +53,8 @@
 (defvar ibuffer-tmp-hide-regexps)
 (defvar ibuffer-tmp-show-regexps)
 
+(declare-function ibuffer-ext-visible-p "ibuf-ext"
+                  (buf all &optional ibuffer-buf))
 (declare-function ibuffer-mark-on-buffer "ibuf-ext"
                   (func &optional ibuffer-mark-on-buffer-mark group))
 (declare-function ibuffer-generate-filter-groups "ibuf-ext"
@@ -1198,7 +1200,7 @@ a new window in the current frame, splitting vertically."
                              (and (stringp (cadr err))
                                   ;; This definitely falls in the
                                   ;; ghetto hack category...
-                                  (not (string-match "too small" (cadr err)))))
+                                  (not (string-match-p "too small" (cadr err)))))
                          (signal (car err) (cdr err))
                        (enlarge-window 3))))))
               (select-window (next-window))
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 73049df097d..104e3363831 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -221,7 +221,7 @@ Conditions are:
        indicate some non-standard, non-simple completion mechanism,
        like file-name and other custom-func completions)."
 
-  (and (window-minibuffer-p (selected-window))
+  (and (window-minibuffer-p)
        (not executing-kbd-macro)
        minibuffer-completion-table
        (or (not (functionp minibuffer-completion-table))
diff --git a/lisp/ido.el b/lisp/ido.el
index d3c0e0f09f7..39ad3137bc9 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -523,8 +523,8 @@ window with completion alternatives, or `ido-next-match' or
 
 
 (defcustom ido-record-commands t
-  "Non-nil means that `ido' will record commands in command history.
-Note that the non-ido equivalent command is recorded."
+  "Non-nil means that Ido will record commands in command history.
+Note that the non-Ido equivalent command is recorded."
   :type 'boolean
   :group 'ido)
 
@@ -1789,10 +1789,10 @@ This function also adds a hook to the minibuffer."
   (ido-set-current-directory (expand-file-name (or dir "~/"))))
 
 (defun ido-record-command (command arg)
-  ;; Add (command arg) to command-history if ido-record-commands is t
-  (if ido-record-commands
+  "Add (COMMAND ARG) to `command-history' if `ido-record-commands' is non-nil."
+  (if ido-record-commands               ; FIXME: use `when' instead of `if'?
       (let ((cmd (list command arg)))
-        (if (or (not command-history)
+        (if (or (not command-history)   ; FIXME: ditto
                 (not (equal cmd (car command-history))))
             (setq command-history (cons cmd command-history))))))
 
@@ -3972,12 +3972,11 @@ If `ido-change-word-sub' cannot be found in WORD, return nil."
             (if (featurep 'xemacs)
                 ;; XEmacs extents are put on by default, doesn't seem to be
                 ;; any way of switching them off.
-                ;; This obscure code avoids a byte compiler warning in Emacs.
-                (let ((f 'display-completion-list))
-                  (funcall f completion-list
-                           :help-string "ido "
-                           :activate-callback
-                           (lambda (x y z) (message "Doesn't work yet, sorry!"))))
+                (display-completion-list
+                 completion-list
+                 :help-string "ido "
+                 :activate-callback
+                 (lambda (&rest _) (message "Doesn't work yet, sorry!")))
               ;; else running Emacs
               ;;(add-hook 'completion-setup-hook 'completion-setup-function)
               (display-completion-list completion-list)))))))
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 30dfd045b46..f9bbbcdb1ab 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -354,6 +354,10 @@ call."
     (define-key map "b" 'image-previous-frame)
     (define-key map "n" 'image-next-file)
     (define-key map "p" 'image-previous-file)
+    (define-key map "a+" 'image-increase-speed)
+    (define-key map "a-" 'image-decrease-speed)
+    (define-key map "a0" 'image-reset-speed)
+    (define-key map "ar" 'image-reverse-speed)
     (define-key map [remap forward-char] 'image-forward-hscroll)
     (define-key map [remap backward-char] 'image-backward-hscroll)
     (define-key map [remap right-char] 'image-forward-hscroll)
@@ -412,7 +416,23 @@ call."
              (image-toggle-animation)))
          :style toggle :selected image-animate-loop
          :active image-multi-frame
-         :help "Animate images once, or forever?"]
+         :help "Animate images once, or forever?"]
+        ["Reverse Animation" image-reverse-speed
+         :style toggle :selected (let ((image (image-get-display-property)))
+                                   (and image (<
+                                               (image-animate-get-speed image)
+                                               0)))
+         :active image-multi-frame
+         :help "Reverse direction of this image's animation?"]
+        ["Speed Up Animation" image-increase-speed
+         :active image-multi-frame
+         :help "Speed up this image's animation"]
+        ["Slow Down Animation" image-decrease-speed
+         :active image-multi-frame
+         :help "Slow down this image's animation"]
+        ["Reset Animation Speed" image-reset-speed
+         :active image-multi-frame
+         :help "Reset the speed of this image's animation"]
         ["Next Frame" image-next-frame :active image-multi-frame
          :help "Show the next frame of this image"]
         ["Previous Frame" image-previous-frame :active image-multi-frame
@@ -437,7 +457,10 @@ call."
 (defun image-mode ()
   "Major mode for image files.
 You can use \\<image-mode-map>\\[image-toggle-display]
-to toggle between display as an image and display as text."
+to toggle between display as an image and display as text.
+
+Key bindings:
+\\{image-mode-map}"
   (interactive)
   (condition-case err
       (progn
@@ -703,6 +726,48 @@ Otherwise it plays once, then stops."
             (image-animate image index
                            (if image-animate-loop t)))))))))
 
+(defun image--set-speed (speed &optional multiply)
+  "Set speed of an animated image to SPEED.
+If MULTIPLY is non-nil, treat SPEED as a multiplication factor.
+If SPEED is `reset', reset the magnitude of the speed to 1."
+  (let ((image (image-get-display-property)))
+    (cond
+     ((null image)
+      (error "No image is present"))
+     ((null image-multi-frame)
+      (message "No image animation."))
+     (t
+      (if (eq speed 'reset)
+          (setq speed (if (< (image-animate-get-speed image) 0)
+                          -1 1)
+                multiply nil))
+      (image-animate-set-speed image speed multiply)
+      ;; FIXME Hack to refresh an active image.
+      (when (image-animate-timer image)
+        (image-toggle-animation)
+        (image-toggle-animation))
+      (message "Image speed is now %s" (image-animate-get-speed image))))))
+
+(defun image-increase-speed ()
+  "Increase the speed of current animated image by a factor of 2."
+  (interactive)
+  (image--set-speed 2 t))
+
+(defun image-decrease-speed ()
+  "Decrease the speed of current animated image by a factor of 2."
+  (interactive)
+  (image--set-speed 0.5 t))
+
+(defun image-reverse-speed ()
+  "Reverse the animation of the current image."
+  (interactive)
+  (image--set-speed -1 t))
+
+(defun image-reset-speed ()
+  "Reset the animation speed of the current image."
+  (interactive)
+  (image--set-speed 'reset))
+
 (defun image-goto-frame (n &optional relative)
   "Show frame N of a multi-frame image.
 Optional argument OFFSET non-nil means interpret N as relative to the
diff --git a/lisp/image.el b/lisp/image.el
index 804dc3af5ea..6c15a7d0b96 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -99,6 +99,14 @@ AUTODETECT can be
  - maybe  auto-detect only if the image type is available
             (see `image-type-available-p').")
 
+(defvar image-format-suffixes
+  '((image/x-icon "ico"))
+  "Alist of MIME Content-Type headers to file name suffixes.
+This is used as a hint by the ImageMagick library when detecting
+image types.  If `create-image' is called with a :format
+matching found in this alist, the ImageMagick library will be
+told that the data would have this suffix if saved to a file.")
+
 (defcustom image-load-path
   (list (file-name-as-directory (expand-file-name "images" data-directory))
         'data-directory 'load-path)
@@ -679,6 +687,19 @@ do not check N is within the range of frames present in the image."
   (plist-put (cdr image) :index n)
   (force-window-update))
 
+(defun image-animate-get-speed (image)
+  "Return the speed factor for animating IMAGE."
+  (or (plist-get (cdr image) :speed) 1))
+
+(defun image-animate-set-speed (image value &optional multiply)
+  "Set the speed factor for animating IMAGE to VALUE.
+With optional argument MULTIPLY non-nil, treat VALUE as a
+multiplication factor for the current value."
+  (plist-put (cdr image) :speed
+             (if multiply
+                 (* value (image-animate-get-speed image))
+               value)))
+
 ;; FIXME? The delay may not be the same for different sub-images,
 ;; hence we need to call image-multi-frame-p to return it.
 ;; But it also returns count, so why do we bother passing that as an
@@ -692,21 +713,28 @@ TIME-ELAPSED is the total time that has elapsed since
 LIMIT determines when to stop.  If t, loop forever.  If nil, stop
  after displaying the last animation frame.  Otherwise, stop
  after LIMIT seconds have elapsed.
-The minimum delay between successive frames is `image-minimum-frame-delay'."
+The minimum delay between successive frames is `image-minimum-frame-delay'.
+
+If the image has a non-nil :speed property, it acts as a multiplier
+for the animation speed.  A negative value means to animate in reverse."
   (image-show-frame image n t)
-  (setq n (1+ n))
-  (let* ((time (float-time))
+  (let* ((speed (image-animate-get-speed image))
+         (time (float-time))
          (animation (image-multi-frame-p image))
          ;; Subtract off the time we took to load the image from the
          ;; stated delay time.
-         (delay (max (+ (or (cdr animation) image-default-frame-delay)
+         (delay (max (+ (* (or (cdr animation) image-default-frame-delay)
+                           (/ 1 (abs speed)))
                         time (- (float-time)))
                      image-minimum-frame-delay))
          done)
-    (if (>= n count)
-        (if limit
-            (setq n 0)
-          (setq done t)))
+    (setq n (if (< speed 0)
+                (1- n)
+              (1+ n)))
+    (if limit
+        (cond ((>= n count) (setq n 0))
+              ((< n 0) (setq n (1- count))))
+      (and (or (>= n count) (< n 0)) (setq done t)))
     (setq time-elapsed (+ delay time-elapsed))
     (if (numberp limit)
         (setq done (>= time-elapsed limit)))
diff --git a/lisp/info.el b/lisp/info.el
index 0e0a11753ba..182ad8563aa 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1905,6 +1905,30 @@ the Top node in FILENAME."
 (defvar Info-search-case-fold nil
   "The value of `case-fold-search' from previous `Info-search' command.")
 
+(defun Info--search-loop (regexp bound backward)
+  (when backward
+    ;; Hide Info file header for backward search.
+    (narrow-to-region (save-excursion
+                        (goto-char (point-min))
+                        (search-forward "\n\^_")
+                        (1- (point)))
+                      (point-max)))
+  (let ((give-up nil)
+        (found nil)
+        (beg-found nil))
+    (while (not (or give-up
+                    (and found
+                         (funcall isearch-filter-predicate
+                                  beg-found found))))
+      (let ((search-spaces-regexp Info-search-whitespace-regexp))
+        (if (funcall
+             (if backward #'re-search-backward #'re-search-forward)
+             regexp bound t)
+            (setq found (point) beg-found (if backward (match-end 0)
+                                            (match-beginning 0)))
+          (setq give-up t found nil))))
+    found))
+
 (defun Info-search (regexp &optional bound _noerror _count direction)
   "Search for REGEXP, starting from point, and select node it's found in.
 If DIRECTION is `backward', search in the reverse direction."
@@ -1920,55 +1944,35 @@ If DIRECTION is `backward', search in the reverse direction."
   (when (equal regexp "")
     (setq regexp (car Info-search-history)))
   (when regexp
-    (let (found beg-found give-up
-          (backward (eq direction 'backward))
-          (onode Info-current-node)
-          (ofile Info-current-file)
-          (opoint (point))
-          (opoint-min (point-min))
-          (opoint-max (point-max))
-          (ostart (window-start))
-          (osubfile Info-current-subfile))
-      (setq Info-search-case-fold case-fold-search)
-      (save-excursion
-        (save-restriction
-          (widen)
-          (when backward
-            ;; Hide Info file header for backward search
-            (narrow-to-region (save-excursion
-                                (goto-char (point-min))
-                                (search-forward "\n\^_")
-                                (1- (point)))
-                              (point-max)))
-          (while (and (not give-up)
-                      (or (null found)
-                          (not (run-hook-with-args-until-failure
-                                'isearch-filter-predicates beg-found found))))
-            (let ((search-spaces-regexp Info-search-whitespace-regexp))
-              (if (if backward
-                      (re-search-backward regexp bound t)
-                    (re-search-forward regexp bound t))
-                  (setq found (point) beg-found (if backward (match-end 0)
-                                                  (match-beginning 0)))
-                (setq give-up t))))))
-
-      (when (and isearch-mode Info-isearch-search
-                 (not Info-isearch-initial-node)
-                 (not bound)
-                 (or give-up (and found (not (and (> found opoint-min)
-                                                  (< found opoint-max))))))
+    (setq Info-search-case-fold case-fold-search)
+    (let* ((backward (eq direction 'backward))
+           (onode Info-current-node)
+           (ofile Info-current-file)
+           (opoint (point))
+           (opoint-min (point-min))
+           (opoint-max (point-max))
+           (ostart (window-start))
+           (osubfile Info-current-subfile)
+           (found
+            (save-excursion
+              (save-restriction
+                (widen)
+                (Info--search-loop regexp bound backward)))))
+
+      (unless (or (not isearch-mode) (not Info-isearch-search)
+                  Info-isearch-initial-node
+                  bound
+                  (and found (> found opoint-min) (< found opoint-max)))
         (signal 'search-failed (list regexp "end of node")))
 
       ;; If no subfiles, give error now.
-      (if give-up
-          (if (null Info-current-subfile)
-              (if isearch-mode
-                  (signal 'search-failed (list regexp "end of manual"))
-                (let ((search-spaces-regexp Info-search-whitespace-regexp))
-                  (if backward
-                      (re-search-backward regexp)
-                    (re-search-forward regexp))))
-            (setq found nil)))
+      (unless (or found Info-current-subfile)
+        (if isearch-mode
+            (signal 'search-failed (list regexp "end of manual"))
+          (let ((search-spaces-regexp Info-search-whitespace-regexp))
+            (if backward
+                (re-search-backward regexp)
+              (re-search-forward regexp)))))
 
       (if (and bound (not found))
           (signal 'search-failed (list regexp)))
@@ -2009,29 +2013,9 @@ If DIRECTION is `backward', search in the reverse direction."
               (while list
                 (message "Searching subfile %s..." (cdr (car list)))
                 (Info-read-subfile (car (car list)))
-                (when backward
-                  ;; Hide Info file header for backward search
-                  (narrow-to-region (save-excursion
-                                      (goto-char (point-min))
-                                      (search-forward "\n\^_")
-                                      (1- (point)))
-                                    (point-max))
-                  (goto-char (point-max)))
+                (when backward (goto-char (point-max)))
                 (setq list (cdr list))
-                (setq give-up nil found nil)
-                (while (and (not give-up)
-                            (or (null found)
-                                (not (run-hook-with-args-until-failure
-                                      'isearch-filter-predicates beg-found found))))
-                  (let ((search-spaces-regexp Info-search-whitespace-regexp))
-                    (if (if backward
-                            (re-search-backward regexp nil t)
-                          (re-search-forward regexp nil t))
-                        (setq found (point) beg-found (if backward (match-end 0)
-                                                        (match-beginning 0)))
-                      (setq give-up t))))
-                (if give-up
-                    (setq found nil))
+                (setq found (Info--search-loop regexp nil backward))
                 (if found
                     (setq list nil)))
               (if found
@@ -4288,8 +4272,7 @@ Advanced commands:
        'Info-isearch-wrap)
   (set (make-local-variable 'isearch-push-state-function)
        'Info-isearch-push-state)
-  (set (make-local-variable 'isearch-filter-predicates)
-       '(Info-isearch-filter))
+  (set (make-local-variable 'isearch-filter-predicate) #'Info-isearch-filter)
   (set (make-local-variable 'revert-buffer-function)
        'Info-revert-buffer-function)
   (Info-set-mode-line)
diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index 9f56b1c8b7d..ce6256c1e47 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -1078,10 +1078,10 @@ with L, LRE, or LRO Unicode bidi character type.")
 ;;  (lambda (range ignore) (set-char-table-range char-width-table range 2))
 ;; 'tibetan)
 (map-charset-chars
- (lambda (range ignore) (set-char-table-range char-width-table range 2))
+ (lambda (range _ignore) (set-char-table-range char-width-table range 2))
  'indian-2-column)
 (map-charset-chars
- (lambda (range ignore) (set-char-table-range char-width-table range 2))
+ (lambda (range _ignore) (set-char-table-range char-width-table range 2))
  'arabic-2-column)
 
 ;; Internal use only.
@@ -1110,8 +1110,7 @@ with L, LRE, or LRO Unicode bidi character type.")
 (defun use-cjk-char-width-table (locale-name)
   (while (char-table-parent char-width-table)
     (setq char-width-table (char-table-parent char-width-table)))
-  (let ((slot (assq locale-name cjk-char-width-table-list))
-        table)
+  (let ((slot (assq locale-name cjk-char-width-table-list)))
     (or slot (error "Unknown locale for CJK language environment: %s"
                     locale-name))
     (unless (nth 1 slot)
@@ -1119,7 +1118,7 @@ with L, LRE, or LRO Unicode bidi character type.")
         (dolist (charset-info (nthcdr 2 slot))
           (let ((charset (car charset-info)))
             (dolist (code-range (cdr charset-info))
-              (map-charset-chars #'(lambda (range arg)
+              (map-charset-chars #'(lambda (range _arg)
                                      (set-char-table-range table range 2))
                                  charset nil
                                  (car code-range) (cdr code-range)))))
@@ -1326,7 +1325,7 @@ Setup char-width-table appropriate for non-CJK language environment."
   (set-char-table-extra-slot char-script-table 0 (nreverse script-list)))
 
 (map-charset-chars
- #'(lambda (range ignore)
+ #'(lambda (range _ignore)
      (set-char-table-range char-script-table range 'tibetan))
  'tibetan)
 
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index c2bbb171241..324d615c581 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -357,7 +357,7 @@
     (dolist (elt cjk)
       (let ((mask (lsh 1 i)))
         (map-charset-chars
-         #'(lambda (range arg)
+         #'(lambda (range _arg)
              (let ((from (car range)) (to (cdr range)))
                (if (< to #x110000)
                    (while (<= from to)
@@ -876,7 +876,7 @@ Return nil if PATTERN doesn't conform to XLFD."
               (aset xlfd-fields i nil)))
         xlfd-fields)))
 
-(defun x-compose-font-name (fields &optional reduce)
+(defun x-compose-font-name (fields &optional _reduce)
   "Compose X fontname from FIELDS.
 FIELDS is a vector of XLFD fields, of length 12.
 If a field is nil, wild-card letter `*' is embedded.
@@ -954,7 +954,7 @@ Done when `mouse-set-font' is called."
         (let ((family (aref xlfd-fields xlfd-regexp-family-subnum))
               (weight (aref xlfd-fields xlfd-regexp-weight-subnum))
               (slant  (aref xlfd-fields xlfd-regexp-slant-subnum))
-              (swidth (aref xlfd-fields xlfd-regexp-swidth-subnum))
+              ;(swidth (aref xlfd-fields xlfd-regexp-swidth-subnum))
               (size   (aref xlfd-fields xlfd-regexp-pixelsize-subnum))
               (nickname (aref xlfd-fields xlfd-regexp-registry-subnum))
               name)
@@ -1039,7 +1039,7 @@ This alist is used by the function `create-fontset-from-fontset-spec'
 to map charsets to scripts.")
 
 (defun create-fontset-from-fontset-spec (fontset-spec
-                                         &optional style-variant noerror)
+                                         &optional _style-variant _noerror)
   "Create a fontset from fontset specification string FONTSET-SPEC.
 FONTSET-SPEC is a string of the format:
         FONTSET-NAME,SCRIPT-NAME0:FONT-NAME0,SCRIPT-NAME1:FONT-NAME1, ...
diff --git a/lisp/international/kkc.el b/lisp/international/kkc.el
index a7d3ac5d017..13833fad66b 100644
--- a/lisp/international/kkc.el
+++ b/lisp/international/kkc.el
@@ -207,7 +207,7 @@ area while indicating the current selection by `<N>'."
                   kkc-current-conversions-width nil
                   kkc-current-conversions (cons 0 nil)))))))
 
-(put 'kkc-error 'error-conditions '(kkc-error error))
+(define-error 'kkc-error nil)
 (defun kkc-error (&rest args)
   (signal 'kkc-error (apply 'format args)))
 
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 62b96720771..34b1576d23e 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1739,8 +1739,8 @@ This hook is mainly used for canceling the effect of
 This variable should be set only with \\[customize], which is equivalent
 to using the function `set-language-environment'."
   :link '(custom-manual "(emacs)Language Environments")
-  :set (lambda (symbol value) (set-language-environment value))
-  :get (lambda (x)
+  :set (lambda (_symbol value) (set-language-environment value))
+  :get (lambda (_x)
          (or (car-safe (assoc-string
                         (if (symbolp current-language-environment)
                             (symbol-name current-language-environment)
diff --git a/lisp/international/mule-util.el b/lisp/international/mule-util.el
index 15a7dc10f65..21e09593187 100644
--- a/lisp/international/mule-util.el
+++ b/lisp/international/mule-util.el
@@ -125,59 +125,6 @@ defaults to \"...\"."
       (concat head-padding (substring str from-idx idx)
               tail-padding ellipsis))))
 
-;;; Test suite for truncate-string-to-width
-;; (dolist (test '((("" 0) . "")
-;;              (("x" 1) . "x")
-;;              (("xy" 1) . "x")
-;;              (("xy" 2 1) . "y")
-;;              (("xy" 0) . "")
-;;              (("xy" 3) . "xy")
-;;              (("中" 0) . "")
-;;              (("中" 1) . "")
-;;              (("中" 2) . "中")
-;;              (("中" 1 nil ? ) . " ")
-;;              (("中文" 3 1 ? ) . "  ")
-;;              (("x中x" 2) . "x")
-;;              (("x中x" 3) . "x中")
-;;              (("x中x" 3) . "x中")
-;;              (("x中x" 4 1) . "中x")
-;;              (("kor한e글an" 8 1 ? ) . "or한e글")
-;;              (("kor한e글an" 7 2 ? ) . "r한e ")
-;;              (("" 0 nil nil "...") . "")
-;;              (("x" 3 nil nil "...") . "x")
-;;              (("中" 3 nil nil "...") . "中")
-;;              (("foo" 3 nil nil "...") . "foo")
-;;              (("foo" 2 nil nil "...") . "fo") ;; XEmacs failure?
-;;              (("foobar" 6 0 nil "...") . "foobar")
-;;              (("foobarbaz" 6 nil nil "...") . "foo...")
-;;              (("foobarbaz" 7 2 nil "...") . "ob...")
-;;              (("foobarbaz" 9 3 nil "...") . "barbaz")
-;;              (("こhんeにlちlはo" 15 1 ?  t) . " hんeにlちlはo")
-;;              (("こhんeにlちlはo" 14 1 ?  t) . " hんeにlち...")
-;;              (("x" 3 nil nil "粵語") . "x")
-;;              (("中" 2 nil nil "粵語") . "中")
-;;              (("中" 1 nil ?x "粵語") . "x") ;; XEmacs error
-;;              (("中文" 3 nil ?  "粵語") . "中 ") ;; XEmacs error
-;;              (("foobarbaz" 4 nil nil  "粵語") . "粵語")
-;;              (("foobarbaz" 5 nil nil  "粵語") . "f粵語")
-;;              (("foobarbaz" 6 nil nil  "粵語") . "fo粵語")
-;;              (("foobarbaz" 8 3 nil "粵語") . "b粵語")
-;;              (("こhんeにlちlはo" 14 4 ?x "日本語") . "xeに日本語")
-;;              (("こhんeにlちlはo" 13 4 ?x "日本語") . "xex日本語")
-;;              ))
-;;   (let (ret)
-;;     (condition-case e
-;;      (setq ret (apply #'truncate-string-to-width (car test)))
-;;       (error (setq ret e)))
-;;     (unless (equal ret (cdr test))
-;;       (error "%s: expected %s, got %s"
-;;           (prin1-to-string (cons 'truncate-string-to-width (car test)))
-;;           (prin1-to-string (cdr test))
-;;           (if (consp ret)
-;;               (format "error: %s: %s" (car ret)
-;;                       (prin1-to-string (cdr ret)))
-;;             (prin1-to-string ret))))))
-
 
 ;;; Nested alist handler.  Nested alist is alist whose elements are
 ;;; also nested alist.
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 11c4db5977d..9af6bc369a4 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -407,12 +407,12 @@ PLIST (property list) may contain any type of information a user
 ;; because that makes a bootstrapping problem
 ;; if you need to recompile all the Lisp files using interpreted code.
 
-(defun charset-id (charset)
+(defun charset-id (_charset)
   "Always return 0.  This is provided for backward compatibility."
   (declare (obsolete nil "23.1"))
   0)
 
-(defmacro charset-bytes (charset)
+(defmacro charset-bytes (_charset)
   "Always return 0.  This is provided for backward compatibility."
   (declare (obsolete nil "23.1"))
   0)
@@ -471,7 +471,7 @@ Return -1 if charset isn't an ISO 2022 one."
 ;;; CHARACTER
 (define-obsolete-function-alias 'char-valid-p 'characterp "23.1")
 
-(defun generic-char-p (char)
+(defun generic-char-p (_char)
   "Always return nil.  This is provided for backward compatibility."
   (declare (obsolete nil "23.1"))
   nil)
@@ -1346,7 +1346,7 @@ graphical terminals."
   (if coding-system
       (setq default-terminal-coding-system coding-system))
   (set-terminal-coding-system-internal coding-system terminal)
-  (redraw-frame (selected-frame)))
+  (redraw-frame))
 
 (defvar default-keyboard-coding-system nil
   "Default value of the keyboard coding system.
@@ -1429,7 +1429,7 @@ use either \\[customize] or \\[set-keyboard-coding-system]."
   :type '(coding-system :tag "Coding system")
   :link '(info-link "(emacs)Terminal Coding")
   :link '(info-link "(emacs)Unibyte Mode")
-  :set (lambda (symbol value)
+  :set (lambda (_symbol value)
          ;; Don't load encoded-kb unnecessarily.
          (if (or value (boundp 'encoded-kbd-setup-display))
              (set-keyboard-coding-system value)
@@ -1850,7 +1850,7 @@ If nothing is specified, the return value is nil."
              (head-end (+ head-start (min size 1024)))
              (tail-start (+ head-start (max (- size 3072) 0)))
              (tail-end (+ head-start size))
-             coding-system head-found tail-found pos char-trans)
+             coding-system head-found tail-found char-trans)
         ;; Try a short cut by searching for the string "coding:"
         ;; and for "unibyte:" at the head and tail of SIZE bytes.
         (setq head-found (or (search-forward "coding:" head-end t)
@@ -1960,11 +1960,10 @@ use \"coding: 'raw-text\" instead." :warning)
       (let ((funcs auto-coding-functions)
             (coding-system nil))
         (while (and funcs (not coding-system))
-          (setq coding-system (condition-case e
-                                  (save-excursion
-                                    (goto-char (point-min))
-                                    (funcall (pop funcs) size))
-                                (error nil))))
+          (setq coding-system (ignore-errors
+                                (save-excursion
+                                  (goto-char (point-min))
+                                  (funcall (pop funcs) size)))))
         (if coding-system
             (cons coding-system 'auto-coding-functions)))))
 
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index 68fffc0e817..245f7975d91 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -1301,7 +1301,7 @@ The returned value is a Quail map specific to KEY."
         (setcdr map (funcall (cdr map) key len)))
     map))
 
-(put 'quail-error 'error-conditions '(quail-error error))
+(define-error 'quail-error nil)
 (defun quail-error (&rest args)
   (signal 'quail-error (apply 'format args)))
 
diff --git a/lisp/isearch.el b/lisp/isearch.el
index ec4f32aecca..131ab5893d4 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -187,21 +187,15 @@ or to the end of the buffer for a backward search.")
   "Function to save a function restoring the mode-specific Isearch state
 to the search status stack.")
 
-(defvar isearch-filter-predicates nil
-  "Predicates that filter the search hits that would normally be available.
-Search hits that dissatisfy the list of predicates are skipped.
-Each function in this list has two arguments: the positions of
-start and end of text matched by the search.
-The search loop uses `run-hook-with-args-until-failure' to call
-each predicate in order, and when one of the predicates returns nil,
-skips this match and continues searching for the next match.
-When the list of predicates is empty, `run-hook-with-args-until-failure'
-returns non-nil that means that the found match is accepted.
-The property `isearch-message-prefix' put on the predicate's symbol
-specifies the prefix string displayed in the search message.")
-(define-obsolete-variable-alias 'isearch-filter-predicate
-                                'isearch-filter-predicates
-                                "24.4")
+(defvar isearch-filter-predicate #'isearch-filter-visible
+  "Predicate that filter the search hits that would normally be available.
+Search hits that dissatisfy the predicate are skipped.  The function
+has two arguments: the positions of start and end of text matched by
+the search.  If this function returns nil, continue searching without
+stopping at this match.
+If you use `add-function' to modify this variable, you can use the
+`isearch-message-prefix' advice property to specify the prefix string
+displayed in the search message.")
 
 ;; Search ring.
 
@@ -783,7 +777,7 @@ See the command `isearch-forward' for more information."
   (interactive "P\np")
   (isearch-mode t nil nil (not no-recursive-edit) (null not-word)))
 
-(defun isearch-forward-symbol (&optional not-symbol no-recursive-edit)
+(defun isearch-forward-symbol (&optional _not-symbol no-recursive-edit)
   "Do incremental search forward for a symbol.
 The prefix argument is currently unused.
 Like ordinary incremental search except that your input is treated
@@ -1015,7 +1009,7 @@ NOPUSH is t and EDIT is t."
   (setq minibuffer-message-timeout isearch-original-minibuffer-message-timeout)
   (isearch-dehighlight)
   (lazy-highlight-cleanup lazy-highlight-cleanup)
-  (let ((found-start (window-start (selected-window)))
+  (let ((found-start (window-start))
         (found-point (point)))
     (when isearch-window-configuration
       (set-window-configuration isearch-window-configuration)
@@ -2255,7 +2249,9 @@ the bottom."
 Return the key sequence as a string/vector."
   (isearch-unread-key-sequence keylist)
   (let (overriding-terminal-local-map)
-    (read-key-sequence nil)))  ; This will go through function-key-map, if nec.
+    ;; This will go through function-key-map, if nec.
+    ;; The arg DONT-DOWNCASE-LAST prevents premature shift-translation.
+    (read-key-sequence nil nil t)))
 
 (defun isearch-lookup-scroll-key (key-seq)
   "If KEY-SEQ is bound to a scrolling command, return it as a symbol.
@@ -2313,6 +2309,16 @@ Isearch mode."
                     (lookup-key local-function-key-map key)))
              (while keylist
                (setq key (car keylist))
+               ;; Handle an undefined shifted printing character
+               ;; by downshifting it if that makes it printing.
+               ;; (As read-key-sequence would normally do,
+               ;; if we didn't have a default definition.)
+               (if (and (integerp key)
+                        (memq 'shift (event-modifiers key))
+                        (>= key (+ ?\s (- ?\S-a ?a)))
+                        (/= key (+ 127 (- ?\S-a ?a)))
+                        (<  key (+ 256 (- ?\S-a ?a))))
+                   (setq key (- key (- ?\S-a ?a))))
                ;; If KEY is a printing char, we handle it here
                ;; directly to avoid the input method and keyboard
                ;; coding system translating it.
@@ -2392,6 +2398,13 @@ Isearch mode."
              (isearch-unread-key-sequence keylist)
              (setq main-event (car unread-command-events))
 
+             ;; Don't store special commands in the keyboard macro.
+             (let (overriding-terminal-local-map)
+               (when (memq (key-binding key)
+                           '(kmacro-start-macro
+                             kmacro-end-macro kmacro-end-and-call-macro))
+                 (cancel-kbd-macro-events)))
+
              ;; If we got a mouse click event, that event contains the
              ;; window clicked on. maybe it was read with the buffer
              ;; it was clicked on.  If so, that buffer, not the current one,
@@ -2436,10 +2449,14 @@ With argument, add COUNT copies of the character."
         (if (subregexp-context-p isearch-string (length isearch-string))
             (isearch-process-search-string "[ ]" " ")
           (isearch-process-search-char char count))
-      (and enable-multibyte-characters
-           (>= char ?\200)
-           (<= char ?\377)
-           (setq char (unibyte-char-to-multibyte char)))
+      ;; This used to assume character codes 0240 - 0377 stand for
+      ;; characters in some single-byte character set, and converted them
+      ;; to Emacs characters.  But in 23.1 this feature is deprecated
+      ;; in favor of inserting the corresponding Unicode characters.
+      ;; (and enable-multibyte-characters
+      ;;      (>= char ?\200)
+      ;;      (<= char ?\377)
+      ;;      (setq char (unibyte-char-to-multibyte char)))
       (isearch-process-search-char char count))))
 
 (defun isearch-printing-char (&optional char count)
@@ -2614,13 +2631,13 @@ If there is no completion possible, say so and continue searching."
                               (< (point) isearch-opoint)))
                        "over")
                    (if isearch-wrapped "wrapped ")
-                   (mapconcat (lambda (s)
-                                (and (symbolp s)
-                                     (get s 'isearch-message-prefix)))
-                              (if (consp isearch-filter-predicates)
-                                  isearch-filter-predicates
-                                (list isearch-filter-predicates))
-                              "")
+                   (let ((prefix ""))
+                     (advice-function-mapc
+                      (lambda (_ props)
+                        (let ((np (cdr (assq 'isearch-message-prefix props))))
+                          (if np (setq prefix (concat np prefix)))))
+                      isearch-filter-predicate)
+                     prefix)
                    (if isearch-word
                        (or (and (symbolp isearch-word)
                                 (get isearch-word 'isearch-message-prefix))
@@ -2766,15 +2783,8 @@ update the match data, and return point."
           (if (or (not isearch-success)
                   (bobp) (eobp)
                   (= (match-beginning 0) (match-end 0))
-                  ;; When one of filter predicates returns nil,
-                  ;; retry the search.  Otherwise, act according
-                  ;; to search-invisible (open overlays, etc.)
-                  (and (run-hook-with-args-until-failure
-                        'isearch-filter-predicates
-                        (match-beginning 0) (match-end 0))
-                       (or (eq search-invisible t)
-                           (not (isearch-range-invisible
-                                 (match-beginning 0) (match-end 0))))))
+                  (funcall isearch-filter-predicate
+                           (match-beginning 0) (match-end 0)))
               (setq retry nil)))
         (setq isearch-just-started nil)
         (if isearch-success
@@ -2786,10 +2796,18 @@ update the match data, and return point."
 
     (invalid-regexp
      (setq isearch-error (car (cdr lossage)))
-     (if (string-match
-          "\\`Premature \\|\\`Unmatched \\|\\`Invalid "
-          isearch-error)
-         (setq isearch-error "incomplete input")))
+     (cond
+      ((string-match
+        "\\`Premature \\|\\`Unmatched \\|\\`Invalid "
+        isearch-error)
+       (setq isearch-error "incomplete input"))
+      ((and (not isearch-regexp)
+            (string-match "\\`Regular expression too big" isearch-error))
+       (cond
+        (isearch-word
+         (setq isearch-error "Too many words"))
+        ((and isearch-lax-whitespace search-whitespace-regexp)
+         (setq isearch-error "Too many spaces for whitespace matching"))))))
 
     (search-failed
      (setq isearch-success nil)
@@ -2951,7 +2969,6 @@ determined by `isearch-range-invisible' unless invisible text can be
 searched too when `search-invisible' is t."
   (or (eq search-invisible t)
       (not (isearch-range-invisible beg end))))
-(make-obsolete 'isearch-filter-visible 'isearch-invisible "24.4")
 
 
 ;; General utilities
@@ -3177,11 +3194,8 @@ Attempt to do the search exactly the way the pending Isearch would."
           (if (or (not success)
                   (= (point) bound) ; like (bobp) (eobp) in `isearch-search'.
                   (= (match-beginning 0) (match-end 0))
-                  (and (run-hook-with-args-until-failure
-                        'isearch-filter-predicates
-                        (match-beginning 0) (match-end 0))
-                       (not (isearch-range-invisible
-                             (match-beginning 0) (match-end 0)))))
+                  (funcall isearch-filter-predicate
+                           (match-beginning 0) (match-end 0)))
               (setq retry nil)))
         success)
     (error nil)))
diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el
index 9d700a5ed82..d0e88309daf 100644
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -482,7 +482,7 @@ non-nil in a repeated invocation of this function."
     (cancel-timer jit-lock-stealth-repeat-timer))
   (unless (or executing-kbd-macro
               memory-full
-              (window-minibuffer-p (selected-window))
+              (window-minibuffer-p)
               ;; For first invocation set up `jit-lock-stealth-buffers'.
               ;; In repeated invocations it's already been set up.
               (null (if repeat
diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index 5664a890cb1..7266dc9ec80 100644
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -109,8 +109,7 @@ data appears to be compressed already.")
 (put 'jka-compr-really-do-compress 'permanent-local t)
 
 
-(put 'compression-error 'error-conditions '(compression-error file-error error))
-
+(define-error 'compression-error nil 'file-error)
 
 (defvar jka-compr-acceptable-retval-list '(0 2 141))
 
diff --git a/lisp/json.el b/lisp/json.el
index 29beaedebe9..aaa7bb0c499 100644
--- a/lisp/json.el
+++ b/lisp/json.el
@@ -177,36 +177,14 @@ without indentation.")
 
 ;; Error conditions
 
-(put 'json-error 'error-message "Unknown JSON error")
-(put 'json-error 'error-conditions '(json-error error))
-
-(put 'json-readtable-error 'error-message "JSON readtable error")
-(put 'json-readtable-error 'error-conditions
-     '(json-readtable-error json-error error))
-
-(put 'json-unknown-keyword 'error-message "Unrecognized keyword")
-(put 'json-unknown-keyword 'error-conditions
-     '(json-unknown-keyword json-error error))
-
-(put 'json-number-format 'error-message "Invalid number format")
-(put 'json-number-format 'error-conditions
-     '(json-number-format json-error error))
-
-(put 'json-string-escape 'error-message "Bad Unicode escape")
-(put 'json-string-escape 'error-conditions
-     '(json-string-escape json-error error))
-
-(put 'json-string-format 'error-message "Bad string format")
-(put 'json-string-format 'error-conditions
-     '(json-string-format json-error error))
-
-(put 'json-key-format 'error-message "Bad JSON object key")
-(put 'json-key-format 'error-conditions
-     '(json-key-format json-error error))
-
-(put 'json-object-format 'error-message "Bad JSON object")
-(put 'json-object-format 'error-conditions
-     '(json-object-format json-error error))
+(define-error 'json-error "Unknown JSON error")
+(define-error 'json-readtable-error "JSON readtable error" 'json-error)
+(define-error 'json-unknown-keyword "Unrecognized keyword" 'json-error)
+(define-error 'json-number-format "Invalid number format" 'json-error)
+(define-error 'json-string-escape "Bad Unicode escape" 'json-error)
+(define-error 'json-string-format "Bad string format" 'json-error)
+(define-error 'json-key-format "Bad JSON object key" 'json-error)
+(define-error 'json-object-format "Bad JSON object" 'json-error)
 
 
 
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index 2c99f2bde2e..26268f5924c 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -65,8 +65,8 @@ should return a grid vector array that is the new solution.
 
 ;;;***
 
-;;;### (autoloads nil "ada-mode" "progmodes/ada-mode.el" (20874 62962
-;;;;;;  290468 0))
+;;;### (autoloads nil "ada-mode" "progmodes/ada-mode.el" (20998 4934
+;;;;;;  952905 0))
 ;;; Generated autoloads from progmodes/ada-mode.el
 
 (autoload 'ada-add-extensions "ada-mode" "\
@@ -96,8 +96,8 @@ Insert a descriptive header at the top of the file.
 
 ;;;***
 
-;;;### (autoloads nil "ada-xref" "progmodes/ada-xref.el" (20709 26818
-;;;;;;  907104 0))
+;;;### (autoloads nil "ada-xref" "progmodes/ada-xref.el" (21024 28968
+;;;;;;  738399 0))
 ;;; Generated autoloads from progmodes/ada-xref.el
 
 (autoload 'ada-find-file "ada-xref" "\
@@ -108,7 +108,7 @@ Completion is available.
 
 ;;;***
 
-;;;### (autoloads nil "add-log" "vc/add-log.el" (20709 26818 907104
+;;;### (autoloads nil "add-log" "vc/add-log.el" (20992 52525 458637
 ;;;;;;  0))
 ;;; Generated autoloads from vc/add-log.el
 
@@ -238,8 +238,8 @@ old-style time formats for entries are supported.
 
 ;;;***
 
-;;;### (autoloads nil "advice" "emacs-lisp/advice.el" (20725 15032
-;;;;;;  264919 0))
+;;;### (autoloads nil "advice" "emacs-lisp/advice.el" (20991 31656
+;;;;;;  363459 0))
 ;;; Generated autoloads from emacs-lisp/advice.el
 
 (defvar ad-redefinition-action 'warn "\
@@ -375,7 +375,7 @@ usage: (defadvice FUNCTION (CLASS NAME [POSITION] [ARGLIST] FLAG...)
 
 ;;;***
 
-;;;### (autoloads nil "align" "align.el" (20709 26818 907104 0))
+;;;### (autoloads nil "align" "align.el" (21012 37798 962028 0))
 ;;; Generated autoloads from align.el
 
 (autoload 'align "align" "\
@@ -399,15 +399,8 @@ on the format of these lists.
 
 (autoload 'align-regexp "align" "\
 Align the current region using an ad-hoc rule read from the minibuffer.
-BEG and END mark the limits of the region.  This function will prompt
-for the REGEXP to align with.  If no prefix arg was specified, you
-only need to supply the characters to be lined up and any preceding
-whitespace is replaced.  If a prefix arg was specified, the full
-regexp with parenthesized whitespace should be supplied; it will also
-prompt for which parenthesis GROUP within REGEXP to modify, the amount
-of SPACING to use, and whether or not to REPEAT the rule throughout
-the line.  See `align-rules-list' for more information about these
-options.
+BEG and END mark the limits of the region.  Interactively, this function
+prompts for the regular expression REGEXP to align with.
 
 For example, let's say you had a list of phone numbers, and wanted to
 align them so that the opening parentheses would line up:
@@ -418,8 +411,29 @@ align them so that the opening parentheses would line up:
     Joe (123) 456-7890
 
 There is no predefined rule to handle this, but you could easily do it
-using a REGEXP like \"(\".  All you would have to do is to mark the
-region, call `align-regexp' and type in that regular expression.
+using a REGEXP like \"(\".  Interactively, all you would have to do is
+to mark the region, call `align-regexp' and enter that regular expression.
+
+REGEXP must contain at least one parenthesized subexpression, typically
+whitespace of the form \"\\\\(\\\\s-*\\\\)\".  In normal interactive use,
+this is automatically added to the start of your regular expression after
+you enter it.  You only need to supply the characters to be lined up, and
+any preceding whitespace is replaced.
+
+If you specify a prefix argument (or use this function non-interactively),
+you must enter the full regular expression, including the subexpression.
+The function also then prompts for which subexpression parenthesis GROUP
+\(default 1) within REGEXP to modify, the amount of SPACING (default
+`align-default-spacing') to use, and whether or not to REPEAT the rule
+throughout the line.
+
+See `align-rules-list' for more information about these options.
+
+The non-interactive form of the previous example would look something like:
+  (align-regexp (point-min) (point-max) \"\\\\(\\\\s-*\\\\)(\")
+
+This function is a nothing more than a small wrapper that helps you
+construct a rule to pass to `align-region', which does the real work.
 
 \(fn BEG END REGEXP &optional GROUP SPACING REPEAT)" t nil)
 
@@ -464,9 +478,9 @@ A replacement function for `newline-and-indent', aligning as it goes.
 
 ;;;***
 
-;;;### (autoloads nil "allout" "allout.el" (20932 10282 564846 0))
+;;;### (autoloads nil "allout" "allout.el" (20996 49577 892030 0))
 ;;; Generated autoloads from allout.el
-(push (purecopy (quote (allout 2 3))) package--builtin-versions)
+(push (purecopy '(allout 2 3)) package--builtin-versions)
 (autoload 'allout-auto-activation-helper "allout" "\
 Institute `allout-auto-activation'.
 
@@ -823,10 +837,10 @@ for details on preparing Emacs for automatic allout activation.
 
 ;;;***
 
-;;;### (autoloads nil "allout-widgets" "allout-widgets.el" (20932
-;;;;;;  61699 522706 0))
+;;;### (autoloads nil "allout-widgets" "allout-widgets.el" (20996
+;;;;;;  49577 892030 0))
 ;;; Generated autoloads from allout-widgets.el
-(push (purecopy (quote (allout-widgets 1 0))) package--builtin-versions)
+(push (purecopy '(allout-widgets 1 0)) package--builtin-versions)
 (let ((loads (get 'allout-widgets 'custom-loads))) (if (member '"allout-widgets" loads) nil (put 'allout-widgets 'custom-loads (cons '"allout-widgets" loads))))
 
 (autoload 'allout-widgets-setup "allout-widgets" "\
@@ -883,7 +897,7 @@ outline hot-spot navigation (see `allout-mode').
 
 ;;;***
 
-;;;### (autoloads nil "ange-ftp" "net/ange-ftp.el" (20843 54187 671468
+;;;### (autoloads nil "ange-ftp" "net/ange-ftp.el" (21005 64551 555603
 ;;;;;;  0))
 ;;; Generated autoloads from net/ange-ftp.el
 
@@ -938,10 +952,10 @@ the buffer *Birthday-Present-for-Name*.
 
 ;;;***
 
-;;;### (autoloads nil "ansi-color" "ansi-color.el" (20930 54950 26050
+;;;### (autoloads nil "ansi-color" "ansi-color.el" (20975 43430 521692
 ;;;;;;  0))
 ;;; Generated autoloads from ansi-color.el
-(push (purecopy (quote (ansi-color 3 4 2))) package--builtin-versions)
+(push (purecopy '(ansi-color 3 4 2)) package--builtin-versions)
 (autoload 'ansi-color-for-comint-mode-on "ansi-color" "\
 Set `ansi-color-for-comint-mode' to t.
 
@@ -964,10 +978,10 @@ This is a good function to put in `comint-output-filter-functions'.
 
 ;;;***
 
-;;;### (autoloads nil "antlr-mode" "progmodes/antlr-mode.el" (20709
-;;;;;;  26818 907104 0))
+;;;### (autoloads nil "antlr-mode" "progmodes/antlr-mode.el" (21022
+;;;;;;  34805 522289 827000))
 ;;; Generated autoloads from progmodes/antlr-mode.el
-(push (purecopy (quote (antlr-mode 2 2 3))) package--builtin-versions)
+(push (purecopy '(antlr-mode 2 2 3)) package--builtin-versions)
 (autoload 'antlr-show-makefile-rules "antlr-mode" "\
 Show Makefile rules for all grammar files in the current directory.
 If the `major-mode' of the current buffer has the value `makefile-mode',
@@ -1000,7 +1014,7 @@ Used in `antlr-mode'.  Also a useful function in `java-mode-hook'.
 
 ;;;***
 
-;;;### (autoloads nil "appt" "calendar/appt.el" (20709 26818 907104
+;;;### (autoloads nil "appt" "calendar/appt.el" (20992 52525 458637
 ;;;;;;  0))
 ;;; Generated autoloads from calendar/appt.el
 
@@ -1022,7 +1036,8 @@ ARG is positive, otherwise off.
 
 ;;;***
 
-;;;### (autoloads nil "apropos" "apropos.el" (20716 56 356960 0))
+;;;### (autoloads nil "apropos" "apropos.el" (20991 31656 363459
+;;;;;;  0))
 ;;; Generated autoloads from apropos.el
 
 (autoload 'apropos-read-pattern "apropos" "\
@@ -1232,7 +1247,7 @@ Entering array mode calls the function `array-mode-hook'.
 ;;;### (autoloads nil "artist" "textmodes/artist.el" (20891 18859
 ;;;;;;  893295 0))
 ;;; Generated autoloads from textmodes/artist.el
-(push (purecopy (quote (artist 1 2 6))) package--builtin-versions)
+(push (purecopy '(artist 1 2 6)) package--builtin-versions)
 (autoload 'artist-mode "artist" "\
 Toggle Artist mode.
 With argument ARG, turn Artist mode on if ARG is positive.
@@ -1463,8 +1478,8 @@ Special commands:
 
 ;;;***
 
-;;;### (autoloads nil "auth-source" "gnus/auth-source.el" (20929
-;;;;;;  34089 117790 0))
+;;;### (autoloads nil "auth-source" "gnus/auth-source.el" (20953
+;;;;;;  16424 151515 0))
 ;;; Generated autoloads from gnus/auth-source.el
 
 (defvar auth-source-cache-expiry 7200 "\
@@ -1548,7 +1563,7 @@ Major mode for editing Autoconf configure.ac files.
 
 ;;;***
 
-;;;### (autoloads nil "autoinsert" "autoinsert.el" (20709 26818 907104
+;;;### (autoloads nil "autoinsert" "autoinsert.el" (20950 40231 187426
 ;;;;;;  0))
 ;;; Generated autoloads from autoinsert.el
 
@@ -1587,8 +1602,8 @@ insert a template for the file depending on the mode of the buffer.
 
 ;;;***
 
-;;;### (autoloads nil "autoload" "emacs-lisp/autoload.el" (20925
-;;;;;;  37032 237257 0))
+;;;### (autoloads nil "autoload" "emacs-lisp/autoload.el" (20974
+;;;;;;  22577 548213 0))
 ;;; Generated autoloads from emacs-lisp/autoload.el
 
 (put 'generated-autoload-file 'safe-local-variable 'stringp)
@@ -1637,7 +1652,7 @@ should be non-nil).
 
 ;;;***
 
-;;;### (autoloads nil "autorevert" "autorevert.el" (20912 25000 802412
+;;;### (autoloads nil "autorevert" "autorevert.el" (20987 34598 970563
 ;;;;;;  0))
 ;;; Generated autoloads from autorevert.el
 
@@ -1726,7 +1741,7 @@ specifies in the mode line.
 
 ;;;***
 
-;;;### (autoloads nil "avoid" "avoid.el" (20709 26818 907104 0))
+;;;### (autoloads nil "avoid" "avoid.el" (21024 28968 738399 0))
 ;;; Generated autoloads from avoid.el
 
 (defvar mouse-avoidance-mode nil "\
@@ -1766,6 +1781,25 @@ definition of \"random distance\".)
 
 ;;;***
 
+;;;### (autoloads nil "bat-mode" "progmodes/bat-mode.el" (21024 28968
+;;;;;;  738399 0))
+;;; Generated autoloads from progmodes/bat-mode.el
+
+(add-to-list 'auto-mode-alist '("\\.\\(bat\\|cmd\\)\\'" . bat-mode))
+
+(autoload 'bat-mode "bat-mode" "\
+Major mode for editing DOS/Windows batch files.
+
+Start a new script from `bat-template'.  Read help pages for DOS commands
+with `bat-cmd-help'.  Navigate between sections using `imenu'.
+Run script using `bat-run' and `bat-run-args'.
+
+\\{bat-mode-map}
+
+\(fn)" t nil)
+
+;;;***
+
 ;;;### (autoloads nil "battery" "battery.el" (20791 9657 561026 0))
 ;;; Generated autoloads from battery.el
  (put 'battery-mode-line-string 'risky-local-variable t)
@@ -2086,8 +2120,8 @@ a reflection.
 
 ;;;***
 
-;;;### (autoloads nil "bookmark" "bookmark.el" (20874 65006 176325
-;;;;;;  548000))
+;;;### (autoloads nil "bookmark" "bookmark.el" (20998 4934 952905
+;;;;;;  0))
 ;;; Generated autoloads from bookmark.el
  (define-key ctl-x-r-map "b" 'bookmark-jump)
  (define-key ctl-x-r-map "m" 'bookmark-set)
@@ -2280,8 +2314,8 @@ Incremental search of bookmarks, hiding the non-matches as we go.
 
 ;;;***
 
-;;;### (autoloads nil "browse-url" "net/browse-url.el" (20929 34089
-;;;;;;  117790 0))
+;;;### (autoloads nil "browse-url" "net/browse-url.el" (20984 58408
+;;;;;;  354075 0))
 ;;; Generated autoloads from net/browse-url.el
 
 (defvar browse-url-browser-function 'browse-url-default-browser "\
@@ -2596,9 +2630,9 @@ from `browse-url-elinks-wrapper'.
 
 ;;;***
 
-;;;### (autoloads nil "bs" "bs.el" (20933 31141 450159 0))
+;;;### (autoloads nil "bs" "bs.el" (20992 52525 458637 0))
 ;;; Generated autoloads from bs.el
-(push (purecopy (quote (bs 1 17))) package--builtin-versions)
+(push (purecopy '(bs 1 17)) package--builtin-versions)
 (autoload 'bs-cycle-next "bs" "\
 Select next buffer defined by buffer cycling.
 The buffers taking part in buffer cycling are defined
@@ -2679,8 +2713,8 @@ Like `bug-reference-mode', but only buttonize in comments and strings.
 
 ;;;***
 
-;;;### (autoloads nil "bytecomp" "emacs-lisp/bytecomp.el" (20929
-;;;;;;  34089 117790 0))
+;;;### (autoloads nil "bytecomp" "emacs-lisp/bytecomp.el" (21024
+;;;;;;  55496 462544 366000))
 ;;; Generated autoloads from emacs-lisp/bytecomp.el
 (put 'byte-compile-dynamic 'safe-local-variable 'booleanp)
 (put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp)
@@ -2800,8 +2834,8 @@ and corresponding effects.
 
 ;;;***
 
-;;;### (autoloads nil "cal-china" "calendar/cal-china.el" (20709
-;;;;;;  26818 907104 0))
+;;;### (autoloads nil "cal-china" "calendar/cal-china.el" (21023
+;;;;;;  8104 618865 0))
 ;;; Generated autoloads from calendar/cal-china.el
 
 (put 'calendar-chinese-time-zone 'risky-local-variable t)
@@ -2837,7 +2871,7 @@ from the cursor position.
 
 ;;;***
 
-;;;### (autoloads nil "calc" "calc/calc.el" (20932 10282 564846 0))
+;;;### (autoloads nil "calc" "calc/calc.el" (20998 4934 952905 0))
 ;;; Generated autoloads from calc/calc.el
  (define-key ctl-x-map "*" 'calc-dispatch)
 
@@ -2932,7 +2966,7 @@ See Info node `(calc)Defining Functions'.
 
 ;;;***
 
-;;;### (autoloads nil "calculator" "calculator.el" (20891 18859 893295
+;;;### (autoloads nil "calculator" "calculator.el" (21024 28968 738399
 ;;;;;;  0))
 ;;; Generated autoloads from calculator.el
 
@@ -2944,8 +2978,8 @@ See the documentation for `calculator-mode' for more information.
 
 ;;;***
 
-;;;### (autoloads nil "calendar" "calendar/calendar.el" (20762 9398
-;;;;;;  526093 0))
+;;;### (autoloads nil "calendar" "calendar/calendar.el" (20993 36675
+;;;;;;  840108 928000))
 ;;; Generated autoloads from calendar/calendar.el
 
 (autoload 'calendar "calendar" "\
@@ -3053,8 +3087,8 @@ Obsoletes `c-forward-into-nomenclature'.
 
 ;;;***
 
-;;;### (autoloads nil "cc-engine" "progmodes/cc-engine.el" (20911
-;;;;;;  4138 279475 0))
+;;;### (autoloads nil "cc-engine" "progmodes/cc-engine.el" (21023
+;;;;;;  33771 640838 743000))
 ;;; Generated autoloads from progmodes/cc-engine.el
 
 (autoload 'c-guess-basic-syntax "cc-engine" "\
@@ -3163,8 +3197,8 @@ the absolute file name of the file if STYLE-NAME is nil.
 
 ;;;***
 
-;;;### (autoloads nil "cc-mode" "progmodes/cc-mode.el" (20907 7082
-;;;;;;  901087 0))
+;;;### (autoloads nil "cc-mode" "progmodes/cc-mode.el" (21022 34805
+;;;;;;  23711 194000))
 ;;; Generated autoloads from progmodes/cc-mode.el
 
 (autoload 'c-initialize-cc-mode "cc-mode" "\
@@ -3176,9 +3210,6 @@ only some basic setup is done, and a call to `c-init-language-vars' or
 control).  See \"cc-mode.el\" for more info.
 
 \(fn &optional NEW-STYLE-INIT)" nil nil)
-
-(defvar c-mode-syntax-table nil "\
-Syntax table used in c-mode buffers.")
  (add-to-list 'auto-mode-alist '("\\.\\(cc\\|hh\\)\\'" . c++-mode))
  (add-to-list 'auto-mode-alist '("\\.[ch]\\(pp\\|xx\\|\\+\\+\\)\\'" . c++-mode))
  (add-to-list 'auto-mode-alist '("\\.\\(CC?\\|HH?\\)\\'" . c++-mode))
@@ -3205,9 +3236,6 @@ Key bindings:
 
 \(fn)" t nil)
 
-(defvar c++-mode-syntax-table nil "\
-Syntax table used in c++-mode buffers.")
-
 (autoload 'c++-mode "cc-mode" "\
 Major mode for editing C++ code.
 To submit a problem report, enter `\\[c-submit-bug-report]' from a
@@ -3225,9 +3253,6 @@ Key bindings:
 \\{c++-mode-map}
 
 \(fn)" t nil)
-
-(defvar objc-mode-syntax-table nil "\
-Syntax table used in objc-mode buffers.")
  (add-to-list 'auto-mode-alist '("\\.m\\'" . objc-mode))
 
 (autoload 'objc-mode "cc-mode" "\
@@ -3247,9 +3272,6 @@ Key bindings:
 \\{objc-mode-map}
 
 \(fn)" t nil)
-
-(defvar java-mode-syntax-table nil "\
-Syntax table used in java-mode buffers.")
  (add-to-list 'auto-mode-alist '("\\.java\\'" . java-mode))
 
 (autoload 'java-mode "cc-mode" "\
@@ -3269,9 +3291,6 @@ Key bindings:
 \\{java-mode-map}
 
 \(fn)" t nil)
-
-(defvar idl-mode-syntax-table nil "\
-Syntax table used in idl-mode buffers.")
  (add-to-list 'auto-mode-alist '("\\.idl\\'" . idl-mode))
 
 (autoload 'idl-mode "cc-mode" "\
@@ -3291,9 +3310,6 @@ Key bindings:
 \\{idl-mode-map}
 
 \(fn)" t nil)
-
-(defvar pike-mode-syntax-table nil "\
-Syntax table used in pike-mode buffers.")
  (add-to-list 'auto-mode-alist '("\\.\\(u?lpc\\|pike\\|pmod\\(\\.in\\)?\\)\\'" . pike-mode))
  (add-to-list 'interpreter-mode-alist '("pike" . pike-mode))
 
@@ -3662,8 +3678,8 @@ See the documentation of `define-ccl-program' for the detail of CCL program.
 
 ;;;***
 
-;;;### (autoloads nil "cconv" "emacs-lisp/cconv.el" (20922 60838
-;;;;;;  997229 0))
+;;;### (autoloads nil "cconv" "emacs-lisp/cconv.el" (21021 52778
+;;;;;;  175609 0))
 ;;; Generated autoloads from emacs-lisp/cconv.el
 
 (autoload 'cconv-closure-convert "cconv" "\
@@ -3682,16 +3698,16 @@ Add the warnings that closure conversion would encounter.
 
 ;;;***
 
-;;;### (autoloads nil "cedet" "cedet/cedet.el" (20748 62911 684442
+;;;### (autoloads nil "cedet" "cedet/cedet.el" (20983 37555 279226
 ;;;;;;  0))
 ;;; Generated autoloads from cedet/cedet.el
-(push (purecopy (quote (cedet 2 0))) package--builtin-versions)
+(push (purecopy '(cedet 2 0)) package--builtin-versions)
 ;;;***
 
-;;;### (autoloads nil "cfengine" "progmodes/cfengine.el" (20929 34089
-;;;;;;  117790 0))
+;;;### (autoloads nil "cfengine" "progmodes/cfengine.el" (20958 34345
+;;;;;;  952538 0))
 ;;; Generated autoloads from progmodes/cfengine.el
-(push (purecopy (quote (cfengine 1 2))) package--builtin-versions)
+(push (purecopy '(cfengine 1 2)) package--builtin-versions)
 (autoload 'cfengine3-mode "cfengine" "\
 Major mode for editing CFEngine3 input.
 There are no special keybindings by default.
@@ -3721,7 +3737,7 @@ on the buffer contents
 ;;;### (autoloads nil "chart" "emacs-lisp/chart.el" (20895 15912
 ;;;;;;  444844 0))
 ;;; Generated autoloads from emacs-lisp/chart.el
-(push (purecopy (quote (chart 0 2))) package--builtin-versions)
+(push (purecopy '(chart 0 2)) package--builtin-versions)
 ;;;***
 
 ;;;### (autoloads nil "check-declare" "emacs-lisp/check-declare.el"
@@ -3742,19 +3758,24 @@ Returns non-nil if any false statements are found.
 
 ;;;***
 
-;;;### (autoloads nil "checkdoc" "emacs-lisp/checkdoc.el" (20893
-;;;;;;  60586 188550 0))
+;;;### (autoloads nil "checkdoc" "emacs-lisp/checkdoc.el" (20996
+;;;;;;  49577 892030 0))
 ;;; Generated autoloads from emacs-lisp/checkdoc.el
-(push (purecopy (quote (checkdoc 0 6 2))) package--builtin-versions)(put 'checkdoc-force-docstrings-flag 'safe-local-variable 'booleanp)
-(put 'checkdoc-force-history-flag 'safe-local-variable 'booleanp)
-(put 'checkdoc-permit-comma-termination-flag 'safe-local-variable 'booleanp)
-(put 'checkdoc-arguments-in-order-flag 'safe-local-variable 'booleanp)
-(put 'checkdoc-symbol-words 'safe-local-variable 'checkdoc-list-of-strings-p)
+(push (purecopy '(checkdoc 0 6 2)) package--builtin-versions)(put 'checkdoc-force-docstrings-flag 'safe-local-variable #'booleanp)
+(put 'checkdoc-force-history-flag 'safe-local-variable #'booleanp)
+(put 'checkdoc-permit-comma-termination-flag 'safe-local-variable #'booleanp)
+(put 'checkdoc-spellcheck-documentation-flag 'safe-local-variable #'booleanp)
+(put 'checkdoc-ispell-list-words 'safe-local-variable #'checkdoc-list-of-strings-p)
+(put 'checkdoc-arguments-in-order-flag 'safe-local-variable #'booleanp)
+(put 'checkdoc-verb-check-experimental-flag 'safe-local-variable #'booleanp)
+(put 'checkdoc-symbol-words 'safe-local-variable #'checkdoc-list-of-strings-p)
 
 (autoload 'checkdoc-list-of-strings-p "checkdoc" "\
 
 
 \(fn OBJ)" nil nil)
+(put 'checkdoc-proper-noun-regexp 'safe-local-variable 'stringp)
+(put 'checkdoc-common-verbs-regexp 'safe-local-variable 'stringp)
 
 (autoload 'checkdoc "checkdoc" "\
 Interactively check the entire buffer for style errors.
@@ -3861,65 +3882,65 @@ space at the end of each line.
 (autoload 'checkdoc-ispell "checkdoc" "\
 Check the style and spelling of everything interactively.
 Calls `checkdoc' with spell-checking turned on.
-Prefix argument TAKE-NOTES is the same as for `checkdoc'
+Prefix argument is the same as for `checkdoc'
 
-\(fn &optional TAKE-NOTES)" t nil)
+\(fn)" t nil)
 
 (autoload 'checkdoc-ispell-current-buffer "checkdoc" "\
 Check the style and spelling of the current buffer.
 Calls `checkdoc-current-buffer' with spell-checking turned on.
-Prefix argument TAKE-NOTES is the same as for `checkdoc-current-buffer'
+Prefix argument is the same as for `checkdoc-current-buffer'
 
-\(fn &optional TAKE-NOTES)" t nil)
+\(fn)" t nil)
 
 (autoload 'checkdoc-ispell-interactive "checkdoc" "\
 Check the style and spelling of the current buffer interactively.
 Calls `checkdoc-interactive' with spell-checking turned on.
-Prefix argument TAKE-NOTES is the same as for `checkdoc-interactive'
+Prefix argument is the same as for `checkdoc-interactive'
 
-\(fn &optional TAKE-NOTES)" t nil)
+\(fn)" t nil)
 
 (autoload 'checkdoc-ispell-message-interactive "checkdoc" "\
 Check the style and spelling of message text interactively.
 Calls `checkdoc-message-interactive' with spell-checking turned on.
-Prefix argument TAKE-NOTES is the same as for `checkdoc-message-interactive'
+Prefix argument is the same as for `checkdoc-message-interactive'
 
-\(fn &optional TAKE-NOTES)" t nil)
+\(fn)" t nil)
 
 (autoload 'checkdoc-ispell-message-text "checkdoc" "\
 Check the style and spelling of message text interactively.
 Calls `checkdoc-message-text' with spell-checking turned on.
-Prefix argument TAKE-NOTES is the same as for `checkdoc-message-text'
+Prefix argument is the same as for `checkdoc-message-text'
 
-\(fn &optional TAKE-NOTES)" t nil)
+\(fn)" t nil)
 
 (autoload 'checkdoc-ispell-start "checkdoc" "\
 Check the style and spelling of the current buffer.
 Calls `checkdoc-start' with spell-checking turned on.
-Prefix argument TAKE-NOTES is the same as for `checkdoc-start'
+Prefix argument is the same as for `checkdoc-start'
 
-\(fn &optional TAKE-NOTES)" t nil)
+\(fn)" t nil)
 
 (autoload 'checkdoc-ispell-continue "checkdoc" "\
 Check the style and spelling of the current buffer after point.
 Calls `checkdoc-continue' with spell-checking turned on.
-Prefix argument TAKE-NOTES is the same as for `checkdoc-continue'
+Prefix argument is the same as for `checkdoc-continue'
 
-\(fn &optional TAKE-NOTES)" t nil)
+\(fn)" t nil)
 
 (autoload 'checkdoc-ispell-comments "checkdoc" "\
 Check the style and spelling of the current buffer's comments.
 Calls `checkdoc-comments' with spell-checking turned on.
-Prefix argument TAKE-NOTES is the same as for `checkdoc-comments'
+Prefix argument is the same as for `checkdoc-comments'
 
-\(fn &optional TAKE-NOTES)" t nil)
+\(fn)" t nil)
 
 (autoload 'checkdoc-ispell-defun "checkdoc" "\
 Check the style and spelling of the current defun with Ispell.
 Calls `checkdoc-defun' with spell-checking turned on.
-Prefix argument TAKE-NOTES is the same as for `checkdoc-defun'
+Prefix argument is the same as for `checkdoc-defun'
 
-\(fn &optional TAKE-NOTES)" t nil)
+\(fn)" t nil)
 
 (autoload 'checkdoc-minor-mode "checkdoc" "\
 Toggle automatic docstring checking (Checkdoc minor mode).
@@ -4094,10 +4115,10 @@ For example, the function `case' has an indent property
 
 ;;;***
 
-;;;### (autoloads nil "cl-lib" "emacs-lisp/cl-lib.el" (20932 10282
-;;;;;;  564846 0))
+;;;### (autoloads nil "cl-lib" "emacs-lisp/cl-lib.el" (20998 4934
+;;;;;;  952905 0))
 ;;; Generated autoloads from emacs-lisp/cl-lib.el
-(push (purecopy (quote (cl-lib 1 0))) package--builtin-versions)
+(push (purecopy '(cl-lib 1 0)) package--builtin-versions)
 (define-obsolete-variable-alias 'custom-print-functions 'cl-custom-print-functions "24.3")
 
 (defvar cl-custom-print-functions nil "\
@@ -4110,6 +4131,8 @@ printer proceeds to the next function on the list.
 This variable is not used at present, but it is defined in hopes that
 a future Emacs interpreter will be able to use it.")
 
+(define-error 'cl-assertion-failed (purecopy "Assertion failed"))
+
 (autoload 'cl--defsubst-expand "cl-macs")
 
 (put 'cl-defun 'doc-string-elt 3)
@@ -4183,7 +4206,7 @@ If FRAME cannot display COLOR, return nil.
 
 ;;;***
 
-;;;### (autoloads nil "comint" "comint.el" (20932 10282 564846 0))
+;;;### (autoloads nil "comint" "comint.el" (21024 28968 738399 0))
 ;;; Generated autoloads from comint.el
 
 (defvar comint-output-filter-functions '(ansi-color-process-output comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt) "\
@@ -4282,8 +4305,8 @@ REGEXP-GROUP is the regular expression group in REGEXP to use.
 
 ;;;***
 
-;;;### (autoloads nil "compare-w" "vc/compare-w.el" (20871 33574
-;;;;;;  214287 0))
+;;;### (autoloads nil "compare-w" "vc/compare-w.el" (20992 52525
+;;;;;;  458637 0))
 ;;; Generated autoloads from vc/compare-w.el
 
 (autoload 'compare-windows "compare-w" "\
@@ -4316,8 +4339,8 @@ on third call it again advances points to the next difference and so on.
 
 ;;;***
 
-;;;### (autoloads nil "compile" "progmodes/compile.el" (20911 4138
-;;;;;;  279475 0))
+;;;### (autoloads nil "compile" "progmodes/compile.el" (21002 1963
+;;;;;;  769129 0))
 ;;; Generated autoloads from progmodes/compile.el
 
 (defvar compilation-mode-hook nil "\
@@ -4385,7 +4408,9 @@ You might also use mode hooks to specify it in certain modes, like this:
                      (file-exists-p \"Makefile\"))
            (set (make-local-variable 'compile-command)
                 (concat \"make -k \"
-                        (file-name-sans-extension buffer-file-name))))))")
+                        (if buffer-file-name
+                          (shell-quote-argument
+                            (file-name-sans-extension buffer-file-name))))))))")
 
 (custom-autoload 'compile-command "compile" t)
 (put 'compile-command 'safe-local-variable (lambda (a) (and (stringp a) (or (not (boundp 'compilation-read-command)) compilation-read-command))))
@@ -4496,8 +4521,8 @@ This is the value of `next-error-function' in Compilation buffers.
 
 ;;;***
 
-;;;### (autoloads nil "completion" "completion.el" (20884 7264 412929
-;;;;;;  442000))
+;;;### (autoloads nil "completion" "completion.el" (20999 25770 522517
+;;;;;;  0))
 ;;; Generated autoloads from completion.el
 
 (defvar dynamic-completion-mode nil "\
@@ -5024,8 +5049,8 @@ INHERIT-INPUT-METHOD.
 
 ;;;***
 
-;;;### (autoloads nil "css-mode" "textmodes/css-mode.el" (20709 26818
-;;;;;;  907104 0))
+;;;### (autoloads nil "css-mode" "textmodes/css-mode.el" (21024 28968
+;;;;;;  738399 0))
 ;;; Generated autoloads from textmodes/css-mode.el
 
 (autoload 'css-mode "css-mode" "\
@@ -5035,8 +5060,8 @@ Major mode to edit Cascading Style Sheets.
 
 ;;;***
 
-;;;### (autoloads nil "cua-base" "emulation/cua-base.el" (20709 26818
-;;;;;;  907104 0))
+;;;### (autoloads nil "cua-base" "emulation/cua-base.el" (20992 52525
+;;;;;;  458637 0))
 ;;; Generated autoloads from emulation/cua-base.el
 
 (defvar cua-mode nil "\
@@ -5086,7 +5111,7 @@ Enable CUA selection mode without the C-z/C-x/C-c/C-v bindings.
 
 ;;;***
 
-;;;### (autoloads nil "cus-edit" "cus-edit.el" (20932 10282 564846
+;;;### (autoloads nil "cus-edit" "cus-edit.el" (21024 28968 738399
 ;;;;;;  0))
 ;;; Generated autoloads from cus-edit.el
 
@@ -5446,7 +5471,7 @@ Mode used for cvs status output.
 ;;;### (autoloads nil "cwarn" "progmodes/cwarn.el" (20709 26818 907104
 ;;;;;;  0))
 ;;; Generated autoloads from progmodes/cwarn.el
-(push (purecopy (quote (cwarn 1 3 1))) package--builtin-versions)
+(push (purecopy '(cwarn 1 3 1)) package--builtin-versions)
 (autoload 'cwarn-mode "cwarn" "\
 Minor mode that highlights suspicious C and C++ constructions.
 
@@ -5516,7 +5541,7 @@ If the argument is nil, we return the display table to its standard state.
 
 ;;;***
 
-;;;### (autoloads nil "dabbrev" "dabbrev.el" (20709 26818 907104
+;;;### (autoloads nil "dabbrev" "dabbrev.el" (20992 52525 458637
 ;;;;;;  0))
 ;;; Generated autoloads from dabbrev.el
 (put 'dabbrev-case-fold-search 'risky-local-variable t)
@@ -5714,8 +5739,8 @@ There is some minimal font-lock support (see vars
 
 ;;;***
 
-;;;### (autoloads nil "debug" "emacs-lisp/debug.el" (20709 26818
-;;;;;;  907104 0))
+;;;### (autoloads nil "debug" "emacs-lisp/debug.el" (21005 64551
+;;;;;;  555603 0))
 ;;; Generated autoloads from emacs-lisp/debug.el
 
 (setq debugger 'debug)
@@ -5790,7 +5815,7 @@ The most useful commands are:
 ;;;### (autoloads nil "delim-col" "delim-col.el" (20709 26818 907104
 ;;;;;;  0))
 ;;; Generated autoloads from delim-col.el
-(push (purecopy (quote (delim-col 2 1))) package--builtin-versions)
+(push (purecopy '(delim-col 2 1)) package--builtin-versions)
 (autoload 'delimit-columns-customize "delim-col" "\
 Customization of `columns' group.
 
@@ -5908,7 +5933,7 @@ the first time the mode is used.
 
 ;;;***
 
-;;;### (autoloads nil "descr-text" "descr-text.el" (20875 30633 412173
+;;;### (autoloads nil "descr-text" "descr-text.el" (21024 28968 738399
 ;;;;;;  0))
 ;;; Generated autoloads from descr-text.el
 
@@ -5943,7 +5968,8 @@ relevant to POS.
 
 ;;;***
 
-;;;### (autoloads nil "desktop" "desktop.el" (20945 22315 8369 0))
+;;;### (autoloads nil "desktop" "desktop.el" (21005 64551 555603
+;;;;;;  0))
 ;;; Generated autoloads from desktop.el
 
 (defvar desktop-save-mode nil "\
@@ -5971,9 +5997,8 @@ modes are restored automatically; they should not be listed here.")
 
 (custom-autoload 'desktop-locals-to-save "desktop" t)
 
-(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
@@ -6074,6 +6099,9 @@ Empty the Desktop.
 This kills all buffers except for internal ones and those with names matched by
 a regular expression in the list `desktop-clear-preserve-buffers'.
 Furthermore, it clears the variables listed in `desktop-globals-to-clear'.
+When called interactively and `desktop-restore-frames' is non-nil, it also
+deletes all frames except the selected one (and its minibuffer frame,
+if different).
 
 \(fn)" t nil)
 
@@ -6164,8 +6192,8 @@ Deuglify broken Outlook (Express) articles and redisplay.
 
 ;;;***
 
-;;;### (autoloads nil "diary-lib" "calendar/diary-lib.el" (20932
-;;;;;;  61699 522706 0))
+;;;### (autoloads nil "diary-lib" "calendar/diary-lib.el" (20992
+;;;;;;  52525 458637 0))
 ;;; Generated autoloads from calendar/diary-lib.el
 
 (autoload 'diary "diary-lib" "\
@@ -6299,7 +6327,7 @@ Optional arguments are passed to `dig-invoke'.
 
 ;;;***
 
-;;;### (autoloads nil "dired" "dired.el" (20932 61699 522706 0))
+;;;### (autoloads nil "dired" "dired.el" (20999 25770 522517 0))
 ;;; Generated autoloads from dired.el
 
 (defvar dired-listing-switches (purecopy "-al") "\
@@ -6470,7 +6498,7 @@ redefine OBJECT if it is a symbol.
 
 ;;;***
 
-;;;### (autoloads nil "disp-table" "disp-table.el" (20709 26818 907104
+;;;### (autoloads nil "disp-table" "disp-table.el" (20992 52525 458637
 ;;;;;;  0))
 ;;; Generated autoloads from disp-table.el
 
@@ -6653,7 +6681,7 @@ Locate SOA record and increment the serial field.
 
 ;;;***
 
-;;;### (autoloads nil "doc-view" "doc-view.el" (20899 12965 791908
+;;;### (autoloads nil "doc-view" "doc-view.el" (20992 52525 458637
 ;;;;;;  0))
 ;;; Generated autoloads from doc-view.el
 
@@ -6730,7 +6758,7 @@ strings when pressed twice.  See `double-map' for details.
 ;;;### (autoloads nil "dunnet" "play/dunnet.el" (20900 33838 319219
 ;;;;;;  0))
 ;;; Generated autoloads from play/dunnet.el
-(push (purecopy (quote (dunnet 2 1))) package--builtin-versions)
+(push (purecopy '(dunnet 2 1)) package--builtin-versions)
 (autoload 'dunnet "dunnet" "\
 Switch to *dungeon* buffer and start game.
 
@@ -6738,8 +6766,8 @@ Switch to *dungeon* buffer and start game.
 
 ;;;***
 
-;;;### (autoloads nil "easy-mmode" "emacs-lisp/easy-mmode.el" (20900
-;;;;;;  33838 319219 0))
+;;;### (autoloads nil "easy-mmode" "emacs-lisp/easy-mmode.el" (20992
+;;;;;;  52525 458637 0))
 ;;; Generated autoloads from emacs-lisp/easy-mmode.el
 
 (defalias 'easy-mmode-define-minor-mode 'define-minor-mode)
@@ -7020,7 +7048,7 @@ To implement dynamic menus, either call this from
 ;;;### (autoloads nil "ebnf2ps" "progmodes/ebnf2ps.el" (20709 26818
 ;;;;;;  907104 0))
 ;;; Generated autoloads from progmodes/ebnf2ps.el
-(push (purecopy (quote (ebnf2ps 4 4))) package--builtin-versions)
+(push (purecopy '(ebnf2ps 4 4)) package--builtin-versions)
 (autoload 'ebnf-customize "ebnf2ps" "\
 Customization for ebnf group.
 
@@ -7282,8 +7310,8 @@ See `ebnf-style-database' documentation.
 
 ;;;***
 
-;;;### (autoloads nil "ebrowse" "progmodes/ebrowse.el" (20709 26818
-;;;;;;  907104 0))
+;;;### (autoloads nil "ebrowse" "progmodes/ebrowse.el" (20992 52525
+;;;;;;  458637 0))
 ;;; Generated autoloads from progmodes/ebrowse.el
 
 (autoload 'ebrowse-tree-mode "ebrowse" "\
@@ -7431,7 +7459,7 @@ Display statistics for a class tree.
 
 ;;;***
 
-;;;### (autoloads nil "ebuff-menu" "ebuff-menu.el" (20709 26818 907104
+;;;### (autoloads nil "ebuff-menu" "ebuff-menu.el" (20992 52525 458637
 ;;;;;;  0))
 ;;; Generated autoloads from ebuff-menu.el
 
@@ -7489,7 +7517,7 @@ With prefix arg NOCONFIRM, execute current line as-is without editing.
 
 ;;;### (autoloads nil "ede" "cedet/ede.el" (20908 27948 216644 0))
 ;;; Generated autoloads from cedet/ede.el
-(push (purecopy (quote (ede 1 2))) package--builtin-versions)
+(push (purecopy '(ede 1 2)) package--builtin-versions)
 (defvar global-ede-mode nil "\
 Non-nil if Global-Ede mode is enabled.
 See the command `global-ede-mode' for a description of this minor mode.
@@ -7515,17 +7543,17 @@ an EDE controlled project.
 ;;;### (autoloads nil "ede/dired" "cedet/ede/dired.el" (20709 26818
 ;;;;;;  907104 0))
 ;;; Generated autoloads from cedet/ede/dired.el
-(push (purecopy (quote (dired 0 4))) package--builtin-versions)
+(push (purecopy '(dired 0 4)) package--builtin-versions)
 ;;;***
 
 ;;;### (autoloads nil "ede/project-am" "cedet/ede/project-am.el"
 ;;;;;;  (20881 10343 547564 552000))
 ;;; Generated autoloads from cedet/ede/project-am.el
-(push (purecopy (quote (project-am 0 0 3))) package--builtin-versions)
+(push (purecopy '(project-am 0 0 3)) package--builtin-versions)
 ;;;***
 
-;;;### (autoloads nil "edebug" "emacs-lisp/edebug.el" (20912 25000
-;;;;;;  802412 0))
+;;;### (autoloads nil "edebug" "emacs-lisp/edebug.el" (20996 49577
+;;;;;;  892030 0))
 ;;; Generated autoloads from emacs-lisp/edebug.el
 
 (defvar edebug-all-defs nil "\
@@ -7589,9 +7617,9 @@ Toggle edebugging of all forms.
 
 ;;;***
 
-;;;### (autoloads nil "ediff" "vc/ediff.el" (20893 60586 188550 0))
+;;;### (autoloads nil "ediff" "vc/ediff.el" (20992 52525 458637 0))
 ;;; Generated autoloads from vc/ediff.el
-(push (purecopy (quote (ediff 2 81 4))) package--builtin-versions)
+(push (purecopy '(ediff 2 81 4)) package--builtin-versions)
 (autoload 'ediff-files "ediff" "\
 Run Ediff on a pair of files, FILE-A and FILE-B.
 
@@ -7818,10 +7846,50 @@ With optional NODE, goes to that node.
 
 \(fn &optional NODE)" t nil)
 
+(autoload 'ediff-files-command "ediff" "\
+
+
+\(fn)" nil nil)
+
+(autoload 'ediff3-files-command "ediff" "\
+
+
+\(fn)" nil nil)
+
+(autoload 'ediff-merge-command "ediff" "\
+
+
+\(fn)" nil nil)
+
+(autoload 'ediff-merge-with-ancestor-command "ediff" "\
+
+
+\(fn)" nil nil)
+
+(autoload 'ediff-directories-command "ediff" "\
+
+
+\(fn)" nil nil)
+
+(autoload 'ediff-directories3-command "ediff" "\
+
+
+\(fn)" nil nil)
+
+(autoload 'ediff-merge-directories-command "ediff" "\
+
+
+\(fn)" nil nil)
+
+(autoload 'ediff-merge-directories-with-ancestor-command "ediff" "\
+
+
+\(fn)" nil nil)
+
 ;;;***
 
-;;;### (autoloads nil "ediff-help" "vc/ediff-help.el" (20709 26818
-;;;;;;  907104 0))
+;;;### (autoloads nil "ediff-help" "vc/ediff-help.el" (20992 52525
+;;;;;;  458637 0))
 ;;; Generated autoloads from vc/ediff-help.el
 
 (autoload 'ediff-customize "ediff-help" "\
@@ -7844,8 +7912,8 @@ Display Ediff's registry.
 
 ;;;***
 
-;;;### (autoloads nil "ediff-util" "vc/ediff-util.el" (20893 60586
-;;;;;;  188550 0))
+;;;### (autoloads nil "ediff-util" "vc/ediff-util.el" (20992 52525
+;;;;;;  458637 0))
 ;;; Generated autoloads from vc/ediff-util.el
 
 (autoload 'ediff-toggle-multiframe "ediff-util" "\
@@ -7864,10 +7932,10 @@ To change the default, set the variable `ediff-use-toolbar-p', which see.
 
 ;;;***
 
-;;;### (autoloads nil "edmacro" "edmacro.el" (20709 26818 907104
-;;;;;;  0))
+;;;### (autoloads nil "edmacro" "edmacro.el" (20964 20753 310858
+;;;;;;  446000))
 ;;; Generated autoloads from edmacro.el
-(push (purecopy (quote (edmacro 2 1))) package--builtin-versions)
+(push (purecopy '(edmacro 2 1)) package--builtin-versions)
 (autoload 'edit-kbd-macro "edmacro" "\
 Edit a keyboard macro.
 At the prompt, type any key sequence which is bound to a keyboard macro.
@@ -7931,7 +7999,7 @@ Turn on EDT Emulation.
 
 ;;;***
 
-;;;### (autoloads nil "ehelp" "ehelp.el" (20762 9398 526093 0))
+;;;### (autoloads nil "ehelp" "ehelp.el" (20992 52525 458637 0))
 ;;; Generated autoloads from ehelp.el
 
 (autoload 'with-electric-help "ehelp" "\
@@ -7970,13 +8038,13 @@ BUFFER is put back into its original major mode.
 ;;;### (autoloads nil "eieio" "emacs-lisp/eieio.el" (20930 5097 423575
 ;;;;;;  701000))
 ;;; Generated autoloads from emacs-lisp/eieio.el
-(push (purecopy (quote (eieio 1 4))) package--builtin-versions)
+(push (purecopy '(eieio 1 4)) package--builtin-versions)
 ;;;***
 
 ;;;### (autoloads nil "eieio-core" "emacs-lisp/eieio-core.el" (20908
 ;;;;;;  27948 216644 0))
 ;;; Generated autoloads from emacs-lisp/eieio-core.el
-(push (purecopy (quote (eieio-core 1 4))) package--builtin-versions)
+(push (purecopy '(eieio-core 1 4)) package--builtin-versions)
 (autoload 'eieio-defclass-autoload "eieio-core" "\
 Create autoload symbols for the EIEIO class CNAME.
 SUPERCLASSES are the superclasses that CNAME inherits from.
@@ -8035,8 +8103,8 @@ Also extracts information about all methods specific to this generic.
 
 ;;;***
 
-;;;### (autoloads nil "eldoc" "emacs-lisp/eldoc.el" (20806 59818
-;;;;;;  347907 0))
+;;;### (autoloads nil "eldoc" "emacs-lisp/eldoc.el" (21024 28968
+;;;;;;  738399 0))
 ;;; Generated autoloads from emacs-lisp/eldoc.el
 
 (defvar eldoc-minor-mode-string (purecopy " ElDoc") "\
@@ -8289,7 +8357,7 @@ Prompts for bug subject.  Leaves you in a mail buffer.
 
 ;;;***
 
-;;;### (autoloads nil "emerge" "vc/emerge.el" (20576 42138 697312
+;;;### (autoloads nil "emerge" "vc/emerge.el" (20992 52525 458637
 ;;;;;;  0))
 ;;; Generated autoloads from vc/emerge.el
 
@@ -8386,7 +8454,7 @@ Commands:
 
 ;;;***
 
-;;;### (autoloads nil "epa" "epa.el" (20917 42917 611340 0))
+;;;### (autoloads nil "epa" "epa.el" (20978 19624 657047 0))
 ;;; Generated autoloads from epa.el
 
 (autoload 'epa-list-keys "epa" "\
@@ -8611,7 +8679,7 @@ Encrypt marked files.
 
 ;;;***
 
-;;;### (autoloads nil "epa-mail" "epa-mail.el" (20709 26818 907104
+;;;### (autoloads nil "epa-mail" "epa-mail.el" (20978 19624 657047
 ;;;;;;  0))
 ;;; Generated autoloads from epa-mail.el
 
@@ -8648,12 +8716,19 @@ Don't use this command in Lisp programs!
 \(fn START END SIGNERS MODE)" t nil)
 
 (autoload 'epa-mail-encrypt "epa-mail" "\
-Encrypt the current buffer.
-The buffer is expected to contain a mail message.
+Encrypt the outgoing mail message in the current buffer.
+Takes the recipients from the text in the header in the buffer
+and translates them through `epa-mail-aliases'.
+With prefix argument, asks you to select among them interactively
+and also whether and how to sign.
 
-Don't use this command in Lisp programs!
+Called from Lisp, the optional argument RECIPIENTS is a list
+of recipient addresses, t to perform symmetric encryption,
+or nil meaning use the defaults.
 
-\(fn START END RECIPIENTS SIGN SIGNERS)" t nil)
+SIGNERS is a list of keys to sign the message with.
+
+\(fn &optional RECIPIENTS SIGNERS)" t nil)
 
 (autoload 'epa-mail-import-keys "epa-mail" "\
 Import keys in the OpenPGP armor format in the current buffer.
@@ -8682,9 +8757,9 @@ if ARG is omitted or nil.
 
 ;;;***
 
-;;;### (autoloads nil "epg" "epg.el" (20936 7342 261759 0))
+;;;### (autoloads nil "epg" "epg.el" (21022 27213 317995 0))
 ;;; Generated autoloads from epg.el
-(push (purecopy (quote (epg 1 0 0))) package--builtin-versions)
+(push (purecopy '(epg 1 0 0)) package--builtin-versions)
 (autoload 'epg-make-context "epg" "\
 Return a context object.
 
@@ -8713,9 +8788,9 @@ Look at CONFIG and try to expand GROUP.
 
 ;;;***
 
-;;;### (autoloads nil "erc" "erc/erc.el" (20891 18859 893295 0))
+;;;### (autoloads nil "erc" "erc/erc.el" (21013 58662 278539 0))
 ;;; Generated autoloads from erc/erc.el
-(push (purecopy (quote (erc 5 3))) package--builtin-versions)
+(push (purecopy '(erc 5 3)) package--builtin-versions)
 (autoload 'erc-select-read-args "erc" "\
 Prompt the user for values of nick, server, port, and password.
 
@@ -8768,8 +8843,8 @@ Otherwise, connect to HOST:PORT as USER and /join CHANNEL.
 
 ;;;***
 
-;;;### (autoloads nil "erc-button" "erc/erc-button.el" (20709 26818
-;;;;;;  907104 0))
+;;;### (autoloads nil "erc-button" "erc/erc-button.el" (21013 58662
+;;;;;;  278539 0))
 ;;; Generated autoloads from erc/erc-button.el
  (autoload 'erc-button-mode "erc-button" nil t)
 
@@ -8945,13 +9020,13 @@ system.
 ;;;### (autoloads nil "erc-lang" "erc/erc-lang.el" (20709 26818 907104
 ;;;;;;  0))
 ;;; Generated autoloads from erc/erc-lang.el
-(push (purecopy (quote (erc-lang 1 0 0))) package--builtin-versions)
+(push (purecopy '(erc-lang 1 0 0)) package--builtin-versions)
 ;;;***
 
-;;;### (autoloads nil "erc-list" "erc/erc-list.el" (20884 7264 412929
-;;;;;;  442000))
+;;;### (autoloads nil "erc-list" "erc/erc-list.el" (21013 58662 278539
+;;;;;;  0))
 ;;; Generated autoloads from erc/erc-list.el
-(push (purecopy (quote (erc-list 0 1))) package--builtin-versions) (autoload 'erc-list-mode "erc-list")
+(push (purecopy '(erc-list 0 1)) package--builtin-versions) (autoload 'erc-list-mode "erc-list")
 
 ;;;***
 
@@ -9069,8 +9144,8 @@ Interactively select a server to connect to using `erc-server-alist'.
 
 ;;;***
 
-;;;### (autoloads nil "erc-notify" "erc/erc-notify.el" (20891 18859
-;;;;;;  893295 0))
+;;;### (autoloads nil "erc-notify" "erc/erc-notify.el" (21013 58662
+;;;;;;  278539 0))
 ;;; Generated autoloads from erc/erc-notify.el
  (autoload 'erc-notify-mode "erc-notify" nil t)
 
@@ -9167,8 +9242,8 @@ This will add a speedbar major display mode.
 
 ;;;***
 
-;;;### (autoloads nil "erc-track" "erc/erc-track.el" (20709 26818
-;;;;;;  907104 0))
+;;;### (autoloads nil "erc-track" "erc/erc-track.el" (21013 58662
+;;;;;;  278539 0))
 ;;; Generated autoloads from erc/erc-track.el
 
 (defvar erc-track-minor-mode nil "\
@@ -9225,7 +9300,7 @@ Add a file to `erc-xdcc-files'.
 
 ;;;***
 
-;;;### (autoloads nil "ert" "emacs-lisp/ert.el" (20834 39208 838628
+;;;### (autoloads nil "ert" "emacs-lisp/ert.el" (20998 4934 952905
 ;;;;;;  0))
 ;;; Generated autoloads from emacs-lisp/ert.el
 
@@ -9304,8 +9379,8 @@ Kill all test buffers that are still live.
 
 ;;;***
 
-;;;### (autoloads nil "esh-mode" "eshell/esh-mode.el" (20911 4138
-;;;;;;  279475 0))
+;;;### (autoloads nil "esh-mode" "eshell/esh-mode.el" (20992 52525
+;;;;;;  458637 0))
 ;;; Generated autoloads from eshell/esh-mode.el
 
 (autoload 'eshell-mode "esh-mode" "\
@@ -9320,7 +9395,7 @@ Emacs shell interactive mode.
 ;;;### (autoloads nil "eshell" "eshell/eshell.el" (20893 60586 188550
 ;;;;;;  0))
 ;;; Generated autoloads from eshell/eshell.el
-(push (purecopy (quote (eshell 2 4 2))) package--builtin-versions)
+(push (purecopy '(eshell 2 4 2)) package--builtin-versions)
 (autoload 'eshell "eshell" "\
 Create an interactive Eshell buffer.
 The buffer used for Eshell sessions is determined by the value of
@@ -9352,7 +9427,7 @@ corresponding to a successful execution.
 
 ;;;***
 
-;;;### (autoloads nil "etags" "progmodes/etags.el" (20731 53823 676680
+;;;### (autoloads nil "etags" "progmodes/etags.el" (20992 52525 458637
 ;;;;;;  0))
 ;;; Generated autoloads from progmodes/etags.el
 
@@ -9975,7 +10050,7 @@ fourth arg NOSEP non-nil inhibits this.
 
 ;;;***
 
-;;;### (autoloads nil "eww" "net/eww.el" (20941 25255 50698 0))
+;;;### (autoloads nil "eww" "net/eww.el" (21022 41153 91581 355000))
 ;;; Generated autoloads from net/eww.el
 
 (autoload 'eww "eww" "\
@@ -10088,7 +10163,7 @@ This is used only in conjunction with `expand-add-abbrevs'.
 
 ;;;***
 
-;;;### (autoloads nil "f90" "progmodes/f90.el" (20886 939 575794
+;;;### (autoloads nil "f90" "progmodes/f90.el" (20992 52525 458637
 ;;;;;;  0))
 ;;; Generated autoloads from progmodes/f90.el
 
@@ -10318,10 +10393,10 @@ Besides the choice of face, it is the same as `buffer-face-mode'.
 
 ;;;***
 
-;;;### (autoloads nil "feedmail" "mail/feedmail.el" (20891 18859
-;;;;;;  893295 0))
+;;;### (autoloads nil "feedmail" "mail/feedmail.el" (21002 1963 769129
+;;;;;;  0))
 ;;; Generated autoloads from mail/feedmail.el
-(push (purecopy (quote (feedmail 11))) package--builtin-versions)
+(push (purecopy '(feedmail 11)) package--builtin-versions)
 (autoload 'feedmail-send-it "feedmail" "\
 Send the current mail buffer using the Feedmail package.
 This is a suitable value for `send-mail-function'.  It can be used
@@ -10372,7 +10447,7 @@ you can set `feedmail-queue-reminder-alist' to nil.
 
 ;;;***
 
-;;;### (autoloads nil "ffap" "ffap.el" (20752 26669 524456 0))
+;;;### (autoloads nil "ffap" "ffap.el" (20998 4934 952905 0))
 ;;; Generated autoloads from ffap.el
 
 (autoload 'ffap-next "ffap" "\
@@ -10435,7 +10510,7 @@ Evaluate the forms in variable `ffap-bindings'.
 
 ;;;***
 
-;;;### (autoloads nil "filecache" "filecache.el" (20709 26818 907104
+;;;### (autoloads nil "filecache" "filecache.el" (20998 4934 952905
 ;;;;;;  0))
 ;;; Generated autoloads from filecache.el
 
@@ -10493,6 +10568,19 @@ the name is considered already unique; only the second substitution
 
 ;;;***
 
+;;;### (autoloads nil "filenotify" "filenotify.el" (20999 25770 522517
+;;;;;;  0))
+;;; Generated autoloads from filenotify.el
+
+(autoload 'file-notify-handle-event "filenotify" "\
+Handle file system monitoring event.
+If EVENT is a filewatch event, call its callback.
+Otherwise, signal a `file-notify-error'.
+
+\(fn EVENT)" t nil)
+
+;;;***
+
 ;;;### (autoloads nil "files-x" "files-x.el" (20938 49065 383398
 ;;;;;;  0))
 ;;; Generated autoloads from files-x.el
@@ -10559,7 +10647,7 @@ Copy directory-local variables to the -*- line.
 
 ;;;***
 
-;;;### (autoloads nil "filesets" "filesets.el" (20791 9657 561026
+;;;### (autoloads nil "filesets" "filesets.el" (20999 25770 522517
 ;;;;;;  0))
 ;;; Generated autoloads from filesets.el
 
@@ -10574,7 +10662,7 @@ Set up hooks, load the cache file -- if existing -- and build the menu.
 ;;;### (autoloads nil "find-cmd" "find-cmd.el" (20709 26818 907104
 ;;;;;;  0))
 ;;; Generated autoloads from find-cmd.el
-(push (purecopy (quote (find-cmd 0 6))) package--builtin-versions)
+(push (purecopy '(find-cmd 0 6)) package--builtin-versions)
 (autoload 'find-cmd "find-cmd" "\
 Initiate the building of a find command.
 For example:
@@ -10630,7 +10718,7 @@ use in place of \"-ls\" as the final argument.
 
 ;;;***
 
-;;;### (autoloads nil "find-file" "find-file.el" (20872 54440 171355
+;;;### (autoloads nil "find-file" "find-file.el" (20999 25770 522517
 ;;;;;;  0))
 ;;; Generated autoloads from find-file.el
 
@@ -10880,7 +10968,7 @@ Define some key bindings for the find-function family of functions.
 
 ;;;***
 
-;;;### (autoloads nil "find-lisp" "find-lisp.el" (20709 26818 907104
+;;;### (autoloads nil "find-lisp" "find-lisp.el" (20993 35788 926781
 ;;;;;;  0))
 ;;; Generated autoloads from find-lisp.el
 
@@ -10895,7 +10983,7 @@ Find all subdirectories of DIR.
 \(fn DIR)" t nil)
 
 (autoload 'find-lisp-find-dired-filter "find-lisp" "\
-Change the filter on a find-lisp-find-dired buffer to REGEXP.
+Change the filter on a `find-lisp-find-dired' buffer to REGEXP.
 
 \(fn REGEXP)" t nil)
 
@@ -10903,7 +10991,7 @@ Change the filter on a find-lisp-find-dired buffer to REGEXP.
 
 ;;;### (autoloads nil "finder" "finder.el" (20925 37032 237257 0))
 ;;; Generated autoloads from finder.el
-(push (purecopy (quote (finder 1 0))) package--builtin-versions)
+(push (purecopy '(finder 1 0)) package--builtin-versions)
 (autoload 'finder-list-keywords "finder" "\
 Display descriptions of the keywords in the Finder buffer.
 
@@ -10960,10 +11048,10 @@ to get the effect of a C-q.
 
 ;;;***
 
-;;;### (autoloads nil "flymake" "progmodes/flymake.el" (20932 61699
-;;;;;;  522706 0))
+;;;### (autoloads nil "flymake" "progmodes/flymake.el" (21019 11047
+;;;;;;  84796 0))
 ;;; Generated autoloads from progmodes/flymake.el
-(push (purecopy (quote (flymake 0 3))) package--builtin-versions)
+(push (purecopy '(flymake 0 3)) package--builtin-versions)
 (autoload 'flymake-mode "flymake" "\
 Toggle on-the-fly syntax checking.
 With a prefix argument ARG, enable the mode if ARG is positive,
@@ -11063,10 +11151,10 @@ Flyspell whole buffer.
 ;;;### (autoloads nil "foldout" "foldout.el" (20709 26818 907104
 ;;;;;;  0))
 ;;; Generated autoloads from foldout.el
-(push (purecopy (quote (foldout 1 10))) package--builtin-versions)
+(push (purecopy '(foldout 1 10)) package--builtin-versions)
 ;;;***
 
-;;;### (autoloads nil "follow" "follow.el" (20709 26818 907104 0))
+;;;### (autoloads nil "follow" "follow.el" (21005 64551 555603 0))
 ;;; Generated autoloads from follow.el
 
 (autoload 'turn-on-follow-mode "follow" "\
@@ -11137,7 +11225,7 @@ selected if the original window is the first one in the frame.
 ;;;### (autoloads nil "footnote" "mail/footnote.el" (20709 26818
 ;;;;;;  907104 0))
 ;;; Generated autoloads from mail/footnote.el
-(push (purecopy (quote (footnote 0 19))) package--builtin-versions)
+(push (purecopy '(footnote 0 19)) package--builtin-versions)
 (autoload 'footnote-mode "footnote" "\
 Toggle Footnote mode.
 With a prefix argument ARG, enable Footnote mode if ARG is
@@ -11153,7 +11241,7 @@ play around with the following keys:
 
 ;;;***
 
-;;;### (autoloads nil "forms" "forms.el" (20709 26818 907104 0))
+;;;### (autoloads nil "forms" "forms.el" (20999 25770 522517 0))
 ;;; Generated autoloads from forms.el
 
 (autoload 'forms-mode "forms" "\
@@ -11189,8 +11277,8 @@ Visit a file in Forms mode in other window.
 
 ;;;***
 
-;;;### (autoloads nil "fortran" "progmodes/fortran.el" (20709 26818
-;;;;;;  907104 0))
+;;;### (autoloads nil "fortran" "progmodes/fortran.el" (20992 52525
+;;;;;;  458637 0))
 ;;; Generated autoloads from progmodes/fortran.el
 
 (autoload 'fortran-mode "fortran" "\
@@ -11316,14 +11404,175 @@ and choose the directory as the fortune-file.
 
 ;;;***
 
+;;;### (autoloads nil "frameset" "frameset.el" (21005 64551 555603
+;;;;;;  0))
+;;; Generated autoloads from frameset.el
+
+(defvar frameset-session-filter-alist '((name . :never) (left . frameset-filter-iconified) (minibuffer . frameset-filter-minibuffer) (top . frameset-filter-iconified)) "\
+Minimum set of parameters to filter for live (on-session) framesets.
+DO NOT MODIFY.  See `frameset-filter-alist' for a full description.")
+
+(defvar frameset-persistent-filter-alist (nconc '((background-color . frameset-filter-sanitize-color) (buffer-list . :never) (buffer-predicate . :never) (buried-buffer-list . :never) (font . frameset-filter-shelve-param) (foreground-color . frameset-filter-sanitize-color) (fullscreen . frameset-filter-shelve-param) (GUI:font . frameset-filter-unshelve-param) (GUI:fullscreen . frameset-filter-unshelve-param) (GUI:height . frameset-filter-unshelve-param) (GUI:width . frameset-filter-unshelve-param) (height . frameset-filter-shelve-param) (outer-window-id . :never) (parent-id . :never) (tty . frameset-filter-tty-to-GUI) (tty-type . frameset-filter-tty-to-GUI) (width . frameset-filter-shelve-param) (window-id . :never) (window-system . :never)) frameset-session-filter-alist) "\
+Parameters to filter for persistent framesets.
+DO NOT MODIFY.  See `frameset-filter-alist' for a full description.")
+
+(defvar frameset-filter-alist frameset-persistent-filter-alist "\
+Alist of frame parameters and filtering functions.
+
+This alist is the default value of the FILTERS argument of
+`frameset-save' and `frameset-restore' (which see).
+
+Initially, `frameset-filter-alist' is set to, and shares the value of,
+`frameset-persistent-filter-alist'.  You can override any item in
+this alist by `push'ing a new item onto it.  If, for some reason, you
+intend to modify existing values, do
+
+  (setq frameset-filter-alist (copy-tree frameset-filter-alist))
+
+before changing anything.
+
+On saving, PARAMETERS is the parameter alist of each frame processed,
+and FILTERED is the parameter alist that gets saved to the frameset.
+
+On restoring, PARAMETERS is the parameter alist extracted from the
+frameset, and FILTERED is the resulting frame parameter alist used
+to restore the frame.
+
+Elements of `frameset-filter-alist' are conses (PARAM . ACTION),
+where PARAM is a parameter name (a symbol identifying a frame
+parameter), and ACTION can be:
+
+ nil       The parameter is copied to FILTERED.
+ :never    The parameter is never copied to FILTERED.
+ :save     The parameter is copied only when saving the frame.
+ :restore  The parameter is copied only when restoring the frame.
+ FILTER    A filter function.
+
+FILTER can be a symbol FILTER-FUN, or a list (FILTER-FUN ARGS...).
+FILTER-FUN is invoked with
+
+  (apply FILTER-FUN CURRENT FILTERED PARAMETERS SAVING ARGS)
+
+where
+
+ CURRENT     A cons (PARAM . VALUE), where PARAM is the one being
+             filtered and VALUE is its current value.
+ FILTERED    The resulting alist (so far).
+ PARAMETERS  The complete alist of parameters being filtered,
+ SAVING      Non-nil if filtering before saving state, nil if filtering
+               before restoring it.
+ ARGS        Any additional arguments specified in the ACTION.
+
+FILTER-FUN is allowed to modify items in FILTERED, but no other arguments.
+It must return:
+ nil                      Skip CURRENT (do not add it to FILTERED).
+ t                        Add CURRENT to FILTERED as is.
+ (NEW-PARAM . NEW-VALUE)  Add this to FILTERED instead of CURRENT.
+
+Frame parameters not on this alist are passed intact, as if they were
+defined with ACTION = nil.")
+
+(autoload 'frameset-frame-id "frameset" "\
+Return the frame id of FRAME, if it has one; else, return nil.
+A frame id is a string that uniquely identifies a frame.
+It is persistent across `frameset-save' / `frameset-restore'
+invocations, and once assigned is never changed unless the same
+frame is duplicated (via `frameset-restore'), in which case the
+newest frame keeps the id and the old frame's is set to nil.
+
+\(fn FRAME)" nil nil)
+
+(autoload 'frameset-frame-id-equal-p "frameset" "\
+Return non-nil if FRAME's id matches ID.
+
+\(fn FRAME ID)" nil nil)
+
+(autoload 'frameset-frame-with-id "frameset" "\
+Return the live frame with id ID, if exists; else nil.
+If FRAME-LIST is a list of frames, check these frames only.
+If nil, check all live frames.
+
+\(fn ID &optional FRAME-LIST)" nil nil)
+
+(autoload 'frameset-save "frameset" "\
+Return a frameset for FRAME-LIST, a list of frames.
+Dead frames and non-frame objects are silently removed from the list.
+If nil, FRAME-LIST defaults to the output of `frame-list' (all live frames).
+APP, NAME and DESCRIPTION are optional data; see the docstring of the
+`frameset' defstruct for details.
+FILTERS is an alist of parameter filters; if nil, the value of the variable
+`frameset-filter-alist' is used instead.
+PREDICATE is a predicate function, which must return non-nil for frames that
+should be saved; if PREDICATE is nil, all frames from FRAME-LIST are saved.
+PROPERTIES is a user-defined property list to add to the frameset.
+
+\(fn FRAME-LIST &key APP NAME DESCRIPTION FILTERS PREDICATE PROPERTIES)" nil nil)
+
+(autoload 'frameset-restore "frameset" "\
+Restore a FRAMESET into the current display(s).
+
+PREDICATE is a function called with two arguments, the parameter alist
+and the window-state of the frame being restored, in that order (see
+the docstring of the `frameset' defstruct for additional details).
+If PREDICATE returns nil, the frame described by that parameter alist
+and window-state is not restored.
+
+FILTERS is an alist of parameter filters; if nil, the value of
+`frameset-filter-alist' is used instead.
+
+REUSE-FRAMES selects the policy to use to reuse frames when restoring:
+  t        Reuse existing frames if possible, and delete those not reused.
+  nil      Restore frameset in new frames and delete existing frames.
+  :keep    Restore frameset in new frames and keep the existing ones.
+  LIST     A list of frames to reuse; only these are reused (if possible).
+             Remaining frames in this list are deleted; other frames not
+             included on the list are left untouched.
+
+FORCE-DISPLAY can be:
+  t        Frames are restored in the current display.
+  nil      Frames are restored, if possible, in their original displays.
+  :delete  Frames in other displays are deleted instead of restored.
+  PRED     A function called with two arguments, the parameter alist and
+             the window state (in that order).  It must return t, nil or
+             `:delete', as above but affecting only the frame that will
+             be created from that parameter alist.
+
+FORCE-ONSCREEN can be:
+  t        Force onscreen only those frames that are fully offscreen.
+  nil      Do not force any frame back onscreen.
+  :all     Force onscreen any frame fully or partially offscreen.
+  PRED     A function called with three arguments,
+           - the live frame just restored,
+           - a list (LEFT TOP WIDTH HEIGHT), describing the frame,
+           - a list (LEFT TOP WIDTH HEIGHT), describing the workarea.
+           It must return non-nil to force the frame onscreen, nil otherwise.
+
+Note the timing and scope of the operations described above: REUSE-FRAMES
+affects existing frames; PREDICATE, FILTERS and FORCE-DISPLAY affect the frame
+being restored before that happens; and FORCE-ONSCREEN affects the frame once
+it has been restored.
+
+All keyword parameters default to nil.
+
+\(fn FRAMESET &key PREDICATE FILTERS REUSE-FRAMES FORCE-DISPLAY FORCE-ONSCREEN)" nil nil)
+
+(autoload 'frameset-to-register "frameset" "\
+Store the current frameset in register REGISTER.
+Use \\[jump-to-register] to restore the frameset.
+Argument is a character, naming the register.
+
+\(fn REGISTER &optional ARG)" t nil)
+
+;;;***
+
 ;;;### (autoloads nil "gamegrid" "play/gamegrid.el" (20752 26925
 ;;;;;;  124734 677000))
 ;;; Generated autoloads from play/gamegrid.el
-(push (purecopy (quote (gamegrid 1 2))) package--builtin-versions)
+(push (purecopy '(gamegrid 1 2)) package--builtin-versions)
 ;;;***
 
-;;;### (autoloads nil "gdb-mi" "progmodes/gdb-mi.el" (20932 61687
-;;;;;;  205708 148000))
+;;;### (autoloads nil "gdb-mi" "progmodes/gdb-mi.el" (20992 52525
+;;;;;;  458637 0))
 ;;; Generated autoloads from progmodes/gdb-mi.el
 
 (defvar gdb-enable-debug nil "\
@@ -11551,9 +11800,9 @@ DEFAULT-MAP specifies the default key map for ICON-LIST.
 
 ;;;***
 
-;;;### (autoloads nil "gnus" "gnus/gnus.el" (20901 54695 989166 0))
+;;;### (autoloads nil "gnus" "gnus/gnus.el" (21002 1963 769129 0))
 ;;; Generated autoloads from gnus/gnus.el
-(push (purecopy (quote (gnus 5 13))) package--builtin-versions)(when (fboundp 'custom-autoload)
+(push (purecopy '(gnus 5 13)) package--builtin-versions)(when (fboundp 'custom-autoload)
  (custom-autoload 'gnus-select-method "gnus"))
 
 (autoload 'gnus-slave-no-server "gnus" "\
@@ -11691,8 +11940,8 @@ If CLEAN, obsolete (ignore).
 
 ;;;***
 
-;;;### (autoloads nil "gnus-art" "gnus/gnus-art.el" (20941 25255
-;;;;;;  50698 0))
+;;;### (autoloads nil "gnus-art" "gnus/gnus-art.el" (20977 54298
+;;;;;;  858063 0))
 ;;; Generated autoloads from gnus/gnus-art.el
 
 (autoload 'gnus-article-prepare-display "gnus-art" "\
@@ -11768,8 +12017,8 @@ supported.
 
 ;;;***
 
-;;;### (autoloads nil "gnus-delay" "gnus/gnus-delay.el" (20791 9657
-;;;;;;  561026 0))
+;;;### (autoloads nil "gnus-delay" "gnus/gnus-delay.el" (20988 22031
+;;;;;;  837044 0))
 ;;; Generated autoloads from gnus/gnus-delay.el
 
 (autoload 'gnus-delay-article "gnus-delay" "\
@@ -11905,8 +12154,8 @@ If gravatars are already displayed, remove them.
 
 ;;;***
 
-;;;### (autoloads nil "gnus-group" "gnus/gnus-group.el" (20929 34089
-;;;;;;  117790 0))
+;;;### (autoloads nil "gnus-group" "gnus/gnus-group.el" (20988 22031
+;;;;;;  837044 0))
 ;;; Generated autoloads from gnus/gnus-group.el
 
 (autoload 'gnus-fetch-group "gnus-group" "\
@@ -12078,8 +12327,8 @@ Calling (gnus-group-split-fancy nil nil \"mail.others\") returns:
 
 ;;;***
 
-;;;### (autoloads nil "gnus-msg" "gnus/gnus-msg.el" (20858 21542
-;;;;;;  723007 0))
+;;;### (autoloads nil "gnus-msg" "gnus/gnus-msg.el" (20974 22577
+;;;;;;  548213 0))
 ;;; Generated autoloads from gnus/gnus-msg.el
 
 (autoload 'gnus-msg-mail "gnus-msg" "\
@@ -12214,8 +12463,8 @@ Add NUM into sorted LIST by side effect.
 
 ;;;***
 
-;;;### (autoloads nil "gnus-registry" "gnus/gnus-registry.el" (20779
-;;;;;;  18487 859617 0))
+;;;### (autoloads nil "gnus-registry" "gnus/gnus-registry.el" (20955
+;;;;;;  58152 201869 0))
 ;;; Generated autoloads from gnus/gnus-registry.el
 
 (autoload 'gnus-registry-initialize "gnus-registry" "\
@@ -12269,8 +12518,8 @@ Update the format specification near point.
 
 ;;;***
 
-;;;### (autoloads nil "gnus-start" "gnus/gnus-start.el" (20763 30266
-;;;;;;  231060 0))
+;;;### (autoloads nil "gnus-start" "gnus/gnus-start.el" (20986 60038
+;;;;;;  720063 0))
 ;;; Generated autoloads from gnus/gnus-start.el
 
 (autoload 'gnus-declare-backend "gnus-start" "\
@@ -12280,8 +12529,8 @@ Declare back end NAME with ABILITIES as a Gnus back end.
 
 ;;;***
 
-;;;### (autoloads nil "gnus-sum" "gnus/gnus-sum.el" (20901 54695
-;;;;;;  989166 0))
+;;;### (autoloads nil "gnus-sum" "gnus/gnus-sum.el" (20984 58408
+;;;;;;  354075 0))
 ;;; Generated autoloads from gnus/gnus-sum.el
 
 (autoload 'gnus-summary-bookmark-jump "gnus-sum" "\
@@ -12319,7 +12568,7 @@ Add the window configuration CONF to `gnus-buffer-configuration'.
 
 ;;;***
 
-;;;### (autoloads nil "gnutls" "net/gnutls.el" (20709 26818 907104
+;;;### (autoloads nil "gnutls" "net/gnutls.el" (20998 4934 952905
 ;;;;;;  0))
 ;;; Generated autoloads from net/gnutls.el
 
@@ -12336,7 +12585,7 @@ A value of nil says to use the default GnuTLS value.")
 
 ;;;***
 
-;;;### (autoloads nil "gomoku" "play/gomoku.el" (20709 26818 907104
+;;;### (autoloads nil "gomoku" "play/gomoku.el" (20992 52525 458637
 ;;;;;;  0))
 ;;; Generated autoloads from play/gomoku.el
 
@@ -12688,7 +12937,7 @@ it if ARG is omitted or nil.
 
 ;;;***
 
-;;;### (autoloads nil "gv" "emacs-lisp/gv.el" (20709 26818 907104
+;;;### (autoloads nil "gv" "emacs-lisp/gv.el" (21002 1963 769129
 ;;;;;;  0))
 ;;; Generated autoloads from emacs-lisp/gv.el
 
@@ -13085,7 +13334,7 @@ Produce a texinfo buffer with sorted doc-strings from the DOC file.
 
 ;;;***
 
-;;;### (autoloads nil "help-macro" "help-macro.el" (20709 26818 907104
+;;;### (autoloads nil "help-macro" "help-macro.el" (20992 52525 458637
 ;;;;;;  0))
 ;;; Generated autoloads from help-macro.el
 
@@ -13100,7 +13349,7 @@ gives the window that lists the options.")
 
 ;;;***
 
-;;;### (autoloads nil "help-mode" "help-mode.el" (20920 19111 869400
+;;;### (autoloads nil "help-mode" "help-mode.el" (20999 25770 522517
 ;;;;;;  0))
 ;;; Generated autoloads from help-mode.el
 
@@ -13200,8 +13449,8 @@ BOOKMARK is a bookmark name or a bookmark record.
 
 ;;;***
 
-;;;### (autoloads nil "helper" "emacs-lisp/helper.el" (20709 26818
-;;;;;;  907104 0))
+;;;### (autoloads nil "helper" "emacs-lisp/helper.el" (20992 52525
+;;;;;;  458637 0))
 ;;; Generated autoloads from emacs-lisp/helper.el
 
 (autoload 'Helper-describe-bindings "helper" "\
@@ -13588,7 +13837,7 @@ Unconditionally turn off `hs-minor-mode'.
 
 ;;;***
 
-;;;### (autoloads nil "hilit-chg" "hilit-chg.el" (20709 26818 907104
+;;;### (autoloads nil "hilit-chg" "hilit-chg.el" (20992 52525 458637
 ;;;;;;  0))
 ;;; Generated autoloads from hilit-chg.el
 
@@ -13720,10 +13969,10 @@ See `highlight-changes-mode' for more information on Highlight-Changes mode.
 
 ;;;***
 
-;;;### (autoloads nil "hippie-exp" "hippie-exp.el" (20709 26818 907104
+;;;### (autoloads nil "hippie-exp" "hippie-exp.el" (20992 52525 458637
 ;;;;;;  0))
 ;;; Generated autoloads from hippie-exp.el
-(push (purecopy (quote (hippie-exp 1 6))) package--builtin-versions)
+(push (purecopy '(hippie-exp 1 6)) package--builtin-versions)
 (defvar hippie-expand-try-functions-list '(try-complete-file-name-partially try-complete-file-name try-expand-all-abbrevs try-expand-list try-expand-line try-expand-dabbrev try-expand-dabbrev-all-buffers try-expand-dabbrev-from-kill try-complete-lisp-symbol-partially try-complete-lisp-symbol) "\
 The list of expansion functions tried in order by `hippie-expand'.
 To change the behavior of `hippie-expand', remove, change the order of,
@@ -13752,7 +14001,7 @@ argument VERBOSE non-nil makes the function verbose.
 
 ;;;***
 
-;;;### (autoloads nil "hl-line" "hl-line.el" (20709 26818 907104
+;;;### (autoloads nil "hl-line" "hl-line.el" (20992 52525 458637
 ;;;;;;  0))
 ;;; Generated autoloads from hl-line.el
 
@@ -13965,7 +14214,7 @@ Convert HTML to plain text in the current buffer.
 ;;;### (autoloads nil "htmlfontify" "htmlfontify.el" (20938 49065
 ;;;;;;  383398 0))
 ;;; Generated autoloads from htmlfontify.el
-(push (purecopy (quote (htmlfontify 0 21))) package--builtin-versions)
+(push (purecopy '(htmlfontify 0 21)) package--builtin-versions)
 (autoload 'htmlfontify-buffer "htmlfontify" "\
 Create a new buffer, named for the current buffer + a .html extension,
 containing an inline CSS-stylesheet and formatted CSS-markup HTML
@@ -14084,8 +14333,8 @@ bound to the current value of the filter.
 
 ;;;***
 
-;;;### (autoloads nil "ibuffer" "ibuffer.el" (20921 40206 193565
-;;;;;;  167000))
+;;;### (autoloads nil "ibuffer" "ibuffer.el" (20999 25770 522517
+;;;;;;  0))
 ;;; Generated autoloads from ibuffer.el
 
 (autoload 'ibuffer-list-buffers "ibuffer" "\
@@ -14127,7 +14376,7 @@ FORMATS is the value to use for `ibuffer-formats'.
 ;;;### (autoloads nil "icalendar" "calendar/icalendar.el" (20709
 ;;;;;;  26818 907104 0))
 ;;; Generated autoloads from calendar/icalendar.el
-(push (purecopy (quote (icalendar 0 19))) package--builtin-versions)
+(push (purecopy '(icalendar 0 19)) package--builtin-versions)
 (autoload 'icalendar-export-file "icalendar" "\
 Export diary file to iCalendar format.
 All diary entries in the file DIARY-FILENAME are converted to iCalendar
@@ -14177,7 +14426,7 @@ buffer `*icalendar-errors*'.
 
 ;;;***
 
-;;;### (autoloads nil "icomplete" "icomplete.el" (20766 59066 666084
+;;;### (autoloads nil "icomplete" "icomplete.el" (20992 52525 458637
 ;;;;;;  0))
 ;;; Generated autoloads from icomplete.el
 
@@ -14270,7 +14519,7 @@ See also the variable `idlwave-shell-prompt-pattern'.
 ;;;### (autoloads nil "idlwave" "progmodes/idlwave.el" (20929 34089
 ;;;;;;  117790 0))
 ;;; Generated autoloads from progmodes/idlwave.el
-(push (purecopy (quote (idlwave 6 1 22))) package--builtin-versions)
+(push (purecopy '(idlwave 6 1 22)) package--builtin-versions)
 (autoload 'idlwave-mode "idlwave" "\
 Major mode for editing IDL source files (version 6.1_em22).
 
@@ -14395,17 +14644,17 @@ The main features of this mode are
 
 ;;;***
 
-;;;### (autoloads nil "ido" "ido.el" (20937 28198 475168 0))
+;;;### (autoloads nil "ido" "ido.el" (20996 49577 892030 0))
 ;;; Generated autoloads from ido.el
 
 (defvar ido-mode nil "\
-Determines for which functional group (buffer and files) ido behavior
-should be enabled.  The following values are possible:
+Determines for which buffer/file Ido should be enabled.
+The following values are possible:
 - `buffer': Turn only on ido buffer behavior (switching, killing,
   displaying...)
 - `file': Turn only on ido file behavior (finding, writing, inserting...)
 - `both': Turn on ido buffer and file behavior.
-- `nil': Turn off any ido switching.
+-  nil: Turn off any ido switching.
 
 Setting this variable directly does not take effect;
 use either \\[customize] or the function `ido-mode'.")
@@ -14681,7 +14930,7 @@ the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'.
 
 ;;;***
 
-;;;### (autoloads nil "image" "image.el" (20903 10024 645978 0))
+;;;### (autoloads nil "image" "image.el" (21005 64551 555603 0))
 ;;; Generated autoloads from image.el
 
 (autoload 'image-type-from-data "image" "\
@@ -14874,10 +15123,10 @@ If Emacs is compiled without ImageMagick support, this does nothing.
 
 ;;;***
 
-;;;### (autoloads nil "image-dired" "image-dired.el" (20921 39978
-;;;;;;  248467 0))
+;;;### (autoloads nil "image-dired" "image-dired.el" (20971 46377
+;;;;;;  737658 0))
 ;;; Generated autoloads from image-dired.el
-(push (purecopy (quote (image-dired 0 4 11))) package--builtin-versions)
+(push (purecopy '(image-dired 0 4 11)) package--builtin-versions)
 (autoload 'image-dired-dired-toggle-marked-thumbs "image-dired" "\
 Toggle thumbnails in front of file names in the dired buffer.
 If no marked file could be found, insert or hide thumbnails on the
@@ -15074,7 +15323,7 @@ An image file is one whose name has an extension in
 
 ;;;***
 
-;;;### (autoloads nil "image-mode" "image-mode.el" (20899 12965 791908
+;;;### (autoloads nil "image-mode" "image-mode.el" (21005 64551 555603
 ;;;;;;  0))
 ;;; Generated autoloads from image-mode.el
 
@@ -15083,6 +15332,9 @@ Major mode for image files.
 You can use \\<image-mode-map>\\[image-toggle-display]
 to toggle between display as an image and display as text.
 
+Key bindings:
+\\{image-mode-map}
+
 \(fn)" t nil)
 
 (autoload 'image-minor-mode "image-mode" "\
@@ -15307,7 +15559,7 @@ of `inferior-lisp-program').  Runs the hooks from
 
 ;;;***
 
-;;;### (autoloads nil "info" "info.el" (20940 4391 641153 0))
+;;;### (autoloads nil "info" "info.el" (20992 52525 458637 0))
 ;;; Generated autoloads from info.el
 
 (defcustom Info-default-directory-list (let* ((config-dir (file-name-as-directory (or (and (featurep 'ns) (let ((dir (expand-file-name "../info" data-directory))) (if (file-directory-p dir) dir))) configure-info-directory))) (prefixes (prune-directory-list '("/usr/local/" "/usr/" "/opt/" "/"))) (suffixes '("share/" "" "gnu/" "gnu/lib/" "gnu/lib/emacs/" "emacs/" "lib/" "lib/emacs/")) (standard-info-dirs (apply #'nconc (mapcar (lambda (pfx) (let ((dirs (mapcar (lambda (sfx) (concat pfx sfx "info/")) suffixes))) (prune-directory-list dirs))) prefixes))) (dirs (if (member config-dir standard-info-dirs) (nconc standard-info-dirs (list config-dir)) (cons config-dir standard-info-dirs)))) (if (not (eq system-type 'windows-nt)) dirs (let* ((instdir (file-name-directory invocation-directory)) (dir1 (expand-file-name "../info/" instdir)) (dir2 (expand-file-name "../../../info/" instdir))) (cond ((file-exists-p dir1) (append dirs (list dir1))) ((file-exists-p dir2) (append dirs (list dir2))) (t dirs))))) "\
@@ -15566,10 +15818,10 @@ Perform completion on file preceding point.
 
 ;;;***
 
-;;;### (autoloads nil "info-xref" "info-xref.el" (20938 49065 383398
+;;;### (autoloads nil "info-xref" "info-xref.el" (20947 64044 876888
 ;;;;;;  0))
 ;;; Generated autoloads from info-xref.el
-(push (purecopy (quote (info-xref 3))) package--builtin-versions)
+(push (purecopy '(info-xref 3)) package--builtin-versions)
 (autoload 'info-xref-check "info-xref" "\
 Check external references in FILENAME, an info document.
 Interactively from an `Info-mode' or `texinfo-mode' buffer the
@@ -15698,7 +15950,7 @@ For example, invoke \"emacs -batch -f batch-info-validate $info/ ~/*.info\"
 ;;;### (autoloads nil "inversion" "cedet/inversion.el" (20745 310
 ;;;;;;  425822 0))
 ;;; Generated autoloads from cedet/inversion.el
-(push (purecopy (quote (inversion 1 3))) package--builtin-versions)
+(push (purecopy '(inversion 1 3)) package--builtin-versions)
 (autoload 'inversion-require-emacs "inversion" "\
 Declare that you need either EMACS-VER, XEMACS-VER or SXEMACS-ver.
 Only checks one based on which kind of Emacs is being run.
@@ -15731,7 +15983,7 @@ Toggle input method in interactive search.
 ;;;### (autoloads nil "isearchb" "isearchb.el" (20709 26818 907104
 ;;;;;;  0))
 ;;; Generated autoloads from isearchb.el
-(push (purecopy (quote (isearchb 1 5))) package--builtin-versions)
+(push (purecopy '(isearchb 1 5)) package--builtin-versions)
 (autoload 'isearchb-activate "isearchb" "\
 Active isearchb mode for subsequent alphanumeric keystrokes.
 Executing this command again will terminate the search; or, if
@@ -15841,8 +16093,8 @@ Add submenus to the File menu, to convert to and from various formats.
 
 ;;;***
 
-;;;### (autoloads nil "ispell" "textmodes/ispell.el" (20847 51240
-;;;;;;  240216 0))
+;;;### (autoloads nil "ispell" "textmodes/ispell.el" (20992 52525
+;;;;;;  458637 0))
 ;;; Generated autoloads from textmodes/ispell.el
 
 (put 'ispell-check-comments 'safe-local-variable (lambda (a) (memq a '(nil t exclusive))))
@@ -16179,7 +16431,7 @@ If non-nil, second arg INITIAL-INPUT is a string to insert before reading.
 
 ;;;***
 
-;;;### (autoloads nil "jka-compr" "jka-compr.el" (20759 33211 414988
+;;;### (autoloads nil "jka-compr" "jka-compr.el" (20998 4934 952905
 ;;;;;;  0))
 ;;; Generated autoloads from jka-compr.el
 
@@ -16203,10 +16455,9 @@ by `jka-compr-installed'.
 
 ;;;***
 
-;;;### (autoloads nil "js" "progmodes/js.el" (20895 15912 444844
-;;;;;;  0))
+;;;### (autoloads nil "js" "progmodes/js.el" (20998 4934 952905 0))
 ;;; Generated autoloads from progmodes/js.el
-(push (purecopy (quote (js 9))) package--builtin-versions)
+(push (purecopy '(js 9)) package--builtin-versions)
 (autoload 'js-mode "js" "\
 Major mode for editing JavaScript.
 
@@ -16215,9 +16466,9 @@ Major mode for editing JavaScript.
 
 ;;;***
 
-;;;### (autoloads nil "json" "json.el" (20709 26818 907104 0))
+;;;### (autoloads nil "json" "json.el" (20998 4934 952905 0))
 ;;; Generated autoloads from json.el
-(push (purecopy (quote (json 1 4))) package--builtin-versions)
+(push (purecopy '(json 1 4)) package--builtin-versions)
 ;;;***
 
 ;;;### (autoloads nil "keypad" "emulation/keypad.el" (20709 26818
@@ -16298,7 +16549,7 @@ the context of text formatting.
 
 ;;;***
 
-;;;### (autoloads nil "kkc" "international/kkc.el" (20799 169 640767
+;;;### (autoloads nil "kkc" "international/kkc.el" (20998 4934 952905
 ;;;;;;  0))
 ;;; Generated autoloads from international/kkc.el
 
@@ -16447,8 +16698,8 @@ The kind of Korean keyboard for Korean input method.
 
 ;;;***
 
-;;;### (autoloads nil "landmark" "play/landmark.el" (20709 26818
-;;;;;;  907104 0))
+;;;### (autoloads nil "landmark" "play/landmark.el" (20992 52525
+;;;;;;  458637 0))
 ;;; Generated autoloads from play/landmark.el
 
 (defalias 'landmark-repeat 'landmark-test-run)
@@ -16601,7 +16852,7 @@ A major mode to edit GNU ld script files
 
 ;;;***
 
-;;;### (autoloads nil "life" "play/life.el" (20709 26818 907104 0))
+;;;### (autoloads nil "life" "play/life.el" (20998 4934 952905 0))
 ;;; Generated autoloads from play/life.el
 
 (autoload 'life "life" "\
@@ -16616,7 +16867,7 @@ generations (this defaults to 1).
 
 ;;;### (autoloads nil "linum" "linum.el" (20709 26818 907104 0))
 ;;; Generated autoloads from linum.el
-(push (purecopy (quote (linum 0 9 24))) package--builtin-versions)
+(push (purecopy '(linum 0 9 24)) package--builtin-versions)
 (autoload 'linum-mode "linum" "\
 Toggle display of line numbers in the left margin (Linum mode).
 With a prefix argument ARG, enable Linum mode if ARG is positive,
@@ -16766,7 +17017,7 @@ done.  Otherwise, it uses the current buffer.
 
 ;;;***
 
-;;;### (autoloads nil "log-view" "vc/log-view.el" (20918 63784 852859
+;;;### (autoloads nil "log-view" "vc/log-view.el" (20986 13739 89657
 ;;;;;;  0))
 ;;; Generated autoloads from vc/log-view.el
 
@@ -16777,7 +17028,7 @@ Major mode for browsing CVS log output.
 
 ;;;***
 
-;;;### (autoloads nil "lpr" "lpr.el" (20878 6823 881439 0))
+;;;### (autoloads nil "lpr" "lpr.el" (20975 43430 521692 0))
 ;;; Generated autoloads from lpr.el
 
 (defvar lpr-windows-system (memq system-type '(ms-dos windows-nt)) "\
@@ -17184,8 +17435,8 @@ double-quotes.
 
 ;;;***
 
-;;;### (autoloads nil "mailalias" "mail/mailalias.el" (20709 26818
-;;;;;;  907104 0))
+;;;### (autoloads nil "mailalias" "mail/mailalias.el" (20970 25513
+;;;;;;  362767 0))
 ;;; Generated autoloads from mail/mailalias.el
 
 (defvar mail-complete-style 'angles "\
@@ -17437,7 +17688,7 @@ Default bookmark handler for Man buffers.
 
 ;;;### (autoloads nil "master" "master.el" (20884 7264 912957 506000))
 ;;; Generated autoloads from master.el
-(push (purecopy (quote (master 1 0 2))) package--builtin-versions)
+(push (purecopy '(master 1 0 2)) package--builtin-versions)
 (autoload 'master-mode "master" "\
 Toggle Master mode.
 With a prefix argument ARG, enable Master mode if ARG is
@@ -17487,10 +17738,10 @@ recursion depth in the minibuffer prompt.  This is only useful if
 
 ;;;### (autoloads nil "md4" "md4.el" (20709 26818 907104 0))
 ;;; Generated autoloads from md4.el
-(push (purecopy (quote (md4 1 0))) package--builtin-versions)
+(push (purecopy '(md4 1 0)) package--builtin-versions)
 ;;;***
 
-;;;### (autoloads nil "message" "gnus/message.el" (20889 63525 775294
+;;;### (autoloads nil "message" "gnus/message.el" (20986 60038 720063
 ;;;;;;  0))
 ;;; Generated autoloads from gnus/message.el
 
@@ -17659,7 +17910,7 @@ which specify the range to operate on.
 ;;;### (autoloads nil "meta-mode" "progmodes/meta-mode.el" (20874
 ;;;;;;  62962 290468 0))
 ;;; Generated autoloads from progmodes/meta-mode.el
-(push (purecopy (quote (meta-mode 1 0))) package--builtin-versions)
+(push (purecopy '(meta-mode 1 0)) package--builtin-versions)
 (autoload 'metafont-mode "meta-mode" "\
 Major mode for editing Metafont sources.
 
@@ -17807,9 +18058,9 @@ delete the draft message.
 
 ;;;***
 
-;;;### (autoloads nil "mh-e" "mh-e/mh-e.el" (20874 65006 672942 217000))
+;;;### (autoloads nil "mh-e" "mh-e/mh-e.el" (20987 34598 970563 0))
 ;;; Generated autoloads from mh-e/mh-e.el
-(push (purecopy (quote (mh-e 8 5))) package--builtin-versions)
+(push (purecopy '(mh-e 8 5)) package--builtin-versions)
 (put 'mh-progs 'risky-local-variable t)
 
 (put 'mh-lib 'risky-local-variable t)
@@ -18072,10 +18323,10 @@ whose file names match the specified wildcard.
 
 ;;;***
 
-;;;### (autoloads nil "mixal-mode" "progmodes/mixal-mode.el" (20709
-;;;;;;  26818 907104 0))
+;;;### (autoloads nil "mixal-mode" "progmodes/mixal-mode.el" (21002
+;;;;;;  1963 769129 0))
 ;;; Generated autoloads from progmodes/mixal-mode.el
-(push (purecopy (quote (mixal-mode 0 1))) package--builtin-versions)
+(push (purecopy '(mixal-mode 0 1)) package--builtin-versions)
 (autoload 'mixal-mode "mixal-mode" "\
 Major mode for the mixal asm language.
 
@@ -18205,7 +18456,7 @@ body) or \"attachment\" (separate from the body).
 
 ;;;***
 
-;;;### (autoloads nil "mml2015" "gnus/mml2015.el" (20922 60838 997229
+;;;### (autoloads nil "mml2015" "gnus/mml2015.el" (20986 60038 720063
 ;;;;;;  0))
 ;;; Generated autoloads from gnus/mml2015.el
 
@@ -18314,7 +18565,7 @@ Convert NATO phonetic alphabet in region to ordinary ASCII text.
 
 ;;;***
 
-;;;### (autoloads nil "mouse-drag" "mouse-drag.el" (20709 26818 907104
+;;;### (autoloads nil "mouse-drag" "mouse-drag.el" (20992 52525 458637
 ;;;;;;  0))
 ;;; Generated autoloads from mouse-drag.el
 
@@ -18362,7 +18613,7 @@ To test this function, evaluate:
 
 ;;;***
 
-;;;### (autoloads nil "mpc" "mpc.el" (20838 36262 626321 0))
+;;;### (autoloads nil "mpc" "mpc.el" (20998 4934 952905 0))
 ;;; Generated autoloads from mpc.el
 
 (autoload 'mpc "mpc" "\
@@ -18382,7 +18633,7 @@ Multiplication puzzle with GNU Emacs.
 
 ;;;***
 
-;;;### (autoloads nil "msb" "msb.el" (20709 26818 907104 0))
+;;;### (autoloads nil "msb" "msb.el" (20999 25770 522517 0))
 ;;; Generated autoloads from msb.el
 
 (defvar msb-mode nil "\
@@ -18540,8 +18791,8 @@ The default is 20.  If LIMIT is negative, do not limit the listing.
 
 ;;;***
 
-;;;### (autoloads nil "mule-util" "international/mule-util.el" (20826
-;;;;;;  45095 436233 0))
+;;;### (autoloads nil "mule-util" "international/mule-util.el" (20991
+;;;;;;  31656 363459 0))
 ;;; Generated autoloads from international/mule-util.el
 
 (defsubst string-to-list (string) "\
@@ -18672,92 +18923,6 @@ per-character basis, this may not be accurate.
 
 ;;;***
 
-;;;### (autoloads nil "nadvice" "emacs-lisp/nadvice.el" (20940 4391
-;;;;;;  641153 0))
-;;; Generated autoloads from emacs-lisp/nadvice.el
-
-(autoload 'advice--remove-function "nadvice" "\
-
-
-\(fn FLIST FUNCTION)" nil nil)
-
-(autoload 'advice--buffer-local "nadvice" "\
-Buffer-local value of VAR, presumed to contain a function.
-
-\(fn VAR)" nil nil)
-
-(autoload 'add-function "nadvice" "\
-Add a piece of advice on the function stored at PLACE.
-FUNCTION describes the code to add.  WHERE describes where to add it.
-WHERE can be explained by showing the resulting new function, as the
-result of combining FUNCTION and the previous value of PLACE, which we
-call OLDFUN here:
-`:before'       (lambda (&rest r) (apply FUNCTION r) (apply OLDFUN r))
-`:after'        (lambda (&rest r) (prog1 (apply OLDFUN r) (apply FUNCTION r)))
-`:around'       (lambda (&rest r) (apply FUNCTION OLDFUN r))
-`:override'     (lambda (&rest r) (apply FUNCTION r))
-`:before-while' (lambda (&rest r) (and (apply FUNCTION r) (apply OLDFUN r)))
-`:before-until' (lambda (&rest r) (or  (apply FUNCTION r) (apply OLDFUN r)))
-`:after-while'  (lambda (&rest r) (and (apply OLDFUN r) (apply FUNCTION r)))
-`:after-until'  (lambda (&rest r) (or  (apply OLDFUN r) (apply FUNCTION r)))
-`:filter-args'  (lambda (&rest r) (apply OLDFUN (funcall FUNCTION r)))
-`:filter-return'(lambda (&rest r) (funcall FUNCTION (apply OLDFUN r)))
-If FUNCTION was already added, do nothing.
-PROPS is an alist of additional properties, among which the following have
-a special meaning:
-- `name': a string or symbol.  It can be used to refer to this piece of advice.
-
-If PLACE is a simple variable, only its global value will be affected.
-Use (local 'VAR) if you want to apply FUNCTION to VAR buffer-locally.
-
-If one of FUNCTION or OLDFUN is interactive, then the resulting function
-is also interactive.  There are 3 cases:
-- FUNCTION is not interactive: the interactive spec of OLDFUN is used.
-- The interactive spec of FUNCTION is itself a function: it should take one
-  argument (the interactive spec of OLDFUN, which it can pass to
-  `advice-eval-interactive-spec') and return the list of arguments to use.
-- Else, use the interactive spec of FUNCTION and ignore the one of OLDFUN.
-
-\(fn WHERE PLACE FUNCTION &optional PROPS)" nil t)
-
-(autoload 'advice--add-function "nadvice" "\
-
-
-\(fn WHERE REF FUNCTION PROPS)" nil nil)
-
-(autoload 'remove-function "nadvice" "\
-Remove the FUNCTION piece of advice from PLACE.
-If FUNCTION was not added to PLACE, do nothing.
-Instead of FUNCTION being the actual function, it can also be the `name'
-of the piece of advice.
-
-\(fn PLACE FUNCTION)" nil t)
-
-(autoload 'advice-add "nadvice" "\
-Like `add-function' but for the function named SYMBOL.
-Contrary to `add-function', this will properly handle the cases where SYMBOL
-is defined as a macro, alias, command, ...
-
-\(fn SYMBOL WHERE FUNCTION &optional PROPS)" nil nil)
-
-(autoload 'advice-remove "nadvice" "\
-Like `remove-function' but for the function named SYMBOL.
-Contrary to `remove-function', this also works when SYMBOL is a macro
-or an autoload and it preserves `fboundp'.
-Instead of the actual function to remove, FUNCTION can also be the `name'
-of the piece of advice.
-
-\(fn SYMBOL FUNCTION)" nil nil)
-
-(autoload 'advice-member-p "nadvice" "\
-Return non-nil if ADVICE has been added to FUNCTION-NAME.
-Instead of ADVICE being the actual function, it can also be the `name'
-of the piece of advice.
-
-\(fn ADVICE FUNCTION-NAME)" nil nil)
-
-;;;***
-
 ;;;### (autoloads nil "net-utils" "net/net-utils.el" (20903 10024
 ;;;;;;  645978 0))
 ;;; Generated autoloads from net/net-utils.el
@@ -18866,8 +19031,8 @@ listed in the PORTS list.
 
 ;;;***
 
-;;;### (autoloads nil "network-stream" "net/network-stream.el" (20770
-;;;;;;  3512 176098 0))
+;;;### (autoloads nil "network-stream" "net/network-stream.el" (20984
+;;;;;;  58408 354075 0))
 ;;; Generated autoloads from net/network-stream.el
 
 (autoload 'open-network-stream "network-stream" "\
@@ -18948,6 +19113,9 @@ values:
 :use-starttls-if-possible is a boolean that says to do opportunistic
 STARTTLS upgrades even if Emacs doesn't have built-in TLS functionality.
 
+:nogreeting is a boolean that can be used to inhibit waiting for
+a greeting from the server.
+
 :nowait is a boolean that says the connection should be made
   asynchronously, if possible.
 
@@ -18980,7 +19148,7 @@ Run `newsticker-start-hook' if newsticker was not running already.
 ;;;***
 
 ;;;### (autoloads nil "newst-plainview" "net/newst-plainview.el"
-;;;;;;  (20762 9398 526093 0))
+;;;;;;  (20992 52525 458637 0))
 ;;; Generated autoloads from net/newst-plainview.el
 
 (autoload 'newsticker-plainview "newst-plainview" "\
@@ -19036,7 +19204,7 @@ Start newsticker treeview.
 ;;;### (autoloads nil "newsticker" "net/newsticker.el" (20709 26818
 ;;;;;;  907104 0))
 ;;; Generated autoloads from net/newsticker.el
-(push (purecopy (quote (newsticker 1 99))) package--builtin-versions)
+(push (purecopy '(newsticker 1 99)) package--builtin-versions)
 ;;;***
 
 ;;;### (autoloads nil "nndiary" "gnus/nndiary.el" (20709 26818 907104
@@ -19080,10 +19248,10 @@ This command does not work if you use short group names.
 ;;;### (autoloads nil "nnmairix" "gnus/nnmairix.el" (20709 26818
 ;;;;;;  907104 0))
 ;;; Generated autoloads from gnus/nnmairix.el
-(push (purecopy (quote (nnmairix 0 6))) package--builtin-versions)
+(push (purecopy '(nnmairix 0 6)) package--builtin-versions)
 ;;;***
 
-;;;### (autoloads nil "nnml" "gnus/nnml.el" (20709 26818 907104 0))
+;;;### (autoloads nil "nnml" "gnus/nnml.el" (20955 58152 201869 0))
 ;;; Generated autoloads from gnus/nnml.el
 
 (autoload 'nnml-generate-nov-databases "nnml" "\
@@ -19142,7 +19310,7 @@ closing requests for requests that are used in matched pairs.
 
 ;;;### (autoloads nil "ntlm" "net/ntlm.el" (20709 26818 907104 0))
 ;;; Generated autoloads from net/ntlm.el
-(push (purecopy (quote (ntlm 1 0))) package--builtin-versions)
+(push (purecopy '(ntlm 1 0)) package--builtin-versions)
 ;;;***
 
 ;;;### (autoloads nil "nxml-glyph" "nxml/nxml-glyph.el" (20709 26818
@@ -19987,10 +20155,10 @@ See the command `outline-mode' for more information on this mode.
 
 ;;;***
 
-;;;### (autoloads nil "package" "emacs-lisp/package.el" (20938 49065
-;;;;;;  383398 0))
+;;;### (autoloads nil "package" "emacs-lisp/package.el" (21022 27213
+;;;;;;  317995 0))
 ;;; Generated autoloads from emacs-lisp/package.el
-(push (purecopy (quote (package 1 0 1))) package--builtin-versions)
+(push (purecopy '(package 1 0 1)) package--builtin-versions)
 (defvar package-enable-at-startup t "\
 Whether to activate installed packages when Emacs starts.
 If non-nil, packages are activated after reading the init file
@@ -20169,8 +20337,8 @@ Check if KEY is in the cache.
 
 ;;;***
 
-;;;### (autoloads nil "pcase" "emacs-lisp/pcase.el" (20717 20920
-;;;;;;  410005 0))
+;;;### (autoloads nil "pcase" "emacs-lisp/pcase.el" (20991 31656
+;;;;;;  363459 0))
 ;;; Generated autoloads from emacs-lisp/pcase.el
 
 (autoload 'pcase "pcase" "\
@@ -20436,7 +20604,7 @@ Setup `shell-mode' to use pcomplete.
 
 ;;;***
 
-;;;### (autoloads nil "pcvs" "vc/pcvs.el" (20717 20920 410005 0))
+;;;### (autoloads nil "pcvs" "vc/pcvs.el" (20983 37555 279226 0))
 ;;; Generated autoloads from vc/pcvs.el
 
 (autoload 'cvs-checkout "pcvs" "\
@@ -20717,7 +20885,7 @@ Use streaming commands.
 
 ;;;***
 
-;;;### (autoloads nil "pp" "emacs-lisp/pp.el" (20709 26818 907104
+;;;### (autoloads nil "pp" "emacs-lisp/pp.el" (21013 58662 278539
 ;;;;;;  0))
 ;;; Generated autoloads from emacs-lisp/pp.el
 
@@ -20768,10 +20936,10 @@ Ignores leading comment characters.
 
 ;;;***
 
-;;;### (autoloads nil "printing" "printing.el" (20891 44219 680764
+;;;### (autoloads nil "printing" "printing.el" (20975 43430 521692
 ;;;;;;  0))
 ;;; Generated autoloads from printing.el
-(push (purecopy (quote (printing 6 9 3))) package--builtin-versions)
+(push (purecopy '(printing 6 9 3)) package--builtin-versions)
 (autoload 'pr-interface "printing" "\
 Activate the printing interface buffer.
 
@@ -21453,7 +21621,7 @@ The default value is '(\"/usr/local/share/emacs/fonts/bdf\").")
 ;;;### (autoloads nil "ps-mode" "progmodes/ps-mode.el" (20777 63161
 ;;;;;;  848428 0))
 ;;; Generated autoloads from progmodes/ps-mode.el
-(push (purecopy (quote (ps-mode 1 1 9))) package--builtin-versions)
+(push (purecopy '(ps-mode 1 1 9)) package--builtin-versions)
 (autoload 'ps-mode "ps-mode" "\
 Major mode for editing PostScript with GNU Emacs.
 
@@ -21497,10 +21665,10 @@ Typing \\<ps-run-mode-map>\\[ps-run-goto-error] when the cursor is at the number
 
 ;;;***
 
-;;;### (autoloads nil "ps-print" "ps-print.el" (20874 65006 672942
-;;;;;;  217000))
+;;;### (autoloads nil "ps-print" "ps-print.el" (20975 43430 521692
+;;;;;;  0))
 ;;; Generated autoloads from ps-print.el
-(push (purecopy (quote (ps-print 7 3 5))) package--builtin-versions)
+(push (purecopy '(ps-print 7 3 5)) package--builtin-versions)
 (defvar ps-page-dimensions-database (purecopy (list (list 'a4 (/ (* 72 21.0) 2.54) (/ (* 72 29.7) 2.54) "A4") (list 'a3 (/ (* 72 29.7) 2.54) (/ (* 72 42.0) 2.54) "A3") (list 'letter (* 72 8.5) (* 72 11.0) "Letter") (list 'legal (* 72 8.5) (* 72 14.0) "Legal") (list 'letter-small (* 72 7.68) (* 72 10.16) "LetterSmall") (list 'tabloid (* 72 11.0) (* 72 17.0) "Tabloid") (list 'ledger (* 72 17.0) (* 72 11.0) "Ledger") (list 'statement (* 72 5.5) (* 72 8.5) "Statement") (list 'executive (* 72 7.5) (* 72 10.0) "Executive") (list 'a4small (* 72 7.47) (* 72 10.85) "A4Small") (list 'b4 (* 72 10.125) (* 72 14.33) "B4") (list 'b5 (* 72 7.16) (* 72 10.125) "B5") '(addresslarge 236.0 99.0 "AddressLarge") '(addresssmall 236.0 68.0 "AddressSmall") '(cuthanging13 90.0 222.0 "CutHanging13") '(cuthanging15 90.0 114.0 "CutHanging15") '(diskette 181.0 136.0 "Diskette") '(eurofilefolder 139.0 112.0 "EuropeanFilefolder") '(eurofoldernarrow 526.0 107.0 "EuroFolderNarrow") '(eurofolderwide 526.0 136.0 "EuroFolderWide") '(euronamebadge 189.0 108.0 "EuroNameBadge") '(euronamebadgelarge 223.0 136.0 "EuroNameBadgeLarge") '(filefolder 230.0 37.0 "FileFolder") '(jewelry 76.0 136.0 "Jewelry") '(mediabadge 180.0 136.0 "MediaBadge") '(multipurpose 126.0 68.0 "MultiPurpose") '(retaillabel 90.0 104.0 "RetailLabel") '(shipping 271.0 136.0 "Shipping") '(slide35mm 26.0 104.0 "Slide35mm") '(spine8mm 187.0 26.0 "Spine8mm") '(topcoated 425.19685 136.0 "TopCoatedPaper") '(topcoatedpaper 396.0 136.0 "TopcoatedPaper150") '(vhsface 205.0 127.0 "VHSFace") '(vhsspine 400.0 50.0 "VHSSpine") '(zipdisk 156.0 136.0 "ZipDisk"))) "\
 List associating a symbolic paper type to its width, height and doc media.
 See `ps-paper-type'.")
@@ -21697,13 +21865,13 @@ If EXTENSION is any other symbol, it is ignored.
 ;;;### (autoloads nil "pulse" "cedet/pulse.el" (20709 26818 907104
 ;;;;;;  0))
 ;;; Generated autoloads from cedet/pulse.el
-(push (purecopy (quote (pulse 1 0))) package--builtin-versions)
+(push (purecopy '(pulse 1 0)) package--builtin-versions)
 ;;;***
 
-;;;### (autoloads nil "python" "progmodes/python.el" (20928 13222
-;;;;;;  500272 0))
+;;;### (autoloads nil "python" "progmodes/python.el" (21020 31917
+;;;;;;  145164 0))
 ;;; Generated autoloads from progmodes/python.el
-(push (purecopy (quote (python 0 24 2))) package--builtin-versions)
+(push (purecopy '(python 0 24 2)) package--builtin-versions)
 (add-to-list 'auto-mode-alist (cons (purecopy "\\.py\\'") 'python-mode))
 
 (add-to-list 'interpreter-mode-alist (cons (purecopy "python") 'python-mode))
@@ -21755,8 +21923,8 @@ them into characters should be done separately.
 
 ;;;***
 
-;;;### (autoloads nil "quail" "international/quail.el" (20709 26818
-;;;;;;  907104 0))
+;;;### (autoloads nil "quail" "international/quail.el" (20998 4934
+;;;;;;  952905 0))
 ;;; Generated autoloads from international/quail.el
 
 (autoload 'quail-title "quail" "\
@@ -22057,7 +22225,8 @@ Display `quickurl-list' as a formatted list using `quickurl-list-mode'.
 
 ;;;***
 
-;;;### (autoloads nil "rcirc" "net/rcirc.el" (20770 3512 176098 0))
+;;;### (autoloads nil "rcirc" "net/rcirc.el" (20992 52525 458637
+;;;;;;  0))
 ;;; Generated autoloads from net/rcirc.el
 
 (autoload 'rcirc "rcirc" "\
@@ -22107,8 +22276,8 @@ See \\[compile].
 
 ;;;***
 
-;;;### (autoloads nil "re-builder" "emacs-lisp/re-builder.el" (20709
-;;;;;;  26818 907104 0))
+;;;### (autoloads nil "re-builder" "emacs-lisp/re-builder.el" (20984
+;;;;;;  58408 354075 0))
 ;;; Generated autoloads from emacs-lisp/re-builder.el
 
 (defalias 'regexp-builder 're-builder)
@@ -22494,13 +22663,13 @@ This means the number of non-shy regexp grouping constructs
 ;;;### (autoloads nil "regi" "emacs-lisp/regi.el" (20709 26818 907104
 ;;;;;;  0))
 ;;; Generated autoloads from emacs-lisp/regi.el
-(push (purecopy (quote (regi 1 8))) package--builtin-versions)
+(push (purecopy '(regi 1 8)) package--builtin-versions)
 ;;;***
 
 ;;;### (autoloads nil "remember" "textmodes/remember.el" (20945 22315
 ;;;;;;  8369 0))
 ;;; Generated autoloads from textmodes/remember.el
-(push (purecopy (quote (remember 2 0))) package--builtin-versions)
+(push (purecopy '(remember 2 0)) package--builtin-versions)
 (autoload 'remember "remember" "\
 Remember an arbitrary piece of data.
 INITIAL is the text to initially place in the *Remember* buffer,
@@ -22557,7 +22726,7 @@ preserve across Emacs restarts.  The notes will be stored in the
 
 ;;;### (autoloads nil "repeat" "repeat.el" (20709 26818 907104 0))
 ;;; Generated autoloads from repeat.el
-(push (purecopy (quote (repeat 0 51))) package--builtin-versions)
+(push (purecopy '(repeat 0 51)) package--builtin-versions)
 (autoload 'repeat "repeat" "\
 Repeat most recently executed command.
 If REPEAT-ARG is non-nil (interactively, with a prefix argument),
@@ -22609,7 +22778,7 @@ mail-sending package is used for editing and sending the message.
 
 ;;;***
 
-;;;### (autoloads nil "reposition" "reposition.el" (20709 26818 907104
+;;;### (autoloads nil "reposition" "reposition.el" (20992 52525 458637
 ;;;;;;  0))
 ;;; Generated autoloads from reposition.el
 
@@ -22732,7 +22901,7 @@ variable.
 
 ;;;***
 
-;;;### (autoloads nil "rmail" "mail/rmail.el" (20892 39729 858825
+;;;### (autoloads nil "rmail" "mail/rmail.el" (20992 52525 458637
 ;;;;;;  0))
 ;;; Generated autoloads from mail/rmail.el
 
@@ -22995,8 +23164,8 @@ than appending to it.  Deletes the message after writing if
 
 ;;;***
 
-;;;### (autoloads nil "rng-cmpct" "nxml/rng-cmpct.el" (20709 26818
-;;;;;;  907104 0))
+;;;### (autoloads nil "rng-cmpct" "nxml/rng-cmpct.el" (20998 4934
+;;;;;;  952905 0))
 ;;; Generated autoloads from nxml/rng-cmpct.el
 
 (autoload 'rng-c-load-schema "rng-cmpct" "\
@@ -23112,7 +23281,7 @@ Start using robin package NAME, which is a string.
 
 ;;;***
 
-;;;### (autoloads nil "rot13" "rot13.el" (20709 26818 907104 0))
+;;;### (autoloads nil "rot13" "rot13.el" (20992 52525 458637 0))
 ;;; Generated autoloads from rot13.el
 
 (autoload 'rot13 "rot13" "\
@@ -23180,10 +23349,10 @@ for modes derived from Text mode, like Mail mode.
 
 ;;;***
 
-;;;### (autoloads nil "ruby-mode" "progmodes/ruby-mode.el" (20944
-;;;;;;  1446 914400 0))
+;;;### (autoloads nil "ruby-mode" "progmodes/ruby-mode.el" (21024
+;;;;;;  28968 738399 0))
 ;;; Generated autoloads from progmodes/ruby-mode.el
-(push (purecopy (quote (ruby-mode 1 2))) package--builtin-versions)
+(push (purecopy '(ruby-mode 1 2)) package--builtin-versions)
 (autoload 'ruby-mode "ruby-mode" "\
 Major mode for editing Ruby scripts.
 \\[ruby-indent-line] properly indents subexpressions of multi-line
@@ -23205,7 +23374,7 @@ The variable `ruby-indent-level' controls the amount of indentation.
 ;;;### (autoloads nil "ruler-mode" "ruler-mode.el" (20791 9657 561026
 ;;;;;;  0))
 ;;; Generated autoloads from ruler-mode.el
-(push (purecopy (quote (ruler-mode 1 6))) package--builtin-versions)
+(push (purecopy '(ruler-mode 1 6)) package--builtin-versions)
 (defvar ruler-mode nil "\
 Non-nil if Ruler mode is enabled.
 Use the command `ruler-mode' to change this variable.")
@@ -23535,13 +23704,13 @@ enclosed in `(and ...)'.
 ;;;### (autoloads nil "sasl-ntlm" "net/sasl-ntlm.el" (20709 26818
 ;;;;;;  907104 0))
 ;;; Generated autoloads from net/sasl-ntlm.el
-(push (purecopy (quote (sasl 1 0))) package--builtin-versions)
+(push (purecopy '(sasl 1 0)) package--builtin-versions)
 ;;;***
 
 ;;;### (autoloads nil "savehist" "savehist.el" (20709 26818 907104
 ;;;;;;  0))
 ;;; Generated autoloads from savehist.el
-(push (purecopy (quote (savehist 24))) package--builtin-versions)
+(push (purecopy '(savehist 24)) package--builtin-versions)
 (defvar savehist-mode nil "\
 Non-nil if Savehist mode is enabled.
 See the command `savehist-mode' for a description of this minor mode.
@@ -23680,7 +23849,7 @@ vertically fixed relative to window boundaries during scrolling.
 ;;;### (autoloads nil "semantic" "cedet/semantic.el" (20908 27948
 ;;;;;;  216644 0))
 ;;; Generated autoloads from cedet/semantic.el
-(push (purecopy (quote (semantic 2 2))) package--builtin-versions)
+(push (purecopy '(semantic 2 2)) package--builtin-versions)
 (defvar semantic-default-submodes '(global-semantic-idle-scheduler-mode global-semanticdb-minor-mode) "\
 List of auxiliary Semantic minor modes enabled by `semantic-mode'.
 The possible elements of this list include the following:
@@ -23756,8 +23925,8 @@ Major mode for editing Wisent grammars.
 
 ;;;***
 
-;;;### (autoloads nil "sendmail" "mail/sendmail.el" (20723 59703
-;;;;;;  12265 0))
+;;;### (autoloads nil "sendmail" "mail/sendmail.el" (21002 1963 769129
+;;;;;;  0))
 ;;; Generated autoloads from mail/sendmail.el
 
 (defvar mail-from-style 'default "\
@@ -24038,7 +24207,7 @@ Like `mail' command, but display mail buffer in another frame.
 
 ;;;***
 
-;;;### (autoloads nil "server" "server.el" (20763 30266 231060 0))
+;;;### (autoloads nil "server" "server.el" (20992 52525 458637 0))
 ;;; Generated autoloads from server.el
 
 (put 'server-host 'risky-local-variable t)
@@ -24105,7 +24274,7 @@ only these files will be asked to be saved.
 
 ;;;***
 
-;;;### (autoloads nil "ses" "ses.el" (20709 26818 907104 0))
+;;;### (autoloads nil "ses" "ses.el" (20999 25770 522517 0))
 ;;; Generated autoloads from ses.el
 
 (autoload 'ses-mode "ses" "\
@@ -24189,10 +24358,10 @@ To work around that, do:
 
 ;;;***
 
-;;;### (autoloads nil "sh-script" "progmodes/sh-script.el" (20850
-;;;;;;  27430 515630 0))
+;;;### (autoloads nil "sh-script" "progmodes/sh-script.el" (21022
+;;;;;;  40320 762131 34000))
 ;;; Generated autoloads from progmodes/sh-script.el
-(push (purecopy (quote (sh-script 2 0 6))) package--builtin-versions)(put 'sh-shell 'safe-local-variable 'symbolp)
+(push (purecopy '(sh-script 2 0 6)) package--builtin-versions)(put 'sh-shell 'safe-local-variable 'symbolp)
 
 (autoload 'sh-mode "sh-script" "\
 Major mode for editing shell scripts.
@@ -24303,7 +24472,7 @@ function, `load-path-shadows-find'.
 
 ;;;***
 
-;;;### (autoloads nil "shadowfile" "shadowfile.el" (20799 169 640767
+;;;### (autoloads nil "shadowfile" "shadowfile.el" (20959 55207 940876
 ;;;;;;  0))
 ;;; Generated autoloads from shadowfile.el
 
@@ -24342,7 +24511,7 @@ Set up file shadowing.
 
 ;;;***
 
-;;;### (autoloads nil "shell" "shell.el" (20884 7264 912957 506000))
+;;;### (autoloads nil "shell" "shell.el" (20992 52525 458637 0))
 ;;; Generated autoloads from shell.el
 
 (defvar shell-dumb-shell-regexp (purecopy "cmd\\(proxy\\)?\\.exe") "\
@@ -24390,7 +24559,7 @@ Otherwise, one argument `-i' is passed to the shell.
 
 ;;;***
 
-;;;### (autoloads nil "shr" "net/shr.el" (20944 31824 211965 0))
+;;;### (autoloads nil "shr" "net/shr.el" (21007 19880 17663 0))
 ;;; Generated autoloads from net/shr.el
 
 (autoload 'shr-insert-document "shr" "\
@@ -24605,8 +24774,8 @@ symmetrical ones, and the same character twice for the others.
 
 ;;;***
 
-;;;### (autoloads nil "smerge-mode" "vc/smerge-mode.el" (20709 26818
-;;;;;;  907104 0))
+;;;### (autoloads nil "smerge-mode" "vc/smerge-mode.el" (21022 27213
+;;;;;;  317995 0))
 ;;; Generated autoloads from vc/smerge-mode.el
 
 (autoload 'smerge-ediff "smerge-mode" "\
@@ -25047,7 +25216,7 @@ Spam reports will be queued with the method used when
 
 ;;;***
 
-;;;### (autoloads nil "speedbar" "speedbar.el" (20892 39729 858825
+;;;### (autoloads nil "speedbar" "speedbar.el" (21024 28968 738399
 ;;;;;;  0))
 ;;; Generated autoloads from speedbar.el
 
@@ -25088,10 +25257,10 @@ Return a vector containing the lines from `spook-phrases-file'.
 
 ;;;***
 
-;;;### (autoloads nil "sql" "progmodes/sql.el" (20878 6823 881439
+;;;### (autoloads nil "sql" "progmodes/sql.el" (20975 10147 44538
 ;;;;;;  0))
 ;;; Generated autoloads from progmodes/sql.el
-(push (purecopy (quote (sql 3 2))) package--builtin-versions)
+(push (purecopy '(sql 3 3)) package--builtin-versions)
 (autoload 'sql-add-product-keywords "sql" "\
 Add highlighting KEYWORDS for SQL PRODUCT.
 
@@ -25554,7 +25723,7 @@ buffer.
 ;;;### (autoloads nil "srecode" "cedet/srecode.el" (20748 62911 684442
 ;;;;;;  0))
 ;;; Generated autoloads from cedet/srecode.el
-(push (purecopy (quote (srecode 1 2))) package--builtin-versions)
+(push (purecopy '(srecode 1 2)) package--builtin-versions)
 ;;;***
 
 ;;;### (autoloads nil "srecode/srt-mode" "cedet/srecode/srt-mode.el"
@@ -25728,8 +25897,8 @@ Studlify-case the current buffer.
 
 ;;;***
 
-;;;### (autoloads nil "subword" "progmodes/subword.el" (20886 47777
-;;;;;;  83668 440000))
+;;;### (autoloads nil "subword" "progmodes/subword.el" (20974 22577
+;;;;;;  548213 0))
 ;;; Generated autoloads from progmodes/subword.el
 
 (autoload 'subword-mode "subword" "\
@@ -25885,7 +26054,7 @@ It relies on the `gpm' daemon being activated.
 
 ;;;***
 
-;;;### (autoloads nil "tabify" "tabify.el" (20928 13222 500272 0))
+;;;### (autoloads nil "tabify" "tabify.el" (20999 25770 522517 0))
 ;;; Generated autoloads from tabify.el
 
 (autoload 'untabify "tabify" "\
@@ -26507,7 +26676,7 @@ converts a table into plain text without frames.  It is a companion to
 
 ;;;***
 
-;;;### (autoloads nil "talk" "talk.el" (20709 26818 907104 0))
+;;;### (autoloads nil "talk" "talk.el" (20992 52525 458637 0))
 ;;; Generated autoloads from talk.el
 
 (autoload 'talk-connect "talk" "\
@@ -26677,7 +26846,7 @@ Start coverage on function under point.
 ;;;### (autoloads nil "tetris" "play/tetris.el" (20874 65006 672942
 ;;;;;;  217000))
 ;;; Generated autoloads from play/tetris.el
-(push (purecopy (quote (tetris 2 1))) package--builtin-versions)
+(push (purecopy '(tetris 2 1)) package--builtin-versions)
 (autoload 'tetris "tetris" "\
 Play the Tetris game.
 Shapes drop from the top of the screen, and the user has to move and
@@ -27154,7 +27323,7 @@ Compose Thai characters in the current buffer.
 
 ;;;***
 
-;;;### (autoloads nil "thingatpt" "thingatpt.el" (20874 62962 290468
+;;;### (autoloads nil "thingatpt" "thingatpt.el" (20999 25770 522517
 ;;;;;;  0))
 ;;; Generated autoloads from thingatpt.el
 
@@ -27219,7 +27388,7 @@ Return the Lisp list at point, or nil if none is found.
 
 ;;;***
 
-;;;### (autoloads nil "thumbs" "thumbs.el" (20709 26818 907104 0))
+;;;### (autoloads nil "thumbs" "thumbs.el" (20958 59019 473587 89000))
 ;;; Generated autoloads from thumbs.el
 
 (autoload 'thumbs-find-thumb "thumbs" "\
@@ -27330,7 +27499,7 @@ See also docstring of the function tibetan-compose-region.
 ;;;### (autoloads nil "tildify" "textmodes/tildify.el" (20791 9657
 ;;;;;;  561026 0))
 ;;; Generated autoloads from textmodes/tildify.el
-(push (purecopy (quote (tildify 4 5))) package--builtin-versions)
+(push (purecopy '(tildify 4 5)) package--builtin-versions)
 (autoload 'tildify-region "tildify" "\
 Add hard spaces in the region between BEG and END.
 See variables `tildify-pattern-alist', `tildify-string-alist', and
@@ -27351,7 +27520,7 @@ This function performs no refilling of the changed text.
 
 ;;;***
 
-;;;### (autoloads nil "time" "time.el" (20709 26818 907104 0))
+;;;### (autoloads nil "time" "time.el" (20998 4934 952905 0))
 ;;; Generated autoloads from time.el
 
 (defvar display-time-day-and-date nil "\
@@ -27566,10 +27735,19 @@ With ARG, turn time stamping on if and only if arg is positive.
 
 ;;;***
 
-;;;### (autoloads nil "timeclock" "calendar/timeclock.el" (20799
-;;;;;;  169 640767 0))
+;;;### (autoloads nil "timeclock" "calendar/timeclock.el" (21013
+;;;;;;  58662 278539 0))
 ;;; Generated autoloads from calendar/timeclock.el
-(push (purecopy (quote (timeclock 2 6 1))) package--builtin-versions)
+(push (purecopy '(timeclock 2 6 1)) package--builtin-versions)
+(defvar timeclock-mode-line-display nil "\
+Non-nil if Timeclock-Mode-Line-Display mode is enabled.
+See the command `timeclock-mode-line-display' for a description of this minor mode.
+Setting this variable directly does not take effect;
+either customize it (see the info node `Easy Customization')
+or call the function `timeclock-mode-line-display'.")
+
+(custom-autoload 'timeclock-mode-line-display "timeclock" nil)
+
 (autoload 'timeclock-mode-line-display "timeclock" "\
 Toggle display of the amount of time left today in the mode line.
 If `timeclock-use-display-time' is non-nil (the default), then
@@ -27727,8 +27905,8 @@ Its value should be an event that has a binding in MENU.
 
 ;;;***
 
-;;;### (autoloads nil "todo-mode" "calendar/todo-mode.el" (20944
-;;;;;;  31824 211965 0))
+;;;### (autoloads nil "todo-mode" "calendar/todo-mode.el" (20982
+;;;;;;  16679 447285 0))
 ;;; Generated autoloads from calendar/todo-mode.el
 
 (autoload 'todo-show "todo-mode" "\
@@ -27770,7 +27948,7 @@ 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.
 
-\(fn &optional SOLICIT-FILE)" t nil)
+\(fn &optional SOLICIT-FILE INTERACTIVE)" t nil)
 
 ;;;***
 
@@ -27848,7 +28026,7 @@ holds a keymap.
 ;;;### (autoloads nil "tpu-edt" "emulation/tpu-edt.el" (20884 7264
 ;;;;;;  412929 442000))
 ;;; Generated autoloads from emulation/tpu-edt.el
-(push (purecopy (quote (tpu-edt 4 5))) package--builtin-versions)
+(push (purecopy '(tpu-edt 4 5)) package--builtin-versions)
 (defvar tpu-edt-mode nil "\
 Non-nil if Tpu-Edt mode is enabled.
 See the command `tpu-edt-mode' for a description of this minor mode.
@@ -27963,7 +28141,7 @@ changing the window configuration.
 
 ;;;***
 
-;;;### (autoloads nil "tramp" "net/tramp.el" (20854 24486 190633
+;;;### (autoloads nil "tramp" "net/tramp.el" (21024 28968 738399
 ;;;;;;  0))
 ;;; Generated autoloads from net/tramp.el
 
@@ -28096,8 +28274,8 @@ Discard Tramp from loading remote files.
 
 ;;;***
 
-;;;### (autoloads nil "tramp-ftp" "net/tramp-ftp.el" (20709 26818
-;;;;;;  907104 0))
+;;;### (autoloads nil "tramp-ftp" "net/tramp-ftp.el" (21008 40741
+;;;;;;  120196 0))
 ;;; Generated autoloads from net/tramp-ftp.el
 
 (autoload 'tramp-ftp-enable-ange-ftp "tramp-ftp" "\
@@ -28107,7 +28285,7 @@ Discard Tramp from loading remote files.
 
 ;;;***
 
-;;;### (autoloads nil "tutorial" "tutorial.el" (20760 54070 584283
+;;;### (autoloads nil "tutorial" "tutorial.el" (20999 25770 522517
 ;;;;;;  0))
 ;;; Generated autoloads from tutorial.el
 
@@ -28645,8 +28823,8 @@ Might do a non-blocking connection; use `process-status' to check.
 
 ;;;***
 
-;;;### (autoloads nil "url-handlers" "url/url-handlers.el" (20892
-;;;;;;  39729 858825 0))
+;;;### (autoloads nil "url-handlers" "url/url-handlers.el" (20984
+;;;;;;  58408 354075 0))
 ;;; Generated autoloads from url/url-handlers.el
 
 (defvar url-handler-mode nil "\
@@ -28700,8 +28878,8 @@ accessible.
 
 ;;;***
 
-;;;### (autoloads nil "url-http" "url/url-http.el" (20766 59628 334727
-;;;;;;  618000))
+;;;### (autoloads nil "url-http" "url/url-http.el" (21004 43695 993272
+;;;;;;  0))
 ;;; Generated autoloads from url/url-http.el
  (autoload 'url-default-expander "url-expand")
 
@@ -29095,7 +29273,7 @@ This uses `url-current-object', set locally to the buffer.
 
 ;;;***
 
-;;;### (autoloads nil "userlock" "userlock.el" (20709 26818 907104
+;;;### (autoloads nil "userlock" "userlock.el" (20998 4934 952905
 ;;;;;;  0))
 ;;; Generated autoloads from userlock.el
 
@@ -29185,7 +29363,7 @@ If FILE-NAME is non-nil, save the result to FILE-NAME.
 
 ;;;***
 
-;;;### (autoloads nil "vc" "vc/vc.el" (20919 46844 767888 0))
+;;;### (autoloads nil "vc" "vc/vc.el" (20992 52525 458637 0))
 ;;; Generated autoloads from vc/vc.el
 
 (defvar vc-checkout-hook nil "\
@@ -29515,7 +29693,7 @@ mode-specific menu.  `vc-annotate-color-map' and
 
 ;;;***
 
-;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (20900 33838 319219
+;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (20990 10793 424093
 ;;;;;;  0))
 ;;; Generated autoloads from vc/vc-bzr.el
 
@@ -29532,7 +29710,7 @@ Name of the format file in a .bzr directory.")
 
 ;;;***
 
-;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (20921 39978 248467
+;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (20983 37555 279226
 ;;;;;;  0))
 ;;; Generated autoloads from vc/vc-cvs.el
 (defun vc-cvs-registered (f)
@@ -29544,7 +29722,7 @@ Name of the format file in a .bzr directory.")
 
 ;;;***
 
-;;;### (autoloads nil "vc-dir" "vc/vc-dir.el" (20900 33838 319219
+;;;### (autoloads nil "vc-dir" "vc/vc-dir.el" (20990 10793 424093
 ;;;;;;  0))
 ;;; Generated autoloads from vc/vc-dir.el
 
@@ -29593,7 +29771,7 @@ case, and the process object in the asynchronous case.
 
 ;;;***
 
-;;;### (autoloads nil "vc-git" "vc/vc-git.el" (20900 33838 319219
+;;;### (autoloads nil "vc-git" "vc/vc-git.el" (20990 10793 424093
 ;;;;;;  0))
 ;;; Generated autoloads from vc/vc-git.el
  (defun vc-git-registered (file)
@@ -29605,7 +29783,7 @@ case, and the process object in the asynchronous case.
 
 ;;;***
 
-;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (20900 33838 319219 0))
+;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (20990 10793 424093 0))
 ;;; Generated autoloads from vc/vc-hg.el
  (defun vc-hg-registered (file)
   "Return non-nil if FILE is registered with hg."
@@ -29666,7 +29844,7 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir)
 
 ;;;***
 
-;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (20900 33838 319219
+;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (20990 10793 424093
 ;;;;;;  0))
 ;;; Generated autoloads from vc/vc-svn.el
  (defun vc-svn-registered (f)
@@ -29683,7 +29861,7 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir)
 ;;;### (autoloads nil "vera-mode" "progmodes/vera-mode.el" (20893
 ;;;;;;  60586 188550 0))
 ;;; Generated autoloads from progmodes/vera-mode.el
-(push (purecopy (quote (vera-mode 2 28))) package--builtin-versions) (add-to-list 'auto-mode-alist (cons (purecopy "\\.vr[hi]?\\'")  'vera-mode))
+(push (purecopy '(vera-mode 2 28)) package--builtin-versions) (add-to-list 'auto-mode-alist (cons (purecopy "\\.vr[hi]?\\'")  'vera-mode))
 
 (autoload 'vera-mode "vera-mode" "\
 Major mode for editing Vera code.
@@ -29739,7 +29917,7 @@ Key bindings:
 ;;;***
 
 ;;;### (autoloads nil "verilog-mode" "progmodes/verilog-mode.el"
-;;;;;;  (20885 2819 449152 0))
+;;;;;;  (20992 52525 458637 0))
 ;;; Generated autoloads from progmodes/verilog-mode.el
 
 (autoload 'verilog-mode "verilog-mode" "\
@@ -30530,7 +30708,7 @@ Convert Vietnamese characters of the current buffer to `VIQR' mnemonics.
 
 ;;;***
 
-;;;### (autoloads nil "view" "view.el" (20762 9398 526093 0))
+;;;### (autoloads nil "view" "view.el" (20999 25770 522517 0))
 ;;; Generated autoloads from view.el
 
 (defvar view-remove-frame-by-deleting t "\
@@ -30802,10 +30980,10 @@ Turn on VIP emulation of VI.
 
 ;;;***
 
-;;;### (autoloads nil "viper" "emulation/viper.el" (20799 169 640767
+;;;### (autoloads nil "viper" "emulation/viper.el" (20954 37295 781599
 ;;;;;;  0))
 ;;; Generated autoloads from emulation/viper.el
-(push (purecopy (quote (viper 3 14 1))) package--builtin-versions)
+(push (purecopy '(viper 3 14 1)) package--builtin-versions)
 (autoload 'toggle-viper-mode "viper" "\
 Toggle Viper on/off.
 If Viper is enabled, turn it off.  Otherwise, turn it on.
@@ -30909,9 +31087,9 @@ this is equivalent to `display-warning', using
 
 ;;;***
 
-;;;### (autoloads nil "wdired" "wdired.el" (20900 33838 319219 0))
+;;;### (autoloads nil "wdired" "wdired.el" (20992 52525 458637 0))
 ;;; Generated autoloads from wdired.el
-(push (purecopy (quote (wdired 2 0))) package--builtin-versions)
+(push (purecopy '(wdired 2 0)) package--builtin-versions)
 (autoload 'wdired-change-to-wdired-mode "wdired" "\
 Put a Dired buffer in Writable Dired (WDired) mode.
 \\<wdired-mode-map>
@@ -30974,10 +31152,10 @@ in certain major modes.
 
 ;;;***
 
-;;;### (autoloads nil "whitespace" "whitespace.el" (20874 65007 172950
-;;;;;;  7000))
+;;;### (autoloads nil "whitespace" "whitespace.el" (20986 60038 720063
+;;;;;;  0))
 ;;; Generated autoloads from whitespace.el
-(push (purecopy (quote (whitespace 13 2 2))) package--builtin-versions)
+(push (purecopy '(whitespace 13 2 2)) package--builtin-versions)
 (autoload 'whitespace-mode "whitespace" "\
 Toggle whitespace visualization (Whitespace mode).
 With a prefix argument ARG, enable Whitespace mode if ARG is
@@ -31402,7 +31580,7 @@ if ARG is omitted or nil.
 
 ;;;***
 
-;;;### (autoloads nil "wid-edit" "wid-edit.el" (20945 22315 8369
+;;;### (autoloads nil "wid-edit" "wid-edit.el" (20959 55207 940876
 ;;;;;;  0))
 ;;; Generated autoloads from wid-edit.el
 
@@ -31498,7 +31676,7 @@ Default MODIFIER is 'shift.
 
 ;;;***
 
-;;;### (autoloads nil "winner" "winner.el" (20849 6570 598687 0))
+;;;### (autoloads nil "winner" "winner.el" (20992 52525 458637 0))
 ;;; Generated autoloads from winner.el
 
 (defvar winner-mode nil "\
@@ -31521,9 +31699,9 @@ the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'.
 
 ;;;***
 
-;;;### (autoloads nil "woman" "woman.el" (20709 26818 907104 0))
+;;;### (autoloads nil "woman" "woman.el" (20999 25770 522517 0))
 ;;; Generated autoloads from woman.el
-(push (purecopy (quote (woman 0 551))) package--builtin-versions)
+(push (purecopy '(woman 0 551)) package--builtin-versions)
 (defvar woman-locale nil "\
 String specifying a manual page locale, or nil.
 If a manual page is available in the specified locale
@@ -31572,7 +31750,7 @@ Default bookmark handler for Woman buffers.
 ;;;### (autoloads nil "ws-mode" "emulation/ws-mode.el" (20709 26818
 ;;;;;;  907104 0))
 ;;; Generated autoloads from emulation/ws-mode.el
-(push (purecopy (quote (ws-mode 0 7))) package--builtin-versions)
+(push (purecopy '(ws-mode 0 7)) package--builtin-versions)
 (autoload 'wordstar-mode "ws-mode" "\
 Major mode with WordStar-like key bindings.
 
@@ -31682,7 +31860,7 @@ The key bindings are:
 
 ;;;***
 
-;;;### (autoloads nil "xml" "xml.el" (20766 6456 368550 0))
+;;;### (autoloads nil "xml" "xml.el" (21002 1963 769129 0))
 ;;; Generated autoloads from xml.el
 
 (autoload 'xml-parse-file "xml" "\
@@ -31738,7 +31916,7 @@ Both features can be combined by providing a cons cell
 
 ;;;***
 
-;;;### (autoloads nil "xmltok" "nxml/xmltok.el" (20884 6711 386198
+;;;### (autoloads nil "xmltok" "nxml/xmltok.el" (20998 4934 952905
 ;;;;;;  0))
 ;;; Generated autoloads from nxml/xmltok.el
 
@@ -31802,7 +31980,7 @@ Extract file name from an yenc header.
 
 ;;;***
 
-;;;### (autoloads nil "zone" "play/zone.el" (20709 26818 907104 0))
+;;;### (autoloads nil "zone" "play/zone.el" (20992 52525 458637 0))
 ;;; Generated autoloads from play/zone.el
 
 (autoload 'zone "zone" "\
@@ -31818,45 +31996,44 @@ Zone out, completely.
 ;;;;;;  "calc/calc-fin.el" "calc/calc-forms.el" "calc/calc-frac.el"
 ;;;;;;  "calc/calc-funcs.el" "calc/calc-graph.el" "calc/calc-help.el"
 ;;;;;;  "calc/calc-incom.el" "calc/calc-keypd.el" "calc/calc-lang.el"
-;;;;;;  "calc/calc-loaddefs.el" "calc/calc-macs.el" "calc/calc-map.el"
-;;;;;;  "calc/calc-math.el" "calc/calc-menu.el" "calc/calc-misc.el"
-;;;;;;  "calc/calc-mode.el" "calc/calc-mtx.el" "calc/calc-nlfit.el"
-;;;;;;  "calc/calc-poly.el" "calc/calc-prog.el" "calc/calc-rewr.el"
-;;;;;;  "calc/calc-rules.el" "calc/calc-sel.el" "calc/calc-stat.el"
-;;;;;;  "calc/calc-store.el" "calc/calc-stuff.el" "calc/calc-trail.el"
-;;;;;;  "calc/calc-units.el" "calc/calc-vec.el" "calc/calc-yank.el"
-;;;;;;  "calc/calcalg2.el" "calc/calcalg3.el" "calc/calccomp.el"
-;;;;;;  "calc/calcsel2.el" "calendar/cal-bahai.el" "calendar/cal-coptic.el"
-;;;;;;  "calendar/cal-french.el" "calendar/cal-html.el" "calendar/cal-islam.el"
-;;;;;;  "calendar/cal-iso.el" "calendar/cal-julian.el" "calendar/cal-loaddefs.el"
-;;;;;;  "calendar/cal-mayan.el" "calendar/cal-menu.el" "calendar/cal-move.el"
-;;;;;;  "calendar/cal-persia.el" "calendar/cal-tex.el" "calendar/cal-x.el"
-;;;;;;  "calendar/diary-loaddefs.el" "calendar/hol-loaddefs.el" "cdl.el"
-;;;;;;  "cedet/cedet-cscope.el" "cedet/cedet-files.el" "cedet/cedet-global.el"
-;;;;;;  "cedet/cedet-idutils.el" "cedet/ede/auto.el" "cedet/ede/autoconf-edit.el"
-;;;;;;  "cedet/ede/base.el" "cedet/ede/cpp-root.el" "cedet/ede/custom.el"
-;;;;;;  "cedet/ede/emacs.el" "cedet/ede/files.el" "cedet/ede/generic.el"
-;;;;;;  "cedet/ede/linux.el" "cedet/ede/loaddefs.el" "cedet/ede/locate.el"
-;;;;;;  "cedet/ede/make.el" "cedet/ede/makefile-edit.el" "cedet/ede/pconf.el"
-;;;;;;  "cedet/ede/pmake.el" "cedet/ede/proj-archive.el" "cedet/ede/proj-aux.el"
-;;;;;;  "cedet/ede/proj-comp.el" "cedet/ede/proj-elisp.el" "cedet/ede/proj-info.el"
-;;;;;;  "cedet/ede/proj-misc.el" "cedet/ede/proj-obj.el" "cedet/ede/proj-prog.el"
-;;;;;;  "cedet/ede/proj-scheme.el" "cedet/ede/proj-shared.el" "cedet/ede/proj.el"
-;;;;;;  "cedet/ede/shell.el" "cedet/ede/simple.el" "cedet/ede/source.el"
-;;;;;;  "cedet/ede/speedbar.el" "cedet/ede/srecode.el" "cedet/ede/system.el"
-;;;;;;  "cedet/ede/util.el" "cedet/semantic/analyze.el" "cedet/semantic/analyze/complete.el"
-;;;;;;  "cedet/semantic/analyze/debug.el" "cedet/semantic/analyze/fcn.el"
-;;;;;;  "cedet/semantic/analyze/refs.el" "cedet/semantic/bovine.el"
-;;;;;;  "cedet/semantic/bovine/c-by.el" "cedet/semantic/bovine/c.el"
-;;;;;;  "cedet/semantic/bovine/debug.el" "cedet/semantic/bovine/el.el"
-;;;;;;  "cedet/semantic/bovine/gcc.el" "cedet/semantic/bovine/make-by.el"
-;;;;;;  "cedet/semantic/bovine/make.el" "cedet/semantic/bovine/scm-by.el"
-;;;;;;  "cedet/semantic/bovine/scm.el" "cedet/semantic/chart.el"
-;;;;;;  "cedet/semantic/complete.el" "cedet/semantic/ctxt.el" "cedet/semantic/db-debug.el"
-;;;;;;  "cedet/semantic/db-ebrowse.el" "cedet/semantic/db-el.el"
-;;;;;;  "cedet/semantic/db-file.el" "cedet/semantic/db-find.el" "cedet/semantic/db-global.el"
-;;;;;;  "cedet/semantic/db-javascript.el" "cedet/semantic/db-mode.el"
-;;;;;;  "cedet/semantic/db-ref.el" "cedet/semantic/db-typecache.el"
+;;;;;;  "calc/calc-macs.el" "calc/calc-map.el" "calc/calc-math.el"
+;;;;;;  "calc/calc-menu.el" "calc/calc-misc.el" "calc/calc-mode.el"
+;;;;;;  "calc/calc-mtx.el" "calc/calc-nlfit.el" "calc/calc-poly.el"
+;;;;;;  "calc/calc-prog.el" "calc/calc-rewr.el" "calc/calc-rules.el"
+;;;;;;  "calc/calc-sel.el" "calc/calc-stat.el" "calc/calc-store.el"
+;;;;;;  "calc/calc-stuff.el" "calc/calc-trail.el" "calc/calc-units.el"
+;;;;;;  "calc/calc-vec.el" "calc/calc-yank.el" "calc/calcalg2.el"
+;;;;;;  "calc/calcalg3.el" "calc/calccomp.el" "calc/calcsel2.el"
+;;;;;;  "calendar/cal-bahai.el" "calendar/cal-coptic.el" "calendar/cal-french.el"
+;;;;;;  "calendar/cal-html.el" "calendar/cal-islam.el" "calendar/cal-iso.el"
+;;;;;;  "calendar/cal-julian.el" "calendar/cal-loaddefs.el" "calendar/cal-mayan.el"
+;;;;;;  "calendar/cal-menu.el" "calendar/cal-move.el" "calendar/cal-persia.el"
+;;;;;;  "calendar/cal-tex.el" "calendar/cal-x.el" "calendar/diary-loaddefs.el"
+;;;;;;  "calendar/hol-loaddefs.el" "cdl.el" "cedet/cedet-cscope.el"
+;;;;;;  "cedet/cedet-files.el" "cedet/cedet-global.el" "cedet/cedet-idutils.el"
+;;;;;;  "cedet/ede/auto.el" "cedet/ede/autoconf-edit.el" "cedet/ede/base.el"
+;;;;;;  "cedet/ede/cpp-root.el" "cedet/ede/custom.el" "cedet/ede/emacs.el"
+;;;;;;  "cedet/ede/files.el" "cedet/ede/generic.el" "cedet/ede/linux.el"
+;;;;;;  "cedet/ede/locate.el" "cedet/ede/make.el" "cedet/ede/makefile-edit.el"
+;;;;;;  "cedet/ede/pconf.el" "cedet/ede/pmake.el" "cedet/ede/proj-archive.el"
+;;;;;;  "cedet/ede/proj-aux.el" "cedet/ede/proj-comp.el" "cedet/ede/proj-elisp.el"
+;;;;;;  "cedet/ede/proj-info.el" "cedet/ede/proj-misc.el" "cedet/ede/proj-obj.el"
+;;;;;;  "cedet/ede/proj-prog.el" "cedet/ede/proj-scheme.el" "cedet/ede/proj-shared.el"
+;;;;;;  "cedet/ede/proj.el" "cedet/ede/shell.el" "cedet/ede/simple.el"
+;;;;;;  "cedet/ede/source.el" "cedet/ede/speedbar.el" "cedet/ede/srecode.el"
+;;;;;;  "cedet/ede/system.el" "cedet/ede/util.el" "cedet/semantic/analyze.el"
+;;;;;;  "cedet/semantic/analyze/complete.el" "cedet/semantic/analyze/debug.el"
+;;;;;;  "cedet/semantic/analyze/fcn.el" "cedet/semantic/analyze/refs.el"
+;;;;;;  "cedet/semantic/bovine.el" "cedet/semantic/bovine/c-by.el"
+;;;;;;  "cedet/semantic/bovine/c.el" "cedet/semantic/bovine/debug.el"
+;;;;;;  "cedet/semantic/bovine/el.el" "cedet/semantic/bovine/gcc.el"
+;;;;;;  "cedet/semantic/bovine/make-by.el" "cedet/semantic/bovine/make.el"
+;;;;;;  "cedet/semantic/bovine/scm-by.el" "cedet/semantic/bovine/scm.el"
+;;;;;;  "cedet/semantic/chart.el" "cedet/semantic/complete.el" "cedet/semantic/ctxt.el"
+;;;;;;  "cedet/semantic/db-debug.el" "cedet/semantic/db-ebrowse.el"
+;;;;;;  "cedet/semantic/db-el.el" "cedet/semantic/db-file.el" "cedet/semantic/db-find.el"
+;;;;;;  "cedet/semantic/db-global.el" "cedet/semantic/db-javascript.el"
+;;;;;;  "cedet/semantic/db-mode.el" "cedet/semantic/db-ref.el" "cedet/semantic/db-typecache.el"
 ;;;;;;  "cedet/semantic/db.el" "cedet/semantic/debug.el" "cedet/semantic/decorate.el"
 ;;;;;;  "cedet/semantic/decorate/include.el" "cedet/semantic/decorate/mode.el"
 ;;;;;;  "cedet/semantic/dep.el" "cedet/semantic/doc.el" "cedet/semantic/ede-grammar.el"
@@ -31864,13 +32041,13 @@ Zone out, completely.
 ;;;;;;  "cedet/semantic/fw.el" "cedet/semantic/grammar-wy.el" "cedet/semantic/grammar.el"
 ;;;;;;  "cedet/semantic/html.el" "cedet/semantic/ia-sb.el" "cedet/semantic/ia.el"
 ;;;;;;  "cedet/semantic/idle.el" "cedet/semantic/imenu.el" "cedet/semantic/java.el"
-;;;;;;  "cedet/semantic/lex-spp.el" "cedet/semantic/lex.el" "cedet/semantic/loaddefs.el"
-;;;;;;  "cedet/semantic/mru-bookmark.el" "cedet/semantic/sb.el" "cedet/semantic/scope.el"
-;;;;;;  "cedet/semantic/senator.el" "cedet/semantic/sort.el" "cedet/semantic/symref.el"
-;;;;;;  "cedet/semantic/symref/cscope.el" "cedet/semantic/symref/filter.el"
-;;;;;;  "cedet/semantic/symref/global.el" "cedet/semantic/symref/grep.el"
-;;;;;;  "cedet/semantic/symref/idutils.el" "cedet/semantic/symref/list.el"
-;;;;;;  "cedet/semantic/tag-file.el" "cedet/semantic/tag-ls.el" "cedet/semantic/tag-write.el"
+;;;;;;  "cedet/semantic/lex-spp.el" "cedet/semantic/lex.el" "cedet/semantic/mru-bookmark.el"
+;;;;;;  "cedet/semantic/sb.el" "cedet/semantic/scope.el" "cedet/semantic/senator.el"
+;;;;;;  "cedet/semantic/sort.el" "cedet/semantic/symref.el" "cedet/semantic/symref/cscope.el"
+;;;;;;  "cedet/semantic/symref/filter.el" "cedet/semantic/symref/global.el"
+;;;;;;  "cedet/semantic/symref/grep.el" "cedet/semantic/symref/idutils.el"
+;;;;;;  "cedet/semantic/symref/list.el" "cedet/semantic/tag-file.el"
+;;;;;;  "cedet/semantic/tag-ls.el" "cedet/semantic/tag-write.el"
 ;;;;;;  "cedet/semantic/tag.el" "cedet/semantic/texi.el" "cedet/semantic/util-modes.el"
 ;;;;;;  "cedet/semantic/util.el" "cedet/semantic/wisent.el" "cedet/semantic/wisent/comp.el"
 ;;;;;;  "cedet/semantic/wisent/java-tags.el" "cedet/semantic/wisent/javascript.el"
@@ -31882,52 +32059,51 @@ Zone out, completely.
 ;;;;;;  "cedet/srecode/el.el" "cedet/srecode/expandproto.el" "cedet/srecode/extract.el"
 ;;;;;;  "cedet/srecode/fields.el" "cedet/srecode/filters.el" "cedet/srecode/find.el"
 ;;;;;;  "cedet/srecode/getset.el" "cedet/srecode/insert.el" "cedet/srecode/java.el"
-;;;;;;  "cedet/srecode/loaddefs.el" "cedet/srecode/map.el" "cedet/srecode/mode.el"
-;;;;;;  "cedet/srecode/semantic.el" "cedet/srecode/srt-wy.el" "cedet/srecode/srt.el"
-;;;;;;  "cedet/srecode/table.el" "cedet/srecode/template.el" "cedet/srecode/texi.el"
-;;;;;;  "cus-dep.el" "dframe.el" "dired-aux.el" "dired-x.el" "dos-fns.el"
-;;;;;;  "dos-vars.el" "dos-w32.el" "dynamic-setting.el" "emacs-lisp/authors.el"
+;;;;;;  "cedet/srecode/map.el" "cedet/srecode/mode.el" "cedet/srecode/semantic.el"
+;;;;;;  "cedet/srecode/srt-wy.el" "cedet/srecode/srt.el" "cedet/srecode/table.el"
+;;;;;;  "cedet/srecode/template.el" "cedet/srecode/texi.el" "cus-dep.el"
+;;;;;;  "dframe.el" "dired-aux.el" "dired-x.el" "dos-fns.el" "dos-vars.el"
+;;;;;;  "dos-w32.el" "dynamic-setting.el" "emacs-lisp/authors.el"
 ;;;;;;  "emacs-lisp/avl-tree.el" "emacs-lisp/bindat.el" "emacs-lisp/byte-opt.el"
-;;;;;;  "emacs-lisp/cl-extra.el" "emacs-lisp/cl-loaddefs.el" "emacs-lisp/cl-macs.el"
-;;;;;;  "emacs-lisp/cl-seq.el" "emacs-lisp/cl.el" "emacs-lisp/eieio-base.el"
-;;;;;;  "emacs-lisp/eieio-datadebug.el" "emacs-lisp/eieio-speedbar.el"
-;;;;;;  "emacs-lisp/find-gc.el" "emacs-lisp/gulp.el" "emacs-lisp/lisp-mnt.el"
-;;;;;;  "emacs-lisp/package-x.el" "emacs-lisp/smie.el" "emacs-lisp/tcover-ses.el"
-;;;;;;  "emacs-lisp/tcover-unsafep.el" "emulation/cua-gmrk.el" "emulation/cua-rect.el"
-;;;;;;  "emulation/edt-lk201.el" "emulation/edt-mapper.el" "emulation/edt-pc.el"
-;;;;;;  "emulation/edt-vt100.el" "emulation/tpu-extras.el" "emulation/viper-cmd.el"
-;;;;;;  "emulation/viper-ex.el" "emulation/viper-init.el" "emulation/viper-keym.el"
-;;;;;;  "emulation/viper-macs.el" "emulation/viper-mous.el" "emulation/viper-util.el"
-;;;;;;  "erc/erc-backend.el" "erc/erc-goodies.el" "erc/erc-ibuffer.el"
-;;;;;;  "eshell/em-alias.el" "eshell/em-banner.el" "eshell/em-basic.el"
-;;;;;;  "eshell/em-cmpl.el" "eshell/em-dirs.el" "eshell/em-glob.el"
-;;;;;;  "eshell/em-hist.el" "eshell/em-ls.el" "eshell/em-pred.el"
-;;;;;;  "eshell/em-prompt.el" "eshell/em-rebind.el" "eshell/em-script.el"
-;;;;;;  "eshell/em-smart.el" "eshell/em-term.el" "eshell/em-tramp.el"
-;;;;;;  "eshell/em-unix.el" "eshell/em-xtra.el" "eshell/esh-arg.el"
-;;;;;;  "eshell/esh-cmd.el" "eshell/esh-ext.el" "eshell/esh-groups.el"
-;;;;;;  "eshell/esh-io.el" "eshell/esh-module.el" "eshell/esh-opt.el"
-;;;;;;  "eshell/esh-proc.el" "eshell/esh-util.el" "eshell/esh-var.el"
-;;;;;;  "ezimage.el" "format-spec.el" "fringe.el" "generic-x.el"
-;;;;;;  "gnus/compface.el" "gnus/gnus-async.el" "gnus/gnus-bcklg.el"
+;;;;;;  "emacs-lisp/cl-extra.el" "emacs-lisp/cl-macs.el" "emacs-lisp/cl-seq.el"
+;;;;;;  "emacs-lisp/cl.el" "emacs-lisp/eieio-base.el" "emacs-lisp/eieio-datadebug.el"
+;;;;;;  "emacs-lisp/eieio-speedbar.el" "emacs-lisp/find-gc.el" "emacs-lisp/gulp.el"
+;;;;;;  "emacs-lisp/lisp-mnt.el" "emacs-lisp/package-x.el" "emacs-lisp/smie.el"
+;;;;;;  "emacs-lisp/tcover-ses.el" "emacs-lisp/tcover-unsafep.el"
+;;;;;;  "emulation/cua-gmrk.el" "emulation/cua-rect.el" "emulation/edt-lk201.el"
+;;;;;;  "emulation/edt-mapper.el" "emulation/edt-pc.el" "emulation/edt-vt100.el"
+;;;;;;  "emulation/tpu-extras.el" "emulation/viper-cmd.el" "emulation/viper-ex.el"
+;;;;;;  "emulation/viper-init.el" "emulation/viper-keym.el" "emulation/viper-macs.el"
+;;;;;;  "emulation/viper-mous.el" "emulation/viper-util.el" "erc/erc-backend.el"
+;;;;;;  "erc/erc-goodies.el" "erc/erc-ibuffer.el" "eshell/em-alias.el"
+;;;;;;  "eshell/em-banner.el" "eshell/em-basic.el" "eshell/em-cmpl.el"
+;;;;;;  "eshell/em-dirs.el" "eshell/em-glob.el" "eshell/em-hist.el"
+;;;;;;  "eshell/em-ls.el" "eshell/em-pred.el" "eshell/em-prompt.el"
+;;;;;;  "eshell/em-rebind.el" "eshell/em-script.el" "eshell/em-smart.el"
+;;;;;;  "eshell/em-term.el" "eshell/em-tramp.el" "eshell/em-unix.el"
+;;;;;;  "eshell/em-xtra.el" "eshell/esh-arg.el" "eshell/esh-cmd.el"
+;;;;;;  "eshell/esh-ext.el" "eshell/esh-io.el" "eshell/esh-module.el"
+;;;;;;  "eshell/esh-opt.el" "eshell/esh-proc.el" "eshell/esh-util.el"
+;;;;;;  "eshell/esh-var.el" "ezimage.el" "format-spec.el" "fringe.el"
+;;;;;;  "generic-x.el" "gnus/compface.el" "gnus/gnus-async.el" "gnus/gnus-bcklg.el"
 ;;;;;;  "gnus/gnus-cite.el" "gnus/gnus-cus.el" "gnus/gnus-demon.el"
 ;;;;;;  "gnus/gnus-dup.el" "gnus/gnus-eform.el" "gnus/gnus-ems.el"
-;;;;;;  "gnus/gnus-int.el" "gnus/gnus-logic.el" "gnus/gnus-mh.el"
-;;;;;;  "gnus/gnus-salt.el" "gnus/gnus-score.el" "gnus/gnus-setup.el"
-;;;;;;  "gnus/gnus-srvr.el" "gnus/gnus-topic.el" "gnus/gnus-undo.el"
-;;;;;;  "gnus/gnus-util.el" "gnus/gnus-uu.el" "gnus/gnus-vm.el" "gnus/gssapi.el"
-;;;;;;  "gnus/ietf-drums.el" "gnus/legacy-gnus-agent.el" "gnus/mail-parse.el"
-;;;;;;  "gnus/mail-prsvr.el" "gnus/mail-source.el" "gnus/mailcap.el"
-;;;;;;  "gnus/messcompat.el" "gnus/mm-archive.el" "gnus/mm-bodies.el"
-;;;;;;  "gnus/mm-decode.el" "gnus/mm-util.el" "gnus/mm-view.el" "gnus/mml-sec.el"
-;;;;;;  "gnus/mml-smime.el" "gnus/nnagent.el" "gnus/nnbabyl.el" "gnus/nndir.el"
-;;;;;;  "gnus/nndraft.el" "gnus/nneething.el" "gnus/nngateway.el"
-;;;;;;  "gnus/nnheader.el" "gnus/nnimap.el" "gnus/nnir.el" "gnus/nnmail.el"
-;;;;;;  "gnus/nnmaildir.el" "gnus/nnmbox.el" "gnus/nnmh.el" "gnus/nnnil.el"
-;;;;;;  "gnus/nnoo.el" "gnus/nnregistry.el" "gnus/nnrss.el" "gnus/nnspool.el"
-;;;;;;  "gnus/nntp.el" "gnus/nnvirtual.el" "gnus/nnweb.el" "gnus/registry.el"
-;;;;;;  "gnus/rfc1843.el" "gnus/rfc2045.el" "gnus/rfc2047.el" "gnus/rfc2104.el"
-;;;;;;  "gnus/rfc2231.el" "gnus/rtree.el" "gnus/sieve-manage.el"
+;;;;;;  "gnus/gnus-icalendar.el" "gnus/gnus-int.el" "gnus/gnus-logic.el"
+;;;;;;  "gnus/gnus-mh.el" "gnus/gnus-salt.el" "gnus/gnus-score.el"
+;;;;;;  "gnus/gnus-setup.el" "gnus/gnus-srvr.el" "gnus/gnus-topic.el"
+;;;;;;  "gnus/gnus-undo.el" "gnus/gnus-util.el" "gnus/gnus-uu.el"
+;;;;;;  "gnus/gnus-vm.el" "gnus/gssapi.el" "gnus/ietf-drums.el" "gnus/legacy-gnus-agent.el"
+;;;;;;  "gnus/mail-parse.el" "gnus/mail-prsvr.el" "gnus/mail-source.el"
+;;;;;;  "gnus/mailcap.el" "gnus/messcompat.el" "gnus/mm-archive.el"
+;;;;;;  "gnus/mm-bodies.el" "gnus/mm-decode.el" "gnus/mm-util.el"
+;;;;;;  "gnus/mm-view.el" "gnus/mml-sec.el" "gnus/mml-smime.el" "gnus/nnagent.el"
+;;;;;;  "gnus/nnbabyl.el" "gnus/nndir.el" "gnus/nndraft.el" "gnus/nneething.el"
+;;;;;;  "gnus/nngateway.el" "gnus/nnheader.el" "gnus/nnimap.el" "gnus/nnir.el"
+;;;;;;  "gnus/nnmail.el" "gnus/nnmaildir.el" "gnus/nnmbox.el" "gnus/nnmh.el"
+;;;;;;  "gnus/nnnil.el" "gnus/nnoo.el" "gnus/nnregistry.el" "gnus/nnrss.el"
+;;;;;;  "gnus/nnspool.el" "gnus/nntp.el" "gnus/nnvirtual.el" "gnus/nnweb.el"
+;;;;;;  "gnus/registry.el" "gnus/rfc1843.el" "gnus/rfc2045.el" "gnus/rfc2047.el"
+;;;;;;  "gnus/rfc2104.el" "gnus/rfc2231.el" "gnus/rtree.el" "gnus/sieve-manage.el"
 ;;;;;;  "gnus/smime.el" "gnus/spam-stat.el" "gnus/spam-wash.el" "hex-util.el"
 ;;;;;;  "hfy-cmap.el" "ibuf-ext.el" "international/cp51932.el" "international/eucjp-ms.el"
 ;;;;;;  "international/fontset.el" "international/iso-ascii.el" "international/ja-dic-cnv.el"
@@ -32018,7 +32194,7 @@ Zone out, completely.
 ;;;;;;  "vc/ediff-vers.el" "vc/ediff-wind.el" "vc/pcvs-info.el" "vc/pcvs-parse.el"
 ;;;;;;  "vc/pcvs-util.el" "vc/vc-dav.el" "vcursor.el" "vt-control.el"
 ;;;;;;  "vt100-led.el" "w32-common-fns.el" "w32-fns.el" "w32-vars.el"
-;;;;;;  "x-dnd.el") (20945 22525 596830 318000))
+;;;;;;  "x-dnd.el") (21027 5557 48411 587000))
 
 ;;;***
 
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 7fb9526b360..c32bd00463e 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -139,6 +139,7 @@
   ;; In case loaddefs hasn't been generated yet.
   (file-error (load "ldefs-boot.el")))
 
+(load "emacs-lisp/nadvice")
 (load "minibuffer")
 (load "abbrev")         ;lisp-mode.el and simple.el use define-abbrev-table.
 (load "simple")
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index 091b1a03025..7f27599edf2 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -407,8 +407,10 @@ sending immediately.  For any other non-nil value, prompt in both
 cases.  You can give a timeout for the prompt; see variable
 `feedmail-confirm-outgoing-timeout'."
   :group 'feedmail-misc
-  :type 'boolean
-  )
+  :type '(choice (const nil)
+                 (const queued)
+                 (const immediate)
+                 (other t)))
 
 
 (defcustom feedmail-display-full-frame 'queued
@@ -425,8 +427,10 @@ it can still be interesting to see a lot about them as they are
 shuttled robotically onward."
   :version "24.1"
   :group 'feedmail-misc
-  :type 'boolean
-  )
+  :type '(choice (const nil)
+                 (const queued)
+                 (const immediate)
+                 (other t)))
 
 
 (defcustom feedmail-confirm-outgoing-timeout nil
@@ -483,8 +487,9 @@ and serially, so slow SMTP conversations can add up to a delay.  There
 is an option for either 'first or 'last because you might have a
 delivery agent that processes the addresses backwards."
   :group 'feedmail-headers
-  :type 'boolean
-  )
+  :type '(choice (const nil)
+                 (const first)
+                 (const last)))
 
 
 (defcustom feedmail-fill-to-cc t
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index e29becedb6e..aa244ddae81 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -3725,7 +3725,7 @@ to switch to."
    ;; If the frame was probably made for this buffer, the user
    ;; probably wants to delete it now.
    ((display-multi-frame-p)
-    (delete-frame (selected-frame)))
+    (delete-frame))
    ;; The previous frame is where normally they have the Rmail buffer
    ;; displayed.
    (t (other-frame -1))))
@@ -4768,9 +4768,7 @@ If prefix argument REVERSE is non-nil, sorts in reverse order.
 
 ;;;***
 
-;;;### (autoloads (rmail-summary-by-senders rmail-summary-by-topic
-;;;;;;  rmail-summary-by-regexp rmail-summary-by-recipients rmail-summary-by-labels
-;;;;;;  rmail-summary) "rmailsum" "rmailsum.el" "61e7ad0931be1e07034dd57825ff326a")
+;;;### (autoloads nil "rmailsum" "rmailsum.el" "a9b3bbd9b82dd566524a1209b5cdb7dd")
 ;;; Generated autoloads from rmailsum.el
 
 (autoload 'rmail-summary "rmailsum" "\
diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index 8dd4120d179..3a0a7824ad8 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -1288,7 +1288,7 @@ advance to the next message."
                 (prog1
                     ;; Is EOB visible in the buffer?
                     (save-excursion
-                      (let ((ht (window-height (selected-window))))
+                      (let ((ht (window-height)))
                         (move-to-window-line (- ht 2))
                         (end-of-line)
                         (eobp)))
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index e1dee3295f2..4fdd75c68a6 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -1114,6 +1114,7 @@ external program defined by `sendmail-program'."
   (let ((errbuf (if mail-interactive
                     (generate-new-buffer " sendmail errors")
                   0))
+        (error nil)
         (tembuf (generate-new-buffer " sendmail temp"))
         (multibyte enable-multibyte-characters)
         (case-fold-search nil)
@@ -1278,10 +1279,13 @@ external program defined by `sendmail-program'."
                      (exit-value (apply 'call-process-region args)))
                 (cond ((or (null exit-value) (eq 0 exit-value)))
                       ((numberp exit-value)
+                       (setq error t)
                        (error "Sending...failed with exit value %d" exit-value))
                       ((stringp exit-value)
+                       (setq error t)
                        (error "Sending...terminated by signal: %s" exit-value))
                       (t
+                       (setq error t)
                        (error "SENDMAIL-SEND-IT -- fall through: %S" exit-value))))
             (or fcc-was-found
                 (error "No recipients")))
@@ -1290,12 +1294,15 @@ external program defined by `sendmail-program'."
                 (goto-char (point-min))
                 (while (re-search-forward "\n\n* *" nil t)
                   (replace-match "; "))
-                (if (not (zerop (buffer-size)))
-                    (error "Sending...failed to %s"
-                           (buffer-substring (point-min) (point-max)))))))
+                (unless (zerop (buffer-size))
+                  (setq error t)
+                  (error "Sending...failed to %s"
+                         (buffer-substring (point-min) (point-max)))))))
       (kill-buffer tembuf)
-      (if (bufferp errbuf)
-          (kill-buffer errbuf)))))
+      (if (and (bufferp errbuf)
+               (not error))
+          (kill-buffer errbuf)
+        (switch-to-buffer-other-window errbuf)))))
 
 (autoload 'rmail-output-to-rmail-buffer "rmailout")
 
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index be459fe38d5..34cfc68295e 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1307,26 +1307,6 @@ mail status in mode line"))
 
 ;; The "Tools" menu items
 
-(defun send-mail-item-name ()
-  (let* ((known-send-mail-commands '((sendmail-user-agent . "sendmail")
-                                     (mh-e-user-agent . "MH")
-                                     (message-user-agent . "Gnus Message")
-                                     (gnus-user-agent . "Gnus")))
-         (name (assq mail-user-agent known-send-mail-commands)))
-    (if name
-        (setq name (cdr name))
-      (setq name (symbol-name mail-user-agent))
-      (if (string-match "\\(.+\\)-user-agent" name)
-          (setq name (match-string 1 name))))
-    name))
-
-(defun read-mail-item-name ()
-  (let* ((known-rmail-commands '((rmail . "RMAIL")
-                                 (mh-rmail . "MH")
-                                 (gnus . "Gnus")))
-         (known (assq read-mail-command known-rmail-commands)))
-    (if known (cdr known) (symbol-name read-mail-command))))
-
 (defvar menu-bar-games-menu
   (let ((menu (make-sparse-keymap "Games")))
 
@@ -1473,18 +1453,17 @@ mail status in mode line"))
     (bindings--define-key menu [directory-search]
       '(menu-item "Directory Search" eudc-tools-menu))
     (bindings--define-key menu [compose-mail]
-      '(menu-item (format "Send Mail (with %s)" (send-mail-item-name)) compose-mail
+      '(menu-item "Compose New Mail" compose-mail
                   :visible (and mail-user-agent (not (eq mail-user-agent 'ignore)))
-                  :help "Send a mail message"))
+                  :help "Start writing a new mail message"))
     (bindings--define-key menu [rmail]
-      '(menu-item (format "Read Mail (with %s)" (read-mail-item-name))
-                  menu-bar-read-mail
+      '(menu-item "Read Mail" menu-bar-read-mail
                   :visible (and read-mail-command
                                 (not (eq read-mail-command 'ignore)))
-                  :help "Read your mail and reply to it"))
+                  :help "Read your mail"))
 
     (bindings--define-key menu [gnus]
-      '(menu-item "Read Net News (Gnus)" gnus
+      '(menu-item "Read Net News" gnus
                   :help "Read network news groups"))
 
     (bindings--define-key menu [separator-vc]
diff --git a/lisp/mouse-drag.el b/lisp/mouse-drag.el
index 3a29e05c8b1..009cc2efe1a 100644
--- a/lisp/mouse-drag.el
+++ b/lisp/mouse-drag.el
@@ -156,7 +156,7 @@ Keep the cursor on the screen as needed."
   "Determine if it's wise to enable col-scrolling for the current window.
 Basically, we check for existing horizontal scrolling."
   (or truncate-lines
-      (> (window-hscroll (selected-window)) 0)
+      (> (window-hscroll) 0)
       (not (window-full-width-p))
       (and
        mouse-drag-electric-col-scrolling
diff --git a/lisp/mpc.el b/lisp/mpc.el
index ad7381bb4b7..825eb3c05d4 100644
--- a/lisp/mpc.el
+++ b/lisp/mpc.el
@@ -209,8 +209,7 @@ defaults to 6600 and HOST defaults to localhost."
 
 (defconst mpc--proc-end-re "^\\(?:OK\\(?: MPD .*\\)?\\|ACK \\(.*\\)\\)\n")
 
-(put 'mpc-proc-error 'error-conditions '(mpc-proc-error error))
-(put 'mpc-proc-error 'error-message "MPD error")
+(define-error 'mpc-proc-error "MPD error")
 
 (defun mpc--debug (format &rest args)
   (if (get-buffer "*MPC-debug*")
@@ -1513,7 +1512,7 @@ when constructing the set of constraints."
   (let* ((newbuf (mpc-tagbrowser-buf tag))
          (win (get-buffer-window newbuf 0)))
     (if win (select-window win)
-      (if (with-current-buffer (window-buffer (selected-window))
+      (if (with-current-buffer (window-buffer)
             (derived-mode-p 'mpc-tagbrowser-mode))
           (setq win (selected-window))
         ;; Find a tagbrowser-mode buffer.
@@ -2618,8 +2617,7 @@ This is used so that they can be compared with `eq', which is needed for
          (song-win (get-buffer-window song-buf 0)))
     (if song-win
         (select-window song-win)
-      (if (or (window-dedicated-p (selected-window))
-              (window-minibuffer-p))
+      (if (or (window-dedicated-p) (window-minibuffer-p))
           (ignore-errors (select-frame (make-frame mpc-frame-alist)))
         (with-current-buffer song-buf
           (setq-local mpc-previous-window-config
diff --git a/lisp/msb.el b/lisp/msb.el
index 4bde993ff84..110a4277376 100644
--- a/lisp/msb.el
+++ b/lisp/msb.el
@@ -386,7 +386,7 @@ This is instead of the groups in `msb-menu-cond'."
 ;;;
 ;;; Some example function to be used for `msb-item-handling-function'.
 ;;;
-(defun msb-item-handler (buffer &optional maxbuf)
+(defun msb-item-handler (_buffer &optional _maxbuf)
   "Create one string item, concerning BUFFER, for the buffer menu.
 The item looks like:
 *% <buffer-name>
@@ -410,7 +410,7 @@ Optional second argument MAXBUF is completely ignored."
          (error "Unknown type of `dired-directory' in buffer %s"
                 (buffer-name)))))
 
-(defun msb-dired-item-handler (buffer &optional maxbuf)
+(defun msb-dired-item-handler (_buffer &optional _maxbuf)
   "Create one string item, concerning a dired BUFFER, for the buffer menu.
 The item looks like:
 *% <buffer-name>
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index f6efc56023a..177fdaca150 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -1,7 +1,6 @@
 ;;; ange-ftp.el --- transparent FTP support for GNU Emacs
 
-;; Copyright (C) 1989-1996, 1998, 2000-2013 Free Software Foundation,
-;; Inc.
+;; Copyright (C) 1989-1996, 1998, 2000-2013 Free Software Foundation, Inc.
 
 ;; Author: Andy Norman (ange@hplb.hpl.hp.com)
 ;; Maintainer: FSF
@@ -700,7 +699,7 @@ parenthesized expressions in REGEXP for the components (in that order)."
   "Regular expression matching the start of a multiline FTP reply.")
 
 (defvar ange-ftp-good-msgs
-  "^220 \\|^230 \\|^226 \\|^25. \\|^221 \\|^200 \\|^[Hh]ash mark"
+  "^220 \\|^230 \\|^226 \\|^25. \\|^221 \\|^200 \\|^[Hh]ash mark\\|^Remote directory:"
   "Regular expression matching FTP \"success\" messages.")
 
 ;; CMS and the odd VMS machine say 200 Port rather than 200 PORT.
@@ -724,9 +723,10 @@ parenthesized expressions in REGEXP for the components (in that order)."
           "^504 Unknown security mechanism\\|"
           "^530 Please login with USER and PASS\\|" ; non kerberized vsFTPd
           "^534 Kerberos Authentication not enabled\\|"
-          "^22[789] .*[Pp]assive\\|^200 EPRT\\|^500 .*EPRT")
+          "^22[789] .*[Pp]assive\\|^200 EPRT\\|^500 .*EPRT\\|^500 .*EPSV")
   "Regular expression matching FTP messages that can be ignored."
   :group 'ange-ftp
+  :version "24.4"                       ; add EPSV
   :type 'regexp)
 
 (defcustom ange-ftp-fatal-msgs
@@ -1097,8 +1097,7 @@ All HOST values should be in lower case.")
 (defvar ange-ftp-trample-marker)
 
 ;; New error symbols.
-(put 'ftp-error 'error-conditions '(ftp-error file-error error))
-;; (put 'ftp-error 'error-message "FTP error")
+(define-error 'ftp-error nil 'file-error) ;"FTP error"
 
 ;;; ------------------------------------------------------------
 ;;; Enhanced message support.
@@ -3022,6 +3021,9 @@ and LINE is the relevant success or fail line from the FTP-client."
     (if (car result)
         (save-match-data
           (and (or (string-match "\"\\([^\"]*\\)\"" line)
+                   ;; Some clients cache the value and return it in
+                   ;; this way without asking the server.  (Bug#15058)
+                   (string-match "^Remote directory: \\(.*\\)" line)
                    (string-match " \\([^ ]+\\) " line)) ; stone-age VMS servers!
                (setq dir (match-string 1 line)))))
     (cons dir line)))
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 70c11c3201f..8b4dd2eed5f 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -159,7 +159,7 @@ word(s) will be searched for via `eww-search-prefix'."
            ((string-match "^image/" (car content-type))
             (eww-display-image))
            (t
-            (eww-display-raw charset)))
+            (eww-display-raw)))
           (setq eww-history-position 0)
           (cond
            (point
@@ -199,7 +199,9 @@ word(s) will be searched for via `eww-search-prefix'."
 
 (defun eww-display-html (charset url)
   (unless (eq charset 'utf8)
-    (decode-coding-region (point) (point-max) charset))
+    (condition-case nil
+        (decode-coding-region (point) (point-max) charset)
+      (coding-system-error nil)))
   (let ((document
          (list
           'base (list (cons 'href url))
@@ -294,7 +296,7 @@ word(s) will be searched for via `eww-search-prefix'."
                                   (list :background (car new-colors))
                                   t))))))
 
-(defun eww-display-raw (charset)
+(defun eww-display-raw ()
   (let ((data (buffer-substring (point) (point-max))))
     (eww-setup-buffer)
     (let ((inhibit-read-only t))
@@ -302,7 +304,7 @@ word(s) will be searched for via `eww-search-prefix'."
     (goto-char (point-min))))
 
 (defun eww-display-image ()
-  (let ((data (buffer-substring (point) (point-max))))
+  (let ((data (shr-parse-image-data)))
     (eww-setup-buffer)
     (let ((inhibit-read-only t))
       (shr-put-image data nil))
@@ -343,7 +345,7 @@ word(s) will be searched for via `eww-search-prefix'."
     (define-key map [(meta p)] 'eww-previous-bookmark)
 
     (easy-menu-define nil map ""
-      '("eww"
+      '("Eww"
         ["Quit" eww-quit t]
         ["Reload" eww-reload t]
         ["Back to previous page" eww-back-url
@@ -754,7 +756,6 @@ appears in a <link> or <a> tag."
   "Change the value of the select drop-down menu under point."
   (interactive)
   (let* ((input (get-text-property (point) 'eww-form))
-         (properties (text-properties-at (point)))
          (completion-ignore-case t)
          (options
           (delq nil
@@ -928,8 +929,7 @@ The browser to used is specified by the `shr-external-browser' variable."
       (setq file "!"))
      ((string-match "\\`[.]" file)
       (setq file (concat "!" file))))
-    (let ((base file)
-          (count 1))
+    (let ((count 1))
       (while (file-exists-p (expand-file-name file directory))
         (setq file
               (if (string-match "\\`\\(.*\\)\\([.][^.]+\\)" file)
diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index 243c64ec459..37755806616 100644
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -111,11 +111,7 @@ trust and key files, and priority string."
                     :type 'gnutls-x509pki
                     :hostname host))
 
-(put 'gnutls-error
-     'error-conditions
-     '(error gnutls-error))
-(put 'gnutls-error
-     'error-message "GnuTLS error")
+(define-error 'gnutls-error "GnuTLS error")
 
 (declare-function gnutls-boot "gnutls.c" (proc type proplist))
 (declare-function gnutls-errorp "gnutls.c" (error))
diff --git a/lisp/net/newst-plainview.el b/lisp/net/newst-plainview.el
index c7a3a107078..2ba4e5c2716 100644
--- a/lisp/net/newst-plainview.el
+++ b/lisp/net/newst-plainview.el
@@ -1188,7 +1188,7 @@ The mode-line is changed accordingly."
   "Redraw the newsticker window."
   (if (fboundp 'force-window-update)
       (force-window-update (current-buffer))
-    (redraw-frame (selected-frame)))
+    (redraw-frame))
   (run-hooks 'newsticker-buffer-change-hook)
   (sit-for 0))
 
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 7c70ded3eaa..2d8da415295 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -1331,7 +1331,7 @@ if ARG is omitted or nil."
   "Return a buffer for PROCESS, either the one selected or the process buffer."
   (if rcirc-always-use-server-buffer-flag
       (process-buffer process)
-    (let ((buffer (window-buffer (selected-window))))
+    (let ((buffer (window-buffer)))
       (if (and buffer
                (with-current-buffer buffer
                  (and (eq major-mode 'rcirc-mode)
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 89791511e09..9cac618b159 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -59,7 +59,7 @@ fit these criteria."
   "Character used to draw horizontal table lines.
 If nil, don't draw horizontal table lines."
   :group 'shr
-  :type 'character)
+  :type '(choice (const nil) character))
 
 (defcustom shr-table-vertical-line ?\s
   "Character used to draw vertical table lines."
@@ -705,7 +705,7 @@ If EXTERNAL, browse the URL using `shr-external-browser'."
       (url-store-in-cache image-buffer)
       (when (or (search-forward "\n\n" nil t)
                 (search-forward "\r\n\r\n" nil t))
-        (let ((data (buffer-substring (point) (point-max))))
+        (let ((data (shr-parse-image-data)))
           (with-current-buffer buffer
             (save-excursion
               (let ((alt (buffer-substring start end))
@@ -732,20 +732,28 @@ If EXTERNAL, browse the URL using `shr-external-browser'."
         (setq payload (base64-decode-string payload)))
       payload)))
 
-(defun shr-put-image (data alt &optional flags)
-  "Put image DATA with a string ALT.  Return image."
+(defun shr-put-image (spec alt &optional flags)
+  "Insert image SPEC with a string ALT.  Return image.
+SPEC is either an image data blob, or a list where the first
+element is the data blob and the second element is the content-type."
   (if (display-graphic-p)
       (let* ((size (cdr (assq 'size flags)))
+             (data (if (consp spec)
+                       (car spec)
+                     spec))
+             (content-type (and (consp spec)
+                                (cadr spec)))
              (start (point))
              (image (cond
                      ((eq size 'original)
-                      (create-image data nil t :ascent 100))
+                      (create-image data nil t :ascent 100
+                                    :format content-type))
                      ((eq size 'full)
                       (ignore-errors
-                        (shr-rescale-image data t)))
+                        (shr-rescale-image data t content-type)))
                      (t
                       (ignore-errors
-                        (shr-rescale-image data))))))
+                        (shr-rescale-image data nil content-type))))))
         (when image
           ;; When inserting big-ish pictures, put them at the
           ;; beginning of the line.
@@ -767,11 +775,10 @@ If EXTERNAL, browse the URL using `shr-external-browser'."
         image)
     (insert alt)))
 
-(defun shr-rescale-image (data &optional force)
+(defun shr-rescale-image (data &optional force content-type)
   "Rescale DATA, if too big, to fit the current buffer.
 If FORCE, rescale the image anyway."
   (if (or (not (fboundp 'imagemagick-types))
-          (eq (image-type-from-data data) 'gif)
           (not (get-buffer-window (current-buffer))))
       (create-image data nil t :ascent 100)
     (let ((edges (window-inside-pixel-edges
@@ -782,7 +789,8 @@ If FORCE, rescale the image anyway."
        :max-width (truncate (* shr-max-image-proportion
                                (- (nth 2 edges) (nth 0 edges))))
        :max-height (truncate (* shr-max-image-proportion
-                                (- (nth 3 edges) (nth 1 edges))))))))
+                                (- (nth 3 edges) (nth 1 edges))))
+       :format content-type))))
 
 ;; url-cache-extract autoloads url-cache.
 (declare-function url-cache-create-filename "url-cache" (url))
@@ -799,7 +807,17 @@ Return a string with image data."
             t)
       (when (or (search-forward "\n\n" nil t)
                 (search-forward "\r\n\r\n" nil t))
-        (buffer-substring (point) (point-max))))))
+        (shr-parse-image-data)))))
+
+(defun shr-parse-image-data ()
+  (list
+   (buffer-substring (point) (point-max))
+   (save-excursion
+     (save-restriction
+       (narrow-to-region (point-min) (point))
+       (let ((content-type (mail-fetch-field "content-type")))
+         (and content-type
+              (intern content-type obarray)))))))
 
 (defun shr-image-displayer (content-function)
   "Return a function to display an image.
@@ -1488,7 +1506,11 @@ ones, in case fg and bg are nil."
                       10))
               (when (and fill
                          (setq colspan (cdr (assq :colspan (cdr column)))))
-                (setq colspan (string-to-number colspan))
+                (setq colspan (min (string-to-number colspan)
+                                   ;; The colspan may be wrong, so
+                                   ;; truncate it to the length of the
+                                   ;; remaining columns.
+                                   (- (length widths) i)))
                 (dotimes (j (1- colspan))
                   (if (> (+ i 1 j) (1- (length widths)))
                       (setq width (aref widths (1- (length widths))))
@@ -1498,9 +1520,6 @@ ones, in case fg and bg are nil."
                 (setq width-column (+ width-column (1- colspan))))
               (when (or column
                         (not fill))
-                ;; Sanity check for degenerate tables.
-                (when (zerop width)
-                  (setq width 10))
                 (push (shr-render-td (cdr column) width fill)
                       tds))
               (setq i (1+ i)
@@ -1509,7 +1528,6 @@ ones, in case fg and bg are nil."
     (nreverse trs)))
 
 (defun shr-render-td (cont width fill)
-  (when (= width 0) (debug))
   (with-temp-buffer
     (let ((bgcolor (cdr (assq :bgcolor cont)))
           (fgcolor (cdr (assq :fgcolor cont)))
diff --git a/lisp/net/soap-client.el b/lisp/net/soap-client.el
index 4ba8e5b5854..1d4a9b573da 100644
--- a/lisp/net/soap-client.el
+++ b/lisp/net/soap-client.el
@@ -1352,10 +1352,7 @@ This is because it is easier to work with list results in LISP."
 
 ;;;; Soap Envelope parsing
 
-(put 'soap-error
-     'error-conditions
-     '(error soap-error))
-(put 'soap-error 'error-message "SOAP error")
+(define-error 'soap-error "SOAP error")
 
 (defun soap-parse-envelope (node operation wsdl)
   "Parse the SOAP envelope in NODE and return the response.
diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index 33e9e5aa44b..a5f59227ef7 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -36,6 +36,8 @@
 (require 'tramp)
 (require 'time-date)
 
+;; Pacify byte-compiler.
+(defvar directory-sep-char)
 (defvar dired-move-to-filename-regexp)
 
 (defcustom tramp-adb-program "adb"
@@ -174,7 +176,7 @@ pass to the OPERATION."
       (tramp-run-real-handler operation args))))
 
 ;;;###tramp-autoload
-(defun tramp-adb-parse-device-names (ignore)
+(defun tramp-adb-parse-device-names (_ignore)
   "Return a list of (nil host) tuples allowed to access."
   (with-timeout (10)
     (with-temp-buffer
@@ -224,7 +226,7 @@ pass to the OPERATION."
 
 ;; This is derived from `tramp-sh-handle-file-truename'.  Maybe the
 ;; code could be shared?
-(defun tramp-adb-handle-file-truename (filename &optional counter prev-dirs)
+(defun tramp-adb-handle-file-truename (filename)
   "Like `file-truename' for Tramp files."
   (with-parsed-tramp-file-name (expand-file-name filename) nil
     (with-tramp-file-property v localname "file-truename"
@@ -416,7 +418,7 @@ Convert (\"-al\") to (\"-a\" \"-l\").  Remove arguments like \"--dired\"."
                          switches))))))
 
 (defun tramp-adb-handle-insert-directory
-  (filename switches &optional wildcard full-directory-p)
+  (filename switches &optional _wildcard _full-directory-p)
   "Like `insert-directory' for Tramp files."
   (when (stringp switches)
     (setq switches (tramp-adb--gnu-switches-to-ash (split-string switches))))
@@ -518,7 +520,7 @@ Emacs dired can't find files."
                (tramp-shell-quote-argument localname))
      "Couldn't delete %s" directory)))
 
-(defun tramp-adb-handle-delete-file (filename &optional trash)
+(defun tramp-adb-handle-delete-file (filename &optional _trash)
   "Like `delete-file' for Tramp files."
   (setq filename (expand-file-name filename))
   (with-parsed-tramp-file-name filename nil
@@ -651,7 +653,7 @@ But handle the case, if the \"test\" command is not available."
 
 (defun tramp-adb-handle-copy-file
   (filename newname &optional ok-if-already-exists keep-date
-            preserve-uid-gid preserve-extended-attributes)
+            _preserve-uid-gid _preserve-extended-attributes)
   "Like `copy-file' for Tramp files.
 PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored."
   (setq filename (expand-file-name filename)
@@ -872,7 +874,7 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored."
     (when p
       (if (yes-or-no-p "A command is running.  Kill it? ")
           (ignore-errors (kill-process p))
-        (tramp-compat-user-error "Shell command in progress")))
+        (tramp-user-error p "Shell command in progress")))
 
     (if current-buffer-p
         (progn
@@ -1090,6 +1092,8 @@ FMT and ARGS are passed to `error'."
   "Maybe open a connection VEC.
 Does not do anything if a connection is already open, but re-opens the
 connection if a previous connection has died for some reason."
+  (tramp-check-proper-host vec)
+
   (let* ((buf (tramp-get-connection-buffer vec))
          (p (get-buffer-process buf))
          (host (tramp-file-name-host vec))
diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el
index f7f570590c8..b89c5124721 100644
--- a/lisp/net/tramp-cache.el
+++ b/lisp/net/tramp-cache.el
@@ -187,7 +187,7 @@ Remove also properties of all files in subdirectories."
                     'directory-file-name (list directory))))
     (tramp-message key 8 "%s" directory)
     (maphash
-     (lambda (key value)
+     (lambda (key _value)
        (when (and (stringp (tramp-file-name-localname key))
                   (string-match directory (tramp-file-name-localname key)))
          (remhash key tramp-cache-data)))
@@ -273,7 +273,7 @@ KEY identifies the connection, it is either a process or a vector."
    (let ((hash (gethash key tramp-cache-data))
          properties)
      (when (hash-table-p hash)
-       (maphash (lambda (x y) (add-to-list 'properties x 'append)) hash))
+       (maphash (lambda (x _y) (add-to-list 'properties x 'append)) hash))
      properties))
   (setq tramp-cache-data-changed t)
   (remhash key tramp-cache-data))
@@ -285,6 +285,11 @@ KEY identifies the connection, it is either a process or a vector."
     (let (result)
       (maphash
        (lambda (key value)
+         ;; Remove text properties from KEY.
+         (when (vectorp key)
+           (dotimes (i (length key))
+             (when (stringp (aref key i))
+               (aset key i (substring-no-properties (aref key i))))))
          (let ((tmp (format
                      "(%s %s)"
                      (if (processp key)
@@ -304,7 +309,7 @@ KEY identifies the connection, it is either a process or a vector."
   "Return a list of all known connection vectors according to `tramp-cache'."
     (let (result)
       (maphash
-       (lambda (key value)
+       (lambda (key _value)
          (when (and (vectorp key) (null (aref key 3)))
            (add-to-list 'result key)))
        tramp-cache-data)
@@ -368,7 +373,7 @@ This function is added always in `tramp-get-completion-function'
 for all methods.  Resulting data are derived from connection history."
   (let (res)
     (maphash
-     (lambda (key value)
+     (lambda (key _value)
        (if (and (vectorp key)
                 (string-equal method (tramp-file-name-method key))
                 (not (tramp-file-name-localname key)))
diff --git a/lisp/net/tramp-cmds.el b/lisp/net/tramp-cmds.el
index 462f0d88367..937db34a346 100644
--- a/lisp/net/tramp-cmds.el
+++ b/lisp/net/tramp-cmds.el
@@ -30,6 +30,10 @@
 
 (require 'tramp)
 
+;; Pacify byte-compiler.
+(defvar reporter-eval-buffer)
+(defvar reporter-prompt-for-summary-p)
+
 (defun tramp-list-tramp-buffers ()
   "Return a list of all Tramp connection buffers."
   (append
@@ -266,6 +270,7 @@ buffer in your bug report.
   (goto-char (point-max))
 
   ;; Dump buffer local variables.
+  (insert "\nlocal variables:\n================")
   (dolist (buffer
            (delq nil
                  (mapcar
@@ -273,21 +278,23 @@ buffer in your bug report.
                     (when (string-match "\\*tramp/" (buffer-name b)) b))
                   (buffer-list))))
     (let ((reporter-eval-buffer buffer)
-          (buffer-name (buffer-name buffer))
           (elbuf (get-buffer-create " *tmp-reporter-buffer*")))
       (with-current-buffer elbuf
         (emacs-lisp-mode)
         (erase-buffer)
-        (insert "\n(setq\n")
+        (insert (format "\n;; %s\n(setq-local\n" (buffer-name buffer)))
         (lisp-indent-line)
-        (tramp-compat-funcall
-         'reporter-dump-variable 'buffer-name (current-buffer))
-        (dolist (varsym-or-cons-cell (buffer-local-variables buffer))
-          (let ((varsym (or (car-safe varsym-or-cons-cell)
-                            varsym-or-cons-cell)))
-            (when (string-match "tramp" (symbol-name varsym))
-              (tramp-compat-funcall
-               'reporter-dump-variable varsym (current-buffer)))))
+        (dolist
+            (varsym
+             (sort
+              (append
+               (mapcar
+                'intern
+                (all-completions "tramp-" (buffer-local-variables buffer)))
+               ;; Non-tramp variables of interest.
+               '(default-directory))
+              'string<))
+            (tramp-compat-funcall 'reporter-dump-variable varsym elbuf))
         (lisp-indent-line)
         (insert ")\n"))
       (insert-buffer-substring elbuf)))
diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el
index 2b0ea74c492..8f9d9d8fee5 100644
--- a/lisp/net/tramp-compat.el
+++ b/lisp/net/tramp-compat.el
@@ -29,9 +29,8 @@
 
 ;;; Code:
 
+;; Pacify byte-compiler.
 (eval-when-compile
-
-  ;; Pacify byte-compiler.
   (require 'cl))
 
 (eval-and-compile
@@ -187,7 +186,7 @@
 ;; `with-temp-message' does not exist in XEmacs.
 (if (fboundp 'with-temp-message)
     (defalias 'tramp-compat-with-temp-message 'with-temp-message)
-  (defmacro tramp-compat-with-temp-message (message &rest body)
+  (defmacro tramp-compat-with-temp-message (_message &rest body)
     "Display MESSAGE temporarily if non-nil while BODY is evaluated."
     `(progn ,@body)))
 
@@ -238,14 +237,14 @@ this is the function `temp-directory'."
 ;; `make-temp-file' exists in Emacs only.  On XEmacs, we use our own
 ;; implementation with `make-temp-name', creating the temporary file
 ;; immediately in order to avoid a security hole.
-(defsubst tramp-compat-make-temp-file (filename &optional dir-flag)
+(defsubst tramp-compat-make-temp-file (f &optional dir-flag)
   "Create a temporary file (compat function).
-Add the extension of FILENAME, if existing."
+Add the extension of F, if existing."
   (let* (file-name-handler-alist
          (prefix (expand-file-name
                   (symbol-value 'tramp-temp-name-prefix)
                   (tramp-compat-temporary-file-directory)))
-         (extension (file-name-extension filename t))
+         (extension (file-name-extension f t))
          result)
     (condition-case nil
         (setq result
@@ -519,11 +518,6 @@ EOL-TYPE can be one of `dos', `unix', or `mac'."
                         "`dos', `unix', or `mac'")))))
         (t (error "Can't change EOL conversion -- is MULE missing?"))))
 
-;; `user-error' has been added to Emacs 24.3.
-(defun tramp-compat-user-error (format &rest args)
-  "Signal a pilot error."
-  (apply (if (fboundp 'user-error) 'user-error 'error) format args))
-
 (add-hook 'tramp-unload-hook
           (lambda ()
             (unload-feature 'tramp-compat 'force)))
diff --git a/lisp/net/tramp-ftp.el b/lisp/net/tramp-ftp.el
index 7d266d4d172..9e1be06a2b1 100644
--- a/lisp/net/tramp-ftp.el
+++ b/lisp/net/tramp-ftp.el
@@ -30,11 +30,13 @@
 
 (require 'tramp)
 
+;; Pacify byte-compiler.
 (eval-when-compile
-
-  ;; Pacify byte-compiler.
   (require 'cl)
   (require 'custom))
+(defvar ange-ftp-ftp-name-arg)
+(defvar ange-ftp-ftp-name-res)
+(defvar ange-ftp-name-format)
 
 ;; Disable Ange-FTP from file-name-handler-alist.
 ;; To handle EFS, the following functions need to be dealt with:
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index 5bb30b04643..e70400af820 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -97,11 +97,6 @@
 ;; option "--without-dbus".  Declare used subroutines and variables.
 (declare-function dbus-get-unique-name "dbusbind.c")
 
-;; Pacify byte-compiler
-(eval-when-compile
-  (require 'cl)
-  (require 'custom))
-
 (require 'tramp)
 
 (require 'dbus)
@@ -109,6 +104,12 @@
 (require 'url-util)
 (require 'zeroconf)
 
+;; Pacify byte-compiler.
+(eval-when-compile
+  (require 'cl)
+  (require 'custom))
+(defvar ls-lisp-use-insert-directory-program)
+
 ;;;###tramp-autoload
 (defcustom tramp-gvfs-methods '("dav" "davs" "obex" "synce")
   "List of methods for remote files, accessed with GVFS."
@@ -489,7 +490,7 @@ Operations not mentioned here will be handled by the default Emacs primitives.")
 First arg specifies the OPERATION, second arg is a list of arguments to
 pass to the OPERATION."
   (unless tramp-gvfs-enabled
-    (tramp-compat-user-error "Package `tramp-gvfs' not supported"))
+    (tramp-user-error nil "Package `tramp-gvfs' not supported"))
   (let ((fn (assoc operation tramp-gvfs-file-name-handler-alist)))
     (if fn
         (save-match-data (apply (cdr fn) args))
@@ -923,7 +924,7 @@ is no information where to trace the message.")
             v (concat localname filename)
             "file-name-all-completions" result))))))))
 
-(defun tramp-gvfs-handle-file-notify-add-watch (file-name flags callback)
+(defun tramp-gvfs-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
@@ -1093,7 +1094,7 @@ is no information where to trace the message.")
           (tramp-flush-file-property v localname))))))
 
 (defun tramp-gvfs-handle-write-region
-  (start end filename &optional append visit lockname confirm)
+  (start end filename &optional _append visit _lockname confirm)
   "Like `write-region' for Tramp files."
   (with-parsed-tramp-file-name filename nil
     ;; XEmacs takes a coding system as the seventh argument, not `confirm'.
@@ -1416,47 +1417,36 @@ It was \"a(say)\", but has changed to \"a{sv})\"."
          (port (tramp-file-name-port vec))
          (localname (tramp-file-name-localname vec))
          (ssl (if (string-match "^davs" method) "true" "false"))
-         (mount-spec '(:array))
-         (mount-pref "/"))
-
-    (setq
-     mount-spec
-     (append
-      mount-spec
-      (cond
-       ((string-equal "smb" method)
-        (string-match "^/?\\([^/]+\\)" localname)
-        (list (tramp-gvfs-mount-spec-entry "type" "smb-share")
-              (tramp-gvfs-mount-spec-entry "server" host)
-              (tramp-gvfs-mount-spec-entry "share" (match-string 1 localname))))
-       ((string-equal "obex" method)
-        (list (tramp-gvfs-mount-spec-entry "type" method)
-              (tramp-gvfs-mount-spec-entry
-               "host" (concat "[" (tramp-bluez-address host) "]"))))
-       ((string-match "^dav" method)
-        (list (tramp-gvfs-mount-spec-entry "type" "dav")
-              (tramp-gvfs-mount-spec-entry "host" host)
-              (tramp-gvfs-mount-spec-entry "ssl" ssl)))
-       (t
-        (list (tramp-gvfs-mount-spec-entry "type" method)
-              (tramp-gvfs-mount-spec-entry "host" host))))))
-
-    (when user
-      (add-to-list
-       'mount-spec (tramp-gvfs-mount-spec-entry "user" user) 'append))
-
-    (when domain
-      (add-to-list
-       'mount-spec (tramp-gvfs-mount-spec-entry "domain" domain) 'append))
-
-    (when port
-      (add-to-list
-       'mount-spec (tramp-gvfs-mount-spec-entry "port" (number-to-string port))
-       'append))
-
-    (when (and (string-match "^dav" method)
-               (string-match "^/?[^/]+" localname))
-      (setq mount-pref (match-string 0 localname)))
+         (mount-spec
+          `(:array
+            ,@(cond
+               ((string-equal "smb" method)
+                (string-match "^/?\\([^/]+\\)" localname)
+                (list (tramp-gvfs-mount-spec-entry "type" "smb-share")
+                      (tramp-gvfs-mount-spec-entry "server" host)
+                      (tramp-gvfs-mount-spec-entry "share" (match-string 1 localname))))
+               ((string-equal "obex" method)
+                (list (tramp-gvfs-mount-spec-entry "type" method)
+                      (tramp-gvfs-mount-spec-entry
+                       "host" (concat "[" (tramp-bluez-address host) "]"))))
+               ((string-match "\\`dav" method)
+                (list (tramp-gvfs-mount-spec-entry "type" "dav")
+                      (tramp-gvfs-mount-spec-entry "host" host)
+                      (tramp-gvfs-mount-spec-entry "ssl" ssl)))
+               (t
+                (list (tramp-gvfs-mount-spec-entry "type" method)
+                      (tramp-gvfs-mount-spec-entry "host" host))))
+            ,@(when user
+                (list (tramp-gvfs-mount-spec-entry "user" user)))
+            ,@(when domain
+                (list (tramp-gvfs-mount-spec-entry "domain" domain)))
+            ,@(when port
+                (list (tramp-gvfs-mount-spec-entry "port" (number-to-string port))))))
+         (mount-pref
+          (if (and (string-match "\\`dav" method)
+                   (string-match "^/?[^/]+" localname))
+              (match-string 0 localname)
+            "/")))
 
     ;; Return.
     `(:struct ,(tramp-gvfs-dbus-string-to-byte-array mount-pref) ,mount-spec)))
@@ -1468,6 +1458,7 @@ It was \"a(say)\", but has changed to \"a{sv})\"."
   "Maybe open a connection VEC.
 Does not do anything if a connection is already open, but re-opens the
 connection if a previous connection has died for some reason."
+  (tramp-check-proper-host vec)
 
   ;; We set the file name, in case there are incoming D-Bus signals or
   ;; D-Bus errors.
@@ -1653,7 +1644,7 @@ be used."
  :system nil nil tramp-bluez-interface-adapter "DeviceFound"
  'tramp-bluez-device-found)
 
-(defun tramp-bluez-parse-device-names (ignore)
+(defun tramp-bluez-parse-device-names (_ignore)
   "Return a list of (nil host) tuples allowed to access."
   (mapcar
    (lambda (x) (list nil (car x)))
@@ -1667,14 +1658,14 @@ be used."
 
 ;; D-Bus zeroconf functions.
 
-(defun tramp-zeroconf-parse-workstation-device-names (ignore)
+(defun tramp-zeroconf-parse-workstation-device-names (_ignore)
   "Return a list of (user host) tuples allowed to access."
   (mapcar
    (lambda (x)
      (list nil (zeroconf-service-host x)))
    (zeroconf-list-services "_workstation._tcp")))
 
-(defun tramp-zeroconf-parse-webdav-device-names (ignore)
+(defun tramp-zeroconf-parse-webdav-device-names (_ignore)
   "Return a list of (user host) tuples allowed to access."
   (mapcar
    (lambda (x)
@@ -1716,15 +1707,15 @@ They are retrieved from the hal daemon."
       (when (with-tramp-dbus-call-method tramp-gvfs-dbus-event-vector t
               :system tramp-hal-service device tramp-hal-interface-device
               "PropertyExists" "sync.plugin")
-        (add-to-list
-         'tramp-synce-devices
+        (pushnew
          (with-tramp-dbus-call-method tramp-gvfs-dbus-event-vector t
            :system tramp-hal-service device tramp-hal-interface-device
-           "GetPropertyString" "pda.pocketpc.name"))))
+           "GetPropertyString" "pda.pocketpc.name")
+         tramp-synce-devices :test #'equal)))
     (tramp-message tramp-gvfs-dbus-event-vector 10 "%s" tramp-synce-devices)
     tramp-synce-devices))
 
-(defun tramp-synce-parse-device-names (ignore)
+(defun tramp-synce-parse-device-names (_ignore)
   "Return a list of (nil host) tuples allowed to access."
   (mapcar
    (lambda (x) (list nil x))
diff --git a/lisp/net/tramp-gw.el b/lisp/net/tramp-gw.el
index 13f2964f938..53dbdbc45d4 100644
--- a/lisp/net/tramp-gw.el
+++ b/lisp/net/tramp-gw.el
@@ -33,16 +33,11 @@
 
 (require 'tramp)
 
-;; Pacify byte-compiler
+;; Pacify byte-compiler.
 (eval-when-compile
   (require 'cl)
   (require 'custom))
-
-;; Avoid byte-compiler warnings if the byte-compiler supports this.
-;; Currently, XEmacs supports this.
-(eval-when-compile
-  (when (featurep 'xemacs)
-      (byte-compiler-options (warnings (- unused-vars)))))
+(defvar socks-noproxy)
 
 ;; We don't add the following methods to `tramp-methods', in order to
 ;; exclude them from file name completion.
@@ -96,7 +91,7 @@
 (defvar tramp-gw-aux-proc nil
   "Process listening on local port, as mediation between SSH and the gateway.")
 
-(defun tramp-gw-gw-proc-sentinel (proc event)
+(defun tramp-gw-gw-proc-sentinel (proc _event)
   "Delete auxiliary process when we are deleted."
   (unless (memq (process-status proc) '(run open))
     (tramp-message
@@ -105,7 +100,7 @@
            (p (tramp-get-connection-property proc "process" nil)))
       (when (processp p) (delete-process p)))))
 
-(defun tramp-gw-aux-proc-sentinel (proc event)
+(defun tramp-gw-aux-proc-sentinel (proc _event)
   "Activate the different filters for involved gateway and auxiliary processes."
   (when (memq (process-status proc) '(run open))
     ;; A new process has been spawned from `tramp-gw-aux-proc'.
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index f9e68d0dad0..8ca94122af1 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -26,21 +26,15 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl))       ; ignore-errors
 (require 'tramp)
 
-;; Pacify byte-compiler.  The function is needed on XEmacs only.  I'm
-;; not sure at all that this is the right way to do it, but let's hope
-;; it works for now, and wait for a guru to point out the Right Way to
-;; achieve this.
-;;(eval-when-compile
-;;  (unless (fboundp 'dired-insert-set-properties)
-;;    (fset 'dired-insert-set-properties 'ignore)))
-;; Gerd suggests this:
-(eval-when-compile (require 'dired))
-;; Note that dired is required at run-time, too, when it is needed.
-;; It is only needed on XEmacs for the function
-;; `dired-insert-set-properties'.
+;; Pacify byte-compiler.
+(eval-when-compile
+  (require 'cl)
+  (require 'dired))
+(defvar directory-sep-char)
+(defvar tramp-gw-tunnel-method)
+(defvar tramp-gw-socks-method)
 
 (defcustom tramp-inline-compress-start-size 4096
   "The minimum size of compressing where inline transfer.
@@ -938,7 +932,7 @@ target of the symlink differ."
         (tramp-shell-quote-argument l-localname))
        t))))
 
-(defun tramp-sh-handle-file-truename (filename &optional counter prev-dirs)
+(defun tramp-sh-handle-file-truename (filename)
   "Like `file-truename' for Tramp files."
   (with-parsed-tramp-file-name (expand-file-name filename) nil
     (tramp-make-tramp-file-name method user host
@@ -1240,14 +1234,14 @@ target of the symlink differ."
 
 ;; This function makes the same assumption as
 ;; `tramp-sh-handle-set-visited-file-modtime'.
-(defun tramp-sh-handle-verify-visited-file-modtime (buf)
+(defun tramp-sh-handle-verify-visited-file-modtime (&optional buf)
   "Like `verify-visited-file-modtime' for Tramp files.
 At the time `verify-visited-file-modtime' calls this function, we
 already know that the buffer is visiting a file and that
 `visited-file-modtime' does not return 0.  Do not call this
 function directly, unless those two cases are already taken care
 of."
-  (with-current-buffer buf
+  (with-current-buffer (or buf (current-buffer))
     (let ((f (buffer-file-name)))
       ;; There is no file visiting the buffer, or the buffer has no
       ;; recorded last modification time, or there is no established
@@ -1837,7 +1831,7 @@ tramp-sh-handle-file-name-all-completions: internal error accessing `%s': `%s'"
      'copy-file (list filename newname ok-if-already-exists keep-date)))))
 
 (defun tramp-sh-handle-copy-directory
-  (dirname newname &optional keep-date parents copy-contents)
+  (dirname newname &optional keep-date parents _copy-contents)
   "Like `copy-directory' for Tramp files."
   (let ((t1 (tramp-tramp-file-p dirname))
         (t2 (tramp-tramp-file-p newname)))
@@ -1911,8 +1905,7 @@ file names."
         (t2 (tramp-tramp-file-p newname))
         (length (nth 7 (file-attributes (file-truename filename))))
         (attributes (and preserve-extended-attributes
-                         (apply 'file-extended-attributes (list filename))))
-        pr tm)
+                         (apply 'file-extended-attributes (list filename)))))
 
     (with-parsed-tramp-file-name (if t1 filename newname) nil
       (when (and (not ok-if-already-exists) (file-exists-p newname))
@@ -2433,7 +2426,7 @@ This is like `dired-recursive-delete-directory' for Tramp files."
          (tramp-error
           v 'file-error "Failed to recursively delete %s" filename))))
 
-(defun tramp-sh-handle-dired-compress-file (file &rest ok-flag)
+(defun tramp-sh-handle-dired-compress-file (file &rest _ok-flag)
   "Like `dired-compress-file' for Tramp files."
   ;; OK-FLAG is valid for XEmacs only, but not implemented.
   ;; Code stolen mainly from dired-aux.el.
@@ -2507,8 +2500,8 @@ This is like `dired-recursive-delete-directory' for Tramp files."
                         'file-name-nondirectory (list localname)))
         (setq localname (tramp-run-real-handler
                          'file-name-directory (list localname))))
-      (unless full-directory-p
-        (setq switches (add-to-list 'switches "-d" 'append)))
+      (unless (or full-directory-p (member "-d" switches))
+        (setq switches (append switches '("-d"))))
       (setq switches (mapconcat 'tramp-shell-quote-argument switches " "))
       (when wildcard
         (setq switches (concat switches " " wildcard)))
@@ -2978,7 +2971,7 @@ the result will be a local, non-Tramp, filename."
         (inhibit-file-name-operation 'insert-file-contents))
     (unwind-protect
         (progn
-          (fset 'find-buffer-file-type (lambda (filename) t))
+          (fset 'find-buffer-file-type (lambda (_filename) t))
           (insert-file-contents filename visit beg end replace))
       ;; Save exit.
       (if find-buffer-file-type-function
@@ -3383,7 +3376,7 @@ 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)
+(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
@@ -3749,7 +3742,7 @@ file exists and nonzero exit status otherwise."
 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."
   (let ((vec (tramp-get-connection-property proc "vector" nil)))
-    (condition-case err
+    (condition-case nil
         (tramp-wait-for-regexp
          proc timeout
          (format
@@ -4204,9 +4197,6 @@ Goes through the list `tramp-inline-compress-commands'."
         (tramp-message
          vec 2 "Couldn't find an inline transfer compress command")))))
 
-(defvar tramp-gw-tunnel-method)
-(defvar tramp-gw-socks-method)
-
 (defun tramp-compute-multi-hops (vec)
   "Expands VEC according to `tramp-default-proxies-alist'.
 Gateway hops are already opened."
@@ -4262,7 +4252,7 @@ Gateway hops are already opened."
                   ?h (or (tramp-file-name-host (car target-alist)) ""))))
           (with-parsed-tramp-file-name proxy l
             ;; Add the hop.
-            (add-to-list 'target-alist l)
+            (pushnew l target-alist :test #'equal)
             ;; Start next search.
             (setq choices tramp-default-proxies-alist)))))
 
@@ -4280,11 +4270,11 @@ Gateway hops are already opened."
            vec 'file-error
            "Connection `%s' is not supported for gateway access." hop))
         ;; Open the gateway connection.
-        (add-to-list
-         'target-alist
+        (pushnew
          (vector
           (tramp-file-name-method hop) (tramp-file-name-user hop)
-          (tramp-compat-funcall 'tramp-gw-open-connection vec gw hop) nil nil))
+          (tramp-compat-funcall 'tramp-gw-open-connection vec gw hop) nil nil)
+         target-alist :test #'equal)
         ;; For the password prompt, we need the correct values.
         ;; Therefore, we must remember the gateway vector.  But we
         ;; cannot do it as connection property, because it shouldn't
@@ -4336,6 +4326,8 @@ Gateway hops are already opened."
   "Maybe open a connection VEC.
 Does not do anything if a connection is already open, but re-opens the
 connection if a previous connection has died for some reason."
+  (tramp-check-proper-host vec)
+
   (catch 'uname-changed
     (let ((p (tramp-get-connection-process vec))
           (process-name (tramp-get-connection-property vec "process-name" nil))
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index 29847556dfe..f05a54f46f7 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -27,9 +27,12 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl))       ; block, return
 (require 'tramp)
 
+;; Pacify byte-compiler.
+(eval-when-compile
+  (require 'cl))
+
 ;; Define SMB method ...
 ;;;###tramp-autoload
 (defconst tramp-smb-method "smb"
@@ -355,7 +358,7 @@ pass to the OPERATION."
         (throw 'tramp-action 'ok)))))
 
 (defun tramp-smb-handle-copy-directory
-  (dirname newname &optional keep-date parents copy-contents)
+  (dirname newname &optional keep-date parents _copy-contents)
   "Like `copy-directory' for Tramp files."
   (setq dirname (expand-file-name dirname)
         newname (expand-file-name newname))
@@ -492,7 +495,7 @@ pass to the OPERATION."
 
 (defun tramp-smb-handle-copy-file
   (filename newname &optional ok-if-already-exists keep-date
-            preserve-uid-gid preserve-extended-attributes)
+            _preserve-uid-gid _preserve-extended-attributes)
   "Like `copy-file' for Tramp files.
 KEEP-DATE has no effect in case NEWNAME resides on an SMB server.
 PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored."
@@ -571,7 +574,7 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored."
           (tramp-error
            v 'file-error "%s `%s'" (match-string 0) directory))))))
 
-(defun tramp-smb-handle-delete-file (filename &optional trash)
+(defun tramp-smb-handle-delete-file (filename &optional _trash)
   "Like `delete-file' for Tramp files."
   (setq filename (expand-file-name filename))
   (when (file-exists-p filename)
@@ -1361,14 +1364,14 @@ Result is a list of (LOCALNAME MODE SIZE MONTH DAY TIME YEAR)."
               (while (not (eobp))
                 (setq entry (tramp-smb-read-file-entry share))
                 (forward-line)
-                (when entry (add-to-list 'res entry))))
+                (when entry (pushnew entry res :test #'equal))))
 
             ;; Cache share entries.
             (unless share
               (tramp-set-connection-property v "share-cache" res)))
 
           ;; Add directory itself.
-          (add-to-list 'res '("" "drwxrwxrwx" 0 (0 0)))
+          (pushnew '("" "drwxrwxrwx" 0 (0 0)) res :test #'equal)
 
           ;; There's a very strange error (debugged with XEmacs 21.4.14)
           ;; If there's no short delay, it returns nil.  No idea about.
@@ -1497,7 +1500,7 @@ Result is the list (LOCALNAME MODE SIZE MTIME)."
                     "%s%s"
                     (if (string-match "D" mode) "d" "-")
                     (mapconcat
-                     (lambda (x) "") "    "
+                     (lambda (_x) "") "    "
                      (concat "r" (if (string-match "R" mode) "-" "w") "x"))))
              line (substring line 0 -6))
           (return))
@@ -1561,6 +1564,8 @@ Does not do anything if a connection is already open, but re-opens the
 connection if a previous connection has died for some reason.
 If ARGUMENT is non-nil, use it as argument for
 `tramp-smb-winexe-program', and suppress any checks."
+  (tramp-check-proper-host vec)
+
   (let* ((share (tramp-smb-get-share vec))
          (buf (tramp-get-connection-buffer vec))
          (p (get-buffer-process buf)))
diff --git a/lisp/net/tramp-uu.el b/lisp/net/tramp-uu.el
index c64d8dfa046..6cf5baeccd8 100644
--- a/lisp/net/tramp-uu.el
+++ b/lisp/net/tramp-uu.el
@@ -28,11 +28,11 @@
 
 ;;; Code:
 
-(defvar tramp-uu-b64-alphabet
+(defconst tramp-uu-b64-alphabet
   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
   "Mapping from base64-encoded character to the byte it represents.")
 
-(defvar tramp-uu-b64-char-to-byte
+(defconst tramp-uu-b64-char-to-byte
   (let ((i 0))
     (mapcar (lambda (c)
               (prog1
@@ -55,7 +55,6 @@
   ;; First we base64 encode the region, then we transmogrify that into
   ;; uu encoding.
   (let ((len (base64-encode-region beg end t))
-        (padding 0)
         i c)
     (save-excursion
       (goto-char beg)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 8ce5f2eae9b..6c3ae376dc3 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -57,9 +57,17 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl))       ; ignore-errors
 (require 'tramp-compat)
 
+;; Pacify byte-compiler.
+(eval-when-compile
+  (require 'cl))
+(defvar bkup-backup-directory-info)
+(defvar directory-sep-char)
+(defvar eshell-path-env)
+(defvar file-notify-descriptors)
+(defvar outline-regexp)
+
 ;;; User Customizable Internal Variables:
 
 (defgroup tramp nil
@@ -1112,6 +1120,12 @@ calling HANDLER.")
 
 ;;; Internal functions which must come first:
 
+(defsubst tramp-user-error (vec-or-proc format &rest args)
+  "Signal a pilot error."
+  (apply
+   'tramp-error vec-or-proc
+   (if (fboundp 'user-error) 'user-error 'error) format args))
+
 ;; Conversion functions between external representation and
 ;; internal data structure.  Convenience functions for internal
 ;; data structure.
@@ -1224,30 +1238,38 @@ their replacement."
         (if noninteractive
             (warn "Method %s is obsolete, using %s"
                   result (substring result 0 -1))
-          (unless (y-or-n-p (format "Method %s is obsolete, use %s? "
+          (unless (y-or-n-p (format "Method \"%s\" is obsolete, use \"%s\"? "
                                     result (substring result 0 -1)))
-            (tramp-compat-user-error "Method \"%s\" not supported" result)))
+            (tramp-user-error nil "Method \"%s\" not supported" result)))
         (add-to-list 'tramp-warned-obsolete-methods result))
       ;; This works with the current set of `tramp-obsolete-methods'.
       ;; Must be improved, if their are more sophisticated replacements.
       (setq result (substring result 0 -1)))
-    result))
+    ;; We must mark, whether a default value has been used.
+    (if (or method (null result))
+        result
+      (propertize result 'tramp-default t))))
 
 (defun tramp-find-user (method user host)
   "Return the right user string to use.
 This is USER, if non-nil. Otherwise, do a lookup in
 `tramp-default-user-alist'."
-  (or user
-      (let ((choices tramp-default-user-alist)
-            luser item)
-        (while choices
-          (setq item (pop choices))
-          (when (and (string-match (or (nth 0 item) "") (or method ""))
-                     (string-match (or (nth 1 item) "") (or host "")))
-            (setq luser (nth 2 item))
-            (setq choices nil)))
-        luser)
-      tramp-default-user))
+  (let ((result
+         (or user
+             (let ((choices tramp-default-user-alist)
+                   luser item)
+               (while choices
+                 (setq item (pop choices))
+                 (when (and (string-match (or (nth 0 item) "") (or method ""))
+                            (string-match (or (nth 1 item) "") (or host "")))
+                   (setq luser (nth 2 item))
+                   (setq choices nil)))
+               luser)
+             tramp-default-user)))
+    ;; We must mark, whether a default value has been used.
+    (if (or user (null result))
+        result
+      (propertize result 'tramp-default t))))
 
 (defun tramp-find-host (method user host)
   "Return the right host string to use.
@@ -1264,6 +1286,18 @@ This is HOST, if non-nil. Otherwise, it is `tramp-default-host'."
         lhost)
       tramp-default-host))
 
+(defun tramp-check-proper-host (vec)
+  "Check host name of VEC."
+  (let ((method (tramp-file-name-method vec))
+        (user (tramp-file-name-user vec))
+        (host (tramp-file-name-host vec)))
+    (when (and (equal tramp-syntax 'ftp) host
+               (or (null method) (get-text-property 0 'tramp-default method))
+               (or (null user) (get-text-property 0 'tramp-default user))
+               (member host (mapcar 'car tramp-methods)))
+      (tramp-cleanup-connection vec)
+      (tramp-user-error vec "Host name must not match method \"%s\"" host))))
+
 (defun tramp-dissect-file-name (name &optional nodefault)
   "Return a `tramp-file-name' structure.
 The structure consists of remote method, remote user, remote host
@@ -1272,7 +1306,7 @@ non-nil, the file name parts are not expanded to their default
 values."
   (save-match-data
     (let ((match (string-match (nth 0 tramp-file-name-structure) name)))
-      (unless match (tramp-compat-user-error "Not a Tramp file name: %s" name))
+      (unless match (tramp-user-error nil "Not a Tramp file name: \"%s\"" name))
       (let ((method    (match-string (nth 1 tramp-file-name-structure) name))
             (user      (match-string (nth 2 tramp-file-name-structure) name))
             (host      (match-string (nth 3 tramp-file-name-structure) name))
@@ -1282,12 +1316,7 @@ values."
           (when (string-match tramp-prefix-ipv6-regexp host)
             (setq host (replace-match "" nil t host)))
           (when (string-match tramp-postfix-ipv6-regexp host)
-            (setq host (replace-match "" nil t host)))
-          (when (and (equal tramp-syntax 'ftp) (null method) (null user)
-                     (member host (mapcar 'car tramp-methods))
-                     (not (tramp-completion-mode-p)))
-            (tramp-compat-user-error
-             "Host name must not match method `%s'" host)))
+            (setq host (replace-match "" nil t host))))
         (if nodefault
             (vector method user host localname hop)
           (vector
@@ -1417,10 +1446,10 @@ The outline level is equal to the verbosity of the Tramp message."
       (set (make-local-variable 'outline-level) 'tramp-debug-outline-level))
     (current-buffer)))
 
-(defsubst tramp-debug-message (vec fmt-string &rest args)
+(defsubst tramp-debug-message (vec fmt-string &rest arguments)
   "Append message to debug buffer.
 Message is formatted with FMT-STRING as control string and the remaining
-ARGS to actually emit the message (if applicable)."
+ARGUMENTS to actually emit the message (if applicable)."
   (when (get-buffer (tramp-buffer-name vec))
     (with-current-buffer (tramp-get-debug-buffer vec)
       (goto-char (point-max))
@@ -1462,7 +1491,8 @@ ARGS to actually emit the message (if applicable)."
                          "tramp-debug-message"
                          "tramp-error"
                          "tramp-error-with-buffer"
-                         "tramp-message")
+                         "tramp-message"
+                         "tramp-user-error")
                        t)
                       "$")
                      fn)))
@@ -1480,14 +1510,14 @@ ARGS to actually emit the message (if applicable)."
 ;             (1+ (count-lines (point-min) (cdr ffn)))))))
         (insert (format "%s " fn)))
       ;; The message.
-      (insert (apply 'format fmt-string args)))))
+      (insert (apply 'format fmt-string arguments)))))
 
 (defvar tramp-message-show-message t
   "Show Tramp message in the minibuffer.
 This variable is used to disable messages from `tramp-error'.
 The messages are visible anyway, because an error is raised.")
 
-(defsubst tramp-message (vec-or-proc level fmt-string &rest args)
+(defsubst tramp-message (vec-or-proc level fmt-string &rest arguments)
   "Emit a message depending on verbosity level.
 VEC-OR-PROC identifies the Tramp buffer to use.  It can be either a
 vector or a process.  LEVEL says to be quiet if `tramp-verbose' is
@@ -1498,7 +1528,7 @@ The message is also logged into the debug buffer when `tramp-verbose'
 is greater than or equal 4.
 
 Calls functions `message' and `tramp-debug-message' with FMT-STRING as
-control string and the remaining ARGS to actually emit the message (if
+control string and the remaining ARGUMENTS to actually emit the message (if
 applicable)."
   (ignore-errors
     (when (<= level tramp-verbose)
@@ -1514,7 +1544,7 @@ applicable)."
                    ((= level 2) "Warning: ")
                    (t           "Tramp: "))
                   fmt-string)
-                 args))
+                 arguments))
         ;; Log only when there is a minimum level.
         (when (>= tramp-verbose 4)
           (when (and vec-or-proc
@@ -1527,17 +1557,21 @@ applicable)."
             (apply 'tramp-debug-message
                    vec-or-proc
                    (concat (format "(%d) # " level) fmt-string)
-                   args)))))))
+                   arguments)))))))
 
-(defsubst tramp-backtrace (vec-or-proc)
+(defsubst tramp-backtrace (&optional vec-or-proc)
   "Dump a backtrace into the debug buffer.
-This function is meant for debugging purposes."
-  (tramp-message vec-or-proc 10 "\n%s" (with-output-to-string (backtrace))))
-
-(defsubst tramp-error (vec-or-proc signal fmt-string &rest args)
+If VEC-OR-PROC is nil, the buffer *debug tramp* is used.  This
+function is meant for debugging purposes."
+  (if vec-or-proc
+      (tramp-message vec-or-proc 10 "\n%s" (with-output-to-string (backtrace)))
+    (if (<= 10 tramp-verbose)
+        (with-output-to-temp-buffer "*debug tramp*" (backtrace)))))
+
+(defsubst tramp-error (vec-or-proc signal fmt-string &rest arguments)
   "Emit an error.
 VEC-OR-PROC identifies the connection to use, SIGNAL is the
-signal identifier to be raised, remaining args passed to
+signal identifier to be raised, remaining arguments passed to
 `tramp-message'.  Finally, signal SIGNAL is raised."
   (let (tramp-message-show-message)
     (tramp-backtrace vec-or-proc)
@@ -1546,16 +1580,16 @@ signal identifier to be raised, remaining args passed to
      (error-message-string
       (list signal
             (get signal 'error-message)
-            (apply 'format fmt-string args))))
-    (signal signal (list (apply 'format fmt-string args)))))
+            (apply 'format fmt-string arguments))))
+    (signal signal (list (apply 'format fmt-string arguments)))))
 
 (defsubst tramp-error-with-buffer
-  (buffer vec-or-proc signal fmt-string &rest args)
-  "Emit an error, and show BUFFER.
-If BUFFER is nil, show the connection buffer.  Wait for 30\", or until
+  (buf vec-or-proc signal fmt-string &rest arguments)
+  "Emit an error, and show BUF.
+If BUF is nil, show the connection buf.  Wait for 30\", or until
 an input event arrives.  The other arguments are passed to `tramp-error'."
   (save-window-excursion
-    (let* ((buf (or (and (bufferp buffer) buffer)
+    (let* ((buf (or (and (bufferp buf) buf)
                     (and (processp vec-or-proc) (process-buffer vec-or-proc))
                     (and (vectorp vec-or-proc)
                          (tramp-get-connection-buffer vec-or-proc))))
@@ -1563,7 +1597,7 @@ an input event arrives.  The other arguments are passed to `tramp-error'."
                     (and buf (with-current-buffer buf
                                (tramp-dissect-file-name default-directory))))))
       (unwind-protect
-          (apply 'tramp-error vec-or-proc signal fmt-string args)
+          (apply 'tramp-error vec-or-proc signal fmt-string arguments)
         ;; Save exit.
         (when (and buf
                    tramp-message-show-message
@@ -1572,7 +1606,7 @@ an input event arrives.  The other arguments are passed to `tramp-error'."
           (let ((enable-recursive-minibuffers t))
             ;; `tramp-error' does not show messages.  So we must do it
             ;; ourselves.
-            (message fmt-string args)
+            (message fmt-string arguments)
             ;; Show buffer.
             (pop-to-buffer buf)
             (discard-input)
@@ -1598,18 +1632,19 @@ Remaining args are Lisp expressions to be evaluated (inside an implicit
 
 If VAR is nil, then we bind `v' to the structure and `method', `user',
 `host', `localname', `hop' to the components."
-  `(let* ((,(or var 'v) (tramp-dissect-file-name ,filename))
-          (,(if var (intern (concat (symbol-name var) "-method")) 'method)
-           (tramp-file-name-method ,(or var 'v)))
-          (,(if var (intern (concat (symbol-name var) "-user")) 'user)
-           (tramp-file-name-user ,(or var 'v)))
-          (,(if var (intern (concat (symbol-name var) "-host")) 'host)
-           (tramp-file-name-host ,(or var 'v)))
-          (,(if var (intern (concat (symbol-name var) "-localname")) 'localname)
-           (tramp-file-name-localname ,(or var 'v)))
-          (,(if var (intern (concat (symbol-name var) "-hop")) 'hop)
-           (tramp-file-name-hop ,(or var 'v))))
-     ,@body))
+  (let ((bindings
+         (mapcar (lambda (elem)
+                   `(,(if var (intern (format "%s-%s" var elem)) elem)
+                     (,(intern (format "tramp-file-name-%s" elem))
+                      ,(or var 'v))))
+                 '(method user host localname hop))))
+    `(let* ((,(or var 'v) (tramp-dissect-file-name ,filename))
+            ,@bindings)
+       ;; We don't know which of those vars will be used, so we bind them all,
+       ;; and then add here a dummy use of all those variables, so we don't get
+       ;; flooded by warnings about those vars `body' didn't use.
+       (ignore ,@(mapcar #'car bindings))
+       ,@body)))
 
 (put 'with-parsed-tramp-file-name 'lisp-indent-function 2)
 (put 'with-parsed-tramp-file-name 'edebug-form-spec '(form symbolp body))
@@ -1627,24 +1662,27 @@ If VAR is nil, then we bind `v' to the structure and `method', `user',
 If LEVEL does not fit for visible messages, there are only traces
 without a visible progress reporter."
   (declare (indent 3) (debug t))
-  `(let ((result "failed")
-         pr tm)
+  `(progn
      (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-message
-                ;; Display only when there is a minimum level.
-                (<= ,level (min tramp-verbose 3)))
-       (ignore-errors
-         (setq pr (tramp-compat-funcall 'make-progress-reporter ,message)
-               tm (when pr
-                    (run-at-time 3 0.1 'tramp-progress-reporter-update pr)))))
-     (unwind-protect
-         ;; 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...%s" ,message result))))
+     (let ((result "failed")
+           (tm
+            ;; We start a pulsing progress reporter after 3 seconds.  Feature
+            ;; introduced in Emacs 24.1.
+            (when (and tramp-message-show-message
+                       ;; Display only when there is a minimum level.
+                       (<= ,level (min tramp-verbose 3)))
+              (ignore-errors
+                (let ((pr (tramp-compat-funcall
+                           #'make-progress-reporter ,message)))
+                  (when pr
+                    (run-at-time 3 0.1
+                                 #'tramp-progress-reporter-update pr)))))))
+       (unwind-protect
+           ;; 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...%s" ,message result)))))
 
 (tramp-compat-font-lock-add-keywords
  'emacs-lisp-mode '("\\<with-tramp-progress-reporter\\>"))
@@ -3206,7 +3244,7 @@ User is always nil."
     (when p
       (if (yes-or-no-p "A command is running.  Kill it? ")
           (ignore-errors (kill-process p))
-        (tramp-compat-user-error "Shell command in progress")))
+        (tramp-user-error p "Shell command in progress")))
 
     (if current-buffer-p
         (progn
@@ -3281,7 +3319,7 @@ beginning of local filename are not substituted."
           (setq filename (concat filename "/"))))
       (tramp-run-real-handler 'substitute-in-file-name (list filename)))))
 
-(defun tramp-handle-unhandled-file-name-directory (filename)
+(defun tramp-handle-unhandled-file-name-directory (_filename)
   "Like `unhandled-file-name-directory' for Tramp files."
   ;; With Emacs 23, we could simply return `nil'.  But we must keep it
   ;; for backward compatibility.
@@ -3341,7 +3379,7 @@ of."
              ;; only if that agrees with the buffer's record.
              (t (equal mt '(-1 65535))))))))))
 
-(defun tramp-handle-file-notify-add-watch (filename flags callback)
+(defun tramp-handle-file-notify-add-watch (filename _flags _callback)
   "Like `file-notify-add-watch' for Tramp files."
   ;; This is the default handler.  tramp-gvfs.el and tramp-sh.el have
   ;; its own one.
@@ -3350,7 +3388,6 @@ of."
     (tramp-error
      v 'file-notify-error "File notification not supported for `%s'" filename)))
 
-(defvar file-notify-descriptors)
 (defun tramp-handle-file-notify-rm-watch (proc)
   "Like `file-notify-rm-watch' for Tramp files."
   ;; The descriptor must be a process object.
@@ -3365,7 +3402,7 @@ of."
 ;; prompts from the remote host.  See the variable
 ;; `tramp-actions-before-shell' for usage of these functions.
 
-(defun tramp-action-login (proc vec)
+(defun tramp-action-login (_proc vec)
   "Send the login name."
   (when (not (stringp tramp-current-user))
     (setq tramp-current-user
@@ -3392,11 +3429,11 @@ of."
       ;; Hide password prompt.
       (narrow-to-region (point-max) (point-max)))))
 
-(defun tramp-action-succeed (proc vec)
+(defun tramp-action-succeed (_proc _vec)
   "Signal success in finding shell prompt."
   (throw 'tramp-action 'ok))
 
-(defun tramp-action-permission-denied (proc vec)
+(defun tramp-action-permission-denied (proc _vec)
   "Signal permission denied."
   (kill-process proc)
   (throw 'tramp-action 'permission-denied))
@@ -3429,7 +3466,7 @@ See also `tramp-action-yesno'."
         (tramp-message vec 6 "\n%s" (buffer-string)))
       (tramp-send-string vec (concat "y" tramp-local-end-of-line)))))
 
-(defun tramp-action-terminal (proc vec)
+(defun tramp-action-terminal (_proc vec)
   "Tell the remote host which terminal type to use.
 The terminal type can be configured with `tramp-terminal-type'."
   (tramp-message vec 5 "Setting `%s' as terminal type." tramp-terminal-type)
@@ -3437,7 +3474,7 @@ The terminal type can be configured with `tramp-terminal-type'."
     (tramp-message vec 6 "\n%s" (buffer-string)))
   (tramp-send-string vec (concat tramp-terminal-type tramp-local-end-of-line)))
 
-(defun tramp-action-process-alive (proc vec)
+(defun tramp-action-process-alive (proc _vec)
   "Check, whether a process has finished."
   (unless (memq (process-status proc) '(run open))
     (throw 'tramp-action 'process-died)))
@@ -4182,9 +4219,6 @@ Only works for Bourne-like shells."
 
 ;;; Integration of eshell.el:
 
-(eval-when-compile
-  (defvar eshell-path-env))
-
 ;; eshell.el keeps the path in `eshell-path-env'.  We must change it
 ;; when `default-directory' points to another host.
 (defun tramp-eshell-directory-change ()
diff --git a/lisp/nxml/nxml-outln.el b/lisp/nxml/nxml-outln.el
index dab22f7559f..5fe6cfefa83 100644
--- a/lisp/nxml/nxml-outln.el
+++ b/lisp/nxml/nxml-outln.el
@@ -1008,13 +1008,8 @@ immediately after the section's start-tag."
 (defun nxml-outline-error (&rest args)
   (signal 'nxml-outline-error args))
 
-(put 'nxml-outline-error
-     'error-conditions
-     '(error nxml-error nxml-outline-error))
-
-(put 'nxml-outline-error
-     'error-message
-     "Cannot create outline of buffer that is not well-formed")
+(define-error 'nxml-outline-error
+  "Cannot create outline of buffer that is not well-formed" 'nxml-error)
 
 ;;; Debugging
 
diff --git a/lisp/nxml/nxml-rap.el b/lisp/nxml/nxml-rap.el
index ac4e9ac4cd9..398c107cf01 100644
--- a/lisp/nxml/nxml-rap.el
+++ b/lisp/nxml/nxml-rap.el
@@ -402,13 +402,8 @@ expected `%s'"
 (defun nxml-scan-error (&rest args)
   (signal 'nxml-scan-error args))
 
-(put 'nxml-scan-error
-     'error-conditions
-     '(error nxml-error nxml-scan-error))
-
-(put 'nxml-scan-error
-     'error-message
-     "Scan over element that is not well-formed")
+(define-error 'nxml-scan-error
+  "Scan over element that is not well-formed" 'nxml-error)
 
 (provide 'nxml-rap)
 
diff --git a/lisp/nxml/nxml-util.el b/lisp/nxml/nxml-util.el
index 6ba6d21f7ed..c410aa12c83 100644
--- a/lisp/nxml/nxml-util.el
+++ b/lisp/nxml/nxml-util.el
@@ -45,7 +45,7 @@
 
 (defmacro nxml-debug-clear-inside (start end)
   (when nxml-debug
-    `(loop for overlay in (overlays-in ,start ,end)
+    `(cl-loop for overlay in (overlays-in ,start ,end)
            if (overlay-get overlay 'nxml-inside-debug)
            do (delete-overlay overlay)
            finally (nxml-debug-change "nxml-clear-inside" ,start ,end))))
@@ -101,13 +101,8 @@ This is the inverse of `nxml-make-namespace'."
   (signal (or error-symbol 'nxml-file-parse-error)
           (list file pos message)))
 
-(put 'nxml-file-parse-error
-     'error-conditions
-     '(error nxml-file-parse-error))
-
-(put 'nxml-parse-file-error
-     'error-message
-     "Error parsing file")
+(define-error 'nxml-error nil)
+(define-error 'nxml-file-parse-error "Error parsing file" 'nxml-error)
 
 (provide 'nxml-util)
 
diff --git a/lisp/nxml/rng-cmpct.el b/lisp/nxml/rng-cmpct.el
index 111dab82633..6697195cebb 100644
--- a/lisp/nxml/rng-cmpct.el
+++ b/lisp/nxml/rng-cmpct.el
@@ -45,13 +45,8 @@ Return a pattern."
 
 ;;; Error handling
 
-(put 'rng-c-incorrect-schema
-     'error-conditions
-     '(error rng-error nxml-file-parse-error rng-c-incorrect-schema))
-
-(put 'rng-c-incorrect-schema
-     'error-message
-     "Incorrect schema")
+(define-error 'rng-c-incorrect-schema
+  "Incorrect schema" '(rng-error nxml-file-parse-error))
 
 (defun rng-c-signal-incorrect-schema (filename pos message)
   (nxml-signal-file-parse-error filename
diff --git a/lisp/nxml/rng-match.el b/lisp/nxml/rng-match.el
index 3c949ada668..36bd23b3768 100644
--- a/lisp/nxml/rng-match.el
+++ b/lisp/nxml/rng-match.el
@@ -1541,14 +1541,7 @@ nullable and y1 isn't, return a choice
   (signal 'rng-compile-error
           (list (apply 'format args))))
 
-(put 'rng-compile-error
-     'error-conditions
-     '(error rng-error rng-compile-error))
-
-(put 'rng-compile-error
-     'error-message
-     "Incorrect schema")
-
+(define-error 'rng-compile-error "Incorrect schema" 'rng-error)
 
 ;;; External API
 
diff --git a/lisp/nxml/rng-uri.el b/lisp/nxml/rng-uri.el
index b5f6983ab7f..8c0d409d520 100644
--- a/lisp/nxml/rng-uri.el
+++ b/lisp/nxml/rng-uri.el
@@ -127,8 +127,7 @@ Signal an error if URI is not a valid file URL."
 (defun rng-uri-error (&rest args)
   (signal 'rng-uri-error (list (apply 'format args))))
 
-(put 'rng-uri-error 'error-conditions '(error rng-uri-error))
-(put 'rng-uri-error 'error-message "Invalid URI")
+(define-error 'rng-uri-error "Invalid URI")
 
 (defun rng-uri-split (str)
   (and (string-match "\\`\\(?:\\([^:/?#]+\\):\\)?\
diff --git a/lisp/nxml/rng-util.el b/lisp/nxml/rng-util.el
index 0d97f9c3f12..7af6ae231c5 100644
--- a/lisp/nxml/rng-util.el
+++ b/lisp/nxml/rng-util.el
@@ -165,6 +165,8 @@ HIST, if non-nil, specifies a history list as with `completing-read'."
     (setq string (substring string 0 -1)))
   string)
 
+(define-error 'rng-error nil)
+
 (provide 'rng-util)
 
 ;;; rng-util.el ends here
diff --git a/lisp/nxml/xmltok.el b/lisp/nxml/xmltok.el
index b80335362a1..9bfcd21618d 100644
--- a/lisp/nxml/xmltok.el
+++ b/lisp/nxml/xmltok.el
@@ -1435,13 +1435,8 @@ If LIMIT is non-nil, then do not consider characters beyond LIMIT."
 (defun xmltok-current-token-string ()
   (buffer-substring-no-properties xmltok-start (point)))
 
-(put 'xmltok-markup-declaration-parse-error
-     'error-conditions
-     '(error xmltok-markup-declaration-parse-error))
-
-(put 'xmltok-markup-declaration-parse-error
-     'error-message
-     "Syntax error in markup declaration")
+(define-error 'xmltok-markup-declaration-parse-error
+  "Syntax error in markup declaration")
 
 (defun xmltok-markup-declaration-parse-error ()
   (signal 'xmltok-markup-declaration-parse-error nil))
diff --git a/lisp/nxml/xsd-regexp.el b/lisp/nxml/xsd-regexp.el
index f63b2e6defb..8c0b26cdab9 100644
--- a/lisp/nxml/xsd-regexp.el
+++ b/lisp/nxml/xsd-regexp.el
@@ -466,13 +466,8 @@ whose value is a range-list."
                      (- (length str)
                         (length xsdre-current-regexp))))))))
 
-(put 'xsdre-invalid-regexp
-     'error-conditions
-     '(error xsdre-invalid-regexp))
-
-(put 'xsdre-invalid-regexp
-     'error-message
-     "Invalid W3C XML Schema Datatypes regular expression")
+(define-error 'xsdre-invalid-regexp
+  "Invalid W3C XML Schema Datatypes regular expression")
 
 (defun xsdre-parse-regexp ()
   (let ((branches nil))
@@ -686,13 +681,7 @@ whose value is a range-list."
 
 ;; This error condition is used only internally.
 
-(put 'xsdre-parse-error
-     'error-conditions
-     '(error xsdre-parse-error))
-
-(put 'xsdre-parse-error
-     'error-message
-     "Internal error in parsing XSD regexp")
+(define-error 'xsdre-parse-error "Internal error in parsing XSD regexp")
 
 ;;; Character class data
 
diff --git a/lisp/obsolete/scribe.el b/lisp/obsolete/scribe.el
index 8396cce3e27..2ba1bb4aa76 100644
--- a/lisp/obsolete/scribe.el
+++ b/lisp/obsolete/scribe.el
@@ -144,7 +144,9 @@ Interesting variables:
   (set (make-local-variable 'sentence-end)
        "\\([.?!]\\|@:\\)[]\"')}]*\\($\\| $\\|\t\\|  \\)[ \t\n]*")
   (set (make-local-variable 'compile-command)
-       (concat "scribe " (buffer-file-name))))
+       (concat "scribe "
+               (if buffer-file-name
+                   (shell-quote-argument (buffer-file-name))))))
 
 (defun scribe-tab ()
   (interactive)
diff --git a/lisp/play/gomoku.el b/lisp/play/gomoku.el
index f2abc00e3f5..609585c9522 100644
--- a/lisp/play/gomoku.el
+++ b/lisp/play/gomoku.el
@@ -948,13 +948,13 @@ If the game is finished, this command requests for another game."
 
 (defun gomoku-max-width ()
   "Largest possible board width for the current window."
-  (1+ (/ (- (window-width (selected-window))
+  (1+ (/ (- (window-width)
             gomoku-x-offset gomoku-x-offset 1)
          gomoku-square-width)))
 
 (defun gomoku-max-height ()
   "Largest possible board height for the current window."
-  (1+ (/ (- (window-height (selected-window))
+  (1+ (/ (- (window-height)
             gomoku-y-offset gomoku-y-offset 2)
          ;; 2 instead of 1 because WINDOW-HEIGHT includes the mode line !
          gomoku-square-height)))
diff --git a/lisp/play/landmark.el b/lisp/play/landmark.el
index 0845ea2c300..cf86d7a9de5 100644
--- a/lisp/play/landmark.el
+++ b/lisp/play/landmark.el
@@ -843,13 +843,13 @@ If the game is finished, this command requests for another game."
 
 (defun landmark-max-width ()
   "Largest possible board width for the current window."
-  (1+ (/ (- (window-width (selected-window))
+  (1+ (/ (- (window-width)
             landmark-x-offset landmark-x-offset 1)
          landmark-square-width)))
 
 (defun landmark-max-height ()
   "Largest possible board height for the current window."
-  (1+ (/ (- (window-height (selected-window))
+  (1+ (/ (- (window-height)
             landmark-y-offset landmark-y-offset 2)
          ;; 2 instead of 1 because WINDOW-HEIGHT includes the mode line !
          landmark-square-height)))
diff --git a/lisp/play/life.el b/lisp/play/life.el
index a52c5477bb7..a73f3a58e66 100644
--- a/lisp/play/life.el
+++ b/lisp/play/life.el
@@ -290,8 +290,7 @@ generations (this defaults to 1)."
   (life-display-generation 0)
   (signal 'life-extinct nil))
 
-(put 'life-extinct 'error-conditions '(life-extinct quit))
-(put 'life-extinct 'error-message "All life has perished")
+(define-error 'life-extinct "All life has perished" 'quit) ;FIXME: quit really?
 
 (provide 'life)
 
diff --git a/lisp/play/zone.el b/lisp/play/zone.el
index 1724ebdf198..0f333392b9a 100644
--- a/lisp/play/zone.el
+++ b/lisp/play/zone.el
@@ -110,7 +110,7 @@ If the element is a function or a list of a function and a number,
     (let ((f (selected-frame))
           (outbuf (get-buffer-create "*zone*"))
           (text (buffer-substring (window-start) (window-end)))
-          (wp (1+ (- (window-point (selected-window))
+          (wp (1+ (- (window-point)
                      (window-start)))))
       (put 'zone 'orig-buffer (current-buffer))
       (switch-to-buffer outbuf)
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index 805444d08b9..33b21d6cc07 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -130,6 +130,8 @@
 (defvar ispell-check-comments)
 (defvar skeleton-further-elements)
 
+(define-error 'ada-mode-errors nil)
+
 (defun ada-mode-version ()
   "Return Ada mode version."
   (interactive)
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index e44b7c191bf..1ca83a97a59 100644
--- a/lisp/progmodes/ada-xref.el
+++ b/lisp/progmodes/ada-xref.el
@@ -342,9 +342,9 @@ CROSS-PREFIX is the prefix to use for the `gnatls' command."
                 )
             (kill-buffer nil))))
 
-    (set 'ada-xref-runtime-library-specs-path
+    (setq ada-xref-runtime-library-specs-path
          (reverse ada-xref-runtime-library-specs-path))
-    (set 'ada-xref-runtime-library-ali-path
+    (setq ada-xref-runtime-library-ali-path
          (reverse ada-xref-runtime-library-ali-path))
     ))
 
@@ -582,8 +582,8 @@ as defined in the project file."
 
     (while dirs
       (if (file-directory-p (car dirs))
-          (set 'list (append list (file-name-all-completions string (car dirs)))))
-      (set 'dirs (cdr dirs)))
+          (setq list (append list (file-name-all-completions string (car dirs)))))
+      (setq dirs (cdr dirs)))
     (cond ((equal flag 'lambda)
            (assoc string list))
           (flag
@@ -702,11 +702,11 @@ is non-nil, prompt the user to select one.  If none are found, return
 
          ((file-exists-p first-choice)
           ;; filename.adp
-          (set 'selected first-choice))
+          (setq selected first-choice))
 
          ((= (length prj-files) 1)
           ;; Exactly one project file was found in the current directory
-          (set 'selected (car prj-files)))
+          (setq selected (car prj-files)))
 
          ((and (> (length prj-files) 1) (not no-user-question))
           ;;  multiple project files in current directory, ask the user
@@ -732,7 +732,7 @@ is non-nil, prompt the user to select one.  If none are found, return
                     (> choice (length prj-files)))
               (setq choice (string-to-number
                             (read-from-minibuffer "Enter No. of your choice: "))))
-            (set 'selected (nth (1- choice) prj-files))))
+            (setq selected (nth (1- choice) prj-files))))
 
          ((= (length prj-files) 0)
           ;; No project file in the current directory; ask user
@@ -742,7 +742,7 @@ is non-nil, prompt the user to select one.  If none are found, return
                    (concat "project file [" ada-last-prj-file "]:")
                    nil ada-last-prj-file))
             (unless (string= ada-last-prj-file "")
-              (set 'selected ada-last-prj-file))))
+              (setq selected ada-last-prj-file))))
          )))
 
     (or selected "default.adp")
@@ -792,9 +792,9 @@ is non-nil, prompt the user to select one.  If none are found, return
 
     (setq prj-file (expand-file-name prj-file))
     (if (string= (file-name-extension prj-file) "gpr")
-        (set 'project (ada-gnat-parse-gpr project prj-file))
+        (setq project (ada-gnat-parse-gpr project prj-file))
 
-      (set 'project (ada-parse-prj-file-1 prj-file project))
+      (setq project (ada-parse-prj-file-1 prj-file project))
       )
 
     ;; Store the project properties
@@ -842,7 +842,7 @@ Return new value of PROJECT."
                           (substitute-in-file-name (match-string 2)))))
 
            ((string= (match-string 1) "build_dir")
-            (set 'project
+            (setq project
                  (plist-put project 'build_dir
                             (file-name-as-directory (match-string 2)))))
 
@@ -884,7 +884,7 @@ Return new value of PROJECT."
 
            (t
             ;; any other field in the file is just copied
-            (set 'project (plist-put project
+            (setq project (plist-put project
                                      (intern (match-string 1))
                                      (match-string 2))))))
 
@@ -900,21 +900,21 @@ Return new value of PROJECT."
         (let ((sep (plist-get project 'ada_project_path_sep)))
           (setq ada_project_path (reverse ada_project_path))
           (setq ada_project_path (mapconcat 'identity ada_project_path sep))
-          (set 'project (plist-put project 'ada_project_path ada_project_path))
+          (setq project (plist-put project 'ada_project_path ada_project_path))
           ;; env var needed now for ada-gnat-parse-gpr
           (setenv "ADA_PROJECT_PATH" ada_project_path)))
 
-    (if debug_post_cmd (set 'project (plist-put project 'debug_post_cmd (reverse debug_post_cmd))))
-    (if debug_pre_cmd (set 'project (plist-put project 'debug_pre_cmd (reverse debug_pre_cmd))))
-    (if casing (set 'project (plist-put project 'casing (reverse casing))))
-    (if check_cmd (set 'project (plist-put project 'check_cmd (reverse check_cmd))))
-    (if comp_cmd (set 'project (plist-put project 'comp_cmd (reverse comp_cmd))))
-    (if make_cmd (set 'project (plist-put project 'make_cmd (reverse make_cmd))))
-    (if run_cmd (set 'project (plist-put project 'run_cmd (reverse run_cmd))))
+    (if debug_post_cmd (setq project (plist-put project 'debug_post_cmd (reverse debug_post_cmd))))
+    (if debug_pre_cmd (setq project (plist-put project 'debug_pre_cmd (reverse debug_pre_cmd))))
+    (if casing (setq project (plist-put project 'casing (reverse casing))))
+    (if check_cmd (setq project (plist-put project 'check_cmd (reverse check_cmd))))
+    (if comp_cmd (setq project (plist-put project 'comp_cmd (reverse comp_cmd))))
+    (if make_cmd (setq project (plist-put project 'make_cmd (reverse make_cmd))))
+    (if run_cmd (setq project (plist-put project 'run_cmd (reverse run_cmd))))
 
     (if gpr_file
         (progn
-          (set 'project (ada-gnat-parse-gpr project gpr_file))
+          (setq project (ada-gnat-parse-gpr project gpr_file))
           ;; append Ada source and object directories to others from Emacs project file
           (setq src_dir (append (plist-get project 'src_dir) src_dir))
           (setq obj_dir (append (plist-get project 'obj_dir) obj_dir))
@@ -930,8 +930,8 @@ Return new value of PROJECT."
     (ada-initialize-runtime-library (or (ada-xref-get-project-field 'cross_prefix) ""))
     ;;)
 
-    (if obj_dir (set 'project (plist-put project 'obj_dir (reverse obj_dir))))
-    (if src_dir (set 'project (plist-put project 'src_dir (reverse src_dir))))
+    (if obj_dir (setq project (plist-put project 'obj_dir (reverse obj_dir))))
+    (if src_dir (setq project (plist-put project 'src_dir (reverse src_dir))))
 
     project
     ))
@@ -1052,9 +1052,9 @@ existing buffer `*gnatfind*', if there is one."
       (if old-contents
           (progn
             (goto-char 1)
-            (set 'buffer-read-only nil)
+            (setq buffer-read-only nil)
             (insert old-contents)
-            (set 'buffer-read-only t)
+            (setq buffer-read-only t)
             (goto-char (point-max)))))
     )
   )
@@ -1142,7 +1142,7 @@ If OTHER-FRAME is non-nil, display the cross-reference in another frame."
     (condition-case err
         (ada-find-in-ali identlist other-frame)
       ;; File not found: print explicit error message
-      (error-file-not-found
+      (ada-error-file-not-found
        (message (concat (error-message-string err)
                         (nthcdr 1 err))))
 
@@ -1194,9 +1194,9 @@ project file."
         (objects   (getenv "ADA_OBJECTS_PATH"))
         (build-dir (ada-xref-get-project-field 'build_dir)))
     (if include
-        (set 'include (concat path-separator include)))
+        (setq include (concat path-separator include)))
     (if objects
-        (set 'objects (concat path-separator objects)))
+        (setq objects (concat path-separator objects)))
     (cons
      (concat "ADA_INCLUDE_PATH="
              (mapconcat (lambda(x) (expand-file-name x build-dir))
@@ -1303,7 +1303,7 @@ If ARG is non-nil, ask for user confirmation."
 
     ;;  Guess the command if it wasn't specified
     (if (not command)
-        (set 'command (list (file-name-sans-extension (buffer-name)))))
+        (setq command (list (file-name-sans-extension (buffer-name)))))
 
     ;; Modify the command to run remotely
     (setq command (ada-remote (mapconcat 'identity command
@@ -1316,7 +1316,7 @@ If ARG is non-nil, ask for user confirmation."
 
     ;; Run the command
     (with-current-buffer (get-buffer-create "*run*")
-      (set 'buffer-read-only nil)
+      (setq buffer-read-only nil)
 
       (erase-buffer)
       (start-process "run" (current-buffer) shell-file-name
@@ -1352,7 +1352,7 @@ project file."
 
     ;;  If the command was not given in the project file, start a bare gdb
     (if (not cmd)
-        (set 'cmd (concat ada-prj-default-debugger
+        (setq cmd (concat ada-prj-default-debugger
                           " "
                           (or executable-name
                               (file-name-sans-extension (buffer-file-name))))))
@@ -1368,18 +1368,18 @@ project file."
         ;;  chance to fully manage it.  Then it works fine with Enlightenment
         ;;  as well
         (let ((frame (make-frame '((visibility . nil)))))
-          (set 'cmd (concat
+          (setq cmd (concat
                      cmd " --editor-window="
                      (cdr (assoc 'outer-window-id (frame-parameters frame)))))
           (select-frame frame)))
 
     ;;  Add a -fullname switch
     ;;  Use the remote machine
-    (set 'cmd (ada-remote (concat cmd " -fullname ")))
+    (setq cmd (ada-remote (concat cmd " -fullname ")))
 
     ;;  Ask for confirmation if required
     (if (or arg ada-xref-confirm-compile)
-        (set 'cmd (read-from-minibuffer "enter command to debug: " cmd)))
+        (setq cmd (read-from-minibuffer "enter command to debug: " cmd)))
 
     (let ((old-comint-exec (symbol-function 'comint-exec)))
 
@@ -1387,13 +1387,13 @@ project file."
       ;;  FIXME: This is evil but luckily a nop under Emacs-21.3.50 !  -stef
       (fset 'gud-gdb-massage-args (lambda (_file args) args))
 
-      (set 'pre-cmd  (mapconcat 'identity pre-cmd  ada-command-separator))
+      (setq pre-cmd  (mapconcat 'identity pre-cmd  ada-command-separator))
       (if (not (equal pre-cmd ""))
           (setq pre-cmd (concat pre-cmd ada-command-separator)))
 
-      (set 'post-cmd (mapconcat 'identity post-cmd "\n"))
+      (setq post-cmd (mapconcat 'identity post-cmd "\n"))
       (if post-cmd
-          (set 'post-cmd (concat post-cmd "\n")))
+          (setq post-cmd (concat post-cmd "\n")))
 
 
       ;;  Temporarily replaces the definition of `comint-exec' so that we
@@ -1403,7 +1403,7 @@ project file."
             `(lambda (buffer name command startfile switches)
                (let (compilation-buffer-name-function)
                  (save-excursion
-                   (set 'compilation-buffer-name-function
+                   (setq compilation-buffer-name-function
                         (lambda(x) (buffer-name buffer)))
                    (compile (ada-quote-cmd
                              (concat ,pre-cmd
@@ -1498,12 +1498,12 @@ by replacing the file extension with `.ali'."
   "Search for FILE in DIR-LIST."
   (let (found)
     (while (and (not found) dir-list)
-      (set 'found (concat (file-name-as-directory (car dir-list))
+      (setq found (concat (file-name-as-directory (car dir-list))
                           (file-name-nondirectory file)))
 
       (unless (file-exists-p found)
-          (set 'found nil))
-      (set 'dir-list (cdr dir-list)))
+          (setq found nil))
+      (setq dir-list (cdr dir-list)))
     found))
 
 (defun ada-find-ali-file-in-dir (file)
@@ -1558,11 +1558,11 @@ the project file."
             (while specs
               (if (string-match (concat (regexp-quote (car specs)) "$")
                                 file)
-                  (set 'is-spec t))
-              (set 'specs (cdr specs)))))
+                  (setq is-spec t))
+              (setq specs (cdr specs)))))
 
       (if is-spec
-          (set 'ali-file-name
+          (setq ali-file-name
                (ada-find-ali-file-in-dir
                 (concat (file-name-base (ada-other-file-name)) ".ali"))))
 
@@ -1589,8 +1589,8 @@ the project file."
                   (while (and (not ali-file-name)
                               (string-match "^\\(.*\\)[.-][^.-]*" parent-name))
 
-                    (set 'parent-name (match-string 1 parent-name))
-                    (set 'ali-file-name (ada-find-ali-file-in-dir
+                    (setq parent-name (match-string 1 parent-name))
+                    (setq ali-file-name (ada-find-ali-file-in-dir
                                          (concat parent-name ".ali")))
                     )
                   ali-file-name)))
@@ -1637,7 +1637,7 @@ Search in project file for possible paths."
     (let ((filename (ada-find-src-file-in-dir file)))
       (if filename
           (expand-file-name filename)
-        (signal 'error-file-not-found (file-name-nondirectory file)))
+        (signal 'ada-error-file-not-found (file-name-nondirectory file)))
       )))
 
 (defun ada-find-file-number-in-ali (file)
@@ -1686,18 +1686,18 @@ macros `ada-name-of', `ada-line-of', `ada-column-of', `ada-file-of',..."
           (if (and (= (char-before) ?\")
                    (= (char-after (+ (length (match-string 0)) (point))) ?\"))
               (forward-char -1))
-          (set 'identifier (regexp-quote (concat "\"" (match-string 0) "\""))))
+          (setq identifier (regexp-quote (concat "\"" (match-string 0) "\""))))
 
       (if (ada-in-string-p)
           (error "Inside string or character constant"))
       (if (looking-at (concat ada-keywords "[^a-zA-Z_]"))
           (error "No cross-reference available for reserved keyword"))
       (if (looking-at "[a-zA-Z0-9_]+")
-          (set 'identifier (match-string 0))
+          (setq identifier (match-string 0))
         (error "No identifier around")))
 
     ;; Build the identlist
-    (set 'identlist    (ada-make-identlist))
+    (setq identlist    (ada-make-identlist))
     (ada-set-name      identlist (downcase identifier))
     (ada-set-line      identlist
                        (number-to-string (count-lines 1 (point))))
@@ -1725,7 +1725,7 @@ Information is extracted from the ali file."
          (concat "^X [0-9]+ " (file-name-nondirectory (ada-file-of identlist)))
          nil t)
         (let ((bound (save-excursion (re-search-forward "^X " nil t))))
-          (set 'declaration-found
+          (setq declaration-found
                (re-search-forward
                 (concat "^"    (ada-line-of identlist)
                         "."    (ada-column-of identlist)
@@ -1743,7 +1743,7 @@ Information is extracted from the ali file."
       ;; Since we already know the number of the file, search for a direct
       ;; reference to it
       (goto-char (point-min))
-      (set 'declaration-found t)
+      (setq declaration-found t)
       (ada-set-ali-index
        identlist
        (number-to-string (ada-find-file-number-in-ali
@@ -1771,7 +1771,7 @@ Information is extracted from the ali file."
             ;; If still not found, then either the declaration is unknown
             ;; or the source file has been modified since the ali file was
             ;; created
-            (set 'declaration-found nil)
+            (setq declaration-found nil)
             )
           )
 
@@ -1786,7 +1786,7 @@ Information is extracted from the ali file."
               (beginning-of-line))
             (unless (looking-at (concat "[0-9]+.[0-9]+[ *]"
                                         (ada-name-of identlist) "[ <{=\(\[]"))
-              (set 'declaration-found nil))))
+              (setq declaration-found nil))))
 
       ;; Still no success ! The ali file must be too old, and we need to
       ;; use a basic algorithm based on guesses.  Note that this only happens
@@ -1794,7 +1794,7 @@ Information is extracted from the ali file."
       ;; automatically
       (unless declaration-found
         (if (ada-xref-find-in-modified-ali identlist)
-            (set 'declaration-found t)
+            (setq declaration-found t)
           ;; No more idea to find the declaration.  Give up
           (progn
             (kill-buffer ali-buffer)
@@ -1814,7 +1814,7 @@ Information is extracted from the ali file."
             (forward-line 1)
             (beginning-of-line)
             (while (looking-at "^\\.\\(.*\\)")
-              (set 'current-line (concat current-line (match-string 1)))
+              (setq current-line (concat current-line (match-string 1)))
               (forward-line 1))
             )
 
@@ -1828,7 +1828,7 @@ Information is extracted from the ali file."
                                           (ada-file-of identlist)))
 
                 ;;  Else clean up the ali file
-                (error-file-not-found
+                (ada-error-file-not-found
                  (signal (car err) (cdr err)))
                 (error
                  (kill-buffer ali-buffer)
@@ -1860,7 +1860,7 @@ This function is disabled for operators, and only works for identifiers."
           (goto-char (point-max))
           (while (re-search-backward my-regexp nil t)
             (save-excursion
-              (set 'line-ali (count-lines 1 (point)))
+              (setq line-ali (count-lines 1 (point)))
               (beginning-of-line)
               ;; have a look at the line and column numbers
               (if (looking-at "^\\([0-9]+\\).\\([0-9]+\\)[ *]")
@@ -1948,7 +1948,7 @@ opens a new window to show the declaration."
 
     ;; Get all the possible locations
     (string-match "^\\([0-9]+\\)[a-zA-Z+*]\\([0-9]+\\)[ *]" ali-line)
-    (set 'locations (list (list (match-string 1 ali-line) ;; line
+    (setq locations (list (list (match-string 1 ali-line) ;; line
                                 (match-string 2 ali-line) ;; column
                                 (ada-declare-file-of identlist))))
     (while (string-match "\\([0-9]+\\)[bc]\\(<[^>]+>\\)?\\([0-9]+\\)"
@@ -1968,16 +1968,16 @@ opens a new window to show the declaration."
             (goto-char (point-min))
             (re-search-forward "^D \\([a-zA-Z0-9_.-]+\\)" nil t
                                (string-to-number file-number))
-            (set 'file (match-string 1))
+            (setq file (match-string 1))
             )
         ;; Else get the nearest file
-        (set 'file (ada-declare-file-of identlist)))
+        (setq file (ada-declare-file-of identlist)))
 
-      (set 'locations (append locations (list (list line col file)))))
+      (setq locations (append locations (list (list line col file)))))
 
     ;; Add the specs at the end again, so that from the last body we go to
     ;; the specs
-    (set 'locations (append locations (list (car locations))))
+    (setq locations (append locations (list (car locations))))
 
     ;; Find the new location we want to go to.
     ;; If we are on none of the locations listed, we simply go to the specs.
@@ -1996,10 +1996,10 @@ opens a new window to show the declaration."
                 col       (nth 1 locations)
                 file      (nth 2 locations)
                 locations nil)
-        (set 'locations (cdr locations))))
+        (setq locations (cdr locations))))
 
     ;;  Find the file in the source path
-    (set 'file (ada-get-ada-file-name file (ada-file-of identlist)))
+    (setq file (ada-get-ada-file-name file (ada-file-of identlist)))
 
     ;; Kill the .ali buffer
     (kill-buffer (current-buffer))
@@ -2044,10 +2044,10 @@ the declaration and documentation of the subprograms one is using."
                   " "
                   (shell-quote-argument (file-name-as-directory (car dirs)))
                   "*.ali")))
-        (set 'dirs (cdr dirs)))
+        (setq dirs (cdr dirs)))
 
       ;;  Now parse the output
-      (set 'case-fold-search t)
+      (setq case-fold-search t)
       (goto-char (point-min))
       (while (re-search-forward regexp nil t)
         (save-excursion
@@ -2058,12 +2058,12 @@ the declaration and documentation of the subprograms one is using."
                 (setq line   (match-string 1)
                       column (match-string 2))
                 (re-search-backward "^X [0-9]+ \\(.*\\)$")
-                (set 'file (list (match-string 1) line column))
+                (setq file (list (match-string 1) line column))
 
                 ;;  There could be duplicate choices, because of the structure
                 ;;  of the .ali files
                 (unless (member file list)
-                  (set 'list (append list (list file))))))))
+                  (setq list (append list (list file))))))))
 
       ;;  Current buffer is still "*grep*"
       (kill-buffer "*grep*")
@@ -2078,7 +2078,7 @@ the declaration and documentation of the subprograms one is using."
 
      ;;  Only one choice => Do the cross-reference
      ((= (length list) 1)
-      (set 'file (ada-find-src-file-in-dir (caar list)))
+      (setq file (ada-find-src-file-in-dir (caar list)))
       (if file
           (ada-xref-change-buffer file
                                   (string-to-number (nth 1 (car list)))
@@ -2117,17 +2117,17 @@ the declaration and documentation of the subprograms one is using."
                 (string-to-number
                  (read-from-minibuffer "Enter No. of your choice: "))))
         )
-      (set 'choice (1- choice))
+      (setq choice (1- choice))
       (kill-buffer "*choice list*")
 
-      (set 'file (ada-find-src-file-in-dir (car (nth choice list))))
+      (setq file (ada-find-src-file-in-dir (car (nth choice list))))
       (if file
           (ada-xref-change-buffer file
                                   (string-to-number (nth 1 (nth choice list)))
                                   (string-to-number (nth 2 (nth choice list)))
                                   identlist
                                   other-frame)
-        (signal 'error-file-not-found (car (nth choice list))))
+        (signal 'ada-error-file-not-found (car (nth choice list))))
       (message "This is only a (good) guess at the cross-reference.")
       ))))
 
@@ -2144,7 +2144,7 @@ If OTHER-FRAME is non-nil, creates a new frame to show the file."
     (if ada-xref-other-buffer
         (if other-frame
             (find-file-other-frame file)
-          (set 'declaration-buffer (find-file-noselect file))
+          (setq declaration-buffer (find-file-noselect file))
           (set-buffer declaration-buffer)
           (switch-to-buffer-other-window declaration-buffer)
           )
@@ -2362,12 +2362,8 @@ For instance, it creates the gnat-specific menus, sets some hooks for
 (add-hook 'ada-mode-hook 'ada-xref-initialize)
 
 ;;  Define a new error type
-(put 'error-file-not-found
-     'error-conditions
-     '(error ada-mode-errors error-file-not-found))
-(put 'error-file-not-found
-     'error-message
-     "File not found in src-dir (check project file): ")
+(define-error 'ada-error-file-not-found
+  "File not found in src-dir (check project file): " 'ada-mode-errors)
 
 (provide 'ada-xref)
 
diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el
index 56680f23a8e..bf90db54002 100644
--- a/lisp/progmodes/antlr-mode.el
+++ b/lisp/progmodes/antlr-mode.el
@@ -178,10 +178,6 @@
                 (set-buffer-modified-p nil)))))))
 (put 'save-buffer-state-x 'lisp-indent-function 0)
 
-;; get rid of byte-compile warnings
-(eval-when-compile
-  (require 'cc-mode))
-
 (defvar outline-level)
 (defvar imenu-use-markers)
 (defvar imenu-create-index-function)
diff --git a/lisp/progmodes/bat-mode.el b/lisp/progmodes/bat-mode.el
new file mode 100644
index 00000000000..60b332170b0
--- /dev/null
+++ b/lisp/progmodes/bat-mode.el
@@ -0,0 +1,186 @@
+;;; bat-mode.el --- Major mode for editing DOS/Windows scripts
+
+;; Copyright (C) 2003, 2008-2013 Free Software Foundation, Inc.
+
+;; Author: Arni Magnusson <arnima@hafro.is>
+;; Keywords: languages
+
+;; 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:
+;;
+;; Major mode for editing DOS/Windows scripts (batch files).  Provides syntax
+;; highlighting, a basic template, access to DOS help pages, imenu/outline
+;; navigation, and the ability to run scripts from within Emacs.  The syntax
+;; groups for highlighting are:
+;;
+;; Face                          Example
+;; bat-label-face                :LABEL
+;; font-lock-comment-face        rem
+;; font-lock-builtin-face        copy
+;; font-lock-keyword-face        goto
+;; font-lock-warning-face        cp
+;; font-lock-constant-face       [call] prog
+;; font-lock-variable-name-face  %var%
+;; font-lock-type-face           -option
+;;
+;; Usage:
+;;
+;; See documentation of function `bat-mode'.
+;;
+;; Separate package `dos-indent' (Matthew Fidler) provides rudimentary
+;; indentation, see http://www.emacswiki.org/emacs/dos-indent.el.
+;;
+;; Acknowledgements:
+;;
+;; Inspired by `batch-mode' (Agnar Renolen) and `cmd-mode' (Tadamegu Furukawa).
+
+;;; Code:
+
+;; 1  Preamble
+
+(defgroup bat-mode nil
+  "Major mode for editing DOS/Windows batch files."
+  :link '(custom-group-link :tag "Font Lock Faces group" font-lock-faces)
+  :group 'languages)
+
+;; 2  User variables
+
+(defface bat-label-face '((t :weight bold))
+  "Font Lock mode face used to highlight labels in batch files.")
+
+;; 3  Internal variables
+
+(defvar bat-font-lock-keywords
+  (eval-when-compile
+    (let ((COMMANDS
+           '("assoc" "at" "attrib" "cd" "cls" "color" "copy" "date" "del" "dir"
+             "doskey" "echo" "endlocal" "erase" "fc" "find" "findstr" "format"
+             "ftype" "label" "md" "mkdir" "more" "move" "net" "path" "pause"
+             "popd" "prompt" "pushd" "rd" "ren" "rename" "replace" "rmdir" "set"
+             "setlocal" "shift" "sort" "subst" "time" "title" "tree" "type"
+             "ver" "vol" "xcopy"))
+          (CONTROLFLOW
+           '("call" "cmd" "defined" "do" "else" "equ" "exist" "exit" "for" "geq"
+             "goto" "gtr" "if" "in" "leq" "lss" "neq" "not" "start"))
+          (UNIX
+           '("bash" "cat" "cp" "fgrep" "grep" "ls" "sed" "sh" "mv" "rm")))
+      `(("\\<_\\(call\\|goto\\)\\_>[ \t]+%?\\([A-Za-z0-9-_\\:.]+\\)%?"
+         (2 font-lock-constant-face t))
+        ("^:[^:].*"
+         . 'bat-label-face)
+        ("\\<_\\(defined\\|set\\)\\_>[ \t]*\\(\\w+\\)"
+         (2 font-lock-variable-name-face))
+        ("%\\(\\w+\\)%?"
+         (1 font-lock-variable-name-face))
+        ("!\\(\\w+\\)!?"                ; delayed-expansion !variable!
+         (1 font-lock-variable-name-face))
+        ("[ =][-/]+\\(\\w+\\)"
+         (1 font-lock-type-face append))
+        (,(concat "\\_<" (regexp-opt COMMANDS) "\\_>") . font-lock-builtin-face)
+        (,(concat "\\_<" (regexp-opt CONTROLFLOW) "\\_>")
+         . font-lock-keyword-face)
+        (,(concat "\\_<" (regexp-opt UNIX) "\\_>")
+         . font-lock-warning-face)))))
+
+(defvar bat-menu
+  '("Bat"
+    ["Run" bat-run :help "Run script"]
+    ["Run with Args" bat-run-args :help "Run script with args"]
+    "--"
+    ["Imenu" imenu :help "Navigate with imenu"]
+    "--"
+    ["Template" bat-template :help "Insert template"]
+    "--"
+    ["Help (Command)" bat-cmd-help :help "Show help page for DOS command"]))
+
+(defvar bat-mode-map
+  (let ((map (make-sparse-keymap)))
+    (easy-menu-define nil map nil bat-menu)
+    (define-key map [?\C-c ?\C-/] 'bat-cmd-help) ;FIXME: Why not C-c C-? ?
+    (define-key map [?\C-c ?\C-a] 'bat-run-args)
+    (define-key map [?\C-c ?\C-c] 'bat-run)
+    (define-key map [?\C-c ?\C-t] 'bat-template)
+    (define-key map [?\C-c ?\C-v] 'bat-run)
+    map))
+
+(defvar bat-mode-syntax-table
+  (let ((table (make-syntax-table)))
+    (modify-syntax-entry ?\n ">" table)
+    (modify-syntax-entry ?\" "\"" table)
+    ;; Beware: `w' should not be used for non-alphabetic chars.
+    (modify-syntax-entry ?~ "_" table)
+    (modify-syntax-entry ?% "." table)
+    (modify-syntax-entry ?- "_" table)
+    (modify-syntax-entry ?_ "_" table)
+    ;; FIXME: { and } can appear in identifiers?  Really?
+    (modify-syntax-entry ?{ "_" table)
+    (modify-syntax-entry ?} "_" table)
+    (modify-syntax-entry ?\\ "." table)
+    table))
+
+(defconst bat--syntax-propertize
+  (syntax-propertize-rules
+   ("^[ \t]*\\(?:\\(@?r\\)em\\_>\\|\\(?1::\\):\\).*" (1 "<"))))
+
+;; 4  User functions
+
+(defun bat-cmd-help (cmd)
+  "Show help for batch file command CMD."
+  (interactive "sHelp: ")
+  (if (string-equal cmd "net")
+      ;; FIXME: liable to quoting nightmare.  Use call-process?
+      (shell-command "net /?") (shell-command (concat "help " cmd))))
+
+(defun bat-run ()
+  "Run a batch file."
+  (interactive)
+  ;; FIXME: liable to quoting nightmare.  Use call/start-process?
+  (save-buffer) (shell-command buffer-file-name))
+
+(defun bat-run-args (args)
+  "Run a batch file with ARGS."
+  (interactive "sArgs: ")
+  ;; FIXME: Use `compile'?
+  (shell-command (concat buffer-file-name " " args)))
+
+(defun bat-template ()
+  "Insert minimal batch file template."
+  (interactive)
+  (goto-char (point-min)) (insert "@echo off\nsetlocal\n\n"))
+
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.\\(bat\\|cmd\\)\\'" . bat-mode))
+
+;; 5  Main function
+
+;;;###autoload
+(define-derived-mode bat-mode prog-mode "Bat"
+  "Major mode for editing DOS/Windows batch files.\n
+Start a new script from `bat-template'.  Read help pages for DOS commands
+with `bat-cmd-help'.  Navigate between sections using `imenu'.
+Run script using `bat-run' and `bat-run-args'.\n
+\\{bat-mode-map}"
+  (setq-local comment-start "rem ")
+  (setq-local syntax-propertize-function bat--syntax-propertize)
+  (setq-local font-lock-defaults
+       '(bat-font-lock-keywords nil t)) ; case-insensitive keywords
+  (setq-local imenu-generic-expression '((nil "^:[^:].*" 0)))
+  (setq-local outline-regexp ":[^:]"))
+
+(provide 'bat-mode)
+
+;;; bat-mode.el ends here
diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el
index 4b3fc91b0ff..b5216b43ed9 100644
--- a/lisp/progmodes/cc-awk.el
+++ b/lisp/progmodes/cc-awk.el
@@ -169,9 +169,9 @@
   (concat "\\=_?\"" c-awk-string-innards-re))
 ;;   Matches an AWK string at point up to, but not including, any terminator.
 ;; A gawk 3.1+ string may look like _"localizable string".
-(defconst c-awk-one-line-possibly-open-string-re
-  (concat "\"\\(" c-awk-string-ch-re "\\|" c-awk-non-eol-esc-pair-re "\\)*"
-          "\\(\"\\|\\\\?$\\|\\'\\)"))
+(defconst c-awk-possibly-open-string-re
+  (concat "\"\\(" c-awk-string-ch-re "\\|" c-awk-esc-pair-re "\\)*"
+          "\\(\"\\|$\\|\\'\\)"))
 
 ;; REGEXPS FOR AWK REGEXPS.
 (defconst c-awk-regexp-normal-re "[^[/\\\n\r]")
@@ -192,25 +192,13 @@
           "\\|" "[^]\n\r]" "\\)*" "\\(]\\|$\\)"))
 ;;   Matches a regexp char list, up to (but not including) EOL if the ] is
 ;;   missing.
-(defconst c-awk-regexp-one-line-possibly-open-char-list-re
-  (concat "\\[\\]?\\(" c-awk-non-eol-esc-pair-re "\\|" "[^]\n\r]" "\\)*"
-          "\\(]\\|\\\\?$\\|\\'\\)"))
-;;   Matches the head (or all) of a regexp char class, up to (but not
-;;   including) the first EOL.
 (defconst c-awk-regexp-innards-re
   (concat "\\(" c-awk-esc-pair-re "\\|" c-awk-regexp-char-list-re
-          "\\|" c-awk-regexp-normal-re "\\)*"))
+          "\\|" c-awk-regexp-normal-re "\\)*"))
 ;;   Matches the inside of an AWK regexp (i.e. without the enclosing /s)
 (defconst c-awk-regexp-without-end-re
   (concat "/" c-awk-regexp-innards-re))
 ;; Matches an AWK regexp up to, but not including, any terminating /.
-(defconst c-awk-one-line-possibly-open-regexp-re
-  (concat "/\\(" c-awk-non-eol-esc-pair-re
-          "\\|" c-awk-regexp-one-line-possibly-open-char-list-re
-          "\\|" c-awk-regexp-normal-re "\\)*"
-          "\\(/\\|\\\\?$\\|\\'\\)"))
-;; Matches as much of the head of an AWK regexp which fits on one line,
-;; possibly all of it.
 
 ;; REGEXPS used for scanning an AWK buffer in order to decide IF A '/' IS A
 ;; REGEXP OPENER OR A DIVISION SIGN.  By "state" in the following is meant
@@ -262,15 +250,24 @@
 
 ;; REGEXPS USED FOR FINDING THE POSITION OF A "virtual semicolon"
 (defconst c-awk-_-harmless-nonws-char-re "[^#/\"\\\\\n\r \t]")
-;; NEW VERSION!  (which will be restricted to the current line)
-(defconst c-awk-one-line-non-syn-ws*-re
-  (concat "\\([ \t]*"
-              "\\(" c-awk-_-harmless-nonws-char-re "\\|"
-                    c-awk-non-eol-esc-pair-re "\\|"
-                    c-awk-one-line-possibly-open-string-re "\\|"
-                    c-awk-one-line-possibly-open-regexp-re
-              "\\)"
-          "\\)*"))
+(defconst c-awk-non-/-syn-ws*-re
+  (concat
+   "\\(" c-awk-escaped-nls*-with-space*
+         "\\(" c-awk-_-harmless-nonws-char-re "\\|"
+               c-awk-non-eol-esc-pair-re "\\|"
+               c-awk-possibly-open-string-re
+         "\\)"
+   "\\)*"))
+(defconst c-awk-space*-/-re (concat c-awk-escaped-nls*-with-space* "/"))
+;; Matches optional whitespace followed by "/".
+(defconst c-awk-space*-regexp-/-re
+  (concat c-awk-escaped-nls*-with-space* "\\s\""))
+;; Matches optional whitespace followed by a "/" with string syntax (a matched
+;; regexp delimiter).
+(defconst c-awk-space*-unclosed-regexp-/-re
+  (concat c-awk-escaped-nls*-with-space* "\\s\|"))
+;; Matches optional whitespace followed by a "/" with string fence syntax (an
+;; unmatched regexp delimiter).
 
 
 ;; ACM, 2002/5/29:
@@ -549,10 +546,36 @@
 (defun c-awk-at-vsemi-p (&optional pos)
   ;; Is there a virtual semicolon at POS (or POINT)?
   (save-excursion
-    (let (nl-prop
-          (pos-or-point (progn (if pos (goto-char pos)) (point))))
-      (forward-line 0)
-      (search-forward-regexp c-awk-one-line-non-syn-ws*-re)
+    (let* (nl-prop
+           (pos-or-point (progn (if pos (goto-char pos)) (point)))
+           (bol (c-point 'bol)) (eol (c-point 'eol)))
+      (c-awk-beginning-of-logical-line)
+      ;; Next `while' goes round one logical line (ending in, e.g. "\\") per
+      ;; iteration.  Such a line is rare, and can only be an open string
+      ;; ending in an escaped \.
+      (while
+          (progn
+            ;; Next `while' goes over a division sign or /regexp/ per iteration.
+            (while
+                (and
+                 (< (point) eol)
+                 (progn
+                   (search-forward-regexp c-awk-non-/-syn-ws*-re eol)
+                   (looking-at c-awk-space*-/-re)))
+              (cond
+               ((looking-at c-awk-space*-regexp-/-re) ; /regexp/
+                (forward-sexp))
+               ((looking-at c-awk-space*-unclosed-regexp-/-re) ; Unclosed /regexp
+                (condition-case nil
+                    (progn
+                      (forward-sexp)
+                      (backward-char))  ; Move to end of (logical) line.
+                  (error (end-of-line)))) ; Happens at EOB.
+               (t                       ; division sign
+                (c-forward-syntactic-ws)
+                (forward-char))))
+            (< (point) bol))
+        (forward-line))
       (and (eq (point) pos-or-point)
            (progn
              (while (and (eq (setq nl-prop (c-awk-get-NL-prop-cur-line)) ?\\)
diff --git a/lisp/progmodes/cc-bytecomp.el b/lisp/progmodes/cc-bytecomp.el
index 337a5292417..c9835bbefe2 100644
--- a/lisp/progmodes/cc-bytecomp.el
+++ b/lisp/progmodes/cc-bytecomp.el
@@ -244,7 +244,9 @@ Having cyclic cc-require's will result in infinite recursion.  That's
 somewhat intentional."
   `(progn
      (eval-when-compile
-       (setq cc-bytecomp-noruntime-functions byte-compile-noruntime-functions)
+       (if (boundp 'byte-compile-noruntime-functions) ; in case load uncompiled
+           (setq cc-bytecomp-noruntime-functions
+                 byte-compile-noruntime-functions))
        (cc-bytecomp-load (symbol-name ,cc-part)))
      ;; Hack to suppress spurious "might not be defined at runtime" warnings.
      ;; The basic issue is that
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index c2ff5011a0e..db2a6c68539 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -1271,6 +1271,9 @@ comment at the start of cc-engine.el for more info."
               (throw 'done (point)))))
           ;; In trailing space after an as yet undetected virtual semicolon?
           (c-backward-syntactic-ws from)
+          (when (and (bolp) (not (bobp))) ; Can happen in AWK Mode with an
+                                          ; unterminated string/regexp.
+            (backward-char))
           (if (and (< (point) to)
                    (c-at-vsemi-p))
               (point)
@@ -6476,6 +6479,15 @@ comment at the start of cc-engine.el for more info."
            (c-go-list-forward)
          t)))
 
+(defmacro c-pull-open-brace (ps)
+  ;; Pull the next open brace from PS (which has the form of paren-state),
+  ;; skipping over any brace pairs.  Returns NIL when PS is exhausted.
+  `(progn
+     (while (consp (car ,ps))
+       (setq ,ps (cdr ,ps)))
+     (prog1 (car ,ps)
+       (setq ,ps (cdr ,ps)))))
+
 (defun c-back-over-member-initializers ()
   ;; Test whether we are in a C++ member initializer list, and if so, go back
   ;; to the introducing ":", returning the position of the opening paren of
@@ -8400,15 +8412,6 @@ comment at the start of cc-engine.el for more info."
           (back-to-indentation)
           (vector (point) open-paren-pos))))))
 
-(defmacro c-pull-open-brace (ps)
-  ;; Pull the next open brace from PS (which has the form of paren-state),
-  ;; skipping over any brace pairs.  Returns NIL when PS is exhausted.
-  `(progn
-     (while (consp (car ,ps))
-       (setq ,ps (cdr ,ps)))
-     (prog1 (car ,ps)
-       (setq ,ps (cdr ,ps)))))
-
 (defun c-most-enclosing-decl-block (paren-state)
   ;; Return the buffer position of the most enclosing decl-block brace (in the
   ;; sense of c-looking-at-decl-block) in the PAREN-STATE structure, or nil if
@@ -8473,10 +8476,10 @@ comment at the start of cc-engine.el for more info."
             ;; check for the class key here.
             (and (c-major-mode-is 'pike-mode)
                  c-decl-block-key))
-           bufpos braceassignp lim next-containing)
+           bufpos braceassignp lim next-containing macro-start)
        (while (and (not bufpos)
                    containing-sexp)
-           (when paren-state
+         (when paren-state
              (if (consp (car paren-state))
                  (setq lim (cdr (car paren-state))
                        paren-state (cdr paren-state))
@@ -8557,22 +8560,38 @@ comment at the start of cc-engine.el for more info."
                                           ))))
                                 nil)
                                (t t))))))
-               (if (and (eq braceassignp 'dontknow)
-                        (/= (c-backward-token-2 1 t lim) 0))
-                   (setq braceassignp nil)))
-             (if (not braceassignp)
-                 (if (eq (char-after) ?\;)
-                     ;; Brace lists can't contain a semicolon, so we're done.
-                     (setq containing-sexp nil)
-                   ;; Go up one level.
-                   (setq containing-sexp next-containing
-                         lim nil
-                         next-containing nil))
-               ;; we've hit the beginning of the aggregate list
-               (c-beginning-of-statement-1
-                (c-most-enclosing-brace paren-state))
-               (setq bufpos (point))))
-           )
+             (if (and (eq braceassignp 'dontknow)
+                      (/= (c-backward-token-2 1 t lim) 0))
+                 (setq braceassignp nil)))
+           (cond
+            (braceassignp
+             ;; We've hit the beginning of the aggregate list.
+             (c-beginning-of-statement-1
+              (c-most-enclosing-brace paren-state))
+             (setq bufpos (point)))
+            ((eq (char-after) ?\;)
+             ;; Brace lists can't contain a semicolon, so we're done.
+             (setq containing-sexp nil))
+            ((and (setq macro-start (point))
+                  (c-forward-to-cpp-define-body)
+                  (eq (point) containing-sexp))
+             ;; We've a macro whose expansion starts with the '{'.
+             ;; Heuristically, if we have a ';' in it we've not got a
+             ;; brace list, otherwise we have.
+             (let ((macro-end (progn (c-end-of-macro) (point))))
+               (goto-char containing-sexp)
+               (forward-char)
+               (if (and (c-syntactic-re-search-forward "[;,]" macro-end t t)
+                        (eq (char-before) ?\;))
+                   (setq bufpos nil
+                         containing-sexp nil)
+                 (setq bufpos macro-start))))
+            (t
+             ;; Go up one level
+             (setq containing-sexp next-containing
+                   lim nil
+                   next-containing nil)))))
+
        bufpos))
    ))
 
@@ -9796,12 +9815,12 @@ comment at the start of cc-engine.el for more info."
                               (not (eq (char-after) ?:))
                               )))
                    (save-excursion
-                     (c-backward-syntactic-ws lim)
-                     (if (eq char-before-ip ?:)
-                         (progn
-                           (forward-char -1)
-                           (c-backward-syntactic-ws lim)))
-                     (back-to-indentation)
+                     (c-beginning-of-statement-1 lim)
+                     (when (looking-at c-opt-<>-sexp-key)
+                       (goto-char (match-end 1))
+                       (c-forward-syntactic-ws)
+                       (c-forward-<>-arglist nil)
+                       (c-forward-syntactic-ws))
                      (looking-at c-class-key)))
               ;; for Java
               (and (c-major-mode-is 'java-mode)
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 2c0a1317b04..0116e9ec3dd 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -2163,8 +2163,7 @@ assumed to be set if this isn't nil."
 (c-lang-defconst c-opt-<>-sexp-key
   ;; Adorned regexp matching keywords that can be followed by an angle
   ;; bracket sexp.  Always set when `c-recognize-<>-arglists' is.
-  t (if (c-lang-const c-recognize-<>-arglists)
-        (c-make-keywords-re t (c-lang-const c-<>-sexp-kwds))))
+  t (c-make-keywords-re t (c-lang-const c-<>-sexp-kwds)))
 (c-lang-defvar c-opt-<>-sexp-key (c-lang-const c-opt-<>-sexp-key))
 
 (c-lang-defconst c-brace-id-list-kwds
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 36c9f72fa18..1e8d6cba8c4 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -217,12 +217,16 @@ control).  See \"cc-mode.el\" for more info."
      (t (error "CC Mode is incompatible with this version of Emacs")))
     map))
 
-(defun c-define-abbrev-table (name defs)
+(defun c-define-abbrev-table (name defs &optional doc)
   ;; Compatibility wrapper for `define-abbrev' which passes a non-nil
   ;; sixth argument for SYSTEM-FLAG in emacsen that support it
   ;; (currently only Emacs >= 21.2).
-  (let ((table (or (symbol-value name)
-                   (progn (define-abbrev-table name nil)
+  (let ((table (or (and (boundp name) (symbol-value name))
+                   (progn (condition-case nil
+                              (define-abbrev-table name nil doc)
+                            (wrong-number-of-arguments ;E.g. Emacs<23.
+                             (eval `(defvar ,name nil ,doc))
+                             (define-abbrev-table name nil)))
                           (symbol-value name)))))
     (while defs
       (condition-case nil
@@ -1235,27 +1239,22 @@ This function is called from `c-common-init', once per mode initialization."
 
 ;; Support for C
 
-;;;###autoload
-(defvar c-mode-syntax-table nil
+(defvar c-mode-syntax-table
+  (funcall (c-lang-const c-make-mode-syntax-table c))
   "Syntax table used in c-mode buffers.")
-(or c-mode-syntax-table
-    (setq c-mode-syntax-table
-          (funcall (c-lang-const c-make-mode-syntax-table c))))
 
-(defvar c-mode-abbrev-table nil
-  "Abbreviation table used in c-mode buffers.")
 (c-define-abbrev-table 'c-mode-abbrev-table
   '(("else" "else" c-electric-continued-statement 0)
-    ("while" "while" c-electric-continued-statement 0)))
+    ("while" "while" c-electric-continued-statement 0))
+  "Abbreviation table used in c-mode buffers.")
 
-(defvar c-mode-map ()
+(defvar c-mode-map
+  (let ((map (c-make-inherited-keymap)))
+    ;; Add bindings which are only useful for C.
+    (define-key map "\C-c\C-e"  'c-macro-expand)
+    map)
   "Keymap used in c-mode buffers.")
-(if c-mode-map
-    nil
-  (setq c-mode-map (c-make-inherited-keymap))
-  ;; add bindings which are only useful for C
-  (define-key c-mode-map "\C-c\C-e"  'c-macro-expand)
-  )
+
 
 (easy-menu-define c-c-menu c-mode-map "C Mode Commands"
                   (cons "C" (c-lang-const c-mode-menu c)))
@@ -1320,30 +1319,25 @@ Key bindings:
 
 ;; Support for C++
 
-;;;###autoload
-(defvar c++-mode-syntax-table nil
+(defvar c++-mode-syntax-table
+  (funcall (c-lang-const c-make-mode-syntax-table c++))
   "Syntax table used in c++-mode buffers.")
-(or c++-mode-syntax-table
-    (setq c++-mode-syntax-table
-          (funcall (c-lang-const c-make-mode-syntax-table c++))))
 
-(defvar c++-mode-abbrev-table nil
-  "Abbreviation table used in c++-mode buffers.")
 (c-define-abbrev-table 'c++-mode-abbrev-table
   '(("else" "else" c-electric-continued-statement 0)
     ("while" "while" c-electric-continued-statement 0)
-    ("catch" "catch" c-electric-continued-statement 0)))
+    ("catch" "catch" c-electric-continued-statement 0))
+  "Abbreviation table used in c++-mode buffers.")
 
-(defvar c++-mode-map ()
+(defvar c++-mode-map
+  (let ((map (c-make-inherited-keymap)))
+    ;; Add bindings which are only useful for C++.
+    (define-key map "\C-c\C-e" 'c-macro-expand)
+    (define-key map "\C-c:"    'c-scope-operator)
+    (define-key map "<"        'c-electric-lt-gt)
+    (define-key map ">"        'c-electric-lt-gt)
+    map)
   "Keymap used in c++-mode buffers.")
-(if c++-mode-map
-    nil
-  (setq c++-mode-map (c-make-inherited-keymap))
-  ;; add bindings which are only useful for C++
-  (define-key c++-mode-map "\C-c\C-e" 'c-macro-expand)
-  (define-key c++-mode-map "\C-c:"    'c-scope-operator)
-  (define-key c++-mode-map "<"        'c-electric-lt-gt)
-  (define-key c++-mode-map ">"        'c-electric-lt-gt))
 
 (easy-menu-define c-c++-menu c++-mode-map "C++ Mode Commands"
                   (cons "C++" (c-lang-const c-mode-menu c++)))
@@ -1380,26 +1374,21 @@ Key bindings:
 
 ;; Support for Objective-C
 
-;;;###autoload
-(defvar objc-mode-syntax-table nil
+(defvar objc-mode-syntax-table
+  (funcall (c-lang-const c-make-mode-syntax-table objc))
   "Syntax table used in objc-mode buffers.")
-(or objc-mode-syntax-table
-    (setq objc-mode-syntax-table
-          (funcall (c-lang-const c-make-mode-syntax-table objc))))
 
-(defvar objc-mode-abbrev-table nil
-  "Abbreviation table used in objc-mode buffers.")
 (c-define-abbrev-table 'objc-mode-abbrev-table
   '(("else" "else" c-electric-continued-statement 0)
-    ("while" "while" c-electric-continued-statement 0)))
+    ("while" "while" c-electric-continued-statement 0))
+  "Abbreviation table used in objc-mode buffers.")
 
-(defvar objc-mode-map ()
+(defvar objc-mode-map
+  (let ((map (c-make-inherited-keymap)))
+    ;; Add bindings which are only useful for Objective-C.
+    (define-key map "\C-c\C-e" 'c-macro-expand)
+    map)
   "Keymap used in objc-mode buffers.")
-(if objc-mode-map
-    nil
-  (setq objc-mode-map (c-make-inherited-keymap))
-  ;; add bindings which are only useful for Objective-C
-  (define-key objc-mode-map "\C-c\C-e" 'c-macro-expand))
 
 (easy-menu-define c-objc-menu objc-mode-map "ObjC Mode Commands"
                   (cons "ObjC" (c-lang-const c-mode-menu objc)))
@@ -1438,28 +1427,22 @@ Key bindings:
 
 ;; Support for Java
 
-;;;###autoload
-(defvar java-mode-syntax-table nil
+(defvar java-mode-syntax-table
+  (funcall (c-lang-const c-make-mode-syntax-table java))
   "Syntax table used in java-mode buffers.")
-(or java-mode-syntax-table
-    (setq java-mode-syntax-table
-          (funcall (c-lang-const c-make-mode-syntax-table java))))
 
-(defvar java-mode-abbrev-table nil
-  "Abbreviation table used in java-mode buffers.")
 (c-define-abbrev-table 'java-mode-abbrev-table
   '(("else" "else" c-electric-continued-statement 0)
     ("while" "while" c-electric-continued-statement 0)
     ("catch" "catch" c-electric-continued-statement 0)
-    ("finally" "finally" c-electric-continued-statement 0)))
+    ("finally" "finally" c-electric-continued-statement 0))
+  "Abbreviation table used in java-mode buffers.")
 
-(defvar java-mode-map ()
+(defvar java-mode-map
+  (let ((map (c-make-inherited-keymap)))
+    ;; Add bindings which are only useful for Java.
+    map)
   "Keymap used in java-mode buffers.")
-(if java-mode-map
-    nil
-  (setq java-mode-map (c-make-inherited-keymap))
-  ;; add bindings which are only useful for Java
-  )
 
 ;; Regexp trying to describe the beginning of a Java top-level
 ;; definition.  This is not used by CC Mode, nor is it maintained
@@ -1504,24 +1487,18 @@ Key bindings:
 
 ;; Support for CORBA's IDL language
 
-;;;###autoload
-(defvar idl-mode-syntax-table nil
+(defvar idl-mode-syntax-table
+  (funcall (c-lang-const c-make-mode-syntax-table idl))
   "Syntax table used in idl-mode buffers.")
-(or idl-mode-syntax-table
-    (setq idl-mode-syntax-table
-          (funcall (c-lang-const c-make-mode-syntax-table idl))))
 
-(defvar idl-mode-abbrev-table nil
+(c-define-abbrev-table 'idl-mode-abbrev-table nil
   "Abbreviation table used in idl-mode buffers.")
-(c-define-abbrev-table 'idl-mode-abbrev-table nil)
 
-(defvar idl-mode-map ()
+(defvar idl-mode-map
+  (let ((map (c-make-inherited-keymap)))
+    ;; Add bindings which are only useful for IDL.
+    map)
   "Keymap used in idl-mode buffers.")
-(if idl-mode-map
-    nil
-  (setq idl-mode-map (c-make-inherited-keymap))
-  ;; add bindings which are only useful for IDL
-  )
 
 (easy-menu-define c-idl-menu idl-mode-map "IDL Mode Commands"
                   (cons "IDL" (c-lang-const c-mode-menu idl)))
@@ -1558,26 +1535,21 @@ Key bindings:
 
 ;; Support for Pike
 
-;;;###autoload
-(defvar pike-mode-syntax-table nil
+(defvar pike-mode-syntax-table
+  (funcall (c-lang-const c-make-mode-syntax-table pike))
   "Syntax table used in pike-mode buffers.")
-(or pike-mode-syntax-table
-    (setq pike-mode-syntax-table
-          (funcall (c-lang-const c-make-mode-syntax-table pike))))
 
-(defvar pike-mode-abbrev-table nil
-  "Abbreviation table used in pike-mode buffers.")
 (c-define-abbrev-table 'pike-mode-abbrev-table
   '(("else" "else" c-electric-continued-statement 0)
-    ("while" "while" c-electric-continued-statement 0)))
+    ("while" "while" c-electric-continued-statement 0))
+  "Abbreviation table used in pike-mode buffers.")
 
-(defvar pike-mode-map ()
+(defvar pike-mode-map
+  (let ((map (c-make-inherited-keymap)))
+    ;; Additional bindings.
+    (define-key map "\C-c\C-e" 'c-macro-expand)
+    map)
   "Keymap used in pike-mode buffers.")
-(if pike-mode-map
-    nil
-  (setq pike-mode-map (c-make-inherited-keymap))
-  ;; additional bindings
-  (define-key pike-mode-map "\C-c\C-e" 'c-macro-expand))
 
 (easy-menu-define c-pike-menu pike-mode-map "Pike Mode Commands"
                   (cons "Pike" (c-lang-const c-mode-menu pike)))
@@ -1626,28 +1598,26 @@ Key bindings:
 ;;; autoload form instead.
 ;;;###autoload (autoload 'awk-mode "cc-mode" "Major mode for editing AWK code." t)
 
-(defvar awk-mode-abbrev-table nil
-  "Abbreviation table used in awk-mode buffers.")
 (c-define-abbrev-table 'awk-mode-abbrev-table
   '(("else" "else" c-electric-continued-statement 0)
-    ("while" "while" c-electric-continued-statement 0)))
+    ("while" "while" c-electric-continued-statement 0))
+  "Abbreviation table used in awk-mode buffers.")
 
-(defvar awk-mode-map ()
+(defvar awk-mode-map
+  (let ((map (c-make-inherited-keymap)))
+    ;; Add bindings which are only useful for awk.
+    (define-key map "#" 'self-insert-command)
+    (define-key map "/" 'self-insert-command)
+    (define-key map "*" 'self-insert-command)
+    (define-key map "\C-c\C-n" 'undefined) ; #if doesn't exist in awk.
+    (define-key map "\C-c\C-p" 'undefined)
+    (define-key map "\C-c\C-u" 'undefined)
+    (define-key map "\M-a" 'c-beginning-of-statement) ; 2003/10/7
+    (define-key map "\M-e" 'c-end-of-statement)       ; 2003/10/7
+    (define-key map "\C-\M-a" 'c-awk-beginning-of-defun)
+    (define-key map "\C-\M-e" 'c-awk-end-of-defun)
+    map)
   "Keymap used in awk-mode buffers.")
-(if awk-mode-map
-    nil
-  (setq awk-mode-map (c-make-inherited-keymap))
-  ;; add bindings which are only useful for awk.
-  (define-key awk-mode-map "#" 'self-insert-command)
-  (define-key awk-mode-map "/" 'self-insert-command)
-  (define-key awk-mode-map "*" 'self-insert-command)
-  (define-key awk-mode-map "\C-c\C-n" 'undefined) ; #if doesn't exist in awk.
-  (define-key awk-mode-map "\C-c\C-p" 'undefined)
-  (define-key awk-mode-map "\C-c\C-u" 'undefined)
-  (define-key awk-mode-map "\M-a" 'c-beginning-of-statement) ; 2003/10/7
-  (define-key awk-mode-map "\M-e" 'c-end-of-statement) ; 2003/10/7
-  (define-key awk-mode-map "\C-\M-a" 'c-awk-beginning-of-defun)
-  (define-key awk-mode-map "\C-\M-e" 'c-awk-end-of-defun))
 
 (easy-menu-define c-awk-menu awk-mode-map "AWK Mode Commands"
                   (cons "AWK" (c-lang-const c-mode-menu awk)))
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index d9c482330cc..8c981b36e56 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -624,7 +624,9 @@ You might also use mode hooks to specify it in certain modes, like this:
                      (file-exists-p \"Makefile\"))
            (set (make-local-variable 'compile-command)
                 (concat \"make -k \"
-                        (file-name-sans-extension buffer-file-name))))))"
+                        (if buffer-file-name
+                          (shell-quote-argument
+                            (file-name-sans-extension buffer-file-name))))))))"
   :type 'string
   :group 'compilation)
 ;;;###autoload(put 'compile-command 'safe-local-variable (lambda (a) (and (stringp a) (or (not (boundp 'compilation-read-command)) compilation-read-command))))
@@ -2492,7 +2494,7 @@ displays at the top of the window; there is no arrow."
 All arguments are markers.  If END-MK is non-nil, mark is set there
 and overlay is highlighted between MK and END-MK."
   ;; Show compilation buffer in other window, scrolled to this error.
-  (let* ((from-compilation-buffer (eq (window-buffer (selected-window))
+  (let* ((from-compilation-buffer (eq (window-buffer)
                                       (marker-buffer msg)))
          ;; Use an existing window if it is in a visible frame.
          (pre-existing (get-buffer-window (marker-buffer msg) 0))
diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el
index 6a71ab330a8..865211d109c 100644
--- a/lisp/progmodes/ebrowse.el
+++ b/lisp/progmodes/ebrowse.el
@@ -1605,7 +1605,7 @@ specifies where to find/view the result."
   ;; Get the source file to view or find.
   (setf file (ebrowse-find-source-file file tags-file))
   ;; If current window is dedicated, use another frame.
-  (when (window-dedicated-p (selected-window))
+  (when (window-dedicated-p)
     (setf where 'other-window))
   (cond (view
          (setf ebrowse-temp-position-to-view struc
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index ff6321d74c3..a7b7e630bb9 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -982,7 +982,7 @@ See documentation of variable `tags-file-name'."
   ;; selected window's buffer; without the hair, point is moved in both
   ;; windows.  To prevent this, we save the selected window's point before
   ;; doing find-tag-noselect, and restore it after.
-  (let* ((window-point (window-point (selected-window)))
+  (let* ((window-point (window-point))
          (tagbuf (find-tag-noselect tagname next-p regexp-p))
          (tagpoint (progn (set-buffer tagbuf) (point))))
     (set-window-point (prog1
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index 9bde2900a67..80f663360e4 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -1026,7 +1026,7 @@ Set subexpression 1 in the match-data to the name of the type."
   (if (lookup-key (current-local-map) [menu-bar index])
       (message "%s" "F90-imenu already exists.")
     (imenu-add-to-menubar "F90-imenu")
-    (redraw-frame (selected-frame))))
+    (redraw-frame)))
 
 
 ;; Abbrevs have generally two letters, except standard types `c, `i, `r, `t.
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 2ead734d163..ab86b83f7bf 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -353,7 +353,7 @@ Return nil if we cannot, non-nil if we can."
       'flymake-simple-cleanup))
 
 (defun flymake-get-real-file-name-function (file-name)
-  (or (nth 4 (flymake-get-file-name-mode-and-masks file-name))
+  (or (nth 2 (flymake-get-file-name-mode-and-masks file-name))
       'flymake-get-real-file-name))
 
 (defvar flymake-find-buildfile-cache (flymake-makehash 'equal))
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index ff667f80f9d..0fc805aae81 100644
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -1080,8 +1080,7 @@ The next key typed is executed unless it is SPC."
      fortran-column-ruler-fixed)
    (save-excursion
      (beginning-of-line)
-     (if (eq (window-start (selected-window))
-             (window-point (selected-window)))
+     (if (eq (window-start) (window-point))
          (line-beginning-position 2)
        (point)))
    nil "Type SPC or any command to erase ruler."))
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 4b51a5e7835..2017636435c 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -2951,7 +2951,7 @@ If not in a source or disassembly buffer just set point."
          obj)
     (when (numberp pos)
       (with-selected-window (posn-window posn)
-        (with-current-buffer (window-buffer (selected-window))
+        (with-current-buffer (window-buffer)
           (goto-char pos)
           (dolist (overlay (overlays-in pos pos))
             (when (overlay-get overlay 'put-break)
diff --git a/lisp/progmodes/idlw-toolbar.el b/lisp/progmodes/idlw-toolbar.el
index d255b8b1a3f..98f9ee3b530 100644
--- a/lisp/progmodes/idlw-toolbar.el
+++ b/lisp/progmodes/idlw-toolbar.el
@@ -962,7 +962,7 @@ static char * file[] = {
   (if (featurep 'xemacs)
       nil ; no action necessary, toolbar gets updated automatically
     ;; On Emacs, redraw the frame to make sure the Toolbar is updated.
-    (redraw-frame (selected-frame))))
+    (redraw-frame)))
 
 (provide 'idlw-toolbar)
 (provide 'idlwave-toolbar)
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 28ee859f9db..49a21933133 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -2244,11 +2244,8 @@ current buffer.  Pushes a mark onto the tag ring just like
 
 ;;; MozRepl integration
 
-(put 'js-moz-bad-rpc 'error-conditions '(error timeout))
-(put 'js-moz-bad-rpc 'error-message "Mozilla RPC Error")
-
-(put 'js-js-error 'error-conditions '(error js-error))
-(put 'js-js-error 'error-message "Javascript Error")
+(define-error 'js-moz-bad-rpc "Mozilla RPC Error") ;; '(timeout error))
+(define-error 'js-js-error "Javascript Error") ;; '(js-error error))
 
 (defun js--wait-for-matching-output
   (process regexp timeout &optional start)
diff --git a/lisp/progmodes/mixal-mode.el b/lisp/progmodes/mixal-mode.el
index 8814cdbba35..a14654cdd7c 100644
--- a/lisp/progmodes/mixal-mode.el
+++ b/lisp/progmodes/mixal-mode.el
@@ -1113,8 +1113,10 @@ Assumes that file has been compiled with debugging support."
        mixal-syntax-propertize-function)
   ;; might add an indent function in the future
   ;;  (set (make-local-variable 'indent-line-function) 'mixal-indent-line)
-  (set (make-local-variable 'compile-command) (concat "mixasm "
-                                                      buffer-file-name)))
+  (set (make-local-variable 'compile-command)
+       (concat "mixasm "
+               (if buffer-file-name
+                   (shell-quote-argument buffer-file-name)))))
 
 (provide 'mixal-mode)
 
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 62870f9085b..fb2dc01c9be 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -52,12 +52,12 @@
 ;; Extra functions `python-nav-forward-statement',
 ;; `python-nav-backward-statement',
 ;; `python-nav-beginning-of-statement', `python-nav-end-of-statement',
-;; `python-nav-beginning-of-block' and `python-nav-end-of-block' are
-;; included but no bound to any key.  At last but not least the
-;; specialized `python-nav-forward-sexp' allows easy navigation
-;; between code blocks.  If you prefer `cc-mode'-like `forward-sexp'
-;; movement, setting `forward-sexp-function' to nil is enough, You can
-;; do that using the `python-mode-hook':
+;; `python-nav-beginning-of-block', `python-nav-end-of-block' and
+;; `python-nav-if-name-main' are included but no bound to any key.  At
+;; last but not least the specialized `python-nav-forward-sexp' allows
+;; easy navigation between code blocks.  If you prefer `cc-mode'-like
+;; `forward-sexp' movement, setting `forward-sexp-function' to nil is
+;; enough, You can do that using the `python-mode-hook':
 
 ;; (add-hook 'python-mode-hook
 ;;           (lambda () (setq forward-sexp-function nil)))
@@ -501,29 +501,24 @@ The type returned can be `comment', `string' or `paren'."
     (,(lambda (limit)
         (let ((re (python-rx (group (+ (any word ?. ?_)))
                              (? ?\[ (+ (not (any  ?\]))) ?\]) (* space)
-                             assignment-operator)))
-          (when (re-search-forward re limit t)
-            (while (and (python-syntax-context 'paren)
-                        (re-search-forward re limit t)))
-            (if (not (or (python-syntax-context 'paren)
-                         (equal (char-after (point-marker)) ?=)))
-                t
-              (set-match-data nil)))))
+                             assignment-operator))
+              (res nil))
+          (while (and (setq res (re-search-forward re limit t))
+                      (or (python-syntax-context 'paren)
+                          (equal (char-after (point-marker)) ?=))))
+          res))
      (1 font-lock-variable-name-face nil nil))
     ;; support for a, b, c = (1, 2, 3)
     (,(lambda (limit)
         (let ((re (python-rx (group (+ (any word ?. ?_))) (* space)
                              (* ?, (* space) (+ (any word ?. ?_)) (* space))
                              ?, (* space) (+ (any word ?. ?_)) (* space)
-                             assignment-operator)))
-          (when (and (re-search-forward re limit t)
-                     (goto-char (nth 3 (match-data))))
-            (while (and (python-syntax-context 'paren)
-                        (re-search-forward re limit t))
-              (goto-char (nth 3 (match-data))))
-            (if (not (python-syntax-context 'paren))
-                t
-              (set-match-data nil)))))
+                             assignment-operator))
+              (res nil))
+          (while (and (setq res (re-search-forward re limit t))
+                      (goto-char (match-end 1))
+                      (python-syntax-context 'paren)))
+          res))
      (1 font-lock-variable-name-face nil nil))))
 
 (defconst python-syntax-propertize-function
@@ -1588,6 +1583,29 @@ This command assumes point is not in a string or comment."
   (or arg (setq arg 1))
   (python-nav-up-list (- arg)))
 
+(defun python-nav-if-name-main ()
+  "Move point at the beginning the __main__ block.
+When \"if __name__ == '__main__':\" is found returns its
+position, else returns nil."
+  (interactive)
+  (let ((point (point))
+        (found (catch 'found
+                 (goto-char (point-min))
+                 (while (re-search-forward
+                         (python-rx line-start
+                                    "if" (+ space)
+                                    "__name__" (+ space)
+                                    "==" (+ space)
+                                    (group-n 1 (or ?\" ?\'))
+                                    "__main__" (backref 1) (* space) ":")
+                         nil t)
+                   (when (not (python-syntax-context-type))
+                     (beginning-of-line)
+                     (throw 'found t))))))
+    (if found
+        (point)
+      (ignore (goto-char point)))))
+
 
 ;;; Shell integration
 
@@ -2119,17 +2137,58 @@ Returns the output.  See `python-shell-send-string-no-output'."
 (define-obsolete-function-alias
   'python-send-string 'python-shell-internal-send-string "24.3")
 
+(defun python-shell-buffer-substring (start end &optional nomain)
+  "Send buffer substring from START to END formatted for shell.
+This is a wrapper over `buffer-substring' that takes care of
+different transformations for the code sent to be evaluated in
+the python shell:
+  1. When Optional Argument NOMAIN is non-nil everything under an
+     \"if __name__ == '__main__'\" block will be removed.
+  2. When a subregion of the buffer is sent, it takes care of
+     appending extra whitelines so tracebacks are correct.
+  3. Wraps indented regions under an \"if True:\" block so the
+     interpreter evaluates them correctly."
+  (let ((substring (buffer-substring-no-properties start end))
+        (fillstr (make-string (1- (line-number-at-pos start)) ?\n))
+        (toplevel-block-p (save-excursion
+                            (goto-char start)
+                            (or (zerop (line-number-at-pos start))
+                                (progn
+                                  (python-util-forward-comment 1)
+                                  (zerop (current-indentation)))))))
+    (with-temp-buffer
+      (python-mode)
+      (insert fillstr)
+      (insert substring)
+      (goto-char (point-min))
+      (when (not toplevel-block-p)
+        (insert "if True:")
+        (delete-region (point) (line-end-position)))
+      (when nomain
+        (let* ((if-name-main-start-end
+                (and nomain
+                     (save-excursion
+                       (when (python-nav-if-name-main)
+                         (cons (point)
+                               (progn (python-nav-forward-sexp)
+                                      (point)))))))
+               ;; Oh destructuring bind, how I miss you.
+               (if-name-main-start (car if-name-main-start-end))
+               (if-name-main-end (cdr if-name-main-start-end)))
+          (when if-name-main-start-end
+            (goto-char if-name-main-start)
+            (delete-region if-name-main-start if-name-main-end)
+            (insert
+             (make-string
+              (- (line-number-at-pos if-name-main-end)
+                 (line-number-at-pos if-name-main-start)) ?\n)))))
+      (buffer-substring-no-properties (point-min) (point-max)))))
+
 (defun python-shell-send-region (start end)
   "Send the region delimited by START and END to inferior Python process."
   (interactive "r")
   (python-shell-send-string
-   (concat
-    (let ((line-num (line-number-at-pos start)))
-      ;; When sending a region, add blank lines for non sent code so
-      ;; backtraces remain correct.
-      (make-string (1- line-num) ?\n))
-    (buffer-substring start end))
-   nil t))
+   (python-shell-buffer-substring start end) nil t))
 
 (defun python-shell-send-buffer (&optional arg)
   "Send the entire buffer to inferior Python process.
@@ -2138,13 +2197,9 @@ by \"if __name__== '__main__':\""
   (interactive "P")
   (save-restriction
     (widen)
-    (let ((str (buffer-substring (point-min) (point-max))))
-      (and
-       (not arg)
-       (setq str (replace-regexp-in-string
-                  (python-rx if-name-main)
-                  "if __name__ == '__main__ ':" str)))
-      (python-shell-send-string str))))
+    (python-shell-send-string
+     (python-shell-buffer-substring
+      (point-min) (point-max) (not arg)))))
 
 (defun python-shell-send-defun (arg)
   "Send the current defun to inferior Python process.
@@ -2271,13 +2326,17 @@ and use the following as the value of this variable:
 LINE is used to detect the context on how to complete given
 INPUT."
   (let* ((prompt
-          ;; Get the last prompt for the inferior process
-          ;; buffer. This is used for the completion code selection
-          ;; heuristic.
+          ;; Get last prompt of the inferior process buffer (this
+          ;; intentionally avoids using `comint-last-prompt' because
+          ;; of incompatibilities with Emacs 24.x).
           (with-current-buffer (process-buffer process)
-            (buffer-substring-no-properties
-             (overlay-start comint-last-prompt-overlay)
-             (overlay-end comint-last-prompt-overlay))))
+            (save-excursion
+              (buffer-substring-no-properties
+               (- (point) (length line))
+               (progn
+                 (re-search-backward "^")
+                 (python-util-forward-comment)
+                 (point))))))
          (completion-context
           ;; Check whether a prompt matches a pdb string, an import
           ;; statement or just the standard prompt and use the
@@ -3042,32 +3101,22 @@ It must be a function with two arguments: TYPE and NAME.")
       "*class definition*"
     "*function definition*"))
 
-(defun python-imenu--put-parent (type name pos num-children tree &optional root)
-  "Add the parent with TYPE, NAME, POS and NUM-CHILDREN to TREE.
-Optional Argument ROOT must be non-nil when the node being
-processed is the root of the TREE."
+(defun python-imenu--put-parent (type name pos tree)
+  "Add the parent with TYPE, NAME and POS to TREE."
   (let ((label
          (funcall python-imenu-format-item-label-function type name))
         (jump-label
          (funcall python-imenu-format-parent-item-jump-label-function type name)))
-    (if root
-        ;; This is the root, everything is a children.
-        (cons label (cons (cons jump-label pos) tree))
-      ;; This is node a which may contain some children.
-      (cons
-       (cons label (cons (cons jump-label pos)
-                         ;; Append all the children
-                         (python-util-popn tree num-children)))
-       ;; All previous non-children nodes.
-       (nthcdr num-children tree)))))
+    (if (not tree)
+        (cons label pos)
+      (cons label (cons (cons jump-label pos) tree)))))
 
-(defun python-imenu--build-tree (&optional min-indent prev-indent num-children tree)
+(defun python-imenu--build-tree (&optional min-indent prev-indent tree)
   "Recursively build the tree of nested definitions of a node.
-Arguments MIN-INDENT PREV-INDENT NUM-CHILDREN and TREE are
-internal and should not be passed explicitly unless you know what
-you are doing."
-  (setq num-children (or num-children 0)
-        min-indent (or min-indent 0))
+Arguments MIN-INDENT PREV-INDENT and TREE are internal and should
+not be passed explicitly unless you know what you are doing."
+  (setq min-indent (or min-indent 0)
+        prev-indent (or prev-indent python-indent-offset))
   (let* ((pos (python-nav-backward-defun))
          (type)
          (name (when (and pos (looking-at python-nav-beginning-of-defun-regexp))
@@ -3076,73 +3125,33 @@ you are doing."
                    (cadr split))))
          (label (when name
                   (funcall python-imenu-format-item-label-function type name)))
-         (indent (current-indentation)))
+         (indent (current-indentation))
+         (children-indent-limit (+ python-indent-offset min-indent)))
     (cond ((not pos)
-           ;; No defun found, nothing to add.
-           tree)
-          ((equal indent 0)
-           (if (> num-children 0)
-               ;; Append it as the parent of everything collected to
-               ;; this point.
-               (python-imenu--put-parent type name pos num-children tree t)
-             ;; There are no children, this is a lonely defun.
-             (cons label pos)))
-          ((equal min-indent indent)
-           ;; Stop collecting nodes after moving to a position with
-           ;; indentation equaling min-indent. This is specially
-           ;; useful for navigating nested definitions recursively.
-           (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)))
+           ;; Nothing found, probably near to bobp.
+           nil)
+          ((<= indent min-indent)
+           ;; The current indentation points that this is a parent
+           ;; node, add it to the tree and stop recursing.
+           (python-imenu--put-parent type name pos tree))
           (t
            (python-imenu--build-tree
             min-indent
             indent
-            ;; Add another children, either when this is the
-            ;; first call or when indentation is
-            ;; less-or-equal than previous. And do not
-            ;; discard the number of children, because the
-            ;; way code is scanned, all children are
-            ;; collected until a root node yet to be found
-            ;; appears.
-            (if (or (not prev-indent)
-                    (and
-                     (> indent min-indent)
-                     (<= indent prev-indent)))
-                (1+ num-children)
-              num-children)
-            (cond ((not prev-indent)
-                   ;; First call to the function: append this
-                   ;; defun to the index.
-                   (list (cons label pos)))
-                  ((= indent prev-indent)
-                   ;; Add another defun with the same depth
-                   ;; as the previous.
-                   (cons (cons label pos) tree))
-                  ((and (< indent prev-indent)
-                        (< 0 num-children))
-                   ;; There are children to be appended and
-                   ;; the previous defun had more
-                   ;; indentation, the current one must be a
-                   ;; parent.
-                   (python-imenu--put-parent type name pos num-children tree))
-                  ((> indent prev-indent)
-                   ;; There are children defuns deeper than
-                   ;; current depth. Fear not, we already
-                   ;; know how to treat them.
-                   (cons
-                    (prog1
-                        (python-imenu--build-tree
-                         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
-                      ;; the current defun we are looking at.
-                      (python-nav-forward-defun))
-                    tree))))))))
+            (if (<= indent children-indent-limit)
+                ;; This lies within the children indent offset range,
+                ;; so it's a normal child of its parent (i.e., not
+                ;; a child of a child).
+                (cons (cons label pos) tree)
+              ;; Oh no, a child of a child?!  Fear not, we
+              ;; know how to roll.  We recursively parse these by
+              ;; swapping prev-indent and min-indent plus adding this
+              ;; newly found item to a fresh subtree.  This works, I
+              ;; promise.
+              (cons
+               (python-imenu--build-tree
+                prev-indent indent (list (cons label pos)))
+               tree)))))))
 
 (defun python-imenu-create-index ()
   "Return tree Imenu alist for the current python buffer.
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index c8fae7ba1e6..acc7738ae5c 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -137,6 +137,7 @@ This should only be called after matching against `ruby-here-doc-beg-re'."
 
 (defconst ruby-symbol-chars "a-zA-Z0-9_"
   "List of characters that symbol names may contain.")
+
 (defconst ruby-symbol-re (concat "[" ruby-symbol-chars "]")
   "Regexp to match symbols.")
 
@@ -254,11 +255,13 @@ Also ignores spaces after parenthesis when 'space."
             ("for" for-body "end")
             ("[" expseq "]")
             ("{" hashvals "}")
+            ("{" insts "}")
             ("while" insts "end")
             ("until" insts "end")
             ("unless" insts "end")
             ("if" if-body "end")
             ("case"  cases "end"))
+      (formal-params ("opening-|" exp "|"))
       (for-body (for-head ";" insts))
       (for-head (id "in" exp))
       (cases (exp "then" insts) ;; FIXME: Ruby also allows (exp ":" insts).
@@ -285,10 +288,20 @@ Also ignores spaces after parenthesis when 'space."
   (save-excursion
     (skip-chars-backward " \t")
     (not (or (bolp)
-             (memq (char-before) '(?\; ?- ?+ ?* ?/ ?:))
+             (and (memq (char-before) '(?\; ?- ?+ ?* ?/ ?: ?.))
+                  ;; Make sure it's not the end of a regexp.
+                  (not (eq (car (syntax-after (1- (point)))) 7)))
              (and (memq (char-before) '(?\? ?=))
-                  (not (memq (char-syntax (char-before (1- (point))))
-                             '(?w ?_))))))))
+                  (let ((tok (ruby-smie--backward-token)))
+                    (or (equal tok "?")
+                        (string-match "\\`\\s." tok))))))))
+
+(defun ruby-smie--opening-pipe-p ()
+  (save-excursion
+    (if (eq ?| (char-before)) (forward-char -1))
+    (skip-chars-backward " \t\n")
+    (or (eq ?\{ (char-before))
+        (looking-back "\\_<do" (- (point) 2)))))
 
 (defun ruby-smie--forward-token ()
   (skip-chars-forward " \t")
@@ -299,12 +312,16 @@ Also ignores spaces after parenthesis when 'space."
         (if (eolp) (forward-char 1) (forward-comment 1))
         ";")
     (forward-comment (point-max))
+    (if (looking-at ":\\s.+")
+        (progn (goto-char (match-end 0)) (match-string 0)) ;; bug#15208.
     (let ((tok (smie-default-forward-token)))
       (cond
        ((member tok '("unless" "if" "while" "until"))
         (if (save-excursion (forward-word -1) (ruby-smie--bosp))
             tok "iuwu-mod"))
-       (t tok)))))
+         ((equal tok "|")
+          (if (ruby-smie--opening-pipe-p) "opening-|" tok))
+         (t tok))))))
 
 (defun ruby-smie--backward-token ()
   (let ((pos (point)))
@@ -314,10 +331,14 @@ Also ignores spaces after parenthesis when 'space."
         (progn (skip-chars-forward " \t")
                ";")
       (let ((tok (smie-default-backward-token)))
+        (when (and (eq ?: (char-before)) (string-match "\\`\\s." tok))
+          (forward-char -1) (setq tok (concat ":" tok))) ;; bug#15208.
         (cond
          ((member tok '("unless" "if" "while" "until"))
           (if (ruby-smie--bosp)
               tok "iuwu-mod"))
+         ((equal tok "|")
+          (if (ruby-smie--opening-pipe-p) "opening-|" tok))
          (t tok))))))
 
 (defun ruby-smie-rules (kind token)
@@ -332,7 +353,19 @@ Also ignores spaces after parenthesis when 'space."
        ;; For (invalid) code between switch and case.
        ;; (if (smie-parent-p "switch") 4)
        0))
-    (`(:before . ,(or `"else" `"then" `"elsif")) 0)
+    (`(:before . "do")
+     (when
+         (save-excursion
+           (forward-word 1)   ;Skip "do"
+           (skip-chars-forward " \t")
+           (and (equal (save-excursion (ruby-smie--forward-token)) "opening-|")
+                (save-excursion (forward-sexp 1)
+                                (skip-chars-forward " \t")
+                                (or (eolp)
+                                    (looking-at comment-start-skip)))))
+       ;; `(column . ,(smie-indent-virtual))
+       (smie-rule-parent)))
+    (`(:before . ,(or `"else" `"then" `"elsif" `"rescue")) 0)
     (`(:before . ,(or `"when"))
      (if (not (smie-rule-sibling-p)) 0)) ;; ruby-indent-level
     ;; Hack attack: Since newlines are separators, don't try to align args that
@@ -903,6 +936,10 @@ Can be one of `heredoc', `modifier', `expr-qstr', `expr-re'."
                       (not (looking-at "[a-z_]"))))
                (and (looking-at ruby-operator-re)
                     (not (ruby-special-char-p))
+                    (save-excursion
+                      (forward-char -1)
+                      (or (not (looking-at ruby-operator-re))
+                          (not (eq (char-before) ?:))))
                     ;; Operator at the end of line.
                     (let ((c (char-after (point))))
                       (and
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 29020d95226..292bc2369a6 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1,7 +1,6 @@
 ;;; sh-script.el --- shell-script editing commands for Emacs
 
-;; Copyright (C) 1993-1997, 1999, 2001-2013 Free Software Foundation,
-;; Inc.
+;; Copyright (C) 1993-1997, 1999, 2001-2013 Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
 ;; Version: 2.0f
@@ -497,6 +496,9 @@ This is buffer-local in every such buffer.")
     (define-key map "\C-c+" 'sh-add)
     (define-key map "\C-\M-x" 'sh-execute-region)
     (define-key map "\C-c\C-x" 'executable-interpret)
+    (define-key map "\C-c\C-n" 'sh-send-line-or-region-and-step)
+    (define-key map "\C-c\C-d" 'sh-cd-here)
+    (define-key map "\C-c\C-z" 'sh-show-shell)
 
     (define-key map [remap delete-backward-char]
       'backward-delete-char-untabify)
@@ -670,7 +672,9 @@ removed when closing the here document."
           "." "alias" "bg" "bind" "builtin" "caller" "compgen" "complete"
           "declare" "dirs" "disown" "enable" "fc" "fg" "help" "history"
           "jobs" "kill" "let" "local" "popd" "printf" "pushd" "shopt"
-          "source" "suspend" "typeset" "unalias")
+          "source" "suspend" "typeset" "unalias"
+          ;; bash4
+          "mapfile" "readarray")
 
     ;; The next entry is only used for defining the others
     (bourne sh-append shell
@@ -734,6 +738,7 @@ implemented as aliases.  See `sh-feature'."
   :type '(repeat (cons (symbol :tag "Shell")
                        (choice (repeat string)
                                (sexp :format "Evaluate: %v"))))
+  :version "24.4"                       ; bash4 additions
   :group 'sh-script)
 
 
@@ -1462,6 +1467,61 @@ The default is t because I assume that in one Emacs session one is
 frequently editing existing scripts with different styles.")
 
 
+;; inferior shell interaction
+;; TODO: support multiple interactive shells
+(defvar sh-shell-process nil
+  "The inferior shell process for interaction.")
+(make-variable-buffer-local 'sh-shell-process)
+(defun sh-shell-process (force)
+  "Get a shell process for interaction.
+If FORCE is non-nil and no process found, create one."
+  (if (and sh-shell-process (process-live-p sh-shell-process))
+      sh-shell-process
+    (setq sh-shell-process
+          (let ((found nil) proc
+                (procs (process-list)))
+            (while (and (not found) procs
+                        (process-live-p (setq proc (pop procs)))
+                        (process-command proc))
+              (when (string-equal sh-shell (file-name-nondirectory
+                                            (car (process-command proc))))
+                (setq found proc)))
+            (or found
+                (and force
+                     (get-buffer-process
+                      (let ((explicit-shell-file-name sh-shell-file))
+                        (shell)))))))))
+
+(defun sh-show-shell ()
+  "Pop the shell interaction buffer."
+  (interactive)
+  (pop-to-buffer (process-buffer (sh-shell-process t))))
+
+(defun sh-send-text (text)
+  "Send the text to the `sh-shell-process'."
+  (comint-send-string (sh-shell-process t) (concat text "\n")))
+
+(defun sh-cd-here ()
+  "Change directory in the current interaction shell to the current one."
+  (interactive)
+  (sh-send-text (concat "cd " default-directory)))
+
+(defun sh-send-line-or-region-and-step ()
+  "Send the current line to the inferior shell and step to the next line.
+When the region is active, send the region instead."
+  (interactive)
+  (let (from to end)
+    (if (use-region-p)
+        (setq from (region-beginning)
+              to (region-end)
+              end to)
+      (setq from (line-beginning-position)
+            to (line-end-position)
+            end (1+ to)))
+    (sh-send-text (buffer-substring-no-properties from to))
+    (goto-char end)))
+
+
 ;; mode-command and utility functions
 
 ;;;###autoload
@@ -2169,6 +2229,7 @@ Calls the value of `sh-set-shell-hook' if set."
     (setq font-lock-set-defaults nil)
     (font-lock-set-defaults)
     (font-lock-fontify-buffer))
+  (setq sh-shell-process nil)
   (run-hooks 'sh-set-shell-hook))
 
 
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index ed911fcbba2..03364bddd9f 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -3256,7 +3256,7 @@ inserted using a single call to `verilog-insert'."
 (defun verilog-point-text (&optional pointnum)
   "Return text describing where POINTNUM or current point is (for errors).
 Use filename, if current buffer being edited shorten to just buffer name."
-  (concat (or (and (equal (window-buffer (selected-window)) (current-buffer))
+  (concat (or (and (equal (window-buffer) (current-buffer))
                    (buffer-name))
               buffer-file-name
               (buffer-name))
diff --git a/lisp/register.el b/lisp/register.el
index 4876c614642..78f18dbc7c1 100644
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -137,11 +137,11 @@ Argument is a character, naming the register."
   "Move point to location stored in a register.
 If the register contains a file name, find that file.
 \(To put a file name in a register, you must use `set-register'.)
-If the register contains a window configuration (one frame) or a frame
-configuration (all frames), restore that frame or all frames accordingly.
+If the register contains a window configuration (one frame) or a frameset
+\(all frames), restore that frame or all frames accordingly.
 First argument is a character, naming the register.
 Optional second arg non-nil (interactively, prefix argument) says to
-delete any existing frames that the frame configuration doesn't mention.
+delete any existing frames that the frameset doesn't mention.
 \(Otherwise, these frames are iconified.)"
   (interactive "cJump to register: \nP")
   (let ((val (get-register register)))
diff --git a/lisp/replace.el b/lisp/replace.el
index be0ecda20fa..5e44677b0f8 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -252,7 +252,7 @@ or capitalized.)
 
 Ignore read-only matches if `query-replace-skip-read-only' is non-nil,
 ignore hidden matches if `search-invisible' is nil, and ignore more
-matches using a non-nil `isearch-filter-predicates'.
+matches using `isearch-filter-predicate'.
 
 If `replace-lax-whitespace' is non-nil, a space or spaces in the string
 to be replaced will match a sequence of whitespace chars defined by the
@@ -306,7 +306,7 @@ capitalized.)
 
 Ignore read-only matches if `query-replace-skip-read-only' is non-nil,
 ignore hidden matches if `search-invisible' is nil, and ignore more
-matches using a non-nil `isearch-filter-predicates'.
+matches using `isearch-filter-predicate'.
 
 If `replace-regexp-lax-whitespace' is non-nil, a space or spaces in the regexp
 to be replaced will match a sequence of whitespace chars defined by the
@@ -390,7 +390,7 @@ are non-nil and REGEXP has no uppercase letters.
 
 Ignore read-only matches if `query-replace-skip-read-only' is non-nil,
 ignore hidden matches if `search-invisible' is nil, and ignore more
-matches using a non-nil `isearch-filter-predicates'.
+matches using `isearch-filter-predicate'.
 
 If `replace-regexp-lax-whitespace' is non-nil, a space or spaces in the regexp
 to be replaced will match a sequence of whitespace chars defined by the
@@ -484,7 +484,7 @@ then its replacement is upcased or capitalized.)
 
 Ignore read-only matches if `query-replace-skip-read-only' is non-nil,
 ignore hidden matches if `search-invisible' is nil, and ignore more
-matches using a non-nil `isearch-filter-predicates'.
+matches using `isearch-filter-predicate'.
 
 If `replace-lax-whitespace' is non-nil, a space or spaces in the string
 to be replaced will match a sequence of whitespace chars defined by the
@@ -530,7 +530,7 @@ are non-nil and REGEXP has no uppercase letters.
 
 Ignore read-only matches if `query-replace-skip-read-only' is non-nil,
 ignore hidden matches if `search-invisible' is nil, and ignore more
-matches using a non-nil `isearch-filter-predicates'.
+matches using `isearch-filter-predicate'.
 
 If `replace-regexp-lax-whitespace' is non-nil, a space or spaces in the regexp
 to be replaced will match a sequence of whitespace chars defined by the
@@ -2087,9 +2087,8 @@ make, or the user didn't cancel the call."
                            'read-only nil))))
             (setq skip-read-only-count (1+ skip-read-only-count)))
            ;; Optionally filter out matches.
-           ((not (run-hook-with-args-until-failure
-                  'isearch-filter-predicates
-                  (nth 0 real-match-data) (nth 1 real-match-data)))
+           ((not (funcall isearch-filter-predicate
+                          (nth 0 real-match-data) (nth 1 real-match-data)))
             (setq skip-filtered-count (1+ skip-filtered-count)))
            ;; Optionally ignore invisible matches.
            ((not (or (eq search-invisible t)
diff --git a/lisp/reposition.el b/lisp/reposition.el
index 0bd27654065..c67200f9550 100644
--- a/lisp/reposition.el
+++ b/lisp/reposition.el
@@ -61,7 +61,7 @@ first comment line visible (if point is in a comment)."
          (here (point))
          ;; change this name once I've gotten rid of references to ht.
          ;; this is actually the number of the last screen line
-         (ht (- (window-height (selected-window)) 2))
+         (ht (- (window-height) 2))
          (line (repos-count-screen-lines (window-start) (point)))
          (comment-height
           ;; The call to max deals with the case of cursor between defuns.
diff --git a/lisp/rfn-eshadow.el b/lisp/rfn-eshadow.el
index cf5f1d16974..8d29c43980c 100644
--- a/lisp/rfn-eshadow.el
+++ b/lisp/rfn-eshadow.el
@@ -176,11 +176,11 @@ This is intended to be used as a minibuffer `post-command-hook' for
 `file-name-shadow-mode'; the minibuffer should have already
 been set up by `rfn-eshadow-setup-minibuffer'."
   (condition-case nil
-      (let ((goal (substitute-in-file-name (minibuffer-contents)))
-            (mid (overlay-end rfn-eshadow-overlay))
-            (start (minibuffer-prompt-end))
-            (end (point-max))
-            (non-essential t))
+      (let* ((non-essential t)
+             (goal (substitute-in-file-name (minibuffer-contents)))
+             (mid (overlay-end rfn-eshadow-overlay))
+             (start (minibuffer-prompt-end))
+             (end (point-max)))
         (unless
             ;; Catch the common case where the shadow does not need to move.
             (and mid
diff --git a/lisp/rot13.el b/lisp/rot13.el
index 03beed3a85b..1b61855f2dc 100644
--- a/lisp/rot13.el
+++ b/lisp/rot13.el
@@ -101,9 +101,9 @@ See also `toggle-rot13-mode'."
 (defun toggle-rot13-mode ()
   "Toggle the use of ROT13 encoding for the current window."
   (interactive)
-  (if (eq (window-display-table (selected-window)) rot13-display-table)
+  (if (eq (window-display-table) rot13-display-table)
       (set-window-display-table (selected-window) nil)
-    (if (null (window-display-table (selected-window)))
+    (if (null (window-display-table))
         (set-window-display-table (selected-window) rot13-display-table))))
 
 (provide 'rot13)
diff --git a/lisp/server.el b/lisp/server.el
index 8a2a466a315..a76b2d4ce5f 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -1557,7 +1557,7 @@ be a cons cell (LINENUMBER . COLUMNNUMBER)."
                 (setq next-buffer (car (process-get proc 'buffers))))
               (setq rest (cdr rest)))))
         (and next-buffer (server-switch-buffer next-buffer killed-one))
-        (unless (or next-buffer killed-one (window-dedicated-p (selected-window)))
+        (unless (or next-buffer killed-one (window-dedicated-p))
           ;; (switch-to-buffer (other-buffer))
           (message "No server buffers remain to edit")))
     (if (not (buffer-live-p next-buffer))
@@ -1584,16 +1584,16 @@ be a cons cell (LINENUMBER . COLUMNNUMBER)."
                    (unless (frame-live-p server-window)
                      (setq server-window (make-frame)))
                    (select-window (frame-selected-window server-window))))
-            (when (window-minibuffer-p (selected-window))
+            (when (window-minibuffer-p)
               (select-window (next-window nil 'nomini 0)))
             ;; Move to a non-dedicated window, if we have one.
-            (when (window-dedicated-p (selected-window))
+            (when (window-dedicated-p)
               (select-window
                (get-window-with-predicate
                 (lambda (w)
                   (and (not (window-dedicated-p w))
                        (equal (frame-terminal (window-frame w))
-                              (frame-terminal (selected-frame)))))
+                              (frame-terminal))))
                 'nomini 'visible (selected-window))))
             (condition-case nil
                 (switch-to-buffer next-buffer)
@@ -1601,7 +1601,7 @@ be a cons cell (LINENUMBER . COLUMNNUMBER)."
               ;; a minibuffer/dedicated-window (if there's no other).
               (error (pop-to-buffer next-buffer)))))))
     (when server-raise-frame
-      (select-frame-set-input-focus (window-frame (selected-window))))))
+      (select-frame-set-input-focus (window-frame)))))
 
 ;;;###autoload
 (defun server-save-buffers-kill-terminal (arg)
diff --git a/lisp/ses.el b/lisp/ses.el
index bf88364456f..5f48dd2f27e 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -703,7 +703,6 @@ for this spreadsheet."
     (and (string-match "\\`\\([A-Z]+\\)\\([0-9]+\\)\\'" str)
          (let* ((col-str (match-string-no-properties 1 str))
                (col 0)
-               (col-offset 0)
                (col-base 1)
                (col-idx (1- (length col-str)))
                (row (1- (string-to-number (match-string-no-properties 2 str)))))
@@ -740,7 +739,7 @@ row and column of the cell, with numbering starting from 0.
 Return nil in case of failure."
   (unless (local-variable-p sym)
     (make-local-variable  sym)
-    (if (let (case-fold-search) (string-match "\\`[A-Z]+[0-9]+\\'" (symbol-name sym)))
+    (if (let (case-fold-search) (string-match-p "\\`[A-Z]+[0-9]+\\'" (symbol-name sym)))
         (put sym 'ses-cell (cons row col))
       (put sym 'ses-cell :ses-named)
       (setq ses--named-cell-hashmap (or ses--named-cell-hashmap (make-hash-table :test 'eq)))
@@ -1474,7 +1473,7 @@ Sets `ses-relocate-return' to 'delete if cell-references were removed."
   (let (rowcol result)
     (if (or (atom formula) (eq (car formula) 'quote))
         (if (and (setq rowcol (ses-sym-rowcol formula))
-                 (string-match "\\`[A-Z]+[0-9]+\\'" (symbol-name formula)))
+                 (string-match-p "\\`[A-Z]+[0-9]+\\'" (symbol-name formula)))
             (ses-relocate-symbol formula rowcol
                                  startrow startcol rowincr colincr)
           formula) ; Pass through as-is.
@@ -1735,7 +1734,7 @@ Does not execute cell formulas or print functions."
   (search-backward ";; Local Variables:\n" nil t)
   (backward-list 1)
   (setq ses--params-marker (point-marker))
-  (let ((params (condition-case nil (read (current-buffer)) (error nil))))
+  (let ((params (ignore-errors (read (current-buffer)))))
     (or (and (= (safe-length params) 3)
              (numberp (car params))
              (numberp (cadr params))
@@ -1761,7 +1760,7 @@ Does not execute cell formulas or print functions."
   ;; Skip over print area, which we assume is correct.
   (goto-char (point-min))
   (forward-line ses--numrows)
-  (or (looking-at ses-print-data-boundary)
+  (or (looking-at-p ses-print-data-boundary)
       (error "Missing marker between print and data areas"))
   (forward-char 1)
   (setq ses--data-marker (point-marker))
@@ -1774,12 +1773,12 @@ Does not execute cell formulas or print functions."
     (dotimes (col ses--numcols)
       (let* ((x      (read (current-buffer)))
              (sym  (car-safe (cdr-safe x))))
-        (or (and (looking-at "\n")
+        (or (and (looking-at-p "\n")
                  (eq (car-safe x) 'ses-cell)
                  (ses-create-cell-variable sym row col))
             (error "Cell-def error"))
         (eval x)))
-    (or (looking-at "\n\n")
+    (or (looking-at-p "\n\n")
         (error "Missing blank line between rows")))
   ;; Load global parameters.
   (let ((widths      (read (current-buffer)))
@@ -1805,8 +1804,8 @@ Does not execute cell formulas or print functions."
     (1value (eval head-row)))
   ;; Should be back at global-params.
   (forward-char 1)
-  (or (looking-at (replace-regexp-in-string "1" "[0-9]+"
-                                            ses-initial-global-parameters))
+  (or (looking-at-p (replace-regexp-in-string "1" "[0-9]+"
+                                              ses-initial-global-parameters))
       (error "Problem with column-defs or global-params"))
   ;; Check for overall newline count in definitions area.
   (forward-line 3)
@@ -2077,9 +2076,8 @@ Based on the current set of columns and `window-hscroll' position."
 
 (defun ses-jump-safe (cell)
   "Like `ses-jump', but no error if invalid cell."
-  (condition-case nil
-      (ses-jump cell)
-    (error)))
+  (ignore-errors
+    (ses-jump cell)))
 
 (defun ses-reprint-all (&optional nonarrow)
   "Recreate the display area.  Calls all printer functions.  Narrows to
@@ -2789,7 +2787,7 @@ We clear the killed cells instead of deleting them."
   ;; For some reason, the text-read-only error is not caught by `delete-region',
   ;; so we have to use subterfuge.
   (let ((buffer-read-only t))
-    (1value (condition-case x
+    (1value (condition-case nil
                 (noreturn (funcall (lookup-key (current-global-map)
                                                (this-command-keys))
                                    beg end))
@@ -3014,13 +3012,13 @@ spot, or error signal if user requests cancel."
                              (ses-col-printer (1- ses--numcols)))))
     rowcol))
 
-(defun ses-export-tsv (beg end)
+(defun ses-export-tsv (_beg _end)
   "Export values from the current range, with tabs between columns and
 newlines between rows.  Result is placed in kill ring."
   (interactive "r")
   (ses-export-tab nil))
 
-(defun ses-export-tsf (beg end)
+(defun ses-export-tsf (_beg _end)
   "Export formulas from the current range, with tabs between columns and
 newlines between rows.  Result is placed in kill ring."
   (interactive "r")
@@ -3298,7 +3296,7 @@ highlighted range in the spreadsheet."
       (let* ((x (ses-sym-rowcol ref))
              (xcell (ses-get-cell (car x) (cdr x))))
         (ses-cell-references-aset xcell
-                                  (cons new-name (delq sym 
+                                  (cons new-name (delq sym
                                                        (ses-cell-references xcell))))))
     (push new-name ses--renamed-cell-symb-list)
     (set new-name (symbol-value sym))
@@ -3579,7 +3577,7 @@ current column and continues until the next nonblank column."
 current column and continues until the next nonblank column."
   (ses-center-span value ?~))
 
-(defun ses-unsafe (value)
+(defun ses-unsafe (_value)
   "Substitute for an unsafe formula or printer."
   (error "Unsafe formula or printer"))
 
diff --git a/lisp/shell.el b/lisp/shell.el
index a78ab7f81ab..3ca2564b65c 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -1122,7 +1122,7 @@ Returns t if successful."
   (interactive)
   (let ((data (shell-command-completion)))
     (if data
-        (prog2 (unless (window-minibuffer-p (selected-window))
+        (prog2 (unless (window-minibuffer-p)
                  (message "Completing command name..."))
             (apply #'completion-in-region data)))))
 
@@ -1232,7 +1232,7 @@ Returns non-nil if successful."
   (interactive)
   (let ((data (shell-environment-variable-completion)))
     (if data
-        (prog2 (unless (window-minibuffer-p (selected-window))
+        (prog2 (unless (window-minibuffer-p)
                  (message "Completing variable name..."))
             (apply #'completion-in-region data)))))
 
diff --git a/lisp/simple.el b/lisp/simple.el
index 1fb2fa6014c..c5e5b313b7b 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1404,11 +1404,25 @@ to get different commands to edit and resubmit."
           ;; add it to the history.
           (or (equal newcmd (car command-history))
               (setq command-history (cons newcmd command-history)))
-          (eval newcmd))
+          (unwind-protect
+              (progn
+                ;; Trick called-interactively-p into thinking that `newcmd' is
+                ;; an interactive call (bug#14136).
+                (add-hook 'called-interactively-p-functions
+                          #'repeat-complex-command--called-interactively-skip)
+                (eval newcmd))
+            (remove-hook 'called-interactively-p-functions
+                         #'repeat-complex-command--called-interactively-skip)))
       (if command-history
           (error "Argument %d is beyond length of command history" arg)
         (error "There are no previous complex commands to repeat")))))
 
+(defun repeat-complex-command--called-interactively-skip (i _frame1 frame2)
+  (and (eq 'eval (cadr frame2))
+       (eq 'repeat-complex-command
+           (cadr (backtrace-frame i #'called-interactively-p)))
+       1))
+
 (defvar extended-command-history nil)
 
 (defun read-extended-command ()
@@ -3338,6 +3352,7 @@ extract characters that are special to a buffer, and should not
 be copied into other buffers."
   (funcall filter-buffer-substring-function beg end delete))
 
+;; FIXME: `with-wrapper-hook' is obsolete
 (defun buffer-substring--filter (beg end &optional delete)
   (with-wrapper-hook filter-buffer-substring-functions (beg end delete)
     (cond
@@ -4098,9 +4113,9 @@ Don't call it from programs: use `insert-buffer-substring' instead!"
     (progn
       (barf-if-buffer-read-only)
       (read-buffer "Insert buffer: "
-                   (if (eq (selected-window) (next-window (selected-window)))
+                   (if (eq (selected-window) (next-window))
                        (other-buffer (current-buffer))
-                     (window-buffer (next-window (selected-window))))
+                     (window-buffer (next-window)))
                    t))))
   (push-mark
    (save-excursion
@@ -4160,8 +4175,7 @@ START and END specify the portion of the current buffer to be copied."
       (save-excursion
         (insert-buffer-substring oldbuf start end)))))
 
-(put 'mark-inactive 'error-conditions '(mark-inactive error))
-(put 'mark-inactive 'error-message (purecopy "The mark is not active now"))
+(define-error 'mark-inactive (purecopy "The mark is not active now"))
 
 (defvar activate-mark-hook nil
   "Hook run when the mark becomes active.
@@ -5671,7 +5685,8 @@ current object."
 
 (defun backward-word (&optional arg)
   "Move backward until encountering the beginning of a word.
-With argument ARG, do this that many times."
+With argument ARG, do this that many times.
+If ARG is omitted or nil, move point backward one word."
   (interactive "^p")
   (forward-word (- (or arg 1))))
 
@@ -5965,7 +5980,7 @@ The variable `selective-display' has a separate value for each buffer."
     (setq selective-display
           (and arg (prefix-numeric-value arg)))
     (recenter current-vpos))
-  (set-window-start (selected-window) (window-start (selected-window)))
+  (set-window-start (selected-window) (window-start))
   (princ "selective-display set to " t)
   (prin1 selective-display t)
   (princ "." t))
@@ -6629,8 +6644,7 @@ Go to the window from which completion was requested."
   (interactive)
   (let ((buf completion-reference-buffer))
     (if (one-window-p t)
-        (if (window-dedicated-p (selected-window))
-            (delete-frame (selected-frame)))
+        (if (window-dedicated-p) (delete-frame))
       (delete-window (selected-window))
       (if (get-buffer-window buf)
           (select-window (get-buffer-window buf))))))
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 2f995219193..52796755625 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -1007,9 +1007,9 @@ supported at a time.
                                  ;; with the selected frame.
                                  (list 'parent (selected-frame)))
                        speedbar-frame-parameters)
-                     speedbar-before-delete-hook
-                     speedbar-before-popup-hook
-                     speedbar-after-create-hook)
+                     'speedbar-before-delete-hook
+                     'speedbar-before-popup-hook
+                     'speedbar-after-create-hook)
   ;; Start up the timer
   (if (not speedbar-frame)
       (speedbar-set-timer nil)
@@ -2648,7 +2648,7 @@ Also resets scanner functions."
               (dframe-select-attached-frame speedbar-frame)
               ;; make sure we at least choose a window to
               ;; get a good directory from
-              (if (window-minibuffer-p (selected-window))
+              (if (window-minibuffer-p)
                   nil
                 ;; Check for special modes
                 (speedbar-maybe-add-localized-support (current-buffer))
@@ -3512,7 +3512,7 @@ interested in."
     (set-buffer speedbar-buffer)
 
     (if (<= (count-lines (point-min) (point-max))
-            (1- (window-height (selected-window))))
+            (1- (window-height)))
         ;; whole buffer fits
         (let ((cp (point)))
 
@@ -3545,7 +3545,7 @@ interested in."
               (setq end (point-max)))))
         ;; Now work out the details of centering
         (let ((nl (count-lines start end))
-              (wl (1- (window-height (selected-window))))
+              (wl (1- (window-height)))
               (cp (point)))
           (if (> nl wl)
               ;; We can't fit it all, so just center on cursor
@@ -3558,12 +3558,12 @@ interested in."
                 nil
               ;; we need to do something...
               (goto-char start)
-              (let ((newcent (/ (- (window-height (selected-window)) nl) 2))
+              (let ((newcent (/ (- (window-height) nl) 2))
                     (lte (count-lines start (point-max))))
-                (if (and (< (+ newcent lte) (window-height (selected-window)))
-                         (> (- (window-height (selected-window)) lte 1)
+                (if (and (< (+ newcent lte) (window-height))
+                         (> (- (window-height) lte 1)
                             newcent))
-                    (setq newcent (- (window-height (selected-window))
+                    (setq newcent (- (window-height)
                                      lte 1)))
                 (recenter newcent))))
           (goto-char cp))))))
@@ -3997,7 +3997,7 @@ TEXT is the buffer's name, TOKEN and INDENT are unused."
 
 (defun speedbar-recenter ()
   "Recenter the current buffer so point is in the center of the window."
-  (recenter (/ (window-height (selected-window)) 2)))
+  (recenter (/ (window-height) 2)))
 
 
 ;;; Color loading section.
diff --git a/lisp/startup.el b/lisp/startup.el
index 44eea7745f7..ec7d73306a2 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1541,7 +1541,7 @@ a face or button specification."
                            (t "splash.pbm")))
          (img (create-image image-file))
          (image-width (and img (car (image-size img))))
-         (window-width (window-width (selected-window))))
+         (window-width (window-width)))
     (when img
       (when (> window-width image-width)
         ;; Center the image in the window.
diff --git a/lisp/subr.el b/lisp/subr.el
index 3b85a9bedb0..b8b0d5af3b8 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -312,6 +312,26 @@ result of an actual problem."
   (while t
     (signal 'user-error (list (apply #'format format args)))))
 
+(defun define-error (name message &optional parent)
+  "Define NAME as a new error signal.
+MESSAGE is a string that will be output to the echo area if such an error
+is signaled without being caught by a `condition-case'.
+PARENT is either a signal or a list of signals from which it inherits.
+Defaults to `error'."
+  (unless parent (setq parent 'error))
+  (let ((conditions
+         (if (consp parent)
+             (apply #'nconc
+                    (mapcar (lambda (parent)
+                              (cons parent
+                                    (or (get parent 'error-conditions)
+                                        (error "Unknown signal `%s'" parent))))
+                            parent))
+           (cons parent (get parent 'error-conditions)))))
+    (put name 'error-conditions
+         (delete-dups (copy-sequence (cons name conditions))))
+    (when message (put name 'error-message message))))
+
 ;; We put this here instead of in frame.el so that it's defined even on
 ;; systems where frame.el isn't loaded.
 (defun frame-configuration-p (object)
@@ -2526,11 +2546,6 @@ When the hook runs, the temporary buffer is current.
 This hook is normally set up with a function to put the buffer in Help
 mode.")
 
-;; The `assert' macro from the cl package signals
-;; `cl-assertion-failed' at runtime so always define it.
-(put 'cl-assertion-failed 'error-conditions '(error))
-(put 'cl-assertion-failed 'error-message (purecopy "Assertion failed"))
-
 (defconst user-emacs-directory
   (if (eq system-type 'ms-dos)
       ;; MS-DOS cannot have initial dot.
@@ -2750,6 +2765,13 @@ Otherwise, return nil."
       (setq object (indirect-function object t)))
   (and (subrp object) (eq (cdr (subr-arity object)) 'unevalled)))
 
+(defun macrop (object)
+  "Non-nil if and only if OBJECT is a macro."
+  (let ((def (indirect-function object t)))
+    (when (consp def)
+      (or (eq 'macro (car def))
+          (and (autoloadp def) (memq (nth 4 def) '(macro t)))))))
+
 (defun field-at-pos (pos)
   "Return the field at position POS, taking stickiness etc into account."
   (let ((raw-field (get-char-property (field-beginning pos) 'field)))
@@ -4050,10 +4072,14 @@ backwards ARG times if negative."
 
 ;;;; Text clones
 
-(defun text-clone-maintain (ol1 after beg end &optional _len)
+(defvar text-clone--maintaining nil)
+
+(defun text-clone--maintain (ol1 after beg end &optional _len)
   "Propagate the changes made under the overlay OL1 to the other clones.
 This is used on the `modification-hooks' property of text clones."
-  (when (and after (not undo-in-progress) (overlay-start ol1))
+  (when (and after (not undo-in-progress)
+             (not text-clone--maintaining)
+             (overlay-start ol1))
     (let ((margin (if (overlay-get ol1 'text-clone-spreadp) 1 0)))
       (setq beg (max beg (+ (overlay-start ol1) margin)))
       (setq end (min end (- (overlay-end ol1) margin)))
@@ -4084,7 +4110,7 @@ This is used on the `modification-hooks' property of text clones."
                 (tail (- (overlay-end ol1) end))
                 (str (buffer-substring beg end))
                 (nothing-left t)
-                (inhibit-modification-hooks t))
+                (text-clone--maintaining t))
             (dolist (ol2 (overlay-get ol1 'text-clones))
               (let ((oe (overlay-end ol2)))
                 (unless (or (eq ol1 ol2) (null oe))
@@ -4095,7 +4121,7 @@ This is used on the `modification-hooks' property of text clones."
                     (unless (> mod-beg (point))
                       (save-excursion (insert str))
                       (delete-region mod-beg (point)))
-                    ;;(overlay-put ol2 'modification-hooks '(text-clone-maintain))
+                    ;;(overlay-put ol2 'modification-hooks '(text-clone--maintain))
                     ))))
             (if nothing-left (delete-overlay ol1))))))))
 
@@ -4126,17 +4152,18 @@ clone should be incorporated in the clone."
                              (>= pt-end (point-max))
                              (>= start (point-max)))
                          0 1))
+         ;; FIXME: Reuse overlays at point to extend dups!
          (ol1 (make-overlay (- start start-margin) (+ end end-margin) nil t))
          (ol2 (make-overlay (- (point) start-margin) (+ pt-end end-margin) nil t))
          (dups (list ol1 ol2)))
-    (overlay-put ol1 'modification-hooks '(text-clone-maintain))
+    (overlay-put ol1 'modification-hooks '(text-clone--maintain))
     (when spreadp (overlay-put ol1 'text-clone-spreadp t))
     (when syntax (overlay-put ol1 'text-clone-syntax syntax))
     ;;(overlay-put ol1 'face 'underline)
     (overlay-put ol1 'evaporate t)
     (overlay-put ol1 'text-clones dups)
     ;;
-    (overlay-put ol2 'modification-hooks '(text-clone-maintain))
+    (overlay-put ol2 'modification-hooks '(text-clone--maintain))
     (when spreadp (overlay-put ol2 'text-clone-spreadp t))
     (when syntax (overlay-put ol2 'text-clone-syntax syntax))
     ;;(overlay-put ol2 'face 'underline)
diff --git a/lisp/tabify.el b/lisp/tabify.el
index a90bf801bcf..44a233717dd 100644
--- a/lisp/tabify.el
+++ b/lisp/tabify.el
@@ -28,7 +28,7 @@
 ;;; Code:
 
 ;;;###autoload
-(defun untabify (start end &optional arg)
+(defun untabify (start end &optional _arg)
   "Convert all tabs in region to multiple spaces, preserving columns.
 If called interactively with prefix ARG, convert for the entire
 buffer.
@@ -61,7 +61,7 @@ Usually this will be \" [ \\t]+\" to match a space followed by whitespace.
 \"^\\t* [ \\t]+\" is also useful, for tabifying only initial whitespace.")
 
 ;;;###autoload
-(defun tabify (start end &optional arg)
+(defun tabify (start end &optional _arg)
   "Convert multiple spaces in region to tabs when possible.
 A group of spaces is partially replaced by tabs
 when this can be done without changing the column they end at.
diff --git a/lisp/talk.el b/lisp/talk.el
index 741571a8d78..8c991c8d995 100644
--- a/lisp/talk.el
+++ b/lisp/talk.el
@@ -50,7 +50,7 @@ Each element has the form (DISPLAY FRAME BUFFER).")
   (let ((type (frame-live-p (selected-frame))))
     (if (or (eq type t) (eq type 'x))
         (talk-add-display
-         (terminal-name (frame-terminal (selected-frame))))
+         (terminal-name (frame-terminal)))
       (error "Unknown frame type")))
   (talk-update-buffers))
 
diff --git a/lisp/term/common-win.el b/lisp/term/common-win.el
index 8fe10dc8e35..aadab96f75a 100644
--- a/lisp/term/common-win.el
+++ b/lisp/term/common-win.el
@@ -159,7 +159,7 @@ is not used)."
                     initial-frame-alist)))))
 
 ;; Make -iconic apply only to the initial frame!
-(defun x-handle-iconic (switch)
+(defun x-handle-iconic (_switch)
   (setq initial-frame-alist
         (cons '(visibility . icon) initial-frame-alist)))
 
@@ -175,7 +175,7 @@ is not used)."
 (declare-function x-parse-geometry "frame.c" (string))
 
 ;; Handle the geometry option
-(defun x-handle-geometry (switch)
+(defun x-handle-geometry (_switch)
   (let* ((geo (x-parse-geometry (pop x-invocation-args)))
          (left (assq 'left geo))
          (top (assq 'top geo))
@@ -216,7 +216,7 @@ is not used)."
 On X, the display name of individual X frames is recorded in the
 `display' frame parameter.")
 
-(defun x-handle-display (switch)
+(defun x-handle-display (_switch)
   "Handle -display DISPLAY option."
   (setq x-display-name (pop x-invocation-args))
   ;; Make subshell programs see the same DISPLAY value Emacs really uses.
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index ab776ea6257..96831cea9a6 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -164,22 +164,22 @@ created."
 ;; platforms.  (Bug#10783)
 
 ;; From src/xfns.c
-(defun x-list-fonts (pattern &optional face frame maximum width)
+(defun x-list-fonts (_pattern &optional _face _frame _maximum width)
   (if (or (null width) (and (numberp width) (= width 1)))
       (list "ms-dos")
     (list "no-such-font")))
 (defun x-display-pixel-width (&optional frame) (frame-width frame))
 (defun x-display-pixel-height (&optional frame) (frame-height frame))
-(defun x-display-planes (&optional frame) 4) ;bg switched to 16 colors as well
-(defun x-display-color-cells (&optional frame) 16)
-(defun x-server-max-request-size (&optional frame) 1000000) ; ???
-(defun x-server-vendor (&optional frame) t "GNU")
-(defun x-server-version (&optional frame) '(1 0 0))
-(defun x-display-screens (&optional frame) 1)
-(defun x-display-mm-height (&optional frame) 245) ; Guess the size of my
-(defun x-display-mm-width (&optional frame) 322)  ; monitor, EZ...
-(defun x-display-backing-store (&optional frame) 'not-useful)
-(defun x-display-visual-class (&optional frame) 'static-color)
+(defun x-display-planes (&optional _frame) 4) ;bg switched to 16 colors as well
+(defun x-display-color-cells (&optional _frame) 16)
+(defun x-server-max-request-size (&optional _frame) 1000000) ; ???
+(defun x-server-vendor (&optional _frame) t "GNU")
+(defun x-server-version (&optional _frame) '(1 0 0))
+(defun x-display-screens (&optional _frame) 1)
+(defun x-display-mm-height (&optional _frame) 245) ; Guess the size of my
+(defun x-display-mm-width (&optional _frame) 322)  ; monitor, EZ...
+(defun x-display-backing-store (&optional _frame) 'not-useful)
+(defun x-display-visual-class (&optional _frame) 'static-color)
 (fset 'x-display-save-under 'ignore)
 (fset 'x-get-resource 'ignore)
 
@@ -253,7 +253,7 @@ is not used)."
           (setq x-last-selected-text text))))))
 
 ;; x-selection-owner-p is used in simple.el.
-(defun x-selection-owner-p (&optional selection terminal)
+(defun x-selection-owner-p (&optional _selection _terminal)
   "Whether the current Emacs process owns the given X Selection.
 The arg should be the name of the selection in question, typically one of
 the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'.
@@ -285,7 +285,7 @@ On Nextstep, TERMINAL is unused.
 
 ;; x-own-selection-internal and x-disown-selection-internal are used
 ;; in select.el:x-set-selection.
-(defun x-own-selection-internal (selection value &optional frame)
+(defun x-own-selection-internal (_selection value &optional _frame)
   "Assert an X selection of the type SELECTION with and value VALUE.
 SELECTION is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'.
 \(Those are literal upper-case symbol names, since that's what X expects.)
@@ -302,7 +302,7 @@ On Nextstep, FRAME is unused.
     (x-select-text value))
   value)
 
-(defun x-disown-selection-internal (selection &optional time-object terminal)
+(defun x-disown-selection-internal (selection &optional _time-object _terminal)
   "If we own the selection SELECTION, disown it.
 Disowning it means there is no such selection.
 
@@ -321,7 +321,8 @@ On MS-DOS, all this does is return non-nil if we own the selection.
       t))
 
 ;; x-get-selection-internal is used in select.el
-(defun x-get-selection-internal (selection-symbol target-type &optional time-stamp terminal)
+(defun x-get-selection-internal (_selection-symbol _target-type
+                                                  &optional _time-stamp _terminal)
   "Return text selected from some X window.
 SELECTION-SYMBOL is typically `PRIMARY', `SECONDARY', or `CLIPBOARD'.
 \(Those are literal upper-case symbol names, since that's what X expects.)
@@ -403,7 +404,7 @@ Errors out because it is not supposed to be called, ever."
   (error "terminal-init-internal called for window-system `%s'"
          (window-system)))
 
-(defun msdos-initialize-window-system (&optional display)
+(defun msdos-initialize-window-system (&optional _display)
   "Initialization function for the `pc' \"window system\"."
   (or (eq (window-system) 'pc)
       (error
diff --git a/lisp/term/tty-colors.el b/lisp/term/tty-colors.el
index 8002c53151b..5ba352a5c3a 100644
--- a/lisp/term/tty-colors.el
+++ b/lisp/term/tty-colors.el
@@ -767,7 +767,7 @@
     (yes . 8))
   "An alist of supported standard tty color modes and their aliases.")
 
-(defun tty-color-alist (&optional frame)
+(defun tty-color-alist (&optional _frame)
   "Return an alist of colors supported by FRAME's terminal.
 FRAME defaults to the selected frame.
 Each element of the returned alist is of the form:
@@ -840,7 +840,7 @@ If FRAME is not specified or is nil, it defaults to the selected frame."
   (tty-modify-color-alist
    (append (list (tty-color-canonicalize name) index) rgb) frame))
 
-(defun tty-color-clear (&optional frame)
+(defun tty-color-clear (&optional _frame)
   "Clear the list of supported tty colors for frame FRAME.
 If FRAME is unspecified or nil, it defaults to the selected frame."
   (setq tty-defined-color-alist nil))
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index acadb0fad43..55181ab7d6d 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -229,7 +229,8 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
        '(glib "libglib-2.0-0.dll")
        '(gobject "libgobject-2.0-0.dll")
        '(gnutls "libgnutls-28.dll" "libgnutls-26.dll")
-       '(libxml2 "libxml2-2.dll" "libxml2.dll")))
+       '(libxml2 "libxml2-2.dll" "libxml2.dll")
+       '(zlib "zlib1.dll" "libz-1.dll")))
 
 ;;; multi-tty support
 (defvar w32-initialized nil
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index ab1556d5779..28fd3d7090c 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -87,7 +87,7 @@
 (defvar x-session-id)
 (defvar x-session-previous-id)
 
-(defun x-handle-no-bitmap-icon (switch)
+(defun x-handle-no-bitmap-icon (_switch)
   (setq default-frame-alist (cons '(icon-type) default-frame-alist)))
 
 ;; Handle the --parent-id option.
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index 86f4583b987..af0b0b606e5 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -606,7 +606,7 @@ We run the first FUNCTION whose STRING matches the input events."
   (add-hook 'delete-terminal-functions 'xterm-remove-modify-other-keys)
   ;; Add the selected frame to the list of frames that
   ;; need to deal with modify-other-keys.
-  (push (frame-terminal (selected-frame))
+  (push (frame-terminal)
       xterm-modify-other-keys-terminal-list)
   (xterm-turn-on-modify-other-keys))
 
@@ -728,7 +728,7 @@ versions of xterm."
 
 (defun xterm-turn-on-modify-other-keys ()
   "Turn the modifyOtherKeys feature of xterm back on."
-  (let ((terminal (frame-terminal (selected-frame))))
+  (let ((terminal (frame-terminal)))
     (when (and (terminal-live-p terminal)
                (memq terminal xterm-modify-other-keys-terminal-list))
       (send-string-to-terminal "\e[>4;1m" terminal))))
@@ -742,7 +742,7 @@ versions of xterm."
 
 (defun xterm-remove-modify-other-keys (&optional terminal)
   "Turn off the modifyOtherKeys feature of xterm for good."
-  (setq terminal (or terminal (frame-terminal (selected-frame))))
+  (setq terminal (or terminal (frame-terminal)))
   (when (and (terminal-live-p terminal)
              (memq terminal xterm-modify-other-keys-terminal-list))
     (setq xterm-modify-other-keys-terminal-list
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index cb19c018839..9c32604b4f4 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -263,6 +263,48 @@
 (defvar css-font-lock-defaults
   '(css-font-lock-keywords nil t))
 
+(defcustom css-indent-offset 4
+  "Basic size of one indentation step."
+  :version "22.2"
+  :type 'integer)
+
+(require 'smie)
+
+(defconst css-smie-grammar
+  (smie-prec2->grammar
+   (smie-precs->prec2 '((assoc ";") (assoc ",") (left ":")))))
+
+(defun css-smie--forward-token ()
+  (cond
+   ((and (eq (char-before) ?\})
+         ;; FIXME: If the next char is not whitespace, what should we do?
+         (or (memq (char-after) '(?\s ?\t ?\n))
+             (looking-at comment-start-skip)))
+    (if (memq (char-after) '(?\s ?\t ?\n))
+        (forward-char 1) (forward-comment 1))
+    ";")
+   ((progn (forward-comment (point-max))
+           (looking-at "[;,:]"))
+    (forward-char 1) (match-string 0))
+   (t (smie-default-forward-token))))
+
+(defun css-smie--backward-token ()
+  (let ((pos (point)))
+    (forward-comment (- (point)))
+    (cond
+     ;; FIXME: If the next char is not whitespace, what should we do?
+     ((and (eq (char-before) ?\}) (> pos (point))) ";")
+     ((memq (char-before) '(?\; ?\, ?\:))
+      (forward-char -1) (string (char-after)))
+     (t (smie-default-backward-token)))))
+
+(defun css-smie-rules (kind token)
+  (pcase (cons kind token)
+    (`(:elem . basic) css-indent-offset)
+    (`(:elem . arg) 0)
+    (`(:before . "{") (if (smie-rule-hanging-p)
+                         (smie-rule-parent 0)))))
+
 ;;;###autoload
 (define-derived-mode css-mode fundamental-mode "CSS"
   "Major mode to edit Cascading Style Sheets."
@@ -271,11 +313,13 @@
   (setq-local comment-start-skip "/\\*+[ \t]*")
   (setq-local comment-end "*/")
   (setq-local comment-end-skip "[ \t]*\\*+/")
-  (setq-local forward-sexp-function 'css-forward-sexp)
   (setq-local parse-sexp-ignore-comments t)
   (setq-local indent-line-function 'css-indent-line)
   (setq-local fill-paragraph-function 'css-fill-paragraph)
   (setq-local add-log-current-defun-function #'css-current-defun-name)
+  (smie-setup css-smie-grammar #'css-smie-rules
+              :forward-token #'css-smie--forward-token
+              :backward-token #'css-smie--backward-token)
   (when css-electric-keys
     (let ((fc (make-char-table 'auto-fill-chars)))
       (set-char-table-parent fc auto-fill-chars)
@@ -355,132 +399,6 @@
             ;; Don't use the default filling code.
             t)))))))
 
-;;; Navigation and indentation.
-
-(defconst css-navigation-syntax-table
-  (let ((st (make-syntax-table css-mode-syntax-table)))
-    (map-char-table (lambda (c v)
-                      ;; Turn punctuation (code = 1) into symbol (code = 1).
-                      (if (eq (car-safe v) 1)
-                          (set-char-table-range st c (cons 3 (cdr v)))))
-                    st)
-    st))
-
-(defun css-backward-sexp (n)
-  (let ((forward-sexp-function nil))
-    (if (< n 0) (css-forward-sexp (- n))
-      (while (> n 0)
-        (setq n (1- n))
-        (forward-comment (- (point-max)))
-        (if (not (eq (char-before) ?\;))
-            (backward-sexp 1)
-          (while (progn (backward-sexp 1)
-                        (save-excursion
-                          (forward-comment (- (point-max)))
-                          ;; FIXME: We should also skip punctuation.
-                          (not (or (bobp) (memq (char-before) '(?\; ?\{))))))))))))
-
-(defun css-forward-sexp (n)
-  (let ((forward-sexp-function nil))
-    (if (< n 0) (css-backward-sexp (- n))
-      (while (> n 0)
-        (setq n (1- n))
-        (forward-comment (point-max))
-        (if (not (eq (char-after) ?\;))
-            (forward-sexp 1)
-          (while (progn (forward-sexp 1)
-                        (save-excursion
-                          (forward-comment (point-max))
-                          ;; FIXME: We should also skip punctuation.
-                          (not (memq (char-after) '(?\; ?\})))))))))))
-
-(defun css-indent-calculate-virtual ()
-  (if (or (save-excursion (skip-chars-backward " \t") (bolp))
-          (if (looking-at "\\s(")
-              (save-excursion
-                (forward-char 1) (skip-chars-forward " \t")
-                (not (or (eolp) (looking-at comment-start-skip))))))
-      (current-column)
-    (css-indent-calculate)))
-
-(defcustom css-indent-offset 4
-  "Basic size of one indentation step."
-  :version "22.2"
-  :type 'integer
-  :group 'css)
-
-(defun css-indent-calculate ()
-  (let ((ppss (syntax-ppss))
-        pos)
-    (with-syntax-table css-navigation-syntax-table
-      (save-excursion
-        (cond
-         ;; Inside a string.
-         ((nth 3 ppss) 'noindent)
-         ;; Inside a comment.
-         ((nth 4 ppss)
-          (setq pos (point))
-          (forward-line -1)
-          (skip-chars-forward " \t")
-          (if (>= (nth 8 ppss) (point))
-              (progn
-                (goto-char (nth 8 ppss))
-                (if (eq (char-after pos) ?*)
-                    (forward-char 1)
-                  (if (not (looking-at comment-start-skip))
-                      (error "Internal css-mode error")
-                    (goto-char (match-end 0))))
-                (current-column))
-            (if (and (eq (char-after pos) ?*) (eq (char-after) ?*))
-                (current-column)
-              ;; 'noindent
-              (current-column)
-              )))
-         ;; In normal code.
-         (t
-          (or
-           (when (looking-at "\\s)")
-             (forward-char 1)
-             (backward-sexp 1)
-             (css-indent-calculate-virtual))
-           (when (looking-at comment-start-skip)
-             (forward-comment (point-max))
-             (css-indent-calculate))
-           (when (save-excursion (forward-comment (- (point-max)))
-                                 (setq pos (point))
-                                 (eq (char-syntax (preceding-char)) ?\())
-             (goto-char (1- pos))
-             (if (not (looking-at "\\s([ \t]*"))
-                 (error "Internal css-mode error")
-               (if (or (memq (char-after (match-end 0)) '(?\n nil))
-                       (save-excursion (goto-char (match-end 0))
-                                       (looking-at comment-start-skip)))
-                   (+ (css-indent-calculate-virtual) css-indent-offset)
-                 (progn (goto-char (match-end 0)) (current-column)))))
-           (progn
-             (css-backward-sexp 1)
-             (if (looking-at "\\s(")
-                 (css-indent-calculate)
-               (css-indent-calculate-virtual))))))))))
-
-
-(defun css-indent-line ()
-  "Indent current line according to CSS indentation rules."
-  (interactive)
-  (let* ((savep (point))
-         (forward-sexp-function nil)
-         (indent (condition-case nil
-                     (save-excursion
-                       (forward-line 0)
-                       (skip-chars-forward " \t")
-                       (if (>= (point) savep) (setq savep nil))
-                       (css-indent-calculate))
-                   (error nil))))
-    (if (not (numberp indent)) 'noindent
-      (if savep
-          (save-excursion (indent-line-to indent))
-        (indent-line-to indent)))))
-
 (defun css-current-defun-name ()
   "Return the name of the CSS section at point, or nil."
   (save-excursion
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 5b6d5f359e6..119b4b04593 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -220,7 +220,7 @@ Remove indentation from each line."
   (let ((str (or
               (and adaptive-fill-function (funcall adaptive-fill-function))
               (and adaptive-fill-regexp (looking-at adaptive-fill-regexp)
-                   (match-string-no-properties 0)))))
+                   (match-string 0)))))
     (if (>= (+ (current-left-margin) (length str)) (current-fill-column))
         ;; Death to insanely long prefixes.
         nil
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 94b184d09a1..3998fafa5cc 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -2218,7 +2218,7 @@ Global `ispell-quit' set to start location to continue spell session."
         (window-min-height (min window-min-height
                                 ispell-choices-win-default-height))
         (command-characters '( ?  ?i ?a ?A ?r ?R ?? ?x ?X ?q ?l ?u ?m ))
-        (dedicated (window-dedicated-p (selected-window)))
+        (dedicated (window-dedicated-p))
         (skipped 0)
         char num result textwin dedicated-win)
 
diff --git a/lisp/textmodes/makeinfo.el b/lisp/textmodes/makeinfo.el
index 35c6e607569..4b57e0b9746 100644
--- a/lisp/textmodes/makeinfo.el
+++ b/lisp/textmodes/makeinfo.el
@@ -211,7 +211,7 @@ nonsensical results."
           (with-current-buffer buffer
             (revert-buffer t t))
         (setq buffer (find-file-noselect makeinfo-output-file-name)))
-      (if (window-dedicated-p (selected-window))
+      (if (window-dedicated-p)
           (switch-to-buffer-other-window buffer)
         (switch-to-buffer buffer)))
     (goto-char (point-min))))
diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index b7ecdb513f5..b67a32a24f7 100644
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -84,48 +84,47 @@ positions of the thing found."
   (if (get thing 'bounds-of-thing-at-point)
       (funcall (get thing 'bounds-of-thing-at-point))
     (let ((orig (point)))
-      (condition-case nil
-          (save-excursion
-            ;; Try moving forward, then back.
-            (funcall ;; First move to end.
-             (or (get thing 'end-op)
-                 (lambda () (forward-thing thing 1))))
-            (funcall ;; Then move to beg.
-             (or (get thing 'beginning-op)
-                 (lambda () (forward-thing thing -1))))
-            (let ((beg (point)))
-              (if (<= beg orig)
-                  ;; If that brings us all the way back to ORIG,
-                  ;; it worked.  But END may not be the real end.
-                  ;; So find the real end that corresponds to BEG.
-                  ;; FIXME: in which cases can `real-end' differ from `end'?
-                  (let ((real-end
-                         (progn
-                           (funcall
-                            (or (get thing 'end-op)
-                                (lambda () (forward-thing thing 1))))
-                           (point))))
-                    (when (and (<= orig real-end) (< beg real-end))
-                      (cons beg real-end)))
-                (goto-char orig)
-                ;; Try a second time, moving backward first and then forward,
-                ;; so that we can find a thing that ends at ORIG.
-                (funcall ;; First, move to beg.
-                 (or (get thing 'beginning-op)
-                     (lambda () (forward-thing thing -1))))
-                (funcall ;; Then move to end.
-                 (or (get thing 'end-op)
-                     (lambda () (forward-thing thing 1))))
-                (let ((end (point))
-                      (real-beg
+      (ignore-errors
+        (save-excursion
+          ;; Try moving forward, then back.
+          (funcall ;; First move to end.
+           (or (get thing 'end-op)
+               (lambda () (forward-thing thing 1))))
+          (funcall ;; Then move to beg.
+           (or (get thing 'beginning-op)
+               (lambda () (forward-thing thing -1))))
+          (let ((beg (point)))
+            (if (<= beg orig)
+                ;; If that brings us all the way back to ORIG,
+                ;; it worked.  But END may not be the real end.
+                ;; So find the real end that corresponds to BEG.
+                ;; FIXME: in which cases can `real-end' differ from `end'?
+                (let ((real-end
                        (progn
                          (funcall
-                          (or (get thing 'beginning-op)
-                              (lambda () (forward-thing thing -1))))
+                          (or (get thing 'end-op)
+                              (lambda () (forward-thing thing 1))))
                          (point))))
-                  (if (and (<= real-beg orig) (<= orig end) (< real-beg end))
-                      (cons real-beg end))))))
-        (error nil)))))
+                  (when (and (<= orig real-end) (< beg real-end))
+                    (cons beg real-end)))
+              (goto-char orig)
+              ;; Try a second time, moving backward first and then forward,
+              ;; so that we can find a thing that ends at ORIG.
+              (funcall ;; First, move to beg.
+               (or (get thing 'beginning-op)
+                   (lambda () (forward-thing thing -1))))
+              (funcall ;; Then move to end.
+               (or (get thing 'end-op)
+                   (lambda () (forward-thing thing 1))))
+              (let ((end (point))
+                    (real-beg
+                     (progn
+                       (funcall
+                        (or (get thing 'beginning-op)
+                            (lambda () (forward-thing thing -1))))
+                       (point))))
+                (if (and (<= real-beg orig) (<= orig end) (< real-beg end))
+                    (cons real-beg end))))))))))
 
 ;;;###autoload
 (defun thing-at-point (thing &optional no-properties)
@@ -217,21 +216,19 @@ The bounds of THING are determined by `bounds-of-thing-at-point'."
 \[Internal function used by `bounds-of-thing-at-point'.]"
   (save-excursion
     (let ((opoint (point))
-          (beg (condition-case nil
-                   (progn (up-list -1)
-                          (point))
-                 (error nil))))
-      (condition-case nil
-          (if beg
-              (progn (forward-sexp)
-                     (cons beg (point)))
-            ;; Are we are at the beginning of a top-level sexp?
-            (forward-sexp)
-            (let ((end (point)))
-              (backward-sexp)
-              (if (>= opoint (point))
-                  (cons opoint end))))
-        (error nil)))))
+          (beg (ignore-errors
+                 (up-list -1)
+                 (point))))
+      (ignore-errors
+        (if beg
+            (progn (forward-sexp)
+                   (cons beg (point)))
+          ;; Are we are at the beginning of a top-level sexp?
+          (forward-sexp)
+          (let ((end (point)))
+            (backward-sexp)
+            (if (>= opoint (point))
+                (cons opoint end))))))))
 
 ;; Defuns
 
@@ -358,7 +355,7 @@ the bounds of a possible ill-formed URI (one lacking a scheme)."
       (if found
           (cons (match-beginning 1) (match-end 1))))))
 
-(defun thing-at-point--bounds-of-well-formed-url (beg end pt)
+(defun thing-at-point--bounds-of-well-formed-url (beg end _pt)
   (save-excursion
     (goto-char beg)
     (let (url-beg paren-end regexp)
@@ -453,16 +450,14 @@ looks like an email address, \"ftp://\" if it starts with
          htb ret)
      (while htbs
        (setq htb (car htbs) htbs (cdr htbs))
-       (condition-case nil
-           (progn
-             ;; errs: htb symbol may be unbound, or not a hash-table.
-             ;; gnus-gethash is just a macro for intern-soft.
-             (and (symbol-value htb)
-                  (intern-soft string (symbol-value htb))
-                  (setq ret string htbs nil))
-             ;; If we made it this far, gnus is running, so ignore "heads":
-             (setq heads nil))
-         (error nil)))
+       (ignore-errors
+         ;; errs: htb symbol may be unbound, or not a hash-table.
+         ;; gnus-gethash is just a macro for intern-soft.
+         (and (symbol-value htb)
+              (intern-soft string (symbol-value htb))
+              (setq ret string htbs nil))
+         ;; If we made it this far, gnus is running, so ignore "heads":
+         (setq heads nil)))
      (or ret (not heads)
          (let ((head (string-match "\\`\\([[:lower:]]+\\)\\." string)))
            (and head (setq head (substring string 0 (match-end 1)))
@@ -566,9 +561,8 @@ Signal an error if the entire string was not used."
       (car read-data))))
 
 (defun form-at-point (&optional thing pred)
-  (let ((sexp (condition-case nil
-                  (read-from-whole-string (thing-at-point (or thing 'sexp)))
-                (error nil))))
+  (let ((sexp (ignore-errors
+                (read-from-whole-string (thing-at-point (or thing 'sexp))))))
     (if (or (not pred) (funcall pred sexp)) sexp)))
 
 ;;;###autoload
diff --git a/lisp/time.el b/lisp/time.el
index 4b5ecf16be1..7e558746c6a 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -323,8 +323,6 @@ would give mode line times like `94/12/30 21:07:48 (UTC)'."
 
 (defun display-time-event-handler ()
   (display-time-update)
-  ;; Do redisplay right now, if no input pending.
-  (sit-for 0)
   (let* ((current (current-time))
          (timer display-time-timer)
          ;; Compute the time when this timer will run again, next.
@@ -352,8 +350,7 @@ Switches from the 1 to 5 to 15 minute load average, and then back to 1."
   (interactive)
   (if (= 3 (setq display-time-load-average (1+ display-time-load-average)))
       (setq display-time-load-average 0))
-  (display-time-update)
-  (sit-for 0))
+  (display-time-update))
 
 (defun display-time-mail-check-directory ()
   (let ((mail-files (directory-files display-time-mail-directory t))
diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index 39eb9e8b9aa..d581cb13e28 100644
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -156,7 +156,7 @@ options:
                           " RET instead."))
               (insert "\n\nWith your current key bindings"
                       " you can use "
-                      (if (string-match "^the .*menus?$" where)
+                      (if (string-match-p "^the .*menus?$" where)
                           ""
                         "the key")
                       where
@@ -346,10 +346,8 @@ from the Emacs default:\n\n" )
                    (def-fun-txt (nth 2 tk))
                    (where       (nth 3 tk))
                    (remark      (nth 4 tk))
-                   (rem-fun (command-remapping def-fun))
                    (key-txt (key-description key))
-                   (key-fun (with-current-buffer tutorial-buffer (key-binding key)))
-                   tot-len)
+                   (key-fun (with-current-buffer tutorial-buffer (key-binding key))))
               (unless (eq def-fun key-fun)
                 ;; Insert key binding description:
                 (when (string= key-txt explain-key-desc)
@@ -723,9 +721,7 @@ See `tutorial--save-tutorial' for more information."
                            saved-file
                            (error-message-string err))))
             ;; An error is raised here?? Is this a bug?
-            (condition-case nil
-                (undo-only)
-              (error nil))
+            (ignore-errors (undo-only))
             ;; Restore point
             (goto-char old-point)
             (if save-err
@@ -881,7 +877,7 @@ Run the Viper tutorial? "))
           ;; or just delete the <<...>> line if a [...] line follows.
           (cond ((save-excursion
                    (forward-line 1)
-                   (looking-at "\\["))
+                   (looking-at-p "\\["))
                  (delete-region (point) (progn (forward-line 1) (point))))
                 ((looking-at "<<Blank lines inserted.*>>")
                  (replace-match "[Middle of page left blank for didactic purposes.   Text continues below]"))
@@ -896,7 +892,7 @@ Run the Viper tutorial? "))
           ;; inserted at the start of the buffer, the "type C-v to
           ;; move to the next screen" might not be visible on the
           ;; first screen (n < 0).  How will the novice know what to do?
-          (let ((n (- (window-height (selected-window))
+          (let ((n (- (window-height)
                       (count-lines (point-min) (point))
                       6)))
             (if (< n 8)
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 120d00002e4..52a69690534 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,24 @@
+2013-08-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * url-http.el (url-http-parse-headers): Always place point at the
+        start of the buffer instead of just 80% of the time.
+
+2013-08-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * url-http.el (url-handle-content-transfer-encoding): Renamed
+        `zlib-decompress-gzipped-region' and check whether it's available,
+        too.
+        (url-handle-content-transfer-encoding): Renamed
+        `zlib-decompress-region' again.
+
+2013-08-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * url-vars.el (url-mime-encoding-string): If we have built-in gzip
+        support, say that we accept gzipped content.
+
+        * url-http.el (url-handle-content-transfer-encoding): Support
+        decompressing gzipped content.
+
 2013-07-31  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * url-handlers.el (url-file-name-completion)
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 7f21a38c535..7047e6b5f13 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -851,11 +851,25 @@ should be shown to the user."
        (error "Unknown class of HTTP response code: %d (%d)"
               class url-http-response-status)))
     (if (not success)
-        (url-mark-buffer-as-dead buffer))
+        (url-mark-buffer-as-dead buffer)
+      (url-handle-content-transfer-encoding))
     (url-http-debug "Finished parsing HTTP headers: %S" success)
     (widen)
+    (goto-char (point-min))
     success))
 
+(defun url-handle-content-transfer-encoding ()
+  (let ((encoding (mail-fetch-field "content-encoding")))
+    (when (and encoding
+               (fboundp 'zlib-decompress-region)
+               (zlib-available-p)
+               (equal (downcase encoding) "gzip"))
+      (save-restriction
+        (widen)
+        (goto-char (point-min))
+        (when (search-forward "\n\n")
+          (zlib-decompress-region (point) (point-max)))))))
+
 ;; Miscellaneous
 (defun url-http-activate-callback ()
   "Activate callback specified when this buffer was created."
diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el
index 6cd0e9aec3c..0361e01dfb4 100644
--- a/lisp/url/url-vars.el
+++ b/lisp/url/url-vars.el
@@ -210,8 +210,9 @@ Should be an assoc list of headers/contents.")
 
 (defvar url-request-method nil "The method to use for the next request.")
 
-;; FIXME!!  (RFC 2616 gives examples like `compress, gzip'.)
-(defvar url-mime-encoding-string nil
+(defvar url-mime-encoding-string (and (fboundp 'zlib-decompress-region)
+                                      (zlib-available-p)
+                                      "gzip")
   "String to send in the Accept-encoding: field in HTTP requests.")
 
 (defvar mm-mime-mule-charset-alist)
diff --git a/lisp/userlock.el b/lisp/userlock.el
index 4ad96eb41ce..9409409a608 100644
--- a/lisp/userlock.el
+++ b/lisp/userlock.el
@@ -30,8 +30,7 @@
 
 ;;; Code:
 
-(put 'file-locked 'error-conditions '(file-locked file-error error))
-(put 'file-locked 'error-message "File is locked")
+(define-error 'file-locked "File is locked" 'file-error)
 
 ;;;###autoload
 (defun ask-user-about-lock (file opponent)
@@ -94,8 +93,7 @@ You can <q>uit; don't modify this file.")
     (with-current-buffer standard-output
       (help-mode))))
 
-(put
- 'file-supersession 'error-conditions '(file-supersession file-error error))
+(define-error 'file-supersession nil 'file-error)
 
 ;;;###autoload
 (defun ask-user-about-supersession-threat (fn)
diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el
index f0ea9c68464..f926a164797 100644
--- a/lisp/vc/add-log.el
+++ b/lisp/vc/add-log.el
@@ -813,12 +813,12 @@ non-nil, otherwise in local time."
 
     (unless (equal file-name buffer-file-name)
       (cond
-       ((equal file-name (buffer-file-name (window-buffer (selected-window))))
+       ((equal file-name (buffer-file-name (window-buffer)))
         ;; If the selected window already shows the desired buffer don't show
         ;; it again (particularly important if other-window is true).
         ;; This is important for diff-add-change-log-entries-other-window.
-        (set-buffer (window-buffer (selected-window))))
-       ((or other-window (window-dedicated-p (selected-window)))
+        (set-buffer (window-buffer)))
+       ((or other-window (window-dedicated-p))
         (find-file-other-window file-name))
        (t (find-file file-name))))
     (or (derived-mode-p 'change-log-mode)
diff --git a/lisp/vc/compare-w.el b/lisp/vc/compare-w.el
index ae4fcc99a25..235ebe5a072 100644
--- a/lisp/vc/compare-w.el
+++ b/lisp/vc/compare-w.el
@@ -179,7 +179,7 @@ on third call it again advances points to the next difference and so on."
                            'compare-windows-sync-regexp
                          compare-windows-sync)))
     (setq p1 (point) b1 (current-buffer))
-    (setq w2 (next-window (selected-window)))
+    (setq w2 (next-window))
     (if (eq w2 (selected-window))
         (setq w2 (next-window (selected-window) nil 'visible)))
     (if (eq w2 (selected-window))
diff --git a/lisp/vc/ediff-help.el b/lisp/vc/ediff-help.el
index 833e84b6cea..78d1a6abfd1 100644
--- a/lisp/vc/ediff-help.el
+++ b/lisp/vc/ediff-help.el
@@ -253,7 +253,7 @@ the value of this variable and the variables `ediff-help-message-*' in
 
 
 (defun ediff-indent-help-message ()
-  (let* ((shift (/ (max 0 (- (window-width (selected-window))
+  (let* ((shift (/ (max 0 (- (window-width)
                              (ediff-help-message-line-length)))
                    2))
          (str (make-string shift ?\ )))
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index ec227f44e8f..2f2c71a71e6 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -537,7 +537,7 @@ to invocation.")
 ;; to reside.
 (defun ediff-setup-control-buffer (ctl-buf)
   "Set up window for control buffer."
-  (if (window-dedicated-p (selected-window))
+  (if (window-dedicated-p)
       (set-buffer ctl-buf) ; we are in control frame but just in case
     (switch-to-buffer ctl-buf))
   (let ((window-min-height 2))
@@ -1629,7 +1629,7 @@ the width of the A/B/C windows."
             (setq lines (1+ lines)))
           ;; And position the beginning on the right line
           (goto-char beg)
-          (recenter (/ (1+ (max (- (1- (window-height (selected-window)))
+          (recenter (/ (1+ (max (- (1- (window-height))
                                    lines)
                                 1)
                            )
@@ -2818,7 +2818,7 @@ Hit \\[ediff-recenter] to reset the windows afterward."
   (with-output-to-temp-buffer ediff-msg-buffer
     (ediff-with-current-buffer standard-output
       (fundamental-mode))
-    (raise-frame (selected-frame))
+    (raise-frame)
     (princ (ediff-version))
     (princ "\n\n")
     (ediff-with-current-buffer ediff-buffer-A
@@ -3468,7 +3468,7 @@ Without an argument, it saves customized diff argument, if available
           (ediff-with-current-buffer buf
             (goto-char (point-min)))
           (switch-to-buffer buf)
-          (raise-frame (selected-frame)))))
+          (raise-frame))))
   (if (frame-live-p ediff-control-frame)
       (ediff-reset-mouse ediff-control-frame))
   (if (window-live-p ediff-control-window)
diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el
index 124bdbd26df..5a14c193344 100644
--- a/lisp/vc/ediff-wind.el
+++ b/lisp/vc/ediff-wind.el
@@ -861,7 +861,7 @@ into icons, regardless of the window manager."
 ;; create a new splittable frame if none is found
 (defun ediff-skip-unsuitable-frames (&optional ok-unsplittable)
   (if (ediff-window-display-p)
-      (let ((wind-frame (window-frame (selected-window)))
+      (let ((wind-frame (window-frame))
              seen-windows)
         (while (and (not (memq (selected-window) seen-windows))
                     (or
@@ -877,7 +877,7 @@ into icons, regardless of the window manager."
           (setq seen-windows (cons (selected-window) seen-windows))
           ;; try new window
           (other-window 1 t)
-          (setq wind-frame (window-frame (selected-window)))
+          (setq wind-frame (window-frame))
           )
         (if (memq (selected-window) seen-windows)
             ;; fed up, no appropriate frames
@@ -939,7 +939,7 @@ into icons, regardless of the window manager."
 
     (setq ctl-frame-iconified-p (ediff-frame-iconified-p ctl-frame))
     (select-frame ctl-frame)
-    (if (window-dedicated-p (selected-window))
+    (if (window-dedicated-p)
         ()
       (delete-other-windows)
       (switch-to-buffer ctl-buffer))
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el
index e9a6a97409c..d35c3e53e9a 100644
--- a/lisp/vc/ediff.el
+++ b/lisp/vc/ediff.el
@@ -1499,7 +1499,7 @@ With optional NODE, goes to that node."
           (if node
               (Info-goto-node node)
             (message "Type `i' to search for a specific topic"))
-          (raise-frame (selected-frame)))
+          (raise-frame))
       (error (beep 1)
              (with-output-to-temp-buffer ediff-msg-buffer
                (ediff-with-current-buffer standard-output
diff --git a/lisp/vc/emerge.el b/lisp/vc/emerge.el
index 0a1bd044125..8d0e8efc75c 100644
--- a/lisp/vc/emerge.el
+++ b/lisp/vc/emerge.el
@@ -1770,7 +1770,7 @@ to the left margin, if they are in windows."
                 (setq lines (1+ lines)))
               ;; And position the beginning on the right line
               (goto-char beg)
-              (recenter (/ (1+ (- (1- (window-height (selected-window)))
+              (recenter (/ (1+ (- (1- (window-height))
                                   lines))
                            2))))))
   (goto-char pos))
diff --git a/lisp/vc/pcvs-util.el b/lisp/vc/pcvs-util.el
index 28ae4ed3de3..2868bb98b29 100644
--- a/lisp/vc/pcvs-util.el
+++ b/lisp/vc/pcvs-util.el
@@ -97,7 +97,7 @@ try to split a new window instead."
 BUF is assumed to be a temporary buffer used from the buffer MAINBUF."
   (interactive (list (current-buffer)))
   (save-current-buffer
-    (let ((win (if (eq buf (window-buffer (selected-window))) (selected-window)
+    (let ((win (if (eq buf (window-buffer)) (selected-window)
                  (get-buffer-window buf t))))
       (when win
         (if (window-dedicated-p win)
@@ -111,8 +111,8 @@ BUF is assumed to be a temporary buffer used from the buffer MAINBUF."
 ;;;           )
           )))
     (with-current-buffer buf
-      (bury-buffer (unless (and (eq buf (window-buffer (selected-window)))
-                                (not (window-dedicated-p (selected-window))))
+      (bury-buffer (unless (and (eq buf (window-buffer))
+                                (not (window-dedicated-p)))
                      buf)))
     (when mainbuf
       (let ((mainwin (or (get-buffer-window mainbuf)
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index f61e97216a9..87336b6a357 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -57,7 +57,6 @@
 
 (defcustom smerge-diff-buffer-name "*vc-diff*"
   "Buffer name to use for displaying diffs."
-  :group 'smerge
   :type '(choice
           (const "*vc-diff*")
           (const "*cvs-diff*")
@@ -69,12 +68,10 @@
           (if (listp diff-switches) diff-switches (list diff-switches)))
   "A list of strings specifying switches to be passed to diff.
 Used in `smerge-diff-base-mine' and related functions."
-  :group 'smerge
   :type '(repeat string))
 
 (defcustom smerge-auto-leave t
   "Non-nil means to leave `smerge-mode' when the last conflict is resolved."
-  :group 'smerge
   :type 'boolean)
 
 (defface smerge-mine
@@ -84,8 +81,7 @@ Used in `smerge-diff-base-mine' and related functions."
      :background "#553333")
     (((class color))
      :foreground "red"))
-  "Face for your code."
-  :group 'smerge)
+  "Face for your code.")
 (define-obsolete-face-alias 'smerge-mine-face 'smerge-mine "22.1")
 (defvar smerge-mine-face 'smerge-mine)
 
@@ -96,8 +92,7 @@ Used in `smerge-diff-base-mine' and related functions."
      :background "#335533")
     (((class color))
      :foreground "green"))
-  "Face for the other code."
-  :group 'smerge)
+  "Face for the other code.")
 (define-obsolete-face-alias 'smerge-other-face 'smerge-other "22.1")
 (defvar smerge-other-face 'smerge-other)
 
@@ -108,8 +103,7 @@ Used in `smerge-diff-base-mine' and related functions."
      :background "#888833")
     (((class color))
      :foreground "yellow"))
-  "Face for the base code."
-  :group 'smerge)
+  "Face for the base code.")
 (define-obsolete-face-alias 'smerge-base-face 'smerge-base "22.1")
 (defvar smerge-base-face 'smerge-base)
 
@@ -118,15 +112,13 @@ Used in `smerge-diff-base-mine' and related functions."
      (:background "grey85"))
     (((background dark))
      (:background "grey30")))
-  "Face for the conflict markers."
-  :group 'smerge)
+  "Face for the conflict markers.")
 (define-obsolete-face-alias 'smerge-markers-face 'smerge-markers "22.1")
 (defvar smerge-markers-face 'smerge-markers)
 
 (defface smerge-refined-change
   '((t nil))
-  "Face used for char-based changes shown by `smerge-refine'."
-  :group 'smerge)
+  "Face used for char-based changes shown by `smerge-refine'.")
 
 (defface smerge-refined-removed
   '((default
@@ -137,7 +129,6 @@ Used in `smerge-diff-base-mine' and related functions."
      :background "#aa2222")
     (t :inverse-video t))
   "Face used for removed characters shown by `smerge-refine'."
-  :group 'smerge
   :version "24.3")
 
 (defface smerge-refined-added
@@ -149,7 +140,6 @@ Used in `smerge-diff-base-mine' and related functions."
      :background "#22aa22")
     (t :inverse-video t))
   "Face used for added characters shown by `smerge-refine'."
-  :group 'smerge
   :version "24.3")
 
 (easy-mmode-defmap smerge-basic-map
@@ -172,7 +162,6 @@ Used in `smerge-diff-base-mine' and related functions."
 
 (defcustom smerge-command-prefix "\C-c^"
   "Prefix for `smerge-mode' commands."
-  :group 'smerge
   :type '(choice (const :tag "ESC"   "\e")
                  (const :tag "C-c ^" "\C-c^" )
                  (const :tag "none"  "")
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 07b7d15299f..7e555825e38 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -649,11 +649,18 @@ If toggling on, also insert its message into the buffer."
 It is based on `log-edit-mode', and has Git-specific extensions.")
 
 (defun vc-git-checkin (files _rev comment)
-  (let ((coding-system-for-write vc-git-commits-coding-system))
+  (let* ((file1 (or (car files) default-directory))
+         (root (vc-git-root file1))
+         (default-directory (expand-file-name root))
+         (only (or (cdr files)
+                   (not (equal root (abbreviate-file-name file1)))))
+         (coding-system-for-write vc-git-commits-coding-system))
     (cl-flet ((boolean-arg-fn
                (argument)
                (lambda (value) (when (equal value "yes") (list argument)))))
-      (apply 'vc-git-command nil 0 files
+      ;; When operating on the whole tree, better pass nil than ".", since "."
+      ;; fails when we're committing a merge.
+      (apply 'vc-git-command nil 0 (if only files)
              (nconc (list "commit" "-m")
                     (log-edit-extract-headers
                      `(("Author" . "--author")
@@ -661,7 +668,7 @@ It is based on `log-edit-mode', and has Git-specific extensions.")
                        ("Amend" . ,(boolean-arg-fn "--amend"))
                        ("Sign-Off" . ,(boolean-arg-fn "--signoff")))
                      comment)
-                    (list "--only" "--"))))))
+                    (if only (list "--only" "--")))))))
 
 (defun vc-git-find-revision (file rev buffer)
   (let* (process-file-side-effects
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index ae9aa0118ae..c47bc4c7f97 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -190,7 +190,7 @@ individually should stay local."
 (make-variable-buffer-local 'vc-mode)
 (put 'vc-mode 'permanent-local t)
 
-(defun vc-mode (&optional arg)
+(defun vc-mode (&optional _arg)
   ;; Dummy function for C-h m
   "Version Control minor mode.
 This minor mode is automatically activated whenever you visit a file under
@@ -631,7 +631,7 @@ this function."
 (define-obsolete-function-alias
   'vc-toggle-read-only 'toggle-read-only "24.1")
 
-(defun vc-default-make-version-backups-p (backend file)
+(defun vc-default-make-version-backups-p (_backend _file)
   "Return non-nil if unmodified versions should be backed up locally.
 The default is to switch off this feature."
   nil)
@@ -834,7 +834,7 @@ current, and kill the buffer that visits the link."
       (set-buffer true-buffer)
       (kill-buffer this-buffer))))
 
-(defun vc-default-find-file-hook (backend)
+(defun vc-default-find-file-hook (_backend)
   nil)
 
 (defun vc-find-file-hook ()
@@ -1033,7 +1033,7 @@ current, and kill the buffer that visits the link."
               '((ext-menu-separator "--"))
               ext-binding))))
 
-(defun vc-default-extra-menu (backend)
+(defun vc-default-extra-menu (_backend)
   nil)
 
 (provide 'vc-hooks)
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 007bbe86f34..fcab6f36c6f 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -486,7 +486,7 @@
 ;;   default implementation always returns nil.
 ;;
 ;; - root (file)
-;; 
+;;
 ;;   Return the root of the VC controlled hierarchy for file.
 ;;
 ;; - repository-hostname (dirname)
@@ -505,12 +505,13 @@
 ;;   from ignored files.
 ;;   When called from Lisp code, if DIRECTORY is non-nil, the
 ;;   repository to use will be deduced by DIRECTORY.
-;; 
+;;
 ;; - ignore-completion-table
-;; 
-;;   Return the completion table for files ignored by the version
-;;   control system in `default-directory'.
-;; 
+;;
+;;   Return the completion table for files ignored by the current
+;;   version control system, e.g., the entries in `.gitignore' and
+;;   `.bzrignore'.
+;;
 ;; - previous-revision (file rev)
 ;;
 ;;   Return the revision number that precedes REV for FILE, or nil if no such
diff --git a/lisp/version.el b/lisp/version.el
index 5db45da860c..96674566781 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -104,7 +104,7 @@ Returns nil if unable to find this information."
              (looking-at "[0-9]+\0\\([^\0\n]+\\)\0")
              (match-string 1))))))
 
-(defun emacs-bzr-version-bzr (dir)
+(defun emacs-bzr-version-bzr (_dir)
   "Ask bzr itself for the version information for directory DIR."
   ;; Comments on `bzr version-info':
   ;; i) Unknown files also cause clean != 1.
diff --git a/lisp/view.el b/lisp/view.el
index f9326399a26..333a9883d14 100644
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -322,7 +322,7 @@ own View-like bindings."
     (view-mode-enter nil exit-action)))
 
 ;;;###autoload
-(defun view-buffer-other-window (buffer &optional not-return exit-action)
+(defun view-buffer-other-window (buffer &optional _not-return exit-action)
   "View BUFFER in View mode in another window.
 Emacs commands editing the buffer contents are not available;
 instead, a special set of commands (mostly letters and
@@ -349,7 +349,7 @@ own View-like bindings."
     (view-mode-enter nil exit-action)))
 
 ;;;###autoload
-(defun view-buffer-other-frame (buffer &optional not-return exit-action)
+(defun view-buffer-other-frame (buffer &optional _not-return exit-action)
   "View BUFFER in View mode in another frame.
 Emacs commands editing the buffer contents are not available;
 instead, a special set of commands (mostly letters and
diff --git a/lisp/wdired.el b/lisp/wdired.el
index 55665fbb6a0..6c2c9777a47 100644
--- a/lisp/wdired.el
+++ b/lisp/wdired.el
@@ -239,7 +239,8 @@ See `wdired-mode'."
        (dired-remember-marks (point-min) (point-max)))
   (set (make-local-variable 'wdired-old-point) (point))
   (set (make-local-variable 'query-replace-skip-read-only) t)
-  (add-hook 'isearch-filter-predicates 'wdired-isearch-filter-read-only nil t)
+  (add-function :after-while (local 'isearch-filter-predicate)
+                #'wdired-isearch-filter-read-only)
   (use-local-map wdired-mode-map)
   (force-mode-line-update)
   (setq buffer-read-only nil)
diff --git a/lisp/window.el b/lisp/window.el
index 86d93c0a9f6..a111b3cb5b4 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -477,7 +477,8 @@ WINDOW must be an internal window.  Return WINDOW."
       (error "Window %s is not an internal window" window)
     (walk-window-subtree
      (lambda (window)
-       (set-window-parameter window 'window-atom t))
+       (unless (window-parameter window 'window-atom)
+         (set-window-parameter window 'window-atom t)))
      window t)
     window))
 
@@ -498,24 +499,39 @@ following symbols can be used.
   sibling of an atomic window's root.  If an internal window is
   specified here, all children of that window become part of the
   atomic window too.  If no window is specified, the new window
-  becomes a sibling of the selected window.
+  becomes a sibling of the selected window.  By default, the
+  `window-atom' parameter of the existing window is set to `main'
+  provided it is live and was not set before.
 
 `side' denotes the side of the existing window where the new
   window shall be located.  Valid values are `below', `right',
-  `above' and `left'.  The default is `below'.
+  `above' and `left'.  The default is `below'.  By default, the
+  `window-atom' parameter of the new window is set to this value.
 
 The return value is the new window, nil when creating that window
 failed."
-  (let ((ignore-window-parameters t)
-        (window-combination-limit t)
-        (window (cdr (assq 'window alist)))
-        (side (cdr (assq 'side alist)))
-        new)
+  (let* ((ignore-window-parameters t)
+         (window-combination-limit t)
+         (window-combination-resize 'atom)
+         (window (cdr (assq 'window alist)))
+         (side (cdr (assq 'side alist)))
+         (atom (when window (window-parameter window 'window-atom)))
+         root new)
     (setq window (window-normalize-window window))
-    ;; Split off new window
+    (setq root (window-atom-root window))
+    ;; Split off new window.
     (when (setq new (split-window window nil side))
-      ;; Make sure we have a valid atomic window.
-      (window-make-atom (window-parent window))
+      (window-make-atom
+       (if (and root (not (eq root window)))
+           ;; When WINDOW was part of an atomic window and we did not
+           ;; split its root, root atomic window at old root.
+           root
+         ;; Otherwise, root atomic window at WINDOW's new parent.
+         (window-parent window)))
+      ;; Assign `window-atom' parameters, if needed.
+      (when (and (not atom) (window-live-p window))
+        (set-window-parameter window 'window-atom 'main))
+      (set-window-parameter new 'window-atom side)
       ;; Display BUFFER in NEW and return NEW.
       (window--display-buffer
        buffer new 'window alist display-buffer-mark-dedicated))))
@@ -631,7 +647,7 @@ its root window."
                 (and (setq sibling (window-next-sibling window))
                      (window-parameter sibling 'window-side)))
             (setq major window)))
-     frame t)
+     frame t 'nomini)
     (or major (frame-root-window frame))))
 
 (defun window--major-side-window (side)
@@ -685,10 +701,8 @@ symbols and values as passed to `display-buffer-in-side-window'.
 This function may be called only if no window on SIDE exists yet.
 The new window automatically becomes the \"major\" side window on
 SIDE.  Return the new window, nil if its creation window failed."
-  (let* ((root (frame-root-window))
-         (left-or-right (memq side '(left right)))
+  (let* ((left-or-right (memq side '(left right)))
          (major (window--major-side-window side))
-         (selected-window (selected-window))
          (on-side (cond
                    ((eq side 'top) 'above)
                    ((eq side 'bottom) 'below)
@@ -698,8 +712,7 @@ SIDE.  Return the new window, nil if its creation window failed."
          ;; parent window unless needed.
          (window-combination-resize 'side)
          (window-combination-limit nil)
-         (new (split-window major nil on-side))
-         fun)
+         (new (split-window major nil on-side)))
     (when new
       ;; Initialize `window-side' parameter of new window to SIDE.
       (set-window-parameter new 'window-side side)
@@ -749,8 +762,7 @@ following symbols can be used:
   A positive value means use a slot following (that is, below or
   on the right of) the middle slot.  The default is zero."
   (let ((side (or (cdr (assq 'side alist)) 'bottom))
-        (slot (or (cdr (assq 'slot alist)) 0))
-        new)
+        (slot (or (cdr (assq 'slot alist)) 0)))
     (cond
      ((not (memq side '(top bottom left right)))
       (error "Invalid side %s specified" side))
@@ -766,7 +778,8 @@ following symbols can be used:
                 (walk-window-tree
                  (lambda (window)
                    (when (eq (window-parameter window 'window-side) side)
-                     (setq windows (cons window windows)))))
+                     (setq windows (cons window windows))))
+                 nil nil 'nomini)
                 (nreverse windows))))
            (slots (when major (max 1 (window-child-count major))))
            (max-slots
@@ -776,9 +789,8 @@ following symbols can be used:
                   ((eq side 'right) 2)
                   ((eq side 'bottom) 3))
                  window-sides-slots))
-           (selected-window (selected-window))
            window this-window this-slot prev-window next-window
-           best-window best-slot abs-slot new-window)
+           best-window best-slot abs-slot)
 
       (cond
        ((and (numberp max-slots) (<= max-slots 0))
@@ -924,14 +936,14 @@ of all windows on FRAME to nil."
                      (if bottom (throw 'reset t) (setq bottom t)))
                     (t
                      (throw 'reset t))))
-                 frame t))
+                 frame t 'nomini))
               ;; If there's a side window, there must be at least one
               ;; non-side window.
               (and (or left top right bottom) (not none)))
       (walk-window-tree
        (lambda (window)
          (set-window-parameter window 'window-side nil))
-       frame t))))
+       frame t 'nomini))))
 
 (defun window--check (&optional frame)
   "Check atomic and side windows on FRAME.
@@ -985,8 +997,8 @@ means ignore all of the above restrictions for all windows."
                 (setq value (+ value
                                (window--min-size-1 sub horizontal ignore)))
                 (setq sub (window-right sub)))
-            ;; The minimum size of an ortho-combination is the maximum of
-            ;; the minimum sizes of its child windows.
+            ;; The minimum size of an ortho-combination is the maximum
+            ;; of the minimum sizes of its child windows.
             (while sub
               (setq value (max value
                                (window--min-size-1 sub horizontal ignore)))
@@ -1486,7 +1498,7 @@ This function changes neither the order of recently selected
 windows nor the buffer list."
   ;; If we start from the minibuffer window, don't fail to come
   ;; back to it.
-  (when (window-minibuffer-p (selected-window))
+  (when (window-minibuffer-p)
     (setq minibuf t))
   ;; Make sure to not mess up the order of recently selected
   ;; windows.  Use `save-selected-window' and `select-window'
@@ -2813,10 +2825,11 @@ and no others."
 (defun window-deletable-p (&optional window)
   "Return t if WINDOW can be safely deleted from its frame.
 WINDOW must be a valid window and defaults to the selected one.
-Return `frame' if deleting WINDOW should also delete its frame."
+Return 'frame if deleting WINDOW should also delete its frame."
   (setq window (window-normalize-window window))
 
-  (unless ignore-window-parameters
+  (unless (or ignore-window-parameters
+              (eq (window-parameter window 'delete-window) t)) 
     ;; Handle atomicity.
     (when (window-parameter window 'window-atom)
       (setq window (window-atom-root window))))
@@ -2828,6 +2841,14 @@ Return `frame' if deleting WINDOW should also delete its frame."
       ;; on the same terminal, and it does not contain the active
       ;; minibuffer.
       (unless (or (eq frame (next-frame frame 0))
+                  ;; We can delete our frame only if no other frame
+                  ;; currently uses our minibuffer window.
+                  (catch 'other
+                    (dolist (other (frame-list))
+                      (when (and (not (eq other frame))
+                                 (eq (window-frame (minibuffer-window other))
+                                     frame))
+                        (throw 'other t))))
                   (let ((minibuf (active-minibuffer-window)))
                     (and minibuf (eq frame (window-frame minibuf)))))
         'frame))
@@ -3065,7 +3086,9 @@ WINDOW must be a live window and defaults to the selected one."
                                ;; (Bug#12588).
                                point window-point-insertion-type)))))
           (set-window-prev-buffers
-           window (cons entry (window-prev-buffers window))))))))
+           window (cons entry (window-prev-buffers window)))))
+
+      (run-hooks 'buffer-list-update-hook))))
 
 (defun unrecord-window-buffer (&optional window buffer)
   "Unrecord BUFFER in WINDOW.
@@ -3899,7 +3922,8 @@ frame.  The selected window is not changed by this function."
 
         (let* ((new (split-window-internal window new-size side new-normal)))
           ;; Assign window-side parameters, if any.
-          (when (eq window-combination-resize 'side)
+          (cond
+           ((eq window-combination-resize 'side)
             (let ((window-side
                    (cond
                     (window-side window-side)
@@ -3913,6 +3937,14 @@ frame.  The selected window is not changed by this function."
                 ;; new parent the same window-side parameter.
                 (set-window-parameter
                  (window-parent new) 'window-side window-side))))
+           ((eq window-combination-resize 'atom)
+            ;; Make sure `window--check-frame' won't destroy an existing
+            ;; atomic window in case the new window gets nested inside.
+            (unless (window-parameter window 'window-atom)
+              (set-window-parameter window 'window-atom t))
+            (when new-parent
+              (set-window-parameter (window-parent new) 'window-atom t))
+            (set-window-parameter new 'window-atom t)))
 
           (run-window-configuration-change-hook frame)
           (window--check frame)
@@ -5610,7 +5642,10 @@ new frame."
          (fun pop-up-frame-function)
          frame window)
     (when (and fun
-               (setq frame (funcall fun))
+               ;; Make BUFFER current so `make-frame' will use it as the
+               ;; new frame's buffer (Bug#15133).
+               (with-current-buffer buffer
+                 (setq frame (funcall fun)))
                (setq window (frame-selected-window frame)))
       (prog1 (window--display-buffer
               buffer window 'frame alist display-buffer-mark-dedicated)
@@ -5681,7 +5716,8 @@ This either splits the window at the bottom of the frame or the
 frame's root window, or reuses an existing window at the bottom
 of the selected frame."
   (let (bottom-window window)
-    (walk-window-tree (lambda (window) (setq bottom-window window)))
+    (walk-window-tree
+     (lambda (window) (setq bottom-window window)) nil nil 'nomini)
     (or (and (not (frame-parameter nil 'unsplittable))
              (setq window (window--try-to-split-window bottom-window alist))
              (window--display-buffer
@@ -5689,7 +5725,7 @@ of the selected frame."
         (and (not (frame-parameter nil 'unsplittable))
              (setq window
                    (condition-case nil
-                       (split-window (frame-root-window))
+                       (split-window (window--major-non-side-window))
                      (error nil)))
              (window--display-buffer
               buffer window 'window alist display-buffer-mark-dedicated))
@@ -5730,7 +5766,7 @@ above, even if that window never showed BUFFER before."
                    0)
                   (display-buffer-reuse-frames 0)
                   (t (last-nonminibuffer-frame))))
-         entry best-window second-best-window window)
+         best-window second-best-window window)
     ;; Scan windows whether they have shown the buffer recently.
     (catch 'best
       (dolist (window (window-list-1 (frame-first-window) 'nomini frames))
@@ -5777,7 +5813,7 @@ that frame."
                 (unless (and not-this-window
                              (eq window (selected-window)))
                   window))
-              (get-largest-window 0 not-this-window))))
+              (get-largest-window 0 nil not-this-window))))
     (when (window-live-p window)
       (prog1
           (window--display-buffer buffer window 'reuse alist)
@@ -5808,7 +5844,8 @@ at the front of the list of recently selected ones."
   (interactive (list (read-buffer "Pop to buffer: " (other-buffer))
                      (if current-prefix-arg t)))
   (setq buffer (window-normalize-buffer-to-switch-to buffer))
-  (set-buffer buffer)
+  ;; This should be done by `select-window' below.
+  ;; (set-buffer buffer)
   (let* ((old-frame (selected-frame))
          (window (display-buffer buffer action))
          (frame (window-frame window)))
@@ -6646,9 +6683,12 @@ is active.  This function is run by `mouse-autoselect-window-timer'."
      (cond
       ((or (menu-or-popup-active-p)
            (and window
-                (not (coordinates-in-window-p (cdr mouse-position) window))))
-       ;; A menu / popup dialog is active or the mouse is on the scroll-bar
-       ;; of WINDOW, temporarily suspend delayed autoselection.
+                (let ((coords (coordinates-in-window-p
+                               (cdr mouse-position) window)))
+                  (and (not (consp coords))
+                       (not (memq coords '(left-margin right-margin)))))))
+       ;; A menu / popup dialog is active or the mouse is not on the
+       ;; text region of WINDOW: Suspend autoselection temporarily.
        (mouse-autoselect-window-start mouse-position nil t))
       ((eq mouse-autoselect-window-state 'suspend)
        ;; Delayed autoselection was temporarily suspended, reenable it.
@@ -6676,7 +6716,7 @@ is active.  This function is run by `mouse-autoselect-window-timer'."
        ;; minibuffer.  Use `unread-command-events' in order to execute pre-
        ;; and post-command hooks and trigger idle timers.  To avoid delaying
        ;; autoselection again, set `mouse-autoselect-window-state'."
-       (unless (window-minibuffer-p (selected-window))
+       (unless (window-minibuffer-p)
          (setq mouse-autoselect-window-state 'select)
          (setq unread-command-events
                (cons (list 'select-window (list window))
@@ -6702,7 +6742,7 @@ is active.  This function is run by `mouse-autoselect-window-timer'."
                 ;; minibuffer gets unselected unexpectedly, and where
                 ;; you then have to move your mouse all the way down to
                 ;; the minibuffer to select it.
-                (window-minibuffer-p (selected-window))
+                (window-minibuffer-p)
                 ;; Don't switch to minibuffer window unless it's active.
                 (and (window-minibuffer-p window)
                      (not (minibuffer-window-active-p window)))
diff --git a/lisp/winner.el b/lisp/winner.el
index e7e7d0614b4..e81052f8499 100644
--- a/lisp/winner.el
+++ b/lisp/winner.el
@@ -227,8 +227,7 @@ You may want to include buffer names such as *Help*, *Apropos*,
       (set-window-configuration winconf))
     (cond
      ((window-live-p chosen) (select-window chosen))
-     ((window-minibuffer-p (selected-window))
-      (other-window 1)))
+     ((window-minibuffer-p) (other-window 1)))
     (when (/= minisize (window-height miniwin))
       (with-selected-window miniwin
         (setf (window-height) minisize)))))
@@ -381,7 +380,7 @@ In other words, \"undo\" changes in window configuration."
         (setq winner-undone-data (list (winner-win-data))))
       (cl-incf winner-undo-counter)     ; starting at 1
       (when (and (winner-undo-this)
-                 (not (window-minibuffer-p (selected-window))))
+                 (not (window-minibuffer-p)))
         (message "Winner undo (%d / %d)"
                  winner-undo-counter
                  (1- (ring-length winner-pending-undo-ring)))))))
diff --git a/lisp/woman.el b/lisp/woman.el
index 1cead32ab2f..b1be2d67b62 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -438,7 +438,7 @@ As a special case, if PATHS is nil then replace it by calling
   (if (memq system-type '(windows-nt ms-dos))
       (cond ((null paths)
              (mapcar 'woman-Cyg-to-Win (woman-parse-man.conf)))
-            ((string-match ";" paths)
+            ((string-match-p ";" paths)
              ;; Assume DOS-style path-list...
              (woman-mapcan              ; splice list into list
               (lambda (x)
@@ -446,7 +446,7 @@ As a special case, if PATHS is nil then replace it by calling
                     (list x)
                   (mapcar 'woman-Cyg-to-Win (woman-parse-man.conf))))
               (parse-colon-path paths)))
-            ((string-match "\\`[a-zA-Z]:" paths)
+            ((string-match-p "\\`[a-zA-Z]:" paths)
              ;; Assume single DOS-style path...
              (list paths))
             (t
@@ -974,7 +974,7 @@ This is usually either black or white."
     ;; With NTEmacs 20.5, the PATTERN option to `x-list-fonts' does
     ;; not seem to work and fonts may be repeated, so ...
     (dolist (font fonts)
-      (and (string-match "-Symbol-" font)
+      (and (string-match-p "-Symbol-" font)
            (not (member font symbol-fonts))
            (setq symbol-fonts (cons font symbol-fonts))))
     symbol-fonts))
@@ -1173,7 +1173,7 @@ Used non-interactively, arguments are optional: if given then TOPIC
 should be a topic string and non-nil RE-CACHE forces re-caching."
   (interactive (list nil current-prefix-arg))
   ;; The following test is for non-interactive calls via gnudoit etc.
-  (if (or (not (stringp topic)) (string-match "\\S " topic))
+  (if (or (not (stringp topic)) (string-match-p "\\S " topic))
       (let ((file-name (woman-file-name topic re-cache)))
         (if file-name
             (woman-find-file file-name)
@@ -1614,7 +1614,7 @@ decompress the file if appropriate.  See the documentation for the
         (let* ((bufname (file-name-nondirectory file-name))
                (case-fold-search t)
                (compressed
-                (not (not (string-match woman-file-compression-regexp bufname)))))
+                (and (string-match-p woman-file-compression-regexp bufname) t)))
           (if compressed
               (setq bufname (file-name-sans-extension bufname)))
           (setq bufname (if exists
@@ -1756,7 +1756,7 @@ Leave point at end of new text.  Return length of inserted text."
       ;; Co-operate with auto-compression mode:
       (if (and compressed
                (or (eq compressed t)
-                   (string-match woman-file-compression-regexp filename))
+                   (string-match-p woman-file-compression-regexp filename))
                ;; (not auto-compression-mode)
                (not (rassq 'jka-compr-handler file-name-handler-alist)) )
           ;; (error "Compressed file requires Auto File Decompression turned on")
@@ -2192,7 +2192,7 @@ To be called on original buffer and any .so insertions."
   (let ((face-list (face-list)))
     (dolist (face face-list)
       (let ((face-name (symbol-name face)))
-        (if (and (string-match "\\`woman-" face-name)
+        (if (and (string-match-p "\\`woman-" face-name)
                  (face-underline-p face))
             (let ((face-no-ul (intern (concat face-name "-no-ul"))))
               (copy-face face face-no-ul)
@@ -3029,6 +3029,8 @@ Leave point at TO (which should be a marker)."
   "Delete any double-quote characters up to the end of the line."
   (woman-unquote (save-excursion (end-of-line) (point-marker))))
 
+(defvar woman1-unquote)          ; bound locally by woman1-roff-buffer
+
 (defun woman1-roff-buffer ()
   "Process non-breaking requests."
   (let ((case-fold-search t)
@@ -3069,8 +3071,6 @@ Leave point at TO (which should be a marker)."
   ".I -- Set words of current line in italic font."
   (woman1-B-or-I ".ft I\n"))
 
-(defvar woman1-unquote)          ; bound locally by woman1-roff-buffer
-
 (defun woman1-B-or-I (B-or-I)
   ".B/I -- Set words of current line in bold/italic font.
 B-OR-I is the appropriate complete control line."
diff --git a/lisp/xml.el b/lisp/xml.el
index a3d34670bfb..b62065eb48f 100644
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -479,7 +479,7 @@ Return one of:
                  xml-default-ns))))
     (cond
      ;; Processing instructions, like <?xml version="1.0"?>.
-     ((looking-at "<\\?")
+     ((looking-at-p "<\\?")
       (search-forward "?>")
       (skip-syntax-forward " ")
       (xml-parse-tag-1 parse-dtd xml-ns))
@@ -492,14 +492,14 @@ Return one of:
          (buffer-substring-no-properties pos (match-beginning 0))
          (xml-parse-string))))
      ;; DTD for the document
-     ((looking-at "<!DOCTYPE[ \t\n\r]")
+     ((looking-at-p "<!DOCTYPE[ \t\n\r]")
       (let ((dtd (xml-parse-dtd parse-ns)))
         (skip-syntax-forward " ")
         (if xml-validating-parser
             (cons dtd (xml-parse-tag-1 nil xml-ns))
           (xml-parse-tag-1 nil xml-ns))))
      ;; skip comments
-     ((looking-at "<!--")
+     ((looking-at-p "<!--")
       (search-forward "-->")
       ;; FIXME: This loses the skipped-over spaces.
       (skip-syntax-forward " ")
@@ -507,7 +507,7 @@ Return one of:
         (let ((xml-sub-parser t))
           (xml-parse-tag-1 parse-dtd xml-ns))))
      ;; end tag
-     ((looking-at "</")
+     ((looking-at-p "</")
       '())
      ;; opening tag
      ((looking-at (eval-when-compile (concat "<\\(" xml-name-re "\\)")))
@@ -530,7 +530,7 @@ Return one of:
         (setq children (list attrs (xml-maybe-do-ns node-name "" xml-ns)))
         (cond
          ;; is this an empty element ?
-         ((looking-at "/>")
+         ((looking-at-p "/>")
           (forward-char 2)
           (nreverse children))
          ;; is this a valid start tag ?
@@ -543,7 +543,7 @@ Return one of:
                ((eobp)
                 (error "XML: (Not Well-Formed) End of document while reading element `%s'"
                        node-name))
-               ((looking-at "</")
+               ((looking-at-p "</")
                 (forward-char 2)
                 (error "XML: (Not Well-Formed) Invalid end tag `%s' (expecting `%s')"
                        (let ((pos (point)))
@@ -591,7 +591,7 @@ references."
         (old-remaining-size (- (buffer-size) (point)))
         ref val)
     (while (and (not (eobp))
-                (not (looking-at "<")))
+                (not (looking-at-p "<")))
       ;; Find the next < or & character.
       (skip-chars-forward "^<&")
       (when (eq (char-after) ?&)
@@ -690,11 +690,11 @@ This follows the rule [28] in the XML specifications."
   (let ((xml-validating-parser nil))
     (xml-parse-dtd)))
 
-(defun xml-parse-dtd (&optional parse-ns)
+(defun xml-parse-dtd (&optional _parse-ns)
   "Parse the DTD at point."
   (forward-char (eval-when-compile (length "<!DOCTYPE")))
   (skip-syntax-forward " ")
-  (if (and (looking-at ">")
+  (if (and (looking-at-p ">")
            xml-validating-parser)
       (error "XML: (Validity) Invalid DTD (expecting name of the document)"))
 
@@ -755,7 +755,7 @@ This follows the rule [28] in the XML specifications."
 
       ;; Parse the rest of the DTD
       ;; Fixme: Deal with NOTATION, PIs.
-      (while (not (looking-at "\\s-*\\]"))
+      (while (not (looking-at-p "\\s-*\\]"))
         (skip-syntax-forward " ")
         (cond
          ((eobp)
@@ -771,14 +771,14 @@ This follows the rule [28] in the XML specifications."
                 (end-pos (match-end 0)))
             ;; Translation of rule [46] of XML specifications
             (cond
-             ((string-match "\\`EMPTY\\s-*\\'" type)  ; empty declaration
+             ((string-match-p "\\`EMPTY\\s-*\\'" type)  ; empty declaration
               (setq type 'empty))
-             ((string-match "\\`ANY\\s-*$" type)      ; any type of contents
+             ((string-match-p "\\`ANY\\s-*$" type)      ; any type of contents
               (setq type 'any))
              ((string-match "\\`(\\(.*\\))\\s-*\\'" type) ; children ([47])
               (setq type (xml-parse-elem-type
                           (match-string-no-properties 1 type))))
-             ((string-match "^%[^;]+;[ \t\n\r]*\\'" type) ; substitution
+             ((string-match-p "^%[^;]+;[ \t\n\r]*\\'" type) ; substitution
               nil)
              (xml-validating-parser
               (error "XML: (Validity) Invalid element type in the DTD")))
@@ -803,7 +803,7 @@ This follows the rule [28] in the XML specifications."
           (goto-char (match-end 0)))
 
          ;; Comments (skip to end, ignoring parameter entity):
-         ((looking-at "<!--")
+         ((looking-at-p "<!--")
           (search-forward "-->")
           (and next-parameter-entity
                (> (point) next-parameter-entity)
@@ -856,7 +856,6 @@ This follows the rule [28] in the XML specifications."
             (unless (looking-at xml-pe-reference-re)
               (error "XML: Internal error"))
             (let* ((entity (match-string 1))
-                   (beg    (point-marker))
                    (elt    (assoc entity xml-parameter-entity-alist)))
               (if elt
                   (progn
@@ -916,11 +915,11 @@ references and parameter-entity references."
         (progn
           (setq elem     (match-string-no-properties 1 string)
                 modifier (match-string-no-properties 2 string))
-          (if (string-match "|" elem)
+          (if (string-match-p "|" elem)
               (setq elem (cons 'choice
                                (mapcar 'xml-parse-elem-type
                                        (split-string elem "|"))))
-            (if (string-match "," elem)
+            (if (string-match-p "," elem)
                 (setq elem (cons 'seq
                                  (mapcar 'xml-parse-elem-type
                                          (split-string elem ",")))))))
@@ -987,13 +986,12 @@ by \"*\"."
   (if (and string (stringp string))
       (let ((start 0))
         (while (string-match "&#\\([0-9]+\\);" string start)
-          (condition-case nil
-              (setq string (replace-match
-                            (string (read (substring string
-                                                     (match-beginning 1)
-                                                     (match-end 1))))
-                            nil nil string))
-            (error nil))
+          (ignore-errors
+            (setq string (replace-match
+                          (string (read (substring string
+                                                   (match-beginning 1)
+                                                   (match-end 1))))
+                          nil nil string)))
           (setq start (1+ (match-beginning 0))))
         string)
     nil))