diff src/bytecode.c @ 16:0293115a14e9 r19-15b91

Import from CVS: tag r19-15b91
author cvs
date Mon, 13 Aug 2007 08:49:20 +0200
parents 376386a54a3c
children 859a2309aef8
line wrap: on
line diff
--- a/src/bytecode.c	Mon Aug 13 08:48:43 2007 +0200
+++ b/src/bytecode.c	Mon Aug 13 08:49:20 2007 +0200
@@ -319,8 +319,8 @@
     (Emchar *) alloca (sizeof (Emchar) *
 		       (1 + string_char_length (XSTRING (bytestr))));
   massaged_code_len =
-    convert_bufbyte_string_into_emchar_string (string_data (XSTRING (bytestr)),
-				      string_length (XSTRING (bytestr)),
+    convert_bufbyte_string_into_emchar_string (XSTRING_DATA (bytestr),
+				      XSTRING_LENGTH (bytestr),
 				      massaged_code);
   massaged_code[massaged_code_len] = 0;
   pc = 0;
@@ -446,7 +446,7 @@
 		  Fput (v1, Qbyte_code_meter, v2);
 		}
 	    }
-#endif
+#endif /* BYTE_CODE_METER */
 	  TOP = Ffuncall (op + 1, &TOP);
 	  break;
 
@@ -656,7 +656,7 @@
 	  break;
 
 	case Btemp_output_buffer_setup:
-	  temp_output_buffer_setup ((char *) string_data (XSTRING (TOP)));
+	  temp_output_buffer_setup ((char *) XSTRING_DATA (TOP));
 	  TOP = Vstandard_output;
 	  break;
 
@@ -862,7 +862,7 @@
 	      TOP = (f1 == f2 ? Qt : Qnil);
 	    }
 	  else
-#endif
+#endif /* LISP_FLOAT_TYPE */
 	    TOP = (XINT (v1) == XINT (v2) ? Qt : Qnil);
 	  break;
 
@@ -1042,8 +1042,9 @@
 	case Bchar_syntax:
 	  CHECK_CHAR_COERCE_INT (TOP);
 	  TOP = make_char (syntax_code_spec
-			   [(int) SYNTAX (current_buffer->syntax_table,
-					  XCHAR (TOP))]);
+			   [(int) SYNTAX
+			    (current_buffer->syntax_table,
+			    XCHAR (TOP))]);
 	  break;
 
 	case Bbuffer_substring: