aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1996-03-23 14:38:37 +0000
committerRichard M. Stallman1996-03-23 14:38:37 +0000
commit46be15a43d496e035d719b592216062f1e44aceb (patch)
tree8c435ad858b34539c5116e8f6f6185c7e2df78c9
parentfcb51016d24922251acfbce354499b32374f9f91 (diff)
downloademacs-46be15a43d496e035d719b592216062f1e44aceb.tar.gz
emacs-46be15a43d496e035d719b592216062f1e44aceb.zip
(custom-type-properties): Use custom-asis instead of as-is.
(custom-asis): Set it to itself.
-rw-r--r--lisp/custom.el11
1 files changed, 7 insertions, 4 deletions
diff --git a/lisp/custom.el b/lisp/custom.el
index 7234cbeae5d..78b2323dd87 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -524,7 +524,7 @@ hierarchy the new entry should be added. CUSTOM is the entry to add."
524 (default . nil)) 524 (default . nil))
525 ((type . const) 525 ((type . const)
526 (tag . "Def") 526 (tag . "Def")
527 (default . as-is)))) 527 (default . custom-asis))))
528 (choice (type . default) 528 (choice (type . default)
529 ;; See `custom-match'. 529 ;; See `custom-match'.
530 (query . custom-choice-query) 530 (query . custom-choice-query)
@@ -632,16 +632,16 @@ Select the properties you want this face to have.")
632 (type . string)) 632 (type . string))
633 "\n" 633 "\n"
634 ((tag . "Bold") 634 ((tag . "Bold")
635 (default . as-is) 635 (default . custom-asis)
636 (type . triggle)) 636 (type . triggle))
637 " " 637 " "
638 ((tag . "Italic") 638 ((tag . "Italic")
639 (default . as-is) 639 (default . custom-asis)
640 (type . triggle)) 640 (type . triggle))
641 " " 641 " "
642 ((tag . "Underline") 642 ((tag . "Underline")
643 (hidden . t) 643 (hidden . t)
644 (default . as-is) 644 (default . custom-asis)
645 (type . triggle))) 645 (type . triggle)))
646 (default . (custom-face-lookup "default" "default" "default" 646 (default . (custom-face-lookup "default" "default" "default"
647 nil nil nil)) 647 nil nil nil))
@@ -733,6 +733,9 @@ Entries in this list take precedence over `custom-type-properties'.")
733(defconst custom-invalid '__invalid__ 733(defconst custom-invalid '__invalid__
734 "Special value representing an invalid field.") 734 "Special value representing an invalid field.")
735 735
736(defconst custom-asis 'custom-asis)
737;; Bad, ugly, and horrible kludge.
738
736(defun custom-property (custom property) 739(defun custom-property (custom property)
737 "Extract from CUSTOM property PROPERTY." 740 "Extract from CUSTOM property PROPERTY."
738 (let ((entry (assq property custom))) 741 (let ((entry (assq property custom)))