Changeset 4166 for trunk/lisp/net/rcirc.el

Timestamp:

09/18/06 20:48:14 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/net/rcirc.el (modified) (4 diffs)

trunk/lisp/net/rcirc.el

@@ -143 +143 @@
-  :group 'rcirc)
-
-
+croll-s
-  "*If non-nil, scroll buffer to keep the point at the bottom of
-the window."
@@ -762 +762 @@
-  (add-hook 'change-major-mode-hook 'rcirc-change-major-mode-hook nil t)
-  (add-hook 'kill-buffer-hook 'rcirc-kill-buffer-hook nil t)
-
-  (add-hook 'window-scroll-functions 'rcirc-scroll-to-bottom nil t)
-
-  ;; add to buffer list, and update buffer abbrevs
@@ -1167 +1165 @@
-(make-variable-buffer-local 'rcirc-last-sender)
-
-(defun rcirc-scroll-to-bottom (window display-start)
-  "Scroll window to show maximum output if `rcirc-show-maximum-output' is
-non-nil."
-  (when rcirc-show-maximum-output
-    (with-selected-window window
-      (when (>= (window-point) rcirc-prompt-end-marker)
-        (recenter -1)))))
-
-(defun rcirc-print (process sender response target text &optional activity)
-  "Print TEXT in the buffer associated with TARGET.
@@ -1253 +1243 @@
-          ;; set the window point for buffers show in windows
-          (walk-windows (lambda (w)
-unless (eq (selected-window) w
-    (when (and
-  
-  
-  
-  (set-window-point w (point-max)
+when (and (not (eq (selected-window) w)
+           
+
+
+
+(set-window-point w (point-max
-                        nil t)
-
-          ;; restore the point
-          (goto-char (if moving rcirc-prompt-end-marker old-point))
+
+        ;; keep window on bottom line if it was already there
+          (when rcirc-scroll-show-maximum-output
+            (walk-windows (lambda (w)
+                            (when (eq (window-buffer w) (current-buffer))
+                              (with-current-buffer (window-buffer w)
+                                (when (eq major-mode 'rcirc-mode)
+                                  (with-selected-window w
+                                    (when (<= (- (window-height)
+                                                 (count-screen-lines
+                                                  (window-point)
+                                                  (window-start))
+                                                 1)
+                                              0)
+                                      (recenter -1)))))))
+                          nil t))
-
-          ;; flush undo (can we do something smarter here?)