[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/gnus/gnus-srvr.el [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/gnus/gnus-srvr.el [lexbind] |
Date: |
Wed, 15 Sep 2004 20:36:02 -0400 |
Index: emacs/lisp/gnus/gnus-srvr.el
diff -c emacs/lisp/gnus/gnus-srvr.el:1.9.8.3
emacs/lisp/gnus/gnus-srvr.el:1.9.8.4
*** emacs/lisp/gnus/gnus-srvr.el:1.9.8.3 Thu Apr 1 04:29:05 2004
--- emacs/lisp/gnus/gnus-srvr.el Thu Sep 16 00:12:16 2004
***************
*** 1,5 ****
;;; gnus-srvr.el --- virtual server support for Gnus
! ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001
;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <address@hidden>
--- 1,5 ----
;;; gnus-srvr.el --- virtual server support for Gnus
! ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <address@hidden>
***************
*** 34,43 ****
(require 'gnus-int)
(require 'gnus-range)
! (defvar gnus-server-mode-hook nil
! "Hook run in `gnus-server-mode' buffers.")
! (defconst gnus-server-line-format " {%(%h:%w%)} %s\n"
"Format of server lines.
It works along the same lines as a normal formatting string,
with some simple extensions.
--- 34,50 ----
(require 'gnus-int)
(require 'gnus-range)
! (defcustom gnus-server-mode-hook nil
! "Hook run in `gnus-server-mode' buffers."
! :group 'gnus-server
! :type 'hook)
!
! (defcustom gnus-server-exit-hook nil
! "Hook run when exiting the server buffer."
! :group 'gnus-server
! :type 'hook)
! (defcustom gnus-server-line-format " {%(%h:%w%)} %s%a\n"
"Format of server lines.
It works along the same lines as a normal formatting string,
with some simple extensions.
***************
*** 47,59 ****
%h backend
%n name
%w address
! %s status")
! (defvar gnus-server-mode-line-format "Gnus: %%b"
! "The format specification for the server mode line.")
!
! (defvar gnus-server-exit-hook nil
! "*Hook run when exiting the server buffer.")
;;; Internal variables.
--- 54,78 ----
%h backend
%n name
%w address
! %s status
! %a agent covered
! General format specifiers can also be used.
! See Info node `(gnus)Formatting Variables'."
! :link '(custom-manual "(gnus)Formatting Variables")
! :group 'gnus-server-visual
! :type 'string)
!
! (defcustom gnus-server-mode-line-format "Gnus: %%b"
! "The format specification for the server mode line."
! :group 'gnus-server-visual
! :type 'string)
!
! (defcustom gnus-server-browse-in-group-buffer nil
! "Whether server browsing should take place in the group buffer.
! If nil, a faster, but more primitive, buffer is used instead."
! :group 'gnus-server-visual
! :type 'boolean)
;;; Internal variables.
***************
*** 63,69 ****
`((?h gnus-tmp-how ?s)
(?n gnus-tmp-name ?s)
(?w gnus-tmp-where ?s)
! (?s gnus-tmp-status ?s)))
(defvar gnus-server-mode-line-format-alist
`((?S gnus-tmp-news-server ?s)
--- 82,89 ----
`((?h gnus-tmp-how ?s)
(?n gnus-tmp-name ?s)
(?w gnus-tmp-where ?s)
! (?s gnus-tmp-status ?s)
! (?a gnus-tmp-agent ?s)))
(defvar gnus-server-mode-line-format-alist
`((?S gnus-tmp-news-server ?s)
***************
*** 85,91 ****
(easy-menu-define
gnus-server-server-menu gnus-server-mode-map ""
'("Server"
! ["Add" gnus-server-add-server t]
["Browse" gnus-server-read-server t]
["Scan" gnus-server-scan-server t]
["List" gnus-server-list-servers t]
--- 105,111 ----
(easy-menu-define
gnus-server-server-menu gnus-server-mode-map ""
'("Server"
! ["Add..." gnus-server-add-server t]
["Browse" gnus-server-read-server t]
["Scan" gnus-server-scan-server t]
["List" gnus-server-list-servers t]
***************
*** 101,106 ****
--- 121,127 ----
'("Connections"
["Open" gnus-server-open-server t]
["Close" gnus-server-close-server t]
+ ["Offline" gnus-server-offline-server t]
["Deny" gnus-server-deny-server t]
"---"
["Open All" gnus-server-open-all-servers t]
***************
*** 117,123 ****
(suppress-keymap gnus-server-mode-map)
(gnus-define-keys gnus-server-mode-map
! " " gnus-server-read-server
"\r" gnus-server-read-server
gnus-mouse-2 gnus-server-pick-server
"q" gnus-server-exit
--- 138,144 ----
(suppress-keymap gnus-server-mode-map)
(gnus-define-keys gnus-server-mode-map
! " " gnus-server-read-server-in-server-buffer
"\r" gnus-server-read-server
gnus-mouse-2 gnus-server-pick-server
"q" gnus-server-exit
***************
*** 134,139 ****
--- 155,161 ----
"C" gnus-server-close-server
"\M-c" gnus-server-close-all-servers
"D" gnus-server-deny-server
+ "L" gnus-server-offline-server
"R" gnus-server-remove-denials
"n" next-line
***************
*** 144,149 ****
--- 166,240 ----
"\C-c\C-i" gnus-info-find-node
"\C-c\C-b" gnus-bug))
+ (defface gnus-server-agent-face
+ '((((class color) (background light)) (:foreground "PaleTurquoise" :bold t))
+ (((class color) (background dark)) (:foreground "PaleTurquoise" :bold t))
+ (t (:bold t)))
+ "Face used for displaying AGENTIZED servers"
+ :group 'gnus-server-visual)
+
+ (defface gnus-server-opened-face
+ '((((class color) (background light)) (:foreground "Green3" :bold t))
+ (((class color) (background dark)) (:foreground "Green1" :bold t))
+ (t (:bold t)))
+ "Face used for displaying OPENED servers"
+ :group 'gnus-server-visual)
+
+ (defface gnus-server-closed-face
+ '((((class color) (background light)) (:foreground "Steel Blue" :italic t))
+ (((class color) (background dark))
+ (:foreground "Light Steel Blue" :italic t))
+ (t (:italic t)))
+ "Face used for displaying CLOSED servers"
+ :group 'gnus-server-visual)
+
+ (defface gnus-server-denied-face
+ '((((class color) (background light)) (:foreground "Red" :bold t))
+ (((class color) (background dark)) (:foreground "Pink" :bold t))
+ (t (:inverse-video t :bold t)))
+ "Face used for displaying DENIED servers"
+ :group 'gnus-server-visual)
+
+ (defface gnus-server-offline-face
+ '((((class color) (background light)) (:foreground "Orange" :bold t))
+ (((class color) (background dark)) (:foreground "Yellow" :bold t))
+ (t (:inverse-video t :bold t)))
+ "Face used for displaying OFFLINE servers"
+ :group 'gnus-server-visual)
+
+ (defcustom gnus-server-agent-face 'gnus-server-agent-face
+ "Face name to use on AGENTIZED servers."
+ :group 'gnus-server-visual
+ :type 'face)
+
+ (defcustom gnus-server-opened-face 'gnus-server-opened-face
+ "Face name to use on OPENED servers."
+ :group 'gnus-server-visual
+ :type 'face)
+
+ (defcustom gnus-server-closed-face 'gnus-server-closed-face
+ "Face name to use on CLOSED servers."
+ :group 'gnus-server-visual
+ :type 'face)
+
+ (defcustom gnus-server-denied-face 'gnus-server-denied-face
+ "Face name to use on DENIED servers."
+ :group 'gnus-server-visual
+ :type 'face)
+
+ (defcustom gnus-server-offline-face 'gnus-server-offline-face
+ "Face name to use on OFFLINE servers."
+ :group 'gnus-server-visual
+ :type 'face)
+
+ (defvar gnus-server-font-lock-keywords
+ (list
+ '("(\\(agent\\))" 1 gnus-server-agent-face)
+ '("(\\(opened\\))" 1 gnus-server-opened-face)
+ '("(\\(closed\\))" 1 gnus-server-closed-face)
+ '("(\\(offline\\))" 1 gnus-server-offline-face)
+ '("(\\(denied\\))" 1 gnus-server-denied-face)))
+
(defun gnus-server-mode ()
"Major mode for listing and editing servers.
***************
*** 168,173 ****
--- 259,268 ----
(buffer-disable-undo)
(setq truncate-lines t)
(setq buffer-read-only t)
+ (if (featurep 'xemacs)
+ (put 'gnus-server-mode 'font-lock-defaults
'(gnus-server-font-lock-keywords t))
+ (set (make-local-variable 'font-lock-defaults)
+ '(gnus-server-font-lock-keywords t)))
(gnus-run-hooks 'gnus-server-mode-hook))
(defun gnus-server-insert-server-line (gnus-tmp-name method)
***************
*** 175,195 ****
(gnus-tmp-where (nth 1 method))
(elem (assoc method gnus-opened-servers))
(gnus-tmp-status
! (if (eq (nth 1 elem) 'denied)
! "(denied)"
(condition-case nil
(if (or (gnus-server-opened method)
(eq (nth 1 elem) 'ok))
"(opened)"
"(closed)")
((error) "(error)")))))
(beginning-of-line)
(gnus-add-text-properties
(point)
(prog1 (1+ (point))
;; Insert the text.
(eval gnus-server-line-format-spec))
! (list 'gnus-server (intern gnus-tmp-name)))))
(defun gnus-enter-server-buffer ()
"Set up the server buffer."
--- 270,297 ----
(gnus-tmp-where (nth 1 method))
(elem (assoc method gnus-opened-servers))
(gnus-tmp-status
! (cond
! ((eq (nth 1 elem) 'denied) "(denied)")
! ((eq (nth 1 elem) 'offline) "(offline)")
! (t
(condition-case nil
(if (or (gnus-server-opened method)
(eq (nth 1 elem) 'ok))
"(opened)"
"(closed)")
((error) "(error)")))))
+ (gnus-tmp-agent (if (and gnus-agent
+ (gnus-agent-method-p method))
+ " (agent)"
+ "")))
(beginning-of-line)
(gnus-add-text-properties
(point)
(prog1 (1+ (point))
;; Insert the text.
(eval gnus-server-line-format-spec))
! (list 'gnus-server (intern gnus-tmp-name)
! 'gnus-named-server (intern (gnus-method-to-server method))))))
(defun gnus-enter-server-buffer ()
"Set up the server buffer."
***************
*** 243,248 ****
--- 345,356 ----
(let ((server (get-text-property (gnus-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)))
+ (and server (symbol-name server))))
+
(defalias 'gnus-server-position-point 'gnus-goto-colon)
(defconst gnus-server-edit-buffer "*Gnus edit server*")
***************
*** 257,263 ****
(when entry
(gnus-dribble-enter
(concat "(gnus-server-set-info \"" server "\" '"
! (prin1-to-string (cdr entry)) ")\n")))
(when (or entry oentry)
;; Buffer may be narrowed.
(save-restriction
--- 365,371 ----
(when entry
(gnus-dribble-enter
(concat "(gnus-server-set-info \"" server "\" '"
! (gnus-prin1-to-string (cdr entry)) ")\n")))
(when (or entry oentry)
;; Buffer may be narrowed.
(save-restriction
***************
*** 276,284 ****
(when (and server info)
(gnus-dribble-enter
(concat "(gnus-server-set-info \"" server "\" '"
! (prin1-to-string info) ")"))
(let* ((server (nth 1 info))
! (entry (assoc server gnus-server-alist)))
(if entry (setcdr entry info)
(setq gnus-server-alist
(nconc gnus-server-alist (list (cons server info))))))))
--- 384,396 ----
(when (and server info)
(gnus-dribble-enter
(concat "(gnus-server-set-info \"" server "\" '"
! (gnus-prin1-to-string info) ")"))
(let* ((server (nth 1 info))
! (entry (assoc server gnus-server-alist))
! (cached (assoc server gnus-server-method-cache)))
! (if cached
! (setq gnus-server-method-cache
! (delq cached gnus-server-method-cache)))
(if entry (setcdr entry info)
(setq gnus-server-alist
(nconc gnus-server-alist (list (cons server info))))))))
***************
*** 330,336 ****
(setq alist (cdr alist)))
(if alist
(setcdr alist (cons killed (cdr alist)))
! (setq gnus-server-alist (list killed)))))
(gnus-server-update-server (car killed))
(setq gnus-server-killed-servers (cdr gnus-server-killed-servers))
(gnus-server-position-point)))
--- 442,448 ----
(setq alist (cdr alist)))
(if alist
(setcdr alist (cons killed (cdr alist)))
! (setq gnus-server-alist (list killed)))))
(gnus-server-update-server (car killed))
(setq gnus-server-killed-servers (cdr gnus-server-killed-servers))
(gnus-server-position-point)))
***************
*** 339,345 ****
"Return to the group buffer."
(interactive)
(gnus-run-hooks 'gnus-server-exit-hook)
! (kill-buffer (current-buffer))
(gnus-configure-windows 'group t))
(defun gnus-server-list-servers ()
--- 451,457 ----
"Return to the group buffer."
(interactive)
(gnus-run-hooks 'gnus-server-exit-hook)
! (gnus-kill-buffer (current-buffer))
(gnus-configure-windows 'group t))
(defun gnus-server-list-servers ()
***************
*** 396,407 ****
(gnus-server-update-server server)
(gnus-server-position-point))))
(defun gnus-server-close-all-servers ()
"Close all servers."
(interactive)
! (let ((servers gnus-inserted-opened-servers))
! (while servers
! (gnus-server-close-server (car (pop servers))))))
(defun gnus-server-deny-server (server)
"Make sure SERVER will never be attempted opened."
--- 508,530 ----
(gnus-server-update-server server)
(gnus-server-position-point))))
+ (defun gnus-server-offline-server (server)
+ "Set SERVER to offline."
+ (interactive (list (gnus-server-server-name)))
+ (let ((method (gnus-server-to-method server)))
+ (unless method
+ (error "No such server: %s" server))
+ (prog1
+ (gnus-close-server method)
+ (gnus-server-set-status method 'offline)
+ (gnus-server-update-server server)
+ (gnus-server-position-point))))
+
(defun gnus-server-close-all-servers ()
"Close all servers."
(interactive)
! (dolist (server gnus-inserted-opened-servers)
! (gnus-server-close-server (car server))))
(defun gnus-server-deny-server (server)
"Make sure SERVER will never be attempted opened."
***************
*** 417,427 ****
(defun gnus-server-remove-denials ()
"Make all denied servers into closed servers."
(interactive)
! (let ((servers gnus-opened-servers))
! (while servers
! (when (eq (nth 1 (car servers)) 'denied)
! (setcar (nthcdr 1 (car servers)) 'closed))
! (setq servers (cdr servers))))
(gnus-server-list-servers))
(defun gnus-server-copy-server (from to)
--- 540,548 ----
(defun gnus-server-remove-denials ()
"Make all denied servers into closed servers."
(interactive)
! (dolist (server gnus-opened-servers)
! (when (eq (nth 1 server) 'denied)
! (setcar (nthcdr 1 server) 'closed)))
(gnus-server-list-servers))
(defun gnus-server-copy-server (from to)
***************
*** 491,496 ****
--- 612,623 ----
(gnus-request-scan nil method)
(gnus-message 3 "Scanning %s...done" server))))
+ (defun gnus-server-read-server-in-server-buffer (server)
+ "Browse a server in server buffer."
+ (interactive (list (gnus-server-server-name)))
+ (let (gnus-server-browse-in-group-buffer)
+ (gnus-server-read-server server)))
+
(defun gnus-server-read-server (server)
"Browse a server."
(interactive (list (gnus-server-server-name)))
***************
*** 541,546 ****
--- 668,674 ----
"L" gnus-browse-exit
"q" gnus-browse-exit
"Q" gnus-browse-exit
+ "d" gnus-browse-describe-group
"\C-c\C-c" gnus-browse-exit
"?" gnus-browse-describe-briefly
***************
*** 556,561 ****
--- 684,690 ----
["Subscribe" gnus-browse-unsubscribe-current-group t]
["Read" gnus-browse-read-group t]
["Select" gnus-browse-select-group t]
+ ["Describe" gnus-browse-describe-group t]
["Next" gnus-browse-next-group t]
["Prev" gnus-browse-prev-group t]
["Exit" gnus-browse-exit t]))
***************
*** 571,576 ****
--- 700,706 ----
(setq gnus-browse-current-method (gnus-server-to-method server))
(setq gnus-browse-return-buffer return-buffer)
(let* ((method gnus-browse-current-method)
+ (orig-select-method gnus-select-method)
(gnus-select-method method)
groups group)
(gnus-message 5 "Connecting to %s..." (nth 1 method))
***************
*** 589,646 ****
1 "Couldn't request list: %s" (gnus-status-message method))
nil)
(t
! (gnus-get-buffer-create gnus-browse-buffer)
! (when gnus-carpal
! (gnus-carpal-setup-buffer 'browse))
! (gnus-configure-windows 'browse)
! (buffer-disable-undo)
! (let ((buffer-read-only nil))
! (erase-buffer))
! (gnus-browse-mode)
! (setq mode-line-buffer-identification
! (list
! (format
! "Gnus: %%b {%s:%s}" (car method) (cadr method))))
! (save-excursion
! (set-buffer nntp-server-buffer)
(let ((cur (current-buffer)))
(goto-char (point-min))
(unless (string= gnus-ignored-newsgroups "")
(delete-matching-lines gnus-ignored-newsgroups))
! (while (not (eobp))
! (ignore-errors
! (push (cons
! (if (eq (char-after) ?\")
! (read cur)
! (let ((p (point)) (name ""))
! (skip-chars-forward "^ \t\\\\")
! (setq name (buffer-substring p (point)))
! (while (eq (char-after) ?\\)
! (setq p (1+ (point)))
! (forward-char 2)
(skip-chars-forward "^ \t\\\\")
! (setq name (concat name (buffer-substring
! p (point)))))
! name))
! (max 0 (- (1+ (read cur)) (read cur))))
! groups))
! (forward-line))))
(setq groups (sort groups
(lambda (l1 l2)
(string< (car l1) (car l2)))))
! (let ((buffer-read-only nil) charset)
! (while groups
! (setq group (car groups))
! (setq charset (gnus-group-name-charset method group))
! (gnus-add-text-properties
! (point)
! (prog1 (1+ (point))
! (insert
! (format "K%7d: %s\n" (cdr group)
! (gnus-group-name-decode (car group) charset))))
! (list 'gnus-group (car group)))
! (setq groups (cdr groups))))
! (switch-to-buffer (current-buffer))
(goto-char (point-min))
(gnus-group-position-point)
(gnus-message 5 "Connecting to %s...done" (nth 1 method))
--- 719,815 ----
1 "Couldn't request list: %s" (gnus-status-message method))
nil)
(t
! (with-current-buffer nntp-server-buffer
(let ((cur (current-buffer)))
(goto-char (point-min))
(unless (string= gnus-ignored-newsgroups "")
(delete-matching-lines gnus-ignored-newsgroups))
! ;; We treat NNTP as a special case to avoid problems with
! ;; garbage group names like `"foo' that appear in some badly
! ;; managed active files. -jh.
! (if (eq (car method) 'nntp)
! (while (not (eobp))
! (ignore-errors
! (push (cons
! (buffer-substring
! (point)
! (progn
! (skip-chars-forward "^ \t")
! (point)))
! (let ((last (read cur)))
! (cons (read cur) last)))
! groups))
! (forward-line))
! (while (not (eobp))
! (ignore-errors
! (push (cons
! (if (eq (char-after) ?\")
! (read cur)
! (let ((p (point)) (name ""))
(skip-chars-forward "^ \t\\\\")
! (setq name (buffer-substring p (point)))
! (while (eq (char-after) ?\\)
! (setq p (1+ (point)))
! (forward-char 2)
! (skip-chars-forward "^ \t\\\\")
! (setq name (concat name (buffer-substring
! p (point)))))
! name))
! (let ((last (read cur)))
! (cons (read cur) last)))
! groups))
! (forward-line)))))
(setq groups (sort groups
(lambda (l1 l2)
(string< (car l1) (car l2)))))
! (if gnus-server-browse-in-group-buffer
! (let* ((gnus-select-method orig-select-method)
! (gnus-group-listed-groups
! (mapcar (lambda (group)
! (let ((name
! (gnus-group-prefixed-name
! (car group) method)))
! (gnus-set-active name (cdr group))
! name))
! groups)))
! (gnus-configure-windows 'group)
! (funcall gnus-group-prepare-function
! gnus-level-killed 'ignore 1 'ignore))
! (gnus-get-buffer-create gnus-browse-buffer)
! (when gnus-carpal
! (gnus-carpal-setup-buffer 'browse))
! (gnus-configure-windows 'browse)
! (buffer-disable-undo)
! (let ((buffer-read-only nil))
! (erase-buffer))
! (gnus-browse-mode)
! (setq mode-line-buffer-identification
! (list
! (format
! "Gnus: %%b {%s:%s}" (car method) (cadr method))))
! (let ((buffer-read-only nil)
! name
! (prefix (let ((gnus-select-method orig-select-method))
! (gnus-group-prefixed-name "" method))))
! (while (setq group (pop groups))
! (gnus-add-text-properties
! (point)
! (prog1 (1+ (point))
! (insert
! (format "%c%7d: %s\n"
! (let ((level (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)))
! (mm-decode-coding-string
! 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)
(gnus-message 5 "Connecting to %s...done" (nth 1 method))
***************
*** 683,689 ****
(if (or (not (gnus-get-info group))
(gnus-ephemeral-group-p group))
(unless (gnus-group-read-ephemeral-group
! (gnus-group-real-name group) gnus-browse-current-method nil
(cons (current-buffer) 'browse))
(error "Couldn't enter %s" group))
(unless (gnus-group-read-group nil no-article group)
--- 852,858 ----
(if (or (not (gnus-get-info group))
(gnus-ephemeral-group-p group))
(unless (gnus-group-read-ephemeral-group
! group gnus-browse-current-method nil
(cons (current-buffer) 'browse))
(error "Couldn't enter %s" group))
(unless (gnus-group-read-group nil no-article group)
***************
*** 728,737 ****
(beginning-of-line)
(let ((name (get-text-property (point) 'gnus-group)))
(when (re-search-forward ": \\(.*\\)$" (gnus-point-at-eol) t)
! (gnus-group-prefixed-name
! (or name
! (match-string-no-properties 1))
! gnus-browse-current-method)))))
(defun gnus-browse-unsubscribe-group ()
"Toggle subscription of the current group in the browse buffer."
--- 897,910 ----
(beginning-of-line)
(let ((name (get-text-property (point) 'gnus-group)))
(when (re-search-forward ": \\(.*\\)$" (gnus-point-at-eol) t)
! (concat (gnus-method-to-server-name gnus-browse-current-method) ":"
! (or name
! (match-string-no-properties 1)))))))
!
! (defun gnus-browse-describe-group (group)
! "Describe the current group."
! (interactive (list (gnus-browse-group-name)))
! (gnus-group-describe-group nil group))
(defun gnus-browse-unsubscribe-group ()
"Toggle subscription of the current group in the browse buffer."
***************
*** 741,753 ****
(save-excursion
(beginning-of-line)
;; If this group it killed, then we want to subscribe it.
! (when (eq (char-after) ?K)
(setq sub t))
(setq group (gnus-browse-group-name))
! (when (and sub
! (cadr (gnus-gethash group gnus-newsrc-hashtb)))
! (error "Group already subscribed"))
! (delete-char 1)
(if sub
(progn
;; Make sure the group has been properly removed before we
--- 914,924 ----
(save-excursion
(beginning-of-line)
;; If this group it killed, then we want to subscribe it.
! (unless (eq (char-after) ? )
(setq sub t))
(setq group (gnus-browse-group-name))
! (when (gnus-server-equal gnus-browse-current-method "native")
! (setq group (gnus-group-real-name group)))
(if sub
(progn
;; Make sure the group has been properly removed before we
***************
*** 760,781 ****
nil
(gnus-method-simplify
gnus-browse-current-method)))
! gnus-level-default-subscribed gnus-level-killed
(and (car (nth 1 gnus-newsrc-alist))
(gnus-gethash (car (nth 1 gnus-newsrc-alist))
gnus-newsrc-hashtb))
t)
(insert ? ))
(gnus-group-change-level
! group gnus-level-killed gnus-level-default-subscribed)
! (insert ?K)))
t))
(defun gnus-browse-exit ()
"Quit browsing and return to the group buffer."
(interactive)
(when (eq major-mode 'gnus-browse-mode)
! (kill-buffer (current-buffer)))
;; Insert the newly subscribed groups in the group buffer.
(save-excursion
(set-buffer gnus-group-buffer)
--- 931,954 ----
nil
(gnus-method-simplify
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))
t)
+ (delete-char 1)
(insert ? ))
(gnus-group-change-level
! group gnus-level-unsubscribed gnus-level-default-subscribed)
! (delete-char 1)
! (insert ?U)))
t))
(defun gnus-browse-exit ()
"Quit browsing and return to the group buffer."
(interactive)
(when (eq major-mode 'gnus-browse-mode)
! (gnus-kill-buffer (current-buffer)))
;; Insert the newly subscribed groups in the group buffer.
(save-excursion
(set-buffer gnus-group-buffer)
***************
*** 796,810 ****
(let ((server (gnus-server-server-name)))
(unless server
(error "No server on the current line"))
! (if (not (gnus-check-backend-function
! 'request-regenerate (car (gnus-server-to-method server))))
! (error "This backend doesn't support regeneration")
! (gnus-message 5 "Requesting regeneration of %s..." server)
! (unless (gnus-open-server server)
! (error "Couldn't open server"))
! (if (gnus-request-regenerate server)
! (gnus-message 5 "Requesting regeneration of %s...done" server)
! (gnus-message 5 "Couldn't regenerate %s" server)))))
(provide 'gnus-srvr)
--- 969,985 ----
(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-regenerate)
! (error
! (error "This backend doesn't support regeneration")))
! (gnus-message 5 "Requesting regeneration of %s..." server)
! (unless (gnus-open-server server)
! (error "Couldn't open server"))
! (if (gnus-request-regenerate server)
! (gnus-message 5 "Requesting regeneration of %s...done" server)
! (gnus-message 5 "Couldn't regenerate %s" server))))
(provide 'gnus-srvr)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/gnus/gnus-srvr.el [lexbind],
Miles Bader <=