(term-emulate-terminal): Fix last change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 415841d58564cf92a0d2fd3279b22d017d8a4683..053fb5c9a7e6be0fe430af6c9c2c5c35260509e3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2002-04-16  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * term.el (term-emulate-terminal): Fix last change.
+
 2002-04-12  Richard M. Stallman  <rms@gnu.org>
 
        * files.el (hack-one-local-variable): Clear text props from string

diff --git a/lisp/term.el b/lisp/term.el
index 005ee02c8cc9a65ee6df0da750ded93f9a2adb39..d5d1173daea4f68324e63c6a02fbdbaa58766058 100644 (file)
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -2830,11 +2830,11 @@ See `term-prompt-regexp'."
                           ((eq char ?\^G)
                            (beep t)) ; Bell
                           ((eq char ?\032)
-                           (let ((end (string-match "\r?$" str i)))
+                           (let ((end (string-match "\r?\n" str i)))
                              (if end
-                                 (progn (funcall term-command-hook
-                                                 (substring str (1+ i) end))
-                                        (setq i (match-end 0)))
+                                 (funcall term-command-hook
+                                          (prog1 (substring str (1+ i) end)
+                                            (setq i (match-end 0))))
                                (setq term-terminal-parameter
                                      (substring str i))
                                (setq term-terminal-state 4)