Commit 14e5809d authored by Leo Liu's avatar Leo Liu

* net/rcirc.el (rcirc-fill-column): Use function.

(rcirc-markup-fill): Remove adjustment.
parent 3f3b46d4
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):
......
......@@ -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)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment