From: John Wiegley <johnw@newartisans.com>
Date: Tue, 12 Jan 2016 06:48:07 +0000 (-0800)
Subject: Merge from origin/emacs-25
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302

Merge from origin/emacs-25

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

1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302
diff --cc doc/misc/texinfo.tex
index 34fd353a9d,0ad0e85a00..0f301a2a71
--- a/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 lisp/emacs-lisp/let-alist.el
index 0b647a028c,e400b49903..3507a39543
--- a/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/progmodes/which-func.el
index 7e289b3ff5,d883d4fc4d..2fc24a8cb3
--- a/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 test/lisp/abbrev-tests.el
index 37917ec535,66413c5a59..0d93e268a9
--- a/test/lisp/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/src/alloc-tests.el
index c0fe0f33cb,5aa35f4a2a..97c6b4f807
--- a/test/src/alloc-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/decompress-tests.el
index 1eea673121,7ece58d97c..f0264ec548
--- a/test/src/decompress-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>