(M28498): Add J{78|83}-3732.

[chise/xemacs-chise.git] / lisp / cus-edit.el

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 5851776..734725f 100644 (file)
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1,9 +1,9 @@
 ;;; cus-edit.el --- Tools for customizating Emacs and Lisp packages.
 ;;
 ;;; cus-edit.el --- Tools for customizating Emacs and Lisp packages.
 ;;

-;; Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc.

 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>

-;; Maintainer: Hrvoje Niksic <hniksic@srce.hr>
+;; Maintainer: Hrvoje Niksic <hniksic@xemacs.org>

 ;; Keywords: help, faces
 ;; Version: 1.9960-x
 ;; X-URL: http://www.dina.kvl.dk/~abraham/custom/
 ;; Keywords: help, faces
 ;; Version: 1.9960-x
 ;; X-URL: http://www.dina.kvl.dk/~abraham/custom/

@@ -1033,7 +1033,6 @@ This works by calling the function specified by
   (widget-insert "\nOperate on everything in this buffer:\n ")
   (widget-create 'push-button
                 :tag "Set"
   (widget-insert "\nOperate on everything in this buffer:\n ")
   (widget-create 'push-button
                 :tag "Set"

-                :tag-glyph '("set-up" "set-down")

                 :help-echo "\
 Make your editing in this buffer take effect for this session"
                 :action (lambda (widget &optional event)
                 :help-echo "\
 Make your editing in this buffer take effect for this session"
                 :action (lambda (widget &optional event)

@@ -1041,7 +1040,6 @@ Make your editing in this buffer take effect for this session"
   (widget-insert " ")
   (widget-create 'push-button
                 :tag "Save"
   (widget-insert " ")
   (widget-create 'push-button
                 :tag "Save"

-                :tag-glyph '("save-up" "save-down")

                 :help-echo "\
 Make your editing in this buffer take effect for future Emacs sessions"
                 :action (lambda (widget &optional event)
                 :help-echo "\
 Make your editing in this buffer take effect for future Emacs sessions"
                 :action (lambda (widget &optional event)

@@ -1077,7 +1075,6 @@ Reset all values in this buffer to their standard settings"
   (widget-insert "  ")
   (widget-create 'push-button
                 :tag "Done"
   (widget-insert "  ")
   (widget-create 'push-button
                 :tag "Done"

-                :tag-glyph '("done-up" "done-down")

                 :help-echo "Remove the buffer"
                 :action (lambda (widget &optional event)
                           (Custom-buffer-done)))
                 :help-echo "Remove the buffer"
                 :action (lambda (widget &optional event)
                           (Custom-buffer-done)))

@@ -2275,7 +2272,7 @@ Optional EVENT is the location for the menu."
   :format "%t: %v"
   :tag "Attributes"
   :extra-offset 12
   :format "%t: %v"
   :tag "Attributes"
   :extra-offset 12

-  :button-args '(:help-echo "Control whether this attribute have any effect")
+  :button-args '(:help-echo "Control whether this attribute has any effect")

   :args (mapcar (lambda (att)
                  (list 'group
                        :inline t
   :args (mapcar (lambda (att)
                  (list 'group
                        :inline t

@@ -2759,7 +2756,7 @@ Optional EVENT is the location for the menu."
   :tag "Hook")
 
 (defun custom-hook-convert-widget (widget)
   :tag "Hook")
 
 (defun custom-hook-convert-widget (widget)

-  ;; Handle `:custom-options'.
+  ;; Handle `:options'.

   (let* ((options (widget-get widget :options))
         (other `(editable-list :inline t
                                :entry-format "%i %d%v"
   (let* ((options (widget-get widget :options))
         (other `(editable-list :inline t
                                :entry-format "%i %d%v"

@@ -3280,7 +3277,7 @@ Leave point at the location of the call, or after the last expression."
                    (when (or (and spec (eq (car spec) 'user)
                               (eq (second spec) 'set)) comment)
                      (princ "\n '(")
                    (when (or (and spec (eq (car spec) 'user)
                               (eq (second spec) 'set)) comment)
                      (princ "\n '(")

-                     (princ symbol)
+                     (prin1 symbol)

                      (princ " ")
                      ;; This comment stuf is in the way ####
                      ;; Is (eq (third spec) (car saved-value)) ????
                      (princ " ")
                      ;; This comment stuf is in the way ####
                      ;; Is (eq (third spec) (car saved-value)) ????

@@ -3313,7 +3310,7 @@ Leave point at the location of the call, or after the last expression."
               (eq (car theme-spec) 'user)
               (eq (second theme-spec) 'set)) comment)
       (princ "\n '(")
               (eq (car theme-spec) 'user)
               (eq (second theme-spec) 'set)) comment)
       (princ "\n '(")

-      (princ symbol)
+      (prin1 symbol)

       (princ " ")
       (prin1 (get symbol 'saved-face))
       (if (or comment now)
       (princ " ")
       (prin1 (get symbol 'saved-face))
       (if (or comment now)

@@ -3358,7 +3355,7 @@ Leave point at the location of the call, or after the last expression."
                        (princ "(")
                        (princ (quote ,setter))
                        (princ "\n '(")
                        (princ "(")
                        (princ (quote ,setter))
                        (princ "\n '(")

-                       (princ object)
+                       (prin1 object)

                        (princ " ")
                        (prin1 (third spec))
                        (princ ")")))))))
                        (princ " ")
                        (prin1 (third spec))
                        (princ ")")))))))