Mercurial > hg > xemacs-beta
comparison lisp/descr-text.el @ 5342:174aed57a32a
Require that NAME be an unquoted symbol, #'block, #'return-from
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (block, return-from): Require that NAME be a symbol
in these macros, as always documented in the #'block docstring and
as required by Common Lisp.
* descr-text.el (unidata-initialize-unihan-database):
Correct the use of non-symbols in #'block and #'return-from in
this function.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sat, 22 Jan 2011 17:20:19 +0000 |
| parents | 09f8ed0933c7 |
| children | f00192e1cd49 0af042a0c116 |
comparison
equal
deleted
inserted
replaced
| 5340:9dd4559b9e9a | 5342:174aed57a32a |
|---|---|
| 596 "%s" (truncate | 596 "%s" (truncate |
| 597 (* (/ offset-start size) 100)) | 597 (* (/ offset-start size) 100)) |
| 598 (concat message | 598 (concat message |
| 599 (make-string | 599 (make-string |
| 600 (mod loop-count 44) ?.))) | 600 (mod loop-count 44) ?.))) |
| 601 (block 'dealing-with-chars | 601 (block dealing-with-chars |
| 602 (when (= buffer-size (- (point-max) (point-min))) | 602 (when (= buffer-size (- (point-max) (point-min))) |
| 603 ;; If we're in the body of the file, we need to delete the | 603 ;; If we're in the body of the file, we need to delete the |
| 604 ;; character info for the last character, and set offset-end | 604 ;; character info for the last character, and set offset-end |
| 605 ;; appropriately. Otherwise, we may not be able to pick where | 605 ;; appropriately. Otherwise, we may not be able to pick where |
| 606 ;; the actual description of a character ends and begins. | 606 ;; the actual description of a character ends and begins. |
| 635 (setq offset-end (+ offset-start (- (point) (point-min)))))) | 635 (setq offset-end (+ offset-start (- (point) (point-min)))))) |
| 636 (goto-char (point-min)) | 636 (goto-char (point-min)) |
| 637 (while t | 637 (while t |
| 638 (when (= (point) (point-max)) | 638 (when (= (point) (point-max)) |
| 639 ;; We're at the end of this part of the file. | 639 ;; We're at the end of this part of the file. |
| 640 (return-from 'dealing-with-chars)) | 640 (return-from dealing-with-chars)) |
| 641 | 641 |
| 642 (unless (re-search-forward "^\\(U\\+[0-9A-F]\\{4,6\\}\\)\t" | 642 (unless (re-search-forward "^\\(U\\+[0-9A-F]\\{4,6\\}\\)\t" |
| 643 nil t) | 643 nil t) |
| 644 ;; We're probably in the comments at the start of the | 644 ;; We're probably in the comments at the start of the |
| 645 ;; file. No need to look for character info. | 645 ;; file. No need to look for character info. |
| 646 (return-from 'dealing-with-chars)) | 646 (return-from dealing-with-chars)) |
| 647 | 647 |
| 648 ;; Store where the character started. | 648 ;; Store where the character started. |
| 649 (beginning-of-line) | 649 (beginning-of-line) |
| 650 (setq character-start (point)) | 650 (setq character-start (point)) |
| 651 | 651 |