diff src/textprop.c @ 111997:a5a188ddc758

Minor clean up to silence some gcc warnings. * src/window.c (Fset_window_buffer): * src/xterm.c (x_set_frame_alpha): Restructure code to silence compiler warning. (handle_one_xevent): Remove unused var `p'. (do_ewmh_fullscreen): Remove unused var `lval'. (xembed_set_info): Remove unused var `atom'. * src/textprop.c (Fremove_list_of_text_properties): Add braces to silence compiler warning. * src/fontset.c (fontset_id_valid_p, dump_fontset): * src/ftfont.c (ftfont_drive_otf): Modernize k&r declaration. * src/eval.c (Feval, Ffuncall): Avoid unneeded gotos. * src/dispnew.c (update_frame, update_frame_1): Compile the `do_pause' label only when it's used. * src/image.c (x_create_bitmap_from_xpm_data): * src/dispextern.h (x_create_bitmap_from_xpm_data): Use const char** like its callers. * src/coding.c (detect_coding_utf_16): Remove unused vars `src_base' and `consumed_chars'. (DECODE_EMACS_MULE_21_COMPOSITION): Remove unused var `charbuf_base'. (decode_coding_emacs_mule): Remove unused label `retry'. (detect_eol): Add parens to silence compiler warning. * src/alloc.c (bytes_used_when_reconsidered): Move to the #ifdef where it's used to silence the compiler. (make_number): Modernize k&r declaration. (mark_char_table): Add parens to silence compiler warning.

--- a/src/textprop.c	Sat Dec 18 12:39:05 2010 -0800
+++ b/src/textprop.c	Sun Dec 19 00:43:42 2010 -0500
@@ -1604,17 +1604,19 @@
       if (LENGTH (i) >= len)
 	{
 	  if (! interval_has_some_properties_list (properties, i))
-	    if (modified)
-	      {
-		if (BUFFERP (object))
-		  signal_after_change (XINT (start), XINT (end) - XINT (start),
-				       XINT (end) - XINT (start));
-		return Qt;
-	      }
-	    else
-	      return Qnil;
-
-	  if (LENGTH (i) == len)
+	    {
+	      if (modified)
+		{
+		  if (BUFFERP (object))
+		    signal_after_change (XINT (start),
+					 XINT (end) - XINT (start),
+					 XINT (end) - XINT (start));
+		  return Qt;
+		}
+	      else
+		return Qnil;
+	    }
+	  else if (LENGTH (i) == len)
 	    {
 	      if (!modified && BUFFERP (object))
 		modify_region (XBUFFER (object), XINT (start), XINT (end), 1);
@@ -1624,20 +1626,20 @@
 				     XINT (end) - XINT (start));
 	      return Qt;
 	    }
-
-	  /* i has the properties, and goes past the change limit */
-	  unchanged = i;
-	  i = split_interval_left (i, len);
-	  copy_properties (unchanged, i);
-	  if (!modified && BUFFERP (object))
-	    modify_region (XBUFFER (object), XINT (start), XINT (end), 1);
-	  remove_properties (Qnil, properties, i, object);
-	  if (BUFFERP (object))
-	    signal_after_change (XINT (start), XINT (end) - XINT (start),
-				 XINT (end) - XINT (start));
-	  return Qt;
+	  else
+	    { /* i has the properties, and goes past the change limit.  */
+	      unchanged = i;
+	      i = split_interval_left (i, len);
+	      copy_properties (unchanged, i);
+	      if (!modified && BUFFERP (object))
+		modify_region (XBUFFER (object), XINT (start), XINT (end), 1);
+	      remove_properties (Qnil, properties, i, object);
+	      if (BUFFERP (object))
+		signal_after_change (XINT (start), XINT (end) - XINT (start),
+				     XINT (end) - XINT (start));
+	      return Qt;
+	    }
 	}
-
       if (interval_has_some_properties_list (properties, i))
 	{
 	  if (!modified && BUFFERP (object))