diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-10-29 13:40:26 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-10-29 13:40:26 -0400 |
| commit | cc99f920f507d28bb1422f8a3d52723ddc734c8a (patch) | |
| tree | 0f5028e7f6bad4d29edcaa598069bf81cd01f09f | |
| parent | fcc50328eefd1a8766c49c8eb921707a86d9dde9 (diff) | |
| download | emacs-cc99f920f507d28bb1422f8a3d52723ddc734c8a.tar.gz | |
* 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.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/net/rcirc.el | 2 |
2 files changed, 3 insertions, 1 deletions
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")) |