[Emacs-diffs] trunk r116564: * lisp/emacs-lisp/lisp.el (lisp--local-variables): Catch `end-of-file'

[Dmitry Gutov]

------------------------------------------------------------
revno: 116564
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16850
committer: Dmitry Gutov <address@hidden>
branch nick: trunk
timestamp: Wed 2014-02-26 04:31:27 +0200
message:
  * lisp/emacs-lisp/lisp.el (lisp--local-variables): Catch `end-of-file'
  error from `read-from-string'.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/lisp.el        lisp.el-20091113204419-o5vbwnq5f7feedwu-131

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-02-26 02:02:21 +0000
+++ b/lisp/ChangeLog    2014-02-26 02:31:27 +0000
@@ -1,5 +1,8 @@
 2014-02-26  Dmitry Gutov  <address@hidden>
 
+       * emacs-lisp/lisp.el (lisp--local-variables): Catch `end-of-file'
+       error from `read-from-string'.  (Bug#16850)
+
        * emacs-lisp/ert.el (ert-run-tests-interactively): `read' the
        result of `completing-read' in the interactive form.  (Bug#16854)
 

=== modified file 'lisp/emacs-lisp/lisp.el'
--- a/lisp/emacs-lisp/lisp.el   2014-02-10 05:50:16 +0000
+++ b/lisp/emacs-lisp/lisp.el   2014-02-26 02:31:27 +0000
@@ -719,8 +719,10 @@
       (dolist (p (nth 9 ppss))
         (push (cdr (syntax-after p)) closer))
       (setq closer (apply #'string closer))
-      (let* ((sexp (car (read-from-string
-                         (concat txt "lisp--witness--lisp" closer))))
+      (let* ((sexp (condition-case nil
+                       (car (read-from-string
+                             (concat txt "lisp--witness--lisp" closer)))
+                     (end-of-file nil)))
              (macroexpand-advice (lambda (expander form &rest args)
                                    (condition-case nil
                                        (apply expander form args)