(ange-ftp-file-name-sans-versions): Don't return

[gnu-emacs] / lisp / widget.el

diff --git a/lisp/widget.el b/lisp/widget.el
index c3dfeb86d6512f88468ac5d773a4526060a20b0e..10af457a97c558087f1ad56c677b12784a3bd8c5 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.9908
+;; Version: 1.9920
 ;; X-URL: http://www.dina.kvl.dk/~abraham/custom/
 
 ;; This file is part of GNU Emacs.
@@ -36,15 +36,17 @@
 (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 :complete-function :complete :button-overlay
+  ;; 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  
@@ -65,17 +67,6 @@
   :button-face-get :button-face :value-face :keymap :entry-from
   :entry-to :help-echo :documentation-property :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))
-
 (defun define-widget (name class doc &rest args)
   "Define a new widget type named NAME from CLASS.