diff options
| author | Stefan Monnier | 2014-07-08 15:15:28 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2014-07-08 15:15:28 -0400 |
| commit | 78478ff63638bafb83ddd5e34f242210833c1f1e (patch) | |
| tree | 098985af4e28a6491e21155513ae6a2fd0a19875 /lisp/eshell | |
| parent | dee89b6708a2f369ea1ba4ff0366f6506ccaeaef (diff) | |
| download | emacs-78478ff63638bafb83ddd5e34f242210833c1f1e.tar.gz emacs-78478ff63638bafb83ddd5e34f242210833c1f1e.zip | |
* lisp/leim/quail/sisheng.el (sisheng-list): Don't bother with-case-table.
* lisp/eshell/em-smart.el (eshell-smart-scroll-window): Use
with-selected-window.
Diffstat (limited to 'lisp/eshell')
| -rw-r--r-- | lisp/eshell/em-smart.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/eshell/em-smart.el b/lisp/eshell/em-smart.el index ee6181000ba..70c53a809b5 100644 --- a/lisp/eshell/em-smart.el +++ b/lisp/eshell/em-smart.el | |||
| @@ -188,7 +188,8 @@ The options are `begin', `after' or `end'." | |||
| 188 | (add-hook 'eshell-post-command-hook | 188 | (add-hook 'eshell-post-command-hook |
| 189 | (function | 189 | (function |
| 190 | (lambda () | 190 | (lambda () |
| 191 | (setq eshell-smart-command-done t))) t t) | 191 | (setq eshell-smart-command-done t))) |
| 192 | t t) | ||
| 192 | 193 | ||
| 193 | (unless (eq eshell-review-quick-commands t) | 194 | (unless (eq eshell-review-quick-commands t) |
| 194 | (add-hook 'eshell-post-command-hook | 195 | (add-hook 'eshell-post-command-hook |
| @@ -200,8 +201,7 @@ The options are `begin', `after' or `end'." | |||
| 200 | (unless eshell-currently-handling-window | 201 | (unless eshell-currently-handling-window |
| 201 | (let ((inhibit-point-motion-hooks t) | 202 | (let ((inhibit-point-motion-hooks t) |
| 202 | (eshell-currently-handling-window t)) | 203 | (eshell-currently-handling-window t)) |
| 203 | (save-selected-window | 204 | (with-selected-window wind |
| 204 | (select-window wind) | ||
| 205 | (eshell-smart-redisplay))))) | 205 | (eshell-smart-redisplay))))) |
| 206 | 206 | ||
| 207 | (defun eshell-refresh-windows (&optional frame) | 207 | (defun eshell-refresh-windows (&optional frame) |
| @@ -212,12 +212,12 @@ The options are `begin', `after' or `end'." | |||
| 212 | (lambda (wind) | 212 | (lambda (wind) |
| 213 | (with-current-buffer (window-buffer wind) | 213 | (with-current-buffer (window-buffer wind) |
| 214 | (if eshell-mode | 214 | (if eshell-mode |
| 215 | (let (window-scroll-functions) | 215 | (let (window-scroll-functions) ;;FIXME: Why? |
| 216 | (eshell-smart-scroll-window wind (window-start)) | 216 | (eshell-smart-scroll-window wind (window-start)) |
| 217 | (setq affected t)))))) | 217 | (setq affected t)))))) |
| 218 | 0 frame) | 218 | 0 frame) |
| 219 | (if affected | 219 | (if affected |
| 220 | (let (window-scroll-functions) | 220 | (let (window-scroll-functions) ;;FIXME: Why? |
| 221 | (eshell-redisplay))))) | 221 | (eshell-redisplay))))) |
| 222 | 222 | ||
| 223 | (defun eshell-smart-display-setup () | 223 | (defun eshell-smart-display-setup () |