diff options
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/files.el | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5c123a80c82..45596d45439 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2008-05-28 Stefan Monnier <monnier@iro.umontreal.ca> + * files.el (hack-local-variables): Don't signal an error if the local + variable section is not properly terminated. + * emacs-lisp/easymenu.el (easy-menu-convert-item) (easy-menu-convert-item-1): Move the duplicate-generation outside of the caching so it also works for identical entries. diff --git a/lisp/files.el b/lisp/files.el index 0fcbcb2a397..0dc8ba20b2d 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2860,7 +2860,10 @@ is specified, returning t if it is specified." (re-search-forward (concat prefix "[ \t]*End:[ \t]*" suffix) nil t)) - (error "Local variables list is not properly terminated")) + ;; This used to be an error, but really all it means is + ;; that this may simply not be a local-variables section, + ;; so just ignore it. + (message "Local variables list is not properly terminated")) (beginning-of-line) (setq endpos (point))) |