[Emacs-diffs] /srv/bzr/emacs/trunk r106574: Gnus: Update the header format of icon data for the most recent icontopbm program.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 106574
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Fri 2011-12-02 04:00:32 +0000
message:
  Gnus: Update the header format of icon data for the most recent icontopbm 
program.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/compface.el
  lisp/gnus/gnus-art.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-12-01 04:55:39 +0000
+++ b/lisp/gnus/ChangeLog       2011-12-02 04:00:32 +0000
@@ -1,3 +1,9 @@
+2011-12-02  Katsumi Yamaoka  <address@hidden>
+
+       * compface.el (uncompface):
+       * gnus-art.el (gnus-article-x-face-command): Update the header format
+       of icon data for the most recent icontopbm program.
+
 2011-12-01  Katsumi Yamaoka  <address@hidden>
 
        * gnus-msg.el (gnus-inews-do-gcc):

=== modified file 'lisp/gnus/compface.el'
--- a/lisp/gnus/compface.el     2011-01-25 04:08:28 +0000
+++ b/lisp/gnus/compface.el     2011-12-02 04:00:32 +0000
@@ -42,7 +42,8 @@
                        'delete '(t nil) nil))
           (progn
             (goto-char (point-min))
-            (insert "/* Width=48, Height=48 */\n")
+            (insert "/* Format_version=1, Width=48, Height=48, Depth=1,\
+ Valid_bits_per_item=16 */\n")
             ;; I just can't get "icontopbm" to work correctly on its
             ;; own in XEmacs.  And Emacs doesn't understand un-raw pbm
             ;; files.

=== modified file 'lisp/gnus/gnus-art.el'
--- a/lisp/gnus/gnus-art.el     2011-11-30 06:05:47 +0000
+++ b/lisp/gnus/gnus-art.el     2011-12-02 04:00:32 +0000
@@ -268,11 +268,14 @@
       (if (or (gnus-image-type-available-p 'xface)
              (gnus-image-type-available-p 'pbm))
          'gnus-display-x-face-in-from
-       "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | ee -")
+       "{ echo \
+'/* Format_version=1, Width=48, Height=48, Depth=1, Valid_bits_per_item=16 */'\
+; uncompface; } | icontopbm | ee -")
     (if (gnus-image-type-available-p 'pbm)
        'gnus-display-x-face-in-from
-      "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | \
-display -"))
+      "{ echo \
+'/* Format_version=1, Width=48, Height=48, Depth=1, Valid_bits_per_item=16 */'\
+; uncompface; } | icontopbm | display -"))
   "*String or function to be executed to display an X-Face header.
 If it is a string, the command will be executed in a sub-shell
 asynchronously.  The compressed face will be piped to this command."