diff options
| author | Jan Djärv | 2007-07-22 12:13:34 +0000 |
|---|---|---|
| committer | Jan Djärv | 2007-07-22 12:13:34 +0000 |
| commit | 0389072b378cf15d0e7991146b3a3594dad8e9b5 (patch) | |
| tree | d972f09b5dcaf7f591045b4482201a28fb6d61df | |
| parent | bb1f0f780d7ff6f1b0d3689dca7badb97e037410 (diff) | |
| download | emacs-0389072b378cf15d0e7991146b3a3594dad8e9b5.tar.gz emacs-0389072b378cf15d0e7991146b3a3594dad8e9b5.zip | |
(x-handle-no-bitmap-icon): New function.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/term/x-win.el | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3548af3cc9c..e5dc4b6f90c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2007-07-22 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * startup.el (command-line-x-option-alist): Use x-handle-no-bitmap-icon, | ||
| 4 | |||
| 5 | * term/x-win.el (x-handle-no-bitmap-icon): New function. | ||
| 6 | |||
| 1 | 2007-07-22 Martin Rudalics <rudalics@gmx.at> | 7 | 2007-07-22 Martin Rudalics <rudalics@gmx.at> |
| 2 | 8 | ||
| 3 | * add-log.el (change-log-fill-parenthesized-list): New function. | 9 | * add-log.el (change-log-fill-parenthesized-list): New function. |
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index 4e80589ad43..efe6275c8f7 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el | |||
| @@ -129,6 +129,9 @@ | |||
| 129 | initial-frame-alist) | 129 | initial-frame-alist) |
| 130 | x-invocation-args (cdr x-invocation-args))))))) | 130 | x-invocation-args (cdr x-invocation-args))))))) |
| 131 | 131 | ||
| 132 | (defun x-handle-no-bitmap-icon (switch) | ||
| 133 | (setq default-frame-alist (cons '(icon-type) default-frame-alist))) | ||
| 134 | |||
| 132 | ;; Make -iconic apply only to the initial frame! | 135 | ;; Make -iconic apply only to the initial frame! |
| 133 | (defun x-handle-iconic (switch) | 136 | (defun x-handle-iconic (switch) |
| 134 | (setq initial-frame-alist | 137 | (setq initial-frame-alist |