* lisp/paths.el (term-file-prefix): Move to lisp/faces.el (the only user).

* faces.el (term-file-prefix): Move here, make it a defcustom.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1b3b9f9e07d43c0aef14eb43eb0306fb2d2b942a..8e9b88a6016e44019f79b242372781f441caec54 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2012-05-24  Glenn Morris  <rgm@gnu.org>
 
+       * paths.el (term-file-prefix): Move to faces.el (the only user).
+       * faces.el (term-file-prefix): Move here, make it a defcustom.
+
        * paths.el (news-directory, news-path, news-inews-program):
        Move to gnus/nnspool.el.
 

diff --git a/lisp/faces.el b/lisp/faces.el
index b3b0fa9b7d23bfefd47dcb04b17f6e9fd98ea487..d96f3af0ac0ac406d1e54892d6379ee3f10124e5 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -28,6 +28,16 @@
 (eval-when-compile
   (require 'cl))
 
+(defcustom term-file-prefix (purecopy "term/")
+  "If non-nil, Emacs startup performs terminal-specific initialization.
+It does this by: (load (concat term-file-prefix (getenv \"TERM\")))
+
+You may set this variable to nil in your init file if you do not wish
+the terminal-initialization file to be loaded."
+  :type '(choice (const :tag "No terminal-specific initialization" nil)
+                (string :tag "Name of directory with term files"))
+  :group 'terminals)
+
 (declare-function xw-defined-colors "term/common-win" (&optional frame))
 
 (defvar help-xref-stack-item)

diff --git a/lisp/paths.el b/lisp/paths.el
index 5269933d245da42029b06ae2b09899a2c0304095..f44a0e660fc533e34cc07488281edbdf28813d7d 100644 (file)
--- a/lisp/paths.el
+++ b/lisp/paths.el
@@ -127,9 +127,4 @@ the environment variable INFOPATH is set.")
   :group 'environment
   :type 'file)
 
-(defvar term-file-prefix (purecopy "term/") "\
-If non-nil, Emacs startup does (load (concat term-file-prefix (getenv \"TERM\")))
-You may set this variable to nil in your `.emacs' file if you do not wish
-the terminal-initialization file to be loaded.")
-
 ;;; paths.el ends here