[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104577: * term/xterm.el (terminal-in
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104577: * term/xterm.el (terminal-init-xterm): More simplifications. |
Date: |
Sun, 12 Jun 2011 13:15:02 -0700 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104577
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2011-06-12 13:15:02 -0700
message:
* term/xterm.el (terminal-init-xterm): More simplifications.
modified:
lisp/term/xterm.el
=== modified file 'lisp/term/xterm.el'
--- a/lisp/term/xterm.el 2011-06-12 19:58:32 +0000
+++ b/lisp/term/xterm.el 2011-06-12 20:15:02 +0000
@@ -488,7 +488,7 @@
(when xterm-extra-capabilities
(let ((coding-system-for-read 'binary)
(chr nil)
- (str nil)
+ (str "")
(background-regex
"11;rgb:\\([a-f0-9]+\\)/\\([a-f0-9]+\\)/\\([a-f0-9]+\\)")
(recompute-faces nil)
@@ -525,10 +525,7 @@
(while (not (equal (setq chr (read-event nil nil 2)) ?c))
(setq str (concat str (string chr))))
(if (string-match ">0;\\([0-9]+\\);0" str)
- (setq version
- (string-to-number
- (substring str (match-beginning 1) (match-end 1))))))
-
+ (setq version (string-to-number (match-string 1 str)))))
;; 2. If reportBackground is known to be supported, or the
;; version is 242 or higher, assume the xterm supports
;; reporting the background color (TODO: maybe earlier
@@ -552,8 +549,7 @@
;; 3. If modifyOtherKeys is known to be supported or the
;; version is 216 (the version when modifyOtherKeys was
- ;; introduced) or higher, initialize the modifyOtherKeys
- ;; support.
+ ;; introduced) or higher, initialize the modifyOtherKeys support.
(if (or (memq 'modifyOtherKeys given-capabilities)
(and (memq 'modifyOtherKeys tocheck-capabilities)
version
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104577: * term/xterm.el (terminal-init-xterm): More simplifications.,
Glenn Morris <=