emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master ffbf163 13/15: ; Try to clean up ChangeLog.2 mess c


From: Paul Eggert
Subject: [Emacs-diffs] master ffbf163 13/15: ; Try to clean up ChangeLog.2 mess created by merge.
Date: Sat, 30 Jan 2016 23:26:19 +0000

branch: master
commit ffbf163ab5ced1bc464a0034e6abc9a41f5e09c4
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    ; Try to clean up ChangeLog.2 mess created by merge.
---
 ChangeLog.2 |11730 +++++++++++++++++++++--------------------------------------
 1 files changed, 4147 insertions(+), 7583 deletions(-)

diff --git a/ChangeLog.2 b/ChangeLog.2
index 877a697..c5cba03 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -1,428 +1,349 @@
-2016-01-30  Nicolas Petton  <address@hidden>
+2016-01-30  Paul Eggert  <address@hidden>
 
-       Bump version to 25.0.90
+       Shrink static heap a bit
 
-       * README:
-       * configure.ac:
-       * msdos/sed2v2.inp: Bump version to 25.0.90.
+       * 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  Nicolas Petton  <address@hidden>
+2016-01-30  Paul Eggert  <address@hidden>
 
-       * etc/AUTHORS: Update the AUTHORS file
+       Fix extern symbols defined and not used
 
-2016-01-30  Nicolas Petton  <address@hidden>
+       * src/alloc.c: Always include <signal.h>.
+       (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)
 
-       authors.el updates
+2016-01-30  Paul Eggert  <address@hidden>
 
-       * admin/authors.el (authors-renamed-files-alist): Additions.
+       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  Nicolas Petton  <address@hidden>
+2016-01-30  Paul Eggert  <address@hidden>
 
