X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fmessagexmas.el;h=e4602d099f8e9dd9e71950bd0ab512808a2bac17;hb=b0eccd76f35ef80c3ad13f09e588d49358e9c22a;hp=6b0ace08cca66b73eeeef5759cc66b41157daa45;hpb=edaab778855de0047bc4ed153fc716e5a7c58967;p=gnus

diff --git a/lisp/messagexmas.el b/lisp/messagexmas.el
index 6b0ace08c..e4602d099 100644
--- a/lisp/messagexmas.el
+++ b/lisp/messagexmas.el
@@ -1,7 +1,7 @@
 ;;; messagexmas.el --- XEmacs extensions to message
 
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2003, 2004
-;;      Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2003, 2004,
+;;   2005, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: mail, news
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -38,10 +38,7 @@
 If this variable is nil, Message will try to locate the directory
 automatically.")
 
-(defvar message-use-toolbar
-  (if (and (featurep 'toolbar)
-	   (specifier-instance default-toolbar-visible-p))
-      'default)
+(defvar message-use-toolbar (if (featurep 'toolbar) 'default)
   "*Position to display the toolbar.  Nil means do not use a toolbar.
 If it is non-nil, it should be one of the symbols `default', `top',
 `bottom', `right', and `left'.  `default' means to use the default
@@ -98,38 +95,45 @@ the width is used for the toolbar displayed on the right or the left.")
   (when (featurep 'toolbar)
     (if (and message-use-toolbar
 	     (message-xmas-setup-toolbar message-toolbar))
-	(let* ((bar (or (intern-soft (format "%s-toolbar" message-use-toolbar))
-			'default-toolbar))
-	       (bars (delq bar (list 'top-toolbar 'bottom-toolbar
-				     'right-toolbar 'left-toolbar)))
-	       hw)
-	  (while bars
-	    (remove-specifier (symbol-value (pop bars)) (current-buffer)))
-	  (unless (eq bar 'default-toolbar)
-	    (set-specifier default-toolbar nil (current-buffer)))
-	  (set-specifier (symbol-value bar) message-toolbar (current-buffer))
-	  (when (setq hw (cdr (assq message-use-toolbar
-				    '((default . default-toolbar-height)
-				      (top . top-toolbar-height)
-				      (bottom . bottom-toolbar-height)))))
-	    (set-specifier (symbol-value hw) (car message-toolbar-thickness)
-			   (current-buffer)))
-	  (when (setq hw (cdr (assq message-use-toolbar
-				    '((default . default-toolbar-width)
-				      (right . right-toolbar-width)
-				      (left . left-toolbar-width)))))
-	    (set-specifier (symbol-value hw) (cdr message-toolbar-thickness)
-			   (current-buffer))))
-      (set-specifier default-toolbar nil (current-buffer))
-      (remove-specifier top-toolbar (current-buffer))
-      (remove-specifier bottom-toolbar (current-buffer))
-      (remove-specifier right-toolbar (current-buffer))
-      (remove-specifier left-toolbar (current-buffer)))
-    (set-specifier default-toolbar-visible-p t (current-buffer))
-    (set-specifier top-toolbar-visible-p t (current-buffer))
-    (set-specifier bottom-toolbar-visible-p t (current-buffer))
-    (set-specifier right-toolbar-visible-p t (current-buffer))
-    (set-specifier left-toolbar-visible-p t (current-buffer))))
+	(let ((bar (or (intern-soft (format "%s-toolbar" message-use-toolbar))
+		       'default-toolbar))
+	      (height (car message-toolbar-thickness))
+	      (width (cdr message-toolbar-thickness))
+	      (cur (current-buffer))
+	      bars)
+	  (set-specifier (symbol-value bar) message-toolbar cur)
+	  (set-specifier default-toolbar-height height cur)
+	  (set-specifier default-toolbar-width width cur)
+	  (set-specifier top-toolbar-height height cur)
+	  (set-specifier bottom-toolbar-height height cur)
+	  (set-specifier right-toolbar-width width cur)
+	  (set-specifier left-toolbar-width width cur)
+	  (if (eq bar 'default-toolbar)
+	      (progn
+		(remove-specifier default-toolbar-visible-p cur)
+		(remove-specifier top-toolbar cur)
+		(remove-specifier top-toolbar-visible-p cur)
+		(remove-specifier bottom-toolbar cur)
+		(remove-specifier bottom-toolbar-visible-p cur)
+		(remove-specifier right-toolbar cur)
+		(remove-specifier right-toolbar-visible-p cur)
+		(remove-specifier left-toolbar cur)
+		(remove-specifier left-toolbar-visible-p cur))
+	    (set-specifier (symbol-value (intern (format "%s-visible-p" bar)))
+			   t cur)
+	    (setq bars (delq bar (list 'default-toolbar
+				       'bottom-toolbar 'top-toolbar
+				       'right-toolbar 'left-toolbar)))
+	    (while bars
+	      (set-specifier (symbol-value (intern (format "%s-visible-p"
+							   (pop bars))))
+			     nil cur))))
+      (let ((cur (current-buffer)))
+	(set-specifier default-toolbar-visible-p nil cur)
+	(set-specifier top-toolbar-visible-p nil cur)
+	(set-specifier bottom-toolbar-visible-p nil cur)
+	(set-specifier right-toolbar-visible-p nil cur)
+	(set-specifier left-toolbar-visible-p nil cur)))))
 
 (defun message-xmas-exchange-point-and-mark ()
   "Exchange point and mark, but allow for XEmacs' optional argument."
@@ -190,5 +194,4 @@ If NOW, use that time instead."
 
 (provide 'messagexmas)
 
-;;; arch-tag: 0ece0484-8757-4641-b2d4-17147dd5c5b5
 ;;; messagexmas.el ends here