diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-18 11:45:36 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-18 11:45:36 -0700 |
| commit | 81deba3d7a2b187d58fe26bd8b4eafb5687095e1 (patch) | |
| tree | 82feff9e8228de216840a6c96ba7c006ce337e24 /src/frame.h | |
| parent | 8dfff871bdf0e420c6f5570e72afc80471d40d51 (diff) | |
| parent | 1a941d6c9eab9a35682408d6b85a1a98cfb6b01d (diff) | |
| download | emacs-81deba3d7a2b187d58fe26bd8b4eafb5687095e1.tar.gz | |
Merge from origin/emacs-24
1a941d6 Fix incorrect usage of @key in the User Manual (Bug#20135)
14c47d3 doc/misc/efaq-w32.texi: Spell-check.
ac85901 doc/misc/efaq-w32.texi: Remove outdated information and update.
c43762d Fix description of fullscreen mode on MS-Windows (Bug#20110).
ea8cab3 doc/lispref/minibuf.texi (Basic Completion): Fix a typo. (Bug#20108)
2fdec80 Improve indexing in Emacs manual (Bug#20105)
cc11321 Fix --no-bitmap-icon
Conflicts:
doc/emacs/ChangeLog
doc/lispref/ChangeLog
doc/misc/ChangeLog
src/ChangeLog
Diffstat (limited to 'src/frame.h')
| -rw-r--r-- | src/frame.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/frame.h b/src/frame.h index ddbf93e98f5..d4dfd1c8f94 100644 --- a/src/frame.h +++ b/src/frame.h @@ -1425,7 +1425,7 @@ x_set_bitmap_icon (struct frame *f) { Lisp_Object obj = assq_no_quit (Qicon_type, f->param_alist); - if (CONSP (obj)) + if (CONSP (obj) && !NILP (XCDR (obj))) x_bitmap_icon (f, XCDR (obj)); } |