aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2006-09-12 22:05:57 +0000
committerChong Yidong2006-09-12 22:05:57 +0000
commitb96572ff12cc71a4e68bb49ebcaf30c4ad7167e3 (patch)
tree9eaf36a528e54652f6ddcabe0f270a1eb894f55e
parentfb97a80d123da1dd3e5a9e7153e1c73ee3561054 (diff)
downloademacs-b96572ff12cc71a4e68bb49ebcaf30c4ad7167e3.tar.gz
emacs-b96572ff12cc71a4e68bb49ebcaf30c4ad7167e3.zip
* net/rcirc.el (rcirc-print): Fix last change.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/net/rcirc.el9
2 files changed, 8 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index deabdbaa27c..f88ac078953 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12006-09-07 Ryan Yeske <rcyeske@gmail.com>
2
3 * net/rcirc.el (rcirc-print): Fix last change.
4
12006-09-12 Jay Belanger <belanger@truman.edu> 52006-09-12 Jay Belanger <belanger@truman.edu>
2 6
3 * calc/calc.el (calc-dispatch): Remove unnecessary `sit-for'. 7 * calc/calc.el (calc-dispatch): Remove unnecessary `sit-for'.
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 12c86b8163f..a639afeecf8 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -1260,11 +1260,10 @@ record activity."
1260 (with-current-buffer (window-buffer w) 1260 (with-current-buffer (window-buffer w)
1261 (when (eq major-mode 'rcirc-mode) 1261 (when (eq major-mode 'rcirc-mode)
1262 (with-selected-window w 1262 (with-selected-window w
1263 (when (<= (- (window-height) 1263 (when (<= (- (window-height)
1264 (- (line-number-at-pos 1264 (count-screen-lines
1265 (window-point)) 1265 (window-point)
1266 (line-number-at-pos 1266 (window-start))
1267 (window-start)))
1268 1) 1267 1)
1269 0) 1268 0)
1270 (recenter -1))))))) 1269 (recenter -1)))))))