Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

author: K. Handa 2015-10-05 22:56:26 +0900
committer: K. Handa 2015-10-05 22:56:26 +0900
commit: 47e9556c70a7009d7c750fd7bf10a0e6cf41cdce (patch)
tree: 4e944bd68080adee76291dd7d4f34103e2b55d50
parent: 52beda922d2cb523a03661bf74b8678c8b45e440 (diff)
parent: ef171d1d0b42758b5f705847d558436e867372f4 (diff)
download: emacs-47e9556c70a7009d7c750fd7bf10a0e6cf41cdce.tar.gz
emacs-47e9556c70a7009d7c750fd7bf10a0e6cf41cdce.zip
141 files changed, 3152 insertions, 1249 deletions
diff --git a/CONTRIBUTE b/CONTRIBUTE
index 609ab7acb6b..4d5d08a0fd5 100644
--- a/CONTRIBUTE
+++ b/CONTRIBUTE
@@ -201,6 +201,20 @@ then exclude that commit from the merge to trunk.
 ** Other process information
+*** Non-ASCII characters in Emacs files
+If you introduce non-ASCII characters into Emacs source files, it is a
+good idea to add a 'coding' cookie to the file to state its encoding.
+Please use the UTF-8 encoding unless it cannot do the job for some
+good reason.  As of Emacs 24.4, it is no longer necessary to have
+explicit 'coding' cookies in *.el files if they are encoded in UTF-8,
+but other files need them even if encoded in UTF-8.  However, if
+an *.el file is intended for use with older Emacs versions (e.g. if
+it's also distributed via ELPA), having an explicit encoding
+specification is still a good idea.
+*** Useful files in the admin/ directory
 See all the files in admin/notes/* .  In particular, see
 admin/notes/newfile, see admin/notes/repo.
diff --git a/ChangeLog.2 b/ChangeLog.2
index 0fb3df621c8..94c850884b5 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -1,3 +1,1082 @@
+2015-10-04  Eli Zaretskii  <eliz@gnu.org>
+            Michael Heerdegen  <michael_heerdegen@web.de>
+        shr: fix too long lines in rendered buffers (Bug#21012)
+        * lisp/net/shr.el (shr-insert-document, shr-fill-text):
+        Correct calculation of available width.
+        (shr-find-fill-point): Don't overflow window edge if shr-kinsoku-shorten
+        is nil.
+2015-10-04  Vincent Belaïche  <vincentb1@users.sourceforge.net>
+        Restore blank line before next section, erroneously erased in my previous commit
+        * etc/compilation.txt (symbol ant): add an additional trailing blank line to this section, so that there are two of them immediately before the next section
+2015-10-04  Vincent Belaïche  <vincentb1@users.sourceforge.net>
+        Support MSW filename style for ant compilation error regexp
+        * etc/compilation.txt (symbol ant):
+        * lisp/progmodes/compile.el (compilation-error-regexp-alist-alist): Support MSW filename style
+2015-10-03  Paul Eggert  <eggert@cs.ucla.edu>
+        * nt/INSTALL: Minor spelling and quote fixes.
+        * lisp/ibuffer.el: Fix docstring length (Bug#21541).
+2015-10-03  Simen Heggestøyl  <simenheg@gmail.com>
+        Maintain ordering of JSON object keys by default
+        * lisp/json.el (json-object-type): Mention order handling in doc-string.
+        (json--plist-reverse): New utility function.
+        (json-read-object): Maintain ordering for alists and plists.
+        (json-pretty-print): Ensure that ordering is maintained.
+        * test/automated/json-tests.el (test-json-plist-reverse): New test for
+        `json--plist-reverse'.
+        (json-read-simple-alist): Update test to accommodate for changes in
+        `json-read-object'.
+        * etc/NEWS: Document the new behavior of the pretty printing functions.
+2015-10-03  Andreas Schwab  <schwab@linux-m68k.org>
+                * src/coding.c (complement_process_encoding_system): Revert last
+                change.
+2015-10-03  Ulf Jasper  <ulf.jasper@web.de>
+        Add entry for Ulf Jasper.
+2015-10-03  Xue Fuqiao  <xfq.free@gmail.com>
+        Doc fix for `defmacro'
+        * doc/lispref/objects.texi (Macro Type): `defmacro' is a macro now.
+2015-10-03  Andreas Schwab  <schwab@linux-m68k.org>
+        More validatation of coding systems
+        * src/fileio.c (Finsert_file_contents): Remove redundant
+        coding-system check.
+        (choose_write_coding_system): Likewise.
+        * src/coding.c (complement_process_encoding_system): Check
+        argument for valid coding system.
+2015-10-03  Eli Zaretskii  <eliz@gnu.org>
+        Avoid crashes in coding_inherit_eol_type
+        * src/coding.c (coding_inherit_eol_type): Check the validity of
+        the arguments.  Suggested by Andreas Schwab <schwab@linux-m68k.org>.
+        (Bug#21602)
+2015-10-03  Eli Zaretskii  <eliz@gnu.org>
+        More validatation of coding system in 'write-region'
+        * src/coding.c (choose_write_coding_system): More validation of
+        coding-system from various sources.  Suggested by Andreas Schwab
+        <schwab@linux-m68k.org>.  (Bug#21602)
+2015-10-03  Eli Zaretskii  <eliz@gnu.org>
+        Avoid crashes due to invalid coding-system
+        * src/fileio.c (choose_write_coding_system)
+        (Finsert_file_contents): Check validity of coding-system-for-write
+        and coding-system-for-read bound by the caller.  (Bug#21602)
+2015-10-03  Tassilo Horn  <tsdh@gnu.org>
+        Adapt to new prettify-symbols-unprettify-at-point default
+        * etc/NEWS: Mention that unprettication of symbol at point is off by
+        default.
+2015-10-03  Tassilo Horn  <tsdh@gnu.org>
+        Revert my two recent process.c changes
+        Revert "Improve last commit to process.c" and "Remove callback-handled
+        channels from Available set" because they did not fix bug#21313.
+        This reverts commits bfa1aa8e2bdaf14adbbf1e9e824051d3f740694c and
+        27f871907cc24f33a7d12ac3a4ab71a88f0bc554..
+2015-10-02  Markus Triska  <triska@metalevel.at>
+        * prolog.el: Update and extend operator table
+        (prolog-smie-grammar): Add multifile, public etc.
+2015-10-02  Paul Eggert  <eggert@cs.ucla.edu>
+        Allow autogen even when Git is not installed
+        * autogen.sh: Test ‘git status’ before trying to use Git.
+2015-10-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * lisp/vc/vc-git.el (vc-git-region-history): Handle local changes
+        Adjust lto/lfrom when we have uncommitted changes.
+2015-10-02  Paul Eggert  <eggert@cs.ucla.edu>
+        Fix problems found by clang 3.5.0
+        * src/cmds.c (Fdelete_char): Don’t assume XINT returns int.
+        * src/font.c (font_parse_family_registry):
+        Use &"str"[X] instead of "str"+X, to pacify clang -Wstring-plus-int.
+2015-10-02  Eli Zaretskii  <eliz@gnu.org>
+        * nt/INSTALL: Update instructions for running autogen.sh
+        * nt/INSTALL: Point to ezwinports for libXpm binaries.
+2015-10-02  Daniel Colascione  <dancol@dancol.org>
+        Fix winner in cl-lib not loaded case
+        * lisp/winner.el (winner-change-fun): Don't use cl-lib functions
+        without requiring CL
+2015-10-02  Paul Eggert  <eggert@cs.ucla.edu>
+        Fix a few problems with directed quotes
+        This is in response to a problem report by Kaushal Modi in:
+        http://bugs.gnu.org/21588#25
+        * lisp/cedet/mode-local.el (describe-mode-local-overload):
+        * lisp/emacs-lisp/bytecomp.el (byte-compile-fix-header):
+        * lisp/info-xref.el (info-xref-check-all-custom):
+        * lisp/mail/emacsbug.el (report-emacs-bug-hook):
+        Prefer directed to undirected single quotes in diagnostics.
+2015-10-01  Eli Zaretskii  <eliz@gnu.org>
+        Revert "Attempt to fix slow redisplay caused by last changes"
+        * src/xdisp.c (try_window_id, try_window_reusing_current_matrix)
+        (try_cursor_movement): Don't relax requirements for redisplay
+        optimizations for the selected frame.  (Bug#21597)
+        This reverts commit c4c1fb97727ff52bcfa83ad5ed94a64a93d12e59.
+2015-10-01  Eli Zaretskii  <eliz@gnu.org>
+        Fix slow redisplay when daemon frame exists
+        * src/xdisp.c (redisplay_internal): Don't consider daemon frames
+        when looking for frames that need to be redisplayed.  (Bug#21597)
+2015-10-01  Eli Zaretskii  <eliz@gnu.org>
+        Attempt to fix slow redisplay caused by last changes
+        * src/xdisp.c (try_window_id, try_window_reusing_current_matrix)
+        (try_cursor_movement): Relax requirements for redisplay
+        optimizations for the selected frame.  (Bug#21597)
+2015-10-01  Stephen Leake  <stephen_leake@stephe-leake.org>
+        Improve doc strings in dired.c
+        * src/dired.c (Ffile_name_completion, Ffile_name_all_completions):
+        Improve doc string.
+2015-10-01  Stephen Leake  <stephen_leake@stephe-leake.org>
+        Set default base-size in minibuffer-completion-help
+        * lisp/minibuffer.el (minibuffer-completion-help): Set default base-size,
+        in case completion table does not set it.
+2015-10-01  Eli Zaretskii  <eliz@gnu.org>
+        Fix GUD display of GDB output with non-ASCII text
+        * lisp/progmodes/gdb-mi.el (gdb-mi-decode-strings): New defcustom.
+        (gdb-mi-decode): New function.
+        (gud-gdbmi-marker-filter): If gdb-mi-decode-strings is non-nil,
+        decode octal escapes in GDB output.  (Bug#21572)
+2015-10-01  Eli Zaretskii  <eliz@gnu.org>
+        * nt/INSTALL: Document where to find XPM support files
+2015-10-01  Tassilo Horn  <tsdh@gnu.org>
+        Un- and re-prettification are not exclusive
+        * lisp/progmodes/prog-mode.el (prettify-symbols--post-command-hook):
+        Re-apply prettification to previous symbol also when unprettifying next
+        one.
+2015-10-01  Tassilo Horn  <tsdh@gnu.org>
+        Don't unprettify symbol at point by default
+        * lisp/progmodes/prog-mode.el (prettify-symbols-unprettify-at-point):
+        Default to disabled (nil).
+2015-09-30  Artur Malabarba  <bruce.connor.am@gmail.com>
+        * lisp/progmodes/prog-mode.el (prettify-symbols-unprettify-at-point):
+        Support unprettifying when point is after a symbol.
+        * etc/NEWS: Document `prettify-symbols-unprettify-at-point'
+2015-09-30  Eli Zaretskii  <eliz@gnu.org>
+        Avoid assertion violations in push_prefix_prop
+        * src/xdisp.c (push_prefix_prop): Avoid assertion violations when
+        a line that has a line-prefix defined starts with an image.  (Bug#21428)
+2015-09-30  Eli Zaretskii  <eliz@gnu.org>
+        Disable some display optimizations when frames need redisplay
+        These optimizations were previously disabled by the
+        windows_or_buffers_changed flag, which now is not set
+        when only some frames need to be redrawn.
+        * src/xdisp.c (redisplay_internal): Redisplay any frame whose
+        'redisplay' flag is set.
+        (try_window_reusing_current_matrix, try_window_id)
+        (try_cursor_movement): Disable these optimizations when the
+        frame's 'redisplay' flag is set.
+2015-09-30  Tassilo Horn  <tsdh@gnu.org>
+        Don't modify buffer by unprettification
+        * lisp/progmodes/prog-mode.el (prettify-symbols--compose-symbol):
+        (prettify-symbols--post-command-hook, prettify-symbols-mode): Don't
+        modify buffer when setting/removing custom prettify-symbols-start/end
+        text properties.  Add them to font-lock-extra-managed-props, too.
+2015-09-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+        Try to avoid redisplaying all frames when creating a new one
+        * src/xfns.c (x_set_menu_bar_lines, x_change_tool_bar_height):
+        * src/xfaces.c (Finternal_make_lisp_face, Finternal_copy_lisp_face)
+        (Finternal_set_lisp_face_attribute, update_face_from_frame_parameter):
+        * src/frame.c (x_set_screen_gamma): Set the specific frame's
+        `redisplay' bit rather than windows_or_buffers_changed.
+        * src/window.c (apply_window_adjustment): Remove redundant setting of
+        windows_or_buffers_changed.
+        * src/xdisp.c (redisplay_internal): Set the specific frame's
+        `redisplay' bit rather than update_mode_lines in response to
+        cursor_type_changed.
+        (syms_of_xdisp): Use hash-tables for redisplay_*_cause tables.
+        (AINC): Adjust accordingly.
+2015-09-30  Tassilo Horn  <tsdh@gnu.org>
+        Implement unprettification of symbol at point
+        * lisp/progmodes/prog-mode.el: Implement feature for unprettifying the
+        symbol at point.
+        (prettify-symbols--current-symbol-bounds): New variable.
+        (prettify-symbols--post-command-hook): New function.
+        (prettify-symbols-unprettify-at-point): New defcustom.
+        (prettify-symbols-mode): Use it.
+        (prettify-symbols--compose-symbol): Use them.
+2015-09-30  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+        * src/macfont.m (mac_font_descriptor_supports_languages): Regard "zh" as synonym of "zh-Hans".
+2015-09-30  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+        Work around crash when displaying etc/HELLO on OS X 10.11
+        * src/macfont.m (mac_font_get_weight)
+        (mac_font_descriptor_get_adjusted_weight): New functions.
+        (macfont_store_descriptor_attributes): Adjust weight.
+2015-09-30  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+        * src/macfont.m: Fix compilation with USE_CT_GLYPH_INFO.
+2015-09-30  Nicolas Petton  <nicolas@petton.fr>
+        * lisp/arc-mode.el (archive-rar-summarize): Better alignment of the columns.
+2015-09-30  Nicolas Petton  <nicolas@petton.fr>
+        Use unar and lsar to handle RAR archives in arc-mode
+        * lisp/arc-mode.el (archive-rar-extract, archive-extract-by-file): Rely
+        on unar and lsar instead of unrar-free for RAR archives (Bug#17663).
+2015-09-30  Wieland Hoffmann  <themineo@gmail.com>  (tiny change)
+        Clarify :create in auth-source's docs
+        * auth-source.el (auth-source-search): Clarify :create's meaning.
+2015-09-30  Phil Sainty  <psainty@orcon.net.nz>
+        Avoid empty -path arguments in rgrep
+        * lisp/progmodes/grep.el (rgrep-default-command): Remove nil from
+        the list produced according to grep-find-ignored-directories,
+        before passing it to Find/Grep invocation.  (Bug#21548)
+2015-09-30  Eli Zaretskii  <eliz@gnu.org>
+        Clarify documentation of pos-visible-in-window-p
+        * src/window.c (Fpos_visible_in_window_p): Clarify the meaning of
+        t for POS.  See
+        http://lists.gnu.org/archive/html/emacs-devel/2015-09/msg01040.html
+        for the original report.
+        * doc/lispref/windows.texi (Window Start and End): Clarify the
+        meaning of t for the POSITION argument of pos-visible-in-window-p.
+2015-09-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * lisp/progmodes/prolog.el: Fix various indentation cases
+        (prolog-operator-chars): New const (add \\).
+        (prolog-smie-forward-token, prolog-smie-backward-token): Use it.
+        (prolog-smie-rules): Add rules according to bug#21526.
+2015-09-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * lisp/progmodes/sh-script.el: Old "dumb" continued line indent
+        (sh-indent-after-continuation): Add new value `always' (bug#17620)
+        (sh-smie-sh-rules): Remove old handling of continued lines.
+        (sh-smie--indent-continuation): New function.
+        (sh-set-shell): Use it.
+2015-09-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * lisp/progmodes/octave.el: Use grammar more; Handle enumeration fun
+        Remove redundant :group keyword args.
+        (octave-begin-keywords, octave-else-keywords, octave-end-keywords):
+        Remove variables.
+        (octave-operator-table, octave-smie-bnf-table): Use let-when-compile to
+        turn them into compile-time variables.
+        Auto-generate the "foo ... end" rules from the "foo ... endfoo" rules.
+        Add rules for break, continue, return, global, and persistent.
+        Refine the rule for "until".
+        (octave-smie--funcall-p, octave-smie--end-index-p)
+        (octave-smie--in-parens-p): New functions.
+        (octave-smie-backward-token, octave-smie-forward-token): Use them to
+        distinguish the "enumeration" function and the "end" index from
+        their corresponding keywords.
+        (octave--block-offset-keywords): New constant.
+        (octave-smie-rules): Use it.  Adjust rules for new global/persistent parsing.
+        (octave-reserved-words): Redefine using octave-smie-grammar.
+        (octave-font-lock-keywords): Use octave-smie--funcall-p and
+        octave-smie--end-index-p.
+2015-09-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * lisp/emacs-lisp/lisp-mode.el (let-when-compile): Work like let*
+2015-09-29  Eli Zaretskii  <eliz@gnu.org>
+        nt/INSTALL: Remove references to GTK site
+        That site no longer offers Windows downloads.
+2015-09-29  Eli Zaretskii  <eliz@gnu.org>
+        * nt/INSTALL: Add instructions for installing Git.
+2015-09-29  Katsumi Yamaoka  <yamaoka@jpl.org>
+        * net/shr.el (shr-colorize-region): Allow 88-color tty to use colors.
+        Suggested by Eli Zaretskii.
+2015-09-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+        * net/shr.el (shr-colorize-region):
+        Don't do it on a system not supporting 256 above colors (bug#21557).
+2015-09-28  Dmitry Gutov  <dgutov@yandex.ru>
+        Revert "Don't rely on defaults in decoding UTF-8 encoded Lisp files"
+        This reverts commit db828f62f6f17414fbbc3206dac123dc73dd6055.
+2015-09-28  Nicolas Petton  <nicolas@petton.fr>
+        Add documentation for seq.el
+        * doc/lispref/sequences.texi: Add documentation regarding extending
+        seq.el, as well as missing documentation for seq-elt, seq-length, seq-p,
+        seq-do and seq-map.
+2015-09-28  Nicolas Petton  <nicolas@petton.fr>
+        Better documentation for seq-some
+        * doc/lispref/sequences.texi:
+        * lisp/emacs-lisp/seq.el: Update the documentation of seq-some to
+        guarantee that the returned value is the first non-nil value that
+        resulted from applying the predicate.
+2015-09-28  Nicolas Petton  <nicolas@petton.fr>
+        * lisp/arc-mode.el: Sharp-quote function arguments.
+2015-09-28  Eli Zaretskii  <eliz@gnu.org>
+        Avoid redisplay error in ediff-regions-wordwise
+        * lisp/vc/ediff-util.el
+        (ediff-clone-buffer-for-region-comparison): Make sure the mark is
+        set before activating it.  (Bug#21567)
+2015-09-28  Eli Zaretskii  <eliz@gnu.org>
+        Another attempt to fix crashes due to prematurely freed faces
+        * src/xdisp.c (redisplay_internal): Inhibit freeing of realized
+        faces for as long as we might have desired matrices that reference
+        those faces.  (Bug#21428)
+2015-09-28  Tassilo Horn  <tsdh@gnu.org>
+        Add auctex development list email address
+2015-09-28  Tassilo Horn  <tsdh@gnu.org>
+        Add admin/MAINTAINERS entries
+        * admin/MAINTAINERS: Add entries for AUCTeX team and myself.
+2015-09-28  (tiny change) Arash Esbati  <esbati@gmx.de>  (tiny change)
+        Improve wrapfig package support and caption parsing
+        * lisp/textmodes/reftex-vars.el (reftex-label-alist-builtin): Correct
+        description string and add wraptable environment.
+        (reftex-default-context-regexps): Improve caption regexp.
+2015-09-28  Anders Lindgren  <andlind@gmail.com>
+        Respect value of frame_resize_pixelwise when handling fullscreen state.
+        * src/nsterm.m (handleFS): Respect frame_resize_pixelwise when
+        setting size increments.
+2015-09-27  Michael Albinus  <michael.albinus@gmx.de>
+        * src/gfilenotify.c (Fgfile_add_watch): Cleanup temporary variable.
+2015-09-27  Simen Heggestøyl  <simenheg@gmail.com>
+        Add prettify-symbols-alist for js-mode
+        * lisp/progmodes/js.el (js--prettify-symbols-alist): New defconst.
+        (js-mode): Use it.
+2015-09-27  Eli Zaretskii  <eliz@gnu.org>
+        * nt/subdirs.el: File deleted (no longer used).
+2015-09-26  Alan Mackenzie  <acm@muc.de>
+        Fix follow-scroll-up/down, making them replacements for scroll-up/down.
+        1. Allow point to move between follow windows in scroll operations.
+        2. Fix bug where `right-char' just before EOB caused spurious scrolling,
+        when EOB was isolated in the last follow window.
+        lisp/follow.el (follow-fixed-window): New variable.
+        (follow-get-scrolled-point): New function.
+        (follow-scrol-up, follow-scroll-down): Add autoload cookies.
+        Reformulate
+        the code.  Put `scroll-command' properties on the functions.  Correct
+        minor errors in ...-down's doc string and code.
+        (follow-calc-win-end): Amend incomplete doc string.  Use
+        `pos-visible-in-window-p' to check whether EOB is in the window.
+        (follow-estimate-first-window-start): Correct an off-by-1 error.
+        (follow-adjust-window): Add handling for explicit scrolling operations.
+2015-09-26  Paul Eggert  <eggert@cs.ucla.edu>
+        * admin/MAINTAINERS: Add self, plus list some more files sans maintaners.
+2015-09-26  Zachary Kanfer  <zkanfer@gmail.com>  (tiny change)
+        New DWIM commands for changing letter-case
+        * lisp/simple.el (upcase-dwim, downcase-dwim, capitalize-dwim):
+        New functions.  (Bug#21501)
+2015-09-26  Eli Zaretskii  <eliz@gnu.org>
+        * etc/PROBLEMS: Document problems with pasting on MS-Windows
+2015-09-26  Eli Zaretskii  <eliz@gnu.org>
+        Make face realization be more frame-specific
+        * src/frame.h (struct f): New flag face_change.
+        * src/xfaces.c (Finternal_make_lisp_face)
+        (Finternal_copy_lisp_face, Finternal_set_lisp_face_attribute)
+        (update_face_from_frame_parameter): Set the face_change flag only
+        for the frame whose faces are affected.
+        * src/xdisp.c (init_iterator): If a frame's face_change flag is
+        set, free faces only on that frame.
+        (redisplay_internal): Disable "display optimization 1" if the
+        frame's face_change flag is set.
+        (redisplay_window): Don't allow skipping a window's redisplay if
+        its frame's face_change flag is set.
+        * src/frame.c (x_set_screen_gamma): Instead of calling
+        Fclear_face_cache, call clear_face_cache and set
+        windows_or_buffers_changed to a non-zero value.  This avoids
+        setting the global face_change flag that triggers face realization
+        on all frames and thorough redisplay of all of them.
+        * lisp/term/tty-colors.el (tty-register-default-colors): Don't
+        clear face cache if the selected frame is a GUI frame.
+2015-09-26  Tassilo Horn  <tsdh@gnu.org>
+        Remove font-latex specific check
+        * lisp/textmodes/tex-mode.el (tex--prettify-symbols-compose-p): Use
+        syntax-ppss data to identify verbatim contents.
+2015-09-25  Tassilo Horn  <tsdh@gnu.org>
+        Fix false negatives in tex--prettify-symbols-compose-p.
+        * lisp/textmodes/tex-mode.el (tex--prettify-symbols-compose-p): Fix some
+        false negatives.
+2015-09-25  Eli Zaretskii  <eliz@gnu.org>
+        Reorder Windows version in Emacs manifests
+        * nt/emacs-x64.manifest:
+        * nt/emacs-x86.manifest: Reorder Windows version from lowest to
+        highest.
+2015-09-25  Eli Zaretskii  <eliz@gnu.org>
+        Update Emacs manifest files for Windows 10
+        * nt/emacs-x86.manifest:
+        * nt/emacs-x64.manifest: Declare compatibility with Windows 10.
+2015-09-25  Eli Zaretskii  <eliz@gnu.org>
+        Avoid non-ASCII decoding errors in C src files
+        * src/nsterm.m:
+        * src/lisp.h:
+        * src/editfns.c:
+        * src/doprnt.c: Add 'coding' cookies -- these files include
+        Unicode characters and should be decoded as UTF-8.
+2015-09-25  Alan Mackenzie  <acm@muc.de>
+        Resurrect edebug-set-initial-mode, repurposing it to set the global mode.
+        lisp/emacs-lisp/edebug.el (edebug-initial-mode-alist): Uncomment, and
+        amend to match current modes and functions.
+        (edebug-set-initial-mode): Uncomment and change from setting a defun's
+        `edebug-initial-mode''s property to setting the variable
+        `edebug-initial-mode'.
+        (top level): Create new binding C-x C-a C-m for
+        `edebug-set-initial-mode'.
+        doc/lispref/edebug.texi (Edebug Execution Modes): document
+        `edebug-set-initial-mode' and its new key binding.
+        (Edebug Options): Mention the new command in the pertinent place.
+        etc/NEWS: Write entry for this change.
+2015-09-25  Eli Zaretskii  <eliz@gnu.org>
+        Avoid non-ASCII decoding errors in Texinfo files
+        * doc/misc/tramp.texi:
+        * doc/lispref/strings.texi:
+        * doc/lispref/positions.texi:
+        * doc/lispref/help.texi:
+        * doc/lispref/functions.texi:
+        * doc/lispintro/emacs-lisp-intro.texi:
+        * doc/emacs/text.texi:
+        * doc/emacs/modes.texi:
+        * doc/emacs/mini.texi:
+        * doc/emacs/display.texi:
+        * doc/emacs/custom.texi:
+        * doc/emacs/basic.texi: Add 'coding' cookies -- these files use
+        Unicode characters and should be decoded as UTF-8.
+        * doc/lispref/frames.texi (Size Parameters): Don't use a non-ASCII
+        apostrophe unnecessarily.
+2015-09-25  Paul Eggert  <eggert@cs.ucla.edu>
+        Merge from gnulib
+        This incorporates:
+        2015-09-25 c-ctype: rewrite to use inline functions
+        2015-09-24 maint: add coding cookies to non-ASCII sources
+        2015-09-24 gitlog-to-changelog: trim only trailing whitespaces
+        * build-aux/gitlog-to-changelog, doc/misc/texinfo.tex:
+        * lib/acl-internal.c, lib/acl-internal.h, lib/c-ctype.c:
+        * lib/c-ctype.h, lib/get-permissions.c, lib/qcopy-acl.c:
+        * lib/set-permissions.c:
+        Copy from gnulib.
+2015-09-24  Paul Eggert  <eggert@cs.ucla.edu>
+        Update publicsuffix.txt from upstream
+        * etc/publicsuffix.txt: Update from
+        https://publicsuffix.org/list/effective_tld_names.dat
+        dated 2015-09-24 17:29:21 UTC.
+2015-09-24  Eli Zaretskii  <eliz@gnu.org>
+        Prevent timers from messing up TTY menus
+        * src/term.c (tty_menu_activate): Inhibit redisplay for as long as
+        the TTY menu is open.  (Bug#21530)
+2015-09-24  Paul Eggert  <eggert@cs.ucla.edu>
+        No need to mention K&R C in c-mode intro
+2015-09-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+        Fix recent bootstrap problems
+        * src/syntax.c (parse_sexp_propertize): Fix last fix.
+        * lisp/nxml/nxml-mode.el (nxml-comment-quote-nested): Fix paren typo.
+        * lisp/emacs-lisp/lisp-mode.el: Require cl-lib for cl-progv.
+2015-09-24  Michael Albinus  <michael.albinus@gmx.de>
+        * src/gfilenotify.c (Fgfile_add_watch): Decrease polling rate.
+2015-09-23  Ivan Andrus  <darthandrus@gmail.com>
+        Properly quote nested xml comments (Bug#6267) (Bug#20001)
+        * nxml-mode.el (nxml-comment-quote-nested): New function
+        (nxml-mode): Set comment-quote-nested-function
+2015-09-23  Ivan Andrus  <darthandrus@gmail.com>
+        Allow major-modes full control over quoting nested comments
+        * newcomment.el (comment-quote-nested-function): New variable.
+        (comment-quote-nested-default): New function.
+        (comment-quote-nested): Use `comment-quote-nested-function'.
+2015-09-23  Paul Eggert  <eggert@cs.ucla.edu>
+        Prefer CALLN in a few more places
+        * src/macfont.m (macfont_set_family_cache):
+        * src/nsterm.m (append2):
+        * src/xterm.c (x_cr_export_frames):
+        Prefer CALLN to allocating the arg arrays by hand.
+2015-09-23  Michael Albinus  <michael.albinus@gmx.de>
+        Adapt file-notify-test02-events test case
+        * test/automated/file-notify-tests.el (file-notify-test02-events):
+        Create a new watch for every test.
+2015-09-23  Michael Albinus  <michael.albinus@gmx.de>
+        Continue gfilenotify.c implementation of missing parts
+        * lisp/filenotify.el (file-notify-add-watch): Append `flags' to
+        `gfile-add-watch' call.
+        (file-notify-rm-watch): Modify `file-notify-descriptors' only
+        after calling the low level functions.
+        * src/gfilenotify.c (dir_monitor_callback): Check, whether
+        event_type is expected.
+        (Fgfile_add_watch): Allow also `change'and `attribute-change' for FLAGS.
+        (Fgfile_rm_watch): Fix typo.
+        (syms_of_gfilenotify): Declare Qchange and Qattribute_change.
+2015-09-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * src/syntax.c: Handle spurious e_property_truncated flag
+        * src/syntax.c (parse_sexp_propertize): Handle spurious
+        e_property_truncated flag.
+        (update_syntax_table_forward): Remove invalid assertion.
+2015-09-23  Eli Zaretskii  <eliz@gnu.org>
+        Support ':relative-width' space display spec on text-mode terminals
+        * src/xdisp.c (produce_stretch_glyph): Support ':relative-width'
+        space display spec on text-mode terminals, by calling
+        PRODUCE_GLYPHS instead of x_produce_glyphs.  Remove the HAVE_WINDOW_SYSTEM
+        guards from the supporting code, as well as the test for a GUI frame.
+2015-09-23  Oleh Krehel  <ohwoeowho@gmail.com>
+        Move let-when-compile to lisp-mode.el
+        This fixes the bootstrapping problem of `let-when-compile' using
+        `cl-progv' while being in subr.el (i.e. before cl stuff was loaded).
+2015-09-23  Thomas Fitzsimmons  <fitzsim@fitzsim.org>
+        Do not include authorization header in an HTTP redirect
+        * lisp/url/url-http.el (url-http-parse-headers): Do not
+        automatically include Authorization header in redirect.
+        (Bug#21350)
+2015-09-22  Eli Zaretskii  <eliz@gnu.org>
+        Clarify documentation of ':relative-width'
+        * doc/lispref/display.texi (Specified Space): Document that
+        ':relative-width' is only supported on GUI frames.
+2015-09-22  Eli Zaretskii  <eliz@gnu.org>
+        Fix 'current-column' in presence of :relative-width
+        * src/indent.c (check_display_width): Support ':relative-width'
+        in a display spec that specifies a stretch glyph.  (Bug#21533)
+2015-09-22  Ken Manheimer  <ken.manheimer@gmail.com>
+        Reformat the pdbtrack remote-file fix ChangeLog.2 entry
+        ... to conform better to CONTRIBUTE guidelines.
+2015-09-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * prolog.el: Fix indentation of empty line
+        * lisp/emacs-lisp/smie.el (smie-rules-function): Document new
+        `empty-line-token' element.
+        (smie-indent-empty-line): New function.
+        (smie-indent-functions): Add it.
+        * lisp/progmodes/prolog.el (prolog-smie-rules): Fix :list-intro behavior
+        and use the new `empty-line-token' element (bug#21526).
+        (prolog-mode-variables): Fix comment-start-skip setting to match
+        comment-start.
+        * test/indent/prolog.prolog: Add nested indentation tests.
+        * lisp/newcomment.el (comment-normalize-vars): Fix default value of
+        comment-start-skip not to misuse submatch 1.
+2015-09-22  Alan Mackenzie  <acm@muc.de>
+        Make description of `edebug-initial-mode' user friendly.
+        Fixes debbugs#21365.
+        dec/lispref/edebug.texi (Edebug Execution Modes): Change the
+        desscription
+        of `edebug-initial-mode' from that of its implementation to that of its
+        visual effect and use.  Move the paragraph higher up.
+2015-09-22  Eli Zaretskii  <eliz@gnu.org>
+        lisp/progmodes/gud.el (gud-format-command): Fix last commit
+        * lisp/progmodes/gud.el (gud-format-command): Don't use Tramp internal
+        functions 'tramp-file-name-localname' and 'tramp-dissect-file-name'.
+2015-09-22  Tassilo Horn  <tsdh@gnu.org>
+        Improve last commit to process.c
+2015-09-22  Michael Albinus  <michael.albinus@gmx.de>
+        Implement gfile-valid-p
+        * lisp/filenotify.el (file-notify-callback): Fix typo.
+        (gfile-valid-p): Remove defalias.
+        * src/gfilenotify.c (dir_monitor_callback): Cancel the monitor if
+        the file or directory to be watched is deleted.
+        (Fgfile_add_watch): Make watch_object a triple.
+        (Fgfile_rm_watch): Check, whether watch is cancelled already.
+        (Fgfile_valid_p): New defun.
+        (syms_of_gfilenotify): Declare Sgfile_valid_p.
+2015-09-22  Tassilo Horn  <tsdh@gnu.org>
+        Remove callback-handled channels from Available set
+        * src/process.c (wait_reading_process_output): Remove channel from
+        Available set if it is handled by a callback, e.g., dbus or
+        inotify (bug#21313).
+2015-09-21  Mark Oteiza  <mvoteiza@udel.edu>
+        Use lunate epsilon for TeX \epsilon
+        * lisp/textmodes/tex-mode.el (tex--prettify-symbols-alist): Add
+        \varepsilon using GREEK SMALL LETTER EPSILON, and change \epsilon to use
+        GREEK LUNATE EPSILON SYMBOL
+2015-09-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * lisp/progmodes/prolog.el: Fix nested electric if-then-else
+        * lisp/progmodes/prolog.el (prolog-find-unmatched-paren): Use innermost
+        rather than outermost paren (bug#21526).
+2015-09-21  Paul Eggert  <eggert@cs.ucla.edu>
+        Improve git diff hunk headers for .el, .texi
+        Problem reported by Alan Mackenzie in:
+        http://lists.gnu.org/archive/html/emacs-devel/2015-09/msg00826.html
+        * .gitattributes (*.el, *.texi): New patterns.
+        * autogen.sh: Configure diff.elisp.xfuncname and
+        diff.texinfo.xfuncname if using Git.
+2015-09-21  Eli Zaretskii  <eliz@gnu.org>
+        Don't rely on defaults in decoding UTF-8 encoded Lisp files
+        * lisp/replace.el:
+        * lisp/textmodes/rst.el:
+        * lisp/whitespace.el: Add an explicit UTF-8 encoding tag.
+2015-09-21  Paul Eggert  <eggert@cs.ucla.edu>
+        Clarify or replace a few \u escapes.
+        * doc/lispref/nonascii.texi (Character Properties)
+        More-detailed commentary for \u escapes.
+        * lisp/progmodes/python.el (python--prettify-symbols-alist):
+        * lisp/replace.el (query-replace-from-to-separator):
+        * lisp/textmodes/rst.el (rst-bullets, rst-re-alist-def)
+        (rst-mode-syntax-table):
+        * lisp/whitespace.el (whitespace-display-mappings):
+        Prefer actual character to \u escape when this makes the code
+        easier to follow in the usual case where Unicode chars can be
+        displayed.
+2015-09-21  Paul Eggert  <eggert@cs.ucla.edu>
+        Pacify GCC -Wmaybe-uninitialized in xdisp.c
+        * src/xdisp.c (face_before_or_after_it_pos): Use do-while rather
+        than while loop to avoid GCC -Wmaybe-uninitialized diagnostic with
+        charpos.  The loop should always execute at least once anyway.
+2015-09-21  Tassilo Horn  <tsdh@gnu.org>
+        Signal error on invalid regexp
+        * lisp/textmodes/reftex-cite.el (reftex-extract-bib-entries): Signal an
+        error when the user tries searching with a regexp matching the empty
+        string.
+2015-09-21  Eli Zaretskii  <eliz@gnu.org>
+        Another fix of file-notify-tests for w32notify
+        * test/automated/file-notify-tests.el (file-notify-test02-events):
+        Further adaptation for w32notify: reduce the number of expected
+        'changed' events.  (Bug#21435)
+2015-09-21  Michael Albinus  <michael.albinus@gmx.de>
+        Adapt tests and manual for w32notify
+        * doc/lispref/os.texi (File Notifications): w32notify does not
+        send `attribute-changed' events.
+        * test/automated/file-notify-tests.el (file-notify--test-with-events):
+        Simplify parameters.  Adapt all callees.
+        (file-notify-test02-events): w32notify does not send
+        `attribute-changed' events.
+        (file-notify-test04-file-validity, file-notify-test05-dir-validity):
+        Do not skip in case of w32notify.  Simply ignore this part of the test.
+2015-09-21  Dima Kogan  <dima@secretsauce.net>
+        Fix setting breakpoints when remote-debugging
+        * lisp/progmodes/gud.el (gud-format-command): Send localized file
+        names to the debugger running on the remote.  (Bug#13304)
+2015-09-21  Nicolas Petton  <nicolas@petton.fr>
+        Better docstring and parameter name for seq-find
+        * lisp/emacs-lisp/seq.el (seq-find): Improve the docstring and rename
+        the parameter `sentinel' to `default'.
+        * doc/lispref/sequences.texi (Sequence Functions): Update the
+          documentation for `seq-find' accordingly.
+2015-09-21  Eli Zaretskii  <eliz@gnu.org>
+        Avoid infinite recursion while displaying box face
+        * src/xdisp.c (face_before_or_after_it_pos): Fix calculation of
+        the previous string/buffer character position under bidi
+        iteration.  (Bug#21428)
+2015-09-21  Anders Lindgren  <andlind@gmail.com>
+        Keep upper edge unchanged when changing size of NS frame (Bug#21415)
+        * src/nsterm.m (x_set_window_size): Keep upper frame edge unchanged
+        (Bug#21415).
+2015-09-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+        Subject: * lisp/progmodes/prolog.el: Improve handling of if/then/else
+        (prolog-smie-rules): Accomodate standard if/then/else special indentation.
+        (prolog-mode): Add . to electric-indent-chars.
+        (prolog-electric--if-then-else): Re-indent the line before adding space
+        after the new char (bug#21526).
+2015-09-20  Mark Oteiza  <mvoteiza@udel.edu>
+        Add prettify symbols to python-mode
+        lisp/progmodes/python.el (python-prettify-symbols-alist): New variable
+        lisp/progmodes/python.el (python-mode): Use it
+2015-09-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * lisp/emacs-lisp/syntax.el (syntax-begin-function): Make obsolete
+2015-09-20  Jostein Kjønigsen  <jostein@secure.kjonigsen.net>  (tiny change)
+        (compilation-error-regexp-alist-alist): Tone down guile-file
+        * lisp/progmodes/compile.el (compilation-error-regexp-alist-alist):
+        Make guile-file a bit less enthusiastic (bug#21496).
+2015-09-20  Drew Csillag  <drew@thecsillags.com>
+        * m4-mode.el (m4-font-lock-keywords): Fix m4_* highlighting
+        * lisp/progmodes/m4-mode.el (m4-font-lock-keywords): Fix recognition
+        of commands when they have a "m4_" prefix.
+2015-09-20  Paul Eggert  <eggert@cs.ucla.edu>
+        '.' -> `.' in doc string
+        * lisp/emacs-lisp/timer.el (run-at-time): In doc string, quote
+        individual chars with grave quotes instead of straight quotes, as
+        this works better when they are translated to curved quotes.
+2015-09-20  Michael Albinus  <michael.albinus@gmx.de>
+        Improve file notifications, especially for Tramp
+        * doc/lispref/files.texi (Magic File Names):
+        Mention `file-notify-valid-p'.
+        * doc/lispref/os.texi (File Notifications):
+        Describe `file-notify-valid-p'.
+        * etc/NEWS: Add `file-notify-valid-p'.
+        * lisp/net/tramp-gvfs.el (tramp-gvfs-handle-file-notify-add-watch):
+        Improve implementation.
+        (tramp-gvfs-monitor-file-process-filter): Rename from
+        `tramp-gvfs-file-gvfs-monitor-file-process-filter'.  Delete
+        process if appropriate.
+        * lisp/net/tramp-sh.el (tramp-sh-handle-file-notify-add-watch):
+        Improve implementation.
+        (tramp-sh-gvfs-monitor-dir-process-filter): Rename from
+        `tramp-sh-file-gvfs-monitor-dir-process-filter'.  Delete process
+        if appropriate.
+        (tramp-sh-inotifywait-process-filter): Rename from
+        `tramp-sh-file-inotifywait-process-filter'.  Delete process if
+        appropriate.
+        * lisp/net/tramp.el (tramp-handle-file-notify-rm-watch):
+        Use `delete-process'
+        (tramp-handle-file-notify-valid-p): Check also, that file or
+        directory to be watched still exists.
+        * test/automated/file-notify-tests.el (file-notify--test-timeout):
+        New defun.  Use it at all places a timeout is needed.
+        (file-notify--test-cleanup): Delete directories recursively.
+        Cleanup also Tramp connections.
+        (file-notify-test02-events): Add tests for `attribute-change'.
+        (file-notify-test04-file-validity, file-notify-test05-dir-validity):
+        Add tests for `file-notify-rm-watch'.
+2015-09-20  Paul Eggert  <eggert@cs.ucla.edu>
+        Use %s to format strings instead of splicing them
+        If FOO might contain quotes that are part of a file or variable
+        name, the quotes should not be translated when showing FOO’s name
+        in a diagnostic.  So, for example, (message (concat (FOO ": bar")))
+        is not quite right, as it would translate FOO’s quotes.
+        Change it to (message "%s: bar" FOO) instead.
+        * lisp/allout.el (allout-process-exposed):
+        * lisp/calc/calc-ext.el (calc-do-prefix-help):
+        * lisp/calc/calc-store.el (calc-store-into):
+        * lisp/calendar/todo-mode.el (todo-category-completions):
+        * lisp/cedet/semantic/complete.el (semantic-completion-message):
+        * lisp/org/ob-latex.el (convert-pdf):
+        * lisp/org/org-crypt.el (org-crypt-check-auto-save):
+        * lisp/org/ox-latex.el (org-latex-compile):
+        * lisp/org/ox-man.el (org-man-compile):
+        * lisp/org/ox-odt.el (org-odt--export-wrap):
+        * lisp/org/ox-texinfo.el (org-texinfo-compile):
+        * lisp/progmodes/ruby-mode.el (ruby-in-ppss-context-p):
+        * lisp/progmodes/verilog-mode.el (verilog-batch-execute-func)
+        (verilog-signals-combine-bus, verilog-read-defines)
+        (verilog-getopt-file, verilog-expand-dirnames)
+        (verilog-modi-lookup, verilog-modi-modport-lookup-one):
+        * lisp/term/ns-win.el (ns-spi-service-call):
+        Use %s to avoid translating quotes of file names etc. in diagnostics.
+2015-09-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+        * lisp/progmodes/js.el (js--syntax-begin-function): Remove.
+        (js-mode): Don't set syntax-begin-function.
+2015-09-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+        Don't assume syntax-begin-function is a symbol.
+        * lisp/font-lock.el (font-lock-compile-keywords): Don't assume
+        syntax-begin-function is a symbol.
 2015-09-20  Eli Zaretskii  <eliz@gnu.org>
        Improve documentation of 'run-at-time'
@@ -13449,7 +14528,7 @@
 This file records repository revisions from
 commit 9d56a21e6a696ad19ac65c4b405aeca44785884a (exclusive) to
-commit 00a65e3238a888fc92b0c2aab8cb5bda8bd99c29 (inclusive).
+commit 2021680e9dcd277a4ebbdb613d535e6edc86f384 (inclusive).
 See ChangeLog.1 for earlier changes.
 ;; Local Variables:
diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS
index da5646696b8..8b7647eaad8 100644
--- a/admin/MAINTAINERS
+++ b/admin/MAINTAINERS
@@ -108,6 +108,43 @@ Nicolas Petton
        lisp/emacs-lisp/map.el
        lisp/emacs-lisp/seq.el
+The GNU AUCTeX maintainers (auctex-devel@gnu.org)
+        RefTeX
+            lisp/textmodes/reftex-auc.el
+            lisp/textmodes/reftex-cite.el
+            lisp/textmodes/reftex-dcr.el
+            lisp/textmodes/reftex-global.el
+            lisp/textmodes/reftex-index.el
+            lisp/textmodes/reftex-parse.el
+            lisp/textmodes/reftex-ref.el
+            lisp/textmodes/reftex-sel.el
+            lisp/textmodes/reftex-toc.el
+            lisp/textmodes/reftex-vars.el
+            lisp/textmodes/reftex.el
+Dmitry Gutov
+        lisp/progmodes/ruby-mode.el
+        test/automated/ruby-mode-tests.el
+        test/indent/ruby.rb
+        lisp/progmodes/xref.el
+        lisp/progmodes/project.el
+Ulf Jasper
+        Newsticker
+            doc/misc/newsticker.texi
+            etc/images/newsticker/*
+            lisp/net/newst-backend.el
+            lisp/net/newst-plainview.el
+            lisp/net/newst-reader.el
+            lisp/net/newst-ticker.el
+            lisp/net/newst-treeview.el
+            lisp/net/newsticker.el
+            test/automated/newsticker-tests.el
+        Icalendar
+            lisp/calendar/icalendar.el
+            test/automated/icalendar-tests.el
 ==============================================================================
 2.
 ==============================================================================
@@ -197,6 +234,7 @@ Paul Eggert
 Michael Albinus
        src/inotify.c
        lisp/autorevert.el
+        lisp/eshell/em-tramp.el
        lisp/notifications.el
        test/automated/auto-revert-tests.el
        test/automated/inotify-test.el
@@ -209,6 +247,17 @@ Nicolas Petton
 Xue Fuqiao
        doc/lispref/*
+Tassilo Horn
+        lisp/doc-view.el
+Dmitry Gutov
+        lisp/whitespace.el
+        lisp/vc/*
+Vibhav Pant
+       lisp/net/browse-url.el
+       lisp/erc/*
 ==============================================================================
 3.
 ==============================================================================
@@ -276,7 +325,6 @@ lisp/dired.el
 lisp/dirtrack.el
 lisp/disp-table.el
 lisp/dnd.el
-lisp/doc-view.el
 lisp/dom.el
 lisp/double.el
 lisp/dynamic-setting.el
@@ -488,7 +536,50 @@ lisp/mouse.el
 lisp/mpc.el
 lisp/msb.el
 lisp/mwheel.el
-lisp/net/*
+lisp/net/ange-ftp.el
+lisp/net/dig.el
+lisp/net/dns.el
+lisp/net/eudcb-bbdb.el
+lisp/net/eudcb-ldap.el
+lisp/net/eudcb-mab.el
+lisp/net/eudc-bob.el
+lisp/net/eudcb-ph.el
+lisp/net/eudc.el
+lisp/net/eudc-export.el
+lisp/net/eudc-hotlist.el
+lisp/net/eudc-vars.el
+lisp/net/eww.el
+lisp/net/gnutls.el
+lisp/net/goto-addr.el
+lisp/net/hmac-def.el
+lisp/net/hmac-md5.el
+lisp/net/imap.el
+lisp/net/ldap.el
+lisp/net/mairix.el
+lisp/net/netrc.el
+lisp/net/net-utils.el
+lisp/net/network-stream.el
+lisp/net/nsm.el
+lisp/net/ntlm.el
+lisp/net/pinentry.el
+lisp/net/quickurl.el
+lisp/net/rcirc.el
+lisp/net/rfc2104.el
+lisp/net/rlogin.el
+lisp/net/sasl-cram.el
+lisp/net/sasl-digest.el
+lisp/net/sasl.el
+lisp/net/sasl-ntlm.el
+lisp/net/sasl-scram-rfc.el
+lisp/net/shr-color.el
+lisp/net/shr.el
+lisp/net/snmp-mode.el
+lisp/net/soap-client.el
+lisp/net/soap-inspect.el
+lisp/net/socks.el
+lisp/net/telnet.el
+lisp/net/tls.el
+lisp/net/webjump.el
 lisp/newcomment.el
 lisp/novice.el
 lisp/nxml/*
@@ -574,11 +665,9 @@ lisp/progmodes/octave.el
 lisp/progmodes/opascal.el
 lisp/progmodes/pascal.el
 lisp/progmodes/prog-mode.el
-lisp/progmodes/project.el
 lisp/progmodes/prolog.el
 lisp/progmodes/ps-mode.el
 lisp/progmodes/python.el
-lisp/progmodes/ruby-mode.el
 lisp/progmodes/scheme.el
 lisp/progmodes/sh-script.el
 lisp/progmodes/simula.el
@@ -588,7 +677,6 @@ lisp/progmodes/vera-mode.el
 lisp/progmodes/verilog-mode.el
 lisp/progmodes/vhdl-mode.el
 lisp/progmodes/which-func.el
-lisp/progmodes/xref.el
 lisp/progmodes/xscheme.el
 lisp/ps-bdf.el
 lisp/ps-def.el
@@ -662,17 +750,6 @@ lisp/textmodes/picture.el
 lisp/textmodes/po.el
 lisp/textmodes/refbib.el
 lisp/textmodes/refer.el
-lisp/textmodes/reftex-auc.el
-lisp/textmodes/reftex-cite.el
-lisp/textmodes/reftex-dcr.el
-lisp/textmodes/reftex-global.el
-lisp/textmodes/reftex-index.el
-lisp/textmodes/reftex-parse.el
-lisp/textmodes/reftex-ref.el
-lisp/textmodes/reftex-sel.el
-lisp/textmodes/reftex-toc.el
-lisp/textmodes/reftex-vars.el
-lisp/textmodes/reftex.el
 lisp/textmodes/remember.el
 lisp/textmodes/rst.el
 lisp/textmodes/sgml-mode.el
@@ -698,14 +775,12 @@ lisp/type-break.el
 lisp/uniquify.el
 lisp/url/*
 lisp/userlock.el
-lisp/vc/*
 lisp/vcursor.el
 lisp/version.el
 lisp/view.el
 lisp/vt-control.el
 lisp/vt100-led.el
 lisp/wdired.el
-lisp/whitespace.el
 lisp/wid-browse.el
 lisp/wid-edit.el
 lisp/widget.el
@@ -735,4 +810,5 @@ test/rmailmm.el
 ;;; Local Variables:
 ;;;   coding: utf-8
+;;;   indent-tabs-mode: t
 ;;; End:
diff --git a/admin/authors.el b/admin/authors.el
index 092da68dbce..3d7850af57d 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -1,4 +1,4 @@
-;;; authors.el --- utility for maintaining Emacs's AUTHORS file -*-coding: utf-8 -*-
+;;; authors.el --- utility for maintaining Emacs's AUTHORS file
 ;; Copyright (C) 2000-2015 Free Software Foundation, Inc.
diff --git a/autogen.sh b/autogen.sh
index 926915c1af1..563a0244ca8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -218,7 +218,7 @@ echo timestamp > src/stamp-h.in || exit
 ## Configure Git, if using Git.
-if test -d .git; then
+if test -d .git && (git status -s) >/dev/null 2>&1; then
    # Configure 'git diff' hunk header format.
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index a171db7bb03..95b721fa739 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -329,6 +329,7 @@ instead of running the @code{mouse-save-then-kill} command, rebind
 @kbd{Mouse-3} by adding the following line to your init file
 (@pxref{Init Rebinding}):
+@c FIXME: `mouse-popup-menubar-stuff' is obsolete since 23.1.
 @smallexample
 (global-set-key [mouse-3] 'mouse-popup-menubar-stuff)
 @end smallexample
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index 7f3afd71d5b..bab660e1e10 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -417,8 +417,8 @@ beginning of a line.
 using straight apostrophes @t{'like this'} or double-quotes @t{"like
 this"}.  Another common way is the curved quote convention, which uses
 left and right single or double quotation marks @t{‘like this’} or
-@t{“like this”}.  Typewriter quotes are simple and portable; curved
+@t{“like this”}.  In text files, typewriter quotes are simple and
-quotes are less ambiguous and typically look nicer.
+portable; curved quotes are less ambiguous and typically look nicer.
  Electric Quote mode makes it easier to type curved quotes.  As you
 type characters it optionally converts @t{`} to @t{‘}, @t{'} to @t{’},
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 22e50e94f48..245113b86d7 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -3454,6 +3454,9 @@ a function.  (@xref{Interactive Codes, , Code Characters for
 Consider the function @code{zap-to-char}.  Its interactive expression
 is
+@c FIXME: the interactive expression of zap-to-char has been changed
+@c (in 2012-04-10).
 @smallexample
 (interactive "p\ncZap to char: ")
 @end smallexample
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi
index fca16da5d3f..412903f8fbc 100644
--- a/doc/lispref/control.texi
+++ b/doc/lispref/control.texi
@@ -1,4 +1,4 @@
-@c -*-texinfo-*-
+@c -*- mode: texinfo; coding: utf-8 -*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990-1995, 1998-1999, 2001-2015 Free Software
 @c Foundation, Inc.
@@ -1002,8 +1002,8 @@ These examples show typical uses of @code{error}:
 @end group
 @group
-(error "You have committed %d errors" 10)
+(error "Invalid name `%s'" "A%%B")
-     @error{} You have committed 10 errors
+     @error{} Invalid name ‘A%%B’
 @end group
 @end example
@@ -1011,10 +1011,16 @@ These examples show typical uses of @code{error}:
 error symbol @code{error}, and a list containing the string returned by
 @code{format-message}.
+In a format string containing single quotes, curved quotes @t{‘like
+this’} and grave quotes @t{`like this'} work better than straight
+quotes @t{'like this'}, as @code{error} typically formats every
+straight quote as a curved closing quote.
 @strong{Warning:} If you want to use your own string as an error message
 verbatim, don't just write @code{(error @var{string})}.  If @var{string}
-contains @samp{%}, it will be interpreted as a format specifier, with
+@var{string} contains @samp{%}, @samp{`}, or @samp{'} it may be
-undesirable results.  Instead, use @code{(error "%s" @var{string})}.
+reformatted, with undesirable results.  Instead, use @code{(error "%s"
+@var{string})}.
 @end defun
 @defun signal error-symbol data
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 452462adcfc..ad248b116ed 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -1,4 +1,4 @@
-@c -*-texinfo-*-
+@c -*- mode: texinfo; coding: utf-8 -*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990-1995, 1998-2015 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
@@ -254,6 +254,11 @@ properties, it is displayed with the specified faces (@pxref{Faces}).
 The string is also added to the @file{*Messages*} buffer, but without
 text properties (@pxref{Logging Messages}).
+In a format string containing single quotes, curved quotes @t{‘like
+this’} and grave quotes @t{`like this'} work better than straight
+quotes @t{'like this'}, as @code{message} typically formats every
+straight quote as a curved closing quote.
 In batch mode, the message is printed to the standard error stream,
 followed by a newline.
@@ -268,21 +273,26 @@ onto the screen immediately.
 @example
 @group
-(message "Minibuffer depth is %d."
+(message "Reverting `%s'..." (buffer-name))
-         (minibuffer-depth))
+ @print{} Reverting ‘subr.el’...
- @print{} Minibuffer depth is 0.
+@result{} "Reverting ‘subr.el’..."
-@result{} "Minibuffer depth is 0."
 @end group
 @group
 ---------- Echo Area ----------
-Minibuffer depth is 0.
+Reverting ‘subr.el’...
 ---------- Echo Area ----------
 @end group
 @end example
 To automatically display a message in the echo area or in a pop-buffer,
 depending on its size, use @code{display-message-or-buffer} (see below).
+@strong{Warning:} If you want to use your own string as a message
+verbatim, don't just write @code{(message @var{string})}.  If
+@var{string} contains @samp{%}, @samp{`}, or @samp{'} it may be
+reformatted, with undesirable results.  Instead, use @code{(message
+"%s" @var{string})}.
 @end defun
 @defvar inhibit-message
diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi
index 0a19274f6a1..c65057202a0 100644
--- a/doc/lispref/objects.texi
+++ b/doc/lispref/objects.texi
@@ -1279,8 +1279,8 @@ list whose first element is the symbol @code{macro} and whose @sc{cdr}
 is a Lisp function object, including the @code{lambda} symbol.
  Lisp macro objects are usually defined with the built-in
-@code{defmacro} function, but any list that begins with @code{macro} is
+@code{defmacro} macro, but any list that begins with @code{macro} is a
-a macro as far as Emacs is concerned.  @xref{Macros}, for an explanation
+macro as far as Emacs is concerned.  @xref{Macros}, for an explanation
 of how to write a macro.
  @strong{Warning}: Lisp macros and keyboard macros (@pxref{Keyboard
diff --git a/doc/lispref/sequences.texi b/doc/lispref/sequences.texi
index b85d5d4c1b1..0a6f4c6623c 100644
--- a/doc/lispref/sequences.texi
+++ b/doc/lispref/sequences.texi
@@ -72,6 +72,7 @@ string, bool-vector, or char-table, @code{nil} otherwise.
 @cindex vector length
 @cindex sequence length
 @cindex char-table length
+@anchor{Definition of length}
 This function returns the number of elements in @var{sequence}.  If
 @var{sequence} is a dotted list, a @code{wrong-type-argument} error is
 signaled.  Circular lists may cause an infinite loop.  For a
@@ -113,6 +114,7 @@ since @code{length} only counts the number of characters, but does not
 account for the display width of each character.
 @defun elt sequence index
+@anchor{Definition of elt}
 @cindex elements of sequences
 This function returns the element of @var{sequence} indexed by
 @var{index}.  Legitimate values of @var{index} are integers ranging
@@ -431,6 +433,57 @@ you pass as an argument.  Unless otherwise stated, the result is a
 sequence of the same type as the input.  For those functions that take
 a predicate, this should be a function of one argument.
+  The @file{seq.el} library can be extended to work with additional
+types of sequential data-structures.  For that purpose, all functions
+are defined using @code{cl-defgeneric}.
+@defun seq-elt sequence index
+  This function the element at the index @var{index} in
+@var{sequence}.  @var{index} can be an integer from zero up to the
+length of @var{sequence} minus one.  For out-of-range values on
+built-in sequence types, @code{seq-elt} behaves like @code{elt}.
+@xref{Definition of elt}.
+@example
+@group
+(seq-elt [1 2 3 4] 2)
+@result{} 3
+@end group
+  @code{seq-elt} returns settable places using @code{setf}.
+@group
+(setq vec [1 2 3 4])
+(setf (seq-elt vec 2) 5)
+vec
+@result{} [1 2 5 4]
+@end group
+@end example
+@end defun
+@defun seq-length sequence
+  This function returns the number of elements in @var{sequence}.  For
+built-in sequence types, @code{seq-length} behaves like @code{length}.
+@xref{Definition of length}.
+@end defun
+@defun seq-p sequence
+  This function returns non-@code{nil} if @var{sequence} is a sequence
+(a list or array), or any additional type of sequence defined via
+@file{seq.el} generic functions.
+@example
+@group
+(seq-p [1 2])
+@result{} t
+@end group
+@group
+(seq-p 2)
+@result{} nil
+@end group
+@end example
+@end defun
 @defun seq-drop sequence n
  This function returns all but the first @var{n} (an integer)
 elements of @var{sequence}.  If @var{n} is negative or zero,
@@ -497,6 +550,28 @@ starting from the first one for which @var{predicate} returns @code{nil}.
 @end example
 @end defun
+@defun seq-do function sequence
+  This function applies @var{function} to each element of
+@var{sequence} in turn (presumably for side effects) and returns
+@var{sequence}.
+@end defun
+@defun seq-map function sequence
+  This function returns the result of applying @var{function} to each
+element of @var{sequence}.  The returned value is a list.
+@example
+@group
+(seq-map #'1+ '(2 4 6))
+@result{} (3 5 7)
+@end group
+@group
+(seq-map #'symbol-name [foo bar])
+@result{} ("foo" "bar")
+@end group
+@end example
+@end defun
 @defun seq-filter predicate sequence
 @cindex filtering sequences
  This function returns a list of all the elements in @var{sequence}
@@ -558,9 +633,8 @@ calling @var{function}.
 @end defun
 @defun seq-some predicate sequence
-  This function returns non-@code{nil} if @var{predicate} returns
+  This function returns the first non-@code{nil} value returned by
-non-@code{nil} for any element of @var{sequence}.  If so, the returned
+applying @var{predicate} to each element of @var{sequence} in turn.
-value is the value returned by @var{predicate}.
 @example
 @group
@@ -575,6 +649,10 @@ value is the value returned by @var{predicate}.
 (seq-some #'null ["abc" 1 nil])
 @result{} t
 @end group
+@group
+(seq-some #'1+ [2 4 6])
+@result{} 3
+@end group
 @end example
 @end defun
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 00161b28b66..1da2d1cfe7b 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -3174,12 +3174,14 @@ position that works well with point, and thus @var{position} is not used.
 @defun pos-visible-in-window-p &optional position window partially
 This function returns non-@code{nil} if @var{position} is within the
 range of text currently visible on the screen in @var{window}.  It
-returns @code{nil} if @var{position} is scrolled vertically out of view.
+returns @code{nil} if @var{position} is scrolled vertically out of
-Locations that are partially obscured are not considered visible unless
+view.  Locations that are partially obscured are not considered
-@var{partially} is non-@code{nil}.  The argument @var{position} defaults
+visible unless @var{partially} is non-@code{nil}.  The argument
-to the current position of point in @var{window}; @var{window}, to the
+@var{position} defaults to the current position of point in
-selected window.  If @var{position} is @code{t}, that means to check the
+@var{window}; @var{window} defaults to the selected window.  If
-last visible position in @var{window}.
+@var{position} is @code{t}, that means to check either the first
+visible position of the last screen line in @var{window}, or the
+end-of-buffer position, whichever comes first.
 This function considers only vertical scrolling.  If @var{position} is
 out of view only because @var{window} has been scrolled horizontally,
diff --git a/etc/NEWS b/etc/NEWS
index e823905e8d3..dbe0de38db6 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -314,17 +314,26 @@ standards.
 * Changes in Specialized Modes and Packages in Emacs 25.1
+** JSON
+---
+*** `json-pretty-print' and `json-pretty-print-buffer' now maintain
+the ordering of object keys by default.
 ** You can recompute the VC state of a file buffer with `M-x vc-refresh-state'
 ** Prog mode has some support for multi-mode indentation.
 See `prog-indentation-context' and `prog-widen'.
-** Prettify Symbols mode supports custom composition predicates.  By
+** Prettify Symbols mode
+*** Prettify Symbols mode supports custom composition predicates.  By
 overriding the default `prettify-symbols-compose-predicate', modes can
 specify in which contexts a symbol map be composed to some unicode
 character.  `prettify-symbols-default-compose-p' is the default which
 is suitable for most programming languages such as C or Lisp (but not
 (La)TeX).
+*** Symbols can be unprettified while point is inside them.
+New variable `prettify-symbols-unprettify-at-point' configures this.
 ** New `xterm-screen-extra-capabilities' config.
 ** The `save-place' variable is replaced by a `save-place-mode'.
@@ -634,9 +643,13 @@ you can no longer use commas to separate regular expressions.
 ** SES now supports local printer functions; see `ses-define-local-printer'.
-** In sh-mode, you can now use `sh-shell' as a file-local variable to
+** sh-script
+*** In sh-mode you can now use `sh-shell' as a file-local variable to
 specify the type of shell in use (bash, csh, etc).
+*** New value `always' for sh-indent-after-continuation.
+This provides old-style ("dumb") indentation of continued lines.
 ** TLS
 ---
 *** Fatal TLS errors are now silent by default.
diff --git a/etc/compilation.txt b/etc/compilation.txt
index f134f53d00c..da6df8a1bb4 100644
--- a/etc/compilation.txt
+++ b/etc/compilation.txt
@@ -52,6 +52,7 @@ jikes are the ending line and ending column.
    [javac] /src/DataBaseTestCase.java:27: unreported exception ...
    [javac] /src/DataBaseTestCase.java:49: warning: finally clause cannot complete normally
    [jikes]  foo.java:3:5:7:9: blah blah
+  [javadoc] c:\MyProject\Polynomial.java:560: error: unknown tag: math
 * Bash v2
diff --git a/etc/themes/wombat-theme.el b/etc/themes/wombat-theme.el
index d49f9bf636f..734731a1ffa 100644
--- a/etc/themes/wombat-theme.el
+++ b/etc/themes/wombat-theme.el
@@ -1,4 +1,4 @@
-;;; wombat-theme.el --- Custom face theme for Emacs  -*-coding: utf-8 -*-
+;;; wombat-theme.el --- Custom face theme for Emacs
 ;; Copyright (C) 2011-2015 Free Software Foundation, Inc.
diff --git a/etc/tutorials/TUTORIAL.cn b/etc/tutorials/TUTORIAL.cn
index 5e187a45ce1..6a558c3f4f2 100644
--- a/etc/tutorials/TUTORIAL.cn
+++ b/etc/tutorials/TUTORIAL.cn
@@ -286,10 +286,9 @@ Emacs 可以有多个“窗格”，每个窗格显示不同的文字。后面�
 <Return> 是一个特殊的键，因为按下这个键后，得到的可能不仅仅是一个换行
 符。根据周围文本的不同，Emacs 可能会在换行符之后插入一些空白字符，这样，
-当你在新的一行开始打字时，文本会自动与前一行对齐。我们把这个按下一个键
+当你在新的一行开始打字时，文本会自动与前一行对齐。
-时不只是插入其对应字符的特性叫做“电动”（electric）。
->> 这是一个电动 <Return> 的例子。
+>> 这是一个自动���进���例子。
   在这一行的末尾输入 <Return>。
 可以看到，在插入换行符之后，Emacs 插入了空格，因此光标移动到了“在”这个
diff --git a/lisp/ChangeLog.17 b/lisp/ChangeLog.17
index 224e2a6da7f..a40f8f3d67a 100644
--- a/lisp/ChangeLog.17
+++ b/lisp/ChangeLog.17
@@ -1,8 +1,3 @@
-2015-09-20  Ken Manheimer  <ken.manheimer@gmail.com>
-        * python.el (python-pdbtrack-set-tracked-buffer): Repair pdbtrack
-        so it follows transition from one remote file to another.
 2015-04-06  Alan Mackenzie  <acm@muc.de>
        Fix miscellaneous glitches in cc-mode.el.  (Bug#20245)
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index 4df41b5613c..cf071e2a1f5 100644
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -839,7 +839,7 @@ when parsing the archive."
  ;; long when the archive -- which has to be moved in memory -- is large.
  (insert
   (apply
-    (function concat)
+    #'concat
    (mapcar
     (lambda (fil)
       ;; Using `concat' here copies the text also, so we can add
@@ -1050,7 +1050,7 @@ using `make-temp-file', and the generated name is returned."
          (setq default-directory arcdir)
          (make-local-variable 'archive-superior-buffer)
          (setq archive-superior-buffer archive-buffer)
-          (add-hook 'write-file-functions 'archive-write-file-member nil t)
+          (add-hook 'write-file-functions #'archive-write-file-member nil t)
          (setq archive-subfile-mode descr)
          (setq archive-file-name-coding-system file-name-coding)
          (if (and
@@ -1091,7 +1091,7 @@ using `make-temp-file', and the generated name is returned."
              (if read-only-p (setq archive-read-only t))
              ;; We will write out the archive ourselves if it is
              ;; part of another archive.
-              (remove-hook 'write-contents-functions 'archive-write-file t))
+              (remove-hook 'write-contents-functions #'archive-write-file t))
            (run-hooks 'archive-extract-hook)
            (if archive-read-only
                (message "Note: altering this archive is not implemented."))))
@@ -1111,7 +1111,7 @@ using `make-temp-file', and the generated name is returned."
         exit-status success)
    (make-directory (directory-file-name default-directory) t)
    (setq exit-status
-          (apply 'call-process
+          (apply #'call-process
                 (car command)
                 nil
                 nil
@@ -1136,7 +1136,7 @@ using `make-temp-file', and the generated name is returned."
  (let ((stderr-file (make-temp-file "arc-stderr")))
    (unwind-protect
        (prog1
-            (apply 'call-process
+            (apply #'call-process
                   (car command)
                   nil
                   (if stderr-file (list t stderr-file) t)
@@ -1157,12 +1157,12 @@ using `make-temp-file', and the generated name is returned."
        (stdout-file (make-temp-file "arc-stdout")))
    (unwind-protect
        (prog1
-            (apply 'call-process
+            (apply #'call-process
                   (car command)
                   nil
                   `(:file ,stdout-file)
                   nil
-                   (append (cdr command) (list archive name dest)))
+                   `(,archive ,name ,@(cdr command) ,dest))
          (with-temp-buffer
            (insert-file-contents stdout-file)
            (goto-char (point-min))
@@ -1284,7 +1284,7 @@ using `make-temp-file', and the generated name is returned."
          (setq ename
                (encode-coding-string ename archive-file-name-coding-system))
          (let* ((coding-system-for-write 'no-conversion)
-                 (exitcode (apply 'call-process
+                 (exitcode (apply #'call-process
                                  (car command)
                                  nil
                                  nil
@@ -1444,7 +1444,7 @@ as a relative change like \"g+rw\" as for chmod(2)."
             (revert-buffer))))))
 (defun archive-*-expunge (archive files command)
-  (apply 'call-process
+  (apply #'call-process
         (car command)
         nil
         nil
@@ -1539,7 +1539,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
                      (length files)
                      (if (= 1 (length files)) "" "s"))
              "\n"))
-    (apply 'vector (nreverse files))))
+    (apply #'vector (nreverse files))))
 (defun archive-arc-rename-entry (newname descr)
  (if (string-match "[:\\\\/]" newname)
@@ -1708,7 +1708,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
                      (length files)
                      (if (= 1 (length files)) "" "s"))
              "\n"))
-    (apply 'vector (nreverse files))))
+    (apply #'vector (nreverse files))))
 (defconst archive-lzh-alternate-display t)
@@ -1905,7 +1905,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
                      (length files)
                      (if (= 1 (length files)) "" "s"))
              "\n"))
-    (apply 'vector (nreverse files))))
+    (apply #'vector (nreverse files))))
 (defun archive-zip-extract (archive name)
  (cond
@@ -2022,7 +2022,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
                      (length files)
                      (if (= 1 (length files)) "" "s"))
              "\n"))
-    (apply 'vector (nreverse files))))
+    (apply #'vector (nreverse files))))
 (defun archive-zoo-extract (archive name)
  (archive-extract-by-stdout archive name archive-zoo-extract))
@@ -2038,37 +2038,36 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
         (maxsize 5)
         (files ()))
    (with-temp-buffer
-      (call-process "unrar-free" nil t nil "--list" (or file copy))
+      (call-process "lsar" nil t nil "-l" (or file copy))
      (if copy (delete-file copy))
      (goto-char (point-min))
-      (re-search-forward "^-+\n")
+      (re-search-forward "^\\(\s+=+\s?+\\)+\n")
-      (while (looking-at (concat " \\(.*\\)\n" ;Name.
+      (while (looking-at (concat "^\s+[0-9.]+\s+-+\s+"   ; Flags
-                                 ;; Size ; Packed.
+                                 "\\([0-9-]+\\)\s+"      ; Size
-                                 " +\\([0-9]+\\) +[0-9]+"
+                                 "\\([0-9.%]+\\)\s+"     ; Ratio
-                                 ;; Ratio ; Date'
+                                 "\\([0-9a-zA-Z]+\\)\s+" ; Mode
-                                 " +\\([0-9%]+\\) +\\([-0-9]+\\)"
+                                 "\\([0-9-]+\\)\s+"      ; Date
-                                 ;; Time ; Attr.
+                                 "\\([0-9:]+\\)\s+"      ; Time
-                                 " +\\([0-9:]+\\) +[^ \n]\\{6,10\\}"
+                                 "\\(.*\\)\n"            ; Name
-                                 ;; CRC; Meth ; Var.
+                                 ))
-                                 " +[0-9A-F]+ +[^ \n]+ +[0-9.]+\n"))
        (goto-char (match-end 0))
-        (let ((name (match-string 1))
+        (let ((name (match-string 6))
-              (size (match-string 2)))
+              (size (match-string 1)))
          (if (> (length name) maxname) (setq maxname (length name)))
          (if (> (length size) maxsize) (setq maxsize (length size)))
          (push (vector name name nil nil
                        ;; Size, Ratio.
-                        size (match-string 3)
+                        size (match-string 2)
                        ;; Date, Time.
                        (match-string 4) (match-string 5))
                files))))
    (setq files (nreverse files))
    (goto-char (point-min))
    (let* ((format (format " %%s %%s  %%%ds %%5s  %%s" maxsize))
-           (sep (format format "--------" "-----" (make-string maxsize ?-)
+           (sep (format format "----------" "-----" (make-string maxsize ?-)
                        "-----" ""))
           (column (length sep)))
-      (insert (format format "  Date  " "Time " "Size " "Ratio" " Filename") "\n")
+      (insert (format format "   Date   " "Time " "Size" "Ratio" "Filename") "\n")
      (insert sep (make-string maxname ?-) "\n")
      (archive-summarize-files (mapcar (lambda (desc)
                                         (let ((text
@@ -2083,7 +2082,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
                                                   (length text))))
                                       files))
      (insert sep (make-string maxname ?-) "\n")
-      (apply 'vector files))))
+      (apply #'vector files))))
 (defun archive-rar-extract (archive name)
  ;; unrar-free seems to have no way to extract to stdout or even to a file.
@@ -2091,7 +2090,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
      ;; The code below assumes the name is relative and may do undesirable
      ;; things otherwise.
      (error "Can't extract files with non-relative names")
-    (archive-extract-by-file archive name '("unrar-free" "--extract") "All OK")))
+    (archive-extract-by-file archive name `("unar" "-no-directory" "-o") "Successfully extracted")))
 ;;; Section: Rar self-extracting .exe archives.
@@ -2171,7 +2170,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
                                                   (length text))))
                                       files))
      (insert sep (make-string maxname ?-) "\n")
-      (apply 'vector files))))
+      (apply #'vector files))))
 (defun archive-7z-extract (archive name)
  ;; 7z doesn't provide a `quiet' option to suppress non-essential
@@ -2272,7 +2271,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
                                                   (length text))))
                                       files))
      (insert sep (make-string maxname ?-) "\n")
-      (apply 'vector files))))
+      (apply #'vector files))))
 (defun archive-ar-extract (archive name)
  (let ((destbuf (current-buffer))
diff --git a/lisp/battery.el b/lisp/battery.el
index b9ce5b49093..b33e906f21e 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -1,4 +1,4 @@
-;;; battery.el --- display battery status information  -*- coding: utf-8 -*-
+;;; battery.el --- display battery status information
 ;; Copyright (C) 1997-1998, 2000-2015 Free Software Foundation, Inc.
diff --git a/lisp/calc/calc-aent.el b/lisp/calc/calc-aent.el
index 2319c484498..6336c3362fb 100644
--- a/lisp/calc/calc-aent.el
+++ b/lisp/calc/calc-aent.el
@@ -1266,7 +1266,6 @@ If the current Calc language does not use placeholders, return nil."
 (provide 'calc-aent)
 ;; Local variables:
-;; coding: utf-8
 ;; generated-autoload-file: "calc-loaddefs.el"
 ;; End:
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index 933c446875e..9adf66f23bd 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -3507,8 +3507,4 @@ A key may contain additional specs for Inverse, Hyperbolic, and Inv+Hyp.")
 (provide 'calc-ext)
-;; Local variables:
-;; coding: utf-8
-;; End:
 ;;; calc-ext.el ends here
diff --git a/lisp/calc/calc-lang.el b/lisp/calc/calc-lang.el
index 6b3b949424d..94366060a41 100644
--- a/lisp/calc/calc-lang.el
+++ b/lisp/calc/calc-lang.el
@@ -2525,8 +2525,4 @@ order to Calc's."
 (provide 'calc-lang)
-;; Local variables:
-;; coding: utf-8
-;; End:
 ;;; calc-lang.el ends here
diff --git a/lisp/calc/calc-store.el b/lisp/calc/calc-store.el
index 21209c66677..2684e627883 100644
--- a/lisp/calc/calc-store.el
+++ b/lisp/calc/calc-store.el
@@ -677,8 +677,4 @@
 (provide 'calc-store)
-;; Local variables:
-;; coding: utf-8
-;; End:
 ;;; calc-store.el ends here
diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el
index 4373e52eb87..a450d8f82a9 100644
--- a/lisp/calc/calc-units.el
+++ b/lisp/calc/calc-units.el
@@ -2163,8 +2163,4 @@ If non-nil, return a list consisting of the note and the cents coefficient."
 (provide 'calc-units)
-;; Local variables:
-;; coding: utf-8
-;; End:
 ;;; calc-units.el ends here
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index b4b0ad8b185..de7bfb8cbef 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -3918,8 +3918,4 @@ See Info node `(calc)Defining Functions'."
 (provide 'calc)
-;; Local variables:
-;; coding: utf-8
-;; End:
 ;;; calc.el ends here
diff --git a/lisp/calc/calccomp.el b/lisp/calc/calccomp.el
index a3432c14b15..119f41993c3 100644
--- a/lisp/calc/calccomp.el
+++ b/lisp/calc/calccomp.el
@@ -1670,8 +1670,4 @@
 (provide 'calccomp)
-;; Local variables:
-;; coding: utf-8
-;; End:
 ;;; calccomp.el ends here
diff --git a/lisp/calendar/cal-bahai.el b/lisp/calendar/cal-bahai.el
index 998dc6c7056..d0b3021ea60 100644
--- a/lisp/calendar/cal-bahai.el
+++ b/lisp/calendar/cal-bahai.el
@@ -324,8 +324,4 @@ Prefix argument ARG will make the entry nonmarking."
 (provide 'cal-bahai)
-;; Local Variables:
-;; coding: utf-8
-;; End:
 ;;; cal-bahai.el ends here
diff --git a/lisp/calendar/cal-french.el b/lisp/calendar/cal-french.el
index b88adb9b636..33e8e8e0618 100644
--- a/lisp/calendar/cal-french.el
+++ b/lisp/calendar/cal-french.el
@@ -256,8 +256,4 @@ Echo French Revolutionary date unless NOECHO is non-nil."
 (provide 'cal-french)
-;; Local Variables:
-;; coding: utf-8
-;; End:
 ;;; cal-french.el ends here
diff --git a/lisp/calendar/cal-menu.el b/lisp/calendar/cal-menu.el
index 251d811bc52..211f16c22f7 100644
--- a/lisp/calendar/cal-menu.el
+++ b/lisp/calendar/cal-menu.el
@@ -280,8 +280,4 @@ is non-nil."
 (provide 'cal-menu)
-;; Local Variables:
-;; coding: utf-8
-;; End:
 ;;; cal-menu.el ends here
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 86e5477aa6f..f188b68b050 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -2635,7 +2635,6 @@ If called by a mouse-event, pops up a menu with the result."
 ;; Local variables:
 ;; byte-compile-dynamic: t
-;; coding: utf-8
 ;; End:
 ;;; calendar.el ends here
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index a1370bbc5e3..7382abf67fc 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -2534,8 +2534,4 @@ entry is found the user is asked to confirm its addition."
 (provide 'diary-lib)
-;; Local Variables:
-;; coding: utf-8
-;; End:
 ;;; diary-lib.el ends here
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index bd3a558dc2c..307ab4deb82 100644
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -823,8 +823,4 @@ arguments, it returns the date of Pascha (Greek Orthodox Easter)."
 (provide 'holidays)
-;; Local Variables:
-;; coding: utf-8
-;; End:
 ;;; holidays.el ends here
diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el
index 4b71530febb..0955e72aa04 100644
--- a/lisp/calendar/icalendar.el
+++ b/lisp/calendar/icalendar.el
@@ -1,4 +1,4 @@
-;;; icalendar.el --- iCalendar implementation -*-coding: utf-8 -*-
+;;; icalendar.el --- iCalendar implementation
 ;; Copyright (C) 2002-2015 Free Software Foundation, Inc.
diff --git a/lisp/cedet/mode-local.el b/lisp/cedet/mode-local.el
index 8736a4ff93c..b5995ffa397 100644
--- a/lisp/cedet/mode-local.el
+++ b/lisp/cedet/mode-local.el
@@ -644,9 +644,9 @@ SYMBOL is a function that can be overridden."
      (insert (overload-docstring-extension symbol) "\n\n")
      (insert (format-message "default function: `%s'\n" default))
      (if override
-          (insert (format-message "\noverride in buffer '%s': `%s'\n"
+          (insert (format-message "\noverride in buffer `%s': `%s'\n"
                                  describe-function-orig-buffer override))
-        (insert (format-message "\nno override in buffer '%s'\n"
+        (insert (format-message "\nno override in buffer `%s'\n"
                                describe-function-orig-buffer)))
      (mapatoms
diff --git a/lisp/color.el b/lisp/color.el
index 3471243a656..d572222021b 100644
--- a/lisp/color.el
+++ b/lisp/color.el
@@ -1,4 +1,4 @@
-;;; color.el --- Color manipulation library -*- coding: utf-8; lexical-binding:t -*-
+;;; color.el --- Color manipulation library -*- lexical-binding:t -*-
 ;; Copyright (C) 2010-2015 Free Software Foundation, Inc.
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 9d023e3dc89..e95a8c9288b 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1590,7 +1590,3 @@ If there are no buffers left to create, kill the timer."
 (provide 'desktop)
 ;;; desktop.el ends here
-;; Local Variables:
-;; coding: utf-8
-;; End:
diff --git a/lisp/dnd.el b/lisp/dnd.el
index 3e161dcfb51..d4fb0889f0a 100644
--- a/lisp/dnd.el
+++ b/lisp/dnd.el
@@ -1,4 +1,4 @@
-;;; dnd.el --- drag and drop support.  -*- coding: utf-8 -*-
+;;; dnd.el --- drag and drop support
 ;; Copyright (C) 2005-2015 Free Software Foundation, Inc.
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 8699af60ea8..6f7ba3353f6 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -2015,7 +2015,7 @@ and will be removed soon.  See (elisp)Backquote in the manual."))
       (format "     (string-lessp emacs-version \"%s\")\n" minimum-version)
       ;; Because the header must fit in a fixed width, we cannot
       ;; insert arbitrary-length file names (Bug#11585).
-       "     (error \"'%s' was compiled for "
+       "     (error \"`%s' was compiled for "
       (format "Emacs %s or later\" #$))\n\n" minimum-version))
      ;; Now compensate for any change in size, to make sure all
      ;; positions in the file remain valid.
diff --git a/lisp/emacs-lisp/cconv.el b/lisp/emacs-lisp/cconv.el
index 0f75f0a1664..efa9a3da011 100644
--- a/lisp/emacs-lisp/cconv.el
+++ b/lisp/emacs-lisp/cconv.el
@@ -1,4 +1,4 @@
-;;; cconv.el --- Closure conversion for statically scoped Emacs lisp. -*- lexical-binding: t; coding: utf-8 -*-
+;;; cconv.el --- Closure conversion for statically scoped Emacs lisp. -*- lexical-binding: t -*-
 ;; Copyright (C) 2011-2015 Free Software Foundation, Inc.
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index d5d8ef0a8a1..c42094f0f0c 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -1,4 +1,4 @@
-;;; cl-macs.el --- Common Lisp macros  -*- lexical-binding: t; coding: utf-8 -*-
+;;; cl-macs.el --- Common Lisp macros  -*- lexical-binding: t -*-
 ;; Copyright (C) 1993, 2001-2015 Free Software Foundation, Inc.
diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el
index 1317d699d25..50f880d7b33 100644
--- a/lisp/emacs-lisp/copyright.el
+++ b/lisp/emacs-lisp/copyright.el
@@ -375,9 +375,4 @@ If FIX is non-nil, run `copyright-fix-years' instead."
 (provide 'copyright)
-;; For the copyright sign:
-;; Local Variables:
-;; coding: utf-8
-;; End:
 ;;; copyright.el ends here
diff --git a/lisp/emacs-lisp/elint.el b/lisp/emacs-lisp/elint.el
index 86ac33c2600..64d65c05902 100644
--- a/lisp/emacs-lisp/elint.el
+++ b/lisp/emacs-lisp/elint.el
@@ -520,7 +520,7 @@ Return nil if there are no more forms, t otherwise."
              ;;;       (with-syntax-table emacs-lisp-mode-syntax-table
              ;;;         (elint-update-env))
              ;;;       (setq env (elint-env-add-env env elint-buffer-env))))
-              ;;(message "Elint processed (require '%s)" name))
+              ;;(message "%s" (format "Elint processed (require '%s)" name))
          (error "%s.el not found in load-path" libname)))
    (error
     (message "Can't get variables from require'd library %s: %s"
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index fec9467bbb7..9ce0dfd49e8 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -238,17 +238,21 @@
          (throw 'found t))))))
 (defmacro let-when-compile (bindings &rest body)
-  "Like `let', but allow for compile time optimization.
+  "Like `let*', but allow for compile time optimization.
-Use BINDINGS as in regular `let', but in BODY each usage should
+Use BINDINGS as in regular `let*', but in BODY each usage should
 be wrapped in `eval-when-compile'.
 This will generate compile-time constants from BINDINGS."
  (declare (indent 1) (debug let))
-  (cl-progv (mapcar #'car bindings)
+  (letrec ((loop
-      (mapcar (lambda (x) (eval (cadr x))) bindings)
+            (lambda (bindings)
-    (macroexpand-all
+              (if (null bindings)
-     (macroexp-progn
+                  (macroexpand-all (macroexp-progn body)
-      body)
+                                   macroexpand-all-environment)
-     macroexpand-all-environment)))
+                (let ((binding (pop bindings)))
+                  (cl-progv (list (car binding))
+                      (list (eval (nth 1 binding) t))
+                    (funcall loop bindings)))))))
+    (funcall loop bindings)))
 (let-when-compile
    ((lisp-fdefs '("defmacro" "defun"))
diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el
index 2c33d39c32f..8bf49b01689 100644
--- a/lisp/emacs-lisp/macroexp.el
+++ b/lisp/emacs-lisp/macroexp.el
@@ -1,4 +1,4 @@
-;;; macroexp.el --- Additional macro-expansion support -*- lexical-binding: t; coding: utf-8 -*-
+;;; macroexp.el --- Additional macro-expansion support -*- lexical-binding: t -*-
 ;;
 ;; Copyright (C) 2004-2015 Free Software Foundation, Inc.
 ;;
diff --git a/lisp/emacs-lisp/pcase.el b/lisp/emacs-lisp/pcase.el
index ea4f38add76..8bcb447cfbb 100644
--- a/lisp/emacs-lisp/pcase.el
+++ b/lisp/emacs-lisp/pcase.el
@@ -1,4 +1,4 @@
-;;; pcase.el --- ML-style pattern-matching macro for Elisp -*- lexical-binding: t; coding: utf-8 -*-
+;;; pcase.el --- ML-style pattern-matching macro for Elisp -*- lexical-binding: t -*-
 ;; Copyright (C) 2010-2015 Free Software Foundation, Inc.
diff --git a/lisp/emacs-lisp/seq.el b/lisp/emacs-lisp/seq.el
index e0f17c0335d..a63447d3243 100644
--- a/lisp/emacs-lisp/seq.el
+++ b/lisp/emacs-lisp/seq.el
@@ -261,8 +261,7 @@ If SEQ is empty, return INITIAL-VALUE and FUNCTION is not called."
    t))
 (cl-defgeneric seq-some (pred seq)
-  "Return non-nil if (PRED element) is non-nil for any element in SEQ, nil otherwise.
+  "Return the first value for which if (PRED element) is non-nil for in SEQ."
-If so, return the non-nil value returned by PRED."
  (catch 'seq--break
    (seq-doseq (elt seq)
      (let ((result (funcall pred elt)))
diff --git a/lisp/emacs-lisp/shadow.el b/lisp/emacs-lisp/shadow.el
index 17e3be7d3ff..229bb587488 100644
--- a/lisp/emacs-lisp/shadow.el
+++ b/lisp/emacs-lisp/shadow.el
@@ -286,7 +286,3 @@ version unless you know what you are doing.\n")
 (provide 'shadow)
 ;;; shadow.el ends here
-;; Local Variables:
-;; coding: utf-8
-;; End:
diff --git a/lisp/emacs-lisp/tabulated-list.el b/lisp/emacs-lisp/tabulated-list.el
index cd61eb9ae56..47ecd2b7922 100644
--- a/lisp/emacs-lisp/tabulated-list.el
+++ b/lisp/emacs-lisp/tabulated-list.el
@@ -581,8 +581,4 @@ as the ewoc pretty-printer."
 (provide 'tabulated-list)
-;; Local Variables:
-;; coding: utf-8
-;; End:
 ;;; tabulated-list.el ends here
diff --git a/lisp/filesets.el b/lisp/filesets.el
index ab332bbeff0..28d0cd85582 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -1,4 +1,4 @@
-;;; filesets.el --- handle group of files -*- coding: utf-8 -*-
+;;; filesets.el --- handle group of files
 ;; Copyright (C) 2002-2015 Free Software Foundation, Inc.
diff --git a/lisp/fringe.el b/lisp/fringe.el
index 8f40c46c3d3..8524f2ad2a2 100644
--- a/lisp/fringe.el
+++ b/lisp/fringe.el
@@ -1,4 +1,4 @@
-;;; fringe.el --- fringe setup and control  -*- coding: utf-8 -*-
+;;; fringe.el --- fringe setup and control
 ;; Copyright (C) 2002-2015 Free Software Foundation, Inc.
diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el
index f101ecdea08..32e22ebc29b 100644
--- a/lisp/gnus/auth-source.el
+++ b/lisp/gnus/auth-source.el
@@ -560,7 +560,7 @@ other properties will always hold scalar values.
 Typically the :secret property, if present, contains a password.
 Common search keys are :max, :host, :port, and :user.  In
-addition, :create specifies how tokens will be or created.
+addition, :create specifies if and how tokens will be created.
 Finally, :type can specify which backend types you want to check.
 A string value is always matched literally.  A symbol is matched
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index 0a0a0b346c0..719cb50ac77 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -2433,8 +2433,4 @@ Use a fallback method for obtaining the rgb values for a color.
 (provide 'htmlfontify)
-;; Local Variables:
-;; coding: utf-8
-;; End:
 ;;; htmlfontify.el ends here
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 5065b661101..89477bd919f 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -2493,14 +2493,17 @@ new filter onto the stack, and the filters combine to show just
 buffers which satisfy ALL criteria on the stack.  For example, suppose
 you only want to see buffers in `emacs-lisp' mode, whose names begin
 with \"gnus\".  You can accomplish this via:
-`\\[ibuffer-filter-by-mode] emacs-lisp-mode RET
-\\[ibuffer-filter-by-name] ^gnus RET'.
+  \\[ibuffer-filter-by-mode] emacs-lisp-mode RET
+  \\[ibuffer-filter-by-name] ^gnus RET
 Additionally, you can OR the top two filters together with
 `\\[ibuffer-or-filters]'.  To see all buffers in either
 `emacs-lisp-mode' or `lisp-interaction-mode', type:
-`\\[ibuffer-filter-by-mode] emacs-lisp-mode RET \\[ibuffer-filter-by-mode] lisp-interaction-mode RET \\[ibuffer-or-filters]'.
+  \\[ibuffer-filter-by-mode] emacs-lisp-mode RET
+  \\[ibuffer-filter-by-mode] lisp-interaction-mode RET
+  \\[ibuffer-or-filters]
 Filters can also be saved and restored using mnemonic names: see the
 functions `ibuffer-save-filters' and `ibuffer-switch-to-saved-filters'.
@@ -2518,9 +2521,10 @@ create a filter group, simply use the regular functions to create a
 filter, and then type `\\[ibuffer-filters-to-filter-group]'.
 A quick example will make things clearer.  Suppose that one wants to
-group all of one's Emacs Lisp buffers together.  To do this, type
+group all of one's Emacs Lisp buffers together.  To do this, type:
-`\\[ibuffer-filter-by-mode] emacs-lisp-mode RET \\[ibuffer-filters-to-filter-group] RET emacs lisp buffers RET'
+  \\[ibuffer-filter-by-mode] emacs-lisp-mode RET
+  \\[ibuffer-filters-to-filter-group] emacs lisp buffers RET
 You may, of course, name the group whatever you want; it doesn't have
 to be \"emacs lisp buffers\".  Filter groups may be composed of any
@@ -2974,8 +2978,4 @@ defaults to one.
 (run-hooks 'ibuffer-load-hook)
-;; Local Variables:
-;; coding: utf-8
-;; End:
 ;;; ibuffer.el ends here
diff --git a/lisp/info-xref.el b/lisp/info-xref.el
index 2b81efa178e..fcdf5323db7 100644
--- a/lisp/info-xref.el
+++ b/lisp/info-xref.el
@@ -454,7 +454,7 @@ and can take a long time."
        (cond ((symbolp load)
               (condition-case cause (require load)
                 (error
-                  (info-xref-output "Symbol `%s': cannot require '%s: %s"
+                  (info-xref-output "Symbol `%s': cannot require `%s': %s"
                                    symbol load cause))))
              ;; skip if previously loaded
              ((assoc load load-history))
diff --git a/lisp/json.el b/lisp/json.el
index daa0c94da28..e2c7cc77222 100644
--- a/lisp/json.el
+++ b/lisp/json.el
@@ -57,7 +57,8 @@
 (defvar json-object-type 'alist
  "Type to convert JSON objects to.
 Must be one of `alist', `plist', or `hash-table'.  Consider let-binding
-this around your call to `json-read' instead of `setq'ing it.")
+this around your call to `json-read' instead of `setq'ing it.  Ordering
+is maintained for `alist' and `plist', but not for `hash-table'.")
 (defvar json-array-type 'vector
  "Type to convert JSON arrays to.
@@ -136,6 +137,17 @@ without indentation.")
                 'not-plist)))
  (null list))
+(defun json--plist-reverse (plist)
+  "Return a copy of PLIST in reverse order.
+Unlike `reverse', this keeps the property-value pairs intact."
+  (let (res)
+    (while plist
+      (let ((prop (pop plist))
+            (val (pop plist)))
+        (push val res)
+        (push prop res)))
+    res))
 (defmacro json--with-indentation (body)
  `(let ((json--encoding-current-indentation
          (if json-encoding-pretty-print
@@ -400,7 +412,10 @@ Please see the documentation of `json-object-type' and `json-key-type'."
          (signal 'json-object-format (list "," (json-peek))))))
    ;; Skip over the "}"
    (json-advance)
-    elements))
+    (pcase json-object-type
+      (`alist (nreverse elements))
+      (`plist (json--plist-reverse elements))
+      (_ elements))))
 ;; Hash table encoding
@@ -602,6 +617,8 @@ Advances point just past JSON object."
  (interactive "r")
  (atomic-change-group
    (let ((json-encoding-pretty-print t)
+          ;; Ensure that ordering is maintained
+          (json-object-type 'alist)
          (txt (delete-and-extract-region begin end)))
      (insert (json-encode (json-read-from-string txt))))))
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index 14c634f937c..e3e620c746b 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -3,7 +3,7 @@
 ;;; Code:
-;;;### (autoloads nil "5x5" "play/5x5.el" (21799 41767 31221 635000))
+;;;### (autoloads nil "5x5" "play/5x5.el" (22026 25907 631502 692000))
 ;;; Generated autoloads from play/5x5.el
 (autoload '5x5 "5x5" "\
@@ -65,8 +65,8 @@ should return a grid vector array that is the new solution.
 ;;;***
-;;;### (autoloads nil "ada-mode" "progmodes/ada-mode.el" (21980 16567
+;;;### (autoloads nil "ada-mode" "progmodes/ada-mode.el" (22011 58553
-;;;;;;  981544 893000))
+;;;;;;  865858 469000))
 ;;; 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" (21980 16567
+;;;### (autoloads nil "ada-xref" "progmodes/ada-xref.el" (22011 58553
-;;;;;;  981544 893000))
+;;;;;;  869858 469000))
 ;;; Generated autoloads from progmodes/ada-xref.el
 (autoload 'ada-find-file "ada-xref" "\
@@ -108,8 +108,8 @@ Completion is available.
 ;;;***
-;;;### (autoloads nil "add-log" "vc/add-log.el" (21985 34484 266705
+;;;### (autoloads nil "add-log" "vc/add-log.el" (22011 58554 85858
-;;;;;;  925000))
+;;;;;;  469000))
 ;;; Generated autoloads from vc/add-log.el
 (put 'change-log-default-name 'safe-local-variable 'string-or-null-p)
@@ -238,8 +238,8 @@ old-style time formats for entries are supported.
 ;;;***
-;;;### (autoloads nil "advice" "emacs-lisp/advice.el" (21976 19509
+;;;### (autoloads nil "advice" "emacs-lisp/advice.el" (22011 58553
-;;;;;;  764430 241000))
+;;;;;;  345858 469000))
 ;;; Generated autoloads from emacs-lisp/advice.el
 (defvar ad-redefinition-action 'warn "\
@@ -374,7 +374,7 @@ usage: (defadvice FUNCTION (CLASS NAME [POSITION] [ARGLIST] FLAG...)
 ;;;***
-;;;### (autoloads nil "align" "align.el" (21980 16567 345544 893000))
+;;;### (autoloads nil "align" "align.el" (21998 46516 830024 649000))
 ;;; Generated autoloads from align.el
 (autoload 'align "align" "\
@@ -477,7 +477,7 @@ A replacement function for `newline-and-indent', aligning as it goes.
 ;;;***
-;;;### (autoloads nil "allout" "allout.el" (21981 37426 507399 97000))
+;;;### (autoloads nil "allout" "allout.el" (22015 55603 653705 321000))
 ;;; Generated autoloads from allout.el
 (push (purecopy '(allout 2 3)) package--builtin-versions)
@@ -837,8 +837,8 @@ for details on preparing Emacs for automatic allout activation.
 ;;;***
-;;;### (autoloads nil "allout-widgets" "allout-widgets.el" (21980
+;;;### (autoloads nil "allout-widgets" "allout-widgets.el" (21998
-;;;;;;  16567 353544 893000))
+;;;;;;  46516 830024 649000))
 ;;; Generated autoloads from allout-widgets.el
 (push (purecopy '(allout-widgets 1 0)) package--builtin-versions)
@@ -896,8 +896,8 @@ outline hot-spot navigation (see `allout-mode').
 ;;;***
-;;;### (autoloads nil "ange-ftp" "net/ange-ftp.el" (21980 16567 805544
+;;;### (autoloads nil "ange-ftp" "net/ange-ftp.el" (22011 58553 761858
-;;;;;;  893000))
+;;;;;;  469000))
 ;;; Generated autoloads from net/ange-ftp.el
 (defalias 'ange-ftp-re-read-dir 'ange-ftp-reread-dir)
@@ -978,8 +978,8 @@ This is a good function to put in `comint-output-filter-functions'.
 ;;;***
-;;;### (autoloads nil "antlr-mode" "progmodes/antlr-mode.el" (21980
+;;;### (autoloads nil "antlr-mode" "progmodes/antlr-mode.el" (22011
-;;;;;;  16567 993544 893000))
+;;;;;;  58553 873858 469000))
 ;;; Generated autoloads from progmodes/antlr-mode.el
 (push (purecopy '(antlr-mode 2 2 3)) package--builtin-versions)
@@ -1015,8 +1015,8 @@ Used in `antlr-mode'.  Also a useful function in `java-mode-hook'.
 ;;;***
-;;;### (autoloads nil "appt" "calendar/appt.el" (21976 19509 728430
+;;;### (autoloads nil "appt" "calendar/appt.el" (21998 46516 878024
-;;;;;;  241000))
+;;;;;;  649000))
 ;;; Generated autoloads from calendar/appt.el
 (autoload 'appt-add "appt" "\
@@ -1037,8 +1037,8 @@ ARG is positive, otherwise off.
 ;;;***
-;;;### (autoloads nil "apropos" "apropos.el" (21985 34484 142705
+;;;### (autoloads nil "apropos" "apropos.el" (21998 46516 834024
-;;;;;;  925000))
+;;;;;;  649000))
 ;;; Generated autoloads from apropos.el
 (autoload 'apropos-read-pattern "apropos" "\
@@ -1153,8 +1153,8 @@ Returns list of symbols and documentation found.
 ;;;***
-;;;### (autoloads nil "arc-mode" "arc-mode.el" (21878 48426 204093
+;;;### (autoloads nil "arc-mode" "arc-mode.el" (22027 46774 644310
-;;;;;;  508000))
+;;;;;;  591000))
 ;;; Generated autoloads from arc-mode.el
 (autoload 'archive-mode "arc-mode" "\
@@ -1480,8 +1480,8 @@ Special commands:
 ;;;***
-;;;### (autoloads nil "auth-source" "gnus/auth-source.el" (21981
+;;;### (autoloads nil "auth-source" "gnus/auth-source.el" (22027
-;;;;;;  37426 543399 97000))
+;;;;;;  46774 676310 591000))
 ;;; Generated autoloads from gnus/auth-source.el
 (defvar auth-source-cache-expiry 7200 "\
@@ -1802,8 +1802,8 @@ Run script using `bat-run' and `bat-run-args'.
 ;;;***
-;;;### (autoloads nil "battery" "battery.el" (21754 56896 744606
+;;;### (autoloads nil "battery" "battery.el" (22026 25907 487502
-;;;;;;  568000))
+;;;;;;  692000))
 ;;; Generated autoloads from battery.el
 (put 'battery-mode-line-string 'risky-local-variable t)
@@ -1875,8 +1875,8 @@ For non-interactive use see also `benchmark-run' and
 ;;;***
-;;;### (autoloads nil "bibtex" "textmodes/bibtex.el" (21988 10682
+;;;### (autoloads nil "bibtex" "textmodes/bibtex.el" (22011 58554
-;;;;;;  61624 461000))
+;;;;;;  41858 469000))
 ;;; Generated autoloads from textmodes/bibtex.el
 (autoload 'bibtex-initialize "bibtex" "\
@@ -2123,8 +2123,8 @@ a reflection.
 ;;;***
-;;;### (autoloads nil "bookmark" "bookmark.el" (21980 16567 369544
+;;;### (autoloads nil "bookmark" "bookmark.el" (22011 58553 109858
-;;;;;;  893000))
+;;;;;;  469000))
 ;;; Generated autoloads from bookmark.el
 (define-key ctl-x-r-map "b" 'bookmark-jump)
 (define-key ctl-x-r-map "m" 'bookmark-set)
@@ -2317,8 +2317,8 @@ Incremental search of bookmarks, hiding the non-matches as we go.
 ;;;***
-;;;### (autoloads nil "browse-url" "net/browse-url.el" (21811 32939
+;;;### (autoloads nil "browse-url" "net/browse-url.el" (21993 28596
-;;;;;;  190503 320000))
+;;;;;;  198597 473000))
 ;;; Generated autoloads from net/browse-url.el
 (defvar browse-url-browser-function 'browse-url-default-browser "\
@@ -2658,7 +2658,7 @@ from `browse-url-elinks-wrapper'.
 ;;;***
-;;;### (autoloads nil "bs" "bs.el" (21980 16567 373544 893000))
+;;;### (autoloads nil "bs" "bs.el" (21998 46516 834024 649000))
 ;;; Generated autoloads from bs.el
 (push (purecopy '(bs 1 17)) package--builtin-versions)
@@ -2699,8 +2699,8 @@ name of buffer configuration.
 ;;;***
-;;;### (autoloads nil "bubbles" "play/bubbles.el" (21980 16567 957544
+;;;### (autoloads nil "bubbles" "play/bubbles.el" (22026 25907 631502
-;;;;;;  893000))
+;;;;;;  692000))
 ;;; Generated autoloads from play/bubbles.el
 (autoload 'bubbles "bubbles" "\
@@ -2742,8 +2742,8 @@ Like `bug-reference-mode', but only buttonize in comments and strings.
 ;;;***
-;;;### (autoloads nil "bytecomp" "emacs-lisp/bytecomp.el" (21988
+;;;### (autoloads nil "bytecomp" "emacs-lisp/bytecomp.el" (22011
-;;;;;;  10681 977624 461000))
+;;;;;;  58553 361858 469000))
 ;;; 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)
@@ -2823,8 +2823,8 @@ whose definitions have been compiled in this Emacs session, as well as
 all functions called by those functions.
 The call graph does not include macros, inline functions, or
-primitives that the byte-code interpreter knows about directly (eq,
+primitives that the byte-code interpreter knows about directly
-cons, etc.).
+\(`eq', `cons', etc.).
 The call tree also lists those functions which are not known to be called
 \(that is, to which no calls have been compiled), and which cannot be
@@ -2873,8 +2873,8 @@ and corresponding effects.
 ;;;***
-;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (21670 32330
+;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (21990 52406
-;;;;;;  885624 725000))
+;;;;;;  468500 385000))
 ;;; Generated autoloads from calendar/cal-dst.el
 (put 'calendar-daylight-savings-starts 'risky-local-variable t)
@@ -2885,8 +2885,8 @@ and corresponding effects.
 ;;;***
-;;;### (autoloads nil "cal-hebrew" "calendar/cal-hebrew.el" (21670
+;;;### (autoloads nil "cal-hebrew" "calendar/cal-hebrew.el" (21993
-;;;;;;  32330 885624 725000))
+;;;;;;  28595 970597 473000))
 ;;; Generated autoloads from calendar/cal-hebrew.el
 (autoload 'calendar-hebrew-list-yahrzeits "cal-hebrew" "\
@@ -2898,7 +2898,7 @@ from the cursor position.
 ;;;***
-;;;### (autoloads nil "calc" "calc/calc.el" (21985 34484 202705 925000))
+;;;### (autoloads nil "calc" "calc/calc.el" (22026 25907 527502 692000))
 ;;; Generated autoloads from calc/calc.el
 (define-key ctl-x-map "*" 'calc-dispatch)
@@ -2995,8 +2995,8 @@ See Info node `(calc)Defining Functions'.
 ;;;***
-;;;### (autoloads nil "calculator" "calculator.el" (21974 64192 548009
+;;;### (autoloads nil "calculator" "calculator.el" (21993 28595 966597
-;;;;;;  993000))
+;;;;;;  473000))
 ;;; Generated autoloads from calculator.el
 (autoload 'calculator "calculator" "\
@@ -3007,8 +3007,8 @@ See the documentation for `calculator-mode' for more information.
 ;;;***
-;;;### (autoloads nil "calendar" "calendar/calendar.el" (21980 16567
+;;;### (autoloads nil "calendar" "calendar/calendar.el" (22026 25907
-;;;;;;  413544 893000))
+;;;;;;  535502 692000))
 ;;; Generated autoloads from calendar/calendar.el
 (autoload 'calendar "calendar" "\
@@ -3069,8 +3069,8 @@ it fails.
 ;;;***
-;;;### (autoloads nil "cc-engine" "progmodes/cc-engine.el" (21988
+;;;### (autoloads nil "cc-engine" "progmodes/cc-engine.el" (22011
-;;;;;;  10682 33624 461000))
+;;;;;;  58553 881858 469000))
 ;;; Generated autoloads from progmodes/cc-engine.el
 (autoload 'c-guess-basic-syntax "cc-engine" "\
@@ -3179,8 +3179,8 @@ the absolute file name of the file if STYLE-NAME is nil.
 ;;;***
-;;;### (autoloads nil "cc-mode" "progmodes/cc-mode.el" (21976 19510
+;;;### (autoloads nil "cc-mode" "progmodes/cc-mode.el" (22021 7991
-;;;;;;  104430 241000))
+;;;;;;  65719 83000))
 ;;; Generated autoloads from progmodes/cc-mode.el
 (autoload 'c-initialize-cc-mode "cc-mode" "\
@@ -3202,7 +3202,8 @@ control).  See \"cc-mode.el\" for more info.
 (add-to-list 'auto-mode-alist '("\\.ii\\'" . c++-mode))
 (autoload 'c-mode "cc-mode" "\
-Major mode for editing K&R and ANSI C code.
+Major mode for editing C code.
 To submit a problem report, enter `\\[c-submit-bug-report]' from a
 c-mode buffer.  This automatically sets up a mail buffer with version
 information already added.  You just need to add a description of the
@@ -3389,8 +3390,8 @@ and exists only for compatibility reasons.
 ;;;***
-;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (21976 19510
+;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (22011 58553
-;;;;;;  104430 241000))
+;;;;;;  885858 469000))
 ;;; Generated autoloads from progmodes/cc-vars.el
 (put 'c-basic-offset 'safe-local-variable 'integerp)
 (put 'c-backslash-column 'safe-local-variable 'integerp)
@@ -3398,8 +3399,8 @@ and exists only for compatibility reasons.
 ;;;***
-;;;### (autoloads nil "ccl" "international/ccl.el" (21988 10681 977624
+;;;### (autoloads nil "ccl" "international/ccl.el" (21998 46517 74024
-;;;;;;  461000))
+;;;;;;  649000))
 ;;; Generated autoloads from international/ccl.el
 (autoload 'ccl-compile "ccl" "\
@@ -3692,8 +3693,8 @@ See the documentation of `define-ccl-program' for the detail of CCL program.
 ;;;***
-;;;### (autoloads nil "cconv" "emacs-lisp/cconv.el" (21978 61237
+;;;### (autoloads nil "cconv" "emacs-lisp/cconv.el" (22026 25907
-;;;;;;  422488 269000))
+;;;;;;  559502 692000))
 ;;; Generated autoloads from emacs-lisp/cconv.el
 (autoload 'cconv-closure-convert "cconv" "\
@@ -3719,8 +3720,8 @@ Add the warnings that closure conversion would encounter.
 ;;;***
-;;;### (autoloads nil "cfengine" "progmodes/cfengine.el" (21980 16568
+;;;### (autoloads nil "cfengine" "progmodes/cfengine.el" (22011 58553
-;;;;;;  17544 893000))
+;;;;;;  889858 469000))
 ;;; Generated autoloads from progmodes/cfengine.el
 (push (purecopy '(cfengine 1 4)) package--builtin-versions)
@@ -3773,15 +3774,15 @@ match any number of times.
 ;;;***
-;;;### (autoloads nil "chart" "emacs-lisp/chart.el" (21976 19509
+;;;### (autoloads nil "chart" "emacs-lisp/chart.el" (21998 46516
-;;;;;;  812430 241000))
+;;;;;;  978024 649000))
 ;;; Generated autoloads from emacs-lisp/chart.el
 (push (purecopy '(chart 0 2)) package--builtin-versions)
 ;;;***
 ;;;### (autoloads nil "check-declare" "emacs-lisp/check-declare.el"
-;;;;;;  (21978 61237 422488 269000))
+;;;;;;  (22011 58553 361858 469000))
 ;;; Generated autoloads from emacs-lisp/check-declare.el
 (autoload 'check-declare-file "check-declare" "\
@@ -3798,8 +3799,8 @@ Returns non-nil if any false statements are found.
 ;;;***
-;;;### (autoloads nil "checkdoc" "emacs-lisp/checkdoc.el" (21986
+;;;### (autoloads nil "checkdoc" "emacs-lisp/checkdoc.el" (22002
-;;;;;;  55346 260512 613000))
+;;;;;;  43570 516887 749000))
 ;;; Generated autoloads from emacs-lisp/checkdoc.el
 (push (purecopy '(checkdoc 0 6 2)) package--builtin-versions)
 (put 'checkdoc-force-docstrings-flag 'safe-local-variable #'booleanp)
@@ -4190,8 +4191,8 @@ a future Emacs interpreter will be able to use it.")
 ;;;***
-;;;### (autoloads nil "cmacexp" "progmodes/cmacexp.el" (21988 10682
+;;;### (autoloads nil "cmacexp" "progmodes/cmacexp.el" (22026 25907
-;;;;;;  33624 461000))
+;;;;;;  631502 692000))
 ;;; Generated autoloads from progmodes/cmacexp.el
 (autoload 'c-macro-expand "cmacexp" "\
@@ -4211,8 +4212,8 @@ For use inside Lisp programs, see also `c-macro-expansion'.
 ;;;***
-;;;### (autoloads nil "cmuscheme" "cmuscheme.el" (21887 31417 144735
+;;;### (autoloads nil "cmuscheme" "cmuscheme.el" (22011 58553 281858
-;;;;;;  656000))
+;;;;;;  469000))
 ;;; Generated autoloads from cmuscheme.el
 (autoload 'run-scheme "cmuscheme" "\
@@ -4232,7 +4233,7 @@ is run).
 ;;;***
-;;;### (autoloads nil "color" "color.el" (21670 32330 885624 725000))
+;;;### (autoloads nil "color" "color.el" (22026 25907 555502 692000))
 ;;; Generated autoloads from color.el
 (autoload 'color-name-to-rgb "color" "\
@@ -4251,7 +4252,7 @@ If FRAME cannot display COLOR, return nil.
 ;;;***
-;;;### (autoloads nil "comint" "comint.el" (21980 16567 473544 893000))
+;;;### (autoloads nil "comint" "comint.el" (22011 58553 293858 469000))
 ;;; Generated autoloads from comint.el
 (defvar comint-output-filter-functions '(ansi-color-process-output comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt) "\
@@ -4389,8 +4390,8 @@ on third call it again advances points to the next difference and so on.
 ;;;***
-;;;### (autoloads nil "compile" "progmodes/compile.el" (21980 16568
+;;;### (autoloads nil "compile" "progmodes/compile.el" (22015 55603
-;;;;;;  17544 893000))
+;;;;;;  789705 321000))
 ;;; Generated autoloads from progmodes/compile.el
 (defvar compilation-mode-hook nil "\
@@ -4594,8 +4595,8 @@ if ARG is omitted or nil.
 ;;;***
-;;;### (autoloads nil "conf-mode" "textmodes/conf-mode.el" (21988
+;;;### (autoloads nil "conf-mode" "textmodes/conf-mode.el" (22026
-;;;;;;  10682 61624 461000))
+;;;;;;  25907 647502 692000))
 ;;; Generated autoloads from textmodes/conf-mode.el
 (autoload 'conf-mode "conf-mode" "\
@@ -4779,8 +4780,8 @@ and subsequent calls on the same file won't go to disk.
 ;;;***
-;;;### (autoloads nil "copyright" "emacs-lisp/copyright.el" (21976
+;;;### (autoloads nil "copyright" "emacs-lisp/copyright.el" (22026
-;;;;;;  19509 832430 241000))
+;;;;;;  25907 575502 692000))
 ;;; Generated autoloads from emacs-lisp/copyright.el
 (put 'copyright-at-end-flag 'safe-local-variable 'booleanp)
 (put 'copyright-names-regexp 'safe-local-variable 'stringp)
@@ -4818,8 +4819,8 @@ If FIX is non-nil, run `copyright-fix-years' instead.
 ;;;***
-;;;### (autoloads nil "cperl-mode" "progmodes/cperl-mode.el" (21980
+;;;### (autoloads nil "cperl-mode" "progmodes/cperl-mode.el" (22011
-;;;;;;  16568 21544 893000))
+;;;;;;  58553 893858 469000))
 ;;; Generated autoloads from progmodes/cperl-mode.el
 (put 'cperl-indent-level 'safe-local-variable 'integerp)
 (put 'cperl-brace-offset 'safe-local-variable 'integerp)
@@ -5063,8 +5064,8 @@ with empty strings removed.
 ;;;***
-;;;### (autoloads nil "css-mode" "textmodes/css-mode.el" (21985 34484
+;;;### (autoloads nil "css-mode" "textmodes/css-mode.el" (22014 34736
-;;;;;;  258705 925000))
+;;;;;;  811840 613000))
 ;;; Generated autoloads from textmodes/css-mode.el
 (autoload 'css-mode "css-mode" "\
@@ -5080,8 +5081,8 @@ Major mode to edit \"Sassy CSS\" files.
 ;;;***
-;;;### (autoloads nil "cua-base" "emulation/cua-base.el" (21826 50080
+;;;### (autoloads nil "cua-base" "emulation/cua-base.el" (21990 52406
-;;;;;;  561727 536000))
+;;;;;;  528500 385000))
 ;;; Generated autoloads from emulation/cua-base.el
 (defvar cua-mode nil "\
@@ -5159,8 +5160,8 @@ entering the area covered by the text-property property or leaving it.
 ;;;***
-;;;### (autoloads nil "cus-edit" "cus-edit.el" (21981 37426 511399
+;;;### (autoloads nil "cus-edit" "cus-edit.el" (21993 28596 22597
-;;;;;;  97000))
+;;;;;;  473000))
 ;;; Generated autoloads from cus-edit.el
 (defvar custom-browse-sort-alphabetically nil "\
@@ -5297,8 +5298,8 @@ and `defface'.
 For example, the MH-E package updates this alist as follows:
-     (add-to-list 'customize-package-emacs-version-alist
+     (add-to-list \\='customize-package-emacs-version-alist
-                  '(MH-E (\"6.0\" . \"22.1\") (\"6.1\" . \"22.1\")
+                  \\='(MH-E (\"6.0\" . \"22.1\") (\"6.1\" . \"22.1\")
                         (\"7.0\" . \"22.1\") (\"7.1\" . \"22.1\")
                         (\"7.2\" . \"22.1\") (\"7.3\" . \"22.1\")
                         (\"7.4\" . \"22.1\") (\"8.0\" . \"22.1\")))
@@ -5479,8 +5480,8 @@ The format is suitable for use with `easy-menu-define'.
 ;;;***
-;;;### (autoloads nil "cus-theme" "cus-theme.el" (21985 34484 218705
+;;;### (autoloads nil "cus-theme" "cus-theme.el" (21998 46516 910024
-;;;;;;  925000))
+;;;;;;  649000))
 ;;; Generated autoloads from cus-theme.el
 (autoload 'customize-create-theme "cus-theme" "\
@@ -5513,8 +5514,8 @@ omitted, a buffer named *Custom Themes* is used.
 ;;;***
-;;;### (autoloads nil "cvs-status" "vc/cvs-status.el" (21670 32331
+;;;### (autoloads nil "cvs-status" "vc/cvs-status.el" (22026 25907
-;;;;;;  885635 586000))
+;;;;;;  671502 692000))
 ;;; Generated autoloads from vc/cvs-status.el
 (autoload 'cvs-status-mode "cvs-status" "\
@@ -5598,8 +5599,8 @@ If the argument is nil, we return the display table to its standard state.
 ;;;***
-;;;### (autoloads nil "dabbrev" "dabbrev.el" (21980 16567 473544
+;;;### (autoloads nil "dabbrev" "dabbrev.el" (22011 58553 321858
-;;;;;;  893000))
+;;;;;;  469000))
 ;;; Generated autoloads from dabbrev.el
 (put 'dabbrev-case-fold-search 'risky-local-variable t)
 (put 'dabbrev-case-replace 'risky-local-variable t)
@@ -5656,7 +5657,7 @@ Create a new data-debug buffer with NAME.
 ;;;***
-;;;### (autoloads nil "dbus" "net/dbus.el" (21855 577 147947 107000))
+;;;### (autoloads nil "dbus" "net/dbus.el" (22011 58553 761858 469000))
 ;;; Generated autoloads from net/dbus.el
 (autoload 'dbus-handle-event "dbus" "\
@@ -5669,8 +5670,8 @@ If the HANDLER returns a `dbus-error', it is propagated as return message.
 ;;;***
-;;;### (autoloads nil "dcl-mode" "progmodes/dcl-mode.el" (21980 16568
+;;;### (autoloads nil "dcl-mode" "progmodes/dcl-mode.el" (22011 58553
-;;;;;;  21544 893000))
+;;;;;;  897858 469000))
 ;;; Generated autoloads from progmodes/dcl-mode.el
 (autoload 'dcl-mode "dcl-mode" "\
@@ -5992,8 +5993,8 @@ the first time the mode is used.
 ;;;***
-;;;### (autoloads nil "descr-text" "descr-text.el" (21981 37426 511399
+;;;### (autoloads nil "descr-text" "descr-text.el" (21998 46516 914024
-;;;;;;  97000))
+;;;;;;  649000))
 ;;; Generated autoloads from descr-text.el
 (autoload 'describe-text-properties "descr-text" "\
@@ -6042,8 +6043,8 @@ This function is meant to be used as a value of
 ;;;***
-;;;### (autoloads nil "desktop" "desktop.el" (21976 19509 748430
+;;;### (autoloads nil "desktop" "desktop.el" (22026 25907 555502
-;;;;;;  241000))
+;;;;;;  692000))
 ;;; Generated autoloads from desktop.el
 (defvar desktop-save-mode nil "\
@@ -6285,8 +6286,8 @@ Deuglify broken Outlook (Express) articles and redisplay.
 ;;;***
-;;;### (autoloads nil "diary-lib" "calendar/diary-lib.el" (21985
+;;;### (autoloads nil "diary-lib" "calendar/diary-lib.el" (22026
-;;;;;;  34484 206705 925000))
+;;;;;;  25907 547502 692000))
 ;;; Generated autoloads from calendar/diary-lib.el
 (autoload 'diary "diary-lib" "\
@@ -6376,8 +6377,8 @@ This requires the external program `diff' to be in your `exec-path'.
 ;;;***
-;;;### (autoloads nil "diff-mode" "vc/diff-mode.el" (21985 34484
+;;;### (autoloads nil "diff-mode" "vc/diff-mode.el" (22011 58554
-;;;;;;  282705 925000))
+;;;;;;  89858 469000))
 ;;; Generated autoloads from vc/diff-mode.el
 (autoload 'diff-mode "diff-mode" "\
@@ -6420,7 +6421,7 @@ Optional arguments are passed to `dig-invoke'.
 ;;;***
-;;;### (autoloads nil "dired" "dired.el" (21985 34484 222705 925000))
+;;;### (autoloads nil "dired" "dired.el" (21998 46624 946024 649000))
 ;;; Generated autoloads from dired.el
 (defvar dired-listing-switches (purecopy "-al") "\
@@ -6577,8 +6578,8 @@ from `default-directory'.
 ;;;***
-;;;### (autoloads nil "disass" "emacs-lisp/disass.el" (21670 32330
+;;;### (autoloads nil "disass" "emacs-lisp/disass.el" (21993 28596
-;;;;;;  885624 725000))
+;;;;;;  58597 473000))
 ;;; Generated autoloads from emacs-lisp/disass.el
 (autoload 'disassemble "disass" "\
@@ -6731,7 +6732,7 @@ Default is 2.
 ;;;***
-;;;### (autoloads nil "dnd" "dnd.el" (21670 32330 885624 725000))
+;;;### (autoloads nil "dnd" "dnd.el" (22026 25907 555502 692000))
 ;;; Generated autoloads from dnd.el
 (defvar dnd-protocol-alist `((,(purecopy "^file:///") . dnd-open-local-file) (,(purecopy "^file://") . dnd-open-file) (,(purecopy "^file:") . dnd-open-local-file) (,(purecopy "^\\(https?\\|ftp\\|file\\|nfs\\)://") . dnd-open-file)) "\
@@ -6822,8 +6823,8 @@ See the command `doc-view-mode' for more information on this mode.
 ;;;***
-;;;### (autoloads nil "doctor" "play/doctor.el" (21670 32331 385639
+;;;### (autoloads nil "doctor" "play/doctor.el" (22011 58553 865858
-;;;;;;  720000))
+;;;;;;  469000))
 ;;; Generated autoloads from play/doctor.el
 (autoload 'doctor "doctor" "\
@@ -6861,8 +6862,8 @@ Switch to *dungeon* buffer and start game.
 ;;;***
-;;;### (autoloads nil "easy-mmode" "emacs-lisp/easy-mmode.el" (21907
+;;;### (autoloads nil "easy-mmode" "emacs-lisp/easy-mmode.el" (22011
-;;;;;;  48688 657360 195000))
+;;;;;;  58553 361858 469000))
 ;;; Generated autoloads from emacs-lisp/easy-mmode.el
 (defalias 'easy-mmode-define-minor-mode 'define-minor-mode)
@@ -7145,8 +7146,8 @@ To implement dynamic menus, either call this from
 ;;;***
-;;;### (autoloads nil "ebnf2ps" "progmodes/ebnf2ps.el" (21978 61237
+;;;### (autoloads nil "ebnf2ps" "progmodes/ebnf2ps.el" (22011 58553
-;;;;;;  706488 269000))
+;;;;;;  897858 469000))
 ;;; Generated autoloads from progmodes/ebnf2ps.el
 (push (purecopy '(ebnf2ps 4 4)) package--builtin-versions)
@@ -7411,8 +7412,8 @@ See `ebnf-style-database' documentation.
 ;;;***
-;;;### (autoloads nil "ebrowse" "progmodes/ebrowse.el" (21988 10682
+;;;### (autoloads nil "ebrowse" "progmodes/ebrowse.el" (21998 46517
-;;;;;;  37624 461000))
+;;;;;;  206024 649000))
 ;;; Generated autoloads from progmodes/ebrowse.el
 (autoload 'ebrowse-tree-mode "ebrowse" "\
@@ -7616,7 +7617,7 @@ With prefix arg NOCONFIRM, execute current line as-is without editing.
 ;;;***
-;;;### (autoloads nil "ede" "cedet/ede.el" (21986 55346 252512 613000))
+;;;### (autoloads nil "ede" "cedet/ede.el" (21996 4784 796983 429000))
 ;;; Generated autoloads from cedet/ede.el
 (push (purecopy '(ede 1 2)) package--builtin-versions)
@@ -7642,8 +7643,8 @@ an EDE controlled project.
 ;;;***
-;;;### (autoloads nil "edebug" "emacs-lisp/edebug.el" (21980 16567
+;;;### (autoloads nil "edebug" "emacs-lisp/edebug.el" (22022 28851
-;;;;;;  505544 893000))
+;;;;;;  765037 303000))
 ;;; Generated autoloads from emacs-lisp/edebug.el
 (defvar edebug-all-defs nil "\
@@ -7707,7 +7708,7 @@ Toggle edebugging of all forms.
 ;;;***
-;;;### (autoloads nil "ediff" "vc/ediff.el" (21985 34484 298705 925000))
+;;;### (autoloads nil "ediff" "vc/ediff.el" (22011 58554 93858 469000))
 ;;; Generated autoloads from vc/ediff.el
 (push (purecopy '(ediff 2 81 4)) package--builtin-versions)
@@ -7990,8 +7991,8 @@ With optional NODE, goes to that node.
 ;;;***
-;;;### (autoloads nil "ediff-mult" "vc/ediff-mult.el" (21670 32331
+;;;### (autoloads nil "ediff-mult" "vc/ediff-mult.el" (21993 28596
-;;;;;;  885635 586000))
+;;;;;;  422597 473000))
 ;;; Generated autoloads from vc/ediff-mult.el
 (autoload 'ediff-show-registry "ediff-mult" "\
@@ -8003,8 +8004,8 @@ Display Ediff's registry.
 ;;;***
-;;;### (autoloads nil "ediff-util" "vc/ediff-util.el" (21985 34484
+;;;### (autoloads nil "ediff-util" "vc/ediff-util.el" (22026 25907
-;;;;;;  298705 925000))
+;;;;;;  671502 692000))
 ;;; Generated autoloads from vc/ediff-util.el
 (autoload 'ediff-toggle-multiframe "ediff-util" "\
@@ -8073,8 +8074,8 @@ or nil, use a compact 80-column format.
 ;;;***
-;;;### (autoloads nil "edt" "emulation/edt.el" (21986 55346 264512
+;;;### (autoloads nil "edt" "emulation/edt.el" (22011 58553 453858
-;;;;;;  613000))
+;;;;;;  469000))
 ;;; Generated autoloads from emulation/edt.el
 (autoload 'edt-set-scroll-margins "edt" "\
@@ -8127,15 +8128,15 @@ BUFFER is put back into its original major mode.
 ;;;***
-;;;### (autoloads nil "eieio" "emacs-lisp/eieio.el" (21978 61583
+;;;### (autoloads nil "eieio" "emacs-lisp/eieio.el" (21998 46624
-;;;;;;  178488 269000))
+;;;;;;  898024 649000))
 ;;; Generated autoloads from emacs-lisp/eieio.el
 (push (purecopy '(eieio 1 4)) package--builtin-versions)
 ;;;***
-;;;### (autoloads nil "eieio-core" "emacs-lisp/eieio-core.el" (21978
+;;;### (autoloads nil "eieio-core" "emacs-lisp/eieio-core.el" (22009
-;;;;;;  61237 458488 269000))
+;;;;;;  58952 307546 645000))
 ;;; Generated autoloads from emacs-lisp/eieio-core.el
 (push (purecopy '(eieio-core 1 4)) package--builtin-versions)
@@ -8209,8 +8210,8 @@ This is suitable as an entry on `find-file-hook' or appropriate mode hooks.
 ;;;***
-;;;### (autoloads nil "elint" "emacs-lisp/elint.el" (21980 16567
+;;;### (autoloads nil "elint" "emacs-lisp/elint.el" (21998 46516
-;;;;;;  505544 893000))
+;;;;;;  994024 649000))
 ;;; Generated autoloads from emacs-lisp/elint.el
 (autoload 'elint-file "elint" "\
@@ -8732,7 +8733,7 @@ if ARG is omitted or nil.
 ;;;***
-;;;### (autoloads nil "epg" "epg.el" (21980 16567 517544 893000))
+;;;### (autoloads nil "epg" "epg.el" (22011 58553 461858 469000))
 ;;; Generated autoloads from epg.el
 (push (purecopy '(epg 1 0 0)) package--builtin-versions)
@@ -8764,7 +8765,7 @@ Look at CONFIG and try to expand GROUP.
 ;;;***
-;;;### (autoloads nil "erc" "erc/erc.el" (21980 16567 529544 893000))
+;;;### (autoloads nil "erc" "erc/erc.el" (22011 58553 477858 469000))
 ;;; Generated autoloads from erc/erc.el
 (push (purecopy '(erc 5 3)) package--builtin-versions)
@@ -8820,8 +8821,8 @@ Otherwise, connect to HOST:PORT as USER and /join CHANNEL.
 ;;;***
-;;;### (autoloads nil "erc-button" "erc/erc-button.el" (21980 16567
+;;;### (autoloads nil "erc-button" "erc/erc-button.el" (21998 46517
-;;;;;;  517544 893000))
+;;;;;;  30024 649000))
 ;;; Generated autoloads from erc/erc-button.el
 (autoload 'erc-button-mode "erc-button" nil t)
@@ -8841,8 +8842,8 @@ Otherwise, connect to HOST:PORT as USER and /join CHANNEL.
 ;;;***
-;;;### (autoloads nil "erc-dcc" "erc/erc-dcc.el" (21980 16567 517544
+;;;### (autoloads nil "erc-dcc" "erc/erc-dcc.el" (21998 46517 30024
-;;;;;;  893000))
+;;;;;;  649000))
 ;;; Generated autoloads from erc/erc-dcc.el
 (autoload 'erc-dcc-mode "erc-dcc")
@@ -9031,8 +9032,8 @@ You can save every individual message by putting this function on
 ;;;***
-;;;### (autoloads nil "erc-match" "erc/erc-match.el" (21980 16567
+;;;### (autoloads nil "erc-match" "erc/erc-match.el" (22011 58553
-;;;;;;  517544 893000))
+;;;;;;  461858 469000))
 ;;; Generated autoloads from erc/erc-match.el
 (autoload 'erc-match-mode "erc-match")
@@ -9097,8 +9098,8 @@ Show who's gone.
 ;;;***
-;;;### (autoloads nil "erc-networks" "erc/erc-networks.el" (21670
+;;;### (autoloads nil "erc-networks" "erc/erc-networks.el" (22011
-;;;;;;  32330 885624 725000))
+;;;;;;  58553 473858 469000))
 ;;; Generated autoloads from erc/erc-networks.el
 (autoload 'erc-determine-network "erc-networks" "\
@@ -9162,8 +9163,8 @@ with args, toggle notify status of people.
 ;;;***
-;;;### (autoloads nil "erc-services" "erc/erc-services.el" (21980
+;;;### (autoloads nil "erc-services" "erc/erc-services.el" (22011
-;;;;;;  16567 517544 893000))
+;;;;;;  58553 473858 469000))
 ;;; Generated autoloads from erc/erc-services.el
 (autoload 'erc-services-mode "erc-services" nil t)
@@ -9271,8 +9272,8 @@ Add a file to `erc-xdcc-files'.
 ;;;***
-;;;### (autoloads nil "ert" "emacs-lisp/ert.el" (21976 19509 868430
+;;;### (autoloads nil "ert" "emacs-lisp/ert.el" (22011 58553 409858
-;;;;;;  241000))
+;;;;;;  469000))
 ;;; Generated autoloads from emacs-lisp/ert.el
 (autoload 'ert-deftest "ert" "\
@@ -9341,8 +9342,8 @@ Display the documentation for TEST-OR-TEST-NAME (a symbol or ert-test).
 ;;;***
-;;;### (autoloads nil "ert-x" "emacs-lisp/ert-x.el" (21980 16567
+;;;### (autoloads nil "ert-x" "emacs-lisp/ert-x.el" (22011 58553
-;;;;;;  505544 893000))
+;;;;;;  393858 469000))
 ;;; Generated autoloads from emacs-lisp/ert-x.el
 (put 'ert-with-test-buffer 'lisp-indent-function 1)
@@ -9354,8 +9355,8 @@ Kill all test buffers that are still live.
 ;;;***
-;;;### (autoloads nil "esh-mode" "eshell/esh-mode.el" (21861 39358
+;;;### (autoloads nil "esh-mode" "eshell/esh-mode.el" (22003 64432
-;;;;;;  497944 643000))
+;;;;;;  600146 533000))
 ;;; Generated autoloads from eshell/esh-mode.el
 (autoload 'eshell-mode "esh-mode" "\
@@ -9401,8 +9402,8 @@ corresponding to a successful execution.
 ;;;***
-;;;### (autoloads nil "etags" "progmodes/etags.el" (21988 10682 37624
+;;;### (autoloads nil "etags" "progmodes/etags.el" (21998 46517 206024
-;;;;;;  461000))
+;;;;;;  649000))
 ;;; Generated autoloads from progmodes/etags.el
 (defvar tags-file-name nil "\
@@ -9888,7 +9889,7 @@ With ARG, insert that many delimiters.
 ;;;***
-;;;### (autoloads nil "eudc" "net/eudc.el" (21799 41767 21224 988000))
+;;;### (autoloads nil "eudc" "net/eudc.el" (22026 25907 611502 692000))
 ;;; Generated autoloads from net/eudc.el
 (autoload 'eudc-set-server "eudc" "\
@@ -9942,8 +9943,8 @@ This does nothing except loading eudc by autoload side-effect.
 ;;;***
-;;;### (autoloads nil "eudc-bob" "net/eudc-bob.el" (21704 50495 455324
+;;;### (autoloads nil "eudc-bob" "net/eudc-bob.el" (22026 25907 607502
-;;;;;;  752000))
+;;;;;;  692000))
 ;;; Generated autoloads from net/eudc-bob.el
 (autoload 'eudc-display-generic-binary "eudc-bob" "\
@@ -9978,8 +9979,8 @@ Display a button for the JPEG DATA.
 ;;;***
-;;;### (autoloads nil "eudc-export" "net/eudc-export.el" (21794 23865
+;;;### (autoloads nil "eudc-export" "net/eudc-export.el" (22026 25907
-;;;;;;  772631 636000))
+;;;;;;  607502 692000))
 ;;; Generated autoloads from net/eudc-export.el
 (autoload 'eudc-insert-record-at-point-into-bbdb "eudc-export" "\
@@ -9995,8 +9996,8 @@ Call `eudc-insert-record-at-point-into-bbdb' if on a record.
 ;;;***
-;;;### (autoloads nil "eudc-hotlist" "net/eudc-hotlist.el" (21704
+;;;### (autoloads nil "eudc-hotlist" "net/eudc-hotlist.el" (22026
-;;;;;;  50495 455324 752000))
+;;;;;;  25907 607502 692000))
 ;;; Generated autoloads from net/eudc-hotlist.el
 (autoload 'eudc-edit-hotlist "eudc-hotlist" "\
@@ -10033,7 +10034,7 @@ fourth arg NOSEP non-nil inhibits this.
 ;;;***
-;;;### (autoloads nil "eww" "net/eww.el" (21826 49851 770496 504000))
+;;;### (autoloads nil "eww" "net/eww.el" (22011 58553 761858 469000))
 ;;; Generated autoloads from net/eww.el
 (defvar eww-suggest-uris '(eww-links-at-point url-get-url-at-point eww-current-url) "\
@@ -10116,7 +10117,7 @@ file modes.
 ;;;***
-;;;### (autoloads nil "expand" "expand.el" (21670 32330 885624 725000))
+;;;### (autoloads nil "expand" "expand.el" (22011 58553 477858 469000))
 ;;; Generated autoloads from expand.el
 (autoload 'expand-add-abbrevs "expand" "\
@@ -10165,8 +10166,8 @@ This is used only in conjunction with `expand-add-abbrevs'.
 ;;;***
-;;;### (autoloads nil "f90" "progmodes/f90.el" (21914 21937 459876
+;;;### (autoloads nil "f90" "progmodes/f90.el" (22026 25907 635502
-;;;;;;  215000))
+;;;;;;  692000))
 ;;; Generated autoloads from progmodes/f90.el
 (autoload 'f90-mode "f90" "\
@@ -10215,7 +10216,7 @@ Variables controlling indentation style and extra features:
  Non-nil causes `f90-do-auto-fill' to break lines before delimiters
  (default t).
 `f90-beginning-ampersand'
-  Automatic insertion of & at beginning of continuation lines (default t).
+  Automatic insertion of `&' at beginning of continuation lines (default t).
 `f90-smart-end'
  From an END statement, check and fill the end using matching block start.
  Allowed values are `blink', `no-blink', and nil, which determine
@@ -10393,8 +10394,8 @@ Besides the choice of face, it is the same as `buffer-face-mode'.
 ;;;***
-;;;### (autoloads nil "feedmail" "mail/feedmail.el" (21989 31537
+;;;### (autoloads nil "feedmail" "mail/feedmail.el" (22011 58553
-;;;;;;  891825 721000))
+;;;;;;  677858 469000))
 ;;; Generated autoloads from mail/feedmail.el
 (push (purecopy '(feedmail 11)) package--builtin-versions)
@@ -10448,7 +10449,7 @@ you can set `feedmail-queue-reminder-alist' to nil.
 ;;;***
-;;;### (autoloads nil "ffap" "ffap.el" (21960 31281 328212 153000))
+;;;### (autoloads nil "ffap" "ffap.el" (21993 28596 82597 473000))
 ;;; Generated autoloads from ffap.el
 (autoload 'ffap-next "ffap" "\
@@ -10569,15 +10570,15 @@ the name is considered already unique; only the second substitution
 ;;;***
-;;;### (autoloads nil "filenotify" "filenotify.el" (21704 50495 455324
+;;;### (autoloads nil "filenotify" "filenotify.el" (22019 52657 867929
-;;;;;;  752000))
+;;;;;;  676000))
 ;;; 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.  It has the format
-  (file-notify (DESCRIPTOR ACTIONS FILE COOKIE) CALLBACK)
+  (file-notify (DESCRIPTOR ACTIONS FILE [FILE1-OR-COOKIE]) CALLBACK)
 Otherwise, signal a `file-notify-error'.
@@ -10585,8 +10586,7 @@ Otherwise, signal a `file-notify-error'.
 ;;;***
-;;;### (autoloads nil "files-x" "files-x.el" (21980 16567 557544
+;;;### (autoloads nil "files-x" "files-x.el" (21998 46517 38024 649000))
-;;;;;;  893000))
 ;;; Generated autoloads from files-x.el
 (autoload 'add-file-local-variable "files-x" "\
@@ -10651,8 +10651,8 @@ Copy directory-local variables to the -*- line.
 ;;;***
-;;;### (autoloads nil "filesets" "filesets.el" (21980 16567 557544
+;;;### (autoloads nil "filesets" "filesets.el" (22026 25907 587502
-;;;;;;  893000))
+;;;;;;  692000))
 ;;; Generated autoloads from filesets.el
 (autoload 'filesets-init "filesets" "\
@@ -10663,8 +10663,8 @@ Set up hooks, load the cache file -- if existing -- and build the menu.
 ;;;***
-;;;### (autoloads nil "find-cmd" "find-cmd.el" (21980 16567 573544
+;;;### (autoloads nil "find-cmd" "find-cmd.el" (22011 58553 489858
-;;;;;;  893000))
+;;;;;;  469000))
 ;;; Generated autoloads from find-cmd.el
 (push (purecopy '(find-cmd 0 6)) package--builtin-versions)
@@ -10684,8 +10684,8 @@ result is a string that should be ready for the command line.
 ;;;***
-;;;### (autoloads nil "find-dired" "find-dired.el" (21981 37426 535399
+;;;### (autoloads nil "find-dired" "find-dired.el" (22011 58553 489858
-;;;;;;  97000))
+;;;;;;  469000))
 ;;; Generated autoloads from find-dired.el
 (autoload 'find-dired "find-dired" "\
@@ -10725,8 +10725,8 @@ use in place of \"-ls\" as the final argument.
 ;;;***
-;;;### (autoloads nil "find-file" "find-file.el" (21670 32330 885624
+;;;### (autoloads nil "find-file" "find-file.el" (22011 58553 489858
-;;;;;;  725000))
+;;;;;;  469000))
 ;;; Generated autoloads from find-file.el
 (defvar ff-special-constructs `((,(purecopy "^#\\s *\\(include\\|import\\)\\s +[<\"]\\(.*\\)[>\"]") lambda nil (buffer-substring (match-beginning 2) (match-end 2)))) "\
@@ -10816,8 +10816,8 @@ Visit the file you click on in another window.
 ;;;***
-;;;### (autoloads nil "find-func" "emacs-lisp/find-func.el" (21978
+;;;### (autoloads nil "find-func" "emacs-lisp/find-func.el" (22011
-;;;;;;  61237 486488 269000))
+;;;;;;  58553 409858 469000))
 ;;; Generated autoloads from emacs-lisp/find-func.el
 (autoload 'find-library "find-func" "\
@@ -11008,7 +11008,7 @@ Change the filter on a `find-lisp-find-dired' buffer to REGEXP.
 ;;;***
-;;;### (autoloads nil "finder" "finder.el" (21980 16567 573544 893000))
+;;;### (autoloads nil "finder" "finder.el" (21998 46517 46024 649000))
 ;;; Generated autoloads from finder.el
 (push (purecopy '(finder 1 0)) package--builtin-versions)
@@ -11068,8 +11068,8 @@ to get the effect of a C-q.
 ;;;***
-;;;### (autoloads nil "flymake" "progmodes/flymake.el" (21980 16568
+;;;### (autoloads nil "flymake" "progmodes/flymake.el" (22011 58553
-;;;;;;  25544 893000))
+;;;;;;  901858 469000))
 ;;; Generated autoloads from progmodes/flymake.el
 (push (purecopy '(flymake 0 3)) package--builtin-versions)
@@ -11170,14 +11170,14 @@ Flyspell whole buffer.
 ;;;***
-;;;### (autoloads nil "foldout" "foldout.el" (21824 11953 672190
+;;;### (autoloads nil "foldout" "foldout.el" (22011 58553 513858
-;;;;;;  35000))
+;;;;;;  469000))
 ;;; Generated autoloads from foldout.el
 (push (purecopy '(foldout 1 10)) package--builtin-versions)
 ;;;***
-;;;### (autoloads nil "follow" "follow.el" (21976 19509 932430 241000))
+;;;### (autoloads nil "follow" "follow.el" (22023 49716 552634 164000))
 ;;; Generated autoloads from follow.el
 (autoload 'turn-on-follow-mode "follow" "\
@@ -11227,6 +11227,32 @@ Keys specific to Follow mode:
 \(fn &optional ARG)" t nil)
+(autoload 'follow-scroll-up "follow" "\
+Scroll text in a Follow mode window chain up.
+If called with no ARG, the `next-screen-context-lines' last lines of
+the bottom window in the chain will be visible in the top window.
+If called with an argument, scroll ARG lines up.
+Negative ARG means scroll downward.
+Works like `scroll-up' when not in Follow mode.
+\(fn &optional ARG)" t nil)
+(autoload 'follow-scroll-down "follow" "\
+Scroll text in a Follow mode window chain down.
+If called with no ARG, the `next-screen-context-lines' top lines of
+the top window in the chain will be visible in the bottom window.
+If called with an argument, scroll ARG lines down.
+Negative ARG means scroll upward.
+Works like `scroll-down' when not in Follow mode.
+\(fn &optional ARG)" t nil)
 (autoload 'follow-delete-other-windows-and-split "follow" "\
 Create two side by side windows and enter Follow mode.
@@ -11245,8 +11271,8 @@ selected if the original window is the first one in the frame.
 ;;;***
-;;;### (autoloads nil "footnote" "mail/footnote.el" (21814 9129 310503
+;;;### (autoloads nil "footnote" "mail/footnote.el" (22026 25907
-;;;;;;  742000))
+;;;;;;  595502 692000))
 ;;; Generated autoloads from mail/footnote.el
 (push (purecopy '(footnote 0 19)) package--builtin-versions)
@@ -11301,8 +11327,8 @@ Visit a file in Forms mode in other window.
 ;;;***
-;;;### (autoloads nil "fortran" "progmodes/fortran.el" (21953 58033
+;;;### (autoloads nil "fortran" "progmodes/fortran.el" (22011 58553
-;;;;;;  403058 929000))
+;;;;;;  901858 469000))
 ;;; Generated autoloads from progmodes/fortran.el
 (autoload 'fortran-mode "fortran" "\
@@ -11334,15 +11360,15 @@ Variables controlling indentation style and extra features:
  Amount of extra indentation for text in full-line comments (default 0).
 `fortran-comment-indent-style'
  How to indent the text in full-line comments. Allowed values are:
-  nil       don't change the indentation
+  nil         don't change the indentation
-  fixed     indent to `fortran-comment-line-extra-indent' beyond the
+  `fixed'     indent to `fortran-comment-line-extra-indent' beyond the
              value of either
                `fortran-minimum-statement-indent-fixed' (fixed format) or
                `fortran-minimum-statement-indent-tab' (TAB format),
              depending on the continuation format in use.
-  relative  indent to `fortran-comment-line-extra-indent' beyond the
+  `relative'  indent to `fortran-comment-line-extra-indent' beyond the
              indentation for a line of code.
-  (default 'fixed)
+  (default `fixed')
 `fortran-comment-indent-char'
  Single-character string to be inserted instead of space for
  full-line comment indentation (default \" \").
@@ -11622,8 +11648,8 @@ Interactively, reads the register using `register-read-with-preview'.
 ;;;***
-;;;### (autoloads nil "gdb-mi" "progmodes/gdb-mi.el" (21980 16568
+;;;### (autoloads nil "gdb-mi" "progmodes/gdb-mi.el" (22029 2088
-;;;;;;  25544 893000))
+;;;;;;  514685 339000))
 ;;; Generated autoloads from progmodes/gdb-mi.el
 (defvar gdb-enable-debug nil "\
@@ -11781,8 +11807,8 @@ regular expression that can be used as an element of
 ;;;***
-;;;### (autoloads nil "glasses" "progmodes/glasses.el" (21670 32331
+;;;### (autoloads nil "glasses" "progmodes/glasses.el" (22011 58553
-;;;;;;  385639 720000))
+;;;;;;  901858 469000))
 ;;; Generated autoloads from progmodes/glasses.el
 (autoload 'glasses-mode "glasses" "\
@@ -11796,8 +11822,8 @@ add virtual separators (like underscores) at places they belong to.
 ;;;***
-;;;### (autoloads nil "gmm-utils" "gnus/gmm-utils.el" (21670 32330
+;;;### (autoloads nil "gmm-utils" "gnus/gmm-utils.el" (21993 28596
-;;;;;;  885624 725000))
+;;;;;;  86597 473000))
 ;;; Generated autoloads from gnus/gmm-utils.el
 (autoload 'gmm-regexp-concat "gmm-utils" "\
@@ -11851,7 +11877,7 @@ DEFAULT-MAP specifies the default key map for ICON-LIST.
 ;;;***
-;;;### (autoloads nil "gnus" "gnus/gnus.el" (21980 16567 677544 893000))
+;;;### (autoloads nil "gnus" "gnus/gnus.el" (22011 58553 561858 469000))
 ;;; Generated autoloads from gnus/gnus.el
 (push (purecopy '(gnus 5 13)) package--builtin-versions)
 (when (fboundp 'custom-autoload)
@@ -11992,8 +12018,8 @@ CLEAN is obsolete and ignored.
 ;;;***
-;;;### (autoloads nil "gnus-art" "gnus/gnus-art.el" (21989 31537
+;;;### (autoloads nil "gnus-art" "gnus/gnus-art.el" (22011 58553
-;;;;;;  811825 721000))
+;;;;;;  521858 469000))
 ;;; Generated autoloads from gnus/gnus-art.el
 (autoload 'gnus-article-prepare-display "gnus-art" "\
@@ -12003,8 +12029,8 @@ Make the current buffer look like a nice article.
 ;;;***
-;;;### (autoloads nil "gnus-bookmark" "gnus/gnus-bookmark.el" (21670
+;;;### (autoloads nil "gnus-bookmark" "gnus/gnus-bookmark.el" (22011
-;;;;;;  32330 885624 725000))
+;;;;;;  58553 521858 469000))
 ;;; Generated autoloads from gnus/gnus-bookmark.el
 (autoload 'gnus-bookmark-set "gnus-bookmark" "\
@@ -12227,8 +12253,8 @@ If gravatars are already displayed, remove them.
 ;;;***
-;;;### (autoloads nil "gnus-group" "gnus/gnus-group.el" (21989 31537
+;;;### (autoloads nil "gnus-group" "gnus/gnus-group.el" (22011 58553
-;;;;;;  823825 721000))
+;;;;;;  529858 469000))
 ;;; Generated autoloads from gnus/gnus-group.el
 (autoload 'gnus-fetch-group "gnus-group" "\
@@ -12299,8 +12325,8 @@ Minor mode for providing mailing-list commands.
 ;;;***
-;;;### (autoloads nil "gnus-mlspl" "gnus/gnus-mlspl.el" (21670 32330
+;;;### (autoloads nil "gnus-mlspl" "gnus/gnus-mlspl.el" (22011 58553
-;;;;;;  885624 725000))
+;;;;;;  529858 469000))
 ;;; Generated autoloads from gnus/gnus-mlspl.el
 (autoload 'gnus-group-split-setup "gnus-mlspl" "\
@@ -12536,8 +12562,8 @@ Add NUM into sorted LIST by side effect.
 ;;;***
-;;;### (autoloads nil "gnus-registry" "gnus/gnus-registry.el" (21981
+;;;### (autoloads nil "gnus-registry" "gnus/gnus-registry.el" (22011
-;;;;;;  37426 571399 97000))
+;;;;;;  58553 541858 469000))
 ;;; Generated autoloads from gnus/gnus-registry.el
 (autoload 'gnus-registry-initialize "gnus-registry" "\
@@ -12552,8 +12578,8 @@ Install the registry hooks.
 ;;;***
-;;;### (autoloads nil "gnus-sieve" "gnus/gnus-sieve.el" (21980 16567
+;;;### (autoloads nil "gnus-sieve" "gnus/gnus-sieve.el" (22011 58553
-;;;;;;  617544 893000))
+;;;;;;  541858 469000))
 ;;; Generated autoloads from gnus/gnus-sieve.el
 (autoload 'gnus-sieve-update "gnus-sieve" "\
@@ -12591,8 +12617,8 @@ Update the format specification near point.
 ;;;***
-;;;### (autoloads nil "gnus-start" "gnus/gnus-start.el" (21981 37426
+;;;### (autoloads nil "gnus-start" "gnus/gnus-start.el" (21993 28596
-;;;;;;  575399 97000))
+;;;;;;  102597 473000))
 ;;; Generated autoloads from gnus/gnus-start.el
 (autoload 'gnus-declare-backend "gnus-start" "\
@@ -12602,8 +12628,8 @@ Declare back end NAME with ABILITIES as a Gnus back end.
 ;;;***
-;;;### (autoloads nil "gnus-sum" "gnus/gnus-sum.el" (21989 31537
+;;;### (autoloads nil "gnus-sum" "gnus/gnus-sum.el" (21993 28596
-;;;;;;  843825 721000))
+;;;;;;  110597 473000))
 ;;; Generated autoloads from gnus/gnus-sum.el
 (autoload 'gnus-summary-bookmark-jump "gnus-sum" "\
@@ -12641,8 +12667,8 @@ Add the window configuration CONF to `gnus-buffer-configuration'.
 ;;;***
-;;;### (autoloads nil "gnutls" "net/gnutls.el" (21978 61237 642488
+;;;### (autoloads nil "gnutls" "net/gnutls.el" (22011 58553 761858
-;;;;;;  269000))
+;;;;;;  469000))
 ;;; Generated autoloads from net/gnutls.el
 (defvar gnutls-min-prime-bits 256 "\
@@ -12658,8 +12684,8 @@ A value of nil says to use the default GnuTLS value.")
 ;;;***
-;;;### (autoloads nil "gomoku" "play/gomoku.el" (21980 16567 969544
+;;;### (autoloads nil "gomoku" "play/gomoku.el" (21998 46517 190024
-;;;;;;  893000))
+;;;;;;  649000))
 ;;; Generated autoloads from play/gomoku.el
 (autoload 'gomoku "gomoku" "\
@@ -12744,8 +12770,8 @@ Retrieve MAIL-ADDRESS gravatar and returns it.
 ;;;***
-;;;### (autoloads nil "grep" "progmodes/grep.el" (21903 51634 290370
+;;;### (autoloads nil "grep" "progmodes/grep.el" (22027 46774 676310
-;;;;;;  580000))
+;;;;;;  591000))
 ;;; Generated autoloads from progmodes/grep.el
 (defvar grep-window-height nil "\
@@ -12922,8 +12948,8 @@ the form \"WINDOW-ID PIXMAP-ID\".  Value is non-nil if successful.
 ;;;***
-;;;### (autoloads nil "gud" "progmodes/gud.el" (21769 20661 366048
+;;;### (autoloads nil "gud" "progmodes/gud.el" (22018 31799 115263
-;;;;;;  601000))
+;;;;;;  120000))
 ;;; Generated autoloads from progmodes/gud.el
 (autoload 'gud-gdb "gud" "\
@@ -13018,8 +13044,8 @@ it if ARG is omitted or nil.
 ;;;***
-;;;### (autoloads nil "gv" "emacs-lisp/gv.el" (21976 19509 880430
+;;;### (autoloads nil "gv" "emacs-lisp/gv.el" (22011 58553 409858
-;;;;;;  241000))
+;;;;;;  469000))
 ;;; Generated autoloads from emacs-lisp/gv.el
 (autoload 'gv-get "gv" "\
@@ -13078,7 +13104,7 @@ return a Lisp form that does the assignment.
 The first arg in ARGLIST (the one that receives VAL) receives an expression
 which can do arbitrary things, whereas the other arguments are all guaranteed
 to be pure and copyable.  Example use:
-  (gv-define-setter aref (v a i) `(aset ,a ,i ,v))
+  (gv-define-setter aref (v a i) \\=`(aset ,a ,i ,v))
 \(fn NAME ARGLIST &rest BODY)" nil t)
@@ -13121,8 +13147,8 @@ binding mode.
 ;;;***
-;;;### (autoloads nil "handwrite" "play/handwrite.el" (21852 24381
+;;;### (autoloads nil "handwrite" "play/handwrite.el" (22026 25907
-;;;;;;  887244 288000))
+;;;;;;  631502 692000))
 ;;; Generated autoloads from play/handwrite.el
 (autoload 'handwrite "handwrite" "\
@@ -13338,8 +13364,8 @@ different regions.  With numeric argument ARG, behaves like
 ;;;***
-;;;### (autoloads nil "help-fns" "help-fns.el" (21985 34484 226705
+;;;### (autoloads nil "help-fns" "help-fns.el" (22011 58553 601858
-;;;;;;  925000))
+;;;;;;  469000))
 ;;; Generated autoloads from help-fns.el
 (autoload 'describe-function "help-fns" "\
@@ -13650,7 +13676,8 @@ This discards the buffer's undo information.
 ;;;***
-;;;### (autoloads nil "hi-lock" "hi-lock.el" (21741 1161 438890 423000))
+;;;### (autoloads nil "hi-lock" "hi-lock.el" (21993 28596 134597
+;;;;;;  473000))
 ;;; Generated autoloads from hi-lock.el
 (autoload 'hi-lock-mode "hi-lock" "\
@@ -13865,8 +13892,8 @@ Several variables affect how the hiding is done:
 ;;;***
-;;;### (autoloads nil "hideshow" "progmodes/hideshow.el" (21670 32331
+;;;### (autoloads nil "hideshow" "progmodes/hideshow.el" (22026 25907
-;;;;;;  385639 720000))
+;;;;;;  635502 692000))
 ;;; Generated autoloads from progmodes/hideshow.el
 (defvar hs-special-modes-alist (mapcar 'purecopy '((c-mode "{" "}" "/[*/]" nil nil) (c++-mode "{" "}" "/[*/]" nil nil) (bibtex-mode ("@\\S(*\\(\\s(\\)" 1)) (java-mode "{" "}" "/[*/]" nil nil) (js-mode "{" "}" "/[*/]" nil))) "\
@@ -14143,8 +14170,8 @@ Global-Hl-Line mode uses the functions `global-hl-line-unhighlight' and
 ;;;***
-;;;### (autoloads nil "holidays" "calendar/holidays.el" (21980 16567
+;;;### (autoloads nil "holidays" "calendar/holidays.el" (22026 25907
-;;;;;;  417544 893000))
+;;;;;;  551502 692000))
 ;;; Generated autoloads from calendar/holidays.el
 (defvar holiday-general-holidays (mapcar 'purecopy '((holiday-fixed 1 1 "New Year's Day") (holiday-float 1 1 3 "Martin Luther King Day") (holiday-fixed 2 2 "Groundhog Day") (holiday-fixed 2 14 "Valentine's Day") (holiday-float 2 1 3 "President's Day") (holiday-fixed 3 17 "St. Patrick's Day") (holiday-fixed 4 1 "April Fools' Day") (holiday-float 5 0 2 "Mother's Day") (holiday-float 5 1 -1 "Memorial Day") (holiday-fixed 6 14 "Flag Day") (holiday-float 6 0 3 "Father's Day") (holiday-fixed 7 4 "Independence Day") (holiday-float 9 1 1 "Labor Day") (holiday-float 10 1 2 "Columbus Day") (holiday-fixed 10 31 "Halloween") (holiday-fixed 11 11 "Veteran's Day") (holiday-float 11 4 4 "Thanksgiving"))) "\
@@ -14203,8 +14230,8 @@ See the documentation for `calendar-holidays' for details.")
 (put 'holiday-islamic-holidays 'risky-local-variable t)
-(defvar holiday-bahai-holidays (mapcar 'purecopy '((holiday-bahai-new-year) (holiday-bahai-ridvan) (holiday-fixed 5 23 "Declaration of the Báb") (holiday-fixed 5 29 "Ascension of Bahá'u'lláh") (holiday-fixed 7 9 "Martyrdom of the Báb") (holiday-fixed 10 20 "Birth of the Báb") (holiday-fixed 11 12 "Birth of Bahá'u'lláh") (if calendar-bahai-all-holidays-flag (append (holiday-fixed 11 26 "Day of the Covenant") (holiday-fixed 11 28 "Ascension of `Abdu'l-Bahá"))))) "\
+(defvar holiday-bahai-holidays (mapcar 'purecopy '((holiday-bahai-new-year) (holiday-bahai-ridvan) (holiday-fixed 5 23 "Declaration of the Báb") (holiday-fixed 5 29 "Ascension of Bahá’u’lláh") (holiday-fixed 7 9 "Martyrdom of the Báb") (holiday-fixed 10 20 "Birth of the Báb") (holiday-fixed 11 12 "Birth of Bahá’u’lláh") (if calendar-bahai-all-holidays-flag (append (holiday-fixed 11 26 "Day of the Covenant") (holiday-fixed 11 28 "Ascension of `Abdu’l-Bahá"))))) "\
-Bahá'í holidays.
+Bahá’í holidays.
 See the documentation for `calendar-holidays' for details.")
 (custom-autoload 'holiday-bahai-holidays "holidays" t)
@@ -14265,8 +14292,8 @@ Convert HTML to plain text in the current buffer.
 ;;;***
-;;;### (autoloads nil "htmlfontify" "htmlfontify.el" (21980 16567
+;;;### (autoloads nil "htmlfontify" "htmlfontify.el" (22026 25907
-;;;;;;  701544 893000))
+;;;;;;  591502 692000))
 ;;; Generated autoloads from htmlfontify.el
 (push (purecopy '(htmlfontify 0 21)) package--builtin-versions)
@@ -14402,8 +14429,8 @@ bound to the current value of the filter.
 ;;;***
-;;;### (autoloads nil "ibuffer" "ibuffer.el" (21980 16640 605544
+;;;### (autoloads nil "ibuffer" "ibuffer.el" (22026 25907 595502
-;;;;;;  893000))
+;;;;;;  692000))
 ;;; Generated autoloads from ibuffer.el
 (autoload 'ibuffer-list-buffers "ibuffer" "\
@@ -14422,7 +14449,7 @@ buffers which are visiting a file.
 (autoload 'ibuffer "ibuffer" "\
 Begin using Ibuffer to edit a list of buffers.
-Type ‘h’ after entering ibuffer for more information.
+Type `h' after entering ibuffer for more information.
 All arguments are optional.
 OTHER-WINDOW-P says to use another window.
@@ -14442,8 +14469,8 @@ FORMATS is the value to use for `ibuffer-formats'.
 ;;;***
-;;;### (autoloads nil "icalendar" "calendar/icalendar.el" (21980
+;;;### (autoloads nil "icalendar" "calendar/icalendar.el" (22026
-;;;;;;  16567 421544 893000))
+;;;;;;  25907 551502 692000))
 ;;; Generated autoloads from calendar/icalendar.el
 (push (purecopy '(icalendar 0 19)) package--builtin-versions)
@@ -14577,8 +14604,8 @@ with no args, if that value is non-nil.
 ;;;***
-;;;### (autoloads nil "idlw-shell" "progmodes/idlw-shell.el" (21980
+;;;### (autoloads nil "idlw-shell" "progmodes/idlw-shell.el" (22011
-;;;;;;  16568 33544 893000))
+;;;;;;  58553 905858 469000))
 ;;; Generated autoloads from progmodes/idlw-shell.el
 (autoload 'idlwave-shell "idlw-shell" "\
@@ -14603,8 +14630,8 @@ See also the variable `idlwave-shell-prompt-pattern'.
 ;;;***
-;;;### (autoloads nil "idlwave" "progmodes/idlwave.el" (21988 10682
+;;;### (autoloads nil "idlwave" "progmodes/idlwave.el" (22011 58553
-;;;;;;  41624 461000))
+;;;;;;  909858 469000))
 ;;; Generated autoloads from progmodes/idlwave.el
 (push (purecopy '(idlwave 6 1 22)) package--builtin-versions)
@@ -14733,7 +14760,7 @@ The main features of this mode are
 ;;;***
-;;;### (autoloads nil "ido" "ido.el" (21981 37426 619399 97000))
+;;;### (autoloads nil "ido" "ido.el" (22011 58553 641858 469000))
 ;;; Generated autoloads from ido.el
 (defvar ido-mode nil "\
@@ -15007,7 +15034,7 @@ See `inferior-emacs-lisp-mode' for details.
 ;;;***
-;;;### (autoloads nil "iimage" "iimage.el" (21670 32331 385639 720000))
+;;;### (autoloads nil "iimage" "iimage.el" (21990 52406 604500 385000))
 ;;; Generated autoloads from iimage.el
 (define-obsolete-function-alias 'turn-on-iimage-mode 'iimage-mode "24.1")
@@ -15023,7 +15050,7 @@ the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'.
 ;;;***
-;;;### (autoloads nil "image" "image.el" (21974 64192 580009 993000))
+;;;### (autoloads nil "image" "image.el" (22011 58553 641858 469000))
 ;;; Generated autoloads from image.el
 (autoload 'image-type-from-data "image" "\
@@ -15216,8 +15243,8 @@ If Emacs is compiled without ImageMagick support, this does nothing.
 ;;;***
-;;;### (autoloads nil "image-dired" "image-dired.el" (21670 32331
+;;;### (autoloads nil "image-dired" "image-dired.el" (22011 58553
-;;;;;;  385639 720000))
+;;;;;;  641858 469000))
 ;;; Generated autoloads from image-dired.el
 (push (purecopy '(image-dired 0 4 11)) package--builtin-versions)
@@ -15634,8 +15661,8 @@ Convert old Emacs Devanagari characters to UCS.
 ;;;***
-;;;### (autoloads nil "inf-lisp" "progmodes/inf-lisp.el" (21887 31404
+;;;### (autoloads nil "inf-lisp" "progmodes/inf-lisp.el" (22011 58553
-;;;;;;  272735 656000))
+;;;;;;  909858 469000))
 ;;; Generated autoloads from progmodes/inf-lisp.el
 (autoload 'inferior-lisp "inf-lisp" "\
@@ -15653,7 +15680,7 @@ of `inferior-lisp-program').  Runs the hooks from
 ;;;***
-;;;### (autoloads nil "info" "info.el" (21985 34484 234705 925000))
+;;;### (autoloads nil "info" "info.el" (22011 58553 645858 469000))
 ;;; 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))))) "\
@@ -15865,8 +15892,8 @@ completion alternatives to currently visited manuals.
 ;;;***
-;;;### (autoloads nil "info-look" "info-look.el" (21862 60209 738095
+;;;### (autoloads nil "info-look" "info-look.el" (22011 58553 641858
-;;;;;;  873000))
+;;;;;;  469000))
 ;;; Generated autoloads from info-look.el
 (autoload 'info-lookup-reset "info-look" "\
@@ -16058,8 +16085,8 @@ For example, invoke \"emacs -batch -f batch-info-validate $info/ ~/*.info\"
 ;;;***
-;;;### (autoloads nil "inversion" "cedet/inversion.el" (21670 32330
+;;;### (autoloads nil "inversion" "cedet/inversion.el" (21993 28595
-;;;;;;  885624 725000))
+;;;;;;  998597 473000))
 ;;; Generated autoloads from cedet/inversion.el
 (push (purecopy '(inversion 1 3)) package--builtin-versions)
@@ -16071,8 +16098,8 @@ Only checks one based on which kind of Emacs is being run.
 ;;;***
-;;;### (autoloads nil "isearch-x" "international/isearch-x.el" (21670
+;;;### (autoloads nil "isearch-x" "international/isearch-x.el" (22003
-;;;;;;  32331 385639 720000))
+;;;;;;  64432 624146 533000))
 ;;; Generated autoloads from international/isearch-x.el
 (autoload 'isearch-toggle-specified-input-method "isearch-x" "\
@@ -16107,8 +16134,8 @@ accessed via isearchb.
 ;;;***
-;;;### (autoloads nil "iso-cvt" "international/iso-cvt.el" (21670
+;;;### (autoloads nil "iso-cvt" "international/iso-cvt.el" (22011
-;;;;;;  32331 385639 720000))
+;;;;;;  58553 645858 469000))
 ;;; Generated autoloads from international/iso-cvt.el
 (autoload 'iso-spanish "iso-cvt" "\
@@ -16206,8 +16233,8 @@ Add submenus to the File menu, to convert to and from various formats.
 ;;;***
-;;;### (autoloads nil "ispell" "textmodes/ispell.el" (21988 10682
+;;;### (autoloads nil "ispell" "textmodes/ispell.el" (22011 58554
-;;;;;;  97624 461000))
+;;;;;;  45858 469000))
 ;;; Generated autoloads from textmodes/ispell.el
 (put 'ispell-check-comments 'safe-local-variable (lambda (a) (memq a '(nil t exclusive))))
@@ -16440,8 +16467,8 @@ You can bind this to the key C-c i in GNUS or mail by adding to
 ;;;***
-;;;### (autoloads nil "japan-util" "language/japan-util.el" (21670
+;;;### (autoloads nil "japan-util" "language/japan-util.el" (22011
-;;;;;;  32331 385639 720000))
+;;;;;;  58553 673858 469000))
 ;;; Generated autoloads from language/japan-util.el
 (autoload 'setup-japanese-environment-internal "japan-util" "\
@@ -16454,9 +16481,9 @@ Convert argument to Katakana and return that.
 The argument may be a character or string.  The result has the same type.
 The argument object is not altered--the value is a copy.
 Optional argument HANKAKU t means to convert to `hankaku' Katakana
- (`japanese-jisx0201-kana'), in which case return value
+\(`japanese-jisx0201-kana'), in which case return value
- may be a string even if OBJ is a character if two Katakanas are
+may be a string even if OBJ is a character if two Katakanas are
- necessary to represent OBJ.
+necessary to represent OBJ.
 \(fn OBJ &optional HANKAKU)" nil nil)
@@ -16542,8 +16569,8 @@ by `jka-compr-installed'.
 ;;;***
-;;;### (autoloads nil "js" "progmodes/js.el" (21976 19510 104430
+;;;### (autoloads nil "js" "progmodes/js.el" (22026 25907 635502
-;;;;;;  241000))
+;;;;;;  692000))
 ;;; Generated autoloads from progmodes/js.el
 (push (purecopy '(js 9)) package--builtin-versions)
@@ -16557,7 +16584,7 @@ Major mode for editing JavaScript.
 ;;;***
-;;;### (autoloads nil "json" "json.el" (21985 34484 234705 925000))
+;;;### (autoloads nil "json" "json.el" (21998 46517 78024 649000))
 ;;; Generated autoloads from json.el
 (push (purecopy '(json 1 4)) package--builtin-versions)
@@ -16664,7 +16691,7 @@ and the return value is the length of the conversion.
 ;;;***
-;;;### (autoloads nil "kmacro" "kmacro.el" (21953 58033 303058 929000))
+;;;### (autoloads nil "kmacro" "kmacro.el" (21990 52406 604500 385000))
 ;;; Generated autoloads from kmacro.el
 (global-set-key "\C-x(" 'kmacro-start-macro)
 (global-set-key "\C-x)" 'kmacro-end-macro)
@@ -16862,7 +16889,7 @@ coding system names is determined from `latex-inputenc-coding-alist'.
 ;;;***
 ;;;### (autoloads nil "latin1-disp" "international/latin1-disp.el"
-;;;;;;  (21670 32331 385639 720000))
+;;;;;;  (22011 58553 645858 469000))
 ;;; Generated autoloads from international/latin1-disp.el
 (defvar latin1-display nil "\
@@ -17004,8 +17031,8 @@ See `linum-mode' for more information on Linum mode.
 ;;;***
-;;;### (autoloads nil "loadhist" "loadhist.el" (21964 28338 113695
+;;;### (autoloads nil "loadhist" "loadhist.el" (22011 58553 673858
-;;;;;;  749000))
+;;;;;;  469000))
 ;;; Generated autoloads from loadhist.el
 (autoload 'unload-feature "loadhist" "\
@@ -17088,8 +17115,8 @@ except that FILTER is not optional.
 ;;;***
-;;;### (autoloads nil "log-edit" "vc/log-edit.el" (21942 1330 837986
+;;;### (autoloads nil "log-edit" "vc/log-edit.el" (22011 58554 93858
-;;;;;;  820000))
+;;;;;;  469000))
 ;;; Generated autoloads from vc/log-edit.el
 (autoload 'log-edit "log-edit" "\
@@ -17131,7 +17158,7 @@ Major mode for browsing CVS log output.
 ;;;***
-;;;### (autoloads nil "lpr" "lpr.el" (21670 32331 385639 720000))
+;;;### (autoloads nil "lpr" "lpr.el" (22011 58553 673858 469000))
 ;;; Generated autoloads from lpr.el
 (defvar lpr-windows-system (memq system-type '(ms-dos windows-nt)) "\
@@ -17226,8 +17253,8 @@ for further customization of the printer command.
 ;;;***
-;;;### (autoloads nil "ls-lisp" "ls-lisp.el" (21907 48688 729360
+;;;### (autoloads nil "ls-lisp" "ls-lisp.el" (21993 28596 150597
-;;;;;;  195000))
+;;;;;;  473000))
 ;;; Generated autoloads from ls-lisp.el
 (defvar ls-lisp-support-shell-wildcards t "\
@@ -17251,8 +17278,8 @@ This function is suitable for execution in an init file.
 ;;;***
-;;;### (autoloads nil "m4-mode" "progmodes/m4-mode.el" (21670 32331
+;;;### (autoloads nil "m4-mode" "progmodes/m4-mode.el" (22015 55603
-;;;;;;  385639 720000))
+;;;;;;  805705 321000))
 ;;; Generated autoloads from progmodes/m4-mode.el
 (autoload 'm4-mode "m4-mode" "\
@@ -17351,8 +17378,8 @@ and then select the region of un-tablified names and use
 ;;;***
-;;;### (autoloads nil "mail-extr" "mail/mail-extr.el" (21670 32331
+;;;### (autoloads nil "mail-extr" "mail/mail-extr.el" (22026 25907
-;;;;;;  385639 720000))
+;;;;;;  599502 692000))
 ;;; Generated autoloads from mail/mail-extr.el
 (autoload 'mail-extract-address-components "mail-extr" "\
@@ -17537,8 +17564,8 @@ double-quotes.
 ;;;***
-;;;### (autoloads nil "mailalias" "mail/mailalias.el" (21855 577
+;;;### (autoloads nil "mailalias" "mail/mailalias.el" (21993 28596
-;;;;;;  57945 485000))
+;;;;;;  166597 473000))
 ;;; Generated autoloads from mail/mailalias.el
 (defvar mail-complete-style 'angles "\
@@ -17591,8 +17618,8 @@ current header, calls `mail-complete-function' and passes prefix ARG if any.
 ;;;***
-;;;### (autoloads nil "mailclient" "mail/mailclient.el" (21670 32331
+;;;### (autoloads nil "mailclient" "mail/mailclient.el" (22011 58553
-;;;;;;  385639 720000))
+;;;;;;  693858 469000))
 ;;; Generated autoloads from mail/mailclient.el
 (autoload 'mailclient-send-it "mailclient" "\
@@ -17604,8 +17631,8 @@ The mail client is taken to be the handler of mailto URLs.
 ;;;***
-;;;### (autoloads nil "make-mode" "progmodes/make-mode.el" (21907
+;;;### (autoloads nil "make-mode" "progmodes/make-mode.el" (22011
-;;;;;;  48688 777360 195000))
+;;;;;;  58553 913858 469000))
 ;;; Generated autoloads from progmodes/make-mode.el
 (autoload 'makefile-mode "make-mode" "\
@@ -17734,7 +17761,7 @@ Previous contents of that buffer are killed first.
 ;;;***
-;;;### (autoloads nil "man" "man.el" (21814 9129 320508 708000))
+;;;### (autoloads nil "man" "man.el" (22026 25907 603502 692000))
 ;;; Generated autoloads from man.el
 (defalias 'manual-entry 'man)
@@ -17790,8 +17817,8 @@ Default bookmark handler for Man buffers.
 ;;;***
-;;;### (autoloads nil "map" "emacs-lisp/map.el" (21919 39857 593327
+;;;### (autoloads nil "map" "emacs-lisp/map.el" (21996 4784 808983
-;;;;;;  44000))
+;;;;;;  429000))
 ;;; Generated autoloads from emacs-lisp/map.el
 (push (purecopy '(map 1 0)) package--builtin-versions)
@@ -17854,8 +17881,8 @@ recursion depth in the minibuffer prompt.  This is only useful if
 ;;;***
-;;;### (autoloads nil "message" "gnus/message.el" (21989 31537 871825
+;;;### (autoloads nil "message" "gnus/message.el" (22011 58553 581858
-;;;;;;  721000))
+;;;;;;  469000))
 ;;; Generated autoloads from gnus/message.el
 (define-mail-user-agent 'message-user-agent 'message-mail 'message-send-and-exit 'message-kill-buffer 'message-send-hook)
@@ -18081,8 +18108,8 @@ redisplayed as output is inserted.
 ;;;***
-;;;### (autoloads nil "mh-comp" "mh-e/mh-comp.el" (21895 57521 622301
+;;;### (autoloads nil "mh-comp" "mh-e/mh-comp.el" (22011 58553 729858
-;;;;;;  332000))
+;;;;;;  469000))
 ;;; Generated autoloads from mh-e/mh-comp.el
 (autoload 'mh-smail "mh-comp" "\
@@ -18172,7 +18199,7 @@ delete the draft message.
 ;;;***
-;;;### (autoloads nil "mh-e" "mh-e/mh-e.el" (21989 31537 923825 721000))
+;;;### (autoloads nil "mh-e" "mh-e/mh-e.el" (22011 58553 749858 469000))
 ;;; Generated autoloads from mh-e/mh-e.el
 (push (purecopy '(mh-e 8 6)) package--builtin-versions)
@@ -18189,8 +18216,8 @@ Display version information about MH-E and the MH mail handling system.
 ;;;***
-;;;### (autoloads nil "mh-folder" "mh-e/mh-folder.el" (21670 32331
+;;;### (autoloads nil "mh-folder" "mh-e/mh-folder.el" (22011 58553
-;;;;;;  385639 720000))
+;;;;;;  749858 469000))
 ;;; Generated autoloads from mh-e/mh-folder.el
 (autoload 'mh-rmail "mh-folder" "\
@@ -18531,8 +18558,8 @@ Insert file contents of URL using `mm-url-program'.
 ;;;***
-;;;### (autoloads nil "mm-uu" "gnus/mm-uu.el" (21989 31537 875825
+;;;### (autoloads nil "mm-uu" "gnus/mm-uu.el" (22010 37685 116774
-;;;;;;  721000))
+;;;;;;  305000))
 ;;; Generated autoloads from gnus/mm-uu.el
 (autoload 'mm-uu-dissect "mm-uu" "\
@@ -18633,8 +18660,8 @@ body) or \"attachment\" (separate from the body).
 ;;;***
-;;;### (autoloads nil "mode-local" "cedet/mode-local.el" (21989 31537
+;;;### (autoloads nil "mode-local" "cedet/mode-local.el" (22011 58553
-;;;;;;  763825 721000))
+;;;;;;  245858 469000))
 ;;; Generated autoloads from cedet/mode-local.el
 (put 'define-overloadable-function 'doc-string-elt 3)
@@ -18675,8 +18702,8 @@ followed by the first character of the construct.
 ;;;***
-;;;### (autoloads nil "morse" "play/morse.el" (21980 16567 969544
+;;;### (autoloads nil "morse" "play/morse.el" (22026 25907 631502
-;;;;;;  893000))
+;;;;;;  692000))
 ;;; Generated autoloads from play/morse.el
 (autoload 'morse-region "morse" "\
@@ -18701,8 +18728,8 @@ Convert NATO phonetic alphabet in region to ordinary ASCII text.
 ;;;***
-;;;### (autoloads nil "mouse-drag" "mouse-drag.el" (21906 58825 986640
+;;;### (autoloads nil "mouse-drag" "mouse-drag.el" (21993 28596 194597
-;;;;;;  200000))
+;;;;;;  473000))
 ;;; Generated autoloads from mouse-drag.el
 (autoload 'mouse-drag-throw "mouse-drag" "\
@@ -18725,7 +18752,7 @@ about which direction is natural.  Perhaps it has to do with which
 hemisphere you're in.)
 To test this function, evaluate:
-    (global-set-key [down-mouse-2] 'mouse-drag-throw)
+    (global-set-key [down-mouse-2] \\='mouse-drag-throw)
 \(fn START-EVENT)" t nil)
@@ -18743,13 +18770,13 @@ Drag scrolling is identical to the \"hand\" option in MacPaint, or the
 middle button in Tk text widgets.
 To test this function, evaluate:
-    (global-set-key [down-mouse-2] 'mouse-drag-drag)
+    (global-set-key [down-mouse-2] \\='mouse-drag-drag)
 \(fn START-EVENT)" t nil)
 ;;;***
-;;;### (autoloads nil "mpc" "mpc.el" (21980 16567 797544 893000))
+;;;### (autoloads nil "mpc" "mpc.el" (22002 43570 536887 749000))
 ;;; Generated autoloads from mpc.el
 (autoload 'mpc "mpc" "\
@@ -18769,7 +18796,7 @@ Multiplication puzzle with GNU Emacs.
 ;;;***
-;;;### (autoloads nil "msb" "msb.el" (21978 61237 622488 269000))
+;;;### (autoloads nil "msb" "msb.el" (22011 58553 757858 469000))
 ;;; Generated autoloads from msb.el
 (defvar msb-mode nil "\
@@ -18794,8 +18821,8 @@ different buffer menu using the function `msb'.
 ;;;***
-;;;### (autoloads nil "mule-diag" "international/mule-diag.el" (21978
+;;;### (autoloads nil "mule-diag" "international/mule-diag.el" (21998
-;;;;;;  61237 582488 269000))
+;;;;;;  46517 78024 649000))
 ;;; Generated autoloads from international/mule-diag.el
 (autoload 'list-character-sets "mule-diag" "\
@@ -18927,8 +18954,8 @@ The default is 20.  If LIMIT is negative, do not limit the listing.
 ;;;***
-;;;### (autoloads nil "mule-util" "international/mule-util.el" (21931
+;;;### (autoloads nil "mule-util" "international/mule-util.el" (22002
-;;;;;;  31023 753164 572000))
+;;;;;;  43570 532887 749000))
 ;;; Generated autoloads from international/mule-util.el
 (defsubst string-to-list (string) "\
@@ -19087,8 +19114,8 @@ QUALITY can be:
 ;;;***
-;;;### (autoloads nil "net-utils" "net/net-utils.el" (21826 50071
+;;;### (autoloads nil "net-utils" "net/net-utils.el" (22011 58553
-;;;;;;  80489 638000))
+;;;;;;  761858 469000))
 ;;; Generated autoloads from net/net-utils.el
 (autoload 'ifconfig "net-utils" "\
@@ -19292,8 +19319,8 @@ asynchronously, if possible.
 ;;;***
-;;;### (autoloads nil "newst-backend" "net/newst-backend.el" (21980
+;;;### (autoloads nil "newst-backend" "net/newst-backend.el" (22011
-;;;;;;  16567 809544 893000))
+;;;;;;  58553 765858 469000))
 ;;; Generated autoloads from net/newst-backend.el
 (autoload 'newsticker-running-p "newst-backend" "\
@@ -19325,8 +19352,8 @@ Start newsticker plainview.
 ;;;***
-;;;### (autoloads nil "newst-reader" "net/newst-reader.el" (21670
+;;;### (autoloads nil "newst-reader" "net/newst-reader.el" (22011
-;;;;;;  32331 385639 720000))
+;;;;;;  58553 765858 469000))
 ;;; Generated autoloads from net/newst-reader.el
 (autoload 'newsticker-show-news "newst-reader" "\
@@ -19357,8 +19384,8 @@ running already.
 ;;;***
-;;;### (autoloads nil "newst-treeview" "net/newst-treeview.el" (21978
+;;;### (autoloads nil "newst-treeview" "net/newst-treeview.el" (21998
-;;;;;;  61237 654488 269000))
+;;;;;;  46517 110024 649000))
 ;;; Generated autoloads from net/newst-treeview.el
 (autoload 'newsticker-treeview "newst-treeview" "\
@@ -19368,8 +19395,8 @@ Start newsticker treeview.
 ;;;***
-;;;### (autoloads nil "nndiary" "gnus/nndiary.el" (21948 40114 262686
+;;;### (autoloads nil "nndiary" "gnus/nndiary.el" (21990 52406 596500
-;;;;;;  453000))
+;;;;;;  385000))
 ;;; Generated autoloads from gnus/nndiary.el
 (autoload 'nndiary-generate-nov-databases "nndiary" "\
@@ -19379,7 +19406,8 @@ Generate NOV databases in all nndiary directories.
 ;;;***
-;;;### (autoloads nil "nndoc" "gnus/nndoc.el" (21855 576 927958 586000))
+;;;### (autoloads nil "nndoc" "gnus/nndoc.el" (22011 58553 585858
+;;;;;;  469000))
 ;;; Generated autoloads from gnus/nndoc.el
 (autoload 'nndoc-add-type "nndoc" "\
@@ -19462,9 +19490,9 @@ closing requests for requests that are used in matched pairs.
 ;;;***
-;;;### (autoloads nil "ntlm" "net/ntlm.el" (21670 32331 385639 720000))
+;;;### (autoloads nil "ntlm" "net/ntlm.el" (21997 25649 666447 325000))
 ;;; Generated autoloads from net/ntlm.el
-(push (purecopy '(ntlm 1 0)) package--builtin-versions)
+(push (purecopy '(ntlm 2 0)) package--builtin-versions)
 ;;;***
@@ -19481,8 +19509,8 @@ Return nil if the face cannot display a glyph for N.
 ;;;***
-;;;### (autoloads nil "nxml-mode" "nxml/nxml-mode.el" (21670 32331
+;;;### (autoloads nil "nxml-mode" "nxml/nxml-mode.el" (22021 7991
-;;;;;;  385639 720000))
+;;;;;;  61719 83000))
 ;;; Generated autoloads from nxml/nxml-mode.el
 (autoload 'nxml-mode "nxml-mode" "\
@@ -19555,8 +19583,8 @@ the variable `nxml-enabled-unicode-blocks'.
 ;;;***
-;;;### (autoloads nil "octave" "progmodes/octave.el" (21988 10682
+;;;### (autoloads nil "octave" "progmodes/octave.el" (22027 46774
-;;;;;;  41624 461000))
+;;;;;;  680310 591000))
 ;;; Generated autoloads from progmodes/octave.el
 (autoload 'octave-mode "octave" "\
@@ -19629,7 +19657,7 @@ Coloring:
 ;;;***
-;;;### (autoloads nil "org" "org/org.el" (21988 10682 25624 461000))
+;;;### (autoloads nil "org" "org/org.el" (22011 58553 849858 469000))
 ;;; Generated autoloads from org/org.el
 (autoload 'org-babel-do-load-languages "org" "\
@@ -19850,8 +19878,8 @@ Call the customize function with org as argument.
 ;;;***
-;;;### (autoloads nil "org-agenda" "org/org-agenda.el" (21988 10681
+;;;### (autoloads nil "org-agenda" "org/org-agenda.el" (22011 58553
-;;;;;;  989624 461000))
+;;;;;;  805858 469000))
 ;;; Generated autoloads from org/org-agenda.el
 (autoload 'org-toggle-sticky-agenda "org-agenda" "\
@@ -20103,10 +20131,10 @@ calling the function returns nil.  This function takes one
 argument: an entry from `org-agenda-get-day-entries'.
 FILTER can also be an alist with the car of each cell being
-either 'headline or 'category.  For example:
+either `headline' or `category'.  For example:
-  '((headline \"IMPORTANT\")
+  ((headline \"IMPORTANT\")
-    (category \"Work\"))
+   (category \"Work\"))
 will only add headlines containing IMPORTANT or headlines
 belonging to the \"Work\" category.
@@ -20124,8 +20152,8 @@ to override `appt-message-warning-time'.
 ;;;***
-;;;### (autoloads nil "org-capture" "org/org-capture.el" (21988 10681
+;;;### (autoloads nil "org-capture" "org/org-capture.el" (21993 28596
-;;;;;;  989624 461000))
+;;;;;;  242597 473000))
 ;;; Generated autoloads from org/org-capture.el
 (autoload 'org-capture-string "org-capture" "\
@@ -20167,8 +20195,8 @@ Set `org-capture-templates' to be similar to `org-remember-templates'.
 ;;;***
-;;;### (autoloads nil "org-colview" "org/org-colview.el" (21948 40114
+;;;### (autoloads nil "org-colview" "org/org-colview.el" (22011 58553
-;;;;;;  334686 453000))
+;;;;;;  809858 469000))
 ;;; Generated autoloads from org/org-colview.el
 (autoload 'org-columns-remove-overlays "org-colview" "\
@@ -20271,8 +20299,8 @@ The Git version of org-mode.
 ;;;***
-;;;### (autoloads nil "outline" "outline.el" (21981 37426 663399
+;;;### (autoloads nil "outline" "outline.el" (21990 52406 672500
-;;;;;;  97000))
+;;;;;;  385000))
 ;;; Generated autoloads from outline.el
 (put 'outline-regexp 'safe-local-variable 'stringp)
 (put 'outline-heading-end-regexp 'safe-local-variable 'stringp)
@@ -20315,8 +20343,8 @@ See the command `outline-mode' for more information on this mode.
 ;;;***
-;;;### (autoloads nil "package" "emacs-lisp/package.el" (21978 61237
+;;;### (autoloads nil "package" "emacs-lisp/package.el" (22000 31493
-;;;;;;  494488 269000))
+;;;;;;  736082 901000))
 ;;; Generated autoloads from emacs-lisp/package.el
 (push (purecopy '(package 1 0 1)) package--builtin-versions)
@@ -20337,6 +20365,9 @@ The variable `package-load-list' controls which packages to load.
 If optional arg NO-ACTIVATE is non-nil, don't activate packages.
 If `user-init-file' does not mention `(package-initialize)', add
 it to the file.
+If called as part of loading `user-init-file', set
+`package-enable-at-startup' to nil, to prevent accidentally
+loading packages twice.
 \(fn &optional NO-ACTIVATE)" t nil)
@@ -20540,8 +20571,8 @@ Check if KEY is in the cache.
 ;;;***
-;;;### (autoloads nil "pcase" "emacs-lisp/pcase.el" (21980 16567
+;;;### (autoloads nil "pcase" "emacs-lisp/pcase.el" (22026 25907
-;;;;;;  509544 893000))
+;;;;;;  583502 692000))
 ;;; Generated autoloads from emacs-lisp/pcase.el
 (autoload 'pcase "pcase" "\
@@ -20642,8 +20673,8 @@ to this macro.
 ;;;***
-;;;### (autoloads nil "pcmpl-cvs" "pcmpl-cvs.el" (21980 16567 953544
+;;;### (autoloads nil "pcmpl-cvs" "pcmpl-cvs.el" (21998 46517 178024
-;;;;;;  893000))
+;;;;;;  649000))
 ;;; Generated autoloads from pcmpl-cvs.el
 (autoload 'pcomplete/cvs "pcmpl-cvs" "\
@@ -20936,8 +20967,8 @@ Global menu used by PCL-CVS.")
 ;;;***
-;;;### (autoloads nil "perl-mode" "progmodes/perl-mode.el" (21887
+;;;### (autoloads nil "perl-mode" "progmodes/perl-mode.el" (22011
-;;;;;;  19055 813447 760000))
+;;;;;;  58553 921858 469000))
 ;;; Generated autoloads from progmodes/perl-mode.el
 (put 'perl-indent-level 'safe-local-variable 'integerp)
 (put 'perl-continued-statement-offset 'safe-local-variable 'integerp)
@@ -21110,8 +21141,8 @@ Major mode for editing PLSTORE files.
 ;;;***
-;;;### (autoloads nil "po" "textmodes/po.el" (21670 32331 885635
+;;;### (autoloads nil "po" "textmodes/po.el" (22026 25907 651502
-;;;;;;  586000))
+;;;;;;  692000))
 ;;; Generated autoloads from textmodes/po.el
 (autoload 'po-find-file-coding-system "po" "\
@@ -21200,8 +21231,8 @@ Ignores leading comment characters.
 ;;;***
-;;;### (autoloads nil "printing" "printing.el" (21981 37426 679399
+;;;### (autoloads nil "printing" "printing.el" (21990 52406 680500
-;;;;;;  97000))
+;;;;;;  385000))
 ;;; Generated autoloads from printing.el
 (push (purecopy '(printing 6 9 3)) package--builtin-versions)
@@ -21789,7 +21820,7 @@ are both set to t.
 ;;;***
-;;;### (autoloads nil "proced" "proced.el" (21981 37426 683399 97000))
+;;;### (autoloads nil "proced" "proced.el" (21998 46517 190024 649000))
 ;;; Generated autoloads from proced.el
 (autoload 'proced "proced" "\
@@ -21847,8 +21878,8 @@ Return the project instance in DIR or `default-directory'.
 ;;;***
-;;;### (autoloads nil "prolog" "progmodes/prolog.el" (21955 13362
+;;;### (autoloads nil "prolog" "progmodes/prolog.el" (22027 46774
-;;;;;;  392569 401000))
+;;;;;;  684310 591000))
 ;;; Generated autoloads from progmodes/prolog.el
 (autoload 'prolog-mode "prolog" "\
@@ -21939,8 +21970,8 @@ Typing \\<ps-run-mode-map>\\[ps-run-goto-error] when the cursor is at the number
 ;;;***
-;;;### (autoloads nil "ps-print" "ps-print.el" (21981 37426 699399
+;;;### (autoloads nil "ps-print" "ps-print.el" (22011 58553 993858
-;;;;;;  97000))
+;;;;;;  469000))
 ;;; Generated autoloads from ps-print.el
 (push (purecopy '(ps-print 7 3 5)) package--builtin-versions)
@@ -22156,8 +22187,8 @@ Optional argument FACE specifies the face to do the highlighting.
 ;;;***
-;;;### (autoloads nil "python" "progmodes/python.el" (21980 16568
+;;;### (autoloads nil "python" "progmodes/python.el" (22026 25907
-;;;;;;  37544 893000))
+;;;;;;  639502 692000))
 ;;; Generated autoloads from progmodes/python.el
 (push (purecopy '(python 0 25 1)) package--builtin-versions)
@@ -22544,8 +22575,8 @@ Display `quickurl-list' as a formatted list using `quickurl-list-mode'.
 ;;;***
-;;;### (autoloads nil "rcirc" "net/rcirc.el" (21980 16567 809544
+;;;### (autoloads nil "rcirc" "net/rcirc.el" (22011 58553 765858
-;;;;;;  893000))
+;;;;;;  469000))
 ;;; Generated autoloads from net/rcirc.el
 (autoload 'rcirc "rcirc" "\
@@ -22583,8 +22614,8 @@ if ARG is omitted or nil.
 ;;;***
-;;;### (autoloads nil "re-builder" "emacs-lisp/re-builder.el" (21976
+;;;### (autoloads nil "re-builder" "emacs-lisp/re-builder.el" (21998
-;;;;;;  19509 900430 241000))
+;;;;;;  46517 18024 649000))
 ;;; Generated autoloads from emacs-lisp/re-builder.el
 (defalias 'regexp-builder 're-builder)
@@ -22602,8 +22633,8 @@ matching parts of the target buffer will be highlighted.
 ;;;***
-;;;### (autoloads nil "recentf" "recentf.el" (21981 37426 699399
+;;;### (autoloads nil "recentf" "recentf.el" (21998 46517 266024
-;;;;;;  97000))
+;;;;;;  649000))
 ;;; Generated autoloads from recentf.el
 (defvar recentf-mode nil "\
@@ -22790,8 +22821,8 @@ For true \"word wrap\" behavior, use `visual-line-mode' instead.
 ;;;***
-;;;### (autoloads nil "reftex" "textmodes/reftex.el" (21980 16640
+;;;### (autoloads nil "reftex" "textmodes/reftex.el" (22026 25907
-;;;;;;  469544 893000))
+;;;;;;  655502 692000))
 ;;; Generated autoloads from textmodes/reftex.el
 (autoload 'reftex-citation "reftex-cite" nil t)
 (autoload 'reftex-all-document-files "reftex-parse")
@@ -22844,8 +22875,8 @@ This enforces rescanning the buffer on next use.
 ;;;***
-;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (21887
+;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (22025
-;;;;;;  63409 948052 707000))
+;;;;;;  5040 882195 139000))
 ;;; Generated autoloads from textmodes/reftex-vars.el
 (put 'reftex-vref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x))))
 (put 'reftex-fref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x))))
@@ -22854,8 +22885,8 @@ This enforces rescanning the buffer on next use.
 ;;;***
-;;;### (autoloads nil "regexp-opt" "emacs-lisp/regexp-opt.el" (21670
+;;;### (autoloads nil "regexp-opt" "emacs-lisp/regexp-opt.el" (22011
-;;;;;;  32330 885624 725000))
+;;;;;;  58553 413858 469000))
 ;;; Generated autoloads from emacs-lisp/regexp-opt.el
 (autoload 'regexp-opt "regexp-opt" "\
@@ -22866,7 +22897,7 @@ is enclosed by at least one regexp grouping construct.
 The returned regexp is typically more efficient than the equivalent regexp:
 (let ((open (if PAREN \"\\\\(\" \"\")) (close (if PAREN \"\\\\)\" \"\")))
-   (concat open (mapconcat 'regexp-quote STRINGS \"\\\\|\") close))
+   (concat open (mapconcat \\='regexp-quote STRINGS \"\\\\|\") close))
 If PAREN is `words', then the resulting regexp is additionally surrounded
 by \\=\\< and \\>.
@@ -23063,8 +23094,8 @@ the mode if ARG is omitted or nil.
 ;;;***
-;;;### (autoloads nil "ring" "emacs-lisp/ring.el" (21976 19509 900430
+;;;### (autoloads nil "ring" "emacs-lisp/ring.el" (21998 46517 18024
-;;;;;;  241000))
+;;;;;;  649000))
 ;;; Generated autoloads from emacs-lisp/ring.el
 (autoload 'ring-p "ring" "\
@@ -23079,8 +23110,8 @@ Make a ring that can contain SIZE elements.
 ;;;***
-;;;### (autoloads nil "rlogin" "net/rlogin.el" (21978 61237 654488
+;;;### (autoloads nil "rlogin" "net/rlogin.el" (22011 58553 765858
-;;;;;;  269000))
+;;;;;;  469000))
 ;;; Generated autoloads from net/rlogin.el
 (autoload 'rlogin "rlogin" "\
@@ -23124,8 +23155,8 @@ variable.
 ;;;***
-;;;### (autoloads nil "rmail" "mail/rmail.el" (21989 31537 903825
+;;;### (autoloads nil "rmail" "mail/rmail.el" (22011 58553 725858
-;;;;;;  721000))
+;;;;;;  469000))
 ;;; Generated autoloads from mail/rmail.el
 (defvar rmail-file-name (purecopy "~/RMAIL") "\
@@ -23541,8 +23572,8 @@ Toggle the use of ROT13 encoding for the current window.
 ;;;***
-;;;### (autoloads nil "rst" "textmodes/rst.el" (21955 13362 436569
+;;;### (autoloads nil "rst" "textmodes/rst.el" (22026 25907 659502
-;;;;;;  401000))
+;;;;;;  692000))
 ;;; Generated autoloads from textmodes/rst.el
 (add-to-list 'auto-mode-alist (purecopy '("\\.re?st\\'" . rst-mode)))
@@ -23572,8 +23603,8 @@ for modes derived from Text mode, like Mail mode.
 ;;;***
-;;;### (autoloads nil "ruby-mode" "progmodes/ruby-mode.el" (21955
+;;;### (autoloads nil "ruby-mode" "progmodes/ruby-mode.el" (22015
-;;;;;;  13362 400569 401000))
+;;;;;;  55603 817705 321000))
 ;;; Generated autoloads from progmodes/ruby-mode.el
 (push (purecopy '(ruby-mode 1 2)) package--builtin-versions)
@@ -23590,8 +23621,8 @@ Major mode for editing Ruby code.
 ;;;***
-;;;### (autoloads nil "ruler-mode" "ruler-mode.el" (21906 58826 62640
+;;;### (autoloads nil "ruler-mode" "ruler-mode.el" (22026 25907 643502
-;;;;;;  200000))
+;;;;;;  692000))
 ;;; Generated autoloads from ruler-mode.el
 (push (purecopy '(ruler-mode 1 6)) package--builtin-versions)
@@ -23609,8 +23640,8 @@ if ARG is omitted or nil.
 ;;;***
-;;;### (autoloads nil "rx" "emacs-lisp/rx.el" (21980 16567 509544
+;;;### (autoloads nil "rx" "emacs-lisp/rx.el" (22011 58553 441858
-;;;;;;  893000))
+;;;;;;  469000))
 ;;; Generated autoloads from emacs-lisp/rx.el
 (autoload 'rx-to-string "rx" "\
@@ -23983,8 +24014,8 @@ where it was when you previously visited the same file.
 ;;;***
-;;;### (autoloads nil "scheme" "progmodes/scheme.el" (21670 32331
+;;;### (autoloads nil "scheme" "progmodes/scheme.el" (22011 58553
-;;;;;;  385639 720000))
+;;;;;;  925858 469000))
 ;;; Generated autoloads from progmodes/scheme.el
 (autoload 'scheme-mode "scheme" "\
@@ -24080,8 +24111,8 @@ vertically fixed relative to window boundaries during scrolling.
 ;;;***
-;;;### (autoloads nil "secrets" "net/secrets.el" (21855 577 177946
+;;;### (autoloads nil "secrets" "net/secrets.el" (22011 58553 765858
-;;;;;;  739000))
+;;;;;;  469000))
 ;;; Generated autoloads from net/secrets.el
 (when (featurep 'dbusbind)
 (autoload 'secrets-show-secrets "secrets" nil t))
@@ -24168,8 +24199,8 @@ Major mode for editing Wisent grammars.
 ;;;***
-;;;### (autoloads nil "sendmail" "mail/sendmail.el" (21964 28338
+;;;### (autoloads nil "sendmail" "mail/sendmail.el" (22026 25907
-;;;;;;  141695 749000))
+;;;;;;  603502 692000))
 ;;; Generated autoloads from mail/sendmail.el
 (defvar mail-from-style 'default "\
@@ -24450,14 +24481,14 @@ Like `mail' command, but display mail buffer in another frame.
 ;;;***
-;;;### (autoloads nil "seq" "emacs-lisp/seq.el" (21982 58292 436758
+;;;### (autoloads nil "seq" "emacs-lisp/seq.el" (22026 25907 583502
-;;;;;;  717000))
+;;;;;;  692000))
 ;;; Generated autoloads from emacs-lisp/seq.el
 (push (purecopy '(seq 2 0)) package--builtin-versions)
 ;;;***
-;;;### (autoloads nil "server" "server.el" (21981 37426 703399 97000))
+;;;### (autoloads nil "server" "server.el" (21998 46517 270024 649000))
 ;;; Generated autoloads from server.el
 (put 'server-host 'risky-local-variable t)
@@ -24524,7 +24555,7 @@ only these files will be asked to be saved.
 ;;;***
-;;;### (autoloads nil "ses" "ses.el" (21981 37426 711399 97000))
+;;;### (autoloads nil "ses" "ses.el" (21990 52406 736500 385000))
 ;;; Generated autoloads from ses.el
 (autoload 'ses-mode "ses" "\
@@ -24568,8 +24599,8 @@ formula:
 ;;;***
-;;;### (autoloads nil "sgml-mode" "textmodes/sgml-mode.el" (21988
+;;;### (autoloads nil "sgml-mode" "textmodes/sgml-mode.el" (22011
-;;;;;;  10682 97624 461000))
+;;;;;;  58554 69858 469000))
 ;;; Generated autoloads from textmodes/sgml-mode.el
 (autoload 'sgml-mode "sgml-mode" "\
@@ -24626,7 +24657,7 @@ Images in many formats can be inlined with <img src=\"URL\">.
 If you mainly create your own documents, `sgml-specials' might be
 interesting.  But note that some HTML 2 browsers can't handle `&apos;'.
 To work around that, do:
-   (eval-after-load \"sgml-mode\" '(aset sgml-char-names ?\\=' nil))
+   (eval-after-load \"sgml-mode\" \\='(aset sgml-char-names ?\\=' nil))
 \\{html-mode-map}
@@ -24634,8 +24665,8 @@ To work around that, do:
 ;;;***
-;;;### (autoloads nil "sh-script" "progmodes/sh-script.el" (21965
+;;;### (autoloads nil "sh-script" "progmodes/sh-script.el" (22027
-;;;;;;  49202 339586 285000))
+;;;;;;  46774 688310 591000))
 ;;; Generated autoloads from progmodes/sh-script.el
 (push (purecopy '(sh-script 2 0 6)) package--builtin-versions)
 (put 'sh-shell 'safe-local-variable 'symbolp)
@@ -24698,8 +24729,8 @@ with your script for an edit-interpret-debug cycle.
 ;;;***
-;;;### (autoloads nil "shadow" "emacs-lisp/shadow.el" (21980 16567
+;;;### (autoloads nil "shadow" "emacs-lisp/shadow.el" (22026 25907
-;;;;;;  509544 893000))
+;;;;;;  583502 692000))
 ;;; Generated autoloads from emacs-lisp/shadow.el
 (autoload 'list-load-path-shadows "shadow" "\
@@ -24835,7 +24866,7 @@ Otherwise, one argument `-i' is passed to the shell.
 ;;;***
-;;;### (autoloads nil "shr" "net/shr.el" (21837 20530 521200 565000))
+;;;### (autoloads nil "shr" "net/shr.el" (22026 25907 631502 692000))
 ;;; Generated autoloads from net/shr.el
 (autoload 'shr-render-region "shr" "\
@@ -24943,8 +24974,8 @@ with no arguments, if that value is non-nil.
 ;;;***
-;;;### (autoloads nil "skeleton" "skeleton.el" (21980 16568 61544
+;;;### (autoloads nil "skeleton" "skeleton.el" (22026 25907 643502
-;;;;;;  893000))
+;;;;;;  692000))
 ;;; Generated autoloads from skeleton.el
 (defvar skeleton-filter-function 'identity "\
@@ -25271,7 +25302,7 @@ Pick your favorite shortcuts:
 ;;;***
-;;;### (autoloads nil "sort" "sort.el" (21670 32331 885635 586000))
+;;;### (autoloads nil "sort" "sort.el" (22011 58553 993858 469000))
 ;;; Generated autoloads from sort.el
 (put 'sort-fold-case 'safe-local-variable 'booleanp)
@@ -25460,8 +25491,8 @@ installed through `spam-necessary-extra-headers'.
 ;;;***
-;;;### (autoloads nil "spam-report" "gnus/spam-report.el" (21989
+;;;### (autoloads nil "spam-report" "gnus/spam-report.el" (22011
-;;;;;;  31537 879825 721000))
+;;;;;;  58553 601858 469000))
 ;;; Generated autoloads from gnus/spam-report.el
 (autoload 'spam-report-process-queue "spam-report" "\
@@ -25503,8 +25534,8 @@ Spam reports will be queued with the method used when
 ;;;***
-;;;### (autoloads nil "speedbar" "speedbar.el" (21670 32331 885635
+;;;### (autoloads nil "speedbar" "speedbar.el" (22011 58553 993858
-;;;;;;  586000))
+;;;;;;  469000))
 ;;; Generated autoloads from speedbar.el
 (defalias 'speedbar 'speedbar-frame-mode)
@@ -25544,8 +25575,8 @@ Return a vector containing the lines from `spook-phrases-file'.
 ;;;***
-;;;### (autoloads nil "sql" "progmodes/sql.el" (21980 16568 41544
+;;;### (autoloads nil "sql" "progmodes/sql.el" (22011 58553 929858
-;;;;;;  893000))
+;;;;;;  469000))
 ;;; Generated autoloads from progmodes/sql.el
 (push (purecopy '(sql 3 5)) package--builtin-versions)
@@ -25562,8 +25593,8 @@ of the current highlighting list.
 For example:
- (sql-add-product-keywords 'ms
+ (sql-add-product-keywords \\='ms
-  '((\"\\\\b\\\\w+_t\\\\b\" . font-lock-type-face)))
+  \\='((\"\\\\b\\\\w+_t\\\\b\" . font-lock-type-face)))
 adds a fontification pattern to fontify identifiers ending in
 `_t' as data types.
@@ -26019,7 +26050,7 @@ Run vsql as an inferior process.
 ;;;***
 ;;;### (autoloads nil "srecode/srt-mode" "cedet/srecode/srt-mode.el"
-;;;;;;  (21978 61237 382488 269000))
+;;;;;;  (21998 46516 910024 649000))
 ;;; Generated autoloads from cedet/srecode/srt-mode.el
 (autoload 'srecode-template-mode "srecode/srt-mode" "\
@@ -26374,8 +26405,8 @@ The variable `tab-width' controls the spacing of tab stops.
 ;;;***
-;;;### (autoloads nil "table" "textmodes/table.el" (21974 64192 704009
+;;;### (autoloads nil "table" "textmodes/table.el" (21998 46517 298024
-;;;;;;  993000))
+;;;;;;  649000))
 ;;; Generated autoloads from textmodes/table.el
 (autoload 'table-insert "table" "\
@@ -26688,15 +26719,15 @@ ORIENTATION is a symbol either horizontally or vertically.
 (autoload 'table-justify "table" "\
 Justify contents of a cell, a row of cells or a column of cells.
-WHAT is a symbol ‘cell’, ‘row’ or ‘column’.  JUSTIFY is a symbol
+WHAT is a symbol `cell', `row' or `column'.  JUSTIFY is a symbol
-‘left’, ‘center’, ‘right’, ‘top’, ‘middle’, ‘bottom’ or ‘none’.
+`left', `center', `right', `top', `middle', `bottom' or `none'.
 \(fn WHAT JUSTIFY)" t nil)
 (autoload 'table-justify-cell "table" "\
 Justify cell contents.
-JUSTIFY is a symbol ‘left’, ‘center’ or ‘right’ for horizontal, or ‘top’,
+JUSTIFY is a symbol `left', `center' or `right' for horizontal, or `top',
-‘middle’, ‘bottom’ or ‘none’ for vertical.  When optional PARAGRAPH is
+`middle', `bottom' or `none' for vertical.  When optional PARAGRAPH is
 non-nil the justify operation is limited to the current paragraph,
 otherwise the entire cell contents is justified.
@@ -26704,15 +26735,15 @@ otherwise the entire cell contents is justified.
 (autoload 'table-justify-row "table" "\
 Justify cells of a row.
-JUSTIFY is a symbol ‘left’, ‘center’ or ‘right’ for horizontal,
+JUSTIFY is a symbol `left', `center' or `right' for horizontal,
-or ‘top’, ‘middle’, ‘bottom’ or ‘none’ for vertical.
+or `top', `middle', `bottom' or `none' for vertical.
 \(fn JUSTIFY)" t nil)
 (autoload 'table-justify-column "table" "\
 Justify cells of a column.
-JUSTIFY is a symbol ‘left’, ‘center’ or ‘right’ for horizontal,
+JUSTIFY is a symbol `left', `center' or `right' for horizontal,
-or ‘top’, ‘middle’, ‘bottom’ or ‘none’ for vertical.
+or `top', `middle', `bottom' or `none' for vertical.
 \(fn JUSTIFY)" t nil)
@@ -26785,25 +26816,25 @@ INTERVAL is the number of cells to travel between sequence element
 insertion which is normally 1.  When zero or less is given for
 INTERVAL it is interpreted as number of cells per row so that sequence
 is placed straight down vertically as long as the table's cell
-structure is uniform.  JUSTIFY is a symbol ‘left’, ‘center’ or
+structure is uniform.  JUSTIFY is a symbol `left', `center' or
-‘right’ that specifies justification of the inserted string.
+`right' that specifies justification of the inserted string.
 Example:
  (progn
    (table-insert 16 3 5 1)
    (table-forward-cell 15)
-    (table-insert-sequence \"D0\" -16 1 1 'center)
+    (table-insert-sequence \"D0\" -16 1 1 \\='center)
    (table-forward-cell 16)
-    (table-insert-sequence \"A[0]\" -16 1 1 'center)
+    (table-insert-sequence \"A[0]\" -16 1 1 \\='center)
    (table-forward-cell 1)
-    (table-insert-sequence \"-\" 16 0 1 'center))
+    (table-insert-sequence \"-\" 16 0 1 \\='center))
  (progn
    (table-insert 16 8 5 1)
-    (table-insert-sequence \"@\" 0 1 2 'right)
+    (table-insert-sequence \"@\" 0 1 2 \\='right)
    (table-forward-cell 1)
-    (table-insert-sequence \"64\" 0 1 2 'left))
+    (table-insert-sequence \"64\" 0 1 2 \\='left))
 \(fn STR N INCREMENT INTERVAL JUSTIFY)" t nil)
@@ -27060,7 +27091,7 @@ Normally input is edited in Emacs and sent a line at a time.
 ;;;***
-;;;### (autoloads nil "term" "term.el" (21953 58033 491058 929000))
+;;;### (autoloads nil "term" "term.el" (22011 58553 997858 469000))
 ;;; Generated autoloads from term.el
 (autoload 'make-term "term" "\
@@ -27102,8 +27133,8 @@ use in that buffer.
 ;;;***
-;;;### (autoloads nil "testcover" "emacs-lisp/testcover.el" (21976
+;;;### (autoloads nil "testcover" "emacs-lisp/testcover.el" (21998
-;;;;;;  19509 908430 241000))
+;;;;;;  46517 22024 649000))
 ;;; Generated autoloads from emacs-lisp/testcover.el
 (autoload 'testcover-this-defun "testcover" "\
@@ -27113,8 +27144,8 @@ Start coverage on function under point.
 ;;;***
-;;;### (autoloads nil "tetris" "play/tetris.el" (21670 32331 385639
+;;;### (autoloads nil "tetris" "play/tetris.el" (22000 1842 148539
-;;;;;;  720000))
+;;;;;;  693000))
 ;;; Generated autoloads from play/tetris.el
 (push (purecopy '(tetris 2 1)) package--builtin-versions)
@@ -27139,8 +27170,8 @@ tetris-mode keybindings:
 ;;;***
-;;;### (autoloads nil "tex-mode" "textmodes/tex-mode.el" (21980 16568
+;;;### (autoloads nil "tex-mode" "textmodes/tex-mode.el" (22026 25907
-;;;;;;  85544 893000))
+;;;;;;  663502 692000))
 ;;; Generated autoloads from textmodes/tex-mode.el
 (defvar tex-shell-file-name nil "\
@@ -27441,8 +27472,8 @@ Major mode to edit DocTeX files.
 ;;;***
-;;;### (autoloads nil "texinfmt" "textmodes/texinfmt.el" (21988 10682
+;;;### (autoloads nil "texinfmt" "textmodes/texinfmt.el" (22011 58554
-;;;;;;  101624 461000))
+;;;;;;  81858 469000))
 ;;; Generated autoloads from textmodes/texinfmt.el
 (autoload 'texinfo-format-buffer "texinfmt" "\
@@ -27481,8 +27512,8 @@ if large.  You can use `Info-split' to do this manually.
 ;;;***
-;;;### (autoloads nil "texinfo" "textmodes/texinfo.el" (21980 16568
+;;;### (autoloads nil "texinfo" "textmodes/texinfo.el" (22026 25907
-;;;;;;  89544 893000))
+;;;;;;  667502 692000))
 ;;; Generated autoloads from textmodes/texinfo.el
 (defvar texinfo-open-quote (purecopy "``") "\
@@ -27594,8 +27625,8 @@ Compose Thai characters in the current buffer.
 ;;;***
-;;;### (autoloads nil "thingatpt" "thingatpt.el" (21918 18992 829579
+;;;### (autoloads nil "thingatpt" "thingatpt.el" (22011 58554 85858
-;;;;;;  660000))
+;;;;;;  469000))
 ;;; Generated autoloads from thingatpt.el
 (autoload 'forward-thing "thingatpt" "\
@@ -27659,7 +27690,7 @@ Return the Lisp list at point, or nil if none is found.
 ;;;***
-;;;### (autoloads nil "thumbs" "thumbs.el" (21974 64192 708009 993000))
+;;;### (autoloads nil "thumbs" "thumbs.el" (21993 28596 414597 473000))
 ;;; Generated autoloads from thumbs.el
 (autoload 'thumbs-find-thumb "thumbs" "\
@@ -27767,8 +27798,8 @@ See also docstring of the function tibetan-compose-region.
 ;;;***
-;;;### (autoloads nil "tildify" "textmodes/tildify.el" (21852 24382
+;;;### (autoloads nil "tildify" "textmodes/tildify.el" (22026 25907
-;;;;;;  87256 328000))
+;;;;;;  667502 692000))
 ;;; Generated autoloads from textmodes/tildify.el
 (push (purecopy '(tildify 4 6 1)) package--builtin-versions)
@@ -27834,7 +27865,7 @@ variable will be set to the representation.
 ;;;***
-;;;### (autoloads nil "time" "time.el" (21942 1330 821986 820000))
+;;;### (autoloads nil "time" "time.el" (22026 25907 667502 692000))
 ;;; Generated autoloads from time.el
 (defvar display-time-day-and-date nil "\
@@ -27896,8 +27927,8 @@ Return a string giving the duration of the Emacs initialization.
 ;;;***
-;;;### (autoloads nil "time-date" "calendar/time-date.el" (21976
+;;;### (autoloads nil "time-date" "calendar/time-date.el" (22000
-;;;;;;  19509 736430 241000))
+;;;;;;  55581 510930 477000))
 ;;; Generated autoloads from calendar/time-date.el
 (autoload 'date-to-time "time-date" "\
@@ -28041,8 +28072,8 @@ With ARG, turn time stamping on if and only if arg is positive.
 ;;;***
-;;;### (autoloads nil "timeclock" "calendar/timeclock.el" (21980
+;;;### (autoloads nil "timeclock" "calendar/timeclock.el" (21998
-;;;;;;  16567 425544 893000))
+;;;;;;  46516 882024 649000))
 ;;; Generated autoloads from calendar/timeclock.el
 (push (purecopy '(timeclock 2 6 1)) package--builtin-versions)
@@ -28152,7 +28183,7 @@ relative only to the time worked today, and not to past time.
 ;;;***
 ;;;### (autoloads nil "titdic-cnv" "international/titdic-cnv.el"
-;;;;;;  (21988 10681 981624 461000))
+;;;;;;  (22011 58553 673858 469000))
 ;;; Generated autoloads from international/titdic-cnv.el
 (autoload 'titdic-convert "titdic-cnv" "\
@@ -28216,8 +28247,8 @@ Its value should be an event that has a binding in MENU.
 ;;;***
-;;;### (autoloads nil "todo-mode" "calendar/todo-mode.el" (21985
+;;;### (autoloads nil "todo-mode" "calendar/todo-mode.el" (22015
-;;;;;;  34484 214705 925000))
+;;;;;;  55603 665705 321000))
 ;;; Generated autoloads from calendar/todo-mode.el
 (autoload 'todo-show "todo-mode" "\
@@ -28415,8 +28446,8 @@ the output buffer or changing the window configuration.
 ;;;***
-;;;### (autoloads nil "tramp" "net/tramp.el" (21981 37426 655399
+;;;### (autoloads nil "tramp" "net/tramp.el" (22015 55603 713705
-;;;;;;  97000))
+;;;;;;  321000))
 ;;; Generated autoloads from net/tramp.el
 (defvar tramp-mode t "\
@@ -28542,8 +28573,8 @@ Discard Tramp from loading remote files.
 ;;;***
-;;;### (autoloads nil "tutorial" "tutorial.el" (21978 61237 774488
+;;;### (autoloads nil "tutorial" "tutorial.el" (22011 58554 85858
-;;;;;;  269000))
+;;;;;;  469000))
 ;;; Generated autoloads from tutorial.el
 (autoload 'help-with-tutorial "tutorial" "\
@@ -28578,8 +28609,8 @@ resumed later.
 ;;;***
-;;;### (autoloads nil "two-column" "textmodes/two-column.el" (21988
+;;;### (autoloads nil "two-column" "textmodes/two-column.el" (21998
-;;;;;;  10682 101624 461000))
+;;;;;;  46517 298024 649000))
 ;;; Generated autoloads from textmodes/two-column.el
 (autoload '2C-command "two-column" () t 'keymap)
 (global-set-key "\C-x6" '2C-command)
@@ -28626,8 +28657,8 @@ First column's text    sSs  Second column's text
 ;;;***
-;;;### (autoloads nil "type-break" "type-break.el" (21976 19510 152430
+;;;### (autoloads nil "type-break" "type-break.el" (22011 58554 85858
-;;;;;;  241000))
+;;;;;;  469000))
 ;;; Generated autoloads from type-break.el
 (defvar type-break-mode nil "\
@@ -28759,7 +28790,7 @@ FRAC should be the inverse of the fractional value; for example, a value of
 ;;;***
-;;;### (autoloads nil "uce" "mail/uce.el" (21670 32331 385639 720000))
+;;;### (autoloads nil "uce" "mail/uce.el" (22026 25907 603502 692000))
 ;;; Generated autoloads from mail/uce.el
 (autoload 'uce-reply-to-uce "uce" "\
@@ -29015,8 +29046,8 @@ Extract FNAM from the local disk cache.
 ;;;***
-;;;### (autoloads nil "url-dav" "url/url-dav.el" (21696 56380 925320
+;;;### (autoloads nil "url-dav" "url/url-dav.el" (22011 58554 85858
-;;;;;;  624000))
+;;;;;;  469000))
 ;;; Generated autoloads from url/url-dav.el
 (autoload 'url-dav-supported-p "url-dav" "\
@@ -29061,8 +29092,8 @@ Handle file: and ftp: URLs.
 ;;;***
-;;;### (autoloads nil "url-gw" "url/url-gw.el" (21670 32331 885635
+;;;### (autoloads nil "url-gw" "url/url-gw.el" (22011 58554 85858
-;;;;;;  586000))
+;;;;;;  469000))
 ;;; Generated autoloads from url/url-gw.el
 (autoload 'url-gateway-nslookup-host "url-gw" "\
@@ -29083,8 +29114,8 @@ overriding the value of `url-gateway-method'.
 ;;;***
-;;;### (autoloads nil "url-handlers" "url/url-handlers.el" (21841
+;;;### (autoloads nil "url-handlers" "url/url-handlers.el" (22011
-;;;;;;  54062 172628 227000))
+;;;;;;  58554 85858 469000))
 ;;; Generated autoloads from url/url-handlers.el
 (defvar url-handler-mode nil "\
@@ -29138,8 +29169,8 @@ accessible.
 ;;;***
-;;;### (autoloads nil "url-http" "url/url-http.el" (21837 20526 641128
+;;;### (autoloads nil "url-http" "url/url-http.el" (22018 31799 119263
-;;;;;;  711000))
+;;;;;;  120000))
 ;;; Generated autoloads from url/url-http.el
 (autoload 'url-default-expander "url-expand")
@@ -29378,8 +29409,8 @@ would have been passed to OPERATION.
 ;;;***
-;;;### (autoloads nil "url-util" "url/url-util.el" (21670 32331 885635
+;;;### (autoloads nil "url-util" "url/url-util.el" (21993 28596 418597
-;;;;;;  586000))
+;;;;;;  473000))
 ;;; Generated autoloads from url/url-util.el
 (defvar url-debug nil "\
@@ -29472,7 +29503,7 @@ Return the nondirectory part of FILE, for a URL.
 Build a query-string.
 Given a QUERY in the form:
-'((key1 val1)
+ ((key1 val1)
  (key2 val2)
  (key3 val1 val2)
  (key4)
@@ -29637,7 +29668,7 @@ If FILE-NAME is non-nil, save the result to FILE-NAME.
 ;;;***
-;;;### (autoloads nil "vc" "vc/vc.el" (21923 36911 845418 539000))
+;;;### (autoloads nil "vc" "vc/vc.el" (22014 34736 871840 613000))
 ;;; Generated autoloads from vc/vc.el
 (defvar vc-checkout-hook nil "\
@@ -29944,8 +29975,8 @@ Return the branch part of a revision number REV.
 ;;;***
-;;;### (autoloads nil "vc-annotate" "vc/vc-annotate.el" (21850 34915
+;;;### (autoloads nil "vc-annotate" "vc/vc-annotate.el" (22011 58554
-;;;;;;  127238 802000))
+;;;;;;  93858 469000))
 ;;; Generated autoloads from vc/vc-annotate.el
 (autoload 'vc-annotate "vc-annotate" "\
@@ -29984,8 +30015,8 @@ should be applied to the background or to the foreground.
 ;;;***
-;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (21852 24382 97237
+;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (22014 34736 819840
-;;;;;;  703000))
+;;;;;;  613000))
 ;;; Generated autoloads from vc/vc-bzr.el
 (defconst vc-bzr-admin-dirname ".bzr" "\
@@ -30001,8 +30032,8 @@ Name of the format file in a .bzr directory.")
 ;;;***
-;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (21985 34484 302705
+;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (22014 34736 823840
-;;;;;;  925000))
+;;;;;;  613000))
 ;;; Generated autoloads from vc/vc-cvs.el
 (defun vc-cvs-registered (f)
  "Return non-nil if file F is registered with CVS."
@@ -30062,8 +30093,8 @@ case, and the process object in the asynchronous case.
 ;;;***
-;;;### (autoloads nil "vc-git" "vc/vc-git.el" (21888 48854 948181
+;;;### (autoloads nil "vc-git" "vc/vc-git.el" (22014 34736 835840
-;;;;;;  796000))
+;;;;;;  613000))
 ;;; Generated autoloads from vc/vc-git.el
 (defun vc-git-registered (file)
  "Return non-nil if FILE is registered with git."
@@ -30074,7 +30105,7 @@ case, and the process object in the asynchronous case.
 ;;;***
-;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (21932 51888 960440 344000))
+;;;### (autoloads nil "vc-hg" "vc/vc-hg.el" (22014 34736 835840 613000))
 ;;; Generated autoloads from vc/vc-hg.el
 (defun vc-hg-registered (file)
  "Return non-nil if FILE is registered with hg."
@@ -30085,8 +30116,8 @@ case, and the process object in the asynchronous case.
 ;;;***
-;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (21945 63921 477174
+;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (22014 34736 839840
-;;;;;;  555000))
+;;;;;;  613000))
 ;;; Generated autoloads from vc/vc-mtn.el
 (defconst vc-mtn-admin-dir "_MTN" "\
@@ -30102,8 +30133,8 @@ Name of the monotone directory's format file.")
 ;;;***
-;;;### (autoloads nil "vc-rcs" "vc/vc-rcs.el" (21896 48221 810207
+;;;### (autoloads nil "vc-rcs" "vc/vc-rcs.el" (22014 34736 851840
-;;;;;;  816000))
+;;;;;;  613000))
 ;;; Generated autoloads from vc/vc-rcs.el
 (defvar vc-rcs-master-templates (purecopy '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")) "\
@@ -30116,8 +30147,8 @@ For a description of possible values, see `vc-check-master-templates'.")
 ;;;***
-;;;### (autoloads nil "vc-sccs" "vc/vc-sccs.el" (21748 18111 534605
+;;;### (autoloads nil "vc-sccs" "vc/vc-sccs.el" (22014 34736 863840
-;;;;;;  274000))
+;;;;;;  613000))
 ;;; Generated autoloads from vc/vc-sccs.el
 (defvar vc-sccs-master-templates (purecopy '("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir)) "\
@@ -30135,8 +30166,8 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir)
 ;;;***
-;;;### (autoloads nil "vc-src" "vc/vc-src.el" (21748 18111 534605
+;;;### (autoloads nil "vc-src" "vc/vc-src.el" (22014 34736 863840
-;;;;;;  274000))
+;;;;;;  613000))
 ;;; Generated autoloads from vc/vc-src.el
 (defvar vc-src-master-templates (purecopy '("%s.src/%s,v")) "\
@@ -30149,8 +30180,8 @@ For a description of possible values, see `vc-check-master-templates'.")
 ;;;***
-;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (21980 16568 97544
+;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (22011 58554 97858
-;;;;;;  893000))
+;;;;;;  469000))
 ;;; Generated autoloads from vc/vc-svn.el
 (defun vc-svn-registered (f)
  (let ((admin-dir (cond ((and (eq system-type 'windows-nt)
@@ -30163,8 +30194,8 @@ For a description of possible values, see `vc-check-master-templates'.")
 ;;;***
-;;;### (autoloads nil "vera-mode" "progmodes/vera-mode.el" (21670
+;;;### (autoloads nil "vera-mode" "progmodes/vera-mode.el" (22011
-;;;;;;  32331 885635 586000))
+;;;;;;  58553 929858 469000))
 ;;; Generated autoloads from progmodes/vera-mode.el
 (push (purecopy '(vera-mode 2 28)) package--builtin-versions)
 (add-to-list 'auto-mode-alist (cons (purecopy "\\.vr[hi]?\\'")  'vera-mode))
@@ -30223,7 +30254,7 @@ Key bindings:
 ;;;***
 ;;;### (autoloads nil "verilog-mode" "progmodes/verilog-mode.el"
-;;;;;;  (21988 10682 49624 461000))
+;;;;;;  (22015 55603 833705 321000))
 ;;; Generated autoloads from progmodes/verilog-mode.el
 (autoload 'verilog-mode "verilog-mode" "\
@@ -30362,8 +30393,8 @@ Key bindings specific to `verilog-mode-map' are:
 ;;;***
-;;;### (autoloads nil "vhdl-mode" "progmodes/vhdl-mode.el" (21988
+;;;### (autoloads nil "vhdl-mode" "progmodes/vhdl-mode.el" (22011
-;;;;;;  10682 57624 461000))
+;;;;;;  58553 969858 469000))
 ;;; Generated autoloads from progmodes/vhdl-mode.el
 (autoload 'vhdl-mode "vhdl-mode" "\
@@ -30413,7 +30444,7 @@ Usage:
      ;;;  -->  \" := \"      [[  -->  [        --CR  -->  comment-out code
      ..   -->  \" => \"      ]   -->  )        ---   -->  horizontal line
      ,,   -->  \" <= \"      ]]  -->  ]        ----  -->  display comment
-      ==   -->  \" == \"      ''  -->  \\\"
+      ==   -->  \" == \"      \\='\\='  -->  \\\"
  WORD COMPLETION:
@@ -30425,7 +30456,7 @@ Usage:
      Typing `TAB' after `(' looks for and inserts complete parenthesized
    expressions (e.g. for array index ranges).  All keywords as well as
    standard types and subprograms of VHDL have predefined abbreviations
-    (e.g. type \"std\" and `TAB' will toggle through all standard types
+    (e.g., type \"std\" and `TAB' will toggle through all standard types
    beginning with \"std\").
      Typing `TAB' after a non-word character indents the line if at the
@@ -30823,7 +30854,7 @@ Usage:
  CODE FIXING:
    `C-c C-x C-p' fixes the closing parenthesis of a generic/port clause
-    (e.g. if the closing parenthesis is on the wrong line or is missing).
+    (e.g., if the closing parenthesis is on the wrong line or is missing).
  PRINTING:
@@ -30860,7 +30891,7 @@ Usage:
    automatically recognized as VHDL source files.  To add an extension
    \".xxx\", add the following line to your Emacs start-up file (`.emacs'):
-      (push '(\"\\\\.xxx\\\\'\" . vhdl-mode) auto-mode-alist)
+      (push \\='(\"\\\\.xxx\\\\\\='\" . vhdl-mode) auto-mode-alist)
  HINTS:
@@ -31218,8 +31249,8 @@ Exit View mode and make the current buffer editable.
 ;;;***
-;;;### (autoloads nil "viper" "emulation/viper.el" (21670 32330 885624
+;;;### (autoloads nil "viper" "emulation/viper.el" (22011 58553 461858
-;;;;;;  725000))
+;;;;;;  469000))
 ;;; Generated autoloads from emulation/viper.el
 (push (purecopy '(viper 3 14 1)) package--builtin-versions)
@@ -31327,7 +31358,7 @@ this is equivalent to `display-warning', using
 ;;;***
-;;;### (autoloads nil "wdired" "wdired.el" (21981 37426 739399 97000))
+;;;### (autoloads nil "wdired" "wdired.el" (22026 25907 675502 692000))
 ;;; Generated autoloads from wdired.el
 (push (purecopy '(wdired 2 0)) package--builtin-versions)
@@ -31393,8 +31424,8 @@ in certain major modes.
 ;;;***
-;;;### (autoloads nil "whitespace" "whitespace.el" (21985 34484 306705
+;;;### (autoloads nil "whitespace" "whitespace.el" (22026 25907 675502
-;;;;;;  925000))
+;;;;;;  692000))
 ;;; Generated autoloads from whitespace.el
 (push (purecopy '(whitespace 13 2 2)) package--builtin-versions)
@@ -31791,8 +31822,8 @@ if ARG is omitted or nil.
 ;;;***
-;;;### (autoloads nil "wid-edit" "wid-edit.el" (21981 37426 739399
+;;;### (autoloads nil "wid-edit" "wid-edit.el" (22003 64432 668146
-;;;;;;  97000))
+;;;;;;  533000))
 ;;; Generated autoloads from wid-edit.el
 (autoload 'widgetp "wid-edit" "\
@@ -31887,7 +31918,7 @@ Default MODIFIER is 'shift.
 ;;;***
-;;;### (autoloads nil "winner" "winner.el" (21733 50750 334730 5000))
+;;;### (autoloads nil "winner" "winner.el" (22009 58952 311546 645000))
 ;;; Generated autoloads from winner.el
 (defvar winner-mode nil "\
@@ -31910,7 +31941,7 @@ the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'.
 ;;;***
-;;;### (autoloads nil "woman" "woman.el" (21985 34484 338705 925000))
+;;;### (autoloads nil "woman" "woman.el" (22026 25907 679502 692000))
 ;;; Generated autoloads from woman.el
 (push (purecopy '(woman 0 551)) package--builtin-versions)
@@ -32034,8 +32065,8 @@ If LIMIT is non-nil, then do not consider characters beyond LIMIT.
 ;;;***
-;;;### (autoloads nil "xref" "progmodes/xref.el" (21963 7479 570964
+;;;### (autoloads nil "xref" "progmodes/xref.el" (21993 28596 366597
-;;;;;;  861000))
+;;;;;;  473000))
 ;;; Generated autoloads from progmodes/xref.el
 (autoload 'xref-pop-marker-stack "xref" "\
@@ -32368,7 +32399,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" "vc/vc-filewise.el" "vcursor.el"
 ;;;;;;  "vt-control.el" "vt100-led.el" "w32-fns.el" "w32-vars.el"
-;;;;;;  "x-dnd.el") (21989 31602 291825 721000))
+;;;;;;  "x-dnd.el") (22026 26004 435502 692000))
 ;;;***
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index f54893fb4be..8e28973c43f 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -417,7 +417,8 @@ and send the mail again%s."
                                         (regexp-quote (system-name)))
                                 from))
               (not (yes-or-no-p
-                     (format "Is '%s' really your email address? " from)))
+                     (format-message "Is `%s' really your email address? "
+                                     from)))
               (error "Please edit the From address and try again"))))))
diff --git a/lisp/mail/footnote.el b/lisp/mail/footnote.el
index 86bb9e89618..839e24c8a90 100644
--- a/lisp/mail/footnote.el
+++ b/lisp/mail/footnote.el
@@ -1,4 +1,4 @@
-;;; footnote.el --- footnote support for message mode  -*- coding: utf-8;-*-
+;;; footnote.el --- footnote support for message mode
 ;; Copyright (C) 1997, 2000-2015 Free Software Foundation, Inc.
diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el
index a7057ca21c8..35138985ed7 100644
--- a/lisp/mail/mail-extr.el
+++ b/lisp/mail/mail-extr.el
@@ -1,4 +1,4 @@
-;;; mail-extr.el --- extract full name and address from RFC 822 mail header -*- coding: utf-8 -*-
+;;; mail-extr.el --- extract full name and address from RFC 822 mail header
 ;; Copyright (C) 1991-1994, 1997, 2001-2015 Free Software Foundation,
 ;; Inc.
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 4c0f2b98257..9269d7f7d83 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -2078,7 +2078,6 @@ you can move to one of them and type C-c C-c to recover that one."
 ;; Local Variables:
 ;; byte-compile-dynamic: t
-;; coding: utf-8
 ;; End:
 ;;; sendmail.el ends here
diff --git a/lisp/mail/uce.el b/lisp/mail/uce.el
index 74939d1c975..5db135728ea 100644
--- a/lisp/mail/uce.el
+++ b/lisp/mail/uce.el
@@ -375,7 +375,3 @@ You might need to set `uce-mail-reader' before using this."
 (provide 'uce)
 ;;; uce.el ends here
-;; Local Variables:
-;; coding: utf-8
-;; End:
diff --git a/lisp/man.el b/lisp/man.el
index fbfa6f0c7f7..90d658a3e76 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -1,4 +1,4 @@
-;;; man.el --- browse UNIX manual pages  -*- coding: utf-8 -*-
+;;; man.el --- browse UNIX manual pages
 ;; Copyright (C) 1993-1994, 1996-1997, 2001-2015 Free Software
 ;; Foundation, Inc.
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 96fe7d797c2..c757920ef29 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -2901,11 +2901,11 @@ This option contains the Unix command line which performs the
 actual printing for the \\[mh-print-msg] command. The string can
 contain one escape, \"%s\", which is replaced by the name of the
 folder and the message number and is useful for print job names.
-I use \"mpage -h'%s' -b Letter -H1of -mlrtb -P\" which produces a
+I use \"mpage -h\\='%s\\=' -b Letter -H1of -mlrtb -P\" which produces a
 nice header and adds a bit of margin so the text fits within my
 printer's margins.
-This options is not used by the commands \\[mh-ps-print-msg] or
+This option is not used by the commands \\[mh-ps-print-msg] or
 \\[mh-ps-print-msg-file]."
  :type 'string
  :group 'mh-show
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 689911c405a..2814d020b8d 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1374,7 +1374,7 @@ appear to be a match."
                     ;; that file.
                     (= (length string) (length compl)))
            (completion--replace beg end compl))))
-    (funcall exit-function))
+      (funcall exit-function))
     ((memq minibuffer-completion-confirm '(confirm confirm-after-completion))
      ;; The user is permitted to exit with an input that's rejected
@@ -1391,7 +1391,7 @@ appear to be a match."
     (t
      ;; Call do-completion, but ignore errors.
-    (funcall completion-function))))
+      (funcall completion-function))))
 (defun completion--try-word-completion (string table predicate point md)
  (let ((comp (completion-try-completion string table predicate point md)))
@@ -1794,7 +1794,7 @@ variables.")
           (if completions "Sole completion" "No completions")))
      (let* ((last (last completions))
-             (base-size (cdr last))
+             (base-size (or (cdr last) 0))
             (prefix (unless (zerop base-size) (substring string 0 base-size)))
             (all-md (completion--metadata (buffer-substring-no-properties
                                            start (point))
diff --git a/lisp/net/eudc-bob.el b/lisp/net/eudc-bob.el
index f01f671de9e..e48af4dc205 100644
--- a/lisp/net/eudc-bob.el
+++ b/lisp/net/eudc-bob.el
@@ -1,4 +1,4 @@
-;;; eudc-bob.el --- Binary Objects Support for EUDC -*- coding: utf-8 -*-
+;;; eudc-bob.el --- Binary Objects Support for EUDC
 ;; Copyright (C) 1999-2015 Free Software Foundation, Inc.
diff --git a/lisp/net/eudc-export.el b/lisp/net/eudc-export.el
index ec0914d636b..c60911ff0c5 100644
--- a/lisp/net/eudc-export.el
+++ b/lisp/net/eudc-export.el
@@ -1,4 +1,4 @@
-;;; eudc-export.el --- functions to export EUDC query results -*- coding: utf-8 -*-
+;;; eudc-export.el --- functions to export EUDC query results
 ;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
diff --git a/lisp/net/eudc-hotlist.el b/lisp/net/eudc-hotlist.el
index 7416ad090eb..55a2fd9a20a 100644
--- a/lisp/net/eudc-hotlist.el
+++ b/lisp/net/eudc-hotlist.el
@@ -1,4 +1,4 @@
-;;; eudc-hotlist.el --- hotlist management for EUDC -*- coding: utf-8 -*-
+;;; eudc-hotlist.el --- hotlist management for EUDC
 ;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
diff --git a/lisp/net/eudc-vars.el b/lisp/net/eudc-vars.el
index 5e994a3a38f..8cffa8e466a 100644
--- a/lisp/net/eudc-vars.el
+++ b/lisp/net/eudc-vars.el
@@ -1,4 +1,4 @@
-;;; eudc-vars.el --- Emacs Unified Directory Client -*- coding: utf-8 -*-
+;;; eudc-vars.el --- Emacs Unified Directory Client
 ;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el
index 66dbc65da9c..7280d9d2625 100644
--- a/lisp/net/eudc.el
+++ b/lisp/net/eudc.el
@@ -1,4 +1,4 @@
-;;; eudc.el --- Emacs Unified Directory Client -*- coding: utf-8 -*-
+;;; eudc.el --- Emacs Unified Directory Client
 ;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
diff --git a/lisp/net/eudcb-bbdb.el b/lisp/net/eudcb-bbdb.el
index bd5d4536aab..0545304b4a3 100644
--- a/lisp/net/eudcb-bbdb.el
+++ b/lisp/net/eudcb-bbdb.el
@@ -1,4 +1,4 @@
-;;; eudcb-bbdb.el --- Emacs Unified Directory Client - BBDB Backend -*- coding: utf-8 -*-
+;;; eudcb-bbdb.el --- Emacs Unified Directory Client - BBDB Backend
 ;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
diff --git a/lisp/net/eudcb-ldap.el b/lisp/net/eudcb-ldap.el
index d22dff615ee..b50d29ddae8 100644
--- a/lisp/net/eudcb-ldap.el
+++ b/lisp/net/eudcb-ldap.el
@@ -1,4 +1,4 @@
-;;; eudcb-ldap.el --- Emacs Unified Directory Client - LDAP Backend -*- coding: utf-8 -*-
+;;; eudcb-ldap.el --- Emacs Unified Directory Client - LDAP Backend
 ;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
diff --git a/lisp/net/eudcb-ph.el b/lisp/net/eudcb-ph.el
index a135e9ba059..f144bf695f5 100644
--- a/lisp/net/eudcb-ph.el
+++ b/lisp/net/eudcb-ph.el
@@ -1,4 +1,4 @@
-;;; eudcb-ph.el --- Emacs Unified Directory Client - CCSO PH/QI Backend -*- coding: utf-8 -*-
+;;; eudcb-ph.el --- Emacs Unified Directory Client - CCSO PH/QI Backend
 ;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el
index 4eef5809233..0c2df8897d7 100644
--- a/lisp/net/newst-treeview.el
+++ b/lisp/net/newst-treeview.el
@@ -940,7 +940,7 @@ Optional arguments CHANGED-WIDGET and EVENT are ignored."
  "Return propertized copy of string TAG.
 Optional argument NUM-NEW is used for choosing face, other
 arguments NT-ID, FEED, and VFEED are added as properties."
-  ;;(message "newsticker--treeview-propertize-tag '%s' %s" feed nt-id)
+  ;;(message "newsticker--treeview-propertize-tag `%s' %s" feed nt-id)
  (let ((face 'newsticker-treeview-face)
        (map (make-sparse-keymap)))
    (if (and num-new (> num-new 0))
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 0ce77b9055c..9116e506756 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -222,10 +222,29 @@ DOM should be a parse tree as generated by
                                     (if (not shr-use-fonts)
                                         shr-width
                                       (* shr-width (frame-char-width))))
+                                ;; We need to adjust the available
+                                ;; width for when the user disables
+                                ;; the fringes, which will cause the
+                                ;; display engine usurp one column for
+                                ;; the continuation glyph.
                                (if (not shr-use-fonts)
-                                    (- (window-width) 2)
+                                    (- (window-body-width) 1
-                                  (- (window-pixel-width)
+                                       (if (and (null shr-width)
-                                     (* (frame-fringe-width) 2))))))
+                                                (or (zerop
+                                                     (fringe-columns 'right))
+                                                    (zerop
+                                                     (fringe-columns 'left))))
+                                           0
+                                         1))
+                                  (- (window-body-width nil t)
+                                     (* 2 (frame-char-width))
+                                     (if (and (null shr-width)
+                                              (or (zerop
+                                                   (fringe-columns 'right))
+                                                  (zerop
+                                                   (fringe-columns 'left))))
+                                         (* (frame-char-width) 2)
+                                       0))))))
    (shr-descend dom)
    (shr-fill-lines start (point))
    (shr-remove-trailing-whitespace start (point))
@@ -439,8 +458,18 @@ size, and full-buffer size."
    (with-temp-buffer
      (let ((shr-indentation 0)
            (shr-start nil)
-            (shr-internal-width (- (window-pixel-width)
+            (shr-internal-width (- (window-body-width nil t)
-                                   (* (frame-fringe-width) 2))))
+                                   (* 2 (frame-char-width))
+                                   ;; Adjust the window width for when
+                                   ;; the user disables the fringes,
+                                   ;; which causes the display engine
+                                   ;; usurp one coplumn for the
+                                   ;; continuation glyph.
+                                   (if (and (null shr-width)
+                                            (or (zerop (fringe-columns 'right))
+                                                (zerop (fringe-columns 'left))))
+                                       (* (frame-char-width) 2)
+                                     0))))
        (shr-insert text)
        (buffer-string)))))
@@ -620,7 +649,9 @@ size, and full-buffer size."
        ;; There's no breakable point, so we give it up.
        (let (found)
          (goto-char bp)
-          (unless shr-kinsoku-shorten
+          ;; Don't overflow the window edge, even if
+          ;; shr-kinsoku-shorten is nil.
+          (unless (or shr-kinsoku-shorten (null shr-width))
            (while (setq found (re-search-forward
                                "\\(\\c>\\)\\| \\|\\c<\\|\\c|"
                                (line-end-position) 'move)))
@@ -632,9 +663,12 @@ size, and full-buffer size."
       ;; Don't put kinsoku-bol characters at the beginning of a line,
       ;; or kinsoku-eol characters at the end of a line.
       (cond
-        (shr-kinsoku-shorten
+        ;; Don't overflow the window edge, even if shr-kinsoku-shorten
+        ;; is nil.
+        ((or shr-kinsoku-shorten (null shr-width))
         (while (and (not (memq (preceding-char) (list ?\C-@ ?\n ? )))
-                     (shr-char-kinsoku-eol-p (preceding-char)))
+                     (or (shr-char-kinsoku-eol-p (preceding-char))
+                         (shr-char-kinsoku-bol-p (following-char))))
           (backward-char 1))
         (when (setq failed (<= (point) start))
           ;; There's no breakable point that doesn't violate kinsoku,
@@ -1042,7 +1076,7 @@ ones, in case fg and bg are nil."
               (shr-color-visible bg fg)))))))
 (defun shr-colorize-region (start end fg &optional bg)
-  (when (or fg bg)
+  (when (and (or fg bg) (>= (display-color-cells) 88))
    (let ((new-colors (shr-color-check fg bg)))
      (when new-colors
        (when fg
@@ -2050,8 +2084,4 @@ The preference is a float determined from `shr-prefer-media-type'."
 (provide 'shr)
-;; Local Variables:
-;; coding: utf-8
-;; End:
 ;;; shr.el ends here
diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el
index 9848325e45a..e6451956dc4 100644
--- a/lisp/net/tramp-compat.el
+++ b/lisp/net/tramp-compat.el
@@ -105,6 +105,12 @@
  (unless (boundp 'remote-file-name-inhibit-cache)
    (defvar remote-file-name-inhibit-cache nil))
+  ;; `directory-listing-before-filename-regexp' does not exist in
+  ;; XEmacs.  Since we use it only in tramp-adb.el, it doesn't harm to
+  ;; declare it here.
+  (unless (boundp 'directory-listing-before-filename-regexp)
+      (defvar directory-listing-before-filename-regexp nil))
  ;; For not existing functions, or functions with a changed argument
  ;; list, there are compiler warnings.  We want to avoid them in
  ;; cases we know what we do.
@@ -122,16 +128,6 @@
  ;; `tramp-handle-*' functions, because this would bypass the locking
  ;; mechanism.
-  ;; `file-remote-p' has been introduced with Emacs 22.  The version
-  ;; of XEmacs is not a magic file name function (yet).
-  (unless (fboundp 'file-remote-p)
-    (defalias 'file-remote-p
-      (lambda (file &optional identification connected)
-        (when (tramp-tramp-file-p file)
-          (tramp-compat-funcall
-           'tramp-file-name-handler
-           'file-remote-p file identification connected)))))
  ;; `process-file' does not exist in XEmacs.
  (unless (fboundp 'process-file)
    (defalias 'process-file
@@ -187,7 +183,11 @@
     (lambda ()
       (ad-remove-advice
        'file-expand-wildcards 'around 'tramp-advice-file-expand-wildcards)
-       (ad-activate 'file-expand-wildcards)))))
+       (ad-activate 'file-expand-wildcards))))
+  ;; `redisplay' does not exist in XEmacs.
+  (unless (fboundp 'redisplay)
+    (defalias 'redisplay 'ignore)))
 ;; `with-temp-message' does not exist in XEmacs.
 (if (fboundp 'with-temp-message)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index fbb8c8a349e..df64f49e1e6 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -4005,7 +4005,7 @@ be granted."
              (or (tramp-get-method-parameter vec 'tramp-tmpdir) "/tmp"))))
    (with-tramp-connection-property vec "tmpdir"
      (or (and (file-directory-p dir) (file-writable-p dir)
-               (file-remote-p dir 'localname))
+               (tramp-file-name-handler 'file-remote-p dir 'localname))
          (tramp-error vec 'file-error "Directory %s not accessible" dir)))
    dir))
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index ab671204e32..5c42f3a828a 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -38,11 +38,14 @@
 (defconst tramp-bug-report-address "tramp-devel@gnu.org"
  "Email address to send bug reports to.")
+;; `locate-dominating-file' does not exist in XEmacs. But it is not used here.
+(autoload 'locate-dominating-file "files")
+(autoload 'tramp-compat-replace-regexp-in-string "tramp-compat")
 (defun tramp-repository-get-version ()
  "Try to return as a string the repository revision of the Tramp sources."
  (unless (featurep 'xemacs)
-    (let ((dir
+    (let ((dir (locate-dominating-file (locate-library "tramp") ".git")))
-           (funcall 'locate-dominating-file (locate-library "tramp") ".git")))
      (when dir
        (with-temp-buffer
          (let ((default-directory (file-name-as-directory dir)))
diff --git a/lisp/obsolete/iso-insert.el b/lisp/obsolete/iso-insert.el
index 358d0fc4bbe..3df786e1f2b 100644
--- a/lisp/obsolete/iso-insert.el
+++ b/lisp/obsolete/iso-insert.el
@@ -1,4 +1,4 @@
-;;; iso-insert.el --- insert functions for ISO 8859/1  -*- coding: utf-8;-*-
+;;; iso-insert.el --- insert functions for ISO 8859/1
 ;; Copyright (C) 1987, 1994, 2001-2015 Free Software Foundation, Inc.
diff --git a/lisp/play/5x5.el b/lisp/play/5x5.el
index 0258f1e4e4a..a07b381d057 100644
--- a/lisp/play/5x5.el
+++ b/lisp/play/5x5.el
@@ -1,4 +1,4 @@
-;;; 5x5.el --- simple little puzzle game -*- coding: utf-8 -*-
+;;; 5x5.el --- simple little puzzle game
 ;; Copyright (C) 1999-2015 Free Software Foundation, Inc.
diff --git a/lisp/play/bubbles.el b/lisp/play/bubbles.el
index 1e06f1ba9de..4dc4c774550 100644
--- a/lisp/play/bubbles.el
+++ b/lisp/play/bubbles.el
@@ -1,4 +1,4 @@
-;;; bubbles.el --- Puzzle game for Emacs -*- coding: utf-8 -*-
+;;; bubbles.el --- Puzzle game for Emacs
 ;; Copyright (C) 2007-2015 Free Software Foundation, Inc.
diff --git a/lisp/play/handwrite.el b/lisp/play/handwrite.el
index 62a8fe4bb0b..30e8357e86a 100644
--- a/lisp/play/handwrite.el
+++ b/lisp/play/handwrite.el
@@ -1,4 +1,4 @@
-;;; handwrite.el --- turns your emacs buffer into a handwritten document -*- coding: utf-8; -*-
+;;; handwrite.el --- turns your emacs buffer into a handwritten document
 ;; Copyright (C) 1996, 2001-2015 Free Software Foundation, Inc.
diff --git a/lisp/play/morse.el b/lisp/play/morse.el
index bbd3e6bc970..e35147dceb4 100644
--- a/lisp/play/morse.el
+++ b/lisp/play/morse.el
@@ -1,4 +1,4 @@
-;;; morse.el --- convert text to morse code and back             -*- coding: utf-8 -*-
+;;; morse.el --- convert text to morse code and back
 ;; Copyright (C) 1995, 2001-2015 Free Software Foundation, Inc.
diff --git a/lisp/progmodes/cmacexp.el b/lisp/progmodes/cmacexp.el
index 0f5b1bb8c6a..9953cae2bef 100644
--- a/lisp/progmodes/cmacexp.el
+++ b/lisp/progmodes/cmacexp.el
@@ -405,7 +405,3 @@ Optional arg DISPLAY non-nil means show messages in the echo area."
      (kill-buffer outbuf))))
 ;;; cmacexp.el ends here
-;; Local Variables:
-;; coding: utf-8
-;; End:
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 9cb367aa633..9e2d625a4d4 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -145,7 +145,7 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
     " in line \\([0-9]+\\) of file \\([^ \n]+[^. \n]\\)\\.? " 2 1)
    (ant
-     "^[ \t]*\\[[^] \n]+\\][ \t]*\\([^: \n]+\\):\\([0-9]+\\):\\(?:\\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\):\\)?\
+     "^[ \t]*\\[[^] \n]+\\][ \t]*\\(\\(?:[A-Za-z]:\\\\\\)?[^: \n]+\\):\\([0-9]+\\):\\(?:\\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\):\\)?\
 \\( warning\\)?" 1 (2 . 4) (3 . 5) (6))
    (bash
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index 0ac59e1a1ea..5c938fd1a93 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -2382,8 +2382,4 @@ escape character."
 (provide 'f90)
-;; Local Variables:
-;; coding: utf-8
-;; End:
 ;;; f90.el ends here
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 3860c81065d..4bee7c1dfa2 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -2315,10 +2315,67 @@ the end of the current result or async record is reached."
 ; list ==>
 ;      "[]" | "[" value ( "," value )* "]" | "[" result ( "," result )* "]"
+(defcustom gdb-mi-decode-strings nil
+  "When non-nil, decode octal escapes in GDB output into non-ASCII text.
+If the value is a coding-system, use that coding-system to decode
+the bytes reconstructed from octal escapes.  Any other non-nil value
+means to decode using the coding-system set for the GDB process.
+Warning: setting this non-nil might mangle strings reported by GDB
+that have literal substrings which match the \\nnn octal escape
+patterns, where nnn is an octal number between 200 and 377.  So
+we only recommend to set this variable non-nil if the program you
+are debugging really reports non-ASCII text, or some of its source
+file names include non-ASCII characters."
+  :type '(choice
+          (const :tag "Don't decode" nil)
+          (const :tag "Decode using default coding-system" t)
+          (coding-system :tag "Decode using this coding-system"))
+  :group 'gdb
+  :version "25.1")
+;; The idea of the following function was suggested
+;; by Kenichi Handa <handa@gnu.org>.
+;;
+;; FIXME: This is fragile: it relies on the assumption that all the
+;; non-ASCII strings output by GDB, including names of the source
+;; files, values of string variables in the inferior, etc., are all
+;; encoded in the same encoding.  It also assumes that the \nnn
+;; sequences are not split between chunks of output of the GDB process
+;; due to buffering, and arrive together.  Finally, if some string
+;; included literal \nnn strings (as opposed to non-ASCII characters
+;; converted by by GDB/MI to octal escapes), this decoding will mangle
+;; those strings.  When/if GDB acquires the ability to not
+;; escape-protect non-ASCII characters in its MI output, this kludge
+;; should be removed.
+(defun gdb-mi-decode (string)
+  "Decode octal escapes in MI output STRING into multibyte text."
+  (let ((coding
+         (if (coding-system-p gdb-mi-decode-strings)
+             gdb-mi-decode-strings
+           (with-current-buffer
+               (gdb-get-buffer-create 'gdb-partial-output-buffer)
+             buffer-file-coding-system))))
+    (with-temp-buffer
+      (set-buffer-multibyte nil)
+      (prin1 string (current-buffer))
+      (goto-char (point-min))
+      ;; prin1 quotes the octal escapes as well, which interferes with
+      ;; their interpretation by 'read' below.  Remove the extra
+      ;; backslashes to countermand that.
+      (while (re-search-forward "\\\\\\(\\\\[2-3][0-7][0-7]\\)" nil t)
+        (replace-match "\\1" nil nil))
+      (goto-char (point-min))
+      (decode-coding-string (read (current-buffer)) coding))))
 (defun gud-gdbmi-marker-filter (string)
  "Filter GDB/MI output."
+  ;; If required, decode non-ASCII text encoded with octal escapes.
+  (or (null gdb-mi-decode-strings)
+      (setq string (gdb-mi-decode string)))
  ;; Record transactions if logging is enabled.
  (when gdb-enable-debug
    (push (cons 'recv string) gdb-debug-log)
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 3240ee8a0db..452a42f4bc2 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -1039,16 +1039,18 @@ to specify a command to run."
                 ;; we should use shell-quote-argument here
                 " -path "
                 (mapconcat
-                  #'(lambda (ignore)
+                  'identity
-                      (cond ((stringp ignore)
+                  (delq nil (mapcar
-                             (shell-quote-argument
+                             #'(lambda (ignore)
-                              (concat "*/" ignore)))
+                                 (cond ((stringp ignore)
-                            ((consp ignore)
+                                        (shell-quote-argument
-                             (and (funcall (car ignore) dir)
+                                         (concat "*/" ignore)))
-                                  (shell-quote-argument
+                                       ((consp ignore)
-                                   (concat "*/"
+                                        (and (funcall (car ignore) dir)
-                                           (cdr ignore)))))))
+                                             (shell-quote-argument
-                  grep-find-ignored-directories
+                                              (concat "*/"
+                                                      (cdr ignore)))))))
+                             grep-find-ignored-directories))
                  " -o -path ")
                 " "
                 (shell-quote-argument ")")
diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el
index 845abc09842..dba497b1f41 100644
--- a/lisp/progmodes/hideshow.el
+++ b/lisp/progmodes/hideshow.el
@@ -1,4 +1,4 @@
-;;; hideshow.el --- minor mode cmds to selectively display code/comment blocks -*- coding: utf-8 -*-
+;;; hideshow.el --- minor mode cmds to selectively display code/comment blocks
 ;; Copyright (C) 1994-2015 Free Software Foundation, Inc.
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index ab994f38252..f2140159e64 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3571,8 +3571,4 @@ If one hasn't been set, or if it's stale, prompt for a new one."
 (provide 'js)
-;; Local Variables:
-;; coding: utf-8
-;; End:
 ;; js.el ends here
diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index 70a2b1ab5ad..b54b88dccb5 100644
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -82,25 +82,6 @@ Used in `octave-mode' and `inferior-octave-mode' buffers.")
 (defvar octave-comment-start-skip "\\(^\\|\\S<\\)\\(?:%!\\|\\s<+\\)\\s-*"
  "Octave-specific `comment-start-skip' (which see).")
-(defvar octave-begin-keywords
-  '("classdef" "do" "enumeration" "events" "for" "function" "if" "methods"
-    "parfor" "properties" "switch" "try" "unwind_protect" "while"))
-(defvar octave-else-keywords
-  '("case" "catch" "else" "elseif" "otherwise" "unwind_protect_cleanup"))
-(defvar octave-end-keywords
-  '("endclassdef" "endenumeration" "endevents" "endfor" "endfunction" "endif"
-    "endmethods" "endparfor" "endproperties" "endswitch" "end_try_catch"
-    "end_unwind_protect" "endwhile" "until" "end"))
-(defvar octave-reserved-words
-  (append octave-begin-keywords
-          octave-else-keywords
-          octave-end-keywords
-          '("break" "continue" "global" "persistent" "return"))
-  "Reserved words in Octave.")
 (defvar octave-function-header-regexp
  (concat "^\\s-*\\_<\\(function\\)\\_>"
          "\\([^=;(\n]*=[ \t]*\\|[ \t]*\\)\\(\\(?:\\w\\|\\s_\\)+\\)\\_>")
@@ -231,20 +212,17 @@ parenthetical grouping.")
 (defcustom octave-font-lock-texinfo-comment t
  "Control whether to highlight the texinfo comment block."
  :type 'boolean
-  :group 'octave
  :version "24.4")
 (defcustom octave-blink-matching-block t
  "Control the blinking of matching Octave block keywords.
 Non-nil means show matching begin of block when inserting a space,
 newline or semicolon after an else or end keyword."
-  :type 'boolean
+  :type 'boolean)
-  :group 'octave)
 (defcustom octave-block-offset 2
  "Extra indentation applied to statements in Octave block structures."
-  :type 'integer
+  :type 'integer)
-  :group 'octave)
 (defvar octave-block-comment-start
  (concat (make-string 2 octave-comment-char) " ")
@@ -252,8 +230,7 @@ newline or semicolon after an else or end keyword."
 (defcustom octave-continuation-offset 4
  "Extra indentation applied to Octave continuation lines."
-  :type 'integer
+  :type 'integer)
-  :group 'octave)
 (eval-and-compile
  (defconst octave-continuation-marker-regexp "\\\\\\|\\.\\.\\."))
@@ -274,109 +251,135 @@ newline or semicolon after an else or end keyword."
 (defcustom octave-mode-hook nil
  "Hook to be run when Octave mode is started."
-  :type 'hook
+  :type 'hook)
-  :group 'octave)
 (defcustom octave-send-show-buffer t
  "Non-nil means display `inferior-octave-buffer' after sending to it."
-  :type 'boolean
+  :type 'boolean)
-  :group 'octave)
 (defcustom octave-send-line-auto-forward t
  "Control auto-forward after sending to the inferior Octave process.
 Non-nil means always go to the next Octave code line after sending."
-  :type 'boolean
+  :type 'boolean)
-  :group 'octave)
 (defcustom octave-send-echo-input t
  "Non-nil means echo input sent to the inferior Octave process."
-  :type 'boolean
+  :type 'boolean)
-  :group 'octave)
 ;;; SMIE indentation
 (require 'smie)
-;; Use '__operators__' in Octave REPL to get a full list.
+(let-when-compile
-(defconst octave-operator-table
+    ((operator-table
-  '((assoc ";" "\n") (assoc ",") ; The doc claims they have equal precedence!?
+      ;; Use '__operators__' in Octave REPL to get a full list?
-    (right "=" "+=" "-=" "*=" "/=")
+      '((assoc ";" "\n") (assoc ",") ;The doc says they have equal precedence!?
-    (assoc "&&") (assoc "||") ; The doc claims they have equal precedence!?
+        (right "=" "+=" "-=" "*=" "/=")
-    (assoc "&") (assoc "|")   ; The doc claims they have equal precedence!?
+        (assoc "&&") (assoc "||") ; The doc claims they have equal precedence!?
-    (nonassoc "<" "<=" "==" ">=" ">" "!=" "~=")
+        (assoc "&") (assoc "|") ; The doc claims they have equal precedence!?
-    (nonassoc ":")                      ;No idea what this is.
+        (nonassoc "<" "<=" "==" ">=" ">" "!=" "~=")
-    (assoc "+" "-")
+        (nonassoc ":")                  ;No idea what this is.
-    (assoc "*" "/" "\\" ".\\" ".*" "./")
+        (assoc "+" "-")
-    (nonassoc "'" ".'")
+        (assoc "*" "/" "\\" ".\\" ".*" "./")
-    (nonassoc "++" "--" "!" "~")        ;And unary "+" and "-".
+        (nonassoc "'" ".'")
-    (right "^" "**" ".^" ".**")
+        (nonassoc "++" "--" "!" "~")    ;And unary "+" and "-".
-    ;; It's not really an operator, but for indentation purposes it
+        (right "^" "**" ".^" ".**")
-    ;; could be convenient to treat it as one.
+        ;; It's not really an operator, but for indentation purposes it
-    (assoc "...")))
+        ;; could be convenient to treat it as one.
+        (assoc "...")))
-(defconst octave-smie-bnf-table
-  '((atom)
+     (matchedrules
-    ;; We can't distinguish the first element in a sequence with
+      ;; We can't distinguish the first element in a sequence with
-    ;; precedence grammars, so we can't distinguish the condition
+      ;; precedence grammars, so we can't distinguish the condition
-    ;; if the `if' from the subsequent body, for example.
+      ;; of the `if' from the subsequent body, for example.
-    ;; This has to be done later in the indentation rules.
+      ;; This has to be done later in the indentation rules.
-    (exp (exp "\n" exp)
+      '(("try" exp "catch" exp "end_try_catch")
-         ;; We need to mention at least one of the operators in this part
+        ("unwind_protect" exp
-         ;; of the grammar: if the BNF and the operator table have
+         "unwind_protect_cleanup" exp "end_unwind_protect")
-         ;; no overlap, SMIE can't know how they relate.
+        ("for" exp "endfor")
-         (exp ";" exp)
+        ("parfor" exp "endparfor")
-         ("try" exp "catch" exp "end_try_catch")
+        ("while" exp "endwhile")
-         ("try" exp "catch" exp "end")
+        ("if" exp "endif")
-         ("unwind_protect" exp
+        ("if" exp "else" exp "endif")
-          "unwind_protect_cleanup" exp "end_unwind_protect")
+        ("if" exp "elseif" exp "else" exp "endif")
-         ("unwind_protect" exp "unwind_protect_cleanup" exp "end")
+        ("if" exp "elseif" exp "elseif" exp "else" exp "endif")
-         ("for" exp "endfor")
+        ("switch" exp "case" exp "endswitch")
-         ("for" exp "end")
+        ("switch" exp "case" exp "otherwise" exp "endswitch")
-         ("parfor" exp "endparfor")
+        ("switch" exp "case" exp "case" exp "otherwise" exp "endswitch")
-         ("parfor" exp "end")
+        ("function" exp "endfunction")
-         ("do" exp "until" atom)
+        ("enumeration" exp "endenumeration")
-         ("while" exp "endwhile")
+        ("events" exp "endevents")
-         ("while" exp "end")
+        ("methods" exp "endmethods")
-         ("if" exp "endif")
+        ("properties" exp "endproperties")
-         ("if" exp "else" exp "endif")
+        ("classdef" exp "endclassdef")
-         ("if" exp "elseif" exp "else" exp "endif")
+        ))
-         ("if" exp "elseif" exp "elseif" exp "else" exp "endif")
-         ("if" exp "elseif" exp "elseif" exp "else" exp "end")
+     (bnf-table
-         ("switch" exp "case" exp "endswitch")
+      `((atom)
-         ("switch" exp "case" exp "otherwise" exp "endswitch")
+        ;; FIXME: We don't parse these declarations correctly since
-         ("switch" exp "case" exp "case" exp "otherwise" exp "endswitch")
+        ;; SMIE *really* likes to parse "a b = 2 c" as "(a b) = (2 c)".
-         ("switch" exp "case" exp "case" exp "otherwise" exp "end")
+        ;; IOW to do it right, we'd need to change octave-smie-*ward-token
-         ("function" exp "endfunction")
+        ;; so that the spaces between vars in var-decls are lexed as
-         ("function" exp "end")
+        ;; something like ",".
-         ("enumeration" exp "endenumeration")
+        ;; Doesn't seem worth the trouble/slowdown for now.
-         ("enumeration" exp "end")
+        ;; We could hack smie-rules so as to work around the bad parse,
-         ("events" exp "endevents")
+        ;; but even that doesn't seem worth the trouble.
-         ("events" exp "end")
+        (var-decls (atom "=" atom)) ;; (var-decls "," var-decls)
-         ("methods" exp "endmethods")
+        (single-exp (atom "=" atom))
-         ("methods" exp "end")
+        (exp (exp "\n" exp)
-         ("properties" exp "endproperties")
+             ;; We need to mention at least one of the operators in this part
-         ("properties" exp "end")
+             ;; of the grammar: if the BNF and the operator table have
-         ("classdef" exp "endclassdef")
+             ;; no overlap, SMIE can't know how they relate.
-         ("classdef" exp "end"))
+             (exp ";" exp)
-    ;; (fundesc (atom "=" atom))
+             ("do" exp "until" single-exp)
-    ))
+             ,@matchedrules
+           ;; For every rule that ends in "endfoo", add a corresponding
+           ;; rule which uses "end" instead.
+           ,@(mapcar (lambda (rule) (nconc (butlast rule) '("end")))
+                     matchedrules)
+           ("global" var-decls) ("persistent" var-decls)
+           ;; These aren't super-important, but having them here
+           ;; makes it easier to extract all keywords.
+           ("break") ("continue") ("return")
+           ;; The following rules do not correspond to valid code AFAIK,
+           ;; but they lead to a grammar that degrades more gracefully
+           ;; on incomplete/incorrect code.  It also helps us in
+           ;; computing octave--block-offset-keywords.
+           ("try" exp "end") ("unwind_protect" exp "end")
+           )
+      ;; (fundesc (atom "=" atom))
+      )))
 (defconst octave-smie-grammar
-  (smie-prec2->grammar
+  (eval-when-compile
-   (smie-merge-prec2s
+    (smie-prec2->grammar
-    (smie-bnf->prec2 octave-smie-bnf-table
+     (smie-merge-prec2s
-                     '((assoc "\n" ";")))
+      (smie-bnf->prec2 bnf-table '((assoc "\n" ";")))
+      (smie-precs->prec2 operator-table)))))
-    (smie-precs->prec2 octave-operator-table))))
+(defconst octave-operator-regexp
+  (eval-when-compile
+    (regexp-opt (remove "\n" (apply #'append
+                                    (mapcar #'cdr operator-table)))))))
 ;; Tokenizing needs to be refined so that ";;" is treated as two
 ;; tokens and also so as to recognize the \n separator (and
 ;; corresponding continuation lines).
-(defconst octave-operator-regexp
+(defun octave-smie--funcall-p ()
-  (regexp-opt (remove "\n" (apply 'append
+  "Return non-nil if we're in an expression context.  Moves point."
-                                  (mapcar 'cdr octave-operator-table)))))
+  (looking-at "[ \t]*("))
+(defun octave-smie--end-index-p ()
+  (let ((ppss (syntax-ppss)))
+    (and (nth 1 ppss)
+         (memq (char-after (nth 1 ppss)) '(?\( ?\[ ?\{)))))
+(defun octave-smie--in-parens-p ()
+  (let ((ppss (syntax-ppss)))
+    (and (nth 1 ppss)
+         (eq ?\( (char-after (nth 1 ppss))))))
 (defun octave-smie-backward-token ()
  (let ((pos (point)))
@@ -390,10 +393,7 @@ Non-nil means always go to the next Octave code line after sending."
                 (forward-comment (- (point)))
                 nil)
             t)
-           ;; Ignore it if it's within parentheses.
+           (not (octave-smie--in-parens-p)))
-           (let ((ppss (syntax-ppss)))
-             (not (and (nth 1 ppss)
-                       (eq ?\( (char-after (nth 1 ppss)))))))
      (skip-chars-forward " \t")
      ;; Why bother distinguishing \n and ;?
      ";") ;;"\n"
@@ -403,7 +403,15 @@ Non-nil means always go to the next Octave code line after sending."
      (goto-char (match-beginning 0))
      (match-string-no-properties 0))
     (t
-      (smie-default-backward-token)))))
+      (let ((tok (smie-default-backward-token)))
+        (cond
+         ((equal tok "enumeration")
+          (if (save-excursion (smie-default-forward-token)
+                              (octave-smie--funcall-p))
+              "enumeration (function)"
+            tok))
+         ((equal tok "end") (if (octave-smie--end-index-p) "end (index)" tok))
+         (t tok)))))))
 (defun octave-smie-forward-token ()
  (skip-chars-forward " \t")
@@ -417,10 +425,7 @@ Non-nil means always go to the next Octave code line after sending."
         (not (or (save-excursion (skip-chars-backward " \t")
                                  ;; Only add implicit ; when needed.
                                  (or (bolp) (eq (char-before) ?\;)))
-                  ;; Ignore it if it's within parentheses.
+                  (octave-smie--in-parens-p))))
-                  (let ((ppss (syntax-ppss)))
-                    (and (nth 1 ppss)
-                         (eq ?\( (char-after (nth 1 ppss))))))))
    (if (eolp) (forward-char 1) (forward-comment 1))
    ;; Why bother distinguishing \n and ;?
    ";") ;;"\n"
@@ -436,7 +441,25 @@ Non-nil means always go to the next Octave code line after sending."
    (goto-char (match-end 0))
    (match-string-no-properties 0))
   (t
-    (smie-default-forward-token))))
+    (let ((tok (smie-default-forward-token)))
+      (cond
+       ((equal tok "enumeration")
+        (if (octave-smie--funcall-p)
+            "enumeration (function)"
+          tok))
+       ((equal tok "end") (if (octave-smie--end-index-p) "end (index)" tok))
+       (t tok))))))
+(defconst octave--block-offset-keywords
+  (let* ((end-prec (nth 1 (assoc "end" octave-smie-grammar)))
+         (end-matchers
+          (delq nil
+                (mapcar (lambda (x) (if (eq end-prec (nth 2 x)) (car x)))
+                        octave-smie-grammar))))
+    ;; Not sure if it would harm to keep "switch", but the previous code
+    ;; excluded it, presumably because there shouldn't be any code on
+    ;; the lines between "switch" and "case".
+    (delete "switch" end-matchers)))
 (defun octave-smie-rules (kind token)
  (pcase (cons kind token)
@@ -445,15 +468,12 @@ Non-nil means always go to the next Octave code line after sending."
    ;; - changes to octave-block-offset wouldn't take effect immediately.
    ;; - edebug wouldn't show the use of this variable.
    (`(:elem . basic) octave-block-offset)
+    (`(:list-intro . ,(or "global" "persistent")) t)
    ;; Since "case" is in the same BNF rules as switch..end, SMIE by default
    ;; aligns it with "switch".
    (`(:before . "case") (if (not (smie-rule-sibling-p)) octave-block-offset))
    (`(:after . ";")
-     (if (smie-rule-parent-p "classdef" "events" "enumeration" "function" "if"
+     (if (apply #'smie-rule-parent-p octave--block-offset-keywords)
-                             "while" "else" "elseif" "for" "parfor"
-                             "properties" "methods" "otherwise" "case"
-                             "try" "catch" "unwind_protect"
-                             "unwind_protect_cleanup")
         (smie-rule-parent octave-block-offset)
       ;; For (invalid) code between switch and case.
       ;; (if (smie-rule-parent-p "switch") 4)
@@ -473,28 +493,33 @@ Non-nil means always go to the next Octave code line after sending."
      (comment-choose-indent)))))
+(defvar octave-reserved-words
+  (delq nil
+        (mapcar (lambda (x)
+                  (setq x (car x))
+                  (and (stringp x) (string-match "\\`[[:alpha:]]" x) x))
+                octave-smie-grammar))
+  "Reserved words in Octave.")
 (defvar octave-font-lock-keywords
  (list
   ;; Fontify all builtin keywords.
-   (cons (concat "\\_<\\("
+   (cons (concat "\\_<" (regexp-opt octave-reserved-words) "\\_>")
-                 (regexp-opt octave-reserved-words)
-                 "\\)\\_>")
         'font-lock-keyword-face)
-   ;; Note: 'end' also serves as the last index in an indexing expression.
+   ;; Note: 'end' also serves as the last index in an indexing expression,
+   ;; and 'enumerate' is also a function.
   ;; Ref: http://www.mathworks.com/help/matlab/ref/end.html
+   ;; Ref: http://www.mathworks.com/help/matlab/ref/enumeration.html
   (list (lambda (limit)
-           (while (re-search-forward "\\_<end\\_>" limit 'move)
+           (while (re-search-forward "\\_<en\\(?:d\\|umeratio\\(n\\)\\)\\_>"
+                                     limit 'move)
             (let ((beg (match-beginning 0))
                   (end (match-end 0)))
               (unless (octave-in-string-or-comment-p)
-                 (condition-case nil
+                 (when (if (match-end 1)
-                     (progn
+                           (octave-smie--funcall-p)
-                       (goto-char beg)
+                         (octave-smie--end-index-p))
-                       (backward-up-list)
+                   (put-text-property beg end 'face nil)))))
-                       (when (memq (char-after) '(?\( ?\[ ?\{))
-                         (put-text-property beg end 'face nil))
-                       (goto-char end))
-                   (error (goto-char end))))))
           nil))
   ;; Fontify all operators.
   (cons octave-operator-regexp 'font-lock-builtin-face)
@@ -609,27 +634,23 @@ Key bindings:
 (defcustom inferior-octave-program "octave"
  "Program invoked by `inferior-octave'."
-  :type 'string
+  :type 'string)
-  :group 'octave)
 (defcustom inferior-octave-buffer "*Inferior Octave*"
  "Name of buffer for running an inferior Octave process."
-  :type 'string
+  :type 'string)
-  :group 'octave)
 (defcustom inferior-octave-prompt
  ;; For Octave >= 3.8, default is always 'octave', see
  ;; http://hg.savannah.gnu.org/hgweb/octave/rev/708173343c50
  "\\(?:^octave\\(?:.bin\\|.exe\\)?\\(?:-[.0-9]+\\)?\\(?::[0-9]+\\)?\\|^debug\\|^\\)>+ "
  "Regexp to match prompts for the inferior Octave process."
-  :type 'regexp
+  :type 'regexp)
-  :group 'octave)
 (defcustom inferior-octave-prompt-read-only comint-prompt-read-only
  "If non-nil, the Octave prompt is read only.
 See `comint-prompt-read-only' for details."
  :type 'boolean
-  :group 'octave
  :version "24.4")
 (defcustom inferior-octave-startup-file
@@ -639,7 +660,6 @@ See `comint-prompt-read-only' for details."
 The contents of this file are sent to the inferior Octave process on
 startup."
  :type '(choice (const :tag "None" nil) file)
-  :group 'octave
  :version "24.4")
 (defcustom inferior-octave-startup-args '("-i" "--no-line-editing")
@@ -647,13 +667,11 @@ startup."
 For example, for suppressing the startup message and using `traditional'
 mode, include \"-q\" and \"--traditional\"."
  :type '(repeat string)
-  :group 'octave
  :version "24.4")
 (defcustom inferior-octave-mode-hook nil
  "Hook to be run when Inferior Octave mode is started."
-  :type 'hook
+  :type 'hook)
-  :group 'octave)
 (defcustom inferior-octave-error-regexp-alist
  '(("error:\\s-*\\(.*?\\) at line \\([0-9]+\\), column \\([0-9]+\\)"
@@ -663,8 +681,7 @@ mode, include \"-q\" and \"--traditional\"."
  "Value for `compilation-error-regexp-alist' in inferior octave."
  :version "24.4"
  :type '(repeat (choice (symbol :tag "Predefined symbol")
-                         (sexp :tag "Error specification")))
+                         (sexp :tag "Error specification"))))
-  :group 'octave)
 (defvar inferior-octave-compilation-font-lock-keywords
  '(("\\_<PASS\\_>" . compilation-info-face)
@@ -995,7 +1012,6 @@ directory and makes this the current buffer's default directory."
 (defcustom inferior-octave-minimal-columns 80
  "The minimal column width for the inferior Octave process."
  :type 'integer
-  :group 'octave
  :version "24.4")
 (defvar inferior-octave-last-column-width nil)
@@ -1180,8 +1196,7 @@ q: Don't fix\n" func file))
 (defface octave-function-comment-block
  '((t (:inherit font-lock-doc-face)))
-  "Face used to highlight function comment block."
+  "Face used to highlight function comment block.")
-  :group 'octave)
 (eval-when-compile (require 'texinfo))
@@ -1602,7 +1617,6 @@ code line."
  :type '(choice (const :tag "Automatic" auto)
                 (const :tag "One Line" oneline)
                 (const :tag "Multi Line" multiline))
-  :group 'octave
  :version "24.4")
 ;; (FN SIGNATURE1 SIGNATURE2 ...)
@@ -1661,7 +1675,6 @@ code line."
 (defcustom octave-help-buffer "*Octave Help*"
  "Buffer name for `octave-help'."
  :type 'string
-  :group 'octave
  :version "24.4")
 ;; Used in a mode derived from help-mode.
@@ -1786,7 +1799,6 @@ sentence."
  "A list of directories for Octave sources.
 If the environment variable OCTAVE_SRCDIR is set, it is searched first."
  :type '(repeat directory)
-  :group 'octave
  :version "24.4")
 (defun octave-source-directories ()
diff --git a/lisp/progmodes/prog-mode.el b/lisp/progmodes/prog-mode.el
index f1aa35f2871..6696356a2dc 100644
--- a/lisp/progmodes/prog-mode.el
+++ b/lisp/progmodes/prog-mode.el
@@ -29,7 +29,8 @@
 ;;; Code:
-(eval-when-compile (require 'cl-lib))
+(eval-when-compile (require 'cl-lib)
+                   (require 'subr-x))
 (defgroup prog-mode nil
  "Generic programming mode, from which others derive."
@@ -161,13 +162,20 @@ Regexp match data 0 points to the chars."
  (let ((start (match-beginning 0))
        (end (match-end 0))
        (match (match-string 0)))
-    (if (funcall prettify-symbols-compose-predicate start end match)
+    (if (and (not (equal prettify-symbols--current-symbol-bounds (list start end)))
+             (funcall prettify-symbols-compose-predicate start end match))
        ;; That's a symbol alright, so add the composition.
-        (compose-region start end (cdr (assoc match alist)))
+        (with-silent-modifications
+          (compose-region start end (cdr (assoc match alist)))
+          (add-text-properties
+           start end
+           `(prettify-symbols-start ,start prettify-symbols-end ,end)))
      ;; No composition for you.  Let's actually remove any
      ;; composition we may have added earlier and which is now
      ;; incorrect.
-      (remove-text-properties start end '(composition))))
+      (remove-text-properties start end '(composition
+                                          prettify-symbols-start
+                                          prettify-symbols-end))))
  ;; Return nil because we're not adding any face property.
  nil)
@@ -179,6 +187,46 @@ Regexp match data 0 points to the chars."
 (defvar-local prettify-symbols--keywords nil)
+(defvar-local prettify-symbols--current-symbol-bounds nil)
+(defcustom prettify-symbols-unprettify-at-point nil
+  "If non-nil, show the non-prettified version of a symbol when point is on it.
+If set to the symbol `right-edge', also unprettify if point
+is immediately after the symbol.  The prettification will be
+reapplied as soon as point moves away from the symbol.  If
+set to nil, the prettification persists even when point is
+on the symbol."
+  :type '(choice (const :tag "Never unprettify" nil)
+                 (const :tag "Unprettify when point is inside" t)
+                 (const :tag "Unprettify when point is inside or at right edge" right-edge))
+  :group 'prog-mode)
+(defun prettify-symbols--post-command-hook ()
+  (cl-labels ((get-prop-as-list
+               (prop)
+               (remove nil
+                       (list (get-text-property (point) prop)
+                             (when (and (eq prettify-symbols-unprettify-at-point 'right-edge)
+                                        (not (bobp)))
+                               (get-text-property (1- (point)) prop))))))
+    ;; Re-apply prettification to the previous symbol.
+    (when (and prettify-symbols--current-symbol-bounds
+               (or (< (point) (car prettify-symbols--current-symbol-bounds))
+                   (> (point) (cadr prettify-symbols--current-symbol-bounds))
+                   (and (not (eq prettify-symbols-unprettify-at-point 'right-edge))
+                        (= (point) (cadr prettify-symbols--current-symbol-bounds)))))
+      (apply #'font-lock-flush prettify-symbols--current-symbol-bounds)
+      (setq prettify-symbols--current-symbol-bounds nil))
+    ;; Unprettify the current symbol.
+    (when-let ((c (get-prop-as-list 'composition))
+               (s (get-prop-as-list 'prettify-symbols-start))
+               (e (get-prop-as-list 'prettify-symbols-end))
+               (s (apply #'min s))
+               (e (apply #'max e)))
+      (with-silent-modifications
+        (setq prettify-symbols--current-symbol-bounds (list s e))
+        (remove-text-properties s e '(composition))))))
 ;;;###autoload
 (define-minor-mode prettify-symbols-mode
  "Toggle Prettify Symbols mode.
@@ -205,9 +253,16 @@ support it."
      (when (setq prettify-symbols--keywords (prettify-symbols--make-keywords))
        (font-lock-add-keywords nil prettify-symbols--keywords)
        (setq-local font-lock-extra-managed-props
-                    (cons 'composition font-lock-extra-managed-props))
+                    (append font-lock-extra-managed-props
+                            '(composition
+                              prettify-symbols-start
+                              prettify-symbols-end)))
+        (when prettify-symbols-unprettify-at-point
+          (add-hook 'post-command-hook
+                    #'prettify-symbols--post-command-hook nil t))
        (font-lock-flush))
    ;; Turn off
+    (remove-hook 'post-command-hook #'prettify-symbols--post-command-hook t)
    (when prettify-symbols--keywords
      (font-lock-remove-keywords nil prettify-symbols--keywords)
      (setq prettify-symbols--keywords nil))
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index 3d9b0c322ab..81aeb8d0f81 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -840,6 +840,8 @@ This is really kludgy, and unneeded (i.e. obsolete) in Emacs>=24."
 (require 'smie)
+(defconst prolog-operator-chars "-\\\\#&*+./:<=>?@\\^`~")
 (defun prolog-smie-forward-token ()
  ;; FIXME: Add support for 0'<char>, if needed after adding it to
  ;; syntax-propertize-functions.
@@ -848,7 +850,7 @@ This is really kludgy, and unneeded (i.e. obsolete) in Emacs>=24."
   (point)
   (progn (cond
           ((looking-at "[!;]") (forward-char 1))
-           ((not (zerop (skip-chars-forward "#&*+-./:<=>?@\\^`~"))))
+           ((not (zerop (skip-chars-forward prolog-operator-chars))))
           ((not (zerop (skip-syntax-forward "w_'"))))
           ;; In case of non-ASCII punctuation.
           ((not (zerop (skip-syntax-forward ".")))))
@@ -861,8 +863,8 @@ This is really kludgy, and unneeded (i.e. obsolete) in Emacs>=24."
  (buffer-substring-no-properties
   (point)
   (progn (cond
-           ((memq (char-before) '(?! ?\;)) (forward-char -1))
+           ((memq (char-before) '(?! ?\; ?\,)) (forward-char -1))
-           ((not (zerop (skip-chars-backward "#&*+-./:<=>?@\\^`~"))))
+           ((not (zerop (skip-chars-backward prolog-operator-chars))))
           ((not (zerop (skip-syntax-backward "w_'"))))
           ;; In case of non-ASCII punctuation.
           ((not (zerop (skip-syntax-backward ".")))))
@@ -875,12 +877,21 @@ This is really kludgy, and unneeded (i.e. obsolete) in Emacs>=24."
  ;; manual uses precedence levels in the opposite sense (higher
  ;; numbers bind less tightly) than SMIE, so we use negative numbers.
  '(("." -10000 -10000)
+    ("?-" nil -1200)
    (":-" -1200 -1200)
    ("-->" -1200 -1200)
+    ("discontiguous" nil -1150)
+    ("dynamic" nil -1150)
+    ("meta_predicate" nil -1150)
+    ("module_transparent" nil -1150)
+    ("multifile" nil -1150)
+    ("public" nil -1150)
+    ("|" -1105 -1105)
    (";" -1100 -1100)
+    ("*->" -1050 -1050)
    ("->" -1050 -1050)
    ("," -1000 -1000)
-    ("\\+" -900 -900)
+    ("\\+" nil -900)
    ("=" -700 -700)
    ("\\=" -700 -700)
    ("=.." -700 -700)
@@ -947,12 +958,36 @@ This is really kludgy, and unneeded (i.e. obsolete) in Emacs>=24."
     ;;     ;    c)
     ;;
     ;; based on the space between the open paren and the "a".
-     (unless (and (smie-rule-parent-p "(")
+     (unless (and (smie-rule-parent-p "(" ";")
                  (save-excursion
                    (smie-indent-forward-token)
                    (smie-backward-sexp 'halfsexp)
-                    (not (eq ?\( (char-before)))))
+                    (if (smie-rule-parent-p "(")
+                        (not (eq (char-before) ?\())
+                      (smie-indent-backward-token)
+                      (smie-rule-bolp))))
       prolog-indent-width))
+    (`(:after . ";")
+     ;; Align with same-line comment as in:
+     ;;   ;   %% Toto
+     ;;       foo
+     (and (smie-rule-bolp)
+          (looking-at ";[ \t]*\\(%\\)")
+          (let ((offset (- (save-excursion (goto-char (match-beginning 1))
+                                           (current-column))
+                           (current-column))))
+            ;; Only do it for small offsets, since the comment may actually be
+            ;; an "end-of-line" comment at comment-column!
+            (if (<= offset prolog-indent-width) offset))))
+    (`(:after . ",")
+     ;; Special indent for:
+     ;;    foopredicate(x) :- !,
+     ;;        toto.
+     (and (eq (char-before) ?!)
+          (save-excursion
+            (smie-indent-backward-token) ;Skip !
+            (equal ":-" (car (smie-indent-backward-token))))
+          (smie-rule-parent prolog-indent-width)))
    (`(:after . ,(or `":-" `"-->")) prolog-indent-width)))
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index b641e300163..6ff12b54976 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -5123,7 +5123,6 @@ returned as is."
 (provide 'python)
 ;; Local Variables:
-;; coding: utf-8
 ;; indent-tabs-mode: nil
 ;; End:
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 049c93dfae2..fbb4a90db40 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1991,9 +1991,30 @@ Does not preserve point."
         (t tok)))))))
 (defcustom sh-indent-after-continuation t
-  "If non-nil, try to make sure text is indented after a line continuation."
+  "If non-nil, indent relative to the continued line's beginning.
-  :version "24.3"
+Continued lines can either be indented as \"one long wrapped line\" without
-  :type 'boolean
+paying attention to the actual syntactic structure, as in:
+   for f \
+       in a; do \
+       toto; \
+       done
+or as lines that just don't have implicit semi-colons between them, as in:
+   for f \
+   in a; do \
+       toto; \
+   done
+With `always' you get the former behavior whereas with nil you get the latter.
+With t, you get the latter as long as that would indent the continuation line
+deeper than the initial line."
+  :version "25.1"
+  :type '(choice
+          (const nil :tag "Never")
+          (const t   :tag "Only if needed to make it deeper")
+          (const always :tag "Always"))
  :group 'sh-indentation)
 (defun sh-smie--continuation-start-indent ()
@@ -2004,24 +2025,49 @@ May return nil if the line should not be treated as continued."
    (unless (sh-smie--looking-back-at-continuation-p)
      (current-indentation))))
+(defun sh-smie--indent-continuation ()
+  (cond
+   ((not (and sh-indent-after-continuation
+              (save-excursion
+                (ignore-errors
+                  (skip-chars-backward " \t")
+                  (sh-smie--looking-back-at-continuation-p)))))
+    nil)
+   ((eq sh-indent-after-continuation 'always)
+    (save-excursion
+      (forward-line -1)
+      (if (sh-smie--looking-back-at-continuation-p)
+          (current-indentation)
+        (+ (current-indentation) sh-indentation))))
+   (t
+    ;; Just make sure a line-continuation is indented deeper.
+    (save-excursion
+      (let ((indent (let ((sh-indent-after-continuation nil))
+                      (smie-indent-calculate)))
+            (max most-positive-fixnum))
+        (if (not (numberp indent)) indent
+          (while (progn
+                   (forward-line -1)
+                   (let ((ci (current-indentation)))
+                     (cond
+                      ;; Previous line is less indented, we're good.
+                      ((< ci indent) nil)
+                      ((sh-smie--looking-back-at-continuation-p)
+                       (setq max (min max ci))
+                       ;; Previous line is itself a continuation.
+                       ;; If it's indented like us, we're good, otherwise
+                       ;; check the line before that one.
+                       (> ci indent))
+                      (t ;Previous line is the beginning of the continued line.
+                       (setq indent (min (+ ci sh-indentation) max))
+                       nil)))))
+          indent))))))
 (defun sh-smie-sh-rules (kind token)
  (pcase (cons kind token)
    (`(:elem . basic) sh-indentation)
    (`(:after . "case-)") (- (sh-var-value 'sh-indent-for-case-alt)
                             (sh-var-value 'sh-indent-for-case-label)))
-    ((and `(:before . ,_)
-          ;; After a line-continuation, make sure the rest is indented.
-          (guard sh-indent-after-continuation)
-          (guard (save-excursion
-                   (ignore-errors
-                     (skip-chars-backward " \t")
-                     (sh-smie--looking-back-at-continuation-p))))
-          (let initial (sh-smie--continuation-start-indent))
-          (guard (let* ((sh-indent-after-continuation nil)
-                        (indent (smie-indent-calculate)))
-                   (and (numberp indent) (numberp initial)
-                        (<= indent initial)))))
-     `(column . ,(+ initial sh-indentation)))
    (`(:before . ,(or `"(" `"{" `"[" "while" "if" "for" "case"))
     (if (not (smie-rule-prev-p "&&" "||" "|"))
         (when (smie-rule-hanging-p)
@@ -2363,6 +2409,7 @@ Calls the value of `sh-set-shell-hook' if set."
                          (if (looking-at "[ \t]*\\\\\n")
                              (goto-char (match-end 0))
                            (funcall orig))))
+          (add-hook 'smie-indent-functions #'sh-smie--indent-continuation nil t)
          (smie-setup (symbol-value (funcall mksym "grammar"))
                      (funcall mksym "rules")
                      :forward-token  (funcall mksym "forward-token")
diff --git a/lisp/replace.el b/lisp/replace.el
index d84f3a24f61..3a908ac4d8d 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1,4 +1,4 @@
-;;; replace.el --- replace commands for Emacs            -*- coding: utf-8 -*-
+;;; replace.el --- replace commands for Emacs
 ;; Copyright (C) 1985-1987, 1992, 1994, 1996-1997, 2000-2015 Free
 ;; Software Foundation, Inc.
diff --git a/lisp/ruler-mode.el b/lisp/ruler-mode.el
index 4f68909ed4c..f1b5da497c9 100644
--- a/lisp/ruler-mode.el
+++ b/lisp/ruler-mode.el
@@ -775,8 +775,4 @@ Optional argument PROPS specifies other text properties to apply."
 (provide 'ruler-mode)
-;; Local Variables:
-;; coding: utf-8
-;; End:
 ;;; ruler-mode.el ends here
diff --git a/lisp/skeleton.el b/lisp/skeleton.el
index 69bd500fa95..67d9faca3e4 100644
--- a/lisp/skeleton.el
+++ b/lisp/skeleton.el
@@ -1,4 +1,4 @@
-;;; skeleton.el --- Lisp language extension for writing statement skeletons -*- coding: utf-8 -*-
+;;; skeleton.el --- Lisp language extension for writing statement skeletons
 ;; Copyright (C) 1993-1996, 2001-2015 Free Software Foundation, Inc.
diff --git a/lisp/subr.el b/lisp/subr.el
index b1b363864f9..e1769074ee5 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1,4 +1,4 @@
-;;; subr.el --- basic lisp subroutines for Emacs  -*- coding: utf-8; lexical-binding:t -*-
+;;; subr.el --- basic lisp subroutines for Emacs  -*- lexical-binding:t -*-
 ;; Copyright (C) 1985-1986, 1992, 1994-1995, 1999-2015 Free Software
 ;; Foundation, Inc.
diff --git a/lisp/tempo.el b/lisp/tempo.el
index 6e2f978b5b7..93df15a8934 100644
--- a/lisp/tempo.el
+++ b/lisp/tempo.el
@@ -759,7 +759,3 @@ space bar, and looks something like this:
 (provide 'tempo)
 ;;; tempo.el ends here
-;; Local Variables:
-;; coding: utf-8
-;; End:
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index ebd76a679a3..5eb6f115f8b 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1,4 +1,4 @@
-;;; x-win.el --- parse relevant switches and set up for X  -*-coding: utf-8; lexical-binding:t -*-
+;;; x-win.el --- parse relevant switches and set up for X  -*- lexical-binding:t -*-
 ;; Copyright (C) 1993-1994, 2001-2015 Free Software Foundation, Inc.
diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el
index 770571a264e..7d81bbca7d5 100644
--- a/lisp/textmodes/conf-mode.el
+++ b/lisp/textmodes/conf-mode.el
@@ -1,4 +1,4 @@
-;;; conf-mode.el --- Simple major mode for editing conf/ini/properties files -*- coding: utf-8 -*-
+;;; conf-mode.el --- Simple major mode for editing conf/ini/properties files
 ;; Copyright (C) 2004-2015 Free Software Foundation, Inc.
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 5f2fbcda04c..a97facf5427 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -1,4 +1,4 @@
-;;; fill.el --- fill commands for Emacs         -*- coding: utf-8 -*-
+;;; fill.el --- fill commands for Emacs
 ;; Copyright (C) 1985-1986, 1992, 1994-1997, 1999, 2001-2015 Free
 ;; Software Foundation, Inc.
diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el
index 8bcc71ed531..58c65678802 100644
--- a/lisp/textmodes/paragraphs.el
+++ b/lisp/textmodes/paragraphs.el
@@ -536,8 +536,4 @@ the current sentence with the one containing the mark."
  (interactive "*p")
  (transpose-subr 'forward-sentence arg))
-;; Local Variables:
-;; coding: utf-8
-;; End:
 ;;; paragraphs.el ends here
diff --git a/lisp/textmodes/po.el b/lisp/textmodes/po.el
index 99ec2916067..a5f39461498 100644
--- a/lisp/textmodes/po.el
+++ b/lisp/textmodes/po.el
@@ -1,4 +1,4 @@
-;;; po.el --- basic support of PO translation files -*- coding: utf-8; -*-
+;;; po.el --- basic support of PO translation files
 ;; Copyright (C) 1995-1998, 2000-2015 Free Software Foundation, Inc.
diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el
index 357a0938e6a..97c8af365e8 100644
--- a/lisp/textmodes/reftex-vars.el
+++ b/lisp/textmodes/reftex-vars.el
@@ -85,8 +85,9 @@
    (supertab    "Supertabular environment"
     (("supertabular" ?t nil nil "\\tablecaption{")))
-    (wrapfig     "The wrapfigure environment"
+    (wrapfig     "The wrapfig package"
-     (("wrapfigure" ?f nil nil caption)))
+     (("wrapfigure" ?f nil nil caption)
+      ("wraptable"  ?t nil nil caption)))
    (ctable     "The ctable package"
     (("\\ctable[]{}{}{}" ?t "tab:" "~\\ref{%s}" 1 ("table" "Tabelle"))))
@@ -653,7 +654,7 @@ Possible keys are sectioning macro names like `chapter', section levels
                (string :tag "Prefix"))))
 (defcustom reftex-default-context-regexps
-  '((caption       . "\\\\\\(rot\\)?caption\\*?[[{]")
+  '((caption       . "\\\\\\(rot\\|bi\\)?\\(sub\\)?caption\\(box\\)?\\*?[[{]")
    (item          . "\\\\item\\(\\[[^]]*\\]\\)?")
    (eqnarray-like . "\\\\begin{%s}\\|\\\\\\\\")
    (alignat-like  . "\\\\begin{%s}{[0-9]*}\\|\\\\\\\\"))
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index 4c234c9a31f..7b2aabd7ea5 100644
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -218,7 +218,7 @@ and before TAIL-RE and DELIM-RE in VAR or DEFAULT for no match."
 ;; Use CVSHeader to really get information from CVS and not other version
 ;; control systems.
 (defconst rst-cvs-header
-  "$CVSHeader: sm/rst_el/rst.el,v 1.327.2.6 2012-10-07 13:05:50 stefan Exp $")
+  "$CVSHeader: sm/rst_el/rst.el,v 1.327.2.26 2015/10/04 09:26:04 stefan Exp $")
 (defconst rst-cvs-rev
  (rst-extract-version "\\$" "CVSHeader: \\S + " "[0-9]+\\(?:\\.[0-9]+\\)+"
                       " .*" rst-cvs-header "0.0")
@@ -232,22 +232,22 @@ and before TAIL-RE and DELIM-RE in VAR or DEFAULT for no match."
 ;; Use LastChanged... to really get information from SVN.
 (defconst rst-svn-rev
  (rst-extract-version "\\$" "LastChangedRevision: " "[0-9]+" " "
-                       "$LastChangedRevision: 7515 $")
+                       "$LastChangedRevision: 7925 $")
  "The SVN revision of this file.
 SVN revision is the upstream (docutils) revision.")
 (defconst rst-svn-timestamp
  (rst-extract-version "\\$" "LastChangedDate: " ".+?+" " "
-                       "$LastChangedDate: 2012-09-20 23:28:53 +0200 (Thu, 20 Sep 2012) $")
+                       "$LastChangedDate: 2015-10-04 11:21:35 +0200 (Sun, 04 Oct 2015) $")
  "The SVN time stamp of this file.")
 ;; Maintained by the release process.
 (defconst rst-official-version
  (rst-extract-version "%" "OfficialVersion: " "[0-9]+\\(?:\\.[0-9]+\\)+" " "
-                       "%OfficialVersion: 1.4.0 %")
+                       "%OfficialVersion: 1.4.1 %")
  "Official version of the package.")
 (defconst rst-official-cvs-rev
  (rst-extract-version "[%$]" "Revision: " "[0-9]+\\(?:\\.[0-9]+\\)+" " "
-                       "%Revision: 1.327 %")
+                       "%Revision: 1.327.2.25 %")
  "CVS revision of this file in the official version.")
 (defconst rst-version
@@ -267,6 +267,7 @@ in parentheses follows the development revision and the time stamp.")
    ("1.3.0" . "24.3")
    ("1.3.1" . "24.3")
    ("1.4.0" . "24.3")
+    ("1.4.1" . "24.5")
    ))
 (unless (assoc rst-official-version rst-package-emacs-version-alist)
@@ -4235,8 +4236,4 @@ column is used (fill-column vs. end of previous/next line)."
 (provide 'rst)
-;; Local Variables:
-;; coding: utf-8
-;; End:
 ;;; rst.el ends here
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index bf15b2628f9..cbeded2c61b 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -1,4 +1,4 @@
-;;; tex-mode.el --- TeX, LaTeX, and SliTeX mode commands -*- coding: utf-8 -*-
+;;; tex-mode.el --- TeX, LaTeX, and SliTeX mode commands
 ;; Copyright (C) 1985-1986, 1989, 1992, 1994-1999, 2001-2015 Free
 ;; Software Foundation, Inc.
diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el
index 57218177d7b..2b606ed002e 100644
--- a/lisp/textmodes/texinfo.el
+++ b/lisp/textmodes/texinfo.el
@@ -1,4 +1,4 @@
-;;; texinfo.el --- major mode for editing Texinfo files -*- coding: utf-8 -*-
+;;; texinfo.el --- major mode for editing Texinfo files
 ;; Copyright (C) 1985, 1988-1993, 1996-1997, 2000-2015 Free Software
 ;; Foundation, Inc.
diff --git a/lisp/textmodes/tildify.el b/lisp/textmodes/tildify.el
index 0e645fcdd38..f1a42f2b688 100644
--- a/lisp/textmodes/tildify.el
+++ b/lisp/textmodes/tildify.el
@@ -508,9 +508,4 @@ variable will be set to the representation."
 (provide 'tildify)
-;; Local variables:
-;; coding: utf-8
-;; End:
 ;;; tildify.el ends here
diff --git a/lisp/time.el b/lisp/time.el
index d35f5b93964..dec594061a4 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -1,4 +1,4 @@
-;;; time.el --- display time, load and mail indicator in mode line of Emacs -*-coding: utf-8 -*-
+;;; time.el --- display time, load and mail indicator in mode line of Emacs
 ;; Copyright (C) 1985-1987, 1993-1994, 1996, 2000-2015 Free Software
 ;; Foundation, Inc.
diff --git a/lisp/vc/cvs-status.el b/lisp/vc/cvs-status.el
index dc43094796e..cf1f49cbeee 100644
--- a/lisp/vc/cvs-status.el
+++ b/lisp/vc/cvs-status.el
@@ -1,4 +1,4 @@
-;;; cvs-status.el --- major mode for browsing `cvs status' output -*- coding: utf-8; lexical-binding: t -*-
+;;; cvs-status.el --- major mode for browsing `cvs status' output -*- lexical-binding: t -*-
 ;; Copyright (C) 1999-2015 Free Software Foundation, Inc.
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index e664f9fdac3..7ef425449c1 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -3348,6 +3348,7 @@ Without an argument, it saves customized diff argument, if available
    (setq wind (ediff-get-visible-buffer-window cloned-buff))
    (select-window wind)
    (delete-other-windows)
+    (or (mark) (push-mark))
    (ediff-activate-mark)
    (split-window-vertically)
    (ediff-select-lowest-window)
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 2f0439365e8..b5570323e03 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -974,6 +974,34 @@ or BRANCH^ (where \"^\" can be repeated)."
      (buffer-string))))
 (defun vc-git-region-history (file buffer lfrom lto)
+  ;; The "git log" command below interprets the line numbers as applying
+  ;; to the HEAD version of the file, not to the current state of the file.
+  ;; So we need to look at all the local changes and adjust lfrom/lto
+  ;; accordingly.
+  ;; FIXME: Maybe this should be done in vc.el (i.e. for all backends), but
+  ;; since Git is the only backend to support this operation so far, it's hard
+  ;; to tell.
+  (with-temp-buffer
+    (vc-call-backend 'git 'diff file "HEAD" nil (current-buffer))
+    (goto-char (point-min))
+    (let ((last-offset 0)
+          (from-offset nil)
+          (to-offset nil))
+      (while (re-search-forward
+              "^@@ -\\([0-9]+\\),\\([0-9]+\\) \\+\\([0-9]+\\),\\([0-9]+\\) @@" nil t)
+        (let ((headno (string-to-number (match-string 1)))
+              (headcnt (string-to-number (match-string 2)))
+              (curno (string-to-number (match-string 3)))
+              (curcnt (string-to-number (match-string 4))))
+          (cl-assert (equal (- curno headno) last-offset))
+          (and (null from-offset) (> curno lfrom)
+               (setq from-offset last-offset))
+          (and (null to-offset) (> curno lto)
+               (setq to-offset last-offset))
+          (setq last-offset
+                (- (+ curno curcnt) (+ headno headcnt)))))
+      (setq lto (- lto (or to-offset last-offset)))
+      (setq lfrom (- lfrom (or to-offset last-offset)))))
  (vc-git-command buffer 'async nil "log" "-p" ;"--follow" ;FIXME: not supported?
                  (format "-L%d,%d:%s" lfrom lto (file-relative-name file))))
diff --git a/lisp/wdired.el b/lisp/wdired.el
index a9e1e2acc2a..8ee9a83d1d2 100644
--- a/lisp/wdired.el
+++ b/lisp/wdired.el
@@ -849,7 +849,6 @@ Like original function but it skips read-only words."
 (provide 'wdired)
 ;; Local Variables:
-;; coding: utf-8
 ;; byte-compile-dynamic: t
 ;; End:
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index 839ca8c3ac5..d45a1dcc47f 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -2581,8 +2581,5 @@ It should be added buffer-locally to `write-file-functions'."
 (run-hooks 'whitespace-load-hook)
-;; Local Variables:
-;; coding: utf-8
-;; End:
 ;;; whitespace.el ends here
diff --git a/lisp/winner.el b/lisp/winner.el
index a05f4ba867e..3767b9f1f69 100644
--- a/lisp/winner.el
+++ b/lisp/winner.el
@@ -180,7 +180,8 @@ You may want to include buffer names such as *Help*, *Apropos*,
  ;; Cull dead frames.
  (setq winner-modified-list
-        (cl-remove-if-not 'frame-live-p winner-modified-list))
+        (cl-loop for frame in winner-modified-list
+             if (frame-live-p frame) collect frame))
  (unless (or (memq (selected-frame) winner-modified-list)
              (/= 0 (minibuffer-depth)))
diff --git a/lisp/woman.el b/lisp/woman.el
index 8fe1bfa0446..81319fa6a9f 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -4627,9 +4627,4 @@ logging the message."
 (provide 'woman)
-;; Local Variables:
-;; coding: utf-8
-;; End:
 ;;; woman.el ends here
diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index b99db489a99..8ec5dfc65c0 100644
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -1,4 +1,4 @@
-;;; x-dnd.el --- drag and drop support for X  -*- coding: utf-8 -*-
+;;; x-dnd.el --- drag and drop support for X
 ;; Copyright (C) 2004-2015 Free Software Foundation, Inc.
diff --git a/nt/INSTALL b/nt/INSTALL
index da150407b39..3bcb496cd52 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -75,6 +75,48 @@ build will run on Windows 9X and newer systems).
  If these short instructions somehow fail, read the rest of this
  file.
+* Installing Git for Windows
+  Skip this section if you already have Git installed and configured,
+  or if you are building from the release tarball, not from the
+  development repository.
+  Git for Windows is available from this download page:
+    https://github.com/git-for-windows/git/releases
+  That page offers both 32-bit and 64-bit installations; pick the one
+  suitable for your OS.  In general, we recommend to install a 64-bit
+  Git if you have a 64-bit Windows system; the 32-bit Git will run on
+  64-bit Windows just fine, but might run into memory problems where
+  the 64-bit Git won't.
+  During Git installation, be sure to select the "Checkout as-is,
+  commit as-is" option from the "Configure line ending conversions"
+  dialog.  Otherwise, Git will convert text files to DOS-style CRLF
+  end-of-line (EOL) format, which will cause subtle problems when
+  building Emacs, because MSYS tools (see below) used to build Emacs
+  use binary file I/O that preserves the CR characters that get in the
+  way of some text-processing tools, like 'makeinfo' and the commands
+  invoked by the autogen.sh script.
+  If you already have Git installed and configured with some other EOL
+  conversion option, you will need to reconfigure it, removing the
+  following variables from all of your .gitconfig files:
+    core.eol
+    core.safecrlf
+    core.autocrlf
+  If you cloned the Emacs directory before changing these config
+  variables, you will have to delete the repository and re-clone it
+  after the change.
+  The instructions for cloning the Emacs repository can be found on
+  the Emacs's Savannah project page:
+    https://savannah.gnu.org/projects/emacs
 * Installing MinGW and MSYS
  Make sure you carefully read the following two sections in their
@@ -143,7 +185,7 @@ build will run on Windows 9X and newer systems).
  optional libraries near the end of this document, before you start
  the build.  Also, consider installing additional MinGW packages that
  are required/recommended, especially if you are building from the
-  repository, as described in the next section.
+  development repository, as described in the next section.
 ** Installing MinGW and MSYS manually
@@ -187,7 +229,7 @@ build will run on Windows 9X and newer systems).
  been warned!
  Additional MinGW packages are required/recommended, especially if
-  you are building from the repository:
+  you are building from the development repository:
   . Texinfo (needed to produce the Info manuals when building from
     the repository, and for "make install")
@@ -197,7 +239,7 @@ build will run on Windows 9X and newer systems).
   . pkg-config (invoked by the configure script to look for optional
     packages)
-     Available from http://www.gtk.org/download/win32.php
+     Available from http://sourceforge.net/projects/ezwinports/files/.
   . gzip (needed to compress files during "make install")
@@ -339,7 +381,12 @@ build will run on Windows 9X and newer systems).
     Checking for automake (need at least version 1.11)...
     ok
     Your system has the required tools, running autoreconf...
-     You can now run `./configure'.
+     Installing git hooks...
+     You can now run './configure'.
+  If the script fails because it cannot find Git, you will need to
+  arrange for the MSYS Bash's PATH to include the Git's 'bin'
+  subdirectory, where there's the git.exe executable.
 * Configuring Emacs for MinGW:
@@ -419,7 +466,7 @@ build will run on Windows 9X and newer systems).
  successful, will eventually produce a summary of the configuration
  similar to this:
-     Configured for `i686-pc-mingw32'.
+     Configured for 'i686-pc-mingw32'.
       Where should the build process find the source code?    /path/to/emacs/sources
       What compiler should emacs be built with?               gcc  -std=gnu99 -O0 -g3
@@ -577,14 +624,13 @@ build will run on Windows 9X and newer systems).
  is in the PATH or otherwise accessible and that the binaries are
  compatible (for example, that they were built with the same compiler).
+  To support XPM images (required for color tool-bar icons), you will
+  need the libXpm library.  It is available from the ezwinports site,
+  http://sourceforge.net/projects/ezwinports/files/.
  For PNG images, we recommend to use versions 1.4.x and later of
  libpng, because previous versions had security issues.  You can find
-  precompiled libraries and headers on the GTK download page for
+  precompiled libraries and headers on the ezwinports site.
-  Windows (http://www.gtk.org/download/win32.php for 32-bit builds and
-  http://www.gtk.org/download/win64.php for 64-bit builds).  The
-  ezwinports site, http://sourceforge.net/projects/ezwinports/files/
-  also offers PNG (as well as other image libraries), which are
-  usually newer.
  Versions 1.4.0 and later of libpng are binary incompatible with
  earlier versions, so Emacs will only look for libpng libraries which
@@ -621,70 +667,32 @@ build will run on Windows 9X and newer systems).
  libtiffN.dll or libtiff-N.dll or libtiff.dll.  These can be found on
  the ezwinports site.
-  Pre-built versions of librsvg and its dependencies can be found in
+  Pre-built versions of librsvg and its dependencies can be found
-  one of these places:
+  here:
-  1. http://sourceforge.net/projects/ezwinports/files/
+    http://sourceforge.net/projects/ezwinports/files/
-     This site includes a minimal (as much as possible for librsvg)
+    This site includes a minimal (as much as possible for librsvg)
-     build of the library and its dependencies; it is also more
+    build of the library and its dependencies; it is also more
-     up-to-date with the latest upstream versions.  However, it
+    up-to-date with the latest upstream versions.  However, it
-     currently only offers 32-bit builds.  For building Emacs, you
+    currently only offers 32-bit builds.  For building Emacs, you need
-     need to download from this site all of the following *-bin.zip
+    to download from this site all of the following *-bin.zip
-     archives:
+    archives:
-       librsvg, gdk-pixbuf, cairo, glib
+      librsvg, gdk-pixbuf, cairo, glib
-     The 'bin' archives on this site include both header files and the
+    The 'bin' archives on this site include both header files and the
-     libraries needed for building with librsvg and for running Emacs.
+    libraries needed for building with librsvg and for running Emacs.
-     The librsvg archive includes all the shared libraries needed to
+    The librsvg archive includes all the shared libraries needed to
-     run Emacs with SVG support; the other 3 packages are required
+    run Emacs with SVG support; the other 3 packages are required
-     because the compiler needs to see their header files when
+    because the compiler needs to see their header files when building
-     building Emacs.
+    Emacs.
-  2. GTK project download site for Windows (see above for 2 URLs,
-     either for 32-bit builds or 64-bit builds)
-     This is the official Windows download site of the GTK project.
-     Its builds of librsvg are fatter, but are currently the only
-     alternative for 64-bit builds.  The easiest way to obtain the
-     dependencies required for building from this site is to download
-     a pre-bundled GTK+ development environment for Windows.  If you
-     would nevertheless like to download only the packages that are
-     strictly required, then, as of the time of this writing, here's
-     the list of GTK+ packages you will need:
-        librsvg, pango, freetype-2.4.11, freetype-2.4.2, croco, cairo,
-        glib, gdk-pixbuf, fontconfig, libpng-1.4.x, libpng-1.5.x,
-        libffi, libxml2, zlib
-     The GTK download page provides 2 separate archives for each
-     package: a 'bin' (binary) archive with programs and DLLs, and a
-     'dev' (development) archive with header files, import libraries,
-     and pkg-config files; download and install both archives for each
-     package you need.  (Sources of each package are available in a
-     separate, 3rd archive.)
-     As you see, some libraries for using this site's librsvg are
-     needed in more than one version -- this is because librsvg and
-     some of its dependencies were linked against different versions
-     of those libraries, and will look only for those DLLs when you
-     invoke SVG function.  So there's a bit of "DLL hell" involved
-     here, but at least in theory this should work, as each library
-     will dynamically link only against its dependencies, even if
-     another version of the same library is already loaded.  In
-     particular, at least 2 different versions of libpng will have to
-     be installed on your machine.  When you install these libpng
-     versions, be sure to keep the header files and the pkg-config
-     files in sync, i.e. install both the 'bin' and 'dev' archives of
-     the same libpng version together.
  To use librsvg at runtime, ensure that librsvg and its dependencies
  are on your PATH, or in the same directory as the emacs.exe binary.
  If you are downloading from the ezwinports site, you only need to
  install a single archive, librsvg-X.Y.Z-w32-bin.zip, which includes
-  all the dependency DLLs.  For the GTK project site, download the
+  all the dependency DLLs.
-  'bin' archives for each of the libraries mentioned above.
  If you think you've got all the dependencies and SVG support is
  still not working, check your PATH for other libraries that shadow
diff --git a/src/cmds.c b/src/cmds.c
index 7a575ae7348..ccc68911624 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -264,7 +264,7 @@ because it respects values of `delete-active-region' and `overwrite-mode'.  */)
  CHECK_NUMBER (n);
-  if (abs (XINT (n)) < 2)
+  if (eabs (XINT (n)) < 2)
    remove_excessive_undo_boundaries ();
  pos = PT + XINT (n);
diff --git a/src/coding.c b/src/coding.c
index 3fc6fb684c6..c5099a7b0b9 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -6004,6 +6004,8 @@ coding_inherit_eol_type (Lisp_Object coding_system, Lisp_Object parent)
  if (NILP (coding_system))
    coding_system = Qraw_text;
+  else
+    CHECK_CODING_SYSTEM (coding_system);
  spec = CODING_SYSTEM_SPEC (coding_system);
  eol_type = AREF (spec, 2);
  if (VECTORP (eol_type))
@@ -6014,6 +6016,7 @@ coding_inherit_eol_type (Lisp_Object coding_system, Lisp_Object parent)
        {
          Lisp_Object parent_spec;
+          CHECK_CODING_SYSTEM (parent);
          parent_spec = CODING_SYSTEM_SPEC (parent);
          parent_eol_type = AREF (parent_spec, 2);
          if (VECTORP (parent_eol_type))
diff --git a/src/dired.c b/src/dired.c
index 97736673f5d..3486e49b566 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -397,8 +397,10 @@ Returns nil if DIRECTORY contains no name starting with FILE.
 If PREDICATE is non-nil, call PREDICATE with each possible
 completion (in absolute form) and ignore it if PREDICATE returns nil.
-This function ignores some of the possible completions as
+This function ignores some of the possible completions as determined
-determined by the variable `completion-ignored-extensions', which see.  */)
+by the variables `completion-regexp-list' and
+`completion-ignored-extensions', which see.  `completion-regexp-list'
+is matched against file and directory names relative to DIRECTORY.  */)
  (Lisp_Object file, Lisp_Object directory, Lisp_Object predicate)
 {
  Lisp_Object handler;
@@ -422,7 +424,12 @@ determined by the variable `completion-ignored-extensions', which see.  */)
 DEFUN ("file-name-all-completions", Ffile_name_all_completions,
       Sfile_name_all_completions, 2, 2, 0,
       doc: /* Return a list of all completions of file name FILE in directory DIRECTORY.
-These are all file names in directory DIRECTORY which begin with FILE.  */)
+These are all file names in directory DIRECTORY which begin with FILE.
+This function ignores some of the possible completions as determined
+by the variables `completion-regexp-list' and
+`completion-ignored-extensions', which see.  `completion-regexp-list'
+is matched against file and directory names relative to DIRECTORY.  */)
  (Lisp_Object file, Lisp_Object directory)
 {
  Lisp_Object handler;
diff --git a/src/fileio.c b/src/fileio.c
index e4b255a53ac..3155ef0edf1 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3470,7 +3470,11 @@ by calling `format-decode', which see.  */)
      mtime = time_error_value (save_errno);
      st.st_size = -1;
      if (!NILP (Vcoding_system_for_read))
-        Fset (Qbuffer_file_coding_system, Vcoding_system_for_read);
+        {
+          /* Don't let invalid values into buffer-file-coding-system.  */
+          CHECK_CODING_SYSTEM (Vcoding_system_for_read);
+          Fset (Qbuffer_file_coding_system, Vcoding_system_for_read);
+        }
      goto notfound;
    }
@@ -4569,7 +4573,7 @@ choose_write_coding_system (Lisp_Object start, Lisp_Object end, Lisp_Object file
      if (NILP (val))
        {
          /* If we still have not decided a coding system, use the
-             default value of buffer-file-coding-system.  */
+             current buffer's value of buffer-file-coding-system.  */
          val = BVAR (current_buffer, buffer_file_coding_system);
          using_default_coding = 1;
        }
@@ -4578,6 +4582,7 @@ choose_write_coding_system (Lisp_Object start, Lisp_Object end, Lisp_Object file
        {
          Lisp_Object spec, attrs;
+          CHECK_CODING_SYSTEM (val);
          CHECK_CODING_SYSTEM_GET_SPEC (val, spec);
          attrs = AREF (spec, 0);
          if (EQ (CODING_ATTR_TYPE (attrs), Qraw_text))
@@ -4586,17 +4591,27 @@ choose_write_coding_system (Lisp_Object start, Lisp_Object end, Lisp_Object file
      if (!force_raw_text
          && !NILP (Ffboundp (Vselect_safe_coding_system_function)))
-        /* Confirm that VAL can surely encode the current region.  */
+        {
-        val = call5 (Vselect_safe_coding_system_function,
+          /* Confirm that VAL can surely encode the current region.  */
-                     start, end, val, Qnil, filename);
+          val = call5 (Vselect_safe_coding_system_function,
+                       start, end, val, Qnil, filename);
+          /* As the function specified by select-safe-coding-system-function
+             is out of our control, make sure we are not fed by bogus
+             values.  */
+          if (!NILP (val))
+            CHECK_CODING_SYSTEM (val);
+        }
      /* If the decided coding-system doesn't specify end-of-line
         format, we use that of
         `default-buffer-file-coding-system'.  */
-      if (! using_default_coding
+      if (! using_default_coding)
-          && ! NILP (BVAR (&buffer_defaults, buffer_file_coding_system)))
+        {
-        val = (coding_inherit_eol_type
+          Lisp_Object dflt = BVAR (&buffer_defaults, buffer_file_coding_system);
-               (val, BVAR (&buffer_defaults, buffer_file_coding_system)));
+          if (! NILP (dflt))
+            val = coding_inherit_eol_type (val, dflt);
+        }
      /* If we decide not to encode text, use `raw-text' or one of its
         subsidiaries.  */
diff --git a/src/font.c b/src/font.c
index ce144e78a08..a52a653d29b 100644
--- a/src/font.c
+++ b/src/font.c
@@ -1770,7 +1770,7 @@ font_parse_family_registry (Lisp_Object family, Lisp_Object registry, Lisp_Objec
      p1 = strchr (p0, '-');
      if (! p1)
        {
-          AUTO_STRING (extra, ("*-*" + (len && p0[len - 1] == '*')));
+          AUTO_STRING (extra, (&"*-*"[len && p0[len - 1] == '*']));
          registry = concat2 (registry, extra);
        }
      registry = Fdowncase (registry);
diff --git a/src/frame.c b/src/frame.c
index 121c55fdb20..f1a78fbdbf8 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -3539,8 +3539,8 @@ x_set_screen_gamma (struct frame *f, Lisp_Object new_value, Lisp_Object old_valu
            (f, bgcolor, Qnil);
    }
-  clear_face_cache (true);
+  clear_face_cache (true);      /* FIXME: Why of all frames?  */
-  windows_or_buffers_changed = 70;
+  fset_redisplay (f);
 }
diff --git a/src/gfilenotify.c b/src/gfilenotify.c
index 8b6b0a0cd2d..69f635d4115 100644
--- a/src/gfilenotify.c
+++ b/src/gfilenotify.c
@@ -195,6 +195,7 @@ will be reported only in case of the `moved' event.  */)
  /* Enable watch.  */
  monitor = g_file_monitor (gfile, gflags, NULL, &gerror);
+  g_object_unref (gfile);
  if (gerror)
    {
      char msg[1024];
diff --git a/src/macfont.m b/src/macfont.m
index 97a255bf018..fae284fad89 100644
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -190,6 +190,14 @@ cfstring_create_with_string_noencode (Lisp_Object s)
  return string;
 }
+static CFIndex
+mac_font_get_weight (CTFontRef font)
+{
+  NSFont *nsFont = (NSFont *) font;
+  return [[NSFontManager sharedFontManager] weightOfFont:nsFont];
+}
 static CGFloat
 mac_screen_font_get_advance_width_for_glyph (ScreenFontRef font, CGGlyph glyph)
 {
@@ -198,57 +206,53 @@ mac_screen_font_get_advance_width_for_glyph (ScreenFontRef font, CGGlyph glyph)
  return advancement.width;
 }
+#if !USE_CT_GLYPH_INFO
 static CGGlyph
 mac_font_get_glyph_for_cid (CTFontRef font, CTCharacterCollection collection,
                            CGFontIndex cid)
 {
-#if USE_CT_GLYPH_INFO
+  CGGlyph result = kCGFontIndexInvalid;
-  return mac_ctfont_get_glyph_for_cid ((CTFontRef) font, collection, cid);
+  NSFont *nsFont = (NSFont *) font;
-#else
+  unichar characters[] = {0xfffd};
-  {
+  NSString *string =
-    CGGlyph result = kCGFontIndexInvalid;
+    [NSString stringWithCharacters:characters
-    NSFont *nsFont = (NSFont *) font;
+                            length:ARRAYELTS (characters)];
-    unichar characters[] = {0xfffd};
+  NSGlyphInfo *glyphInfo =
-    NSString *string =
+    [NSGlyphInfo glyphInfoWithCharacterIdentifier:cid
-      [NSString stringWithCharacters:characters
+                                       collection:collection
-                              length:ARRAYELTS (characters)];
+                                       baseString:string];
-    NSGlyphInfo *glyphInfo =
+  NSDictionary *attributes =
-      [NSGlyphInfo glyphInfoWithCharacterIdentifier:cid
+    [NSDictionary dictionaryWithObjectsAndKeys:nsFont,NSFontAttributeName,
-                                         collection:collection
+                  glyphInfo,NSGlyphInfoAttributeName,nil];
-                                         baseString:string];
+  NSTextStorage *textStorage =
-    NSDictionary *attributes =
+    [[NSTextStorage alloc] initWithString:string
-      [NSDictionary dictionaryWithObjectsAndKeys:nsFont,NSFontAttributeName,
+                               attributes:attributes];
-                    glyphInfo,NSGlyphInfoAttributeName,nil];
+  NSLayoutManager *layoutManager = [[NSLayoutManager alloc] init];
-    NSTextStorage *textStorage =
+  NSTextContainer *textContainer = [[NSTextContainer alloc] init];
-      [[NSTextStorage alloc] initWithString:string
+  NSFont *fontInTextStorage;
-                                 attributes:attributes];
-    NSLayoutManager *layoutManager = [[NSLayoutManager alloc] init];
-    NSTextContainer *textContainer = [[NSTextContainer alloc] init];
-    NSFont *fontInTextStorage;
-    [layoutManager addTextContainer:textContainer];
-    [textContainer release];
-    [textStorage addLayoutManager:layoutManager];
-    [layoutManager release];
-    /* Force layout.  */
-    (void) [layoutManager glyphRangeForTextContainer:textContainer];
-    fontInTextStorage = [textStorage attribute:NSFontAttributeName atIndex:0
-                                effectiveRange:NULL];
-    if (fontInTextStorage == nsFont
-        || [[fontInTextStorage fontName] isEqualToString:[nsFont fontName]])
-      {
-        NSGlyph glyph = [layoutManager glyphAtIndex:0];
-        if (glyph < [nsFont numberOfGlyphs])
+  [layoutManager addTextContainer:textContainer];
-          result = glyph;
+  [textContainer release];
-      }
+  [textStorage addLayoutManager:layoutManager];
+  [layoutManager release];
-    [textStorage release];
+  /* Force layout.  */
+  (void) [layoutManager glyphRangeForTextContainer:textContainer];
-    return result;
+  fontInTextStorage = [textStorage attribute:NSFontAttributeName atIndex:0
-  }
+                              effectiveRange:NULL];
+  if (fontInTextStorage == nsFont
+      || [[fontInTextStorage fontName] isEqualToString:[nsFont fontName]])
+    {
+      NSGlyph glyph = [layoutManager glyphAtIndex:0];
+      if (glyph < [nsFont numberOfGlyphs])
+        result = glyph;
+    }
+  [textStorage release];
+  return result;
 }
 #endif
@@ -762,6 +766,46 @@ cfnumber_get_font_symbolic_traits_value (CFNumberRef number,
  return false;
 }
+static CGFloat
+mac_font_descriptor_get_adjusted_weight (CTFontDescriptorRef desc, CGFloat val)
+{
+  long percent_val = lround (val * 100);
+  if (percent_val == -40 || percent_val == 56)
+    {
+      CTFontRef font = NULL;
+      CFStringRef name =
+        CTFontDescriptorCopyAttribute (desc, kCTFontNameAttribute);
+      if (name)
+        {
+          font = CTFontCreateWithName (name, 0, NULL);
+          CFRelease (name);
+        }
+      if (font)
+        {
+          CFIndex weight = mac_font_get_weight (font);
+          if (percent_val == -40)
+            {
+              /* Workaround for crash when displaying Oriya characters
+                 with Arial Unicode MS on OS X 10.11.  */
+              if (weight == 5)
+                val = 0;
+            }
+          else                  /* percent_val == 56 */
+            {
+              if (weight == 9)
+                /* Adjustment for HiraginoSans-W7 on OS X 10.11.  */
+                val = 0.4;
+            }
+          CFRelease (font);
+        }
+    }
+  return val;
+}
 static void
 macfont_store_descriptor_attributes (CTFontDescriptorRef desc,
                                     Lisp_Object spec_or_entity)
@@ -785,6 +829,7 @@ macfont_store_descriptor_attributes (CTFontDescriptorRef desc,
        enum font_property_index index;
        CFStringRef trait;
        CGPoint points[6];
+        CGFloat (*adjust_func) (CTFontDescriptorRef, CGFloat);
      } numeric_traits[] =
          {{FONT_WEIGHT_INDEX, kCTFontWeightTrait,
            {{-0.4, 50},        /* light */
@@ -792,11 +837,12 @@ macfont_store_descriptor_attributes (CTFontDescriptorRef desc,
             {0, 100},          /* normal */
             {0.24, 140},       /* (semi-bold + normal) / 2 */
             {0.4, 200},        /* bold */
-             {CGFLOAT_MAX, CGFLOAT_MAX}}},
+             {CGFLOAT_MAX, CGFLOAT_MAX}},
+            mac_font_descriptor_get_adjusted_weight},
           {FONT_SLANT_INDEX, kCTFontSlantTrait,
-            {{0, 100}, {0.1, 200}, {CGFLOAT_MAX, CGFLOAT_MAX}}},
+            {{0, 100}, {0.1, 200}, {CGFLOAT_MAX, CGFLOAT_MAX}}, NULL},
           {FONT_WIDTH_INDEX, kCTFontWidthTrait,
-            {{0, 100}, {1, 200}, {CGFLOAT_MAX, CGFLOAT_MAX}}}};
+            {{0, 100}, {1, 200}, {CGFLOAT_MAX, CGFLOAT_MAX}}, NULL}};
      int i;
      for (i = 0; i < ARRAYELTS (numeric_traits); i++)
@@ -806,6 +852,8 @@ macfont_store_descriptor_attributes (CTFontDescriptorRef desc,
            {
              CGPoint *point = numeric_traits[i].points;
+              if (numeric_traits[i].adjust_func)
+                floatval = (*numeric_traits[i].adjust_func) (desc, floatval);
              while (point->x < floatval)
                point++;
              if (point == numeric_traits[i].points)
@@ -2717,7 +2765,6 @@ macfont_has_char (Lisp_Object font, int c)
 static unsigned
 macfont_encode_char (struct font *font, int c)
 {
-  struct macfont_info *macfont_info = (struct macfont_info *) font;
  CGGlyph glyph;
  block_input ();
@@ -3379,18 +3426,24 @@ mac_font_descriptor_supports_languages (CTFontDescriptorRef descriptor,
    result = false;
  else
    {
-      CFIndex desc_languages_count, i, languages_count;
+      CFRange range = CFRangeMake (0, CFArrayGetCount (desc_languages));
+      CFIndex i, languages_count = CFArrayGetCount (languages);
-      desc_languages_count = CFArrayGetCount (desc_languages);
-      languages_count = CFArrayGetCount (languages);
      for (i = 0; i < languages_count; i++)
-        if (!CFArrayContainsValue (desc_languages,
+        {
-                                   CFRangeMake (0, desc_languages_count),
+          CFStringRef language = CFArrayGetValueAtIndex (languages, i);
-                                   CFArrayGetValueAtIndex (languages, i)))
-          {
+          if (!CFArrayContainsValue (desc_languages, range, language)
-            result = false;
+              /* PingFang SC contains "zh" and "zh-Hant" as covered
-            break;
+                 languages, but does not contain "zh-Hans".  */
-          }
+              && !(CFEqual (language, CFSTR ("zh-Hans"))
+                   && CFArrayContainsValue (desc_languages, range,
+                                            CFSTR ("zh"))))
+            {
+              result = false;
+              break;
+            }
+        }
      CFRelease (desc_languages);
    }
@@ -3998,8 +4051,6 @@ mac_register_font_driver (struct frame *f)
 void
 syms_of_macfont (void)
 {
-  static struct font_driver mac_font_driver;
  /* Core Text, for Mac OS X.  */
  DEFSYM (Qmac_ct, "mac-ct");
  macfont_driver.type = Qmac_ct;
diff --git a/src/nsterm.m b/src/nsterm.m
index a5bf06a70af..65d07b2f1e4 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -6724,6 +6724,11 @@ if (cols > 0 && rows > 0)
 {
  if (fs_state != emacsframe->want_fullscreen)
    {
+      NSSize sz;
+      sz.width = frame_resize_pixelwise ? 1 : FRAME_COLUMN_WIDTH (emacsframe);
+      sz.height = frame_resize_pixelwise ? 1 : FRAME_LINE_HEIGHT (emacsframe);
+      [[self window] setResizeIncrements:sz];
      if (fs_state == FULLSCREEN_BOTH)
        {
          [self toggleFullScreen:self];
diff --git a/src/process.c b/src/process.c
index 42dd17c57e0..55f31a02673 100644
--- a/src/process.c
+++ b/src/process.c
@@ -5031,18 +5031,12 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
      for (channel = 0; channel <= max_input_desc; ++channel)
        {
          struct fd_callback_data *d = &fd_callback_info[channel];
-          if (d->func)
+          if (d->func
-            {
+              && ((d->condition & FOR_READ
-              if (d->condition & FOR_READ
+                   && FD_ISSET (channel, &Available))
-                  && FD_ISSET (channel, &Available))
+                  || (d->condition & FOR_WRITE
-                {
+                      && FD_ISSET (channel, &write_mask))))
-                  d->func (channel, d->data);
+            d->func (channel, d->data);
-                  FD_CLR (channel, &Available);
-                }
-              else if (d->condition & FOR_WRITE
-                       && FD_ISSET (channel, &write_mask))
-                d->func (channel, d->data);
-            }
        }
      for (channel = 0; channel <= max_process_desc; channel++)
diff --git a/src/window.c b/src/window.c
index 42a2ca68f14..6d06e548094 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1686,8 +1686,10 @@ Return nil if that position is scrolled vertically out of view.  If a
 character is only partially visible, nil is returned, unless the
 optional argument PARTIALLY is non-nil.  If POS is only out of view
 because of horizontal scrolling, return non-nil.  If POS is t, it
-specifies the position of the last visible glyph in WINDOW.  POS
+specifies either the first position displayed on the last visible
-defaults to point in WINDOW; WINDOW defaults to the selected window.
+screen line in WINDOW, or the end-of-buffer position, whichever comes
+first.  POS defaults to point in WINDOW; WINDOW defaults to the
+selected window.
 If POS is visible, return t if PARTIALLY is nil; if PARTIALLY is non-nil,
 the return value is a list of 2 or 6 elements (X Y [RTOP RBOT ROWH VPOS]),
@@ -6607,7 +6609,6 @@ apply_window_adjustment (struct window *w)
  eassert (w);
  clear_glyph_matrix (w->current_matrix);
  w->window_end_valid = false;
-  windows_or_buffers_changed = 30;
  wset_redisplay (w);
  adjust_frame_glyphs (XFRAME (WINDOW_FRAME (w)));
 }
diff --git a/src/xdisp.c b/src/xdisp.c
index 2c38aa9ccff..44983bb4f9d 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -434,22 +434,54 @@ static Lisp_Object Vmessage_stack;
 static bool message_enable_multibyte;
-/* Nonzero if we should redraw the mode lines on the next redisplay.
+/* At each redisplay cycle, we should refresh everything there is to refresh.
-   If it has value REDISPLAY_SOME, then only redisplay the mode lines where
+   To do that efficiently, we use many optimizations that try to make sure we
-   the `redisplay' bit has been set.  Otherwise, redisplay all mode lines
+   don't waste too much time updating things that haven't changed.
-   (the number used is then only used to track down the cause for this
+   The coarsest such optimization is that, in the most common cases, we only
-   full-redisplay).  */
+   look at the selected-window.
+   To know whether other windows should be considered for redisplay, we use the
+   variable windows_or_buffers_changed: as long as it is 0, it means that we
+   have not noticed anything that should require updating anything else than
+   the selected-window.  If it is set to REDISPLAY_SOME, it means that since
+   last redisplay, some changes have been made which could impact other
+   windows.  To know which ones need redisplay, every buffer, window, and frame
+   has a `redisplay' bit, which (if true) means that this object needs to be
+   redisplayed.  If windows_or_buffers_changed is 0, we know there's no point
+   looking for those `redisplay' bits (actually, there might be some such bits
+   set, but then only on objects which aren't displayed anyway).
+   OTOH if it's non-zero we wil have to loop through all windows and then check
+   the `redisplay' bit of the corresponding window, frame, and buffer, in order
+   to decide whether that window needs attention or not.  Not that we can't
+   just look at the frame's redisplay bit to decide that the whole frame can be
+   skipped, since even if the frame's redisplay bit is unset, some of its
+   windows's redisplay bits may be set.
+   Mostly for historical reasons, windows_or_buffers_changed can also take
+   other non-zero values.  In that case, the precise value doesn't matter (it
+   encodes the cause of the setting but is only used for debugging purposes),
+   and what it means is that we shouldn't pay attention to any `redisplay' bits
+   and we should simply try and redisplay every window out there.  */
-int update_mode_lines;
+int windows_or_buffers_changed;
-/* Nonzero if window sizes or contents other than selected-window have changed
+/* Nonzero if we should redraw the mode lines on the next redisplay.
-   since last redisplay that finished.
+   Similarly to `windows_or_buffers_changed', If it has value REDISPLAY_SOME,
-   If it has value REDISPLAY_SOME, then only redisplay the windows where
+   then only redisplay the mode lines in those buffers/windows/frames where the
-   the `redisplay' bit has been set.  Otherwise, redisplay all windows
+   `redisplay' bit has been set.
-   (the number used is then only used to track down the cause for this
+   For any other value, redisplay all mode lines (the number used is then only
-   full-redisplay).  */
+   used to track down the cause for this full-redisplay).
+   The `redisplay' bits are the same as those used for
+   windows_or_buffers_changed, and setting windows_or_buffers_changed also
+   causes recomputation of the mode lines of all those windows.  IOW this
+   variable only has an effect if windows_or_buffers_changed is zero, in which
+   case we should only need to redisplay the mode-line of those objects with
+   a `redisplay' bit set but not the window's text content (tho we may still
+   need to refresh the text content of the selected-window).  */
-int windows_or_buffers_changed;
+int update_mode_lines;
 /* True after display_mode_line if %l was used and it displayed a
   line number.  */
@@ -13383,6 +13415,8 @@ redisplay_internal (void)
  pending = false;
  forget_escape_and_glyphless_faces ();
+  inhibit_free_realized_faces = false;
  /* If face_change, init_iterator will free all realized faces, which
     includes the faces referenced from current matrices.  So, we
     can't reuse current matrices in this case.  */
@@ -13430,7 +13464,7 @@ redisplay_internal (void)
          /* If cursor type has been changed on the frame
             other than selected, consider all frames.  */
          if (f != sf && f->cursor_type_changed)
-            update_mode_lines = 31;
+            fset_redisplay (f);
        }
      clear_desired_matrices (f);
    }
@@ -13528,9 +13562,12 @@ redisplay_internal (void)
  consider_all_windows_p = (update_mode_lines
                            || windows_or_buffers_changed);
-#define AINC(a,i) \
+#define AINC(a,i)                                                       \
-  if (VECTORP (a) && i >= 0 && i < ASIZE (a) && INTEGERP (AREF (a, i))) \
+  {                                                                     \
-    ASET (a, i, make_number (1 + XINT (AREF (a, i))))
+    Lisp_Object entry = Fgethash (make_number (i), a, make_number (0)); \
+    if (INTEGERP (entry))                                               \
+      Fputhash (make_number (i), make_number (1 + XINT (entry)), a);    \
+  }
  AINC (Vredisplay__all_windows_cause, windows_or_buffers_changed);
  AINC (Vredisplay__mode_lines_cause, update_mode_lines);
@@ -13745,7 +13782,8 @@ redisplay_internal (void)
 #endif
  /* Build desired matrices, and update the display.  If
-     consider_all_windows_p, do it for all windows on all frames.
+     consider_all_windows_p, do it for all windows on all frames that
+     require redisplay, as specified by their 'redisplay' flag.
     Otherwise do it for selected_window, only.  */
  if (consider_all_windows_p)
@@ -13871,6 +13909,10 @@ redisplay_internal (void)
      if (sf->fonts_changed)
        goto retry;
+      /* Prevent freeing of realized faces, since desired matrices are
+         pending that reference the faces we computed and cached.  */
+      inhibit_free_realized_faces = true;
      /* Prevent various kinds of signals during display update.
         stdio is not robust about handling signals,
         which can cause an apparent I/O error.  */
@@ -19802,7 +19844,8 @@ push_prefix_prop (struct it *it, Lisp_Object prop)
  eassert (it->method == GET_FROM_BUFFER
           || it->method == GET_FROM_DISPLAY_VECTOR
-           || it->method == GET_FROM_STRING);
+           || it->method == GET_FROM_STRING
+           || it->method == GET_FROM_IMAGE);
  /* We need to save the current buffer/string position, so it will be
     restored by pop_it, because iterate_out_of_display_property
@@ -31381,13 +31424,11 @@ display table takes effect; in this case, Emacs does not consult
  DEFVAR_LISP ("redisplay--all-windows-cause", Vredisplay__all_windows_cause,
               doc: /*  */);
-  Vredisplay__all_windows_cause
+  Vredisplay__all_windows_cause = Fmake_hash_table (0, NULL);
-    = Fmake_vector (make_number (100), make_number (0));
  DEFVAR_LISP ("redisplay--mode-lines-cause", Vredisplay__mode_lines_cause,
               doc: /*  */);
-  Vredisplay__mode_lines_cause
+  Vredisplay__mode_lines_cause = Fmake_hash_table (0, NULL);
-    = Fmake_vector (make_number (100), make_number (0));
 }
diff --git a/src/xfaces.c b/src/xfaces.c
index 40713f167ff..8cf0b427799 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -631,7 +631,7 @@ free_frame_faces (struct frame *f)
 /* Clear face caches, and recompute basic faces for frame F.  Call
   this after changing frame parameters on which those faces depend,
   or when realized faces have been freed due to changing attributes
-   of named faces. */
+   of named faces.  */
 void
 recompute_basic_faces (struct frame *f)
@@ -2528,10 +2528,15 @@ Value is a vector of face attributes.  */)
  if (NILP (Fget (face, Qface_no_inherit)))
    {
      if (f)
-        f->face_change = 1;
+        {
+          f->face_change = true;
+          fset_redisplay (f);
+        }
      else
-        face_change = true;
+        {
-      windows_or_buffers_changed = 54;
+          face_change = true;
+          windows_or_buffers_changed = 54;
+        }
    }
  eassert (LFACEP (lface));
@@ -2613,10 +2618,15 @@ The value is TO.  */)
  if (NILP (Fget (to, Qface_no_inherit)))
    {
      if (f)
-        f->face_change = 1;
+        {
+          f->face_change = true;
+          fset_redisplay (f);
+        }
      else
-        face_change = true;
+        {
-      windows_or_buffers_changed = 55;
+          face_change = true;
+          windows_or_buffers_changed = 55;
+        }
    }
  return to;
@@ -3120,7 +3130,7 @@ FRAME 0 means change the face on all frames, and change the default
      && NILP (Fequal (old_value, value)))
    {
      f->face_change = true;
-      windows_or_buffers_changed = 56;
+      fset_redisplay (f);
    }
  if (!UNSPECIFIEDP (value) && !IGNORE_DEFFACE_P (value)
@@ -3293,7 +3303,7 @@ update_face_from_frame_parameter (struct frame *f, Lisp_Object param,
      && NILP (Fget (face, Qface_no_inherit)))
    {
      f->face_change = true;
-      windows_or_buffers_changed = 57;
+      fset_redisplay (f);
    }
 }
diff --git a/src/xfns.c b/src/xfns.c
index d6a3d76e948..fc6111c4fab 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1041,7 +1041,7 @@ x_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
    nlines = 0;
  /* Make sure we redisplay all windows in this frame.  */
-  windows_or_buffers_changed = 59;
+  fset_redisplay (f);
 #if defined (USE_X_TOOLKIT) || defined (USE_GTK)
  FRAME_MENU_BAR_LINES (f) = 0;
@@ -1160,8 +1160,7 @@ x_change_tool_bar_height (struct frame *f, int height)
  Lisp_Object fullscreen;
  /* Make sure we redisplay all windows in this frame.  */
-  windows_or_buffers_changed = 60;
+  fset_redisplay (f);
  /* Recalculate tool bar and frame text sizes.  */
  FRAME_TOOL_BAR_HEIGHT (f) = height;
diff --git a/test/automated/auth-source-tests.el b/test/automated/auth-source-tests.el
new file mode 100644
index 00000000000..0b49b9013f7
--- /dev/null
+++ b/test/automated/auth-source-tests.el
@@ -0,0 +1,178 @@
+;;; auth-source-tests.el --- Tests for auth-source.el  -*- lexical-binding: t; -*-
+;; Copyright (C) 2015 Free Software Foundation, Inc.
+;; Author: Damien Cassou <damien@cassou.me>,
+;;         Nicolas Petton <nicolas@petton.fr>
+;; 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:
+;;
+;;; Code:
+(require 'ert)
+(require 'auth-source)
+(defvar secrets-enabled t
+  "Enable the secrets backend to test its features.")
+(defun auth-source-validate-backend (source validation-alist)
+  (let ((backend (auth-source-backend-parse source)))
+    (should (auth-source-backend-p backend))
+    (dolist (pair validation-alist)
+      (should (equal (eieio-oref backend (car pair)) (cdr pair))))))
+(ert-deftest auth-source-backend-parse-macos-keychain ()
+  (auth-source-validate-backend '(:source (:macos-keychain-generic foobar))
+                                '((:source . "foobar")
+                                  (:type . macos-keychain-generic)
+                                  (:search-function . auth-source-macos-keychain-search)
+                                  (:create-function . auth-source-macos-keychain-create))))
+(ert-deftest auth-source-backend-parse-macos-keychain-generic-string ()
+  (auth-source-validate-backend "macos-keychain-generic:foobar"
+                                '((:source . "foobar")
+                                  (:type . macos-keychain-generic)
+                                  (:search-function . auth-source-macos-keychain-search)
+                                  (:create-function . auth-source-macos-keychain-create))))
+(ert-deftest auth-source-backend-parse-macos-keychain-internet-string ()
+  (auth-source-validate-backend "macos-keychain-internet:foobar"
+                                '((:source . "foobar")
+                                  (:type . macos-keychain-internet)
+                                  (:search-function . auth-source-macos-keychain-search)
+                                  (:create-function . auth-source-macos-keychain-create))))
+(ert-deftest auth-source-backend-parse-macos-keychain-internet-symbol ()
+  (auth-source-validate-backend 'macos-keychain-internet
+                                '((:source . "default")
+                                  (:type . macos-keychain-internet)
+                                  (:search-function . auth-source-macos-keychain-search)
+                                  (:create-function . auth-source-macos-keychain-create))))
+(ert-deftest auth-source-backend-parse-macos-keychain-generic-symbol ()
+  (auth-source-validate-backend 'macos-keychain-generic
+                                '((:source . "default")
+                                  (:type . macos-keychain-generic)
+                                  (:search-function . auth-source-macos-keychain-search)
+                                  (:create-function . auth-source-macos-keychain-create))))
+(ert-deftest auth-source-backend-parse-macos-keychain-internet-default-string ()
+  (auth-source-validate-backend 'macos-keychain-internet
+                                '((:source . "default")
+                                  (:type . macos-keychain-internet)
+                                  (:search-function . auth-source-macos-keychain-search)
+                                  (:create-function . auth-source-macos-keychain-create))))
+(ert-deftest auth-source-backend-parse-plstore ()
+  (auth-source-validate-backend '(:source "foo.plist")
+                                '((:source . "foo.plist")
+                                  (:type . plstore)
+                                  (:search-function . auth-source-plstore-search)
+                                  (:create-function . auth-source-plstore-create))))
+(ert-deftest auth-source-backend-parse-netrc ()
+  (auth-source-validate-backend '(:source "foo")
+                                '((:source . "foo")
+                                  (:type . netrc)
+                                  (:search-function . auth-source-netrc-search)
+                                  (:create-function . auth-source-netrc-create))))
+(ert-deftest auth-source-backend-parse-netrc-string ()
+  (auth-source-validate-backend "foo"
+                                '((:source . "foo")
+                                  (:type . netrc)
+                                  (:search-function . auth-source-netrc-search)
+                                  (:create-function . auth-source-netrc-create))))
+(ert-deftest auth-source-backend-parse-secrets ()
+  (provide 'secrets) ; simulates the presence of the `secrets' package
+  (let ((secrets-enabled t))
+    (auth-source-validate-backend '(:source (:secrets "foo"))
+                                  '((:source . "foo")
+                                    (:type . secrets)
+                                    (:search-function . auth-source-secrets-search)
+                                    (:create-function . auth-source-secrets-create)))))
+(ert-deftest auth-source-backend-parse-secrets-strings ()
+  (provide 'secrets) ; simulates the presence of the `secrets' package
+  (let ((secrets-enabled t))
+    (auth-source-validate-backend "secrets:foo"
+                                  '((:source . "foo")
+                                    (:type . secrets)
+                                    (:search-function . auth-source-secrets-search)
+                                    (:create-function . auth-source-secrets-create)))))
+(ert-deftest auth-source-backend-parse-secrets-nil-source ()
+  (provide 'secrets) ; simulates the presence of the `secrets' package
+  (let ((secrets-enabled t))
+    (auth-source-validate-backend '(:source (:secrets nil))
+                                  '((:source . "session")
+                                    (:type . secrets)
+                                    (:search-function . auth-source-secrets-search)
+                                    (:create-function . auth-source-secrets-create)))))
+(ert-deftest auth-source-backend-parse-secrets-alias ()
+  (provide 'secrets) ; simulates the presence of the `secrets' package
+  (let ((secrets-enabled t))
+    ;; Redefine `secrets-get-alias' to map 'foo to "foo"
+    (cl-letf (((symbol-function 'secrets-get-alias) (lambda (_) "foo")))
+      (auth-source-validate-backend '(:source (:secrets foo))
+                                    '((:source . "foo")
+                                      (:type . secrets)
+                                      (:search-function . auth-source-secrets-search)
+                                      (:create-function . auth-source-secrets-create))))))
+(ert-deftest auth-source-backend-parse-secrets-symbol ()
+  (provide 'secrets) ; simulates the presence of the `secrets' package
+  (let ((secrets-enabled t))
+    ;; Redefine `secrets-get-alias' to map 'default to "foo"
+    (cl-letf (((symbol-function 'secrets-get-alias) (lambda (_) "foo")))
+      (auth-source-validate-backend 'default
+                                    '((:source . "foo")
+                                      (:type . secrets)
+                                      (:search-function . auth-source-secrets-search)
+                                      (:create-function . auth-source-secrets-create))))))
+(ert-deftest auth-source-backend-parse-secrets-no-alias ()
+  (provide 'secrets) ; simulates the presence of the `secrets' package
+  (let ((secrets-enabled t))
+    ;; Redefine `secrets-get-alias' to map 'foo to nil (so that
+    ;; "Login" is used by default
+    (cl-letf (((symbol-function 'secrets-get-alias) (lambda (_) nil)))
+      (auth-source-validate-backend '(:source (:secrets foo))
+                                    '((:source . "Login")
+                                      (:type . secrets)
+                                      (:search-function . auth-source-secrets-search)
+                                      (:create-function . auth-source-secrets-create))))))
+;; TODO This test shows suspicious behavior of auth-source: the
+;; "secrets" source is used even though nothing in the input indicates
+;; that is what we want
+(ert-deftest auth-source-backend-parse-secrets-no-source ()
+  (provide 'secrets) ; simulates the presence of the `secrets' package
+  (let ((secrets-enabled t))
+    (auth-source-validate-backend '(:source '(foo))
+                                  '((:source . "session")
+                                    (:type . secrets)
+                                    (:search-function . auth-source-secrets-search)
+                                    (:create-function . auth-source-secrets-create)))))
+(provide 'auth-source-tests)
+;;; auth-source-tests.el ends here
diff --git a/test/automated/coding-tests.el b/test/automated/coding-tests.el
new file mode 100644
index 00000000000..ebbf8968fc7
--- /dev/null
+++ b/test/automated/coding-tests.el
@@ -0,0 +1,50 @@
+;;; coding-tests.el --- tests for text encoding and decoding
+;; Copyright (C) 2015 Free Software Foundation, Inc.
+;; Author: Eli Zaretskii <eliz@gnu.org>
+;; 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/>.
+;;; Code:
+(require 'ert)
+;; Directory to hold test data files.
+(defvar coding-tests-workdir
+  (expand-file-name "coding-tests" temporary-file-directory))
+;; Remove all generated test files.
+(defun coding-tests-remove-files ()
+  (delete-directory coding-tests-workdir t))
+(ert-deftest ert-test-coding-bogus-coding-systems ()
+  (unwind-protect
+      (let (test-file)
+        (or (file-directory-p coding-tests-workdir)
+            (mkdir coding-tests-workdir t))
+        (setq test-file (expand-file-name "nonexisting" coding-tests-workdir))
+        (if (file-exists-p test-file)
+            (delete-file test-file))
+        (should-error
+         (let ((coding-system-for-read 'bogus))
+           (insert-file-contents test-file)))
+        ;; See bug #21602.
+        (setq test-file (expand-file-name "writing" coding-tests-workdir))
+        (should-error
+         (let ((coding-system-for-write (intern "\"us-ascii\"")))
+           (write-region "some text" nil test-file))))
+    (coding-tests-remove-files)))
diff --git a/test/automated/json-tests.el b/test/automated/json-tests.el
index fd89b7aa994..d1b7a2fa022 100644
--- a/test/automated/json-tests.el
+++ b/test/automated/json-tests.el
@@ -22,15 +22,22 @@
 (require 'ert)
 (require 'json)
+(ert-deftest test-json-plist-reverse ()
+  (should (equal (json--plist-reverse '()) '()))
+  (should (equal (json--plist-reverse '(:a 1)) '(:a 1)))
+  (should (equal (json--plist-reverse '(:a 1 :b 2 :c 3))
+                 '(:c 3 :b 2 :a 1))))
 (ert-deftest json-encode-simple-alist ()
  (should (equal (json-encode '((a . 1)
                                (b . 2)))
                 "{\"a\":1,\"b\":2}")))
 (ert-deftest json-read-simple-alist ()
-  (should (equal (json-read-from-string "{\"a\": 1, \"b\": 2}")
+  (let ((json-object-type 'alist))
-                 '((b . 2)
+    (should (equal (json-read-from-string "{\"a\": 1, \"b\": 2}")
-                   (a . 1)))))
+                   '((a . 1)
+                     (b . 2))))))
 (ert-deftest json-encode-string-with-special-chars ()
  (should (equal (json-encode-string "a\n\fb")
diff --git a/test/automated/mule-util.el b/test/automated/mule-util.el
index 038881a7915..24b56c0969b 100644
--- a/test/automated/mule-util.el
+++ b/test/automated/mule-util.el
@@ -1,4 +1,4 @@
-;;; mule-util --- tests for international/mule-util.el -*- coding: utf-8; -*-
+;;; mule-util --- tests for international/mule-util.el
 ;; Copyright (C) 2002-2015 Free Software Foundation, Inc.
diff --git a/test/automated/python-tests.el b/test/automated/python-tests.el
index d9b4c3e1b06..44b05e2b476 100644
--- a/test/automated/python-tests.el
+++ b/test/automated/python-tests.el
@@ -5216,7 +5216,6 @@ class SomeClass:
 (provide 'python-tests)
 ;; Local Variables:
-;; coding: utf-8
 ;; indent-tabs-mode: nil
 ;; End:
diff --git a/test/indent/octave.m b/test/indent/octave.m
index a7041462f7f..4758f9933cb 100644
--- a/test/indent/octave.m
+++ b/test/indent/octave.m
@@ -1,6 +1,19 @@
 ## -*- mode: octave; coding: utf-8 -*-
 0;                              # Don't make this a function file
 function res = tcomp (fn)
+  global x y ...
+         z1 z2
+  persistent x y ...
+             z1 z2
+  global x y = 2 ...
+         z1 z2                  # FIXME
+  do
+    something
+  until x = ...
+        y
  %% res = tcomp (fn)
  %%     imports components and rearranges them.
@@ -10,6 +23,15 @@ function res = tcomp (fn)
  data = dlmread(fn, 3, 0);
+  enumeration
+    first (1)
+    second (2)
+  end
+  y = enumeration (x);          #Beware: "enumeration" can also be a function!
+  y = foo(enumeration (x),
+          2);          #Beware: "enumeration" can also be a function!
  x = data(:,2:end);
  y = 'hello';
  z = y';
diff --git a/test/indent/prolog.prolog b/test/indent/prolog.prolog
index 6bf9437b883..9ac6df1b6c7 100644
--- a/test/indent/prolog.prolog
+++ b/test/indent/prolog.prolog
@@ -1,16 +1,18 @@
 %% -*- mode: prolog; coding: utf-8; fill-column: 78 -*-
 %% bug#21526
-test1 :-
+test21526_1 :-
    (   a ->
-            (   a ->
+        (   a ->
-                b
+            b
-            ;   c
+        ;   c
-            )
+        )
-    ;   c
+    ;   % Toto
+        c ->
+        d
    ).
-test2 :-
+test21526_2 :-
    (    a
    ->   (   a,
             b
@@ -19,7 +21,31 @@ test2 :-
         b2
    ;    c1,
         c2
-    )
+    ).
+test21526_3 :-
+    X \= Y,
+    \+ a,
+    b,
+    \+ \+ c,
+    d.
+test21526_4 :-
+    (   \+ a ->
+        b
+    ;   \+ c,
+        \+ d
+    ).
+test21526_5 :-
+    (a;
+     b ->
+         c).
+test21526_predicate(c) :- !,
+    test_goal1,
+    test_goal2.
 %% Testing correct tokenizing.
 foo(X) :- 0'= = X.
@@ -74,11 +100,11 @@ subst(X, V, FV, lambda(Y, Ti, Bi), lambda(Y1, To, Bo)) :-
    %% If X is equal to Y, X is shadowed, so no subst can take place.
    ->  Y1 = Y, Bo = Bi
    ;   (member((Y, _), FV)
-         %% If Y appears in FV, it can appear in V, so we need to
+        %% If Y appears in FV, it can appear in V, so we need to
-         %% rename it to avoid name capture.
+        %% rename it to avoid name capture.
-         -> new_atom(Y, Y1),
+        -> new_atom(Y, Y1),
-            subst(Y, Y1, [], Bi, Bi1)
+           subst(Y, Y1, [], Bi, Bi1)
-         ; Y1 = Y, Bi1 = Bi),
+        ; Y1 = Y, Bi1 = Bi),
        %% Perform substitution on the body.
        subst(X, V, FV, Bi1, Bo)
    ).
author	K. Handa	2015-10-05 22:56:26 +0900
committer	K. Handa	2015-10-05 22:56:26 +0900
commit	47e9556c70a7009d7c750fd7bf10a0e6cf41cdce (patch)
tree	4e944bd68080adee76291dd7d4f34103e2b55d50
parent	52beda922d2cb523a03661bf74b8678c8b45e440 (diff)
parent	ef171d1d0b42758b5f705847d558436e867372f4 (diff)
download	emacs-47e9556c70a7009d7c750fd7bf10a0e6cf41cdce.tar.gz emacs-47e9556c70a7009d7c750fd7bf10a0e6cf41cdce.zip