diff options
| author | Alan Mackenzie | 2022-01-14 19:28:07 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2022-01-14 19:28:07 +0000 |
| commit | d87a34597c9f0be967f75ff8cfd0ace4392da63f (patch) | |
| tree | c9474eb0156af143ce61a0c5bcec659546b56300 /src/buffer.c | |
| parent | 57b698f15913385aec7bc9745016b961c0aa5c55 (diff) | |
| parent | d29291d665e808307126bf52c3e748fef78f0f9c (diff) | |
| download | emacs-d87a34597c9f0be967f75ff8cfd0ace4392da63f.tar.gz emacs-d87a34597c9f0be967f75ff8cfd0ace4392da63f.zip | |
Merge branch 'master' into scratch/correct-warning-pos
Merge branch:
commit d29291d665e808307126bf52c3e748fef78f0f9c (HEAD -> master,
origin/master, origin/HEAD)
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri Jan 14 12:26:30 2022 -0500
(macroexp--expand-all): Fix bug#53227 and bug#46636
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/buffer.c b/src/buffer.c index 10ac91915c6..a3091015d9b 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -1247,7 +1247,7 @@ buffer_local_value (Lisp_Object variable, Lisp_Object buffer) | |||
| 1247 | { /* Look in local_var_alist. */ | 1247 | { /* Look in local_var_alist. */ |
| 1248 | struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym); | 1248 | struct Lisp_Buffer_Local_Value *blv = SYMBOL_BLV (sym); |
| 1249 | XSETSYMBOL (variable, sym); /* Update In case of aliasing. */ | 1249 | XSETSYMBOL (variable, sym); /* Update In case of aliasing. */ |
| 1250 | result = Fassoc (variable, BVAR (buf, local_var_alist), Qnil); | 1250 | result = assq_no_quit (variable, BVAR (buf, local_var_alist)); |
| 1251 | if (!NILP (result)) | 1251 | if (!NILP (result)) |
| 1252 | { | 1252 | { |
| 1253 | if (blv->fwd.fwdptr) | 1253 | if (blv->fwd.fwdptr) |