aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv2005-10-12 14:22:36 +0000
committerJan Djärv2005-10-12 14:22:36 +0000
commitc755acf3df2059a8225e761c5fc511126b92b9db (patch)
tree695ba3e18e7c56cf716a8a059d201ecfb95cda8d
parent1b3b0b5f0b92e018705d41954b9717b511f6bbe6 (diff)
downloademacs-c755acf3df2059a8225e761c5fc511126b92b9db.tar.gz
emacs-c755acf3df2059a8225e761c5fc511126b92b9db.zip
* startup.el (command-line-x-option-alist): -nb => -nbi
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/startup.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3620d6a8971..bf29ee8420c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12005-10-12 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * startup.el (command-line-x-option-alist): -nb => -nbi
4
12005-10-12 Kim F. Storm <storm@cua.dk> 52005-10-12 Kim F. Storm <storm@cua.dk>
2 6
3 * startup.el (fancy-splash-default-action): Discard mouse click in 7 * startup.el (fancy-splash-default-action): Discard mouse click in
diff --git a/lisp/startup.el b/lisp/startup.el
index 3190d7c5aa7..82191509ef9 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -121,7 +121,7 @@ This is normally copied from `default-directory' when Emacs starts.")
121 ("-bg" 1 x-handle-switch background-color) 121 ("-bg" 1 x-handle-switch background-color)
122 ("-background" 1 x-handle-switch background-color) 122 ("-background" 1 x-handle-switch background-color)
123 ("-ms" 1 x-handle-switch mouse-color) 123 ("-ms" 1 x-handle-switch mouse-color)
124 ("-nb" 0 x-handle-switch icon-type nil) 124 ("-nbi" 0 x-handle-switch icon-type nil)
125 ("-iconic" 0 x-handle-iconic) 125 ("-iconic" 0 x-handle-iconic)
126 ("-xrm" 1 x-handle-xrm-switch) 126 ("-xrm" 1 x-handle-xrm-switch)
127 ("-cr" 1 x-handle-switch cursor-color) 127 ("-cr" 1 x-handle-switch cursor-color)