* liece-xemacs.el

[elisp/liece.git] / lisp / liece-xemacs.el

diff --git a/lisp/liece-xemacs.el b/lisp/liece-xemacs.el
index 06cc66c..489e58f 100644 (file)
--- a/lisp/liece-xemacs.el
+++ b/lisp/liece-xemacs.el
@@ -150,7 +150,9 @@ If it is non-nil, it must be a toolbar.  The five valid values are
 ;;; @ internal variables
 ;;; 
 (defvar liece-glyph-cache nil)
-(defvar liece-toolbar-position default-toolbar-position)
+(defvar liece-toolbar-position (if (featurep 'toolbar)
+                                  default-toolbar-position
+                                nil))
 
 (defvar liece-toolbar-back-glyph nil)
 (defvar liece-toolbar-forward-glyph nil)
@@ -209,8 +211,8 @@ If optional argument FORCE is non-nil, always update toolbar."
                            "icon"))))
       (when (or force
                (not (symbol-value icon)))
-       (set icon (liece-toolbar-map-button-list plist)))
-      (run-hooks 'liece-xemacs-setup-toolbar-hook))))
+       (set icon (liece-toolbar-map-button-list plist))))
+    (run-hooks 'liece-xemacs-setup-toolbar-hook)))
 
 (add-hook 'liece-xemacs-setup-toolbar-hook 'liece-toolbar-setup-crypt-glyph)
 
@@ -229,24 +231,23 @@ If optional argument FORCE is non-nil, always update toolbar."
        (if liece-crypt-mode-active
            liece-toolbar-crypt-active-glyph
          liece-toolbar-crypt-inactive-glyph))
-  (and liece-use-toolbar
-       (set-specifier (symbol-value liece-use-toolbar)
-                     (cons (current-buffer) liece-toolbar-spec-list))))
+  (when liece-use-toolbar
+    (set-specifier (symbol-value liece-use-toolbar) liece-toolbar-spec-list
+                  (current-buffer))))
 
 ;;; @ modeline decoration
 ;;; 
 (defun liece-xemacs-hide-modeline ()
   "Remove modeline from current window."
-  (set-specifier has-modeline-p (cons (current-buffer) nil)))
+  (set-specifier has-modeline-p nil (current-buffer)))
 
 (when (featurep 'scrollbar)
   (defun liece-xemacs-hide-scrollbars ()
     (static-cond
      ((boundp 'horizontal-scrollbar-visible-p)
-      (set-specifier horizontal-scrollbar-visible-p nil
-                    (current-buffer)))
+      (set-specifier horizontal-scrollbar-visible-p nil (current-buffer)))
      ((boundp 'scrollbar-height)
-      (set-specifier scrollbar-height (cons (current-buffer) 0)))))
+      (set-specifier scrollbar-height 0 (current-buffer)))))
   (add-hook 'liece-nick-mode-hook 'liece-xemacs-hide-scrollbars)
   (add-hook 'liece-channel-list-mode-hook 'liece-xemacs-hide-scrollbars))
 
@@ -265,10 +266,10 @@ If optional argument FORCE is non-nil, always update toolbar."
 
 (defun liece-setup-toolbar ()
   "Prepare toolbar if wanted."
-  (and liece-use-toolbar
-       (liece-xemacs-setup-toolbar liece-toolbar-spec-list)
-       (set-specifier (symbol-value liece-use-toolbar)
-                     (cons (current-buffer) liece-toolbar-spec-list))))
+  (when liece-use-toolbar
+    (liece-xemacs-setup-toolbar liece-toolbar-spec-list)
+    (set-specifier (symbol-value liece-use-toolbar) liece-toolbar-spec-list
+                  (current-buffer))))
 
 (defun liece-xemacs-modeline-glyph ()
   "Return a glyph of modeline pointer."