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

(rcirc-markup-fill): Remove adjustment.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 967e4a74c14a112636d5f48e84d79df6029363e5..89d887b0f0b0e3163f3ea8391d7ab40155f7bd4d 100644 (file)
--- 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 44434b789c9ae8ec25d6a78c706b3a6f8a83cfd8..388c2b2879cf981ba7a7f69b88cb9b84391ce9d5 100644 (file)
--- 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)))