From: Glenn Morris <rgm@gnu.org>
Date: Tue, 10 Apr 2012 07:19:38 +0000 (-0700)
Subject: Remove some more "rogue" defcustoms that show up in emacs -Q
X-Git-Tag: emacs-24.2.90~471^2~365^2~17
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=57c3bd0133dd6f06b1d2882078778ed437be8c22;p=emacs.git

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.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fd4457e973c..fb7e3c1233f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-10  Glenn Morris  <rgm@gnu.org>
+
+	* cus-start.el (eol-mnemonic-unix, eol-mnemonic-dos, eol-mnemonic-mac):
+	Add :standard values, reducing "rogue" customs in emacs -Q a bit more.
+
 2012-04-10  Florian Adamsky  <florian@adamsky.it>  (tiny change)
 
 	* recentf.el (recentf-dialog-mode-map): Added two keybindings for
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