[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107835: Remove some more "rogue" defcustoms that show up in emacs -Q

[Glenn Morris]

------------------------------------------------------------
revno: 107835
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-04-10 00:19:38 -0700
message:
  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.
modified:
  lisp/ChangeLog
  lisp/cus-start.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-04-10 02:45:10 +0000
+++ b/lisp/ChangeLog    2012-04-10 07:19:38 +0000
@@ -1,3 +1,8 @@
+2012-04-10  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>  (tiny change)
 
        * recentf.el (recentf-dialog-mode-map): Added two keybindings for

=== modified file 'lisp/cus-start.el'
--- a/lisp/cus-start.el 2012-03-07 05:53:51 +0000
+++ b/lisp/cus-start.el 2012-04-10 07:19:38 +0000
@@ -138,9 +138,18 @@
             ;; 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