Merge from origin/emacs-25

ef33bc7 Spelling and grammar fixes
9c3dbab Fix copyright years by hand
0e96320 Update copyright year to 2016

diff --cc ChangeLog.2
Simple merge

diff --cc Makefile.in
Simple merge

diff --cc README
Simple merge

diff --cc admin/gitmerge.el
Simple merge

diff --cc configure.ac
Simple merge

diff --cc doc/emacs/dired.texi
Simple merge

diff --cc doc/lispref/os.texi
Simple merge

diff --cc doc/misc/eww.texi
Simple merge

diff --cc doc/misc/ses.texi
Simple merge

diff --cc doc/misc/texinfo.tex
index 34fd353a9dc9984ebbb88a5cb5f498eb92a458d8,0ad0e85a0050c3483e5aa202d416a5fadceb7841..0f301a2a716ca455faada31537621a40ab01e871
--- 1/doc/misc/texinfo.tex
--- 2/doc/misc/texinfo.tex
+++ b/doc/misc/texinfo.tex
@@@ -3,12 -3,9 +3,9 @@@
  % Load plain if necessary, i.e., if running under initex.
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  %
 -\def\texinfoversion{2015-12-20.12}
 +\def\texinfoversion{2015-12-17.20}
  %
- % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
- % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- % 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015
- % Free Software Foundation, Inc.
+ % Copyright 1985-1986, 1988, 1990-2016 Free Software Foundation, Inc.
  %
  % This texinfo.tex file is free software: you can redistribute it and/or
  % modify it under the terms of the GNU General Public License as

diff --cc etc/NEWS
Simple merge

diff --cc lib-src/Makefile.in
Simple merge

diff --cc lisp/Makefile.in
Simple merge

diff --cc lisp/abbrev.el
Simple merge

diff --cc lisp/bindings.el
Simple merge

diff --cc lisp/calculator.el
Simple merge

diff --cc lisp/calendar/cal-hebrew.el
Simple merge

diff --cc lisp/calendar/cal-iso.el
Simple merge

diff --cc lisp/calendar/cal-tex.el
Simple merge

diff --cc lisp/calendar/solar.el
Simple merge

diff --cc lisp/cus-edit.el
Simple merge

diff --cc lisp/dired-aux.el
Simple merge

diff --cc lisp/dired-x.el
Simple merge

diff --cc lisp/dired.el
Simple merge

diff --cc lisp/emacs-lisp/autoload.el
Simple merge

diff --cc lisp/emacs-lisp/eieio-compat.el
Simple merge

diff --cc lisp/emacs-lisp/eieio-core.el
Simple merge

diff --cc lisp/emacs-lisp/eieio-custom.el
Simple merge

diff --cc lisp/emacs-lisp/eieio-opt.el
Simple merge

diff --cc lisp/emacs-lisp/eieio.el
Simple merge

diff --cc lisp/emacs-lisp/let-alist.el
index 0b647a028ca223bab32f9289b10731d5e5ec99ca,e400b4990364a59c2d829f708b033f3f0f837432..3507a39543697f8a21cd1638fdec77f27ae96908
--- 1/lisp/emacs-lisp/let-alist.el
--- 2/lisp/emacs-lisp/let-alist.el
+++ b/lisp/emacs-lisp/let-alist.el
@@@ -1,9 -1,9 +1,9 @@@
  ;;; let-alist.el --- Easily let-bind values of an assoc-list by their names -*- lexical-binding: t; -*-
  
- ;; Copyright (C) 2014-2015 Free Software Foundation, Inc.
+ ;; Copyright (C) 2014-2016 Free Software Foundation, Inc.
  
 -;; Author: Artur Malabarba <bruce.connor.am@gmail.com>
 -;; Maintainer: Artur Malabarba <bruce.connor.am@gmail.com>
 +;; Author: Artur Malabarba <emacs@endlessparentheses.com>
 +;; Package-Requires: ((emacs "24.1"))
  ;; Version: 1.0.4
  ;; Keywords: extensions lisp
  ;; Prefix: let-alist

diff --cc lisp/emacs-lisp/package.el
Simple merge

