2000-12-22 09:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>

	* messagexmas.el (message-xmas-redefine): New function.

	* message.el: Use it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 72ccb2a..61f5ba3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2000-12-22 09:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
+       * messagexmas.el (message-xmas-redefine): New function.
+
+       * message.el: Use it.
+
        * gnus-art.el (gnus-article-check-hidden-text): Return t.
 
        * gnus-util.el (gnus-remove-text-properties-when): Return t.

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 86b62ff..563675d 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -84,7 +84,7 @@
                 events-to-keys face-doc-string find-face frame-device
                 frame-property get-popup-menu-response glyph-height
                 glyph-property glyph-width glyphp make-annotation
-                make-event
+                make-event message-xmas-redefine
                 make-color-instance make-extent make-glyph make-gui-button
                 make-image-specifier map-extents next-command-event
                 pp-to-string read-color set-extent-property

diff --git a/lisp/message.el b/lisp/message.el
index 170e7b7..7fc0cb4 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -4560,9 +4560,6 @@ which specify the range to operate on."
 (defalias 'message-exchange-point-and-mark 'exchange-point-and-mark)
 
 ;; Support for toolbar
-(if (featurep 'xemacs)
-    (require 'messagexmas))
-
 (eval-when-compile 
   (defvar tool-bar-map)
   (defvar tool-bar-mode))
@@ -4809,6 +4806,10 @@ regexp varstr."
                          (mail-strip-quoted-names 
                           (message-fetch-field "to")))))
 
+(when (featurep 'xemacs)
+  (require 'messagexmas)
+  (message-xmas-redefine))
+
 (provide 'message)
 
 (run-hooks 'message-load-hook)

diff --git a/lisp/messagexmas.el b/lisp/messagexmas.el
index f0188b9..9f71104 100644 (file)
--- a/lisp/messagexmas.el
+++ b/lisp/messagexmas.el
@@ -91,9 +91,6 @@ If it is non-nil, it must be a toolbar.  The five valid values are
   "Exchange point and mark, but allow for XEmacs' optional argument."
   (exchange-point-and-mark message-xmas-dont-activate-region))
 
-(defalias 'message-exchange-point-and-mark 
-  'message-xmas-exchange-point-and-mark)
-
 (defun message-xmas-maybe-fontify ()
   (when (featurep 'font-lock)
     (font-lock-set-defaults)))
@@ -115,12 +112,19 @@ If it is non-nil, it must be a toolbar.  The five valid values are
      (substring table a (+ a n))
      (substring table (+ a 26) 255))))
 
-(when (>= emacs-major-version 20)
-  (defalias 'message-make-caesar-translation-table
-    'message-xmas-make-caesar-translation-table))
-
 (add-hook 'message-mode-hook 'message-xmas-maybe-fontify)
 
+(defun message-xmas-redefine ()
+  "Redefine message functions for XEmacs."
+  (defalias 'message-exchange-point-and-mark 
+    'message-xmas-exchange-point-and-mark)
+
+  (when (>= emacs-major-version 20)
+    (defalias 'message-make-caesar-translation-table
+      'message-xmas-make-caesar-translation-table)))
+
+(message-xmas-redefine)
+
 (provide 'messagexmas)
 
 ;;; messagexmas.el ends here