From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 16 Apr 2002 18:48:45 +0000 (+0000)
Subject: (term-emulate-terminal): Fix last change.
X-Git-Tag: emacs-pretest-21.2.91~302
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c7bc379f7e5f38502b7e64fb445deb9b3914e35b;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 415841d5856..053fb5c9a7e 100644
--- 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 005ee02c8cc..d5d1173daea 100644
--- 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)