summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/gnus/ChangeLog6
-rw-r--r--lisp/gnus/compface.el3
-rw-r--r--lisp/gnus/gnus-art.el9
3 files changed, 14 insertions, 4 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index b517c81b2b9..fbfcda57b53 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-02 Katsumi Yamaoka <yamaoka@jpl.org>
+
+ * 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 <yamaoka@jpl.org>
* gnus-msg.el (gnus-inews-do-gcc):
diff --git a/lisp/gnus/compface.el b/lisp/gnus/compface.el
index 2a2383777cb..e132f736269 100644
--- a/lisp/gnus/compface.el
+++ b/lisp/gnus/compface.el
@@ -42,7 +42,8 @@ or `faces-xface' and `netpbm' or `libgr-progs', for instance."
'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.
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 60cd369875d..555c715bc2f 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -268,11 +268,14 @@ This can also be a list of the above values."
(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."