diff options
| author | Leo Liu <sdl.web@gmail.com> | 2014-10-29 09:37:16 +0800 |
|---|---|---|
| committer | Leo Liu <sdl.web@gmail.com> | 2014-10-29 09:37:16 +0800 |
| commit | 14e5809d3cc1fd89e50f88d5783219091596a271 (patch) | |
| tree | 4a4cc209e8f0609bdf85ba8a84cde13e72362d96 | |
| parent | 3f3b46d49bbf90ebbaa66c42d0ccffb5c9621eb7 (diff) | |
| download | emacs-14e5809d3cc1fd89e50f88d5783219091596a271.tar.gz | |
* net/rcirc.el (rcirc-fill-column): Use function.
(rcirc-markup-fill): Remove adjustment.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/rcirc.el | 12 |
2 files changed, 11 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 967e4a74c14..89d887b0f0b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-10-29 Leo Liu <sdl.web@gmail.com> + + * net/rcirc.el (rcirc-fill-column): Use function. + (rcirc-markup-fill): Remove adjustment. + 2014-10-28 Christopher Schmidt <ch@ristopher.com> * calc/calc.el (quick-calc): diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index 44434b789c9..388c2b2879c 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -146,12 +146,12 @@ for connections using SSL/TLS." (defcustom rcirc-fill-column nil "Column beyond which automatic line-wrapping should happen. If nil, use value of `fill-column'. -If a symbol (e.g., `frame-width' or `window-body-width'), call it -to compute the number of columns." +If a function (e.g., `frame-text-width' or `window-text-width'), +call it to compute the number of columns." :version "25.1" :type '(choice (const :tag "Value of `fill-column'" nil) - (symbol :tag "Function returning the number of columns") - (integer :tag "Number of columns")) + (integer :tag "Number of columns") + (function :tag "Function returning the number of columns")) :group 'rcirc) (defcustom rcirc-fill-prefix nil @@ -2536,8 +2536,8 @@ If ARG is given, opens the URL in a new browser window." (or rcirc-fill-prefix (make-string (- (point) (line-beginning-position)) ?\s))) (fill-column (- (cond ((null rcirc-fill-column) fill-column) - ((symbolp rcirc-fill-column) - (1- (funcall rcirc-fill-column))) + ((functionp rcirc-fill-column) + (funcall rcirc-fill-column)) (t rcirc-fill-column)) ;; make sure ... doesn't cause line wrapping 3))) |