diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-05 23:30:56 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-05 23:30:56 -0700 |
| commit | 8ff0ac3c78498c905a22786aa124f59d213b99a0 (patch) | |
| tree | a0448dee34e826197c000ec615dd172cfb59bcc1 /src/lread.c | |
| parent | 9991d78e8cd74e986a9b7625c12a43fbf7a283b3 (diff) | |
| parent | 548d0a63d6212c0baef9a3d2bf0093cceb4e1136 (diff) | |
| download | emacs-8ff0ac3c78498c905a22786aa124f59d213b99a0.tar.gz | |
Merge from mainline.
Diffstat (limited to 'src/lread.c')
| -rw-r--r-- | src/lread.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lread.c b/src/lread.c index 7686f966db2..a6da09cf330 100644 --- a/src/lread.c +++ b/src/lread.c @@ -829,7 +829,7 @@ lisp_file_lexically_bound_p (Lisp_Object readcharfun) ch = READCHAR; i = 0; - while (ch != ':' && ch != '\n' && ch != EOF) + while (ch != ':' && ch != '\n' && ch != EOF && in_file_vars) { if (i < sizeof var - 1) var[i++] = ch; @@ -837,6 +837,10 @@ lisp_file_lexically_bound_p (Lisp_Object readcharfun) ch = READCHAR; } + /* Stop scanning if no colon was found before end marker. */ + if (!in_file_vars) + break; + while (i > 0 && (var[i - 1] == ' ' || var[i - 1] == '\t')) i--; var[i] = '\0'; |