summaryrefslogtreecommitdiff
path: root/lisp/term
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2007-07-24 01:23:55 +0000
committerMiles Bader <miles@gnu.org>2007-07-24 01:23:55 +0000
commit40f9398cdba874aa72fd1828534110caa34702be (patch)
treeba7af35a2e0a913ccb78095d130ec695e6bfeb97 /lisp/term
parent22110b82771c73e38e4c637b90c5d01da3671c24 (diff)
parentccb0797a191047816dae47b2e0e7e751027bd0e8 (diff)
downloademacs-unicode-xft-base.tar.gz
Merge from emacs--devo--0unicode-xft-base
Patches applied: * emacs--devo--0 (patch 816-823) - Update from CVS - Merge from emacs--rel--22 * emacs--rel--22 (patch 59-69) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 237-238) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-235
Diffstat (limited to 'lisp/term')
-rw-r--r--lisp/term/x-win.el3
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index c779cd98ae7..5fcf90711e8 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -129,6 +129,9 @@
initial-frame-alist)
x-invocation-args (cdr x-invocation-args)))))))
+(defun x-handle-no-bitmap-icon (switch)
+ (setq default-frame-alist (cons '(icon-type) default-frame-alist)))
+
;; Make -iconic apply only to the initial frame!
(defun x-handle-iconic (switch)
(setq initial-frame-alist