diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/startup.el | 2 |
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 @@ | |||
| 1 | 2005-10-12 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * startup.el (command-line-x-option-alist): -nb => -nbi | ||
| 4 | |||
| 1 | 2005-10-12 Kim F. Storm <storm@cua.dk> | 5 | 2005-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) |