[Emacs-diffs] trunk r116894: Make term-file-aliases into a defcustom; tweaks previous change

[Glenn Morris]

------------------------------------------------------------
revno: 116894
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2014-03-27 21:39:30 -0400
message:
  Make term-file-aliases into a defcustom; tweaks previous change
modified:
  doc/lispref/os.texi            os.texi-20091113204419-o5vbwnq5f7feedwu-6205
  lisp/faces.el                  faces.el-20091113204419-o5vbwnq5f7feedwu-562

=== modified file 'doc/lispref/os.texi'
--- a/doc/lispref/os.texi       2014-03-28 01:29:54 +0000
+++ b/doc/lispref/os.texi       2014-03-28 01:39:30 +0000
@@ -465,7 +465,7 @@
 You could use this hook to define initializations for terminals that do not
 have their own libraries.  @xref{Hooks}.
 
address@hidden term-file-prefix
address@hidden term-file-prefix
 @cindex @env{TERM} environment variable
 If the value of this variable is address@hidden, Emacs loads a
 terminal-specific initialization file as follows:
@@ -480,14 +480,14 @@
 terminal-initialization file.
 
 On MS-DOS, Emacs sets the @env{TERM} environment variable to @samp{internal}.
address@hidden defvar
address@hidden defopt
 
address@hidden term-file-aliases
address@hidden term-file-aliases
 This variable is an an association list mapping terminal types to
 their aliases.  For example, an element of the form @code{("vt102"
 . "vt100")} means to treat a terminal of type @samp{vt102} like one of
 type @samp{vt100}.
address@hidden defvar
address@hidden defopt
 
 @defvar tty-setup-hook
 This variable is a normal hook that Emacs runs after initializing a

=== modified file 'lisp/faces.el'
--- a/lisp/faces.el     2014-03-28 01:29:54 +0000
+++ b/lisp/faces.el     2014-03-28 01:39:30 +0000
@@ -35,6 +35,26 @@
                 (string :tag "Name of directory with term files"))
   :group 'terminals)
 
+(defcustom term-file-aliases
+  '(("apollo" . "vt100")
+    ("vt102" . "vt100")
+    ("vt125" . "vt100")
+    ("vt201" . "vt200")
+    ("vt220" . "vt200")
+    ("vt240" . "vt200")
+    ("vt300" . "vt200")
+    ("vt320" . "vt200")
+    ("vt400" . "vt200")
+    ("vt420" . "vt200")
+    )
+  "Alist of terminal type aliases.
+Entries are of the form (TYPE . ALIAS), where both elements are strings.
+This means to treat a terminal of type TYPE as if it were of type ALIAS."
+  :type '(alist :key-type (string :tag "Terminal")
+               :value-type (string :tag "Alias"))
+  :group 'terminals
+  :version "24.5")
+
 (declare-function xw-defined-colors "term/common-win" (&optional frame))
 
 (defvar help-xref-stack-item)
@@ -2110,22 +2130,6 @@
 Specifically, `tty-run-terminal-initialization' runs this.
 This can be used to fine tune the `input-decode-map', for example.")
 
-(defvar term-file-aliases
-  '(("apollo" . "vt100")
-    ("vt102" . "vt100")
-    ("vt125" . "vt100")
-    ("vt201" . "vt200")
-    ("vt220" . "vt200")
-    ("vt240" . "vt200")
-    ("vt300" . "vt200")
-    ("vt320" . "vt200")
-    ("vt400" . "vt200")
-    ("vt420" . "vt200")
-    )
-  "Alist of terminal type aliases.
-Entries are of the form (TYPE . ALIAS), where both elements are strings.
-This means to treat a terminal of type TYPE as if it were of type ALIAS.")
-
 (defun tty-run-terminal-initialization (frame &optional type run-hook)
   "Run the special initialization code for the terminal type of FRAME.
 The optional TYPE parameter may be used to override the autodetected