From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 21 May 2007 19:39:10 +0000 (+0000)
Subject: (rcirc-fill-column): Allow `window-width'.
X-Git-Url: http://git.hcoop.net/bpt/emacs.git/commitdiff_plain/d51f146b480d273b4eeb4befb3da2d1f06929d9e

(rcirc-fill-column): Allow `window-width'.
(rcirc-print): Handle `window-width'.
(rcirc-buffer-maximum-lines): Doc fix.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cd6587e6d5..53e45ef70d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2007-05-21  Trent Buck  <trentbuck@gmail.com>  (tiny change)
+
+	* net/rcirc.el (rcirc-fill-column): Allow `window-width'.
+	(rcirc-print): Handle `window-width'.
+	(rcirc-buffer-maximum-lines): Doc fix.
+
+2007-05-19  Kevin Ryde  <user42@zip.com.au>
+
+	* info.el (Info-fontify-node): Match https also.
+
 2007-05-18  Richard Stallman  <rms@gnu.org>
 
 	* simple.el (push-mark): Doc fix.
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 311c052fa3..60d81aedb7 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))))