[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r118227: * net/rcirc.el (rcirc-fill-column): Use fun
From: |
Leo Liu |
Subject: |
[Emacs-diffs] trunk r118227: * net/rcirc.el (rcirc-fill-column): Use function. |
Date: |
Wed, 29 Oct 2014 01:38:10 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 118227
revision-id: address@hidden
parent: address@hidden
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Wed 2014-10-29 09:37:16 +0800
message:
* net/rcirc.el (rcirc-fill-column): Use function.
(rcirc-markup-fill): Remove adjustment.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/net/rcirc.el rcirc.el-20091113204419-o5vbwnq5f7feedwu-4032
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-10-29 00:37:37 +0000
+++ b/lisp/ChangeLog 2014-10-29 01:37:16 +0000
@@ -1,3 +1,8 @@
+2014-10-29 Leo Liu <address@hidden>
+
+ * net/rcirc.el (rcirc-fill-column): Use function.
+ (rcirc-markup-fill): Remove adjustment.
+
2014-10-28 Christopher Schmidt <address@hidden>
* calc/calc.el (quick-calc):
=== modified file 'lisp/net/rcirc.el'
--- a/lisp/net/rcirc.el 2014-10-28 21:55:28 +0000
+++ b/lisp/net/rcirc.el 2014-10-29 01:37:16 +0000
@@ -146,12 +146,12 @@
(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 @@
(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)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r118227: * net/rcirc.el (rcirc-fill-column): Use function.,
Leo Liu <=