From: Glenn Morris <rgm@gnu.org>
Date: Wed, 29 Oct 2014 17:40:26 +0000 (-0400)
Subject: * lisp/net/rcirc.el (rcirc-fill-column): Unbump :version.
X-Git-Tag: emacs-25.0.90~2635^2~625
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cc99f920f507d28bb1422f8a3d52723ddc734c8a;p=emacs.git

* lisp/net/rcirc.el (rcirc-fill-column): Unbump :version.
A change in the possible :type with no change in the default does not
merit a :version bump.
Mark :risky.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c0e0c4c1919..1def6877f2c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2014-10-29  Glenn Morris  <rgm@gnu.org>
 
+	* net/rcirc.el (rcirc-fill-column): Unbump :version.  Mark :risky.
+
 	* version.el (emacs-bzr-version, emacs-bzr-get-version):
 	Revert 2014-10-26 change.
 
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 858fad4c060..411932142e9 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -148,7 +148,7 @@ for connections using SSL/TLS."
 If nil, use value of `fill-column'.
 If a function (e.g., `frame-text-width' or `window-text-width'),
 call it to compute the number of columns."
-  :version "25.1"
+  :risky t                              ; can get funcalled
   :type '(choice (const :tag "Value of `fill-column'" nil)
 		 (integer :tag "Number of columns")
 		 (function :tag "Function returning the number of columns"))