diff options
| author | Miles Bader <miles@gnu.org> | 2007-07-24 01:23:55 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-07-24 01:23:55 +0000 |
| commit | 40f9398cdba874aa72fd1828534110caa34702be (patch) | |
| tree | ba7af35a2e0a913ccb78095d130ec695e6bfeb97 /lisp/startup.el | |
| parent | 22110b82771c73e38e4c637b90c5d01da3671c24 (diff) | |
| parent | ccb0797a191047816dae47b2e0e7e751027bd0e8 (diff) | |
| download | emacs-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/startup.el')
| -rw-r--r-- | lisp/startup.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 9e2d211ea1e..2242de90acb 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) |