Changeset 3990 for trunk/lisp/descr-text.el

Timestamp:

11/26/05 10:45:09 (3 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/descr-text.el (modified) (7 diffs)

trunk/lisp/descr-text.el

@@ -459 +459 @@
-         (overlays (mapcar #'(lambda (o) (overlay-properties o))
-                           (overlays-at pos)))
+         (char-description (if (not multibyte-p)
+                               (single-key-description char)
+                             (if (< char 128)
+                                 (single-key-description char)
+                               (string-to-multibyte
+                                (char-to-string char)))))
-         item-list max-width unicode)
-
@@ -468 +474 @@
-    (setq item-list
-          `(("character"
-
-
-
-
-
-
-
+
+
-                            (text-properties-at pos))
-                     char char char
@@ -511 +512 @@
-                 (if (not category-set)
-                     '("-- none --")
-  
+
-                                                 x (category-docstring x)))
-                           (category-set-mnemonics category-set)))))
@@ -584 +585 @@
-                          (concat
-                           "by this font (glyph code)\n"
-0
+#
-                                   (car display) (cdr display)))
-                        "no font available")
@@ -640 +641 @@
-          (re-search-forward "character:[ \t\n]+")
-          (setq pos (point)))
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-        (when disp-vector
@@ -658 +660 @@
-                          (propertize " " 'display '(space :align-to 5))
-                          (if (cdr (aref disp-vector i))
-0
+#
-                                      (cddr (aref disp-vector i)))
-                            "-- no font --")
@@ -709 +711 @@
-                          (propertize " " 'display '(space :align-to 5))
-                          (if (cdr elt)
-0
+#
-                            "-- no font --"))))
-            (insert "these terminal codes:")