diff options
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/simple.el | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 59b0ca370c4..94ff282d58c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2013-02-08 Stefan Monnier <monnier@iro.umontreal.ca> + * simple.el (end-of-buffer): Don't touch unrelated windows (bug#13466). + (fundamental-mode): Use run-mode-hooks. + * eshell/esh-proc.el (eshell/kill): Fix last change. * eshell/em-ls.el (eshell-ls-dir): Fix use of CL in last change. diff --git a/lisp/simple.el b/lisp/simple.el index d7541f68778..9587d3c006c 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -349,8 +349,7 @@ buffer causes automatic display of the corresponding source code location." Other major modes are defined by comparison with this one." (interactive) (kill-all-local-variables) - (unless delay-mode-hooks - (run-hooks 'after-change-major-mode-hook))) + (run-mode-hooks)) ;; Special major modes to view specially formatted data rather than files. @@ -868,7 +867,8 @@ Don't use this command in Lisp programs! ;; If we went to a place in the middle of the buffer, ;; adjust it to the beginning of a line. (cond ((and arg (not (consp arg))) (forward-line 1)) - ((> (point) (window-end nil t)) + ((and (eq (current-buffer) (window-buffer)) + (> (point) (window-end nil t))) ;; If the end of the buffer is not already on the screen, ;; then scroll specially to put it near, but not at, the bottom. (overlay-recenter (point)) |