* 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 c0e0c4c1919bdd56aaf62cf63fe4fa158f31146d..1def6877f2c71d6b7b5c26e24f2944743c9177f2 100644 (file)
--- 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 858fad4c0608e23e5e89d1462afdd77f784e7c31..411932142e97c5e39869c0edc8642c8cb351c428 100644 (file)
--- 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"))