Mercurial > hg > xemacs-beta
diff 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 |
line wrap: on
line diff
--- a/lisp/descr-text.el Sat Jan 15 17:24:06 2011 +0000 +++ b/lisp/descr-text.el Sat Jan 22 17:20:19 2011 +0000 @@ -598,7 +598,7 @@ (concat message (make-string (mod loop-count 44) ?.))) - (block 'dealing-with-chars + (block dealing-with-chars (when (= buffer-size (- (point-max) (point-min))) ;; If we're in the body of the file, we need to delete the ;; character info for the last character, and set offset-end @@ -637,13 +637,13 @@ (while t (when (= (point) (point-max)) ;; We're at the end of this part of the file. - (return-from 'dealing-with-chars)) + (return-from dealing-with-chars)) (unless (re-search-forward "^\\(U\\+[0-9A-F]\\{4,6\\}\\)\t" nil t) ;; We're probably in the comments at the start of the ;; file. No need to look for character info. - (return-from 'dealing-with-chars)) + (return-from dealing-with-chars)) ;; Store where the character started. (beginning-of-line)