From 2da9d3796e5704fff526678b614d450733908ff3 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Thu, 10 Jan 2002 11:42:38 +0000
Subject: [PATCH] * gnus-vers.el (gnus-revision-number): Increment to 01 in
 order to force  update cached format specs.

* gnus-spec.el (gnus-use-correct-string-widths): Default to t.
(gnus-spec-tab): Deal with wide characters.
---
 ChangeLog         |    7 +++++++
 lisp/ChangeLog    |    4 ++++
 lisp/gnus-spec.el |   22 +++++++++++++++-------
 lisp/gnus-vers.el |    2 +-
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e8414b7..81ceb22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* lisp/gnus-vers.el (gnus-revision-number): Increment to 01 in
+	order to force update cached format specs.
+
+	* lisp/gnus-spec.el (gnus-use-correct-string-widths): Default to t.
+
 2002-01-10  TSUCHIYA Masatoshi  <tsuchiya@namazu.org>
 
 	* lisp/nnshimbun.el: Adopt for old Gnusae.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5da2056..7f3f6c7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-spec.el (gnus-spec-tab): Deal with wide characters.
+
 2002-01-09  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* canlock.el (canlock-string-as-unibyte): New macro.
diff --git a/lisp/gnus-spec.el b/lisp/gnus-spec.el
index 23ba443..9bf64e6 100644
--- a/lisp/gnus-spec.el
+++ b/lisp/gnus-spec.el
@@ -32,7 +32,7 @@
 (require 'alist)
 (require 'gnus)
 
-(defcustom gnus-use-correct-string-widths (featurep 'xemacs)
+(defcustom gnus-use-correct-string-widths t
   "*If non-nil, use correct functions for dealing with wide characters."
   :group 'gnus-format
   :type 'boolean)
@@ -289,12 +289,20 @@
 (defun gnus-spec-tab (column)
   (if (> column 0)
       `(insert (make-string (max (- ,column (current-column)) 0) ? ))
-    `(progn
-       (if (> (current-column) ,(abs column))
-	   (delete-region (point)
-			  (- (point) (- (current-column) ,(abs column))))
-	 (insert (make-string (max (- ,(abs column) (current-column)) 0)
-			      ? ))))))
+    (let ((column (abs column)))
+      (if gnus-use-correct-string-widths
+	  `(progn
+	     (if (> (current-column) ,column)
+		 (while (progn
+			  (delete-backward-char 1)
+			  (> (current-column) ,column))))
+	     (insert (make-string (max (- ,column (current-column)) 0) ? )))
+	`(progn
+	   (if (> (current-column) ,column)
+	       (delete-region (point)
+			      (- (point) (- (current-column) ,column)))
+	     (insert (make-string (max (- ,column (current-column)) 0)
+				  ? ))))))))
 
 (defun gnus-correct-length (string)
   "Return the correct width of STRING."
diff --git a/lisp/gnus-vers.el b/lisp/gnus-vers.el
index 21d7083..0f16280 100644
--- a/lisp/gnus-vers.el
+++ b/lisp/gnus-vers.el
@@ -34,7 +34,7 @@
 (require 'product)
 (provide 'gnus-vers)
 
-(defconst gnus-revision-number "00"
+(defconst gnus-revision-number "01"
   "Revision number for this version of gnus.")
 
 ;; Product information of this gnus.
-- 
1.7.10.4