From 1fefa9db20422640251e1b3920278529c9fb7d32 Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Fri, 2 Dec 2011 03:58:56 +0000 Subject: [PATCH] Update the header format of icon data for the most recent icontopbm program. --- lisp/ChangeLog | 6 ++++++ lisp/compface.el | 3 ++- lisp/gnus-art.el | 9 ++++++--- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cc766998e..4a4bb0a81 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2011-12-02 Katsumi Yamaoka + + * 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 * gnus-msg.el (gnus-inews-do-gcc): diff --git a/lisp/compface.el b/lisp/compface.el index 2a2383777..e132f7362 100644 --- a/lisp/compface.el +++ b/lisp/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-art.el b/lisp/gnus-art.el index 60cd36987..555c715bc 100644 --- a/lisp/gnus-art.el +++ b/lisp/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." -- 2.34.1