X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fmessagexmas.el;h=2d7982f7ed47bb4ad1d65f7e26b052ec94fcba46;hb=4cacb5f23eb830e6950dba987063f413977708d7;hp=7e3edd31fcbd98aac6bc1a0833efb776c97cc942;hpb=2bdf225fa3e4e4606e4dc80cc84e7892b9280c62;p=elisp%2Fgnus.git-

diff --git a/lisp/messagexmas.el b/lisp/messagexmas.el
index 7e3edd3..2d7982f 100644
--- a/lisp/messagexmas.el
+++ b/lisp/messagexmas.el
@@ -1,5 +1,7 @@
 ;;; messagexmas.el --- XEmacs extensions to message
-;; Copyright (C) 1996,97,98 Free Software Foundation, Inc.
+
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2003, 2004
+;;      Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: mail, news
@@ -18,13 +20,14 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
 (require 'nnheader)
 
 (defvar message-xmas-dont-activate-region t
@@ -39,7 +42,7 @@ automatically.")
 				'default-toolbar
 			      nil)
   "*If nil, do not use a toolbar.
-If it is non-nil, it must be a toolbar.  The five legal values are
+If it is non-nil, it must be a toolbar.  The five valid values are
 `default-toolbar', `top-toolbar', `bottom-toolbar',
 `right-toolbar', and `left-toolbar'.")
 
@@ -90,8 +93,6 @@ If it is non-nil, it must be a toolbar.  The five legal 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)))
@@ -113,12 +114,38 @@ If it is non-nil, it must be a toolbar.  The five legal 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))
+(defun message-xmas-make-date (&optional now)
+  "Make a valid data header.
+If NOW, use that time instead."
+  (let ((zone (car (current-time-zone)))
+	sign)
+    (if (>= zone 0)
+	(setq sign "+")
+      (setq sign "-"
+	    zone (- zone)))
+    (format "%s %s%02d%02d"
+	    (format-time-string "%a, %d %b %Y %T" now)
+	    sign
+	    (/ zone 3600)
+	    (/ (% zone 3600) 60))))
 
 (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)
+  (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)
+  (defalias 'message-make-date 'message-xmas-make-date))
+
+(message-xmas-redefine)
+
 (provide 'messagexmas)
 
 ;;; messagexmas.el ends here