From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 7 Sep 1997 04:22:29 +0000 (+0000)
Subject: (display_string): Determine multibyte from current buffer,
X-Git-Tag: emacs-20.1~159
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3f1ea77ed6978118921e4ab6c76436a8781a25e6;p=emacs.git

(display_string): Determine multibyte from current buffer,
not from W's buffer.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 40642ecb16c..3c3e526ead5 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -4722,7 +4722,7 @@ display_string (w, vpos, string, length, hpos, truncate,
   GLYPH *p1start = desired_glyphs->glyphs[vpos] + hpos;
   int window_width = XFASTINT (w->width);
   /* If 1, we must display multibyte characters.  */
-  int multibyte = !NILP (XBUFFER (w->buffer)->enable_multibyte_characters);
+  int multibyte = !NILP (current_buffer->enable_multibyte_characters);
 
   /* Use the standard display table, not the window's display table.
      We don't want the mode line in rot13.  */