[Emacs-diffs] trunk r118253: * lisp/emacs-lisp/pp.el (pp-macroexpand-expression): Use macroexpand-1.

[Stefan Monnier]

------------------------------------------------------------
revno: 118253
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18821
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Sun 2014-11-02 01:46:04 -0400
message:
  * lisp/emacs-lisp/pp.el (pp-macroexpand-expression): Use macroexpand-1.
  * lisp/progmodes/elisp-mode.el (emacs-lisp-macroexpand): Idem.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/macroexp.el    
macroexp.el-20091113204419-o5vbwnq5f7feedwu-2966
  lisp/emacs-lisp/pp.el          pp.el-20091113204419-o5vbwnq5f7feedwu-781
  lisp/progmodes/elisp-mode.el   elispmode.el-20140927013948-e1y3x6iieoc5zmhn-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-11-02 02:04:26 +0000
+++ b/lisp/ChangeLog    2014-11-02 05:46:04 +0000
@@ -1,3 +1,9 @@
+2014-11-02  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
 
        * sql.el (sql-mode-oracle-font-lock-keywords): Correct regexp

=== modified file 'lisp/emacs-lisp/macroexp.el'
--- a/lisp/emacs-lisp/macroexp.el       2014-10-31 21:35:35 +0000
+++ b/lisp/emacs-lisp/macroexp.el       2014-11-02 05:46:04 +0000
@@ -394,7 +394,7 @@
   (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."

=== modified file 'lisp/emacs-lisp/pp.el'
--- a/lisp/emacs-lisp/pp.el     2014-07-02 05:05:50 +0000
+++ b/lisp/emacs-lisp/pp.el     2014-11-02 05:46:04 +0000
@@ -137,7 +137,7 @@
   "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 @@
 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

=== modified file 'lisp/progmodes/elisp-mode.el'
--- a/lisp/progmodes/elisp-mode.el      2014-10-15 01:56:56 +0000
+++ b/lisp/progmodes/elisp-mode.el      2014-11-02 05:46:04 +0000
@@ -204,7 +204,7 @@
   (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))