[Emacs-diffs] Changes to emacs/lisp/comint.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/03/12 17:57:00

Index: comint.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/comint.el,v
retrieving revision 1.374
retrieving revision 1.375
diff -u -b -r1.374 -r1.375
--- comint.el   5 Mar 2008 01:57:57 -0000       1.374
+++ comint.el   12 Mar 2008 17:56:57 -0000      1.375
@@ -656,8 +656,8 @@
   ;; http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg00827.html
   ;;
   ;; This makes it really work to keep point at the bottom.
-;;;  (make-local-variable 'scroll-conservatively)
-;;;  (setq scroll-conservatively 10000)
+  ;; (make-local-variable 'scroll-conservatively)
+  ;; (setq scroll-conservatively 10000)
   (add-hook 'pre-command-hook 'comint-preinput-scroll-to-bottom t t)
   (make-local-variable 'comint-ptyp)
   (make-local-variable 'comint-process-echoes)
@@ -962,8 +962,9 @@
 (defun comint-dynamic-list-input-ring-select ()
   "Choose the input history entry that point is in or next to."
   (interactive)
-  (let (beg end completion (buffer completion-reference-buffer)
-       (base-size completion-base-size))
+  (let ((buffer completion-reference-buffer)
+        (base-size completion-base-size)
+        beg end completion)
     (if (and (not (eobp)) (get-text-property (point) 'mouse-face))
        (setq end (point) beg (1+ (point))))
     (if (and (not (bobp)) (get-text-property (1- (point)) 'mouse-face))
@@ -1869,13 +1870,13 @@
            (if (eq scroll 'this)
                (goto-char (point-max))
              (walk-windows
-              (function (lambda (window)
+               (lambda (window)
                 (if (and (eq (window-buffer window) current)
                          (or (eq scroll t) (eq scroll 'all)))
                     (progn
                       (select-window window)
                       (goto-char (point-max))
-                      (select-window selected)))))
+                       (select-window selected))))
               nil t))))))
 
 (defun comint-postoutput-scroll-to-bottom (string)
@@ -1892,9 +1893,8 @@
     (unwind-protect
        (if process
            (walk-windows
-            (function (lambda (window)
-              (if (eq (window-buffer window) current)
-                  (progn
+             (lambda (window)
+               (when (eq (window-buffer window) current)
                     (select-window window)
                     (if (and (< (point) (process-mark process))
                              (or (eq scroll t) (eq scroll 'all)
@@ -1912,7 +1912,7 @@
                         (save-excursion
                           (goto-char (point-max))
                           (recenter (- -1 scroll-margin))))
-                    (select-window selected)))))
+                 (select-window selected)))
             nil t))
       (set-buffer current))))
 
@@ -2182,8 +2182,8 @@
   (interactive)
   (comint-skip-input)
   (interrupt-process nil comint-ptyp)
-;;  (process-send-string nil "\n")
-)
+  ;; (process-send-string nil "\n")
+  )
 
 (defun comint-kill-subjob ()
   "Send kill signal to the current subjob.
@@ -3401,37 +3401,22 @@
             (or (re-search-backward comint-prompt-regexp nil t)
                 (error "No prompt found or `comint-prompt-regexp' not set 
properly"))))
 
-    ;;;;;;;;;;;;;;;;;;;;;
       ;; Set up for redirection
-    ;;;;;;;;;;;;;;;;;;;;;
       (comint-redirect-setup
-       ;; Output Buffer
        output-buffer
-       ;; Comint Buffer
-       (current-buffer)
-       ;; Finished Regexp
-       comint-prompt-regexp
-       ;; Echo input
-       echo)
+       (current-buffer)                 ; Comint Buffer
+       comint-prompt-regexp             ; Finished Regexp
+       echo)                            ; Echo input
 
-    ;;;;;;;;;;;;;;;;;;;;;
       ;; Set the filter
-    ;;;;;;;;;;;;;;;;;;;;;
-      ;; Save the old filter
-      (setq comint-redirect-original-filter-function
+      (setq comint-redirect-original-filter-function ; Save the old filter
            (process-filter proc))
       (set-process-filter proc 'comint-redirect-filter)
 
-    ;;;;;;;;;;;;;;;;;;;;;
       ;; Send the command
-    ;;;;;;;;;;;;;;;;;;;;;
-      (process-send-string
-       (current-buffer)
-       (concat command "\n"))
+      (process-send-string (current-buffer) (concat command "\n"))
 
-    ;;;;;;;;;;;;;;;;;;;;;
       ;; Show the output
-    ;;;;;;;;;;;;;;;;;;;;;
       (or no-display
          (display-buffer
           (get-buffer-create
@@ -3478,13 +3463,12 @@
                    results)))
       results)))
 
-(mapc (lambda (x)
-       (add-to-list 'debug-ignored-errors x))
-      '("^Not at command line$"
+(dolist (x '("^Not at command line$"
        "^Empty input ring$"
        "^No history$"
        "^Not found$"                   ; Too common?
        "^Current buffer has no process$"))
+  (add-to-list 'debug-ignored-errors x))
 
 
 ;; Converting process modes to use comint mode