summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Djärv <jan.h.d@swipnet.se>2007-07-22 12:17:31 +0000
committerJan Djärv <jan.h.d@swipnet.se>2007-07-22 12:17:31 +0000
commitaf849acd5d7cfb41c5ab91095a9757575c3da826 (patch)
tree15f5132d3a3db6224d013ecdafe7be143852b882
parent3f235d5d30e920586915fd621ce50b62f37ffdba (diff)
downloademacs-af849acd5d7cfb41c5ab91095a9757575c3da826.tar.gz
(command-line-x-option-alist): Use x-handle-no-bitmap-icon.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/startup.el2
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5275d798a83..a30aa13f073 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-22 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
+
+ * startup.el (command-line-x-option-alist): Use x-handle-no-bitmap-icon.
+
+ * term/x-win.el (x-handle-no-bitmap-icon): New function.
+
2007-07-22 Ralf Angeli <angeli@caeruleus.net>
* textmodes/reftex.el (reftex-access-parse-file): Create parse
diff --git a/lisp/startup.el b/lisp/startup.el
index f57bf66a3a0..37336d45e29 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -144,7 +144,7 @@ This is normally copied from `default-directory' when Emacs starts.")
("--foreground-color" 1 x-handle-switch foreground-color)
("--background-color" 1 x-handle-switch background-color)
("--mouse-color" 1 x-handle-switch mouse-color)
- ("--no-bitmap-icon" 0 x-handle-switch icon-type nil)
+ ("--no-bitmap-icon" 0 x-handle-no-bitmap-icon)
("--iconic" 0 x-handle-iconic)
("--xrm" 1 x-handle-xrm-switch)
("--cursor-color" 1 x-handle-switch cursor-color)