X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lisp%2Fmessagexmas.el;h=d94afa8136f7656292f628e49d7018625d1a33e0;hb=aa230dde94ae5e75727634bbeae0e5e7f9a58d4b;hp=a375cd1490e31747f8590d385cf4d0622b6ca662;hpb=8cfa576451fc393ec8ad0de58a89a0afd4343fbf;p=elisp%2Fgnus.git-

diff --git a/lisp/messagexmas.el b/lisp/messagexmas.el
index a375cd1..d94afa8 100644
--- a/lisp/messagexmas.el
+++ b/lisp/messagexmas.el
@@ -1,5 +1,7 @@
 ;;; messagexmas.el --- XEmacs extensions to message
-;; Copyright (C) 1996,97,98,99 Free Software Foundation, Inc.
+
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2003
+;;      Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: mail, news
@@ -25,6 +27,7 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
 (require 'nnheader)
 
 (defvar message-xmas-dont-activate-region t
@@ -90,8 +93,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))
 
-(fset 'message-exchange-point-and-mark 'message-xmas-exchange-point-and-mark)
-
 (defun message-xmas-maybe-fontify ()
   (when (featurep 'font-lock)
     (font-lock-set-defaults)))
@@ -100,8 +101,8 @@ If it is non-nil, it must be a toolbar.  The five valid values are
   "Create a rot table with offset N."
   (let ((i -1)
 	(table (make-string 256 0))
-	(a (mm-char-int ?a))
-	(A (mm-char-int ?A)))
+	(a (char-int ?a))
+	(A (char-int ?A)))
     (while (< (incf i) 256)
       (aset table i i))
     (concat
@@ -113,12 +114,23 @@ 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)
-  (fset '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)
+  (defalias 'message-mark-active-p
+    'region-exists-p)
+  (when (>= emacs-major-version 20)
+    (defalias 'message-make-caesar-translation-table
+      'message-xmas-make-caesar-translation-table))
+  (defalias 'message-make-overlay 'make-extent)
+  (defalias 'message-delete-overlay 'delete-extent)
+  (defalias 'message-overlay-put 'set-extent-property))
+
+(message-xmas-redefine)
+
 (provide 'messagexmas)
 
 ;;; messagexmas.el ends here