aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Wiegley2001-04-24 03:16:21 +0000
committerJohn Wiegley2001-04-24 03:16:21 +0000
commit157975e356a04f86bcad1f3503271d10149e7399 (patch)
tree9b49fedd1f30a9857b22973d891620dc96be0a74
parent3dc630b9e18cac41246c81e2d7d11c25857f4e58 (diff)
downloademacs-157975e356a04f86bcad1f3503271d10149e7399.tar.gz
emacs-157975e356a04f86bcad1f3503271d10149e7399.zip
(eshell-smart-redisplay): Added some safety code to work around a
redisplay problem I've been having.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/eshell/em-smart.el6
2 files changed, 10 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b47aa3576f3..78321bfc852 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
12001-04-23 John Wiegley <johnw@gnu.org> 12001-04-23 John Wiegley <johnw@gnu.org>
2 2
3 * eshell/em-smart.el (eshell-smart-redisplay): Added some safety
4 code to work around a redisplay problem I've been having.
5
62001-04-23 John Wiegley <johnw@gnu.org>
7
3 * calendar/timeclock.el (timeclock-day-required): If the time 8 * calendar/timeclock.el (timeclock-day-required): If the time
4 required for a particular day is not set, use `timeclock-workday'. 9 required for a particular day is not set, use `timeclock-workday'.
5 (timeclock-find-discrep): Added some sample code in a comment. 10 (timeclock-find-discrep): Added some sample code in a comment.
diff --git a/lisp/eshell/em-smart.el b/lisp/eshell/em-smart.el
index 9bef8b10d20..0d7810df9e2 100644
--- a/lisp/eshell/em-smart.el
+++ b/lisp/eshell/em-smart.el
@@ -262,7 +262,11 @@ and the end of the buffer are still visible."
262(defun eshell-smart-redisplay () 262(defun eshell-smart-redisplay ()
263 "Display as much output as possible, smartly." 263 "Display as much output as possible, smartly."
264 (if (eobp) 264 (if (eobp)
265 (recenter -1) 265 (save-excursion
266 (recenter -1)
267 ;; trigger the redisplay now, so that we catch any attempted
268 ;; point motion; this is to cover for a redisplay bug
269 (eshell-redisplay))
266 (let ((top-point (point))) 270 (let ((top-point (point)))
267 (and (memq 'eshell-smart-display-move pre-command-hook) 271 (and (memq 'eshell-smart-display-move pre-command-hook)
268 (>= (point) eshell-last-input-start) 272 (>= (point) eshell-last-input-start)