comparison src/symbols.c @ 5468:a9094f28f9a9

Merge with trunk.
author Mats Lidell <matsl@xemacs.org>
date Wed, 19 Jan 2011 22:35:23 +0100
parents 308d34e9f07d 8608eadee6ba
children 0af042a0c116
comparison
equal deleted inserted replaced
5457:4ed2dedf36a1 5468:a9094f28f9a9
2542 Lisp_Object alist = current_buffer->local_var_alist; 2542 Lisp_Object alist = current_buffer->local_var_alist;
2543 Lisp_Object alist_element 2543 Lisp_Object alist_element
2544 = buffer_local_alist_element (current_buffer, variable, bfwd); 2544 = buffer_local_alist_element (current_buffer, variable, bfwd);
2545 2545
2546 if (!NILP (alist_element)) 2546 if (!NILP (alist_element))
2547 current_buffer->local_var_alist = Fdelq (alist_element, alist); 2547 current_buffer->local_var_alist = delq_no_quit (alist_element,
2548 alist);
2548 2549
2549 /* Make sure symbol does not think it is set up for this buffer; 2550 /* Make sure symbol does not think it is set up for this buffer;
2550 force it to look once again for this buffer's value */ 2551 force it to look once again for this buffer's value */
2551 if (!NILP (bfwd->current_buffer) && 2552 if (!NILP (bfwd->current_buffer) &&
2552 current_buffer == XBUFFER (bfwd->current_buffer)) 2553 current_buffer == XBUFFER (bfwd->current_buffer))