[Emacs-diffs] Changes to emacs/lisp/gnus/gnus-srvr.el,v

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     07/10/28 09:18:40

Index: lisp/gnus/gnus-srvr.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/gnus-srvr.el,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- lisp/gnus/gnus-srvr.el      26 Jul 2007 05:26:59 -0000      1.27
+++ lisp/gnus/gnus-srvr.el      28 Oct 2007 09:18:29 -0000      1.28
@@ -52,7 +52,7 @@
 
 The following specs are understood:
 
-%h backend
+%h back end
 %n name
 %w address
 %s status
@@ -116,6 +116,7 @@
        ["Copy" gnus-server-copy-server t]
        ["Edit" gnus-server-edit-server t]
        ["Regenerate" gnus-server-regenerate-server t]
+       ["Compact" gnus-server-compact-server t]
        ["Exit" gnus-server-exit t]))
 
     (easy-menu-define
@@ -165,6 +166,8 @@
 
     "g" gnus-server-regenerate-server
 
+    "z" gnus-server-compact-server
+
     "\C-c\C-i" gnus-info-find-node
     "\C-c\C-b" gnus-bug))
 
@@ -189,7 +192,7 @@
 (defface gnus-server-closed
   '((((class color) (background light)) (:foreground "Steel Blue" :italic t))
     (((class color) (background dark))
-     (:foreground "Light Steel Blue" :italic t))
+     (:foreground "LightBlue" :italic t))
     (t (:italic t)))
   "Face used for displaying CLOSED servers"
   :group 'gnus-server-visual)
@@ -299,7 +302,6 @@
   (gnus-set-format 'server t)
   (let ((alist gnus-server-alist)
        (buffer-read-only nil)
-       (opened gnus-opened-servers)
        done server op-ser)
     (erase-buffer)
     (setq gnus-inserted-opened-servers nil)
@@ -314,27 +316,26 @@
        (pop alist)))
     ;; Then we insert the list of servers that have been opened in
     ;; this session.
