From: Glenn Morris <rgm@gnu.org>
Date: Sun, 12 Jun 2011 20:18:04 +0000 (-0700)
Subject: * term/xterm.el (terminal-init-xterm): Still more simplifications.
X-Git-Tag: emacs-pretest-24.0.90~104^2~569
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=873e858a931f3af4b318473e052fb7acd35f7b53;p=emacs.git

* term/xterm.el (terminal-init-xterm): Still more simplifications.
---

diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index 187d8ea0550..47da0bf4de5 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -489,8 +489,6 @@ features.  Set to nil to skip the checks."
     (let ((coding-system-for-read 'binary)
           (chr nil)
           (str "")
-          (background-regex
-           "11;rgb:\\([a-f0-9]+\\)/\\([a-f0-9]+\\)/\\([a-f0-9]+\\)")
           (recompute-faces nil)
           ;; If `xterm-extra-capabilities' is 'check, we don't know
           ;; the capabilities.  We need to check for those defined
@@ -540,7 +538,8 @@ features.  Set to nil to skip the checks."
           (setq str "")
           (while (not (equal (setq chr (read-event nil nil 2)) ?\\))
             (setq str (concat str (string chr))))
-          (if (string-match background-regex str)
+          (if (string-match
+               "11;rgb:\\([a-f0-9]+\\)/\\([a-f0-9]+\\)/\\([a-f0-9]+\\)" str)
               (setq recompute-faces
                     (xterm-maybe-set-dark-background-mode
                      (string-to-number (match-string 1 str) 16)