X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Ftoolbar.el;h=74d44e7c030ae1c216496d57c808d88dfb37f338;hb=e5cd8d4ed475af329be5df9627a53edd584fd3de;hp=446ce940106d58a3ec725ab35f517ee2799177cb;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git

diff --git a/lisp/toolbar.el b/lisp/toolbar.el
index 446ce94..74d44e7 100644
--- a/lisp/toolbar.el
+++ b/lisp/toolbar.el
@@ -36,9 +36,9 @@
 customized through the options menu."
   :group 'display
   :type 'boolean
-  :set '(lambda (var val)
-	  (set-specifier default-toolbar-visible-p val)
-	  (setq toolbar-visible-p val))
+  :set #'(lambda (var val)
+	   (set-specifier default-toolbar-visible-p val)
+	   (setq toolbar-visible-p val))
   )
 
 (defcustom toolbar-captioned-p ;; added for the options menu - dverna apr. 98
@@ -47,23 +47,23 @@ customized through the options menu."
 customized through the options menu."
   :group 'display
   :type 'boolean
-  :set '(lambda (var val)
-	  (set-specifier toolbar-buttons-captioned-p val)
-	  (setq toolbar-captioned-p val))
+  :set #'(lambda (var val)
+	   (set-specifier toolbar-buttons-captioned-p val)
+	   (setq toolbar-captioned-p val))
   )
 
 (defcustom default-toolbar-position ;; added for the options menu - dverna
   (default-toolbar-position)
-  "The location of the default toolbar. It can be 'top, 'bootom, 'left or
+  "The location of the default toolbar. It can be 'top, 'bottom, 'left or
 'right. This option can be customized through the options menu."
   :group 'display
-  :type '(choice (const :tag "top" 'top)
-		 (const :tag "bottom" 'bottom)
-		 (const :tag "left" 'left)
-		 (const :tag "right" 'right))
-  :set '(lambda (var val)
-	  (set-default-toolbar-position val)
-	  (setq default-toolbar-position val))
+  :type '(choice (const :tag "top" top)
+		 (const :tag "bottom" bottom)
+		 (const :tag "left" left)
+		 (const :tag "right" right))
+  :set #'(lambda (var val)
+	   (set-default-toolbar-position val)
+	   (setq default-toolbar-position val))
   )
 
 (defvar toolbar-help-enabled t
@@ -198,4 +198,21 @@ as an argument if release is over a blank area of the toolbar."
   (setq zmacs-region-stays t)
   (release-toolbar-button-internal event nil))
 
+(defun make-toolbar-specifier (spec-list)
+  "Return a new `toolbar' specifier object with the given specification list.
+SPEC-LIST can be a list of specifications (each of which is a cons of a
+locale and a list of instantiators), a single instantiator, or a list
+of instantiators.  See `make-specifier' for more information about
+specifiers.
+
+Toolbar specifiers are used to specify the format of a toolbar.
+The values of the variables `default-toolbar', `top-toolbar',
+`left-toolbar', `right-toolbar', and `bottom-toolbar' are always
+toolbar specifiers.
+
+Valid toolbar instantiators are called \"toolbar descriptors\"
+and are lists of vectors.  See `default-toolbar' for a description
+of the exact format."
+  (make-specifier-and-init 'toolbar spec-list))
+
 ;;; toolbar.el ends here