procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix handling of X resource for window icons.

Browse source 
* src/xfns.c (Fx_create_frame): Handle bitmapIcon resource as a boolean.

* doc/emacs/cmdargs.texi (Icons X): Fix description of Emacs icon.

* doc/emacs/xresources.texi (Table of Resources): Fix documentation of
bitmapIcon.

* doc/lispref/frames.texi (Management Parameters): Fix description of
icon-type parameter.

Fixes: debbugs:9154
This commit is contained in:
Chong Yidong 2011-09-18 16:01:37 -04:00
parent 72753f87ca
commit 33ed493bca
7 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
doc/emacs/ChangeLog
View file

@ -1,3 +1,10 @@
2011-09-18 Chong Yidong <cyd@stupidchicken.com>
* cmdargs.texi (Icons X): Fix description of Emacs icon.
* xresources.texi (Table of Resources): Fix documentation of
bitmapIcon.
2011-09-15 Chong Yidong <cyd@stupidchicken.com>
* package.texi (Package Menu): Add package-menu-mark-upgrades.

2
doc/emacs/cmdargs.texi
View file

@ -1107,7 +1107,7 @@ Start Emacs in an iconified (``minimized'') state.
@itemx --no-bitmap-icon
@opindex --no-bitmap-icon
@cindex Emacs icon, a gnu
Do not use a picture of a gnu as the Emacs icon.
Do not display the Emacs icon.
@end table
Most window managers allow you to ``iconify'' (or ``minimize'') an

7
doc/emacs/xresources.texi
View file

@ -169,11 +169,10 @@ with the class that it belongs to:
@item @code{background} (class @code{Background})
Background color name.
@ifnottex
@item @code{bitmapIcon} (class @code{BitmapIcon})
Use a bitmap icon (a picture of a gnu) if @samp{on}, let the window
manager choose an icon if @samp{off}.
@end ifnottex
Tell the window manager to display the Emacs icon if @samp{on}; don't
do so if @samp{off}. (The icon is usually shown in the ``taskbar'' on
a graphical desktop.)
@item @code{borderColor} (class @code{BorderColor})
Color name for the external border.

5
doc/lispref/ChangeLog
View file

@ -1,3 +1,8 @@
2011-09-18 Chong Yidong <cyd@stupidchicken.com>
* frames.texi (Management Parameters): Fix description of
icon-type parameter.
2011-09-17 Chong Yidong <cyd@stupidchicken.com>
* tips.texi (Key Binding Conventions): Don't bind a key sequence

8
doc/lispref/frames.texi
View file

@ -779,10 +779,10 @@ Whether deselecting the frame lowers it (non-@code{nil} means yes).
@vindex icon-type, a frame parameter
@item icon-type
The type of icon to use for this frame when it is iconified. If the
value is a string, that specifies a file containing a bitmap to use.
Any other non-@code{nil} value specifies the default bitmap icon (a
picture of a gnu); @code{nil} specifies a text icon.
The type of icon to use for this frame. If the value is a string,
that specifies a file containing a bitmap to use; @code{nil} specifies
no icon (in which case the window manager decides what to show); any
other non-@code{nil} value specifies the default Emacs icon.
@vindex icon-name, a frame parameter
@item icon-name

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2011-09-18 Chong Yidong <cyd@stupidchicken.com>
* xfns.c (Fx_create_frame): Handle the bitmapIcon resource as
boolean (Bug#9154).
2011-09-18 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (display_line): Record maximum and minimum buffer

2
src/xfns.c
View file

@ -3369,7 +3369,7 @@ This function is an internal primitive--use `make-frame' instead. */)
/* We need to do this after creating the X window, so that the
icon-creation functions can say whose icon they're describing. */
x_default_parameter (f, parms, Qicon_type, Qt,
"bitmapIcon", "BitmapIcon", RES_TYPE_SYMBOL);
"bitmapIcon", "BitmapIcon", RES_TYPE_BOOLEAN);
x_default_parameter (f, parms, Qauto_raise, Qnil,
"autoRaise", "AutoRaiseLower", RES_TYPE_BOOLEAN);