X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/56388398e7a1251497f002072c061002ec9d9e81..781424c2f372d40d69d6aa77d62adc236e795323:/lisp/descr-text.el

diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index dfa87308fb..7b7a209451 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -187,22 +187,23 @@ otherwise."
   "List of Unicode-based character property names shown by `describe-char'."
   :group 'mule
   :version "23.1"
-  :type '(set
-	  (const :tag "Unicode Name" name)
-	  (const :tag "Unicode general category " general-category)
-	  (const :tag "Unicode canonical combining class"
-		 canonical-combining-class)
-	  (const :tag "Unicode bidi class" bidi-class)
-	  (const :tag "Unicode decomposition mapping" decomposition)
-	  (const :tag "Unicode decimal digit value" decimal-digit-value)
-	  (const :tag "Unicode digit value" digit-value)
-	  (const :tag "Unicode numeric value" numeric-value)
-	  (const :tag "Unicode mirrored" mirrored)
-	  (const :tag "Unicode old name" old-name)
-	  (const :tag "Unicode ISO 10646 comment" iso-10646-comment)
-	  (const :tag "Unicode simple uppercase mapping" uppercase)
-	  (const :tag "Unicode simple lowercase mapping" lowercase)
-	  (const :tag "Unicode simple titlecase mapping" titlecase)))
+  :type '(choice (const :tag "All properties" t)
+          (set
+           (const :tag "Unicode Name" name)
+           (const :tag "Unicode general category " general-category)
+           (const :tag "Unicode canonical combining class"
+                  canonical-combining-class)
+           (const :tag "Unicode bidi class" bidi-class)
+           (const :tag "Unicode decomposition mapping" decomposition)
+           (const :tag "Unicode decimal digit value" decimal-digit-value)
+           (const :tag "Unicode digit value" digit-value)
+           (const :tag "Unicode numeric value" numeric-value)
+           (const :tag "Unicode mirrored" mirrored)
+           (const :tag "Unicode old name" old-name)
+           (const :tag "Unicode ISO 10646 comment" iso-10646-comment)
+           (const :tag "Unicode simple uppercase mapping" uppercase)
+           (const :tag "Unicode simple lowercase mapping" lowercase)
+           (const :tag "Unicode simple titlecase mapping" titlecase))))
 
 (defcustom describe-char-unicodedata-file nil
   "Location of Unicode data file.
@@ -219,13 +220,6 @@ At the time of writing it is at the URL
   :type '(choice (const :tag "None" nil)
 		 file))
 
-;; We could convert the unidata file into a Lispy form once-for-all
-;; and distribute it for loading on demand.  It might be made more
-;; space-efficient by splitting strings word-wise and replacing them
-;; with lists of symbols interned in a private obarray, e.g.
-;; "LATIN SMALL LETTER A" => '(LATIN SMALL LETTER A).
-
-;; Fixme: Check whether this needs updating for Unicode 4.
 (defun describe-char-unicode-data (char)
   "Return a list of Unicode data for unicode CHAR.
 Each element is a list of a property description and the property value.
@@ -516,7 +510,7 @@ as well as widgets, buttons, overlays, and text properties."
 	    ,@(let ((unicodedata (describe-char-unicode-data char)))
 		(if unicodedata
 		    (cons (list "Unicode data" " ") unicodedata)))))
-    (setq max-width (apply #'max (mapcar #'(lambda (x) 
+    (setq max-width (apply #'max (mapcar #'(lambda (x)
 					     (if (cadr x) (length (car x)) 0))
 					 item-list)))
     (help-setup-xref nil (interactive-p))
@@ -628,30 +622,31 @@ as well as widgets, buttons, overlays, and text properties."
 	    (insert "\nSee the variable `reference-point-alist' for "
 		    "the meaning of the rule.\n")))
 
-	(if (not describe-char-unidata-list)
-	    (insert "\nCharacter code properties are not shown: ")
-	  (insert "\nCharacter code properties: "))
+	(insert (if (not describe-char-unidata-list)
+                    "\nCharacter code properties are not shown: "
+                  "\nCharacter code properties: "))
 	(insert-text-button
 	 "customize what to show"
 	 'action (lambda (&rest ignore)
 		   (customize-variable
 		    'describe-char-unidata-list)))
 	(insert "\n")
-	(dolist (elt describe-char-unidata-list)
+	(dolist (elt (if (eq describe-char-unidata-list t)
+                         (nreverse (mapcar 'car char-code-property-alist))
+                       describe-char-unidata-list))
 	  (let ((val (get-char-code-property char elt))
 		description)
 	    (when val
 	      (setq description (char-code-property-description elt val))
-	      (if description
-		  (insert (format "  %s: %s (%s)\n" elt val description))
-		(insert (format "  %s: %s\n" elt val))))))
+	      (insert (if description
+                          (format "  %s: %s (%s)\n" elt val description)
+                        (format "  %s: %s\n" elt val))))))
 
         (if text-props-desc (insert text-props-desc))
 	(setq help-xref-stack-item (list 'help-insert-string (buffer-string)))
 	(toggle-read-only 1)))))
 
-(defalias 'describe-char-after 'describe-char)
-(make-obsolete 'describe-char-after 'describe-char "22.1")
+(define-obsolete-function-alias 'describe-char-after 'describe-char "22.1")
 
 (provide 'descr-text)