* term/xterm.el (terminal-init-xterm): Update key availability

info.

* term.el (term-delete-lines, term-insert-lines): Clarify
comments.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 89077b519461a28a40945caec64cb3ca45dbe371..a0283cf98aa7c3f38ec9180daf8357a2b2b374f3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2006-06-20  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * 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  <cyd@stupidchicken.com>
 
        * msb.el (msb): Move `sit-for' hack here to handle both

diff --git a/lisp/term.el b/lisp/term.el
index 8dafcfc894bcccd26741a91f39428e59d1477317..4124e2a2969eb7d8b9762e6cbaa6e821e9ca0f7d 100644 (file)
--- 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 6e6c75ade42b32f92a9ce497a7b169d89c80d8a3..4f5814b134aa3451864a534c609d5a16a24f87a0 100644 (file)
--- 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 ?\.)])