Make term-file-aliases into a defcustom; tweaks previous change

2 files changed, 24 insertions, 20 deletions

diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index 8706d898888..cad5d7ec544 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -465,7 +465,7 @@ a normal hook that Emacs runs after initializing a new text terminal.
 You could use this hook to define initializations for terminals that do not
 have their own libraries.  @xref{Hooks}.
 
-@defvar term-file-prefix
+@defopt term-file-prefix
 @cindex @env{TERM} environment variable
 If the value of this variable is non-@code{nil}, Emacs loads a
 terminal-specific initialization file as follows:
@@ -480,14 +480,14 @@ init file if you do not wish to load the
 terminal-initialization file.
 
 On MS-DOS, Emacs sets the @env{TERM} environment variable to @samp{internal}.
-@end defvar
+@end defopt
 
-@defvar term-file-aliases
+@defopt 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}.
-@end defvar
+@end defopt
 
 @defvar tty-setup-hook
 This variable is a normal hook that Emacs runs after initializing a
diff --git a/lisp/faces.el b/lisp/faces.el
index 4a1fa687dee..755de8e3fcd 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -35,6 +35,26 @@ the terminal-initialization file to be loaded."
                  (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 @@ the above example."
 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