mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-29 11:02:01 +00:00
Code Issues Releases Activity

gnus-util.el (gnus-macroexpand-all): Use eval-and-compile.

Browse Source
This commit is contained in:
Katsumi Yamaoka 2010-12-05 23:29:50 +00:00
parent 04db63bc41
commit c67e426e95
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/gnus/ChangeLog
View File

@ -1,3 +1,7 @@
2010-12-05 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-util.el (gnus-macroexpand-all): Use eval-and-compile.
2010-12-05 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnus-sum.el (gnus-summary-respool-article): The completion function

33
lisp/gnus/gnus-util.el
View File

@ -2037,25 +2037,26 @@ Same as `string-match' except this function does not change the match data."
(save-match-data
(string-match regexp string start))))
(if (fboundp 'macroexpand-all)
(defalias 'gnus-macroexpand-all 'macroexpand-all)
(defun gnus-macroexpand-all (form &optional environment)
"Return result of expanding macros at all levels in FORM.
(eval-and-compile
(if (fboundp 'macroexpand-all)
(defalias 'gnus-macroexpand-all 'macroexpand-all)
(defun gnus-macroexpand-all (form &optional environment)
"Return result of expanding macros at all levels in FORM.
If no macros are expanded, FORM is returned unchanged.
The second optional arg ENVIRONMENT specifies an environment of macro
definitions to shadow the loaded ones for use in file byte-compilation."
(if (consp form)
(let ((idx 1)
(len (length (setq form (copy-sequence form))))
expanded)
(while (< idx len)
(setcar (nthcdr idx form) (gnus-macroexpand-all (nth idx form)
environment))
(setq idx (1+ idx)))
(if (eq (setq expanded (macroexpand form environment)) form)
form
(gnus-macroexpand-all expanded environment)))
form)))
(if (consp form)
(let ((idx 1)
(len (length (setq form (copy-sequence form))))
expanded)
(while (< idx len)
(setcar (nthcdr idx form) (gnus-macroexpand-all (nth idx form)
environment))
(setq idx (1+ idx)))
(if (eq (setq expanded (macroexpand form environment)) form)
form
(gnus-macroexpand-all expanded environment)))
form))))
(provide 'gnus-util)