diff options
| author | Miles Bader <miles@gnu.org> | 2007-07-24 01:25:28 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-07-24 01:25:28 +0000 |
| commit | 492d9f3e3ccd2b640958e840caa451e9e04e86db (patch) | |
| tree | c87779daf272535b621216ef05179fa48102e57e /lisp/startup.el | |
| parent | 7eb1e4534e88a32fe5e549e630fdabf3e062be2b (diff) | |
| parent | 1e8995158740b15936887264a3d7183beb5c51d9 (diff) | |
| download | emacs-492d9f3e3ccd2b640958e840caa451e9e04e86db.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 814-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--multi-tty--0--patch-26
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 81898c075a8..7cc6fdc3d01 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -151,7 +151,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) |