aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2002-01-16 19:43:30 +0000
committerEli Zaretskii2002-01-16 19:43:30 +0000
commitbde61f8b78b2ccc547b2f1f3bfa5e5a181cc04d5 (patch)
tree67d0a49482906562225fc1103680a96c43d807db
parentc93bdf057ac900340f7da530ddf859fd7e81a4ef (diff)
downloademacs-bde61f8b78b2ccc547b2f1f3bfa5e5a181cc04d5.tar.gz
emacs-bde61f8b78b2ccc547b2f1f3bfa5e5a181cc04d5.zip
(command-line): Set EOL mnemonics for the Mac.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/startup.el6
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6b4a824a9ad..da5c1708a97 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12002-01-16 Andrew Choi <akochoi@cse.cuhk.edu.hk>
2
3 * startup.el (command-line): Set EOL mnemonics for the Mac.
4
12002-01-16 Andreas Schwab <schwab@suse.de> 52002-01-16 Andreas Schwab <schwab@suse.de>
2 6
3 * mail/feedmail.el (feedmail): Fix :link spec. 7 * mail/feedmail.el (feedmail): Fix :link spec.
diff --git a/lisp/startup.el b/lisp/startup.el
index 1fccb6e8791..18e33f2e3e9 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -675,8 +675,10 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
675 ((memq system-type '(ms-dos windows-nt emx)) 675 ((memq system-type '(ms-dos windows-nt emx))
676 (setq eol-mnemonic-unix "(Unix)") 676 (setq eol-mnemonic-unix "(Unix)")
677 (setq eol-mnemonic-mac "(Mac)")) 677 (setq eol-mnemonic-mac "(Mac)"))
678 ;; Mac-specific settings should come here, once there's a 678 ;; Both Mac and Unix EOLs are now "native" on Mac OS so keep the
679 ;; system-type symbol specific to MacOS. 679 ;; abbreviated strings `/' and `:' set in coding.c for them.
680 ((eq system-type 'macos)
681 (setq eol-mnemonic-dos "(DOS)"))
680 (t ; this is for Unix/GNU/Linux systems 682 (t ; this is for Unix/GNU/Linux systems
681 (setq eol-mnemonic-dos "(DOS)") 683 (setq eol-mnemonic-dos "(DOS)")
682 (setq eol-mnemonic-mac "(Mac)"))) 684 (setq eol-mnemonic-mac "(Mac)")))