Importing Oort Gnus v0.04.

[elisp/gnus.git-] / lisp / gnus-ems.el

diff --git a/lisp/gnus-ems.el b/lisp/gnus-ems.el
index c08b029..61ab874 100644 (file)
--- a/lisp/gnus-ems.el
+++ b/lisp/gnus-ems.el
@@ -1,5 +1,5 @@
 ;;; gnus-ems.el --- functions for making Gnus work under different Emacsen
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -70,6 +70,12 @@
        valstr)))
 
 (eval-and-compile
+  (defalias 'gnus-char-width
+    (if (fboundp 'char-width)
+       'char-width
+      (lambda (ch) 1)))) ;; A simple hack.
+
+(eval-and-compile
   (if (featurep 'xemacs)
       (gnus-xmas-define)
     (defvar gnus-mouse-face-prop 'mouse-face
@@ -84,7 +90,10 @@
            (append nnheader-file-name-translation-alist
                    (mapcar (lambda (c) (cons c ?_))
                            '(?: ?* ?\" ?< ?> ??))
-                   '((?+ . ?-))))))))
+                   (if (string-match "windows-nt\\|cygwin32"
+                                     (symbol-name system-type))
+                       nil
+                     '((?+ . ?-)))))))))
 
 (defvar gnus-tmp-unread)
 (defvar gnus-tmp-replied)
@@ -209,14 +218,14 @@
 
 (defvar gnus-article-compface-xbm
   (condition-case ()
-      (eq 0 (string-match "#define" 
+      (eq 0 (string-match "#define"
                          (shell-command-to-string "uncompface -X")))
     (error nil))
   "Non-nil means the compface program supports the -X option.
 That produces XBM output.")
 
-(defun gnus-article-display-xface (beg end)
-  "Display an XFace header from between BEG and END in the current article.
+(defun gnus-article-display-xface (data)
+  "Display the XFace header FACE in the current buffer.
 Requires support for images in your Emacs and the external programs
 `uncompface', and `icontopbm'.  On a GNU/Linux system these
 might be in packages with names like `compface' or `faces-xface' and
@@ -234,7 +243,6 @@ for XEmacs."
            (make-ring gnus-article-xface-ring-size)))
     (save-excursion
       (let* ((cur (current-buffer))
-            (data (buffer-substring beg end))
             (image (cdr-safe (assoc data (ring-elements
                                           gnus-article-xface-ring-internal))))
             default-enable-multibyte-characters)
@@ -275,8 +283,29 @@ for XEmacs."
        (when image
          (goto-char (point-min))
          (re-search-forward "^From:" nil 'move)
+         (while (get-text-property (point) 'display)
+           (goto-char (next-single-property-change (point) 'display)))
+         (gnus-add-wash-type 'xface)
+         (gnus-add-image 'xface image)
          (insert-image image))))))
 
+;;; Image functions.
+
+(defun gnus-image-type-available-p (type)
+  (and (fboundp 'image-type-available-p)
+       (image-type-available-p type)))
+
+(defun gnus-create-image (file)
+  (create-image file))
+
+(defun gnus-put-image (glyph &optional string)
+  (insert-image glyph string))
+
+(defun gnus-remove-image (image)
+  (dolist (position (gnus-text-with-property 'display))
+    (when (equal (get-text-property position 'display) image)
+      (put-text-property position (1+ position) 'display nil))))
+
 (provide 'gnus-ems)
 
 ;;; gnus-ems.el ends here