Sync

with Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 920ec09..8edc3f8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2000-06-07  Dave Love  <fx@gnu.org>
+
+       * mm-view.el (mm-inline-image-emacs): Don't specify string for
+       put-image.
+       (mm-inline-image): Defalias, not fset.
+
+       * gnus.el (gnus-group-startup-message): Don't specify string for
+       insert-image.
+
+       * gnus-ems.el (gnus-add-minor-mode): Make it an alias if
+       add-minor-mode is available.
+       (gnus-article-display-xface): Don't specify string for
+       insert-image.
+
 2000-06-06 13:28:53  Shenghuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-topic.el (gnus-topic-remove-topic): Set hidden.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 4fed579..3c6bd3c 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -210,6 +210,8 @@ regexp.  If it matches, the text in question is not a signature."
 
 (defcustom gnus-article-x-face-command
   (cond
+   ;; Fixme: This isn't the right thing for mixed graphical and and
+   ;; non-graphical frames in a session.
    ((and (fboundp 'image-type-available-p)
         (image-type-available-p 'xbm))
     'gnus-article-display-xface)

diff --git a/lisp/gnus-ems.el b/lisp/gnus-ems.el
index b737b97..6815584 100644 (file)
--- a/lisp/gnus-ems.el
+++ b/lisp/gnus-ems.el
@@ -167,9 +167,9 @@
        (boundp 'mark-active)
        mark-active))
 
-(defun gnus-add-minor-mode (mode name map)
-  (if (fboundp 'add-minor-mode)
-      (add-minor-mode mode name map)
+(if (fboundp 'add-minor-mode)
+    (defalias 'gnus-add-minor-mode 'add-minor-mode)
+  (defun gnus-add-minor-mode (mode name map)
     (set (make-local-variable mode) t)
     (unless (assq mode minor-mode-alist)
       (push `(,mode ,name) minor-mode-alist))
@@ -260,7 +260,7 @@ for XEmacs."
       (when image
        (goto-char (point-min))
        (re-search-forward "^From:" nil 'move)
-       (insert-image image " ")))))
+       (insert-image image)))))
 
 (defun-maybe assoc-ignore-case (key alist)
   "Like `assoc', but assumes KEY is a string and ignores case when comparing."

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 33f3b46..03b3ccc 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -755,14 +755,27 @@ be set in `.emacs' instead."
         (let ((image (find-image '((:type xpm :file "gnus.xpm")
                                    (:type xbm :file "gnus.xbm")))))
           (when image
-            (newline)                  ; Have somewhere for cursor to
-                                       ; go, not stretched over image.
-            (insert-image image " ")
+            (insert-image image)
             (goto-char (point-min))
-            (while (not (eobp))
-              (insert (make-string (/ (max (- (window-width) (or x 35)) 0) 2)
-                                   ?\ ))
-              (forward-line 1))
+            (insert-char
+             ?\ ;; space
+             (max 0 (let ((cw (frame-char-width)))
+                      (/ (+ (- (* (window-width) cw) 271) cw) 2 cw))))
+            (goto-char (point-min))
+            (insert gnus-product-name " " gnus-version-number
+                    (if (zerop (string-to-number gnus-revision-number))
+                        ""
+                      (concat " (r" gnus-revision-number ")"))
+                    " based on " gnus-original-product-name " v"
+                    gnus-original-version-number "\n")
+            (goto-char (point-min))
+            (insert-char ?\ ;; space
+                         (max 0 (/ (- (window-width) (gnus-point-at-eol)) 2)))
+            (forward-line 1)
+            (insert-char
+             ?\n (max 0
+                      (let ((ch (frame-char-height)))
+                        (/ (+ (- (* (1- (window-height)) ch) 273) ch) 2 ch))))
             (setq gnus-simple-splash nil)
             t))))
    (t

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index 216125b..6fb7289 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -43,7 +43,7 @@
   (let ((b (point-marker))
        buffer-read-only)
     (insert "\n")
-    (put-image (mm-get-image handle) b "x")
+    (put-image (mm-get-image handle) b)
     (mm-handle-set-undisplayer
      handle
      `(lambda () (remove-images ,b (1+ ,b))))))
@@ -65,8 +65,8 @@
 
 (eval-and-compile
   (if (string-match "XEmacs" (emacs-version))
-      (fset 'mm-inline-image 'mm-inline-image-xemacs)
-    (fset 'mm-inline-image 'mm-inline-image-emacs)))
+      (defalias 'mm-inline-image 'mm-inline-image-xemacs)
+    (defalias 'mm-inline-image 'mm-inline-image-emacs)))
 
 (defvar mm-w3-setup nil)
 (defun mm-setup-w3 ()