* 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.
This commit is contained in:
Glenn Morris 2014-10-29 13:40:26 -04:00
parent fcc50328ee
commit cc99f920f5
2 changed files with 3 additions and 1 deletions

View file

@ -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.

View file

@ -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"))