summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/lisp.el
diff options
context:
space:
mode:
authorDmitry Gutov <dgutov@yandex.ru>2014-02-26 04:31:27 +0200
committerDmitry Gutov <dgutov@yandex.ru>2014-02-26 04:31:27 +0200
commitb2388336fef199304f7050340a91fe559b634ba2 (patch)
tree859711d8a58955949a8b1767d20eee31d74cf6cc /lisp/emacs-lisp/lisp.el
parent40ff7f86b6e030763327fd306702ba0928e5b09e (diff)
downloademacs-b2388336fef199304f7050340a91fe559b634ba2.tar.gz
* lisp/emacs-lisp/lisp.el (lisp--local-variables): Catch `end-of-file'
error from `read-from-string'. Fixes: debbugs:16850
Diffstat (limited to 'lisp/emacs-lisp/lisp.el')
-rw-r--r--lisp/emacs-lisp/lisp.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index 03be2f5c1aa..0487515a142 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -719,8 +719,10 @@ considered."
(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)