diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-11-02 01:46:04 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-11-02 01:46:04 -0400 |
| commit | 4a48e97cf905468d6e09c3dd7a5ae7f7489badd5 (patch) | |
| tree | 13288fde709c55b57562bc69824b956124594d11 | |
| parent | ee17a97bea5ed7315c85f1ca2bcd862f84dc5dd8 (diff) | |
| download | emacs-4a48e97cf905468d6e09c3dd7a5ae7f7489badd5.tar.gz | |
* lisp/emacs-lisp/pp.el (pp-macroexpand-expression): Use macroexpand-1.
* lisp/progmodes/elisp-mode.el (emacs-lisp-macroexpand): Idem.
Fixes: debbugs:18821
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/emacs-lisp/macroexp.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/pp.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/elisp-mode.el | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d0256ff94b2..63663e878b9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-11-02 Stefan Monnier <monnier@iro.umontreal.ca> + + * emacs-lisp/pp.el (pp-macroexpand-expression): Use macroexpand-1 + (bug#18821). + * progmodes/elisp-mode.el (emacs-lisp-macroexpand): Idem. + 2014-11-01 Michael R. Mauger <michael@mauger.com> * sql.el (sql-mode-oracle-font-lock-keywords): Correct regexp diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el index 3ce369fd5fd..a96a7af77e8 100644 --- a/lisp/emacs-lisp/macroexp.el +++ b/lisp/emacs-lisp/macroexp.el @@ -394,7 +394,7 @@ symbol itself." (or (symbolp exp) (macroexp-const-p exp))) (defun macroexp-quote (v) - "Returns an expression E such that `(eval E)' is V. + "Return an expression E such that `(eval E)' is V. E is either V or (quote V) depending on whether V evaluates to itself or not." diff --git a/lisp/emacs-lisp/pp.el b/lisp/emacs-lisp/pp.el index dd012fab9da..c18b049020a 100644 --- a/lisp/emacs-lisp/pp.el +++ b/lisp/emacs-lisp/pp.el @@ -137,7 +137,7 @@ Also add the value to the front of the list in the variable `values'." "Macroexpand EXPRESSION and pretty-print its value." (interactive (list (read--expression "Macroexpand: "))) - (pp-display-expression (macroexpand expression) "*Pp Macroexpand Output*")) + (pp-display-expression (macroexpand-1 expression) "*Pp Macroexpand Output*")) (defun pp-last-sexp () "Read sexp before point. Ignores leading comment characters." @@ -175,7 +175,7 @@ With argument, pretty-print output into current buffer. Ignores leading comment characters." (interactive "P") (if arg - (insert (pp-to-string (macroexpand (pp-last-sexp)))) + (insert (pp-to-string (macroexpand-1 (pp-last-sexp)))) (pp-macroexpand-expression (pp-last-sexp)))) ;;; Test cases for quote diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el index 900e859b54a..2be81a57ebe 100644 --- a/lisp/progmodes/elisp-mode.el +++ b/lisp/progmodes/elisp-mode.el @@ -204,7 +204,7 @@ Comments in the form will be lost." (let* ((start (point)) (exp (read (current-buffer))) ;; Compute it before, since it may signal errors. - (new (macroexpand exp))) + (new (macroexpand-1 exp))) (if (equal exp new) (message "Not a macro call, nothing to expand") (delete-region start (point)) |