--- a/lisp/gnus/gnus-ems.el	Mon Aug 13 08:48:43 2007 +0200
+++ b/lisp/gnus/gnus-ems.el	Mon Aug 13 08:49:20 2007 +0200
@@ -1,5 +1,5 @@
 ;;; gnus-ems.el --- functions for making Gnus work under different Emacsen
-;; Copyright (C) 1995,96 Free Software Foundation, Inc.
+;; Copyright (C) 1995,96,97 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
 ;; Keywords: news
@@ -27,26 +27,13 @@
 
 (eval-when-compile (require 'cl))
 
-(defvar gnus-mouse-2 [mouse-2])
+;;; Function aliases later to be redefined for XEmacs usage.
 
-(defalias 'gnus-make-overlay 'make-overlay)
-(defalias 'gnus-overlay-put 'overlay-put)
-(defalias 'gnus-move-overlay 'move-overlay)
-(defalias 'gnus-overlay-end 'overlay-end)
-(defalias 'gnus-extent-detached-p 'ignore)
-(defalias 'gnus-extent-start-open 'ignore)
-(defalias 'gnus-set-text-properties 'set-text-properties)
-(defalias 'gnus-group-remove-excess-properties 'ignore)
-(defalias 'gnus-topic-remove-excess-properties 'ignore)
-(defalias 'gnus-appt-select-lowest-window 'appt-select-lowest-window)
-(defalias 'gnus-mail-strip-quoted-names 'mail-strip-quoted-names)
-(defalias 'gnus-make-local-hook 'make-local-hook)
-(defalias 'gnus-add-hook 'add-hook)
-(defalias 'gnus-character-to-event 'identity)
-(defalias 'gnus-add-text-properties 'add-text-properties)
-(defalias 'gnus-put-text-property 'put-text-property)
-(defalias 'gnus-mode-line-buffer-identification 'identity)
+(defvar gnus-xemacs (string-match "XEmacs\\|Lucid" emacs-version)
+  "Non-nil if running under XEmacs.")
 
+(defvar gnus-mouse-2 [mouse-2])
+(defvar gnus-down-mouse-2 [down-mouse-2])
 
 (eval-and-compile 
   (autoload 'gnus-xmas-define "gnus-xmas")
@@ -60,20 +47,20 @@
 
 (defun gnus-mule-cite-add-face (number prefix face)
   ;; At line NUMBER, ignore PREFIX and add FACE to the rest of the line.
-  (if face
-      (let ((inhibit-point-motion-hooks t)
-	    from to)
-	(goto-line number)
-	(if (boundp 'MULE)
-	    (forward-char (chars-in-string prefix))
-	  (forward-char (length prefix)))
-	(skip-chars-forward " \t")
-	(setq from (point))
-	(end-of-line 1)
-	(skip-chars-backward " \t")
-	(setq to (point))
-	(if (< from to)
-	    (gnus-overlay-put (gnus-make-overlay from to) 'face face)))))
+  (when face
+    (let ((inhibit-point-motion-hooks t)
+	  from to)
+      (goto-line number)
+      (if (boundp 'MULE)
+	  (forward-char (chars-in-string prefix))
+	(forward-char (length prefix)))
+      (skip-chars-forward " \t")
+      (setq from (point))
+      (end-of-line 1)
+      (skip-chars-backward " \t")
+      (setq to (point))
+      (when (< from to)
+	(gnus-overlay-put (gnus-make-overlay from to) 'face face)))))
 
 (defun gnus-mule-max-width-function (el max-width)
   (` (let* ((val (eval (, el)))
@@ -84,8 +71,8 @@
 	 valstr))))
 
 (eval-and-compile
-  (if (string-match "XEmacs\\|Lucid" emacs-version)
-      ()
+  (if gnus-xemacs
+      nil
 
     (defvar gnus-mouse-face-prop 'mouse-face
       "Property used for highlighting mouse regions.")
@@ -94,50 +81,7 @@
       "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | xv -quit -"
       "String or function to be executed to display an X-Face header.
 If it is a string, the command will be executed in a sub-shell
-asynchronously.	 The compressed face will be piped to this command.")
-
-    ;; Added by Per Abrahamsen <amanda@iesd.auc.dk>.
-    (defvar gnus-display-type 
-      (condition-case nil
-	  (let ((display-resource (x-get-resource ".displayType" "DisplayType")))
-	    (cond (display-resource (intern (downcase display-resource)))
-		  ((x-display-color-p) 'color)
-		  ((x-display-grayscale-p) 'grayscale)
-		  (t 'mono)))
-	(error 'mono))
-      "A symbol indicating the display Emacs is running under.
-The symbol should be one of `color', `grayscale' or `mono'. If Emacs
-guesses this display attribute wrongly, either set this variable in
-your `~/.emacs' or set the resource `Emacs.displayType' in your
-`~/.Xdefaults'. See also `gnus-background-mode'.
-
-This is a meta-variable that will affect what default values other
-variables get.  You would normally not change this variable, but
-pounce directly on the real variables themselves.")
-
-    (defvar gnus-background-mode 
-      (condition-case nil
-	  (let ((bg-resource (x-get-resource ".backgroundMode"
-					     "BackgroundMode"))
-		(params (frame-parameters)))
-	    (cond (bg-resource (intern (downcase bg-resource)))
-		  ((and (cdr (assq 'background-color params))
-			(< (apply '+ (x-color-values
-				      (cdr (assq 'background-color params))))
-			   (* (apply '+ (x-color-values "white")) .6)))
-		   'dark)
-		  (t 'light)))
-	(error 'light))
-      "A symbol indicating the Emacs background brightness.
-The symbol should be one of `light' or `dark'.
-If Emacs guesses this frame attribute wrongly, either set this variable in
-your `~/.emacs' or set the resource `Emacs.backgroundMode' in your
-`~/.Xdefaults'.
-See also `gnus-display-type'.
-
-This is a meta-variable that will affect what default values other
-variables get.  You would normally not change this variable, but
-pounce directly on the real variables themselves."))
+asynchronously.	 The compressed face will be piped to this command."))
 
   (cond 
    ((string-match "XEmacs\\|Lucid" emacs-version)
@@ -146,14 +90,15 @@
    ((or (not (boundp 'emacs-minor-version))
 	(< emacs-minor-version 30))
     ;; Remove the `intangible' prop.
-    (let ((props (and (boundp 'gnus-hidden-properties) 
+    (let ((props (and (boundp 'gnus-hidden-properties)
 		      gnus-hidden-properties)))
       (while (and props (not (eq (car (cdr props)) 'intangible)))
 	(setq props (cdr props)))
-      (and props (setcdr props (cdr (cdr (cdr props))))))
-    (or (fboundp 'buffer-substring-no-properties)
-	(defun buffer-substring-no-properties (beg end)
-	  (format "%s" (buffer-substring beg end)))))
+      (when props
+	(setcdr props (cdr (cdr (cdr props))))))
+    (unless (fboundp 'buffer-substring-no-properties)
+      (defun buffer-substring-no-properties (beg end)
+	(format "%s" (buffer-substring beg end)))))
    
    ((boundp 'MULE)
     (provide 'gnusutil))))
@@ -165,16 +110,16 @@
     (let ((funcs '(mouse-set-point set-face-foreground
 				   set-face-background x-popup-menu)))
       (while funcs
-	(or (fboundp (car funcs))
-	    (fset (car funcs) 'gnus-dummy-func))
+	(unless (fboundp (car funcs))
+	  (fset (car funcs) 'gnus-dummy-func))
 	(setq funcs (cdr funcs))))))
-  (or (fboundp 'file-regular-p)
-      (defun file-regular-p (file)
-	(and (not (file-directory-p file))
-	     (not (file-symlink-p file))
-	     (file-exists-p file))))
-  (or (fboundp 'face-list)
-      (defun face-list (&rest args))))
+  (unless (fboundp 'file-regular-p)
+    (defun file-regular-p (file)
+      (and (not (file-directory-p file))
+	   (not (file-symlink-p file))
+	   (file-exists-p file))))
+  (unless (fboundp 'face-list)
+    (defun face-list (&rest args))))
 
 (eval-and-compile
   (let ((case-fold-search t))
@@ -200,18 +145,36 @@
    ((string-match "XEmacs\\|Lucid" emacs-version)
     (gnus-xmas-redefine))
 
-   ((boundp 'MULE)
-    ;; Mule definitions
+   ((featurep 'mule)
+    ;; Mule and new Emacs definitions
+  
+    ;; [Note] Now there are three kinds of mule implementations,
+    ;; original MULE, XEmacs/mule and beta version of Emacs including
+    ;; some mule features. Unfortunately these API are different. In
+    ;; particular, Emacs (including original MULE) and XEmacs are
+    ;; quite different.
+    ;; Predicates to check are following:
+    ;; (boundp 'MULE) is t only if MULE (original; anything older than
+    ;;                     Mule 2.3) is running.
+    ;; (featurep 'mule) is t when every mule variants are running.
+    
+    ;; These implementations may be able to share between original
+    ;; MULE and beta version of new Emacs. In addition, it is able to
+    ;; detect XEmacs/mule by (featurep 'mule) and to check variable
+    ;; `emacs-version'. In this case, implementation for XEmacs/mule
+    ;; may be able to share between XEmacs and XEmacs/mule.
+    
     (defalias 'gnus-truncate-string 'truncate-string)
 
-    (fset 'gnus-summary-make-display-table (lambda () nil))
+    (defvar gnus-summary-display-table nil
+      "Display table used in summary mode buffers.")
     (fset 'gnus-cite-add-face 'gnus-mule-cite-add-face)
     (fset 'gnus-max-width-function 'gnus-mule-max-width-function)
     
-    (if (boundp 'gnus-check-before-posting)
-	(setq gnus-check-before-posting
-	      (delq 'long-lines
-		    (delq 'control-chars gnus-check-before-posting))))
+    (when (boundp 'gnus-check-before-posting)
+      (setq gnus-check-before-posting
+	    (delq 'long-lines
+		  (delq 'control-chars gnus-check-before-posting))))
 
     (defun gnus-summary-line-format-spec ()
       (insert gnus-tmp-unread gnus-tmp-replied 
@@ -223,8 +186,8 @@
 	  gnus-tmp-opening-bracket 
 	  (format "%4d: %-20s" 
 		  gnus-tmp-lines 
-		  (if (> (length gnus-tmp-name) 20) 
-		      (truncate-string gnus-tmp-name 20) 
+		  (if (> (length gnus-tmp-name) 20)
+		      (truncate-string gnus-tmp-name 20)
 		    gnus-tmp-name))
 	  gnus-tmp-closing-bracket)
 	 (point))