diff --cc lisp/epa.el
Simple merge

diff --cc lisp/erc/erc-backend.el
Simple merge

diff --cc lisp/erc/erc.el
Simple merge

diff --cc lisp/ffap.el
Simple merge

diff --cc lisp/filenotify.el
Simple merge

diff --cc lisp/gnus/gnus-util.el
Simple merge

diff --cc lisp/gnus/mml-sec.el
Simple merge

diff --cc lisp/hfy-cmap.el
Simple merge

diff --cc lisp/htmlfontify.el
Simple merge

diff --cc lisp/ibuf-ext.el
Simple merge

diff --cc lisp/ibuffer.el
Simple merge

diff --cc lisp/language/hebrew.el
Simple merge

diff --cc lisp/linum.el
Simple merge

diff --cc lisp/loadup.el
Simple merge

diff --cc lisp/mail/rmail.el
Simple merge

diff --cc lisp/mail/rmailedit.el
Simple merge

diff --cc lisp/mail/rmailkwd.el
Simple merge

diff --cc lisp/mail/rmailmm.el
Simple merge

diff --cc lisp/mail/rmailmsc.el
Simple merge

diff --cc lisp/mail/rmailsort.el
Simple merge

diff --cc lisp/mail/rmailsum.el
Simple merge

diff --cc lisp/mail/undigest.el
Simple merge

diff --cc lisp/menu-bar.el
Simple merge

diff --cc lisp/net/eww.el
Simple merge

diff --cc lisp/net/network-stream.el
Simple merge

diff --cc lisp/net/shr.el
Simple merge

diff --cc lisp/org/ChangeLog.1
Simple merge

diff --cc lisp/progmodes/cc-defs.el
Simple merge

diff --cc lisp/progmodes/verilog-mode.el
Simple merge

diff --cc lisp/progmodes/which-func.el
index 7e289b3ff5b4d26381e9688ad7409057bfafcf72,d883d4fc4dd0e54e3bf33f255a1d11df739860a2..2fc24a8cb3d873cbab2522f9fe0c1b7691f5f38b
--- 1/lisp/progmodes/which-func.el
--- 2/lisp/progmodes/which-func.el
+++ b/lisp/progmodes/which-func.el
@@@ -1,6 -1,6 +1,6 @@@
 -;;; which-func.el --- print current function in mode line
 +;;; which-func.el --- print current function in mode line  -*- lexical-binding:t -*-
  
- ;; Copyright (C) 1994, 1997-1998, 2001-2015 Free Software Foundation,
+ ;; Copyright (C) 1994, 1997-1998, 2001-2016 Free Software Foundation,
  ;; Inc.
  
  ;; Author:   Alex Rezinsky <alexr@msil.sps.mot.com>

diff --cc lisp/ps-mule.el
Simple merge

diff --cc lisp/ps-print.el
Simple merge

diff --cc lisp/ses.el
Simple merge

diff --cc lisp/textmodes/reftex-auc.el
Simple merge

diff --cc lisp/textmodes/reftex-cite.el
Simple merge

diff --cc lisp/textmodes/reftex-dcr.el
Simple merge

diff --cc lisp/textmodes/reftex-global.el
Simple merge

diff --cc lisp/textmodes/reftex-index.el
Simple merge

diff --cc lisp/textmodes/reftex-parse.el
Simple merge

diff --cc lisp/textmodes/reftex-ref.el
Simple merge

diff --cc lisp/textmodes/reftex-sel.el
Simple merge

diff --cc lisp/textmodes/reftex-toc.el
Simple merge

diff --cc lisp/textmodes/reftex.el
Simple merge

diff --cc lisp/url/url-handlers.el
Simple merge

diff --cc lisp/url/url-http.el
Simple merge

diff --cc lisp/url/url-util.el
Simple merge

diff --cc lwlib/Makefile.in
Simple merge

diff --cc msdos/sed2v2.inp
Simple merge

diff --cc nt/Makefile.in
Simple merge

diff --cc oldXMenu/Makefile.in
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/font.c
Simple merge

diff --cc src/font.h
Simple merge

diff --cc src/fontset.c
Simple merge

