Doc fixes related to vc-initial-comment.

* doc/emacs/maintaining.texi (Registering): Remove vc-initial-comment. 

* lisp/vc/vc.el (vc-initial-comment): Mark as obsolete.

* lisp/ChangeLog.15: Fix old entry.

* etc/NEWS: Mention this.

Fixes: debbugs:9745

6 files changed, 20 insertions, 5 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 5f7f63fca31..15b84c27075 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-18  Glenn Morris  <rgm@gnu.org>
+
+        * maintaining.texi (Registering): Remove vc-initial-comment.  (Bug#9745)
+
 2011-10-18  Chong Yidong  <cyd@gnu.org>
 
         * display.texi (Faces): Simplify discussion.  Move documentation
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index dafc9327c74..354812edc1f 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -898,10 +898,11 @@ You can specify a different default by setting the variable
 numeric argument; then it reads the initial revision ID for this
 particular file using the minibuffer.
 
-@vindex vc-initial-comment
-  If @code{vc-initial-comment} is non-@code{nil}, @kbd{C-x v i} reads an
-initial comment to describe the purpose of this source file.  Reading
-the initial comment works like reading a log entry (@pxref{Log Buffer}).
+@c See http://debbugs.gnu.org/9745
+@c @vindex vc-initial-comment
+@c   If @code{vc-initial-comment} is non-@code{nil}, @kbd{C-x v i} reads an
+@c initial comment to describe the purpose of this source file.  Reading
+@c the initial comment works like reading a log entry (@pxref{Log Buffer}).
 
 @node VC Change Log
 @subsubsection VC Change Log
diff --git a/etc/NEWS b/etc/NEWS
index ce30ebb22b0..5592fe325ff 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -844,6 +844,10 @@ binding `log-view-expanded-log-entry-function' to a suitable function.
 *** New command `vc-ediff' allows visual comparison of two revisions
 of a file similar to `vc-diff', but using ediff backend.
 
++++
+*** The option vc-initial-comment was removed in Emacs 23.2, but
+this was not advertised at the time.
+
 ** FIXME: xdg-open for browse-url and reportbug, 2010/08.
 
 ** Obsolete modes
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 21f52e8ca03..0562f2f2fa0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-18  Glenn Morris  <rgm@gnu.org>
+
+        * vc/vc.el (vc-initial-comment): Mark as obsolete.  (Bug#9745)
+
 2011-10-18  Chong Yidong  <cyd@gnu.org>
 
         * faces.el (cursor): Doc fix.
diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15
index 2acf847cddc..9cb24baeb1f 100644
--- a/lisp/ChangeLog.15
+++ b/lisp/ChangeLog.15
@@ -22676,7 +22676,7 @@
         (vc-next-action, vc-transfer-file, vc-rename-file): Also pass the
         backend when calling vc-mode-line.
         (vc-register): Do not create a closure for calling the vc register
-        function, call it directly.
+        function, call it directly.  No longer obey vc-initial-comment.
 
 2009-06-23  Dan Nicolaescu  <dann@ics.uci.edu>
 
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 62536fd94be..cdc4f155083 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -675,6 +675,8 @@
   :type 'boolean
   :group 'vc)
 
+(make-obsolete-variable 'vc-initial-comment "it has no effect." "23.2")
+
 (defcustom vc-default-init-revision "1.1"
   "A string used as the default revision number when a new file is registered.
 This can be overridden by giving a prefix argument to \\[vc-register].  This