diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-04-20 08:07:43 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-04-20 08:07:43 -0700 |
| commit | 2a8f8f75639505b0f04757a1034480843fbd8398 (patch) | |
| tree | d17b3a2c7ea7c51aecb9de9466b9505378dacafb /src/lread.c | |
| parent | e927a36f3cf974a57094d10023ee075bb4596fb9 (diff) | |
| parent | 5de608f3edb54b4f8d9774e159d0fa99484d3ac8 (diff) | |
| download | emacs-2a8f8f75639505b0f04757a1034480843fbd8398.tar.gz | |
Merge from origin/emacs-26
5de608f (origin/emacs-26) Update the documentation of 'perform-replace'
06245b6 * etc/NEWS: Another fix for the last change (noted by Juri Li...
8f6293c Fix use of @key in Texinfo manuals
f4c9894 Improve documentation of actual arglist
ce0e253 ; * etc/NEWS: Improve last change as proposed by Phil Sainty
b89ff0e Don't assume term-current-row cache is valid (Bug#31193)
326a296 ; * etc/NEWS: Mention 'display-buffer-in-major-side-window' c...
3bdc9a1 Fix flyspell-auto-correct-previous-word broken by recent change
a539eb5 * test/src/lread-tests.el (lread-test-bug-31186): New test.
3fa472b Fix undefined behaviour while looking for lexical-binding fil...
4341aac Minor wording improvement in "Bookmarks"
Conflicts:
test/src/lread-tests.el
Diffstat (limited to 'src/lread.c')
| -rw-r--r-- | src/lread.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lread.c b/src/lread.c index 9ddd8d5a7f6..69b53629ec1 100644 --- a/src/lread.c +++ b/src/lread.c @@ -898,6 +898,7 @@ lisp_file_lexically_bound_p (Lisp_Object readcharfun) ch = READCHAR; i = 0; + beg_end_state = NOMINAL; while (ch != ':' && ch != '\n' && ch != EOF && in_file_vars) { if (i < sizeof var - 1) @@ -923,6 +924,7 @@ lisp_file_lexically_bound_p (Lisp_Object readcharfun) ch = READCHAR; i = 0; + beg_end_state = NOMINAL; while (ch != ';' && ch != '\n' && ch != EOF && in_file_vars) { if (i < sizeof val - 1) |