andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix point motion bug in term-emulate-terminal.

Browse source 
* lisp/term.el (term-emulate-terminal): If term-check-size is called,
move point to the process mark without resetting point.

Fixes: debbugs:4635
This commit is contained in:
Chong Yidong 2012-06-17 16:26:13 +08:00
parent 310fbfa8e2
commit eb4a8a9a88
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2012-06-17 Chong Yidong <cyd@gnu.org>
* term.el (term-emulate-terminal): If term-check-size is called,
move point to the process mark without resetting point (Bug#4635).
2012-06-13 Glenn Morris <rgm@gnu.org>
* international/mule-cmds.el (mule-menu-keymap)

17
lisp/term.el
View file

@ -2710,10 +2710,8 @@ See `term-prompt-regexp'."
(str-length (length str)))
(save-selected-window
;; Let's handle the messages. -mm
(let* ((newstr (term-handle-ansi-terminal-messages str)))
(when (not (eq str newstr))
(let ((newstr (term-handle-ansi-terminal-messages str)))
(unless (eq str newstr)
(setq handled-ansi-message t
str newstr)))
(setq str-length (length str))
@ -2723,18 +2721,19 @@ See `term-prompt-regexp'."
(delete-region term-pending-delete-marker (process-mark proc))
(set-marker term-pending-delete-marker nil))
(when (/= (point) (process-mark proc))
(setq save-point (point-marker)))
;; Note if the window size has changed. We used to reset
;; point too, but that gives incorrect results (Bug#4635).
(if (eq (window-buffer) (current-buffer))
(progn
(setq term-vertical-motion (symbol-function 'vertical-motion))
(term-check-size proc))
(setq term-vertical-motion
(symbol-function 'term-buffer-vertical-motion)))
(setq save-marker (copy-marker (process-mark proc)))
(when (/= (point) (process-mark proc))
(setq save-point (point-marker))
(goto-char (process-mark proc)))
(goto-char (process-mark proc))
(save-restriction
;; If the buffer is in line mode, and there is a partial