aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2008-06-05 17:31:55 +0000
committerStefan Monnier2008-06-05 17:31:55 +0000
commit9e0e0d77da7a2726e7d718d4f303b1f5a6444b28 (patch)
treed3b4d7e54b53357bba17c4b6a065125f242c69ee /src
parent4b4f6dc84cbe85fa0b5b45443a6c9af7a618e25a (diff)
downloademacs-9e0e0d77da7a2726e7d718d4f303b1f5a6444b28.tar.gz
emacs-9e0e0d77da7a2726e7d718d4f303b1f5a6444b28.zip
(set_internal): Fix up call to let_shadows_buffer_binding_p.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog29
-rw-r--r--src/data.c2
2 files changed, 15 insertions, 16 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e14b198f719..9c026552cd3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12008-06-05 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * data.c (set_internal): Fix up call to let_shadows_buffer_binding_p.
4
12008-06-05 Kenichi Handa <handa@m17n.org> 52008-06-05 Kenichi Handa <handa@m17n.org>
2 6
3 * coding.c (detect_coding): Fix previous change. 7 * coding.c (detect_coding): Fix previous change.
@@ -28,8 +32,7 @@
28 * xfaces.c (realize_x_face): If the font-related face attributes 32 * xfaces.c (realize_x_face): If the font-related face attributes
29 are the same as those of default face, realize a new fontset from 33 are the same as those of default face, realize a new fontset from
30 default->fontset. 34 default->fontset.
31 (Fx_family_fonts): Use font_parse_family_registry instead of 35 (Fx_family_fonts): Use font_parse_family_registry instead of Ffont_put.
32 Ffont_put.
33 36
342008-06-05 Stefan Monnier <monnier@iro.umontreal.ca> 372008-06-05 Stefan Monnier <monnier@iro.umontreal.ca>
35 38
@@ -74,8 +77,7 @@
742008-06-04 Kenichi Handa <handa@m17n.org> 772008-06-04 Kenichi Handa <handa@m17n.org>
75 78
76 * coding.c (detect_coding): Fix handling of coding->head_ascii. 79 * coding.c (detect_coding): Fix handling of coding->head_ascii.
77 Be sure to call setup_coding_system when a proper coding system is 80 Be sure to call setup_coding_system when we find a proper coding system.
78 found.
79 (detect_coding_system): Fix handling of coding->head_ascii. 81 (detect_coding_system): Fix handling of coding->head_ascii.
80 82
812008-06-03 Andreas Schwab <schwab@suse.de> 832008-06-03 Andreas Schwab <schwab@suse.de>
@@ -223,14 +225,14 @@
223 225
2242008-05-30 Kenichi Handa <handa@m17n.org> 2262008-05-30 Kenichi Handa <handa@m17n.org>
225 227
226 * fontset.c (Ffont_info): Moved to font.c. 228 * fontset.c (Ffont_info): Move to font.c.
227 (syms_of_fontset): Delete defsubr of Sfont_info. 229 (syms_of_fontset): Delete defsubr of Sfont_info.
228 230
229 * font.c (font_style_to_value, font_score): Delete casting of the 231 * font.c (font_style_to_value, font_score): Delete casting of the
230 args to xstcasecmp. 232 args to xstcasecmp.
231 (register_font_driver): Increment num_font_drivers only when 233 (register_font_driver): Increment num_font_drivers only when
232 registering the driver globally. 234 registering the driver globally.
233 (Ffont_info): Moved from fontset.c. Handle a font object too. 235 (Ffont_info): Move from fontset.c. Handle a font object too.
234 (syms_of_font): Defsubr Sfont_info. 236 (syms_of_font): Defsubr Sfont_info.
235 237
2362008-05-29 Kenichi Handa <handa@m17n.org> 2382008-05-29 Kenichi Handa <handa@m17n.org>
@@ -434,14 +436,13 @@
434 436
435 * ftfont.c (ftfont_spec_pattern): Free charset if necessary. 437 * ftfont.c (ftfont_spec_pattern): Free charset if necessary.
436 438
437 * xfont.c (xfont_list_pattern): Free names returned from 439 * xfont.c (xfont_list_pattern): Free names returned from XListFonts.
438 XListFonts.
439 440
4402008-05-22 Jason Rumney <jasonr@gnu.org> 4412008-05-22 Jason Rumney <jasonr@gnu.org>
441 442
442 * font.c: Don't include strings.h. 443 * font.c: Don't include strings.h.
443 444
444 * dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp. 445 * dispextern.h, xfaces.c (xstrcasecmp): Rename from xstricmp.
445 446
446 * dosfns.c, fileio.c, font.c, fontset.c, image.c, macfns.c: 447 * dosfns.c, fileio.c, font.c, fontset.c, image.c, macfns.c:
447 * macterm.c, process.c, w32.c, w32fns.c, w32proc.c, xfaces.c: 448 * macterm.c, process.c, w32.c, w32fns.c, w32proc.c, xfaces.c:
@@ -570,7 +571,7 @@
570 571
571 * Makefile.in (FONTSRC): Delete it. Change all $(FONTSRC) to 572 * Makefile.in (FONTSRC): Delete it. Change all $(FONTSRC) to
572 font.h through out the file. 573 font.h through out the file.
573 (FONT_DRIVERS): Renamed from FONTOBJ. 574 (FONT_DRIVERS): Rename from FONTOBJ.
574 (obj): Change $(FONTOBJ) to $(FONT_DRIVERS). Add font.o. 575 (obj): Change $(FONTOBJ) to $(FONT_DRIVERS). Add font.o.
575 (SOME_MACHINE_OBJECTS): Change $(FONTOBJ) to $(FONT_DRIVERS). 576 (SOME_MACHINE_OBJECTS): Change $(FONTOBJ) to $(FONT_DRIVERS).
576 577
@@ -578,7 +579,7 @@
578 579
579 * font.h (find_font_encoding): Extern it. 580 * font.h (find_font_encoding): Extern it.
580 581
581 * font.c (Vfont_encoding_alist, find_font_encoding): Moved from 582 * font.c (Vfont_encoding_alist, find_font_encoding): Move from
582 fontset.c. 583 fontset.c.
583 (font_pixel_size)[! HAVE_WINDOW_SYSTEM]: Return 1. 584 (font_pixel_size)[! HAVE_WINDOW_SYSTEM]: Return 1.
584 (font_open_entity): Update FRAME_X_DISPLAY_INFO (f)->n_fonts, 585 (font_open_entity): Update FRAME_X_DISPLAY_INFO (f)->n_fonts,
@@ -587,10 +588,8 @@
587 (font_close_object): Update FRAME_X_DISPLAY_INFO (f)->n_fonts only 588 (font_close_object): Update FRAME_X_DISPLAY_INFO (f)->n_fonts only
588 when HAVE_WINDOW_SYSTEM is defined. 589 when HAVE_WINDOW_SYSTEM is defined.
589 590
590 * fontset.c (Vfont_encoding_alist, find_font_encoding): Moved to 591 * fontset.c (Vfont_encoding_alist, find_font_encoding): Move to font.c.
591 font.c. 592 (syms_of_fontset): Move declaration of font-encoding-alist to font.c.
592 (syms_of_fontset): Declaration of font-encoding-alist moved to
593 font.c.
594 593
595 * xfaces.c: Include font.h unconditionally. 594 * xfaces.c: Include font.h unconditionally.
596 (merge_face_ref, merge_face_vectors) 595 (merge_face_ref, merge_face_vectors)
diff --git a/src/data.c b/src/data.c
index 8ee41ba8524..a695c4d56b2 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1198,7 +1198,7 @@ set_internal (symbol, newval, buf, bindflag)
1198 int idx = PER_BUFFER_IDX (offset); 1198 int idx = PER_BUFFER_IDX (offset);
1199 if (idx > 0 1199 if (idx > 0
1200 && !bindflag 1200 && !bindflag
1201 && !let_shadows_buffer_binding_p (symbol)) 1201 && !let_shadows_buffer_binding_p (XSYMBOL (symbol)))
1202 SET_PER_BUFFER_VALUE_P (buf, idx, 1); 1202 SET_PER_BUFFER_VALUE_P (buf, idx, 1);
1203 } 1203 }
1204 else if (BUFFER_LOCAL_VALUEP (valcontents)) 1204 else if (BUFFER_LOCAL_VALUEP (valcontents))