X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/ed19f207449c43f7f08285ada87ae7a46c61c8d1..1048151cc4bec79f7310f4f2ede309889822a6bb:/ChangeLog.2 diff --git a/ChangeLog.2 b/ChangeLog.2 index b2dc6c5dd3..cd29f92e99 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -1,9550 +1,17743 @@ -2016-03-02 Michael Albinus +2016-06-19 Stefan Monnier - Fix Bug#22859 + * lisp/emacs-lisp/macroexp.el (macroexp--expand-all): Fix (bug#19704) - * lisp/filenotify.el (file-notify-callback): Return a `deleted' - event in case of kqueue and file1 is nil. (Bug#22859) + Don't rewrite (funcall 'f ...) to (f ...). -2016-03-01 Eli Zaretskii +2016-06-19 Phillip Lord - Fix reordering of bidi text in an isolate inside an override + Restore initial undo boundary with viper - * src/bidi.c (bidi_resolve_explicit): Override the orig_type value - of FSI with either LRI or RLI, as determined by the first strong - directional character in the isolate. This prevents failure to - isolate when the FSI...PDI text is inside a directional override. - (Bug#22786) + * lisp/emulation/viper-cmd.el (viper-adjust-undo): Add back last undo + boundary if it has been removed. -2016-03-01 Alan Mackenzie + Addresses Bug#22295. - Document c-guess-basic-syntax in the CC Mode manual. +2016-06-19 Phillip Lord - * doc/misc/cc-mode.texi (Syntactic Analysis): Document the function, adding - pxrefs to Custom Line-Up and Other Indentation. - (Custom Line-Up): Add a note on using c-guess-basic-syntax with a pxref to - Syntactic Analysis. + Revert "Fix viper undo breakage from undo-boundary changes" -2016-03-01 Michael Albinus + This reverts commit c0139e32f1f3bb287b04e02a69a7848d6a040003. - Fix targets in test/automated/Makefile.in +2016-06-19 Ken Brown - * test/automated/Makefile.in: Use $(SELECTOR_DEFAULT) also for - empty target and target all. + Fix dbus crash on 32-bit Cygwin -2016-03-01 Leo Liu + * src/dbusbind.c (Fdbus__init_bus): Use make_save_pointer to store + connection address. (Bug#23741) + (xd_lisp_dbus_to_dbus): Use XSAVE_POINTER to retrieve connection + address. - Comment on last change to define-derived-mode +2016-06-19 Nicolas Petton - * lisp/emacs-lisp/derived.el (define-derived-mode): Add comment. + Bump version to 25.0.95 -2016-03-01 Lars Ingebrigtsen + * README: + * configure.ac: + * lisp/ldefs-boot.el: + * msdos/sed2v2.inp: Bump Emacs version to 25.0.95. - Allow binding `url-mime-accept-string' +2016-06-19 Nicolas Petton - * lisp/url/url-http.el (url-http): Allow binding - `url-mime-accept-string' (bug#22855). + * etc/AUTHORS: Update the AUTHORS file - Backport: +2016-06-19 Nicolas Petton - (cherry picked from commit 144bb0cf322b9756d29def3e27a42303e2edce43) + add entries to authors.el -2016-03-01 Lars Ingebrigtsen + * admin/authors.el (authors-renamed-files-alist): Add char-fold files. - Also allow setting the paragraph direction to nil +2016-06-19 Jules Tamagnan - * lisp/net/eww.el (eww-toggle-paragraph-direction): Also allow - setting the paragraph direction to nil ("auto"). + Fix eldoc-related freezes in python mode -2016-02-29 Anders Lindgren + * lisp/progmodes/python.el (python-eldoc-get-doc): New defvar. + (python-eldoc-function-timeout) + (python-eldoc-function-timeout-permanent): New defcustoms. + (python-eldoc-function): If python-eldoc--get-doc-at-point times + out, effectively turn off ElDoc in current buffer. (Bug#23609) - Made the new OS X visible bell more visible. +2016-06-19 Martin Rudalics - * src/nsterm.m: (EmacsBell:init:) Scaled up the visible bell - "caution" image five times, as the image in its original size - was hard to see. + Handle mouse leaving initial window in `mouse-set-region' (Bug#23707) -2016-02-29 Lars Ingebrigtsen + * lisp/mouse.el (mouse-set-region): If the mouse ends up in + another window or on the menu bar, use `window-point' of + selected window instead of `posn-point' of the event end + (Bug#23707). - Use the correct background color when filling nested +2016-06-19 Marco Wahl - * lisp/net/shr.el (shr-face-background): Return the first - background, because that's the one that's visible (bug#22680). + org.el: Fix bindings of < and > for calendar scrolling - Backport: + [This patch taken from upstream Org repo with 8b63dc9 dated + 2014-10-20 (Bug#23725).] + * lisp/org/org.el (org-read-date-minibuffer-local-map): + Switch to the current calendar API for scrolling the calendar. - (cherry picked from commit cad0bc70558f9c28c808711c5295dec9fc5ad6e5) +2016-06-19 Phillip Lord -2016-02-29 Lars Ingebrigtsen + Fix undo boundary in recursive edit (Bug#23632) - Make
in
  • not insert extra newlines + * src/keyboard.c (recursive_edit_1): specbind + undo-auto--undoably-changed-buffers. + * lisp/simple.el (undo-auto--undoably-changed-buffers): + fix docstring. - * lisp/net/shr.el (shr-tag-div): Make
    in
  • not insert - extra newlines (bug#19587). +2016-06-19 Glenn Morris - Backport: + Doc fixes re alist-get. (Bug#23548) - (cherry picked from commit 379a846b8548dc32a9019ef0a37c02f62cd9bad1) + * lisp/subr.el (alist-get): Doc fix. + * doc/lispref/lists.texi (Association Lists): Improve alist-get. -2016-02-29 Dmitry Gutov +2016-06-19 Glenn Morris - Uncomment the next-error-function integration in xref + * lisp/progmodes/python.el (inferior-python-mode): + Avoid tabs. (Bug#23616) - * lisp/progmodes/xref.el (xref--xref-buffer-mode): - Uncomment the next-error-function integration - (http://debbugs.gnu.org/cgi/bugreport.cgi?bug=20489#110). + * src/syntax.c (syms_of_syntax) : Doc fix. -2016-02-29 Dmitry Gutov +2016-06-19 Tino Calancha - Remove the word "valid", to avoid ambiguity + * lisp/help-fns.el (describe-function-1): + Fix handling of file name for aliases. (Bug#21950) - * doc/emacs/maintaining.texi (Identifier Search) - (Looking Up Identifiers): Remove the word "valid" (bug#22692). + * lisp/emacs-lisp/cl-macs.el (cl-loop): Doc fix re "by". -2016-02-28 Michael Albinus + * doc/misc/cl.texi (Mapping over Sequences): Fix cl-notevery. - Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25 +2016-06-19 Paul Eggert -2016-02-28 Michael Albinus + Fix crash in syntax.c after GC - Set auto-revert-use-notify to nil in global-auto-revert-mode. (Bug#22814) + Problem reported by Vincent Belaïche (Bug#23704). + * src/syntax.c (skip_chars): Recompute pointers into the + buffer after every call to update_syntax_table_forward, + as it can GC. - * etc/NEWS: - * etc/PROBLEMS: Mention this. +2016-06-19 Dmitry Gutov - * lisp/autorevert.el (global-auto-revert-mode): Set - `auto-revert-use-notify' to nil. (Bug#22814) + Improve squiggly heredoc support in non-SMIE Ruby mode -2016-02-28 Paul Eggert + * lisp/progmodes/ruby-mode.el (ruby-parse-partial): Support + squiggly heredocs here, too (port from upstream). - * etc/TODO: Minor quoting and grammar fixes. +2016-06-19 Stephen Berman -2016-02-28 Friedrich Beckmann (tiny change) + Fix doc string quoting - Fix ModelSim error parsing + * lisp/files.el (shell-quote-wildcard-pattern): + * lisp/progmodes/vhdl-mode.el (vhdl-mode): + * lisp/subr.el (replace-regexp-in-string): + * lisp/view.el (view-mode): + * src/nsfns.m (syms_of_nsfns): + * src/syntax.c (Fbackward_prefix_chars): + Fix quoting problems in doc strings (Bug#23696). - * lisp/progmodes/vhdl-mode.el (vhdl-compiler-alist): Fix - ModelSim error parsing (bug#5768). +2016-06-19 Martin Rudalics -2016-02-28 Lars Ingebrigtsen + Fix mouse dragging of vertical dividers with scroll bars on left (Bug#23690) - Make parse-time-string-chars faster + * lisp/mouse.el (mouse-drag-line): With scroll bars on the left + adjust trailing edge of window on the left when dragging the + vertical divider of the mode line. (Bug#23690) - * lisp/calendar/parse-time.el (parse-time-string-chars): Clean - up the code (backport:). +2016-06-19 Eli Zaretskii -2016-02-28 Lars Ingebrigtsen + * etc/PROBLEMS: Mention the link-time problems on FreeBSD 11. - Add a eww command to toggle paragraph direction + (Bug#23641) - * lisp/net/eww.el (eww-toggle-paragraph-direction): New - command and keystroke. +2016-06-19 Glenn Morris - * doc/misc/eww.texi (Advanced): Mention the `D' command. + * test/automated/viper-tests.el (viper-test-undo-kmacro): + Delete temp-file at end. -2016-02-27 Glenn Morris + * lisp/mail/footnote.el (footnote-mode): Fix doc typo. - * nextstep/WISHLIST: Merge into etc/TODO and remove. + * doc/misc/smtpmail.texi (Encryption): Fix 2012-12-22 typo. - * etc/TODO: Merge in items from nextstep/WISHLIST. - * nextstep/README: Update for this change. + * lisp/emacs-lisp/lisp-mode.el (lisp--mode-syntax-table): + Fix typo. (Bug#23654) -2016-02-27 Andreas Schwab +2016-06-19 Stefan Monnier - Fix char signedness issue in bidi code + * lisp/recentf.el (recentf-dialog-mode-map): Remove follow-link (bug#22434) - * src/dispextern.h (struct bidi_t): Change type of resolved_level - and isolate_level to signed char. (Bug#22830) +2016-06-19 Bill Wohler -2016-02-27 Andreas Schwab + Correct cl-flet usage (Bug#22317) - * lib-src/pop.c (socket_connection): Fix format string. + * mh-compat.el: Rename mh-cl-flet to mh-flet and convert alias to + macro using patch from Katsumi Yamaoka . + * mh-thread.el (mh-thread-set-tables): + * mh-show.el (mh-gnus-article-highlight-citation): + * mh-mime.el (mh-display-with-external-viewer): + (mh-mime-display, mh-press-button, mh-push-button): + (mh-display-emphasis): Call mh-flet instead of mh-cl-flet. -2016-02-27 Eli Zaretskii +2016-06-19 Bill Wohler - Avoid inflooping in thing-at-point-looking-at + Release MH-E manual version 8.6 - * lisp/thingatpt.el (thing-at-point-looking-at): Avoid inflooping - with regular expressions whose matching doesn't move point. - (Bug#22756) - Describe the argument DISTANCE in the doc string. + * doc/misc/mh-e.texi (VERSION, EDITION, UPDATED, UPDATE-MONTH): + Update for release 8.6. -2016-02-27 Leo Liu +2016-06-19 Mike Kupfer - * lisp/emacs-lisp/derived.el (define-derived-mode): Revert indent change. + Update MH-E's documentation about HTML renderers -2016-02-26 Michael Albinus + * doc/misc/mh-e.texi (HTML): Remove the footnote with the minimum Gnus + version (we are no longer trying to support multiple Emacs + releases). Sort the table of HTML renderers by name (the previous + ordering was based on a 10-year-old survey). Add shr and gnus-w3m to + the table. Remove the entry for w3 (no longer available). Update + existing entries so that they are more consistent about what features + are discussed, and to reflect recent testing (Debian 8). Small tweaks + to existing text. - etc/PROBLEMS: Mention problems with using file descriptors +2016-06-19 Dmitry Gutov - * etc/PROBLEMS: Mention problems with using file descriptors - of kqueue file notification library. + Fx the we->the typo -2016-02-26 Kaushal Modi + * doc/emacs/trouble.texi (Sending Patches): + Fix the typo (bug#23657). - * lisp/apropos.el (apropos-variable): Doc fix. (Bug#22813). +2016-06-19 Paul Eggert -2016-02-25 Eli Zaretskii + Restore frames into the current display by default - Remove unneeded workaround in xftfont.c + * lisp/desktop.el (desktop-restore-in-current-display): + Default to t, not nil (Bug#23604). + * etc/NEWS: Mention the change. - * src/xftfont.c (xftfont_open): Remove "dirty workaround" for - XftTextExtents8 behavior, as it is no longer needed. Suggested by - Fangwen Yu . (Bug#22383) +2016-06-19 Stefan Monnier -2016-02-25 Stefan Monnier + * lisp/recentf.el (recentf-open-files-item): Quick fix for (bug#22434). - * lisp/saveplace.el (save-place-local-mode): New minor mode + etc/TODO: Remove out-of-place issue - (toggle-save-place): Define as obsolete alias. - (save-place--setup-hooks): New function. - (save-place-mode): Use it. +2016-06-19 Eli Zaretskii -2016-02-25 Eli Zaretskii + Clarify doc string of 'file-name-sans-extension' - Fix redisplay on a TTY after 'make-frame' + * lisp/files.el (file-name-sans-extension, file-name-extension): + Clarify in the doc strings what is the extension, and which + leading period doesn't count. (Bug#23643) - * src/xdisp.c (clear_garbaged_frames): Don't clear/redraw a - garbaged TTY frame if it is not the selected frame. (Bug#22794) +2016-06-19 Eli Zaretskii -2016-02-25 Alan Mackenzie + Fix the MSDOS build - Make double-click-1 work with unbalanced parens in CC Mode. Fixes bug#5560. + * msdos/sed1v2.inp (PAXCTL_dumped, PAXCTL_notdumped): Define to + empty, and remove the lines which use them in recipes, as that + causes weird error message from Make and breaks the MSDOS build. - * lisp/mouse.el (mouse-start-end): check the syntax of alleged parens with - `syntax-after' to ensure syntax-table text properties are respected. +2016-06-19 Andreas Schwab -2016-02-25 Magnus Henoch + * lisp/progmodes/elisp-mode.el (elisp-function-argstring): Call + substitute-command-keys to undo help--docstring-quote. (Bug#23634) - Input method polish-slash should not use keyboard translation +2016-06-19 Eli Zaretskii - * lisp/leim/quail/latin-pre.el ("polish-slash"): Input method - polish-slash should not use keyboard translation (bug#19081). + * src/dired.c (Ffile_name_all_completions): Doc fix. (Bug#23631) -2016-02-25 Chris Feng +2016-06-19 Eli Zaretskii - Fix an assertion + Fix infloop in 'number-sequence' - * src/dispnew.c (clear_glyph_matrix_rows): Test matrix->nrows == 0 (which - implies start == 0) separately. + * lisp/subr.el (number-sequence): Avoid overflow leading to an + infloop. (Bug#23627) -2016-02-24 Eli Zaretskii + * test/automated/subr-tests.el (number-sequence-test): New test. - Fix 'toggle-save-place' +2016-06-19 Glenn Morris - * lisp/saveplace.el (toggle-save-place): Set up hooks necessary to - support save-place in the buffer. Autoload the command. + * lisp/emacs-lisp/find-func.el (find-function-library): -2016-02-24 Stefan Monnier + Update for symbol-function no longer erroring. (Bug#23626) - * src/keyboard.c: Don't inadvertently set immediate_echo (bug#22581) +2016-06-19 Glenn Morris - * src/keyboard.c (read_key_sequence): Don't inadvertently set - immediate_echo when we don't want any echo-keystrokes. - (echo_keystrokes_p): Move earlier. + * lisp/w32-fns.el (set-message-beep, w32-get-locale-info) + (w32-get-valid-locale-ids): Improve declarations. -2016-02-24 Chris Zheng (tiny change) +2016-06-19 Vincent Belaïche - Minor fixes in calculator.el + Correct old cell name unbinding when renaming cell. - * lisp/calculator.el (calculator-mode-map): Bind `E' for - `calculator-exp'. - (calculator-last-input): Fix a bug with pressing F1. - (Bug#20764) + Bug is to unbind old cell names when renaming a cell with + 'makunbound'. when the old cell name is of A1 type, then + 'kill-local-variable' must be used instead, so that only the current + spreadsheet is affected. When the old cell name is a renamed cell, + then 'ses--unbind-cell-name' must be used in order to remove the old + name from the name hashmap. -2016-02-24 Anders Lindgren + * ses.el (ses-rename-cell): check consistency of cell symbol from + text-property and from array object. Instead of 'makunbound', use + either 'ses--unbind-cell-name' or 'kill-local-variable' depending on + whether the cell old name is a named cell or an A1 type cell - Update HISTORY section in readme for the NextStep interface. +2016-06-19 Vincent Belaïche - * nextstep/README: Update HISTORY after suggestion - from former maintainer Adrian Robert. + Document problem: slow screen refresh on missing font. -2016-02-24 Eli Zaretskii + See discussion of bug#22519 for more on this. - Improve documentation of 'save-place-mode' +2016-06-19 Glenn Morris - * lisp/saveplace.el (toggle-save-place): Update the doc string wrt - turning on 'save-place-mode' globally. + * admin/admin.el (add-release-logs): Basic check of existing ChangeLog. - * etc/NEWS: Mention the need to call 'save-place-mode' for turning - on the mode in all buffers. +2016-06-19 Glenn Morris -2016-02-24 Chris Feng (tiny change) + * build-aux/gitlog-to-emacslog: Handle empty generated ChangeLog. - Allocate glyph matrices for the initial frame + This is relevant for M-x add-release-logs right after M-x authors. - * src/frame.c (make_initial_frame): Allocate glyph matrices (Bug#22787). +2016-06-19 Glenn Morris - * src/dispnew.c (clear_glyph_matrix_rows): matrix->nrows can be 0. + * admin/admin.el (add-release-logs): Generate ChangeLog if needed. -2016-02-24 Lars Ingebrigtsen +2016-06-19 Paul Eggert - Fix white space in last checkin + * doc/misc/texinfo.tex: Revert previous change (Bug#23611). -2016-02-24 Dima Kogan +2016-06-19 Glenn Morris - Make `insert-pair' always leave the cursor where documented + * admin/authors.el (authors): First update the ChangeLog. - * lisp/emacs-lisp/lisp.el (insert-pair): The docstring of - insert-pair states that after insertion, the point ends up - after the opening character. This was not true if the pair was - inserted to surround a region (bug#16949). + * admin/make-tarball.txt: Related updates. -2016-02-24 Kaushal Modi +2016-06-19 Dmitry Gutov - etc/NEWS: Mention the new second parameter to `package-install' + Rename vc-stay-local back to vc-cvs-stay-local - * etc/NEWS: Mention the new second parameter to - `package-install' (bug#22784). + * lisp/vc/vc-cvs.el (vc-cvs-stay-local): Rename back from + vc-stay-local (bug#19548). Improve the docstring. + (vc-cvs-stay-local-p): Update accordingly. -2016-02-24 John F. Trudeau (tiny change) +2016-06-19 Glenn Morris - Highlight assignments in Makefiles more correctly + * doc/emacs/files.texi (Comparing Files): + * doc/emacs/trouble.texi (Sending Patches): Fix external xrefs. - * lisp/progmodes/make-mode.el (makefile-macroassign-regex): - Highlight assignments preceded by a TAB character correctly - (bug#20787). + * doc/misc/eww.texi (Advanced): Fix xref. +2016-06-19 Eli Zaretskii - Backport: + Fix cross-references between manuals - (cherry picked from commit bbd86c5642bd62c43d72391669f28eaa14459fd5) + * doc/misc/viper.texi (Viper Specials): + * doc/misc/url.texi (Tramp): + * doc/misc/sem-user.texi (Smart Jump): + * doc/lispintro/emacs-lisp-intro.texi (Finding More): + * doc/misc/efaq.texi (Replacing text across multiple files): Fix + cross-references between manuals. (Bug#23612) + * doc/lispintro/emacs-lisp-intro.texi (etags): Node deleted: no + longer relevant to Emacs Lisp programming. -2016-02-23 Eli Zaretskii +2016-06-19 Glenn Morris - Improve documentation of focus-related hooks + * doc/misc/vhdl-mode.texi (Sample Init File): Rename node to avoid ".". - * doc/lispref/commands.texi (Focus Events): Mention focus-related - hooks. (Bug#21728) + * admin/admin.el (add-release-logs): Also update etc/HISTORY. -2016-02-23 Eli Zaretskii +2016-06-19 Eli Zaretskii - Further improve doc string of 'disable-point-adjustment' + Avoid aborting due to errors in arguments of 'set-face-attribute' - * src/keyboard.c (syms_of_keyboard): - : Clarify doc strings. (Bug#22771) + * src/xfaces.c (Finternal_set_lisp_face_attribute): Check the + FRAME argument before using it. This avoids gratuitous aborts in + Emacs built with --enable-checking when the luser was unlucky + enough to get the argument list in wrong order. -2016-02-23 Michael Albinus +2016-06-19 Phillip Lord - Further adaptions in file-notify-tests.el for w32notify + Add automated test for viper-tests.el - * test/automated/file-notify-tests.el - (file-notify--test-read-event-timeout, file-notify--test-timeout): - Decrease values. - (file-notify-test03-autorevert) - (file-notify-test04-file-validity) - (file-notify-test05-dir-validity): Run tests also for w32notify. - (file-notify-test08-watched-file-in-watched-dir): - Adapt expected events for w32notify. +2016-06-19 Phillip Lord -2016-02-23 Jan Tatarik + Fix viper undo breakage from undo-boundary changes - Don't bug out on localised dates in gnus-icalendar + * lisp/simple.el (undo-auto-disable-boundaries): New variable + * lisp/emulation/viper-init.el (viper-undo-in-complex-command, + viper-undo-needs-adjustment): Rename + variable to reflect new purpose, + (viper-buffer-undo-list-mark): Remove + * lisp/emulation/viper-cmd.el (viper-set-complex-command-for-undo): + Add undo using `undo-boundary', disable default undo-boundary + addition. + * lisp/emulation/viper-cmd.el + (viper-complete-complex-command-for-undo,viper-adjust-undo): + Change function name, remove old undo list manipulation. + * lisp/emulation/viper-cmd.el (viper-undo,viper-repeat, + viper-change-state-to-vi,viper-change-state): + Update for function name change. - * lisp/gnus/gnus-icalendar.el - (gnus-icalendar-event:org-timestamp): Don't bug out on - localised dates. + Addresses Bug #22295 -2016-02-23 Drew Adams +2016-06-19 Kaushal Modi - (ls-lisp-insert-directory): Make -B work + Fix reference to obsolete fn ps-eval-switch - * lisp/ls-lisp.el (ls-lisp-insert-directory): Make -B work - (bug#20776). + lpr-eval-switch is functionally the same as ps-eval-switch, + which was obsoleted in 2cdeb903c57126d3ad5f0cbd72e182584b76ee29. + So use that instead (Bug#19717). + * lisp/printing.el (pr-switches): Use lpr-eval-switch instead of + ps-eval-switch. - Backport: +2016-06-19 Paul Eggert - (cherry picked from commit ef52e66efd78aac4c4e5bd5e11870e5ba3b37a1e) + Do not trash symlinks to init file -2016-02-23 Vaidheeswaran C + If the user’s init file is a symbolic link, do not break the link + when initializing the package system. Problem reported by Jackson + Hamilton (Bug#23050). + * lisp/emacs-lisp/package.el (package--ensure-init-file): + Bind find-file-visit-truename when visiting the init file, and + save and restore the buffer name the way cus-edit does in a + similar situation (Bug#454). - Make buttons in header lines work +2016-06-19 Alan Mackenzie - * lisp/help-mode.el (help-button-action): `help-xref-button' in - header line doesn't work (bug#21024). + Don't print the "decomposition" line for control chars in what-cursor-position - Backport: + This is a temporary workaround for bug #23594, where the decomposition line + for linefeed corrupted the display on a Linux virtual terminal. - (cherry picked from commit c11e565a6b6d09fa39d4c3ef65bef08190eaecc1) + * lisp/descr-text.el (describe-char): Remove `decomposition' from the list of + character code properties printed for control characters. -2016-02-23 Christopher Wellons +2016-06-19 Paul Eggert - Make setf for frame-height/width work again + Bring back xterm pasting with middle mouse - * lisp/emacs-lisp/cl-lib.el (frame-height): Make setf for - frame-height/width work again (bug#21979). + Problem reported by Jan Synáček. + Solution suggested by Stefan Monnier (Bug#23519). + * lisp/isearch.el (isearch-mode-map): Add a binding for xterm-paste. + (xterm--pasted-text): New decl. + (isearch-xterm-paste): New function. + * lisp/term/xterm.el (xterm--pasted-text): New function, + taken from xterm-paste internals. + (xterm-paste): Use it. -2016-02-23 Łukasz Stelmach +2016-06-19 Eli Zaretskii - Encode header strings before printing + Provide workaround for xftfont rendering problem - * lisp/ps-print.el (ps-generate-header-line): Encode the - header strings to avoid problems with non-ASCII headers - (bug#22611). + * src/xftfont.c (syms_of_xftfont) : + New variable. + (xftfont_open): Use it to work around problems with rendering some + fonts. (Bug#23360) - Backport: +2016-06-19 Jun Hao - (cherry picked from commit 3cedbdcc71ebefc12bd20ec84f74251fe99ee7d0) + * lisp/desktop.el: Disable restore frameset if in non-graphic display. -2016-02-23 Nicolas Richard + (Bug#17693) - (cl-union): Do not ignore :test argument when lists are equal. +2016-06-19 Eli Zaretskii - * lisp/emacs-lisp/cl-seq.el (cl-union): Do not ignore :test argument when lists are equal. + Mention GTK+ problems in etc/PROBLEMS - * test/automated/cl-seq-tests.el: New file (bug#22729). + * etc/PROBLEMS (GDK_SCALE, GDK_DPI_SCALE): Mention the possible + problems this could create and the workaround. (Bug#23587) -2016-02-23 Lars Ingebrigtsen +2016-06-19 Artur Malabarba - Add `isearch' to `basic-faces' + * lisp/emacs-lisp/package.el (package-refresh-contents): - * doc/lispref/display.texi (Basic Faces): Mention the isearch - and lazy-highlight faces. + Don't change the value of `package-check-signature'. + (package-check-signature): Use `epg-find-configuration' + instead of `executable-find'. - * lisp/replace.el (match): Add `isearch' to the `basic-faces' - group, too (bug#22760). +2016-06-19 Daiki Ueno -2016-02-23 Dmitry Gutov + Revert "epg: Add a way to detect gpg1 executable for tests" - Make $, : and @ "prefix characters" in ruby-mode + This reverts commit d4ae6d7033b34e8b75c59aaf1584131e439ef2d5. - * lisp/progmodes/ruby-mode.el (ruby-mode-syntax-table): Change the - syntax classes of $, : and @ to "prefix character" - (http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00272.html). - (ruby-syntax-propertize): Undo that specifically for colons - followed by an opening paren or bracket. - (ruby-font-lock-keyword-beg-re): Include colon character. - (ruby-font-lock-keywords): Adjust the constants matcher for `:' - not being a symbol constituent anymore. +2016-06-19 Eli Zaretskii -2016-02-23 Dmitry Gutov + Avoid errors with Czech and Slovak input methods - Make find-tag-default-bounds more strict + * lisp/leim/quail/slovak.el (slovak, slovak-prog-1, slovak-prog-2) + (slovak-prog-3): Remove the kp-* key bindings, they are not needed + and cause errors in "C-u C-x =". + * lisp/leim/quail/czech.el (czech, czech-qwerty, czech-prog-1) + (czech-prog-2, czech-prog-3): Remove the kp-* key bindings. + (Bug#23559) - * lisp/subr.el (find-tag-default-bounds): Delegate to - bounds-of-thing-at-point (bug#22692). +2016-06-19 Daiki Ueno -2016-02-22 Michael Albinus + epg: Add a way to detect gpg1 executable for tests - Minor fixes in filenotify.el + Fixes bug#23561. - * lisp/filenotify.el (top): Require 'cl-lib. - (file-notify--rm-descriptor) - (file-notify--event-watched-file): Use cl-caadr. - (file-notify-callback): Handle also `ignore' events from inotify. + * test/automated/epg-tests.el + (epg-tests-program-alist-for-passphrase-callback): New + constant. + (epg-tests-find-usable-gpg-configuration): New function, + renamed from `epg-tests-gpg-usable'. All callers changed. + (epg-tests-gpg-usable): Remove. -2016-02-22 Michael Albinus + * lisp/epg-config.el (epg-config--program-alist): Factor out + constructor element to... + (epg-config--configuration-constructor-alist): ...here. + (epg-find-configuration): Rename FORCE argument to NO-CACHE, + and add PROGRAM-ALIST argument. - Additional fixes for file notification +2016-06-19 Artur Malabarba - * lisp/filenotify.el (top): Require 'cl when compiling. - (file-notify--event-watched-file): New defun. - (file-notify--rm-descriptor, file-notify-callback): - Handle case of several monitors running in parallel. + * lisp/emacs-lisp/package.el: Fix free variable warnings. - * test/automated/file-notify-tests.el - (file-notify--test-event-test): Simplify test. - (file-notify--test-with-events): Get rid of outer definition. - Check also results of tests performed in callbacks. - (file-notify-test02-events): No wrapping when calling - `file-notify-rm-watch'. No special checking for callback tests. - (file-notify-test07-backup): Adapt expected events for gfilenotify. - (file-notify-test08-watched-file-in-watched-dir): Improve. + (package--with-response-buffer): Replace two usages of + `macroexp-let2*' with `let'. -2016-02-22 Eli Zaretskii +2016-06-19 Artur Malabarba - Fix documentation of 'global-disable-point-adjustment' + * lisp/emacs-lisp/package.el (package--with-response-buffer): - * src/keyboard.c (syms_of_keyboard) - : Doc fixes. (Bug#22771) + Fix some macro locals leaking into body. (Bug#22440) -2016-02-22 Daiki Ueno + * test/automated/package-test.el (package-test-signed): + Manually check all possible values of `package-check-signature'. - Set file modes of pinentry socket for extra safety +2016-06-19 Eli Zaretskii - * lisp/net/pinentry.el: Require 'cl-lib for `cl-letf'. - (pinentry-start): Change the file modes of the socket file to 0700. - This is just for extra safety since the parent directory is already - protected with `server-ensure-safe-dir'. + Improve documentation of 'server-name' -2016-02-22 Daiki Ueno + * doc/emacs/misc.texi (Emacs Server): Fix example of setting + 'server-name'. Mention how to do that with daemon sessions. + (Bug#23576) - Clarify GnuPG version compatibility chapter +2016-06-19 Paul Eggert - * doc/misc/epa.texi (GnuPG version compatibility): Make the gpg-agent - description a bit clearer. + Modernize ASLR advice in etc/PROBLEMS -2016-02-22 Daiki Ueno + * etc/PROBLEMS (Segfault during 'make'): Modernize advice for + seccomp, Docker, and NetBSD (Bug#23529). - Revert "Change the default socket location for pinentry" +2016-06-19 Juri Linkov - This reverts commit e34fbdee8aca84b98393b06b2450837d175999ca. - It turned out that the address is fixed in Pinentry itself. + * lisp/char-fold.el: Rename from character-fold.el. -2016-02-21 Dmitry Gutov + * lisp/replace.el (replace-char-fold): Rename from replace-character-fold. + * test/automated/char-fold-tests.el: Rename from character-fold-tests.el. + http://lists.gnu.org/archive/html/emacs-devel/2015-12/msg00529.html - Kill off xref--display-history +2016-06-19 Nicolas Petton - Now that the core workflow keeps the xref window visible, there's - less value in storing this history. And it never was - comprehensive enough to undo scrolling changes. - * lisp/progmodes/xref.el (xref--display-history) - (xref--save-to-history, xref-quit): Remove. - (xref--show-pos-in-buf): Update accordingly. - (xref--xref-buffer-mode-map): Remove xref-quit binding. + Bump version to 25.0.94 -2016-02-21 Dmitry Gutov + * README: + * configure.ac: + * msdos/sed2v2.inp: Bump Emacs version to 25.0.94. - Keep the xref buffer visible until the user quits it explicitly +2016-06-19 Nicolas Petton - * lisp/progmodes/xref.el (xref--pop-to-location): - Rename WINDOW argument to ACTION. - (xref--with-dedicated-window): New macro. - (xref--show-pos-in-buf): Rename from `xref--display-position'. - Add and handle new argument, SELECTED. Use the above macro. - (xref--show-location): Add SELECTED argument. - (xref-show-location-at-point): Make an effort to avoid the - original window when showing the location. - (xref-goto-xref): Don't quit the xref window (bug#20487 and - http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01133.html). - (xref--query-replace-1): Use xref--with-dedicated-window as well. - (xref--next-error-function): Call xref--show-location instead of - xref--pop-to-location. - (xref--show-xrefs): Rename WINDOW argument to DISPLAY-ACTION. - Only pass that value to xref--pop-to-location. Pass the current - selected window to xref-show-xrefs-function as the `window' - property. - (xref--find-xrefs, xref--find-definitions): Rename WINDOW argument - to DISPLAY-ACTION as well. + etc/AUTHORS: Update the AUTHORS file -2016-02-21 Daiki Ueno +2016-06-19 Alan Third - Change the default socket location for pinentry + Fix bug#23462: Crash when iconifying frame on OS X. - * lisp/net/pinentry.el: Require 'cl-lib for `cl-letf'. - (pinentry--socket-dir): Change the default from /tmp/emacsXXX to - ~/.emacs.d/pinentry. - (pinentry-start): Change the file modes of the socket file to 0700. - This is just for extra safety since the parent directory is already - protected with `server-ensure-safe-dir'. + * src/nsterm.m (x_iconify_frame): Block input while miniaturize is + running. -2016-02-21 Daiki Ueno +2016-06-19 Paul Eggert - Mention how to enable pinentry feature + Avoid shrinking windows with Gtk+ 3.20.3 - * etc/NEWS: Mention "gpgconf --reload gpg-agent". - * lisp/net/pinentry.el: Likewise. + Problem reported by Matthias Clasen (Bug#23144). + This was fixed in a different way in master. + Do not merge to master. + * src/xterm.c (handle_one_xevent) [GTK_CHECK_VERSION (3, 20, 3)]: + Do not call xg_frame_resized in the MapNotify case. -2016-02-21 Paul Eggert +2016-06-19 Eli Zaretskii - Sync with gnulib + Fix bug in default setting of 'ps-paper-type' - This incorporates: - 2016-02-10 stdalign: port to older HP and IBM cc - * doc/misc/texinfo.tex, lib/stdalign.in.h: Copy from gnulib. + * lisp/international/mule-cmds.el (set-locale-environment): Don't + inherit the value of locale from previous examination of different + environment variables, which didn't look at LC_PAPER, and so using + that value would effectively ignore the setting of LC_PAPER. + (Bug#23544) -2016-02-21 David Engster +2016-06-19 Paul Eggert (tiny change) - Remove `semanticdb-save-all-db-idle' from `auto-save-hook' + Properly reject malformed or empty package sigs - * lisp/cedet/semantic/db-mode.el (semanticdb-hooks): Do not put - `semanticdb-save-all-db-idle' into `auto-save-hook'. The latter is - not an idle hook, so it's not appropriate to call it there. It will - already be called in the `semantic-idle-work-core-handler', which - runs when Emacs is actually idle. + Problem report and fix by Lizzie Dixon (Bug#23513). + * lisp/emacs-lisp/package.el (package--check-signature-content): + Report an error if no good signatures OR if a fatal error. Not AND. -2016-02-21 David Engster +2016-06-19 Paul Eggert - Restore point when writing semantic table to disk + Remove buggy non-native image scrolling - * lisp/cedet/semantic/db-file.el (object-write): Wrap call to - `semantic-fetch-tags' in `save-excursion', since it might move point - in current buffer. (Bug #22287) + This never worked, and could cause infinite recursion. + Problem reported by Glenn Morris (Bug#22465). + * lisp/xwidget.el (xwidget-webkit-scroll-behavior): Remove. + All uses removed. -2016-02-21 Daiki Ueno +2016-06-19 Paul Eggert - Mention pinentry.el in epa manual + * doc/misc/texinfo.tex: Sync from gnulib. - * doc/misc/epa.texi (GnuPG version compatibility): New chapter, - describing the differences between three GnuPG branches, and how - to enable pinentry.el. - (Caching Passphrases): Add xref to the compatibility chapter. +2016-06-19 Glenn Morris -2016-02-21 Michael Albinus + * lisp/emacs-lisp/find-func.el (find-feature-regexp) + (find-alias-regexp): Fix :version. - Fix Bug#22736 +2016-06-19 Dmitry Gutov - * lisp/filenotify.el (file-notify-callback): Use the proper - descriptor when calling the callback. (Bug#22736) + Do not mistake colon at the end of regexp for slash symbol - * test/automated/file-notify-tests.el - (file-notify--test-event-handler): Deactivate trace. - (file-notify-test08-watched-file-in-watched-dir): Bind - `file-notify--test-tmpfile' temporarily in `dir-callback'. + * lisp/progmodes/ruby-mode.el (ruby-syntax-propertize): + Check the parse state in the "Symbols with special characters" + rule (bug#23515). -2016-02-21 Wieland Hoffmann (tiny change) +2016-06-19 Dmitry Gutov - Grammar fix in doc string + Make package-install-from-buffer not move point - * lisp/custom.el (defgroup): Grammar fix in doc string. + * lisp/emacs-lisp/package.el (package-install-from-buffer): + Use save-excursion here (bug#22616). -2016-02-20 Daiki Ueno +2016-06-19 Dmitry Gutov - Naming fix for consistency + Redo the fix for bug#21839 - * lisp/epg-config.el (epg-find-configuration): Rename from - `epg-configuration-find' to be consistent with other epg-* functions. - Change all callers. + * lisp/help.el (help-add-fundoc-usage): Undo the previous change. + (help--make-usage-docstring): Escape newlines when printing. -2016-02-20 Daiki Ueno + * lisp/emacs-lisp/cl-macs.el (cl--transform-lambda): + Ditto (bug#21839). - Prefer customized value for GnuPG executable +2016-06-19 Dmitry Gutov - * lisp/epg-config.el (epg-configuration-find): Don't check GPG - configuration if it is already set with custom. (Bug#22747) + Don't treat JS spread as contination method call -2016-02-20 Eli Zaretskii + * lisp/progmodes/js.el (js--indent-operator-re): + Allow only one dot (bug#23492). - Fix memory reservation on MS-Windows + * test/indent/js.js (default): Add a corresponding example. - * src/w32heap.c (mmap_alloc): Reserve memory in 64KB granular - units. This avoids leaving gaps in reserved memory regions that - no one can use, since memory reservation must produce 64KB-aligned - addresses. (Bug#22526) +2016-06-19 Dmitry Gutov -2016-02-20 Anders Lindgren + Allow newlines inside cl function arglists - Update NextStep readme and add wish list. + * lisp/help.el (help-add-fundoc-usage): Allow newlines inside + ARGLIST (bug#21839). - * nextstep/README: Rewritten from scratch. New sections on - "History", "Overview of Cocoa and Objective-C", "Guidelines", - "Tracing Support", and "GNUStep". Expanded the "See Also" section. - * nextstep/WISHLIST: New file containing list of issues and ideas - associated with the NS port of Emacs. +2016-06-19 Dmitry Gutov -2016-02-20 Michael Albinus + Publicize cl--generic-all-functions - Report also result in `file-notify--test-event-handler' + * lisp/emacs-lisp/cl-generic.el (cl-generic-all-functions): + Rename from cl--generic-all-functions. Update both callers. -2016-02-20 Michael Albinus + * lisp/cedet/semantic/db-el.el + (semanticdb-find-tags-external-children-of-type-method): + And use it here (bug#23042). - Improve file-notify-test08-watched-file-in-watched-dir +2016-06-19 Alan Mackenzie - * test/automated/file-notify-tests.el (file-notify--test-desc2): - New variable. - (file-notify--test-cleanup): Use it. - (file-notify--test-event-handler): Enable trace. - (file-notify-test08-watched-file-in-watched-dir): Tag it as - :expensive-test. Rewrite callbacks to use - `file-notify--test-event-handler'. Read events in loop. Check - `file-notify--test-results'. - (file-notify-test08-watched-file-in-watched-dir): Fix docstring. + Add some "safe-local-variable" declarations for compatibility with master. -2016-02-20 Stephen Berman + These enable C files from the master repository to be visited in Emacs 25 + without generating irritating questions about configuration variable safety. - Fix todo-mode item date editing bugs + * lisp/progmodes/cc-vars.el: (c-string-list-p, c-string-or-string-list-p): New + functions. + (c-noise-macro-names, c-noise-macro-with-parens-names): give the + safe-local-variable property c-string-list-p. + (c-macro-names-with-semicolon): give the safe-local-variable property + c-string-or-string-list-p. - * lisp/calendar/todo-mode.el (todo-edit-item--header): Prevent out of - range error by making sure the value of the numerical month date - component cannot be nil. Prevent wrong type error on trying to edit - day number in February by making sure numerical instead of string - value of the year component is passed to todo-read-date. - (todo-read-date): When using the numerical month date component make - sure to use `*' for an arbitrary month instead of its numerical value. +2016-06-19 Lars Ingebrigtsen -2016-02-20 Eli Zaretskii + Fix doc string in `insert' - Fix "[:upper:]" for non-ASCII characters + * src/editfns.c (Finsert_and_inherit): The before-insertion + markers do not move. + (Finsert): Ditto. - * src/regex.c (re_match_2_internal): Support [:upper:] and - [:lower:] for non-ASCII characters. (Bug#18150) +2016-06-19 Paul Eggert -2016-02-20 Lars Ingebrigtsen + * doc/misc/emacs-mime.texi (time-date): Document now-builtins better. - Allow customising the article mode cursor behavior +2016-06-19 Dmitry Gutov - * doc/misc/gnus.texi (HTML): Mention gnus-article-show-cursor. + Say 'All results processed' at the end - * lisp/gnus/gnus-art.el (gnus-article-show-cursor): New variable. - (gnus-article-mode): Use it. + * lisp/progmodes/xref.el (xref--query-replace-1): + Say 'All results processed' at the end if the user hadn't + cancelled the process (bug#23284). -2016-02-20 Ari Roponen +2016-06-19 Eli Zaretskii - Use pop-to-buffer-same-window in woman.el + Document automatic adjustment of process' logical window dimensions - * lisp/woman.el (woman-really-find-file): Work around going to - the wrong buffer by using `pop-to-buffer-same-window' (bug#22332). - (WoMan-find-buffer): Ditto. + * doc/lispref/processes.texi (Process Buffers): Document + 'set-process-window-size' and + 'window-adjust-process-window-size-function'. -2016-02-20 Tassilo Horn + * etc/NEWS: Mention the new functionality and variable. - New filenotify test for bug#22736 + * src/process.c (Fset_process_window_size): Improve the doc string. - * test/automated/file-notify-tests.el - (file-notify-test08-watched-file-in-watched-dir): - (file-notify--test-desc1): New filenotify test for bug#22736 +2016-06-19 Michael Albinus -2016-02-20 Marcin Borkowski + tramp-sh.el: Work around a stat bug (backport from master) - Report critical battery errors + * lisp/net/tramp-sh.el (tramp-get-remote-stat): Do not use + stat versions which produce shell quoted output. See also + coreutils Bug#23422. - * lisp/battery.el (battery-pmset): Report critical battery - errors (bug#18157). + (cherry picked from commit 6aad36ace9953b9672b13be68416d205532d5e59) -2016-02-19 Kaushal Modi (tiny change) +2016-06-19 Paul Eggert - Make eww message toggling message clearer + Doc fixes for fclist and grep - * lisp/net/eww.el (eww-toggle-fonts): Make the message - clearer. + A newline is needed between two fc-list calls. + egrep and fgrep have been withdrawn from POSIX, + so document grep -E and grep -F instead. -2016-02-19 Mark Oteiza +2016-06-19 Paul Eggert - * lisp/calc/calc-units.el (math-standard-units): Update to 2014 CODATA adjustment. + Minor doc fixes for quoting -2016-02-18 Martin Rudalics + * doc/lispref/control.texi (Signaling Errors): + * doc/lispref/display.texi (Displaying Messages): + Don’t say that formats “generate”. Try to word more clearly. + * etc/NEWS: Coalesce near-duplicate entries. - Fix bugs in window resizing code +2016-06-19 Dmitry Gutov - * lisp/window.el (adjust-window-trailing-edge): Fix mismatched - parenthesis. - (shrink-window, enlarge-window): Fix bug#22723 where windows - with preserved size would not get resized. Also now signal an - error when the window cannot be shrunk or enlarged as requested. + `nreverse' the marker pairs list -2016-02-17 Eli Zaretskii + * lisp/progmodes/xref.el (xref--buf-pairs-iterator): `nreverse' + the marker pairs list for each buffer before returning. - Fix decoding DOS EOL in a unibyte buffer +2016-06-19 Dmitry Gutov - * src/coding.c (decode_eol): Loop over bytes, not characters. - (Bug#5251) + Use save-excursion in xref-location-marker more -2016-02-17 Alan Mackenzie + * lisp/progmodes/elisp-mode.el (xref-location-marker): Use + save-excursion, in order not to alter the value of point if the + buffer is currently open in the background (problem reported by + Robert Weiner). - Correct c-parse-state cache manipulation error. + * lisp/progmodes/etags.el (xref-location-marker): Same. - * lisp/progmodes/cc-engine.el (c-invalidate-state-cache-1): Correct a - comparison bound. Amend comments. +2016-06-19 Dmitry Gutov -2016-02-17 Daiki Ueno + shell-quote-argument DIR when appropriate - Take advantage of new GnuPG version check function + * lisp/progmodes/project.el (project-file-completion-table): + `shell-quote-argument' DIR as well. - * lisp/emacs-lisp/package.el (epg-configuration-find): Declare. - (package-refresh-contents): Use `epg-configuration-find' to check if EPG - is usable. + * lisp/progmodes/xref.el (xref--rgrep-command): Pass DIR through + `shell-quote-argument' (bug#23453). Thanks for Kaushal Modi for + pointing out the problem. Assert that DIR doesn't start with `~'. -2016-02-17 Daiki Ueno +2016-06-19 Dmitry Gutov - Make GnuPG version check robuster + Rework xref-query-replace-in-results - We changed the default gpg program to "gpg2" from "gpg" in the commit - f93d669a16bd3cb3f43f0c8cfd22fe18b627a6a1. However, there are two - maintained branches (2.0 and 2.1) and Emacs doesn't work well with 2.0 - series. Check the actual version of "gpg2" at run time, and properly - divert to "gpg" if necessary. - * lisp/epg-config.el: Require 'cl-lib for `cl-destructuring-bind'. - (epg-config--program-alist): New variable. - (epg--configurations): New variable. - (epg-configuration-find): New function. - (epg-config--make-gpg-configuration): New function. - (epg-config--make-gpgsm-configuration): New function. - (epg-configuration): Mark as obsolete. - * lisp/epg.el (epg-context): Use `epg-configuration-find'. + * lisp/progmodes/xref.el (xref-query-replace-in-results): Collect + all xrefs from the buffer first, then delegate most of the + processing to the value returned by xref--buf-pairs-iterator. + (xref--buf-pairs-iterator): New function. Return an "iterator" + which partitions returned markers into buffers, and only processes + markers from one buffer at a time. When an xref is out of date, + skip it with a message instead of signaling error (bug#23284). + (xref--outdated-p): Extract from xref--buf-pairs-iterator. Trim + CR from both strings before comparing. + (xref--query-replace-1): Remove the variable current-buf, no need + to track it anymore. Simplify the filter-predicate and search + functions accordingly. Iterate over buffer-markers pairs returned + by the iterator, and call `perform-replace' for each of them. Use + multi-query-replace-map (bug#23284). Use `switch-to-buffer' every + time after the first, in order not to jump between windows. -2016-02-17 Paul Eggert + * test/automated/xref-tests.el + (xref--buf-pairs-iterator-groups-markers-by-buffers-1) + (xref--buf-pairs-iterator-groups-markers-by-buffers-2) + (xref--buf-pairs-iterator-cleans-up-markers): New tests. - Fix x-load-color-file pointer signedness +2016-06-19 Juri Linkov - * src/xfaces.c (Fx_load_color_file) [!HAVE_X_WINDOWS]: - For sscanf and int *, use %d, not %u. - Problem found on Ubuntu 15.10 x32, which lacks X support. + * lisp/replace.el (query-replace-read-from): Use minibuffer-with-setup-hook -2016-02-17 Paul Eggert + to set minibuffer-local value of text-property-default-nonsticky. + (Bug#23418, bug#23127) - * lisp/time-stamp.el (time-stamp-time-zone): Fix doc string punct. +2016-06-19 Stephen Berman -2016-02-16 Mark Oteiza + Fix todo-mode bug involving archived items (bug#23447) - Follow convention for greek letter constants. + * lisp/calendar/todo-mode.el (todo-jump-to-category): When jumping + from Todo Categories mode to a category with only archived items + and todo-skip-archived-categories is non-nil, make sure the + archive file buffer is in Todo Archive mode to prevent + todo-category-select from raising an error, and don't set + todo-current-todo-file, since that makes todo-show display the + archived category. Remove a no-op call to kill-buffer, which is + already called in todo-insert-category-line. - * lisp/calc/calc-units.el (math-standard-units): - Add "sigma" and alias σ to it. +2016-06-19 Dmitry Gutov -2016-02-16 Mark Oteiza + Handle "empty line" regexp in xref searches - Add Stefan-Boltzmann constant to calc units table. + * lisp/progmodes/xref.el (xref--collect-matches-1): Stop after one + match if re-search-forward doesn't move point (bug#23426). - * lisp/calc/calc-units.el (math-standard-units): - Add Stefan-Boltzmann constant. + * test/automated/xref-tests.el + (xref-collect-matches-finds-an-empty-line-regexp-match): + Uncomment test. -2016-02-16 Mark Oteiza +2016-06-19 Dmitry Gutov - * lisp/calc/calc-units.el (math-build-units-table-buffer): Use special-mode. + Add tests for xref-collect-matches -2016-02-16 Glenn Morris + * test/automated/xref-tests.el: New file. Add tests for + xref-collect-matches. - Avoid loading cl-lib for term/xterm.elc, eg in -Q -nw. (Bug#22669) +2016-06-19 Dmitry Gutov - * lisp/emacs-lisp/cl-generic.el (cl--generic-dispatchers): - Prefill with relevant elements for term/xterm. + Use grep-find-ignored-directories instead of vc-directory-exclusion-list -2016-02-16 Tassilo Horn + * lisp/dired-aux.el (dired-do-find-regexp): + Use grep-find-ignored-directories instead of + vc-directory-exclusion-list. The result should be functionally + similar (the former uses the latter as the default value), but it + should be more consistent and appropriate WRT user + customizations. + (dired-do-find-regexp-and-replace): Update the docstring. - Fix soffice UserInstallation-URL for Windows + * lisp/dired.el: Update the corresponding autoloads. - * lisp/doc-view.el (doc-view-odf->pdf-converter-soffice): Fix - UserInstallation-URL when calling soffice on Windows. + * doc/emacs/dired.texi (Operating on Files): Update the + documentation accordingly. -2016-02-16 Lars Ingebrigtsen +2016-06-19 Dmitry Gutov - Fix display of 
     elements
+	Clear buffer-undo-list when showing xrefs
 
-	* lisp/net/eww.el (eww-display-html): Remove CRLF before
-	parsing so that 
     elements don't render with ^M at the end
-	of the lines.
+	* lisp/progmodes/xref.el (xref--show-xref-buffer): Clear
+	buffer-undo-list and temporarily bind it to t while rendering the
+	buffer contents.
 
-2016-02-15  Eli Zaretskii  
+2016-06-19  Alan Mackenzie  
 
-	Minor fixes in global-auto-composition-mode
+	Note the quote translation in `message' in section "incompatible changes".
 
-	* lisp/emacs-lisp/easy-mmode.el (easy-mmode-pretty-mode-name):
-	Produce prettier names of globalized minor modes.
-	* lisp/composite.el (global-auto-composition-mode): Make it a
-	globalized mode.  (Bug#22682)
+	* etc/NEWS: Note that `message' translates quotes, that the translation
+	cannot be disabled, and that `format' can be used to get the old
+	behavior back.
 
-2016-02-15  Alan Mackenzie  
+2016-06-19  Paul Eggert  
 
-	Allow arithmetic operators inside C++ template constructs.
+	* etc/NEWS: Mention (message "%s" (format ...)).
 
-	Fixes debbugs #22486.  This corrects the previous patch with this message
-	which was empty.
+2016-06-19  Lars Ingebrigtsen  
 
-	* lisp/progmodes/cc-langs.el (c-multichar->-op-not->>-regexp): New language
-	variable.
-	(c-<>-notable-chars-re): New language variable.
+	(Common Keywords): Correct what missing :group means
 
-	* lisp/progmodes/cc-engine.el (c-forward-<>-arglist-recur): User
-	c-<>-notable-chars-re in place of the former fixed string in searching for
-	places to stop and examine.
-	Use c-multichar->-op-not->>-regexp to check that a found ">" is not part of a
-	multichar operator in place of the former c->-op-without->-cont-regexp.
-	Add code to skip forwards over a balanced parenthesized expression.
+	* doc/lispref/customize.texi (Common Keywords): Correct what
+	missing :group means.
 
-2016-02-15  Eli Zaretskii  
+2016-06-19  Eli Zaretskii  
 
-	Avoid crashes in semi-malformed 'condition-case'
+	Improve documentation of Dired's 'A' and 'Q' commands
 
-	* src/eval.c (internal_lisp_condition_case): Treat a handler
-	'(nil)' as if it were '(nil nil)'.  (Bug#22675)
+	* lisp/dired-aux.el (dired-do-find-regexp)
+	(dired-do-find-regexp-and-replace): Mention
+	'grep-find-ignored-files' and 'vc-directory-exclusion-list', and
+	also the fact that REGEXP should be palatable by Grep.  (Bug#23426)
+	* lisp/dired.el: Update the corresponding autoload forms.
 
-2016-02-15  Alan Mackenzie  
+	* doc/emacs/dired.texi (Operating on Files): Mention
+	'grep-find-ignored-files' and 'vc-directory-exclusion-list'.
+	(Bug#23429)
 
-	Allow arithmetic operators inside C++ template constructs.
+2016-06-19  Paul Eggert  
 
-	Fixes debbugs #22486.
+	Doc fixes for quoting
 
-	* lisp/progmodes/cc-langs.el (c-multichar->-op-not->>-regexp): New language
-	variable.
-	(c-<>-notable-chars-re): New language variable.
+	* doc/emacs/text.texi, doc/lispintro/emacs-lisp-intro.texi:
+	* doc/lispref/control.texi, doc/lispref/display.texi:
+	* doc/lispref/help.texi, doc/lispref/strings.texi, lisp/subr.el:
+	* src/callint.c, src/doprnt.c, src/editfns.c:
+	Document quoting a bit more systematically.
+	Problem reported by Alan Mackenzie (Bug#23425).
 
-	* lisp/progmodes/cc-engine.el (c-forward-<>-arglist-recur): User
-	c-<>-notable-chars-re in place of the former fixed string in searching for
-	places to stop and examine.
-	Use c-multichar->-op-not->>-regexp to check that a found ">" is not part of a
-	multichar operator in place of the former c->-op-without->-cont-regexp.
-	Add code to skip forwards over a balanced parenthesized expression.
+2016-06-19  Lars Ingebrigtsen  
 
-2016-02-15  Eli Zaretskii  
+	posnp doc clarification
 
-	Fix regression with 'recent-keys' and keyboard macros
+	* lisp/subr.el (posnp): Mention that a posn object is returned
+	from `event-start' (bug#18211).
 
-	* src/keyboard.c (record_char): Don't record in 'recent_keys'
-	events that come from executing keyboard macros.  (Bug#22674)
+2016-06-19  Lars Ingebrigtsen  
 
-2016-02-15  Eli Zaretskii  
+	Mention what a missing :group does
 
-	Fix wording in a doc-view.el comment
+	* doc/lispref/customize.texi (Common Keywords): Document that
+	a missing :group reuses the group from the preceding item (bug#21601).
 
-	* lisp/doc-view.el (doc-view--current-cache-dir): Don't use
-	"illegal" for something that is not against the law.
+2016-06-19  Eli Zaretskii  
 
-2016-02-15  Paul Eggert  
+	Fix documentation of dired-aux search/replace commands
 
-	CONTRIBUTE cleanups and updates
+	* lisp/dired-aux.el (dired-do-find-regexp)
+	(dired-do-find-regexp-and-replace): Doc fixes.  (Bug#23429)
+	* lisp/dired.el: Update the corresponding autoload forms.
 
-	* CONTRIBUTE: Mention URLs and info nodes more consistently,
-	avoiding possibly-confusing punctuation adjacent to a URL, and
-	giving full shell commands for 'info'.  Start with a brief but
-	complete how-to, for people who want to get started right away.
-	Then briefly discuss how to join the development process in the
-	typical order.  Omit needless words.  Update some of the
-	now-obsolete file names, info node names, and quoting styles.
-	Better document emacs-NN branches and how they are merged.
-	* admin/notes/git-workflow: Change emacs-24 to emacs-25,
-	and trunk to master.  This file still needs work.
+2016-06-19  Paul Eggert  
 
-2016-02-14  Paul Eggert  
+	Fix quoting problem in cc-engine debug message
 
-	Port USE_STACK_LISP_OBJECTS fix to Clang
+	* lisp/progmodes/cc-engine.el (c-replay-parse-state-state):
+	Use "%s" format to pass through ‘'’ unscathed (Bug#23425), and
+	likewise for ‘`’, and ‘%’.
 
-	* src/lisp.h (USE_STACK_LISP_OBJECTS): Default to false for Clang.
-	Recent versions of Clang claim to be GCC 4.2.1 but do not have
-	the GCC bug.
+2016-06-19  Philipp Stephani  
 
-2016-02-14  Paul Eggert  
+	Add electric-quote-string unit test
 
-	Port to x86 GCC 4.3.1 and earlier
+	* test/automated/electric-tests.el (electric-quote-string): New test.
 
-	This tries to port to x86 FreeBSD 9, where Emacs dumps core (Bug#22065).
-	* src/lisp.h (USE_STACK_LISP_OBJECTS): Default to false
-	for GCC 4.3.1 and earlier.
+2016-06-19  Paul Eggert  
 
-2016-02-14  Eli Zaretskii  
+	Don’t electrically quote ‘'’ in Python
 
-	Fix point movement under 'scroll-conservatively'
+	Problem reported by Philipp Stephani (Bug#23387).
+	* lisp/electric.el (electric-quote-post-self-insert-function):
+	Do not requote a string starter or ender.
 
-	* src/xdisp.c (redisplay_window): Correct a typo in computing the
-	effective number of text lines in a window.  (Bug#22637)
+2016-06-19  Dmitry Gutov  
 
-2016-02-14  Thomas Plass  
+	`nreverse' Grep hits before passing them to xref--convert-hits
 
-	Replace colon in file name (not legal on Windows)
+	* lisp/progmodes/xref.el (xref-collect-matches): `nreverse' hits
+	before passing them to xref--convert-hits.  Fixes a regression
+	from cc0b7132.
 
-	* lisp/doc-view.el (doc-view--current-cache-dir): Replace colon in file
-	name (not legal on Windows). [tiny change]
+2016-06-19  Paul Eggert  
 
-2016-02-14  Eli Zaretskii  
+	* doc/misc/texinfo.tex: Sync from gnulib.
 
-	Fix a typo in edt.texi
+2016-06-19  Juri Linkov  
 
-	* doc/misc/edt.texi: Fix a typo in an email address.  Reported by
-	"Herbert J. Skuhra" .
+	* lisp/isearch.el (isearch-forward-symbol-at-point): Add isearch-push-state.
 
-2016-02-14  Eli Zaretskii  
+	(Bug#23410)
 
-	Make 'mmap_realloc' on MS-Windows more reliable
+2016-06-19  Michael Albinus  
 
-	* src/w32heap.c (mmap_alloc): If reserving memory succeeds, but
-	committing fails, return NULL.  Don't call GetLastError twice for
-	the same API error.
-	(mmap_realloc): Zero out MEMORY_BASIC_INFORMATION structures
-	before calling VirtualQuery, to avoid using garbled values if the
-	call fails.  If committing more pages from the same block fails,
-	fall back on mmap_alloc + CopyMemory.  Enhance debugging printouts
-	if the call to VirtualAlloc to commit more pages fails.
-	(Bug#22526)
+	tramp.texi: Revert last change due to backward compatibility
 
-2016-02-14  Oscar Fuentes  
+	(cherry picked from commit 910f9a0a936aacbffe9b9b790d7f698dfd287aac)
 
-	Grep alias `all' shall not match parent directory
+2016-06-19  Lars Ingebrigtsen  
 
-	* lisp/progmodes/grep.el (grep-files-aliases): Don't match parent
-	  directory for `all'. Fixes bug#22577
+	cua-prefix-override-inhibit-delay doc fix
 
-2016-02-13  Nicolas Petton  
+	* lisp/emulation/cua-base.el
+	(cua-prefix-override-inhibit-delay): Typo fix in doc string
+	(bug#23401).
 
-	Bump version to 25.0.91
+	(cherry picked from commit 2b4c099822811ede787fc6e575bfbb17b3cc0681)
 
-	* README:
-	* configure.ac:
-	* msdos/sed2v2.inp: Bump version to 25.0.91.
+2016-06-19  Lars Ingebrigtsen  
 
-2016-02-13  Nicolas Petton  
+	global-eldoc-mode doc fix
 
-	* etc/AUTHORS: Update the AUTHORS file
+	* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): Be more
+	specific about what "applicable" means (bug#23071).
 
-2016-02-13  Glenn Morris  
+	(cherry picked from commit 25e95b5dd8cd92e03788e589bf99a4b399f03114)
 
-	* lisp/dired-aux.el: Require cl-lib.  (Bug#22613)
+2016-06-19  Lars Ingebrigtsen  
 
-2016-02-13  Eli Zaretskii  
+	normal-top-level-add-subdirs-to-load-path doc fix
 
-	Index tilde characters in names of backup files
+	* lisp/startup.el (normal-top-level-add-subdirs-to-load-path):
+	Doc fix (bug#21962).
 
-	* doc/emacs/files.texi (Backup Names): Improve indexing.
-	(Bug#22625)
+	(cherry picked from commit 28aaa6d20586e3330a23b017a65e56dd6461c003)
 
-2016-02-13  Eli Zaretskii  
+2016-06-19  Lars Ingebrigtsen  
 
-	Document deprecation of hi-lock-mode's 'C-x w' bindings
+	isearch-search-fun-function doc tweak
 
-	* doc/emacs/display.texi (Highlight Interactively): Deprecate the
-	"C-x w" bindings of hi-lock-mode.
+	* lisp/isearch.el (isearch-search-fun-function): Mention what
+	the STRING parameter is (bug#21552).
 
-	* etc/NEWS: Mark the deprecation entry as documented.
+	(cherry picked from commit cafc2a5940cdc523cfea6dcf1cf540f48367c62a)
 
-2016-02-13  Stefan Monnier  
+2016-06-19  Lars Ingebrigtsen  
 
-	Announce that the `C-x w' bindings are deprecated
+	Fill some imenu--index-alist doc lines
 
-2016-02-13  Paul Eggert  
+	* lisp/imenu.el (imenu--index-alist): Fill some doc lines (bug#21269).
 
-	Suppress GNUstep hardening
+	(cherry picked from commit 4b7bb8f596550628eaa83b82c0f7eabe59a84964)
 
-	Fedora 23 normally hardens GNUstep applications, which causes
-	‘./configure --with-ns’ to break Emacs’s funky way of undumping.
-	Fix this by eliding the hardening options (Bug#22518).
-	* src/Makefile.in (LIBS_GNUSTEP): Omit options like
-	‘-specs=/usr/lib/rpm/redhat/redhat-hardened-ld’.
-	(GNU_OBJC_CFLAGS): Omit options like
-	‘-specs=/usr/lib/rpm/redhat/redhat-hardened-cc1’.
+2016-06-19  Lars Ingebrigtsen  
 
-2016-02-12  Eli Zaretskii  
+	Fmarker_position doc string clarification
 
-	Fix redisplay after a large insertion
+	* src/marker.c (Fmarker_position): Clarify the doc string
+	(bug#21231).
 
-	* src/xdisp.c (redisplay_internal): Don't accept the results of
-	"optimization 3" if the cursor ends up in a partially visible
-	glyph row.  (Bug22637)
+	(cherry picked from commit eeac7c57273cec3f9408b18392dd2bafe3be4450)
 
-2016-02-12  Andreas Schwab  
+2016-06-19  Lars Ingebrigtsen  
 
-	Revert "Fix gnus-group-get-new-news-this-group on group with closed server"
+	Further define-obsolete-* doc fixups
 
-	This reverts commit 9dc77e37aa84c6df9b3ddb4609f3c09201b0580e.
+	* lisp/emacs-lisp/byte-run.el (define-obsolete-face-alias):
+	Fix up last change.
+	(define-obsolete-variable-alias): Ditto.
 
-		* lisp/gnus/nnimap.el (nnimap-change-group): Revert last
-		change.  (Bug#22634)
+	(cherry picked from commit 28e9f4390d8391c2c36be4ef515cf3a2c679a5a5)
 
-2016-02-11  Paul Eggert  
+2016-06-19  Lars Ingebrigtsen  
 
-	* lib-src/make-docfile.c: Include stdarg.h.
+	Describe WHEN in all the define-obsolete- macros
 
-2016-02-11  Alan Mackenzie  
+	* lisp/emacs-lisp/byte-run.el (define-obsolete-face-alias):
+	Say more verbosely what WHEN is (bug#21225).
+	(define-obsolete-function-alias): Describe the WHEN parameter.
+	(define-obsolete-variable-alias): Ditto.
 
-	Extend gpm-mouse-mode's doc string and doc to point out limitations.
+	(cherry picked from commit 247c388f160581d207e41ca5926990bbf69d4a0f)
 
-	* lisp/t-mouse.el (gpm-mouse-mode): Extend doc string to indicate the
-	inability to transfer text between Emacs and other programs which use GPM.
+2016-06-19  Lars Ingebrigtsen  
 
-	* doc/emacs/frames.texi (Text-Only Mouse): Note the inability to transfer text
-	between Emacs and other progrmas which use GPM.
+	Mention with-silent-modifications in the lispref manual
 
-2016-02-11  Eli Zaretskii  
+	* doc/lispref/text.texi (Changing Properties): Document
+	with-silent-modifications (bug#21171).
 
-	Revert "Backport: * lisp/isearch.el: Turn char-folding off by default"
+	(cherry picked from commit fcd0d854eef6e439d51e8f07cf734d5e34e502b3)
 
-	* lisp/isearch.el: Turn char-folding back oon by default.
+2016-06-19  Lars Ingebrigtsen  
 
-	This reverts commit 12c50e82c9b432b2fc31f8fb2215f43ceea80822.
+	with-silent-modifications doc clarification
 
-2016-02-11  Lars Ingebrigtsen  
+	* lisp/subr.el (with-silent-modifications): Rearrange the doc
+	string a bit so that the most pertinent information is at the
+	top (bug#21171).
 
-	Revert "Support integer image rotation and respect EXIF rotations"
+	(cherry picked from commit e0e70f030e69d9696a963a86f5f7caaff4df06eb)
 
-	This reverts commit 0f600496050bf435f55dc81056e06fcd45992dc8.
+2016-06-19  Lars Ingebrigtsen  
 
-	This change does not work on Fedora.
+	clear-visited-file-modtime doc string fix
 
-2016-02-11  Lars Ingebrigtsen  
+	* lisp/files.el (clear-visited-file-modtime): Fix possibly
+	confusing doc string wording (bug#21169).
 
-	Revert "Document EXIF image rotation"
+	(cherry picked from commit 1aaeaf1450756a71c9254a2a5b174c72084ca67a)
 
-	This reverts commit 10b8ed27ec91ff52f93eb0297dcc3abb214931aa.
+2016-06-19  Lars Ingebrigtsen  
 
-	This change does not work on Fedora, for instance.
+	Document mode mode line variables
 
-2016-02-11  Paul Eggert  
+	* doc/lispref/modes.texi (Mode Line Variables): Document
+	`mode-line-front-space, `mode-line-misc-info',
+	`mode-line-end-spaces' (bug#21014).
 
-	Document OS X LANG default
+	(cherry picked from commit bf7a630b0a5d3900f2afb0e7a881ce62e2b9f935)
 
-	* doc/emacs/cmdargs.texi (General Variables):
-	Document OS X Language and Region system preference.
-	Suggested by Alan Third.
+2016-06-19  Lars Ingebrigtsen  
 
-2016-02-11  Alan Third  
+	Add a cross ref to Optional Mode Line
 
-	Set locale when run from OS X GUI
+	* doc/lispref/modes.texi (Mode Line Variables): Add a cross
+	reference to the Emacs mode line node that explains things
+	like `display-time-string' (bug#21002).
 
-	* src/emacs.c (main): Call ns_init_locale.
-	* src/nsterm.m (ns_init_locale): Get locale from OS and set LANG.
-	* src/nsterm.h: Include ns_init_locale.
+	(cherry picked from commit a3151a28789f413af73b14fbba557b2a587fca53)
 
-2016-02-10  Paul Eggert  
+2016-06-19  Lars Ingebrigtsen  
 
-	make-docfile cleanup for I/O, etc.
+	Add a doc string to display-time-string
 
-	* lib-src/make-docfile.c (progname, generate_globals, num_globals)
-	(num_globals_allocated, globals): Now static.
-	(generate_globals, struct rcsoc_state, read_c_string_or_comment):
-	(write_c_args, scan_c_stream, search_lisp_doc_at_eol, scan_lisp_file):
-	Use bool for boolean.
-	(verror): New function.
-	(fatal, error): Use it.  API is now like printf.  All callers changed.
-	(main): Remove err_count local that was always 0.
-	(main, scan_c_stream, scan_lisp_file): Check for I/O error.
-	(scan_file, scan_c_file, scan_c_stream, scan_lisp_file):
-	Return void, not 0.
-	(put_char, scan_keyword_or_put_char, scan_c_file): Use char for byte.
-	(scan_keyword_or_put_char): Check for missing ( and unexpected EOF.
-	(close_emacs_globals): Use ptrdiff_t for index, not int.
-	(scan_c_file, scan_lisp_file): Exit with failure if file cannot be
-	opened, rather than diagnosing but exiting with status 0.
-	(search_lisp_doc_at_eol): Don't worry about ungetc of EOF; it's
-	portable now.
+	* lisp/time.el: Add a doc string to `display-time-string',
+	because it's referred to in the manual, and is too mysterious
+	otherwise (bug#21002).
 
-2016-02-10  Paul Eggert  
+	(cherry picked from commit 45559c584e5a4ddeed1539b028b50b95baa372f8)
 
-	Memory-management cleanup in make-docfile
+2016-06-19  Lars Ingebrigtsen  
 
-	I compiled it with -fsanitize=address and fixed the leaks it detected.
-	Also, I changed it to prefer signed to unsigned integer types,
-	and to check for integer overflow.
-	* lib-src/make-docfile.c:
-	Include , , , .
-	(memory_exhausted): New function.
-	(xmalloc, xrealloc): Use it.
-	(xmalloc, xrealloc, scan_file, struct rcsoc_state, write_c_args)
-	(uncompiled, scan_lisp_file):
-	Prefer signed integer types to unsigned.
-	(xstrdup): Remove.  All uses removed.
-	(num_globals, num_globals_allocated, write_globals, scan_c_stream):
-	Use ptrdiff_t, not int, for indexes that in theory could exceed INT_MAX.
-	(add_global): Use const to pacify --enable-gcc-warnings.
-	Make a copy here, rather than relying on strdup calls later.
-	(add_global, write_globals, scan_c_stream):
-	Avoid integer overflow when calculating sizes.
-	(write_globals, scan_c_stream, scan_lisp_file): Avoid memory leak.
-	(scan_c_stream): Check for add_global failure.
+	custom-buffer-style doc fix
 
-2016-02-10  Kevin Gallagher  
+	* lisp/cus-edit.el (custom-buffer-style): Document the `tree'
+	value (bug#20724).
 
-	Kevin Gallagher has new email address
+	(cherry picked from commit bcf0291d0cd02095b0809b1eb91f1e5c5c2ac5e3)
 
-	* lisp/emulation/edt.el:
-	* lisp/emulation/edt-lk201.el:
-	* lisp/emulation/edt-mapper.el:
-	* lisp/emulation/edt-pc.el:
-	* lisp/emulation/edt-vt100.el:
-	* etc/edt-user.el:
-	* doc/misc/edt.texi: Update Kevin Gallagher's email address.
+2016-06-19  Lars Ingebrigtsen  
 
-2016-02-10  Eli Zaretskii  
+	Rearrange the doc of query-replace slightly
 
-	Improve doc strings of 'forward/backward-word-strictly'
+	* lisp/replace.el (query-replace): Move the mention of the
+	interactive prefix arg earlier so that users can find it
+	(bug#20654).
 
-	* lisp/simple.el (backward-word): Refer to 'backward-word-strictly'
-	in the doc string.  Suggested by Glenn Morris .
-	* lisp/subr.el (forward-word-strictly, backward-word-strictly):
-	Mention 'subword-mode' in the doc strings.
+	(cherry picked from commit bcc10761c3b968fa4534718116a0a601ed7da389)
 
-	* src/syntax.c (Fforward_word): Refer to 'forward-word-strictly'
-	in the doc string.  (Bug#22560)
+2016-06-19  Lars Ingebrigtsen  
 
-2016-02-10  Michael Albinus  
+	apropos-print doc fix
 
-	Describe Makefile test targets in test/README
+	* lisp/apropos.el (apropos-print): Document the undocumented
+	parameters (bug#20520).
 
-	* CONTRIBUTE: Move Makefile test targets to test/README.
+	(cherry picked from commit 0714d7387812a151f59993ac77c7321724ef79b1)
 
-	* Makefile.in:
-	* test/README: Describe Makefile test targets.
+2016-06-19  Lars Ingebrigtsen  
 
-2016-02-10  Artur Malabarba  
+	completion-table-with-predicate doc string fix
 
-	Backport: * lisp/isearch.el: Turn char-folding off by default
+	* lisp/minibuffer.el (completion-table-with-predicate): t ->
+	non-nil in the doc string (bug#20460).
 
-	(search-default-mode): Set default value to nil.
+	(cherry picked from commit b6a4d162208f239bc7804696d611ae52c686f138)
 
-2016-02-10  Lars Ingebrigtsen  
+2016-06-19  Lars Ingebrigtsen  
 
-	Document EXIF image rotation
+	Fill the completion-table-with-predicate doc string
 
-	* doc/lispref/display.texi (ImageMagick Images): Mention EXIF rotation.
+	* lisp/minibuffer.el (completion-table-with-predicate): Fill
+	the doc string (bug#20460).
 
-2016-02-10  Dima Kogan  
+	(cherry picked from commit 207a31432c1ed8b548003a3e4af32c49aa3441e9)
 
-	Support integer image rotation and respect EXIF rotations
+2016-06-19  Lars Ingebrigtsen  
 
-	* src/image.c (imagemagick_load_image): Allow integer rotations in
-	addition to floating point rotations (bug#22591).
-	* src/image.c (imagemagick_load_image): Images that have an
-	orientation given in EXIF and have no explicit :rotation tag are now
-	pre-rotated.  All information such as width/height is reported for the
-	rotated image.
+	replace-match-maybe-edit doc clarification
 
-2016-02-10  Matthew Carter  
+	* lisp/replace.el (replace-match-maybe-edit): Say what
+	MATCH-DATA is (bug#20304).
 
-	Quote table names for postgres listings (sql-mode)
+	(cherry picked from commit 139874ba53c2e2de9868f8e5234d6ea2bcb97af8)
 
-	* lisp/progmodes/sql.el (sql-postgres-completion-object): Avoid passing
-	  unquoted table names to the completion list.
+2016-06-19  Lars Ingebrigtsen  
 
-2016-02-10  Juri Linkov  
+	add-timeout doc fix
 
-	* lisp/replace.el (replace-match-maybe-edit): Make arg `backward' optional.
+	* lisp/emacs-lisp/timer.el (add-timeout): Mention the return
+	value (bug#20181).
 
-	Doc fix.
-	(replace-search, replace-highlight): Make arg `backward' optional.
-	(Bug#18388)
+	(cherry picked from commit 921b40476f597c84d7c34aa289cd43caeb389c4a)
 
-2016-02-10  Juri Linkov  
+2016-06-19  Lars Ingebrigtsen  
 
-	* lisp/simple.el (next-line-or-history-element): Reset temporary-goal-column.
+	Extremely minor doc fix in Choosing Window
 
-	(previous-line-or-history-element): Reset temporary-goal-column.
-	Use end-of-visual-line instead of line-end-position.  (Bug#22544)
+	* doc/lispref/windows.texi (Choosing Window): There's only one
+	action alist, I think (bug#20158).
 
-2016-02-10  Paul Eggert  
+	(cherry picked from commit 6c7e7f421d02d9290d6d1d85320737371160aef7)
 
-	Suppress ACL ops if configured with --disable-acl
+2016-06-19  Lars Ingebrigtsen  
 
-	Without this patch, some ACL operations were suppressed, but not all.
-	* src/fileio.c [!USE_ACL]: Do not include sys/acl.h.
-	(Ffile_acl, Fset_file_acl) [!USE_ACL]: Return nil in this case.
+	Transform mentions of `eval-after-load' to `with-eval-after-load'
 
-2016-02-09  Katsumi Yamaoka  
+	* doc/lispref/loading.texi (Hooks for Loading): Update text to
+	not mention `eval-after-load' (bug#20038).
 
-	Mention web bugs
+	(cherry picked from commit 9392193be56eebdfac702a0bbb5e954088371c7a)
 
-	* doc/misc/emacs-mime.texi (Display Customization):
-	Mention web bugs in the mm-html-blocked-images section.
+2016-06-19  Lars Ingebrigtsen  
 
-2016-02-09  Katsumi Yamaoka  
+	cursor-type doc fix
 
-	Make mm-html-blocked-images default to "" again
+	* src/buffer.c (syms_of_buffer): Mention that cursor-type's
+	WIDHT/HEIGHT can't exceed the frame char size (bug#19215).
 
-	* lisp/gnus/mm-decode.el (mm-html-blocked-images):
-	Default to "" that blocks all external images.
+	(cherry picked from commit 77c5f4554ebb3b7c7d49bc881e45a550f6c93987)
 
-	* doc/misc/emacs-mime.texi (Display Customization):
-	Mention that mm-html-blocked-images defaults to "".
+2016-06-19  Lars Ingebrigtsen  
 
-2016-02-09  Paul Eggert  
+	Add a link from Tool Bar to Images
 
-	Minor alignas cleanup
+	* doc/lispref/keymaps.texi (Tool Bar): Add a link to the
+	Images node (bug#19722).
 
-	* src/lisp.h (alignas): Remove now-redundant #ifdef that was left
-	over from the old way of doing things, before Bug#20862 was fixed.
+	(cherry picked from commit da5d0786163a91400eced4fddba4a92b652458d1)
 
-2016-02-09  Paul Eggert  
+2016-06-19  Lars Ingebrigtsen  
 
-	Add lmalloc commentary and tweak laligned
+	(default-mode-line-format): More explicit obsolete info
 
-	* src/alloc.c (laligned): Help compiler in a tiny way by putting
-	the more-commonly-failing disjunct first.
+	* lisp/subr.el (default-mode-line-format): Be more explicit in
+	how default values are now handled (bug#19424).
 
-2016-02-09  Eli Zaretskii  
+	(cherry picked from commit 9dc5f6d830e72420dc4d41c8f6ca1ca6b28609c0)
 
-	Clarify documentation of key binding conventions
+2016-06-19  Lars Ingebrigtsen  
 
-	* doc/lispref/tips.texi (Key Binding Conventions): Clarify which
-	"punctuation characters" are reserved after "C-c".  (Bug#22604)
+	Fcompare_buffer_substrings doc string clarification
 
-2016-02-09  Oscar Fuentes  
+	* src/editfns.c (Fcompare_buffer_substrings): Extremely minor
+	doc string clarification (bug#19255).
 
-	* etc/NEWS: mention the `vc-faces' customization group
+	(cherry picked from commit aa692acbb598a1cc8219ed7a87dde25fd7626ba5)
 
-2016-02-09  Paul Eggert  
+2016-06-19  Lars Ingebrigtsen  
 
-	Sync with gnulib
+	insert-file-contents-literally doc fix
 
-	This incorporates:
-	2016-02-09 stdalign: port to clang 3.7.0
-	2016-02-06 misc: port better to gcc -fsanitize=address
-	* doc/misc/texinfo.tex, lib/stdalign.in.h, m4/acl.m4, m4/getgroups.m4:
-	Copy from gnulib.
+	* lisp/files.el (insert-file-contents-literally): Say that the
+	parameters are explained in the other function (bug#18317).
 
-2016-02-09  Michael Albinus  
+	(cherry picked from commit b6481b19bc9592492b1f70dfecb4de6256f537fe)
 
-	* CONTRIBUTE: Add more examples for $(SELECTOR) make variable.
+2016-06-19  Lars Ingebrigtsen  
 
-2016-02-09  Katsumi Yamaoka  
+	Fix custom types for cursor-in-non-selected-windows
 
-	Make mm-html-inhibit-images and mm-html-blocked-images default to nil
+	* lisp/cus-start.el (standard): Use the same custom types for
+	cursor-in-non-selected-windows as for cursor-type (bug#19214).
 
-	* lisp/gnus/mm-decode.el (mm-html-inhibit-images)
-	(mm-html-blocked-images): Default to nil.
+	(cherry picked from commit b66bc0cced786e0320e1c3b0758bd3c434d4e8b5)
 
-	* doc/misc/emacs-mime.texi (Display Customization): Mention that
-	mm-html-inhibit-images and mm-html-blocked-images default to nil.
+2016-06-19  Lars Ingebrigtsen  
 
-	* etc/NEWS (Gnus): Document mm-html-inhibit-images and
-	mm-html-blocked-images.
+	Doc clarification to mwheel-scroll
 
-2016-02-09  Paul Eggert  
+	* lisp/mwheel.el (mwheel-scroll): Mention that the restriction
+	does not apply to Windows (bug#19209).
 
-	Increase success rate of fallback lmalloc
+	(cherry picked from commit 696052b5fdfbc5c25dff3c6b081aebe70f6d06c7)
 
-	* src/alloc.c (lmalloc, lrealloc): Reallocate with (typically)
-	larger and larger sizes, to increase the probability that
-	the allocator will return a Lisp-aligned pointer.
+2016-06-19  Lars Ingebrigtsen  
 
-2016-02-09  Lars Ingebrigtsen  
+	Clarify the doc of eval-expression-print-format
 
-	Make backgrounds extend to the end of the lines in shr
+	* lisp/simple.el (eval-expression-print-format): Doc
+	clarification (bug#19114).
 
-	* lisp/net/shr.el (shr-face-background): Faces can also be on
-	the form `(:background "#fff)' (bug#22547).
+	(cherry picked from commit cd193a871f5a8e1c81ba86fc398ac382fa814383)
 
-2016-02-09  Lars Ingebrigtsen  
+2016-06-19  Lars Ingebrigtsen  
 
-	Make the `R' command get the correct relative s
+	Explictly explain that package-initialize loads the packages
 
-	* lisp/net/eww.el (eww-readable): Preserve the base URL so
-	that image expansions are fetched from the right place (bug#22605).
+	* lisp/emacs-lisp/package.el (package-initialize): Be explicit
+	in saying that `package-initialize' obviates adjusting the
+	path or requiring the packages, as this is a question that
+	apparently comes up now and then (bug#18829).
 
-	(cherry picked from commit 8722e849f75ceafb82a1c17105e8ab76077a8ebc)
+	(cherry picked from commit 619e0aedb2f3dbfe6821ac34e2d25b4e5c181117)
 
-	Backport:
+2016-06-19  Lars Ingebrigtsen  
 
-2016-02-09  Mike Kupfer  
+	Have the doc strings of `load-path' and `require' mention each other
 
-	Fix typos in emacs-mime.texi and gnus.texi
+	* src/fns.c (Frequire): Mention `load-path' and fill the doc
+	string (bug#18829).
 
-	* doc/misc/emacs-mime.texi (Display Customization):
-	* doc/misc/gnus.texi (HTML): Fix typo.
+	* src/lread.c (syms_of_lread): Mention that `require' uses
+	`load-path'.
 
-2016-02-09  Katsumi Yamaoka  
+	(cherry picked from commit 3eca9a03816f95da0030665223c0b5262f223ba7)
 
-	* doc/misc/emacs-mime.texi (Display Customization):
-	Doc fix for mm-html-inhibit-images.
+2016-06-19  Lars Ingebrigtsen  
 
-2016-02-09  Lars Ingebrigtsen  
+	Doc fix for insert-pair-alist
 
-	Fix message-cross-post-followup-to group names
+	* lisp/emacs-lisp/lisp.el (insert-pair-alist): Say what
+	COMMAND-CHAR is (bug#18809).
 
-	* lisp/gnus/message.el (message-cross-post-followup-to): Don't
-	insert group names like "nntp+foo:zot", because those aren't valid.
+	(cherry picked from commit 2824c587e9749a8f350f1d3dddd65176b4561dcb)
 
-2016-02-09  David Edmondson  
+2016-06-19  Lars Ingebrigtsen  
 
-	Compare recipient and keys case-insensitively
+	Move doc of backup-directory-alist to the Backup node
 
-	* lisp/gnus/mml2015.el: (mml-secure-check-user-id): When comparing a
-	recipient address with that from a key, do so in a case insensitive
-	manner (bug#22603).
+	* doc/emacs/files.texi (Backup): Move the documentation of
+	`backup-directory-alist' here from the "Single or Numbered
+	Backups" node, because it doesn't seem to have much to do with
+	numbering (bug#18692).
 
-2016-02-08  Glenn Morris  
+	(cherry picked from commit e77b8d84b4161f2cf8720dec2bf44a3e50134398)
 
-	* lisp/gnus/mm-decode.el (mm-alist-to-plist): Doc fix.
+2016-06-19  Lars Ingebrigtsen  
 
-2016-02-08  Katsumi Yamaoka  
+	Tiny doc clarification for create-fontset-from-fontset-spec
 
-	Refactor HTML images handling of Gnus and mm-* (a part of bug#21650)
+	* lisp/international/fontset.el (create-fontset-from-fontset-spec):
+	Clarify what the optional part is (bug#18686).
 
-	* doc/misc/emacs-mime.texi (Display Customization):
-	Remove mm-inline-text-html-with-images; add documentations for
-	mm-html-inhibit-images and mm-html-blocked-images.
+	(cherry picked from commit c05d186455ce9907eeb6b21ea4227e453996c681)
 
-	* lisp/gnus/gnus-art.el (gnus-article-show-images):
-	No need to bind mm-inline-text-html-with-images.
-	(gnus-bind-safe-url-regexp): Rename to gnus-bind-mm-vars.
-	(gnus-bind-mm-vars): Rename from gnus-bind-safe-url-regexp;
-	bind mm-html-inhibit-images and mm-html-blocked-images.
-	(gnus-mime-view-all-parts, gnus-mime-view-part-internally)
-	(gnus-mm-display-part, gnus-mime-display-single)
-	(gnus-mime-display-alternative): Use gnus-bind-mm-vars.
+2016-06-19  Lars Ingebrigtsen  
 
-	* lisp/gnus/mm-decode.el (mm-inline-text-html-with-images): Remove.
-	(mm-html-inhibit-images, mm-html-blocked-images): New user options.
-	(mm-shr): Bind shr-inhibit-images and shr-blocked-images with
-	mm-html-inhibit-images and mm-html-blocked-images respectively
-	instead of gnus-inhibit-images and gnus-blocked-images.
+	Fill the doc string of font-lock-keywords
 
-	* lisp/gnus/mm-view.el (mm-setup-w3m): Use mm-html-inhibit-images
-	instead of mm-inline-text-html-with-images.
+	* lisp/font-lock.el (font-lock-keywords): Fill the lines and
+	reorganise some explanations (bug#21427).
 
-2016-02-08  Paul Eggert  
+	(cherry picked from commit c05716d3a26ea7518b89eacfccaf70c9d0731df7)
 
-	Port to FreeBSD 11-CURRENT i386
+2016-06-19  Lars Ingebrigtsen  
 
-	Problem reported by Herbert J. Skuhra in:
-	http://lists.gnu.org/archive/html/emacs-devel/2016-02/msg00354.html
-	Instead of trying
-	* src/alloc.c (lmalloc, lrealloc, laligned): New functions.
-	(xmalloc, xzalloc, xrealloc, lisp_malloc): Use them.
-	(__alignof__) [!__GNUC__ && !__alignof__]: New macro.
-	(MALLOC_IS_GC_ALIGNED): New macro.
-	* src/lisp.h (NONPOINTER_BITS): Remove.  All uses removed.
-	No longer needed now that alloc.c uses lmalloc and lrealloc.
+	Doc fix for font-lock-remove-keywords
 
-2016-02-08  Michael Albinus  
+	* lisp/font-lock.el (font-lock-remove-keywords): Add a link to
+	`font-lock-add-keywords' to describe KEYWORDS (bug#18634).
 
-	Some fixes in file-notify-tests.el
+	(cherry picked from commit bc00dcf12983cd399127d0eea39647f29778eb02)
 
-	* test/automated/file-notify-tests.el
-	(file-notify--test-with-events-check)
-	(file-notify--test-with-events-explainer): New defuns.
-	(file-notify--test-with-events): Use it.
-	(file-notify-test07-backup): Fix docstring.  Some of the
-	backends fire two `changed' events.  Backup by rename doesn't
-	work for kqueue.
+2016-06-19  Lars Ingebrigtsen  
 
-2016-02-07  Michael Albinus  
+	Clarify whitespace-style doc string
 
-	Fix Bug#22557
+	* lisp/whitespace.el (whitespace-style): Doc clarification
+	(bug#18296).
 
-	* lisp/filenotify.el (file-notify-callback): Do not send a
-	`stopped' event in case of backup by renaming.  (Bug#22557)
+	(cherry picked from commit d96c720d0cca7c9ffbb4c712ad315bb707d6625c)
 
-	* test/automated/Makefile.in: Use $(SELECTOR_EXPENSIVE) for
-	all targets but check and check-maybe.
+2016-06-19  Lars Ingebrigtsen  
 
-	* test/automated/file-notify-tests.el
-	(file-notify--test-read-event-timeout): New defconst.
-	(file-notify--deftest-remote, file-notify--wait-for-events)
-	(file-notify-test02-events)
-	(file-notify-test04-file-validity)
-	(file-notify-test06-many-events): Use it.
-	(file-notify--test-cleanup): Make it more robust.  Delete also
-	backup file.
-	(file-notify-test07-backup): New test.
+	Doc fixed for next-error-buffer-p
 
-2016-02-07  Paul Eggert  
+	* lisp/simple.el (next-error-buffer-p): Clarify doc string
+	(bug#18202).
 
-	Fix test for dladdr
+	(cherry picked from commit a10eb168cc96db9f0dab2d75550cbd8f08be2363)
 
-	Problem reported by Andreas Schwab in:
-	http://lists.gnu.org/archive/html/emacs-devel/2016-02/msg00327.html
-	* configure.ac (dladdr): Link with LIBMODULES when checking for
-	this function.
+2016-06-19  Lars Ingebrigtsen  
 
-2016-02-07  Andreas Schwab  
+	Tiny doc fix
 
-	Fix gnus-group-get-new-news-this-group on group with closed server
+	* src/fileio.c (Ffile_accessible_directory_p): Tiny doc fix
+	(and fill) (bug#18201).
 
-	* lisp/gnus/nnimap.el (nnimap-change-group): Lookup server
-	method and pass to nnimap-open-server.
+	(cherry picked from commit 2ef0040e2363a669d9b93df935d31c98fa130132)
 
-2016-02-07  Artur Malabarba  
+2016-06-19  Lars Ingebrigtsen  
 
-	* lisp/comint.el (comint-prompt-read-only): Clean tabs in docstring
+	Doc fix
 
-	While tabs in code are mostly fine because the Emacs sources have a
-	.dir-locals file specifying tab-width, the same is not true of tabs in
-	code examples inside docstrings.  The docstring is printed on a *Help*
-	buffer, which can be created on any directory and won't necessarily have
-	the same tab-width set.
+	* src/keymap.c (Fdefine_prefix_command): Clarify doc string
+	slightly (bug#18092).
 
-2016-02-07  Lars Ingebrigtsen  
+	(cherry picked from commit 6b769c81d024f7eeb90b167e7df6f87d859614d4)
 
-	Don't inloop gnus-uu-mark-thread on the last thread
+2016-06-19  Lars Ingebrigtsen  
 
-	* lisp/gnus/gnus-uu.el (gnus-uu-mark-thread): Don't infloop on the
-	final thread in the summary buffer (bug#16666).
+	delsel doc touch ups
 
-2016-02-06  Lars Ingebrigtsen  
+	* lisp/delsel.el (delete-selection-helper): Use non-nil
+	instead of t and clarify function return values (bug#18089).
 
-	Display non-ASCII group names better in prompts
+	(cherry picked from commit d7a5b5be9a5869bcd233434ec3103dd1976d7df7)
 
-	* lisp/gnus/gnus-sum.el (gnus-articles-to-read): To decode the
-	group name, we have to do that before we remove the prefix.
+2016-06-19  Lars Ingebrigtsen  
 
-2016-02-06  Lars Ingebrigtsen  
+	Doc fixes for menu-bar.el
 
-	Default to gpg2 instead of gpg
+	* lisp/menu-bar.el (clipboard-kill-ring-save): Describe the
+	REGION parameter (bug#18028).
+	(clipboard-kill-region): Ditto.
 
-	* lisp/epg-config.el (epg-gpg-program): Prefer gpg2 over gpg, if
-	it exists.  This fixes many problems with using the GPG
-	authentication agent.
+	(cherry picked from commit 33d2c67bff0992ecbc0fe38556683242b9d1a4ae)
 
-2016-02-06  David Edmondson  
+2016-06-19  Lars Ingebrigtsen  
 
-	src/process.c Correctly convert AF_INET6 addresses
+	Doc fix
 
-	* src/process.c (conv_lisp_to_sockaddr): AF_INET6 addresses are
-	converted to a list of 16 bit quantities by
-	conv_sockaddr_to_lisp(). conv_lisp_to_sockaddr() should follow the
-	same scheme rather than expecting a (longer) list of 8 bit
-	quantities.
+	* lisp/rect.el (delete-whitespace-rectangle): Doc fix (bug#18026).
 
-	Backport:
+	(cherry picked from commit 6baca4911ec901579749dbf7596011d90fea3781)
 
-	(cherry picked from commit 55ce3c30d617c38eb086d5ad4ffbd881c20c559c)
+2016-06-19  Lars Ingebrigtsen  
 
-2016-02-06  Artur Malabarba  
+	Minor doc clarification
 
-	* lisp/isearch.el (isearch-define-mode-toggle): Improve logic
+	* lisp/subr.el (y-or-n-p): Document the return value from "n"
+	(bug#18024).
 
-2016-02-06  Artur Malabarba  
+	(cherry picked from commit 5d1f3192d484edee92caa46cd7d699da3e920259)
 
-	* lisp/menu-bar.el (menu-bar-options-menu): New search submenu
+2016-06-19  Lars Ingebrigtsen  
 
-	(menu-bar-search-options-menu): New variable
+	Fill font-lock-mode doc string
 
-2016-02-06  Artur Malabarba  
+	* lisp/font-core.el (font-lock-mode): Fill the text to make it
+	narrower (bug#18008).
 
-	* lisp/isearch.el (search-default-mode)
+	(cherry picked from commit 27abf372836532c57be2e9e3ed23413729cc07fc)
 
-	(isearch-regexp-function): Improve docstrings.
+2016-06-19  Lars Ingebrigtsen  
 
-2016-02-06  Artur Malabarba  
+	Wrap the auto-generated doc string
 
-	* lisp/isearch.el: Rename search-default-regexp-mode to search-default-mode
+	* lisp/emacs-lisp/easy-mmode.el (define-minor-mode): Wrap a
+	string to make it less likely that we get overlong lines
+	(bug#17999).
 
-	(search-default-mode): New variable.
-	(isearch-mode, isearch-define-mode-toggle)
-	(isearch--describe-regexp-mode): Update accordingly.
-	* lisp/menu-bar.el (nonincremental-search-forward): Update accordingly.
-	* etc/NEWS: Update accordingly.
-	* doc/emacs/search.texi: Update accordingly.
+	(cherry picked from commit 323b69664914d687fd4b48593479cea223dfbcb4)
 
-2016-02-06  Oscar Fuentes  
+2016-06-19  Lars Ingebrigtsen  
 
-	Use monitor's resolution for positioning tooltips
+	Clarify hi-lock-find-patterns
 
-	* src/xfns.c (compute_tip_xy): Use the resolution of the monitor where
-	  the mouse pointer is to avoid placing the tooltip over the border of
-	  the monitor on multi-head displays. Fixes bug#22549.
+	* lisp/hi-lock.el (hi-lock-find-patterns): Doc clarification
+	(bug#17989).
 
-2016-02-06  Eli Zaretskii  
+	(cherry picked from commit 552e90ce7dff3a7107243fdf71c4de3af443e13a)
 
-	Fix file-notify-test on MS-Windows
+2016-06-19  Lars Ingebrigtsen  
 
-	* test/automated/file-notify-tests.el (file-notify--test-timeout):
-	Reduce w32notify timeout to 10 sec.
-	(file-notify-test06-many-events): Call read-event after each
-	rename, to keep the w32notify backend happy in batch mode.
-	(Bug#22534)
+	Add a doc string to `winner-mode'
 
-2016-02-06  Eli Zaretskii  
+	* lisp/winner.el (winner-mode): Add a doc string based on the
+	comments in the file (bug#17716).
 
-	Fix issues found by auditing w32notify code
+	(cherry picked from commit 2c3ab9b6e39a3d600e7d82deacc24effaec051bb)
 
-	* src/w32inevt.c (handle_file_notifications): Count the number of
-	events to be returned.
-	* src/w32notify.c (send_notifications): Don't copy to the file
-	notification buffer more than it can hold.  (Bug#22534)
+2016-06-19  Lars Ingebrigtsen  
 
-2016-02-06  Eli Zaretskii  
+	Doc fix for align-newline-and-indent
 
-	Extend etags Ruby support for accessors
+	* lisp/align.el (align-newline-and-indent): Mention that
+	alignment is done by `align' (bug#17707).
 
-	* lib-src/etags.c (Ruby_functions): Support accessors defined with
-	parentheses.  (Bug#22563)
+	(cherry picked from commit 340a224ec3e01706112a07164da9a9f3f369a5aa)
 
-	* test/etags/ruby-src/test1.ru (A::B): Add tests for accessors
-	defined with parentheses.
-	* test/etags/ETAGS.good_1:
-	* test/etags/ETAGS.good_2:
-	* test/etags/ETAGS.good_3:
-	* test/etags/ETAGS.good_4:
-	* test/etags/ETAGS.good_5:
-	* test/etags/ETAGS.good_6:
-	* test/etags/CTAGS.good: Adapt to changes in Ruby tests.
+2016-06-19  Lars Ingebrigtsen  
 
-2016-02-06  Lars Ingebrigtsen  
+	Doc fix for `kbd'
 
-	Update publicsuffix.txt.
+	* lisp/subr.el (kbd): Describe more fully the format of the
+	parameter (bug#17039).
 
-	* etc/publicsuffix.txt: Updated from
-	https://publicsuffix.org/list/public_suffix_list.dat.
+	(cherry picked from commit 3a33afe25d8518f194fa4706eaccdb2a786a0348)
 
-2016-02-06  Lars Ingebrigtsen  
+2016-06-19  Lars Ingebrigtsen  
 
-	Ensure that Gnus dribble handling allows removing entries
+	Doc tweak
 
-	* lisp/gnus/gnus-start.el (gnus-dribble-enter): Ensure that each
-	entry is on a single line.
+	* lisp/simple.el (use-empty-active-region): Doc tweak.
+	There's only one region (bug#16513).
 
-2016-02-05  OGAWA Hirofumi    (tiny change)
+	(cherry picked from commit 35fb7897f161d5e5a87e039dc1e427094640b0c8)
 
-	Be consistent when using encoded strings in nnimap data
+2016-06-19  Lars Ingebrigtsen  
 
-	* lisp/gnus/nnimap.el (nnimap-encode-gnus-group): New function
-	(nnimap-request-list): Use it.
-	(nnimap-request-newgroups): Ditto.
+	Link from (emacs)Exiting to (lisp)Killing Emacs
 
-2016-02-05  OGAWA Hirofumi    (tiny change)
+	* doc/emacs/entering.texi (Exiting): Link to the lispref
+	manual for further customisations (bug#15445).
 
-	Display the decoded Gnus group name
+	(cherry picked from commit bc5f27aa099cdde02ca66e71501b89300685ab28)
 
-	* lisp/gnus/gnus-sum.el (gnus-summary-read-group-1): Use the
-	decoded group name in the message.
+2016-06-19  Lars Ingebrigtsen  
 
-2016-02-05  Lars Ingebrigtsen  
+	find-lisp doc touchups
 
-	Use completion-ignore-case instead of defining command
+	* lisp/find-lisp.el (find-lisp-format): Copy over the doc
+	string (bug#15047).
+	(find-lisp-find-files): Clarify doc.
 
-	* lisp/erc/erc.el (erc-mode): Set completion-ignore-case so
-	that we get case-insensitive completion.
-	(erc-completion-at-point): Remove.
+	(cherry picked from commit e4c7657b0d1a31d64ca24bc64b5480cd7687e332)
 
-2016-02-05  Eli Zaretskii  
+2016-06-19  Lars Ingebrigtsen  
 
-	Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25
+	Don't have the manual claim that it lists all CL incompatibilities
 
-2016-02-05  Michael Albinus  
+	* doc/misc/cl.texi (Common Lisp Compatibility): The list of
+	incompatibilities isn't exhaustive, so don't say that it is
+	(bug#15171).
 
-	* test/automated/file-notify-tests.el (file-notify-test06-many-events):
+	(cherry picked from commit fb685bc91a72508c97ce7e30f970d4157677f371)
 
-	Reduce the number of iterations to 250 in case of w32notify.
+2016-06-19  Lars Ingebrigtsen  
 
-2016-02-05  Eli Zaretskii  
+	Change all occurrences of "Mouse-[0-9]" to "mouse-[0-9]"
 
-	Fix problems caused by new implementation of sub-word mode
+	* doc/emacs/*.texi: Change all occurrences of "Mouse-[0-9]" to
+	"mouse-[0-9]".  These are case sensitive, and the keys are lower case
+	(bug#14554).
 
-	* lisp/subr.el (forward-word-strictly, backward-word-strictly):
-	New functions.
-	(word-move-empty-char-table): New variable.
+	(cherry picked from commit e4c26271f2c2fe08f8490e25c63a436ab2a804ca)
 
-	* etc/NEWS: Mention 'forward-word-strictly' and
-	'backward-word-strictly'.
+2016-06-19  Lars Ingebrigtsen  
 
-	* doc/lispref/positions.texi (Word Motion): Document
-	'find-word-boundary-function-table', 'forward-word-strictly', and
-	'backward-word-strictly'.  (Bug#22560)
+	Doc string change to enable-recursive-minibuffers
 
-	* src/syntax.c (syms_of_syntax)
-	: Doc fix.
+	* src/minibuf.c (syms_of_minibuf): Mention
+	minibuffer-depth-indicator-mode in the doc string to
+	enable-recursive-minibuffers (bug#14147).
 
-	* lisp/wdired.el (wdired-xcase-word):
-	* lisp/textmodes/texnfo-upd.el (texinfo-copy-node-name)
-	(texinfo-copy-section-title, texinfo-start-menu-description)
-	(texinfo-copy-menu-title, texinfo-specific-section-type)
-	(texinfo-insert-node-lines, texinfo-copy-next-section-title):
-	* lisp/textmodes/texinfo.el (texinfo-clone-environment)
-	(texinfo-insert-@end):
-	* lisp/textmodes/texinfmt.el (texinfo-format-scan)
-	(texinfo-anchor, texinfo-multitable-widths)
-	(texinfo-multitable-item):
-	* lisp/textmodes/tex-mode.el (latex-env-before-change):
-	* lisp/textmodes/flyspell.el (texinfo-mode-flyspell-verify):
-	* lisp/skeleton.el (skeleton-insert):
-	* lisp/simple.el (count-words):
-	* lisp/progmodes/vhdl-mode.el (vhdl-beginning-of-libunit)
-	(vhdl-beginning-of-defun, vhdl-beginning-of-statement-1)
-	(vhdl-update-sensitivity-list, vhdl-template-block)
-	(vhdl-template-break, vhdl-template-case, vhdl-template-default)
-	(vhdl-template-default-indent, vhdl-template-for-loop)
-	(vhdl-template-if-then-use, vhdl-template-bare-loop)
-	(vhdl-template-nature, vhdl-template-procedural)
-	(vhdl-template-process, vhdl-template-selected-signal-asst)
-	(vhdl-template-type, vhdl-template-variable)
-	(vhdl-template-while-loop, vhdl-beginning-of-block)
-	(vhdl-hooked-abbrev, vhdl-port-copy, vhdl-hs-forward-sexp-func):
-	* lisp/progmodes/verilog-mode.el (verilog-backward-sexp)
-	(verilog-forward-sexp, verilog-beg-of-statement)
-	(verilog-set-auto-endcomments, verilog-backward-token)
-	(verilog-do-indent):
-	* lisp/progmodes/vera-mode.el (vera-guess-basic-syntax)
-	(vera-indent-block-closing):
-	* lisp/progmodes/simula.el (simula-context)
-	(simula-backward-up-level, simula-forward-down-level)
-	(simula-previous-statement, simula-next-statement)
-	(simula-skip-comment-backward, simula-calculate-indent)
-	(simula-find-if, simula-electric-keyword):
-	* lisp/progmodes/sh-script.el (sh-smie--rc-newline-semi-p):
-	* lisp/progmodes/ruby-mode.el (ruby-smie--redundant-do-p)
-	(ruby-smie--forward-token, ruby-smie--backward-token)
-	(ruby-singleton-class-p, ruby-calculate-indent)
-	(ruby-forward-sexp, ruby-backward-sexp):
-	* lisp/progmodes/ps-mode.el (ps-run-goto-error):
-	* lisp/progmodes/perl-mode.el (perl-syntax-propertize-function)
-	(perl-syntax-propertize-special-constructs)
-	(perl-backward-to-start-of-continued-exp):
-	* lisp/progmodes/pascal.el (pascal-indent-declaration):
-	* lisp/progmodes/octave.el (octave-function-file-p):
-	* lisp/progmodes/mantemp.el (mantemp-insert-cxx-syntax):
-	* lisp/progmodes/js.el (js--forward-function-decl):
-	* lisp/progmodes/idlwave.el (idlwave-show-begin-check)
-	(idlwave-beginning-of-block, idlwave-end-of-block)
-	(idlwave-block-jump-out, idlwave-determine-class):
-	* lisp/progmodes/icon.el (icon-is-continuation-line)
-	(icon-backward-to-start-of-continued-exp, end-of-icon-defun):
-	* lisp/progmodes/hideif.el (hide-ifdef-define):
-	* lisp/progmodes/f90.el (f90-change-keywords):
-	* lisp/progmodes/cperl-mode.el (cperl-electric-pod)
-	(cperl-linefeed, cperl-electric-terminator)
-	(cperl-find-pods-heres, cperl-fix-line-spacing)
-	(cperl-invert-if-unless):
-	* lisp/progmodes/cc-engine.el (c-forward-<>-arglist-recur):
-	* lisp/progmodes/cc-align.el (c-lineup-java-inher):
-	* lisp/progmodes/ada-mode.el (ada-compile-goto-error)
-	(ada-adjust-case-skeleton, ada-create-case-exception)
-	(ada-create-case-exception-substring)
-	(ada-case-read-exceptions-from-file, ada-after-keyword-p)
-	(ada-scan-paramlist, ada-get-current-indent, ada-get-indent-end)
-	(ada-get-indent-if, ada-get-indent-block-start)
-	(ada-get-indent-loop, ada-get-indent-type)
-	(ada-search-prev-end-stmt, ada-check-defun-name)
-	(ada-goto-decl-start, ada-goto-matching-start)
-	(ada-goto-matching-end, ada-looking-at-semi-or)
-	(ada-looking-at-semi-private, ada-in-paramlist-p)
-	(ada-search-ignore-complex-boolean, ada-move-to-start)
-	(ada-move-to-end, ada-which-function, ada-gen-treat-proc):
-	* lisp/net/quickurl.el (quickurl-grab-url):
-	* lisp/mail/sendmail.el (mail-do-fcc):
-	* lisp/mail/rmail.el (rmail-resend):
-	* lisp/mail/mailabbrev.el (mail-abbrev-complete-alias):
-	* lisp/mail/mail-extr.el (mail-extract-address-components):
-	* lisp/json.el (json-read-keyword):
-	* lisp/files.el (insert-directory):
-	* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
-	* lisp/completion.el (symbol-under-point, symbol-before-point)
-	(symbol-before-point-for-complete, next-cdabbrev)
-	(add-completions-from-c-buffer):
-	* lisp/cedet/semantic/texi.el (semantic-up-context)
-	(semantic-beginning-of-context):
-	* lisp/cedet/semantic/bovine/el.el (semantic-get-local-variables):
-	use 'forward-word-strictly' and 'backward-word-strictly' instead
-	of 'forward-word' and 'backward-word'.
+	(cherry picked from commit 23ba488a5e8290c4de91e0ff4161641efa364c0d)
 
-2016-02-05  Lars Ingebrigtsen  
+2016-06-19  Lars Ingebrigtsen  
 
-	Fix doc string of tls-program
+	Clarify the `interactive' doc string slightly
 
-	* lisp/net/tls.el (tls-program): Document the %t parameter (bug#22559).
+	* src/callint.c (Finteractive): Clarify the doc string slightly
+	  (bug#14577).
 
-2016-02-05  Lars Ingebrigtsen  
+	(cherry picked from commit cd993be60da2d12db0d390001373d486c1091c47)
 
-	Restore window conf in nsm
+2016-06-19  Lars Ingebrigtsen  
 
-	* lisp/net/nsm.el (nsm-query-user): Restore the window configuration.
+	Clarify some doc strings
 
-	Backport:
+	* lisp/emacs-lisp/syntax.el (syntax-propertize-via-font-lock):
+	Clarify doc string (bug#8693).
+	(syntax-propertize): Clarify doc string.
 
-2016-02-05  Mark Oteiza  
+	(cherry picked from commit ad3ef417f3c40f086de9c547d6272e5685595e42)
 
-	* etc/NEWS: Document new mpc.el features
+2016-06-19  Lars Ingebrigtsen  
 
-2016-02-04  Leo Liu  
+	Add some concept index entries for custom types
 
-	* lisp/custom.el (defface): Revert indentation change.  (Bug#22524)
+	* doc/lispref/customize.texi (Composite Types): Add concept
+	index entries for restricted-sexp, radio and choice (bug#7385).
 
-2016-02-04  Alan Mackenzie  
+	(cherry picked from commit 388bb723fa078158d3148de05e942f9c01e95dd8)
 
-	Correctly fontify C++ initializations which "look like" functions.
+2016-06-19  Lars Ingebrigtsen  
 
-	Fixes bug#7579.
+	Mention `lisp-indent-function' in the lispref manual
 
-	lisp/progmodes/cc-engine.el (c-forward-declarator): Add extra optional
-	parameter to enable handling of "anonymous" declarators in declarations.
+	* doc/lispref/macros.texi (Indenting Macros): Mention
+	`lisp-indent-function' (bug#3393).
 
-	lisp/progmodes/cc-fonts.el (c-font-lock-declarators): Check more rigorously
-	whether a "(" opens a parameter list of a function, or an initialization of a
-	variable.
+	(cherry picked from commit a1627691a896b2afaa264f93534178bc763564c9)
 
-2016-02-04  Ulf Jasper  
+2016-06-19  Lars Ingebrigtsen  
 
-	Improve newsticker-treeview-selection-face
+	Clarify doc string of internal compilation function
 
-	* lisp/net/newst-treeview.el (newsticker-treeview-selection-face): Improve
-	readability for dark background.
+	* lisp/progmodes/compile.el (compilation-get-file-structure):
+	Clarify doc string (bug#3137).
 
-2016-02-04  Eli Zaretskii  
+	(cherry picked from commit 123191decb7428db3b32a6c01631fa755088393a)
 
-	Minor fix in tagging Ruby accessors by etags
+2016-06-19  Paul Eggert  
 
-	* lib-src/etags.c (Ruby_functions): Don't tag accessors whose
-	names are not literal symbols.  (Bug#22241)
+	Use ‘T *restrict’ proto, not ‘T[restrict]’
 
-2016-02-04  Paul Eggert  
+	* src/fns.c (sort_vector_copy): Use a different way to attempt to
+	work around GCC 3.0-and-earlier incompatibility with C99, one that
+	does not have problems with modern non-GCC compilers.
 
-	Spelling fixes
+2016-06-19  Eli Zaretskii  
 
-2016-02-04  Dmitry Gutov  
+	Fix documentation of 'url-retrieve-synchronously'
 
-	Remove 'def X' from the example
+	* doc/misc/url.texi (Retrieving URLs): Update argument list of
+	'url-retrieve-synchronously'.  (Bug#23411)
 
-	* test/etags/ruby-src/test1.ru (A::B): Remove 'def X'
-	(http://lists.gnu.org/archive/html/emacs-devel/2016-02/msg00167.html).
-	* test/etags/CTAGS.good:
-	* test/etags/ETAGS.good_1:
-	* test/etags/ETAGS.good_2:
-	* test/etags/ETAGS.good_3:
-	* test/etags/ETAGS.good_4:
-	* test/etags/ETAGS.good_5:
-	* test/etags/ETAGS.good_6: Adjust accordingly.
+2016-06-19  Eli Zaretskii  
 
-2016-02-04  Vasilij Schneidermann    (tiny change)
+	* lisp/url/url.el (url-retrieve-synchronously): Doc fix.  (Bug#23411)
 
-	Allow sending empty hidden values in eww
+2016-06-19  Leo Liu  
 
-	* lisp/net/eww.el (eww-tag-input): Allow sending empty hidden
-	values (bug#22388).
+	Fix last change to isearch-update (bug#23406)
 
-	(cherry picked from commit 5898da8210af7953e638ddf7821c05260979c3f0)
+	* lisp/isearch.el (isearch-update): Remove (setq cursor-sensor-inhibit
+	  nil) ie remove the original (unless (boundp 'cursor-sensor-inhibit)
+	  ...) form.
 
-	Backport:
+2016-06-19  Leo Liu  
 
-2016-02-04  David Edmondson  
+	Autoload cursor-sensor-inhibit (bug#23406)
 
-	Make erc work better when encountering unknown prefix chars
+	* lisp/emacs-lisp/cursor-sensor.el (cursor-sensor-inhibit): Autoload.
+	* lisp/isearch.el (isearch-update): Remove boundp check.
 
-	* lisp/erc/erc.el (erc-channel-receive-names): Output a warning
-	instead of erroring out on unknown prefix chars (bug#22380).
+2016-06-19  Phillip Lord  
 
-2016-02-04  Lars Ingebrigtsen  
+	org-map-entries: Fix org-agenda-prepare-buffers call
 
-	Make erc completion case-insensitive again
+	* lisp/org.el (org-map-entries): Check that buffer-file-name is non-nil
+	  before passing to org-agenda-prepare-buffers.
 
-	* lisp/erc/erc.el (erc-completion-at-point): Make erc completion
-	case-insensitive again (bug#11360).
+	This is a backport of commit 44c8cd7136e3fcd1e6bfa08895cac437b7a691fa
+	from upstream org-mode. Addresses bug #23365.
 
-2016-02-04  Carlos Pita    (tiny change)
+2016-06-19  Eli Zaretskii  
 
-	Make complection in erc use consistent casing
+	Followup for last commit in the user manual
 
-	* lisp/erc/erc-pcomplete.el (pcomplete-erc-all-nicks): Make
-	case in the complection consistent (bug#18509).
+	* doc/emacs/basic.texi (Moving Point): Clarify that
+	set-goal-column has buffer-local effect.  (Bug#23405)
 
-2016-02-04  Francis Litterio  
+2016-06-19  Eli Zaretskii  
 
-	Make /QUIT in erc more robust
+	Improve doc string of 'set-goal-column'
 
-	* lisp/erc/erc.el (erc-kill-query-buffers): Don't bug out if we're
-	issuing /QUIT to disconnected servers (bug#22099).
+	* lisp/simple.el (set-goal-column): Doc fix.  (Bug#23405)
 
-2016-02-04  Kevin Brubeck Unhammer    (tiny change)
+2016-06-19  Eli Zaretskii  
 
-	Make tracking faces in Emacs work more reliably
+	Fix the MSDOS build
 
-	* lisp/erc/erc-track.el (erc-faces-in): Always return lists of
-	faces to avoid later ambiguity (bug#22424).
+	* config.bat:
+	* msdos/sedlisp.inp:
+	* msdos/sedlibmk.inp:
+	* msdos/sedleim.inp:
+	* msdos/sedadmin.inp:
+	* msdos/sed6.inp:
+	* msdos/sed3v2.inp:
+	* msdos/sed2v2.inp:
+	* msdos/sed1v2.inp: Adapt to Emacs 25.
 
-2016-02-04  Lars Ingebrigtsen  
+	* src/process.c (remove_slash_colon): Move out of "#ifdef
+	subprocesses" block, as it its called unconditionally.  Move
+	ADD_SUBFEATURE calls into "#ifdef subprocesses" block, as they
+	reference variables only defined in that block.
+	* src/msdos.h: Provide prototypes for IT_set_frame_parameters,
+	faccessat, msdos_fatal_signal, syms_of_msdos, pthread_sigmask,
+	dos_keysns, dos_keyread, run_msdos_command, and
+	syms_of_win16select, to avoid compiler warnings.
+	* src/msdos.c (SYS_ENVIRON): Define to either '_environ' or
+	'environ', depending on the DJGPP version.
+	Remove declarations of externally-visible Lisp objects, like
+	Qbackground_color and Qreverse.
+	(run_msdos_command): First argument is not signed, not unsigned.
+	Use SYS_ENVIRON.
+	(sys_select): Use 'timespec_cmp' instead of 'timespec_sign', as
+	the latter doesn't work when 'time_t' is an unsigned data type.
+	This caused idle timers to behave incorrectly: they only fired
+	after a keyboard input event.
+	* src/frame.c (adjust_frame_size) [MSDOS]: Account for
+	FRAME_TOP_MARGIN that isn't counted in the frame's number of
+	lines, but dos_set_window_size needs it to be added.
+	* src/lread.c (INFINITY, NAN) [DJGPP < 2.05]: Provide definitions.
+	* src/fns.c (sort_vector_copy) [__GNUC__ < 4]: Provide a prototype
+	that works around compilation errors with older GCC versions.
+	* src/w16select.c: Don't declare QCLIPBOARD and QPRIMARY as Lisp
+	Objects.
+	* src/filelock.c [MSDOS]: Ifdef away most of the code.  Provide
+	no-op implementations for 'lock_file' and 'unlock_file'.
+	(Ffile_locked_p) [MSDOS]: Always return nil.  This avoids multiple
+	ifdefs in all users of filelock.c functionality.
+	* src/conf_post.h (EOVERFLOW, SIZE_MAX) [DJGPP < 2.04]: Define.
+	* src/emacs.c [MSDOS]: Include dosfns.h, to avoid compiler
+	warnings.
+	* src/dosfns.h: Provide prototypes for dos_cleanup,
+	syms_of_dosfns, and init_dosfns.
+	* src/deps.mk (atimer.o): Depend on msdos.h.
+	(emacs.o): Depend on dosfns.h.
+	* src/atimer.c [MSDOS]: Include msdos.h, to avoid compiler
+	warnings.
+
+	* lisp/window.el (window--adjust-process-windows): Skip the body
+	if 'process-list' is not available.  This avoids failure to start
+	up on MS-DOS.
+	* lisp/vc/diff.el (diff-no-select): Test 'make-process', not
+	'start-process', as the latter is now available on all platforms.
+	* lisp/textmodes/ispell.el (ispell-async-processp): Replace
+	'start-process' with 'make-process' in a comment.
+	* lisp/term/internal.el (IT-unicode-translations): Modify and add
+	a few translations to display Info files with Unicode markup.  Fix
+	an ancient off-by-one mismatch error with Unicode codepoints.
+	* lisp/progmodes/compile.el (compilation-start): Test
+	'make-process', not 'start-process', as the latter is now
+	available on all platforms.
+	* lisp/man.el (Man-build-man-command, Man-getpage-in-background):
+	Test 'make-process', not 'start-process', as the latter is now
+	available on all platforms.
+	* lisp/international/mule-cmds.el (set-coding-system-map): Test
+	'make-process', not 'start-process', as the latter is now
+	available on all platforms.
+	* lisp/eshell/esh-cmd.el (eshell-do-pipelines-synchronously): Doc
+	fix.
+	(eshell-execute-pipeline): Test 'make-process', not
+	'start-process', as the latter is now available on all platforms.
+
+2016-06-19  Andreas Schwab  
+
+	Remove \= from format string (bug#18190)
+
+	* lisp/emacs-lisp/eieio.el (defclass): Remove \= from format
+	string.
+
+2016-06-19  Eli Zaretskii  
+
+	Fix variable-pitch font on MS-Windows
+
+	* lisp/faces.el (variable-pitch) [w32]: Name a variable-pitch font
+	explicitly, to avoid Emacs picking up a bold-italic variant on
+	some MS-Windows systems.  See this thread for details:
+	http://lists.gnu.org/archive/html/emacs-devel/2016-04/msg00746.html.
+
+2016-06-19  Alan Mackenzie  
+
+	Restore follow-scroll-up/down to scrolling by the combined size of all windows
+
+	Also rename the current follow-scroll-up/down functions to
+	follow-scroll-up-window and follow-scroll-down-window.  These scroll by the
+	height of the current window.
+
+	This fixes bug #23347.
+
+	* lisp/follow.el (follow-mode): Tweak the doc string.
+	(follow-scroll-up-arg, follow-scroll-down-arg): new functions, extracted from
+	follow-scroll-up/down.
+	(follow-scroll-up-window, follow-scroll-down-window): Functions renamed from
+	follow-scroll-up/down.
+	(follow-scroll-up, follow-scroll-down): Restore the historic functionality.
+
+2016-06-19  Alan Mackenzie  
+
+	Revert unneeded change which harms syntactic parsing.  This fixes bug #23308.
+
+	* lisp/progmodes/cc-engine.el (c-invalidate-state-cache): User
+	c-state-old-cpp-end as an argument to c-with-all-but-one-cpps-commented-out
+	regardless of the value of `here'.
+
+2016-06-19  Alan Mackenzie  
+
+	Correct indentation of ids in a C++ enum after a protection keyword.
+
+	Also correct the misfontification of the last enum identifier.
+
+	* lisp/progmodes/cc-engine.el (c-forward-keyword-prefixed-id): setq
+	c-last-identifier-range to nil to ensure that only types recognized by this
+	macro are set for fontification as types.
+	(c-backward-typed-enum-colon): Function renamed from
+	c-backward-colon-prefixed-type.  On finding a colon in the backward search,
+	check it is preceded by an identifier rather than a keyword.
+
+2016-06-19  Glenn Morris  
+
+	* lisp/window.el (window--process-window-list): No-op if no processes.
+
+	This avoids an issue with save-selected-window (from walk-windows)
+	failing if frame.el is not loaded, eg if the terminal is resized
+	during startup of a -nw CANNOT_DUMP build.  (Bug#23369).
+
+2016-06-19  Paul Eggert  
+
+	Port dumping to NetBSD with PaX
+
+	Problem reported by Thomas Klausner (Bug#23371).
+	* configure.ac (PAXCTL_dumped, PAXCTL_notdumped): New vars.
+	Set them to setfattr and/or paxctl commands appropriate for
+	GNU/Linux and/or NetBSD; the latter prefers paxctl +a.  Search
+	for paxctl only if setfattr is not found.
+	* src/Makefile.in (PAXCTL_dumped, PAXCTL_notdumped):
+	New vars, replacing PAXCTL_if_present and SETFATTR_if_present.
+	All uses changed.
 
-	Make shr not bug out on images on non-graphical displays
+2016-06-19  Dmitry Gutov  
 
-	* lisp/net/shr.el (shr-put-image): Don't bug out on alt-less
-	images on non-graphical displays (bug#22327).
+	Don't mistake `for' inside a function for a part of array comprehension
 
-2016-02-04  Lars Ingebrigtsen  
+	* lisp/progmodes/js.el (js--indent-in-array-comp): Also check the
+	depth in parens between the bracket and `for' (bug#23391).
 
-	Fix bookmark display widths
+	* test/indent/js.js: Add a corresponding example.
 
-	* lisp/net/eww.el (eww-list-bookmarks): Pop to the buffer before
-	preparing it so that the widths are computed correctly (bug#22328).
+2016-06-19  Anders Lindgren  
 
-2016-02-04  Lars Ingebrigtsen  
+	Fix bug#22891: wrong terminal width when a fringe width is zero.
 
-	Fix typo in eww-make-unique-file-name
+	When either fringe width is zero, Emacs reserved one column for a
+	continuation glyph. Terminal windows does not take this into
+	account when the frame is resized.
 
-	* lisp/net/eww.el (eww-make-unique-file-name): Make this function
-	actually work.
+	* lisp/window.el (window-adjust-process-window-size): Use
+	`window-max-chars-per-line' instead of `window-body-width'.
+	* lisp/term.el (term-window-width): Remove function. (It does the
+	same as `window-max-chars-per-line' but without recent bug fixes.)
+	(term-mode): Use `window-max-chars-per-line' instead of
+	`term-window-width'.
 
-2016-02-03  Lars Ingebrigtsen  
+	Backport
 
-	Make it possible to TAB to input fields
+	(cherry picked from commit 5b5403289888efe8783ae6a405845b925f544ec1)
 
-	* lisp/net/eww.el (eww-tag-input): Make it possible to TAB to
-	input fields (bug#22540).
+2016-06-19  Leo Liu  
 
-2016-02-03  Lars Ingebrigtsen  
+	Improve last change to vc-git-mode-line-string
 
-	Insert complete alt texts when images are disabled
+	* lisp/vc/vc-git.el (vc-git-mode-line-string): Better fix that caches
+	  the result.
 
-	* lisp/net/shr.el (shr-tag-img): When images are disabled, insert
-	the complete alt/title string (bug#22293).
+2016-06-19  Stephen Berman  
 
-2016-02-03  Lars Ingebrigtsen  
+	Todo mode doc bug fix
 
-	Allow eww text fields to grow
+	* lisp/calendar/todo-mode.el (todo-show): Correct obsolete and no
+	longer correct information in doc string.
 
-	* lisp/net/eww.el (eww-process-text-input): Allow text fields to
-	grow when typing in stuff that's longer than the original width.
+2016-06-19  Leo Liu  
 
-2016-02-03  Dima Kogan  
+	Fix revision calculation in vc-git-mode-line-string
 
-	Make erc work when subword-mode is switched on
+	* lisp/vc/vc-git.el (vc-git-mode-line-string): Use
+	  vc-git-working-revision because vc-working-revision needs to decide
+	  the backend and may return nil.
 
-	* lisp/erc/erc-backend.el (erc-forward-word, erc-word-at-arg-p)
-	(erc-bounds-of-word-at-point): New functions to do word-based
-	things when subword-mode is switched on.
+2016-06-19  Jorgen Schaefer  
 
-	* lisp/erc/erc-button.el (erc-button-add-nickname-buttons): Use them
-	(bug#17558).
+	Add Python 3.5 keyword "await"
 
-2016-02-03  Teemu Likonen  
+	* lisp/progmodes/python.el (python-font-lock-keywords): Add await as
+	keyword.
 
-	Fix IMAP doc example
+2016-06-19  Lele Gaifax  
 
-	* doc/misc/gnus.texi (Client-Side IMAP Splitting): Fix example.
+	Add new keywords of Python 3.5
 
-2016-02-03  Paul Eggert  
+	Python 3.5, released in mid September 2015, introduced a few new
+	keywords to better support asynchronous code, "async" and "await"
+	in particular. See https://www.python.org/dev/peps/pep-0492/ for
+	details. (Bug#21783)
+	* lisp/progmodes/python.el (python-rx-constituents): Add async
+	def/for/with as block-start and async def as defun.
+	* lisp/progmodes/python.el (python-font-lock-keywords): Add async
+	def/for/with as keyword.
+	* test/automated/python-tests.el (python-indent-after-async-block-1,
+	python-indent-after-async-block-2, python-indent-after-async-block-3,
+	python-nav-beginning-of-defun-3): New tests to test indentation and
+	navigation for the async keyword.
 
-	Quoting fixes in doc strings and diagnostics
+2016-06-19  Mark Oteiza  
 
-	* lisp/emacs-lisp/bytecomp.el (byte-compile-setq, byte-compile-funcall):
-	* lisp/gnus/mml-smime.el (mml-smime-get-dns-cert)
-	(mml-smime-get-ldap-cert):
-	Follow user style preference when quoting diagnostics.
+	Partially revert previous change.
 
-2016-02-03  Noam Postavsky  
+	This commit partially reverts 0f332848cdb2ed6d46771914a911cbca194cd51a.
+	* lisp/rect.el (rectangle--highlight-for-redisplay): Use region face.
+	This function is for rectangle-mark-mode, not string-rectangle.
 
-	Fix warning message in hack-local-variables
+2016-06-19  Paul Eggert  
 
-	* lisp/files.el (hack-local-variables): use 'thisbuf' to reference
-	the original buffer name in the warning message.  (Bug#21681)
+	Say why text-quoting-style is not a user option
 
-2016-02-03  Eli Zaretskii  
+	* doc/lispref/help.texi (Keys in Documentation):
+	* etc/NEWS: Document why text-quoting-style is not a
+	customizable variable (Bug#23372).
 
-	Etags: yet another improvement in Ruby tags
+2016-06-19  Glenn Morris  
 
-	* lib-src/etags.c (Ruby_functions): Handle continuation lines in
-	Ruby accessor definitions.  (Bug#22241)
+	* lisp/emacs-lisp/autoload.el (update-directory-autoloads):
+	Future-proof against non-time-values.
 
-	* test/etags/ruby-src/test1.ru (A::B#X): Add some more tests for
-	accessors and multiline definitions.
-	* test/etags/ETAGS.good_1:
-	* test/etags/ETAGS.good_2:
-	* test/etags/ETAGS.good_3:
-	* test/etags/ETAGS.good_4:
-	* test/etags/ETAGS.good_5:
-	* test/etags/ETAGS.good_6:
-	* test/etags/CTAGS.good: Adapt to changes in Ruby tags.
+2016-06-19  Eli Zaretskii  
 
-2016-02-03  Eli Zaretskii  
+	Don't mention ~/.emacs.bmk literally in doc strings
 
-	Fix x-popup-menu on TTYs without a mouse
+	* lisp/bookmark.el (bookmark-save-flag, bookmark-load): Don't
+	mention "~/.emacs.bmk" explicitly as the default bookmark file in
+	the doc strings.  (Bug#23350)
 
-	* src/menu.c (Fx_popup_menu): Be sure to initialize 'x' and 'y'
-	for the TTY case without a mouse.  (Bug#22538)
+2016-06-19  YAMAMOTO Mitsuharu  
 
-2016-02-03  Nicolas Petton  
+	* etc/NEWS: Explain why multicolor font display is disabled on OS X Cocoa.
 
-	* lisp/emacs-lisp/map.el: Improvements to the docstring of the pcase macro
+2016-06-19  Paul Eggert  
 
-2016-02-02  Lars Ingebrigtsen  
+	Port to Ubuntu 16.04 --enable-gcc-warnings
 
-	Use pop-to-buffer-same-window in eww
+	* src/image.c (gif_load) [HAVE_GIF]: Fix pointer signedness problem.
 
-	* lisp/net/eww.el: pop-to-buffer-same-window throughout instead of
-	switch-to-buffer (bug#22244).
+2016-06-19  Paul Eggert  
 
-2016-02-02  Paul Eggert  
+	* etc/NEWS: Improve wording of vc-git-log-output-coding-system etc.
 
-	* autogen.sh: Revert all recent changes.
+2016-06-19  Tino Calancha  
 
-2016-02-02  Glenn Morris  
+	Don't kill ~/ if it's the top level directory
 
-	* make-dist: Updates related to nt/.
+	* lisp/dired-aux.el (dired-kill-subdir): Don't kill ~/ if it's
+	the top level directory (bug#23017).
 
-	* make-dist: Add modules/.
+2016-06-19  Tino Calancha    (tiny change)
 
-	* make-dist: Update for super-special file that can't live in etc/.
+	describe-char: fix insert char documentation
 
-2016-02-02  Eli Zaretskii  
+	* lisp/descr-text.el (describe-char):
+	Only 'ucs-names' entries can be inserted by unicode name (Bug#23325).
 
-	Fix failure to compile ns-win.el in parallel builds
+2016-06-19  Dmitry Gutov  
 
-	* src/Makefile.in ($(lispsource)/term/ns-win.elc): Add order-only
-	dependency on $(lispsource)/international/charprop.el.
-	(Bug#22501)
+	(vc-git-mode-line-string): Don't use `replace-regexp-in-string'
 
-2016-02-02  Eli Zaretskii  
+	* lisp/vc/vc-git.el (vc-git-mode-line-string): Use `substring'
+	instead of `replace-regexp-in-string', because REV can be nil
+	(e.g. when FILE is a directory, bug#23344), and we actually know
+	we only need the first 4 characters.
 
-	Fix names of tags generated for Ruby accessors
+2016-06-19  Nicolas Petton  
 
-	* lib-src/etags.c (Ruby_functions): Don't include the leading
-	colon ':' in tags for Ruby accessors and aliases.  (Bug#22241)
+	Bump version to 25.0.93
 
-	* test/etags/ETAGS.good_1:
-	* test/etags/ETAGS.good_2:
-	* test/etags/ETAGS.good_3:
-	* test/etags/ETAGS.good_4:
-	* test/etags/ETAGS.good_5:
-	* test/etags/ETAGS.good_6:
-	* test/etags/CTAGS.good: Adapt to changes in Ruby tags.
+	* README:
+	* configure.ac:
+	* msdos/sed2v2.inp: Bump Emacs version to 25.0.93.
 
-2016-02-02  Eli Zaretskii  
+2016-06-19  Nicolas Petton  
 
-	Fix file-name recognition in 'etags'
+	* etc/AUTHORS: Update the AUTHORS file
 
-	* lib-src/etags.c (get_language_from_filename): If FILE includes a
-	leading directory, compare only its basename to the known file
-	names in lang_names[].
+	* admin/update_autogen: Use #!/usr/bin/env bash
 
-	* test/etags/Makefile (RBSRC): Adapt to recent test1.ruby
-	renaming.
-	* test/etags/ETAGS.good_1:
-	* test/etags/ETAGS.good_2:
-	* test/etags/ETAGS.good_3:
-	* test/etags/ETAGS.good_4:
-	* test/etags/ETAGS.good_5:
-	* test/etags/ETAGS.good_6:
-	* test/etags/CTAGS.good: Adapt to changes in Ruby file names and
-	to the results in Makefile due to the above etags.c fix.
+	* admin/authors.el (authors-ignored-files): Additions.
 
-2016-02-02  Eli Zaretskii  
+2016-06-19  Martin Rudalics  
 
-	Change Ruby file names and extensions recognized by 'etags'
+	In x_set_window_size restore do_pending_window_change calls
 
-	* lib-src/etags.c : New variable, holds names
-	of Ruby files.
-	: Treat .rb, .ru, and .rbw as Ruby extensions.
-	: Add Ruby_filenames to the Ruby entry.
-	* test/etags/ruby-src/test1.ru: Renamed from test1.ruby.
-	(Bug#22241)
+	* src/xterm.c (x_set_window_size):
+	* src/w32term.c (x_set_window_size): Restore
+	do_pending_window_change calls after their stupid removal on
+	2015-08-31.
 
-2016-02-02  Eli Zaretskii  
+2016-06-19  Ilya Zakharevich  
 
-	More improvements for Ruby support in 'etags'
+	Fix Alt-modified keys on some European MS-Windows keyboards
 
-	* lib-src/etags.c (Ruby_functions): Tag Ruby accessors and
-	alias_method.  Identify constants even if the assignment is not
-	followed by whitespace.  (Bug#22241)
+	* src/w32fns.c (deliver_wm_chars): If the reported character is
+	ASCII, AND Meta modifier is a candidate, behave as if Meta is
+	present, i.e. fall back to the legacy code.  (Bug#23251)
 
-	* test/etags/ruby-src/test1.ru: Add tests for constants,
-	accessors, and alias_method.
-	* test/etags/ETAGS.good_1:
-	* test/etags/ETAGS.good_2:
-	* test/etags/ETAGS.good_3:
-	* test/etags/ETAGS.good_4:
-	* test/etags/ETAGS.good_5:
-	* test/etags/ETAGS.good_6:
-	* test/etags/CTAGS.good: Adapt to changes in Ruby tests.
+2016-06-19  Eli Zaretskii  
 
-2016-02-02  Paul Eggert  
+	Document 'help-go-forward'
 
-	Add --git-config option to autogen.sh
+	* doc/emacs/help.texi (Help Mode): Document and index
+	'help-go-forward'.  (Bug#23323)
 
-	* autogen.sh: New options --git-config, --help.
-	(git_config): New shell var.  Alter function to respect this var.
+2016-06-19  Eli Zaretskii  
 
-2016-02-02  Lars Ingebrigtsen  
+	Revert "Allow to customize names of executables used by grep.el"
 
-	Fix editing undo changes in eww fields
+	This reverts commit c93ae7a1e5a94541189a8f36984014344d561ffc.
 
-	* eww.el (eww-tag-form): Don't overwrite initial form data in text
-	fields.
-	(eww-process-text-input): Make `M-t' at the end of text fields work
-	better (bug#19085).
+2016-06-19  Eli Zaretskii  
 
-2016-02-01  Lars Ingebrigtsen  
+	Revert "Don't use 'find-program'"
 
-	Allow the user more control of popping up the eww window
+	This reverts commit 10597c977d55cbf9304b51c3b364ce58199384a0.
 
-	* eww.el (eww): Use pop-to-buffer-same-window (suggested by
-	Michael Heerdegen) (bug#22244).
+2016-06-19  Eli Zaretskii  
 
-2016-02-01  Lars Ingebrigtsen  
+	Revert "Use 'grep-find-program' in check-declare.el"
 
-	Make eww-browse-url with new-window parameter work again
+	This reverts commit 33bef6e90bfd20609d044b8a076c1570c627684a.
 
-	* eww.el (eww-browse-url): Stay in the same buffer if we're
-	already in a eww mode buffer so that eww-browse-url with a
-	new-window parameter works (bug#22244).
+2016-06-19  Eli Zaretskii  
 
-2016-02-01  Lars Ingebrigtsen  
+	Clarify documentation of 'dired-mark-files-containing-regexp'
 
-	Clean up eww code slightly
+	* doc/emacs/dired.texi (Marks vs Flags): Clarify that for files
+	visited in buffers, 'dired-mark-files-containing-regexp' searches
+	the buffer rather than the file on disk.  (Bug#22694)
 
-	* eww.el (eww-browse-url): Clean up code slightly.
+	* lisp/dired.el (dired-mark-files-containing-regexp): Clarify that
+	for files visited in buffers, 'dired-mark-files-containing-regexp'
+	searches the buffer rather than the file on disk.  (Bug#22694)
 
-2016-02-01  Lars Ingebrigtsen  
+2016-06-19  Eli Zaretskii  
 
-	Don't insert nil faces in shr
+	Make tmm-menubar work in correct order again
 
-	* shr.el (shr-insert-table): Don't add nil faces, because that
-	will show up in *Messages* as "Invalid face reference: nil [32
-	times]".
+	* lisp/tmm.el (tmm-prompt): Don't reverse 'tmm-km-list' right at the
+	beginning; instead, pass a reversed copy to 'tmm--completion-table'.
+	(Bug#23309)
+	(tmm-menubar): Fix an off-by-one error in determining the menu
+	item when the function is called with a non-nil 'x-position'
+	argument.
 
-2016-02-01  Glenn Morris  
+2016-06-19  Dmitry Gutov  
 
-	Improve the custom type of some user options.
+	Remove the Meta-CVS VC backend
 
-	* lisp/autoinsert.el (auto-insert-alist):
-	* lisp/replace.el (query-replace-from-to-separator):
-	* lisp/gnus/gnus-art.el (gnus-hidden-properties):
-	* lisp/gnus/gnus-gravatar.el (gnus-gravatar-properties):
-	* lisp/gnus/gnus-picon.el (gnus-picon-properties):
-	* lisp/progmodes/prolog.el (prolog-keywords, prolog-types)
-	(prolog-mode-specificators, prolog-determinism-specificators)
-	(prolog-directives, prolog-program-name, prolog-program-switches)
-	(prolog-consult-string, prolog-compile-string, prolog-eof-string)
-	(prolog-prompt-regexp): Improve custom type.
+	* lisp/obsolete/vc-mcvs.el: Remove the file (bug#20475).
 
-2016-02-01  Glenn Morris  
+	* lisp/vc/log-view.el (log-view-extract-comment): Remove the MCVS
+	reference.
 
-	Mark some risky calendar variables.
+	* doc/misc/efaq-w32.texi (Version control): Same.
 
-	* lisp/calendar/cal-china.el (chinese-calendar-time-zone):
-	Remove risky setting for deleted obsolete alias.
-	(calendar-chinese-standard-time-zone-name)
-	(calendar-chinese-daylight-saving-start)
-	(calendar-chinese-daylight-saving-end):
-	* lisp/calendar/calendar.el (calendar-iso-date-display-form)
-	(calendar-european-date-display-form)
-	(calendar-american-date-display-form, calendar-date-display-form):
-	* lisp/calendar/diary-lib.el (diary-remind-message)
-	(diary-header-line-format):
-	* lisp/calendar/solar.el (calendar-time-display-form)
-	(calendar-location-name): Mark as risky.
+2016-06-19  Michael Albinus  
 
-2016-02-01  Simen Heggestøyl  
+	Fix Bug#23276
 
-	Highlight two additional SCSS keywords
+	* lisp/autorevert.el (auto-revert-handler): Ignore errors
+	coming from `revert-buffer'.  (Bug#23276)
 
-	* lisp/textmodes/css-mode.el (css-bang-ids): New defconst holding CSS
-	identifiers on the form !foo.
-	(scss-bang-ids): New defconst holding SCSS identifiers on the form
-	!foo.
-	(css--font-lock-keywords): Highlight the new SCSS bang identifiers in
-	`font-lock-builtin-face'.
+2016-06-19  Reto Zimmermann  
 
-	* test/indent/css-mode.css: Add bang rule test case.
+	Sync with upstream vhdl mode v3.38.1.
 
-	* test/indent/scss-mode.scss: Add test cases for the introduced bang
-	rules.
+	* lisp/progmodes/vhdl-mode.el (vhdl-version, vhdl-time-stamp): Update.
+	(vhdl-mode): No longer set comment-padding.
+	(vhdl-begin-p): Handle missing space between keyword and parenthesis.
+	(vhdl-beginning-of-statement-1): Fix indentation for "else generate".
+	(vhdl-template-else, vhdl-template-elsif): Support generate statement.
+	(vhdl-re-search-forward, vhdl-re-search-backward): Save match data.
 
-2016-02-01  Karl Fogel  
+2016-06-19  Paul Eggert  
 
-	Recommend enabling integrity-checking in git
+	Tweak configure.ac syntax in recent module patch
 
-	* admin/notes/git-workflow:  Recommend setting transfer.fsckObjects.
+	* configure.ac: Use proper Autoconf parenthesization in
+	recent HAVE_MODULES patch.  Although this doesn’t fix any bugs,
+	the previous syntax was confusing.
 
-	This is related to the autogen.sh changes made by Paul Eggert in
-	commit d766ca8f (2016-02-01) and commit cedd7cad (2016-02-01), and to
-	my edits today to http://www.emacswiki.org/emacs/GitForEmacsDevs and
-	to emacswiki.org/emacs/GitQuickStartForEmacsDevs.  See also the thread
-	"Recommend these .gitconfig settings for git integrity." at
-	https://lists.gnu.org/archive/html/emacs-devel/2016-01/threads.html#01802.
+2016-06-19  Paul Eggert  
 
-2016-02-01  Martin Rudalics  
+	Port to GCC 5.3.1 20160406 (Red Hat 5.3.1-6)
 
-	Some corrections in Elisp manual
+	* src/indent.c (Fvertical_motion): Pacify --enable-gcc-warnings
+	when using the April 6 Fedora patch to GCC.
 
-	* doc/lispref/buffers.texi (Read Only Buffers): Describe optional
-	argument POSITION.
-	* doc/lispref/debugging.texi (Error Debugging): `debug-on-signal'
-	is an option.
-	* doc/lispref/display.texi (Refresh Screen): Describe optional
-	argument FRAME of `redraw-frame'.
-	(Attribute Functions): Describe optional argument CHARACTER of
-	`face-font'.
-	(Defining Images): `image-load-path' is an option.
-	(Beeping): `ring-bell-function' is an option.
-	* doc/lispref/frames.texi (Size and Position): The PIXELWISE
-	argument of `set-frame-size' is optional.
-	(Raising and Lowering): The TERMINAL argument of `tty-top-frame'
-	is optional.
-	* doc/lispref/keymaps.texi (Controlling Active Maps): Fix doc of
-	`set-transient-map'.
-	* doc/lispref/minibuf.texi (Text from Minibuffer):
-	`read-regexp-defaults-function' is an option.
-	(Minibuffer Contents): `delete-minibuffer-contents' is a command.
-	* doc/lispref/modes.texi (Mode Line Variables):
-	`mode-line-position' and `mode-line-modes' are variables, not
-	options.
-	* doc/lispref/strings.texi (Creating Strings): The START argument
-	of `substring' is optional.
-	* doc/lispref/text.texi (Buffer Contents): Describe optional
-	argument NO-PROPERTIES of `thing-at-point'.
-	(User-Level Deletion): Both arguments of
-	`delete-trailing-whitespace' are optional.
-	(Margins): Use @key{RET} instead of @kbd{RET}.
-	* doc/lispref/windows.texi (Display Action Functions): Write
-	non-@code{nil} instead of non-nil.
-	(Choosing Window Options): The WINDOW arg of
-	`split-window-sensibly' is optional.
-	(Choosing Window Options): Write non-@code{nil} instead of
-	non-nil.
-	(Window Start and End): Both args of `window-group-end' are
-	optional.
+2016-06-19  Mark Oteiza  
 
-	* src/buffer.c (Fbarf_if_buffer_read_only): Rename argument POS
-	to POSITION to keep consisteny with doc-string.
+	Make sh-electric-here-document-mode accessible in sh-mode-hook. (Bug#3226)
 
-2016-02-01  Paul Eggert  
+	* lisp/progmodes/sh-script.el (sh-mode-hook): Add
+	sh-electric-here-document-mode as an option and the default value.
+	(sh-mode): Mention sh-mode-hook in docstring.
+	(sh-mode): Remove sh-electric-here-document-mode invocation.
 
-	Chatter when autogen.sh changes Git configuration
+2016-06-19  Glenn Morris  
 
-	* autogen.sh (git_config): New function.  Use it instead of ‘git config’.
+	* configure.ac (HAVE_MODULES): Exclude gnu-kfreebsd from previous.
 
-2016-02-01  Kyle Meyer  
+2016-06-19  Mark Oteiza  
 
-	* lisp/org/org-compat.el (org-font-lock-ensure): Fix bogus test (bug#22399)
+	Make use of rectangle-preview custom variable.
 
-2016-01-31  Paul Eggert  
+	lisp/rect.el (rectangle--string-preview): Only create a preview if
+	rectangle-preview is non-nil (Bug#23248).
 
-	Omit unnecessary history from Lisp intro
+2016-06-19  Mark Oteiza  
 
-	* doc/lispintro/emacs-lisp-intro.texi (Review, Digression into C)
-	(Conclusion): Reword so as not to talk about earlier versions
-	of Emacs in what should be an intro.
+	Make use of rectangle-preview face.
 
-2016-01-31  Paul Eggert  
+	* lisp/rect.el (rectangle--string-preview):
+	(rectangle--highlight-for-redisplay): Replace 'region with
+	'rectangle-preview (Bug#23248).
 
-	* etc/HISTORY: Add some more history, plus git tags.
+2016-06-19  Eli Zaretskii  
 
-2016-01-31  Paul Eggert  
+	Use 'grep-find-program' in check-declare.el
 
-	Improve elisp “Security Considerations” doc
+	* lisp/emacs-lisp/check-declare.el (check-declare-directory): Use
+	'grep-find-program', not 'find-program'.
 
-	* doc/lispref/os.texi (Security Considerations):
-	Mention call-process and rename-file as opposed to shell commands.
-	Add some more cross-references.
+2016-06-19  Eli Zaretskii  
 
-2016-01-31  Paul Eggert  
+	Improve "C-h S" for cl-lib symbols
 
-	autogen.sh now arranges for git to check hashes
+	* lisp/info-look.el: Add cl.info lookup to emacs-lisp-mode related
+	manuals.  (Bug#23289)
 
-	Suggested by Karl Fogel in:
-	http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01802.html
-	* autogen.sh: Do "git config transfer.fsckObjects true".
+2016-06-19  Eli Zaretskii  
 
-2016-01-31  Paul Eggert  
+	Fix minor issues with removing left or right fringes
 
-	Fix (c & 040) typo in emergency escapes
+	* lisp/window.el (window-max-chars-per-line): Account for
+	'left-fringe-width' and 'right-fringe-width' variables.
 
-	* src/keyboard.c (handle_interrupt): Fix recently-introduced
-	typo (040 should have been ~040) that silently suppressed
-	auto-saves after emergency escapes.  Redo comparison to avoid
-	similar problems.
+	* doc/lispref/windows.texi (Window Sizes): Document the effect on
+	window text width when setting the width of one or both fringes to
+	zero.
+	* doc/emacs/display.texi (Fringes): Document the effect on window
+	text width when setting the width of one or both fringes to zero.
+	(Bug#22891)
 
-2016-01-31  Eli Zaretskii  
+2016-06-19  Eli Zaretskii  
 
-	Fix display of overlay strings with 'display' and 'box' property
+	Speed up redisplay in ansi-term mode
 
-	* src/xdisp.c (get_next_display_element): Take the box face from
-	display stack level that comes from a buffer, not an overlay
-	string.  (Bug#22499)
+	* lisp/term.el (ansi-term): Force L2R 'bidi-paragraph-direction'.
+	(Bug#20611)
 
-2016-01-31  Andreas Schwab  
+2016-06-19  Philipp Stephani  
 
-	Fix imap-starttls-open
+	Simplify 8-bit character handling by terminal for 'raw-text'
 
-	* lisp/net/imap.el (imap-starttls-open): Log imap process
-	output.  Call imap-parse-greeting.  (Bug#22500)
+	* lisp/international/mule.el (set-keyboard-coding-system): Treat
+	'raw-text' as another coding type that requires 8-bit characters.
+	* lisp/xt-mouse.el (xterm-mouse--read-coordinate): Use 'no-conversion'
+	instead of 'latin-1'.
 
-2016-01-31  Andreas Schwab  
+2016-06-19  Glenn Morris  
 
-	Fix return value of imap-starttls-open
+	* configure.ac (HAVE_MODULES): Treat gnu like gnu-linux.  (Bug#22722)
 
-	* lisp/net/imap.el (imap-starttls-open): Fix return value.
+2016-06-19  Eli Zaretskii  
 
-2016-01-31  John Wiegley  
+	Fix w32 memory-management problem when extending buffer text
 
-	Correct reference to DARWIN_OS preprocessor symbol
+	* src/w32heap.c (mmap_realloc): Only attempt extending a region if
+	the following region has the same allocation base.  Also, use the
+	original allocation base and enlarged size to commit reserved
+	memory, to ensure that the allocation base stays at its original
+	value.  This fixes several hard-to-debug problems whereby part of
+	buffer text was overwritten with binary nulls, because
+	mmap_realloc copied only part of buffer text when extending it.
+	See
+	http://lists.gnu.org/archive/html/emacs-devel/2016-04/msg00325.html
+	and http://debbugs.gnu.org/cgi/bugreport.cgi?bug=23223#55 for two
+	examples of the related problems.
 
-	* src/alloc.c: Correct a preprocessor reference to DARWIN_OS, which may
-	  not be defined.
+2016-06-19  Michael Albinus  
 
-2016-01-30  Paul Eggert  
+	Fix Bug#20637.  Do not merge to master
 
-	Spelling fix
+	* lisp/vc/vc-hooks.el (vc-state, vc-working-revision):
+	Use `vc-backend' instead of `vc-responsible-backend'.  (Bug#20637)
 
-	Spelling fixes
+	* test/automated/vc-tests.el (vc-test--state)
+	(vc-test--working-revision): Deactivate now failing checks.
 
-2016-01-30  Paul Eggert  
+2016-06-19  Paul Eggert  
 
-	Pacify GCC on C library without glibc API
+	substitute-command-keys keeps quotes’ text props
 
-	Without this change, with --enable-gcc-warnings GCC would complain
-	“error: redundant redeclaration of ‘aligned_alloc’”.
-	* configure.ac: Simplify aligned_alloc testing.
-	* src/alloc.c (aligned_alloc): Don’t use if DARWIN_OS,
-	since the simplified configure.ac no longer checks for that.
-	Don’t declare if HAVE_ALIGNED_ALLOC.
-	Correct misspelling of HAVE_ALIGNED_ALLOC in ifdef.
+	Problem reported by Clément Pit--Claudel (Bug#23254).
+	* src/doc.c: Include intervals.h.
+	(Fsubstitute_command_keys): If the only substitutions are for
+	quotes, copy the source string’s text properties too, since no
+	substring lengths have changed.
 
-2016-01-30  Artur Malabarba  
+2016-06-19  YAMAMOTO Mitsuharu  
 
-	Backport: * lisp/files.el: Remove support for extra .dir-locals file
+	* src/xwidget.c (x_draw_xwidget_glyph_string): More clipping fixes.
 
-	(dir-locals-file-2, dir-locals--all-files): Remove.
-	(dir-locals-collect-variables, dir-locals-file, dir-locals-find-file)
-	(dir-locals-read-from-file, hack-dir-local-variables): Revert changes.
+2016-06-19  Dmitry Gutov  
 
-	* lisp/files-x.el (modify-dir-local-variable): Revert changes.
+	Add semantic-symref-filepattern-alist entry for lisp-interaction-mode
 
-	* lisp/help-fns.el (describe-variable): Revert changes.
+	* lisp/cedet/semantic/symref/grep.el
+	(semantic-symref-filepattern-alist):
+	Add entry for lisp-interaction-mode
+	(http://debbugs.gnu.org/cgi/bugreport.cgi?bug=23223#47)
+
+2016-06-19  Dmitry Gutov  
+
+	Perform xref searches without visiting unopened files
+
+	* lisp/progmodes/xref.el (xref-collect-references): Instead of
+	calling `semantic-symref-find-references-by-name', use
+	`semantic-symref-instantiate' and `semantic-symref-perform-search'
+	directly.  Ask for `line-and-text' results (bug#23223).
+	(xref-collect-matches): Include the line text in the "hit"
+	structure.
+	(xref--convert-hits): New function, split off from
+	`xref-collect-references' and `xref-collect-matches', to convert
+	"hits" to xref instance list.  Create a temporary buffer here, to
+	use it for post-processing all hit lines.
+	(xref--collect-matches): Use a different approach for non-visited
+	files.  Insert the line text into the temp buffer, apply the
+	file's major mode the best we can without reading its whole
+	contents, syntax-propertize, and search in the result.
+	(xref--collect-matches-1): Extract, to handle the common logic
+	between two cases.
+	(xref--find-buffer-visiting): New function, a wrapper around
+	`find-buffer-visiting' to amortize its cost.
 
-	* doc/emacs/custom.texi (Directory Variables): Revert changes.
+	* lisp/cedet/semantic/symref/idutils.el
+	(semantic-symref-idutils--line-re): New constant.
+	(semantic-symref-parse-tool-output-one-line): Support result type
+	`line-and-text'.
 
-	* etc/NEWS: Revert changes.
+	* lisp/cedet/semantic/symref/grep.el
+	(semantic-symref-grep--line-re)
+	(semantic-symref-parse-tool-output-one-line): Same.
 
-2016-01-30  Glenn Morris  
+	* lisp/cedet/semantic/symref/cscope.el
+	(semantic-symref-cscope--line-re)
+	(semantic-symref-parse-tool-output-one-line): Same.
 
-	* lisp/net/browse-url.el (browse-url-default-browser):
-	Lower priority of non-free Chrome.
+	* lisp/cedet/semantic/symref/global.el
+	(semantic-symref-global--line-re)
+	(semantic-symref-parse-tool-output-one-line): Same.
 
-2016-01-30  Glenn Morris  
+2016-06-19  Phillip Lord  
 
-	Improve the custom type of some user options.
+	Revert "Prevent bootstrap autoload backup files"
 
-	* lisp/desktop.el (desktop-minor-mode-table):
-	* lisp/man.el (Man-frame-parameters):
-	* lisp/midnight.el (midnight-delay):
-	* lisp/speedbar.el (speedbar-select-frame-method):
-	* lisp/tooltip.el (tooltip-frame-parameters):
-	* lisp/tree-widget.el (tree-widget-space-width):
-	* lisp/type-break.el (type-break-keystroke-threshold):
-	* lisp/woman.el (woman-imenu-generic-expression):
-	* lisp/cedet/ede.el (ede-debug-program-function):
-	* lisp/cedet/ede/project-am.el (project-am-debug-target-function):
-	* lisp/emulation/viper-keym.el (viper-toggle-key):
-	* lisp/erc/erc-networks.el (erc-server-alist):
-	* lisp/gnus/message.el (message-deletable-headers, message-signature):
-	* lisp/mail/mailalias.el (mail-directory-stream):
-	* lisp/play/tetris.el (tetris-x-colors):
-	* lisp/progmodes/gud.el (gud-tooltip-modes): Improve custom type.
+	This reverts commit c23c965bb9d0a4bcc1b6158833ff99aa20fd53e9.
 
-2016-01-30  Simen Heggestøyl  
+2016-06-19  Paul Eggert  
 
-	Highlight CSS variables with variable name face
+	Improve time zone documentation
 
-	* lisp/textmodes/css-mode.el (css-nmstart-re): Don't match variables.
-	(css--font-lock-keywords): Highlight variables in
-	`font-lock-variable-name-face'.
+	* doc/lispref/os.texi (Time Zone Rules):
+	New section, mostly with material moved here from other sections.
+	* doc/emacs/cmdargs.texi (General Variables):
+	* doc/lispref/os.texi (Time Conversion, Time Parsing):
+	Xref new section.
+	* etc/NEWS, etc/PROBLEMS:
+	* lisp/org/org.el (org-timestamp-format):
+	* src/editfns.c (Fformat_time_string, Fdecode_time)
+	(Fencode_time, Fcurrent_time_string, Fcurrent_time_zone)
+	(Fset_time_zone_rule):
+	When documenting time zone rule strings, mention the TZ
+	environment variable in preference to mentioning the
+	sort-of-internal function set-time-zone-rule.
 
-2016-01-30  Glenn Morris  
+2016-06-19  Phillip Lord  
 
-	* lisp/gnus/gnus-kill.el (gnus-winconf-kill-file): Not user-serviceable.
+	Prevent bootstrap autoload backup files
 
-2016-01-30  Glenn Morris  
+	 * lisp/emacs-lisp/autoload (autoload-find-generated-file): Suppress
+	   backups in newly created file.
 
-	Mark some user options that can get evalled as risky.
+	  (autoload-ensure-default-file): Function split into two.
+	  (autoload-ensure-file-writeable): New function from split.
 
-	* lisp/allout.el (allout-title):
-	* lisp/emacs-lisp/edebug.el (edebug-global-break-condition):
-	* lisp/gnus/message.el (message-mailer-swallows-blank-line):
-	* lisp/progmodes/gud.el (gud-tooltip-display):
-	* lisp/vc/ediff-mult.el (ediff-default-filtering-regexp):
-	Mark as risky.
+	  (Bug#23203)
 
-2016-01-30  Eli Zaretskii  
+2016-06-19  YAMAMOTO Mitsuharu  
 
-	Disable DebPrint in sys_read on MS-Windows
+	Disable multicolor fonts on OS X since they are not supported on free systems
 
-	* src/w32.c (sys_read): Disable a debugging print that is normal
-	when non-blocking reads are retried.
+	* src/macfont.m (macfont_list): Don't use color bitmap fonts.
 
-2016-01-30  Martin Rudalics  
+2016-06-19  Paul Eggert  
 
-	;Fix ChangeLog entry
+	Capitalize “Universal Time” in documentation
 
-2016-01-30  Eli Zaretskii  
+	It’s a proper noun.
+	* lisp/vc/add-log.el (add-log-time-zone-rule): Also, fix typo by
+	mentioning ‘format-time-string’ instead of ‘set-time-zone-rule’.
 
-	Fix typos in Introduction to Emacs Lisp manual
+2016-06-19  Eli Zaretskii  
 
-	* doc/lispintro/emacs-lisp-intro.texi (Emacs Initialization)
-	(kill-new function, Digression into C)
-	(Complete forward-sentence, Divide and Conquer, Find a File)
-	(lengths-list-many-files, Columns of a graph, defcustom)
-	(recursive-count-words): Fix typos.  Reported by Daniel Bastos
-	.
+	Don't use 'find-program'
 
-2016-01-30  Nicolas Petton  
+	* lisp/progmodes/project.el (project-file-completion-table): Use
+	'grep-find-program', rather than the obsolete 'find-program'.
 
-	Bump version to 25.0.90
+2016-06-19  Paul Eggert  
 
-	* README:
-	* configure.ac:
-	* msdos/sed2v2.inp: Bump version to 25.0.90.
+	Sync with gnulib
 
-2016-01-30  Nicolas Petton  
+	This is for picky compilers whose stdint.h fails our C11 tests.
+	Problem reported for clang by Philipp Stephani (Bug#23261).
+	This incorporates:
+	2016-04-11 stdint: port to strict C11 left shift
+	* doc/misc/texinfo.tex, lib/stdint.in.h: Copy from gnulib.
 
-	* etc/AUTHORS: Update the AUTHORS file
+2016-06-19  Leo Liu  
 
-2016-01-30  Nicolas Petton  
+	Fix last change on 2016-01-02
 
-	Bump version to 25.0.90
+	* lisp/emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-2): Move
+	  `cl-errs-re' before `lisp--el-match-keyword'; don't use `prepend'
+	  which highlights `cl-errs-re' even in comments or strings.
 
-	* README:
-	* configure.ac:
-	* msdos/sed2v2.inp: Bump version to 25.0.90.
+2016-06-19  Paul Eggert  
 
-2016-01-30  Nicolas Petton  
+	Port run-prolog EMACS to SWI-Prolog 7.2.3
 
-	* etc/AUTHORS: Update the AUTHORS file
+	* lisp/progmodes/prolog.el (prolog-ensure-process):
+	Work around incompatibility of SWI-Prolog 7.2.3 and earlier
+	with the new way of dealing with the EMACS and INSIDE_EMACS
+	environment variables.
 
-2016-01-30  Nicolas Petton  
+2016-06-19  Eli Zaretskii  
 
-	authors.el updates
+	Avoid crashes due to unreasonably large or small text scaling
 
-	* admin/authors.el (authors-renamed-files-alist): Additions.
+	* lisp/face-remap.el (text-scale-min-amount)
+	(text-scale-max-amount): New functions.
+	(text-scale-set, text-scale-increase): Use them to limit the text
+	scaling to a reasonable range of values.  (Bug#23259)
 
-2016-01-30  Nicolas Petton  
+2016-06-19  Eli Zaretskii  
 
-	Make it possible to run make change-history on emacs-25
+	Improve documentation of 'with-eval-after-load'
 
-	* Makefile.in: Check if the current branch is emacs-25 instead of
-	  master.
+	* lisp/subr.el (with-eval-after-load): Doc fix.  (Bug#23258)
 
-2016-01-30  lu4nx  
+2016-06-19  Eli Zaretskii  
 
-	Support Go language in 'etags'
+	Improve handling of non-ASCII characters in Git log messages
 
-	* lib-src/etags.c : Fix documentation of Ruby tags.
-	: New help.
-	: New variable.
-	(Go_functions): New function.
-	: Add entry for Go.  (Bug#22370)
+	* lisp/vc/vc-git.el (vc-git-commits-coding-system): Now a defcustom.
+	(vc-git-log-output-coding-system): New defcustom.
+	(vc-git-print-log, vc-git-command, vc-git--call): Use
+	'vc-git-log-output-coding-system' for reading stuff from Git.
+	Don't override values of 'coding-system-for-read/write' if they
+	are bound by caller -- this allows the user to force an encoding
+	via "C-x RET c".
+	(vc-git-checkin): On MS-Windows, pass the log message via a
+	temporary file, to work around the limitations on passing
+	non-ASCII characters via command-line arguments.  Force using the
+	'locale-coding-system' for Git command-line arguments.  This fixes
+	problems with non-ASCII commit log messages on MS-Windows.
+	(Bug#23076)
 
-	* doc/emacs/maintaining.texi (Tag Syntax): Document Go support.
-	* doc/man/etags.1: Mention Go support.
+	* etc/NEWS: Mention the new vc-git related defcustoms.
 
-	* etc/NEWS: Mention Go support.
+2016-06-19  Philipp Stephani  
 
-	* test/etags/go-src/test.go:
-	* test/etags/go-src/test1.go: New test files.
-	* test/etags/Makefile (GOSRC): New variable.
-	(SRCS): Add $(GOSRC).
-	* test/etags/ETAGS.good_1:
-	* test/etags/ETAGS.good_2:
-	* test/etags/ETAGS.good_3:
-	* test/etags/ETAGS.good_4:
-	* test/etags/ETAGS.good_5:
-	* test/etags/ETAGS.good_6:
-	* test/etags/CTAGS.good: Adapt to addition of Go tests.
+	Remove undefined behavior in OS X dumper.
 
-2016-01-30  Eli Zaretskii  
+	Found by Address Sanitizer.
 
-	Improve Ruby support in 'etags'
+	* src/unexmacosx.c (unexec_write): Use Mach virtual memory API to
+	avoid undefined behavior when reading arbitrary memory.
 
-	* lib-src/etags.c (Ruby_functions): Tag constants.  Don't tag
-	singleton classes.  Remove class qualifiers from tags generated
-	for method and constant names.  (Bug#22241)
+2016-06-19  Joakim Verona  
 
-	* doc/emacs/maintaining.texi (Tag Syntax): Mention that constants
-	are tagged by etags in Ruby.
+	Fix clipping of xwidgets
 
-	* etc/NEWS: Mention that constants are tagged by etags in Ruby.
+	* src/xwidget.c (x_draw_xwidget_glyph_string): Use window_box
+	instead of calculating the clipping borders manually.  Suggested
+	by YAMAMOTO Mitsuharu .
 
-	* test/etags/ruby-src/test1.ru: Add more tests.
-	* test/etags/ETAGS.good_1:
-	* test/etags/ETAGS.good_2:
-	* test/etags/ETAGS.good_3:
-	* test/etags/ETAGS.good_4:
-	* test/etags/ETAGS.good_5:
-	* test/etags/ETAGS.good_6:
-	* test/etags/CTAGS.good: Adapt to the changes in etags and in Ruby
-	tests.
+2016-06-19  Eli Zaretskii  
 
-2016-01-30  Eli Zaretskii  
+	Improve Lisp-level documentation of tooltips
 
-	Adjust etags test results to changes in copyright years
+	* doc/lispref/display.texi (Tooltips): New section.  (Bug#23246)
+	(Display): Update the chapter menu.
+	* doc/lispref/text.texi (Special Properties): Make the "tooltip"
+	index entry more concrete.  Change the cross-reference to point to
+	"Tooltips" in the ELisp manual.
+	* doc/lispref/elisp.texi (Top): Update the master menu.
+	* doc/emacs/frames.texi (Tooltips): Include more customization
+	variables.  Add a cross-reference to the ELisp manual.
 
-	* test/etags/CTAGS.good:
-	* test/etags/ETAGS.good_1:
-	* test/etags/ETAGS.good_2:
-	* test/etags/ETAGS.good_3:
-	* test/etags/ETAGS.good_4:
-	* test/etags/ETAGS.good_5:
-	* test/etags/ETAGS.good_6: Adjust to shift in characters and
-	in line numbers.
+2016-06-19  Glenn Morris  
 
-2016-01-30  Andreas Schwab  
+	Faces names should not end in "-face".
 
-	Revert "Re-enable checks in member, memql, delete to complain about non-lists"
+	* lisp/rect.el (rectangle-preview): Rename from rectangle-preview-face.
+	* lisp/vc/vc-hooks.el (vc-state-base): Rename from vc-state-base-face.
 
-	This reverts commit f524e8b7f12d9b5a8b92084e5385429fe7b085b9.
+2016-06-19  Paul Eggert  
 
-2016-01-30  Nicolas Petton  
+	* src/xsmfns.c (syms_of_xsmfns): Remove stray "s in doc strings.
 
-	Make it possible to run make change-history on emacs-25
+2016-06-19  Paul Eggert  
 
-	* Makefile.in: Check if the current branch is emacs-25 instead of
-	  master.
+	Comint and compile no longer set EMACS
 
-2016-01-30  Dmitry Gutov  
+	This mostly restores the change that I reverted on March 23,
+	fixing most of Bug#20202.  The only part of the change that is
+	still reverted is the change to M-x term, where compatibility with
+	current Bash constrains us from moving too quickly (Bug#20484).
+	Problem reported by Phillip Lord in: http://bugs.gnu.org/20484#108
+	* etc/NEWS: Document this.
+	* lisp/comint.el (comint-exec-1):
+	* lisp/net/tramp-sh.el (tramp-remote-process-environment):
+	* lisp/progmodes/compile.el (compilation-start):
+	Don’t set EMACS=t in the subsidiary process.
 
-	Don't fiddle with DEFAULT
+2016-06-19  Stefan Monnier  
 
-	* lisp/progmodes/project.el (project--completing-read-strict):
-	Don't change DEFAULT, whether is has any matches in
-	COLLECTION, or not.
+	* lisp/subr.el (read-key): Don't let the prompt linger (bug#22714)
 
-2016-01-30  Eli Zaretskii  
+2016-06-19  Eli Zaretskii  
 
-	Document xwidget commands and functions
+	Allow to customize names of executables used by grep.el
 
-	* doc/lispref/display.texi (Xwidgets): New section, describes some
-	of the xwidget primitives.
-	* doc/lispref/display.texi (Display): Update the chapter menu.
-	* doc/emacs/misc.texi (Embedded WebKit Widgets): New section.
-	* doc/emacs/emacs.texi (Top): Update the master menu to include
-	the xwidget node.
+	* lisp/progmodes/grep.el (grep-find-program): Renamed from
+	'find-program', which was a variable.  All uses changed.
+	(grep-xargs-program): Renamed from 'xargs-program', which was a
+	variable.  All uses changed.
+	(grep-program): Now a defcustom rather than a simple variable.
+	(Bug#23219)
 
-2016-01-30  Lars Ingebrigtsen  
+2016-06-19  Alan Third  
 
-	Build fix for shr.el
+	Set locale encoding to UTF-8 when run from OS X GUI.
 
-	* shr.el (seq): Require.
+	* src/nsterm.m (ns_init_locale): Append .UTF-8 when setting LANG.
 
-2016-01-30  Dmitry Gutov  
+2016-06-19  Eli Zaretskii  
 
-	Improve project-find-file yet again!
+	Avoid signaling errors in 'M-n' at the 'C-x C-f' prompt
 
-	* lisp/progmodes/project.el (project--completing-read-strict):
-	New function.
-	(project-find-file-in): Use it.
-	(project-file-completion-table): Move the default
-	implementation inside the cl-defgeneric form.
-	(http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01720.html)
+	* lisp/ffap.el (ffap-guess-file-name-at-point): Ignore errors
+	while 'ffap-guesser' runs.  (Bug#23218)
 
-2016-01-30  Dmitry Gutov  
+2016-06-19  Marcin Borkowski  
 
-	Don't pass DIR to 'hg status'
+	Avoid infinite loop in 'studlify-word'
 
-	* lisp/vc/vc-hg.el (vc-hg-dir-status-files):
-	Don't pass DIR to 'hg status' (bug#22481).
+	* lisp/play/studly.el (studlify-region): Call
+	'forward-word-strictly' and 'backward-word-strictly' instead of
+	'forward-word' and 'backward-word'.  (Bug#19940)
 
-2016-01-30  Stephen Leake  
+2016-06-19  Paul Eggert  
 
-	Fix typo in previous commits
+	Don’t recommend obsolete EMACS env var
 
-	* lisp/progmodes/project.el (project-find-file-in):
-	* lisp/vc/vc-mtn.el (vc-mtn-find-ignore-file): Fix typo in previous
-	commit.
+	* doc/misc/efaq.texi (Escape sequences in shell output):
+	Remove long-obsolete (and now-confusing) notes about
+	the EMACS environment variable in Emacs 21.1 and earlier.
+	* doc/misc/efaq.texi (^M in the shell buffer):
+	* etc/PROBLEMS:
+	Remove obsolescent recommendation to consult the EMACS environment
+	variable.
 
-2016-01-30  Stephen Leake  
+2016-06-19  Glenn Morris  
 
-	Improve project-find-file
+	* lisp/emacs-lisp/package.el: Change from a few days ago needs seq.
 
-	* lisp/progmodes/project.el (project-file-completion-table): New.
-	(project-find-file, project-or-external-find-file): Default to filename
-	at point.
-	(project-file-completion-table): New, split out from
-	project--find-file-in.
-	(project-find-file-in): Renamed from project--find-file-in, use
-	project-file-completion-table.
+	* lisp/emacs-lisp/seq.el: Load cl-lib, not cl-extra.
 
-	* lisp/progmodes/xref.el (ede-minor-mode): New declaration.
-	(xref--find-ignores-arguments): Add doc string.
+2016-06-19  Leo Liu  
 
-2016-01-30  Stephen Leake  
+	Fix "Beginning of buffer" error in forward-page
 
-	Implement vc-mtn-find-ignore-file, fix some doc strings
+	* lisp/textmodes/page.el (forward-page): Check before move to prevent
+	  "Beginning of buffer" error.
 
-	* lisp/cedet/cedet-global.el (cedet-gnu-global-root): Improve doc string.
+2016-06-19  Dmitry Gutov  
 
-	* lisp/cedet/ede/locate.el (initialize-instance): Improve doc string.
+	Add a `transient' project type
 
-	* lisp/vc/vc-git.el (vc-git-find-ignore-file): Fix doc string.
+	* lisp/progmodes/project.el (project-roots): Implement for the
+	`transient' project type (bug#23224).
+	(project-current): Instead of signaling an error, return a
+	transient project instance rooted in the chosen directory.
 
-	* lisp/vc/vc-mtn.el (vc-mtn-find-ignore-file): New function.
+2016-06-19  Lars Magne Ingebrigtsen  
 
-2016-01-29  Vincent Belaïche  
+	Revert "Backport HTTPS proxy fix"
 
-	Correct a whole bunch of bugs coming with renamed cell relocation.
+	This reverts commit 2d1a6054b161bd1055d4feb11c8c5ac95543f5db.
 
-	This is the same change as commit on master branch. See
-	http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=badcd38aa86ed7973f2be2743c405710973a0bdd
+	It's too late in the Emacs 25 release cycle to add things like this to
+	Emacs 25.1.  It's border line new feature.
 
-	* lisp/ses.el (ses-localvars): rename variable
-	`ses--renamed-cell-symb-list' into `ses--in-killing-named-cell-list'
-	and adjust the comment about it.
-	(ses-plist-delq): new defun.
-	(ses--ses-buffer-list): new defvar.
-	(ses--unbind-cell-name): new defun.
-	(ses-relocate-symbol): Do not relocate symbol when it is a named cell.
-	(ses-relocate-formula): Undo change of
-	2011-12-27T19:30:39Z!vincentb1@users.sourceforge.net that was
-	preventing relocation for named cell --- now doing this is delegated
-	to function `ses-relocate-symbol'.
-	(ses-relocate-range): In docstring, undo change of
-	2016-01-03T07:31:52Z!johnw@newartisans.com, `ses-range' must remain
-	lower case as it is not a variable.
-	(ses-relocate-all): Cell name relocation : 1) check that cell is a
-	renamed cell by testing `ses-cell' property to :ses-named, rather than
-	comparing name to corresponding standard name. Set rowcol of renamed
-	cell into the hashmap --- `ses-cell' property must not be used for
-	that as the same name can be used for different locations in different
-	SES sheets ; 2) use `local-variable-if-set-p' rather than `boundp' and
-	`local-variable-p' to check if cell name is already in use in this
-	sheet or needs initialization.
-	(ses-relocate-all): Cell value relocation : 1) like for name
-	relocation use the `ses-cell' property rather than comparing actual
-	name to corresponding standard name. 2) Correct bug introduced in
-	2011-12-27T19:30:39Z!vincentb1@users.sourceforge.net, as the test was
-	made the other way round than the intention --- ie value relocation
-	was disabled for standard cell, not for renamed cell as was the
-	intention.
-	(ses-relocate-all): Add loop for unbinding deleted renamed cells
-	names.
-	(ses-killbuffer-hook): new defun.
-	(ses-mode): Add the ses--ses-buffer-list maintenance mechanism ---
-	kill buffer hook, plus pushing current buffer if new in list.
-	(ses-delete-row, ses-delete-column): Collect deleted renamed cells
-	into `ses--in-killing-named-cell-list'.
-	(ses-rename-cell): Remove update of variable
-	`ses--renamed-cell-symb-list', this variable is renamed to
-	`ses--in-killing-named-cell-list', and its setting is done in
-	functions `ses-delete-row' and , `ses-delete-column' now.
-	(ses-rename-cell): Make cell new name a buffer local variable.
-	(ses-rename-cell): Change correction of
-	2015-12-30T23:10:37Z!vincentb1@users.sourceforge.net concerning
-	computation of the range over which `cursor-intangible' property was
-	to be updated. This correction was ok for non spilling cells, but not
-	for cells spilling over following blank cells. Simply use
-	`next-single-property-change' rather than computing the end column
-	from column widths.
+2016-06-19  Tao Fang  
 
-2016-01-29  Andreas Schwab  
+	Backport HTTPS proxy fix
 
-	Re-enable checks in member, memql, delete to complain about non-lists
+	Cherry-picked from 3c623c26ae7d695746e05d8a2e16a67a6256b024
 
-	* src/fns.c (Fmember, Fmemql, Fdelete): Revert 2007-10-16 change.
+	Backport:
 
-2016-01-29  Martin Rudalics  
+2016-06-19  Paul Eggert  
 
-	Minor doc(-string) tweaks
+	Fix stability confusion in sort-tests
 
-	* lisp/window.el (window-in-direction): Fix doc-string typo.
-	* doc/lispref/frames.texi (Frame Font): Mention canonical
-	character width/height.
-	* doc/lispref/windows.texi (Windows and Frames): Clarify
-	handling of minibuffer window for `window-in-direction'.
-	(Window Sizes): Minor tweaks in descriptions of
-	`window-max-chars-per-line', `window-min-width' and
-	`window-min-size'.
-	(Deleting Windows): Minor tweak in `delete-window' description.
-	(Selecting Windows): Clarify window use time description.
-	(Cyclic Window Ordering): Minor tweak.
-	(Switching Buffers): Clarify description of
-	`switch-to-buffer-in-dedicated-window'.
+	Problem reported by Philipp Stephani (Bug#23205).
+	* test/automated/sort-tests.el:
+	(sort-tests--insert-words-sort-and-compare):
+	Don’t assume that reversing a sorted list is the same
+	as sorting with the reverse predicate.  This is not true
+	for stable sorts when items compare equal.
 
-2016-01-29  Eli Zaretskii  
+2016-06-19  Paul Eggert  
 
-	Minor improvements to 'pcase' documentation
+	Avoid describe-key error with lambdas
 
-	* doc/lispref/control.texi (Pattern matching case statement):
-	Improve the documentation of 'pcase' per comments.  See two
-	discussion threads on emacs-devel@gnu.org for the details:
-	http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01335.html
-	http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01336.html.
+	Problem reported by Sho Takemori (Bug#22716).
+	* lisp/cedet/mode-local.el (describe-mode-local-overload)
+	(xref-mode-local-overload): Use function-overload-p instead
+	of assuming the argument is a symbol.
 
-2016-01-29  Glenn Morris  
+2016-06-19  Artur Malabarba  
 
-	Don't use eval to quieten prolog.el compilation.
+	* lisp/emacs-lisp/package.el (package-install-selected-packages):
 
-	* lisp/progmodes/prolog.el (pltrace-on, pltrace-off): Declare.
-	(prolog-enable-sicstus-sd, prolog-disable-sicstus-sd): Don't use eval.
+	Skip unavailable packages.
 
-2016-01-29  Glenn Morris  
+2016-06-19  Paul Eggert  
 
-	Mark some risky prolog variables.
+	Sync with gnulib
 
-	* lisp/progmodes/prolog.el (prolog-system-version)
-	(prolog-keywords, prolog-types, prolog-mode-specificators)
-	(prolog-determinism-specificators, prolog-directives)
-	(prolog-program-name, prolog-program-switches)
-	(prolog-consult-string, prolog-compile-string)
-	(prolog-eof-string, prolog-prompt-regexp, prolog-help-function):
-	Mark anything processed by prolog-find-value-by-system as risky.
+	This incorporates:
+	2016-04-03 stdint: detect good enough pre-C++11 stdint.h in C++ mode
+	2016-04-01 stddef: support configuring with g++
+	* doc/misc/texinfo.tex, lib/stddef.in.h, m4/stdint.m4:
+	Copy from gnulib.
 
-2016-01-28  Glenn Morris  
+2016-06-19  Paul Eggert  
 
-	* lisp/custom.el (defcustom): Doc fix.
+	Fix doc for Universal Time
 
-	* doc/lispref/customize.texi (Variable Definitions):
-	Defcustom should always have a type.
+	* doc/lispref/os.texi (Time of Day, Time Conversion):
+	Be more careful about distinguishing UTC (which is not valid for
+	pre-1961 time stamps) and UT (which is).
+	(Time Parsing): Remove stray obsolete paragraph about a
+	UNIVERSAL argument for ‘format-time-string’.
 
-2016-01-28  Glenn Morris  
+2016-06-19  Michael Albinus  
 
-	* lisp/cedet/semantic/db-file.el (semanticdb-persistent-path):
-	Fix :type.
+	Handle Bug#23186
 
-	* lisp/emacs-lisp/package.el (package-load-list): Improve :type.
+	* lisp/net/tramp.el (tramp-encoding-command-switch)
+	(tramp-encoding-command-interactive):
+	* lisp/net/tramp-sh.el (tramp-maybe-open-connection):
+	`tramp-encoding-shell' could be nil.  (Bug#23186)
 
-2016-01-28  Michael Albinus  
+2016-06-19  Paul Eggert  
 
-	Fix Bug#22452
+	More format-time-string change fixups
 
-	* lisp/net/tramp-adb.el (tramp-adb-maybe-open-connection):
-	* lisp/net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection):
-	* lisp/net/tramp-sh.el (tramp-maybe-open-connection):
-	* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
-	Mark it as connected.
+	* lisp/net/tramp-sh.el (tramp-sh-handle-set-file-times):
+	* lisp/org/org.el (org-timestamp-format):
+	Fix doc to match new format-time-string behavior.
+	* lisp/org/ox-icalendar.el (org-icalendar-convert-timestamp):
+	Use (not (not X)) to treat non-nil values of utc arg as UTC.
 
-	* lisp/net/tramp.el (tramp-handle-file-remote-p): Check also, if
-	connection property "connected" is set.  (Bug#22452)
+2016-06-19  Paul Eggert  
 
-2016-01-27  Glenn Morris  
+	make-xwidget unused arg cleanup
 
-	* lisp/xwidget.el (xwidget-query-on-exit-flag): Declare.
+	* doc/lispref/display.texi (Xwidgets): Remove stray refs.
+	* src/xwidget.c (syms_of_xwidget): Qwebkit, not Qwebkit_osr.
 
-	* lisp/xwidget.el (xwidget-webkit-browse-url): Give explicit error
-	if not compiled with xwidgets.
+2016-06-19  Joakim Verona  
 
-2016-01-27  Paul Eggert  
+	Remove unused arguments from make-xwidget
 
-	C-u C-x = example doc fix
+	The arguments BEG and END were unused, and are now removed.
 
-	* doc/emacs/mule.texi (International Chars):
-	Adjust example to match current behavior of C-u C-x =.
+	* display.texi (Xwidgets): Document the change
+	* xwidget.el (make-xwidget, xwidget-insert)
+	(xwidget-webkit-new-session): Reflect changed arguments
+	* xwidget.c (Fmake_xwidget, syms_of_xwidget): Reflect changed arguments
 
-2016-01-27  Paul Eggert  
+2016-06-19  Eli Zaretskii  
 
-	malloc.h hygiene
+	Document incompatible changes in 'format-time-string'
 
-	This attempts to future-proof Emacs a bit against possible glibc
-	changes, by having Emacs use  declarations rather than
-	coding them up by hand.  Problem noted by Florian Weimer in:
-	https://sourceware.org/ml/libc-alpha/2016-01/msg00777.html
-	Implement this mainly by moving malloc.h-related functions from
-	emacs.c (which does not include ) to alloc.c (which does).
-	* src/alloc.c (my_heap_start) [DOUG_LEA_MALLOC || GNU_LINUX]:
-	New function.
-	The remaining changes to this file apply only if DOUG_LEA_MALLOC.
-	(alloc_unexec_pre, alloc_unexec_post): New functions.
-	(malloc_initialize_hook): Use my_heap_start and alloc_unexec_post.
-	(__MALLOC_HOOK_VOLATILE): New macro, if not already defined.
-	(__malloc_initialize_hook): Use it.
-	(malloc_state_ptr, malloc_initialize_hook, __malloc_initialize_hook):
-	Move here from ...
-	* src/emacs.c: ... here.
-	(malloc_get_state, malloc_set_state): Remove extern decls.
-	(my_heap_start) [DOUG_LEA_MALLOC || GNU_LINUX]: Remove static var.
-	All uses changed to similarly-named new function.
-	(Fdump_emacs): Use new functions alloc_unexec_pre, alloc_unexec_post.
-	* src/lisp.h (my_heap_start, alloc_unexec_pre, alloc_unexec_post):
-	New decls.
+	* etc/NEWS: Mention the incompatible change in the interpretation
+	of the 3rd argument to 'format-time-string'.  (Bug#21943)
 
-2016-01-26  Eli Zaretskii  
+2016-06-19  Eli Zaretskii  
 
-	* doc/emacs/mark.texi (Using Region): Clarify wording.  (Bug#22467)
+	Improve documentation of byte-code objects
 
-2016-01-26  Paul Eggert  
+	* doc/lispref/compile.texi (Byte-Code Objects): Document the
+	integer format of the argument descriptor.  (Bug#23061)
 
-	Remove never-set var handle_user_signal_hook
+2016-06-19  Eli Zaretskii  
 
-	* src/keyboard.c, src/keyboard.h (handle_user_signal_hook):
-	Remove never-set var.  All uses removed.
+	Adapt calls to 'format-time-string' to changes in Emacs 25
 
-2016-01-26  K. Handa  
+	* lisp/vc/pcvs-info.el (cvs-fileinfo-from-entries): Use t as the
+	last argument to format-time-string.  (Bug#23128)
+	* lisp/gnus/gmm-utils.el (gmm-format-time-string): Use t as the
+	last argument to format-time-string, when the TZ argument is not a
+	number, per the doc string.
 
-	Backport:fix previous change of src/ftfont.c (ftfont_shape_by_flt)
+2016-06-19  Eli Zaretskii  
 
-	* src/ftfont.c (ftfont_shape_by_flt): Fix previous change.  Access the
-	second glyph only when there are enough glyphs.
+	Improve vc-diff with Git backend
 
-	(cherry picked from commit 9835757013569673854b692ccbb58bfb3c3ed1f7)
+	* lisp/vc/vc-git.el (vc-git-command): Don't override
+	coding-system-for-read/write if they are already bound.
+	Suggested by joaotavora@gmail.com (João Távora).  (Bug#20892)
+	(vc-git-print-log): Don't override coding-system-for-read if it's
+	already bound.
 
-2016-01-26  K. Handa  
+2016-06-19  Dmitry Gutov  
 
-	support rendering of wider range of combinging characters by ftfont backend
+	(js--continued-expression-p): Special-case unary plus and minus
 
-	* lisp/language/hebrew.el (hebrew-shape-gstring): If the font backend
-	supports rendering of combining characters, call
-	font-shape-gstring.
+	* lisp/progmodes/js.el (js--continued-expression-p): Make an
+	effort to recognize unary plus and minus, in the contexts where
+	they make sense (https://github.com/mooz/js2-mode/issues/322).
 
-	* src/font.c (Ffont_get): Handle `combining-capability' property.
-	(syms_of_font): New symbol ":combining-capability'.
+2016-06-19  Alan Mackenzie  
 
-	* src/font.h (struct font_driver): New member combining_capability.
+	Prevent C++ Mode wrongly fontifying some identifiers near templates as types
 
-	* src/ftfont.c: Include "category.h".
-	(ftfont_driver): Initialize combining_capability to
-	ftfont_combining_capability.
-	(ftfont_shape_by_flt): If OTF is null, try to find a suitable
-	FLT in advance.
-	(ftfont_combining_capability): New function.
+	This fixes debbugs #7917.
 
-	(cherry picked from commit 536f48e9a2251b9e654ea974bd90ff2f40218753)
+	* lisp/progmodes/cc-engine.el (c-forward-keyword-prefixed-id): Accept 'maybe
+	(from c-forward-type) as sufficient to record an id.  Record type id as well
+	as ref ids.
+	(c-forward-name): Bind c-last-identifier-range around the call to
+	c-forward-<>-arglist to prevent it getting corrupted.  Don't automatically
+	assume an identifier is a type when a template ">" is followed by a "(".
+	(c-forward-type): Don't automatically assume an identifier is a type when a
+	template ">" is followed by a "(".
 
-2016-01-26  Anders Lindgren  
+	* lisp/progmodes/cc-fonts.el (c-font-lock-<>-arglists): Don't fontify an
+	identifier as a type when its associated ">" is followed by a "(".
 
-	Fixed NextStep fullscreen issue (bug#22468)
+2016-06-19  Eli Zaretskii  
 
-	When in fullscreen mode, `[screen visibleFrame]' sometimes
-	includes, sometimes excludes the menu bar. This could cause
-	a frame to be placed too low when in fullscreen mode.
+	Avoid crashes due to insanely large columns in tabulated-list-format
 
-	* src/nsterm.m (ns_menu_bar_should_be_hidden): Trace.
-	(constrain_frame_rect): New parameter, isFullscreen, when true don't
-	query the height of the menu bar.
-	(ns_constrain_all_frames): Pass `false' (isFullscreen) to
-	`constrain_frame_rect'.
-	([EmacsView initFrameFromEmacs:]): Trace.
-	([EmacsView isFullscreen]): Trace.
-	([EmacsWindow constrainFrameRect:toScreen:]): Pass fullscreen
-	state to `constrain_frame_rect'.
+	* src/xdisp.c (append_stretch_glyph, produce_xwidget_glyph)
+	(produce_image_glyph): Limit the pixel width of the produced glyph
+	to SHRT_MAX.  (Bug#23178)
+	(append_composite_glyph, append_glyph, append_glyphless_glyph):
+	Add assertions to verify that the pixel width of the glyph will
+	never overflow a 'short'.
+	* src/term.c (append_composite_glyph): Add assertion to verify
+	that the pixel width of the glyph will never overflow a 'short'.
 
-2016-01-26  Artur Malabarba  
+2016-06-19  Mark Oteiza  
 
-	* lisp/files.el: Use a fixed file name for the second dir-locals file
+	Teach M-x disassemble a default argument.
 
-	(dir-locals-file): Revert to its original fixed value.
-	(dir-locals-file-2): New const.
-	(dir-locals--all-files): Don't use `file-name-all-completions'.
-	Instead, just check for the 2 dir-locals files and return a list
-	of the ones that exit (if any).
+	Adopts default argument in the same way as `describe-function'.
+	* lisp/emacs-lisp/disass.el (disassemble): Default to function at point,
+	if any.
 
-	* etc/NEWS: Document the change.
+2016-06-19  Eli Zaretskii  
 
-	* doc/emacs/custom.texi (Directory Variables): Document the change.
+	Fix EOL decoding in vc-annotate with SVN back-end on MS-Windows
 
-	* doc/lispref/variables.texi (Directory Local Variables): Update
-	accordingly.
+	* lisp/vc/vc-annotate.el (vc-annotate): Force DOS EOL decoding on
+	MS-Windows and MS-DOS, when processing the output of "svn annotate".
 
-2016-01-26  Artur Malabarba  
+2016-06-19  Michael Albinus  
 
-	* lisp/files-x.el (modify-dir-local-variable): Small rewrite
+	Fix OS X specific settings in tramp-tests
 
-	Change a variable name to be more meaningful, and reorder some of
-	the code with no change in behaviour.
+	* lisp/net/tramp-sh.el (tramp-maybe-open-connection): Use it.
 
-2016-01-26  Artur Malabarba  
+	* lisp/net/tramp.el (tramp-get-local-locale): New defun.
 
-	* lisp/files.el (dir-locals-find-file): Refactor return values
+	* test/automated/tramp-tests.el (tramp--test-darwin-p): Remove.
+	(tramp--test-utf8): Improve settings of coding systems.
+	Do not use `tramp--test-darwin-p' anymore.  (Bug#22145)
 
-	Returning a cache remains unchanged, but the case of returning a
-	file (or pattern) is now changed to return the contaning
-	directory.
+2016-06-19  Alan Mackenzie  
 
-	(dir-locals-read-from-file): Rename to `dir-locals-read-from-dir'
-	and make obsolete.
-	(dir-locals-read-from-dir): Simplify accordingly.
-	(hack-dir-local-variables): Simplify accordingly and rename a
-	variable.
+	Finish fixing a cacheing bug in CC Mode (see 2016-03-09)
 
-2016-01-26  Glenn Morris  
+	* lisp/progmodes/cc-cmds.el: (c-beginning-of-defun, c-end-of-defun): Remove
+	superfluous invocations of c-self-bind-state-cache.
 
-	* lisp/textmodes/flyspell.el (flyspell--prev-meta-tab-binding):
-	Declare.
+	* lisp/progmodes/cc-defs.el: (c-self-bind-state-cache): Copy and terminate
+	markers correctly.
 
-	* configure.ac (USE_CAIRO): Rename to more standard HAVE_CAIRO.
+	* lisp/progmodes/cc-engine.el (c-record-parse-state-state): Terminate stale
+	markers.
 
-	* configure.ac (--with-cairo): Say it's experimental.
+2016-06-19  Alan Mackenzie  
 
-	* lisp/xwidget.el (xwidget-webkit-scroll-behavior):
-	Rename using American spelling.  Update all uses.
+	Merge branch 'emacs-25' of /home/acm/emacs/emacs.git/emacs-25 into emacs-25
 
-2016-01-26  Glenn Morris  
+2016-06-19  Xue Fuqiao  
 
-	Yet more xwidget doc fixes.
+	* doc/lispref/text.texi (Columns): Remove a nonexistent reference.
 
-	* lisp/xwidget.el (xwidget-webkit-scroll-behaviour)
-	(xwidget-insert, xwidget-webkit-browse-url)
-	(xwidget-webkit-scroll-up, xwidget-webkit-scroll-down)
-	(xwidget-webkit-scroll-forward, xwidget-webkit-scroll-backward)
-	(xwidget-webkit-insert-string, xwidget-webkit-show-named-element)
-	(xwidget-webkit-show-id-element)
-	(xwidget-webkit-show-id-or-named-element)
-	(xwidget-webkit-adjust-size, xwidget-webkit-current-url)
-	(xwidget-webkit-execute-script-rv)
-	(xwidget-webkit-copy-selection-as-kill, xwidget-get)
-	(xwidget-put):  Doc fixes.
-	(xwidget-webkit-insert-string, xwidget-webkit-show-named-element)
-	(xwidget-webkit-show-id-element)
-	(xwidget-webkit-show-id-or-named-element): Prompt fixes.
+	The example was removed by Chong Yidong on Mar 5, 2012.
 
-2016-01-25  Ted Zlatanov  
+2016-06-19  Paul Eggert  
 
-	* lisp/gnus/gnus-art.el (gnus-blocked-images):
-	Add explicit nil choice and tags.
+	* doc/man/emacsclient.1: Document +line:column option.
 
-2016-01-25  Paul Eggert  
+2016-06-19  Eli Zaretskii  
 
-	Spelling fixes
+	Fix rare problems with echo-area display and multiple frames
 
-2016-01-25  Stefan Monnier  
+	* src/xdisp.c (redisplay_window): Bind inhibit-redisplay non-nil
+	around the call to x_consider_frame_title, to prevent
+	resize_mini_window from undoing echo-area display.  (Bug#23124)
 
-	(font-lock-ensure-function): Fix bug#22399
+2016-06-19  Alan Mackenzie  
 
-	* lisp/font-lock.el (font-lock-ensure-function): Fix handling when
-	font-lock-mode is not enabled (bug#22399).
+	In M-%, avoid making buffer-local binding of text-property-default-nonsticky
 
-2016-01-25  Alan Mackenzie  
+	This would happen when that variable already has a buffer local binding.  Such
+	a binding would not be seen by read-from-minibuffer.  This fixes bug #23127.
 
-	Expunge "allow" + infinitive from source and doc, part 2.
+	* lisp/replace.el (query-replace-read-from): Move the binding of
+	text-property-default-nonsticky to inside of a new with-current-buffer buffer
+	form with the minibuffer as argument.
 
-	Do the same for "permit", "enable", "prevent", and (where appropriate)
-	"require".
+2016-06-19  Dmitry Gutov  
 
-	doc/misc/reftex.texi:
-	doc/misc/url.texi:
-	lib/get-permissions.c:
-	lib/strftime.c:
-	lisp/org/org-element.el:
-	lisp/org/org-mobile.el:
-	lisp/textmodes/reftex-vars.el:
-	src/bidi.c:
-	src/emacs.c:
-	src/xdisp.c:
-	test/etags/c-src/emacs/src/lisp.h:
+	Remove prog-indentation-context
 
-	Expunge the likes of "This allows to do something" from the above files.
+	* lisp/progmodes/prog-mode.el: (prog-indentation-context)
+	(prog-first-column, prog-widen): Remove, as discussed in
+	http://lists.gnu.org/archive/html/emacs-devel/2016-03/msg01425.html.
 
-2016-01-25  Artur Malabarba  
+	* doc/lispref/text.texi (Mode-Specific Indent): Remove references
+	to them.
 
-	* lisp/emacs-lisp/tabulated-list.el (tabulated-list-mode): Redundant line
+	* etc/NEWS: Ditto.
 
-	`special-mode' is already read-only.
+	* lisp/progmodes/python.el: (prog-widen, prog-first-column):
+	Remove the compatibility aliases and all uses.
 
-2016-01-25  Artur Malabarba  
+	Do not merge to master.
 
-	* lisp/emacs-lisp/ert.el (ert--results-move): Change error to user-error
+2016-06-19  Paul Eggert  
 
-2016-01-25  Paul Eggert  
+	* src/font.c (QCuser_spec): Add missing colon to :user-spec.
 
-	Port "$@" to OpenIndiana ksh93
+2016-06-19  Eli Zaretskii  
 
-	In http://lists.gnu.org/archive/html/bug-autoconf/2015-12/msg00000.html
-	Pavel Raiskup reports that ${1+"$@"} runs afoul of a bug in /bin/sh
-	(derived from ksh 93t+ 2010-03-05).  ${1+"$@"} works around an ancient
-	bug in long-dead shells, so remove the workaround.
-	* admin/check-doc-strings, configure.ac, lib-src/rcs2log:
-	Use plain "$@" rather than ${1+"$@"}.
+	Don't start the 'midnight' timer twice
 
-2016-01-25  Paul Eggert  
+	* lisp/midnight.el (midnight-mode): Avoid starting the midnight
+	timer twice when activating the mode the first time.  (Bug#23123)
 
-	* src/xwidget.c (Fxwidget_set_adjustment): Fix doc string quoting typo.
+2016-06-19  YAMAMOTO Mitsuharu  
 
-2016-01-25  Paul Eggert  
+	* src/xwidget.c (Fxwidget_resize): Fix inappropriate use of XFASTINT.
 
-	Improve wording for SMB support
+2016-06-19  Stephen Berman  
 
-	* doc/misc/tramp.texi (External methods): Improve and modernize
-	wording for discussion of smbclient.  There is no longer any
-	need to mention the laundry list of old MS Windows implementations
-	of SMB and CIFS, nor to mention CIFS.  Also, give a URL for Samba.
+	Fix todo-mode category movement
 
-2016-01-24  Paul Eggert  
+	* lisp/calendar/todo-mode.el (todo-move-category): Use moved
+	category's existing categories sexp instead of invoking
+	todo-update-categories-sexp in file moved to, in order to take
+	archived items into account.  If the moved category has archived
+	items, handle the source archive buffer properly.  Remove
+	superfluous code.
 
-	Merge from gnulib
+2016-06-19  Glenn Morris  
 
-	This incorporates:
-	2016-01-24 openat_proc_name: fix last '/' overwritten on OS/2 kLIBC
-	2016-01-24 closedir, dirfd, opendir: port to OpenSolaris 5.10
-	2016-01-15 detect utimes() correctly on OS/2 kLIBC
-	2016-01-15 openat_proc_name: port to OS/2 kLIBC
-	2016-01-14 stdint: check _INTPTR_T_DECLARED for intptr_t etc.
-	2016-01-14 opendir, closedir, dirfd, fdopendir: port to OS/2 kLIBC
-	2016-01-14 dup, dup2, fcntl: support a directory fd on OS/2 kLIBC
-	2016-01-14 binary-io: don't put fd in binary mode if a console on EMX
-	2016-01-14 sig2str: list all signals on FreeBSD >= 7
-	2016-01-13 acl-permissions: port to USE_ACL==0 platforms
-	2016-01-12 mktime: rename macro to avoid glibc clash
-	2016-01-12 Port "$@" to OpenIndiana ksh93
-	2016-01-12 Port Universal Time settings to strict POSIX
-	* build-aux/gitlog-to-changelog, build-aux/update-copyright:
-	* doc/misc/texinfo.tex, lib/acl-internal.c, lib/acl-internal.h:
-	* lib/binary-io.h, lib/dirent.in.h, lib/dirfd.c, lib/dup2.c:
-	* lib/fcntl.c, lib/fdopendir.c, lib/mktime.c, lib/openat-proc.c:
-	* lib/sig2str.h, lib/stdint.in.h, m4/dirfd.m4, m4/dup2.m4:
-	* m4/fcntl.m4, m4/utimes.m4:
-	Copy from gnulib.
-	* m4/gnulib-comp.m4: Regenerate.
+	* lisp/xt-mouse.el (xterm-mouse-utf-8): Add :version.
 
-2016-01-24  Alan Mackenzie  
+2016-06-19  Eli Zaretskii  
 
-	Expunge "allow" + infinitive without direct object from source and doc.
+	Ignore non-nil. non-cons values of unread-command-events
 
-	Do the same for "permit", "enable", and "prevent".
+	* src/keyboard.c (requeued_events_pending_p, read_char)
+	(Finput_pending_p): Use CONSP instead of !NILP to see if there are
+	unread command events to be processed.  (Bug#22976)
 
-	* doc/emacs/mule.texi:
-	* doc/lispref/control.texi:
-	* doc/lispref/display.texi:
-	* doc/lispref/frames.texi:
-	* doc/lispref/functions.texi:
-	* doc/lispref/nonascii.texi:
-	* doc/lispref/streams.texi:
-	* doc/lispref/windows.texi:
-	* doc/misc/dbus.texi:
-	* doc/misc/eww.texi:
-	* doc/misc/flymake.texi:
-	* doc/misc/octave-mode.texi:
-	* doc/misc/org.texi:
-	* doc/misc/reftex.texi:
-	* doc/misc/tramp.texi:
-	* doc/misc/wisent.texi:
-	* etc/NEWS:
-	* lisp/autorevert.el:
-	* lisp/cedet/mode-local.el:
-	* lisp/cedet/semantic/senator.el:
-	* lisp/cedet/semantic/wisent.el:
-	* lisp/dos-fns.el:
-	* lisp/frameset.el:
-	* lisp/gnus/gnus-agent.el:
-	* lisp/gnus/mm-util.el:
-	* lisp/international/characters.el:
-	* lisp/ldefs-boot.el:
-	* lisp/mail/mailclient.el:
-	* lisp/man.el:
-	* lisp/mh-e/mh-search.el:
-	* lisp/net/tramp-cmds.el:
-	* lisp/net/tramp-gvfs.el:
-	* lisp/org/org-crypt.el:
-	* lisp/org/org-element.el:
-	* lisp/org/org-feed.el:
-	* lisp/org/org.el:
-	* lisp/org/ox-ascii.el:
-	* lisp/org/ox-icalendar.el:
-	* lisp/org/ox-publish.el:
-	* lisp/org/ox.el:
-	* lisp/play/gamegrid.el:
-	* lisp/play/gomoku.el:
-	* lisp/progmodes/antlr-mode.el:
-	* lisp/progmodes/python.el:
-	* lisp/progmodes/vhdl-mode.el:
-	* lisp/strokes.el:
-	* lisp/textmodes/ispell.el:
-	* lisp/tree-widget.el:
-	* lisp/vc/pcvs.el:
-	* lisp/window.el:
-	* src/lisp.h:
-	* src/w32.c:
-	* src/w32heap.c:
-	* src/w32term.c:
-	* src/window.c:
-	* src/xfaces.c:
+2016-06-19  Eli Zaretskii  
 
-	Replace solecisms like "This allow to do something" with a correct
-	alternative, such as "This allow you to do something", "This allows
-	something to be done" or "This allows the doing of something".
+	Improve documentatuon of 'truncate-partial-width-windows'
 
-2016-01-24  l3thal  
+	* src/xdisp.c (syms_of_xdisp) :
+	Clarify in the doc string how the width of partial-width windows
+	is computed for the purposes of truncation decision.  (Bug#4338)
 
-	Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
+	* doc/emacs/windows.texi (Split Window): Clarify how the width of
+	windows is calculated for the purposes of truncation decision.
+	* doc/emacs/display.texi (Line Truncation): Remove a redundant
+	index entry.
 
-2016-01-24  Kelvin White  
+2016-06-19  Paul Eggert  
 
-	Add NEWS entry for asynchronous reconnect in ERC
+	* src/ftfont.c (ftfont_shape_by_flt): Parenthesize as per GNU style.
 
-2016-01-24  l3thal  
+2016-06-19  Eli Zaretskii  
 
-	Add NEWS entry for asynchronous reconnect in ERC
+	Fix 'dired-goto-file' in Dired buffers produced by find-dired
 
-2016-01-24  Kelvin White  
+	* lisp/dired.el (dired-goto-file): Try looking for the file as a
+	relative name with leading sub-directories, before looking for the
+	basename alone.  (Bug#23089)
 
-	browse-url.el: Add 'google-chrome' to supported browsers.
+2016-06-19  Nicolas Petton  
 
-2016-01-24  Paul Eggert  
+	Fix map-put and map-delete for alists (Bug#23105)
 
-	Port Tramp manual to latest Texinfo
+	* lisp/emacs-lisp/map.el (map-put): Do not bind the evaluated place
+	expression to a new symbol.
+	* test/lisp/emacs-lisp/map-tests.el: Add a regression test.
 
-	Otherwise, 'make pdf' did not work (Bug#22416).
-	* doc/misc/tramp.texi (xxx, yyy): Remove macros.
-	(trampfn): Specialize to the case where METHOD is nonempty.
-	The 2nd argument is now user@host, not 2nd user and 3rd host args.
-	All uses changed.
-	(trampf): New macro.
+2016-06-19  Eli Zaretskii  
 
-2016-01-24  Lars Ingebrigtsen  
+	Minor copyedits of documentation for temporary displays
 
-	* eww.el (eww-render): Protect against empty content-types.
+	* doc/emacs/windows.texi (Temporary Displays): Improve indexing.
+	Minor changes in wording.
+	(Window Choice, Displaying Buffers, Pop Up Window): Disambiguate
+	index entries for 'display-buffer'.
 
-2016-01-24  Nicolas Petton  
+	* etc/NEWS: Minor rewording of the entry about temporary displays.
 
-	authors.el updates
+2016-06-19  Philipp Stephani  
 
-	* admin/authors.el (authors-ignored-files, authors-renamed-files-alist):
-	  Additions.
+	Add customization option for using UTF-8 coordinates in xt-mouse
 
-2016-01-24  Dmitry Gutov  
+	* lisp/xt-mouse.el (xterm-mouse-utf-8): New customization option.
+	(xterm-mouse--read-coordinate): New function to replace
+	`xterm-mouse--read-utf8-char'; uses UTF-8 only if enabled.
+	(xterm-mouse--read-number-from-terminal): Adapt to new name.
+	(xterm-mouse-tracking-enable-sequence)
+	(xterm-mouse-tracking-disable-sequence): Replace constants with
+	functions, mark constants as obsolete.
+	(xterm-mouse--tracking-sequence): New helper function.
+	(turn-on-xterm-mouse-tracking-on-terminal): Use new functions;
+	enable UTF-8 only if customization option says so; store UTF-8
+	flag in terminal parameter.  (Bug#23009)
 
-	Rename xref-query-replace to xref-query-replace-in-results
+	* test/automated/xt-mouse-tests.el: Add tests for xt-mouse.el.
 
-	* lisp/progmodes/xref.el(xref-query-replace):
-	Rename to xref-query-replace-in-results.
-	(http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01240.html)
+2016-06-19  Eli Zaretskii  
 
-	* lisp/progmodes/xref.el (xref--xref-buffer-mode-map):
-	* lisp/dired-aux.el (dired-do-find-regexp-and-replace):
-	* doc/emacs/dired.texi (Operating on Files):
-	* doc/emacs/maintaining.texi (Xref Commands)
-	(Identifier Search, Identifier Search): Update accordingly.
+	Minor doc string fixes in replace.el
 
-2016-01-24  Dmitry Gutov  
+	* lisp/replace.el (query-replace, query-replace-regexp)
+	(query-replace-regexp-eval, map-query-replace-regexp)
+	(replace-string, replace-regexp): Clarify in doc strings that
+	these commands operate from point to the end of the buffer's
+	accessible portion.  (Bug#23067)
 
-	Update cl-defgeneric and cl-defmethod docstrings
+2016-06-19  Eli Zaretskii  
 
-	* lisp/emacs-lisp/cl-generic.el: Remove outdated TODO item.
-	(cl-defgeneric): Rename BODY to DEFAULT-BODY.
-	(cl-defmethod): Mention that multiple dispatch arguments are
-	allowed.  Document supported types.  (Bug#22336)
+	Fix scrolling upwards with 'xwidget-webkit-browse-url'
 
-2016-01-23  Dmitry Gutov  
+	* src/xwidget.c (Fxwidget_set_adjustment): Use CHECK_NUMBER instead
+	of CHECK_NATNUM.  Suggested by Shayan Pirani .
+	(Bug#22918)
 
-	Comment out next-error-function integration in xref
+2016-06-19  K. Handa  
 
-	* lisp/progmodes/xref.el (xref--xref-buffer-mode):
-	Comment out next-error-function integration
-	(http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01286.html).
+	Fix display of Indic scripts
 
-2016-01-23  John Wiegley  
+	* ftfont.c (ftfont_shape_by_flt): For combining characters out
+	of the range U+300...U+36F, use the "combining" FLT only with
+	non-OTF fonts.
 
-	Correct a use of "which" in intro.texi
+2016-06-19  Eli Zaretskii  
 
-2016-01-23  Alan Mackenzie  
+	Fix splash screen display at startup
 
-	Distinguish the two meanings of Java's keyword "default".  Fixes bug #22358.
+	* src/frame.c (DEFAULT_ROWS): Enlarge to 36, so that the initial
+	window displayed by "emacs -q" has enough space to show the whole
+	text even if it includes 2 lines talking about recovering crashes
+	sessions.  (Bug#23074)
 
-	* lisp/progmodes/cc-engine.el (c-guess-basic-syntax CASE 14): Check the
-	context of case labels (including "default") more rigorously.
-	(c-guess-basic-syntax CASE 15): Consequential amendment.
+	* lisp/startup.el (use-fancy-splash-screens-p): Fix off-by-one
+	error when computing the window-height from frame-height.
 
-	* lisp/progmodes/cc-langs.el (c-modifier-kwds): Add "default" to Java's value.
+	* etc/NEWS: Mention the change.
 
-2016-01-23  Oscar Fuentes  
+2016-06-19  Martin Rudalics  
 
-	Don't operate on menu bar of nonexistent frame
+	Describe temporary displays in Emacs manual
 
-	* src/xfns.c (Fx_hide_tip) [USE_LUCID]: Check that the current frame
-	is valid before redisplaying its menu. Fixes bug#22438.
+	* doc/emacs/emacs.texi (Temporary Displays): New subsubsection.
+	* doc/emacs/windows.texi (Window Choice): Minor fixes.
+	(Temporary Displays): New subsubsection describing display of
+	temporary buffers and `temp-buffer-resize-mode'.
 
-2016-01-23  Anders Lindgren  
+2016-06-19  Paul Eggert  
 
-	Unbreak the GNUstep build.
+	Avoid stray As next to IDLW icons
 
-	* src/nsterm.m ([EmacsBell init]): In GNUstep, don't use the
-	predefined "caution" image. Add trace.
-	(x_set_window_size): Remove unused variables `cols' and `rows'.
-	(ns_draw_fringe_bitmap): Exclude assignment of `fromRect' when
-	GNUstep is used.
-	([EmacsView updateFrameSize:]): Remove unused variable `win'.
-	([EmacsWindow zoom:]): Remove unused variable `f'.
+	* lisp/progmodes/idlw-toolbar.el (idlwave-toolbar-add-everywhere):
+	Use "" for empty labels, not "a", as the latter now displays stray
+	"A"s (Bug#18997).
 
-2016-01-23  Eli Zaretskii  
-	    John Wiegley  
-	    Michael Heerdegen  
+2016-06-19  Paul Eggert  
 
-	Improve documentation of 'pcase'
+	Avoid GTK 3 crash with icons and masks
 
-	* doc/lispref/control.texi (Pattern matching case statement):
-	Reorganize, expand, and improve wording.
+	Problem reported by Mosè Giordano (Bug#18997).
+	* src/gtkutil.c (xg_get_pixbuf_from_pixmap): Remove.
+	(xg_get_pixbuf_from_pix_and_mask): Do not use
+	xg_get_pixbuf_from_pixmap, as it is poorly documented.  Instead,
+	invoke XGetPixel directly.  This is slow but speed is not
+	important here.  Also, fail for unusual situations (not TrueColor,
+	or images that are not 8 bits per sample) instead of displaying
+	junk or crashing.
 
-	* etc/NEWS: Mention that 'pcase' changes are documented.
+2016-06-19  Juri Linkov  
 
-2016-01-23  Paul Eggert  
+	* lisp/minibuffer.el (minibuffer-completion-help): Use fit-window-to-buffer
 
-	* etc/NEWS: Say that Cairo is experimental.
+	instead of shrink-window-if-larger-than-buffer.  (Bug#23092)
 
-2016-01-23  Paul Eggert  
+2016-06-19  Eli Zaretskii  
 
-	Report error for PNG under Cairo
+	Define make_save_ptr_ptr unconditionally
 
-	* src/image.c (lookup_rgb_color): Signal a file error instead
-	of dumping core when mishandling an image.
+	* src/alloc.c (make_save_ptr_ptr): Remove the !(defined
+	USE_X_TOOLKIT || defined USE_GTK) conditional.  Reported by
+	Philipp Stephani .  (Bug#23101)
 
-2016-01-23  Arash Esbati  
+2016-06-19  Eli Zaretskii  
 
-	Delete a spurious backquote (tiny change)
+	Preserve current buffer when popping up TTY menus
 
-	* lisp/textmodes/reftex-ref.el (reftex-label): Delete a
-	spurious backquote which raises an error with emacs 25.
+	* src/term.c (tty_menu_show): Be sure to save and restore the
+	current buffer around TTY menu pop-ups.  (Bug#23101)
 
-2016-01-23  Paul Eggert  
+2016-06-19  Eli Zaretskii  
 
-	Pacify --enable-gcc-warnings --with-cairo
+	Improve font selection by family on MS-Windows
 
-	Problem reported by Alexander Kuleshov in:
-	http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01289.html
-	* src/gtkutil.c (xg_get_page_setup):
-	Use switch rather than if-then-else.
-	* src/image.c (COLOR_TABLE_SUPPORT):
-	Define directly rather than via #define and optional later #undef.
-	(lookup_rgb_color) [USE_CAIRO && ENABLE_CHECKING]:
-	Crash when the pixel is undefined, as there is a genuine bug
-	here (Bug#22442).
-	* src/image.c (tiff_load, gif_load, svg_load_image)
-	(x_kill_gs_process) [USE_CAIRO]:
-	* src/xterm.c (x_draw_fringe_bitmap) [USE_CAIRO]:
-	Omit unused locals, or move them to where they’re needed.
-	(x_clear_area1): Now ATTRIBUTE_UNUSED.
+	* src/w32font.c (w32font_list_internal): Allow 'ascii-0' charset,
+	in addition to 'iso10646-1', 'unicode-bmp', and 'unicode-sip'.
+	This avoids rejecting many font families whose members are shown
+	by 'font-family-list', in particular 'courier' requested by
+	info.el.  Without this change, many values of ':family' attribute
+	of a face have no effect on MS-Windows, because they are rejected
+	due to bogus mismatch of the charset.
 
-2016-01-23  Eli Zaretskii  
+2016-06-19  Paul Eggert  
 
-	Update documentation for Dired search and replace
+	Comint, term, and compile now set EMACS
 
-	* doc/emacs/dired.texi (Operating on Files): Update descriptions
-	of 'A' and 'Q' now bound to 'dired-do-find-regexp' and
-	'dired-do-find-regexp-and-replace'.
+	This fixes directory tracking in ansi-term, at the expense of
+	breaking some usages of 'configure'.  Setting EMACS is meant to be
+	a somewhat temporary measure, until Bash 4.4 comes out and is
+	common.  (Bug#20484).
+	* etc/NEWS: Document this.
+	* lisp/comint.el (comint-exec-1):
+	* lisp/net/tramp-sh.el (tramp-remote-process-environment):
+	* lisp/progmodes/compile.el (compilation-start):
+	* lisp/term.el (term-exec-1):
+	Go back to setting the EMACS environment variable, for backward
+	compatibility to Bash 4.3 and earlier.
 
-	* etc/NEWS: Mention xref-related changes in Dired.
+2016-06-19  Paul Eggert  
 
-2016-01-23  Paul Eggert  
+	Ignore more merges when generating ChangeLog
 
-	Port recent xdisp.c fix to picky C compilers
+	* build-aux/gitlog-to-emacslog: Ignore all merges from gnu.org,
+	not merely those from master and emacs-NN.  The ChangeLog entries
+	they generate are not that useful.
 
-	* src/xdisp.c (dump_glyph): Redo the call to fprintf to avoid
-	putting #if inside the arguments to a standard function, which
-	the C standard says has undefined behavior.
+2016-06-19  Paul Eggert  
 
-2016-01-22  Alan Mackenzie  
+	Sync with gnulib
 
-	Prevent spurious recognition of K&R argument declarations.  Fixes bug #2203
+	This incorporates:
+	2016-03-22 gitlog-to-changelog: suppress ignored chatter
+	2016-03-21 sys_select: port to new Cygwin
+	* build-aux/gitlog-to-changelog, doc/misc/texinfo.tex:
+	* lib/sys_select.in.h: Copy from gnulib.
 
-	* lisp/progmodes/cc-engine.el (c-forward-declarator): New function.
-	(c-in-knr-argdecl): Before recognizing a K&R argument declaration, check it is
-	contained in the preceding arg list.
+2016-06-19  Paul Eggert  
 
-	* lisp/progmodes/cc-fonts.el (c-font-lock-declarators): Use the new function
-	`c-forward-declarator' in place of inline code.
+	Resurrect GNUS-NEWS autogeneration
 
-2016-01-22  Eli Zaretskii  
+	* doc/misc/gnus-coding.texi (Gnus Maintenance Guide): Update
+	GNUS-NEWS section to match current file locations and procedure.
+	* etc/GNUS-NEWS: Regenerate by using new procedure.
+	* lisp/Makefile.in (update-gnus-news): New rule, containing a
+	procedure for building GNUS-NEWS.  The old procedure got lost
+	somehow when Gnus was merged into Emacs.
 
-	Fix the build with --enable-checking=glyphs
+2016-06-19  Anders Lindgren  
 
-	* src/xdisp.c (dump_glyph): Don't refer to glyph->u.xwidget in a
-	build without xwidget support.
+	Make `toggle-frame-maximized' respect the dock on OS X (bug#22988).
 
-2016-01-22  Eli Zaretskii  
+	* src/nsterm.m (ns_screen_margins): New function.
+	(ns_screen_margins_ignoring_hidden_dock): New function.
+	(ns_menu_bar_height): Reimplement in terms of `ns_screen_margins'.
+	([EmacsWindow zoom:]): Take all screen margins (except those
+	originating from a hidden dock) into account.
 
-	Document cl-generic.el
+2016-06-19  Eli Zaretskii  
 
-	* doc/lispref/functions.texi (Generic Functions): New section.
-	(Bug#22336)
-	(Functions): Update the chapter menu.
-	* doc/lispref/elisp.texi: Update the master menu.
+	Fix bug in displaying header line with a box face
 
-2016-01-22  Paul Eggert  
+	* src/xdisp.c (get_next_display_element): Handle the case when a
+	display string acquires the box face from an underlying string,
+	not from the buffer.  (Bug#23091)
 
-	xwidgets style cleanup
+2016-06-19  Kaushal Modi  
 
-	Adjust the newly-added Xwidgets code so that it uses a more-typical
-	Emacs style.  This should not affect behavior, except that in
-	a few places it adds runtime checks that Lisp arguments are of
-	the proper type, and in one place it uses more-precise arithmetic.
-	* src/buffer.c, src/dispnew.c, src/emacs.c, src/emacsgtkfixed.c:
-	* src/emacs.c, src/print.c, src/window.c, src/xdisp.c, src/xterm.c:
-	Include xwidget.h unconditionally.
-	* src/buffer.c (Fkill_buffer):
-	* src/dispnew.c (update_window):
-	* src/emacs.c (main):
-	* src/print.c (print_object):
-	* src/window.c (Fdelete_window_internal):
-	* src/xdisp.c (handle_single_display_spec, push_it, pop_it)
-	(get_next_element, set_iterator_to_next, next_element_from_xwidget)
-	(dump_glyph, calc_pixel_width_or_height, BUILD_GLYPH_STRINGS_XW)
-	(BUILD_GLYPH_STRINGS, x_produce_glyphs, get_window_cursor_type):
-	* src/xterm.c (x_draw_glyph_string, x_draw_bar_cursor):
-	Call xwidget functions and macros without worrying about
-	HAVE_XWIDGETS when the code is a no-op on non-xwidget
-	platforms.
-	* src/dispextern.h (XWIDGET_GLYPH, struct glyph_string.xwidget)
-	(IT_XWIDGET, GET_FROM_XWIDGET, struct it.u.xwidget)
-	(struct it.xwidget):
-	* src/lisp.h (PVEC_XWIDGET, PVEC_XWIDGET_VIEW):
-	Always define.
-	* src/emacsgtkfixed.h: Omit unnecessary comment.
-	* src/keyboard.c: Fix spacing.
-	* src/xdisp.c (BUILD_XWIDGET_GLYPH_STRING, produce_xwidget_glyph):
-	Define to be a no-op if not HAVE_XWIDGETS.
-	* src/xwidget.c: Include xwidget.h first (after config.h)
-	to make sure that it can stand by itself.
-	(Fmake_xwidget, Fxwidget_webkit_execute_script):
-	Fix typo in doc string.
-	(Fmake_xwidget): Check type of args.
-	(Fmake_xwidget, offscreen_damage_event)
-	(webkit_document_load_finished_cb, webkit_download_cb)
-	(webkit_new_window_policy_decision_requested_cb)
-	(webkit_navigation_policy_decision_requested_cb)
-	(xwidget_osr_draw_cb, xwidget_osr_event_forward)
-	(xwidget_osr_event_set_embedder, xwidget_init_view):
-	Omit unnecessary casts.
-	* src/xwidget.c (Fmake_xwidget, xwidget_hidden)
-	(xwidget_show_view, xwidget_hide_view)
-	(x_draw_xwidget_glyph_string, xwidget_start_redisplay, xwidget_touch)
-	(xwidget_touched):
-	* src/xwidget.h (struct xwidget.kill_without_query)
-	(struct xwidget_view.redisplayed, struct xwidget_view.hidden):
-	Use bool for boolean.
-	* src/xwidget.c (store_xwidget_event_string, Fxwidget_size_request):
-	Simplify by using list functions.
-	(WEBKIT_FN_INIT): Omit unnecessary test for nil.
-	(Fxwidget_resize): Check type of integer args
-	before doing any work.  Check that they are nonnegative.
-	(Fxwidget_set_adjustment): Check type of integer arg.
-	Avoid redundant call to gtk_scrolled_window_get_vadjustment.
-	Simplify.  Use double, not float.
-	(Fxwidget_info, Fxwidget_view_info): Simplify by using CALLN.
-	(valid_xwidget_spec_p): Simplify.
-	(xwidget_spec_value): Omit unused arg FOUND.  All callers changed.
-	* src/xwidget.h: Include lisp.h first, so that includers do
-	not need to worry about doing that before including this file.
-	Make this .h file safe to include even on non-HAVE_XWIDGETS
-	configurations, to simplify the includers.
-	(x_draw_xwidget_glyph_string, syms_of_xwidget, valid_xwidget_spec_p)
-	(xwidget_end_redisplay, lookup_xwidget)
-	(xwidget_view_delete_all_in_window, kill_buffer_xwidgets):
-	Now a no-op if !HAVE_XWIDGETS, to simplify callers.
-	(struct glyph_matrix, struct glyph_string, struct xwidget)
-	(struct xwidget_view, struct window):
-	New forward or incomplete decls, so that includers need not
-	assume the corresponding .h files are already included, or that
-	HAVE_XWIDGETS is defined.
-	(struct xwidget_type, xwidget_from_id): Remove; unused.
+	Fix an Isearch var to be a string (Bug#23038)
 
-2016-01-22  Michael Albinus  
+	* isearch.el (isearch--describe-regexp-mode): The `description' var
+	  needs to always be a string.  Add the missing default case for the
+	  cond form that ensures that.
 
-	Backport kqueue integration from master
+	Before this bug fix, for the events when `regexp-function' and
+	`search-default-mode' both were nil, `description' also stayed nil.  So
+	when `space-before' was non-nil, the "non-string" `description'
+	(with a value of nil) got passed as an argument to
+	`replace-regexp-in-string' (where a string was expected).  That caused
+	the error described in Bug#23038.
 
-	* configure.ac (--with-file-notification): Add kqueue.
-	(top): Remove special test for "${HAVE_NS}" and
-	${with_file_notification}, this is handled inside gfilenotify
-	tests.  Add kqueue tests.  Use NOTIFY_CFLAGS and NOTIFY_LIBS
-	instead of library specific variables.  Add error message for
-	gfile on Nextstep.
+2016-06-19  Leo Liu  
 
-	* doc/lispref/os.texi (File Notifications): Add kqueue as backend.
-	Fix some glitches in the example.
+	Fix (args-out-of-range 1) error in cursor-sensor--detect
 
-	* etc/NEWS: Mention kqueue.
+	* lisp/emacs-lisp/cursor-sensor.el (cursor-sensor--detect): Don't
+	  hard-code (point-min) as 1 which fails in narrowed buffers.
 
-	* lisp/filenotify.el (file-notify--library)
-	(file-notify-descriptors, file-notify-callback)
-	(file-notify-add-watch, file-notify-rm-watch)
-	(file-notify-valid-p): Add kqueue support.
-	(file-notify--rm-descriptor): Remove WHAT arg.
+2016-06-19  Lars Magne Ingebrigtsen  
 
-	* src/Makefile.in: Use NOTIFY_CFLAGS and NOTIFY_LIBS.
+	Render empty 
      •  correctly
 
-	* src/emacs.c (main): Call globals_of_kqueue and syms_of_kqueue.
+	* lisp/net/shr.el (shr-tag-ul): Render empty 
          • 
+	correctly (bug#22964).
+	(cherry picked from commit 4f6ea3988b66cf132c67fd0cc26d12eb9a300ba1)
 
-	* src/inotify.c (inotifyevent_to_event): Extract file name from
-	watch_object if the event doesn't provide it.
-	(Finotify_add_watch): Add file name to watch_object.
+	Backport:
 
-	* src/keyboard.c (make_lispy_event): Check also for HAVE_KQUEUE.
+2016-06-19  Lars Magne Ingebrigtsen  
 
-	* src/kqueue.c: New file.
+	Ignore invalid base64 encoded embedded images
 
-	* src/lisp.h: Declare extern globals_of_kqueue and syms_of_kqueue.
+	* lisp/net/shr.el (shr-image-from-data): Ignore invalid base64
+	encoded embedded images (bug#22928).
+	(cherry picked from commit f2da80d0e1ccd121c4891e869a45aeb9c6b1795d)
 
-	* test/automated/file-notify-tests.el
-	(file-notify--test-expected-events): Remove.
-	(file-notify--test-cleanup): Do not set that variable.
-	(file-notify--test-timeout) Use different timeouts for
-	different libraries.
-	(file-notify--test-library): New defun.
-	(file-notify--test-event-test): Make stronger checks.
-	(file-notify--test-with-events): EVENTS can also be a list of
-	lists.  Flush outstanding events before running the body.
-	Make timeout heuristically depend on the number of events.
-	(file-notify-test01-add-watch, file-notify-test02-events)
-	(file-notify-test04-file-validity, file-notify-test05-dir-validity):
-	Rewrite in order to call file monitors but directory monitors.
-	(file-notify-test02-events, file-notify-test04-file-validity): Do
-	not skip cygwin tests.  Add additional test for file creation.
-	Adapt expected result for different backends.
-	(file-notify-test03-autorevert): Some of the tests don't work for
-	w32notify.
-	(file-notify-test06-many-events): New test.
+	Backport:
 
-2016-01-22  John Wiegley  
+2016-06-19  Lars Magne Ingebrigtsen  
 
-	Further corrections to the pcase docstring
+	Fix 
             and 
             newlines with or without 
          •  in shr
 
-2016-01-22  Eli Zaretskii  
+	* lisp/net/shr.el (shr-ensure-newline): Respect that we're in
+	a 
          • , if we are, and don't insert newlines there.
+	(shr-ensure-paragraph): When mixing newlines and paragraph
+	ensurements, don't insert too many blank lines.
+	(shr-tag-div): A 
             shouldn't introduce a paragraph, but a
+	new line.
+	(cherry picked from commit 292921facaff2f02ac4e8602c1f7ecbdcfe7ef45)
 
-	* doc/emacs/anti.texi (Antinews): Rewrite for Emacs 25.
+	Backport:
 
-2016-01-22  Stephen Leake  
+2016-06-19  Eli Zaretskii  
 
-	In xref-collect-references, force backends to respect the 'dir' arg
+	Avoid errors in 'newline'
 
-	* lisp/progmodes/xref.el (xref-collect-references): Force symref backends
-	to use `default-directory'.
+	* lisp/simple.el (newline): Don't barf if invoked with
+	non-positive argument in the middle of a line.  (Bug#22490)
 
-2016-01-22  John Wiegley  
+2016-06-19  Michael Albinus  
 
-	Minor correction to pcase docstring
+	Fix Bug#23032
 
-2016-01-22  John Wiegley  
+	* doc/misc/eshell.texi (Arguments): Mention the pipe symbol in
+	remote file names.  (Bug#23032)
 
-	Write a new docstring for the pcase macro
+2016-06-19  Eli Zaretskii  
 
-	* lisp/emacs-lisp/pcase.el (pcase): Write a new docstring.
+	Adjudicate review comments in abbrevs.texi
 
-2016-01-21  Stephen Berman  
+	* doc/lispref/abbrevs.texi (Abbrev Files, Abbrev Expansion):
+	* doc/emacs/abbrevs.texi (Dabbrev Customization): State the
+	default values of variables.  Suggested by Steve Byrne
+	.  (Bug#23016)
 
-	Avoid byte-compiler warning in todo-mode (bug#21953)
+	* admin/release-process (Check manuals): Mark files reviewed by
+	Steve Byrne.
 
-	* lisp/calendar/todo-mode.el (todo-convert-legacy-files): Add limit argument
-	to looking-back to comply with advertised-calling-convention.
+2016-06-19  Dmitry Gutov  
 
-2016-01-21  Stephen Berman  
+	Fixup the "normal" matcher; highlight global var symbols, too
 
-	Fix desktop support in todo-mode and doc-view (bug#22377)
+	* lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight
+	operator name symbols with the "normal" matcher (it actually
+	needed updating).  Highlight global variable symbols, too.
 
-	* lisp/calendar/todo-mode.el (todo-restore-desktop-buffer):
-	* lisp/doc-view.el (doc-view-restore-desktop-buffer): Return current buffer.
+2016-06-19  Marcin Borkowski  
 
-	* lisp/calendar/todo-mode.el (todo-modes-set-2):
-	* lisp/doc-view.el (doc-view-mode): Set desktop-save-buffer unconditionally.
+	Honor prefix arg in doc-view-next-line-or-next-page
 
-2016-01-21  Paul Eggert  
+	* lisp/doc-view.el (doc-view-next-line-or-next-page): Take the
+	prefix argument into consideration when continuous scrolling is
+	not in effect (i.e., by default) (bug#19559).
 
-	No need to configure gobject-introspection
+2016-06-19  Paul Eggert  
 
-	It wasn’t needed for the recently-installed xwidget_mvp code; see:
-	http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01154.html
-	* configure.ac (DOES_XWIDGETS_USE_GIR, GIR_REQUIRED, GIR_MODULES):
-	(HAVE_GIR):
-	* src/Makefile.in (GIR_LIBS, GIR_CFLAGS):
-	Remove.  All uses removed.
-	* configure.ac (emacs_config_features): Don’t worry about GIR.
+	Port to strict C99 offsetof
 
-2016-01-20  Paul Eggert  
+	* src/bidi.c (bidi_copy_it):
+	* src/lisp.h (CHAR_TABLE_EXTRA_SLOTS):
+	Use only a single identifier as the second argument of offsetof.
+	Found by using clang -pedantic.
 
-	Don’t export C symbols not used elsewhere
+2016-06-19  Paul Eggert  
 
-	These were recently added, mostly as part of xwidget code.
-	* src/emacsgtkfixed.c (emacs_fixed_get_type): Now static.
-	(EMACS_FIXED, EMACS_FIXED_GET_CLASS):
-	Now static functions here, not macros in emacsgtkfixed.h.
-	* src/emacsgtkfixed.h (EMACS_TYPE_FIXED):
-	Remove.  All uses replaced by definiens.
-	(EMACS_FIXED, EMACS_FIXED_GET_CLASS):
-	Remove; these are now static functions in emacsgtkfixed.c.
-	(EMACS_FIXED_CLASS, EMACS_IS_FIXED, EMACS_IS_FIXED_CLASS):
-	Remove; unused.
-	(emacs_fixed_get_type): Remove decl; no longer extern.
-	* src/xwidget.c (offscreen_damage_event)
-	(webkit_mime_type_policy_typedecision_requested_cb)
-	(webkit_new_window_policy_decision_requested_cb)
-	(webkit_navigation_policy_decision_requested_cb)
-	(xwidget_spec_value, xwidget_view_lookup)
-	(xwidget_start_redisplay, xwidget_touch):
-	Now static.
-	* src/xwidget.h (xwidget_start_redisplay, xwidget_touch):
-	Remove decls.
+	Port to GTK with strict C11 compiler
 
-2016-01-20  Dmitry Gutov  
+	* src/gtkutil.c (xg_create_frame_widgets, xg_toggle_notify_cb):
+	Cast from function type to void * where the C standard requires this.
+	This works around a problem in the prototypes for
+	g_signal_handler_find and g_signal_handlers_block_by_func, which
+	use gpointer instead of GCallback.  Found by using gcc -pedantic.
 
-	Support squiggly heredocs in ruby-mode
+2016-06-19  Paul Eggert  
 
-	* lisp/progmodes/ruby-mode.el (ruby-here-doc-beg-re):
-	Support squiggly heredocs added in Ruby 2.3.
+	Port to GTK with strict C99 compiler
 
-	* test/indent/ruby.rb: Add squiggly example.
+	* src/emacsgtkfixed.c: Use workaround for GNOME bug 683906 only
+	in glib 2.35.6 and earlier, since the bug is fixed in 2.35.7.
+	* src/emacsgtkfixed.c (EmacsFixedPrivate):
+	* src/emacsgtkfixed.h (EmacsFixedClass):
+	Remove duplicate typedef, which strict C99 does not allow (Bug#23003).
 
-2016-01-20  Glenn Morris  
+2016-06-19  Anders Lindgren  
 
-	* configure.ac (emacs_config_features): Remove WEBKIT.
+	Avoid screen artifacts with new OS X visible bell after scrolling
 
-2016-01-20  Paul Eggert  
+	* src/nsterm.m (EmacsBell): Save NSView when displaying the
+	visible bell and set `needsDisplay' when removed.
+	(hide_bell): Trace.
+	(ns_copy_bits): Trace.
 
-	Port to platforms with gtk3 but not webkitgtk3
+2016-06-19  Michael Albinus  
 
-	I ran into this problem on my Fedora 23 installation;
-	Emacs configured but did not build when --with-xwidgets was specified.
-	* configure.ac (HAVE_WEBKIT, HAVE_GIR): Omit unnecessary initializations.
-	(DOES_XWIDGETS_USE_GIR): New var.
-	If --with-xwidgets is specified, report an error if not
-	doable, to be consistent with the other --with options.
-	Require webkitgtk3 to use Xwidgets, as the Xwidgets code does
-	not work at all without webkitgtk3.  Simplify use of
-	EMACS_CHECK_MODULES.  Output message about gobject
-	introspection only if xwidgets are used.
-	* etc/NEWS: Users need webkitgtk3, not merely webkit.
-	* src/xwidget.c (syms_of_xwidget): Don’t worry about HAVE_WEBKIT_OSR,
-	since this file is no longer compiled if webkitgtk3 is not available.
+	Suppress some Tramp tests for OSX, do not merge with master
 
-2016-01-20  Eli Zaretskii  
+	* test/automated/tramp-tests.el (tramp--test-darwin-p): New defun.
+	(tramp--test-utf8): Use it.  (Bug#22145)
 
-	Fix doc string of 'isearch-search-fun-function'
+2016-06-19  Glenn Morris  
 
-	* lisp/isearch.el (isearch-search-fun-function)
-	(isearch-search-string): Doc fixes.  (Bug#22411)
+	* lisp/progmodes/xref.el (xref-buffer-name, xref--window):
+	Move definitions before use.
 
-2016-01-20  Stefan Monnier  
+	* lisp/gnus/mm-decode.el (gnus-format-message): Autoload it.
 
-	* lisp/xwidget.el: Nitpicks
+	* lisp/mail/rmail.el (rmail-mime-entity-truncated): Declare.
 
-	* lisp/xwidget.el (xwidget-log, xwidget-webkit-callback):
-	Use with-current-buffer rather than save-excursion + set-buffer.
+2016-06-19  Glenn Morris  
 
-2016-01-20  Glenn Morris  
+	Address compilation warnings due to 2016-01-03 mml refactoring.
 
-	Don't hard-code 1 as point-min.
+	* lisp/gnus/mml-sec.el (password-cache, mm-encode): Require.
+	(message-options-get): Autoload.
+	(message-options-set): Declare.
+	(mml-secure-cache-passphrase, mml-secure-passphrase-cache-expiry):
+	Simplify default value.
+	* lisp/gnus/mml-smime.el (message-options-set): Remove declaration.
+	* lisp/gnus/mml1991.el, lisp/gnus/mml2015.el:
+	No longer a need for password-cache.
 
-	* lisp/image-mode.el (image-display-size):
-	* lisp/xwidget.el (xwidget-webkit-last-session)
-	(xwidget-webkit-current-session): Don't hard-code 1 as point-min.
+2016-06-19  Stefan Monnier  
 
-2016-01-20  Glenn Morris  
+	* lisp/emacs-lisp/smie.el (smie-indent-keyword): Don't burp in strings
 
-	* lisp/xwidget.el: Add declarations to silence non-xwidget compilation.
+	(bug#22960).
 
-2016-01-20  Glenn Morris  
+2016-06-19  Glenn Morris  
 
-	Trivial doc copyedits.
+	* lisp/dired-x.el (dired-omit-here-always): Correct error message
+	for 2016-01-25 change.
 
-	* src/xwidget.c (Fmake_xwidget, Fget_buffer_xwidgets)
-	(Fxwidget_webkit_get_title, Fxwidget_resize)
-	(Fxwidget_set_adjustment, Fxwidgetp, Fxwidget_view_p)
-	(Fxwidget_info, Fxwidget_view_lookup)
-	(Fset_xwidget_query_on_exit_flag): Trivial doc copyedits.
+	* lisp/dired-x.el (dired-omit-here-always): Replace undefined function
+	removed 2016-01-30.
 
-2016-01-20  Glenn Morris  
+	* lisp/xml.el (xml-parse-tag-1): Replace undefined function.
 
-	Avoid advising image-display-size for xwidgets.
+2016-06-19  Eli Zaretskii  
 
-	* lisp/xwidget.el (xwidget-image-display-size): Remove.
-	(image-display-size): Remove advice.
-	* lisp/image-mode.el (xwidget-info, xwidget-at): Declare.
-	(image-display-size): Incorporate xwidget code directly.
+	Avoid segfaults due to frame image cache being absent
 
-2016-01-20  Glenn Morris  
+	* src/image.c (cache_image): If the frame doesn't have an image
+	cache, create it.  (Bug#23028)
 
-	Avoid breaking non-xwidget Emacs that happen to load xwidget.el.
+2016-06-19  Eli Zaretskii  
 
-	* lisp/xwidget.el (window-configuration-change-hook)
-	(kill-buffer-query-functions): Only modify these hooks if
-	compiled with xwidget support.
+	Improve documentation of glyphless-character display
 
-2016-01-20  Glenn Morris  
+	* doc/emacs/display.texi (Text Display): Document and index the
+	'glyphless-char' face.
 
-	* lisp/xwidget.el (xwidget-webkit-scroll-behaviour): Fix custom spec.
+2016-06-19  Dmitry Gutov  
 
-2016-01-19  Glenn Morris  
+	Support safe navigation operator in non-SMIE indentation code
 
-	* configure.ac (WEBKIT, GIR, CAIRO): Use EMACS_CHECK_MODULES, not PKG_.
+	* lisp/progmodes/ruby-mode.el (ruby-calculate-indent):
+	Support safe navigation operator in non-SMIE indentation code.
+	Cherry-picked from
+	https://github.com/ruby/ruby/commit/68e16ddd7961b86e5013e62ae2954e88638de058.
 
-	* configure.ac (emacs_config_features): Add XWIDGETS, WEBKIT, GIR.
+2016-06-19  Thomas Fitzsimmons  
 
-	* configure.ac (HAVE_WEBKIT_OSR): Remove broken, duplicated gtk3 test.
+	Move xsd:base64Binary decoding fix to debbugs.el 0.9.1
 
-2016-01-19  Katsumi Yamaoka  
+	* lisp/net/soap-client.el (soap-encode-xs-basic-type): Do not
+	assume xsd:base64Binary values are UTF-8 strings.
+	(soap-decode-xs-basic-type): Likewise.
+	(soap-invoke): Document xsd:base64Binary handling.
 
-	* lisp/gnus/nnir.el (nnir-request-update-mark):
-	Default to the original mark.
-	cf. 
-	and 
+2016-06-19  Dmitry Gutov  
 
-2016-01-19  Glenn Morris  
+	Fix Ruby's operator precedence
 
-	* lisp/xwidget.el (report-xwidget-bug): Remove.
+	* lisp/progmodes/ruby-mode.el (ruby-smie-grammar):
+	Rearrange the smie-precs->prec2 form.
 
-	(top-level): No longer require reporter.
+2016-06-19  Dmitry Gutov  
 
-2016-01-19  Joakim Verona  
-	    Grégoire Jadi  
+	(ruby-interpolation-inside-another-interpolation): New failing test
 
-	Support for the new Xwidget feature.
+	* test/automated/ruby-mode-tests.el
+	(ruby-interpolation-inside-another-interpolation):
+	New failing test.
 
-	* configure.ac:
-	(HAVE_XWIDGETS, WIDGET_OBJ, EMACS_CONFIG_FEATURES):
-	* src/xterm.c (x_draw_glyph_string, x_draw_bar_cursor):
-	* src/xdisp.c:
-	(handle_display_spec, handle_single_display_spec, push_it)
-	(pop_it, set_iterator_to_next, dump_glyph)
-	(calc_pixel_width_or_height, fill_xwidget_glyph_string)
-	(BUILD_XWIDGET_GLYPH_STRING, BUILD_GLYPH_STRINGS)
-	(produce_xwidget_glyph, x_produce_glyphs)
-	(get_window_cursor_type):
-	* src/window.c (Fdelete_window_internal):
-	* src/termhooks.h (e):
-	* src/print.c (print_object):
-	* src/lisp.h (ptrdiff_t):
-	* src/keyboard.c (kbd_buffer_get_event, make_lispy_event)
-	(syms_of_keyboard):
-	* src/emacs.c (main):
-	* src/dispnew.c (update_window, scrolling_window):
-	* src/dispextern.h (g, i):
-	* Makefile.in (XWIDGETS_OBJ, WEBKIT_CFLAGS, WEBKIT_LIBS)
-	(GIR_LIBS, ALL_CFLAGS, base_obj, LIBES):
-	* src/keyboard.c (kbd_buffer_get_event):
-	* src/emacsgtkfixed.c (emacs_fixed_gtk_widget_size_allocate)
-	(emacs_fixed_class_init): Add case for an xwidget view.
+2016-06-19  Paul Eggert  
 
-	* src/xwidget.c, src/xwidget.h, lisp/xwidget.el: New files for xwidgets
+	Port to clang 3.7.0 on x86-64
 
+	* configure.ac: Use AS_IF so that gl_WARN_ADD’s prerequisites are
+	not done conditionally.  This helps clang, which needs
+	-Wunknown-warning-option later when configured with warnings.
+	* src/editfns.c (invalid_time): Now _Noreturn, since clang isn’t
+	smart enough to figure this out on its own if warnings are enabled.
+	(lisp_time_struct): Redo for clarity, and to pacify clang.
+	* src/xfns.c (x_real_pos_and_offsets) [USE_XCB]: Don’t use
+	uninitialized locals.  This avoids undefined behavior and pacifies
+	clang.
 
-	Various improvements to the Xwidget feature.
-	* src/xwidget.c:
-	* src/emacsgtkfixed.c:
-	* lisp/xwidget.el:
+2016-06-19  Glenn Morris  
 
-2016-01-19  Eli Zaretskii  
+	* test/automated/package-test.el (package-test-signed): Tweak skip
+	condition, for hydra.
 
-	Improve documentation of 'alist-get'
+2016-06-19  Paul Eggert  
 
-	* doc/lispref/variables.texi (Setting Generalized Variables): Add
-	'alist-get' to the list of functions that can appear in PLACE
-	argument of 'setf'.
+	Sync with gnulib
 
-2016-01-19  Eli Zaretskii  
+	This incorporates:
+	2016-03-15 time_rz: port to clang -Wunused-const-variable
+	2016-03-15 select: port more to Intel 2016.1.150 compiler
+	* lib/sys_select.in.h, lib/time_rz.c: Copy from gnulib.
 
-	Minor copyedits of doc/emacs/maintaining.texi
+2016-06-19  Eli Zaretskii  
 
-	* doc/emacs/maintaining.texi (List Identifiers): More accurate
-	description of "C-M-i" wrt tags tables.
-	(Tags Tables): Move the definition of "tag" to a footnote.
+	Fix startup of "emacs -nw" on systems that CANNOT_DUMP
 
-2016-01-19  Eli Zaretskii  
+	* src/xdisp.c (syms_of_xdisp) : Initialize to
+	nil.
 
-	Unbreak the Cygwin-w32 build
+	* lisp/loadup.el : Set to 'grow-only' after
+	loading window.el.  (Bug#22975)
 
-	* src/w32fns.c (globals_of_w32fns): Move the initialization of
-	resetstkoflw into a part that isn't compiled on Cygwin.
-	(Bug#22403)
+2016-06-19  Dmitry Gutov  
 
-2016-01-19  Lars Magne Ingebrigtsen  
+	Do not tokenize a comment before continuation as ';'
 
-	* shr.el (shr-table-body): Allow tables to have text children.
+	* lisp/progmodes/ruby-mode.el (ruby-smie--implicit-semi-p):
+	Account for a comment right after point.
 
-2016-01-19  Phillip Lord  
+2016-06-19  Dmitry Gutov  
 
-	Cope with multiple overlapping faces.
+	Don't misindent arguments of a method call inside continuation
 
-	* lisp/htmlfontify.el (hfy-face-to-style-i): Treat inheritance right to
-	  left.
-	  (hfy-face-resolve-face): Handle font specification as well as font
-	  name. Documentation update. (Bug#21990)
+	* lisp/progmodes/ruby-mode.el (ruby-smie-rules):
+	Use smie-indent-virtual instead of smie-rule-parent (bug#23015).
+	Simplify the traversal loop.
 
-2016-01-19  Paul Eggert  
+2016-06-19  Stefan Monnier  
 
-	Fix spurious escapes in describe-input-method
+	* src/keyboard.c (echo_keystrokes_p): Don't test cursor_in_echo_area
 
-	Problem reported by Vincent Belaïche (Bug#22309).
-	* lisp/international/mule-cmds.el (describe-language-environment):
-	* lisp/international/quail.el (quail-help):
-	Apply substitute-command-keys to doc strings before displaying them.
+	(read_key_sequence): Test it here, as before.
+	(bug#22825).
 
-2016-01-19  Paul Eggert  
+2016-06-19  Paul Eggert  
 
-	Minor improvements to (random t) documentation
+	ASCII-only etc/NEWS etc.
 
-	* doc/lispref/numbers.texi (Random Numbers):
-	* src/fns.c (Frandom):
-	Omit unnecessary details about randomness fallback.
-	Say that it is a fallback.
+	* etc/NEWS, nextstep/README: Revert the recently-added curved
+	quotes, and stick to ASCII.  This typically involves replacing
+	curved with straight quotes.  Since etc/NEWS is viewed so often by
+	UTF-8-ignorant tools, rewrite its non-ASCII text to spell out
+	Unicode, e.g., replace ‘‒’ with ‘U+2012 (FIGURE DASH)’.
 
-2016-01-19  Dmitry Gutov  
+2016-06-19  Alan Mackenzie  
 
-	Rename methods in Ruby etags example file
+	Fix a cacheing bug, which led to inordinately slow c-beginning-of-defun.
 
-	* test/etags/ruby-src/test.rb: Rename the example methods to
-	correspond to the common terminology used in Ruby.
-	* test/etags/CTAGS.good:
-	* test/etags/ETAGS.good_1:
-	* test/etags/ETAGS.good_2:
-	* test/etags/ETAGS.good_3:
-	* test/etags/ETAGS.good_4:
-	* test/etags/ETAGS.good_5:
-	* test/etags/ETAGS.good_6: Adjust accordingly.
+	* lisp/progmodes/cc-defs.el (c-self-bind-state-cache): New macro.
 
-2016-01-19  Dmitry Gutov  
+	* lisp/progmodes/cc-engine.el (c-ssb-lit-begin): Always call c-parse-state
+	rather than just using the cache variable c-state-cache.
+	(c-syntactic-skip-backward): Invoke c-self-bind-state-cache to isolate calls
+	to c-parse-state from other uses of the parse state cache.
 
-	Propertize backtick in 'def `(abc)' as symbol constituent
+	* lisp/progmodes/cc-cmds.el (c-beginning-of-defun, c-end-of-defun): Invoke
+	c-self-bind-state-cache around the processing, replacing flawed bindings of
+	c-state-cache.
 
-	* lisp/progmodes/ruby-mode.el (ruby-syntax-propertize):
-	Propertize backtick in 'def `(abc)' as symbol constituent.
-	(ruby-syntax-propertize-function):
-	Rename to ruby-syntax-propertize.
+2016-06-19  Alan Mackenzie  
 
-2016-01-18  Eli Zaretskii  
+	Fix a cacheing bug, which led to inordinately slow c-beginning-of-defun.
 
-	Fix scrolling under scroll-preserve-screen-position on TTY
+	* lisp/progmodes/cc-defs.el (c-self-bind-state-cache): New macro.
 
-	* src/window.c (window_scroll_line_based): When setting point to
-	preserve screen coordinates, don't let cursor enter either of the
-	two scroll margins.  (Bug#22395)
+	* lisp/progmodes/cc-engine.el (c-ssb-lit-begin): Always call c-parse-state
+	rather than just using the cache variable c-state-cache.
+	(c-syntactic-skip-backward): Invoke c-self-bind-state-cache to isolate calls
+	to c-parse-state from other uses of the parse state cache.
 
-2016-01-18  Lars Magne Ingebrigtsen  
+	* lisp/progmodes/cc-cmds.el (c-beginning-of-defun, c-end-of-defun): Invoke
+	c-self-bind-state-cache around the processing, replacing flawed bindings of
+	c-state-cache.
 
-	Fix shr table rendering of nested tables
+2016-06-19  Kaushal Modi  
 
-	* shr.el (shr-table-body): Don't include all tbodies in nested
-	tables in the levels above.
+	Fix Isearch prompt when invoked with an argument
 
-2016-01-18  Dmitry Gutov  
+	* lisp/isearch.el (isearch--describe-regexp-mode): With
+	`search-default-mode' set to nil, if user does C-u C-s, the minibuffer
+	now displays "Regexp I-search: " again.  But if the user has set
+	`search-default-mode' to t, and then does C-s, the minibuffer now
+	displays "I-search: " because the default search mode is now regexp
+	mode.  Comments have been added to explain the priority of conditions
+	in the `cond' form.  (Bug#22991)
 
-	* lisp/progmodes/project.el (project--read-regexp): Quote the identifier.
+2016-06-19  Cesar Quiroz    (tiny change)
 
-2016-01-18  Dmitry Gutov  
+	Fix a typo in the Emacs manual
 
-	Add xref-based replacements for Dired search commands
+	* doc/emacs/maintaining.texi (VC Directory Commands): Fix a typo
+	in a command name.
 
-	* lisp/dired-aux.el (dired-do-find-regexp)
-	(dired-do-find-regexp-and-replace): New commands.
-	http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00864.html
+2016-06-19  Paul Eggert  
 
-	* lisp/dired.el (dired-mode-map): Change bindings for `A' and
-	`Q' to the new commands.
+	Curved quotes in etc/NEWS etc.
 
-	* lisp/progmodes/xref.el (xref-query-replace)
-	(xref-collect-matches): Add progress reporters.
-	(xref--find-ignores-arguments): Return nil for zero ignores.
-	(xref--show-xrefs): Add an optional argument.
-	(xref-collect-matches): Drop the assert.  'find' accepts a
-	regular file in place of directory argument, too.
+	* etc/NEWS, nextstep/README: Prefer curved quotes in the
+	recently-changed text documentation.  See:
+	http://lists.gnu.org/archive/html/emacs-devel/2016-03/msg00860.html
 
-2016-01-18  Alan Mackenzie  
+2016-06-19  Paul Eggert  
 
-	* doc/lispref/frames.texi (Position Parameters): Say they don't exist on TTYs.
+	Fix some single quotes in documentation
 
-2016-01-18  Eli Zaretskii  
+	* doc/emacs/anti.texi (Antinews): Avoid confusion in info and PDF
+	when documenting quoting styles.
+	* etc/NEWS, nextstep/README: In these plain text files, quote
+	'like this' consistently, rather than also (sometimes) ‘like this’
+	or (more often) `like this'.
 
-	Improve user documentation of Xref
+2016-06-19  Dmitry Gutov  
 
-	* doc/emacs/maintaining.texi (Xref, Find Identifiers)
-	(Looking Up Identifiers, Identifier Search, List Identifiers):
-	Adjudicate comments by Dmitry Gutov .  See
-	http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00650.html
-	for the details.
+	Make lisp-completion-at-point's argument optional
 
-2016-01-18  Eli Zaretskii  
+	* lisp/progmodes/elisp-mode.el (lisp-completion-at-point): Make
+	the argument optional, like it was before the rename.
 
-	Fix scrolling under scroll-preserve-screen-position and margins
+2016-06-19  Dmitry Gutov  
 
-	* src/window.c (window_scroll_pixel_based): When setting point to
-	preserve screen coordinates, don't let cursor enter either of the
-	two scroll margins.  Fix incorrect usage of
-	WINDOW_WANTS_HEADER_LINE_P and use WINDOW_HEADER_LINE_HEIGHT
-	instead of CURRENT_HEADER_LINE_HEIGHT.  (Bug#22395)
+	Tweak the left precedence of '=>'
 
-2016-01-18  Eli Zaretskii  
+	* lisp/progmodes/ruby-mode.el (ruby-smie-grammar): Tweak the left
+	precedence of '=>', to improve indentation and sexp navigation.
 
-	Unbreak the MS-Windows build
+2016-06-19  Dmitry Gutov  
 
-	* src/sysdep.c (emacs_gnutls_global_init, gnutls_rnd): Disable for
-	WINDOWSNT, to avoid link failure.  (Bug#22202)
+	Indent '.' relative to the first sibling expression
 
-2016-01-18  Alan Mackenzie  
+	* lisp/progmodes/ruby-mode.el (ruby-smie-rules):
+	Indent '.' relative to the first sibling expression, instead of the
+	parent token (bug#17213).
 
-	Desktop: protect users against inadvertant upgrading of desktop file.
+2016-06-19  Dmitry Gutov  
 
-	An upgraded (version 208) desktop file cannot be read in Emacs < 25.
+	Make '.' associative, for easier sexp navigation
 
-	* etc/NEWS: Add an entry about upgrading a desktop file.
+	* lisp/progmodes/ruby-mode.el (ruby-smie-grammar):
+	Make '.' associative, for easier sexp navigation.
 
-	* lisp/desktop.el (desktop-file-version): Amend doc string.
-	(desktop-native-file-version, desktop-io-file-version): new variables.
-	(desktop-clear): Set desktop-io-file-version to nil.
-	(desktop-buffer-info): make the presence of the last item on the list
-	conditional on (>= desktop-io-file-version 208).
-	(desktop-save): Add extra parameter VERSION to take user's C-u or C-u C-u.
-	Amend the doc string.  Add code to determine the output file version.
-	(desktop-create-buffer): Set desktop-io-file-version to the input file's
-	version.
+2016-06-19  Phillip Lord  
 
-2016-01-18  Paul Eggert  
+	Revert "Simplify "Visit New File" to "New File""
 
-	Initialize GnuTLS before calling gnutls_rnd
+	This reverts commit d457fd9dc782465e1547f74021390c9d5951d6af.
 
-	* src/gnutls.c (emacs_gnutls_global_init): Now extern.
-	Don’t set gnutls_global_initialized if gnutls_global_init fails.
-	* src/sysdep.c: Include "gnutls.h", and 
-	if 2.12 or later, which has gnutls_rnd.
-	(emacs_gnutls_global_init, gnutls_rnd): New fallback
-	placeholder macros if before 2.12.
-	(init_random): Initialize gnutls globals before trying to
-	use gnutls_rnd.
+2016-06-19  Phillip Lord  
 
-2016-01-18  Andreas Schwab  
+	Simplify "Visit New File" to "New File"
 
-	Don't use GnuTLS before it is initialized
+	* doc/emacs/files.texi,lisp/menu-bar.el (menu-bar-file-menu),
+	  lisp/startup.el(normal-mouse-start-screen,
+	  normal-no-mouse-startup-screen): Change label "Visit New File" to "New
+	  File".
 
-		* src/sysdep.c (init_random): Don't use gnutls_rnd.
+2016-06-19  Eli Zaretskii  
 
-2016-01-17  Paul Eggert  
+	Update Unicode notes for importing a new Unicode version
 
-	Port cleanup attribute to OpenBSD
+	* admin/notes/unicode: Mention the need to update otf-script-alist
+	in fontset.el when importing data files from a new Unicode
+	version.
 
-	The OpenBSD C compiler issues false alarms about strcpy, strcat, and
-	sprintf, and this messes up 'configure' when it tests for the cleanup
-	attribute.  Work around the problem by using __has_attribute directly.
-	Problem reported by Joakim Jalap (Bug#22385).
-	* configure.ac: Don’t use AX_GCC_VAR_ATTRIBUTE.
-	* m4/ax_gcc_var_attribute.m4: Remove.
-	* src/conf_post.h (__has_attribute): Provide a substitute, for
-	non-GCC or older GCC compilers.  All uses changed to assume
-	the substitute.  Check for the cleanup attribute.
-	* src/emacs-module.c (module_has_cleanup): Just use __has_attribute.
+2016-06-19  Eli Zaretskii  
 
-2016-01-17  Paul Eggert  
+	Import new data files from Unicode 9.0.0beta
 
-	Prefer GnuTLS when acquiring random seed
+	* admin/unidata/UnicodeData.txt:
+	* admin/unidata/Blocks.txt:
+	* admin/unidata/BidiMirroring.txt:
+	* admin/unidata/BidiBrackets.txt: Update from Unicode 9.0.0beta.
+	* admin/unidata/unidata-gen.el (unidata-gen-files): Bind
+	'coding-system-for-read' to 'utf-8, as various Unicode data files
+	now actually use non-ASCII characters.
+	(unidata-setup-list, unidata-get-name): Support the new Tangut
+	Ideographs block.
 
-	This attempts to improve on the fix for Bug#22202.
-	* configure.ac (HAVE_DEV_URANDOM): Remove.
-	Check /dev/urandom existence at run time, not at build time,
-	since the device could exist in the former but not the latter.
-	* src/sysdep.c [HAVE_GNUTLS]: Include gnutls/gnutls.h.
-	(gnutls_rnd) [GNUTLS_VERSION_NUMBER < 0x020c00]: New fallback macro.
-	(random_seed): New typedef.
-	(set_random_seed): New static function.
-	(seed_random): Use them.
-	(init_random): Use random_seed instead of uintmax_t, so as to
-	not consume more entropy than needed.  Prefer gnutls_rnd if it
-	works; this avoids a redundant open of /dev/urandom on
-	GNU/Linux with modern GnuTLS.
+	* lisp/international/characters.el (standard-case-table): Add new
+	characters from Unicode 9.0.0.
+	(standard-category-table): Add Arabic block u+08A0..u+08FF.  Add
+	Cyrillic Extended-C block.
+	(char-width-table): Update ranges per Unicode 9.0.0.
+	* lisp/international/fontset.el (script-representative-chars): Add
+	new scripts defined by Unicode 9.0.0.
+	(otf-script-alist): Add new OTF script tags.
+	* lisp/international/mule-cmds.el (ucs-names): Update ranges per
+	Unicode 9.0.0 additions.
 
-2016-01-16  Eli Zaretskii  
+2016-06-19  Eli Zaretskii  
 
-	Improve documentation of dynamic modules
+	Avoid errors in forms-mode when default major mode is text
 
-	* doc/lispref/loading.texi (How Programs Do Loading): Update the
-	description of searching for files in 'load' when Emacs was built
-	with support for dynamic modules.
+	* lisp/forms.el (forms-mode): Bind
+	change-major-mode-with-file-name to nil when calling
+	set-visited-file-name.  (Bug#22982)
 
-2016-01-16  Eli Zaretskii  
+2016-06-19  Eli Zaretskii  
 
-	* INSTALL: Document --with-modules.
+	Avoid crashes at startup on systems that CANNOT_DUMP
 
-2016-01-16  Eli Zaretskii  
+	* src/xdisp.c (syms_of_xdisp) : New
+	boolean variable.
+	(init_iterator, reseat_to_string)
+	(Fcurrent_bidi_paragraph_direction)
+	(Fbidi_find_overridden_directionality): Use
+	redisplay--inhibit-bidi instead of purify-flag, to determine when
+	it's safe to reorder bidirectional text.
 
-	Document 'function-put'
+	* lisp/loadup.el (redisplay--inhibit-bidi): Set to t at the
+	beginning of the file.  Reset to nil when charprop.el is
+	successfully loaded, or when we are going to dump, whichever
+	happens last.  (Bug#22975)
 
-	* doc/lispref/symbols.texi (Symbol Plists): Document
-	'function-put'.  Update documentation of 'function-get'.
+2016-06-19  Eli Zaretskii  
 
-2016-01-16  Eli Zaretskii  
+	Fix documentation of seq.el functions
 
-	Document 'funcall-interactively'
+	* doc/lispref/sequences.texi (Sequence Functions): Fix typos.  Add
+	cross-references.  Fix formatting.  (Bug#22992)
 
-	* doc/lispref/commands.texi (Interactive Call): Document
-	'funcall-interactively'.
-	* doc/lispref/functions.texi (Calling Functions): Mention
-	'funcall-interactively' and provide a cross-reference.
+2016-06-19  Dmitry Gutov  
 
-2016-01-16  Eli Zaretskii  
+	Support Ruby 2.3.0's safe navigation operator
 
-	* doc/lispref/lists.texi (Association Lists): Document 'alist-get'.
+	* lisp/progmodes/ruby-mode.el (ruby-smie--forward-token)
+	(ruby-smie--backward-token): Tokenize '&.' as '.'.
+	(ruby-smie--implicit-semi-p): Check for possible '&' before '.'.
 
-	* doc/lispref/strings.texi (Text Comparison): Document 'string-greaterp'.
+	* test/indent/ruby.rb: Add an example using safe navigation
+	operator.  Fix a syntax error in existing example.
 
-2016-01-16  Eli Zaretskii  
+2016-06-19  John Wiegley  
 
-	Document renaming of selection-related functions
+	Update Emacs manual section related to character folding
 
-	* doc/lispref/frames.texi (Window System Selections): Rename "x-*"
-	functions into the corresponding "gui-*" functions.  Make the
-	description slightly less X-centric.
+	* search.texi: Character folding is not on by default.
 
-2016-01-16  Eli Zaretskii  
+2016-06-19  Eli Zaretskii  
 
-	* doc/lispref/macros.texi (Expansion): Document 'macroexpand-1'.
+	Update admin/notes/unicode
 
-2016-01-16  Eli Zaretskii  
+	* admin/notes/unicode: Update the list of files from the UCD we
+	are using.  Mention the possible need to change 'ucs-names' when
+	importing a new version of the Unicode Standard.
 
-	Document 'define-inline'
+2016-06-19  Dmitry Gutov  
 
-	* doc/lispref/functions.texi (Defining Functions): Document
-	'define-inline' and related macros.
+	Add symref-filepattern entries for c?perl-mode
 
-	* lisp/emacs-lisp/inline.el (inline-letevals): Doc fix.
+	* lisp/cedet/semantic/symref/grep.el
+	(semantic-symref-filepattern-alist): Add entries for perl-mode and
+	cperl-mode.
 
-2016-01-16  Artur Malabarba  
+2016-06-19  Ken Raeburn  
 
-	* lisp/files.el (dir-locals--all-files): Respect absolute file-names
+	Don't use XRANDR 1.3 extensions if the server doesn't support them.
 
-	* lisp/help-fns.el (describe-variable): Fix a left-over parenthesis
+	* src/xterm.h (struct x_display_info): Add fields to save XRANDR
+	version number.
+	* src/xfns.c (x_get_monitor_attributes): Save the version numbers
+	after querying the X server.
+	(x_get_monitor_attributes_xrandr): Don't use XRRGetOutputPrimary or
+	XRRGetScreenResourcesCurrent if the server doesn't support at least
+	RANDR version 1.3.  Conditionalize the code blocks on compiling
+	against library version 1.3 or better, rather than feature tests for
+	each function.
+	* configure.ac: Stop testing for those two functions.
 
-2016-01-16  Artur Malabarba  
+2016-06-19  Paul Eggert  
 
-	* lisp/dired-x.el (dired-omit-here-always): Use add-dir-local-variable
+	Sync with gnulib
 
-	instead of manually writing a dir-locals file.
+	This incorporates:
+	2016-03-08 intprops: make .h file license match module
+	2016-03-08 acl: fix missing return on Cygwin
+	2016-03-05 extern-inline: port to PGI CC
+	* doc/misc/texinfo.tex, lib/intprops.h, lib/set-permissions.c:
+	* m4/extern-inline.m4:
+	Copy from gnulib.
 
-2016-01-16  Artur Malabarba  
+2016-06-19  Paul Eggert  
 
-	* lisp/files.el (dir-locals--all-files): Use completion instead of wildcards
+	Rework C source files to avoid ^(
 
-	(dir-locals-file)
-	* lisp/files-x.el (modify-dir-local-variable)
-	* lisp/dos-fns.el (dosified-file-name)
-	* lisp/help-fns.el (describe-variable): Change accordingly.
+	Work around Bug#22884 by rewording comments and strings to avoid ‘(’
+	at the start of a line unless it starts a function.  This change
+	is a short-term hack; in the longer run we plan to fix cc-mode’s
+	performance for C files that have ‘(’ at the start of a line in a
+	comment or string.
 
-2016-01-16  Jussi Lahdenniemi    (tiny change)
+2016-06-19  Eli Zaretskii  
 
-	Fix incompatbilities with MS-Windows 2000 and older
+	By default, etags produces unqualified Perl tag names
 
-	* src/w32.c : New global variable.
-	(filename_to_utf16, filename_from_ansi, check_windows_init_file):
-	Use it instead of the literal MB_ERR_INVALID_CHARS.
-	(maybe_load_unicows_dll): Initialize multiByteToWideCharFlags as
-	appropriate for the underlying OS version.  For details, see
-	http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00835.html.
-	* src/w32.h: Declare multiByteToWideCharFlags.
-	* src/w32fns.c (Fx_file_dialog, Fw32_shell_execute)
-	(add_tray_notification): Use multiByteToWideCharFlags instead of
-	the literal MB_ERR_INVALID_CHARS.
-	(_resetstkoflw_proc): New typedef.
-	(w32_reset_stack_overflow_guard): Call _resetstkoflw via a
-	pointer, as this function is absent in msvcrt.dll shipped with W2K
-	and older systems.
+	* lib-src/etags.c (Perl_functions): Produce unqualified names,
+	unless -Q was specified.
+	(print_help): Update the description of -Q.
 
-2016-01-16  Eli Zaretskii  
+	* doc/man/etags.1: Update the documentation of -Q.
 
-	Mention in PROBLEMS an issue with MS-Windows NT4
+	* test/etags/ETAGS.good_1:
+	* test/etags/ETAGS.good_2:
+	* test/etags/ETAGS.good_3:
+	* test/etags/ETAGS.good_4:
+	* test/etags/ETAGS.good_5:
+	* test/etags/CTAGS.good: Adapt the expected test results to the
+	changed Perl functionality.
 
-	* etc/PROBLEMS (MS-Windows): Mention the problem with Shell32.dll
-	on Windows NT4.  For the details, see
-	http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00835.html.
+2016-06-19  Dmitry Gutov  
 
-2016-01-16  Jussi Lahdenniemi    (tiny change)
+	Indent methods with keyword names correctly
 
-	Ensure 8-byte aligned memory allocation on MS-Windows 9X
+	* lisp/progmodes/ruby-mode.el (ruby-smie--at-dot-call):
+	Rename to ruby-smie--before-method-name.  Now also check if we're
+	after a 'def' keyword.  Update both callers.
 
-	* src/w32heap.c (init_heap): Redirect malloc, realloc, and free to
-	special functions on Windows 9X.  Refuse to dump Emacs on Windows 9X.
-	(malloc_after_dump_9x, realloc_after_dump_9x)
-	(free_after_dump_9x): New functions.  (Bug#22379)  See also
-	http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00852.html
-	for more details about the original problem.
+2016-06-19  Dmitry Gutov  
 
-	* nt/inc/ms-w32.h (malloc_after_dump_9x, realloc_after_dump_9x)
-	(free_after_dump_9x): Add prototypes.
+	Propertize character literals and special global variables differently
 
-2016-01-16  Eli Zaretskii  
+	* lisp/progmodes/ruby-mode.el (ruby-syntax-propertize): Propertize
+	character literals and global variables with special names with
+	prefix and symbol syntax classes, for SMIE to tokenize them
+	together automatically.
+	(ruby-font-lock-keywords): Fix an old regression in highlighting
+	character literals.
 
-	Fix tests for active region in hideif.el
+2016-06-19  John Wiegley  
 
-	* lisp/progmodes/hideif.el (hif-evaluate-macro, hide-ifdef-block): Use
-	'use-region-p' to test whether to operate on region, instead of
-	testing 'mark-active'.
+	Change how /etc/NEWS presents character folding
 
-2016-01-16  Eli Zaretskii  
+	* NEWS: Note that character folding is no longer the default.
 
-	Fix interactive specs in some hideif.el commands
+2016-06-19  John Wiegley  
 
-	* lisp/progmodes/hideif.el (hif-evaluate-macro)
-	(hide-ifdef-undef, show-ifdef-block): Don't use '(interactive "r")'
-	in commands that should only act on the region if it's active.
+	Revert "Revert "Backport: * lisp/isearch.el: Turn char-folding off by default""
 
-2016-01-15  Phillip Lord  
+	This reverts commit a91b4b51ddf2575d821adb8b84fdf32cff83886e.
 
-	Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
+2016-06-19  Andreas Schwab  
 
-2016-01-15  Phillip Lord  
+	Properly handle lambda as read function (bug 22961)
 
-	Enable test selector from command line
+	* src/lread.c (readchar): Be more strict about checking for
+	string in cons for read_vector.
+	(unreadchar): Likewise.
 
-	* test/automated/Makefile.in: Change variable manipulation to avoid
-	  over-writing selector.
+2016-06-19  Dmitry Gutov  
 
-2016-01-15  Alan Mackenzie  
+	Propertize operator symbol names with symbol syntax class
 
-	Don't confuse "::" with ":" when trying to parse member initializers.
+	* lisp/progmodes/ruby-mode.el (ruby-syntax-propertize):
+	Do it here.
+	(ruby-font-lock-keywords): Instead of handling them here.  Leave
+	highlighting them to the "normal" matcher, because now we can.
+	(ruby-smie--forward-token, ruby-smie--backward-token):
+	Likewise, don't special-case operator symbols anymore.
+	(ruby-smie--args-separator-p): Simplify the regexp, match operator
+	names with \s_.
+	(ruby-smie--implicit-semi-p): Handle the special cases of ? and =
+	at EOL the same way: check if the character has been assigned the
+	symbol syntax class by syntax-propertize.
 
-	* lisp/progmodes/cc-engine.el (c-back-over-member-initializers): Check
-	more robustly for ":" token when searching backwards for it.
+2016-06-19  Dmitry Gutov  
 
-	* lisp/progmodes/cc-langs.el (c-:$-multichar-token-regexp): New language
-	variable.
+	Stop recognizing :#{} as symbol in ruby-mode
 
-2016-01-15  Eli Zaretskii  
+	* lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Remove
+	the weird part that recognized colon followed by interpolation
+	construct without quotes (e.g. ':#{abc}') as symbol, which is just a
+	syntax error in any modern version of Ruby.  Fix nearby bug reference.
 
-	Ensure positive number of glyphs for margins of positive width
+2016-06-19  Dmitry Gutov  
 
-	* src/dispnew.c (margin_glyphs_to_reserve): Always return a
-	positive value when a non-zero width of the marginal area was
-	requested.  (Bug#22356)
+	Allow using the left shift operator without spaces on both sides
 
-2016-01-15  Eli Zaretskii  
+	* lisp/progmodes/ruby-mode.el (ruby-singleton-class-p): Rename to
+	ruby-verify-heredoc, reverse the meaning of the return value, and
+	short-circuit if preceded by a symbol not separated by whitespace.
 
-	Fix crashes when mini-window has non-zero margins
+	* test/automated/ruby-mode-tests.el (ruby-no-heredoc-left-shift)
+	(ruby-no-heredoc-class-self): New tests.
 
-	* src/window.c (resize_frame_windows): Use 'new_size' to set
-	minibuffer window's 'total_cols' value, as 'size' might be in
-	pixels.  (Bug#22356)
+2016-06-19  Andreas Schwab  
 
-2016-01-15  Alan Mackenzie  
+	Properly handle unquoting in wdired (bug 22938)
 
-	In comment-dwim with style `extra-line', respect indent-tabs-mode.
+	The recorded old names are not quoted, don't unquote them.
 
-	This fixes bug #22369.
+	* lisp/wdired.el (wdired-normalize-filename): Add argument
+	unquotep, only unquote if non-nil.
+	(wdired-get-filename): Don't unquote the old file name.
+	(wdired-get-previous-link): Always unquote.
 
-	* lisp/newcomment.el (comment-make-bol-ws): New function.
-	(comment-make-extra-lines): Use new function instead of a crude `make-string'.
+2016-06-19  Dmitry Gutov  
 
-2016-01-15  Eli Zaretskii  
+	Allow splat operator before percent literal
 
-	Make 'random' seeds cryptographically secure if possible
+	* lisp/progmodes/ruby-mode.el (ruby-syntax-propertize):
+	Allow splat operator before percent literal.
 
-	* configure.ac: Check for "/dev/urandom".
+2016-06-19  Dmitry Gutov  
 
-	* src/sysdep.c (init_random) [HAVE_DEV_URANDOM]: Read the stream
-	for the seed from "/dev/urandom".
-	[WINDOWSNT]: Obtain the stream for the seed from w32 APIs.
-	* src/fns.c (Frandom): Update the doc string to indicate that
-	system entropy is used when available.
-	* src/w32.c: Include wincrypt.h.
-	(w32_init_crypt_random, w32_init_random): New functions, use the
-	CryptGenRandom API.
-	(globals_of_w32): Initialize w32_crypto_hprov handle to zero.
-	* src/w32.h (w32_init_random): Add prototype.
+	Don't apply the return value of goto-char as syntax class
 
-	* doc/lispref/numbers.texi (Random Numbers): Document more details
-	about 't' as the argument to 'random'.
+	* lisp/progmodes/ruby-mode.el (ruby-syntax-propertize): Don't
+	apply the return value of goto-char as syntax class.
 
-	* etc/NEWS: Mention that '(random t)' now uses a cryptographically
-	strong seed if possible.
+2016-06-19  Dmitry Gutov  
 
-	(Bug#22202)
+	Guard against nested percent literals
 
-2016-01-15  Eli Zaretskii  
+	* lisp/progmodes/ruby-mode.el
+	(ruby-syntax-propertize-percent-literal):
+	Don't check the syntax status.
+	(ruby-syntax-propertize): Check it here.  And also guard against
+	being in a larger percent literal.
 
-	Unhide the --no-line-directive option to 'etags'
+	* test/automated/ruby-mode-tests.el
+	(ruby-no-nested-percent-literals): New test.
 
-	* lib-src/etags.c (print_help): Un-undocument the --no-line-directive
-	option.  (Bug#22306)
+2016-06-19  Dmitry Gutov  
 
-	* doc/man/etags.1: Document the --no-line-directive option.
+	Recognize iuwu-mod after an escaped newline
 
-2016-01-15  Alan J Third    (tiny change)
+	* lisp/progmodes/ruby-mode.el (ruby-smie--bosp): Check if the
+	newline is escaped.
+	(ruby-smie-rules): Indent iuwu-mod after an escaped newline
+	correctly.
 
-	Fix picture-mode wrt double-width characters
+2016-06-19  Andreas Schwab  
 
-	* lisp/textmodes/picture.el (picture-insert): Check the width of
-	the character being replaced, not just that of the replacement.
-	(Bug#1808)
+	Fix symbolic mode string conversion for s and t
 
-2016-01-15  Eric Abrahamsen  
+	* lisp/files.el (file-modes-char-to-right): Fix values for ?s and
+	?t.
+	(file-modes-symbolic-to-number): Default to a for ts permissions.
 
-	Honor docstring of gnus-group-get-new-news
+2016-06-19  Eli Zaretskii  
 
-	* lisp/gnus/gnus-start.el (gnus-get-unread-articles): If the prefix arg is t,
-	but non-numeric, unconditionally consider all groups to need updating.
+	Update 'ucs-names' database
 
-2016-01-14  Simen Heggestøyl  
+	* lisp/international/mule-cmds.el (ucs-names): Update used and
+	unused ranges from the latest UnicodeData.txt.
 
-	Disallow parenthesis in non-pseudo CSS selectors
+2016-06-19  Eli Zaretskii  
 
-	* lisp/textmodes/css-mode.el (css--font-lock-keywords): Disallow
-	parenthesis in selectors except for in the function notation that
-	might appear right after a pseudo-class.
-	* test/indent/scss-mode.scss: Add a test for it.
+	Improve doc string of 'shell-command'
 
-2016-01-14  Katsumi Yamaoka  
+	* lisp/simple.el (shell-command): Mention that COMMAND is prompted
+	for.  (Bug#22926)
 
-	* lisp/gnus/nntp.el (nntp-request-newgroups): Simplify
+2016-06-19  Eli Zaretskii  
 
-2016-01-14  Michael Albinus  
+	Make the code in movemail_strftime more general
 
-	check-maybe shall run only default tests
+	* lib-src/movemail.c (movemail_strftime): Transform the format
+	string passed by the caller instead of using a separate format
+	string.
 
-	* test/automated/Makefile.in (check, check-expensive): Depend on
-	mostlyclean.
-	(check-maybe): Re-run only default tests.
-	(check-doit): Use code of check-maybe.
-	(mostlyclean): Move *.log files away.
+2016-06-19  Eli Zaretskii  
 
-2016-01-14  Mark Oteiza  
+	Speed up redisplay of binary files with long series of nulls
 
-	* lisp/thingatpt.el (thing-at-point-uri-schemes): Add "magnet:"
+	* src/bidi.c (bidi_resolve_weak): Avoid entering a loop searching
+	for a character needed for resolving the type of a series of BN
+	and ET characters, as required by rule W5 of UAX#9, if the results
+	of the resolution are known in advance, because we are at level
+	zero, and the previous strong character was L.
+	(bidi_resolve_neutral): Partially resurrect the optimization for a
+	long series of control characters in an otherwise strictly L2R
+	text.
+	(bidi_level_of_next_char): Don't enter the loop that searches for
+	a paragraph separator if the current character is already at base
+	embedding level.  (Bug#22739)
 
-2016-01-14  Dmitry Gutov  
+2016-06-19  Dmitry Gutov  
 
-	Un-obsolete tags-loop-continue
+	Remove the highlighting support for quoting 'like this' inside Lisp docstrings
 
-	* lisp/progmodes/etags.el (tags-loop-continue): Un-obsolete.
-	http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00682.html
+	Remove the highlighting support for quoting 'like this' inside
+	Lisp docstrings.  This part of
+	c4151ebe15479de4c2e511b068cdf9af6a4576cf seems to have been
+	unintentional, considering substitute-command-keys gives wrong
+	output for such usage.
+	* lisp/emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-2)
+	(lisp-cl-font-lock-keywords-2): Do not highlight text between two
+	straight quotes as symbol.
 
-2016-01-13  Eli Zaretskii  
+2016-06-19  Paul Eggert  
 
-	Document obsoletion of 'intangible' and 'point-entered/left'
+	Restore leading space in movemail pop output
 
-	* doc/lispref/text.texi (Special Properties): Document the new
-	properties 'cursor-intangible' and 'cursor-sensor-functions'.
-	Document the obsolete status of 'intangible', 'pointer-left',
-	and 'point-entered' properties, and of 'inhibit-point-motion-hooks'.
-	* doc/lispref/display.texi (Overlay Properties): Document that
-	'intangible' overlay property is obsolete.
+	* lib-src/movemail.c (movemail_strftime) [WINDOWSNT]: New function.
+	(strftime) [WINDOWSNT]: New macro.
+	(mbx_delimit_begin): Go back to previous version of this code,
+	now that there’s a special-purpose WINDOWSNT implementation
+	that should do the right thing.  That way, the output continues
+	to use leading space rather than leading zero for day of month.
 
-	* lisp/emacs-lisp/cursor-sensor.el (cursor-sensor-mode): Doc fix.
+2016-06-19  Eli Zaretskii  
 
-2016-01-13  Eli Zaretskii  
+	Fix bidi-paragraph-direction in Rmail view buffer
 
-	Updater documentation of 'looking-back'
+	* lisp/mail/rmail.el (rmail-show-message-1): Reset
+	bidi-paragraph-direction to nil before formatting the message for
+	display.
 
-	* doc/lispref/searching.texi (Regexp Search): Update documentation
-	of 'looking-back'.  Fix markup.
+2016-06-19  Dmitry Gutov  
 
-2016-01-13  Eli Zaretskii  
+	Don't misindent computed property generator methods
 
-	Document 'pre-redisplay-functions'
+	* lisp/progmodes/js.el (js--looking-at-operator-p):
+	Don't misindent computed property generator methods
+	(https://github.com/mooz/js2-mode/issues/317).
 
-	* doc/lispref/hooks.texi (Standard Hooks):
-	* doc/lispref/display.texi (Forcing Redisplay): Document
-	'pre-redisplay-functions'.
+2016-06-19  Eli Zaretskii  
 
-2016-01-13  Eli Zaretskii  
+	Fix mbox files produced by movemail on MS-Windows
 
-	Document the new deafault value of 'load-read-function'
+	* lib-src/movemail.c (mbx_delimit_begin): Use portable strftime
+	format specifiers, as at least the MS-Windows version of strftime
+	doesn't support %e and %T.
 
-	* doc/lispref/loading.texi (How Programs Do Loading): Document the
-	change in the default value of 'load-read-function'.
+2016-06-19  Paul Eggert  
 
-2016-01-13  Eli Zaretskii  
+	doc string file descriptor exhaustion fix
 
-	Document 'bufferpos-to-filepos' and 'filepos-to-bufferpos'
+	* src/doc.c (get_doc_string): Move newly-added check to a better
+	location (Bug#22814).
 
-	* doc/lispref/nonascii.texi (Text Representations): Document
-	'bufferpos-to-filepos' and 'filepos-to-bufferpos'.
+2016-06-19  Michael Albinus  
 
-2016-01-13  Eli Zaretskii  
+	Fix Bug#22814
 
-	Document the new prefix-command hooks
+	* src/doc.c (get_doc_string): Raise an error in case too many
+	files are open.  (Bug#22814)
 
-	* doc/lispref/hooks.texi (Standard Hooks): Document
-	`prefix-command-echo-keystrokes-functions' and
-	`prefix-command-preserve-state-hook'.
+2016-06-19  Lars Ingebrigtsen  
 
-2016-01-13  Paul Eggert  
+	Fix insertion of edited servers in the dribble file
 
-	Fix one more misuse of time-stamp-time-zone
+	* lisp/gnus/gnus-srvr.el (gnus-server-update-server): Don't
+	insert explicit newlines, because they're quoted (bug#22903).
 
-	* test/etags/html-src/softwarelibero.html: Use "UTC0" rather
-	than the unportable "GMT" for time zone.
+	Backport:
 
-2016-01-13  Paul Eggert  
+	(cherry picked from commit ca4e30058eba0531f38fff75f14734acffab84ea)
 
-	Fix NNTP NEWGROUPS off-by-a-few-hours bug
+2016-06-19  Martin Rudalics  
 
-	* lisp/gnus/nntp.el (nntp-request-newgroups): Format string
-	in Universal Time, since we’re telling the server “GMT”.
+	Fix previous fix of enlarge-/shrink-window
 
-2016-01-13  Paul Eggert  
+	* lisp/window.el (enlarge-window, shrink-window): Consistently
+	signal user-error instead of error.  Resize minibuffer window by
+	delta lines instead of pixels.  When a window cannot be resized,
+	signal an error only when this function was invoked by a command
+	in the enlarge-/shrink-window group (this restores the behavior
+	before the fix of bug#22723 for the non-interactive case).
 
-	Update publicsuffix.txt from upstream
+2016-06-19  Artur Malabarba  
 
-	* etc/publicsuffix.txt: Update from
-	https://publicsuffix.org/list/effective_tld_names.dat
-	dated 2016-01-12 11:52:01 UTC.
+	* lisp/isearch.el (isearch-define-mode-toggle): Fix toggling logic
 
-2016-01-13  Glenn Morris  
+2016-06-19  Mark Oteiza  
 
-	Fix some declarations.
+	Complete temperature units in calc-convert-temperature
 
-	* lisp/descr-text.el (internal-char-font):
-	* lisp/cedet/mode-local.el (xref-item-location):
-	* lisp/gnus/mml-smime.el (epg-key-sub-key-list)
-	(epg-sub-key-capability, epg-sub-key-validity):
-	* lisp/international/mule-util.el (internal-char-font):
-	Fix declarations.
+	* lisp/calc/calc-units.el (calc-convert-temperature): Complete with
+	temperature units in math-standard-units.
 
-2016-01-13  Glenn Morris  
+2016-06-19  Dmitry Gutov  
 
-	Fix some custom types.
+	Make sure to use case-sensitive search
 
-	* lisp/gnus/gnus-fun.el (gnus-x-face-omit-files, gnus-face-omit-files):
-	* lisp/gnus/gnus.el (gnus-valid-select-methods):
-	* lisp/mail/rmail.el (rmail-get-coding-function):
-	* lisp/net/newst-treeview.el (newsticker-groups-filename):
-	* lisp/progmodes/hideif.el (hide-ifdef-exclude-define-regexp):
-	* lisp/textmodes/tildify.el (tildify-space-predicates):
-	* lisp/url/url-tramp.el (url-tramp-protocols):
-	Fix custom types.
+	* lisp/progmodes/xref.el (xref-collect-references): Make sure to
+	use case-sensitive search.
 
-2016-01-13  Glenn Morris  
+2016-06-19  Ulf Jasper  
 
-	Add some missing version tags.
+	Prevent infinite loop on not-well-formed xml. (Bug#16344)
 
-	* lisp/electric.el (electric-quote-comment)
-	(electric-quote-string, electric-quote-paragraph):
-	* lisp/epg-config.el (epg-gpgconf-program):
-	* lisp/rect.el (rectangle-preview):
-	* lisp/emacs-lisp/check-declare.el (check-declare-ext-errors):
-	* lisp/emacs-lisp/package.el (package-selected-packages)
-	(package-hidden-regexps):
-	* lisp/erc/erc.el (erc-network-hide-list, erc-channel-hide-list):
-	* lisp/eshell/em-term.el (eshell-destroy-buffer-when-process-dies):
-	* lisp/gnus/mml-sec.el (mml1991-signers, mml2015-signers)
-	(mml-smime-signers, mml1991-encrypt-to-self, mml2015-encrypt-to-self)
-	(mml-smime-encrypt-to-self, mml2015-sign-with-sender)
-	(mml-smime-sign-with-sender, mml2015-always-trust)
-	(mml-secure-fail-when-key-problem, mml-secure-key-preferences):
-	* lisp/net/browse-url.el (browse-url-conkeror-new-window-is-buffer)
-	(browse-url-conkeror-arguments):
-	* lisp/net/newst-reader.el (newsticker-download-logos):
-	* lisp/progmodes/gud.el (gud-guiler-command-name):
-	* lisp/progmodes/prog-mode.el (prettify-symbols-unprettify-at-point):
-	* lisp/progmodes/project.el (project-vc):
-	* lisp/progmodes/python.el (python-indent-guess-indent-offset-verbose)
-	(python-shell-remote-exec-path, python-shell-first-prompt-hook)
-	(python-shell-completion-native-disabled-interpreters)
-	(python-shell-completion-native-enable)
-	(python-shell-completion-native-output-timeout)
-	(python-shell-completion-native-try-output-timeout):
-	* lisp/progmodes/xref.el (xref):
-	* lisp/term/screen.el (xterm-screen-extra-capabilities):
-	* lisp/term/xterm.el (xterm-max-cut-length):
-	Add missing version tags.
+	* lisp/xml.el (xml-parse-tag-1): Prevent inifinite loop. (Bug#16344)
+	* test/automated/xml-parse-tests.el (xml-parse-tests--bad-data): Add
+	  test cases for Bug#16344.
 
-2016-01-13  Glenn Morris  
+2016-06-19  Alan Third  
 
-	* test/automated/core-elisp-tests.el
-	(core-elisp-tests-1-defvar-in-let): Add a custom type.
+	Add the missing test case for the previous patch
 
-2016-01-13  Glenn Morris  
+	lisp/dabbrev.el (dabbrev--substitute-expansion): Return EXPANSION after
+	any processing.
+	lisp/dabbrev.el (dabbrev-expand): Set EXPANSION to the return value of
+	DABBREV--SUBSTITUTE-EXPANSION.
+	test/automated/dabbrev-tests.el (dabbrev-expand-test): Test for bug#1948.
 
-	* src/buffer.c (syms_of_buffer) : Doc fix.
+2016-06-19  Alan Third  
 
-	Remove comments that do not apply since 2005-08-09.  (Bug#22349)
+	Use the correct dabbrev expansion
 
-2016-01-12  Paul Eggert  
+	lisp/dabbrev.el (dabbrev--substitute-expansion): Return EXPANSION after
+	any processing.
+	lisp/dabbrev.el (dabbrev-expand): Set EXPANSION to the return value of
+	DABBREV--SUBSTITUTE-EXPANSION.
+	test/automated/dabbrev-tests.el (dabbrev-expand-test): Test for bug#1948.
 
-	Merge from gnulib
+2016-06-19  Nicolas Petton  
 
-	This mostly just changes "UTC" to "UTC0" for POSIX conformance.
-	It also updates to the latest version of texinfo.tex.
-	* build-aux/gitlog-to-changelog, build-aux/move-if-change:
-	* build-aux/update-copyright, doc/misc/texinfo.tex:
-	Update from gnulib.
+	Bump version to 25.0.92
 
-2016-01-12  Eli Zaretskii  
+	* README:
+	* configure.ac:
+	* msdos/sed2v2.inp: Bump version to 25.0.92.
 
-	Update documentation of 'process-running-child-p'
+2016-06-19  Nicolas Petton  
 
-	* doc/lispref/processes.texi (Input to Processes): Document the
-	changes in return value of 'process-running-child-p'.
+	* etc/AUTHORS: Update the AUTHORS file
 
-2016-01-12  Eli Zaretskii  
+2016-06-19  Nicolas Petton  
 
-	Update documentation of 'deactivate-mark'.
+	authors.el updates
 
-	* doc/lispref/markers.texi (The Mark): Document that
-	'deactivate-mark' is now buffer-local when set.
+	* admin/authors.el (authors-ignored-files): Addition.
 
-2016-01-12  Eli Zaretskii  
+2016-06-19  Michael Albinus  
+2016-03-04  Michael Albinus  
 
-	Update documentation of 'completion-table-dynamic'
+	Fix Bug#22859
 
-	* doc/lispref/minibuf.texi (Programmed Completion): Document the
-	new optional argument to 'completion-table-dynamic'.
+	* lisp/filenotify.el (file-notify-callback): Return a `deleted'
+	event in case of kqueue and file1 is nil.  (Bug#22859)
 
-2016-01-12  Eli Zaretskii  
+2016-03-04  Eli Zaretskii  
 
-	Document changes in 'read-buffer' and 'read-buffer-function'
+	Fix reordering of bidi text in an isolate inside an override
 
-	* doc/lispref/minibuf.texi (High-Level Completion): Document the
-	4th argument to 'read-buffer' and 'read-buffer-function'.
+	* src/bidi.c (bidi_resolve_explicit): Override the orig_type value
+	of FSI with either LRI or RLI, as determined by the first strong
+	directional character in the isolate.  This prevents failure to
+	isolate when the FSI...PDI text is inside a directional override.
+	(Bug#22786)
 
-2016-01-12  Paul Eggert  
+2016-03-04  Alan Mackenzie  
 
-	Fix time-stamp-time-zone bugs introduced in July
+	Document c-guess-basic-syntax in the CC Mode manual.
 
-	This fixes a bug introduced when the July changes to
-	format-time-string installed, as the changes were not
-	correctly handled in this module (Bug#22302).
-	Also, document time stamp time zones.
-	* lisp/time-stamp.el (time-stamp-time-zone): Document values better.
-	(time-stamp--format): New private function.
-	(time-stamp-string, time-stamp-string-preprocess)
-	(time-stamp-do-number): Use it.
-	* doc/emacs/files.texi (Time Stamps): Mention time zones.
-	* doc/misc/autotype.texi (Timestamps): Document time-stamp-time-zone.
+	* doc/misc/cc-mode.texi (Syntactic Analysis): Document the function, adding
+	pxrefs to Custom Line-Up and Other Indentation.
+	(Custom Line-Up): Add a note on using c-guess-basic-syntax with a pxref to
+	Syntactic Analysis.
 
-2016-01-12  Eli Zaretskii  
+2016-03-04  Michael Albinus  
 
-	Make piping to subprocesses more robust on MS-Windows
+	Fix targets in test/automated/Makefile.in
 
-	* src/w32.c (sys_write): Don't write to a pipe more stuff than its
-	buffer can hold.  Don't return -1 if something has been written to
-	the pipe.  Zero out 'errno' before calling '_write', to avoid
-	returning a stale value.  (Bug#22344)
-	* src/w32proc.c (syms_of_ntproc) : New variable.
-	* src/w32.c (pipe2): Use it to request a user-defined size for the
-	pipe being created.
+	* test/automated/Makefile.in: Use $(SELECTOR_DEFAULT) also for
+	empty target and target all.
 
-	* etc/NEWS: Mention 'w32-pipe-buffer-size'.
+2016-03-04  Leo Liu  
 
-	* doc/emacs/msdos.texi (Windows Processes): Document
-	'w32-pipe-buffer-size'.
+	Comment on last change to define-derived-mode
 
-2016-01-11  Dmitry Gutov  
+	* lisp/emacs-lisp/derived.el (define-derived-mode): Add comment.
 
-	test/automated/vc-hg.el: Support out-of-tree build
+2016-03-04  Lars Ingebrigtsen  
 
-	* test/automated/vc-hg.el
-	(vc-hg-annotate-extract-revision-at-line-with-filename)
-	(vc-hg-annotate-extract-revision-at-line-with-both):
-	Don't refer to source-directory.
-	http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00755.html
+	Allow binding `url-mime-accept-string'
 
-2016-01-11  Michael Albinus  
+	* lisp/url/url-http.el (url-http): Allow binding
+	`url-mime-accept-string' (bug#22855).
 
-	Minor change in tramp-tests.el
+	Backport:
 
-	* test/automated/tramp-tests.el (tramp-test29-vc-registered):
-	Use `dired-uncache' instead of a Tramp internal function.
+	(cherry picked from commit 144bb0cf322b9756d29def3e27a42303e2edce43)
 
-2016-01-11  Peter Feigl  
+2016-03-04  Lars Ingebrigtsen  
 
-	* etc/HELLO: Add Armenian and Mongolian greetings.
+	Also allow setting the paragraph direction to nil
 
-	(Bug#22346)
+	* lisp/net/eww.el (eww-toggle-paragraph-direction): Also allow
+	setting the paragraph direction to nil ("auto").
 
-2016-01-11  Alan Mackenzie  
+2016-03-04  Anders Lindgren  
 
-	Java Mode: Fontify identifiers in the presence of annotations.
+	Made the new OS X visible bell more visible.
 
-	* lisp/progmodes/cc-engine.el (c-forward-annotation): Tidy up the coding:
-	Don't move point when the defun fails.
-	(c-forward-decl-or-cast-1): Correct a usage of match data.
+	* src/nsterm.m: (EmacsBell:init:) Scaled up the visible bell
+	  "caution" image five times, as the image in its original size
+	  was hard to see.
 
-	* lisp/progmodes/cc-fonts.el (c-font-lock-maybe-decl-faces): Remove.
-	(c-font-lock-declarations): Use the new c-maybe-decl-faces in place of the
-	removed variable.
+2016-03-04  Lars Ingebrigtsen  
 
-	* lisp/progmodes/cc-langs.el (c-maybe-decl-faces): New language variable.
+	Use the correct background color when filling nested 
 
-2016-01-11  Eli Zaretskii  
+	* lisp/net/shr.el (shr-face-background): Return the first
+	background, because that's the one that's visible (bug#22680).
 
-	Avoid an infloop when we run out of memory
+	Backport:
 
-	* src/alloc.c (garbage_collect_1): Don't bother saving and
-	restoring the echo-area message if we are GC'ing after running out
-	of memory.  This avoids an infloop due to repeated attempts to
-	allocate memory for the cons cell needed to save the message,
-	which signals the memory-full error, which attempts to save the
-	echo-area message, which signals memory-full again, etc.
+	(cherry picked from commit cad0bc70558f9c28c808711c5295dec9fc5ad6e5)
 
-2016-01-11  Eli Zaretskii  
+2016-03-04  Lars Ingebrigtsen  
 
-	Avoid unnecessary failures of auto-saving after fatal error
+	Make 
             in 
          •  not insert extra newlines
 
-	* src/w32.c (map_w32_filename): Avoid non-trivial system calls for
-	the benefit of FAT volumes if we are called as part of shutting
-	down due to a fatal error, which probably means we are trying to
-	auto-save the session.
-	* src/lread.c (check_obarray): Don't bother making the obarray
-	valid if we are shutting down due to a fatal error.  This avoids
-	interfering with auto-saving the crashed session.
+	* lisp/net/shr.el (shr-tag-div): Make 
             in 
          •  not insert
+	extra newlines (bug#19587).
 
-2016-01-11  Paul Eggert  
+	Backport:
 
-	Simplify HAVE_MODULES use in mark_maybe_pointer
+	(cherry picked from commit 379a846b8548dc32a9019ef0a37c02f62cd9bad1)
 
-	* src/alloc.c (HAVE_MODULES): Now a constant 0 if not defined,
-	so that later code can use 'if' rather than '#ifdef'.
-	(mark_maybe_pointer): Simplify based on HAVE_MODULES now
-	always working.
+2016-03-04  Dmitry Gutov  
 
-2016-01-11  Paul Eggert  
+	Uncomment the next-error-function integration in xref
 
-	Revert attempt to use 'noexcept' in typedef
+	* lisp/progmodes/xref.el (xref--xref-buffer-mode):
+	Uncomment the next-error-function integration
+	(http://debbugs.gnu.org/cgi/bugreport.cgi?bug=20489#110).
 
-	This use of 'noexcept' runs afoul of the C++11 standard.
-	Problem reported by Philipp Stephani in:
-	http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00706.html
-	* src/emacs-module.c (emacs_finalizer_function):
-	Move this typedef here ...
-	* src/emacs-module.h: ... from here, and use only the C
-	version of the typedef.  The typedef is now private since it
-	is never used in the .h file now and anyway it seemed to be
-	causing more confusion than it cured.
-	(make_user_ptr, get_user_finalizer, set_user_finalizer):
-	Open-code the type instead.
+2016-03-04  Dmitry Gutov  
 
-2016-01-10  Eli Zaretskii  
+	Remove the word "valid", to avoid ambiguity
 
-	Update documentation of 'indirect-function'
+	* doc/emacs/maintaining.texi (Identifier Search)
+	(Looking Up Identifiers): Remove the word "valid" (bug#22692).
 
-	* doc/lispref/eval.texi (Function Indirection): Update the
-	documentation of 'indirect-function'.
+2016-03-04  Michael Albinus  
 
-2016-01-10  Eli Zaretskii  
+	Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
 
-	Update documentation for obsoleting 'syntax-begin-function'
+2016-03-04  Michael Albinus  
 
-	* doc/lispref/syntax.texi (Position Parse): Undocument
-	'syntax-begin-function' that is now obsolete.
+	Set auto-revert-use-notify to nil in global-auto-revert-mode.  (Bug#22814)
 
-2016-01-10  Eli Zaretskii  
+	* etc/NEWS:
+	* etc/PROBLEMS: Mention this.
 
-	Document new features if Eshell
+	* lisp/autorevert.el (global-auto-revert-mode): Set
+	`auto-revert-use-notify' to nil.  (Bug#22814)
 
-	* doc/misc/eshell.texi (Input/Output): Document the new
-	'#' syntax.
-	(Input/Output): Document 'eshell-destroy-buffer-when-process-dies'.
-	Disable "Key Index" generation, as there are no @kindex entries in
-	this manual.
+2016-03-04  Paul Eggert  
 
-2016-01-10  Michael Albinus  
+	* etc/TODO: Minor quoting and grammar fixes.
 
-	Handle too long commands in Tramp
+2016-03-04  Friedrich Beckmann    (tiny change)
 
-	* lisp/net/tramp-sh.el (tramp-sh-handle-make-symbolic-link)
-	(tramp-do-file-attributes-with-ls): Send sequence of commands, in
-	order to not exceed shell command line limit.
+	Fix ModelSim error parsing
 
-	* test/automated/tramp-tests.el (tramp--test-darwin-p): Remove.
-	(tramp--test-utf8): Include Arabic file name, again.
+	* lisp/progmodes/vhdl-mode.el (vhdl-compiler-alist): Fix
+	ModelSim error parsing (bug#5768).
 
-2016-01-10  Paul Eggert  
+2016-03-04  Lars Ingebrigtsen  
 
-	* .gitattributes: *.cur and *.pif are binary files too.
+	Make parse-time-string-chars faster
 
-2016-01-10  Stefan Monnier  
+	* lisp/calendar/parse-time.el (parse-time-string-chars): Clean
+	up the code (backport:).
 
-	* src/alloc.c (mark_maybe_pointer): HAVE_MODULES may be undefined
+2016-03-04  Lars Ingebrigtsen  
 
-2016-01-10  Stefan Monnier  
+	Add a eww command to toggle paragraph direction
 
-	* lisp/progmodes/sh-script.el (sh-smie-sh-rules): Improve indentation inside $(...)
+	* lisp/net/eww.el (eww-toggle-paragraph-direction): New
+	command and keystroke.
 
-	* lisp/progmodes/sh-script.el (sh-smie-sh-rules): Improve indentation
-	within $(...).
-	* test/indent/shell.sh: Add corresponding test.
+	* doc/misc/eww.texi (Advanced): Mention the `D' command.
 
-2016-01-10  Stefan Monnier  
+2016-03-04  Glenn Morris  
 
-	* src/alloc.c (mark_maybe_pointer): Also check wide-int's emacs_value
+	* nextstep/WISHLIST: Merge into etc/TODO and remove.
 
-	(mark_memory): Simplify loop.  Don't assume a pointer-sized word can be
-	cast to Lisp_Object.
+	* etc/TODO: Merge in items from nextstep/WISHLIST.
+	* nextstep/README: Update for this change.
 
-2016-01-10  Dmitry Gutov  
+2016-03-04  Andreas Schwab  
 
-	Use short date for 'hg annotate', and output the author
+	Fix char signedness issue in bidi code
 
-	* lisp/vc/vc-hg.el (vc-hg-annotate-command):
-	Change '-d' to '-dq'.  (Bug#21805)
-	(vc-hg-annotate-switches): Default to "-u" "--follow".
-	(vc-hg-annotate-re): Update to recognize the short date format
-	and the optional username.
-	(vc-hg-annotate-time)
-	(vc-hg-annotate-extract-revision-at-line): Update accordingly.
+	* src/dispextern.h (struct bidi_t): Change type of resolved_level
+	and isolate_level to signed char.  (Bug#22830)
 
-	* test/automated/vc-hg.el: New file.
+2016-03-04  Andreas Schwab  
 
-2016-01-10  Paul Eggert  
+	* lib-src/pop.c (socket_connection): Fix format string.
 
-	Spelling fix
+2016-03-04  Eli Zaretskii  
 
-2016-01-09  Eli Zaretskii  
+	Avoid inflooping in thing-at-point-looking-at
 
-	Document user-level functions in project.el
+	* lisp/thingatpt.el (thing-at-point-looking-at): Avoid inflooping
+	with regular expressions whose matching doesn't move point.
+	(Bug#22756)
+	Describe the argument DISTANCE in the doc string.
 
-	* lisp/progmodes/project.el (project-find-file)
-	(project-or-external-find-file): Add doc strings.
+2016-03-04  Leo Liu  
 
-2016-01-09  Eli Zaretskii  
+	* lisp/emacs-lisp/derived.el (define-derived-mode): Revert indent change.
 
-	Document the user-level features of the Xref package
+2016-03-04  Michael Albinus  
 
-	* doc/emacs/maintaining.texi (Maintaining): Add a list of
-	described features.
-	(Xref): New section, made out of thoroughly rewritten "Tags"
-	section.
-	(Find Identifiers, Looking Up Identifiers, Xref Commands)
-	(Identifier Search, List Identifiers): New subsections,
-	incorporating the old tags commands and the new xref commands.
-	(Tags Tables, Tag Syntax, Create Tags Table, Etags Regexps):
-	Section and subsections demoted to a lower level.
-	* doc/emacs/search.texi (Search):
-	* doc/emacs/windows.texi (Pop Up Window):
-	* doc/emacs/frames.texi (Creating Frames):
-	* doc/emacs/programs.texi (Imenu, Symbol Completion):
-	* doc/emacs/building.texi (Grep Searching):
-	* doc/emacs/dired.texi (Operating on Files):
-	* doc/emacs/glossary.texi (Glossary): All references to tags changed.
+	etc/PROBLEMS: Mention problems with using file descriptors
 
-2016-01-09  Stefan Monnier  
+	* etc/PROBLEMS: Mention problems with using file descriptors
+	of kqueue file notification library.
 
-	* doc/lispref/loading.texi: Add `define-type' entry for load-history
+2016-03-04  Kaushal Modi  
 
-	* doc/lispref/loading.texi (Where Defined): Remove incorrect
-	cl-defmethod description, and add missing define-type entry.
+	* lisp/apropos.el (apropos-variable): Doc fix.  (Bug#22813).
 
-2016-01-09  Eli Zaretskii  
+2016-03-04  Eli Zaretskii  
 
-	Improve doc strings and prompts in xref.el
+	Remove unneeded workaround in xftfont.c
 
-	* lisp/progmodes/xref.el (xref-backend-functions)
-	(xref-find-definitions): Doc fixes.
-	(xref-query-replace): Doc fix.  Improve prompts for arguments.
+	* src/xftfont.c (xftfont_open): Remove "dirty workaround" for
+	XftTextExtents8 behavior, as it is no longer needed.  Suggested by
+	Fangwen Yu .  (Bug#22383)
 
-2016-01-09  Alan Mackenzie  
+2016-03-04  Stefan Monnier  
 
-	Allow the use of `font-lock-extend-region-multiline' in CC Mode.
+	* lisp/saveplace.el (save-place-local-mode): New minor mode
 
-	* lisp/progmodes/cc-mode.el (c-font-lock-init): Remove
-	`font-lock-extend-regions-wholelines' from
-	`font-lock-extend-region-functions' rather than setting the latter to
-	nil.
+	(toggle-save-place): Define as obsolete alias.
+	(save-place--setup-hooks): New function.
+	(save-place-mode): Use it.
 
-2016-01-09  Michael Albinus  
+2016-03-04  Eli Zaretskii  
 
-	Fix coding system for Tramp on OS X.
+	Fix redisplay on a TTY after 'make-frame'
 
-	* lisp/net/tramp-compat.el: Require ucs-normalize.
+	* src/xdisp.c (clear_garbaged_frames): Don't clear/redraw a
+	garbaged TTY frame if it is not the selected frame.  (Bug#22794)
 
-	* lisp/net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
-	Set coding system to `utf-8-hfs' for Mac OS X.
+2016-03-04  Alan Mackenzie  
 
-	* test/automated/tramp-tests.el (tramp-test29-vc-registered):
-	Flush directory properties when needed.
-	(tramp--test-utf8): Include Chinese file name, again.
+	Make double-click-1 work with unbalanced parens in CC Mode.  Fixes bug#5560.
 
-2016-01-09  Eli Zaretskii  
+	* lisp/mouse.el (mouse-start-end): check the syntax of alleged parens with
+	`syntax-after' to ensure syntax-table text properties are respected.
 
-	Update 'load-history' docs
+2016-03-04  Magnus Henoch  
 
-	* doc/lispref/loading.texi (Where Defined): Update the list of
-	forms in 'load-history' by adding the forms created for the
-	'cl-generic' generics.  (Bug#21422)
+	Input method polish-slash should not use keyboard translation
 
-2016-01-09  Paul Eggert  
+	* lisp/leim/quail/latin-pre.el ("polish-slash"): Input method
+	polish-slash should not use keyboard translation (bug#19081).
 
-	Fix (error ...) error
+2016-03-04  Chris Feng  
 
-	Problem reported by Glenn Morris in:
-	http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00561.html
-	* lisp/vc/add-log.el (change-log-goto-source): Fix typos
-	introduced in my Aug 28 change, where I got confused by the
-	two meanings of (error ...).
+	Fix an assertion
 
-2016-01-08  Alan Mackenzie  
+	* src/dispnew.c (clear_glyph_matrix_rows): Test matrix->nrows == 0 (which
+	implies start == 0) separately.
 
-	Correctly analyze brace arguments in templated C++ function declarations.
+2016-03-04  Eli Zaretskii  
 
-	* lisp/progmodes/cc-defs.el (c-go-list-forward, c-go-list-backward): add
-	POS and LIMIT parameters, like the other c-go-list-* functions have.
+	Fix 'toggle-save-place'
 
-	* lisp/progmodes/cc-engine.el (c-restore-<>-properties): Check backwards
-	for a ?\( rather than a ?<.  (c-looking-at-inexpr-block): Handle names
-	followed by template specifiers.
+	* lisp/saveplace.el (toggle-save-place): Set up hooks necessary to
+	support save-place in the buffer.  Autoload the command.
 
-2016-01-08  Glenn Morris  
+2016-03-04  Stefan Monnier  
 
-	* lisp/cedet/mode-local.el (describe-function-orig-buffer): Declare.
+	* src/keyboard.c: Don't inadvertently set immediate_echo (bug#22581)
 
-	* lisp/ffap.el (ffap-latex-mode): Avoid free variable.
+	* src/keyboard.c (read_key_sequence): Don't inadvertently set
+	immediate_echo when we don't want any echo-keystrokes.
+	(echo_keystrokes_p): Move earlier.
 
-2016-01-08  Mark Oteiza  
+2016-03-04  Chris Zheng    (tiny change)
 
-	* lisp/play/dunnet.el (dun-fix-screen): Avoid `end-of-buffer`.
+	Minor fixes in calculator.el
 
-2016-01-08  Alan Mackenzie  
+	* lisp/calculator.el (calculator-mode-map): Bind `E' for
+	`calculator-exp'.
+	(calculator-last-input): Fix a bug with pressing F1.
+	(Bug#20764)
 
-	Respect fontification region calculated by major mode.  Fixes bug #22316.
+2016-03-04  Anders Lindgren  
 
-	* lisp/font-lock.el (font-lock-extend-jit-lock-region-after-change): when a
-	fontification region has been calculated by a function on
-	font-lock-extend-after-change-region-function use this region rather than
-	changing the end position to somewhere else.
+	Update HISTORY section in readme for the NextStep interface.
 
-2016-01-08  Eli Zaretskii  
+	* nextstep/README: Update HISTORY after suggestion
+	from former maintainer Adrian Robert.
 
-	Improve documentation of Delete Selection mode
+2016-03-04  Eli Zaretskii  
 
-	* lisp/delsel.el (delete-selection-mode)
-	(delete-selection-helper): Update and expand the doc strings.
-	(Bug#22296)
+	Improve documentation of 'save-place-mode'
 
-	* doc/emacs/mark.texi (Using Region): Document the behavior of
-	delete commands in Delete Selection mode.  (Bug#22296)
+	* lisp/saveplace.el (toggle-save-place): Update the doc string wrt
+	turning on 'save-place-mode' globally.
 
-	* doc/lispref/markers.texi (The Mark): Document how to add the
-	support for Delete Selection mode to Lisp programs. (Bug#22296)
+	* etc/NEWS: Mention the need to call 'save-place-mode' for turning
+	on the mode in all buffers.
 
-2016-01-08  Dmitry Gutov  
+2016-03-04  Chris Feng    (tiny change)
 
-	Fix two project-find-file issues
+	Allocate glyph matrices for the initial frame
 
-	* lisp/progmodes/project.el (project--value-in-dir):
-	Temporarily set enable-local-variables to :all.
-	(project-find-file, project-or-external-find-file):
-	All autoloads.
-	(project--find-file-in): Require xref.
+	* src/frame.c (make_initial_frame): Allocate glyph matrices (Bug#22787).
 
-2016-01-08  Eli Zaretskii  
+	* src/dispnew.c (clear_glyph_matrix_rows): matrix->nrows can be 0.
 
-	Clarify doc string of 'dired-current-directory'
+2016-03-04  Lars Ingebrigtsen  
 
-	* lisp/dired.el (dired-current-directory): Doc fix: clarify that
-	the return value might not end in a slash when called with the
-	optional argument non-nil.  (Bug#6273)
+	Fix white space in last checkin
 
-2016-01-08  Eli Zaretskii  
+2016-03-04  Dima Kogan  
 
-	Use the face of preceding text for displaying the ellipsis
+	Make `insert-pair' always leave the cursor where documented
 
-	* src/xdisp.c (setup_for_ellipsis): Use the face of the preceding
-	text in it->saved_face_id for displaying the ellipsis, and ignore
-	the face, if any, of the invisible text.  (Bug#22320)
+	* lisp/emacs-lisp/lisp.el (insert-pair): The docstring of
+	insert-pair states that after insertion, the point ends up
+	after the opening character. This was not true if the pair was
+	inserted to surround a region (bug#16949).
 
-2016-01-08  Michael Albinus  
+2016-03-04  Kaushal Modi  
 
-	Suppress Chinese file name test for OSX in tramp-tests.el
+	etc/NEWS: Mention the new second parameter to `package-install'
 
-	* test/automated/tramp-tests.el (tramp--test-utf8):
-	Remove instrumentation.  Suppress Chinese file name test for OSX.
+	* etc/NEWS: Mention the new second parameter to
+	`package-install' (bug#22784).
 
-2016-01-08  Glenn Morris  
+2016-03-04  John F. Trudeau    (tiny change)
 
-	* admin/admin.el (set-version): Also handle the NEWS file.
+	Highlight assignments in Makefiles more correctly
 
-2016-01-08  Dmitry Gutov  
+	* lisp/progmodes/make-mode.el (makefile-macroassign-regex):
+	Highlight assignments preceded by a TAB character correctly
+	(bug#20787).
 
-	apropos-library: Skip obvious duplicates; don't error on generics
 
-	* lisp/apropos.el (apropos-library): Skip "was an autoload"
-	entries, to avoid obvious duplicates.  For each cl-defmethod
-	entry, take just its function symbol (bug#21422).
+	Backport:
 
-2016-01-07  Dmitry Gutov  
+	(cherry picked from commit bbd86c5642bd62c43d72391669f28eaa14459fd5)
 
-	Add project-find-file and project-or-external-find-file
+2016-03-04  Eli Zaretskii  
 
-	* lisp/minibuffer.el (completion-category-defaults):
-	Add `project-file' category.
+	Improve documentation of focus-related hooks
 
-	* lisp/progmodes/project.el (project-find-file)
-	(project-or-external-find-file): New commands.
-	(project--find-file-in): New private function.
+	* doc/lispref/commands.texi (Focus Events): Mention focus-related
+	hooks.  (Bug#21728)
 
-	* lisp/progmodes/xref.el (xref-collect-matches): Use
-	`expand-file-name' on DIR, to expand the tildes.
-	(xref--find-ignores-arguments): Extract from
-	`xref--rgrep-command'.
+2016-03-04  Eli Zaretskii  
 
-2016-01-07  Leo Liu  
+	Further improve doc string of 'disable-point-adjustment'
 
-	Add defvar-local to lisp-imenu-generic-expression
+	* src/keyboard.c (syms_of_keyboard): 
+	: Clarify doc strings.  (Bug#22771)
 
-	* lisp/emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression): Add
-	  defvar-local.
+2016-03-04  Michael Albinus  
 
-2016-01-07  Leo Liu  
+	Further adaptions in file-notify-tests.el for w32notify
 
-	Revert commit b1e3d14845517bfa9fa5d6d3840f3ab3160306fd
+	* test/automated/file-notify-tests.el
+	(file-notify--test-read-event-timeout, file-notify--test-timeout):
+	Decrease values.
+	(file-notify-test03-autorevert)
+	(file-notify-test04-file-validity)
+	(file-notify-test05-dir-validity): Run tests also for w32notify.
+	(file-notify-test08-watched-file-in-watched-dir):
+	Adapt expected events for w32notify.
 
-	* lisp/emacs-lisp/easy-mmode.el (define-minor-mode):
-	  Don't declare (indent 1).
+2016-03-04  Jan Tatarik  
 
-2016-01-07  Glenn Morris  
+	Don't bug out on localised dates in gnus-icalendar
 
-	* lisp/emacs-lisp/autoload.el (autoload-find-destination): Doc fix.
+	* lisp/gnus/gnus-icalendar.el
+	(gnus-icalendar-event:org-timestamp): Don't bug out on
+	localised dates.
 
-2016-01-07  Glenn Morris  
+2016-03-04  Drew Adams  
 
-	* lisp/emacs-lisp/autoload.el (autoload-find-destination):
+	(ls-lisp-insert-directory): Make -B work
 
-	Avoid specifying the length of a time object (it has not been "2"
-	for some time).
+	* lisp/ls-lisp.el (ls-lisp-insert-directory): Make -B work
+	(bug#20776).
 
-2016-01-06  Andreas Schwab  
+	Backport:
 
-	Properly encode/decode base64Binary data in SOAP
+	(cherry picked from commit ef52e66efd78aac4c4e5bd5e11870e5ba3b37a1e)
 
-		* lisp/net/soap-client.el (soap-encode-xs-basic-type): Encode
-		base64Binary value as utf-8.
-		(soap-decode-xs-basic-type): Decode base64Binary value as utf-8.
+2016-03-04  Vaidheeswaran C  
 
-2016-01-06  Eli Zaretskii  
+	Make buttons in header lines work
 
-	Obey coding-system-for-write when writing stdout/stderr in batch
+	* lisp/help-mode.el (help-button-action): `help-xref-button' in
+	header line doesn't work (bug#21024).
 
-	* src/print.c (printchar_to_stream):
-	* src/xdisp.c (message_to_stderr): If coding-system-for-write has
-	a non-nil value, use it to encode output in preference to
-	locale-coding-system.  See the discussions in
-	http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00048.html
-	for the details.
+	Backport:
 
-	* doc/lispref/os.texi (Terminal Output): Document how to send
-	non-ASCII text via 'send-string-to-terminal'.
-	(Batch Mode): Document how text written to standard streams is
-	encoded.  Fix inaccuracy regarding which output streams are used
-	by output functions in batch mode.
+	(cherry picked from commit c11e565a6b6d09fa39d4c3ef65bef08190eaecc1)
 
-2016-01-06  Xue Fuqiao  
+2016-03-04  Christopher Wellons  
 
-	* doc/misc/efaq.texi (Packages that do not come with Emacs):
-	Update the URI of MELPA and marmalade-repo.  Reported by CHENG Gao
-	 in
-	https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00390.html.
+	Make setf for frame-height/width work again
 
-2016-01-06  Maksim Golubev    (tiny change)
+	* lisp/emacs-lisp/cl-lib.el (frame-height): Make setf for
+	frame-height/width work again (bug#21979).
 
-	* lisp/progmodes/opascal.el (opascal-mode-syntax-table):
+2016-03-04  Łukasz Stelmach  
 
-	Fix backslash.  (Bug#22224)
+	Encode header strings before printing
 
-2016-01-06  Federico Beffa    (tiny change)
+	* lisp/ps-print.el (ps-generate-header-line): Encode the
+	header strings to avoid problems with non-ASCII headers
+	(bug#22611).
 
-	* lisp/progmodes/xscheme.el (xscheme-prompt-for-expression-exit):
+	Backport:
 
-	Make it actually work.  (Bug#22265)
+	(cherry picked from commit 3cedbdcc71ebefc12bd20ec84f74251fe99ee7d0)
 
-2016-01-05  Alan Mackenzie  
+2016-03-04  Nicolas Richard  
 
-	Remove function wrongly on AWK Mode value of context fontification hook.
+	(cl-union): Do not ignore :test argument when lists are equal.
 
-	* lisp/progmodes/cc-langs.el (c-before-context-fontification-functions):
-	swap order of entries so that awk's entry isn't superseded by the default.
+	* lisp/emacs-lisp/cl-seq.el (cl-union): Do not ignore :test argument when lists are equal.
 
-	* lisp/progmodes/cc-mode.el (c-before-context-fl-expand-region): Correct
-	to handle nil value of c-before-context-fontification-functions.
+	* test/automated/cl-seq-tests.el: New file (bug#22729).
 
-2016-01-05  Paul Eggert  
+2016-03-04  Lars Ingebrigtsen  
 
-	* src/buffer.c: Stick with ASCII in doc string.
+	Add `isearch' to `basic-faces'
 
-2016-01-05  Paul Eggert  
+	* doc/lispref/display.texi (Basic Faces): Mention the isearch
+	and lazy-highlight faces.
 
-	Reword transient-mark-mode doc string
+	* lisp/replace.el (match): Add `isearch' to the `basic-faces'
+	group, too (bug#22760).
 
-	* src/buffer.c (syms_of_buffer): Reword doc string to avoid confusion.
-	The value 'lambda (literally) can be interpreted as (quote lambda),
-	which is not intended here; we want just the lambda symbol.
+2016-03-04  Dmitry Gutov  
 
-2016-01-05  Eli Zaretskii  
+	Make $, : and @ "prefix characters" in ruby-mode
 
-	Update doc string of 'selective-display'
+	* lisp/progmodes/ruby-mode.el (ruby-mode-syntax-table): Change the
+	syntax classes of $, : and @ to "prefix character"
+	(http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00272.html).
+	(ruby-syntax-propertize): Undo that specifically for colons
+	followed by an opening paren or bracket.
+	(ruby-font-lock-keyword-beg-re): Include colon character.
+	(ruby-font-lock-keywords): Adjust the constants matcher for `:'
+	not being a symbol constituent anymore.
 
-	* src/buffer.c (syms_of_buffer) : Say that
-	using it with the value of 't' is obsolete.  (Bug#1092)
+2016-03-04  Dmitry Gutov  
 
-2016-01-05  Alan Mackenzie  
+	Make find-tag-default-bounds more strict
 
-	Make C++ buffers writeable when writing their initial text properties.
+	* lisp/subr.el (find-tag-default-bounds): Delegate to
+	bounds-of-thing-at-point (bug#22692).
 
-	This is a correction to yesterday's CC Mode patch.
+2016-03-04  Michael Albinus  
 
-	* lisp/progmodes/cc-engine.el (c-before-change-check-<>-operators): Put
-	c-save-buffer-state around the function rather than a mere `let'.
+	Minor fixes in filenotify.el
 
-2016-01-05  Michael Albinus  
+	* lisp/filenotify.el (top): Require 'cl-lib.
+	(file-notify--rm-descriptor)
+	(file-notify--event-watched-file): Use cl-caadr.
+	(file-notify-callback): Handle also `ignore' events from inotify.
 
-	Additional changes for "make check-expensive"
+2016-03-04  Michael Albinus  
 
-	* CONTRIBUTE : Encourage use of ":tags '(:expensive-test)".
-	Explain make target `check-expensive'.
+	Additional fixes for file notification
 
-	* etc/NEWS: Mention new make target `check-expensive'.
+	* lisp/filenotify.el (top): Require 'cl when compiling.
+	(file-notify--event-watched-file): New defun.
+	(file-notify--rm-descriptor, file-notify-callback):
+	Handle case of several monitors running in parallel.
 
-	* test/automated/Makefile.in (check-doit): New target.
-	(check, check-expensive): Use it.
+	* test/automated/file-notify-tests.el
+	(file-notify--test-event-test): Simplify test.
+	(file-notify--test-with-events): Get rid of outer definition.
+	Check also results of tests performed in callbacks.
+	(file-notify-test02-events): No wrapping when calling
+	`file-notify-rm-watch'.  No special checking for callback tests.
+	(file-notify-test07-backup): Adapt expected events for gfilenotify.
+	(file-notify-test08-watched-file-in-watched-dir): Improve.
 
-2016-01-04  Alan Mackenzie  
+2016-03-04  Eli Zaretskii  
 
-	Apply text properties for <, > in new after-change function (C++ Java Modes).
+	Fix documentation of 'global-disable-point-adjustment'
 
-	These are category/syntax-table properties to give < and > paren syntax.
-	Also apply certain `c-type' text properties to the insides of <..> constructs
-	to ensure that identifiers contained by them get fontified.  This patch fixes
-	bug #681.
+	* src/keyboard.c (syms_of_keyboard) 
+	: Doc fixes.  (Bug#22771)
 
-	* lisp/progmodes/cc-cmds.el (c-electric-lt-gt): Reformulate due to new
-	after-change action.
+2016-03-04  Daiki Ueno  
 
-	* lisp/progmodes/cc-engine.el (c-before-change-check-<>-operators): Expand
-	change region to include s which might not be already marked as
-	parens, rather than just when paren text properties are removed.
-	(c-restore-<>-properties): New after-change function, which applies text
-	properties marking < and > with paren syntax.
+	Set file modes of pinentry socket for extra safety
 
-	* lisp/progmodes/cc-fonts.el (c-font-lock-declarations): Ensure `c-type'
-	properties are applied to the interiors of <...> constructs, to ensure
-	fontification of identifiers there.
+	* lisp/net/pinentry.el: Require 'cl-lib for `cl-letf'.
+	(pinentry-start): Change the file modes of the socket file to 0700.
+	This is just for extra safety since the parent directory is already
+	protected with `server-ensure-safe-dir'.
 
-	* lisp/progmodes/cc-langs.el (c-before-font-lock-functions): Add
-	c-restore-<>-properties to this list for C++ and Java.
+2016-03-04  Daiki Ueno  
 
-	* lisp/progmodes/cc-mode.el (c-common-init): When invoking
-	c-before-font-lock-functions, exclude c-restore-<>-properties from the
-	functions invoked.
-	(c-before-change): Initialize c-new-BEG/END here (rather than c-after-change)
-	to allow modification by before-change functions.
-	(c-after-change): Amend c-new-END here, rather than initializing it and
-	c-new-BEG.
+	Clarify GnuPG version compatibility chapter
 
-2016-01-04  Michael Albinus  
+	* doc/misc/epa.texi (GnuPG version compatibility): Make the gpg-agent
+	description a bit clearer.
 
-	Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
+2016-03-04  Daiki Ueno  
 
-2016-01-04  Michael Albinus  
+	Revert "Change the default socket location for pinentry"
 
-	Introduce check-expensive tests.
+	This reverts commit e34fbdee8aca84b98393b06b2450837d175999ca.
+	It turned out that the address is fixed in Pinentry itself.
 
-	* Makefile.in (check-expensive):
-	* test/automated/Makefile.in (check-expensive): New target.
+2016-03-04  Dmitry Gutov  
 
-	* test/automated/auto-revert-tests.el
-	(auto-revert-test01-auto-revert-several-files):
-	* test/automated/file-notify-tests.el (file-notify--deftest-remote):
-	* test/automated/tramp-tests.el (tramp-test26-process-file)
-	(tramp-test27-start-file-process, tramp-test28-shell-command)
-	(tramp-test29-vc-registered)
-	(tramp-test31-special-characters-with-stat)
-	(tramp-test31-special-characters-with-perl)
-	(tramp-test31-special-characters-with-ls)
-	(tramp-test32-utf8-with-stat, tramp-test32-utf8-with-perl)
-	(tramp-test32-utf8-with-ls, tramp-test33-asynchronous-requests)
-	(tramp-test35-unload): Tag the tests as :expensive-test.
+	Kill off xref--display-history
 
-2016-01-04  Lars Magne Ingebrigtsen  
+	Now that the core workflow keeps the xref window visible, there's
+	less value in storing this history.  And it never was
+	comprehensive enough to undo scrolling changes.
+	* lisp/progmodes/xref.el (xref--display-history)
+	(xref--save-to-history, xref-quit): Remove.
+	(xref--show-pos-in-buf): Update accordingly.
+	(xref--xref-buffer-mode-map): Remove xref-quit binding.
 
-	shr-tag-video bug fix
+2016-03-04  Dmitry Gutov  
 
-	* shr.el (shr-tag-video): Protect against the `poster' being
-	empty.
+	Keep the xref buffer visible until the user quits it explicitly
 
-2016-01-04  Michael Albinus  
+	* lisp/progmodes/xref.el (xref--pop-to-location):
+	Rename WINDOW argument to ACTION.
+	(xref--with-dedicated-window): New macro.
+	(xref--show-pos-in-buf): Rename from `xref--display-position'.
+	Add and handle new argument, SELECTED.  Use the above macro.
+	(xref--show-location): Add SELECTED argument.
+	(xref-show-location-at-point): Make an effort to avoid the
+	original window when showing the location.
+	(xref-goto-xref): Don't quit the xref window (bug#20487 and
+	http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01133.html).
+	(xref--query-replace-1): Use xref--with-dedicated-window as well.
+	(xref--next-error-function): Call xref--show-location instead of
+	xref--pop-to-location.
+	(xref--show-xrefs): Rename WINDOW argument to DISPLAY-ACTION.
+	Only pass that value to xref--pop-to-location.  Pass the current
+	selected window to xref-show-xrefs-function as the `window'
+	property.
+	(xref--find-xrefs, xref--find-definitions): Rename WINDOW argument
+	to DISPLAY-ACTION as well.
 
-	Minor fixes in tramp-tests.el
+2016-03-04  Daiki Ueno  
 
-	* test/automated/tramp-tests.el (tramp-test26-process-file):
-	Move point properly.
-	(tramp-test29-vc-registered): Work with relative file names.
+	Change the default socket location for pinentry
 
-2016-01-04  Eli Zaretskii  
+	* lisp/net/pinentry.el: Require 'cl-lib for `cl-letf'.
+	(pinentry--socket-dir): Change the default from /tmp/emacsXXX to
+	~/.emacs.d/pinentry.
+	(pinentry-start): Change the file modes of the socket file to 0700.
+	This is just for extra safety since the parent directory is already
+	protected with `server-ensure-safe-dir'.
 
-	Ensure redisplay when 'truncate-lines' is set
+2016-03-04  Daiki Ueno  
 
-	* lisp/frame.el (redisplay--variables): Add 'truncate-lines'.
-	(Bug#22303)
+	Mention how to enable pinentry feature
 
-2016-01-04  Eli Zaretskii  
+	* etc/NEWS: Mention "gpgconf --reload gpg-agent".
+	* lisp/net/pinentry.el: Likewise.
 
-	Fix a doc string of 'transient-mark-mode'
+2016-03-04  Paul Eggert  
 
-	* src/buffer.c (syms_of_buffer) : Prevent
-	"lambda" in doc string from becoming a link to lambda expressions.
+	Sync with gnulib
 
-2016-01-04  Eli Zaretskii  
+	This incorporates:
+	2016-02-10 stdalign: port to older HP and IBM cc
+	* doc/misc/texinfo.tex, lib/stdalign.in.h: Copy from gnulib.
 
-	MS-Windows followup to latest gnulib update
+2016-03-04  David Engster  
 
-	* nt/gnulib.mk (EXTRA_DIST): Add ignore-value.h.
+	Remove `semanticdb-save-all-db-idle' from `auto-save-hook'
 
-2016-01-04  Paul Eggert  
+	* lisp/cedet/semantic/db-mode.el (semanticdb-hooks): Do not put
+	  `semanticdb-save-all-db-idle' into `auto-save-hook'. The latter is
+	  not an idle hook, so it's not appropriate to call it there. It will
+	  already be called in the `semantic-idle-work-core-handler', which
+	  runs when Emacs is actually idle.
 
-	Spelling fix
+2016-03-04  David Engster  
 
-2016-01-04  Jens Lechtenboerger  
+	Restore point when writing semantic table to disk
 
-	Do secure signed Bcc handling
+	* lisp/cedet/semantic/db-file.el (object-write): Wrap call to
+	  `semantic-fetch-tags' in `save-excursion', since it might move point
+	  in current buffer. (Bug #22287)
 
-	* lisp/gnus/message.el (message-send): Do secure signed Bcc handling
-	(bug#18718).
+2016-03-04  Daiki Ueno  
 
-2016-01-04  Paul Eggert  
+	Mention pinentry.el in epa manual
 
-	Avoid stdio in SIGINT handler
+	* doc/misc/epa.texi (GnuPG version compatibility): New chapter,
+	describing the differences between three GnuPG branches, and how
+	to enable pinentry.el.
+	(Caching Passphrases): Add xref to the compatibility chapter.
 
-	* admin/merge-gnulib (GNULIB_MODULES): Add ignore-value.
-	* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
-	* lib/ignore-value.h: New file, from gnulib.
-	* src/keyboard.c: Include it.
-	(write_stdout, read_stdin): New functions.
-	(handle_interrupt): Use them instead of printf and getchar,
-	and avoid fflush when handling signals.
+2016-03-04  Michael Albinus  
 
-2016-01-04  Paul Eggert  
+	Fix Bug#22736
 
-	* doc/misc/texinfo.tex: Revert unwanted copyright change.
+	* lisp/filenotify.el (file-notify-callback): Use the proper
+	descriptor when calling the callback.  (Bug#22736)
 
-2016-01-03  Artur Malabarba  
+	* test/automated/file-notify-tests.el
+	(file-notify--test-event-handler): Deactivate trace.
+	(file-notify-test08-watched-file-in-watched-dir): Bind
+	`file-notify--test-tmpfile' temporarily in `dir-callback'.
 
-	* lisp/align.el (align): Simplify a lambda
+2016-03-04  Wieland Hoffmann    (tiny change)
 
-	* lisp/align.el (align): Fix arg order in call to `align-region'
+	Grammar fix in doc string
 
-2016-01-03  Eli Zaretskii  
+	* lisp/custom.el (defgroup): Grammar fix in doc string.
 
-	Fix compilation next-error in buffers with selective-display
+2016-03-04  Daiki Ueno  
 
-	* lisp/progmodes/compile.el (compilation-beginning-of-line): New
-	function.
-	(compilation-internal-error-properties)
-	(compilation-next-error-function, compilation-set-window): Use
-	it.  (Bug#1092)
+	Naming fix for consistency
 
-2016-01-03  Lars Magne Ingebrigtsen  
+	* lisp/epg-config.el (epg-find-configuration): Rename from
+	`epg-configuration-find' to be consistent with other epg-* functions.
+	Change all callers.
 
-	* lisp/net/nsm.el (nsm-check-protocol): Fix typo in the message.
+2016-03-04  Daiki Ueno  
 
-2016-01-03  Lars Magne Ingebrigtsen  
+	Prefer customized value for GnuPG executable
 
-	Add SHA1 warnings for high network security settings
+	* lisp/epg-config.el (epg-configuration-find): Don't check GPG
+	configuration if it is already set with custom.  (Bug#22747)
 
-	* lisp/net/nsm.el (nsm-check-protocol): When using high security, warn
-	about SHA1 certificates, which are now believed to be open to
-	spoofing.
+2016-03-04  Eli Zaretskii  
 
-2016-01-03  Jens Lechtenboerger  
+	Fix memory reservation on MS-Windows
 
-	Refactor mml-smime.el, mml1991.el, mml2015.el
+	* src/w32heap.c (mmap_alloc): Reserve memory in 64KB granular
+	units.  This avoids leaving gaps in reserved memory regions that
+	no one can use, since memory reservation must produce 64KB-aligned
+	addresses.  (Bug#22526)
 
-	(Maybe this is the last merge from Gnus git to Emacs git)
+2016-03-04  Anders Lindgren  
 
-	Cf. discussion on ding mailing list, messages in
-	.
-	Common code from the three files mml-smime.el, mml1991.el, and
-	mml2015.el is moved to mml-sec.el.  Auxiliary functions are added
-	to gnus-util.el.
+	Update NextStep readme and add wish list.
 
-	The code is supported by test cases with necessary test keys.
+	* nextstep/README: Rewritten from scratch. New sections on
+	"History", "Overview of Cocoa and Objective-C", "Guidelines",
+	"Tracing Support", and "GNUStep". Expanded the "See Also" section.
+	* nextstep/WISHLIST: New file containing list of issues and ideas
+	associated with the NS port of Emacs.
 
-	Documentation in message.texi is updated.
+2016-03-04  Michael Albinus  
 
-	* doc/misc/message.texi (Security, Using S/MIME):
-	Update for refactoring mml-smime.el, mml1991.el, mml2015.el.
-	(Using OpenPGP): Rename from "Using PGP/MIME"; update contents.
-	(Passphrase caching, Encrypt-to-self, Bcc Warning): New sections.
+	Report also result in `file-notify--test-event-handler'
 
-	* lisp/gnus/gnus-util.el (gnus-test-list, gnus-subsetp, gnus-setdiff):
-	New functions.
+2016-03-04  Michael Albinus  
 
-	* lisp/gnus/mml-sec.el: Require gnus-util and epg.
-	(epa--select-keys): Autoload.
-	(mml-signencrypt-style-alist, mml-secure-cache-passphrase): Doc fix.
-	(mml-secure-openpgp-signers): New user option;
-	make mml1991-signers and mml2015-signers obsolete aliases to it.
-	(mml-secure-smime-signers): New user option;
-	make mml-smime-signers an obsolete alias to it.
-	(mml-secure-openpgp-encrypt-to-self): New user option;
-	make mml1991-encrypt-to-self and mml2015-encrypt-to-self obsolete
-	aliases to it.
-	(mml-secure-smime-encrypt-to-self): New user option;
-	make mml-smime-encrypt-to-self an obsolete alias to it.
-	(mml-secure-openpgp-sign-with-sender): New user option;
-	make mml2015-sign-with-sender an obsolete alias to it.
-	(mml-secure-smime-sign-with-sender): New user option;
-	make mml-smime-sign-with-sender an obsolete alias to it.
-	(mml-secure-openpgp-always-trust): New user option;
-	make mml2015-always-trust an obsolete alias to it.
-	(mml-secure-fail-when-key-problem, mml-secure-key-preferences):
-	New user options.
-	(mml-secure-cust-usage-lookup, mml-secure-cust-fpr-lookup)
-	(mml-secure-cust-record-keys, mml-secure-cust-remove-keys)
-	(mml-secure-add-secret-key-id, mml-secure-clear-secret-key-id-list)
-	(mml-secure-cache-passphrase-p, mml-secure-cache-expiry-interval)
-	(mml-secure-passphrase-callback, mml-secure-check-user-id)
-	(mml-secure-secret-key-exists-p, mml-secure-check-sub-key)
-	(mml-secure-find-usable-keys, mml-secure-select-preferred-keys)
-	(mml-secure-fingerprint, mml-secure-filter-keys)
-	(mml-secure-normalize-cust-name, mml-secure-select-keys)
-	(mml-secure-select-keys-1, mml-secure-signer-names, mml-secure-signers)
-	(mml-secure-self-recipients, mml-secure-recipients)
-	(mml-secure-epg-encrypt, mml-secure-epg-sign): New functions.
+	Improve file-notify-test08-watched-file-in-watched-dir
 
-	* lisp/gnus/mml-smime.el: Require epg;
-	refactor declaration and autoloading of epg functions.
-	(mml-smime-use): Doc fix.
-	(mml-smime-cache-passphrase, mml-smime-passphrase-cache-expiry):
-	Obsolete.
-	(mml-smime-get-dns-cert, mml-smime-get-ldap-cert):
-	Use format instead of gnus-format-message.
-	(mml-smime-epg-secret-key-id-list): Remove variable.
-	(mml-smime-epg-passphrase-callback, mml-smime-epg-find-usable-key)
-	(mml-smime-epg-find-usable-secret-key): Remove functions.
-	(mml-smime-epg-sign, mml-smime-epg-encrypt): Refactor.
+	* test/automated/file-notify-tests.el (file-notify--test-desc2):
+	New variable.
+	(file-notify--test-cleanup): Use it.
+	(file-notify--test-event-handler): Enable trace.
+	(file-notify-test08-watched-file-in-watched-dir): Tag it as
+	:expensive-test.  Rewrite callbacks to use
+	`file-notify--test-event-handler'.  Read events in loop.  Check
+	`file-notify--test-results'.
+	(file-notify-test08-watched-file-in-watched-dir): Fix docstring.
 
-	* lisp/gnus/mml1991.el (mml1991-cache-passphrase)
-	(mml1991-passphrase-cache-expiry): Obsolete.
-	(mml1991-epg-secret-key-id-list): Remove variable.
-	(mml1991-epg-passphrase-callback, mml1991-epg-find-usable-key)
-	(mml1991-epg-find-usable-secret-key): Remove functions.
-	(mml1991-epg-sign, mml1991-epg-encrypt): Refactor.
+2016-03-04  Stephen Berman  
 
-	* lisp/gnus/mml2015.el (mml2015-cache-passphrase)
-	(mml2015-passphrase-cache-expiry): Obsolete.
-	(mml2015-epg-secret-key-id-list): Remove variable.
-	(mml2015-epg-passphrase-callback, mml2015-epg-check-user-id)
-	(mml2015-epg-check-sub-key, mml2015-epg-find-usable-key)
-	(mml2015-epg-find-usable-secret-key): Remove functions.
-	(mml2015-epg-decrypt, mml2015-epg-clear-decrypt, mml2015-epg-sign)
-	(mml2015-epg-encrypt): Refactor.
+	Fix todo-mode item date editing bugs
 
-2016-01-02  Glenn Morris  
+	* lisp/calendar/todo-mode.el (todo-edit-item--header): Prevent out of
+	range error by making sure the value of the numerical month date
+	component cannot be nil.  Prevent wrong type error on trying to edit
+	day number in February by making sure numerical instead of string
+	value of the year component is passed to todo-read-date.
+	(todo-read-date): When using the numerical month date component make
+	sure to use `*' for an arbitrary month instead of its numerical value.
 
-	* lisp/progmodes/fortran.el (fortran-make-syntax-propertize-function):
+2016-03-04  Eli Zaretskii  
 
-	Explicitly ignore case.  (Bug#22262)
+	Fix "[:upper:]" for non-ASCII characters
 
-2016-01-02  Stefan Monnier  
+	* src/regex.c (re_match_2_internal): Support [:upper:] and
+	[:lower:] for non-ASCII characters.  (Bug#18150)
 
-	(semantic-symref-derive-find-filepatterns): Return a list
+2016-03-04  Lars Ingebrigtsen  
 
-	* lisp/cedet/semantic/symref/grep.el
-	(semantic-symref-derive-find-filepatterns): Return a list.
-	(semantic-symref-perform-search): Quote the result here once and for all.
+	Allow customising the article mode cursor behavior
 
-2016-01-02  Eli Zaretskii  
+	* doc/misc/gnus.texi (HTML): Mention gnus-article-show-cursor.
 
-	Fix xref-find-references on MS-Windows
+	* lisp/gnus/gnus-art.el (gnus-article-show-cursor): New variable.
+	(gnus-article-mode): Use it.
 
-	* lisp/cedet/semantic/symref/grep.el
-	(semantic-symref-derive-find-filepatterns): Use
-	'shell-quote-argument' instead of manually quoting in a way that
-	only works with Posix shells.  (Bug#22289)
+2016-03-04  Ari Roponen  
 
-2016-01-02  Eli Zaretskii  
+	Use pop-to-buffer-same-window in woman.el
 
-	Document new features of tildify-mode
+	* lisp/woman.el (woman-really-find-file): Work around going to
+	the wrong buffer by using `pop-to-buffer-same-window' (bug#22332).
+	(WoMan-find-buffer): Ditto.
 
-	* lisp/textmodes/tildify.el (tildify-foreach-ignore-environments)
-	(tildify-mode): Spelling fixes in doc strings.
+2016-03-04  Tassilo Horn  
 
-	* etc/NEWS: Reformat the tildify-mode entry.
+	New filenotify test for bug#22736
 
-2016-01-02  Eli Zaretskii  
+	* test/automated/file-notify-tests.el
+	(file-notify-test08-watched-file-in-watched-dir):
+	(file-notify--test-desc1): New filenotify test for bug#22736
 
-	Document new features of Whitespace mode
+2016-03-04  Marcin Borkowski  
 
-	* doc/emacs/display.texi (Useless Whitespace): Document
-	'whitespace-toggle-options' and the new 'big-indent' style.
-	Document 'whitespace-big-indent-regexp'.  Document the Global
-	Whitespace mode.
+	Report critical battery errors
 
-2016-01-02  Eli Zaretskii  
+	* lisp/battery.el (battery-pmset): Report critical battery
+	errors (bug#18157).
 
-	Improve documentation of new Hide-IfDef features
+2016-03-04  Kaushal Modi    (tiny change)
 
-	* etc/NEWS: Expand and reword Hide-IfDef section.
+	Make eww message toggling message clearer
 
-2016-01-02  Leo Liu  
+	* lisp/net/eww.el (eww-toggle-fonts): Make the message
+	clearer.
 
-	Fix regression in font-locking cl-assert and cl-check-type
+2016-03-04  Mark Oteiza  
 
-	* lisp/emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-2): Fix
-	  el-errs-re.
+	* lisp/calc/calc-units.el (math-standard-units): Update to 2014 CODATA adjustment.
 
-2016-01-01  Paul Eggert  
+2016-03-04  Martin Rudalics  
 
-	Spelling and grammar fixes
+	Fix bugs in window resizing code
 
-2016-01-01  Paul Eggert  
+	* lisp/window.el (adjust-window-trailing-edge): Fix mismatched
+	parenthesis.
+	(shrink-window, enlarge-window): Fix bug#22723 where windows
+	with preserved size would not get resized.  Also now signal an
+	error when the window cannot be shrunk or enlarged as requested.
 
-	Fix copyright years by hand
+2016-03-04  Eli Zaretskii  
 
-	These are dates that admin/update-copyright did not update, or
-	updated incorrectly.
+	Fix decoding DOS EOL in a unibyte buffer
 
-2016-01-01  Paul Eggert  
+	* src/coding.c (decode_eol): Loop over bytes, not characters.
+	(Bug#5251)
 
-	Update copyright year to 2016
+2016-03-04  Alan Mackenzie  
 
-	Run admin/update-copyright.
+	Correct c-parse-state cache manipulation error.
 
-2016-01-01  Paul Eggert  
+	* lisp/progmodes/cc-engine.el (c-invalidate-state-cache-1): Correct a
+	comparison bound.  Amend comments.
 
-	Merge from gnulib
+2016-03-04  Daiki Ueno  
 
-	This mostly just updates copyright dates of gnulib files.
-	It also updates to the latest version of texinfo.tex.
+	Take advantage of new GnuPG version check function
 
-2015-12-31  Mark Oteiza  
+	* lisp/emacs-lisp/package.el (epg-configuration-find): Declare.
+	(package-refresh-contents): Use `epg-configuration-find' to check if EPG
+	is usable.
 
-	lisp/emacs-lisp/chart.el (chart-new-buffer): Move to silence byte compiler.
+2016-03-04  Daiki Ueno  
 
-2015-12-31  Mark Oteiza  
+	Make GnuPG version check robuster
 
-	Port chart.el methods to cl-generic.
+	We changed the default gpg program to "gpg2" from "gpg" in the commit
+	f93d669a16bd3cb3f43f0c8cfd22fe18b627a6a1.  However, there are two
+	maintained branches (2.0 and 2.1) and Emacs doesn't work well with 2.0
+	series.  Check the actual version of "gpg2" at run time, and properly
+	divert to "gpg" if necessary.
+	* lisp/epg-config.el: Require 'cl-lib for `cl-destructuring-bind'.
+	(epg-config--program-alist): New variable.
+	(epg--configurations): New variable.
+	(epg-configuration-find): New function.
+	(epg-config--make-gpg-configuration): New function.
+	(epg-config--make-gpgsm-configuration): New function.
+	(epg-configuration): Mark as obsolete.
+	* lisp/epg.el (epg-context): Use `epg-configuration-find'.
 
-	cl-call-next-method cannot be used inside EIEIO's defmethod.
-	* lisp/emacs-lisp/chart.el: Require cl-generic at compile time.
-	* lisp/emacs-lisp/chart.el (initialize-instance, chart-draw):
-	(chart-draw-title, chart-size-in-dir, chart-draw-axis):
-	(chart-axis-draw, chart-translate-xpos, chart-translate-ypos):
-	(chart-translate-namezone, chart-draw-data, chart-add-sequence):
-	(chart-trim, chart-sort): Use cl-defmethod instead of defmethod.
+2016-03-04  Paul Eggert  
 
-2015-12-31  Brian Burns  
+	Fix x-load-color-file pointer signedness
 
-	Add nt/INSTALL.W64 build instructions
+	* src/xfaces.c (Fx_load_color_file) [!HAVE_X_WINDOWS]:
+	For sscanf and int *, use %d, not %u.
+	Problem found on Ubuntu 15.10 x32, which lacks X support.
 
-	* nt/INSTALL.W64: New file.
-	* nt/INSTALL: Point to INSTALL.W64 for 64-bit build instructions.
+2016-03-04  Paul Eggert  
 
-2015-12-31  Joakim Jalap  
+	* lisp/time-stamp.el (time-stamp-time-zone): Fix doc string punct.
 
-	Add new input method 'programmer-dvorak'
+2016-03-04  Mark Oteiza  
 
-	* lisp/leim/quail/programmer-dvorak.el ("programmer-dvorak"): New
-	input method.
+	Follow convention for greek letter constants.
 
-	* etc/NEWS: Mention it.
+	* lisp/calc/calc-units.el (math-standard-units):
+	Add "sigma" and alias σ to it.
 
-2015-12-31  Eli Zaretskii  
+2016-03-04  Mark Oteiza  
 
-	Allow to invoke original M-TAB binding in 'flyspell-prog-mode'
+	Add Stefan-Boltzmann constant to calc units table.
 
-	* lisp/textmodes/flyspell.el (flyspell-prog-mode): Record the
-	original M-TAB binding in a buffer-local variable.
-	(flyspell-auto-correct-word): Invoke the original binding of M-TAB
-	if that is recorded, when point is in a place where flyspell
-	should not be active (e.g., because the user turned on
-	'flyspell-prog-mode').  (Bug#18533)
+	* lisp/calc/calc-units.el (math-standard-units):
+	Add Stefan-Boltzmann constant.
 
-2015-12-31  Eli Zaretskii  
+2016-03-04  Mark Oteiza  
 
-	Fix EWW rendering of long RTL lines
+	* lisp/calc/calc-units.el (math-build-units-table-buffer): Use special-mode.
 
-	* lisp/net/shr.el (shr-insert-document): Undo any previous hscroll
-	of the selected window before filling its lines.  (Bug#22250)
+2016-03-04  Glenn Morris  
 
-2015-12-31  Vincent Belaïche  
+	Avoid loading cl-lib for term/xterm.elc, eg in -Q -nw.  (Bug#22669)
 
-	fix  bug#21054
+	* lisp/emacs-lisp/cl-generic.el (cl--generic-dispatchers):
+	Prefill with relevant elements for term/xterm.
 
-	* lisp/ses.el (ses-check-curcell): Call `ses-set-curcell' unconditionally
+2016-03-04  Tassilo Horn  
 
-2015-12-31  YAMAMOTO Mitsuharu  
+	Fix soffice UserInstallation-URL for Windows
 
-	Clean up cairo printing code
+	* lisp/doc-view.el (doc-view-odf->pdf-converter-soffice): Fix
+	UserInstallation-URL when calling soffice on Windows.
 
-	* src/gtkutil.c (xg_get_page_setup): Use listn.
-	* src/xfns.c (Fx_export_frames, Fx_print_frames_dialog): Doc fix.  Use
-	decode_window_system_frame and FRAME_VISIBLE_P.
-	(Fx_print_frames_dialog): Use redisplay_preserve_echo_area instead
-	of Fdisplay.
-	* src/xterm.c (x_cr_export_frames): Use redisplay_preserve_echo_area
-	instead of Fdisplay.  Temporarily unblock_input around QUIT.
+2016-03-04  Lars Ingebrigtsen  
 
-2015-12-31  YAMAMOTO Mitsuharu  
+	Fix display of 
             elements
 
-	Move variables to inner loop, preparing for Mac port merge
+	* lisp/net/eww.el (eww-display-html): Remove CRLF before
+	parsing so that 
             elements don't render with ^M at the end
+	of the lines.
 
-	* src/keyboard.c (command_loop_1): Move variables `cmd',
-	`keybuf', and `i' to inner loop.
+2016-03-04  Eli Zaretskii  
 
-2015-12-31  YAMAMOTO Mitsuharu  
+	Minor fixes in global-auto-composition-mode
 
-	Add handle_user_signal_hook
+	* lisp/emacs-lisp/easy-mmode.el (easy-mmode-pretty-mode-name):
+	Produce prettier names of globalized minor modes.
+	* lisp/composite.el (global-auto-composition-mode): Make it a
+	globalized mode.  (Bug#22682)
 
-	* src/keyboard.h (handle_user_signal_hook): New declaration.
-	* src/keyboard.c (handle_user_signal_hook): New variable.
-	(handle_user_signal): Call it.
+2016-03-04  Alan Mackenzie  
 
-2015-12-31  YAMAMOTO Mitsuharu  
+	Allow arithmetic operators inside C++ template constructs.
 
-	Avoid writing to purespace
+	Fixes debbugs #22486.  This corrects the previous patch with this message
+	which was empty.
 
-	* src/alloc.c (Fmake_string): Don't write to empty string contents.
-	(allocate_vector): Don't write to empty vector size.
-	* src/character.h (CHECK_CHARACTER_CAR, CHECK_CHARACTER_CDR):
-	Don't call unnecessary XSETCAR or XSETCDR.
-	* src/lisp.h (STRING_SET_UNIBYTE, STRING_SET_MULTIBYTE): Don't
-	write to empty string size_byte.
+	* lisp/progmodes/cc-langs.el (c-multichar->-op-not->>-regexp): New language
+	variable.
+	(c-<>-notable-chars-re): New language variable.
 
-2015-12-31  YAMAMOTO Mitsuharu  
+	* lisp/progmodes/cc-engine.el (c-forward-<>-arglist-recur): User
+	c-<>-notable-chars-re in place of the former fixed string in searching for
+	places to stop and examine.
+	Use c-multichar->-op-not->>-regexp to check that a found ">" is not part of a
+	multichar operator in place of the former c->-op-without->-cont-regexp.
+	Add code to skip forwards over a balanced parenthesized expression.
 
-	Remove unused variable
+2016-03-04  Eli Zaretskii  
 
-	* lisp/international/mule-cmds.el: Remove unused variable
-	`mac-system-coding-system'.
+	Avoid crashes in semi-malformed 'condition-case'
 
-2015-12-31  YAMAMOTO Mitsuharu  
+	* src/eval.c (internal_lisp_condition_case): Treat a handler
+	'(nil)' as if it were '(nil nil)'.  (Bug#22675)
 
-	* configure.ac: Find libxml2 headers in Xcode SDK dir on Darwin.
+2016-03-04  Alan Mackenzie  
 
-2015-12-31  YAMAMOTO Mitsuharu  
+	Allow arithmetic operators inside C++ template constructs.
 
-	Use posix_openpt instead of openpty on Darwin
+	Fixes debbugs #22486.
 
-	* configure.ac (PTY_ITERATION, FIRST_PTY_LETTER, PTY_OPEN)
-	(PTY_NAME_SPRINTF, PTY_TTY_NAME_SPRINTF): Remove
-	Darwin-specific definitions.  Use posix_openpt instead.
+	* lisp/progmodes/cc-langs.el (c-multichar->-op-not->>-regexp): New language
+	variable.
+	(c-<>-notable-chars-re): New language variable.
 
-2015-12-30  Shakthi Kannan  
+	* lisp/progmodes/cc-engine.el (c-forward-<>-arglist-recur): User
+	c-<>-notable-chars-re in place of the former fixed string in searching for
+	places to stop and examine.
+	Use c-multichar->-op-not->>-regexp to check that a found ">" is not part of a
+	multichar operator in place of the former c->-op-without->-cont-regexp.
+	Add code to skip forwards over a balanced parenthesized expression.
 
-	Document support for ':documentation' in Lisp mode
+2016-03-04  Eli Zaretskii  
 
-	* lisp/emacs-lisp/lisp-mode.el (lisp-string-in-doc-position-p)
-	(lisp-string-after-doc-keyword-p)
-	(lisp-font-lock-syntactic-face-function): Add doc strings.
+	Fix regression with 'recent-keys' and keyboard macros
 
-2015-12-30  Shakthi Kannan  
+	* src/keyboard.c (record_char): Don't record in 'recent_keys'
+	events that come from executing keyboard macros.  (Bug#22674)
 
-	Document new features of TeX mode
+2016-03-04  Eli Zaretskii  
 
-	* doc/emacs/text.texi (TeX Print): Document
-	'tex-print-file-extension'.
-	* doc/emacs/programs.texi (Misc for Programs): Document support
-	for Prettify Symbols mode in TeX mode.
+	Fix wording in a doc-view.el comment
 
-2015-12-30  Eli Zaretskii  
+	* lisp/doc-view.el (doc-view--current-cache-dir): Don't use
+	"illegal" for something that is not against the law.
 
-	Clarify docs of hscroll in RTL text
+2016-03-04  Paul Eggert  
 
-	* doc/lispref/windows.texi (Horizontal Scrolling): Clarify the
-	meaning of a window's horizontal scroll amount for RTL paragraphs.
+	CONTRIBUTE cleanups and updates
 
-2015-12-30  Eli Zaretskii  
+	* CONTRIBUTE: Mention URLs and info nodes more consistently,
+	avoiding possibly-confusing punctuation adjacent to a URL, and
+	giving full shell commands for 'info'.  Start with a brief but
+	complete how-to, for people who want to get started right away.
+	Then briefly discuss how to join the development process in the
+	typical order.  Omit needless words.  Update some of the
+	now-obsolete file names, info node names, and quoting styles.
+	Better document emacs-NN branches and how they are merged.
+	* admin/notes/git-workflow: Change emacs-24 to emacs-25,
+	and trunk to master.  This file still needs work.
 
-	Fix rendering of HTML pages that use character composition
+2016-03-04  Paul Eggert  
 
-	* src/indent.c (Fvertical_motion): Fix the case when point starts
-	in the middle of a composition, as in shr-vertical-motion.
-	(Bug#22250)
+	Port USE_STACK_LISP_OBJECTS fix to Clang
 
-2015-12-30  Eli Zaretskii  
+	* src/lisp.h (USE_STACK_LISP_OBJECTS): Default to false for Clang.
+	Recent versions of Clang claim to be GCC 4.2.1 but do not have
+	the GCC bug.
 
-	Avoid some compiler warnings in w32.c
+2016-03-04  Paul Eggert  
 
-	* src/w32.c (codepage_for_filenames, crlf_to_lf)
-	(ansi_encode_filename, socket_to_fd, sys_write)
-	(check_windows_init_file): Avoid compiler warnings about
-	differences in pointer signedness.
+	Port to x86 GCC 4.3.1 and earlier
 
-2015-12-30  Dmitry Gutov  
+	This tries to port to x86 FreeBSD 9, where Emacs dumps core (Bug#22065).
+	* src/lisp.h (USE_STACK_LISP_OBJECTS): Default to false
+	for GCC 4.3.1 and earlier.
 
-	Undo ill-advised change
+2016-03-04  Eli Zaretskii  
 
-	* lisp/progmodes/xref.el (xref-collect-matches): Undo
-	ill-advised change.  The hits come in the order that `find'
-	produces them in, which isn't alphabetical.
+	Fix point movement under 'scroll-conservatively'
 
-2015-12-30  Dmitry Gutov  
+	* src/xdisp.c (redisplay_window): Correct a typo in computing the
+	effective number of text lines in a window.  (Bug#22637)
 
-	Unbreak completion in python-mode buffers
+2016-03-04  Thomas Plass  
 
-	* lisp/progmodes/python.el (python-shell-completion-at-point):
-	Unbreak in python-mode buffers.
+	Replace colon in file name (not legal on Windows)
 
-2015-12-29  Eli Zaretskii  
+	* lisp/doc-view.el (doc-view--current-cache-dir): Replace colon in file
+	name (not legal on Windows). [tiny change]
 
-	Fix typos in CC Mode manual
+2016-03-04  Eli Zaretskii  
 
-	* doc/misc/cc-mode.texi (c-offsets-alist, Style Variables): Fix
-	typos.  (Bug#22267)
+	Fix a typo in edt.texi
 
-2015-12-29  Eli Zaretskii  
+	* doc/misc/edt.texi: Fix a typo in an email address.  Reported by
+	"Herbert J. Skuhra" .
 
-	Avoid assertion violations in compact_font_cache_entry
+2016-03-04  Eli Zaretskii  
 
-	* src/alloc.c (compact_font_cache_entry): Don't use VECTORP to
-	avoid assertion violation in ASIZE.  (Bug#22263)
-
-2015-12-29  Eli Zaretskii  
-
-	Fix filling text with bidirectional characters in shr.el
-
-	* lisp/net/shr.el (shr-insert-document): Bind
-	bidi-display-reordering to nil while filling lines.  This is
-	required for when a line includes characters whose bidi
-	directionality is opposite to the base paragraph direction,
-	because columns are counted in the logical order.  (Bug#22250)
+	Make 'mmap_realloc' on MS-Windows more reliable
 
-2015-12-29  Martin Rudalics  
+	* src/w32heap.c (mmap_alloc): If reserving memory succeeds, but
+	committing fails, return NULL.  Don't call GetLastError twice for
+	the same API error.
+	(mmap_realloc): Zero out MEMORY_BASIC_INFORMATION structures
+	before calling VirtualQuery, to avoid using garbled values if the
+	call fails.  If committing more pages from the same block fails,
+	fall back on mmap_alloc + CopyMemory.  Enhance debugging printouts
+	if the call to VirtualAlloc to commit more pages fails.
+	(Bug#22526)
 
-	* src/xfns.c (x_create_tip_frame): Process alpha parameter.
+2016-03-04  Oscar Fuentes  
 
-2015-12-29  Michael Albinus  
+	Grep alias `all' shall not match parent directory
 
-	Sync with Tramp 2.2.13
+	* lisp/progmodes/grep.el (grep-files-aliases): Don't match parent
+	  directory for `all'. Fixes bug#22577
 
-	* doc/misc/trampver.texi: Change version to "2.2.13.25.1".
+2016-03-04  Nicolas Petton  
 
-	* lisp/net/tramp-compat.el (tramp-compat-delete-dups):
-	Use `tramp-compat-funcall'.
+	Bump version to 25.0.91
 
-	* lisp/net/tramp-gvfs.el (tramp-gvfs-parse-device-names):
-	Make `split-string' call compatible with older Emacsen.
+	* README:
+	* configure.ac:
+	* msdos/sed2v2.inp: Bump version to 25.0.91.
 
-	* lisp/net/trampver.el: Change version to "2.2.13.25.1".
+2016-03-04  Nicolas Petton  
 
-2015-12-29  Lambda Coder  
+	* etc/AUTHORS: Update the AUTHORS file
 
-	* doc/misc/tramp.texi: Editorial revisions to the Tramp manual
+2016-03-04  Glenn Morris  
+2016-02-15  Glenn Morris  
 
-2015-12-29  Lars Ingebrigtsen  
+	* lisp/dired-aux.el: Require cl-lib.  (Bug#22613)
 
-	Mention that tls.el is secure by default, and will fail
+2016-02-15  Eli Zaretskii  
 
-2015-12-29  Lars Ingebrigtsen  
+	Index tilde characters in names of backup files
 
-	Make tls.el use trustfiles by default
+	* doc/emacs/files.texi (Backup Names): Improve indexing.
+	(Bug#22625)
 
-	* lisp/net/tls.el (tls-program): Add a certfile by default (bug#21227).
-	(open-tls-stream): Insert the trustfile by looking at
-	`gnutls-trustfiles'.
+2016-02-15  Eli Zaretskii  
 
-2015-12-29  Lars Ingebrigtsen  
+	Document deprecation of hi-lock-mode's 'C-x w' bindings
 
-	Refactor out gnutls-trustfiles
+	* doc/emacs/display.texi (Highlight Interactively): Deprecate the
+	"C-x w" bindings of hi-lock-mode.
 
-	* lisp/net/gnutls.el (gnutls-trustfiles): Refactor out for reuse by tls.el.
+	* etc/NEWS: Mark the deprecation entry as documented.
 
-2015-12-29  Lars Ingebrigtsen  
+2016-02-15  Stefan Monnier  
 
-	Remove --insecure from gnutls-cli invocation
+	Announce that the `C-x w' bindings are deprecated
 
-	* tls.el (tls-program): Default to using secure TLS
-	connections (bug#19284).
+2016-02-15  Paul Eggert  
 
-2015-12-29  Paul Eggert  
+	Suppress GNUstep hardening
 
-	Spelling fix
+	Fedora 23 normally hardens GNUstep applications, which causes
+	‘./configure --with-ns’ to break Emacs’s funky way of undumping.
+	Fix this by eliding the hardening options (Bug#22518).
+	* src/Makefile.in (LIBS_GNUSTEP): Omit options like
+	‘-specs=/usr/lib/rpm/redhat/redhat-hardened-ld’.
+	(GNU_OBJC_CFLAGS): Omit options like
+	‘-specs=/usr/lib/rpm/redhat/redhat-hardened-cc1’.
 
-2015-12-29  Paul Eggert  
+2016-02-15  Eli Zaretskii  
 
-	Port report-emacs-bug to deterministic builds
+	Fix redisplay after a large insertion
 
-	* lisp/mail/emacsbug.el (report-emacs-bug): Future-proof the
-	recent "built on" change to deterministic builds where
-	emacs-build-system will be nil.  See:
-	http://lists.gnu.org/archive/html/emacs-devel/2015-12/msg01369.html
+	* src/xdisp.c (redisplay_internal): Don't accept the results of
+	"optimization 3" if the cursor ends up in a partially visible
+	glyph row.  (Bug22637)
 
-2015-12-29  Jose A. Ortega Ruiz    (tiny change)
+2016-02-15  Andreas Schwab  
 
-	Fix URL auth error message
+	Revert "Fix gnus-group-get-new-news-this-group on group with closed server"
 
-	* lisp/url/url-http.el (url-http-handle-authentication): Make the error
-	message more correct (bug#20069).
+	This reverts commit 9dc77e37aa84c6df9b3ddb4609f3c09201b0580e.
 
-2015-12-28  Lars Ingebrigtsen  
+		* lisp/gnus/nnimap.el (nnimap-change-group): Revert last
+		change.  (Bug#22634)
 
-	shr link traversal fixup
+2016-02-15  Paul Eggert  
 
-	* shr.el (shr-next-link): Don't bug out on adjacent links.
+	* lib-src/make-docfile.c: Include stdarg.h.
 
-	Backport:
+2016-02-15  Alan Mackenzie  
 
-	(cherry picked from commit 1efc5f8b09273c359683ce13be95fb5df7a84311)
+	Extend gpm-mouse-mode's doc string and doc to point out limitations.
 
-2015-12-28  Tom Tromey  
+	* lisp/t-mouse.el (gpm-mouse-mode): Extend doc string to indicate the
+	inability to transfer text between Emacs and other programs which use GPM.
 
-	set :safe on css-indent-offset
+	* doc/emacs/frames.texi (Text-Only Mouse): Note the inability to transfer text
+	between Emacs and other progrmas which use GPM.
 
-	* lisp/textmodes/css-mode.el (css-indent-offset): Add :safe 'integerp.
+2016-02-15  Eli Zaretskii  
 
-2015-12-28  Lars Ingebrigtsen  
+	Revert "Backport: * lisp/isearch.el: Turn char-folding off by default"
 
-	* eww.el (eww-mode): Remove superfluous bidi reset.
+	* lisp/isearch.el: Turn char-folding back oon by default.
 
-2015-12-28  James Stout    (tiny change)
+	This reverts commit 12c50e82c9b432b2fc31f8fb2215f43ceea80822.
 
-	Make chunked encoding trailer detection more compliant
+2016-02-15  Lars Ingebrigtsen  
 
-	* lisp/url/url-http.el
-	(url-http-chunked-encoding-after-change-function): Make
-	trailer detection more compliant (bug#16345).
+	Revert "Support integer image rotation and respect EXIF rotations"
 
-2015-12-28  Martin Rudalics  
+	This reverts commit 0f600496050bf435f55dc81056e06fcd45992dc8.
 
-	Fix Bug#10873 in `report-emacs-bug'
+	This change does not work on Fedora.
 
-	* lisp/mail/emacsbug.el (report-emacs-bug): If
-	`report-emacs-bug-no-explanations' is nil, make sure we can show
-	mail and warnings buffer on this frame (Bug#10873).
+2016-02-15  Lars Ingebrigtsen  
 
-2015-12-28  Lars Ingebrigtsen  
+	Revert "Document EXIF image rotation"
 
-	Always reset the bidi direction
+	This reverts commit 10b8ed27ec91ff52f93eb0297dcc3abb214931aa.
 
-	* eww.el (eww-display-html): Always reset the bidi direction
-	to `left-to-right' (bug#22257).
+	This change does not work on Fedora, for instance.
 
-2015-12-28  Alan Mackenzie  
+2016-02-15  Paul Eggert  
 
-	Allow line comments ending with escaped NL to be continued to the next line.
+	Document OS X LANG default
 
-	Use this in C, C++, and Objective C Modes.  Fixes bug#22246
+	* doc/emacs/cmdargs.texi (General Variables):
+	Document OS X Language and Region system preference.
+	Suggested by Alan Third.
 
-	* src/syntax.c (comment-end-can-be-escaped): New buffer local variable.
-	(forw-comment, back-comment): On encountering an end of comment character,
-	test whether it is escaped when `comment-end-can-be-escaped' is non-nil.
+2016-02-15  Alan Third  
 
-	* doc/lispref/syntax.texi (Control Parsing): Describe
-	`comment-end-can-be-escaped'.
+	Set locale when run from OS X GUI
 
-	* etc/NEWS (Lisp Changes): Describe `comment-end-can-be-escaped'.
+	* src/emacs.c (main): Call ns_init_locale.
+	* src/nsterm.m (ns_init_locale): Get locale from OS and set LANG.
+	* src/nsterm.h: Include ns_init_locale.
 
-	* lisp/progmodes/cc-langs.el: New c-lang-setvar `comment-end-can-be-escaped'.
+2016-02-15  Paul Eggert  
 
-2015-12-28  Dmitry Gutov  
+	make-docfile cleanup for I/O, etc.
 
-	Rename project-library-roots to project-external-roots
+	* lib-src/make-docfile.c (progname, generate_globals, num_globals)
+	(num_globals_allocated, globals): Now static.
+	(generate_globals, struct rcsoc_state, read_c_string_or_comment):
+	(write_c_args, scan_c_stream, search_lisp_doc_at_eol, scan_lisp_file):
+	Use bool for boolean.
+	(verror): New function.
+	(fatal, error): Use it.  API is now like printf.  All callers changed.
+	(main): Remove err_count local that was always 0.
+	(main, scan_c_stream, scan_lisp_file): Check for I/O error.
+	(scan_file, scan_c_file, scan_c_stream, scan_lisp_file):
+	Return void, not 0.
+	(put_char, scan_keyword_or_put_char, scan_c_file): Use char for byte.
+	(scan_keyword_or_put_char): Check for missing ( and unexpected EOF.
+	(close_emacs_globals): Use ptrdiff_t for index, not int.
+	(scan_c_file, scan_lisp_file): Exit with failure if file cannot be
+	opened, rather than diagnosing but exiting with status 0.
+	(search_lisp_doc_at_eol): Don't worry about ungetc of EOF; it's
+	portable now.
 
-	* lisp/progmodes/project.el (project-library-roots): Rename to
-	project-external-roots.
-	(project-library-roots-function): Rename to
-	project-vc-external-roots-function.  Only use it in the VC
-	backend, for now.  Update project-external-roots accordingly.
-	(project-vc-library-roots): Remove.
-	(project-or-libraries-find-regexp):
-	Rename to project-or-external-find-regexp.
+2016-02-15  Paul Eggert  
 
-	* lisp/progmodes/elisp-mode.el (elisp-library-roots):
-	Rename to elisp-load-path-roots.
+	Memory-management cleanup in make-docfile
 
-	* lisp/progmodes/etags.el (etags-library-roots): Remove.  Use
-	an anonymous function for the default value of
-	project-vc-external-roots-function.
+	I compiled it with -fsanitize=address and fixed the leaks it detected.
+	Also, I changed it to prefer signed to unsigned integer types,
+	and to check for integer overflow.
+	* lib-src/make-docfile.c:
+	Include , , , .
+	(memory_exhausted): New function.
+	(xmalloc, xrealloc): Use it.
+	(xmalloc, xrealloc, scan_file, struct rcsoc_state, write_c_args)
+	(uncompiled, scan_lisp_file):
+	Prefer signed integer types to unsigned.
+	(xstrdup): Remove.  All uses removed.
+	(num_globals, num_globals_allocated, write_globals, scan_c_stream):
+	Use ptrdiff_t, not int, for indexes that in theory could exceed INT_MAX.
+	(add_global): Use const to pacify --enable-gcc-warnings.
+	Make a copy here, rather than relying on strdup calls later.
+	(add_global, write_globals, scan_c_stream):
+	Avoid integer overflow when calculating sizes.
+	(write_globals, scan_c_stream, scan_lisp_file): Avoid memory leak.
+	(scan_c_stream): Check for add_global failure.
 
-2015-12-27  Deniz Dogan  
+2016-02-15  Kevin Gallagher  
 
-	Clear erc user list upon disconnection
+	Kevin Gallagher has new email address
 
-	* lisp/erc/erc-backend.el (erc-process-sentinel): Clear channel user
-	lists upon disconnection.  This prevents invalid channel
-	user lists when reconnecting (bug#10947).
+	* lisp/emulation/edt.el:
+	* lisp/emulation/edt-lk201.el:
+	* lisp/emulation/edt-mapper.el:
+	* lisp/emulation/edt-pc.el:
+	* lisp/emulation/edt-vt100.el:
+	* etc/edt-user.el:
+	* doc/misc/edt.texi: Update Kevin Gallagher's email address.
 
-2015-12-27  Lars Ingebrigtsen  
+2016-02-15  Eli Zaretskii  
 
-	Don't bug out in erc after waking from sleep
+	Improve doc strings of 'forward/backward-word-strictly'
 
-	* lisp/erc/erc-backend.el (erc-server-send-ping): If the server has
-	closed connection, this may already have been detected and
-	`erc-server-last-received-time' has been set to nil (bug#13608).
+	* lisp/simple.el (backward-word): Refer to 'backward-word-strictly'
+	in the doc string.  Suggested by Glenn Morris .
+	* lisp/subr.el (forward-word-strictly, backward-word-strictly):
+	Mention 'subword-mode' in the doc strings.
 
-2015-12-27  David Edmondson  
+	* src/syntax.c (Fforward_word): Refer to 'forward-word-strictly'
+	in the doc string.  (Bug#22560)
 
-	Proxy error in erc with multiple clients
+2016-02-15  Michael Albinus  
 
-	* lisp/erc/erc.el (erc-channel-receive-names): Fix errors
-	generated when multiple IRC clients talk to a single IRC proxy
-	(bug#19034).
+	Describe Makefile test targets in test/README
 
-	Backport:
+	* CONTRIBUTE: Move Makefile test targets to test/README.
 
-	(cherry picked from commit 507e98a54d1aa37823c64993d6b59257a82fe8f4)
+	* Makefile.in:
+	* test/README: Describe Makefile test targets.
 
-2015-12-27  Dima Kogan  
+2016-02-15  Artur Malabarba  
 
-	Ensure that we don't have several timers in erc
+	Backport: * lisp/isearch.el: Turn char-folding off by default
 
-	* lisp/erc/erc-backend.el (erc-server-setup-periodical-ping): Checks
-	for existing timers in the alist before adding new ones.  If a
-	timer already exists, it is cancelled and
-	overwritten. (bug#19292).
+	(search-default-mode): Set default value to nil.
 
-2015-12-27  Jens Lechtenboerger  
+2016-02-15  Lars Ingebrigtsen  
 
-	Fix mml-sec build warnings
+	Document EXIF image rotation
 
-	* lisp/gnus/mml-sec.el: Fix warnings by adding autoloads
-	(bug#18718).
+	* doc/lispref/display.texi (ImageMagick Images): Mention EXIF rotation.
 
-	Backport:
+2016-02-15  Dima Kogan  
 
-	(cherry picked from commit 3603097f62f5f4aa5451716e9ac380161f6829e2)
+	Support integer image rotation and respect EXIF rotations
 
-2015-12-27  Lars Ingebrigtsen  
-
-	Don't insert erc logs at the end
-
-	* lisp/erc/erc-log.el (erc-log-setup-logging): Insert the previous log
-	at the start of the buffer, not at the end (bug#20496).
+	* src/image.c (imagemagick_load_image): Allow integer rotations in
+	addition to floating point rotations (bug#22591).
+	* src/image.c (imagemagick_load_image): Images that have an
+	orientation given in EXIF and have no explicit :rotation tag are now
+	pre-rotated.  All information such as width/height is reported for the
+	rotated image.
 
-2015-12-27  Lars Ingebrigtsen  
+2016-02-15  Matthew Carter  
 
-	(eww-setup-buffer): Restore left-to-right defaults
+	Quote table names for postgres listings (sql-mode)
 
-	* eww.el (eww-setup-buffer): Restore left-to-right defaults.
+	* lisp/progmodes/sql.el (sql-postgres-completion-object): Avoid passing
+	  unquoted table names to the completion list.
 
-	Backport:
+2016-02-15  Juri Linkov  
 
-	(cherry picked from commit 96c874b96b617c124d500a94de761a61f2a08685)
+	* lisp/replace.el (replace-match-maybe-edit): Make arg `backward' optional.
 
-2015-12-27  Lars Ingebrigtsen  
+	Doc fix.
+	(replace-search, replace-highlight): Make arg `backward' optional.
+	(Bug#18388)
 
-	Don't join erc channels doubly
+2016-02-15  Juri Linkov  
 
-	* lisp/erc/erc-join.el (erc-autojoin-channels): Don't join channels
-	more than once (if you have several nicks) (bug#20695).
+	* lisp/simple.el (next-line-or-history-element): Reset temporary-goal-column.
 
-2015-12-27  Eli Zaretskii  
+	(previous-line-or-history-element): Reset temporary-goal-column.
+	Use end-of-visual-line instead of line-end-position.  (Bug#22544)
 
-	Avoid leaving "ghost" of mouse pointer on MS-Windows
+2016-02-15  Paul Eggert  
 
-	* src/w32term.c (frame_set_mouse_pixel_position):
-	* src/w32fns.c (Fw32_mouse_absolute_pixel_position): Momentarily
-	disable "mouse trails" when moving the mouse pointer.  (Bug#22247)
-	* src/w32term.c (frame_set_mouse_pixel_position): Include
-	w32common.h.
+	Suppress ACL ops if configured with --disable-acl
 
-2015-12-27  Krzysztof Jurewicz    (tiny change)
+	Without this patch, some ACL operations were suppressed, but not all.
+	* src/fileio.c [!USE_ACL]: Do not include sys/acl.h.
+	(Ffile_acl, Fset_file_acl) [!USE_ACL]: Return nil in this case.
 
-	Fix auth source lookups from erc with port numbers
+2016-02-15  Katsumi Yamaoka  
 
-	* lisp/erc/erc.el (erc-open): `auth-source' wants strings, not port
-	numbers (bug#20541).
+	Mention web bugs
 
-2015-12-27  Fran Litterio  
+	* doc/misc/emacs-mime.texi (Display Customization):
+	Mention web bugs in the mm-html-blocked-images section.
 
-	Run erc-kill-channel-hook always on exit
+2016-02-15  Katsumi Yamaoka  
 
-	* lisp/erc/erc.el (erc-kill-buffer-function): Run erc-kill-channel-hook
-	when erc-kill-queries-on-quit is set (bug#21187).
+	Make mm-html-blocked-images default to "" again
 
-2015-12-27  Paul Eggert  
+	* lisp/gnus/mm-decode.el (mm-html-blocked-images):
+	Default to "" that blocks all external images.
 
-	Spelling fix
+	* doc/misc/emacs-mime.texi (Display Customization):
+	Mention that mm-html-blocked-images defaults to "".
 
-	* test/automated/url-parse-tests.el:
-	(url-generic-parse-url/same-document-reference):
-	Rename from url-generic-parse-url/same-decument-reference.
+2016-02-15  Paul Eggert  
 
-2015-12-27  Paul Eggert  
+	Minor alignas cleanup
 
-	Reword initial *scratch* for brevity, appearance
+	* src/lisp.h (alignas): Remove now-redundant #ifdef that was left
+	over from the old way of doing things, before Bug#20862 was fixed.
 
-	* lisp/startup.el (initial-scratch-message):
-	Reword to avoid apostrophes, and to make it shorter.
-	See the thread starting in:
-	http://lists.gnu.org/archive/html/emacs-devel/2015-12/msg01241.html
+2016-02-15  Paul Eggert  
 
-2015-12-26  Leo Liu  
+	Add lmalloc commentary and tweak laligned
 
-	Add ert-deftest to lisp-mode.el
+	* src/alloc.c (laligned): Help compiler in a tiny way by putting
+	the more-commonly-failing disjunct first.
 
-	* lisp/emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression,
-	  lisp-el-font-lock-keywords-1): Add ert-deftest.
+2016-02-15  Eli Zaretskii  
 
-2015-12-26  Lars Ingebrigtsen  
+	Clarify documentation of key binding conventions
 
-	Mark imap changes as not needing doc changes
+	* doc/lispref/tips.texi (Key Binding Conventions): Clarify which
+	"punctuation characters" are reserved after "C-c".  (Bug#22604)
 
-	* lisp/net/imap.el (imap-ssl-open): Remove
+2016-02-15  Oscar Fuentes  
 
-2015-12-26  Lars Ingebrigtsen  
+	* etc/NEWS: mention the `vc-faces' customization group
 
-	Use built-in encryption in imap.el
+2016-02-15  Paul Eggert  
 
-	* lisp/net/imap.el (imap-ssl-program): Remove (bug#21134).
-	(imap-starttls-open): Use open-network-stream instead of starttls.el.
-	(imap-tls-open): Use open-network-stream instead of tls.el.
+	Sync with gnulib
 
-2015-12-26  Eli Zaretskii  
+	This incorporates:
+	2016-02-09 stdalign: port to clang 3.7.0
+	2016-02-06 misc: port better to gcc -fsanitize=address
+	* doc/misc/texinfo.tex, lib/stdalign.in.h, m4/acl.m4, m4/getgroups.m4:
+	Copy from gnulib.
 
-	Don't try using /bin/sh in artist.el on MS-Windows
+2016-02-15  Michael Albinus  
 
-	* lisp/textmodes/artist.el (artist-figlet-get-font-list-windows):
-	New function.
-	(artist-figlet-choose-font): Use it on MS-Windows and MS-DOS.
-	(Bug#20167)
+	* CONTRIBUTE: Add more examples for $(SELECTOR) make variable.
 
-2015-12-26  Wolfgang Jenkner  
+2016-02-15  Katsumi Yamaoka  
 
-	Always define gmalloc etc. in src/gmalloc.c
+	Make mm-html-inhibit-images and mm-html-blocked-images default to nil
 
-	This is a work-around to prevent the compiler from using semantic
-	knowledge about malloc for optimization purposes.  E.g., gcc 5.2
-	with -O2 replaces most of calloc's definition by a call to calloc;
-	see Bug#22085.
-	* src/gmalloc.c [!HYBRID_MALLOC] (malloc, realloc, calloc)
-	(aligned_alloc, free): Do not undef.  Instead, define these as
-	functions (perhaps renamed to gmalloc etc.) in terms of gmalloc etc.
+	* lisp/gnus/mm-decode.el (mm-html-inhibit-images)
+	(mm-html-blocked-images): Default to nil.
 
-2015-12-26  Eli Zaretskii  
+	* doc/misc/emacs-mime.texi (Display Customization): Mention that
+	mm-html-inhibit-images and mm-html-blocked-images default to nil.
 
-	Fix documentation of browse-url browser-related functions
+	* etc/NEWS (Gnus): Document mm-html-inhibit-images and
+	mm-html-blocked-images.
 
-	* lisp/net/browse-url.el (browse-url)
-	(browse-url-default-browser, browse-url-default-windows-browser)
-	(browse-url-default-macosx-browser, browse-url-chromium)
-	(browse-url-kde, browse-url-text-xterm): Clarify the usage of ARGS
-	and NEW-WINDOW arguments in these functions.  (Bug#19421)
+2016-02-15  Paul Eggert  
 
-2015-12-26  Paul Eggert  
+	Increase success rate of fallback lmalloc
 
-	Propagate Bug#14412 fix to backtrace_eval_unrewind
+	* src/alloc.c (lmalloc, lrealloc): Reallocate with (typically)
+	larger and larger sizes, to increase the probability that
+	the allocator will return a Lisp-aligned pointer.
 
-	* src/eval.c (unbind_to): Redo so that the FALLTHROUGH!! comment
-	becomes accurate again. This shouldn’t affect behavior.
-	(backtrace_eval_unrewind): Apply the recent unbind_to fix here, too.
+2016-02-15  Lars Ingebrigtsen  
 
-2015-12-26  Eli Zaretskii  
+	Make backgrounds extend to the end of the lines in shr
 
-	Don't produce non-ASCII characters in *scratch*
+	* lisp/net/shr.el (shr-face-background): Faces can also be on
+	the form `(:background "#fff)' (bug#22547).
 
-	* lisp/startup.el (initial-scratch-message): Quote apostrophes to
-	avoid producing non-ASCII characters in the *scratch* buffer's
-	commentary.
+2016-02-15  Lars Ingebrigtsen  
 
-2015-12-26  Eli Zaretskii  
+	Make the `R' command get the correct relative s
 
-	Document changes in 'compare-windows'
+	* lisp/net/eww.el (eww-readable): Preserve the base URL so
+	that image expansions are fetched from the right place (bug#22605).
 
-	* lisp/vc/compare-w.el (compare-windows-removed)
-	(compare-windows-added): Doc fix.
+	(cherry picked from commit 8722e849f75ceafb82a1c17105e8ab76077a8ebc)
 
-	* doc/emacs/files.texi (Comparing Files): Document the changes in
-	window selection by 'compare-windows'.
+	Backport:
 
-2015-12-26  Eli Zaretskii  
+2016-02-15  Mike Kupfer  
 
-	Document 'vc-annotate-background-mode'
+	Fix typos in emacs-mime.texi and gnus.texi
 
-	* doc/emacs/maintaining.texi (Old Revisions): Document
-	'vc-annotate-background-mode'.
+	* doc/misc/emacs-mime.texi (Display Customization):
+	* doc/misc/gnus.texi (HTML): Fix typo.
 
-2015-12-26  Eli Zaretskii  
+2016-02-15  Katsumi Yamaoka  
 
-	Document 'vc-region-history'
+	* doc/misc/emacs-mime.texi (Display Customization):
+	Doc fix for mm-html-inhibit-images.
 
-	* doc/emacs/maintaining.texi (VC Change Log): Document
-	'vc-region-history'.
+2016-02-15  Lars Ingebrigtsen  
 
-2015-12-26  Eli Zaretskii  
+	Fix message-cross-post-followup-to group names
 
-	Improve documentation of 'vc-push'
+	* lisp/gnus/message.el (message-cross-post-followup-to): Don't
+	insert group names like "nntp+foo:zot", because those aren't valid.
 
-	* doc/emacs/maintaining.texi (Pulling / Pushing): Expand and
-	improve the documentation of 'vc-push'.
+2016-02-15  David Edmondson  
 
-	* lisp/vc/vc.el (vc-pull, vc-push): Doc fix.
+	Compare recipient and keys case-insensitively
 
-2015-12-26  Alain Schneble  
+	* lisp/gnus/mml2015.el: (mml-secure-check-user-id): When comparing a
+	recipient address with that from a key, do so in a case insensitive
+	manner (bug#22603).
 
-	Include the tests for the URL parsing fixes
+2016-02-15  Glenn Morris  
 
-2015-12-26  Alain Schneble  
+	* lisp/gnus/mm-decode.el (mm-alist-to-plist): Doc fix.
 
-	Make relative URL parsing and resolution consistent with RFC 3986 (bug#22044)
+2016-02-15  Katsumi Yamaoka  
 
-	* test/automated/url-parse-tests.el: Add tests covering url-generic-parse-url.
-	* test/automated/url-expand-tests.el: Add tests covering url-expand-file-name.
-	* lisp/url/url-parse.el (url-generic-parse-url): Keep empty fragment
-	information in URL-struct.
-	* lisp/url/url-parse.el (url-path-and-query): Do not artificially turn empty
-	path and query into nil path and query, respectively.
-	* lisp/url/url-expand.el (url-expander-remove-relative-links): Do not turn
-	empty path into an absolute ("/") path.
-	* lisp/url/url-expand.el (url-expand-file-name): Properly resolve
-	fragment-only URIs. Do not just return them unchanged.
-	* lisp/url/url-expand.el (url-default-expander): An empty path in the relative
-	reference URI should not drop the last segment.
+	Refactor HTML images handling of Gnus and mm-* (a part of bug#21650)
 
-	Backport:
+	* doc/misc/emacs-mime.texi (Display Customization):
+	Remove mm-inline-text-html-with-images; add documentations for
+	mm-html-inhibit-images and mm-html-blocked-images.
 
-	(cherry picked from commit b792ecea1715e080ad8e232d3d154b8a25d2edfb)
+	* lisp/gnus/gnus-art.el (gnus-article-show-images):
+	No need to bind mm-inline-text-html-with-images.
+	(gnus-bind-safe-url-regexp): Rename to gnus-bind-mm-vars.
+	(gnus-bind-mm-vars): Rename from gnus-bind-safe-url-regexp;
+	bind mm-html-inhibit-images and mm-html-blocked-images.
+	(gnus-mime-view-all-parts, gnus-mime-view-part-internally)
+	(gnus-mm-display-part, gnus-mime-display-single)
+	(gnus-mime-display-alternative): Use gnus-bind-mm-vars.
 
-2015-12-26  Eli Zaretskii  
+	* lisp/gnus/mm-decode.el (mm-inline-text-html-with-images): Remove.
+	(mm-html-inhibit-images, mm-html-blocked-images): New user options.
+	(mm-shr): Bind shr-inhibit-images and shr-blocked-images with
+	mm-html-inhibit-images and mm-html-blocked-images respectively
+	instead of gnus-inhibit-images and gnus-blocked-images.
 
-	Document 'url-user-agent'.
+	* lisp/gnus/mm-view.el (mm-setup-w3m): Use mm-html-inhibit-images
+	instead of mm-inline-text-html-with-images.
 
-	* lisp/url/url-http.el (url-user-agent): Move from here...
-	* lisp/url/url-vars.el (url-user-agent): ...to here.  This is to
-	keep all the URL defcustoms in one place, and also have it defined
-	whenever the URL library is loaded.
+2016-02-15  Paul Eggert  
 
-	* doc/misc/url.texi (Customization): Document 'url-user-agent'.
+	Port to FreeBSD 11-CURRENT i386
 
-2015-12-26  Eli Zaretskii  
+	Problem reported by Herbert J. Skuhra in:
+	http://lists.gnu.org/archive/html/emacs-devel/2016-02/msg00354.html
+	Instead of trying
+	* src/alloc.c (lmalloc, lrealloc, laligned): New functions.
+	(xmalloc, xzalloc, xrealloc, lisp_malloc): Use them.
+	(__alignof__) [!__GNUC__ && !__alignof__]: New macro.
+	(MALLOC_IS_GC_ALIGNED): New macro.
+	* src/lisp.h (NONPOINTER_BITS): Remove.  All uses removed.
+	No longer needed now that alloc.c uses lmalloc and lrealloc.
 
-	Document protocols supported by URL library via Tramp
+2016-02-15  Michael Albinus  
 
-	* doc/misc/url.texi (Tramp): New node, describes the URL schemes
-	supported via Tramp.
-	(Supported URL Types, file/ftp, rlogin/telnet/tn3270): Mention
-	Tramp.
+	Some fixes in file-notify-tests.el
 
-2015-12-26  Eli Zaretskii  
+	* test/automated/file-notify-tests.el
+	(file-notify--test-with-events-check)
+	(file-notify--test-with-events-explainer): New defuns.
+	(file-notify--test-with-events): Use it.
+	(file-notify-test07-backup): Fix docstring.  Some of the
+	backends fire two `changed' events.  Backup by rename doesn't
+	work for kqueue.
 
-	Document changes in Shell-script mode
+2016-02-15  Michael Albinus  
 
-	* lisp/progmodes/sh-script.el (sh-mode, sh-set-shell): Document
-	the 'sh-shell' file-local variable.
-	(top level): Add an auto-load form to avoid byte-compiler warning
-	about 'comint-send-string'.
+	Fix Bug#22557
 
-2015-12-26  Eli Zaretskii  
+	* lisp/filenotify.el (file-notify-callback): Do not send a
+	`stopped' event in case of backup by renaming.  (Bug#22557)
 
-	Fix documentation of 'ses-define-local-printer'
+	* test/automated/Makefile.in: Use $(SELECTOR_EXPENSIVE) for
+	all targets but check and check-maybe.
 
-	* doc/misc/ses.texi (Printer functions): Fix whitespace between
-	sentences and punctuation.  Add an index entry for
-	'ses-define-local-printer'.
+	* test/automated/file-notify-tests.el
+	(file-notify--test-read-event-timeout): New defconst.
+	(file-notify--deftest-remote, file-notify--wait-for-events)
+	(file-notify-test02-events)
+	(file-notify-test04-file-validity)
+	(file-notify-test06-many-events): Use it.
+	(file-notify--test-cleanup): Make it more robust.  Delete also
+	backup file.
+	(file-notify-test07-backup): New test.
 
-2015-12-26  Shakthi Kannan  
+2016-02-15  Paul Eggert  
 
-	Document 'ert-summarize-tests-batch-and-exit'
+	Fix test for dladdr
 
-	* doc/misc/ert.texi (Running Tests in Batch Mode): Document
-	'ert-summarize-tests-batch-and-exit'.
+	Problem reported by Andreas Schwab in:
+	http://lists.gnu.org/archive/html/emacs-devel/2016-02/msg00327.html
+	* configure.ac (dladdr): Link with LIBMODULES when checking for
+	this function.
 
-2015-12-26  Eli Zaretskii  
+2016-02-15  Andreas Schwab  
 
-	Avoid assertion violation in unbind_to
+	Fix gnus-group-get-new-news-this-group on group with closed server
 
-	* src/eval.c (unbind_to) : Avoid assertion violation
-	if we get here with an object that is not a symbol.  (Bug#14412)
+	* lisp/gnus/nnimap.el (nnimap-change-group): Lookup server
+	method and pass to nnimap-open-server.
 
-2015-12-25  Andreas Schwab  
+2016-02-15  Artur Malabarba  
+2016-02-14  Nicolas Petton  
 
-	Don't treat /foo/bar:mumble as ange-ftp address
+	* doc/lispref/sequences.texi: Add documentation for seq-map-indexed
 
-		* lisp/net/browse-url.el (browse-url-filename-alist): Match colons
-		only in the first component.  (bug#5362)
+2016-02-14  Nicolas Petton  
 
-2015-12-25  Lars Ingebrigtsen  
+	New function seq-map-indexed
 
-	Follow  redirects in eww
+	* lisp/emacs-lisp/seq.el (seq-map-indexed): New function.
+	* test/lisp/emacs-lisp/seq-tests.el: Add tests for seq-map-indexed.
 
-	Merge conflict, but I think I resolved it.
+2016-02-14  Lars Ingebrigtsen  
 
-	    Follow meta refresh tags in eww
+	* lisp/gnus/mm-util.el: Remove the mm-string-as-multibyte alias.
 
-	    * eww.el (eww-tag-meta): Follow meta refresh tags (bug#22234).
+2016-02-14  Lars Ingebrigtsen  
 
-	Backport:
+	Fix problem with wrong encoding of non-ASCII message bodies
 
-2015-12-25  Lars Ingebrigtsen  
+	* lisp/gnus/mml.el (mml-generate-mime-1): Disable
+	multibyteness before encoding the data.
 
-	Allow http://user:pass@foo/ URLs again
+2016-02-14  Lars Ingebrigtsen  
 
-	* lisp/url/url-auth.el (url-basic-auth): Allow explicit
-	user/passwords in URLs (bug#19046).
+	Remove codepage setup code from mm-util
 
-	Backport:
+	* lisp/gnus/mm-util.el (mm-codepage-setup): Remove.
+	(mm-codepage-iso-8859-list): Remove.
+	(mm-codepage-ibm-list, mm-setup-codepage-iso-8859)
+	(mm-setup-codepage-ibm): Remove.
+	(mm-charset-eval-alist): Remove the code pages from the
+	default value.
 
-	(cherry picked from commit b563715a2db265517d5a77f165a42afa1e233fdd)
+2016-02-14  Lars Ingebrigtsen  
 
-2015-12-25  Samer Masterson  
+	Remove compat code for older Emacsen
 
-	Autoload url-insert-buffer-contents
+	* lisp/gnus/gnus-art.el (gnus-button-url-regexp): Remove
+	XEmacs compat code.
 
-	* lisp/url/url-handlers.el: Add autoload cookie so that
-	`package-list-packages' doesn't bug out (bug#21927) (tiny change)
+	* lisp/gnus/gnus-sync.el (gnus-sync-json-alist-p): Remove
+	unused compat function.
+	(gnus-sync-json-plist-p): Ditto.
 
-	Backport:
+	* lisp/gnus/message.el (message-default-charset): Make obsolete.
+	(message-info): Remove compat code.
+	(message-setup-fill-variables): Remove kludge needed earlier
+	to not overwrite `normal-auto-fill-function'.
+	(message-split-line): Remove compat code.
 
-	(cherry picked from commit 7a7b5b492ff9929eecd90c4564db6fbf3b192323)
+	* lisp/gnus/mm-view.el (mm-display-inline-fontify): Remove
+	compat code.
 
-2015-12-25  Eli Zaretskii  
+2016-02-14  Lars Ingebrigtsen  
 
-	Make sure *scratch* etc. use forward slashes in its default-directory
+	Remove some compat functions from gmm-utils.el
 
-	* lisp/startup.el (normal-top-level): On MS-Windows, convert
-	backslashes to forward slashes while decoding default-directory
-	of the initially-created buffers.
+	* lisp/gnus/gmm-utils.el (gmm-tool-bar-from-list): Remove
+	compat code.
+	(gmm-image-search-load-path): Remove.
+	(gmm-image-load-path-for-library): Remove.
 
-2015-12-25  Lars Ingebrigtsen  
+2016-02-14  Lars Ingebrigtsen  
 
-	More eww file name coding fixes
+	Remove the gmm-lazy and nnmail-lazy compat widgets
 
-	* eww.el (eww-decode-url-file-name): Use the base coding
-	system to check for encodability.
+	* lisp/gnus/gmm-utils.el (gmm-lazy): Remove.
 
-	Backport:
+	* lisp/gnus/nnmail.el (nnmail-lazy): Remove.
 
-	(cherry picked from commit a8627008abe4ab339df19b417776da28b3ce0fc7)
+2016-02-13  Lars Ingebrigtsen  
 
-2015-12-25  Lars Ingebrigtsen  
+	Clean up nnimap-request-move-article slightly
 
-	Always save eww history
+	* lisp/gnus/nnheader.el (subr-x): Require.
 
-	* eww.el (eww-setup-buffer): Always save history, even when
-	called from outside the eww buffer (bug#19638).
+	* lisp/gnus/nnimap.el (nnimap-request-move-article): Clean up
+	the code slightly.
 
-	Backport:
+2016-02-13  Lars Ingebrigtsen  
 
-	(cherry picked from commit 2a0f18d9b6ce0ccce3d9c4a4a3b5743bae71b41e)
+	Use open-network-stream instead of open-protocol-stream
 
-2015-12-25  Lars Ingebrigtsen  
+	* lisp/gnus/nnimap.el: Use open-network-stream instead of
+	open-protocol-stream.
 
-	Default web pages to right-to-left
+	* lisp/gnus/nntp.el: Ditto.
 
-	* eww.el (eww-mode): Most web pages are left-to-right, so make
-	that the default (bug#19801).
+	* lisp/gnus/pop3.el: Ditto.
 
-	* shr.el (shr-tag-html): Respect "dir" attributes
-	(left-to-right, right-to-left).
+	* lisp/gnus/sieve-manage.el: Ditto.
 
-	Backport:
+	* lisp/net/network-stream.el (open-protocol-stream): Make obsolete.
 
-	(cherry picked from commit 9e089ec8a380ec3758fcf1564c5f86dc92c68c2a)
+2016-02-13  Lars Ingebrigtsen  
 
-2015-12-25  Lars Ingebrigtsen  
+	Remove compat code that relies on (featurep 'mule)
 
-	Make toggling checkboxes work again
+	* lisp/gnus/gnus-group.el (gnus-group-name-decode): Remove
+	compat code.
 
-	* eww.el (eww-update-field): Make toggling checkboxes work
-	again (bug#21881).
+	* lisp/gnus/gnus-start.el (gnus-read-descriptions-file):
+	Remove compat code.
 
-	Backport:
+	* lisp/gnus/mm-bodies.el (mm-decode-body, mm-decode-string):
+	Remove compat code.
 
-	(cherry picked from commit 5e56f606952e5e81b4d3a93ea70e791b74b33041)
+	* lisp/gnus/mm-view.el (mm-w3m-standalone-supports-m17n-p):
+	Remove compat code.
+	(mm-w3m-standalone-supports-m17n-p): Ditto.
 
-2015-12-25  Lars Ingebrigtsen  
+2016-02-13  Lars Ingebrigtsen  
 
-	Don't store cookies with empty names
+	Remove compat functions from starttls.el
 
-	* lisp/url/url-cookie.el (url-cookie-store): Refuse to store
-	cookies with empty names (bug#21936).
+	* lisp/gnus/starttls.el
+	(starttls-set-process-query-on-exit-flag): Remove.
 
-	Backport:
+2016-02-13  Lars Ingebrigtsen  
 
-	(cherry picked from commit 9f0fd7cb1aec3eb9e2e0f7b8854c30870286d96c)
+	Remove compat functions from smime.el
 
-2015-12-25  Lars Ingebrigtsen  
+	* lisp/gnus/smime.el (smime-replace-in-string): Remove.
+	(smime-make-temp-file): Remove.
 
-	Stop rendering HTML before specdlr exhaustion
+2016-02-13  Lars Ingebrigtsen  
 
-	Fixes: 22117
+	Remove compat code from smiley
 
-	* shr.el (shr-descend): Stop rendering before we run out of
-	specpdl room (bug#22117).
+	* lisp/gnus/smiley.el (smiley-style): Remove compat code.
 
-	Backport:
+2016-02-13  Lars Ingebrigtsen  
 
-	(cherry picked from commit 248da292fe46224b0b5a79b632c89cf4de2c2081)
+	Remove compat code from rfc2047
 
-2015-12-25  Lars Ingebrigtsen  
+	* lisp/gnus/rfc2047.el (rfc2047-encode-message-header): Remove
+	compat code.
+	(rfc2047-decode-string): Ditto.
 
-	Use cl-reduce, not reduce.
+2016-02-13  Lars Ingebrigtsen  
 
-	Backport:
+	Remove compat function from pop3
 
-	(cherry picked from commit fe4606f93b91ff3d046aee0cf21ecc277af7a786)
+	* lisp/gnus/pop3.el (pop3-set-process-query-on-exit-flag): Remove.
 
-2015-12-25  Lars Ingebrigtsen  
+2016-02-13  Lars Ingebrigtsen  
 
-	Allow several  tags in shr
+	Remove compat code in Gnus backends
 
-	* shr.el (shr-table-body): New function to find the real body
-	of a table.
-	(shr-tag-table): Use it to render several  tags in a
-	table (bug#22170).
+	* lisp/gnus/nndiary.el (nndiary-error): Remove.
 
-	Backport:
+	* lisp/gnus/nndraft.el (nndraft-request-associate-buffer): Ditto.
 
-	(cherry picked from commit cdaf33029d6620073833876d76056045ecfbc7c4)
+	* lisp/gnus/nnfolder.el (nnfolder-read-folder): Ditto.
 
-2015-12-25  Lars Ingebrigtsen  
+	* lisp/gnus/nnheader.el (nnheader-find-file-noselect): Ditto.
 
-	Make prettier unique file names in eww
+	* lisp/gnus/nnimap.el (nnimap-log-buffer): Remove compat code.
 
-	(eww-make-unique-file-name): Make unique file names by making
-	files like foo(2).jpg instead of foo(1)(2).jpg.
+2016-02-13  Lars Ingebrigtsen  
 
-	Backport:
+	Remove compat code from some mml files
 
-	(cherry picked from commit edfdd0a6cbdfa9e5e4bd0553e2b489401ca39266)
+	* lisp/gnus/mml-sec.el (mml-secure-passphrase-cache-expiry):
+	Remove compat code.
 
-2015-12-25  Lars Ingebrigtsen  
+	* lisp/gnus/mml-smime.el (mml-smime-openssl-sign-query):
+	Always use `mail-extract-address-components', since this isn't
+	time critical.
+	(mml-smime-get-dns-cert): Ditto.
 
-	Decode hex-encoded URLs before using them as file names
+	* lisp/gnus/mml.el (mml-preview): Remove compat code.
 
-	* eww.el (eww-decode-url-file-name): New function.
-	(eww-download-callback): Use it to decode file names before
-	saving them.
+2016-02-13  Lars Ingebrigtsen  
 
-	Backport:
+	Remove compat code and compat functions from mm-util.el
 
-	(cherry picked from commit af22a010d87516c2a646572fb27512c03057784f)
+	* lisp/gnus/mm-util.el (mm-mime-mule-charset-alist): Remove
+	compat code.
+	(mm-coding-system-priorities)
+	(mm-mule-charset-to-mime-charset, mm-charset-after)
+	(mm-mime-charset, mm-iso-8859-x-to-15-region): Remove compat code.
+	(mm-detect-coding-region): Define unconditionally.
+	(mm-detect-mime-charset-region): Ditto.
+	(mm-coding-system-to-mime-charset): It's 'mime-charset now.
+	(coding-system-name)
+	(find-file-coding-system-for-read-from-filename)
+	(find-operation-coding-system): Remove aliases.
 
-2015-12-25  Ashish SHUKLA  
+2016-02-13  Lars Ingebrigtsen  
 
-	Add FreeBSD cert bundle
+	Remove some compat code from mm-*.el
 
-	* doc/misc/emacs-gnutls.texi (Help For Users): Document
-	FreeBSD bundle.
+	* lisp/gnus/mm-bodies.el (mm-decode-body): Ditto.
 
-	* lisp/net/gnutls.el (gnutls-trustfiles): Add FreeBSD cert bundle.
+	* lisp/gnus/mm-decode.el (mm-tmp-directory)
+	(mm-valid-image-format-p): Remove compat code.
 
-	Backport:
+	* lisp/gnus/mm-url.el (mm-url-insert-file-contents): Remove
+	"Connection" "Close" workaround for older Emacsen.
 
-	(cherry picked from commit 60c0f1a18ad88d6dc1a8f4ee5d9d18940eaeb6f7)
+2016-02-13  Lars Ingebrigtsen  
 
-2015-12-25  Lars Ingebrigtsen  
+	Remove compat code and functions from message.el
 
-	Ignore invalid SVG images
+	* lisp/gnus/message.el (message-send-mail-function): Remove
+	compat code.
+	(message-dont-reply-to-names, message-mode)
+	(message-setup-fill-variables, message-fill-paragraph)
+	(message-remove-blank-cited-lines, message-make-from)
+	(message-forward-rmail-make-body, message-tool-bar-gnome)
+	(message-tab): Remove compat code.
+	(message-completion-in-region): Remove.
+	(message-read-from-minibuffer): Remove compat code.
 
-	* shr.el (shr-tag-svg): Ignore SVG images that have no width
-	or height, because these can't be displayed by ImageMagick,
-	anyway.
+2016-02-13  Lars Ingebrigtsen  
 
-	Backport:
+	Declare rfc1843 instead of autoloading
 
-	(cherry picked from commit 821107d53c2e390240d25c036b99ebbf9b4a93b6)
+	* lisp/gnus/gnus-art.el (rfc1843-decode-region): Declare
+	instead of autoload.
 
-2015-12-25  Lars Ingebrigtsen  
+2016-02-13  Eli Zaretskii  
 
-	shr table rendering fix
+	Avoid signaling an error in 'dired-do-find-regexp-and-replace'
 
-	* shr.el (shr-tag-table): Allow rendering body-less tables
-	that have headers.
+	* lisp/dired-aux.el: Require cl-lib, so that 'cl-mapcan' is
+	autoloaded correctly.  (Bug#22613)
 
-	Backport:
+2016-02-13  Eli Zaretskii  
 
-	(cherry picked from commit b05471e42c17e02c56c87d7599ada0c124a5fe09)
+	Fix network-stream-tests.el for MS-Windows
 
-2015-12-25  Eli Zaretskii  
+	* test/lisp/net/network-stream-tests.el
+	(connect-to-tls-ipv6-nowait): Skip for MS-Windows builds.
+	(connect-to-tls-ipv4-wait): Add a 0.1 sleep-for.
 
-	Restore info about the build host in bug reports
+2016-02-13  Lars Ingebrigtsen  
 
-	* lisp/mail/emacsbug.el (report-emacs-bug): Report the system on
-	which Emacs was built.  This is important information for
-	investigating bug reports reported by users who don't build their
-	Emacs.
+	Remove some Message compat functions
 
-2015-12-25  Eli Zaretskii  
+	* lisp/gnus/message.el (message-kill-all-overlays): Define
+	unconditionally.
+	(message-window-inside-pixel-edges): Remove.
+	(mail-dont-reply-to): Remove.
 
-	Fix bootstrap broken by changes related to OS X file-name encoding
+2016-02-13  Lars Ingebrigtsen  
 
-	* lisp/international/ucs-normalize.el (eval-when-compile): Make
-	sure char-code-property-alist includes elements that allow access
-	to 'decomposition' and 'canonical-combining-class' Unicode
-	properties, as compiling ucs-normalize.el requires that.
-	* lisp/loadup.el (featurep 'ns): Load ucs-normalize and ns-win
-	only of charprop.el was already loaded.
+	Remove some Gnus compat code
 
-	* src/Makefile.in ($(lispsource)/international/ucs-normalize.elc):
-	New order-only dependency.
+	* lisp/gnus/gnus-art.el (gnus-mime-inline-part): Remove compat code.
+	(gnus-mm-display-part): Ditto.
 
-2015-12-25  Leo Liu  
+	* lisp/gnus/gnus-start.el (gnus-dribble-read-file): Remove
+	compat code.
 
-	* lisp/ido.el (ido-add-virtual-buffers-to-list): Use bookmark-get-filename.
+2016-02-13  Lars Ingebrigtsen  
 
-2015-12-25  Michael Albinus  
+	Sort groups before inserting them into the group buffer
 
-	Make tramp-test29-vc-registered more robust
+	* lisp/gnus/gnus-group.el (gnus-group-describe-all-groups):
+	Sort groups before inserting them.
 
-	* test/automated/tramp-tests.el (tramp-test29-vc-registered):
-	Move `bzr' case down.  Skip test when `vc-create-repo' fails.
-	Remove instrumentation.
+2016-02-13  Lars Ingebrigtsen  
 
-2015-12-24  YAMAMOTO Mitsuharu  
+	Make "unseen" tracking work again in Gnus
 
-	* lisp/term/x-win.el (x-gtk-stock-map): Fix typo.
+	* lisp/gnus/gnus-sum.el (gnus-update-marks): Make "unseen"
+	tracking work again.
 
-2015-12-24  Katsumi Yamaoka  
+2016-02-13  Lars Ingebrigtsen  
 
-	Fix `gnus-union' so as to behave like `cl-union'
+	Remove Gnus compat functions defined in gnus.el
 
-	* lisp/gnus/gnus-group.el (gnus-group-prepare-flat):
-	Make gnus-union use `equal' to compare items in lists.
+	* lisp/gnus/gnus.el (gnus-extent-detached-p): Remove.
+	(gnus-extent-start-open, gnus-character-to-event)
+	(gnus-assq-delete-all, gnus-add-text-properties)
+	(gnus-put-text-property, gnus-key-press-event-p):
 
-	* lisp/gnus/gnus-util.el (gnus-union):
-	Make it behave like cl-union partially.
+2016-02-13  Lars Ingebrigtsen  
 
-2015-12-23  Paul Eggert  
+	Remove compat code from gnus-uu and win
 
-	Fix dired.c typo with ptrdiff_t vs Lisp_Object
+	* lisp/gnus/gnus-util.el (gnus-image-type-available-p): Remove
+	compat code.
 
-	* src/dired.c (file_name_completion): Don't assume Lisp_Object is
-	an integer type, fixing a problem introduced in the recent fix for
-	Bug#22169.
+	* lisp/gnus/gnus-uu.el (gnus-uu-tmp-dir): Remove compat code.
 
-2015-12-23  Eli Zaretskii  
+	* lisp/gnus/gnus-win.el (gnus-frames-on-display-list): Remove.
 
-	Document default process sentinel more prominently
+2016-02-13  Lars Ingebrigtsen  
 
-	* doc/lispref/processes.texi (Asynchronous Processes): Mention the
-	defaults for process filter and sentinel.  Provide cross-references.
-	(Process Information): Provide cross-references to where filters
-	and sentinels are described.
-	(Filter Functions): Add an index entry for "default filter".
-	(Sentinels): Add a few status messages not documented previously.
-	Resolve the "killed" confusion.  Document and describe the default
-	sentinel.  (Bug#22220)
+	Remove several gnus-util compat functions
 
-2015-12-23  Eli Zaretskii  
+	* lisp/gnus/gnus-util.el (gnus-set-process-query-on-exit-flag): Remove.
+	(gnus-read-shell-command): Remove.
+	(gnus-match-substitute-replacement): Remove.
+	(gnus-string-match-p): Remove.
+	(gnus-string-prefix-p): Remove.
 
-	Fix file-name completion on OS X
+2016-02-13  Lars Ingebrigtsen  
 
-	* src/dired.c (file_name_completion): Reject false matches due to
-	file-name-coding-systems that decompose characters when encoding
-	file names, by comparing decoded file names as well.  (Bug#22169)
-	(syms_of_dired) : New DEFSYM.
+	Remove the gnus-merge alias
 
-	* lisp/international/ucs-normalize.el (utf-8-hfs): Give it a
-	non-nil 'decomposed-characters' property.
+	* lisp/gnus/gnus-util.el (gnus-merge): Remove.
 
-2015-12-23  Anders Lindgren  
+2016-02-13  Lars Ingebrigtsen  
 
-	File-name completion of non-ASCII characters on OS X (bug#22169)
+	Remove the gnus-union alias
 
-	The coding system `utf-8-nfd', locally defined in ns-win.el,
-	didn't provide a :pre-write-conversion method, causing file name
-	completion of non-ASCII characters to fail.  Solved by using the
-	`utf-8-hfs' coding system provided by `ucs-normalize'.
+	* lisp/gnus/gnus-util.el (gnus-union): Remove.
 
-	* lisp/loadup.el: Load international/ucs-normalize (when building
-	for ns).
+2016-02-13  Lars Ingebrigtsen  
 
-	* lisp/term/ns-win.el (utf-8-nfd): Made `utf-8-nfd' as alias for
-	`utf-8-hfs' and removed the old implementation.  Set `utf-8-hfs'
-	as the file name coding system.
+	Remove the gnus-delete-alist alias
 
-	* src/nsfns.m (ns-convert-utf8-nfd-to-nfc): Removed.
+	* lisp/gnus/gnus-util.el (gnus-run-mode-hooks): Remove compat code.
+	(gnus-delete-alist): Remove.
 
-2015-12-23  Tom Tromey  
+2016-02-13  Lars Ingebrigtsen  
 
-	Fix bug #18588 by making bug-reference-bug-regexp more lenient
+	Remove the gnus-float-time alias
 
-	* lisp/progmodes/bug-reference.el (bug-reference-bug-regexp): Accept
-	"bug NNNN".  (Bug #18588)
+	* lisp/gnus/gnus-util.el (gnus-completion-styles): Remove
+	compat code.
+	(gnus-float-time): Remove.
 
-2015-12-23  Tom Tromey  
+2016-02-13  Lars Ingebrigtsen  
 
-	add some cl-* aliases to lisp-mode imenu
+	Remove compat code from gnus-srvr, start and sum
 
-	* (lisp-imenu-generic-expression): Add cl-define-compiler-macro,
-	cl-defgeneric, and cl-defmethod.
+	* lisp/gnus/gnus-srvr.el (gnus-browse-foreign-server): Remove
+	compat code.
 
-2015-12-22  Tom Tromey  
+	* lisp/gnus/gnus-start.el (gnus-check-reasonable-setup):
+	Remove compat code.
 
-	Make a variable buffer-local
+	* lisp/gnus/gnus-sum.el (gnus-summary-display-arrow)
+	(gnus-summary-make-menu-bar, gnus-summary-make-tool-bar)
+	(gnus-recenter)
+	(gnus-summary-limit-strange-charsets-predicate)
+	(gnus-summary-show-thread): Remove compat code.
 
-	* lisp/generic-x.el (generic-rul-mode-setup-function): Make
-	font-lock-syntax-table buffer-local.  (Bug #21627)
+2016-02-13  Lars Ingebrigtsen  
 
-2015-12-22  Eli Zaretskii  
+	Remove compat code from gnus-spec.el
 
-	Fix decoding of text in URLs retrieved by EWW
+	* lisp/gnus/gnus-spec.el (gnus-lrm-string-p): Remove compat code.
+	(gnus-balloon-face-function): Remove compat code.
 
-	* lisp/net/eww.el (eww-render): Pass 'charset' to
-	'eww-display-raw'.  Use the value of 'last-coding-system-used', if
-	non-nil, to set 'buffer-file-coding-system' of the buffer where we
-	show the URL.
-	(eww-display-html, eww-display-raw): Decode the text correctly,
-	using the charset found in the headers, and defaulting to UTF-8.
-	If the user told us to use a specific encoding, override the
-	charset from the headers.  (Bug#22222)
+2016-02-13  Lars Ingebrigtsen  
 
-2015-12-22  Alan Mackenzie  
+	Fix compat change in last check-in
 
-	Fix a coding error in c-forward-<>-arglist-recur.  Fixes bug#22156
+	* lisp/gnus/gnus-group.el
+	(gnus-group-name-charset-group-alist): `find-coding-system'
+	doesn't exist in Emacs.
 
-	* lisp/progmodes/cc-engine.el (c-forward-<>-arglist-recur): Remove unused
-	variable `tmp'.
-	After a failed search for a matching ">", restore point before continuing.
+2016-02-13  Lars Ingebrigtsen  
 
-2015-12-22  Michael Albinus  
+	Always use url-queue
 
-	Instrument Tramp tests
+	* lisp/gnus/gnus-html.el (gnus-html-schedule-image-fetching):
+	Always use url-queue.
 
-	* test/automated/tramp-tests.el (tramp-test29-vc-registered)
-	(tramp--test-utf8): Instrument tests.
+2016-02-13  Lars Ingebrigtsen  
 
-2015-12-22  Martin Rudalics  
+	Remove compat functions from gnus-html.el
 
-	Fix `display-buffer' call in `display-message-or-buffer' (Bug#22221)
+	* lisp/gnus/gnus-html.el (gnus-html-encode-url-chars): Remove.
 
-	* lisp/simple.el (display-message-or-buffer): Call
-	`display-buffer' with ACTION instead of NOT-THIS-WINDOW
-	(Bug#22221).
+2016-02-13  Lars Ingebrigtsen  
 
-2015-12-22  Juri Linkov  
+	Remove compat code from gnus-group.el
 
-	* lisp/saveplace.el (toggle-save-place, save-place-to-alist)
+	* lisp/gnus/gnus-group.el (gnus-group-name-charset-group-alist)
+	(gnus-group-make-tool-bar, gnus-group-update-tool-bar): Remove compat code.
 
-	(save-places-to-alist, save-place-dired-hook):
-	Check for dired-subdir-alist.  (Bug#19851)
+2016-02-13  Lars Ingebrigtsen  
 
-2015-12-21  Paul Eggert  
+	Define gnus-diary-kill-entire-line unconditionally
 
-	Add FIXME comment re stack overflow and modules
+	* lisp/gnus/gnus-diary.el (gnus-diary-kill-entire-line):
+	Define unconditionally.
 
-2015-12-21  Paul Eggert  
+2016-02-13  Lars Ingebrigtsen  
 
-	Revert some recent emacs-module commentary
+	Remove compat code from gnus-cache and gnus-bookmark
 
-	Most of the recently-added commentary was incorrect, due to the
-	possibility of stack overflow.
+	* lisp/gnus/gnus-bookmark.el (gnus-bookmark-bmenu-mode-map): Ditto.
 
-2015-12-21  Paul Eggert  
+	* lisp/gnus/gnus-cache.el (gnus-cache-decoded-group-name):
+	Remove compat code.
 
-	Spelling fix: prefer "cooperate" to "co-operate"
+2016-02-13  Lars Ingebrigtsen  
 
-2015-12-21  Paul Eggert  
+	Remove compat code from gnus-art.el
 
-	Port undo fixes to -fno-common
+	* lisp/gnus/gnus-art.el (gnus-article-prepare)
+	(gnus-mime-copy-part, gnus-output-to-file)
+	(gnus-article-reply-with-original)
+	(gnus-button-handle-apropos-variable)
+	(gnus-button-handle-apropos-documentation):
 
-	Port recent fix for Bug#21968 to platforms like 'gcc -fno-common'.
-	* src/keyboard.c, src/keyboard.h (point_before_last_command_or_undo)
-	(buffer_before_last_command_or_undo):
-	Declare in keyboard.h, and define in keyboard.c,
-	instead of assuming the traditional Unix relaxed ref-def linkage.
+2016-02-13  Lars Ingebrigtsen  
 
-2015-12-20  Philipp Stephani  
+	Remove compat code from gnus-agent.el
 
-	Improve commentary for emacs-module.c
+	* lisp/gnus/gnus-agent.el (gnus-agent-make-mode-line-string):
+	Remove compat code.
 
-	* src/lisp.h: Document emacs-module.c assumptions about EQ and NILP.
-	* src/emacs-module.c (module_non_local_exit_get): Document that we
-	cannot use the current implementation.
-	(module_is_not_nil, module_eq): Document assumptions about EQ and
-	NILP.
+2016-02-13  Lars Ingebrigtsen  
 
-2015-12-20  Michael Albinus  
+	Rewrite gmm-labels usage to use cl-labels
 
-	Suppress test on Mac OS X
+	* lisp/gnus/gmm-utils.el (gmm-tool-bar-style): Remove compat code.
+	(gmm-labels): Remove.
 
-	* test/automated/tramp-tests.el (tramp--test-darwin-p): New defun.
-	(tramp--test-utf8): Use it.
+2016-02-13  Lars Ingebrigtsen  
 
-2015-12-20  Alan Mackenzie  
+	Remove compat code from canlock.el
 
-	Merge branch 'scratch/follow' into emacs-25
+	* lisp/gnus/canlock.el (defmacro): Remove
 
-	This allows Isearch, etc., to work well when Follow Mode is active.
+2016-02-13  Lars Ingebrigtsen  
 
-2015-12-19  Michael Albinus  
+	Remove compat code from auth-source
 
-	* lisp/net/tramp-sh.el (tramp-get-ls-command-with-w-option): Improve check.
+	* lisp/gnus/auth-source.el (auth-source-read-char-choice):
+	Remove compat code.
 
-2015-12-19  Eli Zaretskii  
+2016-02-13  Lars Ingebrigtsen  
 
-	Fix last commit
+	Fix gnus-group.el compilation warnings about unprefixed variables
 
-	* doc/emacs/rmail.texi (Rmail Deletion): Document new behavior of 'u'
-	with numeric argument.
+	* lisp/gnus/gnus-group.el (gnus-group-update-eval-form): Avoid
+	compilation warnings by passing in the dynamic variables as
+	explicit lexical parameters to `eval'.
 
-2015-12-19  Eli Zaretskii  
+2016-02-13  Lars Ingebrigtsen  
 
-	Document new features of Rmail
+	Fix the :tracker slot name
 
-	* doc/emacs/rmail.texi (Rmail Summary Edit, Rmail Deletion):
-	Document new behavior of 'd' and 'C-d' with numeric argument.
-	(Rmail Display): Document the rendering of HTML MIME parts.
+	* lisp/gnus/registry.el (registry-lookup-secondary): The
+	`tracker' slot is called `tracker', not `:tracker'.
 
-2015-12-19  Eli Zaretskii  
+2016-02-12  Lars Ingebrigtsen  
 
-	Improve documentation of new cl-lib functions
+	Fix compilation warnings in gnus-art.el
 
-	* doc/misc/cl.texi (Predicates on Numbers, Numerical Functions):
-	Fix wording.
+	* lisp/gnus/gnus-art.el (rfc1843-decode-region): Autoload.
+	(gnus-article-hide): Avoid compilation warnings.
 
-2015-12-19  Eli Zaretskii  
+2016-02-12  Lars Ingebrigtsen  
 
-	Document the new feature of 'minibuffer-with-setup-hook'
+	Fix compilation warning in gnus-score.el
 
-	* lisp/files.el (minibuffer-with-setup-hook): Clarify how FUN is
-	added to `minibuffer-setup-hook'.
+	* lisp/gnus/gnus-score.el (gnus-art): Require to silence byte
+	compiler.
 
-2015-12-19  Eli Zaretskii  
+2016-02-12  Andreas Schwab  
 
-	Document new features of Font Lock
+	Revert "Fix gnus-group-get-new-news-this-group on group with closed server"
 
-	* doc/lispref/modes.texi (Other Font Lock Variables): Document
-	'font-lock-flush-function' and 'font-lock-ensure-function'.
-	(Font Lock Basics): Document the basic fontification functions
-	referenced in "Other Font Lock Variables".
+	This reverts commit 9dc77e37aa84c6df9b3ddb4609f3c09201b0580e.
 
-	* lisp/font-lock.el (font-lock-flush, font-lock-ensure): Doc fix.
+	This makes nnimap groups not be activated.
 
-2015-12-19  Eli Zaretskii  
+2016-02-12  Lars Ingebrigtsen  
 
-	Document new features of Rectangle mode
+	Fix encoding problem introduced by previous patch series
 
-	* doc/emacs/killing.texi (Rectangles): Document "C-x C-x" in
-	rectangle-mark-mode.
+	* lisp/gnus/rfc2047.el: Ditto (bug#22648).
 
-2015-12-19  Eli Zaretskii  
+	* lisp/gnus/rfc2231.el: Fix problem created by the
+	mm-replace-in-string conversion.
 
-	Manual followup to last change
+2016-02-12  Lars Ingebrigtsen  
 
-	* doc/lispref/display.texi (Displaying Messages): Sync with the
-	doc string.  (Bug#22210)
+	Revert "Avoid defvarring prefix-less variables"
 
-2015-12-19  Eli Zaretskii  
+	This reverts commit 303390bda34f98b400798d5383cf0d722e35ba19.
 
-	Clarify doc string of 'display-message-or-buffer'
+	The defvars are needed if we're doing lexical-binding
 
-	* lisp/simple.el (display-message-or-buffer): Doc fix.  Suggested
-	by Sebastian Wiesner .  (Bug#22210)
+2016-02-12  Glenn Morris  
 
-2015-12-19  Eli Zaretskii  
+	* test/lisp/url/url-auth-tests.el (url-auth-test-digest-auth):
+	Make it pass.
 
-	* doc/emacs/emacs.texi (Top): Update top-level menus.
+	* test/lisp/url/url-auth-tests.el
+	(url-auth-test-digest-auth-retrieve-cache): Fix obvious typo.
 
-	* doc/lispref/elisp.texi (Top): Update top-level menus.
+2016-02-12  Lars Ingebrigtsen  
 
-2015-12-19  Eli Zaretskii  
+	Finish up cl-defmethoding registry,el
 
-	Document how to avoid file-local variables that aren't
+	* lisp/gnus/registry.el (initialize-instance): Use cl-defmethod.
 
-	* doc/emacs/custom.texi (Specifying File Variables): Describe how
-	to prevent Emacs from interpreting unrelated text as file-local
-	variables.  (Bug#22166)
+2016-02-12  Lars Ingebrigtsen  
 
-2015-12-19  Dave Thomas    (tiny change)
+	Revert the gnus-replace-in-string change, fix arguments, reapply
 
-	Fix a typo in eterm-color's termcap entry
+2016-02-12  Lars Ingebrigtsen  
 
-	* lisp/term.el (term-termcap-format): Fix a typo in the "ue="
-	entry.  (Bug#22184)
+	Silence more message.el compilation warnings
 
-2015-12-19  Eli Zaretskii  
+	* lisp/gnus/message.el (message-generate-headers): Don't use
+	variable values directly to get the header values, because
+	that breaks with lexical binding (without unprefixed defvars).
 
-	Allow 'browse-url-emacs' visit non-existent URLs
+2016-02-12  Lars Ingebrigtsen  
 
-	* lisp/url/url-handlers.el (url-insert-file-contents): Don't
-	signal an error if VISIT is non-nil, to more faithfully emulate
-	the behavior of 'insert-file-contents'.  (Bug#22160)
+	Fix various compilation warnings in message.el
 
-2015-12-19  Paul Eggert  
+	* lisp/gnus/message.el (message-fix-before-sending): Use
+	read-multiple-choice instead of gnus-multiple-choice.
+	(mm-util): Require.
+	(rfc2047): Require.
+	(message-remove-blank-cited-lines): Use message instead of
+	gnus-message.
+	(message-send): Use y-or-n-p instead of gnus-y-or-n-p.
 
-	Remove SunOS 4.x cruft
+2016-02-12  Lars Ingebrigtsen  
 
-	Support for SunOS 4.x was removed in Emacs 23 but some cruft was left behind.
-	* lib-src/pop.c [sun]: Remove no-longer-needed include.
-	* lwlib/xlwmenu.c (SUNSO41): Remove.
+	Silence compilation warning in mm-view
 
-2015-12-19  Paul Eggert  
+	* lisp/gnus/mm-view.el (mm-display-inline-fontify): Silence
+	compilation warning.
 
-	Merge from gnulib
+2016-02-12  Lars Ingebrigtsen  
 
-	This mostly commentary fixes.
-	* doc/misc/texinfo.tex, lib/intprops.h: Copy from gnulib.
-	* lib/gnulib.mk: Regenerate with new gnulib-tool.
+	Fix epg-related compilation warnings in mml-sec
 
-2015-12-18  Michael Albinus  
+	* lisp/gnus/mml-sec.el: Fix compilation warnings from the epg
+	library.
 
-	Minor fixes in Tramp
+2016-02-12  Lars Ingebrigtsen  
 
-	* lisp/net/tramp-sh.el (tramp-do-file-attributes-with-ls):
-	Reorder ls arguments.
+	rmail-dont-reply-to-names is obsolete
 
-	* lisp/net/tramp.el (tramp-dissect-file-name): Fix docstring.
+	* lisp/gnus/nnmail.el (nnmail-fancy-expiry-target): Don't bind
+	the obsolete `rmail-dont-reply-to-names' variable.
 
-2015-12-18  Michael Albinus  
+2016-02-12  Lars Ingebrigtsen  
 
-	Make tramp a built-in package
+	Partially revert the defmethod->cl-defmethod change in registry.el
 
-	* lisp/finder.el (finder-compile-keywords): Update
-	`package--builtins' also when Version: keyword is available.
+	* lisp/gnus/registry.el (initialize-instance): Use defmethod,
+	since cl-defmethod doesn't work with :after.
+	(initialize-instance): Ditto, but with :before.
 
-	* lisp/net/trampver.el: Add Version: keyword.
-	(tramp-version): Change it to "2.2.13.25.1", in order to be
-	compatible with `version-to-list'.
+2016-02-12  Lars Ingebrigtsen  
 
-2015-12-18  Lele Gaifax  
+	Avoid obsolete function in plstore
 
-	* etc/tutorials/TUTORIAL.it: Update and fix typos.
+	* lisp/gnus/plstore.el (plstore--insert-buffer): Use setf
+	instead of the obsolete epg-context-set-armor.
 
-2015-12-18  Alan Mackenzie  
+2016-02-12  Lars Ingebrigtsen  
 
-	Rename `recenter-group' to `recenter-window-group'
+	Use cl-defmethod in registry.el
 
-	* doc/lispref/windows.texi (Textual Scrolling)
-	* lisp/window.el (top level, recenter-group)
-	* lisp/follow.el (follow-mode)
-	* lisp/isearch.el (isearch-back-into-window): Rename `recenter-group' to
-	`recenter-window-group' and `recenter-group-function' to
-	`recenter-window-group-function'.
+	* lisp/gnus/registry.el: Use cl-defmethod instead of the
+	obsolete defmethod.
 
-2015-12-18  Eli Zaretskii  
+2016-02-12  Lars Ingebrigtsen  
 
-	Fix vertical-motion in tabulated-list mode
+	Make sieve-manage require sasl
 
-	* src/indent.c (Fvertical_motion): When moving from line beginning
-	to point under line truncation, assume overshoot by one line only
-	if point actually lies beyond the window's right margin.
-	(Bug#22194)
+	* lisp/gnus/sieve-manage.el: Fix compilation warning by
+	requiring sasl.
 
-2015-12-18  Martin Rudalics  
+2016-02-12  Lars Ingebrigtsen  
 
-	Don't have help functions call x-display-pixel-width/-height on ttys
+	Avoid defvarring prefix-less variable
 
-	* lisp/help.el (temp-buffer-max-height, temp-buffer-max-width):
-	Don't call x-display-pixel-width/-height on ttys.
+	* lisp/gnus/mm-uu.el (mm-uu-entry): Rename from `entry'.
 
-2015-12-18  Dmitry Gutov  
+2016-02-12  Lars Ingebrigtsen  
 
-	Use 'hg id' in vc-hg-previous-revision
+	* lisp/gnus/mailcap.el: Remove usage of mailcap-delete-duplicates.
 
-	* lisp/vc/vc-hg.el (vc-hg-previous-revision):
-	Use 'hg id' to retrieve it (bug#22032).
+2016-02-12  Lars Ingebrigtsen  
 
-2015-12-17  Alan Mackenzie  
+	Don't use the obsolete char-valid-p function
 
-	* lisp/follow.el (follow-sit-for): Remove (it's redundant).
+	* lisp/gnus/mm-url.el (mm-url-decode-entities): Don't use the
+	obsolete char-valid-p function.
 
-2015-12-17  Eli Zaretskii  
+2016-02-12  Lars Ingebrigtsen  
 
-	Fix a typo in the Emacs manual
+	Fix missed translation in a previous commit
 
-	* doc/emacs/trouble.texi (Sending Patches): Fix a typo.  Reported
-	by Lele Gaifax .  (Bug#22193)
+	* lisp/gnus/mailcap.el (mailcap-mime-types): Fix missed
+	translation of mailcap-delete-duplicates.
 
-2015-12-17  Eli Zaretskii  
+2016-02-12  Lars Ingebrigtsen  
 
-	Fix parsing netrc entries with ports
+	Avoid using mm-make-temp-file
 
-	* lisp/gnus/auth-source.el (auth-source-ensure-strings): Don't
-	make a list out of 't'.  (Bug#22188)
+	* lisp/gnus/mail-source.el (mail-source-delete-crash-box): Ditto.
 
-	* test/automated/auth-source-tests.el
-	(auth-source-test-netrc-parse-entry): New test.
+	* lisp/gnus/mm-decode.el (mm-display-external): Ditto.
 
-2015-12-17  Paul Eggert  
+	* lisp/gnus/mml-smime.el (mml-smime-openssl-encrypt): Ditto.
 
-	Fix typo in Doug Lea malloc configure log
+2016-02-12  Lars Ingebrigtsen  
 
-	* configure.ac (emacs_cv_var_doug_lea_malloc):
-	Fix typo that confused the log output of 'configure'.
+	Fix compilation warning in gnus-start
 
-2015-12-16  Nicolas Petton  
+	* lisp/gnus/gnus-start.el (gnus-slave-save-newsrc): Avoid
+	mm-make-temp-file.
 
-	* etc/NEWS: Mention the new pcase patterns `seq' and `map'.
+2016-02-12  Lars Ingebrigtsen  
 
-2015-12-16  Alan Mackenzie  
+	Avoid the obsoleted defmethod
 
-	* etc/NEWS: Move entry on pcase to correct section
+	* lisp/gnus/gnus-icalendar.el: Use cl-defmethod instead of
+	defmethod.
 
-	(Accidentally omitted from previous commit)
+2016-02-12  Lars Ingebrigtsen  
 
-2015-12-16  Alan Mackenzie  
+	Avoid defvarring prefix-less variables
 
-	Add documentation for changes to Show Paren mode.
+	* lisp/gnus/gnus-group.el (gnus-group-update-eval-form): We
+	don't need to `defvar' the short variables to allow `eval' to
+	use them.
 
-	* lisp/paren.el (show-paren-highlight-openparen): Enhance doc string.
+2016-02-12  Lars Ingebrigtsen  
 
-	* doc/emacs/programs.texi (Matching): Add descriptions of some pertinent user
-	options, including the new show-paren-when-point-inside-paren and
-	show-paren-when-point-in-periphery.
+	nnweb doesn't need unibyte buffers
 
-	* etc/NEWS (.. Specialized Modes ...): Add an entry for Show Paren mode.
-	Move an entry on pcase to the Lisp Changes section.
+	* lisp/gnus/nnweb.el (nnweb-retrieve-headers)
+	(nnweb-read-overview, nnweb-request-article)
+	(nnweb-google-reference): Unibyte buffers are not needed here.
 
-2015-12-16  Eli Zaretskii  
+2016-02-12  Lars Ingebrigtsen  
 
-	Document Eldoc changes
+	Encode before sending from nnspool
 
-	* doc/emacs/programs.texi (Lisp Doc): Document Global Eldoc mode.
+	* lisp/gnus/nnspool.el (nnspool-request-post): Encode data
+	before sending it to the news server.
 
-2015-12-16  Eli Zaretskii  
+2016-02-11  Lars Ingebrigtsen  
 
-	Fix invocation of Python and Guile interpreters from gdb-mi
+	nnrss buffers don't have to be unibyte
 
-	* lisp/progmodes/gdb-mi.el (gdb-control-commands-regexp): Add
-	commands for interactive Python and Guile interpreters.
-	(gdb-send): Recognize various ways of exiting from Python and
-	Guile interpreters and returning to GDB.  For details, see
-	http://lists.gnu.org/archive/html/emacs-devel/2015-12/msg00693.html
-	and http://stackoverflow.com/questions/31514741.
+	* lisp/gnus/nnrss.el (nnrss-insert): The buffer doesn't have
+	to be unibyte just to receive data, I think.
 
-2015-12-16  Paul Eggert  
+2016-02-11  Lars Ingebrigtsen  
 
-	Remove attempt to use C11 threads
+	Don't use mm-with-unibyte-current-buffer in mml2015
 
-	C11 threads are not needed for Emacs now, and their use is causing
-	hassles on FreeBSD 10.x.  Problem reported by Ashish SHUKLA in:
-	http://lists.gnu.org/archive/html/emacs-devel/2015-12/msg00648.html
-	* configure.ac: Do not check for C11 threads. Remove unnecessary
-	fiddling with CPPFLAGS when configuring pthreads.
-	* src/emacs-module.c (main_thread, check_main_thread)
-	(module_init): Do not worry about C11 threads.
+	* lisp/gnus/mml2015.el (mml2015-mailcrypt-encrypt): Don't use
+	mm-with-unibyte-current-buffer.
 
-2015-12-15  Michael Albinus  
+2016-02-11  Lars Ingebrigtsen  
 
-	Set utf8 encoding with stty in Tramp
+	Don't use mm-with-unibyte-current in mml1991
 
-	* lisp/net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
-	Move up uname check.  Handle Mac OS X eol encoding.  Set utf8
-	encoding with stty.
+	* lisp/gnus/mml1991.el (mml1991-epg-sign): Don't use
+	mm-with-unibyte-current.
 
-2015-12-15  Alan Mackenzie  
+2016-02-11  Lars Ingebrigtsen  
 
-	Tidy up documentation associated with window groups.
+	Don't use mm-with-unibyte-current in mml1991
 
-	* doc/lispref/windows.texi (Basic Windows): Add an @anchor for "Window
-	Groups".  Correct example function to `window-group-start'.
-	(Window Start and End, Textual scrolling): Point to the new anchor.  State
-	that (most of) the args in window group functions have the same meaning as for
-	the corresponding window primitives.
+	* lisp/gnus/mml1991.el (mml1991-pgg-sign): Don't use
+	mm-with-unibyte-current.
 
-	* doc/lispref/positions.texi (Screen Lines).  Same as above.
+2016-02-11  Lars Ingebrigtsen  
 
-2015-12-15  Michael Albinus  
+	Don't use mm-with-unibyte-buffer in utf7
 
-	Complete last commit
+	* lisp/gnus/utf7.el (utf7-fragment-encode): Don't use
+	mm-with-unibyte-buffer.
 
-	* lisp/net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
-	Move uname check up.  Handle Mac OS X eol encoding.
+2016-02-11  Lars Ingebrigtsen  
 
-2015-12-15  Michael Albinus  
+	Remove XEmacs compat code from Gnus helper libraries
 
-	Handle Mac OS X eol encoding in Tramp
+	* lisp/gnus/plstore.el (plstore-called-interactively-p): Remove.
 
-	* lisp/net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
-	Handle Mac OS X eol encoding.
+	* lisp/gnus/pop3.el (pop3-make-date): Remove XEmacs compat.
 
-2015-12-15  YAMAMOTO Mitsuharu  
+	* lisp/gnus/sieve-mode.el: Remove XEmacs compat.
 
-	Fix variable name typo in compute_tip_xy
+	* lisp/gnus/spam-stat.el (spam-stat-called-interactively-p): Remove.
 
-	* src/w32fns.c (compute_tip_xy):
-	* src/xfns.c (compute_tip_xy): Modify *root_x instead of *root_y
-	when `right' is integer.
+2016-02-11  Lars Ingebrigtsen  
 
-2015-12-14  foudfou  
+	Remove XEmacs compat code from Gnus backends
 
-	* lisp/ibuffer.el: Add ability to (un-)mark or delete buffers in the region.
+	* lisp/gnus/mm-view.el (mm-inline-image-xemacs): Remove.
+	(mm-inline-image): Rename from mm-inline-image-emacs.
 
-2015-12-14  Tassilo Horn  
+	* lisp/gnus/mml.el: Remove XEmacs compat code.
 
-	Revert "Fix rx matcher overflow without limiting"
+	* lisp/gnus/nnheader.el: Remove XEmacs compat code.
 
-	This reverts commit fe27e037663d36be3e5741c2ce86ab4ee8017db1.
+	* lisp/gnus/nnimap.el (nnimap-open-connection-1): Remove
+	XEmacs compat code.
 
-2015-12-14  Alan Mackenzie  
+	* lisp/gnus/nnir.el (nnir-run-gmane): Remove XEmacs compat code.
 
-	Ispell: Bind isearch-regexp-function to nil around call to isearch..-new-loop
+	* lisp/gnus/nnmail.el (nnmail-pathname-coding-system): Remove
+	XEmacs compat code.
 
-	* lisp/textmodes/ispell.el (ispell-highlight-spelling-error-overlay): bind
-	isearch-regexp-function to nil around call to isearch-lazy-highligh-new-loop.
+	* lisp/gnus/nnmairix.el: Remove XEmacs compat code.
 
-2015-12-14  Tassilo Horn  
+	* lisp/gnus/nnrss.el: Remove XEmacs compat code.
 
-	Fix rx matcher overflow without limiting
+	* lisp/gnus/nntp.el: Remove XEmacs compat code.
 
-	* lisp/textmodes/reftex-vars.el (reftex-label-regexps): Improve last
-	change to the regexp without imposing a limit on the length of the
-	options.
+2016-02-11  Lars Ingebrigtsen  
 
-2015-12-14  Alan Mackenzie  
+	Remove XEmacs compat functions from mm-util.el
+
+	* lisp/gnus/mm-util.el (mm-special-display-p): Remove.
+	(mm-decode-coding-string, mm-encode-coding-string)
+	(mm-decode-coding-region, mm-encode-coding-region): Remove.
+	(mm-string-to-multibyte): Remove.
+	(mm-char-or-char-int-p): Remove.
+	(mm-ucs-to-char): Remove compat versions of the function.
+	(mm-read-coding-system): Remove.
+	(mm-coding-system-p): Remove compat code.
+	(mm-enrich-utf-8-by-mule-ucs): Remove.
+	(mm-enable-multibyte, mm-disable-multibyte): Remove compat versions.
+	(mm-delete-duplicates): Remove.
+	(mm-multibyte-p): Remove compat versions.
+	(mm-xemacs-find-mime-charset-1): Remove.
+	(mm-xemacs-find-mime-charset): Remove.
+	(mm-make-temp-file): Made obsolete.
+	(mm-find-buffer-file-coding-system): Remove XEmacs compat.
 
-	Enhance ispell-skip-region-alist by generating part of it at runtime.
+2016-02-11  Lars Ingebrigtsen  
 
-	* lisp/textmodes/ispell.el (ispell--\\w-filter, ispell--make-\\w-expression)
-	(ispell--make-filename-or-URL-re): New functions which generate a regexp.
-	(ispell-skip-region-alist): Remove the bit that matches a filename/URL, etc.
-	(ispell-begin-skip-region-regexp, ispell-skip-region-list, ispell-message):
-	Include the result of ispell--make-filename-or-URL-re in regexps.
+	Remove Message and mm-decode XEmacs compat code
 
-2015-12-14  Glenn Morris  
+	* lisp/gnus/message.el: Remove XEmacs compat code.
 
-	* build-aux/gitlog-to-emacslog: Ignore more pointless merge commits.
+	* lisp/gnus/mm-decode.el (mm-create-image-xemacs): Remove.
 
-2015-12-14  Alan Mackenzie  
+	* lisp/gnus/mm-util.el: Remove some XEmacs compat code.
 
-	Replace GROUP argument in six window primitives by new functions.
+2016-02-11  Lars Ingebrigtsen  
 
-	* doc/lispref/windows.texi (Window Start and End, Textual Scrolling)
-	* doc/lispref/positions.texi (Screen Lines): Remove optional GROUP argument
-	from description of six window functions.  Add in description of new functions
-	window-group-start, window-group-end, set-window-group-start,
-	pos-visible-in-window-group-p, recenter-group and move-to-window-group-line,
-	together with the six variables indirecting to the pertinent group
-	functions.
+	Remove som XEmacs compat code from message.el
 
-	* src/window.c
-	* src/keyboard.c: Revert the commit from 2015-11-11 12:02:48, in so far as it
-	applies to these two files, which added the GROUP argument to six window
-	primitives.
+	* lisp/gnus/message.el: Remove some XEmacs compat code.
 
-	* lisp/follow.el (follow-mode): Use updated variable names for the indirected
-	functions.
+2016-02-11  Lars Ingebrigtsen  
 
-	* lisp/isearch.el (isearch-update, isearch-done, isearch-string-out-of-window)
-	(isearch-back-into-window, isearch-lazy-highlight-new-loop)
-	(isearch-lazy-highlight-search, isearch-lazy-highlight-update): Replace calls
-	to window primitives (e.g. window-start) with a GROUP argument by calls to
-	new functions (e.g. window-group-start).
+	Remove XEmacs compat code from ietf-drums.el
 
-	* lisp/ispell.el (ispell-command-loop): Replace call to
-	pos-visible-in-window-p with pos-visible-in-window-group-p.
+	* lisp/gnus/ietf-drums.el (ietf-drums-syntax-table): Drop
+	XEmacs compat.
 
-	* lisp/window.el (window-group-start, window-group-end)
-	(set-window-group-start, recenter-group, pos-visible-in-window-group-p)
-	(selected-window-group, move-to-window-group-line): New functions.
-	(window-group-start-function, window-group-end-function)
-	(set-window-group-start-function, recenter-group-function)
-	(pos-visible-in-window-group-p-function, selected-window-group-function)
-	(move-to-window-group-line-function): New variables.
+2016-02-11  Lars Ingebrigtsen  
 
-2015-12-14  Vitorio Miguel    (tiny change)
+	Remove XEmacs compat code from gravatar.el
 
-	* etc/tutorials/TUTORIAL.pt_BR: Fix a typo.  (Bug#22165)
+	* lisp/gnus/gravatar.el: Remove XEmacs compat code from
+	gravatar.el.
 
-2015-12-13  Eli Zaretskii  
+2016-02-11  Lars Ingebrigtsen  
 
-	Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25
+	Remove more XEmacs compat code from Gnus
 
-2015-12-13  Tassilo Horn  
+	* lisp/gnus/gnus-util.el (gnus-bound-and-true-p): Remove.
+	(gnus-timer--function): Remove.
 
-	Improve regex to not trigger stack overflow
+	* lisp/gnus/gnus-uu.el (gnus-uu-save-article): Remove XEmacs
+	19.2 compat.
 
-	* lisp/textmodes/reftex-vars.el (reftex-label-regexps): Improve regex in
-	order not to trigger a stack overflow in regex matcher with unbalanced
-	brackets (bug#22146).
+	* lisp/gnus/gnus-win.el: Remove XEmacs compat code.
 
-2015-12-13  Eli Zaretskii  
+2016-02-11  Lars Ingebrigtsen  
 
-	Fix visiting files with raw-text
+	Remove more XEmacs compat functions from gnus-util.el
 
-	* src/fileio.c (Finsert_file_contents): Fix setting buffer unibyte
-	when some stuff was actually read.  (Bug#22162)
+	* lisp/gnus/gnus-util.el (gnus-put-display-table): Remove.
+	(gnus-get-display-table): Remove.
+	(gnus-format-message): Remove.
 
-2015-12-13  Tassilo Horn  
+2016-02-11  Lars Ingebrigtsen  
 
-	Fix regex matching keyval labels
+	Remove more XEmacs compat functions from Gnus
 
-	* lisp/textmodes/reftex-vars.el (reftex-label-regexps): Fix regexp
-	matching keyval labels.
+	* lisp/gnus/gnus-util.el (gnus-next-char-property-change): Remove.
+	(gnus-previous-char-property-change): Remove.
+	(gnus-graphic-display-p): Remove.
+	(gnus-select-frame-set-input-focus): Remove.
 
-2015-12-13  Michael Albinus  
+2016-02-11  Lars Ingebrigtsen  
 
-	* lisp/ido.el (ido-file-name-all-completions-1): Do not raise an error
+	Remove more XEmacs compat code from gnus-util
 
-	... in case of Tramp.  (Bug#20821)
+	* lisp/gnus/gnus-util.el (gnus-make-local-hook): Remove (and
+	all its usages).
+	(gnus-invisible-p): Remove.
 
-2015-12-13  Paul Eggert  
+2016-02-11  Lars Ingebrigtsen  
 
-	Fix performance regression with gcc -O0
+	Remove gnus-make-local-hook
 
-	This fixes the smaller performance hit that I noted in:
-	https://lists.gnu.org/archive/html/emacs-devel/2015-12/msg00357.html
-	* src/alloc.c (macro_XPNTR_OR_SYMBOL_OFFSET, macro_XPNTR):
-	* src/puresize.h (puresize_h_PURE_P)
-	(puresize_h_CHECK_IMPURE):
-	New macros, with the old contents of the functions.
-	* src/alloc.c (XPNTR_OR_SYMBOL_OFFSET, XPNTR):
-	* src/puresize.h (PURE_P, CHECK_IMPURE):
-	Use the new macros.  Also macros, if DEFINE_KEY_OPS_AS_MACROS.
-	* src/conf_post.h (ATTRIBUTE_UNUSED):
-	* src/lisp.h (DEFINE_KEY_OPS_AS_MACROS): New macros.
+	* lisp/gnus/gnus-util.el (gnus-make-local-hook): Remove (and
+	all its usages).
 
-2015-12-12  Artur Malabarba  
+2016-02-11  Lars Ingebrigtsen  
 
-	* lisp/emacs-lisp/package.el (package-unpack): Security check
+	gnus-replace-in-string -> replace-regexp-in-string
 
-	Check that we received the package we were offered.
+	* lisp/gnus/gnus-util.el (gnus-replace-in-string): Declare
+	obsolete.  Transform all usages of it into
+	replace-regexp-in-string.
 
-2015-12-12  Artur Malabarba  
+	* lisp/gnus/mailcap.el (mailcap-replace-in-string): Remove.
 
-	* lisp/emacs-lisp/package.el (package--compile): Don't activate
+2016-02-10  Lars Ingebrigtsen  
 
-	`package-unpack' takes care of all activations now (other than
-	`package-initialize).  `package--compile' now only compiles.
+	Remove Gnus XEmacs compat
 
-2015-12-12  Eli Zaretskii  
+	* lisp/gnus/gnus-start.el (gnus-dribble-enter): Remove comment
+	about code that doesn't work in XEmacs.
 
-	Document the new bindings of  and  in the minibuffer
+	* lisp/gnus/gnus-sum.el: Remove XEmacs compat.
 
-	* doc/emacs/mini.texi (Minibuffer History): Describe the new
-	bindings of  and  in the minibuffer.
+	* lisp/gnus/gnus-topic.el: Remove XEmacs compat.
 
-2015-12-12  Eli Zaretskii  
+2016-02-10  Lars Ingebrigtsen  
 
-	Document new features of Ido
+	Remove compat functions in gnus-spec.el
 
-	* doc/misc/ido.texi (Misc): Document 'C-S-b'.
+	* lisp/gnus/gnus-spec.el (gnus-string-width-function): Remove.
+	(gnus-substring-function): Remove.
+	(gnus-use-correct-string-widths): Remove.
+	(gnus-make-format-preserve-properties): Remove.
+	(gnus-xmas-format): Remove.
 
-2015-12-12  Martin Rudalics  
+	* lisp/gnus/gnus-srvr.el (gnus-server-mode): Remove XEmacs compat.
 
-	Fix frame height calculations with added menu bar on Windows (Bug#22105)
+2016-02-10  Lars Ingebrigtsen  
 
-	* doc/lispref/frames.texi (Parameter Access): Mention pitfalls
-	when simultaneously specifying multiple parameters for
-	`modify-frame-parameters' that all may change the frame's size.
-	* src/w32fns.c (x_set_menu_bar_lines): Don't set
-	windows_or_buffers_changed here.
-	(my_create_tip_window, Fx_show_tip): Call AdjustWindowRect
-	with third argument false.
-	* src/w32menu.c (set_frame_menubar): Set
-	windows_or_buffers_changed here.
-	* src/w32term.c (x_set_window_size): Determine third argument of
-	AdjustWindowRect from whether the frame has a menu bar and not
-	from whether it wants one.
+	Remove Gnus XEmacs compat functions
 
-2015-12-12  Eli Zaretskii  
+	* lisp/gnus/gnus-registry.el: Remove XEmacs compat.
 
-	Document the change in interactive shell mode
+	* lisp/gnus/gnus-salt.el: Remove XEmacs compat.
 
-	* doc/emacs/misc.texi (Interactive Shell): Document that the
-	'*shell*' buffer by default displays in a new window.
+	* lisp/gnus/gnus-score.el (gnus-decay-score): Remove XEmacs compat.
 
-2015-12-12  Eli Zaretskii  
+2016-02-10  Lars Ingebrigtsen  
 
-	Document new features of package.el
+	Remove Gnus XEmacs compatibility
 
-	* doc/emacs/package.texi (Package Menu): Document the 'external'
-	status and the new menu commands.
-	(Package Installation): Document archive priorities.
+	* lisp/gnus/gnus-demon.el (gnus-demon-idle-since): Remove
+	XEmacs compat.
 
-	* lisp/emacs-lisp/package.el (package-archive-priorities): Doc fix.
-	(package-menu-hide-low-priority): Doc fix.
+	* lisp/gnus/gnus-dired.el: Remove XEmacs compat.
 
-2015-12-12  Eli Zaretskii  
+	* lisp/gnus/gnus-draft.el: Remove XEmacs compat.
 
-	Update and document new features of xterm support
+	* lisp/gnus/gnus-gravatar.el (gnus-gravatar-insert): Remove
+	XEmacs compat.
 
-	* doc/emacs/frames.texi (Text-Only Mouse): Document that
-	track-mouse is supported by newer xterm versions.
+	* lisp/gnus/gnus-group.el: Remove XEmacs compat.
 
-2015-12-12  Eli Zaretskii  
+	* lisp/gnus/gnus-html.el: Remove XEmacs compat.
 
-	Document new features of Prettify Mode
+	* lisp/gnus/gnus-ml.el: Remove XEmacs compat.
 
-	* doc/emacs/programs.texi (Misc for Programs): Document
-	'prettify-symbols-compose-predicate' and
-	'prettify-symbols-unprettify-at-point'.
+	* lisp/gnus/gnus-picon.el (gnus-picon-style): Remove XEmacs comment.
 
-	* lisp/progmodes/prog-mode.el (prettify-symbols-alist)
-	(prettify-symbols-default-compose-p)
-	(prettify-symbols-compose-predicate)
-	(prettify-symbols--compose-symbol): Doc fixes.
+2016-02-10  Lars Ingebrigtsen  
 
-2015-12-12  Eli Zaretskii  
+	Don't use image-map if it isn't defined
 
-	Document multi-mode indentation facilities
+	* lisp/net/shr.el (shr-image-map): Only use image-map as a
+	parent if it's defined (bug#22614).
 
-	* doc/lispref/text.texi (Mode-Specific Indent): Document
-	'prog-indentation-context', 'prog-first-column', and 'prog-widen'.
+2016-02-10  Lars Ingebrigtsen  
 
-	* lisp/progmodes/prog-mode.el (prog-indentation-context)
-	(prog-widen): Doc fixes.
+	Check for MagickAutoOrientImage
 
-2015-12-12  Eli Zaretskii  
+	* configure.ac: Check for MagickAutoOrientImage.
 
-	Document 'vc-refresh-state'
+	* src/image.c (imagemagick_load_image): Don't use
+	MagickAutoOrientImage unless it's available.
 
-	* doc/emacs/maintaining.texi (Version Control): Document
-	'vc-refresh-state'.
+2016-02-10  Lars Ingebrigtsen  
 
-	* lisp/vc/vc-hooks.el (vc-refresh-state): Doc fix.
+	Document EXIF image rotation
 
-2015-12-12  Eli Zaretskii  
+	* doc/lispref/display.texi (ImageMagick Images): Mention EXIF rotation.
 
-	Fix echo for "C-u"
+2016-02-10  Dima Kogan  
 
-	* src/keyboard.c (command_loop_1): Undo last change.  It caused
-	duplicate echo of C-u.  (Bug#22107)
+	Support integer image rotation and respect EXIF rotations
 
-2015-12-11  Eli Zaretskii  
+	* src/image.c (imagemagick_load_image): Allow integer rotations in
+	addition to floating point rotations (bug#22591).
+	* src/image.c (imagemagick_load_image): Images that have an
+	orientation given in EXIF and have no explicit :rotation tag are now
+	pre-rotated.  All information such as width/height is reported for the
+	rotated image.
 
-	Avoid errors when creating files under SVN in new directory
+2016-02-10  Wolfgang Jenkner  
 
-	* lisp/vc/vc-svn.el (vc-svn-registered): Use
-	file-accessible-directory-p, to avoid cd'ing to a non-existing
-	directory, which signals an error on some systems.  (Bug#21984)
-	(vc-svn-checkin): Call log-edit-extract-headers with 2 arguments.
-	Use declare-function to avoid byte-compiler warnings.
+	* lisp/net/shr.el (image-map): Defvar it.  (Bug#22614)
 
-2015-12-11  Eli Zaretskii  
+2016-02-10  Lars Ingebrigtsen  
 
-	Improve Lua support in etags
+	* lisp/gnus/gnus-cite.el: Remove XEmacs compat code.
 
-	* lib-src/etags.c (Lua_functions): Skip spaces before looking for
-	"function".
+2016-02-09  Lars Ingebrigtsen  
 
-	* etc/NEWS: Mention improved Lua support by 'etags'.
+	Remove compat code from gnus-bookmark.el
 
-	* test/etags/lua-src/test.lua (test): Add tests for indented
-	function definitions.
-	* test/etags/ETAGS.good_1:
-	* test/etags/ETAGS.good_2:
-	* test/etags/ETAGS.good_3:
-	* test/etags/ETAGS.good_4:
-	* test/etags/ETAGS.good_5:
-	* test/etags/ETAGS.good_6:
-	* test/etags/CTAGS.good: Adapt to the modified Lua tests.
+	* lisp/gnus/gnus-bookmark.el (gnus-bookmark-mouse-available-p): Remove.
+	(gnus-bookmark-remove-properties): Remove.
 
-2015-12-11  Eli Zaretskii  
+2016-02-09  Lars Ingebrigtsen  
 
-	Fix 'this-command-keys' wrt prefix argument
+	Remove XEmacs compat code from gnus-a*.el
 
-	* src/keyboard.c (command_loop_1): Restore the feature whereby C-u
-	was part of this-command-keys, but not of this-single-command-keys.
-	(Bug#22107)
+	* lisp/gnus/gnus-agent.el: Remove compat code.
 
-	* lisp/simple.el (internal-echo-keystrokes-prefix): Add
-	commentary about the function's return value.
+	* lisp/gnus/gnus-art.el: Remove compat code.
 
-2015-12-11  Eli Zaretskii  
+	* lisp/gnus/gnus-async.el: Remove compat code.
 
-	* lisp/files.el (load-library): Doc fix.  (Bug#22140)
+2016-02-09  Lars Ingebrigtsen  
 
-2015-12-11  Eli Zaretskii  
+	Remove gmm compat functions
 
-	Improve and document Ruby support in 'etags'
+	* lisp/gnus/gmm-utils.el (gmm-image-search-load-path): Remove.
+	(gmm-write-region): Remove.
+	(gmm-called-interactively-p): Remove.
 
-	* lib-src/etags.c (Ruby_suffixes): Add ".ruby".
-	(Ruby_functions): Support "module" and overloaded operators.
-	(Ruby_help): Mention "module".
+2016-02-09  Lars Ingebrigtsen  
 
-	* test/etags/ruby-src/test.rb:
-	* test/etags/ruby-src/test1.ru: New files.
-	* test/etags/Makefile (RBSRC): New tests.
-	(SRCS): Add ${RBSRC}.
-	* test/etags/ETAGS.good_1:
-	* test/etags/ETAGS.good_2:
-	* test/etags/ETAGS.good_3:
-	* test/etags/ETAGS.good_4:
-	* test/etags/ETAGS.good_5:
-	* test/etags/ETAGS.good_6:
-	* test/etags/CTAGS.good: Adapt to the new Ruby tests.
+	* lisp/gnus/ecomplete.el: Remove XEmacs compat code.
 
-	* doc/man/etags.1: Mention Ruby support.
-	* etc/NEWS: Mention Ruby support.
+2016-02-09  Lars Ingebrigtsen  
 
-2015-12-11  Xi Lu  
+	Remove compat code from compface.el
 
-	Initial support for Ruby in 'etags'
+	* lisp/gnus/compface.el: Remove XEmacs compat code throughout.
 
-	* lib-src/etags.c : New variable.
-	(lang_names): Add an entry for Ruby.
-	(Ruby_functions): New function.  (Bug#22116)
+2016-02-09  Lars Ingebrigtsen  
 
-2015-12-11  Eli Zaretskii  
+	Remove the now empty gnus-ems.el and references to it
 
-	Clarify documentation of 'modify-frame-parameters'
+2016-02-09  Lars Ingebrigtsen  
 
-	* doc/lispref/frames.texi (Parameter Access): Clarify what "ignored
-	PARMs" mean for 'modify-frame-parameters'.
+	Remove Gnus compat names for mouse bindings
 
-	* src/frame.c (Fmodify_frame_parameters): Clarify what "ignored
-	PARMs" mean for this function.  (Bug#22104)
+	* lisp/gnus/gnus-ems.el (gnus-widget-button-keymap): Remove.
+	(gnus-down-mouse-2): Remove.
+	(gnus-down-mouse-3): Remove.
 
-2015-12-11  Eli Zaretskii  
+2016-02-09  Lars Ingebrigtsen  
 
-	Fix setting buffer unibyte when reading from a device
+	Drop Gnus compat functions
 
-	* src/fileio.c (Finsert_file_contents): Call Fset_buffer_multibyte
-	to make a (possibly non-empty) buffer unibyte.  (Bug#22096)
+	* lisp/gnus/gnus-ems.el (gnus-mule-max-width-function): Remove.
 
-2015-12-11  Eli Zaretskii  
+	* lisp/gnus/gnus-util.el (gnus-kill-all-overlays): Move here.
 
-	Clarify documentation of 'values'
+	* lisp/gnus/gnus.el (gnus-mode-line-modified): Remove.
 
-	* doc/lispref/eval.texi (Eval): Clarify that 'values' are not
-	updated by any evaluation commands in 'lisp-interaction-mode'.
-	(Bug#22056)
+2016-02-09  Lars Ingebrigtsen  
 
-2015-12-11  Anders Lindgren  
+	Get rid of gnus-ems-redefine
 
-	Fixed subversion vc error when opening file in new directory (bug#21984).
+	* lisp/gnus/gnus-ems.el (gnus-mouse-face-prop): Remove.
 
-	* lisp/vc/vc-svn.el (vc-svn-registered): Check if directory exists.
+2016-02-09  Lars Ingebrigtsen  
 
-2015-12-09  Eli Zaretskii  
+	* lisp/gnus/gnus-spec.el: Move definition here from gnus-ems.el.
 
-	Yet another fix for when point ends up in invisible text
+2016-02-09  Lars Ingebrigtsen  
 
-	* src/xdisp.c (redisplay_window): When someone forced
-	window-start, and honoring that failed to show the cursor, try
-	moving out of invisible text, before falling back to the middle of
-	the window.  (Bug#22098)
+	Remove Gnus compat code
 
-2015-12-09  Michael Albinus  
+	* lisp/gnus/gnus-ems.el (gnus-ems-redefine): Remove
+	transitional code from ten years ago.
 
-	Fix error in Tramp perl script for cygwin
+2016-02-09  Lars Ingebrigtsen  
 
-	* lisp/net/tramp-sh.el (tramp-perl-file-truename): Do not raise an
-	error if file doesn't exist.
+	Allow interactively scaling past :max-width etc
 
-2015-12-09  YAMAMOTO Mitsuharu  
+	* lisp/image.el (image--current-scaling)
+	(image--image-without-parameters): New functions.
+	(image--change-size): Use them to allow changing the size of a
+	image even if it has :width/:max-width (etc.) already set.
 
-	Remove font workaround for limited outdated versions
+2016-02-09  Lars Ingebrigtsen  
 
-	* src/macfont.m (mac_font_descriptor_get_adjusted_weight): Remove
-	workaround for HiraginoSans-W7 on OS X 10.11 and 10.11.1.
+	* lisp/gnus/mm-decode.el (shr-image-map): Compilation fix.
 
-2015-12-09  Anders Lindgren  
+2016-02-09  Lars Ingebrigtsen  
 
-	Don't add "." to load path (bug#21104)
+	Allow accessing the image commands via shr
 
-	When configured with --enable-locallisppath=no, which is the
-	default for OS X, the load-path incorrectly was populated with ".".
+	* lisp/gnus/mm-decode.el (mm-convert-shr-links): Allow
+	accessing the image commands.
 
-	* src/lread.c (init_lread): Don't call `decode_env_path' when
-	PATH_SITELOADSEARCH is empty.
+	* lisp/net/shr.el (shr-image-map): New map used for images.
+	(shr-urlify): Don't overwrite image maps when applying URL maps.
 
-2015-12-08  Artur Malabarba  
+2016-02-09  Lars Ingebrigtsen  
 
-	* lisp/emacs-lisp/package.el (package--with-response-buffer):
+	Use a sparse image keymap
 
-	Search for the blank-line in the right buffer.
+	* lisp/image.el (image-map): Use a sparse keymap.
 
-2015-12-08  Glenn Morris  
+2016-02-09  Lars Ingebrigtsen  
 
-	* test/automated/simple-test.el (undo-auto-boundary-timer): Update
-	for recent change.
+	Put a keymap on images created with insert-image and friends
 
-2015-12-08  Glenn Morris  
+	* lisp/image.el (image-save): New command.
+	(image-rotate): Ditto.
+	(image-map): New keymap.
+	(insert-image): Put the image-map on all images.
+	(insert-sliced-image): Ditto.
+	* doc/lispref/display.texi (Showing Images): Document the
+	image map.
 
-	Fix some display-warning usage.
+2016-02-09  Lars Ingebrigtsen  
 
-	* lisp/files.el (hack-local-variables, hack-dir-local-variables):
-	* lisp/calendar/diary-lib.el (diary-include-files, diary-sexp-entry):
-	* lisp/calendar/holidays.el (calendar-holiday-list):
-	* lisp/mail/rmailout.el (rmail-output-read-file-name):
-	Fix display-warning usage.
+	Fix some folding issues in read-multiple-choice
 
-2015-12-08  Glenn Morris  
+	* lisp/subr.el (read-multiple-choice): Fix folding when you
+	have many items.
 
-	* lisp/calendar/cal-html.el: Require diary-lib.
+2016-02-09  Lars Ingebrigtsen  
 
-	(cal-html-list-diary-entries): Handle no diary.  (Bug#21994)
+	Fix typo in last checkin
 
-2015-12-08  Thomas Fitzsimmons  
+2016-02-09  Lars Ingebrigtsen  
 
-	Add Obsolete-since header to eudcb-ph.el
+	Remove Gnus compat functions
 
-	* lisp/obsolete/eudcb-ph.el: Add Obsolete-since header.
+	* lisp/gnus/gnus-ems.el (gnus-mark-active-p)
+	(gnus-region-active-p, gnus-select-lowest-window)
+	(gnus-summary-display-table, gnus-max-width-function): Remove
+	compat functions.
 
-2015-12-07  Paul Eggert  
+2016-02-09  Lars Ingebrigtsen  
 
-	Spelling fixes
+	Move non-compat Gnus functions to gnus-util.el
 
-	* doc/misc/calc.texi (Predefined Units): Use the bland modern
-	scientific style for spelling the units “ampere” and
-	“angstrom” rather than the older style “Ampere” and
-	“Ångstrom”.  The latter spelling was wrong anyway (it should
-	have been “Ångström”).
-	* lisp/emacs-lisp/ert.el (ert--explain-equal-rec):
-	Fix misspelling of ‘atom’ in code.
+	* lisp/gnus/gnus-util.el (gnus-remove-image, gnus-put-image)
+	(gnus-create-image, gnus-image-type-available-p): Move here
+	from gnus-ems.el, since these aren't compat functions.
 
-2015-12-07  Eli Zaretskii  
+2016-02-09  Paul Eggert  
 
-	Improve documentation of kill commands
+	Omit valloc decl if redundant
 
-	* lisp/simple.el (region-extract-function, delete-backward-char)
-	(delete-forward-char, kill-region, copy-region-as-kill)
-	(kill-ring-save): Better document the optional argument REGION in
-	the doc strings.  Mention in the doc strings that text put in the
-	kill-ring can be filtered by 'filter-buffer-substring'.
+	* src/gmalloc.c (valloc): Omit decl if malloc.h is included,
+	to pacify --enable-gcc-warnings.
 
-	* doc/lispref/text.texi (Kill Functions): Mention that functions
-	described in this subsection can filter text they put in the
-	kill-ring.  Add a cross-reference to "Buffer Contents" and an
-	index entry.  Document the optional argument 'region' and its
-	effect.
-	(Bug#21315)
+2016-02-09  Wolfgang Jenkner  
 
-2015-12-07  Alan Mackenzie  
+	Restore the calloc family.
 
-	Further progress making Isearch, Ispell, Replace work with Follow Mode.
+	* src/gmalloc.c (calloc, gcalloc, hybrid_calloc): Restore definitions.
+	They were lost in a4817d8 but calloc is still (marginally) used in
+	code statically liked with emacs, so hybrid_calloc is needed.
+	Also, in the non-hybrid case, we can't get rid of calloc anyway as
+	other libraries liked with emacs may need it.
+	* src/conf_post.h: Restore redefinition of calloc to hybrid_calloc.
 
-	* lisp/follow.el: (follow-mode): Remove references to sit*-for-function, which
-	no longer exists.  Add follow-post-command-hook to  three special purpose
-	hooks at setup, and remove them at tear down.
+2016-02-09  Lars Ingebrigtsen  
 
-	* lisp/isearch.el: (isearch-update): invoke isearch-update-post-hook before
-	isearch-lazy-highlight-new-loop.
-	(isearch-lazy-highlight-new-loop): Restore this function to what it previously
-	was, merging the functionality of isearch-lazy-highlight-maybe-new-loop into
-	it.
-	(isearch-lazy-highlight-maybe-new-loop): function removed.
+	Remove some Gnus compat functions
 
-	* lisp/replace.el: (replace-update-post-hook): New hook variable.
-	(perform-replace): Add second (nil) argument to looking-back.  Invoke
-	replace-update-post-hook before calling replace-highlight.
+	* lisp/gnus/gnus-ems.el (gnus-string-mark-left-to-right)
+	(gnus-window-inside-pixel-edges, gnus-set-process-plist)
+	(gnus-process-plist, gnus-process-get, gnus-process-put): Remove.
 
-	* lisp/textmodes/ispell.el: (ispell-update-post-hook): New hook variable.
-	(ispell-command-loop): invoke ispell-update-post-hook.  Add GROUP argument to
-	call of pos-visible-in-window-p.
-	(ispell-display-buffer): Place *Choices* window at the top of the last window
-	in a window group.
+2016-02-09  Paul Eggert  
 
-2015-12-07  Alan Mackenzie  
+	-
 
-	Amend doc of `mapconcat': it can take sequences, not merely strings.
+	-
 
-	* doc/lispref/functions.texi (Mapping Functions): Amend the doc of `mapconcat'
-	to say that SEPARATOR and the results from FUNCTION may be any character
-	sequences, not just strings.  Add an @xref to "Sequences Arrays Vectors".
+2016-02-09  Paul Eggert  
 
-2015-12-07  Michael Albinus  
+	Merge from origin/emacs-25
 
-	Fix an utf8 problem for Tramp on BSD
+	4feb962 * lisp/comint.el (comint-prompt-read-only): Clean tabs in docstring
+	cc419fb Don't inloop gnus-uu-mark-thread on the last thread
+	51c77a2 Display non-ASCII group names better in prompts
+	f93d669 Default to gpg2 instead of gpg
 
-	* lisp/net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
-	Make lax check for utf8.
-	(tramp-get-remote-locale): Add "en_US.UTF-8" as candidate.
+2016-02-09  Paul Eggert  
 
-2015-12-07  Thomas Fitzsimmons  
+	Merge from origin/emacs-25
+
+	9ffe7dd * lisp/isearch.el (isearch-define-mode-toggle): Improve logic
+	16140f7 * lisp/menu-bar.el (menu-bar-options-menu): New search submenu
+	3db6adb * lisp/isearch.el (search-default-mode)
+	4ea1ea7 * lisp/isearch.el: Rename search-default-regexp-mode to search-default-mode
+	c77ffc8 Use monitor's resolution for positioning tooltips
+	49e5749 Fix file-notify-test on MS-Windows
+	be1d874 Fix issues found by auditing w32notify code
+	87ae218 Extend etags Ruby support for accessors
+	aa35257 Update publicsuffix.txt.
+	6816bff Ensure that Gnus dribble handling allows removing entries
+	691feae Be consistent when using encoded strings in nnimap data
+	3ed423b Display the decoded Gnus group name
+	5428b5b Use completion-ignore-case instead of defining command
 
-	Make eudcb-ph.el obsolete
+2016-02-09  Paul Eggert  
 
-	* doc/misc/eudc.texi: Bump version to 1.40.0.
-	Remove PH/QI sections and mentions.
-	* lisp/obsolete/eudcb-ph.el: Make obsolete.
-	* lisp/net/eudc-vars.el (eudc-known-protocols): Remove ph.
-	(eudc-ph-bbdb-conversion-alist): Make obsolete.
-	* etc/NEWS: Mention this.  (Bug#21191)
+	Merge from origin/emacs-25
 
-2015-12-07  Paul Eggert  
+	1eaf68f * test/automated/file-notify-tests.el (file-notify-test06-many-events):
+	d333716 ; * etc/NEWS: Expand news entry for scss-mode
+	c32c16f ; Better document changes in ls-lisp default behavior
+	dc6eed2 Fix doc string of tls-program
 
-	Remove overenthusiastic eassert
+2016-02-09  Paul Eggert  
 
-	* src/lisp.h (XSYMBOL): Remove eassert incorrectly added in
-	previous change.  It breaks on MS-Windows --with-wide-int.
-	Problem reported by Eli Zaretskii in:
-	http://lists.gnu.org/archive/html/emacs-devel/2015-12/msg00275.html
+	Merge from origin/emacs-25
 
-2015-12-06  Paul Eggert  
+	2c117fc * etc/NEWS: Document new mpc.el features
+	71a0496 * lisp/custom.el (defface): Revert indentation change.  (Bug#22524)
+	9dfece1 Correctly fontify C++ initializations which "look like" functions.
+	4485222 Improve newsticker-treeview-selection-face
+	4236944 Minor fix in tagging Ruby accessors by etags
+	35fc77d Spelling fixes
+	3dda110 Remove 'def X' from the example
 
-	Pacify gcc -Wparentheses
+2016-02-09  Paul Eggert  
 
-	* src/xdisp.c (row_containing_pos): Reparenthesize.
+	Minor alignas cleanup
 
-2015-12-06  Paul Eggert  
+	* src/lisp.h (alignas): Remove now-redundant #ifdef that was left
+	over from the old way of doing things, before Bug#20862 was fixed.
 
-	Port mod-test to 32-bit Emacs --without-wide-int
+2016-02-09  Paul Eggert  
 
-	* modules/mod-test/test.el (mod-test-sum-test):
-	Bring back the 2**29 tests, but port them to 32-bit Emacs
-	--without-wide-int.
+	Add lmalloc commentary and tweak laligned
 
-2015-12-06  Michael Albinus  
+	* src/alloc.c (laligned): Help compiler in a tiny way by putting
+	the more-commonly-failing disjunct first.
 
-	Fix minor Tramp problems found on BSD
+2016-02-09  Eli Zaretskii  
 
-	* lisp/net/tramp-sh.el (tramp-perl-file-truename): Do not append
-	trailing slash.  Quote apostrophes.
-	(tramp-sh-handle-file-truename): Do not append trailing slash in
-	the "ls" case.
-	(tramp-get-ls-command-with-w-option): New defun.
-	(tramp-do-file-attributes-with-ls)
-	(tramp-do-directory-files-and-attributes-with-stat): Use it.
+	Clarify documentation of key binding conventions
 
-	* test/automated/tramp-tests.el
-	(tramp-test31-special-characters-with-perl)
-	(tramp-test31-special-characters-with-ls)
-	(tramp-test32-utf8-with-perl, tramp-test32-utf8-with-ls):
-	Suppress also readlink.
+	* doc/lispref/tips.texi (Key Binding Conventions): Clarify which
+	"punctuation characters" are reserved after "C-c".  (Bug#22604)
 
-2015-12-06  Eli Zaretskii  
+2016-02-09  Oscar Fuentes  
 
-	Fix cursor display when invisible text is at line beginning
+	* etc/NEWS: mention the `vc-faces' customization group
 
-	* src/xdisp.c (redisplay_window): When scrolling fails to show
-	point, prefer using the desired matrix if possible for finding the
-	fallback glyph row for displaying the cursor.  (Bug#22098)
-	(row_containing_pos): Exit the loop as soon as we hit the first
-	disabled glyph row.  Otherwise we risk accessing garbled data and
-	departing to the no-no land.
+2016-02-09  Paul Eggert  
 
-2015-12-06  Paul Eggert  
+	Sync with gnulib
 
-	Improve module interface when WIDE_EMACS_INT
+	This incorporates:
+	2016-02-09 stdalign: port to clang 3.7.0
+	2016-02-06 misc: port better to gcc -fsanitize=address
+	* doc/misc/texinfo.tex, lib/stdalign.in.h, m4/acl.m4, m4/getgroups.m4:
+	Copy from gnulib.
 
-	* src/emacs-module.c (plain_values): New constant.
-	(module_nil): Now a constant.
-	(Finternal_module_call, value_to_lisp_bits, lisp_to_value_bits)
-	(syms_of_module): Use if, not #ifdef, so that both sides are
-	checked at compile-time, and so that GCC doesn’t complain
-	about an unused var in the typical case.  Also, depend on
-	plain_values, not on WIDE_EMACS_INT; the code shouldn’t assume
-	that WIDE_EMACS_INT implies !USE_LSB_TAG.
-	(value_to_lisp_bits, lisp_to_value_bits): New functions.
-	Sign-extend integers rather than zero-extending them, as small
-	negative integers are more likely.
-	(value_to_lisp, lisp_to_value): Rewrite in terms of the new *_bits
-	functions.
-	(HAVE_STRUCT_ATTRIBUTE_ALIGNED): Define to 0 if not already defined.
-	(mark_modules): Remove.  All uses removed.
-	(lisp_to_value): Don’t assume Fcons returns a pointer aligned
-	to GCALIGNMENT.
-	(syms_of_module): Check that module_nil converts to Qnil.
-	* src/lisp.h (lisp_h_XSYMBOL, XSYMBOL): Use signed conversion, since
-	we prefer signed to unsigned when either will do.
-	(TAG_PTR): Sign-extend pointers when USE_LSB_TAG, as this is
-	a bit better for emacs-module.c.
+2016-02-09  Michael Albinus  
 
-2015-12-06  Paul Eggert  
+	* CONTRIBUTE: Add more examples for $(SELECTOR) make variable.
 
-	Port mod-test to x86-64 GNU/Linux running 32-bit
+2016-02-09  Katsumi Yamaoka  
 
-	* modules/mod-test/test.el (mod-test-sum-test):
-	Don’t attempt to match descriptions to operating systems.
-	It didn’t work on Fedora x86-64 running a 32-bit executable,
-	and it’s not worth the trouble anyway.
-	Port to 32-bit platforms by removing an assumption about
-	fixnum widths.
+	Make mm-html-inhibit-images and mm-html-blocked-images default to nil
 
-2015-12-06  Michael Albinus  
+	* lisp/gnus/mm-decode.el (mm-html-inhibit-images)
+	(mm-html-blocked-images): Default to nil.
 
-	Fix auto-revert-tests.el when filenotify isn't used
+	* doc/misc/emacs-mime.texi (Display Customization): Mention that
+	mm-html-inhibit-images and mm-html-blocked-images default to nil.
 
-	* test/automated/auto-revert-tests.el (auto-revert--wait-for-revert):
-	Make it working also when filenotify isn't used.
+	* etc/NEWS (Gnus): Document mm-html-inhibit-images and
+	mm-html-blocked-images.
 
-2015-12-06  Juri Linkov  
+2016-02-08  Paul Eggert  
 
-	* lisp/textmodes/ispell.el (ispell-highlight-spelling-error-overlay):
+	Increase success rate of fallback lmalloc
 
-	Let-bind isearch-regexp-function to nil.  (Bug#22097)
+	* src/alloc.c (lmalloc, lrealloc): Reallocate with (typically)
+	larger and larger sizes, to increase the probability that
+	the allocator will return a Lisp-aligned pointer.
 
-2015-12-05  Artur Malabarba  
+2016-02-08  Lars Ingebrigtsen  
 
-	* lisp/emacs-lisp/package.el: Don't install bad signatures (bug#22089)
+	Make backgrounds extend to the end of the lines in shr
 
-	(package--with-response-buffer): NOERROR and ERROR-FORM only
-	handle connection errors.
-	(bad-signature): New error type.
-	(package--check-signature-content): Use it.
-	(package--check-signature): Properly distinguish connection errors
-	from bad-signature errors.  Do the check for
-	`package-check-signature' `allow-unsigned' here instead of forcing
-	the callbacks to do it.  Add a new argument, UNWIND.
-	(package--download-one-archive, package-install-from-archive):
-	Update usage of `package--check-signature'.
+	* lisp/net/shr.el (shr-face-background): Faces can also be on
+	the form `(:background "#fff)' (bug#22547).
 
-2015-12-05  Ulf Jasper  
+2016-02-08  Lars Ingebrigtsen  
 
-	Fix Bug#22092.
+	Make the `R' command get the correct relative s
 
-	* lisp/calendar/icalendar.el (icalendar--get-unfolded-buffer):
-	  Clean up inconsistent line endings. (Bug#22092)
-	  (icalendar--clean-up-line-endings): New.
-	* test/automated/icalendar-tests.el (icalendar-real-world): Add test
-	  for Bug#22092.
+	* lisp/net/eww.el (eww-readable): Preserve the base URL so
+	that image expansions are fetched from the right place (bug#22605).
 
-2015-12-05  Eli Zaretskii  
+	(cherry picked from commit 8722e849f75ceafb82a1c17105e8ab76077a8ebc)
 
-	Document 'bookmark-set-no-overwrite'
+	Backport:
 
-	* doc/emacs/regs.texi (Bookmarks): Document the new command
-	'bookmark-set-no-overwrite' and its keybinding.
+2016-02-08  Mike Kupfer  
 
-2015-12-05  Eli Zaretskii  
+	Fix typos in emacs-mime.texi and gnus.texi
 
-	Document new binding of 'mouse-buffer-menu'
+	* doc/misc/emacs-mime.texi (Display Customization):
+	* doc/misc/gnus.texi (HTML): Fix typo.
 
-	* doc/emacs/buffers.texi (Buffer Menus): 'mouse-buffer-menu' is
-	now also on C-F10.
+2016-02-08  Katsumi Yamaoka  
 
-2015-12-05  Eli Zaretskii  
+	* doc/misc/emacs-mime.texi (Display Customization):
+	Doc fix for mm-html-inhibit-images.
 
-	Initial documentation of dynamic modules
+2016-02-08  Lars Ingebrigtsen  
 
-	* doc/lispref/loading.texi (Dynamic Modules): New section with
-	initial documentation for dynamic modules.
-	* doc/lispref/elisp.texi (Top): Add "Dynamic Modules" to the
-	detailed menu
+	Fix message-cross-post-followup-to group names
 
-	* etc/NEWS: Fix typos in dynamic modules' entry.
+	* lisp/gnus/message.el (message-cross-post-followup-to): Don't
+	insert group names like "nntp+foo:zot", because those aren't valid.
 
-2015-12-05  Artur Malabarba  
+2016-02-08  David Edmondson  
 
-	Remove copyright statements from trivial test files
+	Compare recipient and keys case-insensitively
 
-2015-12-05  Eli Zaretskii  
+	* lisp/gnus/mml2015.el: (mml-secure-check-user-id): When comparing a
+	recipient address with that from a key, do so in a case insensitive
+	manner (bug#22603).
 
-	Add "Preliminaries" section to etc/DEBUG
+2016-02-08  Glenn Morris  
 
-	* etc/DEBUG: Add the "Preliminaries" section for GDB beginners.
-	Most of the content was suggested by Phillip Lord
-	.  Remove the section about debugging
-	with the Visual Studio, as building Emacs with the Microsoft
-	compilers is no longer supported.  Minor fixes in some other
-	sections.
+	* lisp/gnus/mm-decode.el (mm-alist-to-plist): Doc fix.
 
-2015-12-05  Alex Dunn    (tiny change)
+2016-02-08  Katsumi Yamaoka  
 
-	Improve parsing of version strings
+	Refactor HTML images handling of Gnus and mm-* (a part of bug#21650)
 
-	* lisp/subr.el (version-regexp-alist): Allow "." as priority separator
-	(version-to-list): More helpful error messages.
-	(version-to-list): ".5" is valid (update docstring).  Make
-	"22.8X3" invalid, as the doc string says.
+	* doc/misc/emacs-mime.texi (Display Customization):
+	Remove mm-inline-text-html-with-images; add documentations for
+	mm-html-inhibit-images and mm-html-blocked-images.
 
-	* test/automated/subr-tests.el (ert-test-version-parsing): New
-	tests for version string processing.
+	* lisp/gnus/gnus-art.el (gnus-article-show-images):
+	No need to bind mm-inline-text-html-with-images.
+	(gnus-bind-safe-url-regexp): Rename to gnus-bind-mm-vars.
+	(gnus-bind-mm-vars): Rename from gnus-bind-safe-url-regexp;
+	bind mm-html-inhibit-images and mm-html-blocked-images.
+	(gnus-mime-view-all-parts, gnus-mime-view-part-internally)
+	(gnus-mm-display-part, gnus-mime-display-single)
+	(gnus-mime-display-alternative): Use gnus-bind-mm-vars.
 
-2015-12-05  Eli Zaretskii  
+	* lisp/gnus/mm-decode.el (mm-inline-text-html-with-images): Remove.
+	(mm-html-inhibit-images, mm-html-blocked-images): New user options.
+	(mm-shr): Bind shr-inhibit-images and shr-blocked-images with
+	mm-html-inhibit-images and mm-html-blocked-images respectively
+	instead of gnus-inhibit-images and gnus-blocked-images.
 
-	Fix documentation of 'undo' changes
+	* lisp/gnus/mm-view.el (mm-setup-w3m): Use mm-html-inhibit-images
+	instead of mm-inline-text-html-with-images.
 
-	* doc/lispref/text.texi (Undo): Minor wording changes.  Use US
-	English conventions for spelling and whitespace between sentences.
+2016-02-08  Paul Eggert  
 
-	* etc/NEWS: Fix wording and spelling of undo-related entries.
-	Mark them as documented.
+	Port to FreeBSD 11-CURRENT i386
 
-2015-12-05  Glenn Morris  
+	Problem reported by Herbert J. Skuhra in:
+	http://lists.gnu.org/archive/html/emacs-devel/2016-02/msg00354.html
+	Instead of trying
+	* src/alloc.c (lmalloc, lrealloc, laligned): New functions.
+	(xmalloc, xzalloc, xrealloc, lisp_malloc): Use them.
+	(__alignof__) [!__GNUC__ && !__alignof__]: New macro.
+	(MALLOC_IS_GC_ALIGNED): New macro.
+	* src/lisp.h (NONPOINTER_BITS): Remove.  All uses removed.
+	No longer needed now that alloc.c uses lmalloc and lrealloc.
 
-	* lisp/net/net-utils.el: Small improvements.
+2016-02-08  Michael Albinus  
 
-	(net-utils--executable-find-sbin): New function.
-	(ifconfig-program): Check sbin directories.
-	Fallback to "ip".  (Bug#22091)
-	(ifconfig-program-options): Check the actual program in use.
-	(arp-program): Check sbin directories.
+	Some fixes in file-notify-tests.el
 
-2015-12-04  (tiny change) Arash Esbati    (tiny change)
+	* test/automated/file-notify-tests.el
+	(file-notify--test-with-events-check)
+	(file-notify--test-with-events-explainer): New defuns.
+	(file-notify--test-with-events): Use it.
+	(file-notify-test07-backup): Fix docstring.  Some of the
+	backends fire two `changed' events.  Backup by rename doesn't
+	work for kqueue.
 
-	Fix wrong-type-argument integer-or-marker-p nil error
+2016-02-07  Michael Albinus  
 
-	* lisp/textmodes/reftex-auc.el (reftex-what-index-tag):
-	Fix (wrong-type-argument integer-or-marker-p nil) error (bug#22077).
+	Fix Bug#22557
 
-2015-12-04  Alan Mackenzie  
+	* lisp/filenotify.el (file-notify-callback): Do not send a
+	`stopped' event in case of backup by renaming.  (Bug#22557)
 
-	Merge branch 'scratch/follow' of /home/acm/emacs/emacs.git/emacs-25 into scratch/follow
+	* test/automated/Makefile.in: Use $(SELECTOR_EXPENSIVE) for
+	all targets but check and check-maybe.
 
-	Merge necessitated by a rebase operation.
+	* test/automated/file-notify-tests.el
+	(file-notify--test-read-event-timeout): New defconst.
+	(file-notify--deftest-remote, file-notify--wait-for-events)
+	(file-notify-test02-events)
+	(file-notify-test04-file-validity)
+	(file-notify-test06-many-events): Use it.
+	(file-notify--test-cleanup): Make it more robust.  Delete also
+	backup file.
+	(file-notify-test07-backup): New test.
 
-2015-12-04  Alan Mackenzie  
+2016-02-07  Paul Eggert  
 
-	lisp/isearch.el: Eliminate macro isearch-call-message, replacing with funcall.
+	Fix test for dladdr
 
-2015-12-04  Alan Mackenzie  
+	Problem reported by Andreas Schwab in:
+	http://lists.gnu.org/archive/html/emacs-devel/2016-02/msg00327.html
+	* configure.ac (dladdr): Link with LIBMODULES when checking for
+	this function.
 
-	First commit to scratch/follow.  Make Isearch work with Follow Mode, etc.
+2016-02-07  Andreas Schwab  
 
-	doc/lispref/window.texi (Basic Windows): Add paragraph defining "Group of
-	Windows" and new @defun selected-window-group.
-	(Window Start and End): Describe new &optional parameter GROUP and
-	...-group-function for window-start, window-end, set-window-start, and
-	pos-visible-in-window-p.
-	(Textual Scrolling) Describe the same for recenter.
-	doc/lispref/positions.texi (Screen Lines): Describe the same for
-	move-to-window-line.
+	Fix gnus-group-get-new-news-this-group on group with closed server
 
-	src/window.c (Fwindow_start, Fwindow_end, Fset_window_start)
-	(Fpos_visible_in_window_p, Frecenter, Fmove_to_window_line): To each, add ar
-	new optional parameter "group".  At the beginning of each, check whether the
-	corresponding ...-group-function is set to a function, and if so execute this
-	function in place of the normal processing.
-	(syms_of_window): Define symbols for the six new variables below.
-	(window-start-group-function, window-end-group-function)
-	(set-window-start-group-function, recenter-group-function)
-	(pos-visible-in-window-p-group-function, move-to-window-line-group-function):
-	New permanent local buffer local variables.
-	src/keyboard.c (Fposn_at_point): Add extra parameter in call to
-	Fpos_visible_in_window_p.
+	* lisp/gnus/nnimap.el (nnimap-change-group): Lookup server
+	method and pass to nnimap-open-server.
 
-	lisp/window.el (selected-window-group-function): New permanent local buffer
-	local variable.
-	(selected-window-group): New function.
+2016-02-07  Artur Malabarba  
 
-	lisp/follow.el (follow-mode): Set the ...-group-function variables at mode
-	enable, kill them at mode disable.  Add/remove follow-after-change to/from
-	after-change-functions.
-	(follow-start-end-invalid): New variable.
-	(follow-redisplay): Manipulate follow-start-end-invalid.
-	(follow-after-change, follow-window-start, follow-window-end)
-	(follow-set-window-start, follow-pos-visible-in-window-p)
-	(follow-move-to-window-line, follow-sit-for): New functions.
+	* lisp/comint.el (comint-prompt-read-only): Clean tabs in docstring
 
-	lisp/isearch.el (isearch-call-message): New macro.
-	(isearch-update, with-isearch-suspended, isearch-del-char)
-	(isearch-search-and-update, isearch-ring-adjust): Invoke above new macro.
-	(with-isearch-suspended): Rearrange code such that isearch-call-message is
-	invoked before point is moved.
-	(isearch-message): Add comment about where point must be at function call.
-	(isearch-search): Remove call to isearch-message.
-	(isearch-lazy-highlight-window-group): New variable.
-	(isearch-lazy-highlight-new-loop): Unconditionally start idle timer.  Move
-	the battery of tests to ...
-	(isearch-lazy-highlight-maybe-new-loop): New function, started by idle timer.
-	Note: (sit-for 0) is still called.
-	(isearch-lazy-highlight-update): Check membership of
-	isearch-lazy-highlight-window-group.  Don't set the `window' overlay
-	property.
-	(isearch-update, isearch-done, isearch-string-out-of-window)
-	(isearch-back-into-window, isearch-lazy-highlight-maybe-new-loop)
-	(isearch-lazy-highlight-search, isearch-lazy-highlight-update)
-	(isearch-lazy-highlight-update): Call the six amended primitives (see
-	src/window.c above) with the new `group' argument set to t, to cooperate
-	with Follow Mode.
+	While tabs in code are mostly fine because the Emacs sources have a
+	.dir-locals file specifying tab-width, the same is not true of tabs in
+	code examples inside docstrings.  The docstring is printed on a *Help*
+	buffer, which can be created on any directory and won't necessarily have
+	the same tab-width set.
 
-2015-12-04  Stefan Monnier  
+2016-02-07  Lars Ingebrigtsen  
 
-	* lisp/emacs-lisp/ert.el: Prefer pcase over cl-typecase
+	Don't inloop gnus-uu-mark-thread on the last thread
 
-	* lisp/emacs-lisp/ert.el (ert--should-error-handle-error)
-	(ert--explain-format-atom, ert--explain-equal-rec)
-	(ert--print-backtrace, ert-test-result-type-p, ert-select-tests)
-	(ert--insert-human-readable-selector): Prefer pcase over cl-typecase.
+	* lisp/gnus/gnus-uu.el (gnus-uu-mark-thread): Don't infloop on the
+	final thread in the summary buffer (bug#16666).
 
-2015-12-04  Artur Malabarba  
+2016-02-06  Lars Ingebrigtsen  
 
-	* lisp/character-fold.el: Remove special case-folding support
+	Display non-ASCII group names better in prompts
 
-	(character-fold-to-regexp): Remove special code for
-	case-folding.  Char-fold search still respects the
-	`case-fold-search' variable (i.e., f matches F).  This only
-	removes the code that was added to ensure that f also matched
-	all chars that F matched.  For instance, after this commit, f
-	no longer matches 𝔽.
+	* lisp/gnus/gnus-sum.el (gnus-articles-to-read): To decode the
+	group name, we have to do that before we remove the prefix.
 
-	This was necessary because the logic created a regexp with
-	2^(length of the string) redundant paths.  So, when a very
-	long string "almost" matched, Emacs took a very long time to
-	figure out that it didn't.  This became particularly relevant
-	because isearch's lazy-highlight does a search bounded by (1-
-	match-end) (which, in most circumstances, is a search that
-	almost matches).  A recipe for this can be found in bug#22090.
+2016-02-06  Lars Ingebrigtsen  
 
-2015-12-04  Stefan Monnier  
+	Default to gpg2 instead of gpg
 
-	* lisp/emacs-lisp/cl-macs.el (character): Can't be negative
+	* lisp/epg-config.el (epg-gpg-program): Prefer gpg2 over gpg, if
+	it exists.  This fixes many problems with using the GPG
+	authentication agent.
 
-	Fixes (bug#21701)
+2016-02-06  David Edmondson  
 
-2015-12-04  Daiki Ueno  
+	src/process.c Correctly convert AF_INET6 addresses
 
-	lisp/gnus/qp.el: Don't replace "from " at bol
+	* src/process.c (conv_lisp_to_sockaddr): AF_INET6 addresses are
+	converted to a list of 16 bit quantities by
+	conv_sockaddr_to_lisp(). conv_lisp_to_sockaddr() should follow the
+	same scheme rather than expecting a (longer) list of 8 bit
+	quantities.
 
-	* lisp/gnus/qp.el (quoted-printable-encode-region): Bind `case-fold-search'
-	to nil when looking for "^From ".  Problem reported by Simon Josefsson.
+	Backport:
 
-2015-12-03  Phillip Lord  
+	(cherry picked from commit 55ce3c30d617c38eb086d5ad4ffbd881c20c559c)
 
-	Externalize some symbols in undo-auto
+2016-02-06  Artur Malabarba  
 
-	 * doc/lispref/text.texi: Update symbols.
-	 * lisp/simple.el (undo-auto--amalgamate,
-	   undo-auto--current-boundary-timer): Make symbols public.
-	 * src/cmds.c (Fself_insert_command,Fdelete_char): Call
-	   updated symbol.
+	* lisp/isearch.el (isearch-define-mode-toggle): Improve logic
 
-2015-12-03  Stefan Monnier  
+2016-02-06  Artur Malabarba  
 
-	* lisp/emacs-lisp/smie.el (smie-next-sexp): Fix BOB "token"
+	* lisp/menu-bar.el (menu-bar-options-menu): New search submenu
 
-2015-12-03  Michael Albinus  
+	(menu-bar-search-options-menu): New variable
 
-	Some error message improvements in tramp-sh.el
+2016-02-06  Artur Malabarba  
 
-	* lisp/net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
-	Suppress error messages for "mesg" and "biff" calls.
-	(tramp-get-remote-path): Ignore errors when expanding
-	`tramp-own-remote-path'.  Raise a warning instead.
+	* lisp/isearch.el (search-default-mode)
 
-2015-12-03  Eli Zaretskii  
+	(isearch-regexp-function): Improve docstrings.
 
-	Document 'nacl' value for 'system-type'
+2016-02-06  Artur Malabarba  
 
-	* doc/lispref/os.texi (System Environment): Document the 'nacl'
-	value of 'system-type'.
+	* lisp/isearch.el: Rename search-default-regexp-mode to search-default-mode
 
-2015-12-03  Eli Zaretskii  
+	(search-default-mode): New variable.
+	(isearch-mode, isearch-define-mode-toggle)
+	(isearch--describe-regexp-mode): Update accordingly.
+	* lisp/menu-bar.el (nonincremental-search-forward): Update accordingly.
+	* etc/NEWS: Update accordingly.
+	* doc/emacs/search.texi: Update accordingly.
 
-	Document 'window-max-chars-per-line'
+2016-02-06  Oscar Fuentes  
 
-	* doc/lispref/windows.texi (Window Sizes): Document
-	'window-max-chars-per-line'.
+	Use monitor's resolution for positioning tooltips
 
-2015-12-03  Artur Malabarba  
+	* src/xfns.c (compute_tip_xy): Use the resolution of the monitor where
+	  the mouse pointer is to avoid placing the tooltip over the border of
+	  the monitor on multi-head displays. Fixes bug#22549.
 
-	Fix some file headers for the purpose of `package--builtins'
+2016-02-06  Eli Zaretskii  
 
-	* lisp/emacs-lisp/cl-preloaded.el
-	* lisp/emacs-lisp/eieio-compat.el
-	* lisp/net/sasl-scram-rfc.el: Add a "Package:" header
+	Fix file-notify-test on MS-Windows
 
-	* lisp/ielm.el: Fix summary line.
+	* test/automated/file-notify-tests.el (file-notify--test-timeout):
+	Reduce w32notify timeout to 10 sec.
+	(file-notify-test06-many-events): Call read-event after each
+	rename, to keep the w32notify backend happy in batch mode.
+	(Bug#22534)
 
-2015-12-03  Artur Malabarba  
+2016-02-06  Eli Zaretskii  
 
-	* lisp/emacs-lisp/package.el (package-unpack): Load before compiling
+	Fix issues found by auditing w32notify code
 
-	Reload any previously loaded package files before compiling
-	the package (also reload the same files after compiling).
-	This ensures that we have the most recent definitions during
-	compilation, and avoids generating bad elc files when a macro
-	changes and it is used in a different file from the one it's
-	defined in.
+	* src/w32inevt.c (handle_file_notifications): Count the number of
+	events to be returned.
+	* src/w32notify.c (send_notifications): Don't copy to the file
+	notification buffer more than it can hold.  (Bug#22534)
 
-2015-12-03  Artur Malabarba  
+2016-02-06  Eli Zaretskii  
 
-	* lisp/emacs-lisp/package.el: Refactor package activation code
+	Extend etags Ruby support for accessors
 
-	(package-activate): Move code that activates dependencies into
-	package-activate-1.
-	(package--load-files-for-activation): New function.
-	(package-activate-1): Add code for (optionally) activating
-	dependencies, and move file-loading code into
-	`package--load-files-for-activation'.
+	* lib-src/etags.c (Ruby_functions): Support accessors defined with
+	parentheses.  (Bug#22563)
 
-2015-12-03  Eli Zaretskii  
+	* test/etags/ruby-src/test1.ru (A::B): Add tests for accessors
+	defined with parentheses.
+	* test/etags/ETAGS.good_1:
+	* test/etags/ETAGS.good_2:
+	* test/etags/ETAGS.good_3:
+	* test/etags/ETAGS.good_4:
+	* test/etags/ETAGS.good_5:
+	* test/etags/ETAGS.good_6:
+	* test/etags/CTAGS.good: Adapt to changes in Ruby tests.
 
-	Document new font-related functionality
+2016-02-06  Lars Ingebrigtsen  
 
-	* doc/lispref/display.texi (Low-Level Font): Document
-	'default-font-width', 'default-font-height', 'window-font-width',
-	and 'window-font-height'.
+	Update publicsuffix.txt.
 
-	* etc/NEWS: Move entries for 'default-font-width',
+	* etc/publicsuffix.txt: Updated from
+	https://publicsuffix.org/list/public_suffix_list.dat.
+
+2016-02-06  Lars Ingebrigtsen  
+
+	Ensure that Gnus dribble handling allows removing entries
+
+	* lisp/gnus/gnus-start.el (gnus-dribble-enter): Ensure that each
+	entry is on a single line.
+
+2016-02-05  OGAWA Hirofumi    (tiny change)
+
+	Be consistent when using encoded strings in nnimap data
+
+	* lisp/gnus/nnimap.el (nnimap-encode-gnus-group): New function
+	(nnimap-request-list): Use it.
+	(nnimap-request-newgroups): Ditto.
+
+2016-02-05  OGAWA Hirofumi    (tiny change)
+
+	Display the decoded Gnus group name
+
+	* lisp/gnus/gnus-sum.el (gnus-summary-read-group-1): Use the
+	decoded group name in the message.
+
+2016-02-05  Lars Ingebrigtsen  
+
+	Use completion-ignore-case instead of defining command
+
+	* lisp/erc/erc.el (erc-mode): Set completion-ignore-case so
+	that we get case-insensitive completion.
+	(erc-completion-at-point): Remove.
+
+2016-02-05  Eli Zaretskii  
+
+	Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25
+
+2016-02-05  Michael Albinus  
+
+	* test/automated/file-notify-tests.el (file-notify-test06-many-events):
+
+	Reduce the number of iterations to 250 in case of w32notify.
+
+2016-02-05  Eli Zaretskii  
+
+	Fix problems caused by new implementation of sub-word mode
+
+	* lisp/subr.el (forward-word-strictly, backward-word-strictly):
+	New functions.
+	(word-move-empty-char-table): New variable.
+
+	* etc/NEWS: Mention 'forward-word-strictly' and
+	'backward-word-strictly'.
+
+	* doc/lispref/positions.texi (Word Motion): Document
+	'find-word-boundary-function-table', 'forward-word-strictly', and
+	'backward-word-strictly'.  (Bug#22560)
+
+	* src/syntax.c (syms_of_syntax)
+	: Doc fix.
+
+	* lisp/wdired.el (wdired-xcase-word):
+	* lisp/textmodes/texnfo-upd.el (texinfo-copy-node-name)
+	(texinfo-copy-section-title, texinfo-start-menu-description)
+	(texinfo-copy-menu-title, texinfo-specific-section-type)
+	(texinfo-insert-node-lines, texinfo-copy-next-section-title):
+	* lisp/textmodes/texinfo.el (texinfo-clone-environment)
+	(texinfo-insert-@end):
+	* lisp/textmodes/texinfmt.el (texinfo-format-scan)
+	(texinfo-anchor, texinfo-multitable-widths)
+	(texinfo-multitable-item):
+	* lisp/textmodes/tex-mode.el (latex-env-before-change):
+	* lisp/textmodes/flyspell.el (texinfo-mode-flyspell-verify):
+	* lisp/skeleton.el (skeleton-insert):
+	* lisp/simple.el (count-words):
+	* lisp/progmodes/vhdl-mode.el (vhdl-beginning-of-libunit)
+	(vhdl-beginning-of-defun, vhdl-beginning-of-statement-1)
+	(vhdl-update-sensitivity-list, vhdl-template-block)
+	(vhdl-template-break, vhdl-template-case, vhdl-template-default)
+	(vhdl-template-default-indent, vhdl-template-for-loop)
+	(vhdl-template-if-then-use, vhdl-template-bare-loop)
+	(vhdl-template-nature, vhdl-template-procedural)
+	(vhdl-template-process, vhdl-template-selected-signal-asst)
+	(vhdl-template-type, vhdl-template-variable)
+	(vhdl-template-while-loop, vhdl-beginning-of-block)
+	(vhdl-hooked-abbrev, vhdl-port-copy, vhdl-hs-forward-sexp-func):
+	* lisp/progmodes/verilog-mode.el (verilog-backward-sexp)
+	(verilog-forward-sexp, verilog-beg-of-statement)
+	(verilog-set-auto-endcomments, verilog-backward-token)
+	(verilog-do-indent):
+	* lisp/progmodes/vera-mode.el (vera-guess-basic-syntax)
+	(vera-indent-block-closing):
+	* lisp/progmodes/simula.el (simula-context)
+	(simula-backward-up-level, simula-forward-down-level)
+	(simula-previous-statement, simula-next-statement)
+	(simula-skip-comment-backward, simula-calculate-indent)
+	(simula-find-if, simula-electric-keyword):
+	* lisp/progmodes/sh-script.el (sh-smie--rc-newline-semi-p):
+	* lisp/progmodes/ruby-mode.el (ruby-smie--redundant-do-p)
+	(ruby-smie--forward-token, ruby-smie--backward-token)
+	(ruby-singleton-class-p, ruby-calculate-indent)
+	(ruby-forward-sexp, ruby-backward-sexp):
+	* lisp/progmodes/ps-mode.el (ps-run-goto-error):
+	* lisp/progmodes/perl-mode.el (perl-syntax-propertize-function)
+	(perl-syntax-propertize-special-constructs)
+	(perl-backward-to-start-of-continued-exp):
+	* lisp/progmodes/pascal.el (pascal-indent-declaration):
+	* lisp/progmodes/octave.el (octave-function-file-p):
+	* lisp/progmodes/mantemp.el (mantemp-insert-cxx-syntax):
+	* lisp/progmodes/js.el (js--forward-function-decl):
+	* lisp/progmodes/idlwave.el (idlwave-show-begin-check)
+	(idlwave-beginning-of-block, idlwave-end-of-block)
+	(idlwave-block-jump-out, idlwave-determine-class):
+	* lisp/progmodes/icon.el (icon-is-continuation-line)
+	(icon-backward-to-start-of-continued-exp, end-of-icon-defun):
+	* lisp/progmodes/hideif.el (hide-ifdef-define):
+	* lisp/progmodes/f90.el (f90-change-keywords):
+	* lisp/progmodes/cperl-mode.el (cperl-electric-pod)
+	(cperl-linefeed, cperl-electric-terminator)
+	(cperl-find-pods-heres, cperl-fix-line-spacing)
+	(cperl-invert-if-unless):
+	* lisp/progmodes/cc-engine.el (c-forward-<>-arglist-recur):
+	* lisp/progmodes/cc-align.el (c-lineup-java-inher):
+	* lisp/progmodes/ada-mode.el (ada-compile-goto-error)
+	(ada-adjust-case-skeleton, ada-create-case-exception)
+	(ada-create-case-exception-substring)
+	(ada-case-read-exceptions-from-file, ada-after-keyword-p)
+	(ada-scan-paramlist, ada-get-current-indent, ada-get-indent-end)
+	(ada-get-indent-if, ada-get-indent-block-start)
+	(ada-get-indent-loop, ada-get-indent-type)
+	(ada-search-prev-end-stmt, ada-check-defun-name)
+	(ada-goto-decl-start, ada-goto-matching-start)
+	(ada-goto-matching-end, ada-looking-at-semi-or)
+	(ada-looking-at-semi-private, ada-in-paramlist-p)
+	(ada-search-ignore-complex-boolean, ada-move-to-start)
+	(ada-move-to-end, ada-which-function, ada-gen-treat-proc):
+	* lisp/net/quickurl.el (quickurl-grab-url):
+	* lisp/mail/sendmail.el (mail-do-fcc):
+	* lisp/mail/rmail.el (rmail-resend):
+	* lisp/mail/mailabbrev.el (mail-abbrev-complete-alias):
+	* lisp/mail/mail-extr.el (mail-extract-address-components):
+	* lisp/json.el (json-read-keyword):
+	* lisp/files.el (insert-directory):
+	* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
+	* lisp/completion.el (symbol-under-point, symbol-before-point)
+	(symbol-before-point-for-complete, next-cdabbrev)
+	(add-completions-from-c-buffer):
+	* lisp/cedet/semantic/texi.el (semantic-up-context)
+	(semantic-beginning-of-context):
+	* lisp/cedet/semantic/bovine/el.el (semantic-get-local-variables):
+	use 'forward-word-strictly' and 'backward-word-strictly' instead
+	of 'forward-word' and 'backward-word'.
+
+2016-02-05  Lars Ingebrigtsen  
+
+	Fix doc string of tls-program
+
+	* lisp/net/tls.el (tls-program): Document the %t parameter (bug#22559).
+
+2016-02-05  Mark Oteiza  
+
+	* etc/NEWS: Document new mpc.el features
+
+2016-02-04  Leo Liu  
+
+	* lisp/custom.el (defface): Revert indentation change.  (Bug#22524)
+
+2016-02-04  Alan Mackenzie  
+
+	Correctly fontify C++ initializations which "look like" functions.
+
+	Fixes bug#7579.
+
+	lisp/progmodes/cc-engine.el (c-forward-declarator): Add extra optional
+	parameter to enable handling of "anonymous" declarators in declarations.
+
+	lisp/progmodes/cc-fonts.el (c-font-lock-declarators): Check more rigorously
+	whether a "(" opens a parameter list of a function, or an initialization of a
+	variable.
+
+2016-02-04  Ulf Jasper  
+
+	Improve newsticker-treeview-selection-face
+
+	* newst-treeview.el (newsticker-treeview-selection-face): Improve
+	readability for dark background.
+
+2016-02-04  Eli Zaretskii  
+
+	Minor fix in tagging Ruby accessors by etags
+
+	* lib-src/etags.c (Ruby_functions): Don't tag accessors whose
+	names are not literal symbols.  (Bug#22241)
+
+2016-02-04  Paul Eggert  
+
+	Spelling fixes
+
+2016-02-04  Dmitry Gutov  
+
+	Remove 'def X' from the example
+
+	* test/etags/ruby-src/test1.ru (A::B): Remove 'def X'
+	(http://lists.gnu.org/archive/html/emacs-devel/2016-02/msg00167.html).
+	* test/etags/CTAGS.good:
+	* test/etags/ETAGS.good_1:
+	* test/etags/ETAGS.good_2:
+	* test/etags/ETAGS.good_3:
+	* test/etags/ETAGS.good_4:
+	* test/etags/ETAGS.good_5:
+	* test/etags/ETAGS.good_6: Adjust accordingly.
+
+2016-02-09  Eli Zaretskii  
+
+	Fix network-stream-tests on MS-Windows
+
+	* test/lisp/net/network-stream-tests.el (make-local-unix-server):
+	Skip if local sockets are not supported.
+
+2016-02-09  Michael Albinus  
+
+	* admin/notes/bug-triage: Fix bug priorities.  Explain colors in debbugs-gnu.
+
+2016-02-09  Eli Zaretskii  
+
+	Disable 'timer-list'
+
+	* lisp/emacs-lisp/timer-list.el: Make 'timer-list' a disabled
+	command.
+
+2016-02-09  Paul Eggert  
+
+	Avoid aligned_alloc static/extern collision
+
+	* src/alloc.c (aligned_alloc): Define to private name when a
+	static function, to avoid collision with lisp.h extern decl.
+	Reported by John Yates in:
+	http://lists.gnu.org/archive/html/emacs-devel/2016-02/msg00439.html
+
+2016-02-08  Michal Nazarewicz  
+
+	Make `message-beginning-of-line' aware of folded headers
+
+	* lisp/gnus/message.pl (message-beginning-of-header): New function which
+	moves point to the beginning of a mail header.  The function is aware of
+	folded headers and with non-nil argument looks for the true beginning of
+	a header while with nil argument moves to the indented text of header's
+	value.
+	(message-beginning-of-line): Function is now aware of folded headers and
+	either moves point to the indention of a header or, in visual-line-mode,
+	searches for the beginning of the header.
+
+2016-02-08  Michal Nazarewicz  
+
+	Optimise ‘point in message header’ check
+
+	* lisp/gnus/message.el (message-point-in-header-p): Replace two unbound
+	regular expression matches with a single bound string match thus
+	reducing amount of work the function is doing.
+
+2016-02-08  Lars Ingebrigtsen  
+
+	Make the `R' command get the correct relative s
+
+	* lisp/net/eww.el (eww-readable): Preserve the base URL so
+	that image expansions are fetched from the right place (bug#22605).
+
+2016-02-08  Lars Ingebrigtsen  
+
+	Add a mode to list and cancel timers
+
+	* doc/lispref/os.texi (Timers): Menton `timer-list'.
+
+	* lisp/emacs-lisp/timer-list.el: New file.
+
+2016-02-08  Lars Ingebrigtsen  
+
+	Add new commands to allow changing the size of images
+
+	* lisp/image.el (image-increase-size, image-decrease-size):
+	New commands.
+	(image-change-size): New function.
+
+2016-02-08  Lars Ingebrigtsen  
+
+	Allow the image scale to be a floating point number
+
+	* src/image.c (compute_image_size): The scale can be a
+	floating point number.
+
+2016-02-08  Lars Ingebrigtsen  
+
+	Add an IPv6 test
+
+	* test/lisp/net/network-stream-tests.el
+	(connect-to-tls-ipv6-nowait): Add an ipv6 test, too.
+
+2016-02-08  Lars Ingebrigtsen  
+
+	Use gnutls-serv instead of openssh
+
+	* test/lisp/net/network-stream-tests.el (make-tls-server): Use
+	gnutls-serv instead of openssh.
+
+2016-02-08  Daniel Colascione  
+
+	Performance improvements for vc-hg
+
+	Teach vc-hg how to read some Mercurial internal data structures,
+	allowing us to avoid the need to run hg status -A, which is very slow
+	for large repositories.  Fall back to running hg if anything looks
+	funny.  vc-hg now puts the _working directory_ revision in the
+	modeline instead of the file revision, which greatly improves
+	performance and which allows us to again skip running hg in the case
+	that we have an active bookmark.
+
+	* lisp/vc/vc-hg.el (vc-hg-state): Try calling `vc-hg-statefast'
+	(vc-hg-symbolic-revision-styles)
+	(vc-hg-use-file-version-for-mode-line-version)
+	(vc-hg-parse-hg-data-structures): New user preferences
+	(vc-hg--active-bookmark-internal, vc-hg--run-log)
+	(vc-hg--symbolic-revision, vc-hg-mode-line-string)
+	(vc-hg--read-u8, vc-hg--read-u32-be)
+	(vc-hg--raw-dirstate-search, vc-hg--cached-dirstate-search)
+	(vc-hg--parts-to-string, vc-hg--pcre-to-elisp-re)
+	(vc-hg--glob-to-pcre, vc-hg--hgignore-add-pcre)
+	(vc-hg--hgignore-add-glob, vc-hg--hgignore-add-path)
+	(vc-hg--slurp-hgignore-1, vc-hg--slurp-hgignore)
+	(vc-hg--ignore-patterns-valid-p)
+	(vc-hg--ignore-patterns-ignored-p, vc-hg--time-to-fixnum)
+	(vc-hg--file-ignored-p, vc-hg--read-repo-requirements)
+	(vc-hg--requirements-understood-p, vc-hg--dirstate-scan-cache)
+	(vc-hg-state-fast): New functions.
+	(vc-hg--hgignore-patterns, vc-hg--hgignore-filenames)
+	(vc-hg--cached-ignore-patterns, vc-hg--dirstate-scan-cache)
+	(vc-hg--dirstate-scan-cache): New internal variables.
+	* lisp/vc/vc-hooks.el (vc-refresh-state): Invoke vc find-file-hook
+	before updating modeline.
+
+2016-02-07  Lars Ingebrigtsen  
+
+	Skip TLS tests if we don't have openssl
+
+	* test/lisp/net/network-stream-tests.el (connect-to-tls): Skip
+	TLS tests if we don't have openssl and GnuTLS.
+
+2016-02-07  Lars Ingebrigtsen  
+
+	Automatically scale images up on high-density screens
+
+	* doc/lispref/display.texi (ImageMagick Images): Mention :scale.
+	(Defining Images): Mention image-scaling-factor.
+
+	* lisp/image.el (image-compute-scaling-factor): New function
+	(bug#22172).
+	(create-image): Use it.
+	(image-scaling-factor): New variable.
+
+	* src/image.c (compute_image_size): Take :scale into account.
+
+2016-02-07  Lars Ingebrigtsen  
+
+	Ensure progress when fetching from the queue
+
+	* lisp/url/url-queue.el (url-queue-check-progress): Ensure
+	that we have progress when fetching queued requests (bug#22576).
+
+2016-02-07  Lars Ingebrigtsen  
+
+	Make mail-extract-address-components return the user name more
+
+	* lisp/mail/mail-extr.el (mail-extract-address-components):
+	Return the name even if it's the same as the mailbox name (if
+	`mail-extr-ignore-single-names' isn't set) (bug#22594).
+
+2016-02-07  Lars Ingebrigtsen  
+
+	Message no longer warns about unknown top level domains
+
+2016-02-07  Jarno Malmari  
+
+	Add tests for url-auth
+
+	* test/lisp/url/url-auth-tests.el: New file.
+
+2016-02-07  Lars Ingebrigtsen  
+
+	Add a TLS connection test
+
+	* test/lisp/net/network-stream-tests.el (connect-to-tls): Add
+	a TLS connection test.
+
+2016-02-07  Lars Ingebrigtsen  
+
+	Add more network tests
+
+	* test/lisp/net/network-stream-tests.el (echo-server-nowait):
+	New test.
+
+2016-02-07  Lars Ingebrigtsen  
+
+	Add network tests
+
+	* test/lisp/net/network-stream-tests.el: New suite of network tests.
+
+2016-02-07  Foo  
+
+	Allow various Gnus and Message address variables to be functions
+
+	* doc/misc/gnus.texi (To From Newsgroups):
+	gnus-ignored-from-addresses can be a function.
+
+	* doc/misc/message.texi (Wide Reply):
+	message-dont-reply-to-names can be a function.
+
+	* lisp/gnus/gnus-icalendar.el (gnus-icalendar-identities):
+	message-alternative-emails can be a function.
+
+	* lisp/gnus/gnus-notifications.el (gnus-notifications):
+	message-alternative-emails can be a function (bug#22315).
+
+	* lisp/gnus/gnus-sum.el
+	(gnus-summary-from-or-to-or-newsgroups):
+	gnus-ignored-from-addresses can be a function (bug#22315).
+
+2016-02-07  Lars Ingebrigtsen  
+
+	Fix typo in Gnus regexp
+
+	* lisp/gnus/gnus-art.el (gnus-button-valid-fqdn-regexp): Fix
+	typo in last change to this regexp (bug#22592).
+
+2016-02-07  Paul Eggert  
+
+	Port to FreeBSD x86
+
+	Reported by Herbert J. Skuhra in:
+	http://lists.gnu.org/archive/html/emacs-devel/2016-02/msg00336.html
+	* src/lisp.h (NONPOINTER_BITS) [__FreeBSD__]: Zero in this case too,
+	since malloc always returns a multiple of 8 in FreeBSD.
+
+2016-02-07  Alan Mackenzie  
+
+	On leaving CC Mode, clean up by removing character properties.
+
+	* lisp/progmodes/cc-mode.el (c-leave-cc-mode-mode): Remove from the buffer
+	all instances of the text properties/extents category, syntax-table,
+	c-is-sws, c-in-sws, c-type, and c-awk-NL-prop.
+
+2016-02-06  Lars Ingebrigtsen  
+
+	* lisp/gnus/gnus-art.el (gnus-button-valid-fqdn-regexp): Don't use
+	the no-longer-existing message-valid-fqdn-regexp variable.
+
+2016-02-06  Lars Ingebrigtsen  
+
+	Remove message-valid-fqdn-regexp, since it changes too much now
+	* lisp/gnus/message.el (message-valid-fqdn-regexp): Remove.
+	(message-bogus-recipient-p): Don't use it any more.
+	(message-make-fqdn): Ditto.  Suggested by Lars-Johan Liman.
+
+2016-02-06  Paul van der Walt    (tiny change)
+
+	* lisp/gnus/message.el (message-subject-re-regexp): Also match
+	"Re :" as a "Re:" prefix (commonly used in France).
+
+2016-02-06  Adam Sjøgren  
+
+	* lisp/net/shr.el (shr-tag-del, shr-tag-ins): New functions.
+
+2016-02-06  David Edmondson  
+
+	src/process.c Correctly convert AF_INET6 addresses
+	* src/process.c (conv_lisp_to_sockaddr): AF_INET6 addresses are
+	converted to a list of 16 bit quantities by
+	conv_sockaddr_to_lisp().  conv_lisp_to_sockaddr() should follow the
+	same scheme rather than expecting a (longer) list of 8 bit
+	quantities.
+
+2016-02-06  Martin Jesper Low Madsen    (tiny change)
+
+	* lisp/gnus/auth-source.el (auth-source-macos-keychain-search):
+	Search for all host/port (or protocol) combinations for a match in
+	the OS X keychain.
+
+2016-02-06  Lars Ingebrigtsen  
+
+	Remove nonsensical setting of gnus-newsgroup-unseen
+
+	* lisp/gnus/gnus-sum.el (gnus-update-marks): Remove nonsensical
+	setting of gnus-newsgroup-unseen.
+
+2016-02-05  Lars Ingebrigtsen  
+
+	Use underline on all terminals that support it
+
+	* lisp/subr.el (read-multiple-choice): Use
+	display-supports-face-attributes-p instead of
+	display-graphic-p to determine whether we can use underlining.
+
+2016-02-05  Lars Ingebrigtsen  
+
+	Make the nsm query say what it did after the user interaction
+
+	* lisp/net/nsm.el (nsm-query): Issue a message about
+	aborting/accepting messages (suggested by N. Jackson)
+	(bug#22531).
+
+2016-02-05  Paul Eggert  
+
+	Omit XLI (init) == 0 optimization in make-vector
+
+	* src/alloc.c (Fmake_vector): Simplify by omitting the (XLI (init)
+	== 0) case, as this optimization is probably not worth the hassle.
+	Just for the record, the test for that case could have been
+	(XLI (init) % ((EMACS_UINT) -1 / UCHAR_MAX) == 0) (!),
+	assuming the typical platform with no padding bits and where
+	conversion to int omits the most significant bits.
+
+2016-02-05  Paul Eggert  
+
+	* autogen.sh: Port to dash (Bug#22556).
+
+2016-02-05  Michael Albinus  
+
+	Minor cleanup for Tramp "doas".
+
+	* doc/misc/tramp.texi (Inline methods): Add "doas" method.
+
+	* etc/NEWS: Add Tramp connection method "doas".
+
+	* lisp/net/tramp-sh.el (tramp-methods) :
+	Add `tramp-remote-shell-args'.
+
+2016-02-05  Xi Lu  
+
+	* lisp/net/tramp-sh.el (tramp-methods) : Add.  (Bug#22542)
+
+	(tramp-default-user-alist): Add rule for "doas".
+	(top): Completion function for "doas" is
+	`tramp-completion-function-alist-su'.
+
+2016-02-05  Lars Ingebrigtsen  
+
+	Restore the window configuration
+
+	* lisp/net/nsm.el (nsm-query-user): Restore the window
+	configuration (bug#22532).
+
+2016-02-04  Lars Ingebrigtsen  
+
+	Use an X popup in read-multiple-choice if running from a mouse command
+
+	* lisp/subr.el (read-multiple-choice): Use an X popup if
+	called from a mouse action (bug#19368).
+
+2016-02-04  Lars Ingebrigtsen  
+
+	Display cursor in echo area when prompting
+
+	* lisp/subr.el (read-multiple-choice): Display the cursor in
+	the echo area when prompting (bug#19368).
+
+2016-02-04  Lars Ingebrigtsen  
+
+	Make NSM prompting clearer
+
+	* lisp/net/nsm.el (nsm-query-user): Use read-multiple-choice
+	to prompt in a nicer way (bug#19368).
+
+2016-02-04  Lars Ingebrigtsen  
+
+	Underline read-multiple-choice-face
+
+	* lisp/faces.el (read-multiple-choice-face): Also underline
+	the choice.
+
+2016-02-04  Lars Ingebrigtsen  
+
+	Make the read-multiple-choice prompt a bit prettier
+
+	* doc/lispref/commands.texi (Reading One Event): Mention
+	read-multiple-choice-face.
+
+	* lisp/subr.el (read-multiple-choice): Make the prompting a bit
+	prettier.
+
+2016-02-04  Paul Eggert  
+
+	Prefer memcpy and memset to doing it by hand
+
+	* src/alloc.c (Fmake_vector):
+	* src/ccl.c (setup_ccl_program):
+	Use memset to clear array.
+	* src/alloc.c (Fvector, Fmake_byte_code):
+	* src/charset.c (Fdefine_charset_internal):
+	Use memcpy to copy array.
+
+2016-02-04  Nicolas Petton  
+
+	Do not ignore redirections of 301, 302 and 307 status codes
+
+	The current version of HTTP/1.1 (RFC 7231) no longer requires
+	confirmation on 301, 302 or 307 status codes, therefore we do not have
+	to ignore redirects for other requests than GET and HEAD.
+
+	* lisp/url/url-http.el (url-http-parse-headers): Do not ignore 301, 302
+	and 307 redirects for other requests than GET and HEAD.
+
+2016-02-04  Mark Oteiza  
+
+	* lisp/net/eww.el (eww-switch-to-buffer): Use pop-to-buffer-same-window instead.
+
+2016-02-04  Paul Eggert  
+
+	Simplify USE_ALIGNED_ALLOC
+
+	* src/alloc.c (USE_ALIGNED_ALLOC): Simplify, now that we’ve merged
+	in the emacs-25 changes.  Omit no-longer-needed decl for aligned_alloc.
+
+2016-02-04  Eric Abrahamsen  
+
+	Honor docstring of gnus-group-get-new-news
+
+	* lisp/gnus/gnus-start.el (gnus-get-unread-articles): If the prefix arg
+	is t, but non-numeric, unconditionally consider all groups to need
+	updating.
+
+2016-02-04  Lars Ingebrigtsen  
+
+	New function read-multiple-choice
+
+	* doc/lispref/commands.texi (Reading One Event): Document
+	read-multiple-choice.
+
+	* lisp/faces.el (read-multiple-choice-face): New face.
+
+	* lisp/subr.el (read-multiple-choice): New function.
+
+2016-02-04  John Wiegley  
+
+	Merge from origin/emacs-25
+
+	ee73997 Make erc work better when encountering unknown prefix chars
+	b99141d Make erc completion case-insensitive again
+	66c4620 Make complection in erc use consistent casing
+	8c562b2 Make /QUIT in erc more robust
+	d93d2c5 Make tracking faces in Emacs work more reliably
+	af6ab7e Make shr not bug out on images on non-graphical displays
+	3311f40 Fix bookmark display widths
+	d90ab1e Fix typo in eww-make-unique-file-name
+	7f81825 Make it possible to TAB to input fields
+	a43a1dc Insert complete alt texts when images are disabled
+	56ed4e1 Allow eww text fields to grow
+	66b315c Make erc work when subword-mode is switched on
+	255b68f Fix IMAP doc example
+	91557f5 Quoting fixes in doc strings and diagnostics
+	2c0dc9f Fix warning message in hack-local-variables
+	504696d Etags: yet another improvement in Ruby tags
+	8784ebf Fix x-popup-menu on TTYs without a mouse
+	8b87ecb * lisp/emacs-lisp/map.el: Improvements to the docstring of the
+	        pcase macro
+	6191003 Use pop-to-buffer-same-window in eww
+	fe321fd * autogen.sh: Revert all recent changes.
+	74ebd4a * make-dist: Updates related to nt/.
+	737193a * make-dist: Add modules/.
+	3696bf2 * make-dist: Update for super-special file that can't live in etc/.
+	a4278e2 Fix failure to compile ns-win.el in parallel builds
+	860da4d Fix names of tags generated for Ruby accessors
+	f6213ce Fix file-name recognition in 'etags'
+	e42e662 Change Ruby file names and extensions recognized by 'etags'
+	58bfb6a More improvements for Ruby support in 'etags'
+	c04e911 Add --git-config option to autogen.sh
+	5713466 Fix editing undo changes in eww fields
+	51362d6 Allow the user more control of popping up the eww window
+	ee0fbd8 Make eww-browse-url with new-window parameter work again
+	9c3142d Clean up eww code slightly
+	cb035f3 Don't insert nil faces in shr
+	4c3fae3 ; * lisp/progmodes/prolog.el: Remove some obsolete commentary.
+	93f2153 Improve the custom type of some user options.
+	9f60d7e Mark some risky calendar variables.
+	1d07dcd Highlight two additional SCSS keywords
+	ee8b466 Recommend enabling integrity-checking in git
+	e639e10 Some corrections in Elisp manual
+	d766ca8 Chatter when autogen.sh changes Git configuration
+	3b734e1 * org/org-compat.el (org-font-lock-ensure): Fix bogus test (bug#22399)
+	43cb9f8 Omit unnecessary history from Lisp intro
+	2fbd1da * etc/HISTORY: Add some more history, plus git tags.
+	c90e1b4 Improve elisp “Security Considerations” doc
+	cedd7ca autogen.sh now arranges for git to check hashes
+	86ce76b ; Fix ChangeLog.2 commit ID.
+	7b1d2b1 Fix (c & 040) typo in emergency escapes
+	a8273da Fix display of overlay strings with 'display' and 'box' property
+	fc48106 Fix imap-starttls-open
+	cdecbed Fix return value of imap-starttls-open
+	20c7e34 ; * etc/NEWS: Fix renamed command name
+	98bdbdb Correct reference to DARWIN_OS preprocessor symbol
+	b250d29 Spelling fix
+	b920a0e Spelling fixes
+	93b144b Pacify GCC on C library without glibc API
+
+2016-02-04  John Wiegley  
+
+	Merge from origin/emacs-25
+
+	ea26c8a * lisp/net/browse-url.el (browse-url-default-browser): Lower
+	        priority of non-free Chrome.
+	0fac75f Improve the custom type of some user options.
+	2df0e04 Highlight CSS variables with variable name face
+	3cf5e81 * lisp/gnus/gnus-kill.el (gnus-winconf-kill-file): Not
+	        user-serviceable.
+	2a5233c Mark some user options that can get evalled as risky.
+	39b166f Disable DebPrint in sys_read on MS-Windows
+	9fd0189 ;Fix ChangeLog entry
+	4bb7233 Fix typos in Introduction to Emacs Lisp manual
+
+2016-02-04  Vasilij Schneidermann    (tiny change)
+
+	Allow sending empty hidden values in eww
+
+	* lisp/net/eww.el (eww-tag-input): Allow sending empty hidden
+	values (bug#22388).
+
+	(cherry picked from commit 5898da8210af7953e638ddf7821c05260979c3f0)
+
+	Backport:
+
+2016-02-04  David Edmondson  
+
+	Make erc work better when encountering unknown prefix chars
+
+	* lisp/erc/erc.el (erc-channel-receive-names): Output a warning
+	instead of erroring out on unknown prefix chars (bug#22380).
+
+2016-02-04  Mark Oteiza  
+
+	Add a new command to switch between erc buffers
+
+	* doc/misc/eww.texi: Document eww-switch-to-buffer and its keybinding
+	* etc/NEWS: Mention new command
+	* lisp/net/eww.el (eww-mode-map): Bind eww-switch-to-buffer to "s"
+	(eww-mode-map): Add menu item
+	(eww-switch-to-buffer): New command
+
+2016-02-04  David Edmondson  
+
+	Make erc work better when encountering unknown prefix chars
+
+	* lisp/erc/erc.el (erc-channel-receive-names): Output a warning
+	instead of erroring out on unknown prefix chars (bug#22380).
+
+2016-02-04  Vasilij Schneidermann    (tiny change)
+
+	Allow sending empty hidden values in eww
+
+	* lisp/net/eww.el (eww-tag-input): Allow sending empty hidden
+	values (bug#22388).
+
+2016-02-04  Lars Ingebrigtsen  
+
+	Make erc completion case-insensitive again
+
+	* lisp/erc/erc.el (erc-completion-at-point): Make erc completion
+	case-insensitive again (bug#11360).
+
+2016-02-04  Carlos Pita    (tiny change)
+
+	Make complection in erc use consistent casing
+
+	* lisp/erc/erc-pcomplete.el (pcomplete-erc-all-nicks): Make
+	case in the complection consistent (bug#18509).
+
+2016-02-04  Francis Litterio  
+
+	Make /QUIT in erc more robust
+
+	* lisp/erc/erc.el (erc-kill-query-buffers): Don't bug out if we're
+	issuing /QUIT to disconnected servers (bug#22099).
+
+2016-02-04  Kevin Brubeck Unhammer    (tiny change)
+
+	Make tracking faces in Emacs work more reliably
+
+	* lisp/erc/erc-track.el (erc-faces-in): Always return lists of
+	faces to avoid later ambiguity (bug#22424).
+
+2016-02-04  Lars Ingebrigtsen  
+
+	Make shr not bug out on images on non-graphical displays
+
+	* lisp/net/shr.el (shr-put-image): Don't bug out on alt-less
+	images on non-graphical displays (bug#22327).
+
+2016-02-04  Andrew Hyatt  
+
+	Remove packages obsoleted before Emacs 24.
+
+	In accordance with the policy discussed in the emacs-devel list,
+	packages that have been obsoleted for a full major release cycle are up
+	for deletion.
+
+	This removes almost all packages that are now eligible for deletion,
+	with the exception of "cl-compat", which seems it is likely to still be
+	used, and "optional", which offers some functionality that doesn't have
+	a replacement yet.
+
+2016-02-04  Lars Ingebrigtsen  
+
+	Fix bookmark display widths
+
+	* lisp/net/eww.el (eww-list-bookmarks): Pop to the buffer before
+	preparing it so that the widths are computed correctly (bug#22328).
+
+2016-02-04  Lars Ingebrigtsen  
+
+	Fix typo in eww-make-unique-file-name
+
+	* lisp/net/eww.el (eww-make-unique-file-name): Make this function
+	actually work.
+
+2016-02-03  Lars Ingebrigtsen  
+
+	Make it possible to TAB to input fields
+
+	* lisp/net/eww.el (eww-tag-input): Make it possible to TAB to
+	input fields (bug#22540).
+
+2016-02-03  Lars Ingebrigtsen  
+
+	Insert complete alt texts when images are disabled
+
+	* lisp/net/shr.el (shr-tag-img): When images are disabled, insert
+	the complete alt/title string (bug#22293).
+
+2016-02-03  Lars Ingebrigtsen  
+
+	Allow eww text fields to grow
+
+	* lisp/net/eww.el (eww-process-text-input): Allow text fields to
+	grow when typing in stuff that's longer than the original width.
+
+2016-02-03  Dima Kogan  
+
+	Make erc work when subword-mode is switched on
+
+	* lisp/erc/erc-backend.el (erc-forward-word, erc-word-at-arg-p)
+	(erc-bounds-of-word-at-point): New functions to do word-based
+	things when subword-mode is switched on.
+
+	* lisp/erc/erc-button.el (erc-button-add-nickname-buttons): Use them
+	(bug#17558).
+
+2016-02-03  Teemu Likonen  
+
+	Fix IMAP doc example
+
+	* doc/misc/gnus.texi (Client-Side IMAP Splitting): Fix example.
+
+2016-02-03  Paul Eggert  
+
+	Quoting fixes in doc strings and diagnostics
+
+	* lisp/emacs-lisp/bytecomp.el (byte-compile-setq, byte-compile-funcall):
+	* lisp/gnus/mml-smime.el (mml-smime-get-dns-cert)
+	(mml-smime-get-ldap-cert):
+	Follow user style preference when quoting diagnostics.
+
+2016-02-03  Paul Eggert  
+
+	Mention context when resume from emergency escape
+
+	That way, if the user has been doing something else for a while,
+	they are reminded of the situation when restarting Emacs,
+	and are more likely to understand the two questions.
+	* doc/emacs/trouble.texi (Emergency Escape): Document this.
+	* src/keyboard.c (handle_interrupt): Implement this.
+
+2016-02-03  Noam Postavsky  
+
+	Fix warning message in hack-local-variables
+
+	* lisp/files.el (hack-local-variables): use 'thisbuf' to reference
+	the original buffer name in the warning message.  (Bug#21681)
+
+2016-02-03  Eli Zaretskii  
+
+	Etags: yet another improvement in Ruby tags
+
+	* lib-src/etags.c (Ruby_functions): Handle continuation lines in
+	Ruby accessor definitions.  (Bug#22241)
+
+	* test/etags/ruby-src/test1.ru (A::B#X): Add some more tests for
+	accessors and multiline definitions.
+	* test/etags/ETAGS.good_1:
+	* test/etags/ETAGS.good_2:
+	* test/etags/ETAGS.good_3:
+	* test/etags/ETAGS.good_4:
+	* test/etags/ETAGS.good_5:
+	* test/etags/ETAGS.good_6:
+	* test/etags/CTAGS.good: Adapt to changes in Ruby tags.
+
+2016-02-03  Eli Zaretskii  
+
+	Fix x-popup-menu on TTYs without a mouse
+
+	* src/menu.c (Fx_popup_menu): Be sure to initialize 'x' and 'y'
+	for the TTY case without a mouse.  (Bug#22538)
+
+2016-02-03  Nicolas Petton  
+
+	* lisp/emacs-lisp/map.el: Improvements to the docstring of the pcase macro
+
+2016-02-03  Paul Eggert  
+
+	Port aligned_alloc decl to Cygwin.
+
+	Problem reported by Ken Brown (Bug#22522#38).
+	* configure.ac (aligned_alloc): Check for decl too.
+	* src/lisp.h (aligned_alloc): Declare if not already declared.
+
+2016-02-03  Paul Eggert  
+
+	autogen.sh now configures git only on request
+
+	* autogen.sh (do_autoconf, do_git): New vars.
+	Support new arguments --help, all, autoconf, git.
+	By default, just do autoconf-related configuration, not git.
+	Prefer 'echo' to 'cat <
+
+	Use pop-to-buffer-same-window in eww
+
+	* lisp/net/eww.el: pop-to-buffer-same-window throughout instead of
+	switch-to-buffer (bug#22244).
+
+2016-02-02  Paul Eggert  
+
+	* autogen.sh: Revert all recent changes.
+
+2016-02-02  Paul Eggert  
+
+	Build with C11 if available
+
+	* admin/merge-gnulib (GNULIB_MODULES): Add std-gnu11.
+	* m4/std-gnu11.m4: New file, from gnulib.
+	* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
+
+2016-02-02  Paul Eggert  
+
+	Update gnulib copy
+
+	* doc/misc/texinfo.tex: Copy from gnulib.
+
+2016-02-02  Glenn Morris  
+
+	* make-dist: Updates related to nt/.
+
+	* make-dist: Add modules/.
+
+	* make-dist: Update for super-special file that can't live in etc/.
+
+2016-02-02  Eli Zaretskii  
+
+	Fix failure to compile ns-win.el in parallel builds
+
+	* src/Makefile.in ($(lispsource)/term/ns-win.elc): Add order-only
+	dependency on $(lispsource)/international/charprop.el.
+	(Bug#22501)
+
+2016-02-02  Eli Zaretskii  
+
+	Fix names of tags generated for Ruby accessors
+
+	* lib-src/etags.c (Ruby_functions): Don't include the leading
+	colon ':' in tags for Ruby accessors and aliases.  (Bug#22241)
+
+	* test/etags/ETAGS.good_1:
+	* test/etags/ETAGS.good_2:
+	* test/etags/ETAGS.good_3:
+	* test/etags/ETAGS.good_4:
+	* test/etags/ETAGS.good_5:
+	* test/etags/ETAGS.good_6:
+	* test/etags/CTAGS.good: Adapt to changes in Ruby tags.
+
+2016-02-02  Glenn Morris  
+
+	* lisp/vc/add-log.el (change-log-directory-files, find-change-log):
+	Doc tweaks.
+
+2016-02-02  Eli Zaretskii  
+
+	Fix file-name recognition in 'etags'
+
+	* lib-src/etags.c (get_language_from_filename): If FILE includes a
+	leading directory, compare only its basename to the known file
+	names in lang_names[].
+
+	* test/etags/Makefile (RBSRC): Adapt to recent test1.ruby
+	renaming.
+	* test/etags/ETAGS.good_1:
+	* test/etags/ETAGS.good_2:
+	* test/etags/ETAGS.good_3:
+	* test/etags/ETAGS.good_4:
+	* test/etags/ETAGS.good_5:
+	* test/etags/ETAGS.good_6:
+	* test/etags/CTAGS.good: Adapt to changes in Ruby file names and
+	to the results in Makefile due to the above etags.c fix.
+
+2016-02-02  Eli Zaretskii  
+
+	Change Ruby file names and extensions recognized by 'etags'
+
+	* lib-src/etags.c : New variable, holds names
+	of Ruby files.
+	: Treat .rb, .ru, and .rbw as Ruby extensions.
+	: Add Ruby_filenames to the Ruby entry.
+	* test/etags/ruby-src/test1.ru: Renamed from test1.ruby.
+	(Bug#22241)
+
+2016-02-02  Paul Eggert  
+
+	Port better to platforms lacking aligned_alloc
+
+	Problem reported by Ken Brown (Bug#22522).
+	* src/lisp.h (hybrid_aligned_alloc)
+	[HYBRID_MALLOC && !HAVE_ALIGNED_ALLOC]: New decl.
+
+2016-02-02  Paul Eggert  
+
+	Port malloc.h hygiene fix to LTO
+
+	* src/alloc.c (__malloc_initialize_hook):
+	Make it externally visible (Bug#22522).
+
+2016-02-02  Eli Zaretskii  
+
+	More improvements for Ruby support in 'etags'
+
+	* lib-src/etags.c (Ruby_functions): Tag Ruby accessors and
+	alias_method.  Identify constants even if the assignment is not
+	followed by whitespace.  (Bug#22241)
+
+	* test/etags/ruby-src/test1.ruby: Add tests for constants,
+	accessors, and alias_method.
+	* test/etags/ETAGS.good_1:
+	* test/etags/ETAGS.good_2:
+	* test/etags/ETAGS.good_3:
+	* test/etags/ETAGS.good_4:
+	* test/etags/ETAGS.good_5:
+	* test/etags/ETAGS.good_6:
+	* test/etags/CTAGS.good: Adapt to changes in Ruby tests.
+
+2016-02-02  Paul Eggert  
+
+	Add --git-config option to autogen.sh
+
+	* autogen.sh: New options --git-config, --help.
+	(git_config): New shell var.  Alter function to respect this var.
+
+2016-02-02  Lars Ingebrigtsen  
+
+	Fix editing undo changes in eww fields
+
+	* eww.el (eww-tag-form): Don't overwrite initial form data in text
+	fields.
+	(eww-process-text-input): Make `M-t' at the end of text fields work
+	better (bug#19085).
+
+2016-02-01  Lars Ingebrigtsen  
+
+	Allow the user more control of popping up the eww window
+
+	* eww.el (eww): Use pop-to-buffer-same-window (suggested by
+	Michael Heerdegen) (bug#22244).
+
+2016-02-01  Lars Ingebrigtsen  
+
+	Make eww-browse-url with new-window parameter work again
+
+	* eww.el (eww-browse-url): Stay in the same buffer if we're
+	already in a eww mode buffer so that eww-browse-url with a
+	new-window parameter works (bug#22244).
+
+2016-02-01  Lars Ingebrigtsen  
+
+	Clean up eww code slightly
+
+	* eww.el (eww-browse-url): Clean up code slightly.
+
+2016-02-01  Lars Ingebrigtsen  
+
+	Don't insert nil faces in shr
+
+	* shr.el (shr-insert-table): Don't add nil faces, because that
+	will show up in *Messages* as "Invalid face reference: nil [32
+	times]".
+
+2016-02-01  Glenn Morris  
+
+	Make find-change-log prefer a VCS root, if no ChangeLog exists.
+
+	* lisp/vc/add-log.el (change-log-directory-files): New option.
+	(find-change-log): Respect change-log-directory-files.
+	* doc/emacs/maintaining.texi (Change Log Commands):
+	Mention change-log-directory-files.
+
+2016-02-01  Glenn Morris  
+
+	Improve the custom type of some user options.
+
+	* lisp/autoinsert.el (auto-insert-alist):
+	* lisp/replace.el (query-replace-from-to-separator):
+	* lisp/gnus/gnus-art.el (gnus-hidden-properties):
+	* lisp/gnus/gnus-gravatar.el (gnus-gravatar-properties):
+	* lisp/gnus/gnus-picon.el (gnus-picon-properties):
+	* lisp/progmodes/prolog.el (prolog-keywords, prolog-types)
+	(prolog-mode-specificators, prolog-determinism-specificators)
+	(prolog-directives, prolog-program-name, prolog-program-switches)
+	(prolog-consult-string, prolog-compile-string, prolog-eof-string)
+	(prolog-prompt-regexp): Improve custom type.
+
+2016-02-01  Glenn Morris  
+
+	Mark some risky calendar variables.
+
+	* lisp/calendar/cal-china.el (chinese-calendar-time-zone):
+	Remove risky setting for deleted obsolete alias.
+	(calendar-chinese-standard-time-zone-name)
+	(calendar-chinese-daylight-saving-start)
+	(calendar-chinese-daylight-saving-end):
+	* lisp/calendar/calendar.el (calendar-iso-date-display-form)
+	(calendar-european-date-display-form)
+	(calendar-american-date-display-form, calendar-date-display-form):
+	* lisp/calendar/diary-lib.el (diary-remind-message)
+	(diary-header-line-format):
+	* lisp/calendar/solar.el (calendar-time-display-form)
+	(calendar-location-name): Mark as risky.
+
+2016-02-01  Simen Heggestøyl  
+
+	Highlight two additional SCSS keywords
+
+	* lisp/textmodes/css-mode.el (css-bang-ids): New defconst holding CSS
+	identifiers on the form !foo.
+	(scss-bang-ids): New defconst holding SCSS identifiers on the form
+	!foo.
+	(css--font-lock-keywords): Highlight the new SCSS bang identifiers in
+	`font-lock-builtin-face'.
+
+	* test/indent/css-mode.css: Add bang rule test case.
+
+	* test/indent/scss-mode.css: Add test cases for the introduced bang
+	rules.
+
+2016-02-01  Karl Fogel  
+
+	Recommend enabling integrity-checking in git
+
+	* admin/notes/git-workflow:  Recommend setting transfer.fsckObjects.
+
+	This is related to the autogen.sh changes made by Paul Eggert in
+	commit d766ca8f (2016-02-01) and commit cedd7cad (2016-02-01), and to
+	my edits today to http://www.emacswiki.org/emacs/GitForEmacsDevs and
+	to emacswiki.org/emacs/GitQuickStartForEmacsDevs.  See also the thread
+	"Recommend these .gitconfig settings for git integrity." at
+	https://lists.gnu.org/archive/html/emacs-devel/2016-01/threads.html#01802.
+
+2016-02-01  Martin Rudalics  
+
+	Some corrections in Elisp manual
+
+	* doc/lispref/buffers.texi (Read Only Buffers): Describe optional
+	argument POSITION.
+	* doc/lispref/debugging.texi (Error Debugging): `debug-on-signal'
+	is an option.
+	* doc/lispref/display.texi (Refresh Screen): Describe optional
+	argument FRAME of `redraw-frame'.
+	(Attribute Functions): Describe optional argument CHARACTER of
+	`face-font'.
+	(Defining Images): `image-load-path' is an option.
+	(Beeping): `ring-bell-function' is an option.
+	* doc/lispref/frames.texi (Size and Position): The PIXELWISE
+	argument of `set-frame-size' is optional.
+	(Raising and Lowering): The TERMINAL argument of `tty-top-frame'
+	is optional.
+	* doc/lispref/keymaps.texi (Controlling Active Maps): Fix doc of
+	`set-transient-map'.
+	* doc/lispref/minibuf.texi (Text from Minibuffer):
+	`read-regexp-defaults-function' is an option.
+	(Minibuffer Contents): `delete-minibuffer-contents' is a command.
+	* doc/lispref/modes.texi (Mode Line Variables):
+	`mode-line-position' and `mode-line-modes' are variables, not
+	options.
+	* doc/lispref/strings.texi (Creating Strings): The START argument
+	of `substring' is optional.
+	* doc/lispref/text.texi (Buffer Contents): Describe optional
+	argument NO-PROPERTIES of `thing-at-point'.
+	(User-Level Deletion): Both arguments of
+	`delete-trailing-whitespace' are optional.
+	(Margins): Use @key{RET} instead of @kbd{RET}.
+	* doc/lispref/windows.texi (Display Action Functions): Write
+	non-@code{nil} instead of non-nil.
+	(Choosing Window Options): The WINDOW arg of
+	`split-window-sensibly' is optional.
+	(Choosing Window Options): Write non-@code{nil} instead of
+	non-nil.
+	(Window Start and End): Both args of `window-group-end' are
+	optional.
+
+	* src/buffer.c (Fbarf_if_buffer_read_only): Rename argument POS
+	to POSITION to keep consisteny with doc-string.
+
+2016-02-01  Paul Eggert  
+
+	Double static heap size.
+
+	* src/sheap.h (STATIC_HEAP_SIZE): Double it, since it was too
+	small on FreeBSD (Bug#22086).
+
+2016-02-01  Paul Eggert  
+
+	Chatter when autogen.sh changes Git configuration
+
+	* autogen.sh (git_config): New function.  Use it instead of ‘git config’.
+
+2016-02-01  Kyle Meyer  
+
+	* org/org-compat.el (org-font-lock-ensure): Fix bogus test (bug#22399)
+
+2016-02-01  Michael Albinus  
+
+	Fix Bug#20821
+
+	* lisp/net/tramp.el (tramp-file-name-handler):
+	* lisp/net/tramp-sh.el (tramp-sh-handle-expand-file-name):
+	Use `tramp-drop-volume-letter'.  (Bug#20821)
+
+2016-01-31  Paul Eggert  
+
+	Omit unnecessary history from Lisp intro
+
+	* doc/lispintro/emacs-lisp-intro.texi (Review, Digression into C)
+	(Conclusion): Reword so as not to talk about earlier versions
+	of Emacs in what should be an intro.
+
+2016-01-31  Paul Eggert  
+
+	* etc/HISTORY: Add some more history, plus git tags.
+
+2016-01-31  Paul Eggert  
+
+	Improve elisp “Security Considerations” doc
+
+	* doc/lispref/os.texi (Security Considerations):
+	Mention call-process and rename-file as opposed to shell commands.
+	Add some more cross-references.
+
+2016-01-31  Paul Eggert  
+
+	autogen.sh now arranges for git to check hashes
+
+	Suggested by Karl Fogel in:
+	http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01802.html
+	* autogen.sh: Do "git config transfer.fsckObjects true".
+
+2016-01-31  Dave Barker  
+
+	Add ability to give rcirc servers an alias name
+
+	* lisp/net/rcirc.el (rcirc-server-alist): Add :server-alias
+	customization option.
+	(rcirc, rcirc-connect): Take server alias into account.
+
+2016-01-31  Paul Eggert  
+
+	Fix (c & 040) typo in emergency escapes
+
+	* src/keyboard.c (handle_interrupt): Fix recently-introduced
+	typo (040 should have been ~040) that silently suppressed
+	auto-saves after emergency escapes.  Redo comparison to avoid
+	similar problems.
+
+2016-01-31  Paul Eggert  
+
+	Port new hybrid malloc to FreeBSD
+
+	Problem reported by Wolfgang Jenkner in: http://bugs.gnu.org/22086#118
+	* src/gmalloc.c (__malloc_initialize_hook, __after_morecore_hook)
+	(__morecore) [HYBRID_MALLOC]: Define in this case too.
+
+2016-01-31  Wolfgang Jenkner  
+
+	* configure.ac: Stop using mmap for buffers for FreeBSD.
+
+2016-01-31  Eli Zaretskii  
+
+	Fix display of overlay strings with 'display' and 'box' property
+
+	* src/xdisp.c (get_next_display_element): Take the box face from
+	display stack level that comes from a buffer, not an overlay
+	string.  (Bug#22499)
+
+2016-01-31  Andreas Schwab  
+
+	Fix imap-starttls-open
+
+	* lisp/net/imap.el (imap-starttls-open): Log imap process
+	output.  Call imap-parse-greeting.  (Bug#22500)
+
+2016-01-31  Michael Albinus  
+
+	Merge changes from Tramp repository
+
+	* doc/misc/Makefile.in (${buildinfodir}/tramp.info tramp.html):
+	No EXTRA_OPTS needed.
+
+	* doc/misc/tramp.texi: Merge changes from Emacsemacs-25
+	branch, especially for @trampfn{}.
+	(Top): Move @ifnottex down.
+	(History): XEmacs support has been removed.
+	(GVFS based methods, Remote processes): Do not use emacsgvfs flag.
+	(Auto-save and Backup): Use both syntax versions.
+	(File name Syntax): Remark on IPv6 adresses is valid for
+	unified syntax only.
+
+	* doc/misc/trampver.texi: Do not set emacsgvfs flag.
+
+2016-01-31  Andreas Schwab  
+
+	Fix return value of imap-starttls-open
+
+	* lisp/net/imap.el (imap-starttls-open): Fix return value.
+
+2016-01-31  John Wiegley  
+
+	Correct reference to DARWIN_OS preprocessor symbol
+
+	* src/alloc.c: Correct a preprocessor reference to DARWIN_OS, which may
+	  not be defined.
+
+2016-01-30  Paul Eggert  
+
+	Spelling fixes
+
+	Spelling fix
+
+	Spelling fixes
+
+2016-01-30  Glenn Morris  
+
+	* lisp/vc/add-log.el (find-change-log): Use locate-dominating-file.
+
+2016-01-30  Matthew Carter  
+
+	Quote table names for postgres listings (sql-mode)
+
+	* lisp/progmodes/sql.el (sql-postgres-completion-object): Avoid passing
+	  unquoted table names to the completion list.
+
+2016-01-30  Glenn Morris  
+
+	Change Smerge "Mine" and "Other" for "Upper" and "Lower.  (Bug#20878)
+
+	* lisp/vc/smerge-mode.el (smerge-diff-switches)
+	(smerge-context-menu, smerge-match-conflict, smerge-swap): Doc fixes.
+	(smerge-upper, smerge-upper-face, smerge-keep-upper)
+	(smerge-diff-base-upper): Rename from smerge-mine, smerge-mine-face,
+	smerge-keep-mine, smerge-diff-base-mine.  Update all uses.
+	(smerge-mine-face, smerge-other-face): Remove obsolete face aliases.
+	(smerge-lower, smerge-lower-face, smerge-lower-re, smerge-keep-lower)
+	(smerge-diff-base-lower): Rename from smerge-other, smerge-other-face,
+	smerge-other-re, smerge-keep-other, smerge-diff-base-lower.
+	Update all uses.
+	(smerge-basic-map): Add "l" and "u" bindings.
+	(smerge-mode-menu): Update menu bindings for renaming.
+	(smerge-font-lock-keywords): Update face names.
+	(smerge-match-names): Update names.
+	(smerge-diff-upper-lower): Rename from smerge-diff-mine-other.
+	(smerge-match-conflict, smerge-ediff): Rename local variables.
+	(smerge-makeup-conflict): Relabel markers.
+	(smerge-parsep-re): Use renamed variables.
+
+2016-01-30  Paul Eggert  
+
+	Port recent my_edata change to MS-Windows
+
+	* src/lastfile.c (my_edata): Also define if WINDOWSNT.
+
+2016-01-30  Paul Eggert  
+
+	Pacify GCC on C library without glibc API
+
+	Without this change, with --enable-gcc-warnings GCC would complain
+	“error: redundant redeclaration of ‘aligned_alloc’”.
+	* configure.ac: Simplify aligned_alloc testing.
+	* src/alloc.c (aligned_alloc): Don’t use if DARWIN_OS,
+	since the simplified configure.ac no longer checks for that.
+	Don’t declare if HAVE_ALIGNED_ALLOC.
+	Correct misspelling of HAVE_ALIGNED_ALLOC in ifdef.
+
+2016-01-30  Paul Eggert  
+
+	Tell Automake the new lib/Makefile.am is OK
+
+	* lib/Makefile.am (AUTOMAKE_OPTIONS): Add -Wno-portability.
+
+2016-01-30  Paul Eggert  
+
+	Make it easy to override preferred-branch test
+
+	* Makefile.in (preferred-branch-is-current):
+	Rename from emacs-25-branch-is-current.  All uses changed.
+	(PREFERRED_BRANCH): New macro.
+
+2016-01-30  Glenn Morris  
+
+	* lisp/net/browse-url.el (browse-url-default-browser):
+	Lower priority of non-free Chrome.
+
+2016-01-30  Glenn Morris  
+
+	Improve the custom type of some user options.
+
+	* lisp/desktop.el (desktop-minor-mode-table):
+	* lisp/man.el (Man-frame-parameters):
+	* lisp/midnight.el (midnight-delay):
+	* lisp/speedbar.el (speedbar-select-frame-method):
+	* lisp/tooltip.el (tooltip-frame-parameters):
+	* lisp/tree-widget.el (tree-widget-space-width):
+	* lisp/type-break.el (type-break-keystroke-threshold):
+	* lisp/woman.el (woman-imenu-generic-expression):
+	* lisp/cedet/ede.el (ede-debug-program-function):
+	* lisp/cedet/ede/project-am.el (project-am-debug-target-function):
+	* lisp/emulation/viper-keym.el (viper-toggle-key):
+	* lisp/erc/erc-networks.el (erc-server-alist):
+	* lisp/gnus/message.el (message-deletable-headers, message-signature):
+	* lisp/mail/mailalias.el (mail-directory-stream):
+	* lisp/play/tetris.el (tetris-x-colors):
+	* lisp/progmodes/gud.el (gud-tooltip-modes): Improve custom type.
+
+2016-01-30  Simen Heggestøyl  
+
+	Highlight CSS variables with variable name face
+
+	* lisp/textmodes/css-mode.el (css-nmstart-re): Don't match variables.
+	(css--font-lock-keywords): Highlight variables in
+	`font-lock-variable-name-face'.
+
+2016-01-30  Glenn Morris  
+
+	* lisp/gnus/gnus-kill.el (gnus-winconf-kill-file): Not user-serviceable.
+
+2016-01-30  Glenn Morris  
+
+	Mark some user options that can get evalled as risky.
+
+	* lisp/allout.el (allout-title):
+	* lisp/emacs-lisp/edebug.el (edebug-global-break-condition):
+	* lisp/gnus/message.el (message-mailer-swallows-blank-line):
+	* lisp/progmodes/gud.el (gud-tooltip-display):
+	* lisp/vc/ediff-mult.el (ediff-default-filtering-regexp):
+	Mark as risky.
+
+2016-01-30  Eli Zaretskii  
+
+	Disable DebPrint in sys_read on MS-Windows
+
+	* src/w32.c (sys_read): Disable a debugging print that is normal
+	when non-blocking reads are retried.
+
+2016-01-30  Martin Rudalics  
+
+	;Fix ChangeLog entry
+
+2016-01-30  Eli Zaretskii  
+
+	Fix typos in Introduction to Emacs Lisp manual
+
+	* doc/lispintro/emacs-lisp-intro.texi (Emacs Initialization)
+	(kill-new function, Digression into C)
+	(Complete forward-sentence, Divide and Conquer, Find a File)
+	(lengths-list-many-files, Columns of a graph, defcustom)
+	(recursive-count-words): Fix typos.  Reported by Daniel Bastos
+	.
+
+2016-01-30  Paul Eggert  
+
+	Shrink static heap a bit
+
+	* src/sheap.h: Include lisp.h, for Lisp_Object.
+	(STATIC_HEAP_SIZE): Now an enum constant, not a macro.
+	Make it 2 MiB * sizeof (Lisp_Object), which is a bit more
+	conservative than the old value.
+	(Bug#22086)
+
+2016-01-30  Paul Eggert  
+
+	Fix extern symbols defined and not used
+
+	* src/alloc.c: Always include .
+	(malloc_warning) [!SIGDANGER && (SYSTEM_MALLOC || HYBRID_MALLOC)]:
+	Do not define; unused.
+	* src/emacs.c, src/lisp.h (might_dump) [!DOUG_LEA_MALLOC]: Now static.
+	* src/gmalloc.c (gdefault_morecore): Rename from __default_morecore,
+	to avoid collision with glibc.  Now static.  All uses changed.
+	* src/lastfile.c (my_edata): Define only if
+	((!defined SYSTEM_MALLOC && !defined HYBRID_MALLOC && !defined
+	WINDOWSNT) \ || defined CYGWIN || defined DARWIN_OS).
+	(Bug#22086)
+
+2016-01-30  Paul Eggert  
+
+	Build lib/e-*.o only on platforms that need it
+
+	* configure.ac (hybrid malloc): Simplify configuration.
+	(SHEAP_OBJ): Remove; no longer needed.
+	(HYBRID_MALLOC): New var. Subst it.
+	(HYBRID_MALLOC_LIB): New Automake conditional.
+	* lib/Makefile.am (noinst_LIBRARIES): Add libegnu.a only if
+	HYBRID_MALLOC_LIB.
+	(libegnu_a_CPPFLAGS): Omit AM_CPPFLAGS; not needed.
+	(MOSTLYCLEANFILES): Add libegnu.a.
+	* src/Makefile.in (SHEAP_OBJ): Remove.
+	(HYBRID_MALLOC): New macro.
+	(base_obj): Use it to conditionally add sheap.o.
+	(LIBEGNU_ARCHIVE): New macro.
+	($(LIBEGNU_ARCHIVE)): New rule, replacing $(lib)/libegnu.a.
+	All uses of the latter replaced by the former.
+	* src/alloc.c (USE_ALIGNED_ALLOC): Simplify configuration.
+	Correct misspelling ALIGNED_ALLOC to HAVE_ALIGNED_ALLOC.
+	* src/gmalloc.c: Update comment.
+	* src/lisp.h (aligned_alloc)
+	[!DOUG_LEA_MALLOC && !HYBRID_MALLOC && !SYSTEM_MALLOC]:
+	New decl.
+	(Bug#22086)
+
+2016-01-30  Paul Eggert  
+
+	Include  when advisable
+
+	This should help insulate us better from future glibc changes.
+	It is good hygiene to include .h files for APIs that Emacs uses.
+	Fix type clashes between Emacs and GNU  (Bug#22086).
+	* configure.ac: Check for malloc.h.
+	* src/alloc.c: Include  depending on HAVE_MALLOC_H,
+	not on DOUG_LEA_MALLOC.
+	* src/emacs.c, src/gmalloc.c (malloc_enable_thread):
+	Remove decl (now in lisp.h).
+	* src/gmalloc.c: Include stddef.h earlier, for ptrdiff_t.
+	[emacs]: Include lisp.h.
+	[HAVE_MALLOC_H]: Include .
+	(__MALLOC_HOOK_VOLATILE): New macro, if not already defined.
+	(__after_morecore_hook, __malloc_initialize_hook, __morecore)
+	(__default_morecore):
+	[!HAVE_MALLOC_H]: New decls near non-inclusion of .
+	(calloc): Make it clear that the macro should not be used.
+	Remove unused decl.
+	(malloc_info): New macro, to avoid clash with glibc .
+	(__morecore, __default_morecore, __after_morecore_hook)
+	(__malloc_extra_blocks, __malloc_initialize_hook, __free_hook)
+	(__malloc_hook, __realloc_hook, __memalign_hook, memory_warnings):
+	Remove later decls.
+	(gmalloc_hook, gfree_hook, grealloc_hook):
+	Rename from __malloc_hook, __free_hook, __realloc_hook to
+	avoid type collision with glibc .  All uses changed.
+	(gmalloc_hook):
+	(__malloc_extra_blocks) [DOUG_LEA_MALLOC||HYBRID_MALLOC||SYSTEM_MALLOC]:
+	Now static.
+	(gmalloc_hook, __malloc_extra_blocks): Define even if [!HYBRID_MALLOC].
+	(__malloc_initialize_hook, __after_morecore_hook):
+	Declare with types compatible with glibc.
+	(__memalign_hook, hybrid_calloc) [HYBRID_MALLOC]:
+	Remove.  All uses removed.
+	* src/lisp.h (__malloc_extra_blocks, malloc_enable_thread): New decls.
+	* src/ralloc.c, src/vm-limit.c:
+	Simplify includes and include  if available.
+
+2016-01-30  Paul Eggert  
+
+	* src/alloc.c: Include "sheap.h".
+
+	(alloc_unexec_pre, alloc_unexec_post) [HYBRID_MALLOC]:
+	Set and clear bss_sbrk_did_unexec, on all platforms not just Cygwin.
+	* src/lisp.h (alloc_unexec_pre, alloc_unexec_post) [!DOUG_LEA_MALLOC]:
+	Declare unconditionally.
+	* src/unexcw.c, src/unexelf.c (bss_sbrk_did_unexec): Remove decl.
+	(unexec): Don’t set or clear bss_sbrk_did_unexec;
+	the caller now does this.
+	(Bug#22086)
+
+2016-01-30  Paul Eggert  
+
+	Pacify --enable-gcc-warnings when HYBRID_MALLOC
+
+	* src/buffer.c (init_buffer):
+	* src/emacs.c (main):
+	* src/xsmfns.c (smc_save_yourself_CB, x_session_initialize):
+	Use emacs_get_current_dir_name, not get_current_dir_name.
+	* src/conf_post.h (aligned_alloc) [HYBRID_MALLOC && emacs]: New macro.
+	(HYBRID_GET_CURRENT_DIR_NAME, get_current_dir_name): Remove.
+	* src/emacs.c: Include "sheap.h".
+	(report_sheap_usage): Remove decl.
+	(Fdump_emacs) [HYBRID_MALLOC]: Report usage directly.
+	Don't assume ptrdiff_t can be printed as int.
+	* src/gmalloc.c [HYBRID_MALLOC]:
+	Include "sheap.h" rather than declaring its contents by hand.
+	(get_current_dir_name, gget_current_dir_name)
+	(hybrid_get_current_dir_name): Remove.
+	(emacs_abort): Remove duplicate decl.
+	(aligned_alloc): Undef, like malloc etc.
+	(ALLOCATED_BEFORE_DUMPING): Now a static function, not a macro.
+	Make it a bit more efficient.
+	(malloc_find_object_address): Remove unused decl.
+	(enum mcheck_status, mcheck, mprobe, mtrace, muntrace, struct mstats)
+	(mstats, memory_warnings): Declare only if GC_MCHECK.
+	* src/lisp.h (emacs_get_current_dir_name):
+	New decl, replacing get_current_dir_name.
+	* src/sheap.c: Include sheap.h first.
+	(STATIC_HEAP_SIZE): Remove; now in sheap.h.
+	(debug_sheap): Now static.
+	(bss_sbrk_buffer_end): Remove; no longer used.
+	(bss_sbrk_ptr): Now static and private.
+	(bss_sbrk_did_unexec): Now bool.
+	(BLOCKSIZE): Remove, to avoid GCC warning about its not being used.
+	(bss_sbrk): Don't treat request_size 0 as special, since the code
+	works without this being a special case.
+	Avoid overflow if request size exceeds INT_MAX.
+	(report_sheap_usage): Remove; now done in emacs.c.
+	* src/sheap.h: New file.
+	* src/sysdep.c (get_current_dir_name): Remove macro.
+	Include "sheap.h".
+	(emacs_get_current_dir_name): Rename function from
+	get_current_dir_name.  Handle HYBRID_MALLOC here;
+	this is simpler.
+	(Bug#22086)
+
+2016-01-30  Paul Eggert  
+
+	Report static heap usage on non-Cygwin, too
+
+	* src/emacs.c (Fdump_emacs) [HYBRID_MALLOC]: Report sheap usage here ...
+	* src/unexcw.c (unexec): ... instead of here, since sheap can be used
+	on platforms other than Cygwin (Bug#22086).
+
+2016-01-30  Paul Eggert  
+
+	Pacify GCC on extern decls
+
+	* src/unexelf.c (bss_sbrk_did_unexec): Move decl to top level
+	to pacify recent GCC (Bug#22086).
+
+2016-01-30  Wolfgang Jenkner  
+
+	Add musl patch to support HYBRID_MALLOC on elf systems
+
+	* src/gmalloc.c: Adjust for HYBRID_MALLOC in the non CYGWIN case.
+	(__default_morecore): Here, in particular.
+	* configure.ac: Define HYBRID_MALLOC when unexelf.o is used.
+	New variable SHEAP_OBJ.
+	* src/Makefile.in: Use it.
+	(Bug#22086)
+
+2016-01-30  Rich Felker    (tiny change)
+
+	unexelf.c hook to support HYBRID_MALLOC on ELF
+
+	* src/unexelf.c (unexec) [HYBRID_MALLOC]:
+	Define bss_sbrk_did_unexec (Bug#22086).
+
+2016-01-30  Wolfgang Jenkner  
+
+	Link temacs with gnulib compiled with -Demacs
+
+	This is done to support HYBRID_MALLOC, since some static variables
+	(e.g., last_environ in putenv.c) hold pointers to memory malloced
+	before dumping (Bug#22086).
+	* lib/Makefile.am: Add incantation to install libegnu.a.
+	* src/Makefile.in ($(lib)/libgnu.a): Replace with libegnu.a
+	(temacs$(EXEEXT)): Use it.
+
+2016-01-30  Wolfgang Jenkner  
+
+	Internal linkage for gmalloc etc. if HYBRID_MALLOC
+
+	This avoids clashes with symbols if the after-dump malloc is
+	derived from Doug Lea's implementation (Bug#22086).
+
+	* src/gmalloc.c (emacs_abort, __morecore, __default_morecore):
+	Move declarations up.  For HYBRID_MALLOC, turn all `extern'
+	declarations below to `static' ones.
+	(aligned_alloc): Declare for !MSDOS as well.
+	(heapsize, _fraghead): Move resp. copy declaration downwards.
+	For HYBRID_MALLOC, conditionalize out the other definitions,
+	since the previous `static' declarations double as tentative
+	definitions, anyway.
+	(_malloc, _free, _realloc, __free_hook, _aligned_blocks)
+	(__realloc_hook, __memalign_hook): Conditionalize out.
+	(cfree, memalign, valloc): Ditto.
+
+2016-01-30  Paul Eggert  
+
+	Merge from origin/emacs-25
+
+	3f481ad Rename xref-query-replace to xref-query-replace-in-results
+	62f4ed4 Update cl-defgeneric and cl-defmethod docstrings
+	2111e0e Comment out next-error-function integration in xref
+	4e11ad3 Correct a use of "which" in intro.texi
+	a1865bc Distinguish the two meanings of Java's keyword "default".  Fixes bug #22358.
+	76045f7 Don't operate on menu bar of nonexistent frame
+	c32f3bc Unbreak the GNUstep build.
+
+2016-01-30  Andreas Schwab  
+
+	Re-enable checks in member, memql, delete to complain about non-lists
+
+	* src/fns.c (Fmember, Fmemql, Fdelete): Revert 2007-10-16 change.
+
+2016-02-04  Martin Rudalics  
+
+	Minor doc(-string) tweaks
+
+	* lisp/window.el (window-in-direction): Fix doc-string typo.
+	* doc/lispref/frames.texi (Frame Font): Mention canonical
+	character width/height.
+	* doc/lispref/windows.texi (Windows and Frames): Clarify
+	handling of minibuffer window for `window-in-direction'.
+	(Window Sizes): Minor tweaks in descriptions of
+	`window-max-chars-per-line', `window-min-width' and
+	`window-min-size'.
+	(Deleting Windows): Minor tweak in `delete-window' description.
+	(Selecting Windows): Clarify window use time description.
+	(Cyclic Window Ordering): Minor tweak.
+	(Switching Buffers): Clarify description of
+	`switch-to-buffer-in-dedicated-window'.
+
+2016-02-04  Eli Zaretskii  
+
+	Remove some useless-use-of eval.
+
+	* lisp/gnus/gnus.el (gnus-load-hook): Don't use eval.
+	* lisp/gnus/nnrss.el (xml): Simply require it.
+	(xml-rpc-method-call): Use declare-function.
+
+2016-01-28  Glenn Morris  
+
+	Don't use eval to quieten prolog.el compilation.
+
+	* lisp/progmodes/prolog.el (pltrace-on, pltrace-off): Declare.
+	(prolog-enable-sicstus-sd, prolog-disable-sicstus-sd): Don't use eval.
+
+2016-01-28  Glenn Morris  
+
+	Mark some risky prolog variables.
+
+	* lisp/progmodes/prolog.el (prolog-system-version)
+	(prolog-keywords, prolog-types, prolog-mode-specificators)
+	(prolog-determinism-specificators, prolog-directives)
+	(prolog-program-name, prolog-program-switches)
+	(prolog-consult-string, prolog-compile-string)
+	(prolog-eof-string, prolog-prompt-regexp, prolog-help-function):
+	Mark anything processed by prolog-find-value-by-system as risky.
+
+2016-01-28  Glenn Morris  
+
+	* lisp/custom.el (defcustom): Doc fix.
+
+	* doc/lispref/customize.texi (Variable Definitions):
+	Defcustom should always have a type.
+
+2016-01-28  Glenn Morris  
+
+	* lisp/emacs-lisp/bytecomp.el (byte-compile-nogroup-warn):
+	Warn if defcustom has no type.  (Bug#16276)
+
+	* lisp/cedet/semantic/db-file.el (semanticdb-persistent-path):
+	Fix :type.
+
+	* lisp/emacs-lisp/package.el (package-load-list): Improve :type.
+
+2016-01-28  Michael Albinus  
+
+	Fix Bug#22452
+
+	* lisp/net/tramp-adb.el (tramp-adb-maybe-open-connection):
+	* lisp/net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection):
+	* lisp/net/tramp-sh.el (tramp-maybe-open-connection):
+	* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
+	Mark it as connected.
+
+	* lisp/net/tramp.el (tramp-handle-file-remote-p): Check also, if
+	connection property "connected" is set.  (Bug#22452)
+
+2016-01-27  Glenn Morris  
+
+	* test/lisp/vc/vc-hg.el: Move from test/automated/.
+
+	* lisp/xwidget.el (xwidget-query-on-exit-flag): Declare.
+
+	* lisp/xwidget.el (xwidget-webkit-browse-url): Give explicit error
+	if not compiled with xwidgets.
+
+2016-01-26  Paul Eggert  
+
+	C-u C-x = example doc fix
+
+	* doc/emacs/mule.texi (International Chars):
+	Adjust example to match current behavior of C-u C-x =.
+
+2016-01-26  Paul Eggert  
+
+	malloc.h hygiene
+
+	This attempts to future-proof Emacs a bit against possible glibc
+	changes, by having Emacs use  declarations rather than
+	coding them up by hand.  Problem noted by Florian Weimer in:
+	https://sourceware.org/ml/libc-alpha/2016-01/msg00777.html
+	Implement this mainly by moving malloc.h-related functions from
+	emacs.c (which does not include ) to alloc.c (which does).
+	* src/alloc.c (my_heap_start) [DOUG_LEA_MALLOC || GNU_LINUX]:
+	New function.
+	The remaining changes to this file apply only if DOUG_LEA_MALLOC.
+	(alloc_unexec_pre, alloc_unexec_post): New functions.
+	(malloc_initialize_hook): Use my_heap_start and alloc_unexec_post.
+	(__MALLOC_HOOK_VOLATILE): New macro, if not already defined.
+	(__malloc_initialize_hook): Use it.
+	(malloc_state_ptr, malloc_initialize_hook, __malloc_initialize_hook):
+	Move here from ...
+	* src/emacs.c: ... here.
+	(malloc_get_state, malloc_set_state): Remove extern decls.
+	(my_heap_start) [DOUG_LEA_MALLOC || GNU_LINUX]: Remove static var.
+	All uses changed to similarly-named new function.
+	(Fdump_emacs): Use new functions alloc_unexec_pre, alloc_unexec_post.
+	* src/lisp.h (my_heap_start, alloc_unexec_pre, alloc_unexec_post):
+	New decls.
+
+2016-01-26  Eli Zaretskii  
+
+	* doc/emacs/mark.texi (Using Region): Clarify wording.  (Bug#22467)
+
+2016-01-26  Paul Eggert  
+
+	Remove never-set var handle_user_signal_hook
+
+	* src/keyboard.c, src/keyboard.h (handle_user_signal_hook):
+	Remove never-set var.  All uses removed.
+
+2016-01-26  Anders Lindgren  
+
+	Fixed NextStep fullscreen issue (bug#22468)
+
+	When in fullscreen mode, `[screen visibleFrame]' sometimes
+	includes, sometimes excludes the menu bar. This could cause
+	a frame to be placed too low when in fullscreen mode.
+
+	* src/nsterm.m (ns_menu_bar_should_be_hidden): Trace.
+	(constrain_frame_rect): New parameter, isFullscreen, when true don't
+	query the height of the menu bar.
+	(ns_constrain_all_frames): Pass `false' (isFullscreen) to
+	`constrain_frame_rect'.
+	([EmacsView initFrameFromEmacs:]): Trace.
+	([EmacsView isFullscreen]): Trace.
+	([EmacsWindow constrainFrameRect:toScreen:]): Pass fullscreen
+	state to `constrain_frame_rect'.
+
+2016-01-25  Artur Malabarba  
+
+	* lisp/files.el: Use a fixed file name for the second dir-locals file
+
+	(dir-locals-file): Revert to its original fixed value.
+	(dir-locals-file-2): New const.
+	(dir-locals--all-files): Don't use `file-name-all-completions'.
+	Instead, just check for the 2 dir-locals files and return a list
+	of the ones that exit (if any).
+
+	* etc/NEWS: Document the change.
+
+	* doc/emacs/custom.texi (Directory Variables): Document the change.
+
+	* doc/lispref/variables.texi (Directory Local Variables): Update
+	accordingly.
+
+2016-01-25  Artur Malabarba  
+
+	* lisp/files-x.el (modify-dir-local-variable): Small rewrite
+
+	Change a variable name to be more meaningful, and reorder some of
+	the code with no change in behaviour.
+
+2016-01-25  Artur Malabarba  
+
+	* lisp/files.el (dir-locals-find-file): Refactor return values
+
+	Returning a cache remains unchanged, but the case of returning a
+	file (or pattern) is now changed to return the contaning
+	directory.
+
+	(dir-locals-read-from-file): Rename to `dir-locals-read-from-dir'
+	and make obsolete.
+	(dir-locals-read-from-dir): Simplify accordingly.
+	(hack-dir-local-variables): Simplify accordingly and rename a
+	variable.
+
+2016-01-25  Glenn Morris  
+
+	* lisp/textmodes/flyspell.el (flyspell--prev-meta-tab-binding):
+	Declare.
+
+	* configure.ac (USE_CAIRO): Rename to more standard HAVE_CAIRO.
+
+	* configure.ac (--with-cairo): Say it's experimental.
+
+	* lisp/xwidget.el (xwidget-webkit-scroll-behavior):
+	Rename using American spelling.  Update all uses.
+
+2016-01-25  Glenn Morris  
+
+	Yet more xwidget doc fixes.
+
+	* lisp/xwidget.el (xwidget-webkit-scroll-behaviour)
+	(xwidget-insert, xwidget-webkit-browse-url)
+	(xwidget-webkit-scroll-up, xwidget-webkit-scroll-down)
+	(xwidget-webkit-scroll-forward, xwidget-webkit-scroll-backward)
+	(xwidget-webkit-insert-string, xwidget-webkit-show-named-element)
+	(xwidget-webkit-show-id-element)
+	(xwidget-webkit-show-id-or-named-element)
+	(xwidget-webkit-adjust-size, xwidget-webkit-current-url)
+	(xwidget-webkit-execute-script-rv)
+	(xwidget-webkit-copy-selection-as-kill, xwidget-get)
+	(xwidget-put):  Doc fixes.
+	(xwidget-webkit-insert-string, xwidget-webkit-show-named-element)
+	(xwidget-webkit-show-id-element)
+	(xwidget-webkit-show-id-or-named-element): Prompt fixes.
+
+2016-01-25  Ted Zlatanov  
+
+	* lisp/gnus/gnus-art.el (gnus-blocked-images):
+	Add explicit nil choice and tags.
+
+2016-01-25  Paul Eggert  
+
+	Spelling fixes
+
+2016-01-25  Stefan Monnier  
+
+	(rng-c-fix-escaped-newlines): Use subst-char-in-string
+
+	* lisp/nxml/rng-cmpct.el (rng-c-fix-escaped-newlines):
+	Use subst-char-in-string.
+
+2016-01-25  Stefan Monnier  
+
+	* lisp/textmodes/sgml-mode.el (sgml-forward-sexp): New function
+
+	(sgml-cursor-sensor, sgml-pretty-print, sgml-parse-tag-backward)
+	(sgml-calculate-indent): Use it.
+
+2016-01-25  Stefan Monnier  
+
+	* lisp/org: Fix some compiler warnings
+
+	* lisp/org/ob-core.el (org-babel-check-confirm-evaluate)
+	(org-babel-map-src-blocks): Don't emit warnings if added vars are not used.
+	(*this*): Declare as dyn-bound.
+	(org-babel-expand-src-block, org-babel-load-in-session)
+	(org-babel-switch-to-session-with-code, org-babel-get-rownames):
+	Mark unused args.
+	(org-babel-combine-header-arg-lists): Remove unused var `args'.
+	(org-babel-find-named-block): Remove unused var `msg'.
+
+	* lisp/org/org-src.el (org-inhibit-startup, org-src-fontify-natively):
+	Declare as dyn-bound.
+	(org-edit-src-code): Remove unused var `lfmt'.
+	(org-edit-fixed-width-region): Remove unused var `preserve-indentation'.
+
+2016-01-25  Stefan Monnier  
+
+	* lisp/font-lock.el: Use #' to quote function symbols
+
+2016-01-25  Stefan Monnier  
+
+	(font-lock-ensure-function): Fix bug#22399
+
+	* lisp/font-lock.el (font-lock-ensure-function): Fix handling when
+	font-lock-mode is not enabled (bug#22399).
+
+2016-01-25  Alan Mackenzie  
+
+	Expunge "allow" + infinitive from source and doc, part 2.
+
+	Do the same for "permit", "enable", "prevent", and (where appropriate)
+	"require".
+
+	doc/misc/reftex.texi:
+	doc/misc/url.texi:
+	lib/get-permissions.c:
+	lib/strftime.c:
+	lisp/org/org-element.el:
+	lisp/org/org-mobile.el:
+	lisp/textmodes/reftex-vars.el:
+	src/bidi.c:
+	src/emacs.c:
+	src/xdisp.c:
+	test/etags/c-src/emacs/src/lisp.h:
+
+	Expunge the likes of "This allows to do something" from the above files.
+
+2016-01-25  Artur Malabarba  
+
+	* lisp/emacs-lisp/tabulated-list.el (tabulated-list-mode): Redundant line
+
+	`special-mode' is already read-only.
+
+2016-01-25  Artur Malabarba  
+
+	* lisp/emacs-lisp/ert.el (ert--results-move): Change error to user-error
+
+2016-01-24  Paul Eggert  
+
+	Port "$@" to OpenIndiana ksh93
+
+	In http://lists.gnu.org/archive/html/bug-autoconf/2015-12/msg00000.html
+	Pavel Raiskup reports that ${1+"$@"} runs afoul of a bug in /bin/sh
+	(derived from ksh 93t+ 2010-03-05).  ${1+"$@"} works around an ancient
+	bug in long-dead shells, so remove the workaround.
+	* admin/check-doc-strings, configure.ac, lib-src/rcs2log:
+	Use plain "$@" rather than ${1+"$@"}.
+
+2016-01-24  Paul Eggert  
+
+	* src/xwidget.c (Fxwidget_set_adjustment): Fix doc string quoting typo.
+
+2016-01-24  Paul Eggert  
+
+	Improve wording for SMB support
+
+	* doc/misc/tramp.texi (External methods): Improve and modernize
+	wording for discussion of smbclient.  There is no longer any
+	need to mention the laundry list of old MS Windows implementations
+	of SMB and CIFS, nor to mention CIFS.  Also, give a URL for Samba.
+
+2016-01-24  Paul Eggert  
+
+	Merge from gnulib
+
+	This incorporates:
+	2016-01-24 openat_proc_name: fix last '/' overwritten on OS/2 kLIBC
+	2016-01-24 closedir, dirfd, opendir: port to OpenSolaris 5.10
+	2016-01-15 detect utimes() correctly on OS/2 kLIBC
+	2016-01-15 openat_proc_name: port to OS/2 kLIBC
+	2016-01-14 stdint: check _INTPTR_T_DECLARED for intptr_t etc.
+	2016-01-14 opendir, closedir, dirfd, fdopendir: port to OS/2 kLIBC
+	2016-01-14 dup, dup2, fcntl: support a directory fd on OS/2 kLIBC
+	2016-01-14 binary-io: don't put fd in binary mode if a console on EMX
+	2016-01-14 sig2str: list all signals on FreeBSD >= 7
+	2016-01-13 acl-permissions: port to USE_ACL==0 platforms
+	2016-01-12 mktime: rename macro to avoid glibc clash
+	2016-01-12 Port "$@" to OpenIndiana ksh93
+	2016-01-12 Port Universal Time settings to strict POSIX
+	* build-aux/gitlog-to-changelog, build-aux/update-copyright:
+	* doc/misc/texinfo.tex, lib/acl-internal.c, lib/acl-internal.h:
+	* lib/binary-io.h, lib/dirent.in.h, lib/dirfd.c, lib/dup2.c:
+	* lib/fcntl.c, lib/fdopendir.c, lib/mktime.c, lib/openat-proc.c:
+	* lib/sig2str.h, lib/stdint.in.h, m4/dirfd.m4, m4/dup2.m4:
+	* m4/fcntl.m4, m4/utimes.m4:
+	Copy from gnulib.
+	* m4/gnulib-comp.m4: Regenerate.
+
+2016-01-24  Alan Mackenzie  
+
+	Expunge "allow" + infinitive without direct object from source and doc.
+
+	Do the same for "permit", "enable", and "prevent".
+
+	* doc/emacs/mule.texi:
+	* doc/lispref/control.texi:
+	* doc/lispref/display.texi:
+	* doc/lispref/frames.texi:
+	* doc/lispref/functions.texi:
+	* doc/lispref/nonascii.texi:
+	* doc/lispref/streams.texi:
+	* doc/lispref/windows.texi:
+	* doc/misc/dbus.texi:
+	* doc/misc/eww.texi:
+	* doc/misc/flymake.texi:
+	* doc/misc/octave-mode.texi:
+	* doc/misc/org.texi:
+	* doc/misc/reftex.texi:
+	* doc/misc/tramp.texi:
+	* doc/misc/wisent.texi:
+	* etc/NEWS:
+	* lisp/autorevert.el:
+	* lisp/cedet/mode-local.el:
+	* lisp/cedet/semantic/senator.el:
+	* lisp/cedet/semantic/wisent.el:
+	* lisp/dos-fns.el:
+	* lisp/frameset.el:
+	* lisp/gnus/gnus-agent.el:
+	* lisp/gnus/mm-util.el:
+	* lisp/international/characters.el:
+	* lisp/ldefs-boot.el:
+	* lisp/mail/mailclient.el:
+	* lisp/man.el:
+	* lisp/mh-e/mh-search.el:
+	* lisp/net/tramp-cmds.el:
+	* lisp/net/tramp-gvfs.el:
+	* lisp/org/org-crypt.el:
+	* lisp/org/org-element.el:
+	* lisp/org/org-feed.el:
+	* lisp/org/org.el:
+	* lisp/org/ox-ascii.el:
+	* lisp/org/ox-icalendar.el:
+	* lisp/org/ox-publish.el:
+	* lisp/org/ox.el:
+	* lisp/play/gamegrid.el:
+	* lisp/play/gomoku.el:
+	* lisp/progmodes/antlr-mode.el:
+	* lisp/progmodes/python.el:
+	* lisp/progmodes/vhdl-mode.el:
+	* lisp/strokes.el:
+	* lisp/textmodes/ispell.el:
+	* lisp/tree-widget.el:
+	* lisp/vc/pcvs.el:
+	* lisp/window.el:
+	* src/lisp.h:
+	* src/w32.c:
+	* src/w32heap.c:
+	* src/w32term.c:
+	* src/window.c:
+	* src/xfaces.c:
+
+	Replace solecisms like "This allow to do something" with a correct
+	alternative, such as "This allow you to do something", "This allows
+	something to be done" or "This allows the doing of something".
+
+2016-01-24  l3thal  
+
+	Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
+
+2016-01-24  Kelvin White  
+
+	Add NEWS entry for asynchronous reconnect in ERC
+
+2016-01-24  l3thal  
+
+	Add NEWS entry for asynchronous reconnect in ERC
+
+2016-01-24  Kelvin White  
+
+	browse-url.el: Add 'google-chrome' to supported browsers.
+
+2016-01-24  Paul Eggert  
+
+	Port Tramp manual to latest Texinfo
+
+	Otherwise, 'make pdf' did not work (Bug#22416).
+	* doc/misc/tramp.texi (xxx, yyy): Remove macros.
+	(trampfn): Specialize to the case where METHOD is nonempty.
+	The 2nd argument is now user@host, not 2nd user and 3rd host args.
+	All uses changed.
+	(trampf): New macro.
+
+2016-01-24  Lars Ingebrigtsen  
+
+	* eww.el (eww-render): Protect against empty content-types.
+
+2016-01-24  Nicolas Petton  
+
+	authors.el updates
+
+	* admin/authors.el (authors-ignored-files, authors-renamed-files-alist):
+	  Additions.
+
+2016-01-23  Dmitry Gutov  
+
+	Rename xref-query-replace to xref-query-replace-in-results
+
+	* lisp/progmodes/xref.el(xref-query-replace):
+	Rename to xref-query-replace-in-results.
+	(http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01240.html)
+
+	* lisp/progmodes/xref.el (xref--xref-buffer-mode-map):
+	* lisp/dired-aux.el (dired-do-find-regexp-and-replace):
+	* doc/emacs/dired.texi (Operating on Files):
+	* doc/emacs/maintaining.texi (Xref Commands)
+	(Identifier Search, Identifier Search): Update accordingly.
+
+2016-01-23  Dmitry Gutov  
+
+	Update cl-defgeneric and cl-defmethod docstrings
+
+	* lisp/emacs-lisp/cl-generic.el: Remove outdated TODO item.
+	(cl-defgeneric): Rename BODY to DEFAULT-BODY.
+	(cl-defmethod): Mention that multiple dispatch arguments are
+	allowed.  Document supported types.  (Bug#22336)
+
+2016-01-23  Dmitry Gutov  
+
+	Comment out next-error-function integration in xref
+
+	* lisp/progmodes/xref.el (xref--xref-buffer-mode):
+	Comment out next-error-function integration
+	(http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01286.html).
+
+2016-01-23  John Wiegley  
+
+	Correct a use of "which" in intro.texi
+
+2016-01-23  Alan Mackenzie  
+
+	Distinguish the two meanings of Java's keyword "default".  Fixes bug #22358.
+
+	* lisp/progmodes/cc-engine.el (c-guess-basic-syntax CASE 14): Check the
+	context of case labels (including "default") more rigorously.
+	(c-guess-basic-syntax CASE 15): Consequential amendment.
+
+	* lisp/progmodes/cc-langs.el (c-modifier-kwds): Add "default" to Java's value.
+
+2016-01-23  Oscar Fuentes  
+
+	Don't operate on menu bar of nonexistent frame
+
+	* src/xfns.c (Fx_hide_tip) [USE_LUCID]: Check that the current frame
+	is valid before redisplaying its menu. Fixes bug#22438.
+
+2016-01-23  Anders Lindgren  
+
+	Unbreak the GNUstep build.
+
+	* src/nsterm.m ([EmacsBell init]): In GNUstep, don't use the
+	predefined "caution" image. Add trace.
+	(x_set_window_size): Remove unused variables `cols' and `rows'.
+	(ns_draw_fringe_bitmap): Exclude assignment of `fromRect' when
+	GNUstep is used.
+	([EmacsView updateFrameSize:]): Remove unused variable `win'.
+	([EmacsWindow zoom:]): Remove unused variable `f'.
+
+2016-01-23  Eli Zaretskii  
+	    John Wiegley  
+	    Michael Heerdegen  
+
+	Improve documentation of 'pcase'
+
+	* doc/lispref/control.texi (Pattern matching case statement):
+	Reorganize, expand, and improve wording.
+
+	* etc/NEWS: Mention that 'pcase' changes are documented.
+
+2016-01-23  Paul Eggert  
+
+	* etc/NEWS: Say that Cairo is experimental.
+
+2016-01-23  Paul Eggert  
+
+	Report error for PNG under Cairo
+
+	* src/image.c (lookup_rgb_color): Signal a file error instead
+	of dumping core when mishandling an image.
+
+2016-01-23  Arash Esbati  
+
+	Delete a spurious backquote (tiny change)
+
+	* lisp/textmodes/reftex-ref.el (reftex-label): Delete a
+	spurious backquote which raises an error with emacs 25.
+
+2016-01-23  Paul Eggert  
+
+	Pacify --enable-gcc-warnings --with-cairo
+
+	Problem reported by Alexander Kuleshov in:
+	http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01289.html
+	* src/gtkutil.c (xg_get_page_setup):
+	Use switch rather than if-then-else.
+	* src/image.c (COLOR_TABLE_SUPPORT):
+	Define directly rather than via #define and optional later #undef.
+	(lookup_rgb_color) [USE_CAIRO && ENABLE_CHECKING]:
+	Crash when the pixel is undefined, as there is a genuine bug
+	here (Bug#22442).
+	* src/image.c (tiff_load, gif_load, svg_load_image)
+	(x_kill_gs_process) [USE_CAIRO]:
+	* src/xterm.c (x_draw_fringe_bitmap) [USE_CAIRO]:
+	Omit unused locals, or move them to where they’re needed.
+	(x_clear_area1): Now ATTRIBUTE_UNUSED.
+
+2016-01-22  Eli Zaretskii  
+
+	Update documentation for Dired search and replace
+
+	* doc/emacs/dired.texi (Operating on Files): Update descriptions
+	of 'A' and 'Q' now bound to 'dired-do-find-regexp' and
+	'dired-do-find-regexp-and-replace'.
+
+	* etc/NEWS: Mention xref-related changes in Dired.
+
+2016-01-22  Paul Eggert  
+
+	Port recent xdisp.c fix to picky C compilers
+
+	* src/xdisp.c (dump_glyph): Redo the call to fprintf to avoid
+	putting #if inside the arguments to a standard function, which
+	the C standard says has undefined behavior.
+
+2016-01-22  Alan Mackenzie  
+
+	Prevent spurious recognition of K&R argument declarations.  Fixes bug #2203
+
+	* cc-engine.el (c-forward-declarator): New function.
+	(c-in-knr-argdecl): Before recognizing a K&R argument declaration, check it is
+	contained in the preceding arg list.
+
+	* cc-fonts.el (c-font-lock-declarators): Use the new function
+	`c-forward-declarator' in place of inline code.
+
+2016-01-22  Eli Zaretskii  
+
+	Fix the build with --enable-checking=glyphs
+
+	* src/xdisp.c (dump_glyph): Don't refer to glyph->u.xwidget in a
+	build without xwidget support.
+
+2016-01-22  Eli Zaretskii  
+
+	Document cl-generic.el
+
+	* doc/lispref/functions.texi (Generic Functions): New section.
+	(Bug#22336)
+	(Functions): Update the chapter menu.
+	* doc/lispref/elisp.texi: Update the master menu.
+
+2016-01-22  Paul Eggert  
+
+	xwidgets style cleanup
+
+	Adjust the newly-added Xwidgets code so that it uses a more-typical
+	Emacs style.  This should not affect behavior, except that in
+	a few places it adds runtime checks that Lisp arguments are of
+	the proper type, and in one place it uses more-precise arithmetic.
+	* src/buffer.c, src/dispnew.c, src/emacs.c, src/emacsgtkfixed.c:
+	* src/emacs.c, src/print.c, src/window.c, src/xdisp.c, src/xterm.c:
+	Include xwidget.h unconditionally.
+	* src/buffer.c (Fkill_buffer):
+	* src/dispnew.c (update_window):
+	* src/emacs.c (main):
+	* src/print.c (print_object):
+	* src/window.c (Fdelete_window_internal):
+	* src/xdisp.c (handle_single_display_spec, push_it, pop_it)
+	(get_next_element, set_iterator_to_next, next_element_from_xwidget)
+	(dump_glyph, calc_pixel_width_or_height, BUILD_GLYPH_STRINGS_XW)
+	(BUILD_GLYPH_STRINGS, x_produce_glyphs, get_window_cursor_type):
+	* src/xterm.c (x_draw_glyph_string, x_draw_bar_cursor):
+	Call xwidget functions and macros without worrying about
+	HAVE_XWIDGETS when the code is a no-op on non-xwidget
+	platforms.
+	* src/dispextern.h (XWIDGET_GLYPH, struct glyph_string.xwidget)
+	(IT_XWIDGET, GET_FROM_XWIDGET, struct it.u.xwidget)
+	(struct it.xwidget):
+	* src/lisp.h (PVEC_XWIDGET, PVEC_XWIDGET_VIEW):
+	Always define.
+	* src/emacsgtkfixed.h: Omit unnecessary comment.
+	* src/keyboard.c: Fix spacing.
+	* src/xdisp.c (BUILD_XWIDGET_GLYPH_STRING, produce_xwidget_glyph):
+	Define to be a no-op if not HAVE_XWIDGETS.
+	* src/xwidget.c: Include xwidget.h first (after config.h)
+	to make sure that it can stand by itself.
+	(Fmake_xwidget, Fxwidget_webkit_execute_script):
+	Fix typo in doc string.
+	(Fmake_xwidget): Check type of args.
+	(Fmake_xwidget, offscreen_damage_event)
+	(webkit_document_load_finished_cb, webkit_download_cb)
+	(webkit_new_window_policy_decision_requested_cb)
+	(webkit_navigation_policy_decision_requested_cb)
+	(xwidget_osr_draw_cb, xwidget_osr_event_forward)
+	(xwidget_osr_event_set_embedder, xwidget_init_view):
+	Omit unnecessary casts.
+	* src/xwidget.c (Fmake_xwidget, xwidget_hidden)
+	(xwidget_show_view, xwidget_hide_view)
+	(x_draw_xwidget_glyph_string, xwidget_start_redisplay, xwidget_touch)
+	(xwidget_touched):
+	* src/xwidget.h (struct xwidget.kill_without_query)
+	(struct xwidget_view.redisplayed, struct xwidget_view.hidden):
+	Use bool for boolean.
+	* src/xwidget.c (store_xwidget_event_string, Fxwidget_size_request):
+	Simplify by using list functions.
+	(WEBKIT_FN_INIT): Omit unnecessary test for nil.
+	(Fxwidget_resize): Check type of integer args
+	before doing any work.  Check that they are nonnegative.
+	(Fxwidget_set_adjustment): Check type of integer arg.
+	Avoid redundant call to gtk_scrolled_window_get_vadjustment.
+	Simplify.  Use double, not float.
+	(Fxwidget_info, Fxwidget_view_info): Simplify by using CALLN.
+	(valid_xwidget_spec_p): Simplify.
+	(xwidget_spec_value): Omit unused arg FOUND.  All callers changed.
+	* src/xwidget.h: Include lisp.h first, so that includers do
+	not need to worry about doing that before including this file.
+	Make this .h file safe to include even on non-HAVE_XWIDGETS
+	configurations, to simplify the includers.
+	(x_draw_xwidget_glyph_string, syms_of_xwidget, valid_xwidget_spec_p)
+	(xwidget_end_redisplay, lookup_xwidget)
+	(xwidget_view_delete_all_in_window, kill_buffer_xwidgets):
+	Now a no-op if !HAVE_XWIDGETS, to simplify callers.
+	(struct glyph_matrix, struct glyph_string, struct xwidget)
+	(struct xwidget_view, struct window):
+	New forward or incomplete decls, so that includers need not
+	assume the corresponding .h files are already included, or that
+	HAVE_XWIDGETS is defined.
+	(struct xwidget_type, xwidget_from_id): Remove; unused.
+
+2016-01-22  John Wiegley  
+
+	Further corrections to the pcase docstring
+
+2016-01-22  Eli Zaretskii  
+
+	* doc/emacs/anti.texi (Antinews): Rewrite for Emacs 25.
+
+2016-01-21  Stephen Leake  
+
+	In xref-collect-references, force backends to respect the 'dir' arg
+
+	* lisp/progmodes/xref.el (xref-collect-references): Force symref backends
+	to use `default-directory'.
+
+2016-01-21  John Wiegley  
+
+	Minor correction to pcase docstring
+
+2016-01-21  John Wiegley  
+
+	Write a new docstring for the pcase macro
+
+	* lisp/emacs-lisp/pcase.el (pcase): Write a new docstring.
+
+2016-01-21  Stephen Berman  
+
+	Avoid byte-compiler warning in todo-mode (bug#21953)
+
+	* todo-mode.el (todo-convert-legacy-files): Add limit argument
+	to looking-back to comply with advertised-calling-convention.
+
+2016-01-21  Stephen Berman  
+
+	Fix desktop support in todo-mode and doc-view (bug#22377)
+
+	* lisp/calendar/todo-mode.el (todo-restore-desktop-buffer):
+	* lisp/doc-view.el (doc-view-restore-desktop-buffer): Return current buffer.
+
+	* lisp/calendar/todo-mode.el (todo-modes-set-2):
+	* lisp/doc-view.el (doc-view-mode): Set desktop-save-buffer unconditionally.
+
+2016-01-20  Paul Eggert  
+
+	No need to configure gobject-introspection
+
+	It wasn’t needed for the recently-installed xwidget_mvp code; see:
+	http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01154.html
+	* configure.ac (DOES_XWIDGETS_USE_GIR, GIR_REQUIRED, GIR_MODULES):
+	(HAVE_GIR):
+	* src/Makefile.in (GIR_LIBS, GIR_CFLAGS):
+	Remove.  All uses removed.
+	* configure.ac (emacs_config_features): Don’t worry about GIR.
+
+2016-01-20  Paul Eggert  
+
+	Don’t export C symbols not used elsewhere
+
+	These were recently added, mostly as part of xwidget code.
+	* src/emacsgtkfixed.c (emacs_fixed_get_type): Now static.
+	(EMACS_FIXED, EMACS_FIXED_GET_CLASS):
+	Now static functions here, not macros in emacsgtkfixed.h.
+	* src/emacsgtkfixed.h (EMACS_TYPE_FIXED):
+	Remove.  All uses replaced by definiens.
+	(EMACS_FIXED, EMACS_FIXED_GET_CLASS):
+	Remove; these are now static functions in emacsgtkfixed.c.
+	(EMACS_FIXED_CLASS, EMACS_IS_FIXED, EMACS_IS_FIXED_CLASS):
+	Remove; unused.
+	(emacs_fixed_get_type): Remove decl; no longer extern.
+	* src/xwidget.c (offscreen_damage_event)
+	(webkit_mime_type_policy_typedecision_requested_cb)
+	(webkit_new_window_policy_decision_requested_cb)
+	(webkit_navigation_policy_decision_requested_cb)
+	(xwidget_spec_value, xwidget_view_lookup)
+	(xwidget_start_redisplay, xwidget_touch):
+	Now static.
+	* src/xwidget.h (xwidget_start_redisplay, xwidget_touch):
+	Remove decls.
+
+2016-01-20  Dmitry Gutov  
+
+	Support squiggly heredocs in ruby-mode
+
+	* lisp/progmodes/ruby-mode.el (ruby-here-doc-beg-re):
+	Support squiggly heredocs added in Ruby 2.3.
+
+	* test/indent/ruby.rb: Add squiggly example.
+
+2016-01-20  Glenn Morris  
+
+	* configure.ac (emacs_config_features): Remove WEBKIT.
+
+2016-01-20  Paul Eggert  
+
+	Port to platforms with gtk3 but not webkitgtk3
+
+	I ran into this problem on my Fedora 23 installation;
+	Emacs configured but did not build when --with-xwidgets was specified.
+	* configure.ac (HAVE_WEBKIT, HAVE_GIR): Omit unnecessary initializations.
+	(DOES_XWIDGETS_USE_GIR): New var.
+	If --with-xwidgets is specified, report an error if not
+	doable, to be consistent with the other --with options.
+	Require webkitgtk3 to use Xwidgets, as the Xwidgets code does
+	not work at all without webkitgtk3.  Simplify use of
+	EMACS_CHECK_MODULES.  Output message about gobject
+	introspection only if xwidgets are used.
+	* etc/NEWS: Users need webkitgtk3, not merely webkit.
+	* src/xwidget.c (syms_of_xwidget): Don’t worry about HAVE_WEBKIT_OSR,
+	since this file is no longer compiled if webkitgtk3 is not available.
+
+2016-01-20  Eli Zaretskii  
+
+	Fix doc string of 'isearch-search-fun-function'
+
+	* lisp/isearch.el (isearch-search-fun-function)
+	(isearch-search-string): Doc fixes.  (Bug#22411)
+
+2016-01-19  Stefan Monnier  
+
+	* lisp/xwidget.el: Nitpicks
+
+	* lisp/xwidget.el (xwidget-log, xwidget-webkit-callback):
+	Use with-current-buffer rather than save-excursion + set-buffer.
+
+2016-01-19  Glenn Morris  
+
+	Don't hard-code 1 as point-min.
+
+	* lisp/image-mode.el (image-display-size):
+	* lisp/xwidget.el (xwidget-webkit-last-session)
+	(xwidget-webkit-current-session): Don't hard-code 1 as point-min.
+
+2016-01-19  Glenn Morris  
+
+	* lisp/xwidget.el: Add declarations to silence non-xwidget compilation.
+
+2016-01-19  Glenn Morris  
+
+	Trivial doc copyedits.
+
+	* src/xwidget.c (Fmake_xwidget, Fget_buffer_xwidgets)
+	(Fxwidget_webkit_get_title, Fxwidget_resize)
+	(Fxwidget_set_adjustment, Fxwidgetp, Fxwidget_view_p)
+	(Fxwidget_info, Fxwidget_view_lookup)
+	(Fset_xwidget_query_on_exit_flag): Trivial doc copyedits.
+
+2016-01-19  Glenn Morris  
+
+	Avoid advising image-display-size for xwidgets.
+
+	* lisp/xwidget.el (xwidget-image-display-size): Remove.
+	(image-display-size): Remove advice.
+	* lisp/image-mode.el (xwidget-info, xwidget-at): Declare.
+	(image-display-size): Incorporate xwidget code directly.
+
+2016-01-19  Glenn Morris  
+
+	Avoid breaking non-xwidget Emacs that happen to load xwidget.el.
+
+	* lisp/xwidget.el (window-configuration-change-hook)
+	(kill-buffer-query-functions): Only modify these hooks if
+	compiled with xwidget support.
+
+2016-01-19  Glenn Morris  
+
+	* lisp/xwidget.el (xwidget-webkit-scroll-behaviour): Fix custom spec.
+
+	* configure.ac (WEBKIT, GIR, CAIRO): Use EMACS_CHECK_MODULES, not PKG_.
+
+	* configure.ac (emacs_config_features): Add XWIDGETS, WEBKIT, GIR.
+
+	* configure.ac (HAVE_WEBKIT_OSR): Remove broken, duplicated gtk3 test.
+
+2016-01-19  Katsumi Yamaoka  
+
+	* lisp/gnus/nnir.el (nnir-request-update-mark):
+	Default to the original mark.
+	cf. 
+	and 
+
+2016-01-19  Glenn Morris  
+
+	* lisp/xwidget.el (report-xwidget-bug): Remove.
+
+	(top-level): No longer require reporter.
+
+2016-01-19  Joakim Verona  
+	    Grégoire Jadi  
+
+	Support for the new Xwidget feature.
+
+	* configure.ac:
+	(HAVE_XWIDGETS, WIDGET_OBJ, EMACS_CONFIG_FEATURES):
+	* xterm.c (x_draw_glyph_string, x_draw_bar_cursor):
+	* xdisp.c:
+	(handle_display_spec, handle_single_display_spec, push_it)
+	(pop_it, set_iterator_to_next, dump_glyph)
+	(calc_pixel_width_or_height, fill_xwidget_glyph_string)
+	(BUILD_XWIDGET_GLYPH_STRING, BUILD_GLYPH_STRINGS)
+	(produce_xwidget_glyph, x_produce_glyphs)
+	(get_window_cursor_type):
+	* window.c (Fdelete_window_internal):
+	* termhooks.h (e):
+	* print.c (print_object):
+	* lisp.h (ptrdiff_t):
+	* keyboard.c (kbd_buffer_get_event, make_lispy_event)
+	(syms_of_keyboard):
+	* emacs.c (main):
+	* dispnew.c (update_window, scrolling_window):
+	* dispextern.h (g, i):
+	* Makefile.in (XWIDGETS_OBJ, WEBKIT_CFLAGS, WEBKIT_LIBS)
+	(GIR_LIBS, ALL_CFLAGS, base_obj, LIBES):
+	* keyboard.c (kbd_buffer_get_event):
+	* emacsgtkfixed.c (emacs_fixed_gtk_widget_size_allocate)
+	(emacs_fixed_class_init): Add case for an xwidget view.
+
+	* xwidget.c, xwidget.h, xwidget.el: New files for xwidgets
+
+
+	Various improvements to the Xwidget feature.
+	* xwidgets.c:
+	* emacsgtkfixed.c:
+	* xwidget.el:
+
+2016-01-19  Eli Zaretskii  
+
+	Improve documentation of 'alist-get'
+
+	* doc/lispref/variables.texi (Setting Generalized Variables): Add
+	'alist-get' to the list of functions that can appear in PLACE
+	argument of 'setf'.
+
+2016-01-19  Eli Zaretskii  
+
+	Minor copyedits of doc/emacs/maintaining.texi
+
+	* doc/emacs/maintaining.texi (List Identifiers): More accurate
+	description of "C-M-i" wrt tags tables.
+	(Tags Tables): Move the definition of "tag" to a footnote.
+
+2016-01-19  Eli Zaretskii  
+
+	Unbreak the Cygwin-w32 build
+
+	* src/w32fns.c (globals_of_w32fns): Move the initialization of
+	resetstkoflw into a part that isn't compiled on Cygwin.
+	(Bug#22403)
+
+2016-01-19  Lars Magne Ingebrigtsen  
+
+	* shr.el (shr-table-body): Allow tables to have text children.
+
+2016-01-19  Phillip Lord  
+
+	Cope with multiple overlapping faces.
+
+	* lisp/htmlfontify.el (hfy-face-to-style-i): Treat inheritance right to
+	  left.
+	  (hfy-face-resolve-face): Handle font specification as well as font
+	  name. Documentation update. (Bug#21990)
+
+2016-01-18  Paul Eggert  
+
+	Fix spurious escapes in describe-input-method
+
+	Problem reported by Vincent Belaïche (Bug#22309).
+	* lisp/international/mule-cmds.el (describe-language-environment):
+	* lisp/international/quail.el (quail-help):
+	Apply substitute-command-keys to doc strings before displaying them.
+
+2016-01-30  Nicolas Petton  
+
+	Bump version to 25.0.90
+
+	* README:
+	* configure.ac:
+	* msdos/sed2v2.inp: Bump version to 25.0.90.
+
+2016-01-30  Nicolas Petton  
+
+	* etc/AUTHORS: Update the AUTHORS file
+
+2016-01-30  Nicolas Petton  
+
+	authors.el updates
+
+	* admin/authors.el (authors-renamed-files-alist): Additions.
+
+2016-01-30  Nicolas Petton  
+
+	Make it possible to run make change-history on emacs-25
+
+	* Makefile.in: Check if the current branch is emacs-25 instead of
+	  master.
+
+2016-01-30  lu4nx  
+
+	Support Go language in 'etags'
+
+	* lib-src/etags.c : Fix documentation of Ruby tags.
+	: New help.
+	: New variable.
+	(Go_functions): New function.
+	: Add entry for Go.  (Bug#22370)
+
+	* doc/emacs/maintaining.texi (Tag Syntax): Document Go support.
+	* doc/man/etags.1: Mention Go support.
+
+	* etc/NEWS: Mention Go support.
+
+	* test/etags/go-src/test.go:
+	* test/etags/go-src/test1.go: New test files.
+	* test/etags/Makefile (GOSRC): New variable.
+	(SRCS): Add $(GOSRC).
+	* test/etags/ETAGS.good_1:
+	* test/etags/ETAGS.good_2:
+	* test/etags/ETAGS.good_3:
+	* test/etags/ETAGS.good_4:
+	* test/etags/ETAGS.good_5:
+	* test/etags/ETAGS.good_6:
+	* test/etags/CTAGS.good: Adapt to addition of Go tests.
+
+2016-01-30  Eli Zaretskii  
+
+	Improve Ruby support in 'etags'
+
+	* lib-src/etags.c (Ruby_functions): Tag constants.  Don't tag
+	singleton classes.  Remove class qualifiers from tags generated
+	for method and constant names.  (Bug#22241)
+
+	* doc/emacs/maintaining.texi (Tag Syntax): Mention that constants
+	are tagged by etags in Ruby.
+
+	* etc/NEWS: Mention that constants are tagged by etags in Ruby.
+
+	* test/etags/ruby-src/test1.ruby: Add more tests.
+	* test/etags/ETAGS.good_1:
+	* test/etags/ETAGS.good_2:
+	* test/etags/ETAGS.good_3:
+	* test/etags/ETAGS.good_4:
+	* test/etags/ETAGS.good_5:
+	* test/etags/ETAGS.good_6:
+	* test/etags/CTAGS.good: Adapt to the changes in etags and in Ruby
+	tests.
+
+2016-01-30  Eli Zaretskii  
+
+	Adjust etags test results to changes in copyright years
+
+	* test/etags/CTAGS.good:
+	* test/etags/ETAGS.good_1:
+	* test/etags/ETAGS.good_2:
+	* test/etags/ETAGS.good_3:
+	* test/etags/ETAGS.good_4:
+	* test/etags/ETAGS.good_5:
+	* test/etags/ETAGS.good_6: Adjust to shift in characters and
+	in line numbers.
+
+2016-01-30  Andreas Schwab  
+
+	Revert "Re-enable checks in member, memql, delete to complain about non-lists"
+
+	This reverts commit f524e8b7f12d9b5a8b92084e5385429fe7b085b9.
+
+2016-01-30  Nicolas Petton  
+
+	Make it possible to run make change-history on emacs-25
+
+	* Makefile.in: Check if the current branch is emacs-25 instead of
+	  master.
+
+2016-01-30  Dmitry Gutov  
+
+	Don't fiddle with DEFAULT
+
+	* lisp/progmodes/project.el (project--completing-read-strict):
+	Don't change DEFAULT, whether is has any matches in
+	COLLECTION, or not.
+
+2016-01-30  Eli Zaretskii  
+
+	Document xwidget commands and functions
+
+	* doc/lispref/display.texi (Xwidgets): New section, describes some
+	of the xwidget primitives.
+	* doc/lispref/display.texi (Display): Update the chapter menu.
+	* doc/emacs/misc.texi (Embedded WebKit Widgets): New section.
+	* doc/emacs/emacs.texi (Top): Update the master menu to include
+	the xwidget node.
+
+2016-01-30  Lars Ingebrigtsen  
+
+	Build fix for shr.el
+
+	* shr.el (seq): Require.
+
+2016-01-30  Dmitry Gutov  
+
+	Improve project-find-file yet again!
+
+	* lisp/progmodes/project.el (project--completing-read-strict):
+	New function.
+	(project-find-file-in): Use it.
+	(project-file-completion-table): Move the default
+	implementation inside the cl-defgeneric form.
+	(http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01720.html)
+
+2016-01-30  Dmitry Gutov  
+
+	Don't pass DIR to 'hg status'
+
+	* lisp/vc/vc-hg.el (vc-hg-dir-status-files):
+	Don't pass DIR to 'hg status' (bug#22481).
+
+2016-01-30  Stephen Leake  
+
+	Fix typo in previous commits
+
+	* lisp/progmodes/project.el (project-find-file-in):
+	* lisp/vc/vc-mtn.el (vc-mtn-find-ignore-file): Fix typo in previous
+	commit.
+
+2016-01-30  Stephen Leake  
+
+	Improve project-find-file
+
+	* lisp/progmodes/project.el (project-file-completion-table): New.
+	(project-find-file, project-or-external-find-file): Default to filename
+	at point.
+	(project-file-completion-table): New, split out from
+	project--find-file-in.
+	(project-find-file-in): Renamed from project--find-file-in, use
+	project-file-completion-table.
+
+	* lisp/progmodes/xref.el (ede-minor-mode): New declaration.
+	(xref--find-ignores-arguments): Add doc string.
+
+2016-01-30  Stephen Leake  
+
+	Implement vc-mtn-find-ignore-file, fix some doc strings
+
+	* lisp/cedet/cedet-global.el (cedet-gnu-global-root): Improve doc string.
+
+	* lisp/cedet/ede/locate.el (initialize-instance): Improve doc string.
+
+	* lisp/vc/vc-git.el (vc-git-find-ignore-file): Fix doc string.
+
+	* lisp/vc/vc-mtn.el (vc-mtn-find-ignore-file): New function.
+
+2016-01-23  Michael Albinus  
+
+	Improve user name completion in Tramp
+
+	* lisp/net/tramp.el (tramp-parse-passwd, tramp-parse-etc-group):
+	Call also "getent passwd" or "getent group", if possible.
+	(tramp-parse-putty): Cache the result.
+
+2016-01-22  Michael Albinus  
+
+	* etc/NEWS: Move kqueue entries to Emacs 25.1 sections.
+
+2016-01-20  Glenn Morris  
+
+	Remove handling of non-string time-stamp formats, obsolete for 20 years.
+
+	* lisp/time-stamp.el (time-stamp-format): Doc fix.
+	(time-stamp-old-format-warn, time-stamp-fconcat): Remove.
+	(time-stamp-string): Ignore non-string formats.
+
+2016-01-20  Eli Zaretskii  
+
+	Anoter fix for problematic merge from emacs-25
+
+	* src/w32fns.c (globals_of_w32fns): Move initialization of
+	resetstkoflw to a non-Cygwin part.
+
+2016-01-20  Michael Albinus  
+
+	* test/Makefile.in (mostlyclean): Use ${LOGFILES}.
+
+2016-01-20  Eli Zaretskii  
+
+	Fix MS-Windows build broken by a botched merge from emacs-25
+
+	* src/w32.c (w32_crypto_hprov): New static variable.
+	(globals_of_w32): Initialize w32_crypto_hprov.
+	(w32_init_crypt_random, w32_init_random): New functions.
+	Include wincrypt.h.
+	* src/w32.h (w32_init_random): Add prototype.
+
+2016-01-20  Vincent Belaïche  
+
+	Correct a whole bunch of bugs coming with renamed cell relocation.
+
+	* lisp/ses.el (ses-localvars): rename variable
+	`ses--renamed-cell-symb-list' into `ses--in-killing-named-cell-list'
+	and adjust the comment about it.
+	(ses-plist-delq): new defun.
+	(ses--ses-buffer-list): new defvar.
+	(ses--unbind-cell-name): new defun.
+	(ses-relocate-symbol): Do not relocate symbol when it is a named cell.
+	(ses-relocate-formula): Undo change of
+	2011-12-27T19:30:39Z!vincentb1@users.sourceforge.net that was
+	preventing relocation for named cell --- now doing this is delegated
+	to function `ses-relocate-symbol'.
+	(ses-relocate-range): In docstring, undo change of
+	2016-01-03T07:31:52Z!johnw@newartisans.com, `ses-range' must remain
+	lower case as it is not a variable.
+	(ses-relocate-all): Cell name relocation : 1) check that cell is a
+	renamed cell by testing `ses-cell' property to :ses-named, rather than
+	comparing name to corresponding standard name. Set rowcol of renamed
+	cell into the hashmap --- `ses-cell' property must not be used for
+	that as the same name can be used for different locations in different
+	SES sheets ; 2) use `local-variable-if-set-p' rather than `boundp' and
+	`local-variable-p' to check if cell name is already in use in this
+	sheet or needs initialization.
+	(ses-relocate-all): Cell value relocation : 1) like for name
+	relocation use the `ses-cell' property rather than comparing actual
+	name to corresponding standard name. 2) Correct bug introduced in
+	2011-12-27T19:30:39Z!vincentb1@users.sourceforge.net, as the test was
+	made the other way round than the intention --- ie value relocation
+	was disabled for standard cell, not for renamed cell as was the
+	intention.
+	(ses-relocate-all): Add loop for unbinding deleted renamed cells
+	names.
+	(ses-killbuffer-hook): new defun.
+	(ses-mode): Add the ses--ses-buffer-list maintenance mechanism ---
+	kill buffer hook, plus pushing current buffer if new in list.
+	(ses-delete-row, ses-delete-column): Collect deleted renamed cells
+	into `ses--in-killing-named-cell-list'.
+	(ses-rename-cell): Remove update of variable
+	`ses--renamed-cell-symb-list', this variable is renamed to
+	`ses--in-killing-named-cell-list', and its setting is done in
+	functions `ses-delete-row' and , `ses-delete-column' now.
+	(ses-rename-cell): Make cell new name a buffer local variable.
+	(ses-rename-cell): Change correction of
+	2015-12-30T23:10:37Z!vincentb1@users.sourceforge.net concerning
+	computation of the range over which `cursor-intangible' property was
+	to be updated. This correction was ok for non spilling cells, but not
+	for cells spilling over following blank cells. Simply use
+	`next-single-property-change' rather than computing the end column
+	from column widths.
+
+2016-01-19  John Wiegley  
+
+	Merge from origin/emacs-25
+
+	3ae7934 ; * etc/NEWS: Mark entries that don't need further treatment.
+	6165c36 * lisp/files.el (dir-locals--all-files): Respect absolute file-names
+	2ffdf15 * lisp/help-fns.el (describe-variable): Fix a left-over parenthesis
+	71ecd62 * lisp/dired-x.el (dired-omit-here-always): Use add-dir-local-variable
+	f0b82b3 * lisp/files.el (dir-locals--all-files): Use completion instead of wildcards
+	86e4513 Fix incompatbilities with MS-Windows 2000 and older
+	4e96521 Mention in PROBLEMS an issue with MS-Windows NT4
+	15c23aa Ensure 8-byte aligned memory allocation on MS-Windows 9X
+	39afa42 Fix tests for active region in hideif.el
+	05df666 Fix interactive specs in some hideif.el commands
+
+2016-01-19  John Wiegley  
+
+	-
+
+2016-01-19  Paul Eggert  
+
+	Avoid stdio in SIGINT handler
+
+	* admin/merge-gnulib (GNULIB_MODULES): Add ignore-value.
+	* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
+	* lib/ignore-value.h: New file, from gnulib.
+	* src/keyboard.c: Include it.
+	(write_stdout, read_stdin): New functions.
+	(handle_interrupt): Use them instead of printf and getchar,
+	and avoid fflush when handling signals.
+
+2016-01-19  Jens Lechtenboerger  
+
+	Refactor mml-smime.el, mml1991.el, mml2015.el
+
+	(Maybe this is the last merge from Gnus git to Emacs git)
+
+	Cf. discussion on ding mailing list, messages in
+	.
+	Common code from the three files mml-smime.el, mml1991.el, and
+	mml2015.el is moved to mml-sec.el.  Auxiliary functions are added
+	to gnus-util.el.
+
+	The code is supported by test cases with necessary test keys.
+
+	Documentation in message.texi is updated.
+
+	* doc/misc/message.texi (Security, Using S/MIME):
+	Update for refactoring mml-smime.el, mml1991.el, mml2015.el.
+	(Using OpenPGP): Rename from "Using PGP/MIME"; update contents.
+	(Passphrase caching, Encrypt-to-self, Bcc Warning): New sections.
+
+	* lisp/gnus/gnus-util.el (gnus-test-list, gnus-subsetp, gnus-setdiff):
+	New functions.
+
+	* lisp/gnus/mml-sec.el: Require gnus-util and epg.
+	(epa--select-keys): Autoload.
+	(mml-signencrypt-style-alist, mml-secure-cache-passphrase): Doc fix.
+	(mml-secure-openpgp-signers): New user option;
+	make mml1991-signers and mml2015-signers obsolete aliases to it.
+	(mml-secure-smime-signers): New user option;
+	make mml-smime-signers an obsolete alias to it.
+	(mml-secure-openpgp-encrypt-to-self): New user option;
+	make mml1991-encrypt-to-self and mml2015-encrypt-to-self obsolete
+	aliases to it.
+	(mml-secure-smime-encrypt-to-self): New user option;
+	make mml-smime-encrypt-to-self an obsolete alias to it.
+	(mml-secure-openpgp-sign-with-sender): New user option;
+	make mml2015-sign-with-sender an obsolete alias to it.
+	(mml-secure-smime-sign-with-sender): New user option;
+	make mml-smime-sign-with-sender an obsolete alias to it.
+	(mml-secure-openpgp-always-trust): New user option;
+	make mml2015-always-trust an obsolete alias to it.
+	(mml-secure-fail-when-key-problem, mml-secure-key-preferences):
+	New user options.
+	(mml-secure-cust-usage-lookup, mml-secure-cust-fpr-lookup)
+	(mml-secure-cust-record-keys, mml-secure-cust-remove-keys)
+	(mml-secure-add-secret-key-id, mml-secure-clear-secret-key-id-list)
+	(mml-secure-cache-passphrase-p, mml-secure-cache-expiry-interval)
+	(mml-secure-passphrase-callback, mml-secure-check-user-id)
+	(mml-secure-secret-key-exists-p, mml-secure-check-sub-key)
+	(mml-secure-find-usable-keys, mml-secure-select-preferred-keys)
+	(mml-secure-fingerprint, mml-secure-filter-keys)
+	(mml-secure-normalize-cust-name, mml-secure-select-keys)
+	(mml-secure-select-keys-1, mml-secure-signer-names, mml-secure-signers)
+	(mml-secure-self-recipients, mml-secure-recipients)
+	(mml-secure-epg-encrypt, mml-secure-epg-sign): New functions.
+
+	* lisp/gnus/mml-smime.el: Require epg;
+	refactor declaration and autoloading of epg functions.
+	(mml-smime-use): Doc fix.
+	(mml-smime-cache-passphrase, mml-smime-passphrase-cache-expiry):
+	Obsolete.
+	(mml-smime-get-dns-cert, mml-smime-get-ldap-cert):
+	Use format instead of gnus-format-message.
+	(mml-smime-epg-secret-key-id-list): Remove variable.
+	(mml-smime-epg-passphrase-callback, mml-smime-epg-find-usable-key)
+	(mml-smime-epg-find-usable-secret-key): Remove functions.
+	(mml-smime-epg-sign, mml-smime-epg-encrypt): Refactor.
+
+	* lisp/gnus/mml1991.el (mml1991-cache-passphrase)
+	(mml1991-passphrase-cache-expiry): Obsolete.
+	(mml1991-epg-secret-key-id-list): Remove variable.
+	(mml1991-epg-passphrase-callback, mml1991-epg-find-usable-key)
+	(mml1991-epg-find-usable-secret-key): Remove functions.
+	(mml1991-epg-sign, mml1991-epg-encrypt): Refactor.
+
+	* lisp/gnus/mml2015.el (mml2015-cache-passphrase)
+	(mml2015-passphrase-cache-expiry): Obsolete.
+	(mml2015-epg-secret-key-id-list): Remove variable.
+	(mml2015-epg-passphrase-callback, mml2015-epg-check-user-id)
+	(mml2015-epg-check-sub-key, mml2015-epg-find-usable-key)
+	(mml2015-epg-find-usable-secret-key): Remove functions.
+	(mml2015-epg-decrypt, mml2015-epg-clear-decrypt, mml2015-epg-sign)
+	(mml2015-epg-encrypt): Refactor.
+
+2016-01-19  Paul Eggert  
+
+	Merge from gnulib
+
+	This mostly just updates copyright dates of gnulib files.
+	It also updates to the latest version of texinfo.tex.
+
+2016-01-19  YAMAMOTO Mitsuharu  
+
+	Move variables to inner loop, preparing for Mac port merge
+
+	* src/keyboard.c (command_loop_1): Move variables `cmd',
+	`keybuf', and `i' to inner loop.
+
+2016-01-19  Paul Eggert  
+
+	Minor improvements to (random t) documentation
+
+	* doc/lispref/numbers.texi (Random Numbers):
+	* src/fns.c (Frandom):
+	Omit unnecessary details about randomness fallback.
+	Say that it is a fallback.
+
+2016-01-19  Dmitry Gutov  
+
+	Rename methods in Ruby etags example file
+
+	* test/etags/ruby-src/test.rb: Rename the example methods to
+	correspond to the common terminology used in Ruby.
+	* test/etags/CTAGS.good:
+	* test/etags/ETAGS.good_1:
+	* test/etags/ETAGS.good_2:
+	* test/etags/ETAGS.good_3:
+	* test/etags/ETAGS.good_4:
+	* test/etags/ETAGS.good_5:
+	* test/etags/ETAGS.good_6: Adjust accordingly.
+
+2016-01-18  Dmitry Gutov  
+
+	Propertize backtick in 'def `(abc)' as symbol constituent
+
+	* lisp/progmodes/ruby-mode.el (ruby-syntax-propertize):
+	Propertize backtick in 'def `(abc)' as symbol constituent.
+	(ruby-syntax-propertize-function):
+	Rename to ruby-syntax-propertize.
+
+2016-01-18  Eli Zaretskii  
+
+	Fix scrolling under scroll-preserve-screen-position on TTY
+
+	* src/window.c (window_scroll_line_based): When setting point to
+	preserve screen coordinates, don't let cursor enter either of the
+	two scroll margins.  (Bug#22395)
+
+2016-01-18  Lars Magne Ingebrigtsen  
+
+	Fix shr table rendering of nested tables
+
+	* shr.el (shr-table-body): Don't include all tbodies in nested
+	tables in the levels above.
+
+2016-01-18  Dmitry Gutov  
+
+	* lisp/progmodes/project.el (project--read-regexp): Quote the identifier.
+
+2016-01-18  Dmitry Gutov  
+
+	Add xref-based replacements for Dired search commands
+
+	* lisp/dired-aux.el (dired-do-find-regexp)
+	(dired-do-find-regexp-and-replace): New commands.
+	http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00864.html
+
+	* lisp/dired.el (dired-mode-map): Change bindings for `A' and
+	`Q' to the new commands.
+
+	* lisp/progmodes/xref.el (xref-query-replace)
+	(xref-collect-matches): Add progress reporters.
+	(xref--find-ignores-arguments): Return nil for zero ignores.
+	(xref--show-xrefs): Add an optional argument.
+	(xref-collect-matches): Drop the assert.  'find' accepts a
+	regular file in place of directory argument, too.
+
+2016-01-18  Alan Mackenzie  
+
+	* doc/lispref/frames.texi (Position Parameters): Say they don't exist on TTYs.
+
+2016-01-18  Eli Zaretskii  
+
+	Improve user documentation of Xref
+
+	* doc/emacs/maintaining.texi (Xref, Find Identifiers)
+	(Looking Up Identifiers, Identifier Search, List Identifiers):
+	Adjudicate comments by Dmitry Gutov .  See
+	http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00650.html
+	for the details.
+
+2016-01-18  Eli Zaretskii  
+
+	Fix scrolling under scroll-preserve-screen-position and margins
+
+	* src/window.c (window_scroll_pixel_based): When setting point to
+	preserve screen coordinates, don't let cursor enter either of the
+	two scroll margins.  Fix incorrect usage of
+	WINDOW_WANTS_HEADER_LINE_P and use WINDOW_HEADER_LINE_HEIGHT
+	instead of CURRENT_HEADER_LINE_HEIGHT.  (Bug#22395)
+
+2016-01-18  Eli Zaretskii  
+
+	Unbreak the MS-Windows build
+
+	* src/sysdep.c (emacs_gnutls_global_init, gnutls_rnd): Disable for
+	WINDOWSNT, to avoid link failure.  (Bug#22202)
+
+2016-01-18  Alan Mackenzie  
+
+	Desktop: protect users against inadvertant upgrading of desktop file.
+
+	An upgraded (version 208) desktop file cannot be read in Emacs < 25.
+
+	* etc/NEWS: Add an entry about upgrading a desktop file.
+
+	* lisp/desktop.el (desktop-file-version): Amend doc string.
+	(desktop-native-file-version, desktop-io-file-version): new variables.
+	(desktop-clear): Set desktop-io-file-version to nil.
+	(desktop-buffer-info): make the presence of the last item on the list
+	conditional on (>= desktop-io-file-version 208).
+	(desktop-save): Add extra parameter VERSION to take user's C-u or C-u C-u.
+	Amend the doc string.  Add code to determine the output file version.
+	(desktop-create-buffer): Set desktop-io-file-version to the input file's
+	version.
+
+2016-01-17  Paul Eggert  
+
+	Initialize GnuTLS before calling gnutls_rnd
+
+	* src/gnutls.c (emacs_gnutls_global_init): Now extern.
+	Don’t set gnutls_global_initialized if gnutls_global_init fails.
+	* src/sysdep.c: Include "gnutls.h", and 
+	if 2.12 or later, which has gnutls_rnd.
+	(emacs_gnutls_global_init, gnutls_rnd): New fallback
+	placeholder macros if before 2.12.
+	(init_random): Initialize gnutls globals before trying to
+	use gnutls_rnd.
+
+2016-01-17  Andreas Schwab  
+
+	Don't use GnuTLS before it is initialized
+
+		* src/sysdep.c (init_random): Don't use gnutls_rnd.
+
+2016-01-17  Bill Wohler  
+
+	* mh-e.el (mh-version): Add +git to version.
+
+2016-01-17  Paul Eggert  
+
+	Port cleanup attribute to OpenBSD
+
+	The OpenBSD C compiler issues false alarms about strcpy, strcat, and
+	sprintf, and this messes up 'configure' when it tests for the cleanup
+	attribute.  Work around the problem by using __has_attribute directly.
+	Problem reported by Joakim Jalap (Bug#22385).
+	* configure.ac: Don’t use AX_GCC_VAR_ATTRIBUTE.
+	* m4/ax_gcc_var_attribute.m4: Remove.
+	* src/conf_post.h (__has_attribute): Provide a substitute, for
+	non-GCC or older GCC compilers.  All uses changed to assume
+	the substitute.  Check for the cleanup attribute.
+	* src/emacs-module.c (module_has_cleanup): Just use __has_attribute.
+
+2016-01-17  Paul Eggert  
+
+	Prefer GnuTLS when acquiring random seed
+
+	This attempts to improve on the fix for Bug#22202.
+	* configure.ac (HAVE_DEV_URANDOM): Remove.
+	Check /dev/urandom existence at run time, not at build time,
+	since the device could exist in the former but not the latter.
+	* src/sysdep.c [HAVE_GNUTLS]: Include gnutls/gnutls.h.
+	(gnutls_rnd) [GNUTLS_VERSION_NUMBER < 0x020c00]: New fallback macro.
+	(random_seed): New typedef.
+	(set_random_seed): New static function.
+	(seed_random): Use them.
+	(init_random): Use random_seed instead of uintmax_t, so as to
+	not consume more entropy than needed.  Prefer gnutls_rnd if it
+	works; this avoids a redundant open of /dev/urandom on
+	GNU/Linux with modern GnuTLS.
+
+2016-01-16  Eli Zaretskii  
+
+	Improve documentation of dynamic modules
+
+	* doc/lispref/loading.texi (How Programs Do Loading): Update the
+	description of searching for files in 'load' when Emacs was built
+	with support for dynamic modules.
+
+2016-01-16  Eli Zaretskii  
+
+	* INSTALL: Document --with-modules.
+
+2016-01-16  Eli Zaretskii  
+
+	Document 'function-put'
+
+	* doc/lispref/symbols.texi (Symbol Plists): Document
+	'function-put'.  Update documentation of 'function-get'.
+
+2016-01-16  Eli Zaretskii  
+
+	Document 'funcall-interactively'
+
+	* doc/lispref/commands.texi (Interactive Call): Document
+	'funcall-interactively'.
+	* doc/lispref/functions.texi (Calling Functions): Mention
+	'funcall-interactively' and provide a cross-reference.
+
+2016-01-16  Eli Zaretskii  
+
+	* doc/lispref/lists.texi (Association Lists): Document 'alist-get'.
+
+	* doc/lispref/strings.texi (Text Comparison): Document 'string-greaterp'.
+
+2016-01-16  Eli Zaretskii  
+
+	Document renaming of selection-related functions
+
+	* doc/lispref/frames.texi (Window System Selections): Rename "x-*"
+	functions into the corresponding "gui-*" functions.  Make the
+	description slightly less X-centric.
+
+2016-01-16  Eli Zaretskii  
+
+	* doc/lispref/macros.texi (Expansion): Document 'macroexpand-1'.
+
+2016-01-16  Eli Zaretskii  
+
+	Document 'define-inline'
+
+	* doc/lispref/functions.texi (Defining Functions): Document
+	'define-inline' and related macros.
+
+	* lisp/emacs-lisp/inline.el (inline-letevals): Doc fix.
+
+2016-01-16  Artur Malabarba  
+
+	* lisp/files.el (dir-locals--all-files): Respect absolute file-names
+
+	* lisp/help-fns.el (describe-variable): Fix a left-over parenthesis
+
+2016-01-16  Artur Malabarba  
+
+	* lisp/dired-x.el (dired-omit-here-always): Use add-dir-local-variable
+
+	instead of manually writing a dir-locals file.
+
+2016-01-16  Artur Malabarba  
+
+	* lisp/files.el (dir-locals--all-files): Use completion instead of wildcards
+
+	(dir-locals-file)
+	* lisp/files-x.el (modify-dir-local-variable)
+	* lisp/dos-fns.el (dosified-file-name)
+	* lisp/help-fns.el (describe-variable): Change accordingly.
+
+2016-01-16  Jussi Lahdenniemi    (tiny change)
+
+	Fix incompatbilities with MS-Windows 2000 and older
+
+	* src/w32.c : New global variable.
+	(filename_to_utf16, filename_from_ansi, check_windows_init_file):
+	Use it instead of the literal MB_ERR_INVALID_CHARS.
+	(maybe_load_unicows_dll): Initialize multiByteToWideCharFlags as
+	appropriate for the underlying OS version.  For details, see
+	http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00835.html.
+	* src/w32.h: Declare multiByteToWideCharFlags.
+	* src/w32fns.c (Fx_file_dialog, Fw32_shell_execute)
+	(add_tray_notification): Use multiByteToWideCharFlags instead of
+	the literal MB_ERR_INVALID_CHARS.
+	(_resetstkoflw_proc): New typedef.
+	(w32_reset_stack_overflow_guard): Call _resetstkoflw via a
+	pointer, as this function is absent in msvcrt.dll shipped with W2K
+	and older systems.
+
+2016-01-16  Eli Zaretskii  
+
+	Mention in PROBLEMS an issue with MS-Windows NT4
+
+	* etc/PROBLEMS (MS-Windows): Mention the problem with Shell32.dll
+	on Windows NT4.  For the details, see
+	http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00835.html.
+
+2016-01-16  Jussi Lahdenniemi    (tiny change)
+
+	Ensure 8-byte aligned memory allocation on MS-Windows 9X
+
+	* src/w32heap.c (init_heap): Redirect malloc, realloc, and free to
+	special functions on Windows 9X.  Refuse to dump Emacs on Windows 9X.
+	(malloc_after_dump_9x, realloc_after_dump_9x)
+	(free_after_dump_9x): New functions.  (Bug#22379)  See also
+	http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00852.html
+	for more details about the original problem.
+
+	* nt/inc/ms-w32.h (malloc_after_dump_9x, realloc_after_dump_9x)
+	(free_after_dump_9x): Add prototypes.
+
+2016-01-16  Eli Zaretskii  
+
+	Fix tests for active region in hideif.el
+
+	* lisp/progmodes/hideif.el (hif-evaluate-macro, hide-ifdef-block): Use
+	'use-region-p' to test whether to operate on region, instead of
+	testing 'mark-active'.
+
+2016-01-16  Eli Zaretskii  
+
+	Fix interactive specs in some hideif.el commands
+
+	* lisp/progmodes/hideif.el (hif-evaluate-macro)
+	(hide-ifdef-undef, show-ifdef-block): Don't use '(interactive "r")'
+	in commands that should only act on the region if it's active.
+
+2016-01-15  Phillip Lord  
+
+	Enable test selector from command line
+
+	* test/automated/Makefile.in: Change variable manipulation to avoid
+	  over-writing selector.
+
+2016-01-15  Alan Mackenzie  
+
+	Don't confuse "::" with ":" when trying to parse member initializers.
+
+	* lisp/progmodes/cc-engine.el (c-back-over-member-initializers): Check
+	more robustly for ":" token when searching backwards for it.
+
+	* lisp/progmodes/cc-langs (c-:$-multichar-token-regexp): New language
+	variable.
+
+2016-01-15  Eli Zaretskii  
+
+	Ensure positive number of glyphs for margins of positive width
+
+	* src/dispnew.c (margin_glyphs_to_reserve): Always return a
+	positive value when a non-zero width of the marginal area was
+	requested.  (Bug#22356)
+
+2016-01-15  Eli Zaretskii  
+
+	Fix crashes when mini-window has non-zero margins
+
+	* src/window.c (resize_frame_windows): Use 'new_size' to set
+	minibuffer window's 'total_cols' value, as 'size' might be in
+	pixels.  (Bug#22356)
+
+2016-01-15  Alan Mackenzie  
+
+	In comment-dwim with style `extra-line', respect indent-tabs-mode.
+
+	This fixes bug #22369.
+
+	* lisp/newcomment.el (comment-make-bol-ws): New function.
+	(comment-make-extra-lines): Use new function instead of a crude `make-string'.
+
+2016-01-15  Eli Zaretskii  
+
+	Make 'random' seeds cryptographically secure if possible
+
+	* configure.ac: Check for "/dev/urandom".
+
+	* src/sysdep.c (init_random) [HAVE_DEV_URANDOM]: Read the stream
+	for the seed from "/dev/urandom".
+	[WINDOWSNT]: Obtain the stream for the seed from w32 APIs.
+	* src/fns.c (Frandom): Update the doc string to indicate that
+	system entropy is used when available.
+	* src/w32.c: Include wincrypt.h.
+	(w32_init_crypt_random, w32_init_random): New functions, use the
+	CryptGenRandom API.
+	(globals_of_w32): Initialize w32_crypto_hprov handle to zero.
+	* src/w32.h (w32_init_random): Add prototype.
+
+	* doc/lispref/numbers.texi (Random Numbers): Document more details
+	about 't' as the argument to 'random'.
+
+	* etc/NEWS: Mention that '(random t)' now uses a cryptographically
+	strong seed if possible.
+
+	(Bug#22202)
+
+2016-01-15  Eli Zaretskii  
+
+	Unhide the --no-line-directive option to 'etags'
+
+	* lib-src/etags.c (print_help): Un-undocument the --no-line-directive
+	option.  (Bug#22306)
+
+	* doc/man/etags.1: Document the --no-line-directive option.
+
+2016-01-15  Alan J Third    (tiny change)
+
+	Fix picture-mode wrt double-width characters
+
+	* lisp/textmodes/picture.el (picture-insert): Check the width of
+	the character being replaced, not just that of the replacement.
+	(Bug#1808)
+
+2016-01-15  Eric Abrahamsen  
+
+	Honor docstring of gnus-group-get-new-news
+
+	* lisp/gnus/gnus-start.el (gnus-get-unread-articles): If the prefix arg is t,
+	but non-numeric, unconditionally consider all groups to need updating.
+
+2016-01-14  Simen Heggestøyl  
+
+	Disallow parenthesis in non-pseudo CSS selectors
+
+	* lisp/textmodes/css-mode.el (css--font-lock-keywords): Disallow
+	parenthesis in selectors except for in the function notation that
+	might appear right after a pseudo-class.
+	* test/indent/scss-mode.scss: Add a test for it.
+
+2016-01-14  Katsumi Yamaoka  
+
+	* lisp/gnus/nntp.el (nntp-request-newgroups): Simplify
+
+2016-01-14  Michael Albinus  
+
+	check-maybe shall run only default tests
+
+	* test/automated/Makefile.in (check, check-expensive): Depend on
+	mostlyclean.
+	(check-maybe): Re-run only default tests.
+	(check-doit): Use code of check-maybe.
+	(mostlyclean): Move *.log files away.
+
+2016-01-13  Mark Oteiza  
+
+	* lisp/thingatpt.el (thing-at-point-uri-schemes): Add "magnet:"
+
+2016-01-13  Dmitry Gutov  
+
+	Un-obsolete tags-loop-continue
+
+	* lisp/progmodes/etags.el (tags-loop-continue): Un-obsolete.
+	http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00682.html
+
+2016-01-13  Eli Zaretskii  
+
+	Document obsoletion of 'intangible' and 'point-entered/left'
+
+	* doc/lispref/text.texi (Special Properties): Document the new
+	properties 'cursor-intangible' and 'cursor-sensor-functions'.
+	Document the obsolete status of 'intangible', 'pointer-left',
+	and 'point-entered' properties, and of 'inhibit-point-motion-hooks'.
+	* doc/lispref/display.texi (Overlay Properties): Document that
+	'intangible' overlay property is obsolete.
+
+	* lisp/emacs-lisp/cursor-sensor.el (cursor-sensor-mode): Doc fix.
+
+2016-01-13  Eli Zaretskii  
+
+	Updater documentation of 'looking-back'
+
+	* doc/lispref/searching.texi (Regexp Search): Update documentation
+	of 'looking-back'.  Fix markup.
+
+2016-01-13  Eli Zaretskii  
+
+	Document 'pre-redisplay-functions'
+
+	* doc/lispref/hooks.texi (Standard Hooks):
+	* doc/lispref/display.texi (Forcing Redisplay): Document
+	'pre-redisplay-functions'.
+
+2016-01-13  Eli Zaretskii  
+
+	Document the new deafault value of 'load-read-function'
+
+	* doc/lispref/loading.texi (How Programs Do Loading): Document the
+	change in the default value of 'load-read-function'.
+
+2016-01-13  Eli Zaretskii  
+
+	Document 'bufferpos-to-filepos' and 'filepos-to-bufferpos'
+
+	* doc/lispref/nonascii.texi (Text Representations): Document
+	'bufferpos-to-filepos' and 'filepos-to-bufferpos'.
+
+2016-01-13  Eli Zaretskii  
+
+	Document the new prefix-command hooks
+
+	* doc/lispref/hooks.texi (Standard Hooks): Document
+	`prefix-command-echo-keystrokes-functions' and
+	`prefix-command-preserve-state-hook'.
+
+2016-01-13  Paul Eggert  
+
+	Fix one more misuse of time-stamp-time-zone
+
+	* test/etags/html-src/softwarelibero.html: Use "UTC0" rather
+	than the unportable "GMT" for time zone.
+
+2016-01-13  Paul Eggert  
+
+	Fix NNTP NEWGROUPS off-by-a-few-hours bug
+
+	* lisp/gnus/nntp.el (nntp-request-newgroups): Format string
+	in Universal Time, since we’re telling the server “GMT”.
+
+2016-01-12  Paul Eggert  
+
+	Update publicsuffix.txt from upstream
+
+	* etc/publicsuffix.txt: Update from
+	https://publicsuffix.org/list/effective_tld_names.dat
+	dated 2016-01-12 11:52:01 UTC.
+
+2016-01-12  Glenn Morris  
+
+	Fix some declarations.
+
+	* lisp/descr-text.el (internal-char-font):
+	* lisp/cedet/mode-local.el (xref-item-location):
+	* lisp/gnus/mml-smime.el (epg-key-sub-key-list)
+	(epg-sub-key-capability, epg-sub-key-validity):
+	* lisp/international/mule-util.el (internal-char-font):
+	Fix declarations.
+
+2016-01-12  Glenn Morris  
+
+	Fix some custom types.
+
+	* lisp/gnus/gnus-fun.el (gnus-x-face-omit-files, gnus-face-omit-files):
+	* lisp/gnus/gnus.el (gnus-valid-select-methods):
+	* lisp/mail/rmail.el (rmail-get-coding-function):
+	* lisp/net/newst-treeview.el (newsticker-groups-filename):
+	* lisp/progmodes/hideif.el (hide-ifdef-exclude-define-regexp):
+	* lisp/textmodes/tildify.el (tildify-space-predicates):
+	* lisp/url/url-tramp.el (url-tramp-protocols):
+	Fix custom types.
+
+2016-01-12  Glenn Morris  
+
+	Add some missing version tags.
+
+	* lisp/electric.el (electric-quote-comment)
+	(electric-quote-string, electric-quote-paragraph):
+	* lisp/epg-config.el (epg-gpgconf-program):
+	* lisp/rect.el (rectangle-preview):
+	* lisp/emacs-lisp/check-declare.el (check-declare-ext-errors):
+	* lisp/emacs-lisp/package.el (package-selected-packages)
+	(package-hidden-regexps):
+	* lisp/erc/erc.el (erc-network-hide-list, erc-channel-hide-list):
+	* lisp/eshell/em-term.el (eshell-destroy-buffer-when-process-dies):
+	* lisp/gnus/mml-sec.el (mml1991-signers, mml2015-signers)
+	(mml-smime-signers, mml1991-encrypt-to-self, mml2015-encrypt-to-self)
+	(mml-smime-encrypt-to-self, mml2015-sign-with-sender)
+	(mml-smime-sign-with-sender, mml2015-always-trust)
+	(mml-secure-fail-when-key-problem, mml-secure-key-preferences):
+	* lisp/net/browse-url.el (browse-url-conkeror-new-window-is-buffer)
+	(browse-url-conkeror-arguments):
+	* lisp/net/newst-reader.el (newsticker-download-logos):
+	* lisp/progmodes/gud.el (gud-guiler-command-name):
+	* lisp/progmodes/prog-mode.el (prettify-symbols-unprettify-at-point):
+	* lisp/progmodes/project.el (project-vc):
+	* lisp/progmodes/python.el (python-indent-guess-indent-offset-verbose)
+	(python-shell-remote-exec-path, python-shell-first-prompt-hook)
+	(python-shell-completion-native-disabled-interpreters)
+	(python-shell-completion-native-enable)
+	(python-shell-completion-native-output-timeout)
+	(python-shell-completion-native-try-output-timeout):
+	* lisp/progmodes/xref.el (xref):
+	* lisp/term/screen.el (xterm-screen-extra-capabilities):
+	* lisp/term/xterm.el (xterm-max-cut-length):
+	Add missing version tags.
+
+2016-01-12  Glenn Morris  
+
+	* test/automated/core-elisp-tests.el
+	(core-elisp-tests-1-defvar-in-let): Add a custom type.
+
+2016-01-12  Glenn Morris  
+
+	* src/buffer.c (syms_of_buffer) : Doc fix.
+
+	Remove comments that do not apply since 2005-08-09.  (Bug#22349)
+
+2016-01-12  Paul Eggert  
+
+	Merge from gnulib
+
+	This mostly just changes "UTC" to "UTC0" for POSIX conformance.
+	It also updates to the latest version of texinfo.tex.
+	* build-aux/gitlog-to-changelog, build-aux/move-if-change:
+	* build-aux/update-copyright, doc/misc/texinfo.tex:
+	Update from gnulib.
+
+2016-01-12  Eli Zaretskii  
+
+	Update documentation of 'process-running-child-p'
+
+	* doc/lispref/processes.texi (Input to Processes): Document the
+	changes in return value of 'process-running-child-p'.
+
+2016-01-12  Eli Zaretskii  
+
+	Update documentation of 'deactivate-mark'.
+
+	* doc/lispref/markers.texi (The Mark): Document that
+	'deactivate-mark' is now buffer-local when set.
+
+2016-01-12  Eli Zaretskii  
+
+	Update documentation of 'completion-table-dynamic'
+
+	* doc/lispref/minibuf.texi (Programmed Completion): Document the
+	new optional argument to 'completion-table-dynamic'.
+
+2016-01-12  Eli Zaretskii  
+
+	Document changes in 'read-buffer' and 'read-buffer-function'
+
+	* doc/lispref/minibuf.texi (High-Level Completion): Document the
+	4th argument to 'read-buffer' and 'read-buffer-function'.
+
+2016-01-12  Paul Eggert  
+
+	Fix time-stamp-time-zone bugs introduced in July
+
+	This fixes a bug introduced when the July changes to
+	format-time-string installed, as the changes were not
+	correctly handled in this module (Bug#22302).
+	Also, document time stamp time zones.
+	* lisp/time-stamp.el (time-stamp-time-zone): Document values better.
+	(time-stamp--format): New private function.
+	(time-stamp-string, time-stamp-string-preprocess)
+	(time-stamp-do-number): Use it.
+	* doc/emacs/files.texi (Time Stamps): Mention time zones.
+	* doc/misc/autotype.texi (Timestamps): Document time-stamp-time-zone.
+
+2016-01-12  Eli Zaretskii  
+
+	Make piping to subprocesses more robust on MS-Windows
+
+	* src/w32.c (sys_write): Don't write to a pipe more stuff than its
+	buffer can hold.  Don't return -1 if something has been written to
+	the pipe.  Zero out 'errno' before calling '_write', to avoid
+	returning a stale value.  (Bug#22344)
+	* src/w32proc.c (syms_of_ntproc) : New variable.
+	* src/w32.c (pipe2): Use it to request a user-defined size for the
+	pipe being created.
+
+	* etc/NEWS: Mention 'w32-pipe-buffer-size'.
+
+	* doc/emacs/msdos.texi (Windows Processes): Document
+	'w32-pipe-buffer-size'.
+
+2016-01-16  Stefan Monnier  
+
+	* lisp/emacs-lisp/syntax.el (syntax-ppss-table): New var
+
+	(syntax-ppss):
+	* lisp/font-lock.el (font-lock-fontify-syntactically-region): Use it.
+
+2016-01-16  Stefan Monnier  
+
+	lisp/nxml: Use syntax-tables for comments
+
+	* lisp/nxml/nxml-mode.el (nxml-set-face): Prepend.
+	(nxml-mode): Set syntax-ppss-table.
+	Use sgml-syntax-propertize-function for syntax-propertize-function.
+	Let font-lock highlight strings and comments.
+	(nxml-degrade): Don't touch "nxml-inside" property any more.
+	(nxml-after-change, nxml-after-change1): Remove functions.
+	(comment): Don't set fontify rule any more.
+	(nxml-fontify-attribute): Don't highlight the value any more.
+	(nxml-namespace-attribute-value-delimiter, nxml-namespace-attribute-value)
+	(nxml-comment-delimiter, nxml-comment-content): Remove faces.
+
+	* lisp/nxml/nxml-rap.el (nxml-scan-end): Remove.
+	(nxml-get-inside, nxml-inside-start, nxml-inside-end): Use syntax-ppss.
+	(nxml-clear-inside, nxml-set-inside): Remove.
+	(nxml-scan-after-change): Remove function.
+	(nxml-scan-prolog, nxml-tokenize-forward): Simplify.
+	(nxml-ensure-scan-up-to-date): Use syntax-propertize.
+	(nxml-move-outside-backwards):
+	* lisp/nxml/nxml-outln.el (nxml-section-tag-backward): Adjust to new
+	nxml-inside-start behavior.
+
+	* lisp/nxml/nxml-util.el (nxml-debug-set-inside)
+	(nxml-debug-clear-inside): Remove macros.
+
+	* lisp/nxml/xmltok.el (xmltok-forward-special): Remove function.
+	(xmltok-scan-after-comment-open): Simplify.
+
+2016-01-16  Stefan Monnier  
+
+	* elisp-mode.el (elisp--font-lock-flush-elisp-buffers): Fix comment
+
+2016-01-16  Stefan Monnier  
+
+	* lisp/nxml: Use standard completion; it also works for company-mode
+
+	* lisp/nxml/nxml-mode.el (nxml-complete): Obsolete.
+	(nxml-completion-at-point-function): Remove.
+	(nxml-mode): Don't set completion-at-point-functions.
+	* lisp/nxml/rng-nxml.el (rng-nxml-mode-init): Set it here instead.
+	(rng-completion-at-point): Rename from rng-complete and mark it
+	non-interactive.  It is now to be used as completion-at-point-function.
+	(rng-complete-tag, rng-complete-end-tag, rng-complete-attribute-name)
+	(rng-complete-attribute-value): Don't perform completion, but return
+	completion data instead.
+	(rng-complete-qname-function, rng-generate-qname-list): Add a few
+	arguments, previously passed via dynamic coping.
+	(rng-strings-to-completion-table): Rename from
+	rng-strings-to-completion-alist.  Don't return an alist.  Don't both
+	sorting and uniquifying.
+
+	* lisp/nxml/rng-util.el (rng-complete-before-point): Delete function.
+	(rng-completion-exact-p, rng-quote-string): Delete functions.
+
+	* lisp/nxml/rng-valid.el (rng-recover-start-tag-open)
+	(rng-missing-attributes-message, rng-missing-element-message)
+	(rng-mark-missing-end-tags): Use explicit ".." in formats rather than
+	calling rng-quote-string everywhere.
+
+2016-01-16  Stefan Monnier  
+
+	Use sgml-electric-tag-pair-mode also in nxml-mode
+
+	* lisp/nxml/rng-nxml.el: Require sgml-mode.
+	(rng-nxml-easy-menu): Add entry for sgml-electric-tag-pair-mode.
+	(rng-complete-qname-function): Use complete-with-action.
+
+	* lisp/textmodes/sgml-mode.el (sgml-electric-tag-pair-before-change-function):
+	Let-bind forward-sexp-function, since nxml-mode binds it to
+	something incompatible.
+
+	* lisp/nxml/nxml-mode.el: Use setq-local and defvar-local.
+
+2016-01-15  Stefan Monnier  
+
+	* xmltok.el: Mark the "sole --" rather than the comment opener
+
+	* lisp/nxml/xmltok.el (xmltok-scan-after-comment-open): Put the error
+	marker on the "sole --" rather than on the comment opener.
+
+2016-01-15  Sam Steingold  
+
+	replace `tramp-compat-split-string' (removed) with `split-string'
+
+	(python-shell-tramp-refresh-process-environment)
+	(python-shell-calculate-pythonpath): use `split-string'
+	instead of defunct `tramp-compat-split-string'
+
+2016-01-15  Stefan Monnier  
+
+	Update nXML to use Emacs's Unicode support, and lexical-binding
+
+	* etc/nxml/*.el: Remove obsolete char-name files.
+	* lisp/nxml/xsd-regexp.el (xsdre-range-list-difference): Remove unused
+	var `next'.
+	* lisp/nxml/rng-nxml.el (rng-set-state-after): Don't assume point-min==1.
+	* lisp/nxml/rng-match.el (rng-update-match-state): Simplify.
+	* lisp/nxml/nxml-outln.el (nxml-outline-state-transform-exceptions)
+	(nxml-target-section-pos, nxml-depth-in-target-section)
+	(nxml-outline-state-transform-alist)
+	(nxml-outline-display-section-tag-function): Move decl before first use.
+	* lisp/nxml/nxml-mode.el (nxml-char-name-ignore-case)
+	(nxml-char-name-alist, nxml-char-name-table)
+	(nxml-autoload-char-name-set-list, nxml-named-char-history): Remove vars.
+	(nxml-enable-char-name-set, nxml-disable-char-name-set)
+	(nxml-char-name-set-enabled-p, nxml-autoload-char-name-set)
+	(nxml-define-char-name-set, nxml-get-char-name): Remove functions.
+	(nxml-insert-named-char): Use read-char-by-name instead.
+	(nxml-char-ref-display-extra): Use get-char-code-property.
+	* lisp/nxml/nxml-maint.el (nxml-create-unicode-char-name-sets):
+	Remove function.
+	* lisp/nxml/nxml-glyph.el, lisp/nxml/nxml-uchnm.el: Remove files.
+
+2016-01-15  Michael Albinus  
+
+	Add "sg" method to Tramp
+
+	* doc/misc/tramp.texi (Inline methods): Add "sg" method.
+	(Customizing Completion): Add function `tramp-parse-etc-group'.
+
+	* lisp/net/tramp-sh.el (tramp-methods) : Add.  (Bug#22329)
+	(tramp-completion-function-alist-sg): New defconst.
+	(top): Completion function for "sg" is
+	`tramp-completion-function-alist-sg'.
+
+	* lisp/net/tramp.el (tramp-completion-function-alist): Adapt docstring.
+	(tramp-parse-etc-group, tramp-parse-etc-group-group): New defuns.
+
+2016-01-14  Michael Albinus  
+
+	Remove XEmacs compatibility in Tramp
+
+	* doc/misc/tramp.texi: Replace flags by their hard coded name.
+	Remove unused flags and the enclosed alternative text for XEmacs.
+
+	* doc/misc/trampver.texi: Use "Tramp" CamelCase.  Rename "emacs"
+	and "xemacs" flags to "unified" and "separate".  Remove flags
+	"emacsgw", "emacsname", "emacsdir", "ftppackagename",
+	"emacsothername", "emacsotherdir" and "emacsotherfilename".
+	(trampver):
+	* lisp/net/trampver.el (tramp-version): Set to "2.3.0-pre".
+
+	* lisp/net/tramp.el (bkup-backup-directory-info)
+	(directory-sep-char, ls-lisp-use-insert-directory-program)
+	(outline-regexp, tramp-backup-directory-alist)
+	(tramp-default-method, tramp-shell-prompt-pattern, tramp-syntax)
+	(tramp-file-name-regexp-unified)
+	(tramp-file-name-regexp-separate)
+	(tramp-completion-file-name-regexp-unified)
+	(tramp-completion-file-name-regexp-separate, tramp-chunksize)
+	(tramp-get-method-parameter, tramp-find-method, tramp-find-user)
+	(tramp-debug-message, tramp-progress-reporter-update)
+	(with-tramp-progress-reporter)
+	(tramp-rfn-eshadow-setup-minibuffer)
+	(rfn-eshadow-setup-minibuffer-hook, tramp-unload-hook)
+	(tramp-rfn-eshadow-update-overlay)
+	(rfn-eshadow-update-overlay-hook, tramp-default-file-modes)
+	(tramp-file-name-for-operation)
+	(tramp-completion-file-name-handler)
+	(tramp-autoload-file-name-handler, tramp-completion-mode-p)
+	(tramp-handle-directory-files)
+	(tramp-handle-directory-files-and-attributes)
+	(tramp-handle-dired-uncache, tramp-handle-find-backup-file-name)
+	(tramp-handle-insert-file-contents, tramp-handle-load)
+	(tramp-handle-shell-command)
+	(tramp-handle-verify-visited-file-modtime)
+	(tramp-handle-file-notify-valid-p, tramp-accept-process-output)
+	(tramp-check-for-regexp, tramp-wait-for-regexp)
+	(tramp-send-string, tramp-mode-string-to-int)
+	(tramp-get-local-gid, tramp-check-cached-permissions)
+	(tramp-get-remote-tmpdir, tramp-make-tramp-temp-file)
+	(auto-save-file-name-transforms)
+	(tramp-handle-make-auto-save-file-name, tramp-read-passwd)
+	(tramp-clear-passwd, tramp-time-diff):
+	* lisp/net/tramp-adb.el (directory-listing-before-filename-regexp)
+	(directory-sep-char, tramp-adb-file-name-handler-alist)
+	(tramp-adb-parse-device-names)
+	(tramp-adb-handle-expand-file-name)
+	(tramp-adb-handle-file-truename, tramp-adb--gnu-switches-to-ash)
+	(tramp-adb-handle-file-local-copy)
+	(tramp-adb-handle-write-region, tramp-adb-handle-set-file-modes)
+	(tramp-adb-handle-rename-file, tramp-adb-handle-process-file)
+	(tramp-adb-handle-shell-command)
+	(tramp-adb-handle-start-file-process, tramp-adb-get-device)
+	(tramp-adb-maybe-open-connection):
+	* lisp/net/tramp-cache.el (tramp-persistency-file-name)
+	(tramp-cache-print):
+	* lisp/net/tramp-cmds.el (tramp-cleanup-all-connections)
+	(tramp-bug, tramp-reporter-dump-variable)
+	(tramp-load-report-modules, tramp-append-tramp-buffers):
+	* lisp/net/tramp-compat.el (tramp-compat-funcall)
+	(tramp-advice-file-expand-wildcards)
+	(tramp-compat-temporary-file-directory)
+	(tramp-compat-make-temp-file, tramp-compat-copy-file)
+	(tramp-compat-delete-directory, )
+	(tramp-compat-process-running-p):
+	* lisp/net/tramp-ftp.el (tramp-methods) :
+	(tramp-default-method-alist, tramp-foreign-file-name-handler-alist):
+	* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist)
+	(tramp-gvfs-do-copy-or-rename-file, tramp-gvfs-handle-copy-file)
+	(tramp-gvfs-handle-file-local-copy)
+	(tramp-gvfs-handle-file-name-all-completions)
+	(tramp-gvfs-handle-file-notify-add-watch)
+	(tramp-gvfs-monitor-file-process-filter)
+	(tramp-gvfs-handle-file-readable-p)
+	(tramp-gvfs-handle-rename-file, tramp-gvfs-handle-write-region)
+	(tramp-gvfs-file-name, tramp-gvfs-handler-askquestion)
+	(tramp-gvfs-maybe-open-connection)
+	(tramp-gvfs-parse-device-names):
+	* lisp/net/tramp-gw.el (tramp-gw-aux-proc-sentinel)
+	(tramp-gw-open-connection, tramp-gw-open-network-stream):
+	* lisp/net/tramp-sh.el (directory-sep-char)
+	(tramp-sh-file-name-handler-alist)
+	(tramp-sh-handle-file-truename)
+	(tramp-sh-handle-set-visited-file-modtime)
+	(tramp-sh-handle-verify-visited-file-modtime)
+	(tramp-sh-handle-set-file-modes, tramp-sh-handle-set-file-times)
+	(tramp-sh-handle-file-acl)
+	(tramp-sh-handle-file-name-all-completions)
+	(tramp-sh-handle-copy-file, tramp-sh-handle-rename-file)
+	(tramp-do-copy-or-rename-file-directly)
+	(tramp-do-copy-or-rename-file-out-of-band)
+	(dired-compress-file-suffixes, dired-remove-file)
+	(tramp-sh-handle-dired-compress-file)
+	(tramp-sh-handle-insert-directory)
+	(tramp-sh-handle-expand-file-name)
+	(tramp-sh-handle-start-file-process)
+	(tramp-sh-handle-process-file, tramp-sh-handle-file-local-copy)
+	(tramp-sh-handle-write-region, tramp-sh-handle-vc-registered)
+	(tramp-sh-handle-file-notify-add-watch)
+	(tramp-sh-gvfs-monitor-dir-process-filter)
+	(tramp-sh-inotifywait-process-filter, tramp-maybe-send-script)
+	(tramp-find-executable)
+	(tramp-open-connection-setup-interactive-shell)
+	(tramp-find-inline-encoding, tramp-compute-multi-hops)
+	(tramp-maybe-open-connection, tramp-convert-file-attributes)
+	(tramp-get-remote-path, tramp-get-remote-touch):
+	* lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist)
+	(tramp-smb-handle-copy-directory, tramp-smb-handle-copy-file)
+	(tramp-smb-handle-delete-directory)
+	(tramp-smb-handle-directory-files, tramp-smb-handle-file-acl)
+	(tramp-smb-handle-make-directory-internal)
+	(tramp-smb-handle-process-file, tramp-smb-handle-rename-file)
+	(tramp-smb-handle-set-file-acl, tramp-smb-handle-set-file-modes)
+	(tramp-smb-handle-write-region, tramp-smb-get-file-entries)
+	(tramp-smb-get-cifs-capabilities)
+	(tramp-smb-maybe-open-connection):
+	* lisp/net/trampver.el (tramp-repository-get-version):
+	Remove XEmacs compat code.
+
+	* lisp/net/tramp-cmds.el (mml-mode, mml-insert-empty-tag)
+	(reporter-dump-variable): Declare functions.
+
+	* lisp/net/tramp.el (tramp-bkup-backup-directory-info)
+	(tramp-advice-minibuffer-electric-separator)
+	(tramp-advice-minibuffer-electric-tilde)
+	(tramp-handle-unhandled-file-name-directory):
+	* lisp/net/tramp-compat.el (tramp-compat-with-temp-message)
+	(tramp-compat-font-lock-add-keywords)
+	(tramp-compat-load, tramp-compat-number-sequence)
+	(tramp-compat-split-string, tramp-compat-delete-dups):
+	* lisp/net/tramp-sh.el (tramp-sh-handle-insert-file-contents-literally):
+	Remove.
+
+	* lisp/net/tramp-sh.el (tramp-methods) : This does not work
+	recursively.
+
+2016-01-14  K. Handa  
+
+	fix previous change of src/ftfont.c (ftfont_shape_by_flt)
+
+	* src/ftfont.c (ftfont_shape_by_flt): Fix previous change.  Access the
+	second glyph only when there are enough glyphs.
+
+2016-01-13  Glenn Morris  
+
+	* src/buffer.c (Fset_buffer_major_mode): Allow default major-mode,
+
+	or its hook, to move point.  (Bug#22348)
+
+2016-01-12  Michael Albinus  
+
+	Merge missing commit from emacs-25 branch
+
+	* test/Makefile.in (SELECTOR_DEFAULT, SELECTOR_EXPENSIVE, SELECTOR):
+	New variables.
+	(check-expensive, check-doit): New targets.
+
+	* Makefile.in (check-expensive): New target.
+
+	* test/lisp/autorevert-tests.el
+	(auto-revert-test01-auto-revert-several-files):
+	* test/lisp/filenotify-tests.el (file-notify--deftest-remote)
+	(file-notify-test06-many-events):
+	* test/lisp/net/tramp-tests.el (tramp-test26-process-file)
+	(tramp-test27-start-file-process, tramp-test28-shell-command)
+	(tramp-test29-vc-registered)
+	(tramp-test31-special-characters-with-stat)
+	(tramp-test31-special-characters-with-perl)
+	(tramp-test31-special-characters-with-ls)
+	(tramp-test32-utf8-with-stat, tramp-test32-utf8-with-perl)
+	(tramp-test32-utf8-with-ls, tramp-test33-asynchronous-requests)
+	(tramp-test35-unload): Tag the tests as :expensive-test.
+
+2016-01-12  John Wiegley  
+
+	Merge from origin/emacs-25
+
+	1f6898d test/automated/vc-hg.el: Support out-of-tree build
+	3adb56e Minor change in tramp-tests.el
+	2b535ba ; * etc/NEWS: Update the js.el entry.
+	76b518c * etc/HELLO: Add Armenian and Mongolian greetings.
+	b51f1ef Java Mode: Fontify identifiers in the presence of annotations.
+	36b9539 Avoid an infloop when we run out of memory
+	2006752 Avoid unnecessary failures of auto-saving after fatal error
+	eef6784 Simplify HAVE_MODULES use in mark_maybe_pointer
+	552694a Revert attempt to use 'noexcept' in typedef
+	6ad0d39 Update documentation of 'indirect-function'
+	c6a5314 ; * etc/NEWS: Move entry of 'inhibit-point-motion-hooks'.
+	303141a Update documentation for obsoleting 'syntax-begin-function'
+	4e6f61c ; * etc/NEWS: Mark documented and not-to-be-documented entries.
+	e667bbb Document new features if Eshell
+	9c4e4e0 ; * etc/NEWS: Update EUDC entries.
+	1089dc9 Handle too long commands in Tramp
+	684eb58 * .gitattributes: *.cur and *.pif are binary files too.
+	d2c7fda * src/alloc.c (mark_maybe_pointer): HAVE_MODULES may be undefined
+	bd3f53d * sh-script.el (sh-smie-sh-rules): Improve indentation inside $(...)
+	09b2b8a * src/alloc.c (mark_maybe_pointer): Also check wide-int's emacs_value
+	cca0f93 ; Account for spaces before the filename
+	c71e1e8 Use short date for 'hg annotate', and output the author
+	f50027b Spelling fix
+	c7dff67 ; * etc/NEWS: Fix the Xref entries that got separated.
+	cc140bc Document user-level functions in project.el
+	f8208b6 Document the user-level features of the Xref package
+	b131fb8 * loading.texi: Add `define-type' entry for load-history
+	db3c2a8 Improve doc strings and prompts in xref.el
+	f6117ef Allow the use of `font-lock-extend-region-multiline' in CC Mode.
+	90fd798 Fix coding system for Tramp on OS X.
+	e985a0e ; * etc/NEWS: Mark the 'check-expensive' entry not to be documented.
+	9dfcbf0 Update 'load-history' docs
+	207e191 Fix (error ...) error
+	457738f Correctly analyze brace arguments in templated C++ function declarations.
+	d57724a * lisp/cedet/mode-local.el (describe-function-orig-buffer): Declare.
+	2a9532d * lisp/ffap.el (ffap-latex-mode): Avoid free variable.
+	1a6b084 * lisp/play/dunnet.el (dun-fix-screen): Avoid `end-of-buffer`.
+	8be046f Respect fontification region calculated by major mode.  Fixes bug #22316.
+	4b37cba Improve documentation of Delete Selection mode
+	a034dd3 Fix two project-find-file issues
+	30abf29 Clarify doc string of 'dired-current-directory'
+	e990bb2 Use the face of preceding text for displaying the ellipsis
+	5810ac3 Suppress Chinese file name test for OSX in tramp-tests.el
+	eeb710a ; * lisp/startup.el: Sentences end with two spaces.
+	428b3de * admin/admin.el (set-version): Also handle the NEWS file.
+	648de81 ; Add NEWS entry for project.el
+	671862f apropos-library: Skip obvious duplicates; don't error on generics
+	51668a5 ; Grammar fix
+	ed41d11 Add project-find-file and project-or-external-find-file
+	056da45 ; Improve commentary in 'setup_for_ellipsis'
+	269d008 ; Improve docstring for `inhibit-startup-echo-area-message'
+
+2016-01-12  John Wiegley  
+
+	Merge from origin/emacs-25
+
+	ce4a052 Add defvar-local to lisp-imenu-generic-expression
+	a0121bc Revert commit b1e3d14845517bfa9fa5d6d3840f3ab3160306fd
+	76fe2d5 * lisp/emacs-lisp/autoload.el (autoload-find-destination): Doc fix.
+	1ae088f * lisp/emacs-lisp/autoload.el (autoload-find-destination):
+	b6b47af Properly encode/decode base64Binary data in SOAP
+	c632466 Obey coding-system-for-write when writing stdout/stderr in batch
+	2f32cb5 * doc/misc/efaq.texi (Packages that do not come with Emacs):
+	        Update the URI of MELPA and marmalade-repo.
+	        Reported by CHENG Goa  in
+	        https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00390.html.
+	d2937aa * lisp/progmodes/opascal.el (opascal-mode-syntax-table):
+	5330c25 * lisp/progmodes/xscheme.el (xscheme-prompt-for-expression-exit):
+	7380990 Remove function wrongly on AWK Mode value of context
+	fontification hook.
+	d400753 * src/buffer.c: Stick with ASCII in doc string.
+	221240c Reword transient-mark-mode doc string
+	977d3ea Update doc string of 'selective-display'
+	229c3fa Make C++ buffers writeable when writing their initial text
+	        properties.
+	f5c762c Additional changes for "make check-expensive"
+	1729cf3 ; * admin/MAINTAINERS: Remove myself.
+	33219d3 Apply text properties for <, > in new after-change function
+	        (C++ Java Modes).
+
+2016-01-12  John Wiegley  
+
+	Merge from origin/emacs-25
+
+	9fb185a shr-tag-video bug fix
+	6300655 Minor fixes in tramp-tests.el
+	50575b1 Ensure redisplay when 'truncate-lines' is set
+	0d9e80d Fix a doc string of 'transient-mark-mode'
+	0000ae5 MS-Windows followup to latest gnulib update
+	4bc5e02 Spelling fix
+	f1093f7 Do secure signed Bcc handling
+
+2016-01-12  John Wiegley  
+
+	Merge from origin/emacs-25
+
+	861022f * doc/misc/texinfo.tex: Revert unwanted copyright change.
+	46e47a5 ; * etc/refcards/ru-refcard.tex (cyear): Update via M-x set-copyright.
+	71ea138 * lisp/align.el (align): Simplify a lambda
+	5618a50 * lisp/align.el (align): Fix arg order in call to `align-region'
+	1f680db Fix compilation next-error in buffers with selective-display
+	d20a948 * nsm.el (nsm-check-protocol): Fix typo in the message.
+	1da116f Add SHA1 warnings for high network security settings
+	e48bacd ; * etc/NEWS: Typo fix.
+
+2016-01-12  John Wiegley  
+
+	Merge from origin/emacs-25
+
+	43662a2 ; Clarify that xref is still experimental
+	0a6e6ca ; * admin/release-process: Remove some obsolete records.
+	c2e9e3d * lisp/progmodes/fortran.el (fortran-make-syntax-propertize-function):
+	8637f3d (semantic-symref-derive-find-filepatterns): Return a list
+	0a7ad07 ; Re-arrange xref-related entries in NEWS.
+	fe903ef Fix xref-find-references on MS-Windows
+	55a28d8 ; Fixed visual bell artifact problem on NextStep.
+	d064034 Document new features of tildify-mode
+	964bea7 Document new features of Whitespace mode
+	cd68f47 Improve documentation of new Hide-IfDef features
+	723b8bf Fix regression in font-locking cl-assert and cl-check-type
+
+2016-01-12  John Wiegley  
+
+	Merge from origin/emacs-25
+
+	ef33bc7 Spelling and grammar fixes
+	9c3dbab Fix copyright years by hand
+	0e96320 Update copyright year to 2016
+
+2016-01-12  John Wiegley  
+
+	Merge from origin/emacs-25
+
+	9ee6ecb lisp/emacs-lisp/chart.el (chart-new-buffer): Move to silence byte compiler.
+	526d80c Port chart.el methods to cl-generic.
+	410bb69 Add nt/INSTALL.W64 build instructions
+	8f5b524 Add new input method 'programmer-dvorak'
+	6d11f6e Allow to invoke original M-TAB binding in 'flyspell-prog-mode'
+	bb83bb1 Fix EWW rendering of long RTL lines
+	b1a8509 fix  bug#21054
+	ce5ad12 Clean up cairo printing code
+
+2016-01-12  John Wiegley  
+
+	Merge from origin/emacs-25
+
+	6ee327d Add handle_user_signal_hook
+	47580e0 Avoid writing to purespace
+	0588be7 Remove unused variable
+	89e7483 * configure.ac: Find libxml2 headers in Xcode SDK dir on Darwin.
+	3b95e9c Use posix_openpt instead of openpty on Darwin
+	86312ff Document support for ':documentation' in Lisp mode
+	c930e75b Document new features of TeX mode
+	7c83d84 Clarify docs of hscroll in RTL text
+	4c8f8db Fix rendering of HTML pages that use character composition
+	a8d37ca Avoid some compiler warnings in w32.c
+	ce106f3de Undo ill-advised change
+	be0bba4 Unbreak completion in python-mode buffers
+
+2016-01-11  Dmitry Gutov  
+
+	test/automated/vc-hg.el: Support out-of-tree build
+
+	* test/automated/vc-hg.el
+	(vc-hg-annotate-extract-revision-at-line-with-filename)
+	(vc-hg-annotate-extract-revision-at-line-with-both):
+	Don't refer to source-directory.
+	http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00755.html
+
+2016-01-11  Michael Albinus  
+
+	Minor change in tramp-tests.el
+
+	* test/automated/tramp-tests.el (tramp-test29-vc-registered):
+	Use `dired-uncache' instead of a Tramp internal function.
+
+2016-01-11  Peter Feigl  
+
+	* etc/HELLO: Add Armenian and Mongolian greetings.
+
+	(Bug#22346)
+
+2016-01-11  Alan Mackenzie  
+
+	Java Mode: Fontify identifiers in the presence of annotations.
+
+	* lisp/progmodes/cc-engine.el (c-forward-annotation): Tidy up the coding:
+	Don't move point when the defun fails.
+	(c-forward-decl-or-cast-1): Correct a usage of match data.
+
+	* lisp/progmodes/cc-fonts.el (c-font-lock-maybe-decl-faces): Remove.
+	(c-font-lock-declarations): Use the new c-maybe-decl-faces in place of the
+	removed variable.
+
+	* lisp/progmodes/cc-langs.el (c-maybe-decl-faces): New language variable.
+
+2016-01-11  Eli Zaretskii  
+
+	Avoid an infloop when we run out of memory
+
+	* src/alloc.c (garbage_collect_1): Don't bother saving and
+	restoring the echo-area message if we are GC'ing after running out
+	of memory.  This avoids an infloop due to repeated attempts to
+	allocate memory for the cons cell needed to save the message,
+	which signals the memory-full error, which attempts to save the
+	echo-area message, which signals memory-full again, etc.
+
+2016-01-11  Eli Zaretskii  
+
+	Avoid unnecessary failures of auto-saving after fatal error
+
+	* src/w32.c (map_w32_filename): Avoid non-trivial system calls for
+	the benefit of FAT volumes if we are called as part of shutting
+	down due to a fatal error, which probably means we are trying to
+	auto-save the session.
+	* src/lread.c (check_obarray): Don't bother making the obarray
+	valid if we are shutting down due to a fatal error.  This avoids
+	interfering with auto-saving the crashed session.
+
+2016-01-11  Paul Eggert  
+
+	Simplify HAVE_MODULES use in mark_maybe_pointer
+
+	* src/alloc.c (HAVE_MODULES): Now a constant 0 if not defined,
+	so that later code can use 'if' rather than '#ifdef'.
+	(mark_maybe_pointer): Simplify based on HAVE_MODULES now
+	always working.
+
+2016-01-11  Paul Eggert  
+
+	Revert attempt to use 'noexcept' in typedef
+
+	This use of 'noexcept' runs afoul of the C++11 standard.
+	Problem reported by Philipp Stephani in:
+	http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00706.html
+	* src/emacs-module.c (emacs_finalizer_function):
+	Move this typedef here ...
+	* src/emacs-module.h: ... from here, and use only the C
+	version of the typedef.  The typedef is now private since it
+	is never used in the .h file now and anyway it seemed to be
+	causing more confusion than it cured.
+	(make_user_ptr, get_user_finalizer, set_user_finalizer):
+	Open-code the type instead.
+
+2016-01-10  Eli Zaretskii  
+
+	Update documentation of 'indirect-function'
+
+	* doc/lispref/eval.texi (Function Indirection): Update the
+	documentation of 'indirect-function'.
+
+2016-01-10  Eli Zaretskii  
+
+	Update documentation for obsoleting 'syntax-begin-function'
+
+	* doc/lispref/syntax.texi (Position Parse): Undocument
+	'syntax-begin-function' that is now obsolete.
+
+2016-01-10  Eli Zaretskii  
+
+	Document new features if Eshell
+
+	* doc/misc/eshell.texi (Input/Output): Document the new
+	'#' syntax.
+	(Input/Output): Document 'eshell-destroy-buffer-when-process-dies'.
+	Disable "Key Index" generation, as there are no @kindex entries in
+	this manual.
+
+2016-01-10  Michael Albinus  
+
+	Handle too long commands in Tramp
+
+	* lisp/net/tramp-sh.el (tramp-sh-handle-make-symbolic-link)
+	(tramp-do-file-attributes-with-ls): Send sequence of commands, in
+	order to not exceed shell command line limit.
+
+	* test/automated/tramp-tests.el (tramp--test-darwin-p): Remove.
+	(tramp--test-utf8): Include Arabic file name, again.
+
+2016-01-10  Paul Eggert  
+
+	* .gitattributes: *.cur and *.pif are binary files too.
+
+2016-01-10  Stefan Monnier  
+
+	* src/alloc.c (mark_maybe_pointer): HAVE_MODULES may be undefined
+
+2016-01-10  Stefan Monnier  
+
+	* sh-script.el (sh-smie-sh-rules): Improve indentation inside $(...)
+
+	* lisp/progmodes/sh-script.el (sh-smie-sh-rules): Improve indentation
+	within $(...).
+	* test/indent/shell.sh: Add corresponding test.
+
+2016-01-09  Stefan Monnier  
+
+	* src/alloc.c (mark_maybe_pointer): Also check wide-int's emacs_value
+
+	(mark_memory): Simplify loop.  Don't assume a pointer-sized word can be
+	cast to Lisp_Object.
+
+2016-01-09  Dmitry Gutov  
+
+	Use short date for 'hg annotate', and output the author
+
+	* lisp/vc/vc-hg.el (vc-hg-annotate-command):
+	Change '-d' to '-dq'.  (Bug#21805)
+	(vc-hg-annotate-switches): Default to "-u" "--follow".
+	(vc-hg-annotate-re): Update to recognize the short date format
+	and the optional username.
+	(vc-hg-annotate-time)
+	(vc-hg-annotate-extract-revision-at-line): Update accordingly.
+
+	* test/automated/vc-hg.el: New file.
+
+2016-01-09  Paul Eggert  
+
+	Spelling fix
+
+2016-01-09  Eli Zaretskii  
+
+	Document user-level functions in project.el
+
+	* lisp/progmodes/project.el (project-find-file)
+	(project-or-external-find-file): Add doc strings.
+
+2016-01-09  Eli Zaretskii  
+
+	Document the user-level features of the Xref package
+
+	* doc/emacs/maintaining.texi (Maintaining): Add a list of
+	described features.
+	(Xref): New section, made out of thoroughly rewritten "Tags"
+	section.
+	(Find Identifiers, Looking Up Identifiers, Xref Commands)
+	(Identifier Search, List Identifiers): New subsections,
+	incorporating the old tags commands and the new xref commands.
+	(Tags Tables, Tag Syntax, Create Tags Table, Etags Regexps):
+	Section and subsections demoted to a lower level.
+	* doc/emacs/search.texi (Search):
+	* doc/emacs/windows.texi (Pop Up Window):
+	* doc/emacs/frames.texi (Creating Frames):
+	* doc/emacs/programs.texi (Imenu, Symbol Completion):
+	* doc/emacs/building.texi (Grep Searching):
+	* doc/emacs/dired.texi (Operating on Files):
+	* doc/emacs/glossary.texi (Glossary): All references to tags changed.
+
+2016-01-09  Stefan Monnier  
+
+	* loading.texi: Add `define-type' entry for load-history
+
+	* doc/lispref/loading.texi (Where Defined): Remove incorrect
+	cl-defmethod description, and add missing define-type entry.
+
+2016-01-09  Eli Zaretskii  
+
+	Improve doc strings and prompts in xref.el
+
+	* lisp/progmodes/xref.el (xref-backend-functions)
+	(xref-find-definitions): Doc fixes.
+	(xref-query-replace): Doc fix.  Improve prompts for arguments.
+
+2016-01-09  Alan Mackenzie  
+
+	Allow the use of `font-lock-extend-region-multiline' in CC Mode.
+
+	* lisp/progmodes/cc-mode.el (c-font-lock-init): Remove
+	`font-lock-extend-regions-wholelines' from
+	`font-lock-extend-region-functions' rather than setting the latter to
+	nil.
+
+2016-01-09  Michael Albinus  
+
+	Fix coding system for Tramp on OS X.
+
+	* lisp/net/tramp-compat.el: Require ucs-normalize.
+
+	* lisp/net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
+	Set coding system to `utf-8-hfs' for Mac OS X.
+
+	* test/automated/tramp-tests.el (tramp-test29-vc-registered):
+	Flush directory properties when needed.
+	(tramp--test-utf8): Include Chinese file name, again.
+
+2016-01-09  Eli Zaretskii  
+
+	Update 'load-history' docs
+
+	* doc/lispref/loading.texi (Where Defined): Update the list of
+	forms in 'load-history' by adding the forms created for the
+	'cl-generic' generics.  (Bug#21422)
+
+2016-01-08  Paul Eggert  
+
+	Fix (error ...) error
+
+	Problem reported by Glenn Morris in:
+	http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00561.html
+	* lisp/vc/add-log.el (change-log-goto-source): Fix typos
+	introduced in my Aug 28 change, where I got confused by the
+	two meanings of (error ...).
+
+2016-01-08  Alan Mackenzie  
+
+	Correctly analyze brace arguments in templated C++ function declarations.
+
+	* lisp/progmodes/cc-defs.el (c-go-list-forward, c-go-list-backward): add
+	POS and LIMIT parameters, like the other c-go-list-* functions have.
+
+	* lisp/progmodes/cc-engine.el (c-restore-<>-properties): Check backwards
+	for a ?\( rather than a ?<.  (c-looking-at-inexpr-block): Handle names
+	followed by template specifiers.
+
+2016-01-08  Glenn Morris  
+
+	* lisp/cedet/mode-local.el (describe-function-orig-buffer): Declare.
+
+	* lisp/ffap.el (ffap-latex-mode): Avoid free variable.
+
+2016-01-08  Mark Oteiza  
+
+	* lisp/play/dunnet.el (dun-fix-screen): Avoid `end-of-buffer`.
+
+2016-01-08  Alan Mackenzie  
+
+	Respect fontification region calculated by major mode.  Fixes bug #22316.
+
+	* lisp/font-lock.el (font-lock-extend-jit-lock-region-after-change): when a
+	fontification region has been calculated by a function on
+	font-lock-extend-after-change-region-function use this region rather than
+	changing the end position to somewhere else.
+
+2016-01-08  Eli Zaretskii  
+
+	Improve documentation of Delete Selection mode
+
+	* lisp/delsel.el (delete-selection-mode)
+	(delete-selection-helper): Update and expand the doc strings.
+	(Bug#22296)
+
+	* doc/emacs/mark.texi (Using Region): Document the behavior of
+	delete commands in Delete Selection mode.  (Bug#22296)
+
+	* doc/lispref/markers.texi (The Mark): Document how to add the
+	support for Delete Selection mode to Lisp programs. (Bug#22296)
+
+2016-01-08  Dmitry Gutov  
+
+	Fix two project-find-file issues
+
+	* lisp/progmodes/project.el (project--value-in-dir):
+	Temporarily set enable-local-variables to :all.
+	(project-find-file, project-or-external-find-file):
+	All autoloads.
+	(project--find-file-in): Require xref.
+
+2016-01-08  Eli Zaretskii  
+
+	Clarify doc string of 'dired-current-directory'
+
+	* lisp/dired.el (dired-current-directory): Doc fix: clarify that
+	the return value might not end in a slash when called with the
+	optional argument non-nil.  (Bug#6273)
+
+2016-01-08  Eli Zaretskii  
+
+	Use the face of preceding text for displaying the ellipsis
+
+	* src/xdisp.c (setup_for_ellipsis): Use the face of the preceding
+	text in it->saved_face_id for displaying the ellipsis, and ignore
+	the face, if any, of the invisible text.  (Bug#22320)
+
+2016-01-08  Michael Albinus  
+
+	Suppress Chinese file name test for OSX in tramp-tests.el
+
+	* test/automated/tramp-tests.el (tramp--test-utf8):
+	Remove instrumentation.  Suppress Chinese file name test for OSX.
+
+2016-01-07  Glenn Morris  
+
+	* admin/admin.el (set-version): Also handle the NEWS file.
+
+2016-01-07  Dmitry Gutov  
+
+	apropos-library: Skip obvious duplicates; don't error on generics
+
+	* lisp/apropos.el (apropos-library): Skip "was an autoload"
+	entries, to avoid obvious duplicates.  For each cl-defmethod
+	entry, take just its function symbol (bug#21422).
+
+2016-01-07  Dmitry Gutov  
+
+	Add project-find-file and project-or-external-find-file
+
+	* lisp/minibuffer.el (completion-category-defaults):
+	Add `project-file' category.
+
+	* lisp/progmodes/project.el (project-find-file)
+	(project-or-external-find-file): New commands.
+	(project--find-file-in): New private function.
+
+	* lisp/progmodes/xref.el (xref-collect-matches): Use
+	`expand-file-name' on DIR, to expand the tildes.
+	(xref--find-ignores-arguments): Extract from
+	`xref--rgrep-command'.
+
+2016-01-06  Leo Liu  
+
+	Add defvar-local to lisp-imenu-generic-expression
+
+	* lisp/emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression): Add
+	  defvar-local.
+
+2016-01-06  Leo Liu  
+
+	Revert commit b1e3d14845517bfa9fa5d6d3840f3ab3160306fd
+
+	* lisp/emacs-lisp/easy-mmode.el (define-minor-mode):
+	  Don't declare (indent 1).
+
+2016-01-06  Glenn Morris  
+
+	* lisp/emacs-lisp/autoload.el (autoload-find-destination): Doc fix.
+
+2016-01-06  Glenn Morris  
+
+	* lisp/emacs-lisp/autoload.el (autoload-find-destination):
+
+	Avoid specifying the length of a time object (it has not been "2"
+	for some time).
+
+2016-01-06  Andreas Schwab  
+
+	Properly encode/decode base64Binary data in SOAP
+
+		* lisp/net/soap-client.el (soap-encode-xs-basic-type): Encode
+		base64Binary value as utf-8.
+		(soap-decode-xs-basic-type): Decode base64Binary value as utf-8.
+
+2016-01-06  Eli Zaretskii  
+
+	Obey coding-system-for-write when writing stdout/stderr in batch
+
+	* src/print.c (printchar_to_stream):
+	* src/xdisp.c (message_to_stderr): If coding-system-for-write has
+	a non-nil value, use it to encode output in preference to
+	locale-coding-system.  See the discussions in
+	http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00048.html
+	for the details.
+
+	* doc/lispref/os.texi (Terminal Output): Document how to send
+	non-ASCII text via 'send-string-to-terminal'.
+	(Batch Mode): Document how text written to standard streams is
+	encoded.  Fix inaccuracy regarding which output streams are used
+	by output functions in batch mode.
+
+2016-01-06  Xue Fuqiao  
+
+	* doc/misc/efaq.texi (Packages that do not come with Emacs):
+	Update the URI of MELPA and marmalade-repo.  Reported by CHENG Gao
+	 in
+	https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00390.html.
+
+2016-01-05  Maksim Golubev    (tiny change)
+
+	* lisp/progmodes/opascal.el (opascal-mode-syntax-table):
+
+	Fix backslash.  (Bug#22224)
+
+2016-01-05  Federico Beffa    (tiny change)
+
+	* lisp/progmodes/xscheme.el (xscheme-prompt-for-expression-exit):
+
+	Make it actually work.  (Bug#22265)
+
+2016-01-05  Alan Mackenzie  
+
+	Remove function wrongly on AWK Mode value of context fontification hook.
+
+	* lisp/progmodes/cc-langs.el (c-before-context-fontification-functions):
+	swap order of entries so that awk's entry isn't superseded by the default.
+
+	* lisp/progmodes/cc-mode.el (c-before-context-fl-expand-region): Correct
+	to handle nil value of c-before-context-fontification-functions.
+
+2016-01-05  Paul Eggert  
+
+	* src/buffer.c: Stick with ASCII in doc string.
+
+2016-01-05  Paul Eggert  
+
+	Reword transient-mark-mode doc string
+
+	* src/buffer.c (syms_of_buffer): Reword doc string to avoid confusion.
+	The value 'lambda (literally) can be interpreted as (quote lambda),
+	which is not intended here; we want just the lambda symbol.
+
+2016-01-05  Eli Zaretskii  
+
+	Update doc string of 'selective-display'
+
+	* src/buffer.c (syms_of_buffer) : Say that
+	using it with the value of 't' is obsolete.  (Bug#1092)
+
+2016-01-05  Alan Mackenzie  
+
+	Make C++ buffers writeable when writing their initial text properties.
+
+	This is a correction to yesterday's CC Mode patch.
+
+	* lisp/progmodes/cc-engine.el (c-before-change-check-<>-operators): Put
+	c-save-buffer-state around the function rather than a mere `let'.
+
+2016-01-05  Michael Albinus  
+
+	Additional changes for "make check-expensive"
+
+	* CONTRIBUTE : Encourage use of ":tags '(:expensive-test)".
+	Explain make target `check-expensive'.
+
+	* etc/NEWS: Mention new make target `check-expensive'.
+
+	* test/automated/Makefile.in (check-doit): New target.
+	(check, check-expensive): Use it.
+
+2016-01-04  Alan Mackenzie  
+
+	Apply text properties for <, > in new after-change function (C++ Java Modes).
+
+	These are category/syntax-table properties to give < and > paren syntax.
+	Also apply certain `c-type' text properties to the insides of <..> constructs
+	to ensure that identifiers contained by them get fontified.  This patch fixes
+	bug #681.
+
+	* lisp/progmodes/cc-cmds.el (c-electric-lt-gt): Reformulate due to new
+	after-change action.
+
+	* lisp/progmodes/cc-engine.el (c-before-change-check-<>-operators): Expand
+	change region to include s which might not be already marked as
+	parens, rather than just when paren text properties are removed.
+	(c-restore-<>-properties): New after-change function, which applies text
+	properties marking < and > with paren syntax.
+
+	* lisp/progmodes/cc-fonts.el (c-font-lock-declarations): Ensure `c-type'
+	properties are applied to the interiors of <...> constructs, to ensure
+	fontification of identifiers there.
+
+	* lisp/progmodes/cc-langs.el (c-before-font-lock-functions): Add
+	c-restore-<>-properties to this list for C++ and Java.
+
+	* lisp/progmodes/cc-mode.el (c-common-init): When invoking
+	c-before-font-lock-functions, exclude c-restore-<>-properties from the
+	functions invoked.
+	(c-before-change): Initialize c-new-BEG/END here (rather than c-after-change)
+	to allow modification by before-change functions.
+	(c-after-change): Amend c-new-END here, rather than initializing it and
+	c-new-BEG.
+
+2016-01-04  Michael Albinus  
+
+	Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
+
+2016-01-04  Michael Albinus  
+
+	Introduce check-expensive tests.
+
+	* Makefile.in (check-expensive):
+	* test/automated/Makefile.in (check-expensive): New target.
+
+	* test/automated/auto-revert-tests.el
+	(auto-revert-test01-auto-revert-several-files):
+	* test/automated/file-notify-tests.el (file-notify--deftest-remote):
+	* test/automated/tramp-tests.el (tramp-test26-process-file)
+	(tramp-test27-start-file-process, tramp-test28-shell-command)
+	(tramp-test29-vc-registered)
+	(tramp-test31-special-characters-with-stat)
+	(tramp-test31-special-characters-with-perl)
+	(tramp-test31-special-characters-with-ls)
+	(tramp-test32-utf8-with-stat, tramp-test32-utf8-with-perl)
+	(tramp-test32-utf8-with-ls, tramp-test33-asynchronous-requests)
+	(tramp-test35-unload): Tag the tests as :expensive-test.
+
+2016-01-04  Lars Magne Ingebrigtsen  
+
+	shr-tag-video bug fix
+
+	* shr.el (shr-tag-video): Protect against the `poster' being
+	empty.
+
+2016-01-04  Michael Albinus  
+
+	Minor fixes in tramp-tests.el
+
+	* test/automated/tramp-tests.el (tramp-test26-process-file):
+	Move point properly.
+	(tramp-test29-vc-registered): Work with relative file names.
+
+2016-01-04  Eli Zaretskii  
+
+	Ensure redisplay when 'truncate-lines' is set
+
+	* lisp/frame.el (redisplay--variables): Add 'truncate-lines'.
+	(Bug#22303)
+
+2016-01-04  Eli Zaretskii  
+
+	Fix a doc string of 'transient-mark-mode'
+
+	* src/buffer.c (syms_of_buffer) : Prevent
+	"lambda" in doc string from becoming a link to lambda expressions.
+
+2016-01-04  Eli Zaretskii  
+
+	MS-Windows followup to latest gnulib update
+
+	* nt/gnulib.mk (EXTRA_DIST): Add ignore-value.h.
+
+2016-01-04  Paul Eggert  
+
+	Spelling fix
+
+2016-01-03  Jens Lechtenboerger  
+
+	Do secure signed Bcc handling
+
+	* lisp/gnus/message.el (message-send): Do secure signed Bcc handling
+	(bug#18718).
+
+2016-01-03  Paul Eggert  
+
+	Avoid stdio in SIGINT handler
+
+	* admin/merge-gnulib (GNULIB_MODULES): Add ignore-value.
+	* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
+	* lib/ignore-value.h: New file, from gnulib.
+	* src/keyboard.c: Include it.
+	(write_stdout, read_stdin): New functions.
+	(handle_interrupt): Use them instead of printf and getchar,
+	and avoid fflush when handling signals.
+
+2016-01-03  Paul Eggert  
+
+	* doc/misc/texinfo.tex: Revert unwanted copyright change.
+
+2016-01-03  Artur Malabarba  
+
+	* lisp/align.el (align): Simplify a lambda
+
+	* lisp/align.el (align): Fix arg order in call to `align-region'
+
+2016-01-03  Eli Zaretskii  
+
+	Fix compilation next-error in buffers with selective-display
+
+	* lisp/progmodes/compile.el (compilation-beginning-of-line): New
+	function.
+	(compilation-internal-error-properties)
+	(compilation-next-error-function, compilation-set-window): Use
+	it.  (Bug#1092)
+
+2016-01-03  Lars Magne Ingebrigtsen  
+
+	* nsm.el (nsm-check-protocol): Fix typo in the message.
+
+2016-01-03  Lars Magne Ingebrigtsen  
+
+	Add SHA1 warnings for high network security settings
+
+	* nsm.el (nsm-check-protocol): When using high security, warn
+	about SHA1 certificates, which are now believed to be open to
+	spoofing.
+
+2016-01-02  Jens Lechtenboerger  
+
+	Refactor mml-smime.el, mml1991.el, mml2015.el
+
+	(Maybe this is the last merge from Gnus git to Emacs git)
+
+	Cf. discussion on ding mailing list, messages in
+	.
+	Common code from the three files mml-smime.el, mml1991.el, and
+	mml2015.el is moved to mml-sec.el.  Auxiliary functions are added
+	to gnus-util.el.
+
+	The code is supported by test cases with necessary test keys.
+
+	Documentation in message.texi is updated.
+
+	* doc/misc/message.texi (Security, Using S/MIME):
+	Update for refactoring mml-smime.el, mml1991.el, mml2015.el.
+	(Using OpenPGP): Rename from "Using PGP/MIME"; update contents.
+	(Passphrase caching, Encrypt-to-self, Bcc Warning): New sections.
+
+	* lisp/gnus/gnus-util.el (gnus-test-list, gnus-subsetp, gnus-setdiff):
+	New functions.
+
+	* lisp/gnus/mml-sec.el: Require gnus-util and epg.
+	(epa--select-keys): Autoload.
+	(mml-signencrypt-style-alist, mml-secure-cache-passphrase): Doc fix.
+	(mml-secure-openpgp-signers): New user option;
+	make mml1991-signers and mml2015-signers obsolete aliases to it.
+	(mml-secure-smime-signers): New user option;
+	make mml-smime-signers an obsolete alias to it.
+	(mml-secure-openpgp-encrypt-to-self): New user option;
+	make mml1991-encrypt-to-self and mml2015-encrypt-to-self obsolete
+	aliases to it.
+	(mml-secure-smime-encrypt-to-self): New user option;
+	make mml-smime-encrypt-to-self an obsolete alias to it.
+	(mml-secure-openpgp-sign-with-sender): New user option;
+	make mml2015-sign-with-sender an obsolete alias to it.
+	(mml-secure-smime-sign-with-sender): New user option;
+	make mml-smime-sign-with-sender an obsolete alias to it.
+	(mml-secure-openpgp-always-trust): New user option;
+	make mml2015-always-trust an obsolete alias to it.
+	(mml-secure-fail-when-key-problem, mml-secure-key-preferences):
+	New user options.
+	(mml-secure-cust-usage-lookup, mml-secure-cust-fpr-lookup)
+	(mml-secure-cust-record-keys, mml-secure-cust-remove-keys)
+	(mml-secure-add-secret-key-id, mml-secure-clear-secret-key-id-list)
+	(mml-secure-cache-passphrase-p, mml-secure-cache-expiry-interval)
+	(mml-secure-passphrase-callback, mml-secure-check-user-id)
+	(mml-secure-secret-key-exists-p, mml-secure-check-sub-key)
+	(mml-secure-find-usable-keys, mml-secure-select-preferred-keys)
+	(mml-secure-fingerprint, mml-secure-filter-keys)
+	(mml-secure-normalize-cust-name, mml-secure-select-keys)
+	(mml-secure-select-keys-1, mml-secure-signer-names, mml-secure-signers)
+	(mml-secure-self-recipients, mml-secure-recipients)
+	(mml-secure-epg-encrypt, mml-secure-epg-sign): New functions.
+
+	* lisp/gnus/mml-smime.el: Require epg;
+	refactor declaration and autoloading of epg functions.
+	(mml-smime-use): Doc fix.
+	(mml-smime-cache-passphrase, mml-smime-passphrase-cache-expiry):
+	Obsolete.
+	(mml-smime-get-dns-cert, mml-smime-get-ldap-cert):
+	Use format instead of gnus-format-message.
+	(mml-smime-epg-secret-key-id-list): Remove variable.
+	(mml-smime-epg-passphrase-callback, mml-smime-epg-find-usable-key)
+	(mml-smime-epg-find-usable-secret-key): Remove functions.
+	(mml-smime-epg-sign, mml-smime-epg-encrypt): Refactor.
+
+	* lisp/gnus/mml1991.el (mml1991-cache-passphrase)
+	(mml1991-passphrase-cache-expiry): Obsolete.
+	(mml1991-epg-secret-key-id-list): Remove variable.
+	(mml1991-epg-passphrase-callback, mml1991-epg-find-usable-key)
+	(mml1991-epg-find-usable-secret-key): Remove functions.
+	(mml1991-epg-sign, mml1991-epg-encrypt): Refactor.
+
+	* lisp/gnus/mml2015.el (mml2015-cache-passphrase)
+	(mml2015-passphrase-cache-expiry): Obsolete.
+	(mml2015-epg-secret-key-id-list): Remove variable.
+	(mml2015-epg-passphrase-callback, mml2015-epg-check-user-id)
+	(mml2015-epg-check-sub-key, mml2015-epg-find-usable-key)
+	(mml2015-epg-find-usable-secret-key): Remove functions.
+	(mml2015-epg-decrypt, mml2015-epg-clear-decrypt, mml2015-epg-sign)
+	(mml2015-epg-encrypt): Refactor.
+
+2016-01-02  Glenn Morris  
+
+	* lisp/progmodes/fortran.el (fortran-make-syntax-propertize-function):
+
+	Explicitly ignore case.  (Bug#22262)
+
+2016-01-02  Stefan Monnier  
+
+	(semantic-symref-derive-find-filepatterns): Return a list
+
+	* lisp/cedet/semantic/symref/grep.el
+	(semantic-symref-derive-find-filepatterns): Return a list.
+	(semantic-symref-perform-search): Quote the result here once and for all.
+
+2016-01-02  Eli Zaretskii  
+
+	Fix xref-find-references on MS-Windows
+
+	* lisp/cedet/semantic/symref/grep.el
+	(semantic-symref-derive-find-filepatterns): Use
+	'shell-quote-argument' instead of manually quoting in a way that
+	only works with Posix shells.  (Bug#22289)
+
+2016-01-02  Eli Zaretskii  
+
+	Document new features of tildify-mode
+
+	* lisp/textmodes/tildify.el (tildify-foreach-ignore-environments)
+	(tildify-mode): Spelling fixes in doc strings.
+
+	* etc/NEWS: Reformat the tildify-mode entry.
+
+2016-01-02  Eli Zaretskii  
+
+	Document new features of Whitespace mode
+
+	* doc/emacs/display.texi (Useless Whitespace): Document
+	'whitespace-toggle-options' and the new 'big-indent' style.
+	Document 'whitespace-big-indent-regexp'.  Document the Global
+	Whitespace mode.
+
+2016-01-02  Eli Zaretskii  
+
+	Improve documentation of new Hide-IfDef features
+
+	* etc/NEWS: Expand and reword Hide-IfDef section.
+
+2016-01-02  Leo Liu  
+
+	Fix regression in font-locking cl-assert and cl-check-type
+
+	* lisp/emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-2): Fix
+	  el-errs-re.
+
+2016-01-01  Paul Eggert  
+
+	Spelling and grammar fixes
+
+2016-01-01  Paul Eggert  
+
+	Fix copyright years by hand
+
+	These are dates that admin/update-copyright did not update, or
+	updated incorrectly.
+
+2016-01-01  Paul Eggert  
+
+	Update copyright year to 2016
+
+	Run admin/update-copyright.
+
+2016-01-01  Paul Eggert  
+
+	Merge from gnulib
+
+	This mostly just updates copyright dates of gnulib files.
+	It also updates to the latest version of texinfo.tex.
+
+2015-12-31  Mark Oteiza  
+
+	lisp/emacs-lisp/chart.el (chart-new-buffer): Move to silence byte compiler.
+
+2015-12-31  Mark Oteiza  
+
+	Port chart.el methods to cl-generic.
+
+	cl-call-next-method cannot be used inside EIEIO's defmethod.
+	* lisp/emacs-lisp/chart.el: Require cl-generic at compile time.
+	* lisp/emacs-lisp/chart.el (initialize-instance, chart-draw):
+	(chart-draw-title, chart-size-in-dir, chart-draw-axis):
+	(chart-axis-draw, chart-translate-xpos, chart-translate-ypos):
+	(chart-translate-namezone, chart-draw-data, chart-add-sequence):
+	(chart-trim, chart-sort): Use cl-defmethod instead of defmethod.
+
+2015-12-31  Brian Burns  
+
+	Add nt/INSTALL.W64 build instructions
+
+	* nt/INSTALL.W64: New file.
+	* nt/INSTALL: Point to INSTALL.W64 for 64-bit build instructions.
+
+2015-12-31  Joakim Jalap  
+
+	Add new input method 'programmer-dvorak'
+
+	* lisp/leim/quail/programmer-dvorak.el ("programmer-dvorak"): New
+	input method.
+
+	* etc/NEWS: Mention it.
+
+2015-12-31  Eli Zaretskii  
+
+	Allow to invoke original M-TAB binding in 'flyspell-prog-mode'
+
+	* lisp/textmodes/flyspell.el (flyspell-prog-mode): Record the
+	original M-TAB binding in a buffer-local variable.
+	(flyspell-auto-correct-word): Invoke the original binding of M-TAB
+	if that is recorded, when point is in a place where flyspell
+	should not be active (e.g., because the user turned on
+	'flyspell-prog-mode').  (Bug#18533)
+
+2015-12-31  Eli Zaretskii  
+
+	Fix EWW rendering of long RTL lines
+
+	* lisp/net/shr.el (shr-insert-document): Undo any previous hscroll
+	of the selected window before filling its lines.  (Bug#22250)
+
+2015-12-31  Vincent Belaïche  
+
+	fix  bug#21054
+
+	* ses.el (ses-check-curcell): Call `ses-set-curcell' unconditionally
+
+2015-12-31  YAMAMOTO Mitsuharu  
+
+	Clean up cairo printing code
+
+	* src/gtkutil.c (xg_get_page_setup): Use listn.
+	* src/xfns.c (Fx_export_frames, Fx_print_frames_dialog): Doc fix.  Use
+	decode_window_system_frame and FRAME_VISIBLE_P.
+	(Fx_print_frames_dialog): Use redisplay_preserve_echo_area instead
+	of Fdisplay.
+	* src/xterm.c (x_cr_export_frames): Use redisplay_preserve_echo_area
+	instead of Fdisplay.  Temporarily unblock_input around QUIT.
+
+2015-12-30  YAMAMOTO Mitsuharu  
+
+	Add handle_user_signal_hook
+
+	* src/keyboard.h (handle_user_signal_hook): New declaration.
+	* src/keyboard.c (handle_user_signal_hook): New variable.
+	(handle_user_signal): Call it.
+
+2015-12-30  YAMAMOTO Mitsuharu  
+
+	Avoid writing to purespace
+
+	* src/alloc.c (Fmake_string): Don't write to empty string contents.
+	(allocate_vector): Don't write to empty vector size.
+	* src/character.h (CHECK_CHARACTER_CAR, CHECK_CHARACTER_CDR):
+	Don't call unnecessary XSETCAR or XSETCDR.
+	* src/lisp.h (STRING_SET_UNIBYTE, STRING_SET_MULTIBYTE): Don't
+	write to empty string size_byte.
+
+2015-12-30  YAMAMOTO Mitsuharu  
+
+	Remove unused variable
+
+	* lisp/international/mule-cmds.el: Remove unused variable
+	`mac-system-coding-system'.
+
+2015-12-30  YAMAMOTO Mitsuharu  
+
+	* configure.ac: Find libxml2 headers in Xcode SDK dir on Darwin.
+
+2015-12-30  YAMAMOTO Mitsuharu  
+
+	Use posix_openpt instead of openpty on Darwin
+
+	* configure.ac (PTY_ITERATION, FIRST_PTY_LETTER, PTY_OPEN)
+	(PTY_NAME_SPRINTF, PTY_TTY_NAME_SPRINTF): Remove
+	Darwin-specific definitions.  Use posix_openpt instead.
+
+2015-12-30  Shakthi Kannan  
+
+	Document support for ':documentation' in Lisp mode
+
+	* lisp/emacs-lisp/lisp-mode.el (lisp-string-in-doc-position-p)
+	(lisp-string-after-doc-keyword-p)
+	(lisp-font-lock-syntactic-face-function): Add doc strings.
+
+2015-12-30  Shakthi Kannan  
+
+	Document new features of TeX mode
+
+	* doc/emacs/text.texi (TeX Print): Document
+	'tex-print-file-extension'.
+	* doc/emacs/programs.texi (Misc for Programs): Document support
+	for Prettify Symbols mode in TeX mode.
+
+2015-12-30  Eli Zaretskii  
+
+	Clarify docs of hscroll in RTL text
+
+	* doc/lispref/windows.texi (Horizontal Scrolling): Clarify the
+	meaning of a window's horizontal scroll amount for RTL paragraphs.
+
+2015-12-30  Eli Zaretskii  
+
+	Fix rendering of HTML pages that use character composition
+
+	* src/indent.c (Fvertical_motion): Fix the case when point starts
+	in the middle of a composition, as in shr-vertical-motion.
+	(Bug#22250)
+
+2015-12-30  Eli Zaretskii  
+
+	Avoid some compiler warnings in w32.c
+
+	* src/w32.c (codepage_for_filenames, crlf_to_lf)
+	(ansi_encode_filename, socket_to_fd, sys_write)
+	(check_windows_init_file): Avoid compiler warnings about
+	differences in pointer signedness.
+
+2015-12-29  Dmitry Gutov  
+
+	Undo ill-advised change
+
+	* lisp/progmodes/xref.el (xref-collect-matches): Undo
+	ill-advised change.  The hits come in the order that `find'
+	produces them in, which isn't alphabetical.
+
+2015-12-29  Dmitry Gutov  
+
+	Unbreak completion in python-mode buffers
+
+	* lisp/progmodes/python.el (python-shell-completion-at-point):
+	Unbreak in python-mode buffers.
+
+2016-01-09  Andrew Hyatt  
+
+	Adding example replies to bug-triage.
+
+	* admin/notes/bug-triage: Added example replies. Also, as requested,
+	  making the process notes into more of a checklist.
+
+2016-01-08  Andrew Hyatt  
+
+	Rename the notes/admin/triage file to bug-triage.
+
+	* CONTRIBUTE: Change reference to the triage file name.
+	* admin/notes/triage: Rename file to admin/notes/bug-triage.
+
+2016-01-07  Glenn Morris  
+
+	Allow creation of loaddefs files without timestamps.
+
+	* lisp/emacs-lisp/autoload.el (autoload-timestamps): New variable.
+	(autoload-generate-file-autoloads, update-directory-autoloads):
+	If autoload-timestamps is nil, write "t" instead of file timestamp.
+	(autoload-find-destination, update-directory-autoloads):
+	If timestamp is "t", use the modtime of the output file instead.
+
+2016-01-06  Glenn Morris  
+
+	Doc tweaks.
+
+	* lisp/calendar/cal-hebrew.el (diary-hebrew-list-entries):
+	* lisp/calendar/cal-iso.el (calendar-iso-to-absolute)
+	(calendar-iso-from-absolute):
+	* lisp/calendar/cal-tex.el (cal-tex-comment):
+	* lisp/calendar/solar.el (calendar-time-display-form): Doc tweaks.
+
+2016-01-06  Glenn Morris  
+
+	Build tweaks related to tags files.
+
+	* lib-src/Makefile.in (tagsfiles): New variable.
+	(TAGS): Also depend on the source files.  Use our own etags program.
+	* lisp/Makefile.in (ETAGS): Add EXEEXT.
+	(lisptagsfiles1, lisptagsfiles2, lisptagsfiles3, lisptagsfiles4):
+	Remove.
+	(tagsfiles): New, replacing lisptagsfiles1 etc.
+	Remove irrelevant source files here rather than in the TAGS rule.
+	(${ETAGS}): New rule.
+	(TAGS): Also depend on the etags executable.
+	* lwlib/Makefile.in (EXEEXT): New, set by configure.
+	(ETAGS): Add EXEEXT.
+	(${ETAGS}): New rule.
+	(ctagsfiles): Use "wildcard".
+	(TAGS): Also depend on the etags executable.
+	* nt/Makefile.in (ETAGS, tagsfiles): New variables.
+	(${ETAGS}): New rule.
+	(TAGS): Fix dependencies.
+	* oldXMenu/Makefile.in (EXEEXT): New, set by configure.
+	(ETAGS): New variable, replacing $TAGS.  Use our own etags program.
+	Remove "-t" argument.
+	(${ETAGS}): New rule.
+	(tagsfiles): New variable.
+	(TAGS): New rule, with proper dependencies.
+	* src/Makefile.in (ETAGS): Add EXEEXT.  Add a build rule.
+	(ctagsfiles1, ctagsfiles2): Use "wildcard".
+	(ctagsfiles3): Remove.
+	(TAGS): Depend on etags.
+	(../lisp/TAGS, $(lwlibdir)/TAGS): Let the rules in the relevant
+	directories decide if updates are needed.
+
+2016-01-06  Glenn Morris  
+
+	* lisp/Makefile.in (CAL_SRC): Skip calendar.el.
+
+2016-01-06  Glenn Morris  
+
+	* test/lisp/emacs-lisp/package-tests.el
+
+	(package-test-macro-compilation): Fixup branch merge.
+
+2016-01-05  Eli Zaretskii  
+
+	Fix fallout from merging emacs-25 branch in test/
+
+	* .gitignore: Update for the new place of biditest.txt.
+	* test/automated/: Directory removed.  All files moved to their
+	proper places.
+	* test/etags/: Directory removed.  All files moved to their proper
+	places.
+	* test/automated/url-parse-tests.el: File removed; it was an exact
+	copy of the same file in test/lisp/url/.
+	* test/automated/url-expand-tests.el: Moved to test/lisp/url/.
+
+2016-01-04  Paul Eggert  
+
+	Spelling fixes.
+
+2016-01-04  Daniel Colascione  
+
+	Let users disable unsafe signal handling code
+
+	* src/keyboard.c (syms_of_keyboard): New user variables
+	`attempt-stack-overflow-recovery' and
+	`attempt-orderly-shutdown-on-fatal-signal'.
+	* src/sysdep.c (stack_overflow): Check
+	`attempt-stack-overflow-recovery'.
+	* src/emacs.c (terminate_due_to_signal): Check
+	`attempt-orderly-shutdown-on-fatal-signal'.
+
+2016-01-03  Michael Albinus  
+
+	* configure.ac: Add error message for gfile on Nextstep.
+
+2016-01-03  John Wiegley  
+
+	Merge branch 'emacs-25-merge'
+
+2016-01-02  Vincent Belaïche  
+
+	Align textually on fix done for emacs-25 branch for bug#21054
+
+	* lisp/ses.el (ses-check-curcell): Suppress ``temporary fix'' comment,
+	and useless `(if t ...)' in order to align textually on fix done for
+	emacs-25 branch for bug#21054.
+
+2016-01-02  K. Handa  
+
+	support rendering of wider range of combinging characters by ftfont backend
+
+	* lisp/language/hebrew.el (hebrew-shape-gstring): If the font backend
+	supports rendering of combining characters, call
+	font-shape-gstring.
+
+	* src/font.c (Ffont_get): Handle `combining-capability' property.
+	(syms_of_font): New symbol ":combining-capability'.
+
+	* src/font.h (struct font_driver): New member combining_capability.
+
+	* src/ftfont.c: Include "category.h".
+	(ftfont_driver): Initialize combining_capability to
+	ftfont_combining_capability.
+	(ftfont_shape_by_flt): If OTF is null, try to find a suitable
+	FLT in advance.
+	(ftfont_combining_capability): New function.
+
+2016-01-01  Andrew Hyatt  
+
+	Add notes on bug triage procedure
+
+	* CONTRIBUTE: In section on the issue tracker, point to new triage file.
+	* admin/notes/triage: New file explaining triage procedure.
+
+2015-12-30  Vincent Belaïche  
+
+	Correct ses-rename-cell cursor-intangible text prop updating.
+
+	There were two problems:
+
+	- First ses-rename-cell has to work when called non interactively
+	  (with non-nil CELL argument), so in this case the start pos of
+	  put-text-property cannot be plainly (point), you need a
+	  ses-goto-print call before
+
+	- Second, the range itself was computed erronously, only the first
+	  char was affected instead of the full cell width. This was not
+	  noticeable prior to changes (Deprecate `intangible' and
+	  `point-entered' properties) made by Stefan on 2015-04-13T19:51:15Z
+
+	* lisp/ses.el (ses-rename-cell): Correct computation of position range
+	to which the 'cursor-intangible text property has to be set to cell
+	new name.
+
+2015-12-30  Vincent Belaïche  
+
+	Don't fake empty cells value by "" when printing with a lambda.
+
+	When using a lambda expression printer function the user should be
+	free to format differently a really empty cell, ie. containing nil,
+	from a cell containing an empty string "".
+
+	* ses.el (ses-call-printer): Replace `(or value "")' by just `value'
+	in the case of a lambda expression printer function.
+
+	* ses.texi (Printer functions): Add example and description about
+	lambda expression printer function handling all the possible values,
+	including unexpected ones.
+
+2015-12-30  Vincent Belaïche  
+
+	Quick temporary hack to fix curcell refreshing.
+
+	The problem was caused by change: 2015-04-13 Deprecate `intangible'
+	and `point-entered' properties. The problem is that this change has
+	removed the (setq ses--curcell t) setting in the ses-command-hook
+	function.
+
+	* ses.el (ses-check-curcell): replace `(eq ses--curcell t)' by just `t' as
+	a condition to call function `ses-set-curcell'. Comment this as a quick
+	temporary hack to make it work, as I don't know yet whether a definite
+	correction would be to make the ses-set-curcell at every ses-check-curcell,
+	or to revert to the previous approach, ie marking ses--curcell as out-of-date
+	at every potentially cursor motion command.
+
+2015-12-30  Lars Magne Ingebrigtsen  
+
+	Restrictive URL checking tweaks
+
+	* lisp/net/eww.el (eww): Check whether the domain is
+	restrictive instead of the string
+	(http://македонија.icom.museum is restrictive even if each
+	part is from a different script).
+
+2015-12-30  Lars Magne Ingebrigtsen  
+
+	New function `puny-highly-restrictive-domain-p'
+
+	* lisp/net/puny.el (puny-highly-restrictive-string-p): Rename.
+	(puny-highly-restrictive-domain-p): New function.
+
+2015-12-30  Lars Magne Ingebrigtsen  
+
+	eww build fix (require puny)
+
+2015-12-30  Lars Magne Ingebrigtsen  
+
+	Transform non-restrictive domains to punycode for display
+
+	* lisp/net/eww.el (eww): Check whether the domain is Highly
+	Restrictive in the Unicode IDNA sense.
+
+2015-12-30  John Wiegley  
+
+	Merge emacs-25 into master (using imerge)
+
+2015-12-29  Eli Zaretskii  
+
+	Fix typos in CC Mode manual
+
+	* doc/misc/cc-mode.texi (c-offsets-alist, Style Variables): Fix
+	typos.  (Bug#22267)
+
+2015-12-29  Eli Zaretskii  
+
+	Avoid assertion violations in compact_font_cache_entry
+
+	* src/alloc.c (compact_font_cache_entry): Don't use VECTORP to
+	avoid assertion violation in ASIZE.  (Bug#22263)
+
+2015-12-29  Eli Zaretskii  
+
+	Fix filling text with bidirectional characters in shr.el
+
+	* lisp/net/shr.el (shr-insert-document): Bind
+	bidi-display-reordering to nil while filling lines.  This is
+	required for when a line includes characters whose bidi
+	directionality is opposite to the base paragraph direction,
+	because columns are counted in the logical order.  (Bug#22250)
+
+2015-12-29  Lars Ingebrigtsen  
+
+	Further Unicode restrictive fixups
+
+	* puny.el (puny-highly-restrictive-p): Include the extra
+	identifier characters from table 3.
+
+2015-12-29  Martin Rudalics  
+
+	* src/xfns.c (x_create_tip_frame): Process alpha parameter.
+
+2015-12-29  Michael Albinus  
+
+	Sync with Tramp 2.2.13
+
+	* doc/misc/trampver.texi: Change version to "2.2.13.25.1".
+
+	* lisp/net/tramp-compat.el (tramp-compat-delete-dups):
+	Use `tramp-compat-funcall'.
+
+	* lisp/net/tramp-gvfs.el (tramp-gvfs-parse-device-names):
+	Make `split-string' call compatible with older Emacsen.
+
+	* lisp/net/trampver.el: Change version to "2.2.13.25.1".
+
+2015-12-29  Lambda Coder  
+
+	* doc/misc/tramp.texi: Editorial revisions to the Tramp manual
+
+2015-12-29  Lars Ingebrigtsen  
+
+	Mention that tls.el is secure by default, and will fail
+
+2015-12-29  Lars Ingebrigtsen  
+
+	Make tls.el use trustfiles by default
+
+	* lisp/net/tls.el (tls-program): Add a certfile by default (bug#21227).
+	(open-tls-stream): Insert the trustfile by looking at
+	`gnutls-trustfiles'.
+
+2015-12-29  Lars Ingebrigtsen  
+
+	Refactor out gnutls-trustfiles
+
+	* lisp/net/gnutls.el (gnutls-trustfiles): Refactor out for reuse by tls.el.
+
+2015-12-29  Lars Ingebrigtsen  
+
+	Remove --insecure from gnutls-cli invocation
+
+	* tls.el (tls-program): Default to using secure TLS
+	connections (bug#19284).
+
+2015-12-29  Lars Ingebrigtsen  
+
+	Add a new function to say whether a string is restrictive
+
+	* puny.el (puny-highly-restrictive-p): New function.
+
+2015-12-28  Paul Eggert  
+
+	Spelling fix
+
+2015-12-28  Paul Eggert  
+
+	Port report-emacs-bug to deterministic builds
+
+	* lisp/mail/emacsbug.el (report-emacs-bug): Future-proof the
+	recent "built on" change to deterministic builds where
+	emacs-build-system will be nil.  See:
+	http://lists.gnu.org/archive/html/emacs-devel/2015-12/msg01369.html
+
+2015-12-28  Jose A. Ortega Ruiz    (tiny change)
+
+	Fix URL auth error message
+
+	* lisp/url/url-http.el (url-http-handle-authentication): Make the error
+	message more correct (bug#20069).
+
+2015-12-28  Lars Ingebrigtsen  
+
+	Mention the new puny.el library
+
+2015-12-28  Lars Ingebrigtsen  
+
+	IDNA-related fixes for the URL library
+
+	* lisp/url/url-http.el (url-http-create-request): IDNA-encode
+	the Host: header.
+
+	* lisp/url/url-util.el (url-encode-url): Don't hex-encode
+	domain names, but leave them as UTF-8, so that they can be
+	IDNA-encoded later when contacting the host.
+
+2015-12-28  Lars Ingebrigtsen  
+
+	IDNA-encode all domain names in `open-network-stream'
+
+	* network-stream.el (open-network-stream)
+	(network-stream-open-plain, network-stream-open-starttls):
+	IDNA-encode all domain names, if needed.
+
+2015-12-28  Lars Ingebrigtsen  
+
+	Fix puny-encoding all-non-ASCII domains
+
+	* puny.el (puny-encode-string): Fix the all-non-ASCII encoding case.
+
+2015-12-28  Lars Ingebrigtsen  
+
+	* lisp/net/shr.el (shr-next-link): Don't bug out on adjacent links.
+
+2015-12-28  Tom Tromey  
+
+	set :safe on css-indent-offset
+
+	* lisp/textmodes/css-mode.el (css-indent-offset): Add :safe 'integerp.
+
+2015-12-28  Lars Ingebrigtsen  
+
+	* eww.el (eww-mode): Remove superfluous bidi reset.
+
+2015-12-28  James Stout    (tiny change)
+
+	Make chunked encoding trailer detection more compliant
+
+	* lisp/url/url-http.el
+	(url-http-chunked-encoding-after-change-function): Make
+	trailer detection more compliant (bug#16345).
+
+2015-12-28  Lars Ingebrigtsen  
+
+	Reconnect erc even on server errors
+
+	* lisp/erc/erc-backend.el (erc-server-reconnect-p): Try to
+	reconnect even if a server error has occurred (bug#18527).
+
+2015-12-28  Lars Ingebrigtsen  
+
+	Fix punycode short circuit logic
+
+	* puny.el (puny-encode-domain): Fix short-circuit logic.
+
+2015-12-28  Martin Rudalics  
+
+	Fix Bug#10873 in `report-emacs-bug'
+
+	* lisp/mail/emacsbug.el (report-emacs-bug): If
+	`report-emacs-bug-no-explanations' is nil, make sure we can show
+	mail and warnings buffer on this frame (Bug#10873).
+
+2015-12-28  Lars Ingebrigtsen  
+
+	IDNA speed up
+
+	* puny.el (puny-encode-domain): Make the common non-IDNA case faster
+
+2015-12-28  Lars Ingebrigtsen  
+
+	Add IDNA domain encode/decode functions
+
+	* puny.el (puny-decode-domain): New function.
+	(puny-encode-domain): Ditto.
+	(puny-decode-digit): Fix digit decoding error.
+
+2015-12-28  Lars Ingebrigtsen  
+
+	Rename idna.el to puny.el
+
+	* puny.el: Renamed from idna.el to avoid name collisions with
+	the external idna.el library.
+
+2015-12-28  Lars Ingebrigtsen  
+
+	Always reset the bidi direction
+
+	* eww.el (eww-display-html): Always reset the bidi direction
+	to `left-to-right' (bug#22257).
+
+2015-12-28  Alan Mackenzie  
+
+	Allow line comments ending with escaped NL to be continued to the next line.
+
+	Use this in C, C++, and Objective C Modes.  Fixes bug#22246
+
+	* src/syntax.c (comment-end-can-be-escaped): New buffer local variable.
+	(forw-comment, back-comment): On encountering an end of comment character,
+	test whether it is escaped when `comment-end-can-be-escaped' is non-nil.
+
+	* doc/lispref/syntax.texi (Control Parsing): Describe
+	`comment-end-can-be-escaped'.
+
+	* etc/NEWS (Lisp Changes): Describe `comment-end-can-be-escaped'.
+
+	* lisp/progmodes/cc-langs.el: New c-lang-setvar `comment-end-can-be-escaped'.
+
+2015-12-28  Katsumi Yamaoka  
+
+	lisp/gnus/mml-sec.el (mml-secure-bcc-is-safe): Keep old Emacsen compatibility
+
+	* lisp/gnus/mml-sec.el (mml-secure-bcc-is-safe):
+	Don't use split-string with 4th arg for old Emacsen compatibility.
+
+2015-12-27  Dmitry Gutov  
+
+	Rename project-library-roots to project-external-roots
+
+	* lisp/progmodes/project.el (project-library-roots): Rename to
+	project-external-roots.
+	(project-library-roots-function): Rename to
+	project-vc-external-roots-function.  Only use it in the VC
+	backend, for now.  Update project-external-roots accordingly.
+	(project-vc-library-roots): Remove.
+	(project-or-libraries-find-regexp):
+	Rename to project-or-external-find-regexp.
+
+	* lisp/progmodes/elisp-mode.el (elisp-library-roots):
+	Rename to elisp-load-path-roots.
+
+	* lisp/progmodes/etags.el (etags-library-roots): Remove.  Use
+	an anonymous function for the default value of
+	project-vc-external-roots-function.
+
+2015-12-27  Lars Ingebrigtsen  
+
+	* idna.el (idna-decode-string-internal): Implement decoding.
+
+2015-12-27  Lars Ingebrigtsen  
+
+	Further IDNA tweaks
+
+	(idna-encode-string): Make idna-encode-string safe for
+	non-ASCII use.
+
+2015-12-27  Lars Ingebrigtsen  
+
+	Clean up the code slightly
+
+2015-12-27  Lars Ingebrigtsen  
+
+	Added basic idna encoding support
+
+	* lisp/net/idna.el: New file.
+
+2015-12-27  Vivek Dasmohapatra  
+
+	Disconnection fixes for erc
+
+	* lisp/erc/erc-backend.el (erc-server-reconnect-p): Don't
+	reconnect if the user has disconnected explicitly (bug#4589).
+
+2015-12-27  Thomas Riccardi    (tiny change)
+
+	Further erc asynch fixes
+
+	* lisp/erc/erc-backend.el (erc-process-sentinel-2): Make
+	erc-server-connect to return even if the connection is not
+	ready.  Then erc-open and erc-server-reconnect do the
+	same. (bug#5650).
+
+2015-12-27  Vivek Dasmohapatra  
+
+	Make erc connect asynchronously
+
+	* lisp/erc/erc-backend.el (erc-server-reconnect): Use it to
+	reconnect asynchronously.
+
+	* lisp/erc/erc-backend.el (erc-open-network-stream): New function (bug#5650).
+
+2015-12-27  Deniz Dogan  
+
+	Clear erc user list upon disconnection
+
+	* lisp/erc/erc-backend.el (erc-process-sentinel): Clear channel user
+	lists upon disconnection.  This prevents invalid channel
+	user lists when reconnecting (bug#10947).
+
+2015-12-27  Lars Ingebrigtsen  
+
+	Don't bug out in erc after waking from sleep
+
+	* erc-backend.el (erc-server-send-ping): If the server has
+	closed connection, this may already have been detected and
+	`erc-server-last-received-time' has been set to nil (bug#13608).
+
+2015-12-27  David Edmondson  
+
+	Proxy error in erc with multiple clients
+
+	* lisp/erc/erc.el (erc-channel-receive-names): Fix errors
+	generated when multiple IRC clients talk to a single IRC proxy
+	(bug#19034).
+
+2015-12-27  Dima Kogan  
+
+	Ensure that we don't have several timers in erc
+
+	* lisp/erc/erc-backend.el (erc-server-setup-periodical-ping): Checks
+	for existing timers in the alist before adding new ones.  If a
+	timer already exists, it is cancelled and
+	overwritten. (bug#19292).
+
+2015-12-27  Jens Lechtenboerger  
+
+	* lisp/gnus/mml-sec.el: Fix warnings by adding autoloads
+	(bug#18718).
+
+2015-12-27  Lars Ingebrigtsen  
+
+	* lisp/erc/erc-log.el (erc-log-setup-logging): Insert the previous log
+	at the start of the buffer, not at the end (bug#20496).
+
+2015-12-27  Lars Ingebrigtsen  
+
+	* lisp/net/eww.el (eww-setup-buffer): Restore left-to-right defaults.
+
+2015-12-27  Lars Ingebrigtsen  
+
+	Don't join erc channels doubly
+
+	* erc-join.el (erc-autojoin-channels): Don't join channels
+	more than once (if you have several nicks) (bug#20695).
+
+2015-12-27  Eli Zaretskii  
+
+	Avoid leaving "ghost" of mouse pointer on MS-Windows
+
+	* src/w32term.c (frame_set_mouse_pixel_position):
+	* src/w32fns.c (Fw32_mouse_absolute_pixel_position): Momentarily
+	disable "mouse trails" when moving the mouse pointer.  (Bug#22247)
+	* src/w32term.c (frame_set_mouse_pixel_position): Include
+	w32common.h.
+
+2015-12-27  Lars Ingebrigtsen  
+
+	* lisp/gnus/mml-sec.el (mml-secure-bcc-is-safe): Fix typo in last check-in.
+
+2015-12-27  Jens Lechtenboerger  
+
+	Identify unsafe combinations of Bcc and encryption
+
+	* lisp/gnus/gnus-util.el (gnus-subsetp): New function
+	* lisp/gnus/mml-sec.el (mml-secure-safe-bcc-list): New variable
+	* lisp/gnus/mml-sec.el (mml-secure-bcc-is-safe): New function
+
+2015-12-27  Krzysztof Jurewicz    (tiny change)
+
+	Fix auth source lookups from erc with port numbers
+
+	* lisp/erc/erc.el (erc-open): `auth-source' wants strings, not port
+	numbers (bug#20541).
+
+2015-12-27  Fran Litterio  
+
+	Run erc-kill-channel-hook always on exit
+
+	* lisp/erc/erc.el (erc-kill-buffer-function): Run erc-kill-channel-hook
+	when erc-kill-queries-on-quit is set (bug#21187).
+
+2015-12-26  Paul Eggert  
+
+	Spelling fix
+
+	* test/automated/url-parse-tests.el:
+	(url-generic-parse-url/same-document-reference):
+	Rename from url-generic-parse-url/same-decument-reference.
+
+2015-12-26  Paul Eggert  
+
+	Reword initial *scratch* for brevity, appearance
+
+	* lisp/startup.el (initial-scratch-message):
+	Reword to avoid apostrophes, and to make it shorter.
+	See the thread starting in:
+	http://lists.gnu.org/archive/html/emacs-devel/2015-12/msg01241.html
+
+2015-12-26  Leo Liu  
+
+	Add ert-deftest to lisp-mode.el
+
+	* lisp-mode.el (lisp-imenu-generic-expression,
+	  lisp-el-font-lock-keywords-1): Add ert-deftest.
+
+2015-12-26  Lars Ingebrigtsen  
+
+	Mark imap changes as not needing doc changes
+
+	* imap.el (imap-ssl-open): Remove
+
+2015-12-26  Lars Ingebrigtsen  
+
+	Use built-in encryption in imap.el
+
+	* lisp/net/imap.el (imap-ssl-program): Remove (bug#21134).
+	(imap-starttls-open): Use open-network-stream instead of starttls.el.
+	(imap-tls-open): Use open-network-stream instead of tls.el.
+
+2015-12-26  Eli Zaretskii  
+
+	Don't try using /bin/sh in artist.el on MS-Windows
+
+	* lisp/textmodes/artist.el (artist-figlet-get-font-list-windows):
+	New function.
+	(artist-figlet-choose-font): Use it on MS-Windows and MS-DOS.
+	(Bug#20167)
+
+2015-12-26  Wolfgang Jenkner  
+
+	Always define gmalloc etc. in src/gmalloc.c
+
+	This is a work-around to prevent the compiler from using semantic
+	knowledge about malloc for optimization purposes.  E.g., gcc 5.2
+	with -O2 replaces most of calloc's definition by a call to calloc;
+	see Bug#22085.
+	* src/gmalloc.c [!HYBRID_MALLOC] (malloc, realloc, calloc)
+	(aligned_alloc, free): Do not undef.  Instead, define these as
+	functions (perhaps renamed to gmalloc etc.) in terms of gmalloc etc.
+
+2015-12-26  Eli Zaretskii  
+
+	Fix documentation of browse-url browser-related functions
+
+	* lisp/net/browse-url.el (browse-url)
+	(browse-url-default-browser, browse-url-default-windows-browser)
+	(browse-url-default-macosx-browser, browse-url-chromium)
+	(browse-url-kde, browse-url-text-xterm): Clarify the usage of ARGS
+	and NEW-WINDOW arguments in these functions.  (Bug#19421)
+
+2015-12-26  Paul Eggert  
+
+	Propagate Bug#14412 fix to backtrace_eval_unrewind
+
+	* src/eval.c (unbind_to): Redo so that the FALLTHROUGH!! comment
+	becomes accurate again. This shouldn’t affect behavior.
+	(backtrace_eval_unrewind): Apply the recent unbind_to fix here, too.
+
+2015-12-26  Eli Zaretskii  
+
+	Don't produce non-ASCII characters in *scratch*
+
+	* lisp/startup.el (initial-scratch-message): Quote apostrophes to
+	avoid producing non-ASCII characters in the *scratch* buffer's
+	commentary.
+
+2015-12-26  Eli Zaretskii  
+
+	Document changes in 'compare-windows'
+
+	* lisp/vc/compare-w.el (compare-windows-removed)
+	(compare-windows-added): Doc fix.
+
+	* doc/emacs/files.texi (Comparing Files): Document the changes in
+	window selection by 'compare-windows'.
+
+2015-12-26  Eli Zaretskii  
+
+	Document 'vc-annotate-background-mode'
+
+	* doc/emacs/maintaining.texi (Old Revisions): Document
+	'vc-annotate-background-mode'.
+
+2015-12-26  Eli Zaretskii  
+
+	Document 'vc-region-history'
+
+	* doc/emacs/maintaining.texi (VC Change Log): Document
+	'vc-region-history'.
+
+2015-12-26  Eli Zaretskii  
+
+	Improve documentation of 'vc-push'
+
+	* doc/emacs/maintaining.texi (Pulling / Pushing): Expand and
+	improve the documentation of 'vc-push'.
+
+	* lisp/vc/vc.el (vc-pull, vc-push): Doc fix.
+
+2015-12-26  Alain Schneble  
+
+	Include the tests for the URL parsing fixes
+
+2015-12-26  Eli Zaretskii  
+
+	Document 'url-user-agent'.
+
+	* lisp/url/url-http.el (url-user-agent): Move from here...
+	* lisp/url/url-vars.el (url-user-agent): ...to here.  This is to
+	keep all the URL defcustoms in one place, and also have it defined
+	whenever the URL library is loaded.
+
+	* doc/misc/url.texi (Customization): Document 'url-user-agent'.
+
+2015-12-26  Eli Zaretskii  
+
+	Document protocols supported by URL library via Tramp
+
+	* doc/misc/url.texi (Tramp): New node, describes the URL schemes
+	supported via Tramp.
+	(Supported URL Types, file/ftp, rlogin/telnet/tn3270): Mention
+	Tramp.
+
+2015-12-26  Eli Zaretskii  
+
+	Document changes in Shell-script mode
+
+	* lisp/progmodes/sh-script.el (sh-mode, sh-set-shell): Document
+	the 'sh-shell' file-local variable.
+	(top level): Add an auto-load form to avoid byte-compiler warning
+	about 'comint-send-string'.
+
+2015-12-26  Eli Zaretskii  
+
+	Fix documentation of 'ses-define-local-printer'
+
+	* doc/misc/ses.texi (Printer functions): Fix whitespace between
+	sentences and punctuation.  Add an index entry for
+	'ses-define-local-printer'.
+
+2015-12-26  Shakthi Kannan  
+
+	Document 'ert-summarize-tests-batch-and-exit'
+
+	* doc/misc/ert.texi (Running Tests in Batch Mode): Document
+	'ert-summarize-tests-batch-and-exit'.
+
+2015-12-26  Eli Zaretskii  
+
+	Avoid assertion violation in unbind_to
+
+	* src/eval.c (unbind_to) : Avoid assertion violation
+	if we get here with an object that is not a symbol.  (Bug#14412)
+
+2015-12-25  Andreas Schwab  
+
+	Don't treat /foo/bar:mumble as ange-ftp address
+	* lisp/net/browse-url.el (browse-url-filename-alist): Match colons
+	only in the first component.  (bug#5362)
+
+2015-12-25  Eli Zaretskii  
+
+	Make sure *scratch* etc. use forward slashes in its default-directory
+
+	* lisp/startup.el (normal-top-level): On MS-Windows, convert
+	backslashes to forward slashes while decoding default-directory
+	of the initially-created buffers.
+
+2015-12-25  Eli Zaretskii  
+
+	Restore info about the build host in bug reports
+
+	* lisp/mail/emacsbug.el (report-emacs-bug): Report the system on
+	which Emacs was built.  This is important information for
+	investigating bug reports reported by users who don't build their
+	Emacs.
+
+2015-12-25  Eli Zaretskii  
+
+	Fix bootstrap broken by changes related to OS X file-name encoding
+
+	* lisp/international/ucs-normalize.el (eval-when-compile): Make
+	sure char-code-property-alist includes elements that allow access
+	to 'decomposition' and 'canonical-combining-class' Unicode
+	properties, as compiling ucs-normalize.el requires that.
+	* lisp/loadup.el (featurep 'ns): Load ucs-normalize and ns-win
+	only of charprop.el was already loaded.
+
+	* src/Makefile.in ($(lispsource)/international/ucs-normalize.elc):
+	New order-only dependency.
+
+2015-12-25  Leo Liu  
+
+	* lisp/ido.el (ido-add-virtual-buffers-to-list):
+	Use bookmark-get-filename.
+
+2015-12-25  Michael Albinus  
+
+	Make tramp-test29-vc-registered more robust
+
+	* test/automated/tramp-tests.el (tramp-test29-vc-registered):
+	Move `bzr' case down.  Skip test when `vc-create-repo' fails.
+	Remove instrumentation.
+
+2015-12-24  YAMAMOTO Mitsuharu  
+
+	* lisp/term/x-win.el (x-gtk-stock-map): Fix typo.
+
+2015-12-23  Katsumi Yamaoka  
+
+	Fix `gnus-union' so as to behave like `cl-union'
+
+	* lisp/gnus/gnus-group.el (gnus-group-prepare-flat):
+	Make gnus-union use `equal' to compare items in lists.
+
+	* lisp/gnus/gnus-util.el (gnus-union):
+	Make it behave like cl-union partially.
+
+2015-12-23  Paul Eggert  
+
+	Fix dired.c typo with ptrdiff_t vs Lisp_Object
+
+	* src/dired.c (file_name_completion): Don't assume Lisp_Object is
+	an integer type, fixing a problem introduced in the recent fix for
+	Bug#22169.
+
+2015-12-23  Eli Zaretskii  
+
+	Document default process sentinel more prominently
+
+	* doc/lispref/processes.texi (Asynchronous Processes): Mention the
+	defaults for process filter and sentinel.  Provide cross-references.
+	(Process Information): Provide cross-references to where filters
+	and sentinels are described.
+	(Filter Functions): Add an index entry for "default filter".
+	(Sentinels): Add a few status messages not documented previously.
+	Resolve the "killed" confusion.  Document and describe the default
+	sentinel.  (Bug#22220)
+
+2015-12-23  Eli Zaretskii  
+
+	Fix file-name completion on OS X
+
+	* src/dired.c (file_name_completion): Reject false matches due to
+	file-name-coding-systems that decompose characters when encoding
+	file names, by comparing decoded file names as well.  (Bug#22169)
+	(syms_of_dired) : New DEFSYM.
+
+	* lisp/international/ucs-normalize.el (utf-8-hfs): Give it a
+	non-nil 'decomposed-characters' property.
+
+2015-12-23  Anders Lindgren  
+
+	File-name completion of non-ASCII characters on OS X (bug#22169)
+
+	The coding system `utf-8-nfd', locally defined in ns-win.el,
+	didn't provide a :pre-write-conversion method, causing file name
+	completion of non-ASCII characters to fail.  Solved by using the
+	`utf-8-hfs' coding system provided by `ucs-normalize'.
+
+	* lisp/loadup.el: Load international/ucs-normalize (when building
+	for ns).
+
+	* lisp/term/ns-win.el (utf-8-nfd): Made `utf-8-nfd' as alias for
+	`utf-8-hfs' and removed the old implementation.  Set `utf-8-hfs'
+	as the file name coding system.
+
+	* src/nsfns.m (ns-convert-utf8-nfd-to-nfc): Removed.
+
+2015-12-22  Tom Tromey  
+
+	Fix bug #18588 by making bug-reference-bug-regexp more lenient
+
+	* lisp/progmodes/bug-reference.el (bug-reference-bug-regexp): Accept
+	"bug NNNN".  (Bug #18588)
+
+2015-12-22  Tom Tromey  
+
+	add some cl-* aliases to lisp-mode imenu
+
+	* (lisp-imenu-generic-expression): Add cl-define-compiler-macro,
+	cl-defgeneric, and cl-defmethod.
+
+2015-12-22  Tom Tromey  
+
+	Make a variable buffer-local
+
+	* lisp/generic-x.el (generic-rul-mode-setup-function): Make
+	font-lock-syntax-table buffer-local.  (Bug #21627)
+
+2015-12-22  Eli Zaretskii  
+
+	Fix decoding of text in URLs retrieved by EWW
+
+	* lisp/net/eww.el (eww-render): Pass 'charset' to
+	'eww-display-raw'.  Use the value of 'last-coding-system-used', if
+	non-nil, to set 'buffer-file-coding-system' of the buffer where we
+	show the URL.
+	(eww-display-html, eww-display-raw): Decode the text correctly,
+	using the charset found in the headers, and defaulting to UTF-8.
+	If the user told us to use a specific encoding, override the
+	charset from the headers.  (Bug#22222)
+
+2015-12-22  Alan Mackenzie  
+
+	Fix a coding error in c-forward-<>-arglist-recur.  Fixes bug#22156
+
+	* lisp/progmodes/cc-engine.el (c-forward-<>-arglist-recur): Remove unused
+	variable `tmp'.
+	After a failed search for a matching ">", restore point before continuing.
+
+2015-12-22  Michael Albinus  
+
+	Instrument Tramp tests
+
+	* test/automated/tramp-tests.el (tramp-test29-vc-registered)
+	(tramp--test-utf8): Instrument tests.
+
+2015-12-22  Martin Rudalics  
+
+	Fix `display-buffer' call in `display-message-or-buffer' (Bug#22221)
+
+	* lisp/simple.el (display-message-or-buffer): Call
+	`display-buffer' with ACTION instead of NOT-THIS-WINDOW
+	(Bug#22221).
+
+2015-12-21  Juri Linkov  
+
+	* lisp/saveplace.el (toggle-save-place, save-place-to-alist)
+
+	(save-places-to-alist, save-place-dired-hook):
+	Check for dired-subdir-alist.  (Bug#19851)
+
+2015-12-21  Paul Eggert  
+
+	Add FIXME comment re stack overflow and modules
+
+2015-12-20  Paul Eggert  
+
+	Revert some recent emacs-module commentary
+
+	Most of the recently-added commentary was incorrect, due to the
+	possibility of stack overflow.
+
+2015-12-20  Paul Eggert  
+
+	Spelling fix: prefer "cooperate" to "co-operate"
+
+2015-12-20  Paul Eggert  
+
+	Port undo fixes to -fno-common
+
+	Port recent fix for Bug#21968 to platforms like 'gcc -fno-common'.
+	* src/keyboard.c, src/keyboard.h (point_before_last_command_or_undo)
+	(buffer_before_last_command_or_undo):
+	Declare in keyboard.h, and define in keyboard.c,
+	instead of assuming the traditional Unix relaxed ref-def linkage.
+
+2015-12-20  Philipp Stephani  
+
+	Improve commentary for emacs-module.c
+
+	* src/lisp.h: Document emacs-module.c assumptions about EQ and NILP.
+	* src/emacs-module.c (module_non_local_exit_get): Document that we
+	cannot use the current implementation.
+	(module_is_not_nil, module_eq): Document assumptions about EQ and
+	NILP.
+
+2015-12-20  Michael Albinus  
+
+	Suppress test on Mac OS X
+
+	* test/automated/tramp-tests.el (tramp--test-darwin-p): New defun.
+	(tramp--test-utf8): Use it.
+
+2015-12-20  Alan Mackenzie  
+
+	Merge branch 'scratch/follow' into emacs-25
+
+	This allows Isearch, etc., to work well when Follow Mode is active.
+
+2015-12-19  Michael Albinus  
+
+	* lisp/net/tramp-sh.el (tramp-get-ls-command-with-w-option):
+	Improve check.
+
+2015-12-19  Eli Zaretskii  
+
+	Fix last commit
+
+	* doc/emacs/rmail.texi (Rmail Deletion): Document new behavior of 'u'
+	with numeric argument.
+
+2015-12-19  Eli Zaretskii  
+
+	Document new features of Rmail
+
+	* doc/emacs/rmail.texi (Rmail Summary Edit, Rmail Deletion):
+	Document new behavior of 'd' and 'C-d' with numeric argument.
+	(Rmail Display): Document the rendering of HTML MIME parts.
+
+2015-12-19  Eli Zaretskii  
+
+	Improve documentation of new cl-lib functions
+
+	* doc/misc/cl.texi (Predicates on Numbers, Numerical Functions):
+	Fix wording.
+
+2015-12-19  Eli Zaretskii  
+
+	Document the new feature of 'minibuffer-with-setup-hook'
+
+	* lisp/files.el (minibuffer-with-setup-hook): Clarify how FUN is
+	added to `minibuffer-setup-hook'.
+
+2015-12-19  Eli Zaretskii  
+
+	Document new features of Font Lock
+
+	* doc/lispref/modes.texi (Other Font Lock Variables): Document
+	'font-lock-flush-function' and 'font-lock-ensure-function'.
+	(Font Lock Basics): Document the basic fontification functions
+	referenced in "Other Font Lock Variables".
+
+	* lisp/font-lock.el (font-lock-flush, font-lock-ensure): Doc fix.
+
+2015-12-19  Eli Zaretskii  
+
+	Document new features of Rectangle mode
+
+	* doc/emacs/killing.texi (Rectangles): Document "C-x C-x" in
+	rectangle-mark-mode.
+
+2015-12-19  Eli Zaretskii  
+
+	Manual followup to last change
+
+	* doc/lispref/display.texi (Displaying Messages): Sync with the
+	doc string.  (Bug#22210)
+
+2015-12-19  Eli Zaretskii  
+
+	Clarify doc string of 'display-message-or-buffer'
+
+	* lisp/simple.el (display-message-or-buffer): Doc fix.  Suggested
+	by Sebastian Wiesner .  (Bug#22210)
+
+2015-12-19  Eli Zaretskii  
+
+	* doc/emacs/emacs.texi (Top): Update top-level menus.
+
+	* doc/lispref/elisp.texi (Top): Update top-level menus.
+
+2015-12-19  Eli Zaretskii  
+
+	Document how to avoid file-local variables that aren't
+
+	* doc/emacs/custom.texi (Specifying File Variables): Describe how
+	to prevent Emacs from interpreting unrelated text as file-local
+	variables.  (Bug#22166)
+
+2015-12-19  Dave Thomas    (tiny change)
+
+	Fix a typo in eterm-color's termcap entry
+
+	* lisp/term.el (term-termcap-format): Fix a typo in the "ue="
+	entry.  (Bug#22184)
+
+2015-12-19  Eli Zaretskii  
+
+	Allow 'browse-url-emacs' visit non-existent URLs
+
+	* lisp/url/url-handlers.el (url-insert-file-contents): Don't
+	signal an error if VISIT is non-nil, to more faithfully emulate
+	the behavior of 'insert-file-contents'.  (Bug#22160)
+
+2015-12-18  Paul Eggert  
+
+	Remove SunOS 4.x cruft
+
+	Support for SunOS 4.x was removed in Emacs 23 but some cruft was left behind.
+	* lib-src/pop.c [sun]: Remove no-longer-needed include.
+	* lwlib/xlwmenu.c (SUNSO41): Remove.
+
+2015-12-18  Paul Eggert  
+
+	Merge from gnulib
+
+	This mostly commentary fixes.
+	* doc/misc/texinfo.tex, lib/intprops.h: Copy from gnulib.
+	* lib/gnulib.mk: Regenerate with new gnulib-tool.
+
+2015-12-18  Michael Albinus  
+
+	Minor fixes in Tramp
+
+	* lisp/net/tramp-sh.el (tramp-do-file-attributes-with-ls):
+	Reorder ls arguments.
+
+	* lisp/net/tramp.el (tramp-dissect-file-name): Fix docstring.
+
+2015-12-18  Michael Albinus  
+
+	Make tramp a built-in package
+
+	* lisp/finder.el (finder-compile-keywords): Update
+	`package--builtins' also when Version: keyword is available.
+
+	* lisp/net/trampver.el: Add Version: keyword.
+	(tramp-version): Change it to "2.2.13.25.1", in order to be
+	compatible with `version-to-list'.
+
+2015-12-18  Lele Gaifax  
+
+	* etc/tutorials/TUTORIAL.it: Update and fix typos.  (Bug#22187)
+
+2015-12-18  Alan Mackenzie  
+
+	Rename `recenter-group' to `recenter-window-group'
+
+	* doc/lispref/windows.texi (Textual Scrolling)
+	* lisp/window.el (top level, recenter-group)
+	* lisp/follow.el (follow-mode)
+	* lisp/isearch.el (isearch-back-into-window): Rename `recenter-group' to
+	`recenter-window-group' and `recenter-group-function' to
+	`recenter-window-group-function'.
+
+2015-12-18  Eli Zaretskii  
+
+	Fix vertical-motion in tabulated-list mode
+
+	* src/indent.c (Fvertical_motion): When moving from line beginning
+	to point under line truncation, assume overshoot by one line only
+	if point actually lies beyond the window's right margin.
+	(Bug#22194)
+
+2015-12-18  Martin Rudalics  
+
+	Don't have help functions call x-display-pixel-width/-height on ttys
+
+	* lisp/help.el (temp-buffer-max-height, temp-buffer-max-width):
+	Don't call x-display-pixel-width/-height on ttys.
+
+2015-12-17  Dmitry Gutov  
+
+	Use 'hg id' in vc-hg-previous-revision
+
+	* lisp/vc/vc-hg.el (vc-hg-previous-revision):
+	Use 'hg id' to retrieve it (bug#22032).
+
+2015-12-17  Alan Mackenzie  
+
+	* lisp/follow.el (follow-sit-for): Remove (it's redundant).
+
+2015-12-17  Eli Zaretskii  
+
+	Fix a typo in the Emacs manual
+
+	* doc/emacs/trouble.texi (Sending Patches): Fix a typo.  Reported
+	by Lele Gaifax .  (Bug#22193)
+
+2015-12-17  Eli Zaretskii  
+
+	Fix parsing netrc entries with ports
+
+	* lisp/gnus/auth-source.el (auth-source-ensure-strings): Don't
+	make a list out of 't'.  (Bug#22188)
+
+	* test/automated/auth-source-tests.el
+	(auth-source-test-netrc-parse-entry): New test.
+
+2015-12-17  Paul Eggert  
+
+	Fix typo in Doug Lea malloc configure log
+
+	* configure.ac (emacs_cv_var_doug_lea_malloc):
+	Fix typo that confused the log output of 'configure'.
+
+2015-12-16  Nicolas Petton  
+
+	* etc/NEWS: Mention the new pcase patterns `seq' and `map'.
+
+2015-12-16  Alan Mackenzie  
+
+	* etc/NEWS: Move entry on pcase to correct section
+
+	(Accidentally omitted from previous commit)
+
+2015-12-16  Alan Mackenzie  
+
+	Add documentation for changes to Show Paren mode.
+
+	* lisp/paren.el (show-paren-highlight-openparen): Enhance doc string.
+
+	* doc/emacs/programs.texi (Matching): Add descriptions of some pertinent user
+	options, including the new show-paren-when-point-inside-paren and
+	show-paren-when-point-in-periphery.
+
+	* etc/NEWS (.. Specialized Modes ...): Add an entry for Show Paren mode.
+	Move an entry on pcase to the Lisp Changes section.
+
+2015-12-16  Eli Zaretskii  
+
+	Document Eldoc changes
+
+	* doc/emacs/programs.texi (Lisp Doc): Document Global Eldoc mode.
+
+2015-12-16  Eli Zaretskii  
+
+	Fix invocation of Python and Guile interpreters from gdb-mi
+
+	* lisp/progmodes/gdb-mi.el (gdb-control-commands-regexp): Add
+	commands for interactive Python and Guile interpreters.
+	(gdb-send): Recognize various ways of exiting from Python and
+	Guile interpreters and returning to GDB.  For details, see
+	http://lists.gnu.org/archive/html/emacs-devel/2015-12/msg00693.html
+	and http://stackoverflow.com/questions/31514741.
+
+2015-12-16  Paul Eggert  
+
+	Remove attempt to use C11 threads
+
+	C11 threads are not needed for Emacs now, and their use is causing
+	hassles on FreeBSD 10.x.  Problem reported by Ashish SHUKLA in:
+	http://lists.gnu.org/archive/html/emacs-devel/2015-12/msg00648.html
+	* configure.ac: Do not check for C11 threads. Remove unnecessary
+	fiddling with CPPFLAGS when configuring pthreads.
+	* src/emacs-module.c (main_thread, check_main_thread)
+	(module_init): Do not worry about C11 threads.
+
+2015-12-15  Michael Albinus  
+
+	Set utf8 encoding with stty in Tramp
+
+	* lisp/net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
+	Move up uname check.  Handle Mac OS X eol encoding.  Set utf8
+	encoding with stty.
+
+2015-12-15  Alan Mackenzie  
+
+	Tidy up documentation associated with window groups.
+
+	* doc/lispref/windows.texi (Basic Windows): Add an @anchor for "Window
+	Groups".  Correct example function to `window-group-start'.
+	(Window Start and End, Textual scrolling): Point to the new anchor.  State
+	that (most of) the args in window group functions have the same meaning as for
+	the corresponding window primitives.
+
+	* doc/lispref/positions.texi (Screen Lines).  Same as above.
+
+2015-12-15  Michael Albinus  
+
+	Complete last commit
+
+	* lisp/net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
+	Move uname check up.  Handle Mac OS X eol encoding.
+
+2015-12-15  Michael Albinus  
+
+	Handle Mac OS X eol encoding in Tramp
+
+	* lisp/net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
+	Handle Mac OS X eol encoding.
+
+2015-12-15  YAMAMOTO Mitsuharu  
+
+	Fix variable name typo in compute_tip_xy
+
+	* src/w32fns.c (compute_tip_xy):
+	* src/xfns.c (compute_tip_xy): Modify *root_x instead of *root_y
+	when `right' is integer.
+
+2015-12-14  foudfou    (tiny change)
+
+	* lisp/ibuffer.el: Add ability to (un-)mark or delete buffers in the region.
+
+2015-12-14  Tassilo Horn  
+
+	Revert "Fix rx matcher overflow without limiting"
+
+	This reverts commit fe27e037663d36be3e5741c2ce86ab4ee8017db1.
+
+2015-12-14  Alan Mackenzie  
+
+	Ispell: Bind isearch-regexp-function to nil around call to isearch..-new-loop
+
+	* lisp/textmodes/ispell.el (ispell-highlight-spelling-error-overlay): bind
+	isearch-regexp-function to nil around call to isearch-lazy-highligh-new-loop.
+
+2015-12-14  Tassilo Horn  
+
+	Fix rx matcher overflow without limiting
+
+	* lisp/textmodes/reftex-vars.el (reftex-label-regexps): Improve last
+	change to the regexp without imposing a limit on the length of the
+	options.
+
+2015-12-14  Alan Mackenzie  
+
+	Enhance ispell-skip-region-alist by generating part of it at runtime.
+
+	* lisp/textmodes/ispell.el (ispell--\\w-filter, ispell--make-\\w-expression)
+	(ispell--make-filename-or-URL-re): New functions which generate a regexp.
+	(ispell-skip-region-alist): Remove the bit that matches a filename/URL, etc.
+	(ispell-begin-skip-region-regexp, ispell-skip-region-list, ispell-message):
+	Include the result of ispell--make-filename-or-URL-re in regexps.
+
+2015-12-14  Glenn Morris  
+
+	* build-aux/gitlog-to-emacslog: Ignore more pointless merge commits.
+
+2015-12-14  Alan Mackenzie  
+
+	Replace GROUP argument in six window primitives by new functions.
+
+	* doc/lispref/windows.texi (Window Start and End, Textual Scrolling)
+	* doc/lispref/positions.texi (Screen Lines): Remove optional GROUP argument
+	from description of six window functions.  Add in description of new functions
+	window-group-start, window-group-end, set-window-group-start,
+	pos-visible-in-window-group-p, recenter-group and move-to-window-group-line,
+	together with the six variables indirecting to the pertinent group
+	functions.
+
+	* src/window.c
+	* src/keyboard.c: Revert the commit from 2015-11-11 12:02:48, in so far as it
+	applies to these two files, which added the GROUP argument to six window
+	primitives.
+
+	* lisp/follow.el (follow-mode): Use updated variable names for the indirected
+	functions.
+
+	* lisp/isearch.el (isearch-update, isearch-done, isearch-string-out-of-window)
+	(isearch-back-into-window, isearch-lazy-highlight-new-loop)
+	(isearch-lazy-highlight-search, isearch-lazy-highlight-update): Replace calls
+	to window primitives (e.g. window-start) with a GROUP argument by calls to
+	new functions (e.g. window-group-start).
+
+	* lisp/ispell.el (ispell-command-loop): Replace call to
+	pos-visible-in-window-p with pos-visible-in-window-group-p.
+
+	* lisp/window.el (window-group-start, window-group-end)
+	(set-window-group-start, recenter-group, pos-visible-in-window-group-p)
+	(selected-window-group, move-to-window-group-line): New functions.
+	(window-group-start-function, window-group-end-function)
+	(set-window-group-start-function, recenter-group-function)
+	(pos-visible-in-window-group-p-function, selected-window-group-function)
+	(move-to-window-group-line-function): New variables.
+
+2015-12-14  Vitorio Miguel    (tiny change)
+
+	* etc/tutorials/TUTORIAL.pt_BR: Fix a typo.  (Bug#22165)
+
+2015-12-13  Eli Zaretskii  
+
+	Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25
+
+2015-12-13  Tassilo Horn  
+
+	Improve regex to not trigger stack overflow
+
+	* lisp/textmodes/reftex-vars.el (reftex-label-regexps): Improve regex in
+	order not to trigger a stack overflow in regex matcher with unbalanced
+	brackets (bug#22146).
+
+2015-12-13  Eli Zaretskii  
+
+	Fix visiting files with raw-text
+
+	* src/fileio.c (Finsert_file_contents): Fix setting buffer unibyte
+	when some stuff was actually read.  (Bug#22162)
+
+2015-12-13  Tassilo Horn  
+
+	Fix regex matching keyval labels
+
+	* lisp/textmodes/reftex-vars.el (reftex-label-regexps): Fix regexp
+	matching keyval labels.
+
+2015-12-13  Michael Albinus  
+
+	* lisp/ido.el (ido-file-name-all-completions-1): Do not raise an error
+
+	... in case of Tramp.  (Bug#20821)
+
+2015-12-12  Paul Eggert  
+
+	Fix performance regression with gcc -O0
+
+	This fixes the smaller performance hit that I noted in:
+	https://lists.gnu.org/archive/html/emacs-devel/2015-12/msg00357.html
+	* src/alloc.c (macro_XPNTR_OR_SYMBOL_OFFSET, macro_XPNTR):
+	* src/puresize.h (puresize_h_PURE_P)
+	(puresize_h_CHECK_IMPURE):
+	New macros, with the old contents of the functions.
+	* src/alloc.c (XPNTR_OR_SYMBOL_OFFSET, XPNTR):
+	* src/puresize.h (PURE_P, CHECK_IMPURE):
+	Use the new macros.  Also macros, if DEFINE_KEY_OPS_AS_MACROS.
+	* src/conf_post.h (ATTRIBUTE_UNUSED):
+	* src/lisp.h (DEFINE_KEY_OPS_AS_MACROS): New macros.
+
+2015-12-12  Artur Malabarba  
+
+	* lisp/emacs-lisp/package.el (package-unpack): Security check
+
+	Check that we received the package we were offered.
+
+2015-12-12  Artur Malabarba  
+
+	* lisp/emacs-lisp/package.el (package--compile): Don't activate
+
+	`package-unpack' takes care of all activations now (other than
+	`package-initialize).  `package--compile' now only compiles.
+
+2015-12-12  Eli Zaretskii  
+
+	Document the new bindings of  and  in the minibuffer
+
+	* doc/emacs/mini.texi (Minibuffer History): Describe the new
+	bindings of  and  in the minibuffer.
+
+2015-12-12  Eli Zaretskii  
+
+	Document new features of Ido
+
+	* doc/misc/ido.texi (Misc): Document 'C-S-b'.
+
+2015-12-12  Martin Rudalics  
+
+	Fix frame height calculations with added menu bar on Windows (Bug#22105)
+
+	* doc/lispref/frames.texi (Parameter Access): Mention pitfalls
+	when simultaneously specifying multiple parameters for
+	`modify-frame-parameters' that all may change the frame's size.
+	* src/w32fns.c (x_set_menu_bar_lines): Don't set
+	windows_or_buffers_changed here.
+	(my_create_tip_window, Fx_show_tip): Call AdjustWindowRect
+	with third argument false.
+	* src/w32menu.c (set_frame_menubar): Set
+	windows_or_buffers_changed here.
+	* src/w32term.c (x_set_window_size): Determine third argument of
+	AdjustWindowRect from whether the frame has a menu bar and not
+	from whether it wants one.
+
+2015-12-12  Eli Zaretskii  
+
+	Document the change in interactive shell mode
+
+	* doc/emacs/misc.texi (Interactive Shell): Document that the
+	'*shell*' buffer by default displays in a new window.
+
+2015-12-12  Eli Zaretskii  
+
+	Document new features of package.el
+
+	* doc/emacs/package.texi (Package Menu): Document the 'external'
+	status and the new menu commands.
+	(Package Installation): Document archive priorities.
+
+	* lisp/emacs-lisp/package.el (package-archive-priorities): Doc fix.
+	(package-menu-hide-low-priority): Doc fix.
+
+2015-12-12  Eli Zaretskii  
+
+	Update and document new features of xterm support
+
+	* doc/emacs/frames.texi (Text-Only Mouse): Document that
+	track-mouse is supported by newer xterm versions.
+
+2015-12-12  Eli Zaretskii  
+
+	Document new features of Prettify Mode
+
+	* doc/emacs/programs.texi (Misc for Programs): Document
+	'prettify-symbols-compose-predicate' and
+	'prettify-symbols-unprettify-at-point'.
+
+	* lisp/progmodes/prog-mode.el (prettify-symbols-alist)
+	(prettify-symbols-default-compose-p)
+	(prettify-symbols-compose-predicate)
+	(prettify-symbols--compose-symbol): Doc fixes.
+
+2015-12-12  Eli Zaretskii  
+
+	Document multi-mode indentation facilities
+
+	* doc/lispref/text.texi (Mode-Specific Indent): Document
+	'prog-indentation-context', 'prog-first-column', and 'prog-widen'.
+
+	* lisp/progmodes/prog-mode.el (prog-indentation-context)
+	(prog-widen): Doc fixes.
+
+2015-12-12  Eli Zaretskii  
+
+	Document 'vc-refresh-state'
+
+	* doc/emacs/maintaining.texi (Version Control): Document
+	'vc-refresh-state'.
+
+	* lisp/vc/vc-hooks.el (vc-refresh-state): Doc fix.
+
+2015-12-12  Eli Zaretskii  
+
+	Fix echo for "C-u"
+
+	* src/keyboard.c (command_loop_1): Undo last change.  It caused
+	duplicate echo of C-u.  (Bug#22107)
+
+2015-12-11  Eli Zaretskii  
+
+	Avoid errors when creating files under SVN in new directory
+
+	* lisp/vc/vc-svn.el (vc-svn-registered): Use
+	file-accessible-directory-p, to avoid cd'ing to a non-existing
+	directory, which signals an error on some systems.  (Bug#21984)
+	(vc-svn-checkin): Call log-edit-extract-headers with 2 arguments.
+	Use declare-function to avoid byte-compiler warnings.
+
+2015-12-11  Eli Zaretskii  
+
+	Improve Lua support in etags
+
+	* lib-src/etags.c (Lua_functions): Skip spaces before looking for
+	"function".
+
+	* etc/NEWS: Mention improved Lua support by 'etags'.
+
+	* test/etags/lua-src/test.lua (test): Add tests for indented
+	function definitions.
+	* test/etags/ETAGS.good_1:
+	* test/etags/ETAGS.good_2:
+	* test/etags/ETAGS.good_3:
+	* test/etags/ETAGS.good_4:
+	* test/etags/ETAGS.good_5:
+	* test/etags/ETAGS.good_6:
+	* test/etags/CTAGS.good: Adapt to the modified Lua tests.
+
+2015-12-11  Eli Zaretskii  
+
+	Fix 'this-command-keys' wrt prefix argument
+
+	* src/keyboard.c (command_loop_1): Restore the feature whereby C-u
+	was part of this-command-keys, but not of this-single-command-keys.
+	(Bug#22107)
+
+	* lisp/simple.el (internal-echo-keystrokes-prefix): Add
+	commentary about the function's return value.
+
+2015-12-11  Eli Zaretskii  
+
+	* lisp/files.el (load-library): Doc fix.  (Bug#22140)
+
+2015-12-11  Eli Zaretskii  
+
+	Improve and document Ruby support in 'etags'
+
+	* lib-src/etags.c (Ruby_suffixes): Add ".ruby".
+	(Ruby_functions): Support "module" and overloaded operators.
+	(Ruby_help): Mention "module".
+
+	* test/etags/ruby-src/test.rb:
+	* test/etags/ruby-src/test1.ruby: New files.
+	* test/etags/Makefile (RBSRC): New tests.
+	(SRCS): Add ${RBSRC}.
+	* test/etags/ETAGS.good_1:
+	* test/etags/ETAGS.good_2:
+	* test/etags/ETAGS.good_3:
+	* test/etags/ETAGS.good_4:
+	* test/etags/ETAGS.good_5:
+	* test/etags/ETAGS.good_6:
+	* test/etags/CTAGS.good: Adapt to the new Ruby tests.
+
+	* doc/man/etags.1: Mention Ruby support.
+	* etc/NEWS: Mention Ruby support.
+
+2015-12-11  Xi Lu  
+
+	Initial support for Ruby in 'etags'
+
+	* lib-src/etags.c : New variable.
+	(lang_names): Add an entry for Ruby.
+	(Ruby_functions): New function.  (Bug#22116)
+
+2015-12-11  Eli Zaretskii  
+
+	Clarify documentation of 'modify-frame-parameters'
+
+	* doc/lispref/frames.texi (Parameter Access): Clarify what "ignored
+	PARMs" mean for 'modify-frame-parameters'.
+
+	* src/frame.c (Fmodify_frame_parameters): Clarify what "ignored
+	PARMs" mean for this function.  (Bug#22104)
+
+2015-12-11  Eli Zaretskii  
+
+	Fix setting buffer unibyte when reading from a device
+
+	* src/fileio.c (Finsert_file_contents): Call Fset_buffer_multibyte
+	to make a (possibly non-empty) buffer unibyte.  (Bug#22096)
+
+2015-12-11  Eli Zaretskii  
+
+	Clarify documentation of 'values'
+
+	* doc/lispref/eval.texi (Eval): Clarify that 'values' are not
+	updated by any evaluation commands in 'lisp-interaction-mode'.
+	(Bug#22056)
+
+2015-12-11  Anders Lindgren  
+
+	Fixed subversion vc error when opening file in new directory (bug#21984).
+
+	* lisp/vc/vc-svn.el (vc-svn-registered): Check if directory exists.
+
+2015-12-09  Eli Zaretskii  
+
+	Yet another fix for when point ends up in invisible text
+
+	* src/xdisp.c (redisplay_window): When someone forced
+	window-start, and honoring that failed to show the cursor, try
+	moving out of invisible text, before falling back to the middle of
+	the window.  (Bug#22098)
+
+2015-12-09  Michael Albinus  
+
+	Fix error in Tramp perl script for cygwin
+
+	* lisp/net/tramp-sh.el (tramp-perl-file-truename): Do not raise an
+	error if file doesn't exist.
+
+2015-12-09  YAMAMOTO Mitsuharu  
+
+	Remove font workaround for limited outdated versions
+
+	* src/macfont.m (mac_font_descriptor_get_adjusted_weight): Remove
+	workaround for HiraginoSans-W7 on OS X 10.11 and 10.11.1.
+
+2015-12-09  Anders Lindgren  
+
+	Don't add "." to load path (bug#21104)
+
+	When configured with --enable-locallisppath=no, which is the
+	default for OS X, the load-path incorrectly was populated with ".".
+
+	* src/lread.c (init_lread): Don't call `decode_env_path' when
+	PATH_SITELOADSEARCH is empty.
+
+2015-12-08  Artur Malabarba  
+
+	* lisp/emacs-lisp/package.el (package--with-response-buffer):
+
+	Search for the blank-line in the right buffer.
+
+2015-12-08  Glenn Morris  
+
+	* test/automated/simple-test.el (undo-auto-boundary-timer): Update
+	for recent change.
+
+2015-12-08  Glenn Morris  
+
+	Fix some display-warning usage.
+
+	* lisp/files.el (hack-local-variables, hack-dir-local-variables):
+	* lisp/calendar/diary-lib.el (diary-include-files, diary-sexp-entry):
+	* lisp/calendar/holidays.el (calendar-holiday-list):
+	* lisp/mail/rmailout.el (rmail-output-read-file-name):
+	Fix display-warning usage.
+
+2015-12-07  Glenn Morris  
+
+	* lisp/calendar/cal-html.el: Require diary-lib.
+
+	(cal-html-list-diary-entries): Handle no diary.  (Bug#21994)
+
+2015-12-07  Thomas Fitzsimmons  
+
+	Add Obsolete-since header to eudcb-ph.el
+
+	* eudcb-ph.el: Add Obsolete-since header.
+
+2015-12-07  Paul Eggert  
+
+	Spelling fixes
+
+	* doc/misc/calc.texi (Predefined Units): Use the bland modern
+	scientific style for spelling the units “ampere” and
+	“angstrom” rather than the older style “Ampere” and
+	“Ångstrom”.  The latter spelling was wrong anyway (it should
+	have been “Ångström”).
+	* lisp/emacs-lisp/ert.el (ert--explain-equal-rec):
+	Fix misspelling of ‘atom’ in code.
+
+2015-12-07  Eli Zaretskii  
+
+	Improve documentation of kill commands
+
+	* lisp/simple.el (region-extract-function, delete-backward-char)
+	(delete-forward-char, kill-region, copy-region-as-kill)
+	(kill-ring-save): Better document the optional argument REGION in
+	the doc strings.  Mention in the doc strings that text put in the
+	kill-ring can be filtered by 'filter-buffer-substring'.
+
+	* doc/lispref/text.texi (Kill Functions): Mention that functions
+	described in this subsection can filter text they put in the
+	kill-ring.  Add a cross-reference to "Buffer Contents" and an
+	index entry.  Document the optional argument 'region' and its
+	effect.
+	(Bug#21315)
+
+2015-12-07  Alan Mackenzie  
+
+	Further progress making Isearch, Ispell, Replace work with Follow Mode.
+
+	* lisp/follow.el: (follow-mode): Remove references to sit*-for-function, which
+	no longer exists.  Add follow-post-command-hook to  three special purpose
+	hooks at setup, and remove them at tear down.
+
+	* lisp/isearch.el: (isearch-update): invoke isearch-update-post-hook before
+	isearch-lazy-highlight-new-loop.
+	(isearch-lazy-highlight-new-loop): Restore this function to what it previously
+	was, merging the functionality of isearch-lazy-highlight-maybe-new-loop into
+	it.
+	(isearch-lazy-highlight-maybe-new-loop): function removed.
+
+	* lisp/replace.el: (replace-update-post-hook): New hook variable.
+	(perform-replace): Add second (nil) argument to looking-back.  Invoke
+	replace-update-post-hook before calling replace-highlight.
+
+	* lisp/textmodes/ispell.el: (ispell-update-post-hook): New hook variable.
+	(ispell-command-loop): invoke ispell-update-post-hook.  Add GROUP argument to
+	call of pos-visible-in-window-p.
+	(ispell-display-buffer): Place *Choices* window at the top of the last window
+	in a window group.
+
+2015-12-07  Alan Mackenzie  
+
+	Amend doc of `mapconcat': it can take sequences, not merely strings.
+
+	* doc/lispref/functions.texi (Mapping Functions): Amend the doc of `mapconcat'
+	to say that SEPARATOR and the results from FUNCTION may be any character
+	sequences, not just strings.  Add an @xref to "Sequences Arrays Vectors".
+
+2015-12-07  Michael Albinus  
+
+	Fix an utf8 problem for Tramp on BSD
+
+	* lisp/net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
+	Make lax check for utf8.
+	(tramp-get-remote-locale): Add "en_US.UTF-8" as candidate.
+
+2015-12-06  Thomas Fitzsimmons  
+
+	Make eudcb-ph.el obsolete
+
+	* doc/misc/eudc.texi: Bump version to 1.40.0.
+	Remove PH/QI sections and mentions.
+	* lisp/obsolete/eudcb-ph.el: Make obsolete.
+	* lisp/net/eudc-vars.el (eudc-known-protocols): Remove ph.
+	(eudc-ph-bbdb-conversion-alist): Make obsolete.
+	* etc/NEWS: Mention this.  (Bug#21191)
+
+2015-12-06  Paul Eggert  
+
+	Remove overenthusiastic eassert
+
+	* src/lisp.h (XSYMBOL): Remove eassert incorrectly added in
+	previous change.  It breaks on MS-Windows --with-wide-int.
+	Problem reported by Eli Zaretskii in:
+	http://lists.gnu.org/archive/html/emacs-devel/2015-12/msg00275.html
+
+2015-12-06  Paul Eggert  
+
+	Pacify gcc -Wparentheses
+
+	* src/xdisp.c (row_containing_pos): Reparenthesize.
+
+2015-12-06  Paul Eggert  
+
+	Port mod-test to 32-bit Emacs --without-wide-int
+
+	* modules/mod-test/test.el (mod-test-sum-test):
+	Bring back the 2**29 tests, but port them to 32-bit Emacs
+	--without-wide-int.
+
+2015-12-06  Michael Albinus  
+
+	Fix minor Tramp problems found on BSD
+
+	* lisp/net/tramp-sh.el (tramp-perl-file-truename): Do not append
+	trailing slash.  Quote apostrophes.
+	(tramp-sh-handle-file-truename): Do not append trailing slash in
+	the "ls" case.
+	(tramp-get-ls-command-with-w-option): New defun.
+	(tramp-do-file-attributes-with-ls)
+	(tramp-do-directory-files-and-attributes-with-stat): Use it.
+
+	* test/automated/tramp-tests.el
+	(tramp-test31-special-characters-with-perl)
+	(tramp-test31-special-characters-with-ls)
+	(tramp-test32-utf8-with-perl, tramp-test32-utf8-with-ls):
+	Suppress also readlink.
+
+2015-12-06  Eli Zaretskii  
+
+	Fix cursor display when invisible text is at line beginning
+
+	* src/xdisp.c (redisplay_window): When scrolling fails to show
+	point, prefer using the desired matrix if possible for finding the
+	fallback glyph row for displaying the cursor.  (Bug#22098)
+	(row_containing_pos): Exit the loop as soon as we hit the first
+	disabled glyph row.  Otherwise we risk accessing garbled data and
+	departing to the no-no land.
+
+2015-12-06  Paul Eggert  
+
+	Improve module interface when WIDE_EMACS_INT
+
+	* src/emacs-module.c (plain_values): New constant.
+	(module_nil): Now a constant.
+	(Finternal_module_call, value_to_lisp_bits, lisp_to_value_bits)
+	(syms_of_module): Use if, not #ifdef, so that both sides are
+	checked at compile-time, and so that GCC doesn’t complain
+	about an unused var in the typical case.  Also, depend on
+	plain_values, not on WIDE_EMACS_INT; the code shouldn’t assume
+	that WIDE_EMACS_INT implies !USE_LSB_TAG.
+	(value_to_lisp_bits, lisp_to_value_bits): New functions.
+	Sign-extend integers rather than zero-extending them, as small
+	negative integers are more likely.
+	(value_to_lisp, lisp_to_value): Rewrite in terms of the new *_bits
+	functions.
+	(HAVE_STRUCT_ATTRIBUTE_ALIGNED): Define to 0 if not already defined.
+	(mark_modules): Remove.  All uses removed.
+	(lisp_to_value): Don’t assume Fcons returns a pointer aligned
+	to GCALIGNMENT.
+	(syms_of_module): Check that module_nil converts to Qnil.
+	* src/lisp.h (lisp_h_XSYMBOL, XSYMBOL): Use signed conversion, since
+	we prefer signed to unsigned when either will do.
+	(TAG_PTR): Sign-extend pointers when USE_LSB_TAG, as this is
+	a bit better for emacs-module.c.
+
+2015-12-06  Paul Eggert  
+
+	Port mod-test to x86-64 GNU/Linux running 32-bit
+
+	* modules/mod-test/test.el (mod-test-sum-test):
+	Don’t attempt to match descriptions to operating systems.
+	It didn’t work on Fedora x86-64 running a 32-bit executable,
+	and it’s not worth the trouble anyway.
+	Port to 32-bit platforms by removing an assumption about
+	fixnum widths.
+
+2015-12-06  Michael Albinus  
+
+	Fix auto-revert-tests.el when filenotify isn't used
+
+	* test/automated/auto-revert-tests.el (auto-revert--wait-for-revert):
+	Make it working also when filenotify isn't used.
+
+2015-12-05  Juri Linkov  
+
+	* lisp/textmodes/ispell.el (ispell-highlight-spelling-error-overlay):
+
+	Let-bind isearch-regexp-function to nil.  (Bug#22097)
+
+2015-12-05  Artur Malabarba  
+
+	* lisp/emacs-lisp/package.el: Don't install bad signatures (bug#22089)
+
+	(package--with-response-buffer): NOERROR and ERROR-FORM only
+	handle connection errors.
+	(bad-signature): New error type.
+	(package--check-signature-content): Use it.
+	(package--check-signature): Properly distinguish connection errors
+	from bad-signature errors.  Do the check for
+	`package-check-signature' `allow-unsigned' here instead of forcing
+	the callbacks to do it.  Add a new argument, UNWIND.
+	(package--download-one-archive, package-install-from-archive):
+	Update usage of `package--check-signature'.
+
+2015-12-05  Ulf Jasper  
+
+	Fix Bug#22092.
+
+	* lisp/calendar/icalendar.el (icalendar--get-unfolded-buffer):
+	  Clean up inconsistent line endings. (Bug#22092)
+	  (icalendar--clean-up-line-endings): New.
+	* test/automated/icalendar-tests.el (icalendar-real-world): Add test
+	  for Bug#22092.
+
+2015-12-05  Eli Zaretskii  
+
+	Document 'bookmark-set-no-overwrite'
+
+	* doc/emacs/regs.texi (Bookmarks): Document the new command
+	'bookmark-set-no-overwrite' and its keybinding.
+
+2015-12-05  Eli Zaretskii  
+
+	Document new binding of 'mouse-buffer-menu'
+
+	* doc/emacs/buffers.texi (Buffer Menus): 'mouse-buffer-menu' is
+	now also on C-F10.
+
+2015-12-05  Eli Zaretskii  
+
+	Initial documentation of dynamic modules
+
+	* doc/lispref/loading.texi (Dynamic Modules): New section with
+	initial documentation for dynamic modules.
+	* doc/lispref/elisp.texi (Top): Add "Dynamic Modules" to the
+	detailed menu
+
+	* etc/NEWS: Fix typos in dynamic modules' entry.
+
+2015-12-05  Artur Malabarba  
+
+	Remove copyright statements from trivial test files
+
+2015-12-05  Eli Zaretskii  
+
+	Add "Preliminaries" section to etc/DEBUG
+
+	* etc/DEBUG: Add the "Preliminaries" section for GDB beginners.
+	Most of the content was suggested by Phillip Lord
+	.  Remove the section about debugging
+	with the Visual Studio, as building Emacs with the Microsoft
+	compilers is no longer supported.  Minor fixes in some other
+	sections.
+
+2015-12-05  Alex Dunn    (tiny change)
+
+	Improve parsing of version strings
+
+	* lisp/subr.el (version-regexp-alist): Allow "." as priority separator
+	(version-to-list): More helpful error messages.
+	(version-to-list): ".5" is valid (update docstring).  Make
+	"22.8X3" invalid, as the doc string says.
+
+	* test/automated/subr-tests.el (ert-test-version-parsing): New
+	tests for version string processing.
+
+2015-12-05  Eli Zaretskii  
+
+	Fix documentation of 'undo' changes
+
+	* doc/lispref/text.texi (Undo): Minor wording changes.  Use US
+	English conventions for spelling and whitespace between sentences.
+
+	* etc/NEWS: Fix wording and spelling of undo-related entries.
+	Mark them as documented.
+
+2015-12-04  Glenn Morris  
+
+	* lisp/net/net-utils.el: Small improvements.
+
+	(net-utils--executable-find-sbin): New function.
+	(ifconfig-program): Check sbin directories.
+	Fallback to "ip".  (Bug#22091)
+	(ifconfig-program-options): Check the actual program in use.
+	(arp-program): Check sbin directories.
+
+2015-12-04  Arash Esbati    (tiny change)
+
+	Fix wrong-type-argument integer-or-marker-p nil error
+
+	* lisp/textmodes/reftex-auc.el (reftex-what-index-tag):
+	Fix (wrong-type-argument integer-or-marker-p nil) error (bug#22077).
+
+2015-12-04  Alan Mackenzie  
+
+	Merge branch 'scratch/follow' of /home/acm/emacs/emacs.git/emacs-25 into scratch/follow
+
+	Merge necessitated by a rebase operation.
+
+2015-12-04  Alan Mackenzie  
+
+	lisp/isearch.el: Eliminate macro isearch-call-message, replacing with funcall.
+
+2015-12-04  Alan Mackenzie  
+
+	First commit to scratch/follow.  Make Isearch work with Follow Mode, etc.
+
+	doc/lispref/window.texi (Basic Windows): Add paragraph defining "Group of
+	Windows" and new @defun selected-window-group.
+	(Window Start and End): Describe new &optional parameter GROUP and
+	...-group-function for window-start, window-end, set-window-start, and
+	pos-visible-in-window-p.
+	(Textual Scrolling) Describe the same for recenter.
+	doc/lispref/positions.texi (Screen Lines): Describe the same for
+	move-to-window-line.
+
+	src/window.c (Fwindow_start, Fwindow_end, Fset_window_start)
+	(Fpos_visible_in_window_p, Frecenter, Fmove_to_window_line): To each, add ar
+	new optional parameter "group".  At the beginning of each, check whether the
+	corresponding ...-group-function is set to a function, and if so execute this
+	function in place of the normal processing.
+	(syms_of_window): Define symbols for the six new variables below.
+	(window-start-group-function, window-end-group-function)
+	(set-window-start-group-function, recenter-group-function)
+	(pos-visible-in-window-p-group-function, move-to-window-line-group-function):
+	New permanent local buffer local variables.
+	src/keyboard.c (Fposn_at_point): Add extra parameter in call to
+	Fpos_visible_in_window_p.
+
+	lisp/window.el (selected-window-group-function): New permanent local buffer
+	local variable.
+	(selected-window-group): New function.
+
+	lisp/follow.el (follow-mode): Set the ...-group-function variables at mode
+	enable, kill them at mode disable.  Add/remove follow-after-change to/from
+	after-change-functions.
+	(follow-start-end-invalid): New variable.
+	(follow-redisplay): Manipulate follow-start-end-invalid.
+	(follow-after-change, follow-window-start, follow-window-end)
+	(follow-set-window-start, follow-pos-visible-in-window-p)
+	(follow-move-to-window-line, follow-sit-for): New functions.
+
+	lisp/isearch.el (isearch-call-message): New macro.
+	(isearch-update, with-isearch-suspended, isearch-del-char)
+	(isearch-search-and-update, isearch-ring-adjust): Invoke above new macro.
+	(with-isearch-suspended): Rearrange code such that isearch-call-message is
+	invoked before point is moved.
+	(isearch-message): Add comment about where point must be at function call.
+	(isearch-search): Remove call to isearch-message.
+	(isearch-lazy-highlight-window-group): New variable.
+	(isearch-lazy-highlight-new-loop): Unconditionally start idle timer.  Move
+	the battery of tests to ...
+	(isearch-lazy-highlight-maybe-new-loop): New function, started by idle timer.
+	Note: (sit-for 0) is still called.
+	(isearch-lazy-highlight-update): Check membership of
+	isearch-lazy-highlight-window-group.  Don't set the `window' overlay
+	property.
+	(isearch-update, isearch-done, isearch-string-out-of-window)
+	(isearch-back-into-window, isearch-lazy-highlight-maybe-new-loop)
+	(isearch-lazy-highlight-search, isearch-lazy-highlight-update)
+	(isearch-lazy-highlight-update): Call the six amended primitives (see
+	src/window.c above) with the new `group' argument set to t, to cooperate
+	with Follow Mode.
+
+2015-12-04  Stefan Monnier  
+
+	* lisp/emacs-lisp/ert.el: Prefer pcase over cl-typecase
+
+	* lisp/emacs-lisp/ert.el (ert--should-error-handle-error)
+	(ert--explain-format-atom, ert--explain-equal-rec)
+	(ert--print-backtrace, ert-test-result-type-p, ert-select-tests)
+	(ert--insert-human-readable-selector): Prefer pcase over cl-typecase.
+
+2015-12-04  Artur Malabarba  
+
+	* lisp/character-fold.el: Remove special case-folding support
+
+	(character-fold-to-regexp): Remove special code for
+	case-folding.  Char-fold search still respects the
+	`case-fold-search' variable (i.e., f matches F).  This only
+	removes the code that was added to ensure that f also matched
+	all chars that F matched.  For instance, after this commit, f
+	no longer matches 𝔽.
+
+	This was necessary because the logic created a regexp with
+	2^(length of the string) redundant paths.  So, when a very
+	long string "almost" matched, Emacs took a very long time to
+	figure out that it didn't.  This became particularly relevant
+	because isearch's lazy-highlight does a search bounded by (1-
+	match-end) (which, in most circumstances, is a search that
+	almost matches).  A recipe for this can be found in bug#22090.
+
+2015-12-04  Stefan Monnier  
+
+	* lisp/emacs-lisp/cl-macs.el (character): Can't be negative
+	Fixes (bug#21701)
+
+2015-12-04  Daiki Ueno  
+
+	lisp/gnus/qp.el: Don't replace "from " at bol
+
+	* lisp/gnus/qp.el (quoted-printable-encode-region): Bind `case-fold-search'
+	to nil when looking for "^From ".  Problem reported by Simon Josefsson.
+
+2015-12-03  Phillip Lord  
+
+	Externalize some symbols in undo-auto
+
+	 * doc/lispref/text.texi: Update symbols.
+	 * lisp/simple.el (undo-auto--amalgamate,
+	   undo-auto--current-boundary-timer): Make symbols public.
+	 * src/cmds.c (Fself_insert_command,Fdelete_char): Call
+	   updated symbol.
+
+2015-12-03  Stefan Monnier  
+
+	* lisp/emacs-lisp/smie.el (smie-next-sexp): Fix BOB "token"
+
+2015-12-03  Michael Albinus  
+
+	Some error message improvements in tramp-sh.el
+
+	* lisp/net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
+	Suppress error messages for "mesg" and "biff" calls.
+	(tramp-get-remote-path): Ignore errors when expanding
+	`tramp-own-remote-path'.  Raise a warning instead.
+
+2015-12-03  Eli Zaretskii  
+
+	Document 'nacl' value for 'system-type'
+
+	* doc/lispref/os.texi (System Environment): Document the 'nacl'
+	value of 'system-type'.
+
+2015-12-03  Eli Zaretskii  
+
+	Document 'window-max-chars-per-line'
+
+	* doc/lispref/windows.texi (Window Sizes): Document
+	'window-max-chars-per-line'.
+
+2015-12-03  Artur Malabarba  
+
+	Fix some file headers for the purpose of `package--builtins'
+
+	* lisp/emacs-lisp/cl-preloaded.el
+	* lisp/emacs-lisp/eieio-compat.el
+	* lisp/net/sasl-scram-rfc.el: Add a "Package:" header
+
+	* lisp/ielm.el: Fix summary line.
+
+2015-12-03  Artur Malabarba  
+
+	* lisp/emacs-lisp/package.el (package-unpack): Load before compiling
+
+	Reload any previously loaded package files before compiling
+	the package (also reload the same files after compiling).
+	This ensures that we have the most recent definitions during
+	compilation, and avoids generating bad elc files when a macro
+	changes and it is used in a different file from the one it's
+	defined in.
+
+2015-12-03  Artur Malabarba  
+
+	* lisp/emacs-lisp/package.el: Refactor package activation code
+
+	(package-activate): Move code that activates dependencies into
+	package-activate-1.
+	(package--load-files-for-activation): New function.
+	(package-activate-1): Add code for (optionally) activating
+	dependencies, and move file-loading code into
+	`package--load-files-for-activation'.
+
+2015-12-03  Eli Zaretskii  
+
+	Document new font-related functionality
+
+	* doc/lispref/display.texi (Low-Level Font): Document
+	'default-font-width', 'default-font-height', 'window-font-width',
+	and 'window-font-height'.
+
+	* etc/NEWS: Move entries for 'default-font-width',
 	'default-font-height', 'window-font-width', and 'window-font-height'
 	to their place and mark them documented.
 
-2015-12-03  Eli Zaretskii  
+2015-12-03  Eli Zaretskii  
+
+	Fix documentation and implementation of 'directory-name-p'
+
+	* lisp/files.el (directory-name-p): Modify to recognize
+	backslashes on MS-Windows and MS-DOS.  Adjust the doc string
+	accordingly.  Use '=', not char-equal, for comparison, as
+	letter-case cannot possibly be an issue here.
+
+	* doc/lispref/files.texi (Directory Names): Move the documentation
+	of directory-name-p here from "Relative File Names".  Update the
+	description per the changes in implementation.
+
+	* etc/NEWS: Move the entry for 'directory-name-p' to its proper
+	place and mark it documented.
+
+2015-12-02  Eli Zaretskii  
+
+	Minor copyedit in Emacs manual
+
+	* doc/emacs/search.texi (Lax Search): Make wording about character
+	folding by default less definitive.  (Bug#22043)
+
+2015-12-02  Eli Zaretskii  
+
+	More emacs-module.c fixes for wide ints
+
+	* src/emacs-module.c (value_to_lisp) [WIDE_EMACS_INT]: Use
+	unsigned data types to manipulate pointers, to avoid sign
+	extension coming after us with a vengeance.
+
+	* modules/mod-test/test.el (mod-test-sum-test): Add tests for
+	Emacs with wide ints that verify integer values near the critical
+	value that requires us to switch to a cons cell.
+
+2015-12-02  Stephen Leake  
+
+	Fix bug#22069 in cl-generic.el
+
+	* lisp/emacs-lisp/cl-generic.el (cl-no-method): Remove %S; this string is
+	not run thru `format'.
+
+2015-12-01  Dmitry Gutov  
+
+	APPEND etags--xref-backend to xref-backend-functions
+
+	* lisp/progmodes/xref.el (xref-backend-functions):
+	Use APPEND when adding the default element
+	(http://lists.gnu.org/archive/html/emacs-devel/2015-12/msg00061.html).
+
+2015-12-01  Eli Zaretskii  
+
+	More accurate documentation of lax whitespace matching
+
+	* lisp/isearch.el (isearch-forward-word, isearch-forward-symbol)
+	(word-search-backward, word-search-forward)
+	(word-search-backward-lax, word-search-forward-lax): Mention in
+	doc strings that toggling lax whitespace matching has no effect on
+	these commands.
+
+	* doc/emacs/search.texi (Word Search, Symbol Search): Clarify that
+	lax whitespace matching has no effect on these commands.
+
+2015-12-01  Eli Zaretskii  
+
+	Fix emacs-module.c for wide ints
+
+	* src/emacs-module.c (lisp_to_value): Compare the produced value
+	with the original Lisp object, not with the one potentially
+	converted into a Lisp_Cons.  Fixes assertion violations when
+	working with integers larger than fit into a 32-bit value.
+
+	* modules/mod-test/test.el (mod-test-sum-test): Add tests for
+	large integers, to test --with-wide-int.
+
+2015-12-01  Eli Zaretskii  
+
+	Document 'directory-files-recursively'
+
+	* lisp/files.el (directory-files-recursively): Doc fix.  Rename
+	the argument MATCH to REGEXP, to be more explicit about its form.
+
+	* doc/lispref/files.texi (Contents of Directories): Improve the
+	documentation of 'directory-files-recursively'.  Add
+	cross-references.
+
+	* etc/NEWS: Move the entry for 'directory-files-recursively' to
+	its place and mark it documented.
+
+2015-12-01  Eli Zaretskii  
+
+	Document 'inhibit-read-only' property
+
+	* doc/lispref/text.texi (Special Properties): Describe the new
+	'inhibit-read-only' text property.  Add cross-reference to where
+	read-only buffers are described.
+	* doc/lispref/buffers.texi (Read Only Buffers): Mention that
+	'inhibit-read-only' property exempts text from being read-only.
+	Add cross-reference to "Special Properties".
+
+	* etc/NEWS: Move the entry about 'inhibit-read-only' property to
+	its place and mark it documented.
+
+2015-12-01  Artur Malabarba  
+
+	* lisp/emacs-lisp/package.el: Update header comments
+
+2015-12-01  Artur Malabarba  
+
+	* lisp/character-fold.el: Add back multi-char matching
+
+	(character-fold-to-regexp): Uncomment recently commented code
+	and make the algorithm "dummer" by not checking every possible
+	combination.  This will miss some possible matches, but it
+	greatly reduces regexp size.
+
+	* test/automated/character-fold-tests.el
+	(character-fold--test-fold-to-regexp): Comment out test of
+	functionality no longer supported.
+
+2015-12-01  Xue Fuqiao  
+
+	* doc/emacs/ack.texi (Acknowledgments): Update.
+
+2015-12-01  Michael Albinus  
+
+	Check `file-remote-p' over absolute files names in files.el
+
+	* lisp/files.el (directory-files-recursively)
+	(get-free-disk-space): Check `file-remote-p' over absolute files names.
+
+2015-12-01  Andreas Schwab  
+
+		* src/lread.c (syms_of_lread): Doc fix.
+
+2015-11-30  Dmitry Gutov  
+
+	Don't mistake certain JS method calls for keywords
+
+	* lisp/progmodes/js.el (js--ctrl-statement-indentation):
+	Braceless keyword can't come after a period (bug#22063).
+
+2015-11-30  David Reitter  
+
+	Read frame_title_format from buffer-local variable for NS port
+
+	* src/nsfns.m (x_implicitly_set_name): Read frame-title-format and
+	icon-title-format variables from buffer in appropriate window.
+	(Bug#22048)
+
+2015-11-30  Juri Linkov  
+
+	* lisp/replace.el (occur-engine): Count matches in empty lines.
+
+	(Bug#22062)
+
+2015-11-30  Aurélien Aptel  
+
+	* src/emacs-module.h: Fix finalizer typedef for C++11
+
+	C++11 standard doesn't allow exception-specification in typedef.
+	The workaround is to declare a dummy function prototype and use
+	decltype on it.
+
+2015-11-30  Eli Zaretskii  
+
+	Fix last change
+
+	* src/emacs-module.c (lisp_to_value, value_to_lisp)
+	[WIDE_EMACS_INT]: Avoid compiler warnings.
+
+2015-11-30  Stefan Monnier  
+
+	Rely on conservative stack scanning to find "emacs_value"s
+
+	* src/emacs-module.c (struct emacs_value_tag)
+	(struct emacs_value_frame, struct emacs_value_storage): Remove.
+	(value_frame_size): Remove constant.
+	(struct emacs_env_private): Use Lisp_Object for non_local_exit info.
+	(lisp_to_value): Remove first arg.
+	(module_nil): New constant.
+	Use it instead of NULL when returning an emacs_value.
+	(module_make_function): Adjust to new calling convention of
+	Qinternal_module_call.
+	(DEFUN): Receive args in an array rather than a list.
+	Use SAFE_ALLOCA rather than xnmalloc.  Skip the lisp_to_value loop when
+	we don't have WIDE_EMACS_INT.  Adjust to new type of non_local_exit info.
+	(module_non_local_exit_signal_1, module_non_local_exit_throw_1):
+	Adjust to new type of non_local_exit info.
+	(ltv_mark) [WIDE_EMACS_INT]: New constant.
+	(value_to_lisp, lisp_to_value): Rewrite.
+	(initialize_frame, initialize_storage, finalize_storage): Remove functions.
+	(allocate_emacs_value): Remove function.
+	(mark_modules): Gut it.
+	(initialize_environment): Don't initialize storage any more.
+	Keep the actual env object on Vmodule_environments.
+	(finalize_environment): Don't finalize storage any more.
+	(syms_of_module): Initialize ltv_mark and module_nil.
+
+	* src/emacs-module.h (emacs_value): Make it more clear that this type
+	is really opaque, including the fact that NULL may not be valid.
+
+	* modules/mod-test/mod-test.c (Fmod_test_signal, Fmod_test_throw):
+	Don't assume that NULL is a valid emacs_value.
+
+2015-11-30  Eli Zaretskii  
+
+	Yet another doc improvement for search commands
+
+	* doc/emacs/search.texi (Word Search, Symbol Search)
+	(Regexp Search): Document commands that don't support lax
+	whitespace matching or character folding.
+	(Nonincremental Search): Mention the search commands that can be
+	invoked from the menu bar.
+
+	* lisp/isearch.el (isearch-define-mode-toggle-word)
+	(isearch-define-mode-toggle-symbol)
+	(isearch-define-mode-toggle-character-fold): Note in the doc
+	string that turning these on exits the regexp mode.
+	(isearch-forward-regexp, isearch-forward-word)
+	(isearch-forward-symbol, isearch-backward-regexp)
+	(word-search-backward, word-search-forward)
+	(word-search-backward-lax, word-search-forward-lax): State in the
+	doc string which commands don't support character folding and/or
+	lax-whitespace matching.
+
+2015-11-30  Martin Rudalics  
+
+	Run `window-size-change-functions' also when reading from minibuffer
+
+	* src/xdisp.c (redisplay_internal): Run `window-size-change-functions'
+	also when reading from minibuffer.
+
+2015-11-30  Ulf Jasper  
+
+	Fix scrambling of html-rendered item buffers
+
+	* lisp/net/newst-treeview.el (newsticker--treeview-render-text): Fix
+	  scrambling of contents by wrapping call to html-renderer in
+	  save-selected-window.
+
+2015-11-30  Paul Eggert  
+
+	Fix font typo in previous doc fix.
+
+2015-11-30  Paul Eggert  
+
+	A bit more security doc, esp. file local vars
+
+	* doc/emacs/emacs.texi (Top):
+	* doc/emacs/misc.texi (Miscellaneous Commands):
+	Refer to new Host Security section.
+	(Host Security): New section.
+	* doc/lispref/os.texi (Security Considerations):
+	Mention file local variables.
+
+2015-11-30  Artur Malabarba  
+
+	* lisp/character-fold.el: Comment out branching code
+
+	(character-fold-to-regexp): Comment out code that uses multi-char
+	table.  The branching caused by this induces absurdly long regexps,
+	up to 10k chars for as little as 25 input characters.
+
+2015-11-30  Paul Eggert  
+
+	Spelling and grammar fixes
+
+2015-11-29  Dmitry Gutov  
+
+	Make lisp-completion-at-point a wrapper instead of an alias
+
+	* lisp/progmodes/elisp-mode.el (lisp-completion-at-point):
+	Turn into an obsolete wrapper around elisp-completion-at-point
+	(bug#20455).
+
+2015-11-29  Artur Malabarba  
+
+	* lisp/isearch.el (isearch-search-fun-default): Nicer error
+
+	message when the search fails.
+
+2015-11-29  Dmitry Gutov  
+
+	Update menu-bar-goto-uses-etags-p for the current xref API
+
+	* lisp/menu-bar.el (menu-bar-goto-uses-etags-p): Consult
+	xref-backend-functions, instead of now-nonexistent
+	xref-find-function.
+
+2015-11-29  Artur Malabarba  
+
+	* lisp/isearch.el (isearch-define-mode-toggle): Advertise binding
+
+2015-11-29  Artur Malabarba  
+
+	* lisp/menu-bar.el: Use folding in searches
+
+	(nonincremental-search-forward): Use `isearch-search-fun-default'
+	to determine the search function.
+	(nonincremental-search-backward)
+	(nonincremental-repeat-search-forward)
+	(nonincremental-repeat-search-backward): Use it.
+
+2015-11-29  Artur Malabarba  
+
+	* lisp/menu-bar.el (menu-bar-goto-uses-etags-p): Fix a warning
+
+2015-11-29  Artur Malabarba  
+
+	* lisp/character-fold.el (character-fold-to-regexp): Be careful
+
+	not to return huge regexps.
+
+2015-11-29  Eli Zaretskii  
+
+	Improve documentation of string-collate-* functions
+
+	* doc/lispref/strings.texi (Text Comparison): Improve wording and
+	indexing of 'string-collate-equalp' and 'string-collate-lessp'.
+
+	* etc/NEWS: Move the entry of 'string-collate-equalp' and
+	'string-collate-lessp' to "Lisp Changes" section and mark it as
+	documented.
+
+2015-11-29  Eli Zaretskii  
+
+	Document truncate-string-ellipsis
+
+	* doc/lispref/display.texi (Size of Displayed Text): Document
+	'truncate-string-ellipsis'.
+
+	* lisp/international/mule-util.el (truncate-string-ellipsis): Doc fix.
+	(truncate-string-to-width): Mention in the doc string that the
+	default for ELLIPSIS comes from 'truncate-string-ellipsis'.
+
+	* etc/NEWS: Move the 'truncate-string-ellipsis' entry to the "Lisp
+	Changes" section.
+
+2015-11-29  Eli Zaretskii  
+
+	Fix confusion wrt character folding in the Emacs manual
+
+	* doc/emacs/search.texi (Nonincremental Search, Regexp Search):
+	Document that invoking search-forward/backward and
+	re-search-forward/backward supports only case folding, but not the
+	rest of the lax-search features.  Reported by Mike Kupfer
+	.
+
+2015-11-29  Ken Brown  
+
+	Update mod-test-sum-test
+
+	* modules/mod-test/test.el (mod-test-sum-test): Update to
+	accommodate the lack of dladdr on Cygwin.
+
+2015-11-29  Alan Mackenzie  
+
+	Byte compiler: Catch missing argument to `funcall'.  Fixes bug#22051.
+
+	* lisp/emacs-lisp/bytecomp.el (byte-compile-funcall): When there's no argument
+	to `funcall', (i) Output an error message; (ii) Generate code to signal a
+	`wrong-number-of-arguments' error.
+
+2015-11-29  Martin Rudalics  
+
+	* lisp/window.el (split-window): Don't sanitize sizes when SIZE is non-nil.
+
+2015-11-28  Artur Malabarba  
+
+	* lisp/character-fold.el (character-fold-to-regexp)
+
+	Warn about using long strings.
+
+	* test/automated/character-fold-tests.el
+	(character-fold--test-lax-whitespace)
+	(character-fold--test-consistency): Reduce string size for tests.
+
+2015-11-28  Eli Zaretskii  
+
+	Document renaming of x-select-enable-* variables
+
+	* doc/emacs/killing.texi (Clipboard): Rename
+	x-select-enable-clipboard to select-enable-clipboard and
+	x-select-enable-primary to select-enable-primary.  Update index
+	entries.
+
+	* etc/NEWS: Mark entry as documented.
+
+2015-11-28  Eli Zaretskii  
+
+	Document the shorthand hints displayed by M-x
+
+	* doc/emacs/m-x.texi (M-x): Document the numeric meaning of
+	suggest-key-bindings.  Document the shorthand hints for commands
+	that have no key bindings.  Document that M-x completion ignores
+	obsolete commands.
+
+	* etc/NEWS: Move the M-x entry to "Editing Changes" and mark it as
+	documented.
+
+2015-11-28  Eli Zaretskii  
+
+	Update docs of character folding
+
+	* doc/emacs/search.texi (Lax Search): Update the description of
+	character folding for the latest changes.
+
+2015-11-28  Artur Malabarba  
+
+	* lisp/character-fold.el: Also play nice with case-folding
+
+	(character-fold-to-regexp): Take `case-fold-search' into account.
+
+2015-11-28  Artur Malabarba  
+
+	* lisp/character-fold.el: Add support for multi-char matches
+
+	(character-fold-table): Now has an extra-slot. This is a second
+	char-table that holds multi-character matches.  See docstring for
+	details.
+	(character-fold-to-regexp): Can build branching regexps when a
+	character's entry the extra slot of `character-fold-table' matches the
+	characters that succeed it.
+
+2015-11-28  Artur Malabarba  
+
+	* lisp/character-fold.el: Code simplifications
+
+	(character-fold-table): Reduce the scope of a variable.
+	(character-fold-to-regexp): Change logic to work directly on the
+	input string.  It's a little easier to understand, probably
+	faster, and sets us up for implementing multi-char matches.
+
+	* test/automated/character-fold-tests.el
+	(character-fold--test-fold-to-regexp): New test.
+
+2015-11-28  Eli Zaretskii  
+
+	Document changes in "C-h l"
+
+	* doc/emacs/help.texi (Misc Help): Document the changes in "C-h l".
+
+	* etc/NEWS: mark "C-h l" changes as documented.
+
+2015-11-28  Eli Zaretskii  
+
+	Finalize documentation of 'custom-prompt-customize-unsaved-options'
+
+	* doc/emacs/custom.texi (Saving Customizations): Index the new
+	function 'custom-prompt-customize-unsaved-options'.
+
+	* etc/NEWS: Mention when 'custom-prompt-customize-unsaved-options'
+	is useful.
+
+2015-11-28  Eli Zaretskii  
+
+	Document 'comment-line'
+
+	* doc/emacs/programs.texi (Comment Commands): Document
+	'comment-line'.
+
+	* etc/NEWS: Move the entry for 'comment-line' into "Editing Changes".
+
+2015-11-28  Eli Zaretskii  
+
+	Document new checkdoc features
+
+	* doc/lispref/tips.texi (Tips, Library Headers): Document the
+	keyword-checking features of checkdoc and the commands
+	'checkdoc-file' and 'checkdoc-current-buffer'.
+
+	* etc/NEWS: Move the checkdoc-related entries to their own
+	section.
+
+2015-11-28  Philipp Stephani  
+
+	Simplify the prologue of emacs-module.c functions
+
+	* src/emacs-module.c (MODULE_FUNCTION_BEGIN): New macro.
+	(module_make_global_ref)
+	(module_free_global_ref, module_make_function, module_funcall)
+	(module_intern, module_type_of, module_extract_integer)
+	(module_make_integer, module_extract_float, module_make_float)
+	(module_copy_string_contents, module_make_string)
+	(module_make_user_ptr, module_get_user_ptr, module_set_user_ptr)
+	(module_get_user_finalizer, module_set_user_finalizer)
+	(module_vec_set, module_vec_get, module_vec_size): Use new helper
+	macro MODULE_FUNCTION_BEGIN.
+
+2015-11-28  Eli Zaretskii  
+
+	Don't reject module calls with no arguments
+
+	* src/emacs-module.c (Finternal_module_call): Allow ARGLIST be nil.
+
+2015-11-28  Philipp Stephani  
+
+	Make module-call be visible from Lisp
+
+	* src/emacs-module.c (module_make_function): Use internal--module-call.
+	(Finternal_module_call): Renamed from Fmodule_call.  Add safety
+	checks.
+	(syms_of_module): DEFSYM save-value-p and save-pointer-p.  Do
+	defsubr internal--module-call.
+
+2015-11-28  Eli Zaretskii  
+
+	Add etags tests for the recent Lua-related bugfix
+
+	* test/etags/lua-src/test.lua: New file, tests the issues raised
+	by bug#21934.
+	* test/etags/Makefile (LUASRC): Add test.lua.
+	* test/etags/ETAGS.good_1:
+	* test/etags/ETAGS.good_2:
+	* test/etags/ETAGS.good_3:
+	* test/etags/ETAGS.good_4:
+	* test/etags/ETAGS.good_5:
+	* test/etags/ETAGS.good_6:
+	* test/etags/CTAGS.good: Adapt to the new Lua test.  Also, an old
+	regression fix, resolved around 25 May 2015, required changes to
+	the "good" ETAGS files.
+
+2015-11-28  Eli Zaretskii  
+
+	Fix Lua tags when a function name includes '.' or ':'
+
+	* lib-src/etags.c (Lua_functions): Add a tag for the last element
+	of a function name after a dot or a colon.  (Bug#21934)
+
+2015-11-28  Eli Zaretskii  
+
+	Improve documentation of search and replace commands
+
+	* doc/emacs/search.texi (Replacement and Lax Matches): Document
+	which commands are affected by 'replace-character-fold'.
+	(Lax Search): Add a cross reference to "Replacement and Lax
+	Matches".  Improve wording.  Fix lost extra whitespace.
+	(Search Customizations): Improve wording.  (Bug#22036)
+	See also comments in
+	http://lists.gnu.org/archive/html/emacs-devel/2015-11/msg02376.html.
+
+	* lisp/replace.el (query-replace, query-replace-regexp)
+	(query-replace-regexp-eval, replace-string, replace-regexp):
+	Mention 'replace-character-fold' in the doc strings.
+
+2015-11-28  Paul Eggert  
+
+	Fix minor problems found by static checking
+
+	* src/undo.c (prepare_record): Add proper prototype for C.
+
+2015-11-27  Stefan Monnier  
+
+	* src/emacs-module.c (struct env_storage): Delete
+
+	(struct emacs_runtime_private): Keep an emacs_env instead.
+	(Fmodule_load, Fmodule_call): Declare emacs_env_private separately.
+	(initialize_environment): Split the arg in two.	 Adjust all callers.
+	Only store the private part in Vmodule_environments.
+	(finalize_environment): Change the arg to only be the private env.
+	Adjust all callers.
+
+2015-11-27  Eli Zaretskii  
+
+	Improve documentation of 'replace-character-fold'
+
+	* lisp/replace.el (replace-character-fold): Clarify which commands
+	are affected by this variable.
+
+2015-11-27  Dmitry Gutov  
+
+	Autoload etags when using its xref backend
+
+	* lisp/progmodes/xref.el (xref--etags-backend):
+	Rename to etags--xref-backend.  Move to etags.el.  Autoload.
+	(Bug#22026)
+
+2015-11-27  Artur Malabarba  
+
+	* lisp/character-fold.el: Allow complex chars to match their decomposition
+
+	(character-fold-table): When a character's decomposition does not
+	involve a formatting tag (i.e., if it has an "exact" description via
+	other characters), then this character is allowed to match the
+	decomposition.
+
+2015-11-27  Artur Malabarba  
+
+	* lisp/character-fold.el: More descriptive variable names
+
+	(character-fold-table): Rename a lot of the lexical variables to
+	make the code easier to read.
+
+2015-11-27  Artur Malabarba  
+
+	* lisp/isearch.el: Ensure we still support `isearch-new-word'
+
+	(isearch-new-regexp-function): Define variable.
+	(isearch-new-word): Define as an obsolete alias. (Bug#22018)
+
+2015-11-27  Eli Zaretskii  
+
+	Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25
+
+2015-11-27  Lee Bochicchio  
+
+	* test/lisp/abbrev-tests.el: Define more tests
+
+	(abbrev-table-name-test, kill-all-abbrevs-test)
+	(clear-abbrev-table-test): New tests.
+
+2015-11-27  Eli Zaretskii  
+
+	Add module tests for wrong-type-argument
+
+	* modules/mod-test/test.el (mod-test-sum-test): Add tests for
+	wrong-type-argument.
+
+2015-11-27  Eli Zaretskii  
+
+	Improve handling of signals and 'throw' in modules
+
+	* src/emacs-module.c: Add commentary explaining how to write
+	functions in this file.
+	(module_make_global_ref, module_free_global_ref)
+	(module_non_local_exit_signal, module_non_local_exit_throw)
+	(module_make_function, module_funcall, module_intern)
+	(module_type_of, module_is_not_nil, module_eq)
+	(module_extract_integer, module_make_integer)
+	(module_extract_float, module_make_float)
+	(module_copy_string_contents, module_make_string)
+	(module_make_user_ptr, module_get_user_ptr, module_set_user_ptr)
+	(module_get_user_finalizer, module_set_user_finalizer)
+	(module_vec_set, module_vec_get, module_vec_size)
+	(module_non_local_exit_signal_1, module_non_local_exit_throw_1):
+	Do nothing and return with failure indication immediately, if some
+	previous module call signaled an error or wants to throw.  See
+	http://lists.gnu.org/archive/html/emacs-devel/2015-11/msg02133.html
+	for the relevant discussions.
+
+2015-11-27  Eli Zaretskii  
+
+	Add ':version' tag to 'checkdoc-package-keywords-flag'
+
+	* lisp/emacs-lisp/checkdoc.el (checkdoc-package-keywords-flag):
+	Add a ':version' tag.
+
+2015-11-27  Eli Zaretskii  
+
+	Improve documentation of 'eval-buffer' and 'eval-region'
+
+	* src/lread.c (Feval_buffer, Feval_region): Doc fixes.  (Bug#22023)
+
+	* doc/lispref/eval.texi (Eval): Mention narrowing to clarify
+	"accessible portion of buffer".
+
+2015-11-27  Eli Zaretskii  
+
+	Unbreak the Cygwin w32 build
+
+	* src/emacs.c (main): Call w32_init_main_thread in the Cygwin w32
+	build as well.  Reported by Andy Moreton .
+
+2015-11-27  Eli Zaretskii  
+
+	Improve commentary in character-fold.el
+
+	* lisp/character-fold.el (character-fold-to-regexp): Move detailed
+	description from commit log message to comments.  (Bug#22019)
+
+2015-11-26  Alan Mackenzie  
+
+	Byte Compiler: generate code to adjust stack count after call to `signal'.
+
+	Corrects change from earlier today.
+
+	* lisp/emacs-lisp/bytecomp.el (byte-compile-setq): supply the current value of
+	`byte-compile--for-effect' as argument to `byte-compile-form'.
+
+2015-11-26  Eli Zaretskii  
+
+	Improve commentary of prepare_to_modify_buffer_1
+
+	* src/insdel.c (prepare_to_modify_buffer_1): Mention in commentary
+	that this function runs Lisp.  Suggested by Richard Stallman
+	.
+
+2015-11-26  Phillip Lord  
+
+	Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
+
+2015-11-26  Phillip Lord  
+
+	Fix regression after merge.
+
+	 * src/undo.c (prepare_record): Remove call to run_undoable_change.
+
+2015-11-26  Phillip Lord  
+
+	After delete, record point location in undo.
+
+	Addresses Bug #21968.
+
+		* lisp/simple.el (undo-auto--add-boundary): Clean up code to
+		better support intercalating calls.
+		* src/keyboard.c, src/keyboard.h (command_loop_1): Store value of
+		point and current buffer before each command.
+		* src/undo.c (record_point): Now only record the point.
+		* src/undo.c (prepare_record): Functionality removed form
+		record_point.
+		* src/undo.c (record_delete): Check if point needs recording.
+		* src/undo.c (undo-boundary): Record value of point before each
+		boundary.
+		* test/automated/simple-test.el: New tests.
+
+	Conflicts:
+		src/undo.c
+
+2015-11-26  Eli Zaretskii  
+
+	Fix compiler warnings in w32.c
+
+	* src/w32.c (sys_socket): In case of error, use -1 as return
+	value, not INVALID_SOCKET, which causes compiler warnings.
+	(maybe_load_unicows_dll): Cast the return value of GetProcAddress
+	to the appropriate function signature, to avoid compiler errors.
+	Reported by Andy Moreton .  (Bug#21953)
+
+2015-11-26  Dmitry Gutov  
+
+	Check if the file exists on disk before producing the revert diff
+
+	* lisp/vc/vc-dispatcher.el (vc-buffer-sync): Check if the file
+	exists on disk (bug#20558).
+
+2015-11-26  Alan Mackenzie  
+
+	Byte compiler: on setq with an odd number of arguments, generate a `signal'
+
+	* lisp/emacs-lisp/cconv.el (cconv-convert): Don't transform `setq' form when
+	it has an odd number of arguments, to allow bytecomp to handle the error.
+
+	* lisp/emacs-lisp/bytecomp.el (byte-compile-setq): In a `setq' form with an
+	odd number of arguments, generate a `signal' instead of the normal code.
+
+2015-11-25  Dmitry Gutov  
+
+	Use find-tag-default for xref-backend-identifier-at-point
+
+	* lisp/progmodes/etags.el (find-tag-tag)
+	(tags-completion-at-point-function): Extract common code as
+	find-tag--default.
+	(xref-backend-identifier-at-point): Define in terms of the new
+	function.
+
+2015-11-25  Paul Eggert  
+
+	* src/undo.c (record_property_change): Remove now-unused local.
+
+2015-11-25  Phillip Lord  
+
+	run_undoable_changes now called from insdel.
+
+	The original calls from inside undo.c are not always at a safe position
+	to call lisp, as they originate in varied positions within insdel.c.
+	Calling them directly from prepare_to_modify_buffer_1 ensures that they
+	are always run at the same point.
+
+	 * src/undo.c (run_undoable_changes,syms_of_undo): Remove function
+	 and symbol used.
+	 * src/insdel.c (run_undoable_changes): Add function and symbol.
+
+2015-11-25  Eli Zaretskii  
+
+	Improve and update documentation of search commands
+
+	* doc/emacs/search.texi (Lax Search): Renamed from "Search Case";
+	all references changed.  Move the description of lax-whitespace
+	here.  Add description of the new character folding features and
+	additional customizable options.
+	(Isearch Yank): Move before "Error in Search".
+	(Basic Isearch): Improve wording.  Add index entries.  Add short
+	description of how to abandon search, making this subsection a
+	complete introduction to search basics.
+	(Repeat Isearch): Add index entries.  Describe additional
+	customizable options.  Describe mouse clicks.
+	(Isearch Yank): Add index entries.  Describe mouse-2 click in echo
+	area.  Describe more customizable options.
+	(Error in Isearch): Add index entries.
+	(Special Isearch): Move actual description of some isearch
+	commands to other sections, leaving here just the summary of the
+	commands.  Add command that toggles character folding.  Describe
+	commands, like "C-h C-h", that were previously omitted for some
+	reason.
+	(Not Exiting Isearch): Describe search-exit-option.  Add index
+	entries.
+	(Word Search): Describe eww-search-word and eww-search-prefix.
+	(Symbol Search): Add index entries.
+	(Regexp Search): Describe regexp-search-ring-max.
+	(Replacement and Lax Matches): Renamed from "Replacement and
+	Case"; all references changed.  Describe lax-whitespace matching
+	in replace commands and related options.  Describe character
+	folding in replace commands and related options.
+	(Query Replace): Describe query-replace-from-to-separator and the
+	new history features.  Add index entries for highlighted text.
+	Describe query-replace-skip-read-only.  Describe more keys
+	accepted by query-replace.
+	(Other Repeating Search): More index entries for Occur.  Describe
+	list-matching-lines-default-context-lines.
+	(Search Customizations): New section, documents customizable
+	options that were not documented until now.
+	* doc/emacs/glossary.texi (Glossary): Add "Case Folding" and
+	"Character Folding".
+
+	* etc/NEWS: Move search- and replace-related entries to a single
+	parent section.
+
+	* lisp/replace.el (query-replace-show-replacement): Doc fix.
+	* lisp/isearch.el (search-nonincremental-instead)
+	(isearch-hide-immediately): Doc fixes.
+
+2015-11-25  Katsumi Yamaoka  
+
+	Remove nnml-retrieve-groups that is unnecessary and somewhat problematic
+
+	* lisp/gnus/nnml.el (nnml-retrieve-groups): Remove.  See:
+	 and
+	
+
+2015-11-25  Paul Eggert  
+
+	Fix module_format_fun_env when dynlib_addr fails
+
+	* src/emacs-module.c (module_format_fun_env):
+	exprintf doesn’t support %p, so use %x.  Reported by Eli Zaretskii in:
+	http://lists.gnu.org/archive/html/emacs-devel/2015-11/msg02122.html
+
+2015-11-25  Paul Eggert  
+
+	Disambiguate variable help a bit better
+
+	* lisp/help-fns.el (describe-variable): Quote the
+	variable’s value if it is a symbol other than t or nil.
+	See: T.V Raman in:
+	http://lists.gnu.org/archive/html/emacs-devel/2015-11/msg02147.html
+
+2015-11-24  Dmitry Gutov  
+
+	Pass SVN commit message through log-edit-extract-headers
+
+	* lisp/vc/vc-svn.el (vc-svn-checkin): Pass COMMENT through
+	log-edit-extract-headers (bug#18954).
+
+2015-11-24  Alan Mackenzie  
+
+	CC Mode: Eliminate compiler warning messages.
+
+	* lisp/progmodes/cc-mode.el (top level): remove compile time declaration of
+	`font-lock-syntactic-keywords' (which CC Mode doesn't use).
+	* lisp/progmodes/cc-awk.el (awk-mode-syntax-table)
+	(c-awk-set-syntax-table-properties): Clarify comments about
+	`font-lock-syntactic-keywords'.
+
+	* lisp/progmodes/cc-bytecomp.el (cc-bytecomp-load): Create a dummy declaration
+	of this before the real (interpreted) one, to satisfy the byte compiler.
+
+2015-11-24  Simen Heggestøyl  
+
+	Extend the test suite for json.el
+
+	* lisp/json.el (json-plist-p): Clarify docstring.
+
+	* test/automated/json-tests.el (json-tests--with-temp-buffer): New
+	macro.
+	(test-json-join, test-json-alist-p)
+	(test-json-plist-p, test-json-advance, test-json-peek)
+	(test-json-pop, test-json-skip-whitespace)
+	(test-json-read-keyword, test-json-encode-keyword)
+	(test-json-read-number, test-json-encode-number)
+	(test-json-read-escaped-char, test-json-read-string)
+	(test-json-encode-string, test-json-encode-key)
+	(test-json-new-object, test-json-add-to-object)
+	(test-json-read-object, test-json-encode-list)
+	(test-json-read-array, test-json-encode-array)
+	(test-json-read, test-json-read-from-string)
+	(test-json-encode): New tests.
+	(json-read-simple-alist): Merged into `test-json-read-object'.
+	(json-encode-string-with-special-chars): Merged into
+	`test-json-encode-string'.
+	(json-read-string-with-special-chars): Split into
+	`test-json-encode-string' and `test-json-read-from-string'.
+
+2015-11-24  Anders Lindgren  
+
+	Fixed bug#18283: Enable applescript in NextStep.
+
+	* nextstep/templates/Info.plist.in: Set NSAppleScriptEnabled to YES.
+
+2015-11-24  Eli Zaretskii  
+
+	Allow completion on dynamic module files in load-library
+
+	* lisp/files.el (load-library): Bind completion-ignored-extensions
+	to nil, to allow completion on dynamic modules typed as file
+	names.  Reported by Andy Moreton .
+
+2015-11-24  Alan Mackenzie  
+
+	CC Mode: eliminate almost all byte compilation warnings
+
+	* lisp/progmodes/cc-bytecomp.el (cc-bytecomp-noruntime-functions): Remove.
+	(cc-require): Remove the crude hack that saved and restored
+	byte-compile-noruntime-functions.
+	(cc-conditional-require, cc-conditional-require-after-load): New macros.
+
+	* lisp/progmodes/cc-defs.el (top level): Reformulate code which loaded
+	cc-fix.el using the new macros in cc-bytecomp.el.
+
+	* lisp/progmodes/cc-langs.el (c++-template-syntax-table)
+	(c-no-parens-syntax-table): Add extra "(eval ..)"s around "'(lambda ..)"
+	forms to remove the superflous quotes.
+
+2015-11-24  Eli Zaretskii  
+
+	Add one more mod-test test
+
+	* modules/mod-test/test.el (mod-test-sum-test): Test the error
+	signaled when the function is invoked with a wrong number of
+	arguments.
+
+2015-11-24  Philipp Stephani  
+
+	* modules/mod-test/mod-test.c (Fmod_test_sum): Verify there are 2 args.
+
+2015-11-24  Eli Zaretskii  
+
+	Implement dynlib_addr for MS-Windows
 
-	Fix documentation and implementation of 'directory-name-p'
+	* src/dynlib.c [WINDOWSNT]: Include w32common.h.
+	 [WINDOWSNT]: New static variable.
+	(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS)
+	(GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT) [WINDOWSNT]: Define
+	if undefined.
+	(dynlib_reset_last_error): Reset g_b_init_get_module_handle_ex to
+	zero.
+	(dynlib_addr) [WINDOWSNT]: Non-trivial implementation to report
+	the full file name of the module for a given address.
 
-	* lisp/files.el (directory-name-p): Modify to recognize
-	backslashes on MS-Windows and MS-DOS.  Adjust the doc string
-	accordingly.  Use '=', not char-equal, for comparison, as
-	letter-case cannot possibly be an issue here.
+2015-11-24  Alan Mackenzie  
 
-	* doc/lispref/files.texi (Directory Names): Move the documentation
-	of directory-name-p here from "Relative File Names".  Update the
-	description per the changes in implementation.
+	Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
 
-	* etc/NEWS: Move the entry for 'directory-name-p' to its proper
-	place and mark it documented.
+2015-11-24  Alan Mackenzie  
 
-2015-12-02  Eli Zaretskii  
+	Squashed commit of the following:
 
-	Minor copyedit in Emacs manual
+	commit e1ecf76585bef2eb87995f7a7f92cc12003a6f70
+	Author: Alan Mackenzie 
+	Date:   Tue Nov 24 16:50:09 2015 +0000
 
-	* doc/emacs/search.texi (Lax Search): Make wording about character
-	folding by default less definitive.  (Bug#22043)
+	    Byte compile: minor amendments.
 
-2015-12-02  Eli Zaretskii  
+	    * lisp/emacs-lisp/bytecomp.el (byte-compile-initial-macro-environment):
+	    add a comment to explain the binding of variables around a subsidiary
+	    compilation.
+	    (byte-compile-new-defuns): Amend the doc string.
 
-	More emacs-module.c fixes for wide ints
+	commit c537bfed1dda1593d218956ff00c6105a3ff0316
+	Author: Alan Mackenzie 
+	Date:   Sat Nov 21 18:43:57 2015 +0000
 
-	* src/emacs-module.c (value_to_lisp) [WIDE_EMACS_INT]: Use
-	unsigned data types to manipulate pointers, to avoid sign
-	extension coming after us with a vengeance.
+	    Byte compiler: fix spurious warnings "might not be defined at runtime".
 
-	* modules/mod-test/test.el (mod-test-sum-test): Add tests for
-	Emacs with wide ints that verify integer values near the critical
-	value that requires us to switch to a cons cell.
+	    Also initialize byte-compile-noruntime-functions between runs.
 
-2015-12-02  Stephen Leake  
+	    * lisp/emacs-lisp/bytecomp.el (byte-compile-new-defuns): New variable.
+	    (byte-compile-initial-macro-environment): For eval-when-compile: bind
+	    byte-compile-unresolved-functions and byte-compile-new-defuns around
+	    byte-compile-top-level, to prevent spurious entries being made.
+	    (byte-compile-warn-about-unresolved-functions): Check whether function is
+	    in byte-compile-new-defuns before emitting a warning about it.
+	    (byte-compile-from-buffer): Initialize new variable and
+	    byte-compile-noruntime-functions to nil.
+	    (byte-compile-file-form-require): record all new functions defined by a
+	    `require' in byte-compile-new-defuns.
+	    (byte-compile-file-form-defmumble): record the new alias in
+	    byte-compile-new-defuns.
 
-	Fix bug#22069 in cl-generic.el
+2015-11-24  Eli Zaretskii  
 
-	* lisp/emacs-lisp/cl-generic.el (cl-no-method): Remove %S; this string is
-	not run thru `format'.
+	Fix crash at startup related to GC of font entities
 
-2015-12-02  Dmitry Gutov  
+	* src/font.h (GC_FONT_SPEC_P, GC_FONT_ENTITY_P)
+	(GC_FONT_OBJECT_P, GC_XFONT_SPEC, GC_XFONT_ENTITY)
+	(GC_XFONT_OBJECT): New macros, for use in garbage collector.
+	* src/alloc.c (compact_font_cache_entry, compact_font_caches):
+	Don't ifdef away font cache compaction on NT_GUI, as the problems
+	which led to that seem to have been solved.
+	(compact_font_cache_entry): Use GC_FONT_SPEC_P, GC_XFONT_SPEC,
+	GC_XFONT_ENTITY, and GC_XFONT_OBJECT, instead of their non-GC_
+	cousins.  (Bug#21999)
 
-	APPEND etags--xref-backend to xref-backend-functions
+2015-11-24  Alan Mackenzie  
 
-	* lisp/progmodes/xref.el (xref-backend-functions):
-	Use APPEND when adding the default element
-	(http://lists.gnu.org/archive/html/emacs-devel/2015-12/msg00061.html).
+	Byte compile: Output an error, not a warning, for odd number of args to setq
 
-2015-12-01  Eli Zaretskii  
+	* lisp/emacs-lisp/bytecomp.el (byte-compile-setq): Amend.
 
-	More accurate documentation of lax whitespace matching
+2015-11-24  Ken Raeburn  
 
-	* lisp/isearch.el (isearch-forward-word, isearch-forward-symbol)
-	(word-search-backward, word-search-forward)
-	(word-search-backward-lax, word-search-forward-lax): Mention in
-	doc strings that toggling lax whitespace matching has no effect on
-	these commands.
+	Fix kbd_buffer iteration loop in readable_events
 
-	* doc/emacs/search.texi (Word Search, Symbol Search): Clarify that
-	lax whitespace matching has no effect on these commands.
+	* src/keyboard.c (readable_events): Wrap the event pointer back to the
+	start of the kbd_buffer array inside the top of the loop instead of
+	right before checking the loop condition, since kbd_fetch_ptr and
+	kbd_store_ptr point past the end of the array to mean that element 0
+	is next. (bug#21935)
 
-2015-12-01  Eli Zaretskii  
+2015-11-24  Paul Eggert  
 
-	Fix emacs-module.c for wide ints
+	Improve text-quoting-style doc again
 
-	* src/emacs-module.c (lisp_to_value): Compare the produced value
-	with the original Lisp object, not with the one potentially
-	converted into a Lisp_Cons.  Fixes assertion violations when
-	working with integers larger than fit into a 32-bit value.
+	* doc/lispref/help.texi (Keys in Documentation):
+	Omit overkill discussion of ‘setq’.  Mention Emacs versions
+	where ‘grave’ style was standard.
 
-	* modules/mod-test/test.el (mod-test-sum-test): Add tests for
-	large integers, to test --with-wide-int.
+2015-11-23  Paul Eggert  
 
-2015-12-01  Eli Zaretskii  
+	Improve text-quoting-style doc
 
-	Document 'directory-files-recursively'
+2015-11-23  Paul Eggert  
 
-	* lisp/files.el (directory-files-recursively): Doc fix.  Rename
-	the argument MATCH to REGEXP, to be more explicit about its form.
+	Simplify module_make_function
 
-	* doc/lispref/files.texi (Contents of Directories): Improve the
-	documentation of 'directory-files-recursively'.  Add
-	cross-references.
+	* src/emacs-module.c (module_make_function):
+	Simplify by calling build_unibyte_string.
 
-	* etc/NEWS: Move the entry for 'directory-files-recursively' to
-	its place and mark it documented.
+2015-11-23  Paul Eggert  
 
-2015-12-01  Eli Zaretskii  
+	Port better to FreeBSD’s dlfunc vs dlsym
 
-	Document 'inhibit-read-only' property
+	This avoids warnings when converting between void * and
+	function pointers, which strict C11 does not allow.
+	* configure.ac (dlfunc): Check for existence.
+	* src/dynlib.c (dlfunc) [!HAVE_DLFUNC]: New macro.
+	(dynlib_func): New function.
+	* src/dynlib.h (dynlib_function_ptr, dynlib_func): New decls.
+	* src/emacs-module.c (Fmodule_load): Use dynlib_func, not
+	dynlib_sym, for function pointers.
 
-	* doc/lispref/text.texi (Special Properties): Describe the new
-	'inhibit-read-only' text property.  Add cross-reference to where
-	read-only buffers are described.
-	* doc/lispref/buffers.texi (Read Only Buffers): Mention that
-	'inhibit-read-only' property exempts text from being read-only.
-	Add cross-reference to "Special Properties".
+2015-11-23  Paul Eggert  
 
-	* etc/NEWS: Move the entry about 'inhibit-read-only' property to
-	its place and mark it documented.
+	Simplify use of emacs_finalizer_function type
 
-2015-12-01  Artur Malabarba  
+	* src/emacs-module.h (emacs_finalizer_function):
+	Now EMACS_NOEXCEPT.  All users simplified to omit EMACS_NOEXCEPT.
+	(struct emacs_env_25): Use emacs_finalizer_function where applicable.
 
-	* lisp/emacs-lisp/package.el: Update header comments
+2015-11-23  Paul Eggert  
 
-2015-12-01  Artur Malabarba  
+	module_format_fun_env fixes
 
-	* lisp/character-fold.el: Add back multi-char matching
+	* src/doprnt.c (exprintf) [HAVE_MODULES]: Also define in this case.
+	* src/emacs-module.c (module_format_fun_env):
+	Convert path and sym to UTF-8.
+	Don’t use VLAs, as the C11 standard says they’re optional,
+	and anyway they can cause core dumps with large allocations.
+	Use exprintf rather than snprintf, as exprintf handles arbitrarily
+	long strings.  Simplify the code a bit.
 
-	(character-fold-to-regexp): Uncomment recently commented code
-	and make the algorithm "dummer" by not checking every possible
-	combination.  This will miss some possible matches, but it
-	greatly reduces regexp size.
+2015-11-23  Dmitry Gutov  
 
-	* test/automated/character-fold-tests.el
-	(character-fold--test-fold-to-regexp): Comment out test of
-	functionality no longer supported.
+	Don't use package-user-dir in elisp-library-roots if it's not bound
 
-2015-12-01  Xue Fuqiao  
+	* lisp/progmodes/elisp-mode.el (elisp-library-roots): Don't
+	use package-user-dir if it's not bound (bug#19759).
 
-	* doc/emacs/ack.texi (Acknowledgments): Update.
+2015-11-23  Anders Lindgren  
 
-2015-12-01  Michael Albinus  
+	New visible-bell for NextStep (OS X El Capitan compatible).
+
+	Instead of inverting a rectangle in the middle of the frame, use
+	the standard NextStep image "caution", represented using an
+	warning sign with an exclamation mark.  (Bug#21662)
+
+	Implemented based on a suggestion drafted by Mustafa Kocaturk.
+
+	* src/nsterm.m (EmacsBell): New class for managing the caution
+	image.  Support multiple active bells, the image is removed once
+	all bells have timed out.
+	(ns_timeout): Removed, no longer used.
+	(ns_ring_bell): Reimplemented to use EmacsBell.
+
+2015-11-23  Johan Bockgård  
+
+	* lisp/emacs-lisp/nadvice.el (add-function): Fix debug spec.
+
+	(remove-function): Ditto. (Bug#20376)
+
+2015-11-23  Mark Oteiza  
+
+	* lisp/leim/quail/tamil-dvorak.el: Add necessary escapes.
+
+2015-11-23  Eli Zaretskii  
+
+	Improve how non-ASCII strings are accepted from modules
+
+	* src/emacs-module.c (module_make_function, module_make_string):
+	Build a unibyte Lisp string and then decode it by UTF-8, instead
+	of building a multibyte string without decoding.  This is more
+	tolerant to deviations from UTF-8.
+
+2015-11-23  Paul Eggert  
+
+	Port recent module changes to pickier compilers
+
+	* src/emacs-module.c (module_make_function)
+	(module_make_string): Add casts to fix pointer signedness issues.
+
+2015-11-23  Philipp Stephani  
+
+	Fix how strings are accepted from modules
+
+	* emacs-module.c (module_make_function, module_make_string): Use
+	make_multibyte_string.
+	(module_copy_string_contents): Encode before reading the byte
+	size.  Return false if and only if an error occurred.
+
+2015-11-23  Eli Zaretskii  
+
+	Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25
+
+2015-11-23  Shakthi Kannan  
+
+	Add the tamil-dvorak input method
+
+	* lisp/leim/quail/tamil-dvorak.el: New file.  (Bug#21768)
+
+	* etc/NEWS: Mention the new input method.
+
+2015-11-23  Martin Rudalics  
+
+	Move setting FRAME_WINDOW_SIZES_CHANGED to resize_frame_windows.
+
+	* src/frame.c (adjust_frame_size): Don't set
+	FRAME_WINDOW_SIZES_CHANGED here ...
+	* src/window.c (resize_frame_windows): ... but here, as suggested
+	by Stefan Monnier.  Also remove some dead code along the way.
+
+2015-11-23  Alan Mackenzie  
+
+	* /etc/NEWS (Incompatible Lisp Changes): Also `setf' needs an even # of args.
+
+2015-11-23  Alan Mackenzie  
+
+	Signal an error when `setf' gets an odd number of arguments.
 
-	Check `file-remote-p' over absolute files names in files.el
+	* lisp/emacs-lisp/gv.el (setf): Amend.
 
-	* lisp/files.el (directory-files-recursively)
-	(get-free-disk-space): Check `file-remote-p' over absolute files names.
+2015-11-23  Stefan Monnier  
 
-2015-12-01  Andreas Schwab  
+	* lisp/emacs-lisp/smie.el (smie-backward-sexp): Handle BOB better.
 
-		* src/lread.c (syms_of_lread): Doc fix.
+2015-11-23  Alan Mackenzie  
 
-2015-12-01  Dmitry Gutov  
+	* etc/NEWS (Incompatible Lisp Changes): Document new restriction on `setq'.
 
-	Don't mistake certain JS method calls for keywords
+2015-11-23  Alan Mackenzie  
 
-	* lisp/progmodes/js.el (js--ctrl-statement-indentation):
-	Braceless keyword can't come after a period (bug#22063).
+	Expunge occurrences of `setq' with an odd number of arguments.
 
-2015-12-01  David Reitter  
+	* lisp/apropos.el (apropos-documentation):
+	* lisp/obsolete/complete.el (PC-include-file-all-completions):
+	* lisp/progmodes/compile.el (compilation-goto-locus):
+	* lisp/vc/vc-cvs.el (vc-cvs-parse-root): (twice)
+	Insert missing nil at end of `setq' forms.
 
-	Read frame_title_format from buffer-local variable for NS port
+	* lisp/emacs-lisp/bytecomp.el (byte-compile-file-form-autoload): Remove an
+	erroneous trailing variable name from a setq, thus allowing a compilation
+	properly to track functions not defined at runtime.
 
-	* src/nsfns.m (x_implicitly_set_name): Read frame-title-format and
-	icon-title-format variables from buffer in appropriate window.
-	(Bug#22048)
+2015-11-23  John Wiegley  
 
-2015-12-01  Juri Linkov  
+	Add a note about a questionable use of bool in xdisp.c
 
-	* lisp/replace.el (occur-engine): Count matches in empty lines.
+2015-11-23  Alan Mackenzie  
 
-	(Bug#22062)
+	Issue a warning from the byte compiler on a malformed `setq' form.
 
-2015-11-30  Aurélien Aptel  
+	Partly fixes bug#20241.
+	* lisp/emacs-lisp/bytecomp.el (byte-compile-setq): Issue a warning when a
+	`setq' form with an odd number of arguments is compiled.
 
-	* src/emacs-module.h: Fix finalizer typedef for C++11
+2015-11-23  Alan Mackenzie  
 
-	C++11 standard doesn't allow exception-specification in typedef.
-	The workaround is to declare a dummy function prototype and use
-	decltype on it.
+	Don't let cconv_convert insert a nil argument into a `setq' form.
 
-2015-11-30  Eli Zaretskii  
+	Fixes bug#21983.
+	* lisp/emacs-lisp/cconv.el (cconv-convert): Don't silently insert a nil last
+	argument into a `setq' when there're an odd number of args.  This enables the
+	byte compiler to issue a message in this case.
 
-	Fix last change
+2015-11-23  Alan Mackenzie  
 
-	* src/emacs-module.c (lisp_to_value, value_to_lisp)
-	[WIDE_EMACS_INT]: Avoid compiler warnings.
+	Signal an error when `setq' has an odd number of arguments.  Fixes bug#20241.
 
-2015-11-30  Stefan Monnier  
+	* src/eval.c (Fsetq): Signal an error on an odd number of arguments.
+	(syms_of_eval): Add a DEFSYM for Qsetq.
 
-	Rely on conservative stack scanning to find "emacs_value"s
+2015-11-23  Martin Rudalics  
 
-	* src/emacs-module.c (struct emacs_value_tag)
-	(struct emacs_value_frame, struct emacs_value_storage): Remove.
-	(value_frame_size): Remove constant.
-	(struct emacs_env_private): Use Lisp_Object for non_local_exit info.
-	(lisp_to_value): Remove first arg.
-	(module_nil): New constant.
-	Use it instead of NULL when returning an emacs_value.
-	(module_make_function): Adjust to new calling convention of
-	Qinternal_module_call.
-	(DEFUN): Receive args in an array rather than a list.
-	Use SAFE_ALLOCA rather than xnmalloc.  Skip the lisp_to_value loop when
-	we don't have WIDE_EMACS_INT.  Adjust to new type of non_local_exit info.
-	(module_non_local_exit_signal_1, module_non_local_exit_throw_1):
-	Adjust to new type of non_local_exit info.
-	(ltv_mark) [WIDE_EMACS_INT]: New constant.
-	(value_to_lisp, lisp_to_value): Rewrite.
-	(initialize_frame, initialize_storage, finalize_storage): Remove functions.
-	(allocate_emacs_value): Remove function.
-	(mark_modules): Gut it.
-	(initialize_environment): Don't initialize storage any more.
-	Keep the actual env object on Vmodule_environments.
-	(finalize_environment): Don't finalize storage any more.
-	(syms_of_module): Initialize ltv_mark and module_nil.
+	* doc/lispref/windows.texi (Window Sizes): Fix indices and references.
 
-	* src/emacs-module.h (emacs_value): Make it more clear that this type
-	is really opaque, including the fact that NULL may not be valid.
+	* src/frame.c (adjust_frame_size): Set FRAME_WINDOW_SIZES_CHANGED (Bug#21975).
 
-	* modules/mod-test/mod-test.c (Fmod_test_signal, Fmod_test_throw):
-	Don't assume that NULL is a valid emacs_value.
+2015-11-22  Thomas Fitzsimmons  
 
-2015-11-30  Eli Zaretskii  
+	Add EUDC BBDB 3 entry in NEWS
 
-	Yet another doc improvement for search commands
+	* NEWS: Mention EUDC BBDB backend support for BBDB 3.
 
-	* doc/emacs/search.texi (Word Search, Symbol Search)
-	(Regexp Search): Document commands that don't support lax
-	whitespace matching or character folding.
-	(Nonincremental Search): Mention the search commands that can be
-	invoked from the menu bar.
+2015-11-22  Thomas Fitzsimmons  
 
-	* lisp/isearch.el (isearch-define-mode-toggle-word)
-	(isearch-define-mode-toggle-symbol)
-	(isearch-define-mode-toggle-character-fold): Note in the doc
-	string that turning these on exits the regexp mode.
-	(isearch-forward-regexp, isearch-forward-word)
-	(isearch-forward-symbol, isearch-backward-regexp)
-	(word-search-backward, word-search-forward)
-	(word-search-backward-lax, word-search-forward-lax): State in the
-	doc string which commands don't support character folding and/or
-	lax-whitespace matching.
+	Improve EUDC to BBDB 3 export
 
-2015-11-30  Martin Rudalics  
+	* eudc-vars.el (eudc-ldap-bbdb-conversion-alist): Change phone
+	entry to single item.  Add company conversion.
+	* eudc-export.el (eudc-bbdbify-company): New function.
+	(bbdb-parse-phone): Declare function.
+	(eudc-bbdbify-phone): Add BBDB 3 support.
+	(Bug#21971)
 
-	Run `window-size-change-functions' also when reading from minibuffer
+2015-11-22  Thomas Fitzsimmons  
 
-	* src/xdisp.c (redisplay_internal): Run `window-size-change-functions'
-	also when reading from minibuffer.
+	Add BBDB 3 support for EUDC export
 
-2015-11-30  Ulf Jasper  
+	* eudc.el: Add bbdb-version defvar.
+	(eudc--using-bbdb-3-or-newer-p): New function.
+	* eudc-export.el (eudc-create-bbdb-record): Add support for
+	bbdb-create-internal argument list changes introduced in BBDB 3.
+	* eudcb-bbdb.el: Remove bbdb-version defvar.
+	(eudc-bbdb-field): Call eudc--using-bbdb-3-or-newer-p.
+	(Bug#21971)
 
-	Fix scrambling of html-rendered item buffers
+2015-11-22  Eli Zaretskii  
 
-	* lisp/net/newst-treeview.el (newsticker--treeview-render-text): Fix
-	  scrambling of contents by wrapping call to html-renderer in
-	  save-selected-window.
+	Allow loading modules by 'load-file'
 
-2015-11-30  Paul Eggert  
+	* src/lread.c (Fload): Call 'unbind_to' with 'Fmodule_load' as the
+	2nd arg, to avoid the "binding stack not balanced" error.
+	(syms_of_lread) : New Lisp variable.
 
-	Fix font typo in previous doc fix.
+	* lisp/files.el (module-file-suffix): Declare.
+	(load-file): Remove 'module-file-suffix' from
+	'completion-ignored-extensions', to allow completion on modules.
 
-2015-11-30  Paul Eggert  
+	* etc/NEWS: Mention 'module-file-suffix'.
 
-	A bit more security doc, esp. file local vars
+2015-11-22  Eli Zaretskii  
 
-	* doc/emacs/emacs.texi (Top):
-	* doc/emacs/misc.texi (Miscellaneous Commands):
-	Refer to new Host Security section.
-	(Host Security): New section.
-	* doc/lispref/os.texi (Security Considerations):
-	Mention file local variables.
+	Fix unoptimized builds
 
-2015-11-30  Artur Malabarba  
+	* src/lisp.h (XTYPE): Move before XSYMBOL, to fix unoptimized
+	builds.
 
-	* lisp/character-fold.el: Comment out branching code
+2015-11-22  Dmitry Gutov  
 
-	(character-fold-to-regexp): Comment out code that uses multi-char
-	table.  The branching caused by this induces absurdly long regexps,
-	up to 10k chars for as little as 25 input characters.
+	Work around the asynchronous-empty-diff problem
 
-2015-11-30  Paul Eggert  
+	* lisp/vc/vc-rcs.el (vc-rcs-diff):
+	* lisp/vc/vc-mtn.el (vc-mtn-diff):
+	* lisp/vc/vc-hg.el (vc-hg-diff):
+	* lisp/vc/vc-git.el (vc-git-diff): Ignore the ASYNC argument,
+	do a synchronous process call (bug#21969).
 
-	Spelling and grammar fixes
+2015-11-21  Karl Fogel  
 
-2015-11-30  Dmitry Gutov  
+	Finish excising electric indent from `open-line'
 
-	Make lisp-completion-at-point a wrapper instead of an alias
+	* lisp/simple.el (open-line): Remove INTERACTIVE argument.
 
-	* lisp/progmodes/elisp-mode.el (lisp-completion-at-point):
-	Turn into an obsolete wrapper around elisp-completion-at-point
-	(bug#20455).
+	* test/automated/simple-test.el (open-line-indent, open-line-hook):
+	  Adjust accordingly.
 
-2015-11-29  Artur Malabarba  
+	This change finishes what my commit of Thu Nov 19 17:32:37 2015 -0600
+	(git commit c59353896) started.  It turns out that having INTERACTIVE
+	cause `post-self-insert-hook' to run (via `newline') meant `open-line'
+	still had the electric indent behavior, as `post-self-insert-hook'
+	normally contains `electric-indent-post-self-insert-function' ever
+	since `electric-indent-mode' has been on by default.  Tracing the code
+	change in `open-line' is mildly twisty, because Artur Malabarba's
+	earliest two commits of 24 Oct 2015 first removed the `interactive'
+	form entirely (git commit 6939896e2) and then restored it with the new
+	extra "p" already added (git commit bd4f04f86), such that there is no
+	single-commit diff in which one sees the second "p" appear.  Thus this
+	change is effectively a reversion of parts of each of those commits.
 
-	* lisp/isearch.el (isearch-search-fun-default): Nicer error
+	This could close bug#21884, at least until further discussion.
 
-	message when the search fails.
+2015-11-21  Dmitry Gutov  
 
-2015-11-29  Dmitry Gutov  
+	Adhere closer to the "implicit tag name" definition
 
-	Update menu-bar-goto-uses-etags-p for the current xref API
+	* lisp/progmodes/etags.el (etags-tags-completion-table):
+	Adhere closer to the "implicit tag name" definition.  Simplify
+	the regexp.  Search for the explicit tag name first, and when
+	not found, search locally for the implicit one.  (Bug#21934)
 
-	* lisp/menu-bar.el (menu-bar-goto-uses-etags-p): Consult
-	xref-backend-functions, instead of now-nonexistent
-	xref-find-function.
+2015-11-21  Stefan Monnier  
 
-2015-11-29  Artur Malabarba  
+	Unrevert most of regexp reentrancy abort patch
 
-	* lisp/isearch.el (isearch-define-mode-toggle): Advertise binding
+	The problem was in:
+	  * src/syntax.c (update_syntax_table_forward): Propertize even when truncated
+	which is hence not unreverted.
+	The rest is:
+	* src/syntax.h (UPDATE_SYNTAX_TABLE_FORWARD_FAST):
+	(UPDATE_SYNTAX_TABLE_FAST): Re-introduce.
+	All callers in regex.c changed back to the _FAST versions.
 
-2015-11-29  Artur Malabarba  
+	* test/automated/message-mode-tests.el: Tweak the test to rely on auto
+	propertization in backward-sexp.
 
-	* lisp/menu-bar.el: Use folding in searches
+2015-11-21  Paul Eggert  
 
-	(nonincremental-search-forward): Use `isearch-search-fun-default'
-	to determine the search function.
-	(nonincremental-search-backward)
-	(nonincremental-repeat-search-forward)
-	(nonincremental-repeat-search-backward): Use it.
+	Revert regexp reentrancy abort patch
 
-2015-11-29  Artur Malabarba  
+	Although the patch does fix Bug#21688 and prevents a core dump,
+	it also makes the message-mode-propertize test fail; see:
+	http://lists.gnu.org/archive/html/emacs-devel/2015-11/msg01667.html
+	Perhaps someone else can come up with a better fix some day.
+	* src/syntax.c (update_syntax_table_forward):
+	Propertize even when truncated.
+	* src/syntax.h (UPDATE_SYNTAX_TABLE_FORWARD_FAST):
+	(UPDATE_SYNTAX_TABLE_FAST): Remove.
+	All callers changed back to the non-_FAST versions.
 
-	* lisp/menu-bar.el (menu-bar-goto-uses-etags-p): Fix a warning
+2015-11-21  Paul Eggert  
 
-2015-11-29  Artur Malabarba  
+	Add a few safety checks when ENABLE_CHECKING
 
-	* lisp/character-fold.el (character-fold-to-regexp): Be careful
+	This was motivated by the recent addition of module code,
+	which added some ENABLE_CHECKING-enabled checks that are
+	useful elsewhere too.
+	* src/alloc.c (compact_font_cache_entry):
+	* src/fns.c (sweep_weak_table):
+	* src/lread.c (oblookup):
+	Use gc_asize rather than doing it by hand.
+	* src/emacs-module.c (module_make_global_ref)
+	(module_free_global_ref, module_vec_size):
+	Omit assertions that lisp.h now checks.
+	* src/lisp.h (XFASTINT, ASIZE): In functional implementations,
+	check that the result is nonnegative.  Use eassume, as this
+	info can help a bit when optimizing production code.
+	(XSYMBOL) [!USE_LSB_TAG]: Assert that argument is a symbol,
+	to be consistent with the USE_LSB_TAG case.
+	(gc_asize): New function, when ASIZE is needed in the gc.
+	(gc_aset): Use it.
+	(HASH_TABLE_P): Move definition up, so that it can be used ...
+	(XHASH_TABLE): ... here, to assert that the arg is a hash table.
 
-	not to return huge regexps.
+2015-11-21  Eli Zaretskii  
 
-2015-11-29  Eli Zaretskii  
+	Simplify recording of main thread's ID on MS-Windows
 
-	Improve documentation of string-collate-* functions
+	* src/w32term.c (w32_initialize):
+	* src/w32console.c (initialize_w32_display):
+	* src/w32fns.c (globals_of_w32fns): Don't record the main thread
+	ID independently for each type of session (GUI, TTY, batch).
+	* src/w32term.c (w32_init_main_thread): New function, records the
+	main thread's thread ID.
+	* src/w32term.h: Add prototype for w32_init_main_thread.
+	* src/emacs.c (main) [WINDOWSNT]: Call w32_init_main_thread.
 
-	* doc/lispref/strings.texi (Text Comparison): Improve wording and
-	indexing of 'string-collate-equalp' and 'string-collate-lessp'.
+	* src/emacs-module.c [WINDOWSNT]: Rename main_thread_id to
+	main_thread, for consistency with other threading libraries.  All
+	users changed.  Include w32term.h.
+	(check_main_thread) [WINDOWSNT]: Simplify the test: no need to
+	make sure the main thread is alive, as we hold a handle on it
+	opened by w32_init_main_thread.
+	(module_init) [WINDOWSNT]: Reuse the thread ID recorded by
+	w32_init_main_thread, instead of calling the requisite APIs once
+	more.
 
-	* etc/NEWS: Move the entry of 'string-collate-equalp' and
-	'string-collate-lessp' to "Lisp Changes" section and mark it as
-	documented.
+2015-11-21  Eli Zaretskii  
 
-2015-11-29  Eli Zaretskii  
+	Call 'window-size-change-functions' for mini-windows
 
-	Document truncate-string-ellipsis
+	* src/window.c (grow_mini_window, shrink_mini_window): Set the
+	frame's 'window_sizes_changed' flag.
+	* src/xdisp.c (redisplay_internal): Call the hooks on
+	'window-size-change-functions' if the call to 'echo_area_display'
+	sets the frame's 'window_sizes_changed' flag.
+	(syms_of_xdisp) :
+	Update doc string to indicate the mini-window resizes trigger a
+	call to the hooks, and don't promise that will happen "before
+	redisplay".  (Bug#19576, Bug#21333)
 
-	* doc/lispref/display.texi (Size of Displayed Text): Document
-	'truncate-string-ellipsis'.
+	* doc/lispref/windows.texi (Window Hooks): Update the description
+	of 'window-size-change-functions'.
 
-	* lisp/international/mule-util.el (truncate-string-ellipsis): Doc fix.
-	(truncate-string-to-width): Mention in the doc string that the
-	default for ELLIPSIS comes from 'truncate-string-ellipsis'.
+2015-11-21  Eli Zaretskii  
 
-	* etc/NEWS: Move the 'truncate-string-ellipsis' entry to the "Lisp
-	Changes" section.
+	Improve documentation of dynamic modules
 
-2015-11-29  Eli Zaretskii  
+	* src/fns.c (Frequire): Doc fix to include the dynamic module
+	support.
+	* src/lread.c (Fload, Vload_suffixes): Doc fixes to include the
+	dynamic module support.
+	(Fload): Treat the module suffix the same as '*.el' and '*.elc'
+	wrt the MUST-SUFFIX argument.
 
-	Fix confusion wrt character folding in the Emacs manual
+	* etc/NEWS: Expand documentation of dynamically loaded modules.
 
-	* doc/emacs/search.texi (Nonincremental Search, Regexp Search):
-	Document that invoking search-forward/backward and
-	re-search-forward/backward supports only case folding, but not the
-	rest of the lax-search features.  Reported by Mike Kupfer
-	.
+2015-11-21  Philipp Stephani    (tiny change)
 
-2015-11-29  Ken Brown  
+	Initial documentation for dynamic modules
 
-	Update mod-test-sum-test
+	* etc/NEWS: Mention the new support for dynamically loaded modules.
 
-	* modules/mod-test/test.el (mod-test-sum-test): Update to
-	accommodate the lack of dladdr on Cygwin.
+2015-11-20  Dmitry Gutov  
 
-2015-11-29  Alan Mackenzie  
+	Add xref--etags-backend to xref-backing-functions using add-hook
 
-	Byte compiler: Catch missing argument to `funcall'.  Fixes bug#22051.
+	* lisp/progmodes/xref.el (xref-backend-functions): Move the
+	default value into a separate `add-hook' call (bug#21964).
 
-	* lisp/emacs-lisp/bytecomp.el (byte-compile-funcall): When there's no argument
-	to `funcall', (i) Output an error message; (ii) Generate code to signal a
-	`wrong-number-of-arguments' error.
+	* lisp/progmodes/elisp-mode.el (emacs-lisp-mode):
+	Don't declare the xref-backend-functions variable.
+	It doesn't make any difference.
 
-2015-11-29  Martin Rudalics  
+2015-11-20  Paul Eggert  
 
-	* lisp/window.el (split-window): Don't sanitize sizes when SIZE is non-nil.
+	Fix double-decrement bug when freeing global refs
 
-2015-11-28  Artur Malabarba  
+	* src/emacs-module.c (module_free_global_ref): Add a FIXME
+	comment about error reporting.  Fix a recently-introduced typo
+	that double-decremented the refcount.
 
-	* lisp/character-fold.el (character-fold-to-regexp)
+2015-11-20  Paul Eggert  
 
-	Warn about using long strings.
+	Declare emacs_module_init in the module API
 
-	* test/automated/character-fold-tests.el
-	(character-fold--test-lax-whitespace)
-	(character-fold--test-consistency): Reduce string size for tests.
+	* src/emacs-module.h (emacs_module_init): New decl.
+	Without it, GCC might complain about a module that defines
+	emacs_module_init without using it.  This also checks the
+	API better.
 
-2015-11-28  Eli Zaretskii  
+2015-11-20  Paul Eggert  
 
-	Document renaming of x-select-enable-* variables
+	Fix module test to use ptrdiff_t nargs too
 
-	* doc/emacs/killing.texi (Clipboard): Rename
-	x-select-enable-clipboard to select-enable-clipboard and
-	x-select-enable-primary to select-enable-primary.  Update index
-	entries.
+	* modules/mod-test/mod-test.c (Fmod_test_return_t)
+	(Fmod_test_sum, Fmod_test_signal, Fmod_test_throw)
+	(Fmod_test_non_local_exit_funcall, Fmod_test_globref_make)
+	(Fmod_test_string_a_to_b, Fmod_test_userptr_make)
+	(Fmod_test_userptr_get, Fmod_test_vector_fill)
+	(Fmod_test_vector_eq): Arg counts are ptrdiff_t, not int.
+	(finalizer): Remove; no longer used.
 
-	* etc/NEWS: Mark entry as documented.
+2015-11-20  Paul Eggert  
 
-2015-11-28  Eli Zaretskii  
+	Fix reindent-introduced typo in module code
 
-	Document the shorthand hints displayed by M-x
+	* src/emacs-module.c (MODULE_SETJMP_1): Fix typo that I
+	introduced while reindenting the code earlier, and add a
+	comment explaining the unusual use of do-while here.
 
-	* doc/emacs/m-x.texi (M-x): Document the numeric meaning of
-	suggest-key-bindings.  Document the shorthand hints for commands
-	that have no key bindings.  Document that M-x completion ignores
-	obsolete commands.
+2015-11-20  Anders Lindgren  
 
-	* etc/NEWS: Move the M-x entry to "Editing Changes" and mark it as
-	documented.
+	Fixed bug#19576: `write-file' saves wrong buffer.
 
-2015-11-28  Eli Zaretskii  
+	If a function on the hook `window-size-change-functions' doesn't
+	restore the current buffer, functions that save and restore the
+	current window configuration (like `y-or-no-p') could silently
+	change the current buffer.  When `write-file' asked the user
+	confirmation to overwrite a file, `y-or-no-p' changed the current
+	buffer, and the wrong buffer was saved to the file.
 
-	Update docs of character folding
+	* lisp/follow.el (follow-windows-start-end): Call `select-frame'
+	using the `norecord' parameter.
+	(follow-window-size-change): Restore current buffer. Call
+	`select-frame' using the `norecord' parameter. Cleanup.
 
-	* doc/emacs/search.texi (Lax Search): Update the description of
-	character folding for the latest changes.
+2015-11-20  John Wiegley  
 
-2015-11-28  Artur Malabarba  
+	Correct a documentation error in frames.texi
 
-	* lisp/character-fold.el: Also play nice with case-folding
+2015-11-20  Stephen Leake  
 
-	(character-fold-to-regexp): Take `case-fold-search' into account.
+	* lisp/cedet/mode-local.el: Delete obsolete comment
 
-2015-11-28  Artur Malabarba  
+2015-11-20  Paul Eggert  
 
-	* lisp/character-fold.el: Add support for multi-char matches
+	Module function arg counts are ptrdiff_t, not int
 
-	(character-fold-table): Now has an extra-slot. This is a second
-	char-table that holds multi-character matches.  See docstring for
-	details.
-	(character-fold-to-regexp): Can build branching regexps when a
-	character's entry the extra slot of `character-fold-table' matches the
-	characters that succeed it.
+	* src/emacs-module.c (struct module_fun_env)
+	(module_make_function, module_funcall, Fmodule_call):
+	* src/emacs-module.h (struct emacs_runtime, struct emacs_env_25):
+	Use ptrdiff_t, not int, for arg counts.
+	* src/emacs-module.c (module_make_function): Don’t bother
+	checking arity against MOST_POSITIVE_FIXNUM, as that’s
+	unnecessary here.  Make the checking clearer by negating it.
+	(module_make_function, Fmodule_call): No need to use xzalloc
+	since the storage doesn’t need to be cleared.
+	(module_funcall): Don’t use VLA, since C11 doesn’t guarantee support
+	for it, and many implementations are buggy with large VLAs anyway.
+	Use SAFE_ALLOCA_LISP instead.
+	(module_vec_set): Don’t crash if i < 0.
+	(module_vec_get): Don’t crash if i < MOST_NEGATIVE_FIXNUM.
+	(module_vec_set, module_vec_get): Do fixnum checks only when
+	i is out of array bounds, for efficiency in the usual case.
+	(Fmodule_load): Simplify fixnum range check.
+	(Fmodule_call): Simplify arity check.  Use xnmalloc to detect
+	integer overflow in array allocation size.
 
-2015-11-28  Artur Malabarba  
+2015-11-20  Eli Zaretskii  
 
-	* lisp/character-fold.el: Code simplifications
+	Minor improvements in module test
 
-	(character-fold-table): Reduce the scope of a variable.
-	(character-fold-to-regexp): Change logic to work directly on the
-	input string.  It's a little easier to understand, probably
-	faster, and sets us up for implementing multi-char matches.
+	* modules/mod-test/mod-test.c: Include stdlib.h, to avoid warnings
+	about missing prototype of malloc.
+	* modules/mod-test/Makefile (CFLAGS): Add -std=gnu99, to avoid
+	compiler warnings.
 
-	* test/automated/character-fold-tests.el
-	(character-fold--test-fold-to-regexp): New test.
+2015-11-20  Eli Zaretskii  
 
-2015-11-28  Eli Zaretskii  
+	Improve MS-Windows implementation in dynlib.c
 
-	Document changes in "C-h l"
+	* src/dynlib.c [WINDOWSNT]: Include errno.h, lisp.h, and w32.h.
+	No need to include windows.h, as w32.h already does that.
+	: New static variable.
+	(dynlib_reset_last_error): New function.
+	(dynlib_open): Convert forward slashes to backslashes.  Convert
+	file names from UTF-8 to either UTF-16 or the current ANSI
+	codepage, and call either LoadLibraryW or LoadLibraryA.  If the
+	argument is NULL, return a handle to the main module, like
+	'dlopen' does.  Record the error, if any, for use by dynlib_error.
+	(dynlib_sym): Check the handle for validity. Record the error, if
+	any, for use by dynlib_error.
+	(dynlib_error): Call w32_strerror to produce the error string, and
+	zero out the last error code, like dlerror does.
+	(dynlib_close): Check the handle for validity.  Record the error,
+	if any, for use by dynlib_error.  Don't call FreeLibrary with a
+	handle for the main module.
+	* src/w32.c (globals_of_w32): Call dynlib_reset_last_error.
 
-	* doc/emacs/help.texi (Misc Help): Document the changes in "C-h l".
+2015-11-20  Paul Eggert  
 
-	* etc/NEWS: mark "C-h l" changes as documented.
+	Include-file tweaks for modules
 
-2015-11-28  Eli Zaretskii  
+	* src/dynlib.c, src/emacs-module.c: Include  first.
+	* src/dynlib.h: Do not include config.h.
+	It’s every .c file’s responsibility to include config.h first.
+	* src/emacs-module.c: Include emacs-module.h immediately after
+	config.h, to test that emacs-module.h doesn’t depend on
+	include files other than config.h.
 
-	Finalize documentation of 'custom-prompt-customize-unsaved-options'
+2015-11-19  Paul Eggert  
 
-	* doc/emacs/custom.texi (Saving Customizations): Index the new
-	function 'custom-prompt-customize-unsaved-options'.
+	Simplify push_handler and profile its malloc
 
-	* etc/NEWS: Mention when 'custom-prompt-customize-unsaved-options'
-	is useful.
+	* src/lisp.h (PUSH_HANDLER): Remove.
+	All callers changed to use push_handler directly.
+	* src/eval.c (internal_condition_case)
+	(internal_condition_case_1, internal_condition_case_2)
+	(internal_condition_case_n):
+	Use same pattern as for other invokers of push_handler.
+	(push_handler, push_handler_nosignal): Use call-by-value
+	instead of call-by-reference.  All uses changed.
+	(push_handler): Simplify by rewriting in terms of
+	push_handler_nosignal.
+	(push_handler_nosignal): Profile any newly allocated memory.
 
-2015-11-28  Eli Zaretskii  
+2015-11-19  Paul Eggert  
 
-	Document 'comment-line'
+	* src/emacs-module.h: Include stddef.h, not stdlib.h.
 
-	* doc/emacs/programs.texi (Comment Commands): Document
-	'comment-line'.
+2015-11-19  Juanma Barranquero  
 
-	* etc/NEWS: Move the entry for 'comment-line' into "Editing Changes".
+	Discover repository version in linked worktrees (bug#21930)
 
-2015-11-28  Eli Zaretskii  
+	* lisp/version.el (emacs-repository--version-git-1): Do not assume
+	HEAD is at .git/HEAD, it can also be at .git/worktrees//HEAD.
+	(emacs-repository-get-version): Grok linked worktrees when EXTERNAL
+	is nil too.
 
-	Document new checkdoc features
+2015-11-19  Juri Linkov  
 
-	* doc/lispref/tips.texi (Tips, Library Headers): Document the
-	keyword-checking features of checkdoc and the commands
-	'checkdoc-file' and 'checkdoc-current-buffer'.
+	* lisp/replace.el (occur-regexp-descr): New function.
+	(occur-1, occur-engine): Use it.
 
-	* etc/NEWS: Move the checkdoc-related entries to their own
-	section.
+	* lisp/isearch.el (isearch-occur): Propertize regexp with
+	isearch-string and isearch-regexp-function-descr for
+	occur-regexp-descr to display the correct description
+	message in the header (bug#21176, bug#21180).
 
-2015-11-28  Philipp Stephani  
+2015-11-19  Karl Fogel  
 
-	Simplify the prologue of emacs-module.c functions
+	Revert `open-line' electric-indent sensitivity
 
-	* src/emacs-module.c (MODULE_FUNCTION_BEGIN): New macro.
-	(module_make_global_ref)
-	(module_free_global_ref, module_make_function, module_funcall)
-	(module_intern, module_type_of, module_extract_integer)
-	(module_make_integer, module_extract_float, module_make_float)
-	(module_copy_string_contents, module_make_string)
-	(module_make_user_ptr, module_get_user_ptr, module_set_user_ptr)
-	(module_get_user_finalizer, module_set_user_finalizer)
-	(module_vec_set, module_vec_get, module_vec_size): Use new helper
-	macro MODULE_FUNCTION_BEGIN.
+	* lisp/simple.el (open-line): Remove electric indent code.
+	  (electric-indent-just-newline): Don't declare.
 
-2015-11-28  Eli Zaretskii  
+	* test/automated/simple-test.el (open-line-indent): Adjust test.
 
-	Don't reject module calls with no arguments
+	This partly reverts Artur Malabarba's change that added electric
+	indent sensitivity to `open-line' (Oct 24 22:26:27 2015 +0100, git
+	commit bd4f04f86), and adjusts a new test he added right afterwards
+	(Sat Oct 24 23:43:06 2015 +0100, git commit 207f235e3) accordingly.
+	However, the new INTERACTIVE argument to `open-line', which he also
+	added in the first commit, is not reverted here.
 
-	* src/emacs-module.c (Finternal_module_call): Allow ARGLIST be nil.
+	See the thread "Questioning the new behavior of `open-line'." on the
+	Emacs Devel mailing list, and in particular this message:
 
-2015-11-28  Philipp Stephani  
+	  From: Artur Malabarba
+	  Subject: Re: Questioning the new behavior of `open-line'.
+	  To: Karl Fogel
+	  Cc: David Kastrup, Pierpaolo Bernardi, emacs-devel
+	  Date: Wed, 18 Nov 2015 21:03:58 +0000
+	  Message-ID: \
+	    
 
-	Make module-call be visible from Lisp
+	  https://lists.gnu.org/archive/html/emacs-devel/2015-11/msg01707.html
 
-	* src/emacs-module.c (module_make_function): Use internal--module-call.
-	(Finternal_module_call): Renamed from Fmodule_call.  Add safety
-	checks.
-	(syms_of_module): DEFSYM save-value-p and save-pointer-p.  Do
-	defsubr internal--module-call.
+2015-11-19  Paul Eggert  
 
-2015-11-28  Eli Zaretskii  
+	Omit unnecessary clear in Fmodule_load
 
-	Add etags tests for the recent Lua-related bugfix
+	* src/emacs-module.c (Fmodule_load):
+	Simplify and avoid unnecessary initialization of priv member to 0.
 
-	* test/etags/lua-src/test.lua: New file, tests the issues raised
-	by bug#21934.
-	* test/etags/Makefile (LUASRC): Add test.lua.
-	* test/etags/ETAGS.good_1:
-	* test/etags/ETAGS.good_2:
-	* test/etags/ETAGS.good_3:
-	* test/etags/ETAGS.good_4:
-	* test/etags/ETAGS.good_5:
-	* test/etags/ETAGS.good_6:
-	* test/etags/CTAGS.good: Adapt to the new Lua test.  Also, an old
-	regression fix, resolved around 25 May 2015, required changes to
-	the "good" ETAGS files.
+	* src/emacs-module.c: (module_vec_set, module_vec_get, module_vec_size)
 
-2015-11-28  Eli Zaretskii  
+2015-11-19  Paul Eggert  
 
-	Fix Lua tags when a function name includes '.' or ':'
+	Prefer signed integer types in module code
 
-	* lib-src/etags.c (Lua_functions): Add a tag for the last element
-	of a function name after a dot or a colon.  (Bug#21934)
+	Generally speaking, at the C level the Emacs source code prefers
+	signed types like ‘ptrdiff_t’ to unsigned types like ‘size_t’,
+	partly to avoid the usual signedness confusion when comparing values.
+	Change the module API to follow this convention.
+	Use ‘int’ for small values that can’t exceed INT_MAX.
+	* modules/mod-test/mod-test.c (Fmod_test_globref_make)
+	(Fmod_test_string_a_to_b, Fmod_test_vector_fill)
+	(Fmod_test_vector_eq):
+	* src/emacs-module.c (struct emacs_value_frame)
+	(module_make_global_ref, module_free_global_ref)
+	(module_copy_string_contents, module_make_string)
+	(module_vec_set, module_vec_get, module_vec_size):
+	* src/emacs-module.h (struct emacs_runtime, struct emacs_env_25):
+	* src/lread.c (suffix_p):
+	Prefer signed to unsigned integer types.
 
-2015-11-28  Eli Zaretskii  
+2015-11-19  Paul Eggert  
 
-	Improve documentation of search and replace commands
+	Omit ‘const’ on locals
 
-	* doc/emacs/search.texi (Replacement and Lax Matches): Document
-	which commands are affected by 'replace-character-fold'.
-	(Lax Search): Add a cross reference to "Replacement and Lax
-	Matches".  Improve wording.  Fix lost extra whitespace.
-	(Search Customizations): Improve wording.  (Bug#22036)
-	See also comments in
-	http://lists.gnu.org/archive/html/emacs-devel/2015-11/msg02376.html.
+	Remove ‘const’ qualifier from locals that were newly added.
+	We don’t normally bother declaring locals with ‘const’ even
+	though they are not modified, for the same reason we don’t
+	bother declaring them with ‘register’ even though their
+	addresses are not taken; the advantage in compile-time
+	checking isn’t worth the loss of readability.
+	* modules/mod-test/mod-test.c (Fmod_test_non_local_exit_funcall)
+	(Fmod_test_vector_fill, Fmod_test_vector_eq):
+	* src/emacs-module.c (MODULE_SETJMP_1)
+	(module_make_global_ref, module_free_global_ref)
+	(module_non_local_exit_get, module_make_function)
+	(module_extract_integer, module_extract_float)
+	(module_get_user_ptr, module_set_user_ptr)
+	(module_get_user_finalizer, module_set_user_finalizer)
+	(module_vec_get, Fmodule_call)
+	(module_non_local_exit_signal_1)
+	(module_non_local_exit_throw_1, lisp_to_value)
+	(finalize_storage, allocate_emacs_value, mark_modules)
+	(module_handle_signal, module_handle_throw)
+	(module_format_fun_env):
+	* src/eval.c (push_handler, push_handler_nosignal)
+	(init_handler):
+	* src/lread.c (suffix_p):
+	Omit unnecessary ‘const’.
 
-	* lisp/replace.el (query-replace, query-replace-regexp)
-	(query-replace-regexp-eval, replace-string, replace-regexp):
-	Mention 'replace-character-fold' in the doc strings.
+2015-11-19  Paul Eggert  
 
-2015-11-28  Paul Eggert  
+	Prefer intmax_t to int64_t in module code
 
-	Fix minor problems found by static checking
+	* modules/mod-test/mod-test.c (sum, Fmod_test_sum):
+	* src/emacs-module.c (module_extract_integer)
+	(module_make_integer):
+	* src/emacs-module.h (struct emacs_env_25):
+	Prefer intmax_t to int64_t.  This doesn’t change the generated
+	code on any of the machines Emacs currently ports to, but it’s
+	at least in theory more future-proof as C99 doesn’t guarantee
+	that int64_t exists.
 
-	* src/undo.c (prepare_record): Add proper prototype for C.
+2015-11-19  Paul Eggert  
 
-2015-11-27  Stefan Monnier  
+	Rename module.c to emacs-module.c, etc.
 
-	* src/emacs-module.c (struct env_storage): Delete
+	* src/emacs-module.c: Rename from src/module.c.
+	* src/emacs-module.h: Rename from src/module.h.
+	All uses changed.
 
-	(struct emacs_runtime_private): Keep an emacs_env instead.
-	(Fmodule_load, Fmodule_call): Declare emacs_env_private separately.
-	(initialize_environment): Split the arg in two.	 Adjust all callers.
-	Only store the private part in Vmodule_environments.
-	(finalize_environment): Change the arg to only be the private env.
-	Adjust all callers.
+2015-11-19  Paul Eggert  
 
-2015-11-27  Eli Zaretskii  
+	Fix minor module problems found by static checking
 
-	Improve documentation of 'replace-character-fold'
+	* src/dynlib.c (dynlib_close): #ifdef out for now, as it’s not used.
+	* src/eval.c, src/lisp.h (lisp_eval_depth): Now static.
+	* src/module.c (Fmodule_load): Fix pointer signedness bug.
+	(Fmodule_call): Tell GCC that the default case is unreachable.
 
-	* lisp/replace.el (replace-character-fold): Clarify which commands
-	are affected by this variable.
+2015-11-19  Paul Eggert  
 
-2015-11-27  Mark Oteiza  
+	Style fixes for indenting etc. in module code
 
-	Backport: Add interactive seek command.
+	This is mostly indenting and spacing changes.  Also, remove
+	some unnecessary static decls instead of bothering to reindent them.
+	* src/module.h (EMACS_EXTERN_C_BEGIN): Remove, and do this inline,
+	as most other Emacs files do for this sort of thing.
 
-	* lisp/mpc.el (mpc-cmd-seekcur): New function.
-	(mpc-seek-current): New command.
-	(mpc-mode-menu): Add entry for mpc-seek-current
-	(mpc-mode-map): Bind mpc-seek-current to "g"
+2015-11-19  Eli Zaretskii  
 
-2015-11-27  Dmitry Gutov  
+	Minor improvements in modules testing Makefile
 
-	Autoload etags when using its xref backend
+	* modules/mod-test/Makefile (EMACS, SO): New variables.
+	(CFLAGS): When SO = dll, don't use -fPIC.
+	(check): New target, runs the test.
 
-	* lisp/progmodes/xref.el (xref--etags-backend):
-	Rename to etags--xref-backend.  Move to etags.el.  Autoload.
-	(Bug#22026)
+2015-11-19  Eli Zaretskii  
 
-2015-11-27  Artur Malabarba  
+	* .gitignore: Add "*.dll".
 
-	* lisp/character-fold.el: Allow complex chars to match their decomposition
+2015-11-19  Paul Eggert  
 
-	(character-fold-table): When a character's decomposition does not
-	involve a formatting tag (i.e., if it has an "exact" description via
-	other characters), then this character is allowed to match the
-	decomposition.
+	Migrate modules/.gitignore into .gitignore
 
-2015-11-27  Artur Malabarba  
+	* .gitignore: Add former contents of modules/.gitignore.
+	* modules/.gitignore: Remove.
 
-	* lisp/character-fold.el: More descriptive variable names
+2015-11-19  Paul Eggert  
 
-	(character-fold-table): Rename a lot of the lexical variables to
-	make the code easier to read.
+	Add copyright notices to module code
 
-2015-11-27  Artur Malabarba  
+	Put them in the usual format for GNU Emacs copyright notices.
 
-	* lisp/isearch.el: Ensure we still support `isearch-new-word'
+2015-11-19  Paul Eggert  
 
-	(isearch-new-regexp-function): Define variable.
-	(isearch-new-word): Define as an obsolete alias. (Bug#22018)
+	Rename emacs_module.h to module.h
 
-2015-11-27  Eli Zaretskii  
+	* src/module.h: Rename from src/emacs_module.h.
+	All uses changed.
 
-	Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25
+2015-11-19  Juanma Barranquero  
 
-2015-11-27  Lee Bochicchio  
+	* src/module.c (Fmodule_load): Remove unused vars `doc_name', `args'
 
-	* test/automated/abbrev-tests.el: Define more tests
+	* src/lread.c (Fload): Remove unused variable `size'
 
-	(abbrev-table-name-test, kill-all-abbrevs-test)
-	(clear-abbrev-table-test): New tests.
+2015-11-19  Alan Mackenzie  
 
-2015-11-27  Eli Zaretskii  
+	src/keyboard.c (pre-command-hook): Fix typo in doc string: "pre" -> "post".
 
-	Add module tests for wrong-type-argument
+2015-11-18  Dmitry Gutov  
 
-	* modules/mod-test/test.el (mod-test-sum-test): Add tests for
-	wrong-type-argument.
+	Prioritize looking inside vc-parent-buffer over log-view-mode fallback
 
-2015-11-27  Eli Zaretskii  
+	* lisp/vc/vc.el (vc-deduce-fileset): Prioritize looking inside
+	vc-parent-buffer over log-view-mode fallback (bug#21955).
 
-	Improve handling of signals and 'throw' in modules
+2015-11-18  Alan Mackenzie  
 
-	* src/emacs-module.c: Add commentary explaining how to write
-	functions in this file.
-	(module_make_global_ref, module_free_global_ref)
-	(module_non_local_exit_signal, module_non_local_exit_throw)
-	(module_make_function, module_funcall, module_intern)
-	(module_type_of, module_is_not_nil, module_eq)
-	(module_extract_integer, module_make_integer)
-	(module_extract_float, module_make_float)
-	(module_copy_string_contents, module_make_string)
-	(module_make_user_ptr, module_get_user_ptr, module_set_user_ptr)
-	(module_get_user_finalizer, module_set_user_finalizer)
-	(module_vec_set, module_vec_get, module_vec_size)
-	(module_non_local_exit_signal_1, module_non_local_exit_throw_1):
-	Do nothing and return with failure indication immediately, if some
-	previous module call signaled an error or wants to throw.  See
-	http://lists.gnu.org/archive/html/emacs-devel/2015-11/msg02133.html
-	for the relevant discussions.
+	lisp/isearch.el: Eliminate macro isearch-call-message, replacing with funcall.
 
-2015-11-27  Eli Zaretskii  
+2015-11-18  Ken Brown  
 
-	Add ':version' tag to 'checkdoc-package-keywords-flag'
+	* configure.ac (LIBMODULES): Don’t define on Cygwin
 
-	* lisp/emacs-lisp/checkdoc.el (checkdoc-package-keywords-flag):
-	Add a ':version' tag.
+2015-11-18  Eli Zaretskii  
 
-2015-11-27  Eli Zaretskii  
+	Fix MS-Windows build --with-modules
 
-	Improve documentation of 'eval-buffer' and 'eval-region'
+	* src/module.c: Reformat copyright commentary.
+	(module_vec_get): Use explicit cast to size_t to avoid compiler
+	warning in 32-bit builds.
+	(check_main_thread) [WINDOWSNT]: Fix letter-case in Windows APIs.
+	Compare thread IDs directly, as GetThreadId is not available
+	before Windows Vista.
+	(check_main_thread) [WINDOWSNT]: Duplicate the thread handle
+	without using APIs and constants not available on XP and older
+	systems.  Obtain and store the thread ID as well.
 
-	* src/lread.c (Feval_buffer, Feval_region): Doc fixes.  (Bug#22023)
+2015-11-18  Aurélien Aptel  
+	    Philipp Stephani  
 
-	* doc/lispref/eval.texi (Eval): Mention narrowing to clarify
-	"accessible portion of buffer".
+	Add dynamic module test and helper script
 
-2015-11-27  Eli Zaretskii  
+	Add 'modhelp.py' script (python2) to automate module testing and
+	module generation.
 
-	Unbreak the Cygwin w32 build
+	To build and test all modules in the modules/ dir
+	  $ ./modhelp.py test
 
-	* src/emacs.c (main): Call w32_init_main_thread in the Cygwin w32
-	build as well.  Reported by Andy Moreton .
+	To generate a module from template code (good starting point)
+	  $ ./modhelp init mynewtestmodule
 
-2015-11-27  Eli Zaretskii  
+	See the script -h option for more documentation.
 
-	Improve commentary in character-fold.el
+	* modules/modhelp.py: New module helper script.
+	* modules/mod-test/Makefile: New file. Makefile for the test module.
+	* modules/mod-test/mod-test.c: New file. Test module source file.
+	* modules/mod-test/test.el: New file. ert test suite for the test module.
+	* modules/.gitignore: New file. Local .gitignore file.
 
-	* lisp/character-fold.el (character-fold-to-regexp): Move detailed
-	description from commit log message to comments.  (Bug#22019)
+2015-11-18  Aurélien Aptel  
 
-2015-11-26  Alan Mackenzie  
+	Make 'Fload' look for modules
 
-	Byte Compiler: generate code to adjust stack count after call to `signal'.
+	'Fload' can now load dynamic modules. This also makes 'require' work.
 
-	Corrects change from earlier today.
+	* src/lread.c:
+	  (suffix_p): New function.
+	  (Fload): Use 'suffix_p'.  Call 'Fmodule_load' when we try to load a file
+	  with a module suffix.
+	  (syms_of_lread): Append module suffix to 'Vload_suffixes'.
 
-	* lisp/emacs-lisp/bytecomp.el (byte-compile-setq): supply the current value of
-	`byte-compile--for-effect' as argument to `byte-compile-form'.
+2015-11-18  Aurélien Aptel  
+	    Philipp Stephani  
 
-2015-11-26  Eli Zaretskii  
+	Add dynamic module module support
 
-	Improve commentary of prepare_to_modify_buffer_1
+	* configure.ac: Add '--with-modules' option.  Conditionally add
+	  dynlib.o and module.o to the list of objects.  Add any system
+	  specific flags to the linker flags to support dynamic libraries.
+	* m4/ax_gcc_var_attribute.m4: Add autoconf extension to test gcc
+	  attributes.
+	* src/Makefile.in: Conditionally add module objects and linker flags.
+	* src/alloc.c (garbage_collect_1): protect module local values from
+	  GC.
+	* src/lisp.h: Add 'module_init' and 'syms_of_module' prototypes.
+	* src/emacs_module.h: New header file included by modules.  Public
+	  module API.
+	* src/module.c: New module implementation file.
 
-	* src/insdel.c (prepare_to_modify_buffer_1): Mention in commentary
-	that this function runs Lisp.  Suggested by Richard Stallman
-	.
+2015-11-18  Aurélien Aptel  
 
-2015-11-26  Phillip Lord  
+	Add new User Pointer (User_Ptr) type
 
-	Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
+	* src/lisp.h: Add new Lisp_Misc_User_Ptr type.
+	(XUSER_PTR): New User_Ptr accessor.
+	* src/alloc.c (make_user_ptr): New function.
+	(mark_object, sweep_misc): Handle Lisp_Misc_User_Ptr.
+	* src/data.c (Ftype_of): Return 'user-ptr' for user pointer.
+	(Fuser-ptrp): New user pointer type predicate function.
+	(syms_of_data): New 'user-ptrp', 'user-ptr' symbol.  New 'user-ptrp'
+	subr.
+	* src/print.c (print_object): Add printer for User_Ptr type.
 
-2015-11-26  Phillip Lord  
+2015-11-18  Aurélien Aptel  
+	    Philipp Stephani  
 
-	Fix regression after merge.
+	Add portable layer for dynamic loading
 
-	 * src/undo.c (prepare_record): Remove call to run_undoable_change.
+	* src/dynlib.h: New file.
+	* src/dynlib.c: New file.
 
-2015-11-26  Phillip Lord  
+2015-11-18  Philipp Stephani  
 
-	After delete, record point location in undo.
+	Add catch-all & no-signal version of PUSH_HANDLER
 
-	Addresses Bug #21968.
+	Ground work for modules. Add a non-signaling version of PUSH_HANDLER and
+	a new "catch-all" handler type.
 
-		* lisp/simple.el (undo-auto--add-boundary): Clean up code to
-		better support intercalating calls.
-		* src/keyboard.c, src/keyboard.h (command_loop_1): Store value of
-		point and current buffer before each command.
-		* src/undo.c (record_point): Now only record the point.
-		* src/undo.c (prepare_record): Functionality removed form
-		record_point.
-		* src/undo.c (record_delete): Check if point needs recording.
-		* src/undo.c (undo-boundary): Record value of point before each
-		boundary.
-		* test/automated/simple-test.el: New tests.
+	* src/eval.c (init_handler, push_handler, push_handler_nosignal): New
+	  functions.
+	* src/fns.c (hash_remove_from_table): Expose function public.
+	* src/lisp.h: New handler type, define macro to push_handler call.
 
-	Conflicts:
-		src/undo.c
+2015-11-18  Ken Brown  
 
-2015-11-26  Eli Zaretskii  
+	Silence byte-compiler warning
 
-	Fix compiler warnings in w32.c
+	* lisp/server.el (server-process-filter): Silence byte-compiler
+	warning.
 
-	* src/w32.c (sys_socket): In case of error, use -1 as return
-	value, not INVALID_SOCKET, which causes compiler warnings.
-	(maybe_load_unicows_dll): Cast the return value of GetProcAddress
-	to the appropriate function signature, to avoid compiler errors.
-	Reported by Andy Moreton .  (Bug#21953)
+2015-11-18  Paul Eggert  
 
-2015-11-26  Dmitry Gutov  
+	Quote symbols in docstrings using `'
 
-	Check if the file exists on disk before producing the revert diff
+	Be more systematic about quoting symbols `like-this' rather than
+	`like-this or 'like-this' in docstrings.  This follows up Artur
+	Malabarba's email in:
+	http://lists.gnu.org/archive/html/emacs-devel/2015-11/msg01647.html
 
-	* lisp/vc/vc-dispatcher.el (vc-buffer-sync): Check if the file
-	exists on disk (bug#20558).
+2015-11-18  Peder O. Klingenberg  
 
-2015-11-26  Alan Mackenzie  
+	Fix savegames in dunnet
 
-	Byte compiler: on setq with an odd number of arguments, generate a `signal'
+	* lisp/play/dunnet.el (dun-rot13): Use the standard rot13-region instead
+	  of separate implementation.
 
-	* lisp/emacs-lisp/cconv.el (cconv-convert): Don't transform `setq' form when
-	it has an odd number of arguments, to allow bytecomp to handle the error.
+2015-11-18  Artur Malabarba  
 
-	* lisp/emacs-lisp/bytecomp.el (byte-compile-setq): In a `setq' form with an
-	odd number of arguments, generate a `signal' instead of the normal code.
+	* lisp/emacs-lisp/package.el (package--with-response-buffer):
 
-2015-11-26  Dmitry Gutov  
+	Ensure we're at the start of the buffer before searching for
+	the end of headers.
 
-	Use find-tag-default for xref-backend-identifier-at-point
+2015-11-17  Xue Fuqiao  
 
-	* lisp/progmodes/etags.el (find-tag-tag)
-	(tags-completion-at-point-function): Extract common code as
-	find-tag--default.
-	(xref-backend-identifier-at-point): Define in terms of the new
-	function.
+	* admin/release-process: Improve wording.
 
-2015-11-26  Paul Eggert  
+2015-11-17  Paul Eggert  
 
-	* src/undo.c (record_property_change): Remove now-unused local.
+	Fix docstring quoting problems with ‘ '’
 
-2015-11-25  Phillip Lord  
+	Problem reported by Artur Malabarba in:
+	http://lists.gnu.org/archive/html/emacs-devel/2015-11/msg01513.html
+	Most of these fixes are to documentation; many involve fixing
+	longstanding quoting glitches that are independent of the
+	recent substitute-command-keys changes.  The changes to code are:
+	* lisp/cedet/mode-local.el (mode-local-augment-function-help)
+	(describe-mode-local-overload):
+	Substitute docstrings before displaying them.
+	* lisp/emacs-lisp/cl-macs.el (cl--transform-lambda):
+	Quote the generated docstring for later substitution.
 
-	run_undoable_changes now called from insdel.
+2015-11-17  Eli Zaretskii  
 
-	The original calls from inside undo.c are not always at a safe position
-	to call lisp, as they originate in varied positions within insdel.c.
-	Calling them directly from prepare_to_modify_buffer_1 ensures that they
-	are always run at the same point.
+	Improve configure --help text for wide ints
 
-	 * src/undo.c (run_undoable_changes,syms_of_undo): Remove function
-	 and symbol used.
-	 * src/insdel.c (run_undoable_changes): Add function and symbol.
+	* configure.ac (wide-int): Clarify user-level advantages and
+	disadvantages.
 
-2015-11-25  Eli Zaretskii  
+2015-11-17  Stephen Leake  
 
-	Improve and update documentation of search commands
+	Improve doc string
 
-	* doc/emacs/search.texi (Lax Search): Renamed from "Search Case";
-	all references changed.  Move the description of lax-whitespace
-	here.  Add description of the new character folding features and
-	additional customizable options.
-	(Isearch Yank): Move before "Error in Search".
-	(Basic Isearch): Improve wording.  Add index entries.  Add short
-	description of how to abandon search, making this subsection a
-	complete introduction to search basics.
-	(Repeat Isearch): Add index entries.  Describe additional
-	customizable options.  Describe mouse clicks.
-	(Isearch Yank): Add index entries.  Describe mouse-2 click in echo
-	area.  Describe more customizable options.
-	(Error in Isearch): Add index entries.
-	(Special Isearch): Move actual description of some isearch
-	commands to other sections, leaving here just the summary of the
-	commands.  Add command that toggles character folding.  Describe
-	commands, like "C-h C-h", that were previously omitted for some
-	reason.
-	(Not Exiting Isearch): Describe search-exit-option.  Add index
-	entries.
-	(Word Search): Describe eww-search-word and eww-search-prefix.
-	(Symbol Search): Add index entries.
-	(Regexp Search): Describe regexp-search-ring-max.
-	(Replacement and Lax Matches): Renamed from "Replacement and
-	Case"; all references changed.  Describe lax-whitespace matching
-	in replace commands and related options.  Describe character
-	folding in replace commands and related options.
-	(Query Replace): Describe query-replace-from-to-separator and the
-	new history features.  Add index entries for highlighted text.
-	Describe query-replace-skip-read-only.  Describe more keys
-	accepted by query-replace.
-	(Other Repeating Search): More index entries for Occur.  Describe
-	list-matching-lines-default-context-lines.
-	(Search Customizations): New section, documents customizable
-	options that were not documented until now.
-	* doc/emacs/glossary.texi (Glossary): Add "Case Folding" and
-	"Character Folding".
+	* lisp/progmodes/xref.el (xref-backend-references): Improve doc string.
 
-	* etc/NEWS: Move search- and replace-related entries to a single
-	parent section.
+2015-11-17  Paul Eggert  
 
-	* lisp/replace.el (query-replace-show-replacement): Doc fix.
-	* lisp/isearch.el (search-nonincremental-instead)
-	(isearch-hide-immediately): Doc fixes.
+	eval_sub followed dangling pointer when debugging
 
-2015-11-25  Katsumi Yamaoka  
+	Problem reported by Pip Cet (Bug#21245).
+	This bug could occur in eval_sub if the C compiler reused
+	storage associated with the ‘argvals’ local after ‘argvals’
+	went out of scope, and if the Elisp debugger stopped on Elisp
+	function exit and accessed ‘argvals’.  It could also occur if
+	a variadic function was called with so many arguments (over
+	2048 args on x86-64) that SAFE_ALLOCA_LISP called malloc, then
+	SAFE_FREE freed the arguments, then the memory manager used
+	the storage for other purposes, then the debugger accessed the
+	arguments.
+	* src/eval.c (eval_sub): Declare ‘argvals’ at top level of
+	function body.	Simplify local decls.
+	When allocating args via SAFE_ALLOCA, call
+	debugger before invoking SAFE_FREE, as the debugger needs
+	access to the args.
+	(eval_sub, apply_lambda): Rework to avoid need for
+	set_backtrace_debug_on_exit hack.  This is cleaner,
+	and should work better with buggy custom debuggers.
 
-	Remove nnml-retrieve-groups that is unnecessary and somewhat problematic
+2015-11-16  Daiki Ueno  
 
-	* lisp/gnus/nnml.el (nnml-retrieve-groups): Remove.  See:
-	 and
-	
+	* lisp/image-mode.el: Support encrypted file
 
-2015-11-25  Paul Eggert  
+	(image-toggle-display-image): Read content from the buffer instead
+	of the file, if the buffer holds a decrypted data.  (Bug#21870)
 
-	Fix module_format_fun_env when dynlib_addr fails
+2015-11-16  Paul Eggert  
 
-	* src/emacs-module.c (module_format_fun_env):
-	exprintf doesn’t support %p, so use %x.  Reported by Eli Zaretskii in:
-	http://lists.gnu.org/archive/html/emacs-devel/2015-11/msg02122.html
+	ELF unexec: align section header
 
-2015-11-25  Paul Eggert  
+	This ports the recent unexelf.c changes to Fedora x86-64
+	when configured with GCC’s -fsanitize=undefined option.
+	* src/unexelf.c (unexec): Align new_data2_size to a multiple
+	of ElfW (Shdr)’s alignment, so that NEW_SECTION_H returns a
+	pointer aligned appropriately for its type.
 
-	Disambiguate variable help a bit better
+2015-11-16  Andreas Schwab  
 
-	* lisp/help-fns.el (describe-variable): Quote the
-	variable’s value if it is a symbol other than t or nil.
-	See: T.V Raman in:
-	http://lists.gnu.org/archive/html/emacs-devel/2015-11/msg02147.html
+	Do more checks on bytecode objects (Bug#21929)
 
-2015-11-25  Dmitry Gutov  
+	* src/eval.c (funcall_lambda): Check size of compiled function
+	object.
+	(Ffetch_bytecode): Likewise.
 
-	Pass SVN commit message through log-edit-extract-headers
+2015-11-16  Johan Bockgård  
 
-	* lisp/vc/vc-svn.el (vc-svn-checkin): Pass COMMENT through
-	log-edit-extract-headers (bug#18954).
+	pcase.el: Fix edebugging of backquoted cons patterns
 
-2015-11-24  Alan Mackenzie  
+	* lisp/emacs-lisp/pcase.el (pcase-QPAT): Fix edebugging of backquoted
+	cons patterns. (Bug#21920)
 
-	CC Mode: Eliminate compiler warning messages.
+2015-11-16  Paul Eggert  
 
-	* lisp/progmodes/cc-mode.el (top level): remove compile time declaration of
-	`font-lock-syntactic-keywords' (which CC Mode doesn't use).
-	* lisp/progmodes/cc-awk.el (awk-mode-syntax-table)
-	(c-awk-set-syntax-table-properties): Clarify comments about
-	`font-lock-syntactic-keywords'.
+	Improve fix for regex reentrancy abort
 
-	* lisp/progmodes/cc-bytecomp.el (cc-bytecomp-load): Create a dummy declaration
-	of this before the real (interpreted) one, to satisfy the byte compiler.
+	Suggested by Stefan Monnier (Bug#21688).
+	* src/syntax.c (update_syntax_table_forward):
+	Remove recently-added PROPERTIZE arg, and assume it is true.
+	All callers changed.
+	* src/syntax.h (UPDATE_SYNTAX_TABLE_FORWARD_FAST):
+	Invoke update_syntax_table directly.
 
-2015-11-24  Simen Heggestøyl  
+2015-11-16  Artur Malabarba  
 
-	Extend the test suite for json.el
+	* lisp/faces.el (faces--attribute-at-point): Use `face-list-p'
 
-	* lisp/json.el (json-plist-p): Clarify docstring.
+	* lisp/emacs-lisp/package.el (package--with-response-buffer): Missing require
 
-	* test/automated/json-tests.el (json-tests--with-temp-buffer): New
-	macro.
-	(test-json-join, test-json-alist-p)
-	(test-json-plist-p, test-json-advance, test-json-peek)
-	(test-json-pop, test-json-skip-whitespace)
-	(test-json-read-keyword, test-json-encode-keyword)
-	(test-json-read-number, test-json-encode-number)
-	(test-json-read-escaped-char, test-json-read-string)
-	(test-json-encode-string, test-json-encode-key)
-	(test-json-new-object, test-json-add-to-object)
-	(test-json-read-object, test-json-encode-list)
-	(test-json-read-array, test-json-encode-array)
-	(test-json-read, test-json-read-from-string)
-	(test-json-encode): New tests.
-	(json-read-simple-alist): Merged into `test-json-read-object'.
-	(json-encode-string-with-special-chars): Merged into
-	`test-json-encode-string'.
-	(json-read-string-with-special-chars): Split into
-	`test-json-encode-string' and `test-json-read-from-string'.
+	* lisp/emacs-lisp/nadvice.el (add-function): Escape quote
 
-2015-11-24  Anders Lindgren  
+2015-11-15  Vasily Korytov  
 
-	Fixed bug#18283: Enable applescript in NextStep.
+	Recognize .rbw and .pyw files (bug#18753)
 
-	* nextstep/templates/Info.plist.in: Set NSAppleScriptEnabled to YES.
+	* lisp/progmodes/python.el (auto-mode-alist):
+	Recognize .pyw files.
 
-2015-11-24  Eli Zaretskii  
+	* lisp/progmodes/ruby-mode.el (auto-mode-alist):
+	Recognize .rbw files.
 
-	Allow completion on dynamic module files in load-library
+2015-11-15  Dmitry Gutov  
 
-	* lisp/files.el (load-library): Bind completion-ignored-extensions
-	to nil, to allow completion on dynamic modules typed as file
-	names.  Reported by Andy Moreton .
+	Fix ruby-mode auto-mode-alist entry
 
-2015-11-24  Alan Mackenzie  
+	* lisp/progmodes/ruby-mode.el (auto-mode-alist): Add grouping
+	around the extensions (bug#21257).
 
-	CC Mode: eliminate almost all byte compilation warnings
+2015-11-15  Dmitry Gutov  
 
-	* lisp/progmodes/cc-bytecomp.el (cc-bytecomp-noruntime-functions): Remove.
-	(cc-require): Remove the crude hack that saved and restored
-	byte-compile-noruntime-functions.
-	(cc-conditional-require, cc-conditional-require-after-load): New macros.
+	Fix etags completion near eob
 
-	* lisp/progmodes/cc-defs.el (top level): Reformulate code which loaded
-	cc-fix.el using the new macros in cc-bytecomp.el.
+	* lisp/progmodes/etags.el (tags-completion-at-point-function):
+	Use `goto-char', to avoid the end-of-buffer error (bug#20061).
 
-	* lisp/progmodes/cc-langs.el (c++-template-syntax-table)
-	(c-no-parens-syntax-table): Add extra "(eval ..)"s around "'(lambda ..)"
-	forms to remove the superflous quotes.
+2015-11-15  Alan Mackenzie  
 
-2015-11-24  Eli Zaretskii  
+	De-pessimize detection of C++ member initialization lists.
 
-	Add one more mod-test test
+	list/progmodes/cc-engine.el (c-back-over-list-of-member-inits): New macro.
+	(c-back-over-member-initializers): Reformulate such that c-at-toplevel-p
+	is only called when a construct "looks right" rather than continually.
+	(c-guess-basic-syntax, CASE 5R): Add a check for the mode being C++ Mode.
 
-	* modules/mod-test/test.el (mod-test-sum-test): Test the error
-	signaled when the function is invoked with a wrong number of
-	arguments.
+2015-11-15  Stephen Leake  
 
-2015-11-24  Philipp Stephani  
+	Improve a few doc strings, comments
 
-	* modules/mod-test/mod-test.c (Fmod_test_sum): Verify there are 2 args.
+	* lisp/cedet/cedet-global.el (cedet-gnu-global-expand-filename):
+	* lisp/cedet/ede/locate.el (ede-locate-base):
+	* lisp/cedet/semantic/symref.el (semantic-symref-calculate-rootdir):
+	* src/fns.c (Fdelq): Improve doc string.
 
-2015-11-24  Eli Zaretskii  
+	* lisp/progmodes/elisp-mode.el (elisp--xref-find-definitions): Add FIXME.
 
-	Implement dynlib_addr for MS-Windows
+2015-11-15  Anders Lindgren  
 
-	* src/dynlib.c [WINDOWSNT]: Include w32common.h.
-	 [WINDOWSNT]: New static variable.
-	(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS)
-	(GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT) [WINDOWSNT]: Define
-	if undefined.
-	(dynlib_reset_last_error): Reset g_b_init_get_module_handle_ex to
-	zero.
-	(dynlib_addr) [WINDOWSNT]: Non-trivial implementation to report
-	the full file name of the module for a given address.
+	Enhance NSTRACE (trace output for NextStep).
 
-2015-11-24  Alan Mackenzie  
+	Trace can be disabled for groups of functions. By default, event
+	functions and functions that generate lots of output are disabled.
 
-	Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
+	Trace output of Objective-C functions now use the "[ClassName
+	parameter:]" form.
 
-2015-11-24  Alan Mackenzie  
+	* src/nsterm.h (NSTRACE_ALL_GROUPS, NSTRACE_GROUP_EVENTS)
+	(NSTRACE_GROUP_UPDATES, NSTRACE_GROUP_FRINGE, NSTRACE_GROUP_COLOR)
+	(NSTRACE_GROUP_GLYPHS, NSTRACE_GROUP_FOCUS): New macros,
+	controlling in which function groups trace should be active.
+	(NSTRACE_WHEN): Support for silencing a function, this also
+	silencing all called functions.
+	(NSTRACE_UNSILENCE): New macro, used to re-enable trace.
+	(NSTRACE_FMT_FSTYPE, NSTRACE_ARG_FSTYPE): New macros, used to
+	print the full screen state in NSTRACE functions.
 
-	Squashed commit of the following:
+	* src/nsterm.m (nstrace_depth, nstrace_num): Made volatile as they
+	can be accessed from multiple threads.
+	(nstrace_enabled_global): New variable, when FALSE, trace is
+	silenced.
+	(nstrace_restore_global_trace_state): New function, used to
+	restore `nstrace_enabled_global' at end of block.
+	([EmacsView setFrame:], [EmacsWindow setFrame:display:])
+	([EmacsWindow setFrame:display:animation:])
+	([EmacsWindow setFrameTopLeftPoint:]): New functions, print trace
+	and call corresponding super function.
+	(Many functions): Add or enhance trace output.
 
-	commit e1ecf76585bef2eb87995f7a7f92cc12003a6f70
-	Author: Alan Mackenzie 
-	Date:   Tue Nov 24 16:50:09 2015 +0000
+	* src/nsimage.m (ns_image_from_file): Enhanced trace output.
 
-	    Byte compile: minor amendments.
+	* src/nsfns.m (x_set_tool_bar_lines): Add trace output.
 
-	    * lisp/emacs-lisp/bytecomp.el (byte-compile-initial-macro-environment):
-	    add a comment to explain the binding of variables around a subsidiary
-	    compilation.
-	    (byte-compile-new-defuns): Amend the doc string.
+	* src/nsmenu.m ([EmacsToolbar setVisible:]): New function, print trace
+	and call corresponding super function.
 
-	commit c537bfed1dda1593d218956ff00c6105a3ff0316
-	Author: Alan Mackenzie 
-	Date:   Sat Nov 21 18:43:57 2015 +0000
+2015-11-15  Anders Lindgren  
 
-	    Byte compiler: fix spurious warnings "might not be defined at runtime".
+	Fixed a toolbar related issue on OS X.
 
-	    Also initialize byte-compile-noruntime-functions between runs.
+	Earlier, when toggling the tool-bar in a maximized frame, the
+	frame size didn't match the number of text lines, leaving an
+	unused area at the bottom of the frame.
 
-	    * lisp/emacs-lisp/bytecomp.el (byte-compile-new-defuns): New variable.
-	    (byte-compile-initial-macro-environment): For eval-when-compile: bind
-	    byte-compile-unresolved-functions and byte-compile-new-defuns around
-	    byte-compile-top-level, to prevent spurious entries being made.
-	    (byte-compile-warn-about-unresolved-functions): Check whether function is
-	    in byte-compile-new-defuns before emitting a warning about it.
-	    (byte-compile-from-buffer): Initialize new variable and
-	    byte-compile-noruntime-functions to nil.
-	    (byte-compile-file-form-require): record all new functions defined by a
-	    `require' in byte-compile-new-defuns.
-	    (byte-compile-file-form-defmumble): record the new alias in
-	    byte-compile-new-defuns.
+	* nsfns.m (x_set_tool_bar_lines): Exit maximized and full height
+	fullscreen modes when tool bar is disabled.
 
-2015-11-24  Eli Zaretskii  
+2015-11-15  Anders Lindgren  
 
-	Fix crash at startup related to GC of font entities
+	Fixed OS X 10.6.8 build issue (bug#21862).
 
-	* src/font.h (GC_FONT_SPEC_P, GC_FONT_ENTITY_P)
-	(GC_FONT_OBJECT_P, GC_XFONT_SPEC, GC_XFONT_ENTITY)
-	(GC_XFONT_OBJECT): New macros, for use in garbage collector.
-	* src/alloc.c (compact_font_cache_entry, compact_font_caches):
-	Don't ifdef away font cache compaction on NT_GUI, as the problems
-	which led to that seem to have been solved.
-	(compact_font_cache_entry): Use GC_FONT_SPEC_P, GC_XFONT_SPEC,
-	GC_XFONT_ENTITY, and GC_XFONT_OBJECT, instead of their non-GC_
-	cousins.  (Bug#21999)
+	* src/nsterm.h (EmacsView): Add missing declarations.
+	* src/nsterm.m ([EmacsView windowDidBecomeKey]): New method, like
+	the standard method but without the notification parameter.
+	Intended to be used for direct calls.
+	([EmacsView windowDidEnterFullScreen]): Call the non-notification
+	version of `windowDidBecomeKey'. Made the notification method call
+	the non-notification method instead of the vice versa.
+	(NSWindowDidEnterFullScreenNotification): Deleted, no longer
+	needed.
 
-2015-11-24  Alan Mackenzie  
+2015-11-15  Artur Malabarba  
 
-	Byte compile: Output an error, not a warning, for odd number of args to setq
+	* lisp/faces.el (faces--attribute-at-point): Fix an issue
 
-	* lisp/emacs-lisp/bytecomp.el (byte-compile-setq): Amend.
+	Previous code would signal an error when the face at point was
+	a manually built list of attributes such as '(:foregroud "white").
 
-2015-11-24  Ken Raeburn  
+	* test/automated/faces-tests.el (faces--test-color-at-point): Add a test
 
-	Fix kbd_buffer iteration loop in readable_events
+2015-11-15  Paul Eggert  
 
-	* src/keyboard.c (readable_events): Wrap the event pointer back to the
-	start of the kbd_buffer array inside the top of the loop instead of
-	right before checking the loop condition, since kbd_fetch_ptr and
-	kbd_store_ptr point past the end of the array to mean that element 0
-	is next. (bug#21935)
+	Fix regex abort when it tries to reenter itself
 
-2015-11-24  Paul Eggert  
+	Problem reported by Ken Raeburn.
+	Solution suggested by Stefan Monnier (Bug#21688).
+	* src/regex.c (re_match_2_internal):
+	Use new _FAST functions to avoid regex code reentering itself.
+	* src/syntax.c (update_syntax_table_forward): New arg PROPERTIZE.
+	All callers changed.
+	* src/syntax.h (UPDATE_SYNTAX_TABLE_FORWARD_FAST)
+	(UPDATE_SYNTAX_TABLE_FAST): New inline functions.
 
-	Improve text-quoting-style doc again
+2015-11-15  Dmitry Gutov  
 
-	* doc/lispref/help.texi (Keys in Documentation):
-	Omit overkill discussion of ‘setq’.  Mention Emacs versions
-	where ‘grave’ style was standard.
+	Improve Ruby 1.9-style keyword keys highlighting
 
-2015-11-24  Paul Eggert  
+	* lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords):
+	Handle required keyword arguments (bug#21367).
+	And highlight the colon together with the name.
 
-	Improve text-quoting-style doc
+2015-11-15  Dmitry Gutov  
 
-2015-11-24  Paul Eggert  
+	Unify the absolutely equal xref-backend-references implementations
 
-	Simplify module_make_function
+	* lisp/progmodes/elisp-mode.el (xref-backend-references):
+	Remove.
 
-	* src/emacs-module.c (module_make_function):
-	Simplify by calling build_unibyte_string.
+	* lisp/progmodes/etags.el (xref-backend-references):
+	Remove.
 
-2015-11-24  Paul Eggert  
+	* lisp/progmodes/xref.el (xref-backend-references):
+	Define the default implementation.
 
-	Port better to FreeBSD’s dlfunc vs dlsym
+2015-11-14  Dmitry Gutov  
 
-	This avoids warnings when converting between void * and
-	function pointers, which strict C11 does not allow.
-	* configure.ac (dlfunc): Check for existence.
-	* src/dynlib.c (dlfunc) [!HAVE_DLFUNC]: New macro.
-	(dynlib_func): New function.
-	* src/dynlib.h (dynlib_function_ptr, dynlib_func): New decls.
-	* src/emacs-module.c (Fmodule_load): Use dynlib_func, not
-	dynlib_sym, for function pointers.
+	Update project-find-regexp for the new xref API
 
-2015-11-24  Paul Eggert  
+	* lisp/progmodes/project.el (project--read-regexp):
+	Update to use the new xref API methods.
 
-	Simplify use of emacs_finalizer_function type
+	* lisp/progmodes/xref.el (xref-find-backend): Autoload.
 
-	* src/emacs-module.h (emacs_finalizer_function):
-	Now EMACS_NOEXCEPT.  All users simplified to omit EMACS_NOEXCEPT.
-	(struct emacs_env_25): Use emacs_finalizer_function where applicable.
+2015-11-14  Dmitry Gutov  
 
-2015-11-24  Paul Eggert  
+	Fix replacing a match with a shorter string
 
-	module_format_fun_env fixes
+	In effect, partially reverting fe973fc.
 
-	* src/doprnt.c (exprintf) [HAVE_MODULES]: Also define in this case.
-	* src/emacs-module.c (module_format_fun_env):
-	Convert path and sym to UTF-8.
-	Don’t use VLAs, as the C11 standard says they’re optional,
-	and anyway they can cause core dumps with large allocations.
-	Use exprintf rather than snprintf, as exprintf handles arbitrarily
-	long strings.  Simplify the code a bit.
+	* lisp/progmodes/xref.el (xref-query-replace): Store the end
+	of each match as a marker again, instead of length.
+	(xref--query-replace-1): Update accordingly.
 
-2015-11-23  Dmitry Gutov  
+2015-11-14  Artur Malabarba  
 
-	Don't use package-user-dir in elisp-library-roots if it's not bound
+	* lisp/progmodes/xref.el (xref-pop-marker-stack): Downgrade errors
 
-	* lisp/progmodes/elisp-mode.el (elisp-library-roots): Don't
-	use package-user-dir if it's not bound (bug#19759).
+	Signal user-errors instead.
 
-2015-11-23  Anders Lindgren  
+2015-11-14  Eli Zaretskii  
 
-	New visible-bell for NextStep (OS X El Capitan compatible).
+	Document 'describe-symbol'
 
-	Instead of inverting a rectangle in the middle of the frame, use
-	the standard NextStep image "caution", represented using an
-	warning sign with an exclamation mark.  (Bug#21662)
+	* doc/emacs/help.texi (Help Summary): Mention "C-h o".
+	(Name Help): Document "C-h o" and describe-symbol.
 
-	Implemented based on a suggestion drafted by Mustafa Kocaturk.
+	* lisp/help-fns.el (describe-symbol): Doc fix.
 
-	* src/nsterm.m (EmacsBell): New class for managing the caution
-	image.  Support multiple active bells, the image is removed once
-	all bells have timed out.
-	(ns_timeout): Removed, no longer used.
-	(ns_ring_bell): Reimplemented to use EmacsBell.
+2015-11-14  Paul Eggert  
 
-2015-11-23  Johan Bockgård  
+	Change test name to avoid spellcheck issue.
 
-	* lisp/emacs-lisp/nadvice.el (add-function): Fix debug spec.
+2015-11-14  Eli Zaretskii  
 
-	(remove-function): Ditto. (Bug#20376)
+	Avoid signaling an error in 'describe-symbol'
 
-2015-11-23  Mark Oteiza  
+	* lisp/help-fns.el (describe-symbol): Avoid errors when the symbol
+	exists as a function/variable/face/etc., but is undocumented.
 
-	* lisp/leim/quail/tamil-dvorak.el: Add necessary escapes.
+	* test/automated/help-fns.el (help-fns-test-describe-symbol): New
+	test.
 
-2015-11-23  Eli Zaretskii  
+2015-11-14  Eli Zaretskii  
 
-	Improve how non-ASCII strings are accepted from modules
+	* INSTALL (--with-cairo): Document this new configure option.
 
-	* src/emacs-module.c (module_make_function, module_make_string):
-	Build a unibyte Lisp string and then decode it by UTF-8, instead
-	of building a multibyte string without decoding.  This is more
-	tolerant to deviations from UTF-8.
+2015-11-14  Eli Zaretskii  
 
-2015-11-23  Paul Eggert  
+	Document that GNU Make >= 3.81 is required to build Emacs
 
-	Port recent module changes to pickier compilers
+	* doc/lispref/internals.texi (Building Emacs): Document that GNU
+	Make 3.81 or later is now required.
 
-	* src/emacs-module.c (module_make_function)
-	(module_make_string): Add casts to fix pointer signedness issues.
+2015-11-14  Eli Zaretskii  
 
-2015-11-23  Philipp Stephani  
+	* CONTRIBUTE (Branches): Improve wording for back-ported commits.
 
-	Fix how strings are accepted from modules
+2015-11-13  l3thal  
 
-	* src/emacs-module.c (module_make_function, module_make_string): Use
-	make_multibyte_string.
-	(module_copy_string_contents): Encode before reading the byte
-	size.  Return false if and only if an error occurred.
+	Merge branch 'erc-async-reconnect' into emacs-25
 
-2015-11-23  Eli Zaretskii  
+	Reconnect asynchronously.
 
-	Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25
+2015-11-11  Alan Mackenzie  
 
-2015-11-23  Shakthi Kannan  
+	First commit to scratch/follow.  Make Isearch work with Follow Mode, etc.
 
-	Add the tamil-dvorak input method
+	doc/lispref/window.texi (Basic Windows): Add paragraph defining "Group of
+	Windows" and new @defun selected-window-group.
+	(Window Start and End): Describe new &optional parameter GROUP and
+	...-group-function for window-start, window-end, set-window-start, and
+	pos-visible-in-window-p.
+	(Textual Scrolling) Describe the same for recenter.
+	doc/lispref/positions.texi (Screen Lines): Describe the same for
+	move-to-window-line.
 
-	* lisp/leim/quail/tamil-dvorak.el: New file.  (Bug#21768)
+	src/window.c (Fwindow_start, Fwindow_end, Fset_window_start)
+	(Fpos_visible_in_window_p, Frecenter, Fmove_to_window_line): To each, add ar
+	new optional parameter "group".  At the beginning of each, check whether the
+	corresponding ...-group-function is set to a function, and if so execute this
+	function in place of the normal processing.
+	(syms_of_window): Define symbols for the six new variables below.
+	(window-start-group-function, window-end-group-function)
+	(set-window-start-group-function, recenter-group-function)
+	(pos-visible-in-window-p-group-function, move-to-window-line-group-function):
+	New permanent local buffer local variables.
+	src/keyboard.c (Fposn_at_point): Add extra parameter in call to
+	Fpos_visible_in_window_p.
 
-	* etc/NEWS: Mention the new input method.
+	lisp/window.el (selected-window-group-function): New permanent local buffer
+	local variable.
+	(selected-window-group): New function.
 
-2015-11-23  Martin Rudalics  
+	lisp/follow.el (follow-mode): Set the ...-group-function variables at mode
+	enable, kill them at mode disable.  Add/remove follow-after-change to/from
+	after-change-functions.
+	(follow-start-end-invalid): New variable.
+	(follow-redisplay): Manipulate follow-start-end-invalid.
+	(follow-after-change, follow-window-start, follow-window-end)
+	(follow-set-window-start, follow-pos-visible-in-window-p)
+	(follow-move-to-window-line, follow-sit-for): New functions.
 
-	Move setting FRAME_WINDOW_SIZES_CHANGED to resize_frame_windows.
+	lisp/isearch.el (isearch-call-message): New macro.
+	(isearch-update, with-isearch-suspended, isearch-del-char)
+	(isearch-search-and-update, isearch-ring-adjust): Invoke above new macro.
+	(with-isearch-suspended): Rearrange code such that isearch-call-message is
+	invoked before point is moved.
+	(isearch-message): Add comment about where point must be at function call.
+	(isearch-search): Remove call to isearch-message.
+	(isearch-lazy-highlight-window-group): New variable.
+	(isearch-lazy-highlight-new-loop): Unconditionally start idle timer.  Move
+	the battery of tests to ...
+	(isearch-lazy-highlight-maybe-new-loop): New function, started by idle timer.
+	Note: (sit-for 0) is still called.
+	(isearch-lazy-highlight-update): Check membership of
+	isearch-lazy-highlight-window-group.  Don't set the `window' overlay
+	property.
+	(isearch-update, isearch-done, isearch-string-out-of-window)
+	(isearch-back-into-window, isearch-lazy-highlight-maybe-new-loop)
+	(isearch-lazy-highlight-search, isearch-lazy-highlight-update)
+	(isearch-lazy-highlight-update): Call the six amended primitives (see
+	src/window.c above) with the new `group' argument set to t, to cooperate
+	with Follow Mode.
 
-	* src/frame.c (adjust_frame_size): Don't set
-	FRAME_WINDOW_SIZES_CHANGED here ...
-	* src/window.c (resize_frame_windows): ... but here, as suggested
-	by Stefan Monnier.  Also remove some dead code along the way.
+2015-12-27  Lars Ingebrigtsen  
 
-2015-11-23  Alan Mackenzie  
+	* shr.el (shr-descend): Allow using lambdas in external functions.
 
-	* etc/NEWS (Incompatible Lisp Changes): Also `setf' needs an even # of args.
+2015-12-25  Stefan Monnier  
 
-2015-11-23  Alan Mackenzie  
+	* admin/gitmerge.el: Tweaks that seemed necessary
 
-	Signal an error when `setf' gets an odd number of arguments.
+	* admin/gitmerge.el (gitmerge-skip-regexp): Remove "sync".
+	(gitmerge-maybe-resume): Provide explicit empty commit message.
 
-	* lisp/emacs-lisp/gv.el (setf): Amend.
+2015-12-25  Łukasz Stelmach    (tiny change)
 
-2015-11-23  Stefan Monnier  
+	Use a different port for TLS erc
 
-	* lisp/emacs-lisp/smie.el (smie-backward-sexp): Handle BOB better.
+	* lisp/erc/erc.el (erc-default-port-tls): New variable
+	(bug#19497).
+	* lisp/erc/erc.el (erc-tls): Use it.
 
-2015-11-23  Alan Mackenzie  
+2015-12-25  Alain Schneble  
 
-	* etc/NEWS (Incompatible Lisp Changes): Document new restriction on `setq'.
+	Make relative URL parsing and resolution consistent with RFC 3986 (bug#22044)
 
-2015-11-23  Alan Mackenzie  
+	* test/lisp/url/url-parse-tests.el: Add tests covering url-generic-parse-url.
+	* test/lisp/url/url-expand-tests.el: Add tests covering url-expand-file-name.
+	* lisp/url/url-parse.el (url-generic-parse-url): Keep empty fragment
+	information in URL-struct.
+	* lisp/url/url-parse.el (url-path-and-query): Do not artificially turn empty
+	path and query into nil path and query, respectively.
+	* lisp/url/url-expand.el (url-expander-remove-relative-links): Do not turn
+	empty path into an absolute ("/") path.
+	* lisp/url/url-expand.el (url-expand-file-name): Properly resolve
+	fragment-only URIs. Do not just return them unchanged.
+	* lisp/url/url-expand.el (url-default-expander): An empty path in the relative
+	reference URI should not drop the last segment.
 
-	Expunge occurrences of `setq' with an odd number of arguments.
+2015-12-25  Lars Ingebrigtsen  
 
-	* lisp/apropos.el (apropos-documentation):
-	* lisp/obsolete/complete.el (PC-include-file-all-completions):
-	* lisp/progmodes/compile.el (compilation-goto-locus):
-	* lisp/vc/vc-cvs.el (vc-cvs-parse-root): (twice)
-	Insert missing nil at end of `setq' forms.
+	Let url use default file modes when copying files
 
-	* lisp/emacs-lisp/bytecomp.el (byte-compile-file-form-autoload): Remove an
-	erroneous trailing variable name from a setq, thus allowing a compilation
-	properly to track functions not defined at runtime.
+	* lisp/url/url-handlers.el (url-copy-file): Use default file
+	modes when copying files (bug#11400).
 
-2015-11-23  John Wiegley  
+2015-12-25  Devon Sean McCullough  
 
-	Add a note about a questionable use of bool in xdisp.c
+	Doc fix for url-http
 
-2015-11-23  Alan Mackenzie  
+	* lisp/url/url-http.el (url-http): Document better return values
+	  (bug#13187) (tiny change)
 
-	Issue a warning from the byte compiler on a malformed `setq' form.
+2015-12-25  Lars Ingebrigtsen  
 
-	Partly fixes bug#20241.
-	* lisp/emacs-lisp/bytecomp.el (byte-compile-setq): Issue a warning when a
-	`setq' form with an odd number of arguments is compiled.
+	* eww.el (eww-display-html): Support