diff options
| author | Glenn Morris | 2018-08-29 08:24:03 -0700 |
|---|---|---|
| committer | Glenn Morris | 2018-08-29 08:24:03 -0700 |
| commit | d8bef4b519624de20baa1428dd103f61dfb220fa (patch) | |
| tree | ed458e2d88b9a0a422fd46e50c1d2654d24b07a9 /src/eval.c | |
| parent | b28d5333e0144acc7385339578d907196c4b6f3e (diff) | |
| parent | 2670cbf9a87eb498d73770c381ca51657d390a1e (diff) | |
| download | emacs-d8bef4b519624de20baa1428dd103f61dfb220fa.tar.gz emacs-d8bef4b519624de20baa1428dd103f61dfb220fa.zip | |
Merge from origin/emacs-26
2670cbf (origin/emacs-26) ; * configure.ac: Remove outdated comment (...
3b71bef admin.el: respect environment settings for makeinfo etc
3764ab4 * etc/PROBLEMS: New entry about GTK+ 3 crash with some X serv...
9d61344 Index profiler commands in elisp manual
f088817 Fix math-imaginary-i check
fca935e ; Let pre-commit git hook check merged in changes (Bug#29197)
fe06fcc Avoid infinite hscrolling loops when line numbers are displayed
63e59c8 Avoid crashes in malformed defvar
785682c * configure.ac (emacs_config_features): Add GLIB, XDBE, XIM.
2695b7e * configure.ac: Doc fixes related to --with-xim.
d0d162c Small checkdoc quoting fix (bug#32546)
Conflicts:
configure.ac
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c index 8745ba9ef99..50de60c936c 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -787,7 +787,7 @@ usage: (defvar SYMBOL &optional INITVALUE DOCSTRING) */) | |||
| 787 | LOADHIST_ATTACH (sym); | 787 | LOADHIST_ATTACH (sym); |
| 788 | } | 788 | } |
| 789 | else if (!NILP (Vinternal_interpreter_environment) | 789 | else if (!NILP (Vinternal_interpreter_environment) |
| 790 | && !XSYMBOL (sym)->u.s.declared_special) | 790 | && (SYMBOLP (sym) && !XSYMBOL (sym)->u.s.declared_special)) |
| 791 | /* A simple (defvar foo) with lexical scoping does "nothing" except | 791 | /* A simple (defvar foo) with lexical scoping does "nothing" except |
| 792 | declare that var to be dynamically scoped *locally* (i.e. within | 792 | declare that var to be dynamically scoped *locally* (i.e. within |
| 793 | the current file or let-block). */ | 793 | the current file or let-block). */ |