(sh-font-lock-keywords): Don't crash for an unrecognized shell.

[bpt/emacs.git] / lisp / widget.el

diff --git a/lisp/widget.el b/lisp/widget.el
index 4905c06..10af457 100644 (file)
--- a/lisp/widget.el
+++ b/lisp/widget.el
@@ -4,7 +4,7 @@
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: help, extensions, faces, hypermedia
-;; Version: 1.90
+;; Version: 1.9920
 ;; X-URL: http://www.dina.kvl.dk/~abraham/custom/
 
 ;; This file is part of GNU Emacs.
@@ -36,21 +36,28 @@
 (eval-when-compile (require 'cl))
 
 (defmacro define-widget-keywords (&rest keys)
-  (`
-   (eval-and-compile
-     (let ((keywords (quote (, keys))))
-       (while keywords
-        (or (boundp (car keywords))
-            (set (car keywords) (car keywords)))
-        (setq keywords (cdr keywords)))))))
-
-(define-widget-keywords :prompt-value :text-format :deactivate :active
+  ;; Don't use backquote, since that makes trouble trying to
+  ;; re-bootstrap from just the .el files.
+  (list 'eval-and-compile
+    (list 'let (list (list 'keywords (list 'quote keys)))
+      (list 'while 'keywords
+       (list 'or (list 'boundp (list 'car 'keywords))
+           (list 'set (list 'car 'keywords) (list 'car 'keywords)))
+       (list 'setq 'keywords (list 'cdr 'keywords))))))
+
+(define-widget-keywords :documentation-indent
+  :complete-function :complete :button-overlay
+  :field-overlay  
+  :documentation-shown :button-prefix  
+  :button-suffix :mouse-down-action :glyph-up :glyph-down :glyph-inactive  
+  :prompt-internal :prompt-history :prompt-match
+  :prompt-value  :deactivate :active  
   :inactive :activate :sibling-args :delete-button-args
   :insert-button-args :append-button-args :button-args 
   :tag-glyph :off-glyph :on-glyph :valid-regexp
-  :secret :sample-face :sample-face-get :case-fold :widget-doc 
+  :secret :sample-face :sample-face-get :case-fold 
   :create :convert-widget :format :value-create :offset :extra-offset
-  :tag :doc :from :to :args :value :value-from :value-to :action
+  :tag :doc :from :to :args :value :action
   :value-set :value-delete :match :parent :delete :menu-tag-get
   :value-get :choice :void :menu-tag :on :off :on-type :off-type
   :notify :entry-format :button :children :buttons :insert-before
@@ -58,19 +65,7 @@
   :indent :size :value-to-external :validate :error :directory
   :must-match :type-error :value-inline :inline :match-inline :greedy
   :button-face-get :button-face :value-face :keymap :entry-from
-  :entry-to :help-echo :documentation-property :hide-front-space
-  :hide-rear-space :tab-order) 
-
-;; These autoloads should be deleted when the file is added to Emacs.
-(unless (fboundp 'load-gc)
-  (autoload 'widget-apply "wid-edit")
-  (autoload 'widget-create "wid-edit")
-  (autoload 'widget-insert "wid-edit")
-  (autoload 'widget-prompt-value "wid-edit")
-  (autoload 'widget-browse "wid-browse" nil t)
-  (autoload 'widget-browse-other-window "wid-browse" nil t)
-  (autoload 'widget-browse-at "wid-browse" nil t)
-  (autoload 'widget-minor-mode "wid-browse" nil t))
+  :entry-to :help-echo :documentation-property :tab-order) 
 
 (defun define-widget (name class doc &rest args)
   "Define a new widget type named NAME from CLASS.