Tell about server setup.

[gnus] / lisp / gnus-spec.el

diff --git a/lisp/gnus-spec.el b/lisp/gnus-spec.el
index 44cf937..1c5fa47 100644 (file)
--- a/lisp/gnus-spec.el
+++ b/lisp/gnus-spec.el
@@ -1,32 +1,51 @@
 ;;; gnus-spec.el --- format spec functions for Gnus
 ;;; gnus-spec.el --- format spec functions for Gnus

-;; Copyright (C) 1996,97 Free Software Foundation, Inc.

 
 

-;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>

 ;; Keywords: news
 
 ;; This file is part of GNU Emacs.
 
 ;; Keywords: news
 
 ;; This file is part of GNU Emacs.
 

-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify

 ;; it under the terms of the GNU General Public License as published by
 ;; it under the terms of the GNU General Public License as published by

-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.

 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of

-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License

-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.

 
 ;;; Commentary:
 
 ;;; Code:
 
 
 ;;; Commentary:
 
 ;;; Code:
 

+;; For Emacs < 22.2.
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
+(eval-when-compile (require 'cl))
+(defvar gnus-newsrc-file-version)
+

 (require 'gnus)
 
 (require 'gnus)
 

+(defcustom gnus-use-correct-string-widths (featurep 'xemacs)
+  "*If non-nil, use correct functions for dealing with wide characters."
+  :version "22.1"
+  :group 'gnus-format
+  :type 'boolean)
+
+(defcustom gnus-make-format-preserve-properties (featurep 'xemacs)
+  "*If non-nil, use a replacement `format' function which preserves
+text properties. This is only needed on XEmacs, as Emacs does this anyway."
+  :version "22.1"
+  :group 'gnus-format
+  :type 'boolean)
+

 ;;; Internal variables.
 
 (defvar gnus-summary-mark-positions nil)
 ;;; Internal variables.
 
 (defvar gnus-summary-mark-positions nil)


@@ -66,6 +85,11 @@
 (defvar gnus-tmp-article-number)
 (defvar gnus-mouse-face)
 (defvar gnus-mouse-face-prop)
 (defvar gnus-tmp-article-number)
 (defvar gnus-mouse-face)
 (defvar gnus-mouse-face-prop)

+(defvar gnus-tmp-header)
+(defvar gnus-tmp-from)
+
+(declare-function gnus-summary-from-or-to-or-newsgroups "gnus-sum"
+                  (header gnus-tmp-from))

 
 (defun gnus-summary-line-format-spec ()
   (insert gnus-tmp-unread gnus-tmp-replied
 
 (defun gnus-summary-line-format-spec ()
   (insert gnus-tmp-unread gnus-tmp-replied


@@ -74,13 +98,15 @@
    (point)
    (progn
      (insert
    (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"))
      (point))
    gnus-mouse-face-prop gnus-mouse-face)
   (insert " " gnus-tmp-subject-or-nil "\n"))


@@ -117,18 +143,21 @@
 
 (defvar gnus-format-specs
   `((version . ,emacs-version)
 
 (defvar gnus-format-specs
   `((version . ,emacs-version)

-    (group "%M\%S\%p\%P\%5y: %(%g%)%l\n" ,gnus-group-line-format-spec)
+    (gnus-version . ,(gnus-continuum-version))
+    (group "%M\%S\%p\%P\%5y: %(%g%)\n" ,gnus-group-line-format-spec)

     (summary-dummy "*  %(:                          :%) %S\n"
                   ,gnus-summary-dummy-line-format-spec)
     (summary-dummy "*  %(:                          :%) %S\n"
                   ,gnus-summary-dummy-line-format-spec)

-    (summary "%U\%R\%z\%I\%(%[%4L: %-20,20n%]%) %s\n"
+    (summary "%U%R%z%I%(%[%4L: %-23,23f%]%) %s\n"

             ,gnus-summary-line-format-spec))
   "Alist of format specs.")
 
             ,gnus-summary-line-format-spec))
   "Alist of format specs.")
 

+(defvar gnus-default-format-specs gnus-format-specs)
+

 (defvar gnus-article-mode-line-format-spec nil)
 (defvar gnus-summary-mode-line-format-spec nil)
 (defvar gnus-group-mode-line-format-spec nil)
 
 (defvar gnus-article-mode-line-format-spec nil)
 (defvar gnus-summary-mode-line-format-spec nil)
 (defvar gnus-group-mode-line-format-spec nil)
 

-;;; Phew.  All that gruft is over, fortunately.
+;;; Phew.  All that gruft is over with, fortunately.

 
 ;;;###autoload
 (defun gnus-update-format (var)
 
 ;;;###autoload
 (defun gnus-update-format (var)


@@ -159,30 +188,40 @@
     (pop-to-buffer "*Gnus Format*")
     (erase-buffer)
     (lisp-interaction-mode)
     (pop-to-buffer "*Gnus Format*")
     (erase-buffer)
     (lisp-interaction-mode)

-    (insert (pp-to-string spec))))
+    (insert (gnus-pp-to-string spec))))

 
 (defun gnus-update-format-specifications (&optional force &rest types)
 
 (defun gnus-update-format-specifications (&optional force &rest types)

-  "Update all (necessary) format specifications."
+  "Update all (necessary) format specifications.
+Return a list of updated types."

   ;; Make the indentation array.
   ;; See whether all the stored info needs to be flushed.
   (when (or force
   ;; Make the indentation array.
   ;; See whether all the stored info needs to be flushed.
   (when (or force

+           (not gnus-newsrc-file-version)
+           (not (equal (gnus-continuum-version)
+                       (gnus-continuum-version gnus-newsrc-file-version)))

            (not (equal emacs-version
                        (cdr (assq 'version gnus-format-specs)))))
     (setq gnus-format-specs nil))
            (not (equal emacs-version
                        (cdr (assq 'version gnus-format-specs)))))
     (setq gnus-format-specs nil))

+  ;; Flush the group format spec cache if there's the grouplens stuff
+  ;; or it doesn't support decoded group names.
+  (when (memq 'group types)
+    (let* ((spec (assq 'group gnus-format-specs))
+          (sspec (gnus-prin1-to-string (nth 2 spec))))
+      (when (or (string-match " gnus-tmp-grouplens[ )]" sspec)
+               (not (string-match " gnus-tmp-decoded-group[ )]" sspec)))
+       (setq gnus-format-specs (delq spec gnus-format-specs)))))

 
   ;; Go through all the formats and see whether they need updating.
 
   ;; Go through all the formats and see whether they need updating.

-  (let (new-format entry type val)
+  (let (new-format entry type val updated)

     (while (setq type (pop types))
     (while (setq type (pop types))

-      ;; Jump to the proper buffer to find out the value of
-      ;; the variable, if possible.  (It may be buffer-local.)
+      ;; Jump to the proper buffer to find out the value of the
+      ;; variable, if possible.  (It may be buffer-local.)

       (save-excursion
       (save-excursion

-       (let ((buffer (intern (format "gnus-%s-buffer" type)))
-             val)
+       (let ((buffer (intern (format "gnus-%s-buffer" type))))

          (when (and (boundp buffer)
                     (setq val (symbol-value buffer))
          (when (and (boundp buffer)
                     (setq val (symbol-value buffer))

-                    (get-buffer val)
-                    (buffer-name (get-buffer val)))
-           (set-buffer (get-buffer val)))
+                    (gnus-buffer-exists-p val))
+           (set-buffer val))

          (setq new-format (symbol-value
                            (intern (format "gnus-%s-line-format" type)))))
        (setq entry (cdr (assq type gnus-format-specs)))
          (setq new-format (symbol-value
                            (intern (format "gnus-%s-line-format" type)))))
        (setq entry (cdr (assq type gnus-format-specs)))


@@ -200,9 +239,7 @@
                  (gnus-parse-format
                   new-format
                   (symbol-value
                  (gnus-parse-format
                   new-format
                   (symbol-value

-                   (intern (format "gnus-%s-line-format-alist"
-                                   (if (eq type 'article-mode)
-                                       'summary-mode type))))
+                   (intern (format "gnus-%s-line-format-alist" type)))

                   (not (string-match "mode$" (symbol-name type))))))
          ;; Enter the new format spec into the list.
          (if entry
                   (not (string-match "mode$" (symbol-name type))))))
          ;; Enter the new format spec into the list.
          (if entry


@@ -210,10 +247,12 @@
                (setcar (cdr entry) val)
                (setcar entry new-format))
            (push (list type new-format val) gnus-format-specs))
                (setcar (cdr entry) val)
                (setcar entry new-format))
            (push (list type new-format val) gnus-format-specs))

-         (set (intern (format "gnus-%s-line-format-spec" type)) val)))))
+         (set (intern (format "gnus-%s-line-format-spec" type)) val)
+         (push type updated))))

 
 

-  (unless (assq 'version gnus-format-specs)
-    (push (cons 'version emacs-version) gnus-format-specs)))
+    (unless (assq 'version gnus-format-specs)
+      (push (cons 'version emacs-version) gnus-format-specs))
+   &