Mercurial > emacs
comparison src/bytecode.c @ 108386:af5739d1d4d4
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Sun, 09 May 2010 22:52:44 +0000 |
parents | ee0a08d8887e |
children | aec1143e8d85 |
comparison
equal
deleted
inserted
replaced
108385:575a2fcd23b7 | 108386:af5739d1d4d4 |
---|---|
602 && !SYMBOL_CONSTANT_P (sym)) | 602 && !SYMBOL_CONSTANT_P (sym)) |
603 XSYMBOL (sym)->val.value = val; | 603 XSYMBOL (sym)->val.value = val; |
604 else | 604 else |
605 { | 605 { |
606 BEFORE_POTENTIAL_GC (); | 606 BEFORE_POTENTIAL_GC (); |
607 set_internal (sym, val, current_buffer, 0); | 607 set_internal (sym, val, Qnil, 0); |
608 AFTER_POTENTIAL_GC (); | 608 AFTER_POTENTIAL_GC (); |
609 } | 609 } |
610 } | 610 } |
611 (void) POP; | 611 (void) POP; |
612 break; | 612 break; |