merge masterxwidget

3 files changed, 13 insertions, 1 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 37031890945..1fcea545a73 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-08  Artur Malabarba  <bruce.connor.am@gmail.com>
+
+        * NEWS: Document `comment-line'.
+
 2015-02-03  Artur Malabarba  <bruce.connor.am@gmail.com>
 
         * NEWS: Document package.el's improved dependency-handling.
diff --git a/etc/GNUS-NEWS b/etc/GNUS-NEWS
index 4f311e3d9b5..ee3584fdb82 100644
--- a/etc/GNUS-NEWS
+++ b/etc/GNUS-NEWS
@@ -9,6 +9,8 @@ For older news, see Gnus info node "New Features".
 
 * New features
 
+** nnimap can request and use the Gmail "X-GM-LABELS".
+
 ** New package `gnus-notifications.el' can send notifications when you
    receive new messages.
 
diff --git a/etc/NEWS b/etc/NEWS
index 72e23562868..4c7160ebca6 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -53,7 +53,7 @@ build with 'make V=1'.
 group instead of a user if its argument is prefixed by ':' (a colon).
 This will cause the game score files in ${localstatedir}/games/emacs
 to be owned by that group, and the helper program for updating them to
-be installed setgid.
+be installed setgid.  The option now defaults to the 'games' group.
 
 ---
 ** The `grep-changelog' script (and its manual page) are no longer included.
@@ -66,6 +66,8 @@ so if you want to use it, you can always take a copy from an older Emacs.
 
 * Changes in Emacs 25.1
 
+** New command `comment-line' bound to `C-x C-;'.
+
 ** New function `custom-prompt-customize-unsaved-options' checks for
 unsaved customizations and prompts user to customize (if found).
 
@@ -599,6 +601,10 @@ in languages like German where downcasing rules depend on grammar.
 
 * Lisp Changes in Emacs 25.1
 
+** lexical closures can use (:documentation <form>) to build their docstring.
+It should be placed right where the docstring would be, and <form> is then
+evaluated (and should return a string) when the closure is built.
+
 ** define-inline provides a new way to define inlinable functions.
 
 ** New function macroexpand-1 to perform a single step of macroexpansion.