Show
Ignore:
Timestamp:
06/02/07 09:29:41 (1 year ago)
Author:
miyoshi
Message:

Sync up with Emacs_22_BASE.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lisp/net/rcirc.el

    r4207 r4210  
    9696(defcustom rcirc-fill-column nil 
    9797  "*Column beyond which automatic line-wrapping should happen. 
    98 If nil, use value of `fill-column'.  If 'frame-width, use the 
    99 maximum frame width." 
     98If nil, use value of `fill-column'. 
     99If `window-width', use the window's width as maximum. 
     100If `frame-width', use the frame's width as maximum." 
    100101  :type '(choice (const :tag "Value of `fill-column'") 
     102                 (const :tag "Full window width" window-width) 
    101103                 (const :tag "Full frame width" frame-width) 
    102104                 (integer :tag "Number of columns")) 
    …… 
    144146 
    145147(defcustom rcirc-scroll-show-maximum-output t 
    146   "*If non-nil, scroll buffer to keep the point at the bottom of 
    147 the window." 
     148  "*If non-nil, scroll buffer to keep the point at the bottom of the window." 
    148149  :type 'boolean 
    149150  :group 'rcirc) 
    …… 
    12461247                      (fill-column (cond ((eq rcirc-fill-column 'frame-width) 
    12471248                                          (1- (frame-width))) 
     1249                                         ((eq rcirc-fill-column 'window-width) 
     1250                                          (1- (window-width))) 
    12481251                                         (rcirc-fill-column 
    12491252                                          rcirc-fill-column)