[Emacs-diffs] Changes to emacs/src/ChangeLog,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/05/30 02:37:40

Index: src/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.6485
retrieving revision 1.6486
diff -u -b -r1.6485 -r1.6486
--- src/ChangeLog       29 May 2008 23:00:20 -0000      1.6485
+++ src/ChangeLog       30 May 2008 02:37:38 -0000      1.6486
@@ -1,10 +1,16 @@
+2008-05-30  Stefan Monnier  <address@hidden>
+
+       * data.c (Fmake_variable_buffer_local, Fmake_local_variable)
+       (Fmake_variable_frame_local): Disallow mixing buffer-local and
+       frame-local settings for the same variable.
+
 2008-05-29  Kenichi Handa  <address@hidden>
 
        * coding.h (enum define_coding_utf8_arg_index): New enum.
        (enum coding_attr_index): Change coding_attr_utf_16_bom to
        coding_attr_utf_bom.
-       (enum utf_bom_type): Renamed from utf_16_bom_type.
-       (struct utf_16_spec): Adjusted for the above change.
+       (enum utf_bom_type): Rename from utf_16_bom_type.
+       (struct utf_16_spec): Adjust for the above change.
        (struct coding_system): Add utf_8_bom in `spec' union.
 
        * coding.c (CODING_UTF_8_BOM): New macro.
@@ -21,8 +27,7 @@
        (UTF_BOM, UTF_8_BOM_1, UTF_8_BOM_2, UTF_8_BOM_3): New macros.
        (detect_coding_utf_8): Check BOM.
        (decode_coding_utf_8, encode_coding_utf_8): Handle BOM.
-       (decode_coding_utf_16): Adjusted for the change of enum
-       utf_bom_type.
+       (decode_coding_utf_16): Adjust for the change of enum utf_bom_type.
        (encode_coding_utf_16): Likewise.
        (setup_coding_system): Likewise.  Set CODING_UTF_8_BOM (coding).
        (detect_coding, detect_coding_system): Handle utf-8-auto.