diff options
| author | Richard M. Stallman <rms@gnu.org> | 2007-05-21 19:39:10 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 2007-05-21 19:39:10 +0000 |
| commit | d51f146b480d273b4eeb4befb3da2d1f06929d9e (patch) | |
| tree | 7a6649d7b5fc1c94a734713d12cdfeb05d2d349a /lisp/net | |
| parent | 82113a92c51f90184c847188755f9f0d5cfa1217 (diff) | |
| download | emacs-d51f146b480d273b4eeb4befb3da2d1f06929d9e.tar.gz | |
(rcirc-fill-column): Allow `window-width'.
(rcirc-print): Handle `window-width'.
(rcirc-buffer-maximum-lines): Doc fix.
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/rcirc.el | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index 311c052fa30..60d81aedb7a 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -95,9 +95,11 @@ Each element looks like (SERVER-REGEXP . CHANNEL-LIST)." (defcustom rcirc-fill-column nil "*Column beyond which automatic line-wrapping should happen. -If nil, use value of `fill-column'. If 'frame-width, use the -maximum frame width." +If nil, use value of `fill-column'. +If `window-width', use the window's width as maximum. +If `frame-width', use the frame's width as maximum." :type '(choice (const :tag "Value of `fill-column'") + (const :tag "Full window width" window-width) (const :tag "Full frame width" frame-width) (integer :tag "Number of columns")) :group 'rcirc) @@ -143,8 +145,7 @@ number. If zero or nil, no truncating is done." :group 'rcirc) (defcustom rcirc-scroll-show-maximum-output t - "*If non-nil, scroll buffer to keep the point at the bottom of -the window." + "*If non-nil, scroll buffer to keep the point at the bottom of the window." :type 'boolean :group 'rcirc) @@ -1245,6 +1246,8 @@ record activity." (make-string (- text-start fill-start) ?\s))) (fill-column (cond ((eq rcirc-fill-column 'frame-width) (1- (frame-width))) + ((eq rcirc-fill-column 'window-width) + (1- (window-width))) (rcirc-fill-column rcirc-fill-column) (t fill-column)))) |