From: shuhei-k <shuhei-k>
Date: Tue, 25 Aug 1998 23:59:50 +0000 (+0000)
Subject: (gnus-string-width): Removed.
X-Git-Tag: semi-mule-199811302358~8
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=198372a778b4611dff1b70e1453f1c76fb9cfa82;p=elisp%2Fgnus.git-

(gnus-string-width): Removed.
(gnus-truncate-string): Use `truncate-string-to-width' if available.
(gnus-tilde-max-form): Moved from gnus-spec.el.
(gnus-tilde-cut-form): Ditto.
---

diff --git a/lisp/gnus-ems.el b/lisp/gnus-ems.el
index 0503df6..f798e12 100644
--- a/lisp/gnus-ems.el
+++ b/lisp/gnus-ems.el
@@ -220,8 +220,49 @@
     (fset 'gnus-encode-coding-string 'encode-coding-string)
     (fset 'gnus-decode-coding-string 'decode-coding-string)
 
-    (fset 'gnus-string-width 'string-width)
-    (fset 'gnus-truncate-string 'truncate-string)
+    (if (fboundp 'truncate-string-to-width)
+	(fset 'gnus-truncate-string 'truncate-string-to-width)
+      (fset 'gnus-truncate-string 'truncate-string))
+
+    (defun gnus-tilde-max-form (el max-width)
+      "Return a form that limits EL to MAX-WIDTH."
+      (let ((max (abs max-width)))
+	(if (symbolp el)
+	    `(if (> (string-width ,el) ,max)
+		 ,(if (< max-width 0)
+		      `(gnus-truncate-string
+			,el (string-width ,el)
+			(- (string-width ,el) ,max))
+		    `(gnus-truncate-string ,el ,max))
+	       ,el)
+	  `(let ((val (eval ,el)))
+	     (if (> (string-width val) ,max)
+		 ,(if (< max-width 0)
+		      `(gnus-truncate-string
+			val (string-width val)
+			(- (string-width val) ,max))
+		    `(gnus-truncate-string val ,max))
+	       val)))))
+
+    (defun gnus-tilde-cut-form (el cut-width)
+      "Return a form that cuts CUT-WIDTH off of EL."
+      (let ((cut (abs cut-width)))
+	(if (symbolp el)
+	    `(if (> (string-width ,el) ,cut)
+		 ,(if (< cut-width 0)
+		      `(gnus-truncate-string
+			,el (- (string-width ,el) ,cut))
+		    `(gnus-truncate-string
+		      ,el (- (string-width ,el) ,cut) ,cut))
+	       ,el)
+	  `(let ((val (eval ,el)))
+	     (if (> (string-width val) ,cut)
+		 ,(if (< cut-width 0)
+		      `(gnus-truncate-string
+			val (- (string-width val) ,cut))
+		    `(gnus-truncate-string
+		      val (- (string-width val) ,cut) ,cut))
+	       val)))))
 
     (when window-system
       (require 'path-util)