commit: Require that NAME be an unquoted symbol, #'block, #'return-from
changeset: 5342:174aed57a32a
parent: 5340:9dd4559b9e9a
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Sat Jan 22 17:20:19 2011 +0000
files: lisp/ChangeLog lisp/cl-macs.el lisp/descr-text.el
description:
Require that NAME be an unquoted symbol, #'block, #'return-from
2011-01-22 Aidan Kehoe <kehoea(a)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.
diff -r 9dd4559b9e9a -r 174aed57a32a lisp/ChangeLog
--- a/lisp/ChangeLog Sat Jan 15 17:24:06 2011 +0000
+++ b/lisp/ChangeLog Sat Jan 22 17:20:19 2011 +0000
＠＠ -1,3 +1,12 ＠＠
+2011-01-22 Aidan Kehoe <kehoea(a)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.
+
2011-01-15 Aidan Kehoe <kehoea(a)parhasard.net>
* cl-extra.el (concatenate): Accept more complicated TYPEs in this
diff -r 9dd4559b9e9a -r 174aed57a32a lisp/cl-macs.el
--- a/lisp/cl-macs.el Sat Jan 15 17:24:06 2011 +0000
+++ b/lisp/cl-macs.el Sat Jan 22 17:20:19 2011 +0000
＠＠ -745,7 +745,8 ＠＠
called from BODY."
(if (cl-safe-expr-p (cons 'progn body)) (cons 'progn body)
(list 'cl-block-wrapper
- (list* 'catch (list 'quote (intern (format "--cl-block-%s--"
name)))
+ (list* 'catch (list 'quote (intern (concat "--cl-block-"
+ (symbol-name name) "--")))
body))))
(defvar cl-active-block-names nil)
＠＠ -788,7 +789,7 ＠＠
returning RESULT from that form (or nil if RESULT is omitted).
This is compatible with Common Lisp, but note that `defun' and
`defmacro' do not create implicit blocks as they do in Common Lisp."
- (let ((name2 (intern (format "--cl-block-%s--" name))))
+ (let ((name2 (intern (concat "--cl-block-" (symbol-name name)
"--"))))
(list 'cl-block-throw (list 'quote name2) result)))
diff -r 9dd4559b9e9a -r 174aed57a32a lisp/descr-text.el
--- 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)
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches