diff options
| author | Glenn Morris | 2012-05-24 00:53:21 -0700 |
|---|---|---|
| committer | Glenn Morris | 2012-05-24 00:53:21 -0700 |
| commit | f18b81e6d670ea83e3ccb7c7b6aff50933120018 (patch) | |
| tree | ecb014a9aa434b7bfb9eaa36479c5860d5f6dff0 | |
| parent | ee2f89a66507839a1234a1ff5b96b20776fcd5ef (diff) | |
| download | emacs-f18b81e6d670ea83e3ccb7c7b6aff50933120018.tar.gz emacs-f18b81e6d670ea83e3ccb7c7b6aff50933120018.zip | |
* 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.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/faces.el | 10 | ||||
| -rw-r--r-- | lisp/paths.el | 5 |
3 files changed, 13 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1b3b9f9e07d..8e9b88a6016 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2012-05-24 Glenn Morris <rgm@gnu.org> | 1 | 2012-05-24 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * paths.el (term-file-prefix): Move to faces.el (the only user). | ||
| 4 | * faces.el (term-file-prefix): Move here, make it a defcustom. | ||
| 5 | |||
| 3 | * paths.el (news-directory, news-path, news-inews-program): | 6 | * paths.el (news-directory, news-path, news-inews-program): |
| 4 | Move to gnus/nnspool.el. | 7 | Move to gnus/nnspool.el. |
| 5 | 8 | ||
diff --git a/lisp/faces.el b/lisp/faces.el index b3b0fa9b7d2..d96f3af0ac0 100644 --- a/lisp/faces.el +++ b/lisp/faces.el | |||
| @@ -28,6 +28,16 @@ | |||
| 28 | (eval-when-compile | 28 | (eval-when-compile |
| 29 | (require 'cl)) | 29 | (require 'cl)) |
| 30 | 30 | ||
| 31 | (defcustom term-file-prefix (purecopy "term/") | ||
| 32 | "If non-nil, Emacs startup performs terminal-specific initialization. | ||
| 33 | It does this by: (load (concat term-file-prefix (getenv \"TERM\"))) | ||
| 34 | |||
| 35 | You may set this variable to nil in your init file if you do not wish | ||
| 36 | the terminal-initialization file to be loaded." | ||
| 37 | :type '(choice (const :tag "No terminal-specific initialization" nil) | ||
| 38 | (string :tag "Name of directory with term files")) | ||
| 39 | :group 'terminals) | ||
| 40 | |||
| 31 | (declare-function xw-defined-colors "term/common-win" (&optional frame)) | 41 | (declare-function xw-defined-colors "term/common-win" (&optional frame)) |
| 32 | 42 | ||
| 33 | (defvar help-xref-stack-item) | 43 | (defvar help-xref-stack-item) |
diff --git a/lisp/paths.el b/lisp/paths.el index 5269933d245..f44a0e660fc 100644 --- a/lisp/paths.el +++ b/lisp/paths.el | |||
| @@ -127,9 +127,4 @@ the environment variable INFOPATH is set.") | |||
| 127 | :group 'environment | 127 | :group 'environment |
| 128 | :type 'file) | 128 | :type 'file) |
| 129 | 129 | ||
| 130 | (defvar term-file-prefix (purecopy "term/") "\ | ||
| 131 | If non-nil, Emacs startup does (load (concat term-file-prefix (getenv \"TERM\"))) | ||
| 132 | You may set this variable to nil in your `.emacs' file if you do not wish | ||
| 133 | the terminal-initialization file to be loaded.") | ||
| 134 | |||
| 135 | ;;; paths.el ends here | 130 | ;;; paths.el ends here |