*** empty log message ***

[gnus] / lisp / messagexmas.el

diff --git a/lisp/messagexmas.el b/lisp/messagexmas.el
index 416d05e..b1ff9c5 100644 (file)
--- a/lisp/messagexmas.el
+++ b/lisp/messagexmas.el
@@ -25,63 +25,60 @@
 
 ;;; Code:
 
+(require 'nnheader)
+
+(defvar message-xmas-dont-activate-region nil
+  "If t, don't activate region after yanking.")
+
 (defvar message-xmas-glyph-directory nil
   "*Directory where Message logos and icons are located.
 If this variable is nil, Message will try to locate the directory
 automatically.")
 
-(defvar message-use-toolbar 'default-toolbar
+(defvar message-use-toolbar (if (featurep 'toolbar)
+                               '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
 `default-toolbar', `top-toolbar', `bottom-toolbar',
 `right-toolbar', and `left-toolbar'.")
 
 (defvar message-toolbar 
-  '([message-spell toolbar-ispell t "Spell"]
-    [message-help toolbar-info t "Message help"])
+  '([message-spell ispell-message t "Spell"]
+    [message-help (Info-goto-node "(Message)Top") t "Message help"])
   "The message buffer toolbar.")
 
 (defun message-xmas-find-glyph-directory (&optional package)
   (setq package (or package "message"))
-  (let ((path load-path)
-       dir result)
-    ;; We try to find the dir by looking at the load path,
-    ;; stripping away the last component and adding "etc/".
-    (while path
-      (if (and (car path)
-              (file-exists-p
-               (setq dir (concat
-                          (file-name-directory
-                           (directory-file-name (car path)))
-                          "etc/" (or package "message") "/")))
-              (file-directory-p dir))
-         (setq result dir
-               path nil)
-       (setq path (cdr path))))
-    result))
+  (let ((dir (symbol-value
+             (intern-soft (concat package "-xmas-glyph-directory")))))
+    (if (and (stringp dir) (file-directory-p dir))
+       dir
+      (nnheader-find-etc-directory package))))
 
 (defun message-xmas-setup-toolbar (bar &optional force package)
   (let ((dir (message-xmas-find-glyph-directory package))
+       (xpm (if (featurep 'xpm) "xpm" "xbm"))
        icon up down disabled name)
     (unless package
       (setq message-xmas-glyph-directory dir))
     (when dir
-      (if (and (not force)
-              (boundp (aref (car bar) 0)))
-         dir
-       (while bar
-         (setq icon (aref (car bar) 0)
-               name (symbol-name icon)
-               bar (cdr bar))
-         (setq up (concat dir name "-up.xpm"))
-         (setq down (concat dir name "-down.xpm"))
-         (setq disabled (concat dir name "-disabled.xpm"))
+      (while bar
+       (setq icon (aref (car bar) 0)
+             name (symbol-name icon)
+             bar (cdr bar))
+       (when (or force
+                 (not (boundp icon)))
+         (setq up (concat dir name "-up." xpm))
+         (setq down (concat dir name "-down." xpm))
+         (setq disabled (concat dir name "-disabled." xpm))
          (if (not (file-exists-p up))
-             (set icon nil)
+             (setq bar nil
+                   dir nil)
            (set icon (toolbar-make-button-list
                       up (and (file-exists-p down) down)
-                      (and (file-exists-p disabled) disabled)))))
-       dir))))
+                      (and (file-exists-p disabled) disabled)))))))
+    dir))
 
 (defun message-setup-toolbar ()
   (and message-use-toolbar
@@ -89,6 +86,12 @@ If it is non-nil, it must be a toolbar.  The five legal values are
        (set-specifier (symbol-value message-use-toolbar)
                      (cons (current-buffer) message-toolbar))))
 
+(defun message-xmas-exchange-point-and-mark ()
+  "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)
+
 (provide 'messagexmas)
 
 ;;; messagexmas.el ends here