* gnus-util.el (gnus-limit-string): Delete this function.

* gnus-sum.el (gnus-simplify-subject-fully): Use
`truncate-string-to-width' instead.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 42a2ff7..80a6ec7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,6 +4,11 @@
        (gnus-summary-insert-old-articles): Don't truncate group name for
        `read-string'.
 
+       * gnus-util.el (gnus-limit-string): Delete this function.
+
+       * gnus-sum.el (gnus-simplify-subject-fully): Use
+       `truncate-string-to-width' instead.
+
 2007-05-11  Micha\e,Ak\e(Bl Cadilhac  <michael@cadilhac.name>
 
        * gnus-sum.el (gnus-summary-next-group-on-exit): New variable.  Tell if, on

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 556421a..f1d0a48 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -1708,8 +1708,8 @@ See `gnus-simplify-buffer-fuzzy' for details."
    ((eq gnus-summary-gather-subject-limit 'fuzzy)
     (gnus-simplify-subject-fuzzy subject))
    ((numberp gnus-summary-gather-subject-limit)
-    (gnus-limit-string (gnus-simplify-subject-re subject)
-                      gnus-summary-gather-subject-limit))
+    (truncate-string-to-width (gnus-simplify-subject-re subject)
+                             gnus-summary-gather-subject-limit))
    (t
     subject)))
 

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index 631e4be..57e273a 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -109,15 +109,6 @@ This is a compatibility function for different Emacsen."
         (set symbol nil))
      symbol))
 
-;; Added by Geoffrey T. Dairiki <dairiki@u.washington.edu>.  A safe way
-;; to limit the length of a string.  This function is necessary since
-;; `(substr "abc" 0 30)' pukes with "Args out of range".
-;; Fixme: Why not `truncate-string-to-width'?
-(defsubst gnus-limit-string (str width)
-  (if (> (length str) width)
-      (substring str 0 width)
-    str))
-
 (defsubst gnus-goto-char (point)
   (and point (goto-char point)))