(elint-add-required-env): Revert to not using temp-buffers (2009-09-12).

2 files changed, 16 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 328e68dc7fb..41362abced0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-14  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/elint.el (elint-add-required-env): Revert to not using
+        temp-buffers (2009-09-12).
+
 2009-09-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * textmodes/ispell.el (ispell-command-loop): Improve last fix, using
diff --git a/lisp/emacs-lisp/elint.el b/lisp/emacs-lisp/elint.el
index d2e950ae908..e90b72f65ff 100644
--- a/lisp/emacs-lisp/elint.el
+++ b/lisp/emacs-lisp/elint.el
@@ -352,14 +352,17 @@ Return nil if there are no more forms, t otherwise."
         (message nil)
         (if lib
             (save-excursion
-              ;;; (set-buffer (find-file-noselect lib))
-              ;;; (elint-update-env)
-              ;;; (setq env (elint-env-add-env env elint-buffer-env)))
-              (with-temp-buffer
-                (insert-file-contents lib)
-                (with-syntax-table emacs-lisp-mode-syntax-table
-                  (elint-update-env))
-                (setq env (elint-env-add-env env elint-buffer-env))))
+              ;; FIXME this doesn't use a temp buffer, because it
+              ;; stores the result in buffer-local variables so that
+              ;; it can be reused.
+              (set-buffer (find-file-noselect lib))
+              (elint-update-env)
+              (setq env (elint-env-add-env env elint-buffer-env)))
+              ;;; (with-temp-buffer
+              ;;;       (insert-file-contents lib)
+              ;;;       (with-syntax-table emacs-lisp-mode-syntax-table
+              ;;;         (elint-update-env))
+              ;;;       (setq env (elint-env-add-env env elint-buffer-env))))
               ;;(message "Elint processed (require '%s)" name))
           (error "Unable to find require'd library %s" name)))
     (error