diff --cc src/ftfont.c
Simple merge

diff --cc src/inotify.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/sysdep.c
Simple merge

diff --cc test/Makefile.in
Simple merge

diff --cc test/lisp/abbrev-tests.el
index 37917ec53536911ed07a36f42c727d8c6527f6bc,66413c5a59072a1d8104a223af5b286bd26ccf42..0d93e268a99882f917a7318afa5cfdf2c993669d
--- 1/test/lisp/abbrev-tests.el
--- 2/test/automated/abbrev-tests.el
+++ b/test/lisp/abbrev-tests.el
@@@ -1,6 -1,6 +1,6 @@@
 -;;; abbrev-tests.el --- Test suite for abbrevs.
 +;;; abbrev-tests.el --- Test suite for abbrevs  -*- lexical-binding: t; -*-
  
- ;; Copyright (C) 2015 Free Software Foundation, Inc.
+ ;; Copyright (C) 2015-2016 Free Software Foundation, Inc.
  
  ;; Author: Eli Zaretskii <eliz@gnu.org>
  ;; Keywords: abbrevs

diff --cc test/lisp/autorevert-tests.el
Simple merge

diff --cc test/lisp/calc/calc-tests.el
Simple merge

diff --cc test/lisp/calendar/icalendar-tests.el
Simple merge

diff --cc test/lisp/character-fold-tests.el
Simple merge

diff --cc test/lisp/comint-tests.el
Simple merge

diff --cc test/lisp/descr-text-tests.el
Simple merge

diff --cc test/lisp/electric-tests.el
Simple merge

diff --cc test/lisp/emacs-lisp/cl-generic-tests.el
Simple merge

diff --cc test/lisp/emacs-lisp/cl-lib-tests.el
Simple merge

diff --cc test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el
Simple merge

diff --cc test/lisp/emacs-lisp/eieio-tests/eieio-test-persist.el
Simple merge

diff --cc test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
Simple merge

diff --cc test/lisp/emacs-lisp/ert-tests.el
Simple merge

diff --cc test/lisp/emacs-lisp/ert-x-tests.el
Simple merge

diff --cc test/lisp/emacs-lisp/generator-tests.el
Simple merge

diff --cc test/lisp/emacs-lisp/let-alist-tests.el
Simple merge

diff --cc test/lisp/emacs-lisp/map-tests.el
Simple merge

diff --cc test/lisp/emacs-lisp/nadvice-tests.el
Simple merge

diff --cc test/lisp/emacs-lisp/package-tests.el
Simple merge

diff --cc test/lisp/emacs-lisp/pcase-tests.el
Simple merge

diff --cc test/lisp/emacs-lisp/regexp-opt-tests.el
Simple merge

diff --cc test/lisp/emacs-lisp/seq-tests.el
Simple merge

diff --cc test/lisp/emacs-lisp/subr-x-tests.el
Simple merge

diff --cc test/lisp/emacs-lisp/tabulated-list-test.el
Simple merge

diff --cc test/lisp/emacs-lisp/thunk-tests.el
Simple merge

diff --cc test/lisp/emacs-lisp/timer-tests.el
Simple merge

diff --cc test/lisp/epg-tests.el
Simple merge

diff --cc test/lisp/eshell/eshell.el
Simple merge

diff --cc test/lisp/faces-tests.el
Simple merge

diff --cc test/lisp/filenotify-tests.el
Simple merge

diff --cc test/lisp/gnus/auth-source-tests.el
Simple merge

diff --cc test/lisp/gnus/gnus-tests.el
Simple merge

diff --cc test/lisp/gnus/message-tests.el
Simple merge

diff --cc test/lisp/help-fns-tests.el
Simple merge

diff --cc test/lisp/imenu-tests.el
Simple merge

diff --cc test/lisp/info-xref-tests.el
Simple merge

diff --cc test/lisp/international/mule-util-tests.el
Simple merge

diff --cc test/lisp/isearch-tests.el
Simple merge

diff --cc test/lisp/json-tests.el
Simple merge

diff --cc test/lisp/legacy/bytecomp-tests.el
Simple merge

