diff options
| author | Ken Raeburn <raeburn@raeburn.org> | 2002-07-15 00:01:34 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@raeburn.org> | 2002-07-15 00:01:34 +0000 |
| commit | d5db40779d7505244d37476b4f046641f07eea2b (patch) | |
| tree | 5c8bf4dad41639287e722cb7cbdc0709e47a9e53 /src/dispnew.c | |
| parent | 491c2516d32fa8b9ba9422ec142c8925dd82af00 (diff) | |
| download | emacs-d5db40779d7505244d37476b4f046641f07eea2b.tar.gz | |
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
SCHARS, SBYTES, STRING_INTERVALS, SREF, SDATA; explicit size_byte references
left unchanged for now.
Diffstat (limited to 'src/dispnew.c')
| -rw-r--r-- | src/dispnew.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/dispnew.c b/src/dispnew.c index 59cc06b19ea..1467fd6eba7 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -379,7 +379,7 @@ add_window_display_history (w, msg, paused_p) w, ((BUFFERP (w->buffer) && STRINGP (XBUFFER (w->buffer)->name)) - ? (char *) XSTRING (XBUFFER (w->buffer)->name)->data + ? (char *) SDATA (XBUFFER (w->buffer)->name) : "???"), paused_p ? " ***paused***" : ""); strcat (buf, msg); @@ -6058,7 +6058,7 @@ FILE = nil means just close any termscript file currently open. */) if (! NILP (file)) { file = Fexpand_file_name (file, Qnil); - termscript = fopen (XSTRING (file)->data, "w"); + termscript = fopen (SDATA (file), "w"); if (termscript == 0) report_file_error ("Opening termscript", Fcons (file, Qnil)); } @@ -6075,11 +6075,11 @@ Control characters in STRING will have terminal-dependent effects. */) { /* ??? Perhaps we should do something special for multibyte strings here. */ CHECK_STRING (string); - fwrite (XSTRING (string)->data, 1, STRING_BYTES (XSTRING (string)), stdout); + fwrite (SDATA (string), 1, SBYTES (string), stdout); fflush (stdout); if (termscript) { - fwrite (XSTRING (string)->data, 1, STRING_BYTES (XSTRING (string)), + fwrite (SDATA (string), 1, SBYTES (string), termscript); fflush (termscript); } @@ -6330,7 +6330,7 @@ the current state. */) { buf = XCDR (XCAR (tail)); /* Ignore buffers that aren't included in buffer lists. */ - if (XSTRING (XBUFFER (buf)->name)->data[0] == ' ') + if (SREF (XBUFFER (buf)->name, 0) == ' ') continue; if (!EQ (*vecp++, buf)) goto changed; @@ -6364,7 +6364,7 @@ the current state. */) { buf = XCDR (XCAR (tail)); /* Ignore buffers that aren't included in buffer lists. */ - if (XSTRING (XBUFFER (buf)->name)->data[0] == ' ') + if (SREF (XBUFFER (buf)->name, 0) == ' ') continue; *vecp++ = buf; *vecp++ = XBUFFER (buf)->read_only; |