From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 18 May 1997 20:18:16 +0000 (+0000)
Subject: (strwidth): Fix previous change.
X-Git-Tag: emacs-20.1~2082
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=acc35c361fa20cd41212fd376173c7cc3b8e62ac;p=emacs.git

(strwidth): Fix previous change.
---

diff --git a/src/charset.c b/src/charset.c
index e88d1839b20..8518cc8829d 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -811,7 +811,10 @@ strwidth (str, len)
 	  int c = STRING_CHAR (str, endp - str);
 
 	  /* Get the way the display table would display it.  */
-	  disp = DISP_CHAR_VECTOR (dp, c);
+	  if (dp)
+	    disp = DISP_CHAR_VECTOR (dp, c);
+	  else
+	    disp = Qnil;
 
 	  if (VECTORP (disp))
 	    thiswidth = XVECTOR (disp)->size;