diff --cc test/lisp/legacy/coding-tests.el
Simple merge

diff --cc test/lisp/legacy/core-elisp-tests.el
Simple merge

diff --cc test/lisp/legacy/decoder-tests.el
Simple merge

diff --cc test/lisp/legacy/files-tests.el
Simple merge

diff --cc test/lisp/legacy/font-parse-tests.el
Simple merge

diff --cc test/lisp/legacy/lexbind-tests.el
Simple merge

diff --cc test/lisp/legacy/occur-tests.el
Simple merge

diff --cc test/lisp/legacy/process-tests.el
Simple merge

diff --cc test/lisp/legacy/syntax-tests.el
Simple merge

diff --cc test/lisp/legacy/textprop-tests.el
Simple merge

diff --cc test/lisp/legacy/undo-tests.el
Simple merge

diff --cc test/lisp/man-tests.el
Simple merge

diff --cc test/lisp/minibuffer-tests.el
Simple merge

diff --cc test/lisp/net/dbus-tests.el
Simple merge

diff --cc test/lisp/net/newsticker-tests.el
Simple merge

diff --cc test/lisp/net/sasl-scram-rfc-tests.el
Simple merge

diff --cc test/lisp/net/tramp-tests.el
Simple merge

diff --cc test/lisp/obarray-tests.el
Simple merge

diff --cc test/lisp/progmodes/compile-tests.el
Simple merge

diff --cc test/lisp/progmodes/elisp-mode-tests.el
Simple merge

diff --cc test/lisp/progmodes/f90.el
Simple merge

diff --cc test/lisp/progmodes/flymake-tests.el
Simple merge

diff --cc test/lisp/progmodes/python-tests.el
Simple merge

diff --cc test/lisp/progmodes/ruby-mode-tests.el
Simple merge

diff --cc test/lisp/progmodes/subword-tests.el
Simple merge

diff --cc test/lisp/replace-tests.el
Simple merge

diff --cc test/lisp/simple-tests.el
Simple merge

diff --cc test/lisp/sort-tests.el
Simple merge

diff --cc test/lisp/subr-tests.el
Simple merge

diff --cc test/lisp/textmodes/reftex-tests.el
Simple merge

diff --cc test/lisp/textmodes/sgml-mode-tests.el
Simple merge

diff --cc test/lisp/textmodes/tildify-tests.el
Simple merge

diff --cc test/lisp/thingatpt-tests.el
Simple merge

diff --cc test/lisp/url/url-expand-tests.el
Simple merge

diff --cc test/lisp/url/url-future-tests.el
Simple merge

diff --cc test/lisp/url/url-parse-tests.el
Simple merge

diff --cc test/lisp/url/url-util-tests.el
Simple merge

diff --cc test/lisp/vc/add-log-tests.el
Simple merge

diff --cc test/lisp/vc/vc-bzr-tests.el
Simple merge

diff --cc test/lisp/vc/vc-tests.el
Simple merge

diff --cc test/lisp/xml-tests.el
Simple merge

diff --cc test/manual/biditest.el
Simple merge

diff --cc test/manual/cedet/cedet-utests.el
Simple merge

diff --cc test/manual/cedet/ede-tests.el
Simple merge

diff --cc test/manual/cedet/semantic-ia-utest.el
Simple merge

diff --cc test/manual/cedet/semantic-tests.el
Simple merge

diff --cc test/manual/cedet/semantic-utest-c.el
Simple merge

diff --cc test/manual/cedet/semantic-utest.el
Simple merge

diff --cc test/manual/cedet/srecode-tests.el
Simple merge

diff --cc test/manual/cedet/tests/test.c
Simple merge

diff --cc test/manual/cedet/tests/test.el
Simple merge

diff --cc test/manual/cedet/tests/test.make
Simple merge

diff --cc test/manual/cedet/tests/testdoublens.cpp
Simple merge

diff --cc test/manual/cedet/tests/testdoublens.hpp
Simple merge

diff --cc test/manual/cedet/tests/testjavacomp.java
Simple merge

diff --cc test/manual/cedet/tests/testpolymorph.cpp
Simple merge

