Mercurial > emacs
comparison lisp/descr-text.el @ 109412:9557b86a556a
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Sun, 20 Jun 2010 22:46:22 +0000 |
| parents | 8d29522e59d4 |
| children | 60516122d066 |
comparison
equal
deleted
inserted
replaced
| 109411:d654ebf81f14 | 109412:9557b86a556a |
|---|---|
| 616 'type 'help-face | 616 'type 'help-face |
| 617 'help-args '(,face)))))) | 617 'help-args '(,face)))))) |
| 618 ,@(if (not eight-bit-p) | 618 ,@(if (not eight-bit-p) |
| 619 (let ((unicodedata (describe-char-unicode-data char))) | 619 (let ((unicodedata (describe-char-unicode-data char))) |
| 620 (if unicodedata | 620 (if unicodedata |
| 621 (cons (list "Unicode data" " ") unicodedata)))))) | 621 (cons (list "Unicode data" "") unicodedata)))))) |
| 622 (setq max-width (apply 'max (mapcar (lambda (x) | 622 (setq max-width (apply 'max (mapcar (lambda (x) |
| 623 (if (cadr x) (length (car x)) 0)) | 623 (if (cadr x) (length (car x)) 0)) |
| 624 item-list))) | 624 item-list))) |
| 625 (set-buffer src-buf) | 625 (set-buffer src-buf) |
| 626 (help-setup-xref (list 'describe-char pos buffer) | 626 (help-setup-xref (list 'describe-char pos buffer) |
| 640 (string-width clm)) | 640 (string-width clm)) |
| 641 1) | 641 1) |
| 642 (window-width)) | 642 (window-width)) |
| 643 (insert "\n") | 643 (insert "\n") |
| 644 (indent-to (1+ max-width))) | 644 (indent-to (1+ max-width))) |
| 645 (insert " " clm))) | 645 (unless (zerop (length clm)) |
| 646 (insert " " clm)))) | |
| 646 (insert "\n")))) | 647 (insert "\n")))) |
| 647 | 648 |
| 648 (when overlays | 649 (when overlays |
| 649 (save-excursion | 650 (save-excursion |
| 650 (goto-char (point-min)) | 651 (goto-char (point-min)) |