diff options
| author | Andreas Schwab | 2012-08-19 10:40:12 +0200 |
|---|---|---|
| committer | Andreas Schwab | 2012-08-19 10:40:12 +0200 |
| commit | 9e677988f40fcbcd0a2283cbc7f8b7b087427fae (patch) | |
| tree | 6e46428387d270f51d624cd09a548afa72dd403d | |
| parent | 17975d7ff9fd734e67dfb97dc9f8be45fcdaec7c (diff) | |
| download | emacs-9e677988f40fcbcd0a2283cbc7f8b7b087427fae.tar.gz emacs-9e677988f40fcbcd0a2283cbc7f8b7b087427fae.zip | |
* data.c (set_internal): Don't use set_blv_found.
(Fkill_local_variable): Likewise.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/data.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5956eea1c51..84271438a81 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-08-19 Andreas Schwab <schwab@linux-m68k.org> | ||
| 2 | |||
| 3 | * data.c (set_internal): Don't use set_blv_found. | ||
| 4 | (Fkill_local_variable): Likewise. | ||
| 5 | |||
| 1 | 2012-08-18 Alp Aker <alp.tekin.aker@gmail.com> | 6 | 2012-08-18 Alp Aker <alp.tekin.aker@gmail.com> |
| 2 | 7 | ||
| 3 | * nsfont.m (ns_ascii_average_width): Ensure the string | 8 | * nsfont.m (ns_ascii_average_width): Ensure the string |
diff --git a/src/data.c b/src/data.c index ea511824e6d..6dd852dd710 100644 --- a/src/data.c +++ b/src/data.c | |||
| @@ -1184,7 +1184,7 @@ set_internal (register Lisp_Object symbol, register Lisp_Object newval, register | |||
| 1184 | ? XFRAME (where)->param_alist | 1184 | ? XFRAME (where)->param_alist |
| 1185 | : BVAR (XBUFFER (where), local_var_alist))); | 1185 | : BVAR (XBUFFER (where), local_var_alist))); |
| 1186 | set_blv_where (blv, where); | 1186 | set_blv_where (blv, where); |
| 1187 | set_blv_found (blv, 1); | 1187 | blv->found = 1; |
| 1188 | 1188 | ||
| 1189 | if (NILP (tem1)) | 1189 | if (NILP (tem1)) |
| 1190 | { | 1190 | { |
| @@ -1199,7 +1199,7 @@ set_internal (register Lisp_Object symbol, register Lisp_Object newval, register | |||
| 1199 | if (bindflag || !blv->local_if_set | 1199 | if (bindflag || !blv->local_if_set |
| 1200 | || let_shadows_buffer_binding_p (sym)) | 1200 | || let_shadows_buffer_binding_p (sym)) |
| 1201 | { | 1201 | { |
| 1202 | set_blv_found (blv, 0); | 1202 | blv->found = 0; |
| 1203 | tem1 = blv->defcell; | 1203 | tem1 = blv->defcell; |
| 1204 | } | 1204 | } |
| 1205 | /* If it's a local_if_set, being set not bound, | 1205 | /* If it's a local_if_set, being set not bound, |
| @@ -1735,7 +1735,7 @@ From now on the default value will apply in this buffer. Return VARIABLE. */) | |||
| 1735 | if (EQ (buf, blv->where)) | 1735 | if (EQ (buf, blv->where)) |
| 1736 | { | 1736 | { |
| 1737 | set_blv_where (blv, Qnil); | 1737 | set_blv_where (blv, Qnil); |
| 1738 | set_blv_found (blv, 0); | 1738 | blv->found = 0; |
| 1739 | find_symbol_value (variable); | 1739 | find_symbol_value (variable); |
| 1740 | } | 1740 | } |
| 1741 | } | 1741 | } |