From: Dave Love <fx@gnu.org>
Date: Wed, 20 Sep 2000 16:42:43 +0000 (+0000)
Subject: (gnus-smiley-display): Autoload from smiley-ems.
X-Git-Tag: emacs-pretest-21.0.90~1476
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2d2f7f3ed62ab320c9b4f507d54dd3d61229eb7b;p=emacs.git

(gnus-smiley-display): Autoload from smiley-ems.
(mouse-set-point, set-face-foreground)
(set-face-background, x-popup-menu) [not window-system]: Don't zap
them.
---

diff --git a/lisp/gnus/gnus-ems.el b/lisp/gnus/gnus-ems.el
index 59dd6ae5774..ef97fa4d68e 100644
--- a/lisp/gnus/gnus-ems.el
+++ b/lisp/gnus/gnus-ems.el
@@ -49,6 +49,8 @@
   (autoload 'gnus-xmas-redefine "gnus-xmas")
   (autoload 'appt-select-lowest-window "appt"))
 
+(autoload 'gnus-smiley-display "smiley-ems") ; override XEmacs version
+
 ;;; Mule functions.
 
 (defun gnus-mule-max-width-function (el max-width)
@@ -65,16 +67,6 @@
     (defvar gnus-mouse-face-prop 'mouse-face
       "Property used for highlighting mouse regions.")))
 
-(eval-and-compile
-  (cond
-   ((not window-system)
-    (let ((funcs '(mouse-set-point set-face-foreground
-				   set-face-background x-popup-menu)))
-      (while funcs
-	(unless (fboundp (car funcs))
-	  (defalias (car funcs) 'ignore))
-	(setq funcs (cdr funcs)))))))
-
 (eval-and-compile
   (let ((case-fold-search t))
     (cond