-       Make it possible to run make change-history on emacs-25
+       Include <malloc.h> 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 <malloc.h> (Bug#22086).
+       * configure.ac: Check for malloc.h.
+       * src/alloc.c: Include <malloc.h> 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.h>.
+       (__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 <malloc.h>.
+       (calloc): Make it clear that the macro should not be used.
+       Remove unused decl.
+       (malloc_info): New macro, to avoid clash with glibc <malloc.h>.
+       (__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 <malloc.h>.  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 <malloc.h> if available.
 
-       * Makefile.in: Check if the current branch is emacs-25 instead of
-         master.
+2016-01-30  Paul Eggert  <address@hidden>
 
-2016-01-30  lu4nx  <address@hidden>
+       * src/alloc.c: Include "sheap.h".
 
-       Support Go language in 'etags'
+       (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)
 
-       * lib-src/etags.c <Ruby_help>: Fix documentation of Ruby tags.
-       <Go_help>: New help.
-       <Go_suffixes>: New variable.
-       (Go_functions): New function.
-       <lang_names>: Add entry for Go.  (Bug#22370)
+2016-01-30  Paul Eggert  <address@hidden>
 
-       * doc/emacs/maintaining.texi (Tag Syntax): Document Go support.
-       * doc/man/etags.1: Mention Go support.
+       Pacify --enable-gcc-warnings when HYBRID_MALLOC
 
-       * etc/NEWS: Mention Go support.
+       * 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)
 
-       * 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  Paul Eggert  <address@hidden>
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       Report static heap usage on non-Cygwin, too
 
-       Improve Ruby support in 'etags'
+       * 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).
 
-       * 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-01-30  Paul Eggert  <address@hidden>
 
-       * doc/emacs/maintaining.texi (Tag Syntax): Mention that constants
-       are tagged by etags in Ruby.
+       Pacify GCC on extern decls
 
-       * etc/NEWS: Mention that constants are tagged by etags in Ruby.
+       * src/unexelf.c (bss_sbrk_did_unexec): Move decl to top level
+       to pacify recent GCC (Bug#22086).
 
-       * 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  Wolfgang Jenkner  <address@hidden>
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       Add musl patch to support HYBRID_MALLOC on elf systems
 
-       Adjust etags test results to changes in copyright years
+       * 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)
 
-       * 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  Rich Felker  <address@hidden>  (tiny change)
 
-2016-01-30  Andreas Schwab  <address@hidden>
+       unexelf.c hook to support HYBRID_MALLOC on ELF
 
-       Revert "Re-enable checks in member, memql, delete to complain about 
non-lists"
+       * src/unexelf.c (unexec) [HYBRID_MALLOC]:
+       Define bss_sbrk_did_unexec (Bug#22086).
 
-       This reverts commit f524e8b7f12d9b5a8b92084e5385429fe7b085b9.
+2016-01-30  Wolfgang Jenkner  <address@hidden>
 
-2016-01-30  Nicolas Petton  <address@hidden>
+       Link temacs with gnulib compiled with -Demacs
 
-       Make it possible to run make change-history on emacs-25
+       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.
 
-       * Makefile.in: Check if the current branch is emacs-25 instead of
-         master.
+2016-01-30  Wolfgang Jenkner  <address@hidden>
 
-2016-01-30  Dmitry Gutov  <address@hidden>
+       Internal linkage for gmalloc etc. if HYBRID_MALLOC
 
-       Don't fiddle with DEFAULT
+       This avoids clashes with symbols if the after-dump malloc is
+       derived from Doug Lea's implementation (Bug#22086).
 
-       * lisp/progmodes/project.el (project--completing-read-strict):
-       Don't change DEFAULT, whether is has any matches in
-       COLLECTION, or not.
+       * 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  Eli Zaretskii  <address@hidden>
+2016-01-30  Paul Eggert  <address@hidden>
 
-       Document xwidget commands and functions
+       Merge from origin/emacs-25
 
-       * 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.
+       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  Lars Ingebrigtsen  <address@hidden>
+2016-01-30  Andreas Schwab  <address@hidden>
 
-       Build fix for shr.el
+       Re-enable checks in member, memql, delete to complain about non-lists
 
-       * shr.el (seq): Require.
+       * fns.c (Fmember, Fmemql, Fdelete): Revert 2007-10-16 change.
 
-2016-01-30  Dmitry Gutov  <address@hidden>
+2016-01-28  Glenn Morris  <address@hidden>
 
-       Improve project-find-file yet again!
+       Remove some useless-use-of eval.
 
-       * 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/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-30  Dmitry Gutov  <address@hidden>
+2016-01-28  Glenn Morris  <address@hidden>
 
-       Don't pass DIR to 'hg status'
+       Don't use eval to quieten prolog.el compilation.
 
-       * lisp/vc/vc-hg.el (vc-hg-dir-status-files):
-       Don't pass DIR to 'hg status' (bug#22481).
+       * lisp/progmodes/prolog.el (pltrace-on, pltrace-off): Declare.
+       (prolog-enable-sicstus-sd, prolog-disable-sicstus-sd): Don't use eval.
 
-2016-01-30  Stephen Leake  <address@hidden>
+2016-01-28  Glenn Morris  <address@hidden>
 
-       Fix typo in previous commits
+       Mark some risky prolog variables.
 
-       * lisp/progmodes/project.el (project-find-file-in):
-       * lisp/vc/vc-mtn.el (vc-mtn-find-ignore-file): Fix typo in previous
-       commit.
+       * 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-30  Stephen Leake  <address@hidden>
+2016-01-28  Glenn Morris  <address@hidden>
 
-       Improve project-find-file
+       * lisp/custom.el (defcustom): Doc fix.
 
-       * 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.
+       * doc/lispref/customize.texi (Variable Definitions):
+       Defcustom should always have a type.
 
-       * lisp/progmodes/xref.el (ede-minor-mode): New declaration.
-       (xref--find-ignores-arguments): Add doc string.
+2016-01-28  Glenn Morris  <address@hidden>
 
-2016-01-30  Stephen Leake  <address@hidden>
+       * lisp/emacs-lisp/bytecomp.el (byte-compile-nogroup-warn):
+       Warn if defcustom has no type.  (Bug#16276)
 
-       Implement vc-mtn-find-ignore-file, fix some doc strings
+       * lisp/cedet/semantic/db-file.el (semanticdb-persistent-path):
+       Fix :type.
 
-       * lisp/cedet/cedet-global.el (cedet-gnu-global-root): Improve doc 
string.
+       * lisp/emacs-lisp/package.el (package-load-list): Improve :type.
 
-       * lisp/cedet/ede/locate.el (initialize-instance): Improve doc string.
+2016-01-28  Michael Albinus  <address@hidden>
 
-       * lisp/vc/vc-git.el (vc-git-find-ignore-file): Fix doc string.
+       Fix Bug#22452
 
-       * lisp/vc/vc-mtn.el (vc-mtn-find-ignore-file): New function.
+       * 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.
 
-2016-01-23  Michael Albinus  <address@hidden>
+       * lisp/net/tramp.el (tramp-handle-file-remote-p): Check also, if
+       connection property "connected" is set.  (Bug#22452)
 
-       Improve user name completion in Tramp
+2016-01-27  Glenn Morris  <address@hidden>
 
-       * 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.
+       * test/lisp/vc/vc-hg.el: Move from test/automated/.
 
-2016-01-22  Michael Albinus  <address@hidden>
+       * lisp/xwidget.el (xwidget-query-on-exit-flag): Declare.
 
-       * etc/NEWS: Move kqueue entries to Emacs 25.1 sections.
+       * lisp/xwidget.el (xwidget-webkit-browse-url): Give explicit error
+       if not compiled with xwidgets.
 
-2016-01-20  Glenn Morris  <address@hidden>
+2016-01-26  Paul Eggert  <address@hidden>
 
-       Remove handling of non-string time-stamp formats, obsolete for 20 years.
+       C-u C-x = example doc fix
 
-       * 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.
+       * doc/emacs/mule.texi (International Chars):
+       Adjust example to match current behavior of C-u C-x =.
 
-2016-01-20  Eli Zaretskii  <address@hidden>
+2016-01-26  Paul Eggert  <address@hidden>
 
-       Anoter fix for problematic merge from emacs-25
+       malloc.h hygiene
 
-       * src/w32fns.c (globals_of_w32fns): Move initialization of
-       resetstkoflw to a non-Cygwin part.
+       This attempts to future-proof Emacs a bit against possible glibc
+       changes, by having Emacs use <malloc.h> 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 <malloc.h>) 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-20  Michael Albinus  <address@hidden>
+2016-01-26  Eli Zaretskii  <address@hidden>
 
-       * test/Makefile.in (mostlyclean): Use ${LOGFILES}.
+       * doc/emacs/mark.texi (Using Region): Clarify wording.  (Bug#22467)
 
-2016-01-20  Eli Zaretskii  <address@hidden>
+2016-01-26  Paul Eggert  <address@hidden>
 
-       Fix MS-Windows build broken by a botched merge from emacs-25
+       Remove never-set var handle_user_signal_hook
 
-       * 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.
+       * src/keyboard.c, src/keyboard.h (handle_user_signal_hook):
+       Remove never-set var.  All uses removed.
 
-2016-01-20  Vincent Belaïche  <address@hidden>
+2016-01-26  Anders Lindgren  <address@hidden>
 
-       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:address@hidden 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:address@hidden, `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 initialisation.
-       (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:address@hidden, 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:address@hidden 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-30  Andreas Schwab  <address@hidden>
-
-       Re-enable checks in member, memql, delete to complain about non-lists
-
-               * src/fns.c (Fmember, Fmemql, Fdelete): Revert 2007-10-16 
change.
-
-2016-01-30  Martin Rudalics  <address@hidden>
-
-       c:/emacs-git/next/ChangeLog
-
-2016-01-30  Eli Zaretskii  <address@hidden>
-
-       Minor improvements to 'pcase' documentation
-
-       * doc/lispref/control.texi (Pattern matching case statement):
-       Improve the documentation of 'pcase' per comments.  See two
-       discussion threads on address@hidden 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.
-
-2016-01-30  Glenn Morris  <address@hidden>
-
-       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-30  Glenn Morris  <address@hidden>
-
-       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-30  Glenn Morris  <address@hidden>
-
-       * lisp/custom.el (defcustom): Doc fix.
-
-       * doc/lispref/customize.texi (Variable Definitions):
-       Defcustom should always have a type.
-
-2016-01-30  Glenn Morris  <address@hidden>
-
-       * lisp/cedet/semantic/db-file.el (semanticdb-persistent-path):
-       Fix :type.
-
-       * lisp/emacs-lisp/package.el (package-load-list): Improve :type.
-
-2016-01-30  Michael Albinus  <address@hidden>
-
-       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-30  Glenn Morris  <address@hidden>
-
-       * 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-30  Paul Eggert  <address@hidden>
-
-       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-30  Paul Eggert  <address@hidden>
-
-       malloc.h hygiene
-
-       This attempts to future-proof Emacs a bit against possible glibc
-       changes, by having Emacs use <malloc.h> 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 <malloc.h>) 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-30  Eli Zaretskii  <address@hidden>
-
-       * doc/emacs/mark.texi (Using Region): Clarify wording.  (Bug#22467)
-
-2016-01-30  Paul Eggert  <address@hidden>
-
-       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-30  K. Handa  <address@hidden>
-
-       Backport: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.
-
-       (cherry picked from commit 9835757013569673854b692ccbb58bfb3c3ed1f7)
-
-2016-01-30  K. Handa  <address@hidden>
-
-       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.
-
-       (cherry picked from commit 536f48e9a2251b9e654ea974bd90ff2f40218753)
-
-2016-01-30  Anders Lindgren  <address@hidden>
-
-       Fixed NextStep fullscreen issue (bug#22468)
+       Fixed NextStep fullscreen issue (bug#22468)
 
        When in fullscreen mode, `[screen visibleFrame]' sometimes
        includes, sometimes excludes the menu bar. This could cause
@@ -438,7 +359,7 @@
        ([EmacsWindow constrainFrameRect:toScreen:]): Pass fullscreen
        state to `constrain_frame_rect'.
 
-2016-01-30  Artur Malabarba  <address@hidden>
+2016-01-25  Artur Malabarba  <address@hidden>
 
        * lisp/files.el: Use a fixed file name for the second dir-locals file
 
@@ -455,14 +376,14 @@
        * doc/lispref/variables.texi (Directory Local Variables): Update
        accordingly.
 
-2016-01-30  Artur Malabarba  <address@hidden>
+2016-01-25  Artur Malabarba  <address@hidden>
 
        * 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-30  Artur Malabarba  <address@hidden>
+2016-01-25  Artur Malabarba  <address@hidden>
 
        * lisp/files.el (dir-locals-find-file): Refactor return values
 
@@ -476,7 +397,7 @@
        (hack-dir-local-variables): Simplify accordingly and rename a
        variable.
 
-2016-01-30  Glenn Morris  <address@hidden>
+2016-01-25  Glenn Morris  <address@hidden>
 
        * lisp/textmodes/flyspell.el (flyspell--prev-meta-tab-binding):
        Declare.
@@ -488,7 +409,7 @@
        * lisp/xwidget.el (xwidget-webkit-scroll-behavior):
        Rename using American spelling.  Update all uses.
 
-2016-01-30  Glenn Morris  <address@hidden>
+2016-01-25  Glenn Morris  <address@hidden>
 
        Yet more xwidget doc fixes.
 
@@ -507,23 +428,59 @@
        (xwidget-webkit-show-id-element)
        (xwidget-webkit-show-id-or-named-element): Prompt fixes.
 
-2016-01-30  Ted Zlatanov  <address@hidden>
+2016-01-25  Ted Zlatanov  <address@hidden>
 
        * lisp/gnus/gnus-art.el (gnus-blocked-images):
        Add explicit nil choice and tags.
 
-2016-01-30  Paul Eggert  <address@hidden>
+2016-01-25  Paul Eggert  <address@hidden>
 
        Spelling fixes
 
-2016-01-30  Stefan Monnier  <address@hidden>
+2016-01-25  Stefan Monnier  <address@hidden>
+
+       (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  <address@hidden>
+
+       * 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  <address@hidden>
+
+       * 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  <address@hidden>
+
+       * lisp/font-lock.el: Use #' to quote function symbols
+
+2016-01-25  Stefan Monnier  <address@hidden>
 
        (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-30  Alan Mackenzie  <address@hidden>
+2016-01-25  Alan Mackenzie  <address@hidden>
 
        Expunge "allow" + infinitive from source and doc, part 2.
 
@@ -544,17 +501,17 @@
 
        Expunge the likes of "This allows to do something" from the above files.
 
-2016-01-30  Artur Malabarba  <address@hidden>
+2016-01-25  Artur Malabarba  <address@hidden>
 
        * lisp/emacs-lisp/tabulated-list.el (tabulated-list-mode): Redundant 
line
 
        `special-mode' is already read-only.
 
-2016-01-30  Artur Malabarba  <address@hidden>
+2016-01-25  Artur Malabarba  <address@hidden>
 
        * lisp/emacs-lisp/ert.el (ert--results-move): Change error to user-error
 
-2016-01-30  Paul Eggert  <address@hidden>
+2016-01-24  Paul Eggert  <address@hidden>
 
        Port "$@" to OpenIndiana ksh93
 
@@ -565,11 +522,11 @@
        * admin/check-doc-strings, configure.ac, lib-src/rcs2log:
        Use plain "$@" rather than ${1+"$@"}.
 
-2016-01-30  Paul Eggert  <address@hidden>
+2016-01-24  Paul Eggert  <address@hidden>
 
        * src/xwidget.c (Fxwidget_set_adjustment): Fix doc string quoting typo.
 
-2016-01-30  Paul Eggert  <address@hidden>
+2016-01-24  Paul Eggert  <address@hidden>
 
        Improve wording for SMB support
 
@@ -578,7 +535,7 @@
        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-30  Paul Eggert  <address@hidden>
+2016-01-24  Paul Eggert  <address@hidden>
 
        Merge from gnulib
 
@@ -605,7 +562,7 @@
        Copy from gnulib.
        * m4/gnulib-comp.m4: Regenerate.
 
-2016-01-30  Alan Mackenzie  <address@hidden>
+2016-01-24  Alan Mackenzie  <address@hidden>
 
        Expunge "allow" + infinitive without direct object from source and doc.
 
@@ -672,23 +629,23 @@
        alternative, such as "This allow you to do something", "This allows
        something to be done" or "This allows the doing of something".
 
-2016-01-30  l3thal  <address@hidden>
+2016-01-24  l3thal  <address@hidden>
 
        Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
 
-2016-01-30  Kelvin White  <address@hidden>
+2016-01-24  Kelvin White  <address@hidden>
 
        Add NEWS entry for asynchronous reconnect in ERC
 
-2016-01-30  l3thal  <address@hidden>
+2016-01-24  l3thal  <address@hidden>
 
        Add NEWS entry for asynchronous reconnect in ERC
 
-2016-01-30  Kelvin White  <address@hidden>
+2016-01-24  Kelvin White  <address@hidden>
 
        browse-url.el: Add 'google-chrome' to supported browsers.
 
-2016-01-30  Paul Eggert  <address@hidden>
+2016-01-24  Paul Eggert  <address@hidden>
 
        Port Tramp manual to latest Texinfo
 
@@ -699,18 +656,18 @@
        All uses changed.
        (trampf): New macro.
 
-2016-01-30  Lars Ingebrigtsen  <address@hidden>
+2016-01-24  Lars Ingebrigtsen  <address@hidden>
 
        * eww.el (eww-render): Protect against empty content-types.
 
-2016-01-30  Nicolas Petton  <address@hidden>
+2016-01-24  Nicolas Petton  <address@hidden>
 
        authors.el updates
 
        * admin/authors.el (authors-ignored-files, authors-renamed-files-alist):
          Additions.
 
-2016-01-30  Dmitry Gutov  <address@hidden>
+2016-01-23  Dmitry Gutov  <address@hidden>
 
        Rename xref-query-replace to xref-query-replace-in-results
 
@@ -724,7 +681,7 @@
        * doc/emacs/maintaining.texi (Xref Commands)
        (Identifier Search, Identifier Search): Update accordingly.
 
-2016-01-30  Dmitry Gutov  <address@hidden>
+2016-01-23  Dmitry Gutov  <address@hidden>
 
        Update cl-defgeneric and cl-defmethod docstrings
 
@@ -733,7 +690,7 @@
        (cl-defmethod): Mention that multiple dispatch arguments are
        allowed.  Document supported types.  (Bug#22336)
 
-2016-01-30  Dmitry Gutov  <address@hidden>
+2016-01-23  Dmitry Gutov  <address@hidden>
 
        Comment out next-error-function integration in xref
 
@@ -741,11 +698,11 @@
        Comment out next-error-function integration
        (http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg01286.html).
 
-2016-01-30  John Wiegley  <address@hidden>
+2016-01-23  John Wiegley  <address@hidden>
 
        Correct a use of "which" in intro.texi
 
-2016-01-30  Alan Mackenzie  <address@hidden>
+2016-01-23  Alan Mackenzie  <address@hidden>
 
        Distinguish the two meanings of Java's keyword "default".  Fixes bug 
#22358.
 
@@ -755,14 +712,14 @@
 
        * lisp/progmodes/cc-langs.el (c-modifier-kwds): Add "default" to Java's 
value.
 
-2016-01-30  Oscar Fuentes  <address@hidden>
+2016-01-23  Oscar Fuentes  <address@hidden>
 
        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-30  Anders Lindgren  <address@hidden>
+2016-01-23  Anders Lindgren  <address@hidden>
 
        Unbreak the GNUstep build.
 
@@ -774,7 +731,7 @@
        ([EmacsView updateFrameSize:]): Remove unused variable `win'.
        ([EmacsWindow zoom:]): Remove unused variable `f'.
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+2016-01-23  Eli Zaretskii  <address@hidden>
            John Wiegley  <address@hidden>
            Michael Heerdegen  <address@hidden>
 
@@ -785,25 +742,25 @@
 
        * etc/NEWS: Mention that 'pcase' changes are documented.
 
-2016-01-30  Paul Eggert  <address@hidden>
+2016-01-23  Paul Eggert  <address@hidden>
 
        * etc/NEWS: Say that Cairo is experimental.
 
-2016-01-30  Paul Eggert  <address@hidden>
+2016-01-23  Paul Eggert  <address@hidden>
 
        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-30  Arash Esbati  <address@hidden>
+2016-01-23  Arash Esbati  <address@hidden>
 
        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-30  Paul Eggert  <address@hidden>
+2016-01-23  Paul Eggert  <address@hidden>
 
        Pacify --enable-gcc-warnings --with-cairo
 
@@ -822,7 +779,7 @@
        Omit unused locals, or move them to where they’re needed.
        (x_clear_area1): Now ATTRIBUTE_UNUSED.
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+2016-01-22  Eli Zaretskii  <address@hidden>
 
        Update documentation for Dired search and replace
 
@@ -832,7 +789,7 @@
 
        * etc/NEWS: Mention xref-related changes in Dired.
 
-2016-01-30  Paul Eggert  <address@hidden>
+2016-01-22  Paul Eggert  <address@hidden>
 
        Port recent xdisp.c fix to picky C compilers
 
@@ -840,25 +797,25 @@
        putting #if inside the arguments to a standard function, which
        the C standard says has undefined behavior.
 
-2016-01-30  Alan Mackenzie  <address@hidden>
+2016-01-22  Alan Mackenzie  <address@hidden>
 
        Prevent spurious recognition of K&R argument declarations.  Fixes bug 
#2203
 
-       * lisp/progmodes/cc-engine.el (c-forward-declarator): New function.
+       * 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.
 
-       * lisp/progmodes/cc-fonts.el (c-font-lock-declarators): Use the new 
function
+       * cc-fonts.el (c-font-lock-declarators): Use the new function
        `c-forward-declarator' in place of inline code.
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+2016-01-22  Eli Zaretskii  <address@hidden>
 
        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-30  Eli Zaretskii  <address@hidden>
+2016-01-22  Eli Zaretskii  <address@hidden>
 
        Document cl-generic.el
 
@@ -867,7 +824,7 @@
        (Functions): Update the chapter menu.
        * doc/lispref/elisp.texi: Update the master menu.
 
-2016-01-30  Paul Eggert  <address@hidden>
+2016-01-22  Paul Eggert  <address@hidden>
 
        xwidgets style cleanup
 
@@ -945,95 +902,39 @@
        HAVE_XWIDGETS is defined.
        (struct xwidget_type, xwidget_from_id): Remove; unused.
 
-2016-01-30  Michael Albinus  <address@hidden>
-
-       Backport kqueue integration from master
-
-       * 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.
-
-       * doc/lispref/os.texi (File Notifications): Add kqueue as backend.
-       Fix some glitches in the example.
-
-       * etc/NEWS: Mention kqueue.
-
-       * 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.
-
-       * src/Makefile.in: Use NOTIFY_CFLAGS and NOTIFY_LIBS.
-
-       * src/emacs.c (main): Call globals_of_kqueue and syms_of_kqueue.
-
-       * 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.
-
-       * src/keyboard.c (make_lispy_event): Check also for HAVE_KQUEUE.
-
-       * src/kqueue.c: New file.
-
-       * src/lisp.h: Declare extern globals_of_kqueue and syms_of_kqueue.
-
-       * 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.
-
-2016-01-30  John Wiegley  <address@hidden>
+2016-01-22  John Wiegley  <address@hidden>
 
        Further corrections to the pcase docstring
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+2016-01-22  Eli Zaretskii  <address@hidden>
 
        * doc/emacs/anti.texi (Antinews): Rewrite for Emacs 25.
 
-2016-01-30  Stephen Leake  <address@hidden>
+2016-01-21  Stephen Leake  <address@hidden>
 
        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-30  John Wiegley  <address@hidden>
+2016-01-21  John Wiegley  <address@hidden>
 
        Minor correction to pcase docstring
 
-2016-01-30  John Wiegley  <address@hidden>
+2016-01-21  John Wiegley  <address@hidden>
 
        Write a new docstring for the pcase macro
 
        * lisp/emacs-lisp/pcase.el (pcase): Write a new docstring.
 
-2016-01-30  Stephen Berman  <address@hidden>
+2016-01-21  Stephen Berman  <address@hidden>
 
        Avoid byte-compiler warning in todo-mode (bug#21953)
 
-       * lisp/calendar/todo-mode.el (todo-convert-legacy-files): Add limit 
argument
+       * todo-mode.el (todo-convert-legacy-files): Add limit argument
        to looking-back to comply with advertised-calling-convention.
 
-2016-01-30  Stephen Berman  <address@hidden>
+2016-01-21  Stephen Berman  <address@hidden>
 
        Fix desktop support in todo-mode and doc-view (bug#22377)
 
@@ -1043,7 +944,7 @@
        * lisp/calendar/todo-mode.el (todo-modes-set-2):
        * lisp/doc-view.el (doc-view-mode): Set desktop-save-buffer 
unconditionally.
 
-2016-01-30  Paul Eggert  <address@hidden>
+2016-01-20  Paul Eggert  <address@hidden>
 
        No need to configure gobject-introspection
 
@@ -1055,7 +956,7 @@
        Remove.  All uses removed.
        * configure.ac (emacs_config_features): Don’t worry about GIR.
 
-2016-01-30  Paul Eggert  <address@hidden>
+2016-01-20  Paul Eggert  <address@hidden>
 
        Don’t export C symbols not used elsewhere
 
@@ -1080,7 +981,7 @@
        * src/xwidget.h (xwidget_start_redisplay, xwidget_touch):
        Remove decls.
 
-2016-01-30  Dmitry Gutov  <address@hidden>
+2016-01-20  Dmitry Gutov  <address@hidden>
 
        Support squiggly heredocs in ruby-mode
 
@@ -1089,11 +990,11 @@
 
        * test/indent/ruby.rb: Add squiggly example.
 
-2016-01-30  Glenn Morris  <address@hidden>
+2016-01-20  Glenn Morris  <address@hidden>
 
        * configure.ac (emacs_config_features): Remove WEBKIT.
 
-2016-01-30  Paul Eggert  <address@hidden>
+2016-01-20  Paul Eggert  <address@hidden>
 
        Port to platforms with gtk3 but not webkitgtk3
 
@@ -1111,21 +1012,21 @@
        * 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-30  Eli Zaretskii  <address@hidden>
+2016-01-20  Eli Zaretskii  <address@hidden>
 
        Fix doc string of 'isearch-search-fun-function'
 
        * lisp/isearch.el (isearch-search-fun-function)
        (isearch-search-string): Doc fixes.  (Bug#22411)
 
-2016-01-30  Stefan Monnier  <address@hidden>
+2016-01-19  Stefan Monnier  <address@hidden>
 
        * lisp/xwidget.el: Nitpicks
 
        * lisp/xwidget.el (xwidget-log, xwidget-webkit-callback):
        Use with-current-buffer rather than save-excursion + set-buffer.
 
-2016-01-30  Glenn Morris  <address@hidden>
+2016-01-19  Glenn Morris  <address@hidden>
 
        Don't hard-code 1 as point-min.
 
@@ -1133,11 +1034,11 @@
        * lisp/xwidget.el (xwidget-webkit-last-session)
        (xwidget-webkit-current-session): Don't hard-code 1 as point-min.
 
-2016-01-30  Glenn Morris  <address@hidden>
+2016-01-19  Glenn Morris  <address@hidden>
 
        * lisp/xwidget.el: Add declarations to silence non-xwidget compilation.
 
-2016-01-30  Glenn Morris  <address@hidden>
+2016-01-19  Glenn Morris  <address@hidden>
 
        Trivial doc copyedits.
 
@@ -1147,7 +1048,7 @@
        (Fxwidget_info, Fxwidget_view_lookup)
        (Fset_xwidget_query_on_exit_flag): Trivial doc copyedits.
 
-2016-01-30  Glenn Morris  <address@hidden>
+2016-01-19  Glenn Morris  <address@hidden>
 
        Avoid advising image-display-size for xwidgets.
 
@@ -1156,7 +1057,7 @@
        * lisp/image-mode.el (xwidget-info, xwidget-at): Declare.
        (image-display-size): Incorporate xwidget code directly.
 
-2016-01-30  Glenn Morris  <address@hidden>
+2016-01-19  Glenn Morris  <address@hidden>
 
        Avoid breaking non-xwidget Emacs that happen to load xwidget.el.
 
@@ -1164,70 +1065,68 @@
        (kill-buffer-query-functions): Only modify these hooks if
        compiled with xwidget support.
 
-2016-01-30  Glenn Morris  <address@hidden>
+2016-01-19  Glenn Morris  <address@hidden>
 
        * lisp/xwidget.el (xwidget-webkit-scroll-behaviour): Fix custom spec.
 
-2016-01-30  Glenn Morris  <address@hidden>
-
        * 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-30  Katsumi Yamaoka  <address@hidden>
+2016-01-19  Katsumi Yamaoka  <address@hidden>
 
        * lisp/gnus/nnir.el (nnir-request-update-mark):
        Default to the original mark.
        cf. <http://thread.gmane.org/gmane.emacs.gnus.general/86583>
        and <http://thread.gmane.org/gmane.emacs.gnus.general/86640>
 
-2016-01-30  Glenn Morris  <address@hidden>
+2016-01-19  Glenn Morris  <address@hidden>
 
        * lisp/xwidget.el (report-xwidget-bug): Remove.
 
        (top-level): No longer require reporter.
 
-2016-01-30  Joakim Verona  <address@hidden>
+2016-01-19  Joakim Verona  <address@hidden>
            Grégoire Jadi  <address@hidden>
 
        Support for the new Xwidget feature.
 
        * configure.ac:
        (HAVE_XWIDGETS, WIDGET_OBJ, EMACS_CONFIG_FEATURES):
-       * src/xterm.c (x_draw_glyph_string, x_draw_bar_cursor):
-       * src/xdisp.c:
+       * 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):
-       * 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)
+       * 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):
-       * src/emacs.c (main):
-       * src/dispnew.c (update_window, scrolling_window):
-       * src/dispextern.h (g, i):
+       * 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):
-       * src/keyboard.c (kbd_buffer_get_event):
-       * src/emacsgtkfixed.c (emacs_fixed_gtk_widget_size_allocate)
+       * keyboard.c (kbd_buffer_get_event):
+       * emacsgtkfixed.c (emacs_fixed_gtk_widget_size_allocate)
        (emacs_fixed_class_init): Add case for an xwidget view.
 
-       * src/xwidget.c, src/xwidget.h, lisp/xwidget.el: New files for xwidgets
+       * xwidget.c, xwidget.h, xwidget.el: New files for xwidgets
 
 
        Various improvements to the Xwidget feature.
-       * src/xwidget.c:
-       * src/emacsgtkfixed.c:
-       * lisp/xwidget.el:
+       * xwidgets.c:
+       * emacsgtkfixed.c:
+       * xwidget.el:
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+2016-01-19  Eli Zaretskii  <address@hidden>
 
        Improve documentation of 'alist-get'
 
@@ -1235,7 +1134,7 @@
        'alist-get' to the list of functions that can appear in PLACE
        argument of 'setf'.
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+2016-01-19  Eli Zaretskii  <address@hidden>
 
        Minor copyedits of doc/emacs/maintaining.texi
 
@@ -1243,7 +1142,7 @@
        description of "C-M-i" wrt tags tables.
        (Tags Tables): Move the definition of "tag" to a footnote.
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+2016-01-19  Eli Zaretskii  <address@hidden>
 
        Unbreak the Cygwin-w32 build
 
@@ -1251,11 +1150,11 @@
        resetstkoflw into a part that isn't compiled on Cygwin.
        (Bug#22403)
 
-2016-01-30  Lars Magne Ingebrigtsen  <address@hidden>
+2016-01-19  Lars Magne Ingebrigtsen  <address@hidden>
 
        * shr.el (shr-table-body): Allow tables to have text children.
 
-2016-01-30  Phillip Lord  <address@hidden>
+2016-01-19  Phillip Lord  <address@hidden>
 
        Cope with multiple overlapping faces.
 
@@ -1264,7 +1163,7 @@
          (hfy-face-resolve-face): Handle font specification as well as font
          name. Documentation update. (Bug#21990)
 
-2016-01-30  Paul Eggert  <address@hidden>
+2016-01-18  Paul Eggert  <address@hidden>
 
        Fix spurious escapes in describe-input-method
 
@@ -1273,8689 +1172,5511 @@
        * lisp/international/quail.el (quail-help):
        Apply substitute-command-keys to doc strings before displaying them.
 
-2016-01-30  Paul Eggert  <address@hidden>
+2016-01-30  Nicolas Petton  <address@hidden>
 
-       Minor improvements to (random t) documentation
+       Bump version to 25.0.90
 
-       * doc/lispref/numbers.texi (Random Numbers):
-       * src/fns.c (Frandom):
-       Omit unnecessary details about randomness fallback.
-       Say that it is a fallback.
+       * README:
+       * configure.ac:
+       * msdos/sed2v2.inp: Bump version to 25.0.90.
 
-2016-01-30  Dmitry Gutov  <address@hidden>
+2016-01-30  Nicolas Petton  <address@hidden>
 
-       Rename methods in Ruby etags example file
+       * etc/AUTHORS: Update the AUTHORS file
 
-       * test/etags/ruby-src/test.rb: Rename the example methods to
-       correspond to the common terminology used in Ruby.
-       * test/etags/CTAGS.good:
+2016-01-30  Nicolas Petton  <address@hidden>
+
+       authors.el updates
+
+       * admin/authors.el (authors-renamed-files-alist): Additions.
+
+2016-01-30  Nicolas Petton  <address@hidden>
+
+       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  <address@hidden>
+
+       Support Go language in 'etags'
+
+       * lib-src/etags.c <Ruby_help>: Fix documentation of Ruby tags.
+       <Go_help>: New help.
+       <Go_suffixes>: New variable.
+       (Go_functions): New function.
+       <lang_names>: 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: Adjust accordingly.
+       * test/etags/ETAGS.good_6:
+       * test/etags/CTAGS.good: Adapt to addition of Go tests.
 
-2016-01-30  Dmitry Gutov  <address@hidden>
+2016-01-30  Eli Zaretskii  <address@hidden>
 
-       Propertize backtick in 'def `(abc)' as symbol constituent
+       Improve Ruby support in 'etags'
 
-       * 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.
+       * 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-01-30  Eli Zaretskii  <address@hidden>
+       * doc/emacs/maintaining.texi (Tag Syntax): Mention that constants
+       are tagged by etags in Ruby.
 
-       Fix scrolling under scroll-preserve-screen-position on TTY
+       * etc/NEWS: Mention that constants are tagged by etags in Ruby.
 
-       * 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)
+       * 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  Lars Magne Ingebrigtsen  <address@hidden>
+2016-01-30  Eli Zaretskii  <address@hidden>
 
-       Fix shr table rendering of nested tables
+       Adjust etags test results to changes in copyright years
 
-       * shr.el (shr-table-body): Don't include all tbodies in nested
-       tables in the levels above.
+       * 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  Dmitry Gutov  <address@hidden>
+2016-01-30  Andreas Schwab  <address@hidden>
 
-       * lisp/progmodes/project.el (project--read-regexp): Quote the 
identifier.
+       Revert "Re-enable checks in member, memql, delete to complain about 
non-lists"
 
-2016-01-30  Dmitry Gutov  <address@hidden>
+       This reverts commit f524e8b7f12d9b5a8b92084e5385429fe7b085b9.
 
-       Add xref-based replacements for Dired search commands
+2016-01-30  Nicolas Petton  <address@hidden>
 
-       * 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
+       Make it possible to run make change-history on emacs-25
 
-       * lisp/dired.el (dired-mode-map): Change bindings for `A' and
-       `Q' to the new commands.
+       * Makefile.in: Check if the current branch is emacs-25 instead of
+         master.
 
-       * 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-30  Dmitry Gutov  <address@hidden>
 
-2016-01-30  Alan Mackenzie  <address@hidden>
+       Don't fiddle with DEFAULT
 
-       * doc/lispref/frames.texi (Position Parameters): Say they don't exist 
on TTYs.
+       * 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  <address@hidden>
 
-       Improve user documentation of Xref
+       Document xwidget commands and functions
 
-       * doc/emacs/maintaining.texi (Xref, Find Identifiers)
-       (Looking Up Identifiers, Identifier Search, List Identifiers):
-       Adjudicate comments by Dmitry Gutov <address@hidden>.  See
-       http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00650.html
-       for the details.
+       * 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  Eli Zaretskii  <address@hidden>
+2016-01-30  Lars Ingebrigtsen  <address@hidden>
 
-       Fix scrolling under scroll-preserve-screen-position and margins
+       Build fix for shr.el
 
-       * 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)
+       * shr.el (seq): Require.
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+2016-01-30  Dmitry Gutov  <address@hidden>
 
-       Unbreak the MS-Windows build
+       Improve project-find-file yet again!
 
-       * src/sysdep.c (emacs_gnutls_global_init, gnutls_rnd): Disable for
-       WINDOWSNT, to avoid link failure.  (Bug#22202)
+       * 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  Alan Mackenzie  <address@hidden>
+2016-01-30  Dmitry Gutov  <address@hidden>
 
-       Desktop: protect users against inadvertant upgrading of desktop file.
+       Don't pass DIR to 'hg status'
 
-       An upgraded (version 208) desktop file cannot be read in Emacs < 25.
+       * lisp/vc/vc-hg.el (vc-hg-dir-status-files):
+       Don't pass DIR to 'hg status' (bug#22481).
 
-       * etc/NEWS: Add an entry about upgrading a desktop file.
+2016-01-30  Stephen Leake  <address@hidden>
 
-       * 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.
+       Fix typo in previous commits
 
-2016-01-30  Paul Eggert  <address@hidden>
+       * lisp/progmodes/project.el (project-find-file-in):
+       * lisp/vc/vc-mtn.el (vc-mtn-find-ignore-file): Fix typo in previous
+       commit.
 
-       Initialize GnuTLS before calling gnutls_rnd
+2016-01-30  Stephen Leake  <address@hidden>
 
-       * 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 <gnutls/crypto.h>
-       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.
+       Improve project-find-file
 
-2016-01-30  Andreas Schwab  <address@hidden>
+       * 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.
 
-       Don't use GnuTLS before it is initialized
+       * lisp/progmodes/xref.el (ede-minor-mode): New declaration.
+       (xref--find-ignores-arguments): Add doc string.
 
-               * src/sysdep.c (init_random): Don't use gnutls_rnd.
+2016-01-30  Stephen Leake  <address@hidden>
 
-2016-01-30  Paul Eggert  <address@hidden>
+       Implement vc-mtn-find-ignore-file, fix some doc strings
 
-       Port cleanup attribute to OpenBSD
+       * lisp/cedet/cedet-global.el (cedet-gnu-global-root): Improve doc 
string.
 
-       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.
+       * lisp/cedet/ede/locate.el (initialize-instance): Improve doc string.
 
-2016-01-30  Paul Eggert  <address@hidden>
+       * lisp/vc/vc-git.el (vc-git-find-ignore-file): Fix doc string.
 
-       Prefer GnuTLS when acquiring random seed
+       * lisp/vc/vc-mtn.el (vc-mtn-find-ignore-file): New function.
 
-       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-23  Michael Albinus  <address@hidden>
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       Improve user name completion in Tramp
 
-       Improve documentation of dynamic modules
+       * 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.
 
-       * 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-22  Michael Albinus  <address@hidden>
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       * etc/NEWS: Move kqueue entries to Emacs 25.1 sections.
 
-       * INSTALL: Document --with-modules.
+2016-01-20  Glenn Morris  <address@hidden>
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       Remove handling of non-string time-stamp formats, obsolete for 20 years.
 
-       Document 'function-put'
-
-       * doc/lispref/symbols.texi (Symbol Plists): Document
-       'function-put'.  Update documentation of 'function-get'.
+       * 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-30  Eli Zaretskii  <address@hidden>
+2016-01-20  Eli Zaretskii  <address@hidden>
 
-       Document 'funcall-interactively'
+       Anoter fix for problematic merge from emacs-25
 
-       * doc/lispref/commands.texi (Interactive Call): Document
-       'funcall-interactively'.
-       * doc/lispref/functions.texi (Calling Functions): Mention
-       'funcall-interactively' and provide a cross-reference.
+       * src/w32fns.c (globals_of_w32fns): Move initialization of
+       resetstkoflw to a non-Cygwin part.
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+2016-01-20  Michael Albinus  <address@hidden>
 
-       * doc/lispref/lists.texi (Association Lists): Document 'alist-get'.
+       * test/Makefile.in (mostlyclean): Use ${LOGFILES}.
 
-       * doc/lispref/strings.texi (Text Comparison): Document 
'string-greaterp'.
+2016-01-20  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       Fix MS-Windows build broken by a botched merge from emacs-25
 
-       Document renaming of selection-related functions
+       * 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.
 
-       * doc/lispref/frames.texi (Window System Selections): Rename "x-*"
-       functions into the corresponding "gui-*" functions.  Make the
-       description slightly less X-centric.
+2016-01-20  Vincent Belaïche  <address@hidden>
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       Correct a whole bunch of bugs coming with renamed cell relocation.
 
-       * doc/lispref/macros.texi (Expansion): Document 'macroexpand-1'.
+       * 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:address@hidden 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:address@hidden, `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 initialisation.
+       (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:address@hidden, 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:address@hidden 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-30  Eli Zaretskii  <address@hidden>
+2016-01-19  John Wiegley  <address@hidden>
 
-       Document 'define-inline'
+       Merge from origin/emacs-25
 
-       * doc/lispref/functions.texi (Defining Functions): Document
-       'define-inline' and related macros.
+       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
 
-       * lisp/emacs-lisp/inline.el (inline-letevals): Doc fix.
+2016-01-19  John Wiegley  <address@hidden>
 
-2016-01-30  Artur Malabarba  <address@hidden>
+       -
 
-       * lisp/files.el (dir-locals--all-files): Respect absolute file-names
+2016-01-19  Paul Eggert  <address@hidden>
 
-       * lisp/help-fns.el (describe-variable): Fix a left-over parenthesis
+       Avoid stdio in SIGINT handler
 
-2016-01-30  Artur Malabarba  <address@hidden>
+       * 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.
 
-       * lisp/dired-x.el (dired-omit-here-always): Use add-dir-local-variable
+2016-01-19  Jens Lechtenboerger  <address@hidden>
 
-       instead of manually writing a dir-locals file.
+       Refactor mml-smime.el, mml1991.el, mml2015.el
 
-2016-01-30  Artur Malabarba  <address@hidden>
+       (Maybe this is the last merge from Gnus git to Emacs git)
 
-       * lisp/files.el (dir-locals--all-files): Use completion instead of 
wildcards
+       Cf. discussion on ding mailing list, messages in
+       <http://thread.gmane.org/gmane.emacs.gnus.general/86228>.
+       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.
 
-       (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.
+       The code is supported by test cases with necessary test keys.
 
-2016-01-30  Jussi Lahdenniemi  <address@hidden>  (tiny change)
+       Documentation in message.texi is updated.
 
-       Fix incompatbilities with MS-Windows 2000 and older
+       * 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.
 
-       * src/w32.c <multiByteToWideCharFlags>: 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.
+       * lisp/gnus/gnus-util.el (gnus-test-list, gnus-subsetp, gnus-setdiff):
+       New functions.
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       * 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.
 
-       Mention in PROBLEMS an issue with MS-Windows NT4
+       * 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.
 
-       * 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.
+       * 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-01-30  Jussi Lahdenniemi  <address@hidden>  (tiny change)
+       * 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.
 
-       Ensure 8-byte aligned memory allocation on MS-Windows 9X
+2016-01-19  Paul Eggert  <address@hidden>
 
-       * 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.
+       Merge from gnulib
 
-       * nt/inc/ms-w32.h (malloc_after_dump_9x, realloc_after_dump_9x)
-       (free_after_dump_9x): Add prototypes.
+       This mostly just updates copyright dates of gnulib files.
+       It also updates to the latest version of texinfo.tex.
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+2016-01-19  YAMAMOTO Mitsuharu  <address@hidden>
 
-       Fix tests for active region in hideif.el
+       Move variables to inner loop, preparing for Mac port merge
 
-       * 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'.
+       * src/keyboard.c (command_loop_1): Move variables `cmd',
+       `keybuf', and `i' to inner loop.
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+2016-01-19  Paul Eggert  <address@hidden>
 
-       Fix interactive specs in some hideif.el commands
+       Minor improvements to (random t) documentation
 
-       * 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.
+       * doc/lispref/numbers.texi (Random Numbers):
+       * src/fns.c (Frandom):
+       Omit unnecessary details about randomness fallback.
+       Say that it is a fallback.
 
-2016-01-30  Phillip Lord  <address@hidden>
+2016-01-19  Dmitry Gutov  <address@hidden>
 
-       Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
+       Rename methods in Ruby etags example file
 
-2016-01-30  Phillip Lord  <address@hidden>
+       * 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.
 
-       Enable test selector from command line
+2016-01-18  Dmitry Gutov  <address@hidden>
 
-       * test/automated/Makefile.in: Change variable manipulation to avoid
-         over-writing selector.
+       Propertize backtick in 'def `(abc)' as symbol constituent
 
-2016-01-30  Alan Mackenzie  <address@hidden>
+       * 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.
 
-       Don't confuse "::" with ":" when trying to parse member initializers.
+2016-01-18  Eli Zaretskii  <address@hidden>
 
-       * lisp/progmodes/cc-engine.el (c-back-over-member-initializers): Check
-       more robustly for ":" token when searching backwards for it.
+       Fix scrolling under scroll-preserve-screen-position on TTY
 
-       * lisp/progmodes/cc-langs.el (c-:$-multichar-token-regexp): New language
-       variable.
+       * 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-30  Eli Zaretskii  <address@hidden>
+2016-01-18  Lars Magne Ingebrigtsen  <address@hidden>
 
-       Ensure positive number of glyphs for margins of positive width
+       Fix shr table rendering of nested tables
 
-       * 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)
+       * shr.el (shr-table-body): Don't include all tbodies in nested
+       tables in the levels above.
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+2016-01-18  Dmitry Gutov  <address@hidden>
 
-       Fix crashes when mini-window has non-zero margins
+       * lisp/progmodes/project.el (project--read-regexp): Quote the 
identifier.
 
-       * 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-18  Dmitry Gutov  <address@hidden>
 
-2016-01-30  Alan Mackenzie  <address@hidden>
+       Add xref-based replacements for Dired search commands
 
-       In comment-dwim with style `extra-line', respect indent-tabs-mode.
+       * 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
 
-       This fixes bug #22369.
+       * lisp/dired.el (dired-mode-map): Change bindings for `A' and
+       `Q' to the new commands.
 
-       * lisp/newcomment.el (comment-make-bol-ws): New function.
-       (comment-make-extra-lines): Use new function instead of a crude 
`make-string'.
+       * 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-30  Eli Zaretskii  <address@hidden>
+2016-01-18  Alan Mackenzie  <address@hidden>
 
-       Make 'random' seeds cryptographically secure if possible
+       * doc/lispref/frames.texi (Position Parameters): Say they don't exist 
on TTYs.
 
-       * configure.ac: Check for "/dev/urandom".
+2016-01-18  Eli Zaretskii  <address@hidden>
 
-       * 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.
+       Improve user documentation of Xref
 
-       * doc/lispref/numbers.texi (Random Numbers): Document more details
-       about 't' as the argument to 'random'.
+       * doc/emacs/maintaining.texi (Xref, Find Identifiers)
+       (Looking Up Identifiers, Identifier Search, List Identifiers):
+       Adjudicate comments by Dmitry Gutov <address@hidden>.  See
+       http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00650.html
+       for the details.
 
-       * etc/NEWS: Mention that '(random t)' now uses a cryptographically
-       strong seed if possible.
+2016-01-18  Eli Zaretskii  <address@hidden>
 
-       (Bug#22202)
+       Fix scrolling under scroll-preserve-screen-position and margins
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       * 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)
 
-       Unhide the --no-line-directive option to 'etags'
+2016-01-18  Eli Zaretskii  <address@hidden>
 
-       * lib-src/etags.c (print_help): Un-undocument the --no-line-directive
-       option.  (Bug#22306)
+       Unbreak the MS-Windows build
 
-       * doc/man/etags.1: Document the --no-line-directive option.
+       * src/sysdep.c (emacs_gnutls_global_init, gnutls_rnd): Disable for
+       WINDOWSNT, to avoid link failure.  (Bug#22202)
 
-2016-01-30  Alan J Third  <address@hidden>  (tiny change)
+2016-01-18  Alan Mackenzie  <address@hidden>
 
-       Fix picture-mode wrt double-width characters
+       Desktop: protect users against inadvertant upgrading of desktop file.
 
-       * lisp/textmodes/picture.el (picture-insert): Check the width of
-       the character being replaced, not just that of the replacement.
-       (Bug#1808)
+       An upgraded (version 208) desktop file cannot be read in Emacs < 25.
 
-2016-01-30  Eric Abrahamsen  <address@hidden>
+       * etc/NEWS: Add an entry about upgrading a desktop file.
 
-       Honor docstring of gnus-group-get-new-news
+       * 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.
 
-       * 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-17  Paul Eggert  <address@hidden>
 
-2016-01-30  Simen Heggestøyl  <address@hidden>
+       Initialize GnuTLS before calling gnutls_rnd
 
-       Disallow parenthesis in non-pseudo CSS selectors
+       * 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 <gnutls/crypto.h>
+       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.
 
-       * 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-17  Andreas Schwab  <address@hidden>
 
-2016-01-30  Katsumi Yamaoka  <address@hidden>
+       Don't use GnuTLS before it is initialized
 
-       * lisp/gnus/nntp.el (nntp-request-newgroups): Simplify
+               * src/sysdep.c (init_random): Don't use gnutls_rnd.
 
-2016-01-30  Michael Albinus  <address@hidden>
+2016-01-17  Bill Wohler  <address@hidden>
 
-       check-maybe shall run only default tests
+       * mh-e.el (mh-version): Add +git to version.
 
-       * 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-17  Paul Eggert  <address@hidden>
 
-2016-01-30  Mark Oteiza  <address@hidden>
+       Port cleanup attribute to OpenBSD
 
-       * lisp/thingatpt.el (thing-at-point-uri-schemes): Add "magnet:"
+       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-30  Dmitry Gutov  <address@hidden>
+2016-01-17  Paul Eggert  <address@hidden>
 
-       Un-obsolete tags-loop-continue
+       Prefer GnuTLS when acquiring random seed
 
-       * lisp/progmodes/etags.el (tags-loop-continue): Un-obsolete.
-       http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00682.html
+       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-30  Eli Zaretskii  <address@hidden>
+2016-01-16  Eli Zaretskii  <address@hidden>
 
-       Document obsoletion of 'intangible' and 'point-entered/left'
+       Improve documentation of dynamic modules
 
-       * 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.
+       * 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/emacs-lisp/cursor-sensor.el (cursor-sensor-mode): Doc fix.
+2016-01-16  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       * INSTALL: Document --with-modules.
 
-       Updater documentation of 'looking-back'
+2016-01-16  Eli Zaretskii  <address@hidden>
 
-       * doc/lispref/searching.texi (Regexp Search): Update documentation
-       of 'looking-back'.  Fix markup.
+       Document 'function-put'
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       * doc/lispref/symbols.texi (Symbol Plists): Document
+       'function-put'.  Update documentation of 'function-get'.
 
-       Document 'pre-redisplay-functions'
+2016-01-16  Eli Zaretskii  <address@hidden>
 
-       * doc/lispref/hooks.texi (Standard Hooks):
-       * doc/lispref/display.texi (Forcing Redisplay): Document
-       'pre-redisplay-functions'.
+       Document 'funcall-interactively'
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       * doc/lispref/commands.texi (Interactive Call): Document
+       'funcall-interactively'.
+       * doc/lispref/functions.texi (Calling Functions): Mention
+       'funcall-interactively' and provide a cross-reference.
 
-       Document the new deafault value of 'load-read-function'
+2016-01-16  Eli Zaretskii  <address@hidden>
 
-       * doc/lispref/loading.texi (How Programs Do Loading): Document the
-       change in the default value of 'load-read-function'.
+       * doc/lispref/lists.texi (Association Lists): Document 'alist-get'.
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       * doc/lispref/strings.texi (Text Comparison): Document 
'string-greaterp'.
 
-       Document 'bufferpos-to-filepos' and 'filepos-to-bufferpos'
+2016-01-16  Eli Zaretskii  <address@hidden>
 
-       * doc/lispref/nonascii.texi (Text Representations): Document
-       'bufferpos-to-filepos' and 'filepos-to-bufferpos'.
+       Document renaming of selection-related functions
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       * doc/lispref/frames.texi (Window System Selections): Rename "x-*"
+       functions into the corresponding "gui-*" functions.  Make the
+       description slightly less X-centric.
 
-       Document the new prefix-command hooks
+2016-01-16  Eli Zaretskii  <address@hidden>
 
-       * doc/lispref/hooks.texi (Standard Hooks): Document
-       `prefix-command-echo-keystrokes-functions' and
-       `prefix-command-preserve-state-hook'.
+       * doc/lispref/macros.texi (Expansion): Document 'macroexpand-1'.
 
-2016-01-30  Paul Eggert  <address@hidden>
+2016-01-16  Eli Zaretskii  <address@hidden>
 
-       Fix one more misuse of time-stamp-time-zone
+       Document 'define-inline'
 
-       * test/etags/html-src/softwarelibero.html: Use "UTC0" rather
-       than the unportable "GMT" for time zone.
+       * doc/lispref/functions.texi (Defining Functions): Document
+       'define-inline' and related macros.
 
-2016-01-30  Paul Eggert  <address@hidden>
+       * lisp/emacs-lisp/inline.el (inline-letevals): Doc fix.
 
-       Fix NNTP NEWGROUPS off-by-a-few-hours bug
+2016-01-16  Artur Malabarba  <address@hidden>
 
-       * lisp/gnus/nntp.el (nntp-request-newgroups): Format string
-       in Universal Time, since we’re telling the server “GMT”.
-
-2016-01-30  Paul Eggert  <address@hidden>
+       * lisp/files.el (dir-locals--all-files): Respect absolute file-names
 
-       Update publicsuffix.txt from upstream
+       * lisp/help-fns.el (describe-variable): Fix a left-over parenthesis
 
-       * etc/publicsuffix.txt: Update from
-       https://publicsuffix.org/list/effective_tld_names.dat
-       dated 2016-01-12 11:52:01 UTC.
+2016-01-16  Artur Malabarba  <address@hidden>
 
-2016-01-30  Glenn Morris  <address@hidden>
+       * lisp/dired-x.el (dired-omit-here-always): Use add-dir-local-variable
 
-       Fix some declarations.
+       instead of manually writing a dir-locals file.
 
-       * 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-16  Artur Malabarba  <address@hidden>
 
-2016-01-30  Glenn Morris  <address@hidden>
+       * lisp/files.el (dir-locals--all-files): Use completion instead of 
wildcards
 
-       Fix some custom types.
+       (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.
 
-       * 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-16  Jussi Lahdenniemi  <address@hidden>  (tiny change)
 
-2016-01-30  Glenn Morris  <address@hidden>
+       Fix incompatbilities with MS-Windows 2000 and older
 
-       Add some missing version tags.
+       * src/w32.c <multiByteToWideCharFlags>: 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.
 
-       * 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-16  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Glenn Morris  <address@hidden>
+       Mention in PROBLEMS an issue with MS-Windows NT4
 
-       * test/automated/core-elisp-tests.el
-       (core-elisp-tests-1-defvar-in-let): Add a custom type.
+       * 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-30  Glenn Morris  <address@hidden>
+2016-01-16  Jussi Lahdenniemi  <address@hidden>  (tiny change)
 
-       * src/buffer.c (syms_of_buffer) <major-mode>: Doc fix.
+       Ensure 8-byte aligned memory allocation on MS-Windows 9X
 
-       Remove comments that do not apply since 2005-08-09.  (Bug#22349)
+       * 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-01-30  Paul Eggert  <address@hidden>
+       * nt/inc/ms-w32.h (malloc_after_dump_9x, realloc_after_dump_9x)
+       (free_after_dump_9x): Add prototypes.
 
-       Merge from gnulib
+2016-01-16  Eli Zaretskii  <address@hidden>
 
-       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.
+       Fix tests for active region in hideif.el
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       * 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'.
 
-       Update documentation of 'process-running-child-p'
+2016-01-16  Eli Zaretskii  <address@hidden>
 
-       * doc/lispref/processes.texi (Input to Processes): Document the
-       changes in return value of 'process-running-child-p'.
+       Fix interactive specs in some hideif.el commands
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       * 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.
 
-       Update documentation of 'deactivate-mark'.
+2016-01-15  Phillip Lord  <address@hidden>
 
-       * doc/lispref/markers.texi (The Mark): Document that
-       'deactivate-mark' is now buffer-local when set.
+       Enable test selector from command line
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       * test/automated/Makefile.in: Change variable manipulation to avoid
+         over-writing selector.
 
-       Update documentation of 'completion-table-dynamic'
+2016-01-15  Alan Mackenzie  <address@hidden>
 
-       * doc/lispref/minibuf.texi (Programmed Completion): Document the
-       new optional argument to 'completion-table-dynamic'.
+       Don't confuse "::" with ":" when trying to parse member initializers.
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       * lisp/progmodes/cc-engine.el (c-back-over-member-initializers): Check
+       more robustly for ":" token when searching backwards for it.
 
-       Document changes in 'read-buffer' and 'read-buffer-function'
+       * lisp/progmodes/cc-langs (c-:$-multichar-token-regexp): New language
+       variable.
 
-       * doc/lispref/minibuf.texi (High-Level Completion): Document the
-       4th argument to 'read-buffer' and 'read-buffer-function'.
+2016-01-15  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Paul Eggert  <address@hidden>
+       Ensure positive number of glyphs for margins of positive width
 
-       Fix time-stamp-time-zone bugs introduced in July
+       * 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)
 
-       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-15  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       Fix crashes when mini-window has non-zero margins
 
-       Make piping to subprocesses more robust on MS-Windows
+       * 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)
 
-       * 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) <w32-pipe-buffer-size>: New variable.
-       * src/w32.c (pipe2): Use it to request a user-defined size for the
-       pipe being created.
+2016-01-15  Alan Mackenzie  <address@hidden>
 
-       * etc/NEWS: Mention 'w32-pipe-buffer-size'.
+       In comment-dwim with style `extra-line', respect indent-tabs-mode.
 
-       * doc/emacs/msdos.texi (Windows Processes): Document
-       'w32-pipe-buffer-size'.
+       This fixes bug #22369.
 
-2016-01-30  Dmitry Gutov  <address@hidden>
+       * lisp/newcomment.el (comment-make-bol-ws): New function.
+       (comment-make-extra-lines): Use new function instead of a crude 
`make-string'.
 
-       test/automated/vc-hg.el: Support out-of-tree build
+2016-01-15  Eli Zaretskii  <address@hidden>
 
-       * 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
+       Make 'random' seeds cryptographically secure if possible
 
-2016-01-30  Michael Albinus  <address@hidden>
+       * configure.ac: Check for "/dev/urandom".
 
-       Minor change in tramp-tests.el
+       * 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.
 
-       * test/automated/tramp-tests.el (tramp-test29-vc-registered):
-       Use `dired-uncache' instead of a Tramp internal function.
+       * doc/lispref/numbers.texi (Random Numbers): Document more details
+       about 't' as the argument to 'random'.
 
-2016-01-30  Peter Feigl  <address@hidden>
+       * etc/NEWS: Mention that '(random t)' now uses a cryptographically
+       strong seed if possible.
 
-       * etc/HELLO: Add Armenian and Mongolian greetings.
+       (Bug#22202)
 
-       (Bug#22346)
+2016-01-15  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Alan Mackenzie  <address@hidden>
+       Unhide the --no-line-directive option to 'etags'
 
-       Java Mode: Fontify identifiers in the presence of annotations.
+       * lib-src/etags.c (print_help): Un-undocument the --no-line-directive
+       option.  (Bug#22306)
 
-       * 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.
+       * doc/man/etags.1: Document the --no-line-directive option.
 
-       * 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-01-15  Alan J Third  <address@hidden>  (tiny change)
 
-       * lisp/progmodes/cc-langs.el (c-maybe-decl-faces): New language 
variable.
+       Fix picture-mode wrt double-width characters
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       * lisp/textmodes/picture.el (picture-insert): Check the width of
+       the character being replaced, not just that of the replacement.
+       (Bug#1808)
 
-       Avoid an infloop when we run out of memory
+2016-01-15  Eric Abrahamsen  <address@hidden>
 
-       * 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.
+       Honor docstring of gnus-group-get-new-news
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       * 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.
 
-       Avoid unnecessary failures of auto-saving after fatal error
+2016-01-14  Simen Heggestøyl  <address@hidden>
 
-       * 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.
+       Disallow parenthesis in non-pseudo CSS selectors
 
-2016-01-30  Paul Eggert  <address@hidden>
+       * 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.
 
-       Simplify HAVE_MODULES use in mark_maybe_pointer
+2016-01-14  Katsumi Yamaoka  <address@hidden>
 
-       * 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.
+       * lisp/gnus/nntp.el (nntp-request-newgroups): Simplify
 
-2016-01-30  Paul Eggert  <address@hidden>
+2016-01-14  Michael Albinus  <address@hidden>
 
-       Revert attempt to use 'noexcept' in typedef
+       check-maybe shall run only default tests
 
-       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.
+       * 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-30  Eli Zaretskii  <address@hidden>
+2016-01-13  Mark Oteiza  <address@hidden>
 
-       Update documentation of 'indirect-function'
+       * lisp/thingatpt.el (thing-at-point-uri-schemes): Add "magnet:"
 
-       * doc/lispref/eval.texi (Function Indirection): Update the
-       documentation of 'indirect-function'.
+2016-01-13  Dmitry Gutov  <address@hidden>
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       Un-obsolete tags-loop-continue
 
-       Update documentation for obsoleting 'syntax-begin-function'
+       * lisp/progmodes/etags.el (tags-loop-continue): Un-obsolete.
+       http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00682.html
 
-       * doc/lispref/syntax.texi (Position Parse): Undocument
-       'syntax-begin-function' that is now obsolete.
+2016-01-13  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       Document obsoletion of 'intangible' and 'point-entered/left'
 
-       Document new features if Eshell
+       * 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.
 
-       * doc/misc/eshell.texi (Input/Output): Document the new
-       '#<bufname>' syntax.
-       (Input/Output): Document 'eshell-destroy-buffer-when-process-dies'.
-       Disable "Key Index" generation, as there are no @kindex entries in
-       this manual.
+       * lisp/emacs-lisp/cursor-sensor.el (cursor-sensor-mode): Doc fix.
 
-2016-01-30  Michael Albinus  <address@hidden>
+2016-01-13  Eli Zaretskii  <address@hidden>
 
-       Handle too long commands in Tramp
+       Updater documentation of 'looking-back'
 
-       * 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.
+       * doc/lispref/searching.texi (Regexp Search): Update documentation
+       of 'looking-back'.  Fix markup.
 
-       * test/automated/tramp-tests.el (tramp--test-darwin-p): Remove.
-       (tramp--test-utf8): Include Arabic file name, again.
+2016-01-13  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Paul Eggert  <address@hidden>
+       Document 'pre-redisplay-functions'
 
-       * .gitattributes: *.cur and *.pif are binary files too.
+       * doc/lispref/hooks.texi (Standard Hooks):
+       * doc/lispref/display.texi (Forcing Redisplay): Document
+       'pre-redisplay-functions'.
 
-2016-01-30  Stefan Monnier  <address@hidden>
+2016-01-13  Eli Zaretskii  <address@hidden>
 
-       * src/alloc.c (mark_maybe_pointer): HAVE_MODULES may be undefined
+       Document the new deafault value of 'load-read-function'
 
-2016-01-30  Stefan Monnier  <address@hidden>
+       * doc/lispref/loading.texi (How Programs Do Loading): Document the
+       change in the default value of 'load-read-function'.
 
-       * lisp/progmodes/sh-script.el (sh-smie-sh-rules): Improve indentation 
inside $(...)
+2016-01-13  Eli Zaretskii  <address@hidden>
 
-       * lisp/progmodes/sh-script.el (sh-smie-sh-rules): Improve indentation
-       within $(...).
-       * test/indent/shell.sh: Add corresponding test.
+       Document 'bufferpos-to-filepos' and 'filepos-to-bufferpos'
 
-2016-01-30  Stefan Monnier  <address@hidden>
+       * doc/lispref/nonascii.texi (Text Representations): Document
+       'bufferpos-to-filepos' and 'filepos-to-bufferpos'.
 
-       * src/alloc.c (mark_maybe_pointer): Also check wide-int's emacs_value
+2016-01-13  Eli Zaretskii  <address@hidden>
 
-       (mark_memory): Simplify loop.  Don't assume a pointer-sized word can be
-       cast to Lisp_Object.
+       Document the new prefix-command hooks
 
-2016-01-30  Dmitry Gutov  <address@hidden>
+       * doc/lispref/hooks.texi (Standard Hooks): Document
+       `prefix-command-echo-keystrokes-functions' and
+       `prefix-command-preserve-state-hook'.
 
-       Use short date for 'hg annotate', and output the author
+2016-01-13  Paul Eggert  <address@hidden>
 
-       * 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.
+       Fix one more misuse of time-stamp-time-zone
 
-       * test/automated/vc-hg.el: New file.
+       * test/etags/html-src/softwarelibero.html: Use "UTC0" rather
+       than the unportable "GMT" for time zone.
 
-2016-01-30  Paul Eggert  <address@hidden>
+2016-01-13  Paul Eggert  <address@hidden>
 
-       Spelling fix
+       Fix NNTP NEWGROUPS off-by-a-few-hours bug
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       * lisp/gnus/nntp.el (nntp-request-newgroups): Format string
+       in Universal Time, since we’re telling the server “GMT”.
 
-       Document user-level functions in project.el
+2016-01-12  Paul Eggert  <address@hidden>
 
-       * lisp/progmodes/project.el (project-find-file)
-       (project-or-external-find-file): Add doc strings.
+       Update publicsuffix.txt from upstream
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       * etc/publicsuffix.txt: Update from
+       https://publicsuffix.org/list/effective_tld_names.dat
+       dated 2016-01-12 11:52:01 UTC.
 
-       Document the user-level features of the Xref package
+2016-01-12  Glenn Morris  <address@hidden>
 
-       * 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.
+       Fix some declarations.
 
-2016-01-30  Stefan Monnier  <address@hidden>
+       * 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.
 
-       * doc/lispref/loading.texi: Add `define-type' entry for load-history
+2016-01-12  Glenn Morris  <address@hidden>
 
-       * doc/lispref/loading.texi (Where Defined): Remove incorrect
-       cl-defmethod description, and add missing define-type entry.
+       Fix some custom types.
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       * 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.
 
-       Improve doc strings and prompts in xref.el
+2016-01-12  Glenn Morris  <address@hidden>
 
-       * lisp/progmodes/xref.el (xref-backend-functions)
-       (xref-find-definitions): Doc fixes.
-       (xref-query-replace): Doc fix.  Improve prompts for arguments.
+       Add some missing version tags.
 
-2016-01-30  Alan Mackenzie  <address@hidden>
+       * 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.
 
-       Allow the use of `font-lock-extend-region-multiline' in CC Mode.
+2016-01-12  Glenn Morris  <address@hidden>
 
-       * 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.
+       * test/automated/core-elisp-tests.el
+       (core-elisp-tests-1-defvar-in-let): Add a custom type.
 
-2016-01-30  Michael Albinus  <address@hidden>
+2016-01-12  Glenn Morris  <address@hidden>
 
-       Fix coding system for Tramp on OS X.
+       * src/buffer.c (syms_of_buffer) <major-mode>: Doc fix.
 
-       * lisp/net/tramp-compat.el: Require ucs-normalize.
+       Remove comments that do not apply since 2005-08-09.  (Bug#22349)
 
-       * lisp/net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
-       Set coding system to `utf-8-hfs' for Mac OS X.
+2016-01-12  Paul Eggert  <address@hidden>
 
-       * test/automated/tramp-tests.el (tramp-test29-vc-registered):
-       Flush directory properties when needed.
-       (tramp--test-utf8): Include Chinese file name, again.
+       Merge from gnulib
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       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.
 
-       Update 'load-history' docs
+2016-01-12  Eli Zaretskii  <address@hidden>
 
-       * 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)
+       Update documentation of 'process-running-child-p'
 
-2016-01-30  Paul Eggert  <address@hidden>
+       * doc/lispref/processes.texi (Input to Processes): Document the
+       changes in return value of 'process-running-child-p'.
 
-       Fix (error ...) error
+2016-01-12  Eli Zaretskii  <address@hidden>
 
-       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 ...).
+       Update documentation of 'deactivate-mark'.
 
-2016-01-30  Alan Mackenzie  <address@hidden>
+       * doc/lispref/markers.texi (The Mark): Document that
+       'deactivate-mark' is now buffer-local when set.
 
-       Correctly analyze brace arguments in templated C++ function 
declarations.
+2016-01-12  Eli Zaretskii  <address@hidden>
 
-       * 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.
+       Update documentation of 'completion-table-dynamic'
 
-       * 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-30  Glenn Morris  <address@hidden>
-
-       * lisp/cedet/mode-local.el (describe-function-orig-buffer): Declare.
-
-       * lisp/ffap.el (ffap-latex-mode): Avoid free variable.
-
-2016-01-30  Mark Oteiza  <address@hidden>
-
-       * lisp/play/dunnet.el (dun-fix-screen): Avoid `end-of-buffer`.
-
-2016-01-30  Alan Mackenzie  <address@hidden>
-
-       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-30  Eli Zaretskii  <address@hidden>
-
-       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-30  Dmitry Gutov  <address@hidden>
+       * doc/lispref/minibuf.texi (Programmed Completion): Document the
+       new optional argument to 'completion-table-dynamic'.
 
-       Fix two project-find-file issues
+2016-01-12  Eli Zaretskii  <address@hidden>
 
-       * 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.
+       Document changes in 'read-buffer' and 'read-buffer-function'
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       * doc/lispref/minibuf.texi (High-Level Completion): Document the
+       4th argument to 'read-buffer' and 'read-buffer-function'.
 
-       Clarify doc string of 'dired-current-directory'
+2016-01-12  Paul Eggert  <address@hidden>
 
-       * 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 time-stamp-time-zone bugs introduced in July
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       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.
 
-       Use the face of preceding text for displaying the ellipsis
+2016-01-12  Eli Zaretskii  <address@hidden>
 
-       * 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)
+       Make piping to subprocesses more robust on MS-Windows
 
-2016-01-30  Michael Albinus  <address@hidden>
+       * 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) <w32-pipe-buffer-size>: New variable.
+       * src/w32.c (pipe2): Use it to request a user-defined size for the
+       pipe being created.
 
-       Suppress Chinese file name test for OSX in tramp-tests.el
+       * etc/NEWS: Mention 'w32-pipe-buffer-size'.
 
-       * test/automated/tramp-tests.el (tramp--test-utf8):
-       Remove instrumentation.  Suppress Chinese file name test for OSX.
+       * doc/emacs/msdos.texi (Windows Processes): Document
+       'w32-pipe-buffer-size'.
 
-2016-01-30  Glenn Morris  <address@hidden>
+2016-01-16  Stefan Monnier  <address@hidden>
 
-       * admin/admin.el (set-version): Also handle the NEWS file.
+       * lisp/emacs-lisp/syntax.el (syntax-ppss-table): New var
 
-2016-01-30  Dmitry Gutov  <address@hidden>
+       (syntax-ppss):
+       * lisp/font-lock.el (font-lock-fontify-syntactically-region): Use it.
 
-       apropos-library: Skip obvious duplicates; don't error on generics
+2016-01-16  Stefan Monnier  <address@hidden>
 
-       * 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).
+       lisp/nxml: Use syntax-tables for comments
 
-2016-01-30  Dmitry Gutov  <address@hidden>
+       * 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.
 
-       Add project-find-file and project-or-external-find-file
+       * 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/minibuffer.el (completion-category-defaults):
-       Add `project-file' category.
+       * lisp/nxml/nxml-util.el (nxml-debug-set-inside)
+       (nxml-debug-clear-inside): Remove macros.
 
-       * lisp/progmodes/project.el (project-find-file)
-       (project-or-external-find-file): New commands.
-       (project--find-file-in): New private function.
+       * lisp/nxml/xmltok.el (xmltok-forward-special): Remove function.
+       (xmltok-scan-after-comment-open): Simplify.
 
-       * 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-16  Stefan Monnier  <address@hidden>
 
-2016-01-30  Leo Liu  <address@hidden>
+       * elisp-mode.el (elisp--font-lock-flush-elisp-buffers): Fix comment
 
-       Add defvar-local to lisp-imenu-generic-expression
+2016-01-16  Stefan Monnier  <address@hidden>
 
-       * lisp/emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression): Add
-         defvar-local.
+       * lisp/nxml: Use standard completion; it also works for company-mode
 
-2016-01-30  Leo Liu  <address@hidden>
+       * 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.
 
-       Revert commit b1e3d14845517bfa9fa5d6d3840f3ab3160306fd
+       * lisp/nxml/rng-util.el (rng-complete-before-point): Delete function.
+       (rng-completion-exact-p, rng-quote-string): Delete functions.
 
-       * lisp/emacs-lisp/easy-mmode.el (define-minor-mode):
-         Don't declare (indent 1).
+       * 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-30  Glenn Morris  <address@hidden>
+2016-01-16  Stefan Monnier  <address@hidden>
 
-       * lisp/emacs-lisp/autoload.el (autoload-find-destination): Doc fix.
+       Use sgml-electric-tag-pair-mode also in nxml-mode
 
-2016-01-30  Glenn Morris  <address@hidden>
+       * 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/emacs-lisp/autoload.el (autoload-find-destination):
+       * 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.
 
-       Avoid specifying the length of a time object (it has not been "2"
-       for some time).
+       * lisp/nxml/nxml-mode.el: Use setq-local and defvar-local.
 
-2016-01-30  Andreas Schwab  <address@hidden>
+2016-01-15  Stefan Monnier  <address@hidden>
 
-       Properly encode/decode base64Binary data in SOAP
+       * xmltok.el: Mark the "sole --" rather than the comment opener
 
-               * 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.
+       * lisp/nxml/xmltok.el (xmltok-scan-after-comment-open): Put the error
+       marker on the "sole --" rather than on the comment opener.
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+2016-01-15  Sam Steingold  <address@hidden>
 
-       Obey coding-system-for-write when writing stdout/stderr in batch
+       replace `tramp-compat-split-string' (removed) with `split-string'
 
-       * 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.
+       (python-shell-tramp-refresh-process-environment)
+       (python-shell-calculate-pythonpath): use `split-string'
+       instead of defunct `tramp-compat-split-string'
 
-       * 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-15  Stefan Monnier  <address@hidden>
 
-2016-01-30  Xue Fuqiao  <address@hidden>
+       Update nXML to use Emacs's Unicode support, and lexical-binding
 
-       * doc/misc/efaq.texi (Packages that do not come with Emacs):
-       Update the URI of MELPA and marmalade-repo.  Reported by CHENG Gao
-       <address@hidden> in
-       https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00390.html.
+       * 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-30  Maksim Golubev  <address@hidden>  (tiny change)
+2016-01-15  Michael Albinus  <address@hidden>
 
-       * lisp/progmodes/opascal.el (opascal-mode-syntax-table):
+       Add "sg" method to Tramp
 
-       Fix backslash.  (Bug#22224)
+       * doc/misc/tramp.texi (Inline methods): Add "sg" method.
+       (Customizing Completion): Add function `tramp-parse-etc-group'.
 
-2016-01-30  Federico Beffa  <address@hidden>  (tiny change)
+       * lisp/net/tramp-sh.el (tramp-methods) <sg>: Add.  (Bug#22329)
+       (tramp-completion-function-alist-sg): New defconst.
+       (top): Completion function for "sg" is
+       `tramp-completion-function-alist-sg'.
 
-       * lisp/progmodes/xscheme.el (xscheme-prompt-for-expression-exit):
+       * lisp/net/tramp.el (tramp-completion-function-alist): Adapt docstring.
+       (tramp-parse-etc-group, tramp-parse-etc-group-group): New defuns.
 
-       Make it actually work.  (Bug#22265)
+2016-01-14  Michael Albinus  <address@hidden>
 
-2016-01-30  Alan Mackenzie  <address@hidden>
+       Remove XEmacs compatibility in Tramp
 
-       Remove function wrongly on AWK Mode value of context fontification hook.
+       * doc/misc/tramp.texi: Replace flags by their hard coded name.
+       Remove unused flags and the enclosed alternative text for XEmacs.
 
-       * 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.
+       * 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/progmodes/cc-mode.el (c-before-context-fl-expand-region): Correct
-       to handle nil value of c-before-context-fontification-functions.
-
-2016-01-30  Paul Eggert  <address@hidden>
-
-       * src/buffer.c: Stick with ASCII in doc string.
-
-2016-01-30  Paul Eggert  <address@hidden>
-
-       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-30  Eli Zaretskii  <address@hidden>
-
-       Update doc string of 'selective-display'
-
-       * src/buffer.c (syms_of_buffer) <selective-display>: Say that
-       using it with the value of 't' is obsolete.  (Bug#1092)
-
-2016-01-30  Alan Mackenzie  <address@hidden>
-
-       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-30  Michael Albinus  <address@hidden>
-
-       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-30  Alan Mackenzie  <address@hidden>
-
-       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 and >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-30  Michael Albinus  <address@hidden>
-
-       Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
-
-2016-01-30  Michael Albinus  <address@hidden>
-
-       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-30  Lars Magne Ingebrigtsen  <address@hidden>
-
-       shr-tag-video bug fix
-
-       * shr.el (shr-tag-video): Protect against the `poster' being
-       empty.
-
-2016-01-30  Michael Albinus  <address@hidden>
-
-       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-30  Eli Zaretskii  <address@hidden>
-
-       Ensure redisplay when 'truncate-lines' is set
-
-       * lisp/frame.el (redisplay--variables): Add 'truncate-lines'.
-       (Bug#22303)
-
-2016-01-30  Eli Zaretskii  <address@hidden>
-
-       Fix a doc string of 'transient-mark-mode'
-
-       * src/buffer.c (syms_of_buffer) <transient-mark-mode>: Prevent
-       "lambda" in doc string from becoming a link to lambda expressions.
-
-2016-01-30  Eli Zaretskii  <address@hidden>
-
-       MS-Windows followup to latest gnulib update
-
-       * nt/gnulib.mk (EXTRA_DIST): Add ignore-value.h.
-
-2016-01-30  Paul Eggert  <address@hidden>
-
-       Spelling fix
-
-2016-01-30  Jens Lechtenboerger  <address@hidden>
-
-       Do secure signed Bcc handling
-
-       * lisp/gnus/message.el (message-send): Do secure signed Bcc handling
-       (bug#18718).
-
-2016-01-30  Paul Eggert  <address@hidden>
-
-       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-30  Paul Eggert  <address@hidden>
-
-       * doc/misc/texinfo.tex: Revert unwanted copyright change.
-
-2016-01-30  Artur Malabarba  <address@hidden>
-
-       * lisp/align.el (align): Simplify a lambda
-
-       * lisp/align.el (align): Fix arg order in call to `align-region'
-
-2016-01-30  Eli Zaretskii  <address@hidden>
-
-       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-30  Lars Magne Ingebrigtsen  <address@hidden>
-
-       * lisp/net/nsm.el (nsm-check-protocol): Fix typo in the message.
-
-2016-01-30  Lars Magne Ingebrigtsen  <address@hidden>
-
-       Add SHA1 warnings for high network security settings
-
-       * 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-01-30  Jens Lechtenboerger  <address@hidden>
-
-       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
-       <http://thread.gmane.org/gmane.emacs.gnus.general/86228>.
-       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-30  Glenn Morris  <address@hidden>
-
-       * lisp/progmodes/fortran.el (fortran-make-syntax-propertize-function):
-
-       Explicitly ignore case.  (Bug#22262)
-
-2016-01-30  Stefan Monnier  <address@hidden>
-
-       (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-30  Eli Zaretskii  <address@hidden>
-
-       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-30  Eli Zaretskii  <address@hidden>
-
-       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-30  Eli Zaretskii  <address@hidden>
-
-       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-30  Eli Zaretskii  <address@hidden>
-
-       Improve documentation of new Hide-IfDef features
-
-       * etc/NEWS: Expand and reword Hide-IfDef section.
-
-2016-01-30  Leo Liu  <address@hidden>
-
-       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-30  Paul Eggert  <address@hidden>
-
-       Spelling and grammar fixes
-
-2016-01-30  Paul Eggert  <address@hidden>
-
-       Fix copyright years by hand
-
-       These are dates that admin/update-copyright did not update, or
-       updated incorrectly.
-
-2016-01-30  Paul Eggert  <address@hidden>
-
-       Update copyright year to 2016
-
-       Run admin/update-copyright.
-
-2016-01-30  Paul Eggert  <address@hidden>
-
-       Merge from gnulib
-
-       This mostly just updates copyright dates of gnulib files.
-       It also updates to the latest version of texinfo.tex.
-
-2016-01-30  Mark Oteiza  <address@hidden>
-
-       lisp/emacs-lisp/chart.el (chart-new-buffer): Move to silence byte 
compiler.
-
-2016-01-30  Mark Oteiza  <address@hidden>
-
-       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.
-
-2016-01-30  Brian Burns  <address@hidden>
-
-       Add nt/INSTALL.W64 build instructions
-
-       * nt/INSTALL.W64: New file.
-       * nt/INSTALL: Point to INSTALL.W64 for 64-bit build instructions.
-
-2016-01-30  Joakim Jalap  <address@hidden>
-
-       Add new input method 'programmer-dvorak'
-
-       * lisp/leim/quail/programmer-dvorak.el ("programmer-dvorak"): New
-       input method.
-
-       * etc/NEWS: Mention it.
-
-2016-01-30  Eli Zaretskii  <address@hidden>
-
-       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)
-
-2016-01-30  Eli Zaretskii  <address@hidden>
-
-       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)
-
-2016-01-30  Vincent Belaïche  <address@hidden>
-
-       fix  bug#21054
-
-       * lisp/ses.el (ses-check-curcell): Call `ses-set-curcell' 
unconditionally
-
-2016-01-30  YAMAMOTO Mitsuharu  <address@hidden>
-
-       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.
-
-2016-01-30  YAMAMOTO Mitsuharu  <address@hidden>
-
-       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-30  YAMAMOTO Mitsuharu  <address@hidden>
-
-       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.
-
-2016-01-30  YAMAMOTO Mitsuharu  <address@hidden>
-
-       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.
-
-2016-01-30  YAMAMOTO Mitsuharu  <address@hidden>
-
-       Remove unused variable
-
-       * lisp/international/mule-cmds.el: Remove unused variable
-       `mac-system-coding-system'.
-
-2016-01-30  YAMAMOTO Mitsuharu  <address@hidden>
-
-       * configure.ac: Find libxml2 headers in Xcode SDK dir on Darwin.
-
-2016-01-30  YAMAMOTO Mitsuharu  <address@hidden>
-
-       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.
-
-2016-01-30  Shakthi Kannan  <address@hidden>
-
-       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.
-
-2016-01-30  Shakthi Kannan  <address@hidden>
-
-       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.
-
-2016-01-30  Eli Zaretskii  <address@hidden>
-
-       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.
-
-2016-01-30  Eli Zaretskii  <address@hidden>
-
-       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)
-
-2016-01-30  Eli Zaretskii  <address@hidden>
-
-       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.
-
-2016-01-30  Dmitry Gutov  <address@hidden>
-
-       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.
-
-2016-01-30  Dmitry Gutov  <address@hidden>
-
-       Unbreak completion in python-mode buffers
-
-       * lisp/progmodes/python.el (python-shell-completion-at-point):
-       Unbreak in python-mode buffers.
-
-2016-01-30  Eli Zaretskii  <address@hidden>
-
-       Fix typos in CC Mode manual
-
-       * doc/misc/cc-mode.texi (c-offsets-alist, Style Variables): Fix
-       typos.  (Bug#22267)
-
-2016-01-30  Eli Zaretskii  <address@hidden>
-
-       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)
-
-2016-01-30  Eli Zaretskii  <address@hidden>
-
-       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)
-
-2016-01-30  Martin Rudalics  <address@hidden>
-
-       * src/xfns.c (x_create_tip_frame): Process alpha parameter.
-
-2016-01-30  Michael Albinus  <address@hidden>
-
-       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".
-
-2016-01-30  Lambda Coder  <address@hidden>
-
-       * doc/misc/tramp.texi: Editorial revisions to the Tramp manual
-
-2016-01-30  Lars Ingebrigtsen  <address@hidden>
-
-       Mention that tls.el is secure by default, and will fail
-
-2016-01-30  Lars Ingebrigtsen  <address@hidden>
-
-       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'.
-
-2016-01-30  Lars Ingebrigtsen  <address@hidden>
-
-       Refactor out gnutls-trustfiles
-
-       * lisp/net/gnutls.el (gnutls-trustfiles): Refactor out for reuse by 
tls.el.
-
-2016-01-30  Lars Ingebrigtsen  <address@hidden>
-
-       Remove --insecure from gnutls-cli invocation
-
-       * tls.el (tls-program): Default to using secure TLS
-       connections (bug#19284).
-
-2016-01-30  Paul Eggert  <address@hidden>
-
-       Spelling fix
-
-2016-01-30  Paul Eggert  <address@hidden>
-
-       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
-
-2016-01-30  Jose A. Ortega Ruiz  <address@hidden>  (tiny change)
-
-       Fix URL auth error message
-
-       * lisp/url/url-http.el (url-http-handle-authentication): Make the error
-       message more correct (bug#20069).
-
-2016-01-30  Lars Ingebrigtsen  <address@hidden>
-
-       shr link traversal fixup
-
-       * shr.el (shr-next-link): Don't bug out on adjacent links.
-
-       Backport:
-
-       (cherry picked from commit 1efc5f8b09273c359683ce13be95fb5df7a84311)
-
-2016-01-30  Tom Tromey  <address@hidden>
-
-       set :safe on css-indent-offset
-
-       * lisp/textmodes/css-mode.el (css-indent-offset): Add :safe 'integerp.
-
-2016-01-30  Lars Ingebrigtsen  <address@hidden>
-
-       * eww.el (eww-mode): Remove superfluous bidi reset.
-
-2016-01-30  James Stout  <address@hidden>  (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).
-
-2016-01-30  Martin Rudalics  <address@hidden>
-
-       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).
-
-2016-01-30  Lars Ingebrigtsen  <address@hidden>
-
-       Always reset the bidi direction
-
-       * eww.el (eww-display-html): Always reset the bidi direction
-       to `left-to-right' (bug#22257).
-
-2016-01-30  Alan Mackenzie  <address@hidden>
-
-       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'.
-
-2016-01-30  Dmitry Gutov  <address@hidden>
-
-       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.
-
-2016-01-30  Deniz Dogan  <address@hidden>
-
-       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).
-
-2016-01-30  Lars Ingebrigtsen  <address@hidden>
-
-       Don't bug out in erc after waking from sleep
-
-       * 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).
-
-2016-01-30  David Edmondson  <address@hidden>
-
-       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).
-
-       Backport:
-
-       (cherry picked from commit 507e98a54d1aa37823c64993d6b59257a82fe8f4)
-
-2016-01-30  Dima Kogan  <address@hidden>
-
-       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).
-
-2016-01-30  Jens Lechtenboerger  <address@hidden>
-
-       Fix mml-sec build warnings
-
-       * lisp/gnus/mml-sec.el: Fix warnings by adding autoloads
-       (bug#18718).
-
-       Backport:
-
-       (cherry picked from commit 3603097f62f5f4aa5451716e9ac380161f6829e2)
-
-2016-01-30  Lars Ingebrigtsen  <address@hidden>
-
-       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).
-
-2016-01-30  Lars Ingebrigtsen  <address@hidden>
-
-       (eww-setup-buffer): Restore left-to-right defaults
-
-       * eww.el (eww-setup-buffer): Restore left-to-right defaults.
-
-       Backport:
-
-       (cherry picked from commit 96c874b96b617c124d500a94de761a61f2a08685)
-
-2016-01-30  Lars Ingebrigtsen  <address@hidden>
-
-       Don't join erc channels doubly
-
-       * lisp/erc/erc-join.el (erc-autojoin-channels): Don't join channels
-       more than once (if you have several nicks) (bug#20695).
-
-2016-01-30  Eli Zaretskii  <address@hidden>
-
-       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.
-
-2016-01-30  Krzysztof Jurewicz  <address@hidden>  (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).
-
-2016-01-30  Fran Litterio  <address@hidden>
-
-       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).
-
-2016-01-30  Paul Eggert  <address@hidden>
-
-       Spelling fix
-
-       * test/automated/url-parse-tests.el:
-       (url-generic-parse-url/same-document-reference):
-       Rename from url-generic-parse-url/same-decument-reference.
-
-2016-01-30  Paul Eggert  <address@hidden>
-
-       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
-
-2016-01-30  Leo Liu  <address@hidden>
-
-       Add ert-deftest to lisp-mode.el
-
-       * lisp/emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression,
-         lisp-el-font-lock-keywords-1): Add ert-deftest.
-
-2016-01-30  Lars Ingebrigtsen  <address@hidden>
-
-       Mark imap changes as not needing doc changes
-
-       * lisp/net/imap.el (imap-ssl-open): Remove
-
-2016-01-30  Lars Ingebrigtsen  <address@hidden>
-
-       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.
-
-2016-01-30  Eli Zaretskii  <address@hidden>
-
-       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)
-
-2016-01-30  Wolfgang Jenkner  <address@hidden>
-
-       Always define gmalloc etc. in src/gmalloc.c
-2016-01-19  John Wiegley  <address@hidden>
-
-       -
-
-2016-01-19  John Wiegley  <address@hidden>
-
-       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  <address@hidden>
-
-       -
-
-2016-01-19  Paul Eggert  <address@hidden>
-
-       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  <address@hidden>
-
-       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
-       <http://thread.gmane.org/gmane.emacs.gnus.general/86228>.
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       * lisp/progmodes/project.el (project--read-regexp): Quote the 
identifier.
-
-2016-01-18  Dmitry Gutov  <address@hidden>
-
-       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  <address@hidden>
-
-       * doc/lispref/frames.texi (Position Parameters): Say they don't exist 
on TTYs.
-
-2016-01-18  Eli Zaretskii  <address@hidden>
-
-       Improve user documentation of Xref
-
-       * doc/emacs/maintaining.texi (Xref, Find Identifiers)
-       (Looking Up Identifiers, Identifier Search, List Identifiers):
-       Adjudicate comments by Dmitry Gutov <address@hidden>.  See
-       http://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00650.html
-       for the details.
-
-2016-01-18  Eli Zaretskii  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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 <gnutls/crypto.h>
-       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  <address@hidden>
-
-       Don't use GnuTLS before it is initialized
-
-               * src/sysdep.c (init_random): Don't use gnutls_rnd.
-
-2016-01-17  Bill Wohler  <address@hidden>
-
-       * mh-e.el (mh-version): Add +git to version.
-
-2016-01-17  Paul Eggert  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       * INSTALL: Document --with-modules.
-
-2016-01-16  Eli Zaretskii  <address@hidden>
-
-       Document 'function-put'
-
-       * doc/lispref/symbols.texi (Symbol Plists): Document
-       'function-put'.  Update documentation of 'function-get'.
-
-2016-01-16  Eli Zaretskii  <address@hidden>
-
-       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  <address@hidden>
-
-       * doc/lispref/lists.texi (Association Lists): Document 'alist-get'.
-
-       * doc/lispref/strings.texi (Text Comparison): Document 
'string-greaterp'.
-
-2016-01-16  Eli Zaretskii  <address@hidden>
-
-       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  <address@hidden>
-
-       * doc/lispref/macros.texi (Expansion): Document 'macroexpand-1'.
-
-2016-01-16  Eli Zaretskii  <address@hidden>
-
-       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  <address@hidden>
-
-       * 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  <address@hidden>
-
-       * 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  <address@hidden>
-
-       * 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  <address@hidden>  (tiny change)
-
-       Fix incompatbilities with MS-Windows 2000 and older
-
-       * src/w32.c <multiByteToWideCharFlags>: 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  <address@hidden>
-
-       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  <address@hidden>  (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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       Enable test selector from command line
-
-       * test/automated/Makefile.in: Change variable manipulation to avoid
-         over-writing selector.
-
-2016-01-15  Alan Mackenzie  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>  (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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       * lisp/gnus/nntp.el (nntp-request-newgroups): Simplify
-
-2016-01-14  Michael Albinus  <address@hidden>
-
-       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  <address@hidden>
-
-       * lisp/thingatpt.el (thing-at-point-uri-schemes): Add "magnet:"
-
-2016-01-13  Dmitry Gutov  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       Updater documentation of 'looking-back'
-
-       * doc/lispref/searching.texi (Regexp Search): Update documentation
-       of 'looking-back'.  Fix markup.
-
-2016-01-13  Eli Zaretskii  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       * test/automated/core-elisp-tests.el
-       (core-elisp-tests-1-defvar-in-let): Add a custom type.
-
-2016-01-12  Glenn Morris  <address@hidden>
-
-       * src/buffer.c (syms_of_buffer) <major-mode>: Doc fix.
-
-       Remove comments that do not apply since 2005-08-09.  (Bug#22349)
-
-2016-01-12  Paul Eggert  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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) <w32-pipe-buffer-size>: 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  <address@hidden>
-
-       * 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  <address@hidden>
-
-       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  <address@hidden>
-
-       * elisp-mode.el (elisp--font-lock-flush-elisp-buffers): Fix comment
-
-2016-01-16  Stefan Monnier  <address@hidden>
-
-       * 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  <address@hidden>
-
-       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  <address@hidden>
-
-       * 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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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) <sg>: 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  <address@hidden>
-
-       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) <ftp>:
-       (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) <psftp>: This does not work
-       recursively.
-
-2016-01-14  K. Handa  <address@hidden>
-
-       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  <address@hidden>
-
-       * src/buffer.c (Fset_buffer_major_mode): Allow default major-mode,
-
-       or its hook, to move point.  (Bug#22348)
-
-2016-01-12  Michael Albinus  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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 <address@hidden> 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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       * etc/HELLO: Add Armenian and Mongolian greetings.
-
-       (Bug#22346)
-
-2016-01-11  Alan Mackenzie  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       Update documentation of 'indirect-function'
-
-       * doc/lispref/eval.texi (Function Indirection): Update the
-       documentation of 'indirect-function'.
-
-2016-01-10  Eli Zaretskii  <address@hidden>
-
-       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  <address@hidden>
-
-       Document new features if Eshell
-
-       * doc/misc/eshell.texi (Input/Output): Document the new
-       '#<bufname>' 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  <address@hidden>
-
-       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  <address@hidden>
-
-       * .gitattributes: *.cur and *.pif are binary files too.
-
-2016-01-10  Stefan Monnier  <address@hidden>
-
-       * src/alloc.c (mark_maybe_pointer): HAVE_MODULES may be undefined
-
-2016-01-10  Stefan Monnier  <address@hidden>
-
-       * 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  <address@hidden>
-
-       * 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  <address@hidden>
-
-       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  <address@hidden>
-
-       Spelling fix
-
-2016-01-09  Eli Zaretskii  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       * 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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       * lisp/cedet/mode-local.el (describe-function-orig-buffer): Declare.
-
-       * lisp/ffap.el (ffap-latex-mode): Avoid free variable.
-
-2016-01-08  Mark Oteiza  <address@hidden>
-
-       * lisp/play/dunnet.el (dun-fix-screen): Avoid `end-of-buffer`.
-
-2016-01-08  Alan Mackenzie  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       * admin/admin.el (set-version): Also handle the NEWS file.
-
-2016-01-07  Dmitry Gutov  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       Revert commit b1e3d14845517bfa9fa5d6d3840f3ab3160306fd
-
-       * lisp/emacs-lisp/easy-mmode.el (define-minor-mode):
-         Don't declare (indent 1).
-
-2016-01-06  Glenn Morris  <address@hidden>
-
-       * lisp/emacs-lisp/autoload.el (autoload-find-destination): Doc fix.
-
-2016-01-06  Glenn Morris  <address@hidden>
-
-       * 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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       * doc/misc/efaq.texi (Packages that do not come with Emacs):
-       Update the URI of MELPA and marmalade-repo.  Reported by CHENG Gao
-       <address@hidden> in
-       https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00390.html.
-
-2016-01-05  Maksim Golubev  <address@hidden>  (tiny change)
-
-       * lisp/progmodes/opascal.el (opascal-mode-syntax-table):
-
-       Fix backslash.  (Bug#22224)
-
-2016-01-05  Federico Beffa  <address@hidden>  (tiny change)
-
-       * lisp/progmodes/xscheme.el (xscheme-prompt-for-expression-exit):
-
-       Make it actually work.  (Bug#22265)
-
-2016-01-05  Alan Mackenzie  <address@hidden>
-
-       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  <address@hidden>
-
-       * src/buffer.c: Stick with ASCII in doc string.
-
-2016-01-05  Paul Eggert  <address@hidden>
-
-       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  <address@hidden>
-
-       Update doc string of 'selective-display'
-
-       * src/buffer.c (syms_of_buffer) <selective-display>: Say that
-       using it with the value of 't' is obsolete.  (Bug#1092)
-
-2016-01-05  Alan Mackenzie  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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 and >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  <address@hidden>
-
-       Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
-
-2016-01-04  Michael Albinus  <address@hidden>
-
-       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  <address@hidden>
-
-       shr-tag-video bug fix
-
-       * shr.el (shr-tag-video): Protect against the `poster' being
-       empty.
-
-2016-01-04  Michael Albinus  <address@hidden>
-
-       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  <address@hidden>
-
-       Ensure redisplay when 'truncate-lines' is set
-
-       * lisp/frame.el (redisplay--variables): Add 'truncate-lines'.
-       (Bug#22303)
-
-2016-01-04  Eli Zaretskii  <address@hidden>
-
-       Fix a doc string of 'transient-mark-mode'
-
-       * src/buffer.c (syms_of_buffer) <transient-mark-mode>: Prevent
-       "lambda" in doc string from becoming a link to lambda expressions.
-
-2016-01-04  Eli Zaretskii  <address@hidden>
-
-       MS-Windows followup to latest gnulib update
-
-       * nt/gnulib.mk (EXTRA_DIST): Add ignore-value.h.
-
-2016-01-04  Paul Eggert  <address@hidden>
-
-       Spelling fix
-
-2016-01-03  Jens Lechtenboerger  <address@hidden>
-
-       Do secure signed Bcc handling
-
-       * lisp/gnus/message.el (message-send): Do secure signed Bcc handling
-       (bug#18718).
-
-2016-01-03  Paul Eggert  <address@hidden>
-
-       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  <address@hidden>
-
-       * doc/misc/texinfo.tex: Revert unwanted copyright change.
-
-2016-01-03  Artur Malabarba  <address@hidden>
-
-       * lisp/align.el (align): Simplify a lambda
-
-       * lisp/align.el (align): Fix arg order in call to `align-region'
-
-2016-01-03  Eli Zaretskii  <address@hidden>
-
-       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  <address@hidden>
-
-       * nsm.el (nsm-check-protocol): Fix typo in the message.
-
-2016-01-03  Lars Magne Ingebrigtsen  <address@hidden>
-
-       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  <address@hidden>
-
-       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
-       <http://thread.gmane.org/gmane.emacs.gnus.general/86228>.
-       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  <address@hidden>
-
-       * lisp/progmodes/fortran.el (fortran-make-syntax-propertize-function):
-
-       Explicitly ignore case.  (Bug#22262)
-
-2016-01-02  Stefan Monnier  <address@hidden>
-
-       (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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       Improve documentation of new Hide-IfDef features
-
-       * etc/NEWS: Expand and reword Hide-IfDef section.
-
-2016-01-02  Leo Liu  <address@hidden>
-
-       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  <address@hidden>
-
-       Spelling and grammar fixes
-
-2016-01-01  Paul Eggert  <address@hidden>
-
-       Fix copyright years by hand
-
-       These are dates that admin/update-copyright did not update, or
-       updated incorrectly.
-
-2016-01-01  Paul Eggert  <address@hidden>
-
-       Update copyright year to 2016
-
-       Run admin/update-copyright.
-
-2016-01-01  Paul Eggert  <address@hidden>
-
-       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  <address@hidden>
-
-       lisp/emacs-lisp/chart.el (chart-new-buffer): Move to silence byte 
compiler.
-
-2015-12-31  Mark Oteiza  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       fix  bug#21054
-
-       * ses.el (ses-check-curcell): Call `ses-set-curcell' unconditionally
-
-2015-12-31  YAMAMOTO Mitsuharu  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       Remove unused variable
-
-       * lisp/international/mule-cmds.el: Remove unused variable
-       `mac-system-coding-system'.
-
-2015-12-30  YAMAMOTO Mitsuharu  <address@hidden>
-
-       * configure.ac: Find libxml2 headers in Xcode SDK dir on Darwin.
-
-2015-12-30  YAMAMOTO Mitsuharu  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       * lisp/Makefile.in (CAL_SRC): Skip calendar.el.
-
-2016-01-06  Glenn Morris  <address@hidden>
-
-       * test/lisp/emacs-lisp/package-tests.el
-
-       (package-test-macro-compilation): Fixup branch merge.
-
-2016-01-05  Eli Zaretskii  <address@hidden>
-
-       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  <address@hidden>
-
-       Spelling fixes.
-
-2016-01-04  Daniel Colascione  <address@hidden>
-
-       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  <address@hidden>
-
-       * configure.ac: Add error message for gfile on Nextstep.
-
-2016-01-03  John Wiegley  <address@hidden>
-
-       Merge branch 'emacs-25-merge'
-
-2016-01-02  Vincent Belaïche  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       eww build fix (require puny)
-
-2015-12-30  Lars Magne Ingebrigtsen  <address@hidden>
-
-       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  <address@hidden>
-
-       Merge emacs-25 into master (using imerge)
-
-2015-12-29  Eli Zaretskii  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       Further Unicode restrictive fixups
-
-       * puny.el (puny-highly-restrictive-p): Include the extra
-       identifier characters from table 3.
-
-2015-12-29  Martin Rudalics  <address@hidden>
-
-       * src/xfns.c (x_create_tip_frame): Process alpha parameter.
-
-2015-12-29  Michael Albinus  <address@hidden>
-
-       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  <address@hidden>
-
-       * doc/misc/tramp.texi: Editorial revisions to the Tramp manual
-
-2015-12-29  Lars Ingebrigtsen  <address@hidden>
-
-       Mention that tls.el is secure by default, and will fail
-
-2015-12-29  Lars Ingebrigtsen  <address@hidden>
-
-       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  <address@hidden>
-
-       Refactor out gnutls-trustfiles
-
-       * lisp/net/gnutls.el (gnutls-trustfiles): Refactor out for reuse by 
tls.el.
-
-2015-12-29  Lars Ingebrigtsen  <address@hidden>
-
-       Remove --insecure from gnutls-cli invocation
-
-       * tls.el (tls-program): Default to using secure TLS
-       connections (bug#19284).
-
-2015-12-29  Lars Ingebrigtsen  <address@hidden>
-
-       Add a new function to say whether a string is restrictive
-
-       * puny.el (puny-highly-restrictive-p): New function.
-
-2015-12-28  Paul Eggert  <address@hidden>
-
-       Spelling fix
-
-2015-12-28  Paul Eggert  <address@hidden>
-
-       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  <address@hidden>  (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  <address@hidden>
-
-       Mention the new puny.el library
-
-2015-12-28  Lars Ingebrigtsen  <address@hidden>
-
-       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  <address@hidden>
-
-       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  <address@hidden>
-
-       Fix puny-encoding all-non-ASCII domains
-
-       * puny.el (puny-encode-string): Fix the all-non-ASCII encoding case.
-
-2015-12-28  Lars Ingebrigtsen  <address@hidden>
-
-       * lisp/net/shr.el (shr-next-link): Don't bug out on adjacent links.
-
-2015-12-28  Tom Tromey  <address@hidden>
-
-       set :safe on css-indent-offset
-
-       * lisp/textmodes/css-mode.el (css-indent-offset): Add :safe 'integerp.
-
-2015-12-28  Lars Ingebrigtsen  <address@hidden>
+       * 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) <ftp>:
+       (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.
 
-       * eww.el (eww-mode): Remove superfluous bidi reset.
+       * lisp/net/tramp-cmds.el (mml-mode, mml-insert-empty-tag)
+       (reporter-dump-variable): Declare functions.
 
-2015-12-28  James Stout  <address@hidden>  (tiny change)
+       * 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.
 
-       Make chunked encoding trailer detection more compliant
+       * lisp/net/tramp-sh.el (tramp-methods) <psftp>: This does not work
+       recursively.
 
-       * lisp/url/url-http.el
-       (url-http-chunked-encoding-after-change-function): Make
-       trailer detection more compliant (bug#16345).
+2016-01-14  K. Handa  <address@hidden>
 
-2015-12-28  Lars Ingebrigtsen  <address@hidden>
+       fix previous change of src/ftfont.c (ftfont_shape_by_flt)
 
-       Reconnect erc even on server errors
+       * src/ftfont.c (ftfont_shape_by_flt): Fix previous change.  Access the
+       second glyph only when there are enough glyphs.
 
-       * lisp/erc/erc-backend.el (erc-server-reconnect-p): Try to
-       reconnect even if a server error has occurred (bug#18527).
+2016-01-13  Glenn Morris  <address@hidden>
 
-2015-12-28  Lars Ingebrigtsen  <address@hidden>
+       * src/buffer.c (Fset_buffer_major_mode): Allow default major-mode,
 
-       Fix punycode short circuit logic
+       or its hook, to move point.  (Bug#22348)
 
-       * puny.el (puny-encode-domain): Fix short-circuit logic.
+2016-01-12  Michael Albinus  <address@hidden>
 
-2015-12-28  Martin Rudalics  <address@hidden>
+       Merge missing commit from emacs-25 branch
 
-       Fix Bug#10873 in `report-emacs-bug'
+       * test/Makefile.in (SELECTOR_DEFAULT, SELECTOR_EXPENSIVE, SELECTOR):
+       New variables.
+       (check-expensive, check-doit): New targets.
 
-       * 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).
+       * Makefile.in (check-expensive): New target.
 
-2015-12-28  Lars Ingebrigtsen  <address@hidden>
+       * 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.
 
-       IDNA speed up
+2016-01-12  John Wiegley  <address@hidden>
 
-       * puny.el (puny-encode-domain): Make the common non-IDNA case faster
+       Merge from origin/emacs-25
 
-2015-12-28  Lars Ingebrigtsen  <address@hidden>
+       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'
 
-       Add IDNA domain encode/decode functions
+2016-01-12  John Wiegley  <address@hidden>
 
-       * puny.el (puny-decode-domain): New function.
-       (puny-encode-domain): Ditto.
-       (puny-decode-digit): Fix digit decoding error.
+       Merge from origin/emacs-25
 
-2015-12-28  Lars Ingebrigtsen  <address@hidden>
+       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 <address@hidden> 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).
 
-       Rename idna.el to puny.el
+2016-01-12  John Wiegley  <address@hidden>
 
-       * puny.el: Renamed from idna.el to avoid name collisions with
-       the external idna.el library.
+       Merge from origin/emacs-25
 
-2015-12-28  Lars Ingebrigtsen  <address@hidden>
+       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
 
-       Always reset the bidi direction
+2016-01-12  John Wiegley  <address@hidden>
 
-       * eww.el (eww-display-html): Always reset the bidi direction
-       to `left-to-right' (bug#22257).
+       Merge from origin/emacs-25
 
-2015-12-28  Alan Mackenzie  <address@hidden>
+       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.
 
-       Allow line comments ending with escaped NL to be continued to the next 
line.
+2016-01-12  John Wiegley  <address@hidden>
 
-       Use this in C, C++, and Objective C Modes.  Fixes bug#22246
+       Merge from origin/emacs-25
 
-       * 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.
+       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
 
-       * doc/lispref/syntax.texi (Control Parsing): Describe
-       `comment-end-can-be-escaped'.
+2016-01-12  John Wiegley  <address@hidden>
 
-       * etc/NEWS (Lisp Changes): Describe `comment-end-can-be-escaped'.
+       Merge from origin/emacs-25
 
-       * lisp/progmodes/cc-langs.el: New c-lang-setvar 
`comment-end-can-be-escaped'.
+       ef33bc7 Spelling and grammar fixes
+       9c3dbab Fix copyright years by hand
+       0e96320 Update copyright year to 2016
 
-2015-12-28  Katsumi Yamaoka  <address@hidden>
+2016-01-12  John Wiegley  <address@hidden>
 
-       lisp/gnus/mml-sec.el (mml-secure-bcc-is-safe): Keep old Emacsen 
compatibility
+       Merge from origin/emacs-25
 
-       * lisp/gnus/mml-sec.el (mml-secure-bcc-is-safe):
-       Don't use split-string with 4th arg for old Emacsen compatibility.
+       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
 
-2015-12-27  Dmitry Gutov  <address@hidden>
+2016-01-12  John Wiegley  <address@hidden>
 
-       Rename project-library-roots to project-external-roots
+       Merge from origin/emacs-25
 
-       * 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.
+       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
 
-       * lisp/progmodes/elisp-mode.el (elisp-library-roots):
-       Rename to elisp-load-path-roots.
+2016-01-11  Dmitry Gutov  <address@hidden>
 
-       * lisp/progmodes/etags.el (etags-library-roots): Remove.  Use
-       an anonymous function for the default value of
-       project-vc-external-roots-function.
+       test/automated/vc-hg.el: Support out-of-tree build
 
-2015-12-27  Lars Ingebrigtsen  <address@hidden>
+       * 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
 
-       * idna.el (idna-decode-string-internal): Implement decoding.
+2016-01-11  Michael Albinus  <address@hidden>
 
-2015-12-27  Lars Ingebrigtsen  <address@hidden>
+       Minor change in tramp-tests.el
 
-       Further IDNA tweaks
+       * test/automated/tramp-tests.el (tramp-test29-vc-registered):
+       Use `dired-uncache' instead of a Tramp internal function.
 
-       (idna-encode-string): Make idna-encode-string safe for
-       non-ASCII use.
+2016-01-11  Peter Feigl  <address@hidden>
 
-2015-12-27  Lars Ingebrigtsen  <address@hidden>
+       * etc/HELLO: Add Armenian and Mongolian greetings.
 
-       Clean up the code slightly
+       (Bug#22346)
 
-2015-12-27  Lars Ingebrigtsen  <address@hidden>
+2016-01-11  Alan Mackenzie  <address@hidden>
 
-       Added basic idna encoding support
+       Java Mode: Fontify identifiers in the presence of annotations.
 
-       * lisp/net/idna.el: New file.
+       * 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.
 
-2015-12-27  Vivek Dasmohapatra  <address@hidden>
+       * 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.
 
-       Disconnection fixes for erc
+       * lisp/progmodes/cc-langs.el (c-maybe-decl-faces): New language 
variable.
 
-       * lisp/erc/erc-backend.el (erc-server-reconnect-p): Don't
-       reconnect if the user has disconnected explicitly (bug#4589).
+2016-01-11  Eli Zaretskii  <address@hidden>
 
-2015-12-27  Thomas Riccardi  <address@hidden>  (tiny change)
+       Avoid an infloop when we run out of memory
 
-       Further erc asynch fixes
+       * 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.
 
-       * 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).
+2016-01-11  Eli Zaretskii  <address@hidden>
 
-2015-12-27  Vivek Dasmohapatra  <address@hidden>
+       Avoid unnecessary failures of auto-saving after fatal error
 
-       Make erc connect asynchronously
+       * 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/erc/erc-backend.el (erc-server-reconnect): Use it to
-       reconnect asynchronously.
+2016-01-11  Paul Eggert  <address@hidden>
 
-       * lisp/erc/erc-backend.el (erc-open-network-stream): New function 
(bug#5650).
+       Simplify HAVE_MODULES use in mark_maybe_pointer
 
-2015-12-27  Deniz Dogan  <address@hidden>
+       * 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.
 
-       Clear erc user list upon disconnection
+2016-01-11  Paul Eggert  <address@hidden>
 
-       * lisp/erc/erc-backend.el (erc-process-sentinel): Clear channel user
-       lists upon disconnection.  This prevents invalid channel
-       user lists when reconnecting (bug#10947).
+       Revert attempt to use 'noexcept' in typedef
 
-2015-12-27  Lars Ingebrigtsen  <address@hidden>
+       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.
 
-       Don't bug out in erc after waking from sleep
+2016-01-10  Eli Zaretskii  <address@hidden>
 
-       * 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).
+       Update documentation of 'indirect-function'
 
-2015-12-27  David Edmondson  <address@hidden>
+       * doc/lispref/eval.texi (Function Indirection): Update the
+       documentation of 'indirect-function'.
 
-       Proxy error in erc with multiple clients
+2016-01-10  Eli Zaretskii  <address@hidden>
 
-       * lisp/erc/erc.el (erc-channel-receive-names): Fix errors
-       generated when multiple IRC clients talk to a single IRC proxy
-       (bug#19034).
+       Update documentation for obsoleting 'syntax-begin-function'
 
-2015-12-27  Dima Kogan  <address@hidden>
+       * doc/lispref/syntax.texi (Position Parse): Undocument
+       'syntax-begin-function' that is now obsolete.
 
-       Ensure that we don't have several timers in erc
+2016-01-10  Eli Zaretskii  <address@hidden>
 
-       * 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).
+       Document new features if Eshell
 
-2015-12-27  Jens Lechtenboerger  <address@hidden>
+       * doc/misc/eshell.texi (Input/Output): Document the new
+       '#<bufname>' syntax.
+       (Input/Output): Document 'eshell-destroy-buffer-when-process-dies'.
+       Disable "Key Index" generation, as there are no @kindex entries in
+       this manual.
 
-       * lisp/gnus/mml-sec.el: Fix warnings by adding autoloads
-       (bug#18718).
+2016-01-10  Michael Albinus  <address@hidden>
 
-2015-12-27  Lars Ingebrigtsen  <address@hidden>
+       Handle too long commands in Tramp
 
-       * 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).
+       * 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.
 
-2015-12-27  Lars Ingebrigtsen  <address@hidden>
+       * test/automated/tramp-tests.el (tramp--test-darwin-p): Remove.
+       (tramp--test-utf8): Include Arabic file name, again.
 
-       * lisp/net/eww.el (eww-setup-buffer): Restore left-to-right defaults.
+2016-01-10  Paul Eggert  <address@hidden>
 
-2015-12-27  Lars Ingebrigtsen  <address@hidden>
+       * .gitattributes: *.cur and *.pif are binary files too.
 
-       Don't join erc channels doubly
+2016-01-10  Stefan Monnier  <address@hidden>
 
-       * erc-join.el (erc-autojoin-channels): Don't join channels
-       more than once (if you have several nicks) (bug#20695).
+       * src/alloc.c (mark_maybe_pointer): HAVE_MODULES may be undefined
 
-2015-12-27  Eli Zaretskii  <address@hidden>
+2016-01-10  Stefan Monnier  <address@hidden>
 
-       Avoid leaving "ghost" of mouse pointer on MS-Windows
+       * sh-script.el (sh-smie-sh-rules): Improve indentation inside $(...)
 
-       * 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.
+       * lisp/progmodes/sh-script.el (sh-smie-sh-rules): Improve indentation
+       within $(...).
+       * test/indent/shell.sh: Add corresponding test.
 
-2015-12-27  Lars Ingebrigtsen  <address@hidden>
+2016-01-09  Stefan Monnier  <address@hidden>
 
-       * lisp/gnus/mml-sec.el (mml-secure-bcc-is-safe): Fix typo in last 
check-in.
+       * src/alloc.c (mark_maybe_pointer): Also check wide-int's emacs_value
 
-2015-12-27  Jens Lechtenboerger  <address@hidden>
+       (mark_memory): Simplify loop.  Don't assume a pointer-sized word can be
+       cast to Lisp_Object.
 
-       Identify unsafe combinations of Bcc and encryption
+2016-01-09  Dmitry Gutov  <address@hidden>
 
-       * 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
+       Use short date for 'hg annotate', and output the author
 
-2015-12-27  Krzysztof Jurewicz  <address@hidden>  (tiny change)
+       * 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.
 
-       Fix auth source lookups from erc with port numbers
+       * test/automated/vc-hg.el: New file.
 
-       * lisp/erc/erc.el (erc-open): `auth-source' wants strings, not port
-       numbers (bug#20541).
+2016-01-09  Paul Eggert  <address@hidden>
 
-2015-12-27  Fran Litterio  <address@hidden>
+       Spelling fix
 
-       Run erc-kill-channel-hook always on exit
+2016-01-09  Eli Zaretskii  <address@hidden>
 
-       * lisp/erc/erc.el (erc-kill-buffer-function): Run erc-kill-channel-hook
-       when erc-kill-queries-on-quit is set (bug#21187).
+       Document user-level functions in project.el
 
-2015-12-26  Paul Eggert  <address@hidden>
+       * lisp/progmodes/project.el (project-find-file)
+       (project-or-external-find-file): Add doc strings.
 
-       Spelling fix
+2016-01-09  Eli Zaretskii  <address@hidden>
 
-       * test/automated/url-parse-tests.el:
-       (url-generic-parse-url/same-document-reference):
-       Rename from url-generic-parse-url/same-decument-reference.
+       Document the user-level features of the Xref package
 
-2015-12-26  Paul Eggert  <address@hidden>
+       * 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.
 
-       Reword initial *scratch* for brevity, appearance
+2016-01-09  Stefan Monnier  <address@hidden>
 
-       * 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
+       * loading.texi: Add `define-type' entry for load-history
 
-2015-12-26  Leo Liu  <address@hidden>
+       * doc/lispref/loading.texi (Where Defined): Remove incorrect
+       cl-defmethod description, and add missing define-type entry.
 
-       Add ert-deftest to lisp-mode.el
+2016-01-09  Eli Zaretskii  <address@hidden>
 
-       * lisp-mode.el (lisp-imenu-generic-expression,
-         lisp-el-font-lock-keywords-1): Add ert-deftest.
+       Improve doc strings and prompts in xref.el
 
-2015-12-26  Lars Ingebrigtsen  <address@hidden>
+       * lisp/progmodes/xref.el (xref-backend-functions)
+       (xref-find-definitions): Doc fixes.
+       (xref-query-replace): Doc fix.  Improve prompts for arguments.
 
-       Mark imap changes as not needing doc changes
+2016-01-09  Alan Mackenzie  <address@hidden>
 
-       * imap.el (imap-ssl-open): Remove
+       Allow the use of `font-lock-extend-region-multiline' in CC Mode.
 
-2015-12-26  Lars Ingebrigtsen  <address@hidden>
+       * 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.
 
-       Use built-in encryption in imap.el
+2016-01-09  Michael Albinus  <address@hidden>
 
-       * 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.
+       Fix coding system for Tramp on OS X.
 
-2015-12-26  Eli Zaretskii  <address@hidden>
+       * lisp/net/tramp-compat.el: Require ucs-normalize.
 
-       Don't try using /bin/sh in artist.el on MS-Windows
+       * lisp/net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
+       Set coding system to `utf-8-hfs' for Mac OS X.
 
-       * 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)
+       * test/automated/tramp-tests.el (tramp-test29-vc-registered):
+       Flush directory properties when needed.
+       (tramp--test-utf8): Include Chinese file name, again.
 
-2015-12-26  Wolfgang Jenkner  <address@hidden>
+2016-01-09  Eli Zaretskii  <address@hidden>
 
-       Always define gmalloc etc. in src/gmalloc.c
+       Update 'load-history' docs
 
-       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.
+       * 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)
 
-2015-12-26  Eli Zaretskii  <address@hidden>
+2016-01-08  Paul Eggert  <address@hidden>
 
-       Fix documentation of browse-url browser-related functions
+       Fix (error ...) error
 
-       * 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)
+       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 ...).
 
-2015-12-26  Paul Eggert  <address@hidden>
+2016-01-08  Alan Mackenzie  <address@hidden>
 
-       Propagate Bug#14412 fix to backtrace_eval_unrewind
+       Correctly analyze brace arguments in templated C++ function 
declarations.
 
-       * 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.
+       * 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.
 
-2015-12-26  Eli Zaretskii  <address@hidden>
+       * 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.
 
-       Don't produce non-ASCII characters in *scratch*
+2016-01-08  Glenn Morris  <address@hidden>
 
-       * lisp/startup.el (initial-scratch-message): Quote apostrophes to
-       avoid producing non-ASCII characters in the *scratch* buffer's
-       commentary.
+       * lisp/cedet/mode-local.el (describe-function-orig-buffer): Declare.
 
-2015-12-26  Eli Zaretskii  <address@hidden>
+       * lisp/ffap.el (ffap-latex-mode): Avoid free variable.
 
-       Document changes in 'compare-windows'
+2016-01-08  Mark Oteiza  <address@hidden>
 
-       * lisp/vc/compare-w.el (compare-windows-removed)
-       (compare-windows-added): Doc fix.
+       * lisp/play/dunnet.el (dun-fix-screen): Avoid `end-of-buffer`.
 
-       * doc/emacs/files.texi (Comparing Files): Document the changes in
-       window selection by 'compare-windows'.
+2016-01-08  Alan Mackenzie  <address@hidden>
 
-2015-12-26  Eli Zaretskii  <address@hidden>
+       Respect fontification region calculated by major mode.  Fixes bug 
#22316.
 
-       Document 'vc-annotate-background-mode'
+       * 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.
 
-       * doc/emacs/maintaining.texi (Old Revisions): Document
-       'vc-annotate-background-mode'.
+2016-01-08  Eli Zaretskii  <address@hidden>
 
-2015-12-26  Eli Zaretskii  <address@hidden>
+       Improve documentation of Delete Selection mode
 
-       Document 'vc-region-history'
+       * lisp/delsel.el (delete-selection-mode)
+       (delete-selection-helper): Update and expand the doc strings.
+       (Bug#22296)
 
-       * doc/emacs/maintaining.texi (VC Change Log): Document
-       'vc-region-history'.
+       * doc/emacs/mark.texi (Using Region): Document the behavior of
+       delete commands in Delete Selection mode.  (Bug#22296)
 
-2015-12-26  Eli Zaretskii  <address@hidden>
+       * doc/lispref/markers.texi (The Mark): Document how to add the
+       support for Delete Selection mode to Lisp programs. (Bug#22296)
 
-       Improve documentation of 'vc-push'
+2016-01-08  Dmitry Gutov  <address@hidden>
 
-       * doc/emacs/maintaining.texi (Pulling / Pushing): Expand and
-       improve the documentation of 'vc-push'.
+       Fix two project-find-file issues
 
-       * lisp/vc/vc.el (vc-pull, vc-push): Doc fix.
+       * 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.
 
-2015-12-26  Alain Schneble  <address@hidden>
+2016-01-08  Eli Zaretskii  <address@hidden>
 
-       Include the tests for the URL parsing fixes
+       Clarify doc string of 'dired-current-directory'
 
-2016-01-30  Alain Schneble  <address@hidden>
+       * 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)
 
-       Make relative URL parsing and resolution consistent with RFC 3986 
(bug#22044)
+2016-01-08  Eli Zaretskii  <address@hidden>
 
-       * 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.
+       Use the face of preceding text for displaying the ellipsis
 
-       Backport:
+       * 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)
 
-       (cherry picked from commit b792ecea1715e080ad8e232d3d154b8a25d2edfb)
+2016-01-08  Michael Albinus  <address@hidden>
 
-2015-12-26  Eli Zaretskii  <address@hidden>
+       Suppress Chinese file name test for OSX in tramp-tests.el
 
-       Document 'url-user-agent'.
+       * test/automated/tramp-tests.el (tramp--test-utf8):
+       Remove instrumentation.  Suppress Chinese file name test for OSX.
 
-       * 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-01-07  Glenn Morris  <address@hidden>
 
-       * doc/misc/url.texi (Customization): Document 'url-user-agent'.
+       * admin/admin.el (set-version): Also handle the NEWS file.
 
-2015-12-26  Eli Zaretskii  <address@hidden>
+2016-01-07  Dmitry Gutov  <address@hidden>
 
-       Document protocols supported by URL library via Tramp
+       apropos-library: Skip obvious duplicates; don't error on generics
 
-       * doc/misc/url.texi (Tramp): New node, describes the URL schemes
-       supported via Tramp.
-       (Supported URL Types, file/ftp, rlogin/telnet/tn3270): Mention
-       Tramp.
+       * 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).
 
-2015-12-26  Eli Zaretskii  <address@hidden>
+2016-01-07  Dmitry Gutov  <address@hidden>
 
-       Document changes in Shell-script mode
+       Add project-find-file and project-or-external-find-file
 
-       * 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'.
+       * lisp/minibuffer.el (completion-category-defaults):
+       Add `project-file' category.
 
-2015-12-26  Eli Zaretskii  <address@hidden>
+       * lisp/progmodes/project.el (project-find-file)
+       (project-or-external-find-file): New commands.
+       (project--find-file-in): New private function.
 
-       Fix documentation of 'ses-define-local-printer'
+       * 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'.
 
-       * doc/misc/ses.texi (Printer functions): Fix whitespace between
-       sentences and punctuation.  Add an index entry for
-       'ses-define-local-printer'.
+2016-01-06  Leo Liu  <address@hidden>
 
-2015-12-26  Shakthi Kannan  <address@hidden>
+       Add defvar-local to lisp-imenu-generic-expression
 
-       Document 'ert-summarize-tests-batch-and-exit'
+       * lisp/emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression): Add
+         defvar-local.
 
-       * doc/misc/ert.texi (Running Tests in Batch Mode): Document
-       'ert-summarize-tests-batch-and-exit'.
+2016-01-06  Leo Liu  <address@hidden>
 
-2015-12-26  Eli Zaretskii  <address@hidden>
+       Revert commit b1e3d14845517bfa9fa5d6d3840f3ab3160306fd
 
-       Avoid assertion violation in unbind_to
+       * lisp/emacs-lisp/easy-mmode.el (define-minor-mode):
+         Don't declare (indent 1).
 
-       * src/eval.c (unbind_to) <SPECPDL_LET>: Avoid assertion violation
-       if we get here with an object that is not a symbol.  (Bug#14412)
+2016-01-06  Glenn Morris  <address@hidden>
 
-2015-12-25  Andreas Schwab  <address@hidden>
+       * lisp/emacs-lisp/autoload.el (autoload-find-destination): Doc fix.
 
-       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)
+2016-01-06  Glenn Morris  <address@hidden>
 
-2016-01-30  Lars Ingebrigtsen  <address@hidden>
+       * lisp/emacs-lisp/autoload.el (autoload-find-destination):
 
-       Follow <meta> redirects in eww
+       Avoid specifying the length of a time object (it has not been "2"
+       for some time).
 
-       Merge conflict, but I think I resolved it.
+2016-01-06  Andreas Schwab  <address@hidden>
 
-           Follow meta refresh tags in eww
+       Properly encode/decode base64Binary data in SOAP
 
-           * eww.el (eww-tag-meta): Follow meta refresh tags (bug#22234).
+               * 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.
 
-       Backport:
+2016-01-06  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Lars Ingebrigtsen  <address@hidden>
+       Obey coding-system-for-write when writing stdout/stderr in batch
 
-       Allow http://user:address@hidden/ URLs again
+       * 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.
 
-       * lisp/url/url-auth.el (url-basic-auth): Allow explicit
-       user/passwords in URLs (bug#19046).
+       * 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.
 
-       Backport:
+2016-01-06  Xue Fuqiao  <address@hidden>
 
-       (cherry picked from commit b563715a2db265517d5a77f165a42afa1e233fdd)
+       * doc/misc/efaq.texi (Packages that do not come with Emacs):
+       Update the URI of MELPA and marmalade-repo.  Reported by CHENG Gao
+       <address@hidden> in
+       https://lists.gnu.org/archive/html/emacs-devel/2016-01/msg00390.html.
 
-2016-01-30  Samer Masterson  <address@hidden>
+2016-01-05  Maksim Golubev  <address@hidden>  (tiny change)
 
-       Autoload url-insert-buffer-contents
+       * lisp/progmodes/opascal.el (opascal-mode-syntax-table):
 
-       * lisp/url/url-handlers.el: Add autoload cookie so that
-       `package-list-packages' doesn't bug out (bug#21927) (tiny change)
+       Fix backslash.  (Bug#22224)
 
-       Backport:
+2016-01-05  Federico Beffa  <address@hidden>  (tiny change)
 
-       (cherry picked from commit 7a7b5b492ff9929eecd90c4564db6fbf3b192323)
+       * lisp/progmodes/xscheme.el (xscheme-prompt-for-expression-exit):
 
-2015-12-25  Eli Zaretskii  <address@hidden>
+       Make it actually work.  (Bug#22265)
 
-       Make sure *scratch* etc. use forward slashes in its default-directory
+2016-01-05  Alan Mackenzie  <address@hidden>
 
-       * lisp/startup.el (normal-top-level): On MS-Windows, convert
-       backslashes to forward slashes while decoding default-directory
-       of the initially-created buffers.
+       Remove function wrongly on AWK Mode value of context fontification hook.
 
-2015-12-25  Eli Zaretskii  <address@hidden>
+       * 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.
 
-       Restore info about the build host in bug reports
+       * lisp/progmodes/cc-mode.el (c-before-context-fl-expand-region): Correct
+       to handle nil value of c-before-context-fontification-functions.
 
-       * 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.
+2016-01-05  Paul Eggert  <address@hidden>
 
-2015-12-25  Eli Zaretskii  <address@hidden>
+       * src/buffer.c: Stick with ASCII in doc string.
 
-       Fix bootstrap broken by changes related to OS X file-name encoding
+2016-01-05  Paul Eggert  <address@hidden>
 
-       * 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.
+       Reword transient-mark-mode doc string
 
-       * src/Makefile.in ($(lispsource)/international/ucs-normalize.elc):
-       New order-only dependency.
+       * 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.
 
-2015-12-25  Leo Liu  <address@hidden>
+2016-01-05  Eli Zaretskii  <address@hidden>
 
-       * lisp/ido.el (ido-add-virtual-buffers-to-list):
-       Use bookmark-get-filename.
+       Update doc string of 'selective-display'
 
-2015-12-25  Michael Albinus  <address@hidden>
+       * src/buffer.c (syms_of_buffer) <selective-display>: Say that
+       using it with the value of 't' is obsolete.  (Bug#1092)
 
-       Make tramp-test29-vc-registered more robust
+2016-01-05  Alan Mackenzie  <address@hidden>
 
-       * test/automated/tramp-tests.el (tramp-test29-vc-registered):
-       Move `bzr' case down.  Skip test when `vc-create-repo' fails.
-       Remove instrumentation.
+       Make C++ buffers writeable when writing their initial text properties.
 
-2015-12-24  YAMAMOTO Mitsuharu  <address@hidden>
+       This is a correction to yesterday's CC Mode patch.
 
-       * lisp/term/x-win.el (x-gtk-stock-map): Fix typo.
+       * lisp/progmodes/cc-engine.el (c-before-change-check-<>-operators): Put
+       c-save-buffer-state around the function rather than a mere `let'.
 
-2015-12-23  Katsumi Yamaoka  <address@hidden>
+2016-01-05  Michael Albinus  <address@hidden>
 
-       Fix `gnus-union' so as to behave like `cl-union'
+       Additional changes for "make check-expensive"
 
-       * lisp/gnus/gnus-group.el (gnus-group-prepare-flat):
-       Make gnus-union use `equal' to compare items in lists.
+       * CONTRIBUTE : Encourage use of ":tags '(:expensive-test)".
+       Explain make target `check-expensive'.
 
-       * lisp/gnus/gnus-util.el (gnus-union):
-       Make it behave like cl-union partially.
+       * etc/NEWS: Mention new make target `check-expensive'.
 
-2015-12-23  Paul Eggert  <address@hidden>
+       * test/automated/Makefile.in (check-doit): New target.
+       (check, check-expensive): Use it.
 
-       Fix dired.c typo with ptrdiff_t vs Lisp_Object
+2016-01-04  Alan Mackenzie  <address@hidden>
 
-       * 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.
+       Apply text properties for <, > in new after-change function (C++ Java 
Modes).
 
-2015-12-23  Eli Zaretskii  <address@hidden>
+       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.
 
-       Document default process sentinel more prominently
+       * lisp/progmodes/cc-cmds.el (c-electric-lt-gt): Reformulate due to new
+       after-change action.
 
-       * 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)
+       * lisp/progmodes/cc-engine.el (c-before-change-check-<>-operators): 
Expand
+       change region to include <s and >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.
 
-2015-12-23  Eli Zaretskii  <address@hidden>
+       * 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.
 
-       Fix file-name completion on OS X
+       * lisp/progmodes/cc-langs.el (c-before-font-lock-functions): Add
+       c-restore-<>-properties to this list for C++ and Java.
 
-       * 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) <Qdecomposed_characters>: New DEFSYM.
+       * 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.
 
-       * lisp/international/ucs-normalize.el (utf-8-hfs): Give it a
-       non-nil 'decomposed-characters' property.
+2016-01-04  Michael Albinus  <address@hidden>
 
-2015-12-23  Anders Lindgren  <address@hidden>
+       Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
 
-       File-name completion of non-ASCII characters on OS X (bug#22169)
+2016-01-04  Michael Albinus  <address@hidden>
 
-       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'.
+       Introduce check-expensive tests.
 
-       * lisp/loadup.el: Load international/ucs-normalize (when building
-       for ns).
+       * Makefile.in (check-expensive):
+       * test/automated/Makefile.in (check-expensive): New target.
 
-       * 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.
+       * 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.
 
-       * src/nsfns.m (ns-convert-utf8-nfd-to-nfc): Removed.
+2016-01-04  Lars Magne Ingebrigtsen  <address@hidden>
 
-2015-12-22  Tom Tromey  <address@hidden>
+       shr-tag-video bug fix
 
-       Fix bug #18588 by making bug-reference-bug-regexp more lenient
+       * shr.el (shr-tag-video): Protect against the `poster' being
+       empty.
 
-       * lisp/progmodes/bug-reference.el (bug-reference-bug-regexp): Accept
-       "bug NNNN".  (Bug #18588)
+2016-01-04  Michael Albinus  <address@hidden>
 
-2016-01-30  Tom Tromey  <address@hidden>
-2015-12-22  Tom Tromey  <address@hidden>
+       Minor fixes in tramp-tests.el
 
-       add some cl-* aliases to lisp-mode imenu
+       * test/automated/tramp-tests.el (tramp-test26-process-file):
+       Move point properly.
+       (tramp-test29-vc-registered): Work with relative file names.
 
-       * (lisp-imenu-generic-expression): Add cl-define-compiler-macro,
-       cl-defgeneric, and cl-defmethod.
+2016-01-04  Eli Zaretskii  <address@hidden>
 
-2015-12-22  Tom Tromey  <address@hidden>
+       Ensure redisplay when 'truncate-lines' is set
 
-       Make a variable buffer-local
+       * lisp/frame.el (redisplay--variables): Add 'truncate-lines'.
+       (Bug#22303)
 
-       * lisp/generic-x.el (generic-rul-mode-setup-function): Make
-       font-lock-syntax-table buffer-local.  (Bug #21627)
+2016-01-04  Eli Zaretskii  <address@hidden>
 
-2015-12-22  Eli Zaretskii  <address@hidden>
+       Fix a doc string of 'transient-mark-mode'
 
-       Fix decoding of text in URLs retrieved by EWW
+       * src/buffer.c (syms_of_buffer) <transient-mark-mode>: Prevent
+       "lambda" in doc string from becoming a link to lambda expressions.
 
-       * 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-01-04  Eli Zaretskii  <address@hidden>
 
-2015-12-22  Alan Mackenzie  <address@hidden>
+       MS-Windows followup to latest gnulib update
 
-       Fix a coding error in c-forward-<>-arglist-recur.  Fixes bug#22156
+       * nt/gnulib.mk (EXTRA_DIST): Add ignore-value.h.
 
-       * 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-01-04  Paul Eggert  <address@hidden>
 
-2015-12-22  Michael Albinus  <address@hidden>
+       Spelling fix
 
-       Instrument Tramp tests
+2016-01-03  Jens Lechtenboerger  <address@hidden>
 
-       * test/automated/tramp-tests.el (tramp-test29-vc-registered)
-       (tramp--test-utf8): Instrument tests.
+       Do secure signed Bcc handling
 
-2015-12-22  Martin Rudalics  <address@hidden>
+       * lisp/gnus/message.el (message-send): Do secure signed Bcc handling
+       (bug#18718).
 
-       Fix `display-buffer' call in `display-message-or-buffer' (Bug#22221)
+2016-01-03  Paul Eggert  <address@hidden>
 
-       * lisp/simple.el (display-message-or-buffer): Call
-       `display-buffer' with ACTION instead of NOT-THIS-WINDOW
-       (Bug#22221).
+       Avoid stdio in SIGINT handler
 
-2016-01-30  Juri Linkov  <address@hidden>
-2015-12-21  Juri Linkov  <address@hidden>
+       * 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.
 
-       * lisp/saveplace.el (toggle-save-place, save-place-to-alist)
+2016-01-03  Paul Eggert  <address@hidden>
 
-       (save-places-to-alist, save-place-dired-hook):
-       Check for dired-subdir-alist.  (Bug#19851)
+       * doc/misc/texinfo.tex: Revert unwanted copyright change.
 
-2015-12-21  Paul Eggert  <address@hidden>
+2016-01-03  Artur Malabarba  <address@hidden>
 
-       Add FIXME comment re stack overflow and modules
+       * lisp/align.el (align): Simplify a lambda
 
-2016-01-30  Paul Eggert  <address@hidden>
-2015-12-20  Paul Eggert  <address@hidden>
+       * lisp/align.el (align): Fix arg order in call to `align-region'
 
-       Revert some recent emacs-module commentary
+2016-01-03  Eli Zaretskii  <address@hidden>
 
-       Most of the recently-added commentary was incorrect, due to the
-       possibility of stack overflow.
+       Fix compilation next-error in buffers with selective-display
 
-2016-01-30  Paul Eggert  <address@hidden>
+       * 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)
 
-       Spelling fix: prefer "cooperate" to "co-operate"
+2016-01-03  Lars Magne Ingebrigtsen  <address@hidden>
 
-2016-01-30  Paul Eggert  <address@hidden>
-2015-12-20  Paul Eggert  <address@hidden>
+       * nsm.el (nsm-check-protocol): Fix typo in the message.
 
-       Spelling fix: prefer "cooperate" to "co-operate"
+2016-01-03  Lars Magne Ingebrigtsen  <address@hidden>
 
-2015-12-20  Paul Eggert  <address@hidden>
+       Add SHA1 warnings for high network security settings
 
-       Port undo fixes to -fno-common
+       * nsm.el (nsm-check-protocol): When using high security, warn
+       about SHA1 certificates, which are now believed to be open to
+       spoofing.
 
-       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-01-02  Jens Lechtenboerger  <address@hidden>
 
-2015-12-20  Philipp Stephani  <address@hidden>
+       Refactor mml-smime.el, mml1991.el, mml2015.el
 
-       Improve commentary for emacs-module.c
+       (Maybe this is the last merge from Gnus git to Emacs git)
 
-       * 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.
+       Cf. discussion on ding mailing list, messages in
+       <http://thread.gmane.org/gmane.emacs.gnus.general/86228>.
+       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.
 
-2015-12-20  Michael Albinus  <address@hidden>
+       The code is supported by test cases with necessary test keys.
 
-       Suppress test on Mac OS X
+       Documentation in message.texi is updated.
 
-       * test/automated/tramp-tests.el (tramp--test-darwin-p): New defun.
-       (tramp--test-utf8): Use it.
+       * 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.
 
-2015-12-20  Alan Mackenzie  <address@hidden>
+       * lisp/gnus/gnus-util.el (gnus-test-list, gnus-subsetp, gnus-setdiff):
+       New functions.
 
-       Merge branch 'scratch/follow' into emacs-25
+       * 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.
 
-       This allows Isearch, etc., to work well when Follow Mode is active.
+       * 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.
 
-2015-12-19  Michael Albinus  <address@hidden>
+       * 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/net/tramp-sh.el (tramp-get-ls-command-with-w-option):
-       Improve check.
+       * 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.
 
-2015-12-19  Eli Zaretskii  <address@hidden>
+2016-01-02  Glenn Morris  <address@hidden>
 
-       Fix last commit
+       * lisp/progmodes/fortran.el (fortran-make-syntax-propertize-function):
 
-       * doc/emacs/rmail.texi (Rmail Deletion): Document new behavior of 'u'
-       with numeric argument.
+       Explicitly ignore case.  (Bug#22262)
 
-2015-12-19  Eli Zaretskii  <address@hidden>
+2016-01-02  Stefan Monnier  <address@hidden>
 
-       Document new features of Rmail
+       (semantic-symref-derive-find-filepatterns): Return a list
 
-       * 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/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.
 
-2015-12-19  Eli Zaretskii  <address@hidden>
+2016-01-02  Eli Zaretskii  <address@hidden>
 
-       Improve documentation of new cl-lib functions
+       Fix xref-find-references on MS-Windows
 
-       * doc/misc/cl.texi (Predicates on Numbers, Numerical Functions):
-       Fix wording.
+       * 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)
 
-2015-12-19  Eli Zaretskii  <address@hidden>
+2016-01-02  Eli Zaretskii  <address@hidden>
 
-       Document the new feature of 'minibuffer-with-setup-hook'
+       Document new features of tildify-mode
 
-       * lisp/files.el (minibuffer-with-setup-hook): Clarify how FUN is
-       added to `minibuffer-setup-hook'.
+       * lisp/textmodes/tildify.el (tildify-foreach-ignore-environments)
+       (tildify-mode): Spelling fixes in doc strings.
 
-2015-12-19  Eli Zaretskii  <address@hidden>
+       * etc/NEWS: Reformat the tildify-mode entry.
 
-       Document new features of Font Lock
+2016-01-02  Eli Zaretskii  <address@hidden>
 
-       * 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".
+       Document new features of Whitespace mode
 
-       * lisp/font-lock.el (font-lock-flush, font-lock-ensure): Doc fix.
+       * 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.
 
-2015-12-19  Eli Zaretskii  <address@hidden>
+2016-01-02  Eli Zaretskii  <address@hidden>
 
-       Document new features of Rectangle mode
+       Improve documentation of new Hide-IfDef features
 
-       * doc/emacs/killing.texi (Rectangles): Document "C-x C-x" in
-       rectangle-mark-mode.
+       * etc/NEWS: Expand and reword Hide-IfDef section.
 
-2015-12-19  Eli Zaretskii  <address@hidden>
+2016-01-02  Leo Liu  <address@hidden>
 
-       Manual followup to last change
+       Fix regression in font-locking cl-assert and cl-check-type
 
-       * doc/lispref/display.texi (Displaying Messages): Sync with the
-       doc string.  (Bug#22210)
+       * lisp/emacs-lisp/lisp-mode.el (lisp-el-font-lock-keywords-2): Fix
+         el-errs-re.
 
-2015-12-19  Eli Zaretskii  <address@hidden>
+2016-01-01  Paul Eggert  <address@hidden>
 
-       Clarify doc string of 'display-message-or-buffer'
+       Spelling and grammar fixes
 
-       * lisp/simple.el (display-message-or-buffer): Doc fix.  Suggested
-       by Sebastian Wiesner <address@hidden>.  (Bug#22210)
+2016-01-01  Paul Eggert  <address@hidden>
 
-2015-12-19  Eli Zaretskii  <address@hidden>
+       Fix copyright years by hand
 
-       * doc/emacs/emacs.texi (Top): Update top-level menus.
+       These are dates that admin/update-copyright did not update, or
+       updated incorrectly.
 
-       * doc/lispref/elisp.texi (Top): Update top-level menus.
+2016-01-01  Paul Eggert  <address@hidden>
 
-2015-12-19  Eli Zaretskii  <address@hidden>
+       Update copyright year to 2016
 
-       Document how to avoid file-local variables that aren't
+       Run admin/update-copyright.
 
-       * doc/emacs/custom.texi (Specifying File Variables): Describe how
-       to prevent Emacs from interpreting unrelated text as file-local
-       variables.  (Bug#22166)
+2016-01-01  Paul Eggert  <address@hidden>
 
-2015-12-19  Dave Thomas  <address@hidden>  (tiny change)
+       Merge from gnulib
 
-       Fix a typo in eterm-color's termcap entry
+       This mostly just updates copyright dates of gnulib files.
+       It also updates to the latest version of texinfo.tex.
 
-       * lisp/term.el (term-termcap-format): Fix a typo in the "ue="
-       entry.  (Bug#22184)
+2015-12-31  Mark Oteiza  <address@hidden>
 
-2015-12-19  Eli Zaretskii  <address@hidden>
+       lisp/emacs-lisp/chart.el (chart-new-buffer): Move to silence byte 
compiler.
 
-       Allow 'browse-url-emacs' visit non-existent URLs
+2015-12-31  Mark Oteiza  <address@hidden>
 
-       * 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)
+       Port chart.el methods to cl-generic.
 
-2016-01-30  Paul Eggert  <address@hidden>
-2015-12-18  Paul Eggert  <address@hidden>
+       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.
 
-       Remove SunOS 4.x cruft
+2015-12-31  Brian Burns  <address@hidden>
 
-       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.
+       Add nt/INSTALL.W64 build instructions
 
-2016-01-30  Paul Eggert  <address@hidden>
-2015-12-18  Paul Eggert  <address@hidden>
+       * nt/INSTALL.W64: New file.
+       * nt/INSTALL: Point to INSTALL.W64 for 64-bit build instructions.
 
-       Merge from gnulib
+2015-12-31  Joakim Jalap  <address@hidden>
 
-       This mostly commentary fixes.
-       * doc/misc/texinfo.tex, lib/intprops.h: Copy from gnulib.
-       * lib/gnulib.mk: Regenerate with new gnulib-tool.
+       Add new input method 'programmer-dvorak'
 
-2015-12-18  Michael Albinus  <address@hidden>
+       * lisp/leim/quail/programmer-dvorak.el ("programmer-dvorak"): New
+       input method.
 
-       Minor fixes in Tramp
+       * etc/NEWS: Mention it.
 
-       * lisp/net/tramp-sh.el (tramp-do-file-attributes-with-ls):
-       Reorder ls arguments.
+2015-12-31  Eli Zaretskii  <address@hidden>
 
-       * lisp/net/tramp.el (tramp-dissect-file-name): Fix docstring.
+       Allow to invoke original M-TAB binding in 'flyspell-prog-mode'
 
-2015-12-18  Michael Albinus  <address@hidden>
+       * 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)
 
-       Make tramp a built-in package
+2015-12-31  Eli Zaretskii  <address@hidden>
 
-       * lisp/finder.el (finder-compile-keywords): Update
-       `package--builtins' also when Version: keyword is available.
+       Fix EWW rendering of long RTL lines
 
-       * 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'.
+       * lisp/net/shr.el (shr-insert-document): Undo any previous hscroll
+       of the selected window before filling its lines.  (Bug#22250)
 
-2015-12-18  Lele Gaifax  <address@hidden>
+2015-12-31  Vincent Belaïche  <address@hidden>
 
-       * etc/tutorials/TUTORIAL.it: Update and fix typos.  (Bug#22187)
+       fix  bug#21054
 
-2015-12-18  Alan Mackenzie  <address@hidden>
+       * ses.el (ses-check-curcell): Call `ses-set-curcell' unconditionally
 
-       Rename `recenter-group' to `recenter-window-group'
+2015-12-31  YAMAMOTO Mitsuharu  <address@hidden>
 
-       * 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'.
+       Clean up cairo printing code
 
-2015-12-18  Eli Zaretskii  <address@hidden>
+       * 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.
 
-       Fix vertical-motion in tabulated-list mode
+2015-12-30  YAMAMOTO Mitsuharu  <address@hidden>
 
-       * 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)
+       Add handle_user_signal_hook
 
-2015-12-18  Martin Rudalics  <address@hidden>
+       * src/keyboard.h (handle_user_signal_hook): New declaration.
+       * src/keyboard.c (handle_user_signal_hook): New variable.
+       (handle_user_signal): Call it.
 
-       Don't have help functions call x-display-pixel-width/-height on ttys
+2015-12-30  YAMAMOTO Mitsuharu  <address@hidden>
 
-       * lisp/help.el (temp-buffer-max-height, temp-buffer-max-width):
-       Don't call x-display-pixel-width/-height on ttys.
+       Avoid writing to purespace
 
-2016-01-30  Dmitry Gutov  <address@hidden>
-2015-12-17  Dmitry Gutov  <address@hidden>
+       * 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.
 
-       Use 'hg id' in vc-hg-previous-revision
+2015-12-30  YAMAMOTO Mitsuharu  <address@hidden>
 
-       * lisp/vc/vc-hg.el (vc-hg-previous-revision):
-       Use 'hg id' to retrieve it (bug#22032).
+       Remove unused variable
 
-2015-12-17  Alan Mackenzie  <address@hidden>
+       * lisp/international/mule-cmds.el: Remove unused variable
+       `mac-system-coding-system'.
 
-       * lisp/follow.el (follow-sit-for): Remove (it's redundant).
+2015-12-30  YAMAMOTO Mitsuharu  <address@hidden>
 
-2015-12-17  Eli Zaretskii  <address@hidden>
+       * configure.ac: Find libxml2 headers in Xcode SDK dir on Darwin.
 
-       Fix a typo in the Emacs manual
+2015-12-30  YAMAMOTO Mitsuharu  <address@hidden>
 
-       * doc/emacs/trouble.texi (Sending Patches): Fix a typo.  Reported
-       by Lele Gaifax <address@hidden>.  (Bug#22193)
+       Use posix_openpt instead of openpty on Darwin
 
-2015-12-17  Eli Zaretskii  <address@hidden>
+       * configure.ac (PTY_ITERATION, FIRST_PTY_LETTER, PTY_OPEN)
+       (PTY_NAME_SPRINTF, PTY_TTY_NAME_SPRINTF): Remove
+       Darwin-specific definitions.  Use posix_openpt instead.
 
-       Fix parsing netrc entries with ports
+2015-12-30  Shakthi Kannan  <address@hidden>
 
-       * lisp/gnus/auth-source.el (auth-source-ensure-strings): Don't
-       make a list out of 't'.  (Bug#22188)
+       Document support for ':documentation' in Lisp mode
 
-       * test/automated/auth-source-tests.el
-       (auth-source-test-netrc-parse-entry): New test.
+       * 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-17  Paul Eggert  <address@hidden>
+2015-12-30  Shakthi Kannan  <address@hidden>
 
-       Fix typo in Doug Lea malloc configure log
+       Document new features of TeX mode
 
-       * configure.ac (emacs_cv_var_doug_lea_malloc):
-       Fix typo that confused the log output of 'configure'.
+       * 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-16  Nicolas Petton  <address@hidden>
+2015-12-30  Eli Zaretskii  <address@hidden>
 
-       * etc/NEWS: Mention the new pcase patterns `seq' and `map'.
+       Clarify docs of hscroll in RTL text
 
-2015-12-16  Alan Mackenzie  <address@hidden>
+       * doc/lispref/windows.texi (Horizontal Scrolling): Clarify the
+       meaning of a window's horizontal scroll amount for RTL paragraphs.
 
-       * etc/NEWS: Move entry on pcase to correct section
+2015-12-30  Eli Zaretskii  <address@hidden>
 
-       (Accidentally omitted from previous commit)
+       Fix rendering of HTML pages that use character composition
 
-2015-12-16  Alan Mackenzie  <address@hidden>
+       * src/indent.c (Fvertical_motion): Fix the case when point starts
+       in the middle of a composition, as in shr-vertical-motion.
+       (Bug#22250)
 
-       Add documentation for changes to Show Paren mode.
+2015-12-30  Eli Zaretskii  <address@hidden>
 
-       * lisp/paren.el (show-paren-highlight-openparen): Enhance doc string.
+       Avoid some compiler warnings in w32.c
 
-       * 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.
+       * 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.
 
-       * etc/NEWS (.. Specialized Modes ...): Add an entry for Show Paren mode.
-       Move an entry on pcase to the Lisp Changes section.
+2015-12-29  Dmitry Gutov  <address@hidden>
 
-2015-12-16  Eli Zaretskii  <address@hidden>
+       Undo ill-advised change
 
-       Document Eldoc changes
+       * 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.
 
-       * doc/emacs/programs.texi (Lisp Doc): Document Global Eldoc mode.
+2015-12-29  Dmitry Gutov  <address@hidden>
 
-2015-12-16  Eli Zaretskii  <address@hidden>
+       Unbreak completion in python-mode buffers
 
-       Fix invocation of Python and Guile interpreters from gdb-mi
+       * lisp/progmodes/python.el (python-shell-completion-at-point):
+       Unbreak in python-mode buffers.
 
-       * 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.
+2016-01-09  Andrew Hyatt  <address@hidden>
 
-2015-12-16  Paul Eggert  <address@hidden>
+       Adding example replies to bug-triage.
 
-       Remove attempt to use C11 threads
+       * admin/notes/bug-triage: Added example replies. Also, as requested,
+         making the process notes into more of a checklist.
 
-       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.
+2016-01-08  Andrew Hyatt  <address@hidden>
 
-2015-12-15  Michael Albinus  <address@hidden>
+       Rename the notes/admin/triage file to bug-triage.
 
-       Set utf8 encoding with stty in Tramp
+       * CONTRIBUTE: Change reference to the triage file name.
+       * admin/notes/triage: Rename file to admin/notes/bug-triage.
 
-       * 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.
+2016-01-07  Glenn Morris  <address@hidden>
 
-2015-12-15  Alan Mackenzie  <address@hidden>
+       Allow creation of loaddefs files without timestamps.
 
-       Tidy up documentation associated with window groups.
+       * 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.
 
-       * 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.
+2016-01-06  Glenn Morris  <address@hidden>
 
-       * doc/lispref/positions.texi (Screen Lines).  Same as above.
+       Doc tweaks.
 
-2015-12-15  Michael Albinus  <address@hidden>
+       * 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.
 
-       Complete last commit
+2016-01-06  Glenn Morris  <address@hidden>
 
-       * lisp/net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
-       Move uname check up.  Handle Mac OS X eol encoding.
+       Build tweaks related to tags files.
 
-2015-12-15  Michael Albinus  <address@hidden>
+       * 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.
 
-       Handle Mac OS X eol encoding in Tramp
+2016-01-06  Glenn Morris  <address@hidden>
 
-       * lisp/net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
-       Handle Mac OS X eol encoding.
+       * lisp/Makefile.in (CAL_SRC): Skip calendar.el.
 
-2015-12-15  YAMAMOTO Mitsuharu  <address@hidden>
+2016-01-06  Glenn Morris  <address@hidden>
 
-       Fix variable name typo in compute_tip_xy
+       * test/lisp/emacs-lisp/package-tests.el
 
-       * src/w32fns.c (compute_tip_xy):
-       * src/xfns.c (compute_tip_xy): Modify *root_x instead of *root_y
-       when `right' is integer.
+       (package-test-macro-compilation): Fixup branch merge.
 
-2016-01-30  foudfou  <address@hidden>
-2015-12-14  foudfou  <address@hidden>  (tiny change)
+2016-01-05  Eli Zaretskii  <address@hidden>
 
-       * lisp/ibuffer.el: Add ability to (un-)mark or delete buffers in the 
region.
+       Fix fallout from merging emacs-25 branch in test/
 
-2015-12-14  Tassilo Horn  <address@hidden>
+       * .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/.
 
-       Revert "Fix rx matcher overflow without limiting"
+2016-01-04  Paul Eggert  <address@hidden>
 
-       This reverts commit fe27e037663d36be3e5741c2ce86ab4ee8017db1.
+       Spelling fixes.
 
-2015-12-14  Alan Mackenzie  <address@hidden>
+2016-01-04  Daniel Colascione  <address@hidden>
 
-       Ispell: Bind isearch-regexp-function to nil around call to 
isearch..-new-loop
+       Let users disable unsafe signal handling code
 
-       * lisp/textmodes/ispell.el (ispell-highlight-spelling-error-overlay): 
bind
-       isearch-regexp-function to nil around call to 
isearch-lazy-highligh-new-loop.
+       * 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'.
 
-2015-12-14  Tassilo Horn  <address@hidden>
+2016-01-03  Michael Albinus  <address@hidden>
 
-       Fix rx matcher overflow without limiting
+       * configure.ac: Add error message for gfile on Nextstep.
 
-       * 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-01-03  John Wiegley  <address@hidden>
 
-2015-12-14  Alan Mackenzie  <address@hidden>
+       Merge branch 'emacs-25-merge'
 
-       Enhance ispell-skip-region-alist by generating part of it at runtime.
+2016-01-02  Vincent Belaïche  <address@hidden>
 
-       * 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.
+       Align textually on fix done for emacs-25 branch for bug#21054
 
-2015-12-14  Glenn Morris  <address@hidden>
+       * 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.
 
-       * build-aux/gitlog-to-emacslog: Ignore more pointless merge commits.
+2016-01-02  K. Handa  <address@hidden>
 
-2015-12-14  Alan Mackenzie  <address@hidden>
+       support rendering of wider range of combinging characters by ftfont 
backend
 
-       Replace GROUP argument in six window primitives by new functions.
+       * lisp/language/hebrew.el (hebrew-shape-gstring): If the font backend
+       supports rendering of combining characters, call
+       font-shape-gstring.
 
-       * 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/font.c (Ffont_get): Handle `combining-capability' property.
+       (syms_of_font): New symbol ":combining-capability'.
 
-       * 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.
+       * src/font.h (struct font_driver): New member combining_capability.
 
-       * lisp/follow.el (follow-mode): Use updated variable names for the 
indirected
-       functions.
+       * 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.
 
-       * 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).
+2016-01-01  Andrew Hyatt  <address@hidden>
 
-       * lisp/ispell.el (ispell-command-loop): Replace call to
-       pos-visible-in-window-p with pos-visible-in-window-group-p.
+       Add notes on bug triage procedure
 
-       * 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.
+       * CONTRIBUTE: In section on the issue tracker, point to new triage file.
+       * admin/notes/triage: New file explaining triage procedure.
 
-2015-12-14  Vitorio Miguel  <address@hidden>  (tiny change)
+2015-12-30  Vincent Belaïche  <address@hidden>
 
-       * etc/tutorials/TUTORIAL.pt_BR: Fix a typo.  (Bug#22165)
+       Correct ses-rename-cell cursor-intangible text prop updating.
 
-2015-12-13  Eli Zaretskii  <address@hidden>
+       There were two problems:
 
-       Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into 
emacs-25
+       - 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
 
-2015-12-13  Tassilo Horn  <address@hidden>
+       - 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
 
-       Improve regex to not trigger stack overflow
+       * 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.
 
-       * 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-30  Vincent Belaïche  <address@hidden>
 
-2015-12-13  Eli Zaretskii  <address@hidden>
+       Don't fake empty cells value by "" when printing with a lambda.
 
-       Fix visiting files with raw-text
+       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 "".
 
-       * src/fileio.c (Finsert_file_contents): Fix setting buffer unibyte
-       when some stuff was actually read.  (Bug#22162)
+       * ses.el (ses-call-printer): Replace `(or value "")' by just `value'
+       in the case of a lambda expression printer function.
 
-2015-12-13  Tassilo Horn  <address@hidden>
+       * ses.texi (Printer functions): Add example and description about
+       lambda expression printer function handling all the possible values,
+       including unexpected ones.
 
-       Fix regex matching keyval labels
+2015-12-30  Vincent Belaïche  <address@hidden>
 
-       * lisp/textmodes/reftex-vars.el (reftex-label-regexps): Fix regexp
-       matching keyval labels.
+       Quick temporary hack to fix curcell refreshing.
 
-2015-12-13  Michael Albinus  <address@hidden>
+       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.
 
-       * lisp/ido.el (ido-file-name-all-completions-1): Do not raise an error
+       * 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.
 
-       ... in case of Tramp.  (Bug#20821)
+2015-12-30  Lars Magne Ingebrigtsen  <address@hidden>
 
-2016-01-30  Paul Eggert  <address@hidden>
-2015-12-12  Paul Eggert  <address@hidden>
+       Restrictive URL checking tweaks
 
-       Fix performance regression with gcc -O0
+       * 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).
 
-       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-30  Lars Magne Ingebrigtsen  <address@hidden>
 
-2015-12-12  Artur Malabarba  <address@hidden>
+       New function `puny-highly-restrictive-domain-p'
 
-       * lisp/emacs-lisp/package.el (package-unpack): Security check
+       * lisp/net/puny.el (puny-highly-restrictive-string-p): Rename.
+       (puny-highly-restrictive-domain-p): New function.
 
-       Check that we received the package we were offered.
+2015-12-30  Lars Magne Ingebrigtsen  <address@hidden>
 
-2015-12-12  Artur Malabarba  <address@hidden>
+       eww build fix (require puny)
 
-       * lisp/emacs-lisp/package.el (package--compile): Don't activate
+2015-12-30  Lars Magne Ingebrigtsen  <address@hidden>
 
-       `package-unpack' takes care of all activations now (other than
-       `package-initialize).  `package--compile' now only compiles.
+       Transform non-restrictive domains to punycode for display
 
-2015-12-12  Eli Zaretskii  <address@hidden>
+       * lisp/net/eww.el (eww): Check whether the domain is Highly
+       Restrictive in the Unicode IDNA sense.
 
-       Document the new bindings of <UP> and <DOWN> in the minibuffer
+2015-12-30  John Wiegley  <address@hidden>
 
-       * doc/emacs/mini.texi (Minibuffer History): Describe the new
-       bindings of <UP> and <DOWN> in the minibuffer.
+       Merge emacs-25 into master (using imerge)
 
-2015-12-12  Eli Zaretskii  <address@hidden>
+2015-12-29  Eli Zaretskii  <address@hidden>
 
-       Document new features of Ido
+       Fix typos in CC Mode manual
 
-       * doc/misc/ido.texi (Misc): Document 'C-S-b'.
+       * doc/misc/cc-mode.texi (c-offsets-alist, Style Variables): Fix
+       typos.  (Bug#22267)
 
-2015-12-12  Martin Rudalics  <address@hidden>
+2015-12-29  Eli Zaretskii  <address@hidden>
 
-       Fix frame height calculations with added menu bar on Windows (Bug#22105)
+       Avoid assertion violations in compact_font_cache_entry
 
-       * 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.
+       * src/alloc.c (compact_font_cache_entry): Don't use VECTORP to
+       avoid assertion violation in ASIZE.  (Bug#22263)
 
-2015-12-12  Eli Zaretskii  <address@hidden>
+2015-12-29  Eli Zaretskii  <address@hidden>
 
-       Document the change in interactive shell mode
+       Fix filling text with bidirectional characters in shr.el
 
-       * doc/emacs/misc.texi (Interactive Shell): Document that the
-       '*shell*' buffer by default displays in a new window.
+       * 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-12  Eli Zaretskii  <address@hidden>
+2015-12-29  Lars Ingebrigtsen  <address@hidden>
 
-       Document new features of package.el
+       Further Unicode restrictive fixups
 
-       * doc/emacs/package.texi (Package Menu): Document the 'external'
-       status and the new menu commands.
-       (Package Installation): Document archive priorities.
+       * puny.el (puny-highly-restrictive-p): Include the extra
+       identifier characters from table 3.
 
-       * lisp/emacs-lisp/package.el (package-archive-priorities): Doc fix.
-       (package-menu-hide-low-priority): Doc fix.
+2015-12-29  Martin Rudalics  <address@hidden>
 
-2015-12-12  Eli Zaretskii  <address@hidden>
+       * src/xfns.c (x_create_tip_frame): Process alpha parameter.
 
-       Update and document new features of xterm support
+2015-12-29  Michael Albinus  <address@hidden>
 
-       * doc/emacs/frames.texi (Text-Only Mouse): Document that
-       track-mouse is supported by newer xterm versions.
+       Sync with Tramp 2.2.13
 
-2015-12-12  Eli Zaretskii  <address@hidden>
+       * doc/misc/trampver.texi: Change version to "2.2.13.25.1".
 
-       Document new features of Prettify Mode
+       * lisp/net/tramp-compat.el (tramp-compat-delete-dups):
+       Use `tramp-compat-funcall'.
 
-       * doc/emacs/programs.texi (Misc for Programs): Document
-       'prettify-symbols-compose-predicate' and
-       'prettify-symbols-unprettify-at-point'.
+       * lisp/net/tramp-gvfs.el (tramp-gvfs-parse-device-names):
+       Make `split-string' call compatible with older Emacsen.
 
-       * lisp/progmodes/prog-mode.el (prettify-symbols-alist)
-       (prettify-symbols-default-compose-p)
-       (prettify-symbols-compose-predicate)
-       (prettify-symbols--compose-symbol): Doc fixes.
+       * lisp/net/trampver.el: Change version to "2.2.13.25.1".
 
-2015-12-12  Eli Zaretskii  <address@hidden>
+2015-12-29  Lambda Coder  <address@hidden>
 
-       Document multi-mode indentation facilities
+       * doc/misc/tramp.texi: Editorial revisions to the Tramp manual
 
-       * doc/lispref/text.texi (Mode-Specific Indent): Document
-       'prog-indentation-context', 'prog-first-column', and 'prog-widen'.
+2015-12-29  Lars Ingebrigtsen  <address@hidden>
 
-       * lisp/progmodes/prog-mode.el (prog-indentation-context)
-       (prog-widen): Doc fixes.
+       Mention that tls.el is secure by default, and will fail
 
-2015-12-12  Eli Zaretskii  <address@hidden>
+2015-12-29  Lars Ingebrigtsen  <address@hidden>
 
-       Document 'vc-refresh-state'
+       Make tls.el use trustfiles by default
 
-       * doc/emacs/maintaining.texi (Version Control): Document
-       'vc-refresh-state'.
+       * lisp/net/tls.el (tls-program): Add a certfile by default (bug#21227).
+       (open-tls-stream): Insert the trustfile by looking at
+       `gnutls-trustfiles'.
 
-       * lisp/vc/vc-hooks.el (vc-refresh-state): Doc fix.
+2015-12-29  Lars Ingebrigtsen  <address@hidden>
 
-2015-12-12  Eli Zaretskii  <address@hidden>
+       Refactor out gnutls-trustfiles
 
-       Fix echo for "C-u"
+       * lisp/net/gnutls.el (gnutls-trustfiles): Refactor out for reuse by 
tls.el.
 
-       * src/keyboard.c (command_loop_1): Undo last change.  It caused
-       duplicate echo of C-u.  (Bug#22107)
+2015-12-29  Lars Ingebrigtsen  <address@hidden>
 
-2015-12-11  Eli Zaretskii  <address@hidden>
+       Remove --insecure from gnutls-cli invocation
 
-       Avoid errors when creating files under SVN in new directory
+       * tls.el (tls-program): Default to using secure TLS
+       connections (bug#19284).
 
-       * 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-29  Lars Ingebrigtsen  <address@hidden>
 
-2015-12-11  Eli Zaretskii  <address@hidden>
+       Add a new function to say whether a string is restrictive
 
-       Improve Lua support in etags
+       * puny.el (puny-highly-restrictive-p): New function.
 
-       * lib-src/etags.c (Lua_functions): Skip spaces before looking for
-       "function".
+2015-12-28  Paul Eggert  <address@hidden>
 
-       * etc/NEWS: Mention improved Lua support by 'etags'.
+       Spelling fix
 
-       * 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-28  Paul Eggert  <address@hidden>
 
-2015-12-11  Eli Zaretskii  <address@hidden>
+       Port report-emacs-bug to deterministic builds
 
-       Fix 'this-command-keys' wrt prefix argument
+       * 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/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)
+2015-12-28  Jose A. Ortega Ruiz  <address@hidden>  (tiny change)
+
+       Fix URL auth error message
+
+       * lisp/url/url-http.el (url-http-handle-authentication): Make the error
+       message more correct (bug#20069).
 
-       * lisp/simple.el (internal-echo-keystrokes-prefix): Add
-       commentary about the function's return value.
+2015-12-28  Lars Ingebrigtsen  <address@hidden>
 
-2015-12-11  Eli Zaretskii  <address@hidden>
+       Mention the new puny.el library
 
-       * lisp/files.el (load-library): Doc fix.  (Bug#22140)
+2015-12-28  Lars Ingebrigtsen  <address@hidden>
 
-2015-12-11  Eli Zaretskii  <address@hidden>
+       IDNA-related fixes for the URL library
 
-       Improve and document Ruby support in 'etags'
+       * lisp/url/url-http.el (url-http-create-request): IDNA-encode
+       the Host: header.
 
-       * lib-src/etags.c (Ruby_suffixes): Add ".ruby".
-       (Ruby_functions): Support "module" and overloaded operators.
-       (Ruby_help): Mention "module".
+       * 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.
 
-       * 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.
+2015-12-28  Lars Ingebrigtsen  <address@hidden>
 
-       * doc/man/etags.1: Mention Ruby support.
-       * etc/NEWS: Mention Ruby support.
+       IDNA-encode all domain names in `open-network-stream'
 
-2015-12-11  Xi Lu  <address@hidden>
+       * network-stream.el (open-network-stream)
+       (network-stream-open-plain, network-stream-open-starttls):
+       IDNA-encode all domain names, if needed.
 
-       Initial support for Ruby in 'etags'
+2015-12-28  Lars Ingebrigtsen  <address@hidden>
 
-       * lib-src/etags.c <Ruby_suffixes>: New variable.
-       (lang_names): Add an entry for Ruby.
-       (Ruby_functions): New function.  (Bug#22116)
+       Fix puny-encoding all-non-ASCII domains
 
-2015-12-11  Eli Zaretskii  <address@hidden>
+       * puny.el (puny-encode-string): Fix the all-non-ASCII encoding case.
 
-       Clarify documentation of 'modify-frame-parameters'
+2015-12-28  Lars Ingebrigtsen  <address@hidden>
 
-       * doc/lispref/frames.texi (Parameter Access): Clarify what "ignored
-       PARMs" mean for 'modify-frame-parameters'.
+       * lisp/net/shr.el (shr-next-link): Don't bug out on adjacent links.
 
-       * src/frame.c (Fmodify_frame_parameters): Clarify what "ignored
-       PARMs" mean for this function.  (Bug#22104)
+2015-12-28  Tom Tromey  <address@hidden>
 
-2015-12-11  Eli Zaretskii  <address@hidden>
+       set :safe on css-indent-offset
 
-       Fix setting buffer unibyte when reading from a device
+       * lisp/textmodes/css-mode.el (css-indent-offset): Add :safe 'integerp.
 
-       * src/fileio.c (Finsert_file_contents): Call Fset_buffer_multibyte
-       to make a (possibly non-empty) buffer unibyte.  (Bug#22096)
+2015-12-28  Lars Ingebrigtsen  <address@hidden>
 
-2015-12-11  Eli Zaretskii  <address@hidden>
+       * eww.el (eww-mode): Remove superfluous bidi reset.
 
-       Clarify documentation of 'values'
+2015-12-28  James Stout  <address@hidden>  (tiny change)
 
-       * doc/lispref/eval.texi (Eval): Clarify that 'values' are not
-       updated by any evaluation commands in 'lisp-interaction-mode'.
-       (Bug#22056)
+       Make chunked encoding trailer detection more compliant
 
-2015-12-11  Anders Lindgren  <address@hidden>
+       * lisp/url/url-http.el
+       (url-http-chunked-encoding-after-change-function): Make
+       trailer detection more compliant (bug#16345).
 
-       Fixed subversion vc error when opening file in new directory 
(bug#21984).
+2015-12-28  Lars Ingebrigtsen  <address@hidden>
 
-       * lisp/vc/vc-svn.el (vc-svn-registered): Check if directory exists.
+       Reconnect erc even on server errors
 
-2015-12-09  Eli Zaretskii  <address@hidden>
+       * lisp/erc/erc-backend.el (erc-server-reconnect-p): Try to
+       reconnect even if a server error has occurred (bug#18527).
 
-       Yet another fix for when point ends up in invisible text
+2015-12-28  Lars Ingebrigtsen  <address@hidden>
 
-       * 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)
+       Fix punycode short circuit logic
 
-2015-12-09  Michael Albinus  <address@hidden>
+       * puny.el (puny-encode-domain): Fix short-circuit logic.
 
-       Fix error in Tramp perl script for cygwin
+2015-12-28  Martin Rudalics  <address@hidden>
 
-       * lisp/net/tramp-sh.el (tramp-perl-file-truename): Do not raise an
-       error if file doesn't exist.
+       Fix Bug#10873 in `report-emacs-bug'
 
-2015-12-09  YAMAMOTO Mitsuharu  <address@hidden>
+       * 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).
 
-       Remove font workaround for limited outdated versions
+2015-12-28  Lars Ingebrigtsen  <address@hidden>
 
-       * src/macfont.m (mac_font_descriptor_get_adjusted_weight): Remove
-       workaround for HiraginoSans-W7 on OS X 10.11 and 10.11.1.
+       IDNA speed up
 
-2015-12-09  Anders Lindgren  <address@hidden>
+       * puny.el (puny-encode-domain): Make the common non-IDNA case faster
 
-       Don't add "." to load path (bug#21104)
+2015-12-28  Lars Ingebrigtsen  <address@hidden>
 
-       When configured with --enable-locallisppath=no, which is the
-       default for OS X, the load-path incorrectly was populated with ".".
+       Add IDNA domain encode/decode functions
 
-       * src/lread.c (init_lread): Don't call `decode_env_path' when
-       PATH_SITELOADSEARCH is empty.
+       * puny.el (puny-decode-domain): New function.
+       (puny-encode-domain): Ditto.
+       (puny-decode-digit): Fix digit decoding error.
 
-2015-12-08  Artur Malabarba  <address@hidden>
+2015-12-28  Lars Ingebrigtsen  <address@hidden>
 
-       * lisp/emacs-lisp/package.el (package--with-response-buffer):
+       Rename idna.el to puny.el
 
-       Search for the blank-line in the right buffer.
+       * puny.el: Renamed from idna.el to avoid name collisions with
+       the external idna.el library.
 
-2015-12-08  Glenn Morris  <address@hidden>
+2015-12-28  Lars Ingebrigtsen  <address@hidden>
 
-       * test/automated/simple-test.el (undo-auto-boundary-timer): Update
-       for recent change.
+       Always reset the bidi direction
 
-2015-12-08  Glenn Morris  <address@hidden>
+       * eww.el (eww-display-html): Always reset the bidi direction
+       to `left-to-right' (bug#22257).
 
-       Fix some display-warning usage.
+2015-12-28  Alan Mackenzie  <address@hidden>
 
-       * 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.
+       Allow line comments ending with escaped NL to be continued to the next 
line.
 
-2016-01-30  Glenn Morris  <address@hidden>
-2015-12-07  Glenn Morris  <address@hidden>
+       Use this in C, C++, and Objective C Modes.  Fixes bug#22246
 
-       * lisp/calendar/cal-html.el: Require diary-lib.
+       * 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.
 
-       (cal-html-list-diary-entries): Handle no diary.  (Bug#21994)
+       * doc/lispref/syntax.texi (Control Parsing): Describe
+       `comment-end-can-be-escaped'.
 
-2016-01-30  Thomas Fitzsimmons  <address@hidden>
+       * etc/NEWS (Lisp Changes): Describe `comment-end-can-be-escaped'.
 
-       Add Obsolete-since header to eudcb-ph.el
+       * lisp/progmodes/cc-langs.el: New c-lang-setvar 
`comment-end-can-be-escaped'.
 
-       * lisp/obsolete/eudcb-ph.el: Add Obsolete-since header.
-2015-12-07  Thomas Fitzsimmons  <address@hidden>
+2015-12-28  Katsumi Yamaoka  <address@hidden>
 
-       Add Obsolete-since header to eudcb-ph.el
+       lisp/gnus/mml-sec.el (mml-secure-bcc-is-safe): Keep old Emacsen 
compatibility
 
-       * eudcb-ph.el: Add Obsolete-since header.
+       * lisp/gnus/mml-sec.el (mml-secure-bcc-is-safe):
+       Don't use split-string with 4th arg for old Emacsen compatibility.
 
-2015-12-07  Paul Eggert  <address@hidden>
+2015-12-27  Dmitry Gutov  <address@hidden>
 
-       Spelling fixes
+       Rename project-library-roots to project-external-roots
 
-       * 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/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.
 
-2015-12-07  Eli Zaretskii  <address@hidden>
+       * lisp/progmodes/elisp-mode.el (elisp-library-roots):
+       Rename to elisp-load-path-roots.
 
-       Improve documentation of kill commands
+       * lisp/progmodes/etags.el (etags-library-roots): Remove.  Use
+       an anonymous function for the default value of
+       project-vc-external-roots-function.
 
-       * 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'.
+2015-12-27  Lars Ingebrigtsen  <address@hidden>
 
-       * 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)
+       * idna.el (idna-decode-string-internal): Implement decoding.
 
-2015-12-07  Alan Mackenzie  <address@hidden>
+2015-12-27  Lars Ingebrigtsen  <address@hidden>
 
-       Further progress making Isearch, Ispell, Replace work with Follow Mode.
+       Further IDNA tweaks
 
-       * 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.
+       (idna-encode-string): Make idna-encode-string safe for
+       non-ASCII use.
 
-       * 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.
+2015-12-27  Lars Ingebrigtsen  <address@hidden>
 
-       * 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.
+       Clean up the code slightly
 
-       * 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-27  Lars Ingebrigtsen  <address@hidden>
 
-2015-12-07  Alan Mackenzie  <address@hidden>
+       Added basic idna encoding support
 
-       Amend doc of `mapconcat': it can take sequences, not merely strings.
+       * lisp/net/idna.el: New file.
 
-       * 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-27  Vivek Dasmohapatra  <address@hidden>
 
-2015-12-07  Michael Albinus  <address@hidden>
+       Disconnection fixes for erc
 
-       Fix an utf8 problem for Tramp on BSD
+       * lisp/erc/erc-backend.el (erc-server-reconnect-p): Don't
+       reconnect if the user has disconnected explicitly (bug#4589).
 
-       * 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-27  Thomas Riccardi  <address@hidden>  (tiny change)
 
-2016-01-30  Thomas Fitzsimmons  <address@hidden>
-2015-12-06  Thomas Fitzsimmons  <address@hidden>
+       Further erc asynch fixes
 
-       Make eudcb-ph.el obsolete
+       * 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).
 
-       * 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-27  Vivek Dasmohapatra  <address@hidden>
+
+       Make erc connect asynchronously
 
-2016-01-30  Paul Eggert  <address@hidden>
-2015-12-06  Paul Eggert  <address@hidden>
+       * lisp/erc/erc-backend.el (erc-server-reconnect): Use it to
+       reconnect asynchronously.
 
-       Remove overenthusiastic eassert
+       * lisp/erc/erc-backend.el (erc-open-network-stream): New function 
(bug#5650).
 
-       * 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-27  Deniz Dogan  <address@hidden>
 
-2015-12-06  Paul Eggert  <address@hidden>
+       Clear erc user list upon disconnection
 
-       Pacify gcc -Wparentheses
+       * lisp/erc/erc-backend.el (erc-process-sentinel): Clear channel user
+       lists upon disconnection.  This prevents invalid channel
+       user lists when reconnecting (bug#10947).
 
-       * src/xdisp.c (row_containing_pos): Reparenthesize.
+2015-12-27  Lars Ingebrigtsen  <address@hidden>
 
-2015-12-06  Paul Eggert  <address@hidden>
+       Don't bug out in erc after waking from sleep
 
-       Port mod-test to 32-bit Emacs --without-wide-int
+       * 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).
 
-       * 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-27  David Edmondson  <address@hidden>
 
-2015-12-06  Michael Albinus  <address@hidden>
+       Proxy error in erc with multiple clients
 
-       Fix minor Tramp problems found on BSD
+       * lisp/erc/erc.el (erc-channel-receive-names): Fix errors
+       generated when multiple IRC clients talk to a single IRC proxy
+       (bug#19034).
 
-       * 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.
+2015-12-27  Dima Kogan  <address@hidden>
 
-       * 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.
+       Ensure that we don't have several timers in erc
 
-2015-12-06  Eli Zaretskii  <address@hidden>
+       * 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).
 
-       Fix cursor display when invisible text is at line beginning
+2015-12-27  Jens Lechtenboerger  <address@hidden>
 
-       * 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.
+       * lisp/gnus/mml-sec.el: Fix warnings by adding autoloads
+       (bug#18718).
 
-2015-12-06  Paul Eggert  <address@hidden>
+2015-12-27  Lars Ingebrigtsen  <address@hidden>
 
-       Improve module interface when WIDE_EMACS_INT
+       * 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/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-27  Lars Ingebrigtsen  <address@hidden>
 
-2015-12-06  Paul Eggert  <address@hidden>
+       * lisp/net/eww.el (eww-setup-buffer): Restore left-to-right defaults.
 
-       Port mod-test to x86-64 GNU/Linux running 32-bit
+2015-12-27  Lars Ingebrigtsen  <address@hidden>
 
-       * 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.
+       Don't join erc channels doubly
 
-2015-12-06  Michael Albinus  <address@hidden>
+       * erc-join.el (erc-autojoin-channels): Don't join channels
+       more than once (if you have several nicks) (bug#20695).
 
-       Fix auto-revert-tests.el when filenotify isn't used
+2015-12-27  Eli Zaretskii  <address@hidden>
 
-       * test/automated/auto-revert-tests.el (auto-revert--wait-for-revert):
-       Make it working also when filenotify isn't used.
+       Avoid leaving "ghost" of mouse pointer on MS-Windows
 
-2016-01-30  Juri Linkov  <address@hidden>
-2015-12-05  Juri Linkov  <address@hidden>
+       * 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.
 
-       * lisp/textmodes/ispell.el (ispell-highlight-spelling-error-overlay):
+2015-12-27  Lars Ingebrigtsen  <address@hidden>
 
-       Let-bind isearch-regexp-function to nil.  (Bug#22097)
+       * lisp/gnus/mml-sec.el (mml-secure-bcc-is-safe): Fix typo in last 
check-in.
 
-2015-12-05  Artur Malabarba  <address@hidden>
+2015-12-27  Jens Lechtenboerger  <address@hidden>
 
-       * lisp/emacs-lisp/package.el: Don't install bad signatures (bug#22089)
+       Identify unsafe combinations of Bcc and encryption
 
-       (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/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-05  Ulf Jasper  <address@hidden>
+2015-12-27  Krzysztof Jurewicz  <address@hidden>  (tiny change)
 
-       Fix Bug#22092.
+       Fix auth source lookups from erc with port numbers
 
-       * 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/erc/erc.el (erc-open): `auth-source' wants strings, not port
+       numbers (bug#20541).
 
-2015-12-05  Eli Zaretskii  <address@hidden>
+2015-12-27  Fran Litterio  <address@hidden>
 
-       Document 'bookmark-set-no-overwrite'
+       Run erc-kill-channel-hook always on exit
 
-       * doc/emacs/regs.texi (Bookmarks): Document the new command
-       'bookmark-set-no-overwrite' and its keybinding.
+       * 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-05  Eli Zaretskii  <address@hidden>
+2015-12-26  Paul Eggert  <address@hidden>
 
-       Document new binding of 'mouse-buffer-menu'
+       Spelling fix
 
-       * doc/emacs/buffers.texi (Buffer Menus): 'mouse-buffer-menu' is
-       now also on C-F10.
+       * test/automated/url-parse-tests.el:
+       (url-generic-parse-url/same-document-reference):
+       Rename from url-generic-parse-url/same-decument-reference.
 
-2015-12-05  Eli Zaretskii  <address@hidden>
+2015-12-26  Paul Eggert  <address@hidden>
 
-       Initial documentation of dynamic modules
+       Reword initial *scratch* for brevity, appearance
 
-       * 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
+       * 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
 
-       * etc/NEWS: Fix typos in dynamic modules' entry.
+2015-12-26  Leo Liu  <address@hidden>
 
-2015-12-05  Artur Malabarba  <address@hidden>
+       Add ert-deftest to lisp-mode.el
 
-       Remove copyright statements from trivial test files
+       * lisp-mode.el (lisp-imenu-generic-expression,
+         lisp-el-font-lock-keywords-1): Add ert-deftest.
 
-2015-12-05  Eli Zaretskii  <address@hidden>
+2015-12-26  Lars Ingebrigtsen  <address@hidden>
 
-       Add "Preliminaries" section to etc/DEBUG
+       Mark imap changes as not needing doc changes
 
-       * etc/DEBUG: Add the "Preliminaries" section for GDB beginners.
-       Most of the content was suggested by Phillip Lord
-       <address@hidden>.  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.
+       * imap.el (imap-ssl-open): Remove
 
-2015-12-05  Alex Dunn  <address@hidden>  (tiny change)
+2015-12-26  Lars Ingebrigtsen  <address@hidden>
 
-       Improve parsing of version strings
+       Use built-in encryption in imap.el
 
-       * 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.
+       * 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.
 
-       * test/automated/subr-tests.el (ert-test-version-parsing): New
-       tests for version string processing.
+2015-12-26  Eli Zaretskii  <address@hidden>
 
-2015-12-05  Eli Zaretskii  <address@hidden>
+       Don't try using /bin/sh in artist.el on MS-Windows
 
-       Fix documentation of 'undo' changes
+       * 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)
 
-       * doc/lispref/text.texi (Undo): Minor wording changes.  Use US
-       English conventions for spelling and whitespace between sentences.
+2015-12-26  Wolfgang Jenkner  <address@hidden>
 
-       * etc/NEWS: Fix wording and spelling of undo-related entries.
-       Mark them as documented.
+       Always define gmalloc etc. in src/gmalloc.c
 
-2016-01-30  Glenn Morris  <address@hidden>
-2015-12-04  Glenn Morris  <address@hidden>
+       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/net/net-utils.el: Small improvements.
+2015-12-26  Eli Zaretskii  <address@hidden>
 
-       (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.
+       Fix documentation of browse-url browser-related functions
 
-2016-01-30  (tiny change) Arash Esbati  <address@hidden>  (tiny change)
-2015-12-04  Arash Esbati  <address@hidden>  (tiny change)
+       * 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)
 
-       Fix wrong-type-argument integer-or-marker-p nil error
+2015-12-26  Paul Eggert  <address@hidden>
 
-       * lisp/textmodes/reftex-auc.el (reftex-what-index-tag):
-       Fix (wrong-type-argument integer-or-marker-p nil) error (bug#22077).
+       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  <address@hidden>
 
-2015-12-04  Alan Mackenzie  <address@hidden>
+       Don't produce non-ASCII characters in *scratch*
 
-       Merge branch 'scratch/follow' of /home/acm/emacs/emacs.git/emacs-25 
into scratch/follow
+       * lisp/startup.el (initial-scratch-message): Quote apostrophes to
+       avoid producing non-ASCII characters in the *scratch* buffer's
+       commentary.
 
-       Merge necessitated by a rebase operation.
+2015-12-26  Eli Zaretskii  <address@hidden>
 
-2015-12-04  Alan Mackenzie  <address@hidden>
+       Document changes in 'compare-windows'
 
-       lisp/isearch.el: Eliminate macro isearch-call-message, replacing with 
funcall.
+       * lisp/vc/compare-w.el (compare-windows-removed)
+       (compare-windows-added): Doc fix.
 
-2015-12-04  Alan Mackenzie  <address@hidden>
+       * doc/emacs/files.texi (Comparing Files): Document the changes in
+       window selection by 'compare-windows'.
 
-       First commit to scratch/follow.  Make Isearch work with Follow Mode, 
etc.
+2015-12-26  Eli Zaretskii  <address@hidden>
 
-       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.
+       Document 'vc-annotate-background-mode'
 
-       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.
+       * doc/emacs/maintaining.texi (Old Revisions): Document
+       'vc-annotate-background-mode'.
 
-       lisp/window.el (selected-window-group-function): New permanent local 
buffer
-       local variable.
-       (selected-window-group): New function.
+2015-12-26  Eli Zaretskii  <address@hidden>
 
-       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.
+       Document 'vc-region-history'
 
-       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.
+       * doc/emacs/maintaining.texi (VC Change Log): Document
+       'vc-region-history'.
 
-2015-12-04  Stefan Monnier  <address@hidden>
+2015-12-26  Eli Zaretskii  <address@hidden>
 
-       * lisp/emacs-lisp/ert.el: Prefer pcase over cl-typecase
+       Improve documentation of 'vc-push'
 
-       * 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.
+       * doc/emacs/maintaining.texi (Pulling / Pushing): Expand and
+       improve the documentation of 'vc-push'.
 
-2015-12-04  Artur Malabarba  <address@hidden>
+       * lisp/vc/vc.el (vc-pull, vc-push): Doc fix.
 
-       * lisp/character-fold.el: Remove special case-folding support
+2015-12-26  Alain Schneble  <address@hidden>
 
-       (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 𝔽.
+       Include the tests for the URL parsing fixes
 
-       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-26  Eli Zaretskii  <address@hidden>
 
-2015-12-04  Stefan Monnier  <address@hidden>
+       Document 'url-user-agent'.
 
-       * lisp/emacs-lisp/cl-macs.el (character): Can't be negative
-       Fixes (bug#21701)
+       * 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.
 
-2015-12-04  Daiki Ueno  <address@hidden>
+       * doc/misc/url.texi (Customization): Document 'url-user-agent'.
 
-       lisp/gnus/qp.el: Don't replace "from " at bol
+2015-12-26  Eli Zaretskii  <address@hidden>
 
-       * lisp/gnus/qp.el (quoted-printable-encode-region): Bind 
`case-fold-search'
-       to nil when looking for "^From ".  Problem reported by Simon Josefsson.
+       Document protocols supported by URL library via Tramp
 
-2015-12-03  Phillip Lord  <address@hidden>
+       * doc/misc/url.texi (Tramp): New node, describes the URL schemes
+       supported via Tramp.
+       (Supported URL Types, file/ftp, rlogin/telnet/tn3270): Mention
+       Tramp.
 
-       Externalize some symbols in undo-auto
+2015-12-26  Eli Zaretskii  <address@hidden>
 
-        * 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.
+       Document changes in Shell-script mode
 
-2015-12-03  Stefan Monnier  <address@hidden>
+       * 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'.
 
-       * lisp/emacs-lisp/smie.el (smie-next-sexp): Fix BOB "token"
+2015-12-26  Eli Zaretskii  <address@hidden>
 
-2015-12-03  Michael Albinus  <address@hidden>
+       Fix documentation of 'ses-define-local-printer'
 
-       Some error message improvements in tramp-sh.el
+       * doc/misc/ses.texi (Printer functions): Fix whitespace between
+       sentences and punctuation.  Add an index entry for
+       'ses-define-local-printer'.
 
-       * 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-26  Shakthi Kannan  <address@hidden>
 
-2015-12-03  Eli Zaretskii  <address@hidden>
+       Document 'ert-summarize-tests-batch-and-exit'
 
-       Document 'nacl' value for 'system-type'
+       * doc/misc/ert.texi (Running Tests in Batch Mode): Document
+       'ert-summarize-tests-batch-and-exit'.
 
-       * doc/lispref/os.texi (System Environment): Document the 'nacl'
-       value of 'system-type'.
+2015-12-26  Eli Zaretskii  <address@hidden>
 
-2015-12-03  Eli Zaretskii  <address@hidden>
+       Avoid assertion violation in unbind_to
 
-       Document 'window-max-chars-per-line'
+       * src/eval.c (unbind_to) <SPECPDL_LET>: Avoid assertion violation
+       if we get here with an object that is not a symbol.  (Bug#14412)
 
-       * doc/lispref/windows.texi (Window Sizes): Document
-       'window-max-chars-per-line'.
+2015-12-25  Andreas Schwab  <address@hidden>
 
-2015-12-03  Artur Malabarba  <address@hidden>
+       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)
 
-       Fix some file headers for the purpose of `package--builtins'
+2015-12-25  Eli Zaretskii  <address@hidden>
 
-       * lisp/emacs-lisp/cl-preloaded.el
-       * lisp/emacs-lisp/eieio-compat.el
-       * lisp/net/sasl-scram-rfc.el: Add a "Package:" header
+       Make sure *scratch* etc. use forward slashes in its default-directory
 
-       * lisp/ielm.el: Fix summary line.
+       * 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-03  Artur Malabarba  <address@hidden>
+2015-12-25  Eli Zaretskii  <address@hidden>
 
-       * lisp/emacs-lisp/package.el (package-unpack): Load before compiling
+       Restore info about the build host in bug reports
 
-       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.
+       * 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-03  Artur Malabarba  <address@hidden>
+2015-12-25  Eli Zaretskii  <address@hidden>
 
-       * lisp/emacs-lisp/package.el: Refactor package activation code
+       Fix bootstrap broken by changes related to OS X file-name encoding
 
-       (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'.
+       * 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.
 
-2015-12-03  Eli Zaretskii  <address@hidden>
+       * src/Makefile.in ($(lispsource)/international/ucs-normalize.elc):
+       New order-only dependency.
 
-       Document new font-related functionality
+2015-12-25  Leo Liu  <address@hidden>
 
-       * doc/lispref/display.texi (Low-Level Font): Document
-       'default-font-width', 'default-font-height', 'window-font-width',
-       and 'window-font-height'.
+       * lisp/ido.el (ido-add-virtual-buffers-to-list):
+       Use bookmark-get-filename.
 
-       * 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-25  Michael Albinus  <address@hidden>
 
-2015-12-03  Eli Zaretskii  <address@hidden>
+       Make tramp-test29-vc-registered more robust
 
-       Fix documentation and implementation of 'directory-name-p'
+       * test/automated/tramp-tests.el (tramp-test29-vc-registered):
+       Move `bzr' case down.  Skip test when `vc-create-repo' fails.
+       Remove instrumentation.
 
-       * 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-12-24  YAMAMOTO Mitsuharu  <address@hidden>
 
-       * 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.
+       * lisp/term/x-win.el (x-gtk-stock-map): Fix typo.
 
-       * etc/NEWS: Move the entry for 'directory-name-p' to its proper
-       place and mark it documented.
+2015-12-23  Katsumi Yamaoka  <address@hidden>
 
-2015-12-02  Eli Zaretskii  <address@hidden>
+       Fix `gnus-union' so as to behave like `cl-union'
 
-       Minor copyedit in Emacs manual
+       * lisp/gnus/gnus-group.el (gnus-group-prepare-flat):
+       Make gnus-union use `equal' to compare items in lists.
 
-       * doc/emacs/search.texi (Lax Search): Make wording about character
-       folding by default less definitive.  (Bug#22043)
+       * lisp/gnus/gnus-util.el (gnus-union):
+       Make it behave like cl-union partially.
 
-2015-12-02  Eli Zaretskii  <address@hidden>
+2015-12-23  Paul Eggert  <address@hidden>
 
-       More emacs-module.c fixes for wide ints
+       Fix dired.c typo with ptrdiff_t vs Lisp_Object
 
-       * 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.
+       * 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.
 
-       * 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-23  Eli Zaretskii  <address@hidden>
 
-2015-12-02  Stephen Leake  <address@hidden>
+       Document default process sentinel more prominently
 
-       Fix bug#22069 in cl-generic.el
+       * 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)
 
-       * lisp/emacs-lisp/cl-generic.el (cl-no-method): Remove %S; this string 
is
-       not run thru `format'.
+2015-12-23  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Dmitry Gutov  <address@hidden>
-2015-12-01  Dmitry Gutov  <address@hidden>
+       Fix file-name completion on OS X
 
-       APPEND etags--xref-backend to xref-backend-functions
+       * 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) <Qdecomposed_characters>: New DEFSYM.
 
-       * 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).
+       * lisp/international/ucs-normalize.el (utf-8-hfs): Give it a
+       non-nil 'decomposed-characters' property.
 
-2015-12-01  Eli Zaretskii  <address@hidden>
+2015-12-23  Anders Lindgren  <address@hidden>
 
-       More accurate documentation of lax whitespace matching
+       File-name completion of non-ASCII characters on OS X (bug#22169)
 
-       * 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.
+       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'.
 
-       * doc/emacs/search.texi (Word Search, Symbol Search): Clarify that
-       lax whitespace matching has no effect on these commands.
+       * lisp/loadup.el: Load international/ucs-normalize (when building
+       for ns).
 
-2015-12-01  Eli Zaretskii  <address@hidden>
+       * 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.
 
-       Fix emacs-module.c for wide ints
+       * src/nsfns.m (ns-convert-utf8-nfd-to-nfc): Removed.
 
-       * 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.
+2015-12-22  Tom Tromey  <address@hidden>
 
-       * modules/mod-test/test.el (mod-test-sum-test): Add tests for
-       large integers, to test --with-wide-int.
+       Fix bug #18588 by making bug-reference-bug-regexp more lenient
 
-2015-12-01  Eli Zaretskii  <address@hidden>
+       * lisp/progmodes/bug-reference.el (bug-reference-bug-regexp): Accept
+       "bug NNNN".  (Bug #18588)
 
-       Document 'directory-files-recursively'
+2015-12-22  Tom Tromey  <address@hidden>
 
-       * lisp/files.el (directory-files-recursively): Doc fix.  Rename
-       the argument MATCH to REGEXP, to be more explicit about its form.
+       add some cl-* aliases to lisp-mode imenu
 
-       * doc/lispref/files.texi (Contents of Directories): Improve the
-       documentation of 'directory-files-recursively'.  Add
-       cross-references.
+       * (lisp-imenu-generic-expression): Add cl-define-compiler-macro,
+       cl-defgeneric, and cl-defmethod.
 
-       * etc/NEWS: Move the entry for 'directory-files-recursively' to
-       its place and mark it documented.
+2015-12-22  Tom Tromey  <address@hidden>
 
-2015-12-01  Eli Zaretskii  <address@hidden>
+       Make a variable buffer-local
 
-       Document 'inhibit-read-only' property
+       * lisp/generic-x.el (generic-rul-mode-setup-function): Make
+       font-lock-syntax-table buffer-local.  (Bug #21627)
 
-       * 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-12-22  Eli Zaretskii  <address@hidden>
 
-       * etc/NEWS: Move the entry about 'inhibit-read-only' property to
-       its place and mark it documented.
+       Fix decoding of text in URLs retrieved by EWW
 
-2015-12-01  Artur Malabarba  <address@hidden>
+       * 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)
 
-       * lisp/emacs-lisp/package.el: Update header comments
+2015-12-22  Alan Mackenzie  <address@hidden>
 
-2015-12-01  Artur Malabarba  <address@hidden>
+       Fix a coding error in c-forward-<>-arglist-recur.  Fixes bug#22156
 
-       * lisp/character-fold.el: Add back multi-char matching
+       * lisp/progmodes/cc-engine.el (c-forward-<>-arglist-recur): Remove 
unused
+       variable `tmp'.
+       After a failed search for a matching ">", restore point before 
continuing.
 
-       (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-12-22  Michael Albinus  <address@hidden>
 
-       * test/automated/character-fold-tests.el
-       (character-fold--test-fold-to-regexp): Comment out test of
-       functionality no longer supported.
+       Instrument Tramp tests
 
-2015-12-01  Xue Fuqiao  <address@hidden>
+       * test/automated/tramp-tests.el (tramp-test29-vc-registered)
+       (tramp--test-utf8): Instrument tests.
 
-       * doc/emacs/ack.texi (Acknowledgments): Update.
+2015-12-22  Martin Rudalics  <address@hidden>
 
-2015-12-01  Michael Albinus  <address@hidden>
+       Fix `display-buffer' call in `display-message-or-buffer' (Bug#22221)
 
-       Check `file-remote-p' over absolute files names in files.el
+       * lisp/simple.el (display-message-or-buffer): Call
+       `display-buffer' with ACTION instead of NOT-THIS-WINDOW
+       (Bug#22221).
 
-       * lisp/files.el (directory-files-recursively)
-       (get-free-disk-space): Check `file-remote-p' over absolute files names.
+2015-12-21  Juri Linkov  <address@hidden>
 
-2015-12-01  Andreas Schwab  <address@hidden>
+       * lisp/saveplace.el (toggle-save-place, save-place-to-alist)
 
-               * src/lread.c (syms_of_lread): Doc fix.
+       (save-places-to-alist, save-place-dired-hook):
+       Check for dired-subdir-alist.  (Bug#19851)
 
-2016-01-30  Dmitry Gutov  <address@hidden>
-2015-11-30  Dmitry Gutov  <address@hidden>
+2015-12-21  Paul Eggert  <address@hidden>
 
-       Don't mistake certain JS method calls for keywords
+       Add FIXME comment re stack overflow and modules
 
-       * lisp/progmodes/js.el (js--ctrl-statement-indentation):
-       Braceless keyword can't come after a period (bug#22063).
+2015-12-20  Paul Eggert  <address@hidden>
 
-2016-01-30  David Reitter  <address@hidden>
+       Revert some recent emacs-module commentary
 
-       Read frame_title_format from buffer-local variable for NS port
+       Most of the recently-added commentary was incorrect, due to the
+       possibility of stack overflow.
 
-       * src/nsfns.m (x_implicitly_set_name): Read frame-title-format and
-       icon-title-format variables from buffer in appropriate window.
-       (Bug#22048)
+2015-12-20  Paul Eggert  <address@hidden>
 
-2016-01-30  Juri Linkov  <address@hidden>
-2015-11-30  David Reitter  <address@hidden>
+       Spelling fix: prefer "cooperate" to "co-operate"
 
-       Read frame_title_format from buffer-local variable for NS port
+2015-12-20  Paul Eggert  <address@hidden>
 
-       * nsfns.m (x_implicitly_set_name): Read frame-title-format and
-       icon-title-format variables from buffer in appropriate window.
-       (Bug#22048)
+       Port undo fixes to -fno-common
 
-2015-11-30  Juri Linkov  <address@hidden>
+       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.
 
-       * lisp/replace.el (occur-engine): Count matches in empty lines.
+2015-12-20  Philipp Stephani  <address@hidden>
 
-       (Bug#22062)
+       Improve commentary for emacs-module.c
 
-2015-11-30  Aurélien Aptel  <address@hidden>
+       * 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.
 
-       * src/emacs-module.h: Fix finalizer typedef for C++11
+2015-12-20  Michael Albinus  <address@hidden>
 
-       C++11 standard doesn't allow exception-specification in typedef.
-       The workaround is to declare a dummy function prototype and use
-       decltype on it.
+       Suppress test on Mac OS X
 
-2015-11-30  Eli Zaretskii  <address@hidden>
+       * test/automated/tramp-tests.el (tramp--test-darwin-p): New defun.
+       (tramp--test-utf8): Use it.
 
-       Fix last change
+2015-12-20  Alan Mackenzie  <address@hidden>
 
-       * src/emacs-module.c (lisp_to_value, value_to_lisp)
-       [WIDE_EMACS_INT]: Avoid compiler warnings.
+       Merge branch 'scratch/follow' into emacs-25
 
-2015-11-30  Stefan Monnier  <address@hidden>
+       This allows Isearch, etc., to work well when Follow Mode is active.
 
-       Rely on conservative stack scanning to find "emacs_value"s
+2015-12-19  Michael Albinus  <address@hidden>
 
-       * 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.
+       * lisp/net/tramp-sh.el (tramp-get-ls-command-with-w-option):
+       Improve check.
 
-       * 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.
+2015-12-19  Eli Zaretskii  <address@hidden>
 
-       * modules/mod-test/mod-test.c (Fmod_test_signal, Fmod_test_throw):
-       Don't assume that NULL is a valid emacs_value.
+       Fix last commit
 
-2015-11-30  Eli Zaretskii  <address@hidden>
+       * doc/emacs/rmail.texi (Rmail Deletion): Document new behavior of 'u'
+       with numeric argument.
 
-       Yet another doc improvement for search commands
+2015-12-19  Eli Zaretskii  <address@hidden>
 
-       * 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.
+       Document new features of Rmail
 
-       * 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.
+       * 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-11-30  Martin Rudalics  <address@hidden>
+2015-12-19  Eli Zaretskii  <address@hidden>
 
-       Run `window-size-change-functions' also when reading from minibuffer
+       Improve documentation of new cl-lib functions
 
-       * src/xdisp.c (redisplay_internal): Run `window-size-change-functions'
-       also when reading from minibuffer.
+       * doc/misc/cl.texi (Predicates on Numbers, Numerical Functions):
+       Fix wording.
 
-2015-11-30  Ulf Jasper  <address@hidden>
+2015-12-19  Eli Zaretskii  <address@hidden>
 
-       Fix scrambling of html-rendered item buffers
+       Document the new feature of 'minibuffer-with-setup-hook'
 
-       * lisp/net/newst-treeview.el (newsticker--treeview-render-text): Fix
-         scrambling of contents by wrapping call to html-renderer in
-         save-selected-window.
+       * lisp/files.el (minibuffer-with-setup-hook): Clarify how FUN is
+       added to `minibuffer-setup-hook'.
 
-2015-11-30  Paul Eggert  <address@hidden>
+2015-12-19  Eli Zaretskii  <address@hidden>
 
-       Fix font typo in previous doc fix.
+       Document new features of Font Lock
 
-2015-11-30  Paul Eggert  <address@hidden>
+       * 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".
 
-       A bit more security doc, esp. file local vars
+       * lisp/font-lock.el (font-lock-flush, font-lock-ensure): Doc fix.
 
-       * 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-12-19  Eli Zaretskii  <address@hidden>
 
-2015-11-30  Artur Malabarba  <address@hidden>
+       Document new features of Rectangle mode
 
-       * lisp/character-fold.el: Comment out branching code
+       * doc/emacs/killing.texi (Rectangles): Document "C-x C-x" in
+       rectangle-mark-mode.
 
-       (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-12-19  Eli Zaretskii  <address@hidden>
 
-2015-11-30  Paul Eggert  <address@hidden>
+       Manual followup to last change
 
-       Spelling and grammar fixes
+       * doc/lispref/display.texi (Displaying Messages): Sync with the
+       doc string.  (Bug#22210)
 
-2016-01-30  Dmitry Gutov  <address@hidden>
-2015-11-29  Dmitry Gutov  <address@hidden>
+2015-12-19  Eli Zaretskii  <address@hidden>
 
-       Make lisp-completion-at-point a wrapper instead of an alias
+       Clarify doc string of 'display-message-or-buffer'
 
-       * lisp/progmodes/elisp-mode.el (lisp-completion-at-point):
-       Turn into an obsolete wrapper around elisp-completion-at-point
-       (bug#20455).
+       * lisp/simple.el (display-message-or-buffer): Doc fix.  Suggested
+       by Sebastian Wiesner <address@hidden>.  (Bug#22210)
 
-2015-11-29  Artur Malabarba  <address@hidden>
+2015-12-19  Eli Zaretskii  <address@hidden>
 
-       * lisp/isearch.el (isearch-search-fun-default): Nicer error
+       * doc/emacs/emacs.texi (Top): Update top-level menus.
 
-       message when the search fails.
+       * doc/lispref/elisp.texi (Top): Update top-level menus.
 
-2015-11-29  Dmitry Gutov  <address@hidden>
+2015-12-19  Eli Zaretskii  <address@hidden>
 
-       Update menu-bar-goto-uses-etags-p for the current xref API
+       Document how to avoid file-local variables that aren't
 
-       * lisp/menu-bar.el (menu-bar-goto-uses-etags-p): Consult
-       xref-backend-functions, instead of now-nonexistent
-       xref-find-function.
+       * doc/emacs/custom.texi (Specifying File Variables): Describe how
+       to prevent Emacs from interpreting unrelated text as file-local
+       variables.  (Bug#22166)
 
-2015-11-29  Artur Malabarba  <address@hidden>
+2015-12-19  Dave Thomas  <address@hidden>  (tiny change)
 
-       * lisp/isearch.el (isearch-define-mode-toggle): Advertise binding
+       Fix a typo in eterm-color's termcap entry
 
-2015-11-29  Artur Malabarba  <address@hidden>
+       * lisp/term.el (term-termcap-format): Fix a typo in the "ue="
+       entry.  (Bug#22184)
 
-       * lisp/menu-bar.el: Use folding in searches
+2015-12-19  Eli Zaretskii  <address@hidden>
 
-       (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.
+       Allow 'browse-url-emacs' visit non-existent URLs
 
-2015-11-29  Artur Malabarba  <address@hidden>
+       * 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)
 
-       * lisp/menu-bar.el (menu-bar-goto-uses-etags-p): Fix a warning
+2015-12-18  Paul Eggert  <address@hidden>
 
-2015-11-29  Artur Malabarba  <address@hidden>
+       Remove SunOS 4.x cruft
 
-       * lisp/character-fold.el (character-fold-to-regexp): Be careful
+       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.
 
-       not to return huge regexps.
+2015-12-18  Paul Eggert  <address@hidden>
 
-2015-11-29  Eli Zaretskii  <address@hidden>
+       Merge from gnulib
 
-       Improve documentation of string-collate-* functions
+       This mostly commentary fixes.
+       * doc/misc/texinfo.tex, lib/intprops.h: Copy from gnulib.
+       * lib/gnulib.mk: Regenerate with new gnulib-tool.
 
-       * doc/lispref/strings.texi (Text Comparison): Improve wording and
-       indexing of 'string-collate-equalp' and 'string-collate-lessp'.
+2015-12-18  Michael Albinus  <address@hidden>
 
-       * etc/NEWS: Move the entry of 'string-collate-equalp' and
-       'string-collate-lessp' to "Lisp Changes" section and mark it as
-       documented.
+       Minor fixes in Tramp
 
-2015-11-29  Eli Zaretskii  <address@hidden>
+       * lisp/net/tramp-sh.el (tramp-do-file-attributes-with-ls):
+       Reorder ls arguments.
 
-       Document truncate-string-ellipsis
+       * lisp/net/tramp.el (tramp-dissect-file-name): Fix docstring.
 
-       * doc/lispref/display.texi (Size of Displayed Text): Document
-       'truncate-string-ellipsis'.
+2015-12-18  Michael Albinus  <address@hidden>
 
-       * 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'.
+       Make tramp a built-in package
 
-       * etc/NEWS: Move the 'truncate-string-ellipsis' entry to the "Lisp
-       Changes" section.
+       * lisp/finder.el (finder-compile-keywords): Update
+       `package--builtins' also when Version: keyword is available.
 
-2015-11-29  Eli Zaretskii  <address@hidden>
+       * 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'.
 
-       Fix confusion wrt character folding in the Emacs manual
+2015-12-18  Lele Gaifax  <address@hidden>
 
-       * 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
-       <address@hidden>.
+       * etc/tutorials/TUTORIAL.it: Update and fix typos.  (Bug#22187)
 
-2015-11-29  Ken Brown  <address@hidden>
+2015-12-18  Alan Mackenzie  <address@hidden>
 
-       Update mod-test-sum-test
+       Rename `recenter-group' to `recenter-window-group'
 
-       * modules/mod-test/test.el (mod-test-sum-test): Update to
-       accommodate the lack of dladdr on Cygwin.
+       * 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-11-29  Alan Mackenzie  <address@hidden>
+2015-12-18  Eli Zaretskii  <address@hidden>
 
-       Byte compiler: Catch missing argument to `funcall'.  Fixes bug#22051.
+       Fix vertical-motion in tabulated-list mode
 
-       * 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.
+       * 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-11-29  Martin Rudalics  <address@hidden>
+2015-12-18  Martin Rudalics  <address@hidden>
 
-       * lisp/window.el (split-window): Don't sanitize sizes when SIZE is 
non-nil.
+       Don't have help functions call x-display-pixel-width/-height on ttys
 
-2015-11-28  Artur Malabarba  <address@hidden>
+       * lisp/help.el (temp-buffer-max-height, temp-buffer-max-width):
+       Don't call x-display-pixel-width/-height on ttys.
 
-       * lisp/character-fold.el (character-fold-to-regexp)
+2015-12-17  Dmitry Gutov  <address@hidden>
 
-       Warn about using long strings.
+       Use 'hg id' in vc-hg-previous-revision
 
-       * test/automated/character-fold-tests.el
-       (character-fold--test-lax-whitespace)
-       (character-fold--test-consistency): Reduce string size for tests.
+       * lisp/vc/vc-hg.el (vc-hg-previous-revision):
+       Use 'hg id' to retrieve it (bug#22032).
 
-2015-11-28  Eli Zaretskii  <address@hidden>
+2015-12-17  Alan Mackenzie  <address@hidden>
 
-       Document renaming of x-select-enable-* variables
+       * lisp/follow.el (follow-sit-for): Remove (it's redundant).
 
-       * 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.
+2015-12-17  Eli Zaretskii  <address@hidden>
 
-       * etc/NEWS: Mark entry as documented.
+       Fix a typo in the Emacs manual
 
-2015-11-28  Eli Zaretskii  <address@hidden>
+       * doc/emacs/trouble.texi (Sending Patches): Fix a typo.  Reported
+       by Lele Gaifax <address@hidden>.  (Bug#22193)
 
-       Document the shorthand hints displayed by M-x
+2015-12-17  Eli Zaretskii  <address@hidden>
 
-       * 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.
+       Fix parsing netrc entries with ports
 
-       * etc/NEWS: Move the M-x entry to "Editing Changes" and mark it as
-       documented.
+       * lisp/gnus/auth-source.el (auth-source-ensure-strings): Don't
+       make a list out of 't'.  (Bug#22188)
 
-2015-11-28  Eli Zaretskii  <address@hidden>
+       * test/automated/auth-source-tests.el
+       (auth-source-test-netrc-parse-entry): New test.
 
-       Update docs of character folding
+2015-12-17  Paul Eggert  <address@hidden>
 
-       * doc/emacs/search.texi (Lax Search): Update the description of
-       character folding for the latest changes.
+       Fix typo in Doug Lea malloc configure log
 
-2015-11-28  Artur Malabarba  <address@hidden>
+       * configure.ac (emacs_cv_var_doug_lea_malloc):
+       Fix typo that confused the log output of 'configure'.
 
-       * lisp/character-fold.el: Also play nice with case-folding
+2015-12-16  Nicolas Petton  <address@hidden>
 
-       (character-fold-to-regexp): Take `case-fold-search' into account.
+       * etc/NEWS: Mention the new pcase patterns `seq' and `map'.
 
-2015-11-28  Artur Malabarba  <address@hidden>
+2015-12-16  Alan Mackenzie  <address@hidden>
 
-       * lisp/character-fold.el: Add support for multi-char matches
+       * etc/NEWS: Move entry on pcase to correct section
 
-       (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.
+       (Accidentally omitted from previous commit)
 
-2015-11-28  Artur Malabarba  <address@hidden>
+2015-12-16  Alan Mackenzie  <address@hidden>
 
-       * lisp/character-fold.el: Code simplifications
+       Add documentation for changes to Show Paren mode.
 
-       (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.
+       * lisp/paren.el (show-paren-highlight-openparen): Enhance doc string.
 
-       * test/automated/character-fold-tests.el
-       (character-fold--test-fold-to-regexp): New test.
+       * 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  <address@hidden>
+
+       Document Eldoc changes
 
-2015-11-28  Eli Zaretskii  <address@hidden>
+       * doc/emacs/programs.texi (Lisp Doc): Document Global Eldoc mode.
 
-       Document changes in "C-h l"
+2015-12-16  Eli Zaretskii  <address@hidden>
 
-       * doc/emacs/help.texi (Misc Help): Document the changes in "C-h l".
+       Fix invocation of Python and Guile interpreters from gdb-mi
 
-       * etc/NEWS: mark "C-h l" changes as documented.
+       * 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-11-28  Eli Zaretskii  <address@hidden>
+2015-12-16  Paul Eggert  <address@hidden>
 
-       Finalize documentation of 'custom-prompt-customize-unsaved-options'
+       Remove attempt to use C11 threads
 
-       * doc/emacs/custom.texi (Saving Customizations): Index the new
-       function 'custom-prompt-customize-unsaved-options'.
+       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.
 
-       * etc/NEWS: Mention when 'custom-prompt-customize-unsaved-options'
-       is useful.
+2015-12-15  Michael Albinus  <address@hidden>
 
-2015-11-28  Eli Zaretskii  <address@hidden>
+       Set utf8 encoding with stty in Tramp
 
-       Document 'comment-line'
+       * 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.
 
-       * doc/emacs/programs.texi (Comment Commands): Document
-       'comment-line'.
+2015-12-15  Alan Mackenzie  <address@hidden>
 
-       * etc/NEWS: Move the entry for 'comment-line' into "Editing Changes".
+       Tidy up documentation associated with window groups.
 
-2015-11-28  Eli Zaretskii  <address@hidden>
+       * 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.
 
-       Document new checkdoc features
+       * doc/lispref/positions.texi (Screen Lines).  Same as above.
 
-       * doc/lispref/tips.texi (Tips, Library Headers): Document the
-       keyword-checking features of checkdoc and the commands
-       'checkdoc-file' and 'checkdoc-current-buffer'.
+2015-12-15  Michael Albinus  <address@hidden>
 
-       * etc/NEWS: Move the checkdoc-related entries to their own
-       section.
+       Complete last commit
 
-2015-11-28  Philipp Stephani  <address@hidden>
+       * lisp/net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
+       Move uname check up.  Handle Mac OS X eol encoding.
 
-       Simplify the prologue of emacs-module.c functions
+2015-12-15  Michael Albinus  <address@hidden>
 
-       * 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.
+       Handle Mac OS X eol encoding in Tramp
 
-2015-11-28  Eli Zaretskii  <address@hidden>
+       * lisp/net/tramp-sh.el (tramp-open-connection-setup-interactive-shell):
+       Handle Mac OS X eol encoding.
 
-       Don't reject module calls with no arguments
+2015-12-15  YAMAMOTO Mitsuharu  <address@hidden>
 
-       * src/emacs-module.c (Finternal_module_call): Allow ARGLIST be nil.
+       Fix variable name typo in compute_tip_xy
 
-2015-11-28  Philipp Stephani  <address@hidden>
+       * src/w32fns.c (compute_tip_xy):
+       * src/xfns.c (compute_tip_xy): Modify *root_x instead of *root_y
+       when `right' is integer.
 
-       Make module-call be visible from Lisp
+2015-12-14  foudfou  <address@hidden>  (tiny change)
 
-       * 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.
+       * lisp/ibuffer.el: Add ability to (un-)mark or delete buffers in the 
region.
 
-2015-11-28  Eli Zaretskii  <address@hidden>
+2015-12-14  Tassilo Horn  <address@hidden>
 
-       Add etags tests for the recent Lua-related bugfix
+       Revert "Fix rx matcher overflow without limiting"
 
-       * 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.
+       This reverts commit fe27e037663d36be3e5741c2ce86ab4ee8017db1.
 
-2015-11-28  Eli Zaretskii  <address@hidden>
+2015-12-14  Alan Mackenzie  <address@hidden>
 
-       Fix Lua tags when a function name includes '.' or ':'
+       Ispell: Bind isearch-regexp-function to nil around call to 
isearch..-new-loop
 
-       * 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)
+       * lisp/textmodes/ispell.el (ispell-highlight-spelling-error-overlay): 
bind
+       isearch-regexp-function to nil around call to 
isearch-lazy-highligh-new-loop.
 
-2015-11-28  Eli Zaretskii  <address@hidden>
+2015-12-14  Tassilo Horn  <address@hidden>
 
-       Improve documentation of search and replace commands
+       Fix rx matcher overflow without limiting
 
-       * 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/textmodes/reftex-vars.el (reftex-label-regexps): Improve last
+       change to the regexp without imposing a limit on the length of the
+       options.
 
-       * 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-12-14  Alan Mackenzie  <address@hidden>
 
-2015-11-28  Paul Eggert  <address@hidden>
+       Enhance ispell-skip-region-alist by generating part of it at runtime.
 
-       Fix minor problems found by static checking
+       * 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.
 
-       * src/undo.c (prepare_record): Add proper prototype for C.
+2015-12-14  Glenn Morris  <address@hidden>
 
-2015-11-27  Stefan Monnier  <address@hidden>
+       * build-aux/gitlog-to-emacslog: Ignore more pointless merge commits.
 
-       * src/emacs-module.c (struct env_storage): Delete
+2015-12-14  Alan Mackenzie  <address@hidden>
 
-       (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.
+       Replace GROUP argument in six window primitives by new functions.
 
-2015-11-27  Eli Zaretskii  <address@hidden>
+       * 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.
 
-       Improve documentation of 'replace-character-fold'
+       * 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/replace.el (replace-character-fold): Clarify which commands
-       are affected by this variable.
+       * lisp/follow.el (follow-mode): Use updated variable names for the 
indirected
+       functions.
 
-2016-01-30  Mark Oteiza  <address@hidden>
+       * 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).
 
-       Backport: Add interactive seek command.
+       * lisp/ispell.el (ispell-command-loop): Replace call to
+       pos-visible-in-window-p with pos-visible-in-window-group-p.
 
-       * 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"
+       * 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-11-27  Dmitry Gutov  <address@hidden>
+2015-12-14  Vitorio Miguel  <address@hidden>  (tiny change)
 
-       Autoload etags when using its xref backend
+       * etc/tutorials/TUTORIAL.pt_BR: Fix a typo.  (Bug#22165)
 
-       * lisp/progmodes/xref.el (xref--etags-backend):
-       Rename to etags--xref-backend.  Move to etags.el.  Autoload.
-       (Bug#22026)
+2015-12-13  Eli Zaretskii  <address@hidden>
 
-2015-11-27  Artur Malabarba  <address@hidden>
+       Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into 
emacs-25
 
-       * lisp/character-fold.el: Allow complex chars to match their 
decomposition
+2015-12-13  Tassilo Horn  <address@hidden>
 
-       (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.
+       Improve regex to not trigger stack overflow
 
-2015-11-27  Artur Malabarba  <address@hidden>
+       * 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/character-fold.el: More descriptive variable names
+2015-12-13  Eli Zaretskii  <address@hidden>
 
-       (character-fold-table): Rename a lot of the lexical variables to
-       make the code easier to read.
+       Fix visiting files with raw-text
 
-2015-11-27  Artur Malabarba  <address@hidden>
+       * src/fileio.c (Finsert_file_contents): Fix setting buffer unibyte
+       when some stuff was actually read.  (Bug#22162)
 
-       * lisp/isearch.el: Ensure we still support `isearch-new-word'
+2015-12-13  Tassilo Horn  <address@hidden>
 
-       (isearch-new-regexp-function): Define variable.
-       (isearch-new-word): Define as an obsolete alias. (Bug#22018)
+       Fix regex matching keyval labels
 
-2015-11-27  Eli Zaretskii  <address@hidden>
+       * lisp/textmodes/reftex-vars.el (reftex-label-regexps): Fix regexp
+       matching keyval labels.
 
-       Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into 
emacs-25
+2015-12-13  Michael Albinus  <address@hidden>
 
-2015-11-27  Lee Bochicchio  <address@hidden>
+       * lisp/ido.el (ido-file-name-all-completions-1): Do not raise an error
 
-       * test/lisp/abbrev-tests.el: Define more tests
+       ... in case of Tramp.  (Bug#20821)
 
-       (abbrev-table-name-test, kill-all-abbrevs-test)
-       (clear-abbrev-table-test): New tests.
+2015-12-12  Paul Eggert  <address@hidden>
 
-2015-11-27  Eli Zaretskii  <address@hidden>
+       Fix performance regression with gcc -O0
 
-       Add module tests for wrong-type-argument
+       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.
 
-       * modules/mod-test/test.el (mod-test-sum-test): Add tests for
-       wrong-type-argument.
+2015-12-12  Artur Malabarba  <address@hidden>
 
-2015-11-27  Eli Zaretskii  <address@hidden>
+       * lisp/emacs-lisp/package.el (package-unpack): Security check
 
-       Improve handling of signals and 'throw' in modules
+       Check that we received the package we were offered.
 
-       * 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-12-12  Artur Malabarba  <address@hidden>
 
-2015-11-27  Eli Zaretskii  <address@hidden>
+       * lisp/emacs-lisp/package.el (package--compile): Don't activate
 
-       Add ':version' tag to 'checkdoc-package-keywords-flag'
+       `package-unpack' takes care of all activations now (other than
+       `package-initialize).  `package--compile' now only compiles.
 
-       * lisp/emacs-lisp/checkdoc.el (checkdoc-package-keywords-flag):
-       Add a ':version' tag.
+2015-12-12  Eli Zaretskii  <address@hidden>
 
-2015-11-27  Eli Zaretskii  <address@hidden>
+       Document the new bindings of <UP> and <DOWN> in the minibuffer
 
-       Improve documentation of 'eval-buffer' and 'eval-region'
+       * doc/emacs/mini.texi (Minibuffer History): Describe the new
+       bindings of <UP> and <DOWN> in the minibuffer.
 
-       * src/lread.c (Feval_buffer, Feval_region): Doc fixes.  (Bug#22023)
+2015-12-12  Eli Zaretskii  <address@hidden>
 
-       * doc/lispref/eval.texi (Eval): Mention narrowing to clarify
-       "accessible portion of buffer".
+       Document new features of Ido
 
-2015-11-27  Eli Zaretskii  <address@hidden>
+       * doc/misc/ido.texi (Misc): Document 'C-S-b'.
 
-       Unbreak the Cygwin w32 build
+2015-12-12  Martin Rudalics  <address@hidden>
 
-       * src/emacs.c (main): Call w32_init_main_thread in the Cygwin w32
-       build as well.  Reported by Andy Moreton <address@hidden>.
+       Fix frame height calculations with added menu bar on Windows (Bug#22105)
 
-2015-11-27  Eli Zaretskii  <address@hidden>
+       * 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.
 
-       Improve commentary in character-fold.el
+2015-12-12  Eli Zaretskii  <address@hidden>
 
-       * lisp/character-fold.el (character-fold-to-regexp): Move detailed
-       description from commit log message to comments.  (Bug#22019)
+       Document the change in interactive shell mode
 
-2015-11-26  Alan Mackenzie  <address@hidden>
+       * doc/emacs/misc.texi (Interactive Shell): Document that the
+       '*shell*' buffer by default displays in a new window.
 
-       Byte Compiler: generate code to adjust stack count after call to 
`signal'.
+2015-12-12  Eli Zaretskii  <address@hidden>
 
-       Corrects change from earlier today.
+       Document new features of package.el
 
-       * lisp/emacs-lisp/bytecomp.el (byte-compile-setq): supply the current 
value of
-       `byte-compile--for-effect' as argument to `byte-compile-form'.
+       * doc/emacs/package.texi (Package Menu): Document the 'external'
+       status and the new menu commands.
+       (Package Installation): Document archive priorities.
 
-2015-11-26  Eli Zaretskii  <address@hidden>
+       * lisp/emacs-lisp/package.el (package-archive-priorities): Doc fix.
+       (package-menu-hide-low-priority): Doc fix.
 
-       Improve commentary of prepare_to_modify_buffer_1
+2015-12-12  Eli Zaretskii  <address@hidden>
 
-       * src/insdel.c (prepare_to_modify_buffer_1): Mention in commentary
-       that this function runs Lisp.  Suggested by Richard Stallman
-       <address@hidden>.
+       Update and document new features of xterm support
 
-2015-11-26  Phillip Lord  <address@hidden>
+       * doc/emacs/frames.texi (Text-Only Mouse): Document that
+       track-mouse is supported by newer xterm versions.
 
-       Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
+2015-12-12  Eli Zaretskii  <address@hidden>
 
-2015-11-26  Phillip Lord  <address@hidden>
+       Document new features of Prettify Mode
 
-       Fix regression after merge.
+       * doc/emacs/programs.texi (Misc for Programs): Document
+       'prettify-symbols-compose-predicate' and
+       'prettify-symbols-unprettify-at-point'.
 
-        * src/undo.c (prepare_record): Remove call to run_undoable_change.
+       * lisp/progmodes/prog-mode.el (prettify-symbols-alist)
+       (prettify-symbols-default-compose-p)
+       (prettify-symbols-compose-predicate)
+       (prettify-symbols--compose-symbol): Doc fixes.
 
-2015-11-26  Phillip Lord  <address@hidden>
+2015-12-12  Eli Zaretskii  <address@hidden>
 
-       After delete, record point location in undo.
+       Document multi-mode indentation facilities
 
-       Addresses Bug #21968.
+       * doc/lispref/text.texi (Mode-Specific Indent): Document
+       'prog-indentation-context', 'prog-first-column', and 'prog-widen'.
 
-               * 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.
+       * lisp/progmodes/prog-mode.el (prog-indentation-context)
+       (prog-widen): Doc fixes.
 
-       Conflicts:
-               src/undo.c
+2015-12-12  Eli Zaretskii  <address@hidden>
 
-2015-11-26  Eli Zaretskii  <address@hidden>
+       Document 'vc-refresh-state'
 
-       Fix compiler warnings in w32.c
+       * doc/emacs/maintaining.texi (Version Control): Document
+       'vc-refresh-state'.
 
-       * 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 <address@hidden>.  (Bug#21953)
+       * lisp/vc/vc-hooks.el (vc-refresh-state): Doc fix.
 
-2015-11-26  Dmitry Gutov  <address@hidden>
+2015-12-12  Eli Zaretskii  <address@hidden>
 
-       Check if the file exists on disk before producing the revert diff
+       Fix echo for "C-u"
 
-       * lisp/vc/vc-dispatcher.el (vc-buffer-sync): Check if the file
-       exists on disk (bug#20558).
+       * src/keyboard.c (command_loop_1): Undo last change.  It caused
+       duplicate echo of C-u.  (Bug#22107)
 
-2015-11-26  Alan Mackenzie  <address@hidden>
+2015-12-11  Eli Zaretskii  <address@hidden>
 
-       Byte compiler: on setq with an odd number of arguments, generate a 
`signal'
+       Avoid errors when creating files under SVN in new directory
 
-       * 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/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/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-12-11  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Dmitry Gutov  <address@hidden>
-2015-11-25  Dmitry Gutov  <address@hidden>
+       Improve Lua support in etags
 
-       Use find-tag-default for xref-backend-identifier-at-point
+       * lib-src/etags.c (Lua_functions): Skip spaces before looking for
+       "function".
 
-       * 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.
+       * etc/NEWS: Mention improved Lua support by 'etags'.
 
-2016-01-30  Paul Eggert  <address@hidden>
-2015-11-25  Paul Eggert  <address@hidden>
+       * 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.
 
-       * src/undo.c (record_property_change): Remove now-unused local.
+2015-12-11  Eli Zaretskii  <address@hidden>
 
-2015-11-25  Phillip Lord  <address@hidden>
+       Fix 'this-command-keys' wrt prefix argument
 
-       run_undoable_changes now called from insdel.
+       * 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)
 
-       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.
+       * lisp/simple.el (internal-echo-keystrokes-prefix): Add
+       commentary about the function's return value.
 
-        * 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-12-11  Eli Zaretskii  <address@hidden>
 
-2015-11-25  Eli Zaretskii  <address@hidden>
+       * lisp/files.el (load-library): Doc fix.  (Bug#22140)
 
-       Improve and update documentation of search commands
+2015-12-11  Eli Zaretskii  <address@hidden>
 
-       * 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".
+       Improve and document Ruby support in 'etags'
 
-       * etc/NEWS: Move search- and replace-related entries to a single
-       parent section.
+       * lib-src/etags.c (Ruby_suffixes): Add ".ruby".
+       (Ruby_functions): Support "module" and overloaded operators.
+       (Ruby_help): Mention "module".
 
-       * lisp/replace.el (query-replace-show-replacement): Doc fix.
-       * lisp/isearch.el (search-nonincremental-instead)
-       (isearch-hide-immediately): Doc fixes.
+       * 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.
 
-2015-11-25  Katsumi Yamaoka  <address@hidden>
+       * doc/man/etags.1: Mention Ruby support.
+       * etc/NEWS: Mention Ruby support.
 
-       Remove nnml-retrieve-groups that is unnecessary and somewhat problematic
+2015-12-11  Xi Lu  <address@hidden>
 
-       * lisp/gnus/nnml.el (nnml-retrieve-groups): Remove.  See:
-       <http://thread.gmane.org/gmane.emacs.gnus.general/86308> and
-       <http://thread.gmane.org/gmane.emacs.gnus.general/86321>
+       Initial support for Ruby in 'etags'
 
-2015-11-25  Paul Eggert  <address@hidden>
+       * lib-src/etags.c <Ruby_suffixes>: New variable.
+       (lang_names): Add an entry for Ruby.
+       (Ruby_functions): New function.  (Bug#22116)
 
-       Fix module_format_fun_env when dynlib_addr fails
+2015-12-11  Eli Zaretskii  <address@hidden>
 
-       * 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
+       Clarify documentation of 'modify-frame-parameters'
 
-2015-11-25  Paul Eggert  <address@hidden>
+       * doc/lispref/frames.texi (Parameter Access): Clarify what "ignored
+       PARMs" mean for 'modify-frame-parameters'.
 
-       Disambiguate variable help a bit better
+       * src/frame.c (Fmodify_frame_parameters): Clarify what "ignored
+       PARMs" mean for this function.  (Bug#22104)
 
-       * 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-12-11  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Dmitry Gutov  <address@hidden>
+       Fix setting buffer unibyte when reading from a device
 
-       Pass SVN commit message through log-edit-extract-headers
+       * src/fileio.c (Finsert_file_contents): Call Fset_buffer_multibyte
+       to make a (possibly non-empty) buffer unibyte.  (Bug#22096)
 
-       * lisp/vc/vc-svn.el (vc-svn-checkin): Pass COMMENT through
-       log-edit-extract-headers (bug#18954).
+2015-12-11  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Alan Mackenzie  <address@hidden>
+       Clarify documentation of 'values'
 
-       CC Mode: Eliminate compiler warning messages.
+       * doc/lispref/eval.texi (Eval): Clarify that 'values' are not
+       updated by any evaluation commands in 'lisp-interaction-mode'.
+       (Bug#22056)
 
-       * 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'.
+2015-12-11  Anders Lindgren  <address@hidden>
 
-       * lisp/progmodes/cc-bytecomp.el (cc-bytecomp-load): Create a dummy 
declaration
-       of this before the real (interpreted) one, to satisfy the byte compiler.
+       Fixed subversion vc error when opening file in new directory 
(bug#21984).
 
-2016-01-30  Simen Heggestøyl  <address@hidden>
+       * lisp/vc/vc-svn.el (vc-svn-registered): Check if directory exists.
 
-       Extend the test suite for json.el
+2015-12-09  Eli Zaretskii  <address@hidden>
 
-       * lisp/json.el (json-plist-p): Clarify docstring.
+       Yet another fix for when point ends up in invisible text
 
-       * 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'.
+       * 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)
 
-2016-01-30  Anders Lindgren  <address@hidden>
+2015-12-09  Michael Albinus  <address@hidden>
 
-       Fixed bug#18283: Enable applescript in NextStep.
+       Fix error in Tramp perl script for cygwin
 
-       * nextstep/templates/Info.plist.in: Set NSAppleScriptEnabled to YES.
+       * lisp/net/tramp-sh.el (tramp-perl-file-truename): Do not raise an
+       error if file doesn't exist.
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+2015-12-09  YAMAMOTO Mitsuharu  <address@hidden>
 
-       Allow completion on dynamic module files in load-library
+       Remove font workaround for limited outdated versions
 
-       * 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 <address@hidden>.
+       * src/macfont.m (mac_font_descriptor_get_adjusted_weight): Remove
+       workaround for HiraginoSans-W7 on OS X 10.11 and 10.11.1.
 
-2016-01-30  Alan Mackenzie  <address@hidden>
+2015-12-09  Anders Lindgren  <address@hidden>
 
-       CC Mode: eliminate almost all byte compilation warnings
+       Don't add "." to load path (bug#21104)
 
-       * 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.
+       When configured with --enable-locallisppath=no, which is the
+       default for OS X, the load-path incorrectly was populated with ".".
 
-       * lisp/progmodes/cc-defs.el (top level): Reformulate code which loaded
-       cc-fix.el using the new macros in cc-bytecomp.el.
+       * src/lread.c (init_lread): Don't call `decode_env_path' when
+       PATH_SITELOADSEARCH is empty.
 
-       * 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-12-08  Artur Malabarba  <address@hidden>
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       * lisp/emacs-lisp/package.el (package--with-response-buffer):
 
-       Add one more mod-test test
+       Search for the blank-line in the right buffer.
 
-       * 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-12-08  Glenn Morris  <address@hidden>
 
-2016-01-30  Philipp Stephani  <address@hidden>
+       * test/automated/simple-test.el (undo-auto-boundary-timer): Update
+       for recent change.
 
-       * modules/mod-test/mod-test.c (Fmod_test_sum): Verify there are 2 args.
+2015-12-08  Glenn Morris  <address@hidden>
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       Fix some display-warning usage.
 
-       Implement dynlib_addr for MS-Windows
+       * 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.
 
-       * src/dynlib.c [WINDOWSNT]: Include w32common.h.
-       <g_b_init_get_module_handle_ex> [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.
+2015-12-07  Glenn Morris  <address@hidden>
 
-2016-01-30  Alan Mackenzie  <address@hidden>
+       * lisp/calendar/cal-html.el: Require diary-lib.
 
-       Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
+       (cal-html-list-diary-entries): Handle no diary.  (Bug#21994)
 
-2016-01-30  Alan Mackenzie  <address@hidden>
+2015-12-07  Thomas Fitzsimmons  <address@hidden>
 
-       Squashed commit of the following:
+       Add Obsolete-since header to eudcb-ph.el
 
-       commit e1ecf76585bef2eb87995f7a7f92cc12003a6f70
-       Author: Alan Mackenzie <address@hidden>
-       Date:   Tue Nov 24 16:50:09 2015 +0000
+       * eudcb-ph.el: Add Obsolete-since header.
 
-           Byte compile: minor amendments.
+2015-12-07  Paul Eggert  <address@hidden>
 
-           * 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.
+       Spelling fixes
 
-       commit c537bfed1dda1593d218956ff00c6105a3ff0316
-       Author: Alan Mackenzie <address@hidden>
-       Date:   Sat Nov 21 18:43:57 2015 +0000
+       * 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.
 
-           Byte compiler: fix spurious warnings "might not be defined at 
runtime".
+2015-12-07  Eli Zaretskii  <address@hidden>
 
-           Also initialize byte-compile-noruntime-functions between runs.
+       Improve documentation of kill commands
 
-           * 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.
+       * 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'.
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       * 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)
 
-       Fix crash at startup related to GC of font entities
+2015-12-07  Alan Mackenzie  <address@hidden>
 
-       * 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)
+       Further progress making Isearch, Ispell, Replace work with Follow Mode.
 
-2016-01-30  Alan Mackenzie  <address@hidden>
+       * 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.
 
-       Byte compile: Output an error, not a warning, for odd number of args to 
setq
+       * 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/emacs-lisp/bytecomp.el (byte-compile-setq): Amend.
+       * 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.
 
-2016-01-30  Ken Raeburn  <address@hidden>
+       * 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.
 
-       Fix kbd_buffer iteration loop in readable_events
+2015-12-07  Alan Mackenzie  <address@hidden>
 
-       * 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)
+       Amend doc of `mapconcat': it can take sequences, not merely strings.
 
-2016-01-30  Paul Eggert  <address@hidden>
+       * 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".
 
-       Improve text-quoting-style doc again
+2015-12-07  Michael Albinus  <address@hidden>
 
-       * doc/lispref/help.texi (Keys in Documentation):
-       Omit overkill discussion of ‘setq’.  Mention Emacs versions
-       where ‘grave’ style was standard.
+       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.
 
-2016-01-30  Paul Eggert  <address@hidden>
+2015-12-06  Thomas Fitzsimmons  <address@hidden>
 
-       Improve text-quoting-style doc
+       Make eudcb-ph.el obsolete
 
-2016-01-30  Paul Eggert  <address@hidden>
+       * 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)
 
-       Simplify module_make_function
+2015-12-06  Paul Eggert  <address@hidden>
 
-       * src/emacs-module.c (module_make_function):
-       Simplify by calling build_unibyte_string.
+       Remove overenthusiastic eassert
 
-2016-01-30  Paul Eggert  <address@hidden>
+       * 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
 
-       Port better to FreeBSD’s dlfunc vs dlsym
+2015-12-06  Paul Eggert  <address@hidden>
 
-       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.
+       Pacify gcc -Wparentheses
 
-2016-01-30  Paul Eggert  <address@hidden>
+       * src/xdisp.c (row_containing_pos): Reparenthesize.
 
-       Simplify use of emacs_finalizer_function type
+2015-12-06  Paul Eggert  <address@hidden>
 
-       * 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.
+       Port mod-test to 32-bit Emacs --without-wide-int
 
-2016-01-30  Paul Eggert  <address@hidden>
+       * 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.
 
-       module_format_fun_env fixes
+2015-12-06  Michael Albinus  <address@hidden>
 
-       * 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.
+       Fix minor Tramp problems found on BSD
 
-2016-01-30  Dmitry Gutov  <address@hidden>
+       * 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.
 
-       Don't use package-user-dir in elisp-library-roots if it's not bound
+       * 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.
 
-       * lisp/progmodes/elisp-mode.el (elisp-library-roots): Don't
-       use package-user-dir if it's not bound (bug#19759).
+2015-12-06  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Anders Lindgren  <address@hidden>
+       Fix cursor display when invisible text is at line beginning
 
-       New visible-bell for NextStep (OS X El Capitan compatible).
+       * 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.
 
-       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)
+2015-12-06  Paul Eggert  <address@hidden>
 
-       Implemented based on a suggestion drafted by Mustafa Kocaturk.
+       Improve module interface when WIDE_EMACS_INT
 
-       * 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.
+       * 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-01-30  Johan Bockgård  <address@hidden>
+2015-12-06  Paul Eggert  <address@hidden>
 
-       * lisp/emacs-lisp/nadvice.el (add-function): Fix debug spec.
+       Port mod-test to x86-64 GNU/Linux running 32-bit
 
-       (remove-function): Ditto. (Bug#20376)
+       * 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.
 
-2016-01-30  Mark Oteiza  <address@hidden>
+2015-12-06  Michael Albinus  <address@hidden>
 
-       * lisp/leim/quail/tamil-dvorak.el: Add necessary escapes.
+       Fix auto-revert-tests.el when filenotify isn't used
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       * test/automated/auto-revert-tests.el (auto-revert--wait-for-revert):
+       Make it working also when filenotify isn't used.
 
-       Improve how non-ASCII strings are accepted from modules
+2015-12-05  Juri Linkov  <address@hidden>
 
-       * 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.
+       * lisp/textmodes/ispell.el (ispell-highlight-spelling-error-overlay):
 
-2016-01-30  Paul Eggert  <address@hidden>
+       Let-bind isearch-regexp-function to nil.  (Bug#22097)
 
-       Port recent module changes to pickier compilers
+2015-12-05  Artur Malabarba  <address@hidden>
 
-       * src/emacs-module.c (module_make_function)
-       (module_make_string): Add casts to fix pointer signedness issues.
+       * lisp/emacs-lisp/package.el: Don't install bad signatures (bug#22089)
 
-2016-01-30  Philipp Stephani  <address@hidden>
+       (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'.
 
-       Fix how strings are accepted from modules
+2015-12-05  Ulf Jasper  <address@hidden>
 
-       * 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.
+       Fix Bug#22092.
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       * 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.
 
-       Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into 
emacs-25
+2015-12-05  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Shakthi Kannan  <address@hidden>
+       Document 'bookmark-set-no-overwrite'
 
-       Add the tamil-dvorak input method
+       * doc/emacs/regs.texi (Bookmarks): Document the new command
+       'bookmark-set-no-overwrite' and its keybinding.
 
-       * lisp/leim/quail/tamil-dvorak.el: New file.  (Bug#21768)
+2015-12-05  Eli Zaretskii  <address@hidden>
 
-       * etc/NEWS: Mention the new input method.
+       Document new binding of 'mouse-buffer-menu'
 
-2016-01-30  Martin Rudalics  <address@hidden>
+       * doc/emacs/buffers.texi (Buffer Menus): 'mouse-buffer-menu' is
+       now also on C-F10.
 
-       Move setting FRAME_WINDOW_SIZES_CHANGED to resize_frame_windows.
+2015-12-05  Eli Zaretskii  <address@hidden>
 
-       * 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.
+       Initial documentation of dynamic modules
 
-2016-01-30  Alan Mackenzie  <address@hidden>
+       * 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 (Incompatible Lisp Changes): Also `setf' needs an even # of 
args.
+       * etc/NEWS: Fix typos in dynamic modules' entry.
 
-2016-01-30  Alan Mackenzie  <address@hidden>
+2015-12-05  Artur Malabarba  <address@hidden>
 
-       Signal an error when `setf' gets an odd number of arguments.
+       Remove copyright statements from trivial test files
 
-       * lisp/emacs-lisp/gv.el (setf): Amend.
+2015-12-05  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Stefan Monnier  <address@hidden>
+       Add "Preliminaries" section to etc/DEBUG
 
-       * lisp/emacs-lisp/smie.el (smie-backward-sexp): Handle BOB better.
+       * etc/DEBUG: Add the "Preliminaries" section for GDB beginners.
+       Most of the content was suggested by Phillip Lord
+       <address@hidden>.  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.
 
-2016-01-30  Alan Mackenzie  <address@hidden>
+2015-12-05  Alex Dunn  <address@hidden>  (tiny change)
 
-       * etc/NEWS (Incompatible Lisp Changes): Document new restriction on 
`setq'.
+       Improve parsing of version strings
 
-2016-01-30  Alan Mackenzie  <address@hidden>
+       * 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.
 
-       Expunge occurrences of `setq' with an odd number of arguments.
+       * test/automated/subr-tests.el (ert-test-version-parsing): New
+       tests for version string processing.
 
-       * 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.
+2015-12-05  Eli Zaretskii  <address@hidden>
 
-       * 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.
+       Fix documentation of 'undo' changes
 
-2016-01-30  John Wiegley  <address@hidden>
+       * doc/lispref/text.texi (Undo): Minor wording changes.  Use US
+       English conventions for spelling and whitespace between sentences.
 
-       Add a note about a questionable use of bool in xdisp.c
+       * etc/NEWS: Fix wording and spelling of undo-related entries.
+       Mark them as documented.
 
-2016-01-30  Alan Mackenzie  <address@hidden>
+2015-12-04  Glenn Morris  <address@hidden>
 
-       Issue a warning from the byte compiler on a malformed `setq' form.
+       * lisp/net/net-utils.el: Small improvements.
 
-       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.
+       (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.
 
-2016-01-30  Alan Mackenzie  <address@hidden>
+2015-12-04  Arash Esbati  <address@hidden>  (tiny change)
 
-       Don't let cconv_convert insert a nil argument into a `setq' form.
+       Fix wrong-type-argument integer-or-marker-p nil error
 
-       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.
+       * lisp/textmodes/reftex-auc.el (reftex-what-index-tag):
+       Fix (wrong-type-argument integer-or-marker-p nil) error (bug#22077).
 
-2016-01-30  Alan Mackenzie  <address@hidden>
+2015-12-04  Alan Mackenzie  <address@hidden>
+
+       Merge branch 'scratch/follow' of /home/acm/emacs/emacs.git/emacs-25 
into scratch/follow
 
-       Signal an error when `setq' has an odd number of arguments.  Fixes 
bug#20241.
+       Merge necessitated by a rebase operation.
 
-       * src/eval.c (Fsetq): Signal an error on an odd number of arguments.
-       (syms_of_eval): Add a DEFSYM for Qsetq.
+2015-12-04  Alan Mackenzie  <address@hidden>
 
-2016-01-30  Martin Rudalics  <address@hidden>
+       lisp/isearch.el: Eliminate macro isearch-call-message, replacing with 
funcall.
 
-       * doc/lispref/windows.texi (Window Sizes): Fix indices and references.
+2015-12-04  Alan Mackenzie  <address@hidden>
 
-       * src/frame.c (adjust_frame_size): Set FRAME_WINDOW_SIZES_CHANGED 
(Bug#21975).
+       First commit to scratch/follow.  Make Isearch work with Follow Mode, 
etc.
 
-2016-01-30  Thomas Fitzsimmons  <address@hidden>
+       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.
 
-       Add EUDC BBDB 3 entry in NEWS
+       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.
 
-       * NEWS: Mention EUDC BBDB backend support for BBDB 3.
+       lisp/window.el (selected-window-group-function): New permanent local 
buffer
+       local variable.
+       (selected-window-group): New function.
 
-2016-01-30  Thomas Fitzsimmons  <address@hidden>
+       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.
 
-       Improve EUDC to BBDB 3 export
+       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.
 
-       * lisp/net/eudc-vars.el (eudc-ldap-bbdb-conversion-alist): Change phone
-       entry to single item.  Add company conversion.
-       * lisp/net/eudc-export.el (eudc-bbdbify-company): New function.
-       (bbdb-parse-phone): Declare function.
-       (eudc-bbdbify-phone): Add BBDB 3 support.
-       (Bug#21971)
+2015-12-04  Stefan Monnier  <address@hidden>
 
-2016-01-30  Thomas Fitzsimmons  <address@hidden>
+       * lisp/emacs-lisp/ert.el: Prefer pcase over cl-typecase
 
-       Add BBDB 3 support for EUDC export
+       * 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/net/eudc.el: Add bbdb-version defvar.
-       (eudc--using-bbdb-3-or-newer-p): New function.
-       * lisp/net/eudc-export.el (eudc-create-bbdb-record): Add support for
-       bbdb-create-internal argument list changes introduced in BBDB 3.
-       * lisp/net/eudcb-bbdb.el: Remove bbdb-version defvar.
-       (eudc-bbdb-field): Call eudc--using-bbdb-3-or-newer-p.
-       (Bug#21971)
+2015-12-04  Artur Malabarba  <address@hidden>
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       * lisp/character-fold.el: Remove special case-folding support
 
-       Allow loading modules by 'load-file'
+       (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 𝔽.
 
-       * 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) <module-file-suffix>: New Lisp variable.
+       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.
 
-       * lisp/files.el (module-file-suffix): Declare.
-       (load-file): Remove 'module-file-suffix' from
-       'completion-ignored-extensions', to allow completion on modules.
+2015-12-04  Stefan Monnier  <address@hidden>
 
-       * etc/NEWS: Mention 'module-file-suffix'.
+       * lisp/emacs-lisp/cl-macs.el (character): Can't be negative
+       Fixes (bug#21701)
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+2015-12-04  Daiki Ueno  <address@hidden>
 
-       Fix unoptimized builds
+       lisp/gnus/qp.el: Don't replace "from " at bol
 
-       * src/lisp.h (XTYPE): Move before XSYMBOL, to fix unoptimized
-       builds.
+       * lisp/gnus/qp.el (quoted-printable-encode-region): Bind 
`case-fold-search'
+       to nil when looking for "^From ".  Problem reported by Simon Josefsson.
 
-2016-01-30  Dmitry Gutov  <address@hidden>
+2015-12-03  Phillip Lord  <address@hidden>
 
-       Work around the asynchronous-empty-diff problem
+       Externalize some symbols in undo-auto
 
-       * 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).
+        * 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.
 
-2016-01-30  Karl Fogel  <address@hidden>
+2015-12-03  Stefan Monnier  <address@hidden>
 
-       Finish excising electric indent from `open-line'
+       * lisp/emacs-lisp/smie.el (smie-next-sexp): Fix BOB "token"
 
-       * lisp/simple.el (open-line): Remove INTERACTIVE argument.
+2015-12-03  Michael Albinus  <address@hidden>
 
-       * test/automated/simple-test.el (open-line-indent, open-line-hook):
-         Adjust accordingly.
+       Some error message improvements in tramp-sh.el
 
-       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/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.
 
-       This could close bug#21884, at least until further discussion.
+2015-12-03  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Dmitry Gutov  <address@hidden>
+       Document 'nacl' value for 'system-type'
 
-       Adhere closer to the "implicit tag name" definition
+       * doc/lispref/os.texi (System Environment): Document the 'nacl'
+       value of 'system-type'.
 
-       * 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)
+2015-12-03  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Stefan Monnier  <address@hidden>
+       Document 'window-max-chars-per-line'
 
-       Unrevert most of regexp reentrancy abort patch
+       * doc/lispref/windows.texi (Window Sizes): Document
+       'window-max-chars-per-line'.
 
-       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-12-03  Artur Malabarba  <address@hidden>
 
-       * test/automated/message-mode-tests.el: Tweak the test to rely on auto
-       propertization in backward-sexp.
+       Fix some file headers for the purpose of `package--builtins'
 
-2016-01-30  Paul Eggert  <address@hidden>
+       * lisp/emacs-lisp/cl-preloaded.el
+       * lisp/emacs-lisp/eieio-compat.el
+       * lisp/net/sasl-scram-rfc.el: Add a "Package:" header
 
-       Revert regexp reentrancy abort patch
+       * lisp/ielm.el: Fix summary line.
 
-       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.
+2015-12-03  Artur Malabarba  <address@hidden>
 
-2016-01-30  Paul Eggert  <address@hidden>
+       * lisp/emacs-lisp/package.el (package-unpack): Load before compiling
 
-       Add a few safety checks when ENABLE_CHECKING
+       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.
 
-       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.
+2015-12-03  Artur Malabarba  <address@hidden>
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       * lisp/emacs-lisp/package.el: Refactor package activation code
 
-       Simplify recording of main thread's ID on MS-Windows
+       (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'.
 
-       * 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.
+2015-12-03  Eli Zaretskii  <address@hidden>
 
-       * 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.
+       Document new font-related functionality
 
-2016-01-30  Mark Oteiza  <address@hidden>
+       * doc/lispref/display.texi (Low-Level Font): Document
+       'default-font-width', 'default-font-height', 'window-font-width',
+       and 'window-font-height'.
 
-       Backport: Fix issue where a new tempfile was created every refresh
+       * 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.
 
-       * lisp/mpc.el (mpc-format): Leave dir as relative path
+2015-12-03  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       Fix documentation and implementation of 'directory-name-p'
 
-       Call 'window-size-change-functions' for mini-windows
+       * 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.
 
-       * 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) <window-size-change-functions>:
-       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/files.texi (Directory Names): Move the documentation
+       of directory-name-p here from "Relative File Names".  Update the
+       description per the changes in implementation.
 
-       * doc/lispref/windows.texi (Window Hooks): Update the description
-       of 'window-size-change-functions'.
+       * etc/NEWS: Move the entry for 'directory-name-p' to its proper
+       place and mark it documented.
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+2015-12-02  Eli Zaretskii  <address@hidden>
 
-       Improve documentation of dynamic modules
+       Minor copyedit in Emacs manual
 
-       * 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.
+       * doc/emacs/search.texi (Lax Search): Make wording about character
+       folding by default less definitive.  (Bug#22043)
 
-       * etc/NEWS: Expand documentation of dynamically loaded modules.
+2015-12-02  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Philipp Stephani  <address@hidden>  (tiny change)
+       More emacs-module.c fixes for wide ints
 
-       Initial documentation for dynamic modules
+       * 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.
 
-       * etc/NEWS: Mention the new support for dynamically loaded modules.
+       * 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.
 
-2016-01-30  Dmitry Gutov  <address@hidden>
+2015-12-02  Stephen Leake  <address@hidden>
 
-       Add xref--etags-backend to xref-backing-functions using add-hook
+       Fix bug#22069 in cl-generic.el
 
-       * lisp/progmodes/xref.el (xref-backend-functions): Move the
-       default value into a separate `add-hook' call (bug#21964).
+       * lisp/emacs-lisp/cl-generic.el (cl-no-method): Remove %S; this string 
is
+       not run thru `format'.
 
-       * lisp/progmodes/elisp-mode.el (emacs-lisp-mode):
-       Don't declare the xref-backend-functions variable.
-       It doesn't make any difference.
+2015-12-01  Dmitry Gutov  <address@hidden>
 
-2016-01-30  Paul Eggert  <address@hidden>
+       APPEND etags--xref-backend to xref-backend-functions
 
-       Fix double-decrement bug when freeing global refs
+       * 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).
 
-       * 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.
+2015-12-01  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Paul Eggert  <address@hidden>
+       More accurate documentation of lax whitespace matching
 
-       Declare emacs_module_init in the module API
+       * 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.
 
-       * 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.
+       * doc/emacs/search.texi (Word Search, Symbol Search): Clarify that
+       lax whitespace matching has no effect on these commands.
 
-2016-01-30  Paul Eggert  <address@hidden>
+2015-12-01  Eli Zaretskii  <address@hidden>
 
-       Fix module test to use ptrdiff_t nargs too
+       Fix emacs-module.c for wide ints
 
-       * 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.
+       * 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.
 
-2016-01-30  Paul Eggert  <address@hidden>
+       * modules/mod-test/test.el (mod-test-sum-test): Add tests for
+       large integers, to test --with-wide-int.
 
-       Fix reindent-introduced typo in module code
+2015-12-01  Eli Zaretskii  <address@hidden>
 
-       * 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.
+       Document 'directory-files-recursively'
 
-2016-01-30  Anders Lindgren  <address@hidden>
+       * lisp/files.el (directory-files-recursively): Doc fix.  Rename
+       the argument MATCH to REGEXP, to be more explicit about its form.
 
-       Fixed bug#19576: `write-file' saves wrong buffer.
+       * doc/lispref/files.texi (Contents of Directories): Improve the
+       documentation of 'directory-files-recursively'.  Add
+       cross-references.
 
-       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.
+       * etc/NEWS: Move the entry for 'directory-files-recursively' to
+       its place and mark it documented.
 
-       * 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.
+2015-12-01  Eli Zaretskii  <address@hidden>
 
-2016-01-30  John Wiegley  <address@hidden>
+       Document 'inhibit-read-only' property
 
-       Correct a documentation error in frames.texi
+       * 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".
 
-2016-01-30  Stephen Leake  <address@hidden>
+       * etc/NEWS: Move the entry about 'inhibit-read-only' property to
+       its place and mark it documented.
 
-       * lisp/cedet/mode-local.el: Delete obsolete comment
+2015-12-01  Artur Malabarba  <address@hidden>
 
-2016-01-30  Paul Eggert  <address@hidden>
+       * lisp/emacs-lisp/package.el: Update header comments
 
-       Module function arg counts are ptrdiff_t, not int
+2015-12-01  Artur Malabarba  <address@hidden>
 
-       * 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.
+       * lisp/character-fold.el: Add back multi-char matching
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       (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.
 
-       Minor improvements in module test
+       * test/automated/character-fold-tests.el
+       (character-fold--test-fold-to-regexp): Comment out test of
+       functionality no longer supported.
 
-       * 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.
+2015-12-01  Xue Fuqiao  <address@hidden>
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       * doc/emacs/ack.texi (Acknowledgments): Update.
 
-       Improve MS-Windows implementation in dynlib.c
+2015-12-01  Michael Albinus  <address@hidden>
 
-       * src/dynlib.c [WINDOWSNT]: Include errno.h, lisp.h, and w32.h.
-       No need to include windows.h, as w32.h already does that.
-       <dynlib_last_err>: 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.
+       Check `file-remote-p' over absolute files names in files.el
 
-2016-01-30  Paul Eggert  <address@hidden>
+       * lisp/files.el (directory-files-recursively)
+       (get-free-disk-space): Check `file-remote-p' over absolute files names.
 
-       Include-file tweaks for modules
+2015-12-01  Andreas Schwab  <address@hidden>
 
-       * src/dynlib.c, src/emacs-module.c: Include <config.h> 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.
+               * src/lread.c (syms_of_lread): Doc fix.
 
-2016-01-30  Paul Eggert  <address@hidden>
+2015-11-30  Dmitry Gutov  <address@hidden>
 
-       Simplify push_handler and profile its malloc
+       Don't mistake certain JS method calls for keywords
 
-       * 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.
+       * lisp/progmodes/js.el (js--ctrl-statement-indentation):
+       Braceless keyword can't come after a period (bug#22063).
 
-2016-01-30  Paul Eggert  <address@hidden>
+2015-11-30  David Reitter  <address@hidden>
 
-       * src/emacs-module.h: Include stddef.h, not stdlib.h.
+       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)
 
-2016-01-30  Juanma Barranquero  <address@hidden>
+2015-11-30  Juri Linkov  <address@hidden>
 
-       Discover repository version in linked worktrees (bug#21930)
+       * lisp/replace.el (occur-engine): Count matches in empty lines.
 
-       * lisp/version.el (emacs-repository--version-git-1): Do not assume
-       HEAD is at .git/HEAD, it can also be at .git/worktrees/<branch>/HEAD.
-       (emacs-repository-get-version): Grok linked worktrees when EXTERNAL
-       is nil too.
+       (Bug#22062)
+
+2015-11-30  Aurélien Aptel  <address@hidden>
 
-2016-01-30  Juri Linkov  <address@hidden>
+       * src/emacs-module.h: Fix finalizer typedef for C++11
 
-       * lisp/replace.el (occur-regexp-descr): New function.
-       (occur-1, occur-engine): Use it.
+       C++11 standard doesn't allow exception-specification in typedef.
+       The workaround is to declare a dummy function prototype and use
+       decltype on it.
 
-       * 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-30  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Karl Fogel  <address@hidden>
+       Fix last change
 
-       Revert `open-line' electric-indent sensitivity
+       * src/emacs-module.c (lisp_to_value, value_to_lisp)
+       [WIDE_EMACS_INT]: Avoid compiler warnings.
 
-       * lisp/simple.el (open-line): Remove electric indent code.
-         (electric-indent-just-newline): Don't declare.
+2015-11-30  Stefan Monnier  <address@hidden>
 
-       * test/automated/simple-test.el (open-line-indent): Adjust test.
+       Rely on conservative stack scanning to find "emacs_value"s
 
-       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 (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.
 
-       See the thread "Questioning the new behavior of `open-line'." on the
-       Emacs Devel mailing list, and in particular this message:
+       * 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.
 
-         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: \
-           <address@hidden>
+       * modules/mod-test/mod-test.c (Fmod_test_signal, Fmod_test_throw):
+       Don't assume that NULL is a valid emacs_value.
 
-         https://lists.gnu.org/archive/html/emacs-devel/2015-11/msg01707.html
+2015-11-30  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Paul Eggert  <address@hidden>
+       Yet another doc improvement for search commands
 
-       Omit unnecessary clear in Fmodule_load
+       * 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.
 
-       * src/emacs-module.c (Fmodule_load):
-       Simplify and avoid unnecessary initialization of priv member to 0.
+       * 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.
 
-       * src/emacs-module.c: (module_vec_set, module_vec_get, module_vec_size)
+2015-11-30  Martin Rudalics  <address@hidden>
 
-2016-01-30  Paul Eggert  <address@hidden>
+       Run `window-size-change-functions' also when reading from minibuffer
 
-       Prefer signed integer types in module code
+       * src/xdisp.c (redisplay_internal): Run `window-size-change-functions'
+       also when reading from minibuffer.
 
-       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-30  Ulf Jasper  <address@hidden>
 
-2016-01-30  Paul Eggert  <address@hidden>
+       Fix scrambling of html-rendered item buffers
 
-       Omit ‘const’ on locals
+       * lisp/net/newst-treeview.el (newsticker--treeview-render-text): Fix
+         scrambling of contents by wrapping call to html-renderer in
+         save-selected-window.
 
-       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’.
+2015-11-30  Paul Eggert  <address@hidden>
 
-2016-01-30  Paul Eggert  <address@hidden>
+       Fix font typo in previous doc fix.
 
-       Prefer intmax_t to int64_t in module code
+2015-11-30  Paul Eggert  <address@hidden>
 
-       * 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.
+       A bit more security doc, esp. file local vars
 
-2016-01-30  Paul Eggert  <address@hidden>
+       * 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.
 
-       Rename module.c to emacs-module.c, etc.
+2015-11-30  Artur Malabarba  <address@hidden>
 
-       * src/emacs-module.c: Rename from src/module.c.
-       * src/emacs-module.h: Rename from src/module.h.
-       All uses changed.
+       * lisp/character-fold.el: Comment out branching code
 
-2016-01-30  Paul Eggert  <address@hidden>
+       (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.
 
-       Fix minor module problems found by static checking
+2015-11-30  Paul Eggert  <address@hidden>
 
-       * 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/emacs-module.c (Fmodule_load): Fix pointer signedness bug.
-       (Fmodule_call): Tell GCC that the default case is unreachable.
+       Spelling and grammar fixes
 
-2016-01-30  Paul Eggert  <address@hidden>
+2015-11-29  Dmitry Gutov  <address@hidden>
 
-       Style fixes for indenting etc. in module code
+       Make lisp-completion-at-point a wrapper instead of an alias
 
-       This is mostly indenting and spacing changes.  Also, remove
-       some unnecessary static decls instead of bothering to reindent them.
-       * src/emacs-module.h (EMACS_EXTERN_C_BEGIN): Remove, and do this inline,
-       as most other Emacs files do for this sort of thing.
+       * lisp/progmodes/elisp-mode.el (lisp-completion-at-point):
+       Turn into an obsolete wrapper around elisp-completion-at-point
+       (bug#20455).
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+2015-11-29  Artur Malabarba  <address@hidden>
 
-       Minor improvements in modules testing Makefile
+       * lisp/isearch.el (isearch-search-fun-default): Nicer error
 
-       * modules/mod-test/Makefile (EMACS, SO): New variables.
-       (CFLAGS): When SO = dll, don't use -fPIC.
-       (check): New target, runs the test.
+       message when the search fails.
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+2015-11-29  Dmitry Gutov  <address@hidden>
 
-       * .gitignore: Add "*.dll".
+       Update menu-bar-goto-uses-etags-p for the current xref API
 
-2016-01-30  Paul Eggert  <address@hidden>
+       * lisp/menu-bar.el (menu-bar-goto-uses-etags-p): Consult
+       xref-backend-functions, instead of now-nonexistent
+       xref-find-function.
 
-       Migrate modules/.gitignore into .gitignore
+2015-11-29  Artur Malabarba  <address@hidden>
 
-       * .gitignore: Add former contents of modules/.gitignore.
-       * modules/.gitignore: Remove.
+       * lisp/isearch.el (isearch-define-mode-toggle): Advertise binding
 
-2016-01-30  Paul Eggert  <address@hidden>
+2015-11-29  Artur Malabarba  <address@hidden>
 
-       Add copyright notices to module code
+       * lisp/menu-bar.el: Use folding in searches
 
-       Put them in the usual format for GNU Emacs copyright notices.
+       (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.
 
-2016-01-30  Paul Eggert  <address@hidden>
+2015-11-29  Artur Malabarba  <address@hidden>
 
-       Rename emacs_module.h to module.h
+       * lisp/menu-bar.el (menu-bar-goto-uses-etags-p): Fix a warning
 
-       * src/module.h: Rename from src/emacs_module.h.
-       All uses changed.
+2015-11-29  Artur Malabarba  <address@hidden>
 
-2016-01-30  Juanma Barranquero  <address@hidden>
+       * lisp/character-fold.el (character-fold-to-regexp): Be careful
 
-       * src/module.c (Fmodule_load): Remove unused vars `doc_name', `args'
+       not to return huge regexps.
 
-       * src/lread.c (Fload): Remove unused variable `size'
+2015-11-29  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Alan Mackenzie  <address@hidden>
+       Improve documentation of string-collate-* functions
 
-       src/keyboard.c (pre-command-hook): Fix typo in doc string: "pre" -> 
"post".
+       * doc/lispref/strings.texi (Text Comparison): Improve wording and
+       indexing of 'string-collate-equalp' and 'string-collate-lessp'.
 
-2016-01-30  Dmitry Gutov  <address@hidden>
+       * etc/NEWS: Move the entry of 'string-collate-equalp' and
+       'string-collate-lessp' to "Lisp Changes" section and mark it as
+       documented.
 
-       Prioritize looking inside vc-parent-buffer over log-view-mode fallback
+2015-11-29  Eli Zaretskii  <address@hidden>
 
-       * lisp/vc/vc.el (vc-deduce-fileset): Prioritize looking inside
-       vc-parent-buffer over log-view-mode fallback (bug#21955).
+       Document truncate-string-ellipsis
 
-2016-01-30  Alan Mackenzie  <address@hidden>
+       * doc/lispref/display.texi (Size of Displayed Text): Document
+       'truncate-string-ellipsis'.
 
-       lisp/isearch.el: Eliminate macro isearch-call-message, replacing with 
funcall.
+       * 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'.
 
-2016-01-30  Ken Brown  <address@hidden>
+       * etc/NEWS: Move the 'truncate-string-ellipsis' entry to the "Lisp
+       Changes" section.
 
-       * configure.ac (LIBMODULES): Don’t define on Cygwin
+2015-11-29  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       Fix confusion wrt character folding in the Emacs manual
 
-       Fix MS-Windows build --with-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
+       <address@hidden>.
 
-       * 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.
+2015-11-29  Ken Brown  <address@hidden>
 
-2016-01-30  Aurélien Aptel  <address@hidden>
-           Philipp Stephani  <address@hidden>
+       Update mod-test-sum-test
 
-       Add dynamic module test and helper script
+       * modules/mod-test/test.el (mod-test-sum-test): Update to
+       accommodate the lack of dladdr on Cygwin.
 
-       Add 'modhelp.py' script (python2) to automate module testing and
-       module generation.
+2015-11-29  Alan Mackenzie  <address@hidden>
 
-       To build and test all modules in the modules/ dir
-         $ ./modhelp.py test
+       Byte compiler: Catch missing argument to `funcall'.  Fixes bug#22051.
 
-       To generate a module from template code (good starting point)
-         $ ./modhelp init mynewtestmodule
+       * 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.
 
-       See the script -h option for more documentation.
+2015-11-29  Martin Rudalics  <address@hidden>
 
-       * 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/window.el (split-window): Don't sanitize sizes when SIZE is 
non-nil.
 
-2016-01-30  Aurélien Aptel  <address@hidden>
+2015-11-28  Artur Malabarba  <address@hidden>
 
-       Make 'Fload' look for modules
+       * lisp/character-fold.el (character-fold-to-regexp)
 
-       'Fload' can now load dynamic modules. This also makes 'require' work.
+       Warn about using long strings.
 
-       * 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'.
+       * test/automated/character-fold-tests.el
+       (character-fold--test-lax-whitespace)
+       (character-fold--test-consistency): Reduce string size for tests.
 
-2016-01-30  Aurélien Aptel  <address@hidden>
-           Philipp Stephani  <address@hidden>
+2015-11-28  Eli Zaretskii  <address@hidden>
 
-       Add dynamic module module support
+       Document renaming of x-select-enable-* variables
 
-       * 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/emacs-module.c: New module implementation file.
+       * 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.
 
-2016-01-30  Aurélien Aptel  <address@hidden>
+       * etc/NEWS: Mark entry as documented.
 
-       Add new User Pointer (User_Ptr) type
+2015-11-28  Eli Zaretskii  <address@hidden>
 
-       * 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.
+       Document the shorthand hints displayed by M-x
 
-2016-01-30  Aurélien Aptel  <address@hidden>
-           Philipp Stephani  <address@hidden>
+       * 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.
 
-       Add portable layer for dynamic loading
+       * etc/NEWS: Move the M-x entry to "Editing Changes" and mark it as
+       documented.
 
-       * src/dynlib.h: New file.
-       * src/dynlib.c: New file.
+2015-11-28  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Philipp Stephani  <address@hidden>
+       Update docs of character folding
 
-       Add catch-all & no-signal version of PUSH_HANDLER
+       * doc/emacs/search.texi (Lax Search): Update the description of
+       character folding for the latest changes.
 
-       Ground work for modules. Add a non-signaling version of PUSH_HANDLER and
-       a new "catch-all" handler type.
+2015-11-28  Artur Malabarba  <address@hidden>
 
-       * 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.
+       * lisp/character-fold.el: Also play nice with case-folding
 
-2016-01-30  Ken Brown  <address@hidden>
+       (character-fold-to-regexp): Take `case-fold-search' into account.
 
-       Silence byte-compiler warning
+2015-11-28  Artur Malabarba  <address@hidden>
 
-       * lisp/server.el (server-process-filter): Silence byte-compiler
-       warning.
+       * lisp/character-fold.el: Add support for multi-char matches
 
-2016-01-30  Paul Eggert  <address@hidden>
+       (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.
 
-       Quote symbols in docstrings using `'
+2015-11-28  Artur Malabarba  <address@hidden>
 
-       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/character-fold.el: Code simplifications
 
-2016-01-30  Peder O. Klingenberg  <address@hidden>
+       (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.
 
-       Fix savegames in dunnet
+       * test/automated/character-fold-tests.el
+       (character-fold--test-fold-to-regexp): New test.
 
-       * lisp/play/dunnet.el (dun-rot13): Use the standard rot13-region instead
-         of separate implementation.
+2015-11-28  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Artur Malabarba  <address@hidden>
+       Document changes in "C-h l"
 
-       * lisp/emacs-lisp/package.el (package--with-response-buffer):
+       * doc/emacs/help.texi (Misc Help): Document the changes in "C-h l".
 
-       Ensure we're at the start of the buffer before searching for
-       the end of headers.
+       * etc/NEWS: mark "C-h l" changes as documented.
 
-2016-01-30  Xue Fuqiao  <address@hidden>
+2015-11-28  Eli Zaretskii  <address@hidden>
 
-       * admin/release-process: Improve wording.
+       Finalize documentation of 'custom-prompt-customize-unsaved-options'
 
-2016-01-30  Xue Fuqiao  <address@hidden>
+       * doc/emacs/custom.texi (Saving Customizations): Index the new
+       function 'custom-prompt-customize-unsaved-options'.
 
-       Backport: * CONTRIBUTE: Remove information about feature freeze.
+       * etc/NEWS: Mention when 'custom-prompt-customize-unsaved-options'
+       is useful.
 
-       (cherry picked from commit ae0653b5ab9ee223751ec389b87011963e1cbbef)
+2015-11-28  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Xue Fuqiao  <address@hidden>
+       Document 'comment-line'
 
-       Backport: Document the release process
+       * doc/emacs/programs.texi (Comment Commands): Document
+       'comment-line'.
 
-       * admin/notes/versioning: Add information about RC releases.
-       * admin/release-process: Document the release process.
-       * admin/authors.el (authors-ignored-files):
-       * admin/README: Change FOR-RELEASE to release-process.
-       * CONTRIBUTE:
-       * admin/notes/bugtracker: Don't mention FOR-RELEASE.
+       * etc/NEWS: Move the entry for 'comment-line' into "Editing Changes".
 
-       (cherry picked from commit 9a4aa0f5945a03611ae29c516025dbd353bd26ab)
+2015-11-28  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Xue Fuqiao  <address@hidden>
+       Document new checkdoc features
 
-       Backport: * admin/release-process: Rename from admin/FOR-RELEASE.
+       * doc/lispref/tips.texi (Tips, Library Headers): Document the
+       keyword-checking features of checkdoc and the commands
+       'checkdoc-file' and 'checkdoc-current-buffer'.
 
-       (cherry picked from commit f8cc14b59700e51a4e31139c0a65c8154995e055)
+       * etc/NEWS: Move the checkdoc-related entries to their own
+       section.
 
-2016-01-30  Xue Fuqiao  <address@hidden>
+2015-11-28  Philipp Stephani  <address@hidden>
 
-       Backport: Mention CONTRIBUTE in README
+       Simplify the prologue of emacs-module.c functions
 
-       Mention CONTRIBUTE in README, since it was moved from etc/ to root.
-       * etc/TODO: Remove the reference to `etc/CONTRIBUTE'.
-       * README: Mention CONTRIBUTE.
+       * 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.
 
-       (cherry picked from commit ed2e7e20ae0945288c98091f308f5460c3453873)
+2015-11-28  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Paul Eggert  <address@hidden>
+       Don't reject module calls with no arguments
 
-       Fix docstring quoting problems with ‘ '’
+       * src/emacs-module.c (Finternal_module_call): Allow ARGLIST be nil.
 
-       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.
+2015-11-28  Philipp Stephani  <address@hidden>
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       Make module-call be visible from Lisp
 
-       Improve configure --help text for wide ints
+       * 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.
 
-       * configure.ac (wide-int): Clarify user-level advantages and
-       disadvantages.
+2015-11-28  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Stephen Leake  <address@hidden>
+       Add etags tests for the recent Lua-related bugfix
 
-       Improve doc string
+       * 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.
 
-       * lisp/progmodes/xref.el (xref-backend-references): Improve doc string.
+2015-11-28  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Paul Eggert  <address@hidden>
+       Fix Lua tags when a function name includes '.' or ':'
 
-       eval_sub followed dangling pointer when debugging
+       * 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)
 
-       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.
+2015-11-28  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Daiki Ueno  <address@hidden>
+       Improve documentation of search and replace commands
 
-       * lisp/image-mode.el: Support encrypted file
+       * 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.
 
-       (image-toggle-display-image): Read content from the buffer instead
-       of the file, if the buffer holds a decrypted data.  (Bug#21870)
+       * lisp/replace.el (query-replace, query-replace-regexp)
+       (query-replace-regexp-eval, replace-string, replace-regexp):
+       Mention 'replace-character-fold' in the doc strings.
 
-2016-01-30  Paul Eggert  <address@hidden>
+2015-11-28  Paul Eggert  <address@hidden>
 
-       ELF unexec: align section header
+       Fix minor problems found by static checking
 
-       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.
+       * src/undo.c (prepare_record): Add proper prototype for C.
 
-2016-01-30  Andreas Schwab  <address@hidden>
+2015-11-27  Stefan Monnier  <address@hidden>
 
-       Do more checks on bytecode objects (Bug#21929)
+       * src/emacs-module.c (struct env_storage): Delete
 
-       * src/eval.c (funcall_lambda): Check size of compiled function
-       object.
-       (Ffetch_bytecode): Likewise.
+       (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.
 
-2016-01-30  Johan Bockgård  <address@hidden>
+2015-11-27  Eli Zaretskii  <address@hidden>
 
-       pcase.el: Fix edebugging of backquoted cons patterns
+       Improve documentation of 'replace-character-fold'
 
-       * lisp/emacs-lisp/pcase.el (pcase-QPAT): Fix edebugging of backquoted
-       cons patterns. (Bug#21920)
+       * lisp/replace.el (replace-character-fold): Clarify which commands
+       are affected by this variable.
 
-2016-01-30  Paul Eggert  <address@hidden>
+2015-11-27  Dmitry Gutov  <address@hidden>
 
-       Improve fix for regex reentrancy abort
+       Autoload etags when using its xref backend
 
-       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.
+       * lisp/progmodes/xref.el (xref--etags-backend):
+       Rename to etags--xref-backend.  Move to etags.el.  Autoload.
+       (Bug#22026)
 
-2016-01-30  Artur Malabarba  <address@hidden>
+2015-11-27  Artur Malabarba  <address@hidden>
 
-       * lisp/faces.el (faces--attribute-at-point): Use `face-list-p'
+       * lisp/character-fold.el: Allow complex chars to match their 
decomposition
 
-       * lisp/emacs-lisp/package.el (package--with-response-buffer): Missing 
require
+       (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.
 
-       * lisp/emacs-lisp/nadvice.el (add-function): Escape quote
+2015-11-27  Artur Malabarba  <address@hidden>
 
-2016-01-30  Vasily Korytov  <address@hidden>
+       * lisp/character-fold.el: More descriptive variable names
 
-       Recognize .rbw and .pyw files (bug#18753)
+       (character-fold-table): Rename a lot of the lexical variables to
+       make the code easier to read.
 
-       * lisp/progmodes/python.el (auto-mode-alist):
-       Recognize .pyw files.
+2015-11-27  Artur Malabarba  <address@hidden>
 
-       * lisp/progmodes/ruby-mode.el (auto-mode-alist):
-       Recognize .rbw files.
+       * lisp/isearch.el: Ensure we still support `isearch-new-word'
 
-2016-01-30  Dmitry Gutov  <address@hidden>
+       (isearch-new-regexp-function): Define variable.
+       (isearch-new-word): Define as an obsolete alias. (Bug#22018)
 
-       Fix ruby-mode auto-mode-alist entry
+2015-11-27  Eli Zaretskii  <address@hidden>
 
-       * lisp/progmodes/ruby-mode.el (auto-mode-alist): Add grouping
-       around the extensions (bug#21257).
+       Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into 
emacs-25
 
-2016-01-30  Dmitry Gutov  <address@hidden>
+2015-11-27  Lee Bochicchio  <address@hidden>
 
-       Fix etags completion near eob
+       * test/lisp/abbrev-tests.el: Define more tests
 
-       * lisp/progmodes/etags.el (tags-completion-at-point-function):
-       Use `goto-char', to avoid the end-of-buffer error (bug#20061).
+       (abbrev-table-name-test, kill-all-abbrevs-test)
+       (clear-abbrev-table-test): New tests.
 
-2016-01-30  Alan Mackenzie  <address@hidden>
+2015-11-27  Eli Zaretskii  <address@hidden>
 
-       De-pessimize detection of C++ member initialization lists.
+       Add module tests for wrong-type-argument
 
-       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): Add tests for
+       wrong-type-argument.
 
-2016-01-30  Artur Malabarba  <address@hidden>
+2015-11-27  Eli Zaretskii  <address@hidden>
 
-       Backport: * lisp/emacs-lisp/package.el: Fix a decoding issue.
+       Improve handling of signals and 'throw' in modules
 
-       * lisp/url/url-handlers.el (url-insert-file-contents): Move some code to
-       `url-insert-buffer-contents'.
-       (url-insert-buffer-contents): New function
+       * 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.
 
-       (package--with-response-buffer): Use `url-insert-buffer-contents'.
-       The previous code had some issues with decoding. Refactoring that
-       function allows us to use the decoding from url-handlers while still
-       treating both sync and async requests the same.
+2015-11-27  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Stephen Leake  <address@hidden>
+       Add ':version' tag to 'checkdoc-package-keywords-flag'
 
-       Improve a few doc strings, comments
+       * lisp/emacs-lisp/checkdoc.el (checkdoc-package-keywords-flag):
+       Add a ':version' tag.
 
-       * 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-27  Eli Zaretskii  <address@hidden>
 
-       * lisp/progmodes/elisp-mode.el (elisp--xref-find-definitions): Add 
FIXME.
+       Improve documentation of 'eval-buffer' and 'eval-region'
 
-2016-01-30  Anders Lindgren  <address@hidden>
+       * src/lread.c (Feval_buffer, Feval_region): Doc fixes.  (Bug#22023)
 
-       Enhance NSTRACE (trace output for NextStep).
+       * doc/lispref/eval.texi (Eval): Mention narrowing to clarify
+       "accessible portion of buffer".
 
-       Trace can be disabled for groups of functions. By default, event
-       functions and functions that generate lots of output are disabled.
+2015-11-27  Eli Zaretskii  <address@hidden>
 
-       Trace output of Objective-C functions now use the "[ClassName
-       parameter:]" form.
+       Unbreak the Cygwin w32 build
 
-       * 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.
+       * src/emacs.c (main): Call w32_init_main_thread in the Cygwin w32
+       build as well.  Reported by Andy Moreton <address@hidden>.
 
-       * 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.
+2015-11-27  Eli Zaretskii  <address@hidden>
 
-       * src/nsimage.m (ns_image_from_file): Enhanced trace output.
+       Improve commentary in character-fold.el
 
-       * src/nsfns.m (x_set_tool_bar_lines): Add trace output.
+       * lisp/character-fold.el (character-fold-to-regexp): Move detailed
+       description from commit log message to comments.  (Bug#22019)
 
-       * src/nsmenu.m ([EmacsToolbar setVisible:]): New function, print trace
-       and call corresponding super function.
+2015-11-26  Alan Mackenzie  <address@hidden>
 
-2016-01-30  Anders Lindgren  <address@hidden>
+       Byte Compiler: generate code to adjust stack count after call to 
`signal'.
 
-       Fixed a toolbar related issue on OS X.
+       Corrects change from earlier today.
 
-       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-setq): supply the current 
value of
+       `byte-compile--for-effect' as argument to `byte-compile-form'.
 
-       * src/nsfns.m (x_set_tool_bar_lines): Exit maximized and full height
-       fullscreen modes when tool bar is disabled.
+2015-11-26  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Anders Lindgren  <address@hidden>
+       Improve commentary of prepare_to_modify_buffer_1
 
-       Fixed OS X 10.6.8 build issue (bug#21862).
+       * src/insdel.c (prepare_to_modify_buffer_1): Mention in commentary
+       that this function runs Lisp.  Suggested by Richard Stallman
+       <address@hidden>.
 
-       * 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-26  Phillip Lord  <address@hidden>
 
-2016-01-30  Artur Malabarba  <address@hidden>
+       Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
 
-       * lisp/faces.el (faces--attribute-at-point): Fix an issue
+2015-11-26  Phillip Lord  <address@hidden>
 
-       Previous code would signal an error when the face at point was
-       a manually built list of attributes such as '(:foregroud "white").
+       Fix regression after merge.
 
-       * test/automated/faces-tests.el (faces--test-color-at-point): Add a test
+        * src/undo.c (prepare_record): Remove call to run_undoable_change.
 
-2016-01-30  Paul Eggert  <address@hidden>
+2015-11-26  Phillip Lord  <address@hidden>
 
-       Fix regex abort when it tries to reenter itself
+       After delete, record point location in undo.
 
-       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.
+       Addresses Bug #21968.
 
-2016-01-30  Dmitry Gutov  <address@hidden>
+               * 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.
 
-       Improve Ruby 1.9-style keyword keys highlighting
+       Conflicts:
+               src/undo.c
 
-       * lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords):
-       Handle required keyword arguments (bug#21367).
-       And highlight the colon together with the name.
+2015-11-26  Eli Zaretskii  <address@hidden>
 
-2016-01-30  Dmitry Gutov  <address@hidden>
+       Fix compiler warnings in w32.c
 
-       Unify the absolutely equal xref-backend-references implementations
+       * 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 <address@hidden>.  (Bug#21953)
 
-       * lisp/progmodes/elisp-mode.el (xref-backend-references):
-       Remove.
+2015-11-26  Dmitry Gutov  <address@hidden>
 
-       * lisp/progmodes/etags.el (xref-backend-references):
-       Remove.
+       Check if the file exists on disk before producing the revert diff
 
-       * lisp/progmodes/xref.el (xref-backend-references):
-       Define the default implementation.
+       * lisp/vc/vc-dispatcher.el (vc-buffer-sync): Check if the file
+       exists on disk (bug#20558).
 
-2016-01-30  Dmitry Gutov  <address@hidden>
+2015-11-26  Alan Mackenzie  <address@hidden>
 
-       Update project-find-regexp for the new xref API
+       Byte compiler: on setq with an odd number of arguments, generate a 
`signal'
 
-       * lisp/progmodes/project.el (project--read-regexp):
-       Update to use the new xref API methods.
+       * 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/progmodes/xref.el (xref-find-backend): Autoload.
+       * 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.
 
-2016-01-30  Dmitry Gutov  <address@hidden>
+2015-11-25  Dmitry Gutov  <address@hidden>
 
-       Fix replacing a match with a shorter string
+       Use find-tag-default for xref-backend-identifier-at-point
 
-       In effect, partially reverting fe973fc.
+       * 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.
 
-       * 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-25  Paul Eggert  <address@hidden>
 
-2016-01-30  Artur Malabarba  <address@hidden>
+       * src/undo.c (record_property_change): Remove now-unused local.
 
-       * lisp/progmodes/xref.el (xref-pop-marker-stack): Downgrade errors
+2015-11-25  Phillip Lord  <address@hidden>
 
-       Signal user-errors instead.
+       run_undoable_changes now called from insdel.
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       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.
 
-       Document 'describe-symbol'
+        * src/undo.c (run_undoable_changes,syms_of_undo): Remove function
+        and symbol used.
+        * src/insdel.c (run_undoable_changes): Add function and symbol.
 
-       * doc/emacs/help.texi (Help Summary): Mention "C-h o".
-       (Name Help): Document "C-h o" and describe-symbol.
+2015-11-25  Eli Zaretskii  <address@hidden>
 
-       * lisp/help-fns.el (describe-symbol): Doc fix.
+       Improve and update documentation of search commands
 
-2016-01-30  Paul Eggert  <address@hidden>
+       * 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".
 
-       Change test name to avoid spellcheck issue.
+       * etc/NEWS: Move search- and replace-related entries to a single
+       parent section.
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       * lisp/replace.el (query-replace-show-replacement): Doc fix.
+       * lisp/isearch.el (search-nonincremental-instead)
+       (isearch-hide-immediately): Doc fixes.
 
-       Avoid signaling an error in 'describe-symbol'
+2015-11-25  Katsumi Yamaoka  <address@hidden>
 
-       * lisp/help-fns.el (describe-symbol): Avoid errors when the symbol
-       exists as a function/variable/face/etc., but is undocumented.
+       Remove nnml-retrieve-groups that is unnecessary and somewhat problematic
 
-       * test/automated/help-fns.el (help-fns-test-describe-symbol): New
-       test.
+       * lisp/gnus/nnml.el (nnml-retrieve-groups): Remove.  See:
+       <http://thread.gmane.org/gmane.emacs.gnus.general/86308> and
+       <http://thread.gmane.org/gmane.emacs.gnus.general/86321>
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+2015-11-25  Paul Eggert  <address@hidden>
 
-       * INSTALL (--with-cairo): Document this new configure option.
+       Fix module_format_fun_env when dynlib_addr fails
 
-2016-01-30  Eli Zaretskii  <address@hidden>
+       * 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
 
-       Document that GNU Make >= 3.81 is required to build Emacs
+2015-11-25  Paul Eggert  <address@hidden>
 
-       * doc/lispref/internals.texi (Building Emacs): Document that GNU
-       Make 3.81 or later is now required.
+       Disambiguate variable help a bit better
 
-2016-01-30  Artur Malabarba  <address@hidden>
+       * 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
 
-       Backport: * lisp/emacs-lisp/package.el: Refactor 
-with-work-buffer-async.
 2015-11-24  Dmitry Gutov  <address@hidden>
 
        Pass SVN commit message through log-edit-extract-headers
@@ -12717,15 +9438,6 @@
        `url-insert-buffer-contents'.
        (url-insert-buffer-contents): New function
 
-2016-01-30  Eli Zaretskii  <address@hidden>
-
-       * CONTRIBUTE (Branches): Improve wording for back-ported commits.
-
-2016-01-30  Dmitry Gutov  <address@hidden>
-
-       Merge branch 'master' into emacs-25
-
-2016-01-30  Dmitry Gutov  <address@hidden>
 2015-11-15  Stefan Monnier  <address@hidden>
 
        * lisp/progmodes/verilog-mode.el: Use with-silent-modifications
@@ -12845,11 +9557,6 @@
        (xref-backend-references, xref-backend-definitions)
        (xref-backend-apropos): New generic methods.
 
-2016-01-30  Juri Linkov  <address@hidden>
-
-       Support rectangular regions for more commands
-
-       * lisp/simple.el (region-extract-function): Handle the arg value 
‘bounds’.
 2015-11-13  Juri Linkov  <address@hidden>
 
        Support rectangular regions for more commands
@@ -12893,7 +9600,6 @@
        Search for all matches in the hit line.  Add `highlight' face to
        the matched region in the summary.  Update both callers.
 
-2016-01-30  Dmitry Gutov  <address@hidden>
 2015-11-13  Dmitry Gutov  <address@hidden>
 
        Replace xref-match-bounds with xref-match-length
@@ -12911,16 +9617,6 @@
        (xref-query-replace): Ditto.  And check that the search results
        are up-to-date.
 
-2016-01-30  John Wiegley  <address@hidden>
-
-       Merge remote-tracking branch 'origin/master' into emacs-25
-
-2016-01-30  l3thal  <address@hidden>
-
-       Merge branch 'erc-async-reconnect' into emacs-25
-
-       Reconnect asynchronously.
-
 2015-11-13  Paul Eggert  <address@hidden>
 
        Merge from gnulib
@@ -12940,138 +9636,6 @@
        mflt_run to leave the output areas unchanged on failure, as
        this isn’t part of its interface spec.
 
-2016-01-30  Eli Zaretskii  <address@hidden>
-
-       Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into 
emacs-25
-
-2016-01-30  Paul Eggert  <address@hidden>
-
-       Port recent XCB changes to 64-bit ‘long int’
-
-       For historical reasons, libX11 represents 32-bit values like Atoms as
-       ‘long int’ even on platforms where ‘long int’ is 64 bits.  XCB doesn’t
-       do that, so adapt the recent XCB code to behave properly on 64-bit
-       platforms.  Also, fix what appears to be a bug in the interpretation
-       of xcb_get_property_value_length, at least on my Fedora platform
-       which is running libxcb-1.11-5.fc21.
-       * src/xfns.c (x_real_pos_and_offsets):
-       * src/xterm.c (get_current_wm_state):
-       xcb_get_property_value_length returns a byte count, not a word count.
-       For 32-bit quantities, xcb_get_property_value returns a vector
-       of 32-bit words, not of (possibly 64-bit) long int.
-
-       Backport.
-
-2016-01-30  Paul Eggert  <address@hidden>
-
-       * src/undo.c (run_undoable_change): Now static.
-
-       Backport.
-
-2016-01-30  Eli Zaretskii  <address@hidden>
-
-       Remove support for ':timeout' from w32 tray notifications
-
-       * src/w32fns.c (Fw32_notification_notify): Delete the code that
-       supports ':timeout'.
-       (syms_of_w32fns): Don't DEFSYM ':timeout'.  This avoids clashes
-       with dbusbind.c when D-Bus is compiled in.
-
-       * doc/lispref/os.texi (Desktop Notifications): Don't mention
-       ':timeout'.
-
-       Backport.
-
-2016-01-30  Juanma Barranquero  <address@hidden>
-
-       * test/automated/simple-test.el: Add test for bug#20698 (bug#21885)
-
-       (simple-test--transpositions): New macro.
-       (simple-transpose-subr): New test.
-
-       Backport.
-
-2016-01-30  Juanma Barranquero  <address@hidden>
-
-       * lisp/progmodes/elisp-mode.el: Declare function `project-roots'
-
-       Backport.
-
-2016-01-30  Juanma Barranquero  <address@hidden>
-
-       * src/undo.c: Small fixes for previous change
-
-       (run_undoable_change): Mark void argument list.
-       (record_property_change): Remove unused variable `boundary'.
-
-       Backport.
-
-2016-01-30  Eli Zaretskii  <address@hidden>
-
-       Add a few more variables to redisplay--variables
-
-       * lisp/frame.el (redisplay--variables): Add bidi-paragraph-direction
-       and bidi-display-reordering to the list.
-
-       Backport.
-
-2016-01-30  Eli Zaretskii  <address@hidden>
-
-       * lisp/loadup.el: Enlarge the size of the hash table to 80000.
-
-       Backport.
-
-2016-01-30  Eli Barzilay  <address@hidden>
-
-       Fix point positioning after transposing with negative arg
-
-       * lisp/simple.el (transpose-subr): When invoked with a negative
-       argument, move point to after the transposed text, like we do
-       when invoked with a positive argument.  (Bug#21885)
-
-       Backport.
-
-2016-01-30  Eli Zaretskii  <address@hidden>
-
-       Fix last change in shr.el
-
-       * lisp/net/shr.el (shr--have-one-fringe-p): Rename from
-       have-fringes-p.  All callers changed.  Doc fix.  (Bug#21895)
-
-       Backport.
-
-2016-01-30  Eli Zaretskii  <address@hidden>
-
-       Fix last change
-
-       * src/w32fns.c (syms_of_w32fns) [WINDOWSNT && !HAVE_DBUS]:
-       Don't DEFSYM tray notification symbols if D-Bus is being used.
-
-       Backport.
-
-2016-01-30  Eli Zaretskii  <address@hidden>
-
-       Another fix for MinGW64 and Cygwin builds due to notifications
-
-       * src/w32fns.c: Ifdef away tray notification code if D-Bus is
-       being compiled into Emacs.
-       (syms_of_w32fns) [WINDOWSNT && !HAVE_DBUS]: Don't defsubr
-       Sw32_notification_notify and Sw32_notification_close if the code
-       is not compiled.  Reported by Andy Moreton <address@hidden>.
-
-       Backport.
-
-2016-01-30  YAMAMOTO Mitsuharu  <address@hidden>
-
-       Remove intern calls and XXX comments from Fx_export_frames
-
-       * src/xfns.c (Fx_export_frames): Use Qpdf, Qpng, Qpostscript, and
-       Qsvg instead of intern calls.  Use "postscript" instead of "ps"
-       for consistency with image types.  Remove XXX comments.
-       (syms_of_xfns) <Qpdf>: DEFSYM it.
-
-       Backport.
-
 2015-11-13  Paul Eggert  <address@hidden>
 
        Port recent XCB changes to 64-bit ‘long int’
@@ -31981,7 +28545,7 @@
 
 This file records repository revisions from
 commit 9d56a21e6a696ad19ac65c4b405aeca44785884a (exclusive) to
-commit 2d231aad9a24eda1e36e0b33d96f31aa7e29a737 (inclusive).
+commit 3f43da09956b663d92f578e41bcacb8742bb6bba (inclusive).
 See ChangeLog.1 for earlier changes.
 
 ;; Local Variables:



reply via email to

[Prev in Thread] Current Thread [Next in Thread]