2003-01-13 Romain FRANCOISE <romain@orebokech.com>

	* gnus-fun.el (gnus-x-face-from-file): Quote file name.
	(gnus-face-from-file): Ditto.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 81c9ec1..85b43a0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-13  Romain FRANCOISE  <romain@orebokech.com>
+
+       * gnus-fun.el (gnus-x-face-from-file): Quote file name. 
+       (gnus-face-from-file): Ditto.
+
 2003-01-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-sum.el (gnus-articles-to-read): Don't just apply

diff --git a/lisp/gnus-fun.el b/lisp/gnus-fun.el
index 5e63bc9..aebc1db 100644 (file)
--- a/lisp/gnus-fun.el
+++ b/lisp/gnus-fun.el
@@ -85,17 +85,17 @@ Output to the current buffer, replace text, and don't mingle error."
 
 ;;;###autoload
 (defun gnus-x-face-from-file (file)
-  "Insert an X-Face header based on an image file."
-  (interactive "fImage file name:" )
+  "Insert an X-Face header based on a GIF image file."
+  (interactive "fImage file name: ")
   (when (file-exists-p file)
     (gnus-shell-command-to-string
      (format gnus-convert-image-to-x-face-command
-            (shell-quote-argument file)))))
+            (shell-quote-argument (expand-file-name file))))))
 
 ;;;###autoload
 (defun gnus-face-from-file (file)
-  "Return an Face header based on an image file."
-  (interactive "fImage file name:" )
+  "Return an Face header based on a JPEG image file."
+  (interactive "fImage file name: ")
   (when (file-exists-p file)
     (let ((done nil)
          (attempt "")
@@ -106,7 +106,7 @@ Output to the current buffer, replace text, and don't mingle error."
        (setq attempt
              (gnus-shell-command-to-string
               (format gnus-convert-image-to-face-command
-                      (shell-quote-argument file)
+                      (shell-quote-argument (expand-file-name file))
                       quant)))
        (if (> (length attempt) 740)
            (progn