Synch with Oort Gnus.

[elisp/gnus.git-] / lisp / gnus-spec.el

diff --git a/lisp/gnus-spec.el b/lisp/gnus-spec.el
index aaa1eca..eec204e 100644 (file)
--- a/lisp/gnus-spec.el
+++ b/lisp/gnus-spec.el
@@ -1,5 +1,5 @@
 ;;; gnus-spec.el --- format spec functions for Gnus
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -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)
@@ -76,6 +76,8 @@
 (defvar gnus-tmp-article-number)
 (defvar gnus-mouse-face)
 (defvar gnus-mouse-face-prop)
+(defvar gnus-tmp-header)
+(defvar gnus-tmp-from)
 
 (defun gnus-summary-line-format-spec ()
   (insert gnus-tmp-unread gnus-tmp-replied
@@ -84,13 +86,15 @@
    (point)
    (progn
      (insert
-      gnus-tmp-opening-bracket
-      (format "%4d: %-20s"
-             gnus-tmp-lines
-             (if (> (length gnus-tmp-name) 20)
-                 (substring gnus-tmp-name 0 20)
-               gnus-tmp-name))
-      gnus-tmp-closing-bracket)
+      (format "%c%4s: %-23s%c" gnus-tmp-opening-bracket gnus-tmp-lines
+             (let ((val
+                    (inline
+                      (gnus-summary-from-or-to-or-newsgroups
+                       gnus-tmp-header gnus-tmp-from))))
+               (if (> (length val) 23)
+                   (substring val 0 23)
+                 val))
+             gnus-tmp-closing-bracket))
      (point))
    gnus-mouse-face-prop gnus-mouse-face)
   (insert " " gnus-tmp-subject-or-nil "\n"))
@@ -129,10 +133,12 @@
   `((group ("%M\%S\%p\%P\%5y: %(%g%)%l\n" ,gnus-group-line-format-spec))
     (summary-dummy ("*  %(:                          :%) %S\n"
                    ,gnus-summary-dummy-line-format-spec))
-    (summary ("%U\%R\%z\%I\%(%[%4L: %-23,23n%]%) %s\n"
+    (summary ("%U%R%z%I%(%[%4L: %-23,23f%]%) %s\n"
              ,gnus-summary-line-format-spec)))
   "Alist of format specs.")
 
+(defvar gnus-default-format-specs gnus-format-specs)
+
 (defvar gnus-format-specs-compiled nil
   "Alist of compiled format specs.  Each element should be the form:
 \(TYPE (FORMAT-STRING-1 . COMPILED-FUNCTION-1)
@@ -289,12 +295,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."
@@ -324,15 +338,29 @@
     (setq wend seek)
     (substring string wstart (1- wend))))
 
+(defun gnus-string-width-function ()
+  (cond
+   (gnus-use-correct-string-widths
+    'gnus-correct-length)
+   ((fboundp 'string-width)
+    'string-width)
+   (t
+    'length)))
+
+(defun gnus-substring-function ()
+  (cond
+   (gnus-use-correct-string-widths
+    'gnus-correct-substring)
+   ((fboundp 'string-width)
+    'gnus-correct-substring)
+   (t
+    'substring)))
+
 (defun gnus-tilde-max-form (el max-width)
   "Return a form that limits EL to MAX-WIDTH."
   (let ((max (abs max-width))
-       (length-fun (if gnus-use-correct-string-widths
-                       'gnus-correct-length
-                     'length))
-       (substring-fun (if gnus-use-correct-string-widths
-                          'gnus-correct-substring
-                        'substring)))
+       (length-fun (gnus-string-width-function))
+       (substring-fun (gnus-substring-function)))
     (if (symbolp el)
        `(if (> (,length-fun ,el) ,max)
             ,(if (< max-width 0)
@@ -349,12 +377,8 @@
 (defun gnus-tilde-cut-form (el cut-width)
   "Return a form that cuts CUT-WIDTH off of EL."
   (let ((cut (abs cut-width))
-       (length-fun (if gnus-use-correct-string-widths
-                     'gnus-correct-length
-                   'length))
-       (substring-fun (if gnus-use-correct-string-widths
-                      'gnus-correct-substring
-                    'substring)))
+       (length-fun (gnus-string-width-function))
+       (substring-fun (gnus-substring-function)))
     (if (symbolp el)
        `(if (> (,length-fun ,el) ,cut)
             ,(if (< cut-width 0)
@@ -396,12 +420,12 @@ characters when given a pad value."
       `(let* ((val (eval ,el))
              (need (- ,pad (,(if gnus-use-correct-string-widths
                                  'gnus-correct-length
-                               'length) ,el))))
+                               'length) val))))
         (if (> need 0)
             (concat ,(when side '(make-string need ?\ ))
-                    ,el
+                    val
                     ,(when (not side) '(make-string need ?\ )))
-          ,el)))))
+          val)))))
 
 (defun gnus-parse-format (format spec-alist &optional insert)
   ;; This function parses the FORMAT string with the help of the