-    (while opened
-      (when (and (not (member (caar opened) done))
+    (dolist (open gnus-opened-servers)
+      (when (and (not (member (car open) done))
                 ;; Just ignore ephemeral servers.
-                (not (member (caar opened) gnus-ephemeral-servers)))
-       (push (caar opened) done)
+                (not (member (car open) gnus-ephemeral-servers)))
+       (push (car open) done)
        (gnus-server-insert-server-line
-        (setq op-ser (format "%s:%s" (caaar opened) (nth 1 (caar opened))))
-        (caar opened))
-       (push (list op-ser (caar opened)) gnus-inserted-opened-servers))
-      (setq opened (cdr opened))))
+        (setq op-ser (format "%s:%s" (caar open) (nth 1 (car open))))
+        (car open))
+       (push (list op-ser (car open)) gnus-inserted-opened-servers))))
   (goto-char (point-min))
   (gnus-server-position-point))
 
 (defun gnus-server-server-name ()
-  (let ((server (get-text-property (gnus-point-at-bol) 'gnus-server)))
+  (let ((server (get-text-property (point-at-bol) 'gnus-server)))
     (and server (symbol-name server))))
 
 (defun gnus-server-named-server ()
-  "Returns a server name that matches one of the names returned by
-gnus-method-to-server."
-  (let ((server (get-text-property (gnus-point-at-bol) 'gnus-named-server)))
+  "Return a server name that matches one of the names returned by
+`gnus-method-to-server'."
+  (let ((server (get-text-property (point-at-bol) 'gnus-named-server)))
     (and server (symbol-name server))))
 
 (defalias 'gnus-server-position-point 'gnus-goto-colon)
@@ -377,7 +378,14 @@
       (if cached
          (setq gnus-server-method-cache
                (delq cached gnus-server-method-cache)))
-      (if entry (setcdr entry info)
+      (if entry
+         (progn
+           ;; Remove the server from `gnus-opened-servers' since
+           ;; it has never been opened with the new `info' yet.
+           (gnus-opened-servers-remove (cdr entry))
+           ;; Don't make a new Lisp object.
+           (setcar (cdr entry) (car info))
+           (setcdr (cdr entry) (cdr info)))
        (setq gnus-server-alist
              (nconc gnus-server-alist (list (cons server info))))))))
 
@@ -478,9 +486,8 @@
 (defun gnus-server-open-all-servers ()
   "Open all servers."
   (interactive)
-  (let ((servers gnus-inserted-opened-servers))
-    (while servers
-      (gnus-server-open-server (car (pop servers))))))
+  (dolist (server gnus-inserted-opened-servers)
+    (gnus-server-open-server (car server))))
 
 (defun gnus-server-close-server (server)
   "Close SERVER."
@@ -510,6 +517,8 @@
   "Close all servers."
   (interactive)
   (dolist (server gnus-inserted-opened-servers)
+    (gnus-server-close-server (car server)))
+  (dolist (server gnus-server-alist)
     (gnus-server-close-server (car server))))
 
 (defun gnus-server-deny-server (server)
@@ -586,7 +595,8 @@
      `(lambda (form)
        (gnus-server-set-info ,server form)
        (gnus-server-list-servers)
-       (gnus-server-position-point)))))
+       (gnus-server-position-point))
+     'edit-server)))
 
 (defun gnus-server-scan-server (server)
   "Request a scan from the current server."
@@ -717,11 +727,12 @@
              (while (not (eobp))
                (ignore-errors
                  (push (cons
+                        (mm-string-as-unibyte
                         (buffer-substring
                          (point)
                          (progn
                            (skip-chars-forward "^ \t")
-                           (point)))
+                            (point))))
                         (let ((last (read cur)))
                           (cons (read cur) last)))
                        groups))
@@ -729,6 +740,7 @@
            (while (not (eobp))
              (ignore-errors
                (push (cons
+                      (mm-string-as-unibyte
                       (if (eq (char-after) ?\")
                           (read cur)
                         (let ((p (point)) (name ""))
@@ -740,7 +752,7 @@
                             (skip-chars-forward "^ \t\\\\")
                             (setq name (concat name (buffer-substring
                                                      p (point)))))
-                          name))
+                           name)))
                       (let ((last (read cur)))
                         (cons (read cur) last)))
                      groups))
@@ -783,18 +795,26 @@
             (prog1 (1+ (point))
               (insert
                (format "%c%7d: %s\n"
-                       (let ((level (gnus-group-level
-                                     (concat prefix (setq name (car group))))))
+                       (let ((level
+                              (if (string= prefix "")
+                                  (gnus-group-level (setq name (car group)))
+                                (gnus-group-level
+                                 (concat prefix (setq name (car group)))))))
                              (cond
                               ((<= level gnus-level-subscribed) ? )
                               ((<= level gnus-level-unsubscribed) ?U)
                               ((= level gnus-level-zombie) ?Z)
                               (t ?K)))
                        (max 0 (- (1+ (cddr group)) (cadr group)))
+                       ;; Don't decode if name is ASCII
+                       (if (and (fboundp 'detect-coding-string)
+                                (eq (detect-coding-string name t) 'undecided))
+                           name
                        (mm-decode-coding-string
                         name
-                        (inline (gnus-group-name-charset method name))))))
-            (list 'gnus-group name))))
+                          (inline (gnus-group-name-charset method name)))))))
+            (list 'gnus-group name)
+            )))
        (switch-to-buffer (current-buffer)))
       (goto-char (point-min))
       (gnus-group-position-point)
@@ -885,7 +905,7 @@
   (save-excursion
     (beginning-of-line)
     (let ((name (get-text-property (point) 'gnus-group)))
-      (when (re-search-forward ": \\(.*\\)$" (gnus-point-at-eol) t)
+      (when (re-search-forward ": \\(.*\\)$" (point-at-eol) t)
        (concat (gnus-method-to-server-name gnus-browse-current-method) ":"
                (or name
                    (match-string-no-properties 1)))))))
@@ -926,8 +946,7 @@
                                  gnus-browse-current-method))))
             gnus-level-default-subscribed (gnus-group-level group)
             (and (car (nth 1 gnus-newsrc-alist))
-                 (gnus-gethash (car (nth 1 gnus-newsrc-alist))
-                               gnus-newsrc-hashtb))
+                 (gnus-group-entry (car (nth 1 gnus-newsrc-alist))))
             (null (gnus-group-entry group)))
            (delete-char 1)
            (insert ? ))
@@ -966,7 +985,7 @@
        (gnus-get-function (gnus-server-to-method server)
                           'request-regenerate)
       (error
-       (error "This backend doesn't support regeneration")))
+       (error "This back end doesn't support regeneration")))
     (gnus-message 5 "Requesting regeneration of %s..." server)
     (unless (gnus-open-server server)
       (error "Couldn't open server"))
@@ -974,6 +993,40 @@
        (gnus-message 5 "Requesting regeneration of %s...done" server)
       (gnus-message 5 "Couldn't regenerate %s" server))))
 
+
+;;;
+;;; Server compaction. -- dvl
+;;;
+
+;; #### FIXME: this function currently fails to update the Group buffer's
+;; #### appearance.
+(defun gnus-server-compact-server ()
+  "Issue a command to the server to compact all its groups.
+
+Note: currently only implemented in nnml."
+  (interactive)
+  (let ((server (gnus-server-server-name)))
+    (unless server
+      (error "No server on the current line"))
+    (condition-case ()
+       (gnus-get-function (gnus-server-to-method server)
+                          'request-compact)
+      (error
+       (error "This back end doesn't support compaction")))
+    (gnus-message 5 "\
+Requesting compaction of %s... (this may take a long time)"
+                 server)
+    (unless (gnus-open-server server)
+      (error "Couldn't open server"))
+    (if (not (gnus-request-compact server))
+       (gnus-message 5 "Couldn't compact %s" server)
+      (gnus-message 5 "Requesting compaction of %s...done" server)
+      ;; Invalidate the original article buffer which might be out of date.
+      ;; #### NOTE: Yes, this might be a bit rude, but since compaction
+      ;; #### will not happen very often, I think this is acceptable.
+      (let ((original (get-buffer gnus-original-article-buffer)))
+       (and original (gnus-kill-buffer original))))))
+
 (provide 'gnus-srvr)
 
 ;;; arch-tag: c0117f64-27ca-475d-9406-8da6854c7a25