Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-283

1 files changed, 30 insertions, 32 deletions

diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index 0a8c8be697f..8b7338f8833 100644
--- a/lisp/eshell/esh-mode.el
+++ b/lisp/eshell/esh-mode.el
@@ -778,38 +778,36 @@ This is done after all necessary filtering has been done."
         (setq string (funcall (car functions) string))
         (setq functions (cdr functions))))
     (if (and string oprocbuf (buffer-name oprocbuf))
-        (let ((obuf (current-buffer))
-              opoint obeg oend)
-          (set-buffer oprocbuf)
-          (setq opoint (point))
-          (setq obeg (point-min))
-          (setq oend (point-max))
-          (let ((buffer-read-only nil)
-                (nchars (length string))
-                (ostart nil))
-            (widen)
-            (goto-char eshell-last-output-end)
-            (setq ostart (point))
-            (if (<= (point) opoint)
-                (setq opoint (+ opoint nchars)))
-            (if (< (point) obeg)
-                (setq obeg (+ obeg nchars)))
-            (if (<= (point) oend)
-                (setq oend (+ oend nchars)))
-            (insert-before-markers string)
-            (if (= (window-start (selected-window)) (point))
-                (set-window-start (selected-window)
-                                  (- (point) nchars)))
-            (if (= (point) eshell-last-input-end)
-                (set-marker eshell-last-input-end
-                            (- eshell-last-input-end nchars)))
-            (set-marker eshell-last-output-start ostart)
-            (set-marker eshell-last-output-end (point))
-            (force-mode-line-update))
-          (narrow-to-region obeg oend)
-          (goto-char opoint)
-          (eshell-run-output-filters)
-          (set-buffer obuf)))))
+        (let (opoint obeg oend)
+          (with-current-buffer oprocbuf
+            (setq opoint (point))
+            (setq obeg (point-min))
+            (setq oend (point-max))
+            (let ((buffer-read-only nil)
+                  (nchars (length string))
+                  (ostart nil))
+              (widen)
+              (goto-char eshell-last-output-end)
+              (setq ostart (point))
+              (if (<= (point) opoint)
+                  (setq opoint (+ opoint nchars)))
+              (if (< (point) obeg)
+                  (setq obeg (+ obeg nchars)))
+              (if (<= (point) oend)
+                  (setq oend (+ oend nchars)))
+              (insert-before-markers string)
+              (if (= (window-start (selected-window)) (point))
+                  (set-window-start (selected-window)
+                                    (- (point) nchars)))
+              (if (= (point) eshell-last-input-end)
+                  (set-marker eshell-last-input-end
+                              (- eshell-last-input-end nchars)))
+              (set-marker eshell-last-output-start ostart)
+              (set-marker eshell-last-output-end (point))
+              (force-mode-line-update))
+            (narrow-to-region obeg oend)
+            (goto-char opoint)
+            (eshell-run-output-filters))))))
 
 (defun eshell-run-output-filters ()
   "Run the `eshell-output-filter-functions' on the current output."