Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 832-838)

   - Remove lisp/erc/erc-nicklist.el
   - Update some .arch-inventory files
   - Fix void function definition error in cus-edit.el
   - Update from CVS
   - Restore lisp/emacs-lisp/cl-loaddefs.el
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 75-83)

   - Update from CVS
   - Remove lisp/erc/erc-nicklist.el
   - Update some .arch-inventory files
   - Indicate that emacs--devo--0--patch-834 does not need to be applied
   - Merge from gnus--rel--5.10
   - Restore lisp/emacs-lisp/cl-loaddefs.el

 * gnus--rel--5.10  (patch 239-241)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-239

2 files changed, 16 insertions, 12 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 21194e24a2f..cf6019cbfd2 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -50,6 +50,9 @@ recenter the visited source file.  Its value can be a number (for example,
 is on a remote machine, or a hyphen otherwise.
 ** The new command balance-window-area balances windows both vertically
 and horizontally.
+
+** The new command close-display-connection can be used to close a connection
+to a remote display, e.g. because the display is about to become unreachable.
 
 * Startup Changes in Emacs 23.1
 
@@ -74,14 +77,8 @@ history element containing the search string becomes the current.
 
 * New Modes and Packages in Emacs 23.1
 
-** css-mode to edit Cascading Style Sheets.
-
 ** bibtex-style-mode helps you write BibTeX's *.bst files.
 
-** vera-mode to edit Vera files.
-
-** socks.el (which had been part of W3) is now part of Emacs.
-
 ** minibuffer-indicate-depth-mode shows the minibuffer depth in the prompt.
 
 
@@ -95,12 +92,11 @@ Only copyright lines with holders matching copyright-names-regexp will be
 considered for update.
 
 ** VC
-*** VC backends can provide completion of revision names.
-*** VC has some support for Bazaar (bzr).
+*** Clicking on the VC mode-line entry now pops the VC menu.
 
-*** VC has some support for Mercurial (hg).
+*** The VC mode-line entry now has a tooltip.
 
-*** VC has some support for Git.
+*** VC has some support for Bazaar (bzr).
 
 ** sgml-electric-tag-pair-mode lets you simultaneously edit matched tag pairs.
 
@@ -147,7 +143,9 @@ file copy is checked via the file's checksum.
 If `default-directory' is a remote file name, subprocesses are started
 on the corresponding remote system.
 
-** C-x C-q in dired-mode now runs the command wdired-change-to-wdired-mode.
+** C-x C-q in dired-mode now runs the command wdired-change-to-wdired-mode,
+and C-x C-q in wdired-mode exits it with asking a question about
+saving changes.
 
 * Changes in Emacs 23.1 on non-free operating systems
 
@@ -167,6 +165,8 @@ supported on other platforms, but not on Windows due to using the winsock
 
 * Lisp Changes in Emacs 23.1
 
+** Non-breaking space now acts as whitespace.
+
 +++
 ** In `condition-case', a handler can specify "let the debugger run first".
 
@@ -220,7 +220,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
diff --git a/etc/NEWS.22 b/etc/NEWS.22
index 5b1f9e8c6fa..ae31b2489e1 100644
--- a/etc/NEWS.22
+++ b/etc/NEWS.22
@@ -63,8 +63,12 @@ in to make it use the scrollbars from the system theme.
 
 ** VC
 
+*** VC backends can provide completion of revision names.
+
 *** VC has some support for Mercurial (hg).
 
+*** VC has some support for Git.
+
 
 * Installation Changes in Emacs 22.1