diff --cc test/manual/cedet/tests/testspp.c
Simple merge

diff --cc test/manual/cedet/tests/testsppreplace.c
Simple merge

diff --cc test/manual/cedet/tests/testsppreplaced.c
Simple merge

diff --cc test/manual/cedet/tests/testsubclass.cpp
Simple merge

diff --cc test/manual/cedet/tests/testsubclass.hh
Simple merge

diff --cc test/manual/cedet/tests/testtypedefs.cpp
Simple merge

diff --cc test/manual/cedet/tests/testvarnames.c
Simple merge

diff --cc test/manual/etags/c-src/abbrev.c
Simple merge

diff --cc test/manual/etags/c-src/emacs/src/gmalloc.c
Simple merge

diff --cc test/manual/etags/c-src/emacs/src/keyboard.c
Simple merge

diff --cc test/manual/etags/c-src/emacs/src/lisp.h
Simple merge

diff --cc test/manual/etags/c-src/emacs/src/regex.h
Simple merge

diff --cc test/manual/etags/c-src/etags.c
Simple merge

diff --cc test/manual/etags/c-src/exit.c
Simple merge

diff --cc test/manual/etags/c-src/exit.strange_suffix
Simple merge

diff --cc test/manual/etags/c-src/getopt.h
Simple merge

diff --cc test/manual/etags/c-src/sysdep.h
Simple merge

diff --cc test/manual/etags/el-src/emacs/lisp/progmodes/etags.el
Simple merge

diff --cc test/manual/etags/tex-src/texinfo.tex
Simple merge

diff --cc test/manual/etags/y-src/cccp.c
Simple merge

diff --cc test/manual/etags/y-src/parse.c
Simple merge

diff --cc test/manual/etags/y-src/parse.y
Simple merge

diff --cc test/manual/indent/pascal.pas
Simple merge

diff --cc test/manual/redisplay-testsuite.el
Simple merge

diff --cc test/manual/rmailmm.el
Simple merge

diff --cc test/src/alloc-tests.el
index c0fe0f33cb9eb58ba63ab890d94d0319a1d1c210,5aa35f4a2ac00fe93b7a9640e593c72d5daef5da..97c6b4f807091c3cb04b96c840a11887400c0c8c
--- 1/test/src/alloc-tests.el
--- 2/test/automated/finalizer-tests.el
+++ b/test/src/alloc-tests.el
@@@ -1,6 -1,6 +1,6 @@@
 -;;; finalizer-tests.el --- Finalizer tests -*- lexical-binding: t -*-
 +;;; alloc-tests.el --- alloc tests -*- lexical-binding: t -*-
  
- ;; Copyright (C) 2015 Free Software Foundation, Inc.
+ ;; Copyright (C) 2015-2016 Free Software Foundation, Inc.
  
  ;; Author: Daniel Colascione <dancol@dancol.org>
  ;; Keywords:

diff --cc test/src/buffer-tests.el
Simple merge

diff --cc test/src/cmds-tests.el
Simple merge

diff --cc test/src/data-tests.el
Simple merge

diff --cc test/src/decompress-tests.el
index 1eea673121cf4bbc97a0366c9fc5baef7e803a51,7ece58d97c904f2df92814adee0411165bf0c56a..f0264ec548deb7edfe6b2b11b7b046d4cc717f30
--- 1/test/src/decompress-tests.el
--- 2/test/automated/zlib-tests.el
+++ b/test/src/decompress-tests.el
@@@ -1,6 -1,6 +1,6 @@@
 -;;; zlib-tests.el --- Test suite for zlib.
 +;;; decompress-tests.el --- Test suite for decompress.
  
- ;; Copyright (C) 2013-2015 Free Software Foundation, Inc.
+ ;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
  
  ;; Author: Lars Ingebrigtsen <larsi@gnus.org>
  

diff --cc test/src/fns-tests.el
Simple merge

diff --cc test/src/inotify-tests.el
Simple merge

diff --cc test/src/keymap-tests.el
Simple merge

diff --cc test/src/print-tests.el
Simple merge

diff --cc test/src/xml-tests.el
Simple merge