[Emacs-diffs] /srv/bzr/emacs/trunk r110331: Misc minor simplifications in C code.

[Stefan Monnier]

------------------------------------------------------------
revno: 110331
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2012-10-01 20:31:56 -0400
message:
  Misc minor simplifications in C code.
  * src/buffer.c (Fset_buffer_multibyte): Signal an error instead of widening.
  (Fmake_overlay): Remove redundant tests.
  * src/coding.h (ENCODE_FILE, DECODE_FILE, DECODE_SYSTEM): Remove special
  case for the special 0 coding-system.
  * src/frame.c (Fmake_terminal_frame): Prefer safer CONSP over !NILP.
modified:
  etc/NEWS
  src/ChangeLog
  src/buffer.c
  src/coding.h
  src/frame.c

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2012-10-01 07:03:04 +0000
+++ b/etc/NEWS  2012-10-02 00:31:56 +0000
@@ -619,6 +619,8 @@
 
 * Incompatible Lisp Changes in Emacs 24.3
 
+** set-buffer-multibyte now signals an error in narrowed buffers.
+
 +++
 ** (random) by default now returns a different random sequence in
 every Emacs run.  Use (random S), where S is a string, to set the

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-10-02 00:08:54 +0000
+++ b/src/ChangeLog     2012-10-02 00:31:56 +0000
@@ -1,3 +1,13 @@
+2012-10-02  Stefan Monnier  <address@hidden>
+
+       * frame.c (Fmake_terminal_frame): Prefer safer CONSP over !NILP.
+
+       * coding.h (ENCODE_FILE, DECODE_FILE, DECODE_SYSTEM): Remove special
+       case for the special 0 coding-system.
+
+       * buffer.c (Fset_buffer_multibyte): Signal an error instead of widening.
+       (Fmake_overlay): Remove redundant tests.
+
 2012-10-02  Juanma Barranquero  <address@hidden>
 
        * makefile.w32-in ($(BLD)/alloc.$(O), $(BLD)/gmalloc.$(O)):

=== modified file 'src/buffer.c'
--- a/src/buffer.c      2012-10-01 06:36:54 +0000
+++ b/src/buffer.c      2012-10-02 00:31:56 +0000
@@ -2464,7 +2464,7 @@
     begv = BEGV, zv = ZV;
 
   if (narrowed)
-    Fwiden ();
+    error ("Changing multibyteness in a narrowed buffer");
 
   if (NILP (flag))
     {
@@ -3847,17 +3847,16 @@
   end = OVERLAY_END (overlay);
   if (OVERLAY_POSITION (end) < b->overlay_center)
     {
-      if (b->overlays_after)
-       XOVERLAY (overlay)->next = b->overlays_after;
+      eassert (b->overlays_after);
+      XOVERLAY (overlay)->next = b->overlays_after;
       set_buffer_overlays_after (b, XOVERLAY (overlay));
     }
   else
     {
-      if (b->overlays_before)
-       XOVERLAY (overlay)->next = b->overlays_before;
+      eassert (b->overlays_before);
+      XOVERLAY (overlay)->next = b->overlays_before;
       set_buffer_overlays_before (b, XOVERLAY (overlay));
     }
-
   /* This puts it in the right list, and in the right order.  */
   recenter_overlay_lists (b, b->overlay_center);
 
@@ -4141,7 +4140,7 @@
   /* Put all the overlays we want in a vector in overlay_vec.
      Store the length in len.  */
   noverlays = overlays_at (XINT (pos), 1, &overlay_vec, &len,
-                          0, 0, 0);
+                          NULL, NULL, 0);
 
   /* Make a list of them all.  */
   result = Flist (noverlays, overlay_vec);

=== modified file 'src/coding.h'
--- a/src/coding.h      2012-08-27 16:19:34 +0000
+++ b/src/coding.h      2012-10-02 00:31:56 +0000
@@ -646,10 +646,8 @@
    for file names, if any.  */
 #define ENCODE_FILE(name)                                                 \
   (! NILP (Vfile_name_coding_system)                                      \
-   && !EQ (Vfile_name_coding_system, make_number (0))                     \
    ? code_convert_string_norecord (name, Vfile_name_coding_system, 1)     \
    : (! NILP (Vdefault_file_name_coding_system)                                
   \
-      && !EQ (Vdefault_file_name_coding_system, make_number (0))          \
       ? code_convert_string_norecord (name, Vdefault_file_name_coding_system, 
1) \
       : name))
 
@@ -658,10 +656,8 @@
    for file names, if any.  */
 #define DECODE_FILE(name)                                                 \
   (! NILP (Vfile_name_coding_system)                                      \
-   && !EQ (Vfile_name_coding_system, make_number (0))                     \
    ? code_convert_string_norecord (name, Vfile_name_coding_system, 0)     \
    : (! NILP (Vdefault_file_name_coding_system)                                
   \
-      && !EQ (Vdefault_file_name_coding_system, make_number (0))          \
       ? code_convert_string_norecord (name, Vdefault_file_name_coding_system, 
0) \
       : name))
 
@@ -670,7 +666,6 @@
    for system functions, if any.  */
 #define ENCODE_SYSTEM(str)                                                \
   (! NILP (Vlocale_coding_system)                                         \
-   && !EQ (Vlocale_coding_system, make_number (0))                        \
    ? code_convert_string_norecord (str, Vlocale_coding_system, 1)         \
    : str)
 
@@ -678,7 +673,6 @@
    for system functions, if any.  */
 #define DECODE_SYSTEM(str)                                                \
   (! NILP (Vlocale_coding_system)                                         \
-   && !EQ (Vlocale_coding_system, make_number (0))                        \
    ? code_convert_string_norecord (str, Vlocale_coding_system, 0)         \
    : str)
 

=== modified file 'src/frame.c'
--- a/src/frame.c       2012-10-01 06:36:54 +0000
+++ b/src/frame.c       2012-10-02 00:31:56 +0000
@@ -632,7 +632,7 @@
     Lisp_Object terminal;
 
     terminal = Fassq (Qterminal, parms);
-    if (!NILP (terminal))
+    if (CONSP (terminal))
       {
         terminal = XCDR (terminal);
         t = get_terminal (terminal, 1);