diff options
| author | Dan Nicolaescu | 2006-06-20 18:12:23 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2006-06-20 18:12:23 +0000 |
| commit | 2b0193e1fb271c778a1fbb8588f72ac84d8b7dfa (patch) | |
| tree | 55320b403d521e0a41b87d33bc7235f483b55a21 | |
| parent | 809b6e9891919e0de881fe9e5c3f4af84b877ba3 (diff) | |
| download | emacs-2b0193e1fb271c778a1fbb8588f72ac84d8b7dfa.tar.gz emacs-2b0193e1fb271c778a1fbb8588f72ac84d8b7dfa.zip | |
* term/xterm.el (terminal-init-xterm): Update key availability
info.
* term.el (term-delete-lines, term-insert-lines): Clarify
comments.
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/term.el | 6 | ||||
| -rw-r--r-- | 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 @@ | |||
| 1 | 2006-06-20 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * term/xterm.el (terminal-init-xterm): Update key availability | ||
| 4 | info. | ||
| 5 | |||
| 6 | * term.el (term-delete-lines, term-insert-lines): Clarify | ||
| 7 | comments. | ||
| 8 | |||
| 1 | 2006-06-20 Chong Yidong <cyd@stupidchicken.com> | 9 | 2006-06-20 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 10 | ||
| 3 | * msb.el (msb): Move `sit-for' hack here to handle both | 11 | * 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." | |||
| 3768 | (save-start-line-column term-start-line-column) | 3768 | (save-start-line-column term-start-line-column) |
| 3769 | (save-current-row (term-current-row))) | 3769 | (save-current-row (term-current-row))) |
| 3770 | ;; The number of inserted lines shouldn't exceed the scroll region end. | 3770 | ;; The number of inserted lines shouldn't exceed the scroll region end. |
| 3771 | ;; The `term-scroll-end' line is part of the scrolling region, so | ||
| 3772 | ;; we need to go one line past it in order to ensure correct | ||
| 3773 | ;; scrolling. | ||
| 3771 | (when (> (+ save-current-row lines) (1+ term-scroll-end)) | 3774 | (when (> (+ save-current-row lines) (1+ term-scroll-end)) |
| 3772 | (setq lines (- lines (- (+ save-current-row lines) (1+ term-scroll-end))))) | 3775 | (setq lines (- lines (- (+ save-current-row lines) (1+ term-scroll-end))))) |
| 3773 | (term-down lines) | 3776 | (term-down lines) |
| @@ -3786,6 +3789,9 @@ Should only be called when point is at the start of a screen line." | |||
| 3786 | (save-start-line-column term-start-line-column) | 3789 | (save-start-line-column term-start-line-column) |
| 3787 | (save-current-row (term-current-row))) | 3790 | (save-current-row (term-current-row))) |
| 3788 | ;; Inserting lines should take into account the scroll region. | 3791 | ;; Inserting lines should take into account the scroll region. |
| 3792 | ;; The `term-scroll-end' line is part of the scrolling region, so | ||
| 3793 | ;; we need to go one line past it in order to ensure correct | ||
| 3794 | ;; scrolling. | ||
| 3789 | (if (< save-current-row term-scroll-start) | 3795 | (if (< save-current-row term-scroll-start) |
| 3790 | ;; If point is before scroll start, | 3796 | ;; If point is before scroll start, |
| 3791 | (progn | 3797 | (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 @@ | |||
| 228 | (define-key map "\e[4~" [select]) | 228 | (define-key map "\e[4~" [select]) |
| 229 | (define-key map "\e[29~" [print]) | 229 | (define-key map "\e[29~" [print]) |
| 230 | 230 | ||
| 231 | ;; These keys will be available xterm starting probably from | 231 | ;; These keys are available in xterm starting from version 214 |
| 232 | ;; version 214. | 232 | ;; if the modifyOtherKeys resource is set. |
| 233 | (define-key map "\e[27;5;9~" [(control ?\t)]) | 233 | (define-key map "\e[27;5;9~" [(control ?\t)]) |
| 234 | (define-key map "\e[27;5;44~" [(control ?\,)]) | 234 | (define-key map "\e[27;5;44~" [(control ?\,)]) |
| 235 | (define-key map "\e[27;5;46~" [(control ?\.)]) | 235 | (define-key map "\e[27;5;46~" [(control ?\.)]) |