[Emacs-diffs] /srv/bzr/emacs/trunk r105830: Fix handling of X resource for window icons.

[Chong Yidong]

------------------------------------------------------------
revno: 105830
fixes bug(s): http://debbugs.gnu.org/9154
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2011-09-18 16:01:37 -0400
message:
  Fix handling of X resource for window icons.
  
  * 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.
modified:
  doc/emacs/ChangeLog
  doc/emacs/cmdargs.texi
  doc/emacs/xresources.texi
  doc/lispref/ChangeLog
  doc/lispref/frames.texi
  src/ChangeLog
  src/xfns.c

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2011-09-15 02:10:52 +0000
+++ b/doc/emacs/ChangeLog       2011-09-18 20:01:37 +0000
@@ -1,3 +1,10 @@
+2011-09-18  Chong Yidong  <address@hidden>
+
+       * cmdargs.texi (Icons X): Fix description of Emacs icon.
+
+       * xresources.texi (Table of Resources): Fix documentation of
+       bitmapIcon.
+
 2011-09-15  Chong Yidong  <address@hidden>
 
        * package.texi (Package Menu): Add package-menu-mark-upgrades.

=== modified file 'doc/emacs/cmdargs.texi'
--- a/doc/emacs/cmdargs.texi    2011-07-12 01:38:28 +0000
+++ b/doc/emacs/cmdargs.texi    2011-09-18 20:01:37 +0000
@@ -1107,7 +1107,7 @@
 @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

=== modified file 'doc/emacs/xresources.texi'
--- a/doc/emacs/xresources.texi 2011-05-17 02:26:56 +0000
+++ b/doc/emacs/xresources.texi 2011-09-18 20:01:37 +0000
@@ -169,11 +169,10 @@
 @item @code{background} (class @code{Background})
 Background color name.
 
address@hidden
 @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}.
address@hidden 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.

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2011-09-17 19:49:57 +0000
+++ b/doc/lispref/ChangeLog     2011-09-18 20:01:37 +0000
@@ -1,3 +1,8 @@
+2011-09-18  Chong Yidong  <address@hidden>
+
+       * frames.texi (Management Parameters): Fix description of
+       icon-type parameter.
+
 2011-09-17  Chong Yidong  <address@hidden>
 
        * tips.texi (Key Binding Conventions): Don't bind a key sequence

=== modified file 'doc/lispref/frames.texi'
--- a/doc/lispref/frames.texi   2011-08-28 18:49:59 +0000
+++ b/doc/lispref/frames.texi   2011-09-18 20:01:37 +0000
@@ -779,10 +779,10 @@
 
 @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 address@hidden 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 address@hidden value specifies the default Emacs icon.
 
 @vindex icon-name, a frame parameter
 @item icon-name

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-09-18 19:02:17 +0000
+++ b/src/ChangeLog     2011-09-18 20:01:37 +0000
@@ -1,3 +1,8 @@
+2011-09-18  Chong Yidong  <address@hidden>
+
+       * xfns.c (Fx_create_frame): Handle the bitmapIcon resource as
+       boolean (Bug#9154).
+
 2011-09-18  Eli Zaretskii  <address@hidden>
 
        * xdisp.c (display_line): Record maximum and minimum buffer

=== modified file 'src/xfns.c'
--- a/src/xfns.c        2011-09-09 01:06:52 +0000
+++ b/src/xfns.c        2011-09-18 20:01:37 +0000
@@ -3369,7 +3369,7 @@
   /* 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);