(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 59dd6ae5774026ff191d38040eb7d372d400f177..ef97fa4d68e0da118fbb2029c06af6b445806565 100644 (file)
--- 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