From: Kenichi Handa <handa@m17n.org>
Date: Fri, 19 Jan 2001 23:38:06 +0000 (+0000)
Subject: (Fformat): Use lisp_string_width instead of strwidth.
X-Git-Tag: emacs-pretest-21.0.96~185
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e1e40b38d1a8968beaac5355d66736be5ac3ff73;p=emacs.git

(Fformat): Use lisp_string_width instead of strwidth.
---

diff --git a/src/editfns.c b/src/editfns.c
index c431be1161a..1871c54d2b7 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3311,8 +3311,7 @@ Use %% to put a single % into the output.")
 	  if (STRINGP (args[n]))
 	    {
 	      int padding, nbytes;
-	      int width = strwidth (XSTRING (args[n])->data,
-				    STRING_BYTES (XSTRING (args[n])));
+	      int width = lisp_string_width (args[n], -1, NULL, NULL);
 	      int start = nchars;
 
 	      /* If spec requires it, pad on right with spaces.  */