[Emacs-diffs] Changes to emacs/lisp/ielm.el

[Miles Bader]

Index: emacs/lisp/ielm.el
diff -c emacs/lisp/ielm.el:1.26 emacs/lisp/ielm.el:1.27
*** emacs/lisp/ielm.el:1.26     Sat Jun 15 10:17:24 2002
--- emacs/lisp/ielm.el  Mon Aug 19 01:03:38 2002
***************
*** 1,6 ****
  ;;; ielm.el --- interaction mode for Emacs Lisp
  
! ;; Copyright (C) 1994 Free Software Foundation, Inc.
  
  ;; Author: David Smith <address@hidden>
  ;; Maintainer: FSF
--- 1,6 ----
  ;;; ielm.el --- interaction mode for Emacs Lisp
  
! ;; Copyright (C) 1994, 2002 Free Software Foundation, Inc.
  
  ;; Author: David Smith <address@hidden>
  ;; Maintainer: FSF
***************
*** 452,469 ****
        '(ielm-font-lock-keywords nil nil ((?: . "w") (?- . "w") (?* . "w"))))
  
    ;; A dummy process to keep comint happy. It will never get any input
!   (if (comint-check-proc (current-buffer)) nil
      ;; Was cat, but on non-Unix platforms that might not exist, so
      ;; use hexl instead, which is part of the Emacs distribution.
      (start-process "ielm" (current-buffer) "hexl")
      (process-kill-without-query (ielm-process))
      (goto-char (point-max))
      ;; Add a silly header
      (insert ielm-header)
      (ielm-set-pm (point-max))
      (comint-output-filter (ielm-process) ielm-prompt)
      (set-marker comint-last-input-start (ielm-pm))
      (set-process-filter (get-buffer-process (current-buffer)) 
'comint-output-filter))
    (run-hooks 'ielm-mode-hook))
  
  (defun ielm-get-old-input nil
--- 452,475 ----
        '(ielm-font-lock-keywords nil nil ((?: . "w") (?- . "w") (?* . "w"))))
  
    ;; A dummy process to keep comint happy. It will never get any input
!   (unless (comint-check-proc (current-buffer))
      ;; Was cat, but on non-Unix platforms that might not exist, so
      ;; use hexl instead, which is part of the Emacs distribution.
      (start-process "ielm" (current-buffer) "hexl")
      (process-kill-without-query (ielm-process))
      (goto-char (point-max))
+     
+     ;; Lisp output can include raw characters that confuse comint's
+     ;; carriage control code.
+     (set (make-local-variable 'comint-inhibit-carriage-motion) t)
+ 
      ;; Add a silly header
      (insert ielm-header)
      (ielm-set-pm (point-max))
      (comint-output-filter (ielm-process) ielm-prompt)
      (set-marker comint-last-input-start (ielm-pm))
      (set-process-filter (get-buffer-process (current-buffer)) 
'comint-output-filter))
+ 
    (run-hooks 'ielm-mode-hook))
  
  (defun ielm-get-old-input nil