From: Ken Raeburn <raeburn@raeburn.org>
Date: Sun, 14 Jul 2002 23:54:05 +0000 (+0000)
Subject: (SMBP): Deleted.  All uses changed to STRING_MULTIBYTE.
X-Git-Tag: ttn-vms-21-2-B4~14138
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=491c2516d32fa8b9ba9422ec142c8925dd82af00;p=emacs.git

(SMBP): Deleted.  All uses changed to STRING_MULTIBYTE.
(STRING_SET_UNIBYTE): New macro.
(SET_STRING_BYTES): Deleted.  Callers (all of which supplied a length of -1)
changed to use STRING_SET_UNIBYTE.
---

diff --git a/src/lisp.h b/src/lisp.h
index 2fef6562478..8c01d9c74de 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -545,7 +545,6 @@ extern Lisp_Object make_number ();
 #define SDATA(string)		XSTRING (string)->data
 #define SCHARS(string)		XSTRING (string)->size
 #define SBYTES(string)		STRING_BYTES (XSTRING (string))
-#define SMBP(string)		STRING_MULTIBYTE (string)
 
 
 /* Basic data type for use of intervals.  See the macros in intervals.h.  */
@@ -681,8 +680,11 @@ extern int string_bytes P_ ((struct Lisp_String *));
 
 #endif /* not GC_CHECK_STRING_BYTES */
 
-/* Set the length in bytes of STR.  */
-#define SET_STRING_BYTES(STR, SIZE)  ((STR)->size_byte = (SIZE))
+/* Mark STR as a unibyte string.  */
+#define STRING_SET_UNIBYTE(STR)      (XSTRING (STR)->size_byte = -1)
+
+/* Get text properties.  */
+#define STRING_INTERVALS(STR)  (XSTRING (STR)->intervals)
 
 /* In a string or vector, the sign bit of the `size' is the gc mark bit */