(decode_mode_spec): Use current buffer for most purposes.

2 files changed, 10 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 52426939562..bdc2d2d7e20 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-09  Richard M. Stallman  <rms@gnu.org>
+
+        * xdisp.c (decode_mode_spec): Use current buffer for most purposes.
+
 2004-09-08  Richard M. Stallman  <rms@gnu.org>
 
         * window.c (Fset_window_buffer): Doc fix.
diff --git a/src/xdisp.c b/src/xdisp.c
index 45388409fd4..496e79d194a 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -16127,7 +16127,10 @@ decode_mode_spec_coding (coding_system, buf, eol_flag)
    generated by character C.  PRECISION >= 0 means don't return a
    string longer than that value.  FIELD_WIDTH > 0 means pad the
    string returned with spaces to that value.  Return 1 in *MULTIBYTE
-   if the result is multibyte text.  */
+   if the result is multibyte text.
+
+   Note we operate on the current buffer for most purposes,
+   the exception being w->base_line_pos.  */
 
 static char lots_of_dashes[] = "--------------------------------------------------------------------------------------------------------------------------------------------";
 
@@ -16141,7 +16144,7 @@ decode_mode_spec (w, c, field_width, precision, multibyte)
   Lisp_Object obj;
   struct frame *f = XFRAME (WINDOW_FRAME (w));
   char *decode_mode_spec_buf = f->decode_mode_spec_buffer;
-  struct buffer *b = XBUFFER (w->buffer);
+  struct buffer *b = current_buffer;
 
   obj = Qnil;
   *multibyte = 0;
@@ -16443,7 +16446,7 @@ decode_mode_spec (w, c, field_width, precision, multibyte)
 
     case 's':
       /* status of process */
-      obj = Fget_buffer_process (w->buffer);
+      obj = Fget_buffer_process (Fcurrent_buffer ());
       if (NILP (obj))
         return "no process";
 #ifdef subprocesses