From: yamaoka <yamaoka>
Date: Thu, 20 Jul 2000 22:38:54 +0000 (+0000)
Subject: Synch.
X-Git-Tag: t-gnus-6_14-quimby-before-installer-changed-~160
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d7a4299265f98a836a5b0392af097921e822cc7;p=elisp%2Fgnus.git-

Synch.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f2babd9..8067243 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2000-07-19  Dave Love  <fx@gnu.org>
+
+	* gnus-ems.el: Defalias some dummy funcs to `ignore'.
+	(gnus-x-splash): Use expand-file-name.  Remove redundant facep
+	check.
+	(gnus-article-display-xface): Special-case for dark backgrounds.
+
 2000-07-19  Kim-Minh Kaplan <kmkaplan@galaxy.fr>
 
 	* imap.el (imap-calculate-literal-size-first): New variable.
diff --git a/lisp/gnus-ems.el b/lisp/gnus-ems.el
index 6815584..72cd3b3 100644
--- a/lisp/gnus-ems.el
+++ b/lisp/gnus-ems.el
@@ -64,12 +64,11 @@
 (eval-and-compile
   (cond
    ((not window-system)
-    (defun gnus-dummy-func (&rest args))
     (let ((funcs '(mouse-set-point set-face-foreground
 				   set-face-background x-popup-menu)))
       (while funcs
 	(unless (fboundp (car funcs))
-	  (defalias (car funcs) 'gnus-dummy-func))
+	  (defalias (car funcs) 'ignore))
 	(setq funcs (cdr funcs)))))))
 
 (eval-and-compile
@@ -119,7 +118,7 @@
 
     (defvar gnus-summary-display-table nil
       "Display table used in summary mode buffers.")
-    (defalias 'gnus-summary-set-display-table (lambda ()))
+    (defalias 'gnus-summary-set-display-table 'ignore)
 
     (if (fboundp 'truncate-string-to-width)
 	(fset 'gnus-truncate-string 'truncate-string-to-width)
@@ -186,15 +185,15 @@
       (let ((buffer-read-only nil))
 	(erase-buffer)
 	(when (and dir
-		   (file-exists-p (setq file (concat dir "x-splash"))))
+		   (file-exists-p (setq file
+					(expand-file-name "x-splash" dir))))
 	  (with-temp-buffer
 	    (insert-file-contents-as-binary file)
 	    (goto-char (point-min))
 	    (ignore-errors
 	      (setq pixmap (read (current-buffer))))))
 	(when pixmap
-	  (unless (facep 'gnus-splash)
-	    (make-face 'gnus-splash))
+	  (make-face 'gnus-splash)
 	  (setq height (/ (car pixmap) (frame-char-height))
 		width (/ (cadr pixmap) (frame-char-width)))
 	  (set-face-foreground 'gnus-splash "Brown")
@@ -202,11 +201,11 @@
 	  (insert-char ?\n (* (/ (window-height) 2 height) height))
 	  (setq i height)
 	  (while (> i 0)
-	    (insert-char ?  (* (/ (window-width) 2 width) width))
+	    (insert-char ?\  (* (/ (window-width) 2 width) width))
 	    (setq beg (point))
-	    (insert-char ?  width)
+	    (insert-char ?\  width)
 	    (set-text-properties beg (point) '(face gnus-splash))
-	    (insert "\n")
+	    (insert ?\n)
 	    (decf i))
 	  (goto-char (point-min))
 	  (sit-for 0))))))
@@ -220,7 +219,7 @@
 
 (defun gnus-article-display-xface (beg end)
   "Display an XFace header from between BEG and END in the current article.
-This requires support images in your Emacs and the external programs
+Requires support for images in your Emacs and the external programs
 `uncompface', `icontopbm' and `ppmtoxbm'.  On a GNU/Linux system these
 might be in packages with names like `compface' or `faces-xface' and
 `netpbm' or `libgr-progs', for instance.
@@ -255,7 +254,16 @@ for XEmacs."
 		   (eq 0 (call-process-region (point-min) (point-max)
 					      "pbmtoxbm"
 					      'delete '(t nil)))
-		   (setq image (create-image (buffer-string) 'xbm t)))))
+		   ;; Miles Bader says that faces don't look right as
+		   ;; light on dark.
+		   (if (eq 'dark (cdr-safe (assq 'background-mode
+						 (frame-parameters))))
+		       (setq image (create-image (buffer-string) 'xbm t
+						 :ascent 'center
+						 :foreground "black"
+						 :background "white"))
+		     (setq image (create-image (buffer-string) 'xbm t
+					       :ascent 'center))))))
 	  (ring-insert gnus-article-xface-ring-internal (cons data image))))
       (when image
 	(goto-char (point-min))