Merge from trunk; add Bug#.

1 files changed, 12 insertions, 0 deletions

diff --git a/etc/NEWS b/etc/NEWS
index dd302a052d6..2e11af4c1c3 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -31,6 +31,11 @@ may or may not be useful.  By default, these warnings are not generated.
 
 
 * Startup Changes in Emacs 24.2
+
+** Emacs no longer searches for `leim-list.el' files beneath the standard
+lisp/ directory.  There should not be any there anyway.  If you have
+been adding them there, put them somewhere else, eg site-lisp.
+
 
 * Changes in Emacs 24.2
 
@@ -45,6 +50,13 @@ may or may not be useful.  By default, these warnings are not generated.
 * New Modes and Packages in Emacs 24.2
 
 * Incompatible Lisp Changes in Emacs 24.2
+
++++
+** Docstrings starting with `*' no longer indicate user options.
+Only variables defined using `defcustom' are considered user options.
+The function `user-variable-p' is now an obsolete alias for
+`custom-variable-p'.
+
 
 * Lisp changes in Emacs 24.2