From 2b0193e1fb271c778a1fbb8588f72ac84d8b7dfa Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Tue, 20 Jun 2006 18:12:23 +0000 Subject: [PATCH] * term/xterm.el (terminal-init-xterm): Update key availability info. * term.el (term-delete-lines, term-insert-lines): Clarify comments. --- lisp/ChangeLog | 8 ++++++++ lisp/term.el | 6 ++++++ lisp/term/xterm.el | 4 ++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 89077b51946..a0283cf98aa 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2006-06-20 Dan Nicolaescu + + * term/xterm.el (terminal-init-xterm): Update key availability + info. + + * term.el (term-delete-lines, term-insert-lines): Clarify + comments. + 2006-06-20 Chong Yidong * msb.el (msb): Move `sit-for' hack here to handle both diff --git a/lisp/term.el b/lisp/term.el index 8dafcfc894b..4124e2a2969 100644 --- a/lisp/term.el +++ b/lisp/term.el @@ -3768,6 +3768,9 @@ Should only be called when point is at the start of a screen line." (save-start-line-column term-start-line-column) (save-current-row (term-current-row))) ;; The number of inserted lines shouldn't exceed the scroll region end. + ;; The `term-scroll-end' line is part of the scrolling region, so + ;; we need to go one line past it in order to ensure correct + ;; scrolling. (when (> (+ save-current-row lines) (1+ term-scroll-end)) (setq lines (- lines (- (+ save-current-row lines) (1+ term-scroll-end))))) (term-down lines) @@ -3786,6 +3789,9 @@ Should only be called when point is at the start of a screen line." (save-start-line-column term-start-line-column) (save-current-row (term-current-row))) ;; Inserting lines should take into account the scroll region. + ;; The `term-scroll-end' line is part of the scrolling region, so + ;; we need to go one line past it in order to ensure correct + ;; scrolling. (if (< save-current-row term-scroll-start) ;; If point is before scroll start, (progn diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el index 6e6c75ade42..4f5814b134a 100644 --- a/lisp/term/xterm.el +++ b/lisp/term/xterm.el @@ -228,8 +228,8 @@ (define-key map "\e[4~" [select]) (define-key map "\e[29~" [print]) - ;; These keys will be available xterm starting probably from - ;; version 214. + ;; These keys are available in xterm starting from version 214 + ;; if the modifyOtherKeys resource is set. (define-key map "\e[27;5;9~" [(control ?\t)]) (define-key map "\e[27;5;44~" [(control ?\,)]) (define-key map "\e[27;5;46~" [(control ?\.)]) -- 2.39.5