3 files changed, 770 insertions, 37 deletions

diff --git a/ChangeLog.3 b/ChangeLog.3
index df2b167cc72..49176f8a5ed 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -1,3 +1,735 @@
+2019-01-07  Leo Liu  <sdl.web@gmail.com>
+
+        * lisp/textmodes/mhtml-mode.el: Avoid loading flyspell.  (Bug#33939)
+
+2019-01-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Improve GC+Cairo workaround
+
+        Suggested by Eli Zaretskii (Bug#20890#31).
+        * src/font.h (font_data_structures_may_be_ill_formed): New function.
+        * src/ftfont.c (ftfont_close):
+        * src/ftcrfont.c (ftcrfont_close): Use it.
+
+        (cherry picked from commit d02fd482fbeaf6ed551e78223b538495cb0c3541)
+
+2019-01-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Work around GC+Cairo bug
+
+        Workaround suggested by Robert Pluim (Bug#20890#13).
+        * src/ftfont.c (ftfont_close) [USE_CAIRO]:
+        Do nothing if GC is in progress.
+
+2019-01-07  Eli Zaretskii  <eliz@gnu.org>
+
+        Improve commentary in font.h
+
+        * src/font.h (struct font, struct font_driver): Fix typos and
+        wording in comments.  Document all driver methods.
+
+2019-01-07  Martin Rudalics  <rudalics@gmx.at>
+
+        Fix definition of Qwindow_point_insertion_type (Bug#33871)
+
+        * src/window.c (Qwindow_point_insertion_type): Fix definition
+        (Bug#33871).
+
+2019-01-07  Eli Zaretskii  <eliz@gnu.org>
+
+        Improve documentation of 'server-name'
+
+        * doc/emacs/misc.texi (Emacs Server, TCP Emacs server)
+        (emacsclient Options):
+        * lisp/server.el (server-name):  Document the usage of
+        'server-name' to specify the server file as an absolute file
+        name.  Do not merge to master.  (Bug#33934)
+
+2019-01-07  Eli Zaretskii  <eliz@gnu.org>
+
+        Update Unicode copyright notice
+
+        * admin/unidata/copyright.html: Updated version from the
+        Unicode Consortium's site.
+
+2019-01-07  Michael Albinus  <michael.albinus@gmx.de>
+
+        Handle quoted file names in filenotify.el
+
+        * lisp/filenotify.el (file-notify-add-watch): Do not save
+        quoted file names in `file-notify-descriptors'.
+
+        * test/lisp/files-tests.el
+        (files-file-name-non-special-notify-handlers): Do not expect
+        to fail.
+
+2019-01-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix copyright years by hand
+
+        These are dates that admin/update-copyright did not update, or
+        updated incorrectly.
+
+2019-01-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Update copyright year to 2019
+
+        Run 'TZ=UTC0 admin/update-copyright $(git ls-files)'.
+
+2019-01-07  Eli Zaretskii  <eliz@gnu.org>
+
+        * doc/man/emacs.1.in: Fix value of default frame height.  (Bug#33921)
+
+2019-01-07  Martin Rudalics  <rudalics@gmx.at>
+
+        In user manual fix value of default frame height (Bug#33921)
+
+        * doc/emacs/cmdargs.texi (Window Size X): Fix value of default
+        frame height (Bug#33921).
+
+2019-01-07  Eli Zaretskii  <eliz@gnu.org>
+
+        Improve documentation of 'file-local-name' and related APIs
+
+        * doc/lispref/files.texi (Unique File Names)
+        (Magic File Names, File Name Expansion): Improve documentation
+        of the "local part" of a remote file name.
+        * doc/lispref/processes.texi (Synchronous Processes)
+        (Asynchronous Processes): State explicitly that program and
+        file names passed to functions that start remote processes
+        need to be relative or obtained by 'file-local-name'.
+
+        * lisp/files.el (file-local-name):
+        * lisp/simple.el (start-file-process, process-file): Improve
+        the documentation of the "local part" of a remote file name,
+        and its use in APIs that start remote processes.
+
+2019-01-07  Michael Albinus  <michael.albinus@gmx.de>
+
+        Fix Bug#31704.  Do not merge
+
+        * lisp/net/tramp.el (tramp-eshell-directory-change):
+        Use `path-separator' as it does eshell.  (Bug#31704)
+
+2019-01-07  Michael Albinus  <michael.albinus@gmx.de>
+
+        Fix Bug#31704.  Do not merge
+
+        * lisp/eshell/esh-proc.el (eshell-gather-process-output): Do not
+        let `expand-file-name' prefix remote file names with MS Windows
+        volume letter.
+
+        * lisp/net/tramp.el (tramp-eshell-directory-change):
+        Use `path-separator' as it does eshell.  (Bug#31704)
+
+2019-01-07  Eli Zaretskii  <eliz@gnu.org>
+
+        * lisp/files.el (cd): Fix last change.  (Bug#33791)
+
+2019-01-07  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix remote directories in Eshell on MS-Windows
+
+        * lisp/files.el (cd): Support remote directory names on
+        MS-Windows.  (Bug#33791)
+
+2019-01-07  Drew Adams  <drew.adams@oracle.com>
+
+        Fix :type 'group' in defcustom
+
+        * lisp/wid-edit.el (group): Fix the :format spec.  (Bug#33566)
+
+2019-01-07  Alan Third  <alan@idiocy.org>
+
+        Fix NS fringe bitmap drawing bug (bug#33864)
+
+        * src/nsterm.m (ns_draw_fringe_bitmap): Check the rectangle to clear
+        correctly.
+
+2019-01-07  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix commentary in dispnew.c
+
+        * src/dispnew.c (buffer_posn_from_coords): Fix inaccuracies in
+        the commentary.
+
+2019-01-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Improve accept-process-process doc
+
+        * doc/lispref/processes.texi (Accepting Output):
+        * src/process.c (Faccept_process_output):
+        Document that (accept-process-output P) can return non-nil
+        even after P has exited, and that it can return nil even if P
+        is still running (Bug#33839).
+
+2019-01-07  Stephen Leake  <stephen_leake@stephe-leake.org>
+
+        Fix a simple bug in display-buffer-use-some-frame
+
+        * lisp/window.el (display-buffer-use-some-frame): Simplify the
+        predicate, fix TYPE arg to window--display-buffer.
+
+2019-01-07  Michael Albinus  <michael.albinus@gmx.de>
+
+        Clarify thread switching while waiting for process output
+
+        * doc/lispref/threads.texi (Threads): Clarify, that thread
+        switching happens when waiting for process output from
+        asynchronous processes.
+
+2019-01-07  Charles A. Roelli  <charles@aurox.ch>
+
+        Improve process doc. with respect to handling of large input (Bug#33191)
+
+        * src/process.c (Fprocess_send_region, Fprocess_send_string):
+        Document that process input longer than the process input
+        buffer may be split into bunches.  Remove an outdated
+        reference to a 500 character split boundary.
+        * doc/lispref/processes.texi (Asynchronous Processes): Remove
+        mention of "stray character injections" in PTY processes.  See
+        also the comment about ICANON in src/sysdep.c, function
+        child_setup_tty.
+
+2019-01-07  Terrence Brannon  <metaperl@gmail.com>
+
+        Minor copyedits in landmark.el
+
+        * lisp/obsolete/landmark.el: Fix author's email and commentary.
+
+2019-01-07  Alan Mackenzie  <acm@muc.de>
+
+        Check result from c-backward-token-2 to avoid infinite loop
+
+        This fixes bug #33784.
+
+        * lisp/progmodes/cc-fonts.el (c-get-fontification-context): While moving back
+        over enclosing parentheses, check that c-backward-token-2 actually moves.
+
+2019-01-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        cl-make-random-state was not copying its arg
+
+        Problem reported by Xu Chunyang (Bug#33731).
+        * lisp/emacs-lisp/cl-extra.el (cl-make-random-state):
+        Use copy-sequence, not copy-tree, so that the record is copied.
+        * test/lisp/emacs-lisp/cl-extra-tests.el:
+        (cl-extra-test-cl-make-random-state): New test.
+
+2019-01-07  Glenn Morris  <rgm@gnu.org>
+
+        Skip a vc-bzr test if run as root
+
+        * test/lisp/vc/vc-bzr-tests.el (vc-bzr-test-faulty-bzr-autoloads):
+        Skip this test when run as root.  This works around a race
+        condition in root-specific code in vc-mode-line when deleting a file.
+
+2019-01-07  Chris Feng  <chris.w.feng@gmail.com>
+
+        Backport: Handle unread-command-events consistently (bug#23980)
+
+        * src/keyboard.c (read_char): Events put into `unread-command-events'
+        with the form (t . EVENT) should always have the t stripped when read
+        out.
+        * test/src/keyboard-tests.el: New tests for `unread-command-events'.
+
+        (cherry picked from commit 1f3f4b1296613b8cdc0632a68fde86e86ddad866)
+
+2019-01-07  Glenn Morris  <rgm@gnu.org>
+
+        Restrict downcasing in elisp xref tests (bug#25534)
+
+        The tests happen to not fail at the moment because find-library-name
+        now has an extra feature, find-library--from-load-history, which
+        happens to do a case-insensitive regexp match; but still it seems
+        better not to rely on this.
+
+        * test/lisp/progmodes/elisp-mode-tests.el (xref--case-insensitive):
+        New variable.
+        (xref-elisp-test-run, emacs-test-dir): Only downcase if the
+        filesystem seems to be case-insensitive.
+
+2019-01-07  Rob Browning  <rlb@defaultvalue.org>
+
+        Avoid test failures if directory name looks like a regexp
+
+        Taken from <https://sources.debian.org/patches/emacs/1:26.1+1-1>
+        * test/lisp/ibuffer-tests.el (ibuffer-filter-inclusion-3):
+        * test/lisp/net/tramp-tests.el (tramp-test42-remote-load-path):
+        Regexp-quote file names to avoid failures with directory names
+        of the form "build/emacs-i87jK3/emacs-26.1+1/...".
+
+2019-01-07  Michael Albinus  <michael.albinus@gmx.de>
+
+        Fix Bug#33524
+
+        * lisp/progmodes/flymake-proc.el
+        (flymake-proc-create-temp-with-folder-structure):
+        Unquote file-name.  (Bug#33524)
+
+2019-01-07  Glenn Morris  <rgm@gnu.org>
+
+        * doc/lispintro/emacs-lisp-intro.texi (Finding More): Fix xref.
+
+2019-01-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        More porting to GCC 8 of --enable-gcc-warnings
+
+        Backport from master.
+        I ran into this when building Emacs 26 with GCC 8 on Fedora 29 x86.
+        * lwlib/lwlib-Xaw.h (xaw_update_one_value, xaw_popup_menu):
+        * lwlib/lwlib-Xlw.h (xlw_update_one_value, xlw_pop_instance):
+        * lwlib/lwlib.h (lw_allow_resizing, lw_set_main_areas) [!USE_MOTIF]:
+        No longer const.
+        * src/emacs-module.c: Ignore -Wcast-function-type.
+
+2019-01-07  Glenn Morris  <rgm@gnu.org>
+
+        Fix an epg test for recent GnuPG versions (bug#33439)
+
+        * test/lisp/epg-tests.el (epg-decrypt-1):
+        Tell recent GnuPG (e.g. 2.2.11) not to worry about missing MDC.
+
+2019-01-07  Robert Pluim  <rpluim@gmail.com>
+
+        Document font structure layout constraints
+
+        This has to be the same as in src/ftcrfont.c and src/ftfont.c
+
+        * src/xftfont.c (struct xftfont_info): Document layout constraints.
+
+2019-01-07  Robert Pluim  <rpluim@gmail.com>
+
+        Document font structure layout constraints
+
+        The layout of the initial members of ftcrfont_info must match
+        ftfont_info
+
+        * src/ftcrfont.c (struct ftcrfont_info): Likewise.
+
+        * src/ftfont.c (struct ftfont_info): Document layout constraints.
+
+2019-01-07  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix display of line numbers in empty lines beyond EOB
+
+        * src/xdisp.c (maybe_produce_line_number): When the current
+        line is at EOB, use the 'line-number-current-line' face only
+        on that single line, but not on the rest of empty lines beyond
+        EOB.  (Bug#33732)
+
+2019-01-07  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix redisplay when a window's scroll bar or fringes are changed
+
+        * src/window.c (set_window_fringes, set_window_scroll_bars):
+        Set windows_or_buffers_changed flag to cause immediate
+        thorough redisplay of a window when scroll bars or fringes are
+        changed.  (Bug#33694)
+
+2019-01-07  Martin Rudalics  <rudalics@gmx.at>
+
+        Tiny markup fix in Elisp manual
+
+        * doc/lispref/lists.texi (Building Lists): Use '@var' instead
+        of '@code' for argument.
+
+2019-01-07  Alan Mackenzie  <acm@muc.de>
+
+        CC Mode: stop extra parens on expression causing false fontification as type
+
+        * lisp/progmodes/cc-fonts.el (c-get-fontification-context): recognize
+        arithmetic operator followed by several open parentheses, not just one, as not
+        being an argument list.
+
+2019-01-07  Ari Roponen  <ari.roponen@gmail.com>
+
+        Fix cairo scrolling for side-by-side windows
+
+        Backport: Fixes Bug#33442.
+
+        * src/xterm.c (x_scroll_run) [USE_CAIRO]: Fix scrolling for
+        side-by-side split windows.  (Bug#31288)
+
+        (cherry picked from commit 6e362a32bc9d21f73a0f29ca6f45481edeea6f29)
+
+2019-01-07  Alan Mackenzie  <acm@muc.de>
+
+        CC Mode: stop wrongly recognizing "func(a * 9)" as "pointer to type a"
+
+        * lisp/progmodes/cc-engine.el (c-forward-decl-or-cast-1): When testing for an
+        identifier after "a *", on failure additionally check for a digit, setting a
+        new flag variable got-number if one is found.  In the test for CASE 18, check
+        this flag.
+
+2019-01-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * lisp/emacs-lisp/cursor-sensor.el: Add motivation
+
+2019-01-07  Raimon Grau  <raimonster@gmail.com>
+
+        Guard occur against an undefined orig-line
+
+        * lisp/replace.el (occur-engine): Avoid inserting the current line if
+        orig-line is nil.  This happens, for example, when reverting an occur
+        buffer with `list-matching-lines-jump-to-current-line' set to t.
+        (Bug#33476)
+
+2019-01-07  Eli Zaretskii  <eliz@gnu.org>
+
+        Indexing followup to recent changes
+
+        * doc/lispref/text.texi (Special Properties): Index
+        'cursor-sensor-inhibit'.  (Bug#33664)
+
+2019-01-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        Improve documentation of cursor-sensor.el (bug#33664)
+
+        * doc/lispref/text.texi (Special Properties): Mention cursor-sensor-inhibit.
+        * lisp/emacs-lisp/cursor-sensor.el (Commentary): Add cursor-sensor-mode.
+        (cursor-sensor-inhibit): Add docstring.
+
+2019-01-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * doc/lispref/commands.texi (Adjusting Point): Bug#33662
+
+        Tweak text to clarify intangibility.
+
+2019-01-07  Michael Albinus  <michael.albinus@gmx.de>
+
+        Tramp multi-hop methods must be inline
+
+        * doc/misc/tramp.texi (Ad-hoc multi-hops): Involved methods must
+        be inline methods.
+
+2019-01-07  Ari Roponen  <ari.roponen@gmail.com>
+
+        Fix scaling problem in Cairo builds
+
+        * src/xterm.c (x_begin_cr_clip) [USE_GTK]:
+        (x_update_begin) [USE_CAIRO && USE_GTK]: Support scaling.
+        (Bug#33442)
+
+2019-01-07  Juri Linkov  <juri@linkov.net>
+
+        * lisp/simple.el (next-line-or-history-element): Use current-column
+
+        in all position calculations.
+        (previous-line-or-history-element): Idem.  (Bug#33640)
+
+2019-01-07  Martin Rudalics  <rudalics@gmx.at>
+
+        A few further fixes of window internals description
+
+        * doc/lispref/internals.texi (Window Internals): Add a few
+        more items and clarify description of some others.
+
+2019-01-07  Eli Zaretskii  <eliz@gnu.org>
+
+        Revert "Revert "Fix infloop in GC mark_kboards""
+
+        This reverts commit c418c85617babbe7b63730fefb71e2c87a0141af.
+        This reinstates the original fix, as it had nothing to do
+        with the behavior reported in bug#33571, which seems to be
+        the expected behavior.
+
+2019-01-07  Eli Zaretskii  <eliz@gnu.org>
+
+        Revert "Fix infloop in GC mark_kboards"
+
+        This reverts commit af914fc26db273d8788e7efa57c569f0f778d037,
+        since it caused unintended adverse effects on echoing of keys.
+        (Bug#33571)
+
+2019-01-07  Glenn Morris  <rgm@gnu.org>
+
+        * lisp/emacs-lisp/subr-x.el (if-let, when-let): Doc fix: active voice.
+
+2019-01-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix infloop in GC mark_kboards
+
+        Do not merge to master, as I have a more systematic fix there.
+        * src/keyboard.c (mark_kboards): Fix infloop (Bug#33547).
+
+2019-01-07  Alan Third  <alan@idiocy.org>
+
+        Fix macOS run-time feature check
+
+        * src/nsterm.m (x_set_parent_frame) [NS_IMPL_COCOA]: Fix run-time
+        feature check.
+
+2019-01-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * etc/NEWS-*: Fix capitalization of "Emacs"
+
+2019-01-07  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix "M-x man" when there's no 'man' program on PATH
+
+        * lisp/man.el (Man-bgproc-sentinel): Make sure the process
+        buffer is not read-only when inserting a message into it.
+        (Bug#33510)
+
+2019-01-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix core dump in dbus-message-internal
+
+        Backport from master.
+        * src/dbusbind.c (Fdbus_message_internal):
+        Don’t go past array end (Bug#33530).
+
+2019-01-07  Michael Albinus  <michael.albinus@gmx.de>
+
+        * doc/misc/dbus.texi (Type Conversion): Fix typo.  (Bug#33551)
+
+2019-01-07  Eli Zaretskii  <eliz@gnu.org>
+
+        Improve documentation of gdb-mi.el
+
+        * lisp/progmodes/gdb-mi.el (gdb-show-changed-values)
+        (gdb-max-children): Doc fixes.
+
+        * doc/emacs/building.texi (Source Buffers, Stack Buffer)
+        (GDB User Interface Layout): Mention some additional
+        customizable variables.  (Bug#33548)
+
+2019-01-07  Thomas Fitzsimmons  <fitzsim@fitzsim.org>
+
+        LDAP: Set process-connection-type to t on Darwin
+
+        * lisp/net/ldap.el (ldap-search-internal): Set
+        process-connection-type to t on Darwin.  Do not merge to
+        master.  (Bug#33050)
+
+2019-01-07  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix a typo in a doc string
+
+        * lisp/emacs-lisp/map-ynp.el (read-answer-short): Fix typo.
+        (Bug#33528)
+
+2019-01-07  Eli Zaretskii  <eliz@gnu.org>
+
+        Minor markup fix in frames.texi
+
+        * doc/lispref/frames.texi (Frame Layout): Fix markup of @table
+        entries.  (Bug#33531)
+
+2019-01-07  Glenn Morris  <rgm@gnu.org>
+
+        * lisp/net/trampver.el (customize-package-emacs-version-alist):
+        Add 2.3.3.
+
+        * lisp/mh-e/mh-e.el (customize-package-emacs-version-alist): Additions.
+
+2019-01-07  Glenn Morris  <rgm@gnu.org>
+
+        * lisp/emacs-lisp/map-ynp.el (map-y-or-n-p): Pass format to message.
+
+2019-01-07  Robert Pluim  <rpluim@gmail.com>
+
+        Don't call xwidget functions until GTK has been initialized
+
+        Follow up fix to Bug#33294.
+
+        * src/gtkutil.c: Define xg_gtk_initialized.
+        (xg_initialize): Set it when GTK has finished initializing.
+
+        * src/gtkutil.h: Declare xg_gtk_initialized.
+
+        * src/xwidget.c (Fmake_xwidget): Error out if GTK has not been
+        initialized.
+        (xwidget_init_view): Likewise.
+
+2019-01-07  Eli Zaretskii  <eliz@gnu.org>
+
+        Improve documentation of Ediff wordwise commands
+
+        * lisp/vc/ediff.el (ediff-windows-wordwise)
+        (ediff-windows-linewise, ediff-regions-wordwise): Update and
+        clarify the doc strings.
+
+        * doc/misc/ediff.texi (Major Entry Points): Update and clarify
+        the documentation of 'ediff-windows-wordwise' and
+        'ediff-regions-wordwise'.  See the discussion starting at
+        https://lists.gnu.org/archive/html/help-gnu-emacs/2018-11/msg00197.html
+        for the details.
+
+2019-01-07  Eli Zaretskii  <eliz@gnu.org>
+
+        Support Hunspell 1.7.0 in ispell.el
+
+        * lisp/textmodes/ispell.el
+        (ispell-find-hunspell-dictionaries): Invoke Hunspell with an
+        additional command-line argument, to work around a misfeature
+        in Hunspell 1.7.0 that prevents it from reporting the loaded
+        dictionary.  (Bug#33493)
+
+2019-01-07  Eli Zaretskii  <eliz@gnu.org>
+
+        Avoid clearing echo-area message by auto-save-visited-file-name
+
+        * lisp/emacs-lisp/map-ynp.el (map-y-or-n-p): Record the
+        previous echo-area message, if any, and restore it before
+        exiting.  (Bug#33490)
+
+2019-01-07  Alan Third  <alan@idiocy.org>
+
+        Set tooltip text color (bug#33452)
+
+
+        * src/nsmenu.m: ([EmacsTooltip init]): Set text color to black.
+
+2019-01-07  Alan Third  <alan@idiocy.org>
+
+        Fix more drawing bugs in NS port (bug#32932)
+
+        * src/nsterm.m (ns_row_rect): New function.
+        (ns_clip_to_row): Remove function.
+        (ns_copy_bits): Fix mistake.
+        (ns_shift_glyphs_for_insert): Mark the frame as dirty instead of
+        directly copying.
+        (ns_draw_fringe_bitmap): Stop using ns_clip_to_row.
+        (ns_draw_window_cursor): Stop using ns_clip_to_row and perform a
+        display when not in redisplay.
+        (ns_update_window_begin): Remove redundant code that never executes.
+        ([EmacsView drawRect:]): Show the rectangle being exposed in NSTRACE.
+        * src/xdisp.c (expose_window_tree) [HAVE_NS]:
+        (expose_frame) [HAVE_NS]: Redraw even if the frame is garbaged.
+
+2019-01-07  Alan Mackenzie  <acm@muc.de>
+
+        Fix bug #33416, where typing a ) in a comment at EOB caused a loop (CC Mode).
+
+        * lisp/progmodes/cc-mode.el (c-fl-decl-start): A c-forward-syntactic-ws leaves
+        point inside whitespace when moving over a comment at EOB which has no
+        terminating LF.  Check this possibility and correct for it.
+
+2019-01-07  Ulrich Müller  <ulm@gentoo.org>
+
+        Update the calc units table
+
+        On 2018-11-16, the 26th meeting of the General Conference on Weights
+        and Measures (CGPM) has redefined the International System of Units by
+        adopting fixed values for the Planck constant, the elementary charge,
+        the Boltzmann constant, and the Avogadro constant:
+        https://www.bipm.org/utils/en/pdf/CGPM/Draft-Resolution-A-EN.pdf
+
+        * lisp/calc/calc-units.el (math-standard-units): Update according
+        to redefinition of the SI in 2018.  (Bug#33412)
+
+2019-01-07  Eli Zaretskii  <eliz@gnu.org>
+
+        Improve indexing in the ELisp manual
+
+        * doc/lispref/control.texi (Control Structures, Sequencing)
+        (Conditionals, Iteration, Catch and Throw, Handling Errors)
+        (Cleanups):
+        * doc/lispref/eval.texi (Self-Evaluating Forms)
+        (Symbol Forms, Function Forms, Macro Forms, Special Forms)
+        (Quoting, Backquote): Add index entries that begin with
+        "forms".  (Bug#33440)
+
+2019-01-07  Eli Zaretskii  <eliz@gnu.org>
+
+        More Symbola-related extensions for default fontset
+
+        * lisp/international/fontset.el (setup-default-fontset): Add
+        few more blocks of symbols and punctuation supported by latest
+        Symbola.
+
+2019-01-07  Eli Zaretskii  <eliz@gnu.org>
+
+        Better support for display of U+1F900..U+1F9FF block
+
+        * lisp/international/fontset.el (setup-default-fontset): Add
+        the [#x1F900..#x1F9FF] block to those supported by Symbola.
+
+2019-01-07  Eli Zaretskii  <eliz@gnu.org>
+
+        Improve documentation of 'edit-abbrevs-mode'
+
+        * lisp/abbrev.el (edit-abbrevs-mode): Refer to 'edit-abbrevs'
+        for more detailed usage information.  (Bug#33443)
+        (edit-abbrevs): Doc fix.
+
+2019-01-07  Eli Zaretskii  <eliz@gnu.org>
+
+        Improve documentation of 'dired-do-compress'
+
+        * lisp/dired-aux.el (dired-do-compress): Describe in the doc
+        string the effect on directories and on compressed archive.
+        (Bug#33450)
+
+2019-01-07  Eli Zaretskii  <eliz@gnu.org>
+
+        Improve doc string and display of 'describe-character'
+
+        * lisp/descr-text.el (describe-char): Explain how does the
+        function obtain the various data about the character.  Don't
+        display "preferred" before "charset": it tends to confuse
+        people.
+
+2019-01-07  Eli Zaretskii  <eliz@gnu.org>
+
+        * etc/NEWS: Clarify what 'Z' does in Dired.  (Bug#33450)
+
+2019-01-07  Eli Zaretskii  <eliz@gnu.org>
+
+        Update the docs of object internals
+
+        * doc/lispref/internals.texi (Buffer Internals)
+        (Window Internals, Process Internals): Update the descriptions
+        of Lisp objects.
+
+2019-01-07  Stephen Berman  <stephen.berman@gmx.net>
+
+        Fix two Edebug defcustoms (bug#33428)
+
+        * lisp/emacs-lisp/edebug.el (edebug-print-length)
+        (edebug-print-level): Fix customization type to allow setting
+        the documented valid value nil via the Customize interface.
+
+2019-01-07  Michael Albinus  <michael.albinus@gmx.de>
+
+        Fix Bug#33141
+
+        * lisp/net/tramp.el (tramp-make-tramp-file-name): Avoid check for
+        empty method with simplified `tramp-syntax'.  (Bug#33141)
+
+2019-01-07  Eli Zaretskii  <eliz@gnu.org>
+
+        Improve documentation of the window tree
+
+        * doc/lispref/windows.texi (Windows and Frames): More accurate
+        wording regarding the relation of a mini-window to its frame's
+        window tree.
+
+        * src/window.h (struct window): Improve commentary to some
+        fields.
+
+2019-01-07  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix window scrolling on TTY frames when there's no mode line
+
+        * src/window.c (window_internal_height): Remove tests for
+        next, prev, and parent pointers, as they are unrelated to
+        whether a window has a mode line.  (Bug#33363)
+
+2019-01-07  Eli Zaretskii  <eliz@gnu.org>
+
+        Fix decoding XML files encoded in ISO-8859
+
+        * lisp/international/mule.el (sgml-xml-auto-coding-function):
+        Avoid signaling an error from coding-system-equal when the XML
+        encoding tag specifies an encoding whose type is 'charset'.
+        (Bug#33429)
+
+2019-01-07  Nicolas Petton  <nicolas@petton.fr>
+
+        * etc/AUTHORS: Update.
 2019-01-03  Andrey Kotlarski  <m00naticus@gmail.com>
 
         Fix EBROWSE parsing of classes declared final
@@ -63457,7 +64189,7 @@
 
 This file records repository revisions from
 commit 9d56a21e6a696ad19ac65c4b405aeca44785884a (exclusive) to
-commit 72525076996cd709086b1afb47ab0d095322e9b7 (inclusive).
+commit 2cf20b67cf6836dd7bd80077042068afa0d7b04f (inclusive).
 See ChangeLog.1 for earlier changes.
 
 ;; Local Variables:
diff --git a/etc/AUTHORS b/etc/AUTHORS
index 07cdf0acfcf..0f4ec253dc1 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -109,8 +109,8 @@ Alan Shutko: changed diary-lib.el calendar.el bindings.el cal-hebrew.el
 Alan Third: wrote dabbrev-tests.el
 and changed nsterm.m nsfns.m nsterm.h nsmenu.m frame.el macfont.m
   nsimage.m ns-win.el Info.plist.in conf_post.h frame.c frame.h
-  frames.texi keyboard.c macfont.h macos.texi picture.el rect.el
-  battery.el callproc.c configure.ac and 12 other files
+  frames.texi keyboard.c macfont.h macos.texi picture.el rect.el xdisp.c
+  battery.el callproc.c and 12 other files
 
 Alastair Burt: changed gnus-art.el smiley.el
 
@@ -366,8 +366,8 @@ Antonin Houska: changed newcomment.el
 Arash Esbati: changed reftex-vars.el reftex.el reftex-auc.el
   reftex-ref.el
 
-Ari Roponen: changed atimer.c doc.c hash.texi image.c mule.texi
-  package.el startup.el subr.el svg.el time-date.el woman.el xterm.c
+Ari Roponen: changed xterm.c atimer.c doc.c hash.texi image.c mule.texi
+  package.el startup.el subr.el svg.el time-date.el woman.el
 
 Arisawa Akihiro: changed characters.el coding.c epa-file.el japan-util.el
   language/tibetan.el message.el mm-decode.el mm-view.el ps-print.el
@@ -673,7 +673,7 @@ Chao-Hong Liu: changed TUTORIAL.cn TUTORIAL.zh
 Charles A. Roelli: changed nsterm.m display.texi isearch.el nsfns.m
   nsterm.h org-clock.el search.texi simple.el DEBUG INSTALL add-log.el
   anti.texi buffers.texi comint.el data.c diff-mode.el eldoc.el files.el
-  fill.el find-func.el flymake.el and 19 other files
+  fill.el find-func.el flymake.el and 21 other files
 
 Charles Hannum: changed aix3-1.h aix3-2.h configure ibmrs6000.h
   keyboard.c netbsd.h pop.c sysdep.c systime.h systty.h xrdb.c
@@ -699,11 +699,12 @@ and co-wrote longlines.el tango-dark-theme.el tango-theme.el
 and changed simple.el display.texi xdisp.c files.el frames.texi
   cus-edit.el files.texi custom.el subr.el text.texi faces.el keyboard.c
   startup.el package.el misc.texi emacs.texi modes.texi mouse.el
-  custom.texi image.c window.el and 935 other files
+  custom.texi image.c window.el and 936 other files
 
 Chris Chase: co-wrote idlw-shell.el idlwave.el
 
-Chris Feng: changed dispnew.c autoload.el frame.c process.c
+Chris Feng: changed dispnew.c autoload.el frame.c keyboard-tests.el
+  keyboard.c process.c
 
 Chris Foote: changed progmodes/python.el
 
@@ -1293,7 +1294,7 @@ and co-wrote color.el
 and changed cus-edit.el dired.el faces.el files.el help-mode.el imenu.el
   info.el isearch.el ls-lisp.el menu-bar.el modes.texi mouse.el
   ange-ftp.el apropos.el bindings.el bookmark.el custom.el descr-text.el
-  dired.texi etags.el finder.el and 14 other files
+  dired.texi etags.el finder.el and 15 other files
 
 E. Choroba: changed simple.el
 
@@ -1347,8 +1348,8 @@ Eli Zaretskii: wrote [bidirectional display in xdisp.c]
   tty-colors.el
 and changed xdisp.c msdos.c w32.c display.texi w32fns.c simple.el
   files.el fileio.c keyboard.c w32proc.c files.texi w32term.c text.texi
-  dispnew.c emacs.c frames.texi dispextern.h lisp.h process.c term.c
-  window.c and 1121 other files
+  dispnew.c frames.texi emacs.c dispextern.h lisp.h process.c term.c
+  window.c and 1124 other files
 
 Emanuele Giaquinta: changed configure.ac rxvt.el charset.c etags.c
   fontset.c frame.el gnus-faq.texi loadup.el lread.c sh-script.el
@@ -1433,7 +1434,7 @@ and changed c.srt ede.texi info.el rmail.el speedbspec.el cedet.el
   ede-autoconf.srt ede-make.srt eieio.texi gud.el sb-dir-minus.xpm
   sb-dir-plus.xpm sb-dir.xpm sb-mail.xpm sb-pg-minus.xpm sb-pg-plus.xpm
   sb-pg.xpm sb-tag-gt.xpm sb-tag-minus.xpm sb-tag-plus.xpm
-  sb-tag-type.xpm and 33 other files
+  sb-tag-type.xpm and 34 other files
 
 Eric Schulte: wrote ob-asymptote.el ob-awk.el ob-calc.el ob-comint.el
   ob-coq.el ob-css.el ob-ditaa.el ob-dot.el ob-emacs-lisp.el ob-eval.el
@@ -1734,7 +1735,7 @@ and changed configure.ac Makefile.in src/Makefile.in calendar.el
   diary-lib.el lisp/Makefile.in files.el rmail.el make-dist
   progmodes/f90.el bytecomp.el simple.el authors.el admin.el emacs.texi
   misc/Makefile.in startup.el lib-src/Makefile.in ack.texi display.texi
-  cal-menu.el and 1680 other files
+  cal-menu.el and 1682 other files
 
 Glynn Clements: wrote gamegrid.el snake.el tetris.el
 
@@ -2545,7 +2546,7 @@ Juri Linkov: wrote files-x.el misearch.el replace-tests.el
 and changed isearch.el info.el replace.el simple.el progmodes/grep.el
   dired.el dired-aux.el progmodes/compile.el startup.el faces.el files.el
   menu-bar.el bindings.el display.texi descr-text.el desktop.el comint.el
-  image-mode.el ispell.el man.el cus-edit.el and 359 other files
+  image-mode.el ispell.el man.el cus-edit.el and 360 other files
 
 Jussi Lahdenniemi: changed w32fns.c ms-w32.h msdos.texi w32.c w32.h
   w32console.c w32heap.c w32inevt.c w32term.h
@@ -2567,7 +2568,7 @@ and co-wrote longlines.el tramp-sh.el tramp.el
 and changed message.el gnus-agent.el gnus-sum.el files.el nnmail.el
   tramp.texi nntp.el gnus.el simple.el ange-ftp.el dired.el paragraphs.el
   bindings.el files.texi gnus-art.el gnus-group.el man.el INSTALL
-  Makefile.in crisp.el fileio.c and 44 other files
+  Makefile.in crisp.el fileio.c and 45 other files
 
 Kailash C. Chowksey: changed HELLO ind-util.el kannada.el knd-util.el
   lisp/Makefile.in loadup.el
@@ -2915,7 +2916,7 @@ and changed octave.el ido.el rcirc.el files.el subr.el lisp-mode.el
   eldoc.el simple.el flymake.el smie.el abbrev.el progmodes/python.el
   cfengine.el cl-extra.el cl-macs.el emacs-lisp/cl-lib.el fns.c
   progmodes/compile.el register.el rng-valid.el thingatpt.el
-  and 165 other files
+  and 166 other files
 
 Leonard H. Tower Jr.: changed rnews.el rnewspost.el emacsbug.el
   rmailout.el sendmail.el
@@ -2954,7 +2955,7 @@ Luc Teirlinck: wrote help-at-pt.el
 and changed files.el autorevert.el cus-edit.el subr.el simple.el
   frames.texi startup.el display.texi files.texi dired.el comint.el
   modes.texi custom.texi emacs.texi fns.c frame.el ielm.el minibuf.texi
-  variables.texi buffers.texi commands.texi and 212 other files
+  variables.texi buffers.texi commands.texi and 213 other files
 
 Ludovic Courtès: wrote nnregistry.el
 and changed configure.ac gnus.texi loadup.el
@@ -3159,7 +3160,7 @@ Martin Pohlack: changed iimage.el pc-select.el
 Martin Rudalics: changed window.el window.c windows.texi frame.c
   frames.texi w32fns.c xdisp.c xterm.c w32term.c frame.el xfns.c help.el
   buffer.c display.texi cus-start.el dispnew.c frame.h mouse.el nsfns.m
-  window.h gtkutil.c and 201 other files
+  window.h gtkutil.c and 202 other files
 
 Martin Stjernholm: wrote cc-bytecomp.el
 and co-wrote cc-align.el cc-cmds.el cc-compat.el cc-defs.el cc-engine.el
@@ -3282,7 +3283,7 @@ and changed tramp.texi tramp-adb.el trampver.el trampver.texi dbusbind.c
   file-notify-tests.el ange-ftp.el files.el dbus.texi files.texi
   autorevert.el tramp-fish.el kqueue.c tramp-gw.el tramp-imap.el os.texi
   configure.ac lisp.h gfilenotify.c inotify.c keyboard.c
-  and 221 other files
+  and 222 other files
 
 Michael Ben-Gershon: changed acorn.h configure.ac riscix1-1.h riscix1-2.h
   unexec.c
@@ -3348,7 +3349,7 @@ Michael Olson: changed erc.el erc-backend.el Makefile erc-track.el
   erc-log.el erc-stamp.el erc-autoaway.el erc-dcc.el erc-goodies.el
   erc-list.el erc-compat.el erc-identd.el erc.texi ERC-NEWS erc-bbdb.el
   erc-match.el erc-notify.el erc-ibuffer.el erc-services.el remember.el
-  erc-button.el and 55 other files
+  erc-button.el and 56 other files
 
 Michael Piotrowski: changed gnus-art.el gnus-sum.el ps-print.el
 
@@ -3739,9 +3740,9 @@ and changed imenu.el make-mode.el
 Paul Eggert: wrote rcs2log
 and co-wrote cal-dst.el
 and changed lisp.h configure.ac alloc.c process.c fileio.c editfns.c
-  xdisp.c sysdep.c image.c keyboard.c emacs.c xterm.c data.c lread.c
+  xdisp.c sysdep.c keyboard.c image.c emacs.c xterm.c data.c lread.c
   fns.c callproc.c Makefile.in gnulib.mk eval.c buffer.c frame.c
-  and 1598 other files
+  and 1600 other files
 
 Paul Fisher: changed fns.c
 
@@ -3976,7 +3977,7 @@ Rafael Sepúlveda: changed TUTORIAL.es
 
 Raffael Mancini: changed misc.el
 
-Raimon Grau: changed thingatpt.el
+Raimon Grau: changed replace.el thingatpt.el
 
 Rainer Orth: changed gtkutil.c lisp/Makefile.in
 
@@ -4115,7 +4116,7 @@ Rick Frankel: changed ox-html.el ob-sql.el org.texi
 Rick Sladkey: wrote backquote.el
 and changed gud.el intervals.c intervals.h simple.el
 
-Rob Browning: changed tls.el configure.ac
+Rob Browning: changed tls.el configure.ac ibuffer-tests.el tramp-tests.el
 
 Rob Christie: changed nsmenu.m
 
@@ -4144,10 +4145,10 @@ Roberto Rodríguez: changed ada-mode.texi glossary.texi widget.texi
 
 Robert P. Goldman: changed org.texi ob-exp.el org.el ox-latex.el
 
-Robert Pluim: changed configure.ac files.texi gtkutil.c dired-x.texi
-  misc.texi vc-git.el xfns.c xterm.c bindings.el desktop.el efaq.texi
-  epa.texi filelock.c font.c ftfont.c gnus-agent.el gnus-demon.el
-  gnus.texi ido.el image-mode.el mail-source.el and 15 other files
+Robert Pluim: changed gtkutil.c configure.ac files.texi dired-x.texi
+  ftfont.c misc.texi vc-git.el xfns.c xterm.c bindings.el desktop.el
+  efaq.texi epa.texi filelock.c font.c ftcrfont.c gnus-agent.el
+  gnus-demon.el gnus.texi gtkutil.h ido.el and 19 other files
 
 Robert Thorpe: changed cus-start.el indent.el
 
@@ -4530,7 +4531,7 @@ and changed todo-mode.texi diary-lib.el dired-tests.el doc-view.el
   files.el minibuffer.el wdired-tests.el dired.el frames.texi hl-line.el
   info.el menu-bar.el mouse.el otodo-mode.el subr.el .gitattributes
   allout.el artist.el compile.texi cus-start.el descr-text.el
-  and 41 other files
+  and 43 other files
 
 Stephen C. Gilardi: changed configure.ac
 
@@ -4551,8 +4552,8 @@ and changed time-stamp.el mh-e.el mh-comp.el mh-utils.el mh-customize.el
 Stephen J. Turnbull: changed ediff-init.el strings.texi subr.el
 
 Stephen Leake: wrote elisp-mode-tests.el
-and changed ada-mode.el ada-xref.el elisp-mode.el mode-local.el xref.el
-  CONTRIBUTE vc-mtn.el window.el ada-mode.texi ada-prj.el cedet-global.el
+and changed ada-mode.el ada-xref.el elisp-mode.el mode-local.el window.el
+  xref.el CONTRIBUTE vc-mtn.el ada-mode.texi ada-prj.el cedet-global.el
   ede/generic.el ada-stmt.el cl-generic.el ede/locate.el files.texi
   project.el windows.texi INSTALL.REPO INSTALL.W64 align.el
   and 21 other files
@@ -4696,7 +4697,7 @@ Teodor Zlatanov: wrote auth-source.el gnus-registry.el gnus-tests.el
 and changed spam.el gnus.el nnimap.el gnus.texi gnutls.c gnus-sum.el
   auth.texi cfengine.el gnus-sync.el gnus-util.el gnus-start.el netrc.el
   gnutls.h message.el spam-stat.el encrypt.el mail-source.el nnir.el
-  nnmail.el auth-source-tests.el configure.ac and 120 other files
+  nnmail.el auth-source-tests.el configure.ac and 121 other files
 
 Terje Rosten: changed xfns.c version.el xterm.c xterm.h
 
@@ -4956,9 +4957,9 @@ and changed org-gnus.el smime.el
 Ulrich Leodolter: changed w32proc.c
 
 Ulrich Müller: changed configure.ac lib-src/Makefile.in src/Makefile.in
-  version.el doctor.el emacs.1 files.el gamegrid.el gud.el server.el
-  ChgPane.c ChgSel.c HELLO INSTALL Makefile.in XMakeAssoc.c authors.el
-  bytecomp.el calc-units.el case-table.el configure and 39 other files
+  version.el calc-units.el doctor.el emacs.1 files.el gamegrid.el gud.el
+  server.el ChgPane.c ChgSel.c HELLO INSTALL Makefile.in XMakeAssoc.c
+  authors.el bytecomp.el case-table.el configure and 39 other files
 
 Ulrich Neumerkel: changed xterm.c
 
diff --git a/lisp/textmodes/mhtml-mode.el b/lisp/textmodes/mhtml-mode.el
index 4c125ab2c67..7de24c783f0 100644
--- a/lisp/textmodes/mhtml-mode.el
+++ b/lisp/textmodes/mhtml-mode.el
@@ -23,12 +23,10 @@
 
 (eval-and-compile
   (require 'cl-lib)
-  (require 'flyspell)
   (require 'sgml-mode))
 (require 'js)
 (require 'css-mode)
 (require 'prog-mode)
-(require 'font-lock)
 
 (defcustom mhtml-tag-relative-indent t
   "How <script> and <style> bodies are indented relative to the tag.
@@ -350,6 +348,8 @@ This is used by `mhtml--pre-command'.")
       ;; HTML.
       (sgml-indent-line))))
 
+(declare-function flyspell-generic-progmode-verify "flyspell")
+
 (defun mhtml--flyspell-check-word ()
   (let ((submode (get-text-property (point) 'mhtml-submode)))
     (if submode