summaryrefslogtreecommitdiff
path: root/lisp/cus-start.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-04-10 00:19:38 -0700
committerGlenn Morris <rgm@gnu.org>2012-04-10 00:19:38 -0700
commit57c3bd0133dd6f06b1d2882078778ed437be8c22 (patch)
tree070c6758a816fd3df01c64b5563e94f2e5fe37ad /lisp/cus-start.el
parenta9f72fc14ec65ae6f7cbd8eaea1f81c896162ecc (diff)
downloademacs-57c3bd0133dd6f06b1d2882078778ed437be8c22.tar.gz
Remove some more "rogue" defcustoms that show up in emacs -Q
* lisp/cus-start.el (eol-mnemonic-unix, eol-mnemonic-dos, eol-mnemonic-mac): Add :standard values, reducing "rogue" customs in emacs -Q a bit more.
Diffstat (limited to 'lisp/cus-start.el')
-rw-r--r--lisp/cus-start.el15
1 files changed, 12 insertions, 3 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index fbba49951d1..83973e4a534 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -138,9 +138,18 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
;; coding.c
(inhibit-eol-conversion mule boolean)
(eol-mnemonic-undecided mule string)
- (eol-mnemonic-unix mule string)
- (eol-mnemonic-dos mule string)
- (eol-mnemonic-mac mule string)
+ ;; startup.el fiddles with the values. IMO, would be
+ ;; simpler to just use #ifdefs in coding.c.
+ (eol-mnemonic-unix mule string nil
+ :standard
+ (if (memq system-type '(ms-dos windows-nt))
+ "(Unix)" ":"))
+ (eol-mnemonic-dos mule string nil
+ :standard
+ (if (memq system-type '(ms-dos windows-nt))
+ "\\" "(DOS)"))
+ (eol-mnemonic-mac mule string nil
+ :standard "(Mac)")
(file-coding-system-alist
mule
(alist