* lisp/emacs-lisp/lisp-mode.el (eval-defun-2): Simplify, using lexical-binding.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 157152b20a3497c1310eb755c5933e2cb9b2320a..6e6c0aaa67116f1591c1662dd7714739b0b046b4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2013-10-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * emacs-lisp/lisp-mode.el (eval-defun-2): Simplify, using lexical-binding.
+
        * emacs-lisp/tq.el (tq-create): Use a closure instead of `(lambda...).
 
        * progmodes/ruby-mode.el: Fix recently added tests.

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index f7105b7d3b4e9a1fb3ff7e7490ed7267122083b5..f1705cbc9ececd1a5ddddb9360a4832a56148c47 100644 (file)
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -1,4 +1,4 @@
-;;; lisp-mode.el --- Lisp mode, and its idiosyncratic commands  -*- coding: utf-8 -*-
+;;; lisp-mode.el --- Lisp mode, and its idiosyncratic commands  -*- lexical-binding:t -*-
 
 ;; Copyright (C) 1985-1986, 1999-2013 Free Software Foundation, Inc.
 
@@ -917,27 +917,25 @@ Return the result of evaluation."
     (save-excursion
       ;; Arrange for eval-region to "read" the (possibly) altered form.
       ;; eval-region handles recording which file defines a function or
-      ;; variable.  Re-written using `apply' to avoid capturing
-      ;; variables like `end'.
-      (apply
-       #'eval-region
-       (let ((standard-output t)
-            beg end form)
-        ;; Read the form from the buffer, and record where it ends.
-        (save-excursion
-          (end-of-defun)
-          (beginning-of-defun)
-          (setq beg (point))
-          (setq form (read (current-buffer)))
-          (setq end (point)))
-        ;; Alter the form if necessary.
-        (setq form (eval-sexp-add-defvars (eval-defun-1 (macroexpand form))))
-        (list beg end standard-output
-              `(lambda (ignore)
-                ;; Skipping to the end of the specified region
-                ;; will make eval-region return.
-                (goto-char ,end)
-                ',form))))))
+      ;; variable.
+      (let ((standard-output t)
+            beg end form)
+        ;; Read the form from the buffer, and record where it ends.
+        (save-excursion
+          (end-of-defun)
+          (beginning-of-defun)
+          (setq beg (point))
+          (setq form (read (current-buffer)))
+          (setq end (point)))
+        ;; Alter the form if necessary.
+        (let ((form (eval-sexp-add-defvars
+                     (eval-defun-1 (macroexpand form)))))
+          (eval-region beg end standard-output
+                       (lambda (_ignore)
+                         ;; Skipping to the end of the specified region
+                         ;; will make eval-region return.
+                         (goto-char end)
+                         form))))))
   ;; The result of evaluation has been put onto VALUES.  So return it.
   (car values))