procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/emacs-lisp/lisp.el (lisp--local-variables): Catch `end-of-file'

Browse source 
error from `read-from-string'.

Fixes: debbugs:16850
This commit is contained in:
Dmitry Gutov 2014-02-26 04:31:27 +02:00
parent 40ff7f86b6
commit b2388336fe
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -1,5 +1,8 @@
2014-02-26 Dmitry Gutov <dgutov@yandex.ru>
* 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)

6
lisp/emacs-lisp/lisp.el
View file

@ -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)