Mercurial > emacs
changeset 27388:38dfea505906
(set_internal): Further fix in same criterion.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sat, 22 Jan 2000 02:57:37 +0000 |
| parents | d0a7127b33e5 |
| children | 0eff88dd2524 |
| files | src/data.c |
| diffstat | 1 files changed, 6 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/data.c Fri Jan 21 05:31:13 2000 +0000 +++ b/src/data.c Sat Jan 22 02:57:37 2000 +0000 @@ -1043,14 +1043,12 @@ currently cached, or if it's a Lisp_Buffer_Local_Value and we're looking at the default value, the cache is invalid; we need to write it out, and find the new CURRENT-ALIST-ELEMENT. */ - if ((XBUFFER_LOCAL_VALUE (valcontents)->found_for_buffer - && (buf != XBUFFER (XBUFFER_LOCAL_VALUE (valcontents)->buffer) - || (BUFFER_LOCAL_VALUEP (valcontents) - && EQ (XCAR (current_alist_element), - current_alist_element)))) - || - (XBUFFER_LOCAL_VALUE (valcontents)->found_for_frame - && !EQ (selected_frame, XBUFFER_LOCAL_VALUE (valcontents)->frame))) + if (XBUFFER_LOCAL_VALUE (valcontents)->found_for_frame + ? !EQ (selected_frame, XBUFFER_LOCAL_VALUE (valcontents)->frame) + : (buf != XBUFFER (XBUFFER_LOCAL_VALUE (valcontents)->buffer) + || (BUFFER_LOCAL_VALUEP (valcontents) + && EQ (XCAR (current_alist_element), + current_alist_element)))) { /* Write out the cached value for the old buffer; copy it back to its alist element. This works if the current