* xterm.c (x_catch_errors, x_clear_errors): Use SSET.

diff --git a/src/ChangeLog b/src/ChangeLog
index 8eda2c6c2ab5b6cbf100ea41e058ef8e6a4ff45d..29f28059f6196ffb70890f606039aa82554e2a3d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,31 @@
 2002-07-16  Ken Raeburn  <raeburn@gnu.org>
 
-       * lisp.h (SDATA): Produce rvalue.
+       * lisp.h (SDATA, SREF): Produce rvalue.
+       (SSET): New macro.
+       * alloc.c (make_event_array): Use SSET for storing into a string.
+       * buffer.c (Fother_buffer): Use SREF when retrieving a byte from
+       a string.
+       * casefiddle.c (casify_object): Use SSET.
+       * charset.h (FETCH_STRING_CHAR_ADVANCE,
+       FETCH_STRING_CHAR_ADVANCE_NO_CHECK): Use SDATA when getting
+       address of string contents.
+       * data.c (Faref): Use SDATA.
+       (Faset): Use SDATA, SSET.
+       * dired.c (directory_files_internal): Use SSET.
+       * fileio.c (Fmake_symbolic_link, Fexpand_file_name): Use SSET.
+       (Fread_file_name): Use SREF, SSET.
+       * fns.c (concat): Use SSET.
+       (concat, Fdelete): Use SDATA.
+       * insdel.c (insert_from_string_1): Use SDATA.
+       * keyboard.c (Fevent_convert_list): Use SREF.
+       * lread.c (Fload): Use SDATA, SSET.
+       * macfns.c (validate_x_resource_name): Use SSET.
+       * process.c (status_message): Use SSET.
+       * search.c (wordify): Use SDATA.
+       (Freplace_match): Use SREF.
+       * w32fns.c (validate_x_resource_name): Use SSET.
+       * xfns.c (validate_x_resource_name): Use SSET.
+       * xterm.c (x_catch_errors, x_clear_errors): Use SSET.
 
 2002-07-16  Richard M. Stallman  <rms@gnu.org>
 

diff --git a/src/xterm.c b/src/xterm.c
index 5796ff9e8b96543915af90b1d63a99d02eb85f31..b0b52ebbdf3377ff3573b55e8619730351a6b78f 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -12131,7 +12131,7 @@ x_catch_errors (dpy)
   record_unwind_protect (x_catch_errors_unwind, x_error_message_string);
 
   x_error_message_string = make_uninit_string (X_ERROR_MESSAGE_SIZE);
-  SREF (x_error_message_string, 0) = 0;
+  SSET (x_error_message_string, 0, 0);
 
   return count;
 }
@@ -12181,7 +12181,7 @@ void
 x_clear_errors (dpy)
      Display *dpy;
 {
-  SREF (x_error_message_string, 0) = 0;
+  SSET (x_error_message_string, 0, 0);
 }
 
 /* Stop catching X protocol errors and let them make Emacs die.