Synch with Oort Gnus.

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

diff --git a/lisp/gnus-ems.el b/lisp/gnus-ems.el
index 3a6a096..010c325 100644 (file)
--- a/lisp/gnus-ems.el
+++ b/lisp/gnus-ems.el
@@ -63,6 +63,12 @@
 ;;; Mule functions.
 
 (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
@@ -77,7 +83,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)
@@ -288,6 +297,8 @@ 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)))
          (insert-image image))))))
 
 (defun-maybe assoc-ignore-case (key alist)