Merge from origin/emacs-25

ee73997 Make erc work better when encountering unknown prefix chars
b99141d Make erc completion case-insensitive again
66c4620 Make complection in erc use consistent casing
8c562b2 Make /QUIT in erc more robust
d93d2c5 Make tracking faces in Emacs work more reliably
af6ab7e Make shr not bug out on images on non-graphical displays
3311f40 Fix bookmark display widths
d90ab1e Fix typo in eww-make-unique-file-name
7f81825 Make it possible to TAB to input fields
a43a1dc Insert complete alt texts when images are disabled
56ed4e1 Allow eww text fields to grow
66b315c Make erc work when subword-mode is switched on
255b68f Fix IMAP doc example
91557f5 Quoting fixes in doc strings and diagnostics
2c0dc9f Fix warning message in hack-local-variables
504696d Etags: yet another improvement in Ruby tags
8784ebf Fix x-popup-menu on TTYs without a mouse
8b87ecb * lisp/emacs-lisp/map.el: Improvements to the docstring of the
        pcase macro
6191003 Use pop-to-buffer-same-window in eww
fe321fd * autogen.sh: Revert all recent changes.
74ebd4a * make-dist: Updates related to nt/.
737193a * make-dist: Add modules/.
3696bf2 * make-dist: Update for super-special file that can't live in etc/.
a4278e2 Fix failure to compile ns-win.el in parallel builds
860da4d Fix names of tags generated for Ruby accessors
f6213ce Fix file-name recognition in 'etags'
e42e662 Change Ruby file names and extensions recognized by 'etags'
58bfb6a More improvements for Ruby support in 'etags'
c04e911 Add --git-config option to autogen.sh
5713466 Fix editing undo changes in eww fields
51362d6 Allow the user more control of popping up the eww window
ee0fbd8 Make eww-browse-url with new-window parameter work again
9c3142d Clean up eww code slightly
cb035f3 Don't insert nil faces in shr
4c3fae3 ; * lisp/progmodes/prolog.el: Remove some obsolete commentary.
93f2153 Improve the custom type of some user options.
9f60d7e Mark some risky calendar variables.
1d07dcd Highlight two additional SCSS keywords
ee8b466 Recommend enabling integrity-checking in git
e639e10 Some corrections in Elisp manual
d766ca8 Chatter when autogen.sh changes Git configuration
3b734e1 * org/org-compat.el (org-font-lock-ensure): Fix bogus test (bug#22399)
43cb9f8 Omit unnecessary history from Lisp intro
2fbd1da * etc/HISTORY: Add some more history, plus git tags.
c90e1b4 Improve elisp “Security Considerations” doc
cedd7ca autogen.sh now arranges for git to check hashes
86ce76b ; Fix ChangeLog.2 commit ID.
7b1d2b1 Fix (c & 040) typo in emergency escapes
a8273da Fix display of overlay strings with 'display' and 'box' property
fc48106 Fix imap-starttls-open
cdecbed Fix return value of imap-starttls-open
20c7e34 ; * etc/NEWS: Fix renamed command name
98bdbdb Correct reference to DARWIN_OS preprocessor symbol
b250d29 Spelling fix
b920a0e Spelling fixes
93b144b Pacify GCC on C library without glibc API

2 files changed, 51 insertions, 26 deletions

diff --git a/etc/HISTORY b/etc/HISTORY
index 04264256801..810702622fa 100644
--- a/etc/HISTORY
+++ b/etc/HISTORY
@@ -1,14 +1,35 @@
-        GNU Emacs versions and their release dates
+        GNU Emacs history, versions, and release dates
 
 For more details about release contents, see the NEWS* files.
 
+Most of the development history of GNU Emacs is available in its
+source code repository <http://savannah.gnu.org/git/?group=emacs>.
+However, in the early days GNU Emacs was developed without using
+version control systems and was published via half-inch 9-track
+1600-bpi magnetic tape reels.  Although information about this early
+development is sketchy, the following text summarizes what is known.
+
+EMACS started out as a set of macros atop the TECO text editor, and
+was first operational in late 1976.  It was inspired by earlier work
+such as the E editor of Stanford, and was based on older TECO macro
+sets.  EMACS in turn inspired several similar editors.  See:
+Stallman RM. EMACS: The Extensible, Customizable Self-Documenting
+Display Editor.  AI Memo 519a, MIT, 1981-03-26
+<http://dspace.mit.edu/bitstream/handle/1721.1/5736/AIM-519A.pdf>.
+
+In 1984, work began on GNU Emacs, a fresh implementation designed to
+run on GNU and GNU-like systems, with a full-featured Lisp at its
+core.  GNU Emacs 1.0 through 1.12 were released in early 1985.  The
+next version after 1.12 was 13; this was the initial public release.
+
+Here is a list of known GNU Emacs stable releases starting with the
+initial public release.  Entries in the list are of the form "GNU
+Emacs N (DATE) TAG", where N is the version number, DATE the release
+date, and TAG (if present) the corresponding tag in the source code
+repository.  Any commentary about the version starts on the next line.
 Dates are approximate in the following list; some are when the version
 was made, some are when it was announced.
 
-
-GNU Emacs 1.0 through 1.12 were released in early 1985.
-The next release after 1.12 was 13.
-
 GNU Emacs 13 (1985-03-20)
 Initial release announced on Usenet.
 
@@ -135,15 +156,15 @@ GNU Emacs 19.32 (1996-07-31)
 
 GNU Emacs 19.33 (1996-08-11)
 
-GNU Emacs 19.34 (1996-08-21)
+GNU Emacs 19.34 (1996-08-21) emacs-19.34
 
-GNU Emacs 20.1 (1997-09-15)
+GNU Emacs 20.1 (1997-09-15) emacs-20.1
 
-GNU Emacs 20.2 (1997-09-19)
+GNU Emacs 20.2 (1997-09-19) emacs-20.2
 
-GNU Emacs 20.3 (1998-08-19)
+GNU Emacs 20.3 (1998-08-19) emacs-20.3
 
-GNU Emacs 20.4 (1999-07-12)
+GNU Emacs 20.4 (1999-07-12) emacs-20.4
 
 GNU Emacs 20.5 (1999-12-04)
 
@@ -151,40 +172,40 @@ GNU Emacs 20.6 (2000-02-15)
 
 GNU Emacs 20.7 (2000-06-13)
 
-GNU Emacs 21.1 (2001-10-20)
+GNU Emacs 21.1 (2001-10-20) emacs-21.1
 
-GNU Emacs 21.2 (2002-03-16)
+GNU Emacs 21.2 (2002-03-16) emacs-21.2
 
-GNU Emacs 21.3 (2003-03-19)
+GNU Emacs 21.3 (2003-03-19) emacs-21.3
 
 GNU Emacs 21.4 (2005-02-08)
 
 GNU Emacs 21.4a (2005-02-17)
 This is Emacs 21.4 with an updated notice in etc/PROBLEMS.
 
-GNU Emacs 22.1 (2007-06-02)
+GNU Emacs 22.1 (2007-06-02) emacs-22.1
 
-GNU Emacs 22.2 (2008-03-26)
+GNU Emacs 22.2 (2008-03-26) emacs-22.2
 
-GNU Emacs 22.3 (2008-09-05)
+GNU Emacs 22.3 (2008-09-05) emacs-22.3
 
-GNU Emacs 23.1 (2009-07-29)
+GNU Emacs 23.1 (2009-07-29) emacs-23.1
 
-GNU Emacs 23.2 (2010-05-08)
+GNU Emacs 23.2 (2010-05-08) emacs-23.2
 
-GNU Emacs 23.3 (2011-03-10)
+GNU Emacs 23.3 (2011-03-10) emacs-23.3
 
-GNU Emacs 23.4 (2012-01-29)
+GNU Emacs 23.4 (2012-01-29) emacs-23.4
 
-GNU Emacs 24.1 (2012-06-10)
+GNU Emacs 24.1 (2012-06-10) emacs-24.1
 
-GNU Emacs 24.2 (2012-08-27)
+GNU Emacs 24.2 (2012-08-27) emacs-24.2
 
-GNU Emacs 24.3 (2013-03-10)
+GNU Emacs 24.3 (2013-03-10) emacs-24.3
 
-GNU Emacs 24.4 (2014-10-20)
+GNU Emacs 24.4 (2014-10-20) emacs-24.4
 
-GNU Emacs 24.5 (2015-04-10)
+GNU Emacs 24.5 (2015-04-10) emacs-24.5
 
 
 ----------------------------------------------------------------------
diff --git a/etc/NEWS b/etc/NEWS
index faf49b0b335..1f4f9895315 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -500,6 +500,10 @@ servers.
 ---
 *** Reconnection is now asynchronous.
 
+---
+*** Nick completion is now case-insentive again after inadvertently
+being made case-sensitive in Emacs 24.2.
+
 ** Midnight-mode
 
 ---
@@ -564,7 +568,7 @@ which were installed by the user (as opposed to installed as
 dependencies).  This variable can also be manually customized.
 
 ---
-*** New command `package-install-user-selected-packages' installs all
+*** New command `package-install-selected-packages' installs all
 packages from `package-selected-packages' which are currently missing.
 
 ---