(term-emulate-terminal): Extract proper command string

which is supplied to term-command-hook.

diff --git a/lisp/term.el b/lisp/term.el
index 7311b09b2a0950cd28cd602c3ded01758ac8df0f..005ee02c8cc9a65ee6df0da750ded93f9a2adb39 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 "\n" str i)))
+                           (let ((end (string-match "\r?$" str i)))
                              (if end
                                  (progn (funcall term-command-hook
-                                                 (substring str (1+ i) (1- end)))
-                                        (setq i end))
+                                                 (substring str (1+ i) end))
+                                        (setq i (match-end 0)))
                                (setq term-terminal-parameter
                                      (substring str i))
                                (setq term-terminal-state 4)