Merge from emacs-24, up to 2012-04-10T02:06:19Z!larsi@gnus.org

[gnu-emacs] / lisp / term / xterm.el

diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index 47da0bf4de57e04674039727bc28b869be99364e..7e56cd9fa1da1e6f3be965a7a431b32378337cbc 100644 (file)
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -1,6 +1,6 @@
 ;;; xterm.el --- define function key sequences and standard colors for xterm
 
-;; Copyright (C) 1995, 2001-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2001-2012 Free Software Foundation, Inc.
 
 ;; Author: FSF
 ;; Keywords: terminals
@@ -30,9 +30,16 @@
   :group 'emacs)
 
 (defcustom xterm-extra-capabilities 'check
-  "Set to a list if the XTerm supports modifyOtherKeys or
-reporting the background color.  Set to 'check to check for those
-features.  Set to nil to skip the checks."
+  "Whether Xterm supports some additional, more modern, features.
+If nil, just assume that it does not.
+If `check', try to check if it does.
+If a list, assume that the listed features are supported, without checking.
+
+The relevant features are:
+  modifyOtherKeys  -- if supported, more key bindings work (e.g, \"\\C-,\")
+  reportBackground -- if supported, Xterm reports its background color
+"
+  :version "24.1"
   :group 'xterm
   :type '(choice (const :tag "No" nil)
                  (const :tag "Check" check)
@@ -460,7 +467,7 @@ features.  Set to nil to skip the checks."
   "Terminal initialization function for xterm."
   ;; rxvt terminals sometimes set the TERM variable to "xterm", but
   ;; rxvt's keybindings are incompatible with xterm's. It is
-  ;; better in that case to use rxvt's initializion function.
+  ;; better in that case to use rxvt's initialization function.
   (if (and (getenv "COLORTERM" (selected-frame))
           (string-match "\\`rxvt" (getenv "COLORTERM" (selected-frame))))
       (tty-run-terminal-initialization (selected-frame) "rxvt")
@@ -637,7 +644,7 @@ versions of xterm."
        ;; 216 non-gray colors first
        (let ((r 0) (g 0) (b 0))
          (while (> ncolors 24)
-           ;; This and other formulae taken from 256colres.pl and
+           ;; This and other formulas taken from 256colres.pl and
            ;; 88colres.pl in the xterm distribution.
            (tty-color-define (format "color-%d" (- 256 ncolors))
                              (- 256 ncolors)