(require 'gnus-win)
(require 'gnus-undo)
-(defgroup gnus-group nil
- "Group buffers."
- :group 'gnus)
-
(defcustom gnus-group-archive-directory
"/ftp@ftp.hpc.uh.edu:/pub/emacs/ding-list/"
"*The address of the (ding) archives."
- :group 'gnus-group
+ :group 'gnus-group-foreign
:type 'directory)
(defcustom gnus-group-recent-archive-directory
"/ftp@ftp.hpc.uh.edu:/pub/emacs/ding-list-recent/"
"*The address of the most recent (ding) articles."
- :group 'gnus-group
+ :group 'gnus-group-foreign
:type 'directory)
-;; Suggested by Andrew Eskilsson <pi92ae@lelle.pt.hk-r.se>.
-(defcustom gnus-no-groups-message "No news is horrible news"
+(defcustom gnus-no-groups-message "No news is no news"
"*Message displayed by Gnus when no groups are available."
- :group 'gnus-group
+ :group 'gnus-start
:type 'string)
(defcustom gnus-keep-same-level nil
than the current level.
If this variable is `best', Gnus will make the next newsgroup the one
with the best level."
- :group 'gnus-group
+ :group 'gnus-group-levels
:type '(choice (const nil)
(const best)
(sexp :tag "other" t)))
(defcustom gnus-group-goto-unread t
"*If non-nil, movement commands will go to the next unread and subscribed group."
- :group 'gnus-group
+ :link '(custom-manual "(gnus)Group Maneuvering")
+ :group 'gnus-group-various
:type 'boolean)
(defcustom gnus-goto-next-group-when-activating t
"*If non-nil, the \\<gnus-group-mode-map>\\[gnus-group-get-new-news-this-group] command will advance point to the next group."
- :group 'gnus-group
+ :link '(custom-manual "(gnus)Scanning New Messages")
+ :group 'gnus-group-various
:type 'boolean)
(defcustom gnus-permanently-visible-groups nil
"*Regexp to match groups that should always be listed in the group buffer.
This means that they will still be listed when there are no unread
articles in the groups."
- :group 'gnus-group
+ :group 'gnus-group-listing
:type 'regexp)
(defcustom gnus-list-groups-with-ticked-articles t
"*If non-nil, list groups that have only ticked articles.
If nil, only list groups that have unread articles."
- :group 'gnus-group
+ :group 'gnus-group-listing
:type 'boolean)
(defcustom gnus-group-default-list-level gnus-level-subscribed
"*Default listing level.
Ignored if `gnus-group-use-permanent-levels' is non-nil."
- :group 'gnus-group
+ :group 'gnus-group-listing
:type 'integer)
(defcustom gnus-group-list-inactive-groups t
"*If non-nil, inactive groups will be listed."
- :group 'gnus-group
+ :group 'gnus-group-listing
+ :group 'gnus-group-levels
:type 'boolean)
(defcustom gnus-group-sort-function 'gnus-group-sort-by-alphabet
This variable can also be a list of sorting functions. In that case,
the most significant sort function should be the last function in the
list."
- :group 'gnus-group
+ :group 'gnus-group-listing
+ :link '(custom-manual "(gnus)Sorting Groups")
:type '(radio (function-item gnus-group-sort-by-alphabet)
(function-item gnus-group-sort-by-real-name)
(function-item gnus-group-sort-by-unread)
%l Whether there are GroupLens predictions for this group (string)
%n Select from where (string)
%z A string that look like `<%s:%n>' if a foreign select method is used
-?d The date the group was last entered.
+%d The date the group was last entered.
%u User defined specifier. The next character in the format string should
be a letter. Gnus will call the function gnus-user-format-function-X,
where X is the letter following %u. The function will be passed the
Also note that if you change the format specification to include any
of these specs, you must probably re-start Gnus to see them go into
effect."
- :group 'gnus-group
+ :group 'gnus-group-visual
:type 'string)
(defcustom gnus-group-mode-line-format "Gnus: %%b {%M\%:%S}"
%S The native news server.
%M The native select method.
%: \":\" if %S isn't \"\"."
- :group 'gnus-group
+ :group 'gnus-group-visual
:type 'string)
(defcustom gnus-group-mode-hook nil
"Hook for Gnus group mode."
- :group 'gnus-group
+ :group 'gnus-group-various
:options '(gnus-topic-mode)
:type 'hook)
(defcustom gnus-group-menu-hook nil
"Hook run after the creation of the group mode menu."
- :group 'gnus-group
+ :group 'gnus-group-various
:type 'hook)
(defcustom gnus-group-catchup-group-hook nil
"Hook run when catching up a group from the group buffer."
- :group 'gnus-group
+ :group 'gnus-group-various
+ :link '(custom-manual "(gnus)Group Data")
:type 'hook)
(defcustom gnus-group-update-group-hook nil
"Hook called when updating group lines."
- :group 'gnus-group
+ :group 'gnus-group-visual
:type 'hook)
(defcustom gnus-group-prepare-function 'gnus-group-prepare-flat
than this number should be displayed.
The only current function implemented is `gnus-group-prepare-flat'."
- :group 'gnus-group
+ :group 'gnus-group-listing
:type 'function)
(defcustom gnus-group-prepare-hook nil
"Hook called after the group buffer has been generated.
If you want to modify the group buffer, you can use this hook."
- :group 'gnus-group
+ :group 'gnus-group-listing
:type 'hook)
(defcustom gnus-suspend-gnus-hook nil
"Hook called when suspending (not exiting) Gnus."
- :group 'gnus-group
+ :group 'gnus-exit
:type 'hook)
(defcustom gnus-exit-gnus-hook nil
"Hook called when exiting Gnus."
- :group 'gnus-group
+ :group 'gnus-exit
:type 'hook)
(defcustom gnus-after-exiting-gnus-hook nil
"Hook called after exiting Gnus."
- :group 'gnus-group
+ :group 'gnus-exit
:type 'hook)
(defcustom gnus-group-update-hook '(gnus-group-highlight-line)
The default function `gnus-group-highlight-line' will
highlight the line according to the `gnus-group-highlight'
variable."
- :group 'gnus-group
+ :group 'gnus-group-visual
:type 'hook)
(defcustom gnus-useful-groups
"gnus-help"
(nndoc "gnus-help"
(nndoc-article-type mbox)
- (eval `(nndoc-address
+ (eval `(nndoc-address
,(let ((file (nnheader-find-etc-directory
"gnus-tut.txt" t)))
(unless file
(error "Couldn't find doc group"))
file))))))
"Alist of useful group-server pairs."
- :group 'gnus-group
+ :group 'gnus-group-listing
:type '(repeat (list (string :tag "Description")
(string :tag "Name")
(sexp :tag "Method"))))
gnus-group-mail-low-empty-face)
(t .
gnus-group-mail-low-face))
- "Controls the highlighting of group buffer lines.
+ "Controls the highlighting of group buffer lines.
Below is a list of `Form'/`Face' pairs. When deciding how a a
particular group line should be displayed, each form is
evaluated. The content of the face field after the first true form is
used. You can change how those group lines are displayed by
-editing the face field.
+editing the face field.
It is also possible to change and add form fields, but currently that
requires an understanding of Lisp expressions. Hopefully this will
level: The level of the group.
score: The score of the group.
ticked: The number of ticked articles."
- :group 'gnus-group
+ :group 'gnus-group-visual
:type '(repeat (cons (sexp :tag "Form") face)))
(defcustom gnus-new-mail-mark ?%
"Mark used for groups with new mail."
- :group 'gnus-group
+ :group 'gnus-group-visual
:type 'character)
;;; Internal variables
["Local kill file" gnus-group-edit-local-kill (gnus-group-group-name)]
["Global kill file" gnus-group-edit-global-kill t])
))
-
+
(easy-menu-define
gnus-group-group-menu gnus-group-mode-map ""
'("Groups"
["Send a bug report" gnus-bug t]
["Send a mail" gnus-group-mail t]
["Post an article..." gnus-group-post-news t]
- ["Check for new news" gnus-group-get-new-news t]
+ ["Check for new news" gnus-group-get-new-news t]
["Activate all groups" gnus-activate-all-groups t]
["Restart Gnus" gnus-group-restart t]
["Read init file" gnus-group-read-init-file t]
(gnus-set-default-directory)
(gnus-update-format-specifications nil 'group 'group-mode)
(gnus-update-group-mark-positions)
- (gnus-make-local-hook 'post-command-hook)
+ (make-local-hook 'post-command-hook)
(gnus-add-hook 'post-command-hook 'gnus-clear-inboxes-moved nil t)
(when gnus-use-undo
(gnus-undo-mode 1))
(setq level (car gnus-group-list-mode)
unread (cdr gnus-group-list-mode)))
(setq level (gnus-group-default-level level))
- (gnus-group-setup-buffer) ;May call from out of group buffer
+ (gnus-group-setup-buffer)
(gnus-update-format-specifications nil 'group 'group-mode)
(let ((case-fold-search nil)
(props (text-properties-at (gnus-point-at-bol)))
- (group (gnus-group-group-name)))
+ (empty (= (point-min) (point-max)))
+ (group (gnus-group-group-name))
+ number)
(set-buffer gnus-group-buffer)
- (funcall gnus-group-prepare-function level unread lowest)
- (if (zerop (buffer-size))
- (gnus-message 5 gnus-no-groups-message)
- (goto-char (point-max))
- (when (or (not gnus-group-goto-next-group-function)
- (not (funcall gnus-group-goto-next-group-function
- group props)))
- (if (not group)
- ;; Go to the first group with unread articles.
- (gnus-group-search-forward t)
- ;; Find the right group to put point on. If the current group
- ;; has disappeared in the new listing, try to find the next
- ;; one. If no next one can be found, just leave point at the
- ;; first newsgroup in the buffer.
- (when (not (gnus-goto-char
- (text-property-any
- (point-min) (point-max)
- 'gnus-group (gnus-intern-safe
- group gnus-active-hashtb))))
- (let ((newsrc (cdddr (gnus-gethash group gnus-newsrc-hashtb))))
- (while (and newsrc
- (not (gnus-goto-char
- (text-property-any
- (point-min) (point-max) 'gnus-group
- (gnus-intern-safe
- (caar newsrc) gnus-active-hashtb)))))
- (setq newsrc (cdr newsrc)))
- (unless newsrc
- (goto-char (point-max))
- (forward-line -1))))))
- ;; Adjust cursor point.
- (gnus-group-position-point))))
+ (setq number (funcall gnus-group-prepare-function level unread lowest))
+ (when (or (and (numberp number)
+ (zerop number))
+ (zerop (buffer-size)))
+ ;; No groups in the buffer.
+ (gnus-message 5 gnus-no-groups-message))
+ ;; We have some groups displayed.
+ (goto-char (point-max))
+ (when (or (not gnus-group-goto-next-group-function)
+ (not (funcall gnus-group-goto-next-group-function
+ group props)))
+ (cond
+ (empty
+ (goto-char (point-min)))
+ ((not group)
+ ;; Go to the first group with unread articles.
+ (gnus-group-search-forward t))
+ (t
+ ;; Find the right group to put point on. If the current group
+ ;; has disappeared in the new listing, try to find the next
+ ;; one. If no next one can be found, just leave point at the
+ ;; first newsgroup in the buffer.
+ (when (not (gnus-goto-char
+ (text-property-any
+ (point-min) (point-max)
+ 'gnus-group (gnus-intern-safe
+ group gnus-active-hashtb))))
+ (let ((newsrc (cdddr (gnus-gethash group gnus-newsrc-hashtb))))
+ (while (and newsrc
+ (not (gnus-goto-char
+ (text-property-any
+ (point-min) (point-max) 'gnus-group
+ (gnus-intern-safe
+ (caar newsrc) gnus-active-hashtb)))))
+ (setq newsrc (cdr newsrc)))
+ (unless newsrc
+ (goto-char (point-max))
+ (forward-line -1)))))))
+ ;; Adjust cursor point.
+ (gnus-group-position-point)))
(defun gnus-group-list-level (level &optional all)
"List groups on LEVEL.
(>= clevel lowest)
(or all ; We list all groups?
(if (eq unread t) ; Unactivated?
- gnus-group-list-inactive-groups ; We list unactivated
+ gnus-group-list-inactive-groups ; We list unactivated
(> unread 0)) ; We list groups with unread articles
(and gnus-list-groups-with-ticked-articles
(cdr (assq 'tick (gnus-info-marks info))))
(gnus-group-set-mode-line)
(setq gnus-group-list-mode (cons level all))
- (run-hooks 'gnus-group-prepare-hook)))
+ (run-hooks 'gnus-group-prepare-hook)
+ t))
(defun gnus-group-prepare-flat-list-dead (groups level mark regexp)
;; List zombies and killed lists somewhat faster, which was
(if (zerop (cdr active))
0
(- (1+ (cdr active)) (car active)))
- 0)
+ nil)
nil))))
-(defun gnus-group-insert-group-line (gnus-tmp-group gnus-tmp-level
+(defun gnus-group-insert-group-line (gnus-tmp-group gnus-tmp-level
gnus-tmp-marked number
gnus-tmp-method)
"Insert a group line in the group buffer."
(setq list (cdr list)))
(let ((face (cdar list)))
(unless (eq face (get-text-property beg 'face))
- (gnus-put-text-property
- beg end 'face
+ (gnus-put-text-property
+ beg end 'face
(setq face (if (boundp face) (symbol-value face) face)))
(gnus-extent-start-open beg)))
(goto-char p)))
"Update all lines where GROUP appear.
If VISIBLE-ONLY is non-nil, the group won't be displayed if it isn't
already."
- (save-excursion
+ ;; Can't use `save-excursion' here, so we do it manually.
+ (let ((buf (current-buffer))
+ mark)
(set-buffer gnus-group-buffer)
+ (setq mark (point-marker))
;; The buffer may be narrowed.
(save-restriction
(widen)
(let ((entry (gnus-gethash group gnus-newsrc-hashtb)))
(when (and entry (not (gnus-ephemeral-group-p group)))
(gnus-dribble-enter
- (concat "(gnus-group-set-info '"
+ (concat "(gnus-group-set-info '"
(gnus-prin1-to-string (nth 2 entry))
")"))))
;; Find all group instances. If topics are in use, each group
(run-hooks 'gnus-group-update-group-hook))))
(when gnus-group-update-group-function
(funcall gnus-group-update-group-function group))
- (gnus-group-set-mode-line)))))
+ (gnus-group-set-mode-line)))
+ (goto-char mark)
+ (set-marker mark nil)
+ (set-buffer buf)))
(defun gnus-group-set-mode-line ()
"Update the mode line in the group buffer."
(max-len 60)
gnus-tmp-header ;Dummy binding for user-defined formats
;; Get the resulting string.
- (modified
+ (modified
(and gnus-dribble-buffer
(buffer-name gnus-dribble-buffer)
(buffer-modified-p gnus-dribble-buffer)
(mode-string (eval gformat)))
;; Say whether the dribble buffer has been modified.
(setq mode-line-modified
- (if modified "---*- " "----- "))
+ (if modified "--**- " "----- "))
;; If the line is too long, we chop it off.
(when (> (length mode-string) max-len)
(setq mode-string (substring mode-string 0 (- max-len 4))))
(prog1
- (setq mode-line-buffer-identification
+ (setq mode-line-buffer-identification
(gnus-mode-line-buffer-identification
(list mode-string)))
(set-buffer-modified-p modified))))))
(setq n (1- n))
(gnus-group-next-group way)))
(nreverse groups)))
- ((and (boundp 'transient-mark-mode)
- transient-mark-mode
- (boundp 'mark-active)
- mark-active)
+ ((gnus-region-active-p)
;; Work on the region between point and mark.
(let ((max (max (point) (mark)))
groups)
(- (1+ (cdr active)) (car active)))))
(gnus-summary-read-group
group (or all (and (numberp number)
- (zerop (+ number (gnus-range-length
+ (zerop (+ number (gnus-range-length
(cdr (assq 'tick marked)))
(gnus-range-length
(cdr (assq 'dormant marked)))))))
(require 'gnus-score)
(let (gnus-visual
gnus-score-find-score-files-function
+ gnus-home-score-file
gnus-apply-kill-hook
gnus-summary-expunge-below)
(gnus-group-read-group all t)))
(defun gnus-group-select-group-ephemerally ()
"Select the current group without doing any processing whatsoever.
You will actually be entered into a group that's a copy of
-the current group; no changes you make while in this group will
+the current group; no changes you make while in this group will
be permanent."
(interactive)
(require 'gnus-score)
`(,(car method) ,(concat (cadr method) "-ephemeral")
(,(intern (format "%s-address" (car method))) ,(cadr method))
,@(cddr method)))
- (gnus-group-read-ephemeral-group
+ (gnus-group-read-ephemeral-group
(gnus-group-prefixed-name group method) method)))
;;;###autoload
(gnus))
(gnus-group-read-group nil nil group))
+(defvar gnus-ephemeral-group-server 0)
+
;; Enter a group that is not in the group buffer. Non-nil is returned
;; if selection was successful.
-(defun gnus-group-read-ephemeral-group (group method &optional activate
+(defun gnus-group-read-ephemeral-group (group method &optional activate
quit-config request-only)
"Read GROUP from METHOD as an ephemeral group.
If ACTIVATE, request the group first.
If REQUEST-ONLY, don't actually read the group; just request it.
Return the name of the group is selection was successful."
+ ;; Transform the select method into a unique server.
+ (let ((saddr (intern (format "%s-address" (car method)))))
+ (setq method (gnus-copy-sequence method))
+ (unless (assq saddr method)
+ (nconc method `((,saddr ,(cadr method)))))
+ (setf (cadr method) (format "%s-%d" (cadr method)
+ (incf gnus-ephemeral-group-server))))
(let ((group (if (gnus-group-foreign-p group) group
(gnus-group-prefixed-name group method))))
(gnus-sethash
group
- `(-1 nil (,group
+ `(-1 nil (,group
,gnus-level-default-subscribed nil nil ,method
((quit-config .
,(if quit-config quit-config
(when activate
(gnus-activate-group group 'scan)
(unless (gnus-request-group group)
- (error "Couldn't request group: %s"
+ (error "Couldn't request group: %s"
(nnheader-get-report (car method)))))
(if request-only
group
(when group
(if far
(gnus-goto-char
- (text-property-any
+ (text-property-any
(point-min) (point-max)
'gnus-group (gnus-intern-safe group gnus-active-hashtb)))
(beginning-of-line)
(t
;; Search through the entire buffer.
(gnus-goto-char
- (text-property-any
+ (text-property-any
(point-min) (point-max)
'gnus-group (gnus-intern-safe group gnus-active-hashtb))))))))
(gnus-set-active nname (cons 1 0))
(unless (gnus-ephemeral-group-p name)
(gnus-dribble-enter
- (concat "(gnus-group-set-info '"
+ (concat "(gnus-group-set-info '"
(gnus-prin1-to-string (cdr info)) ")")))
;; Insert the line.
(gnus-group-insert-group-line-info nname)
(unless (gnus-check-backend-function
'request-rename-group (gnus-group-group-name))
(error "This backend does not support renaming groups"))
- (read-string "Rename group to: " (gnus-group-group-name)))))
+ (gnus-read-group "Rename group to: "
+ (gnus-group-real-name (gnus-group-group-name))))))
(unless (gnus-check-backend-function 'request-rename-group group)
(error "This backend does not support renaming groups"))
- (unless group
+ (unless group
(error "No group to rename"))
- (when (string-match "^[ \t]*$" new-name)
- (error "Not a valid group name"))
- (when (equal group new-name)
+ (when (equal (gnus-group-real-name group) new-name)
(error "Can't rename to the same name"))
;; We find the proper prefixed name.
(setq new-name
- (if (equal (gnus-group-real-name new-name) new-name)
+ (if (gnus-group-native-p group)
;; Native group.
new-name
;; Foreign group.
(error "No group on current line"))
(unless (setq info (gnus-get-info group))
(error "Killed group; can't be edited"))
- (gnus-close-group group)
+ (ignore-errors
+ (gnus-close-group group))
(gnus-edit-form
;; Find the proper form to edit.
(cond ((eq part 'method)
(t info))
;; The proper documentation.
(format
- "Editing the %s."
+ "Editing the %s for `%s'."
(cond
((eq part 'method) "select method")
((eq part 'params) "group parameters")
- (t "group info")))
+ (t "group info"))
+ group)
`(lambda (form)
(gnus-group-edit-group-done ',part ,group form)))))
0)
'gnus-group-web-type-history))
(search
- (read-string
- "Search string: "
+ (read-string
+ "Search string: "
(cons (or (car gnus-group-web-search-history) "") 0)
'gnus-group-web-search-history))
(method
(defun gnus-group-sort-groups (func &optional reverse)
"Sort the group buffer according to FUNC.
-If REVERSE, reverse the sorting order."
+When used interactively, the sorting function used will be
+determined by the `gnus-group-sort-function' variable.
+If REVERSE (the prefix), reverse the sorting order."
(interactive (list gnus-group-sort-function current-prefix-arg))
(funcall gnus-group-sort-alist-function
(gnus-make-sort-function func) reverse)
(gnus-info-clear-data info)))
(gnus-get-unread-articles)
(gnus-dribble-enter "")
- (when (gnus-y-or-n-p
+ (when (gnus-y-or-n-p
"Move the cache away to avoid problems in the future? ")
(call-interactively 'gnus-cache-move-cache)))))
(gnus-compress-sequence
(if expiry-wait
;; We set the expiry variables to the group
- ;; parameter.
+ ;; parameter.
(let ((nnmail-expiry-wait-function nil)
(nnmail-expiry-wait expiry-wait))
(gnus-request-expire-articles
groups (cdr groups))
(gnus-group-remove-mark group)
(gnus-group-unsubscribe-group
- group
+ group
(cond
((eq do-sub 'unsubscribe)
gnus-level-default-unsubscribed)
(list (completing-read
"Group: " gnus-active-hashtb nil
(gnus-read-active-file-p)
- nil
+ nil
'gnus-group-history)))
(let ((newsrc (gnus-gethash group gnus-newsrc-hashtb)))
(cond
(newsrc
;; Toggle subscription flag.
(gnus-group-change-level
- newsrc (if level level (if (<= (nth 1 (nth 2 newsrc))
+ newsrc (if level level (if (<= (gnus-info-level (nth 2 newsrc))
gnus-level-subscribed)
(1+ gnus-level-subscribed)
gnus-level-default-subscribed)))
(gnus-master-read-slave-newsrc))
;; We might read in new NoCeM messages here.
- (when (and gnus-use-nocem
+ (when (and gnus-use-nocem
(null arg))
(gnus-nocem-scan-groups))
;; If ARG is not a number, then we read the active file.
;; If the user wants it, we scan for new groups.
(when (eq gnus-check-new-newsgroups 'always)
(gnus-find-new-newsgroups)))
-
+
(setq arg (gnus-group-default-level arg t))
(if (and gnus-read-active-file (not arg))
(progn
(let ((gnus-read-active-file (if arg nil gnus-read-active-file)))
(gnus-get-unread-articles arg)))
(run-hooks 'gnus-after-getting-new-news-hook)
- (gnus-group-list-groups))
+ (gnus-group-list-groups (and (numberp arg)
+ (max (car gnus-group-list-mode) arg))))
(defun gnus-group-get-new-news-this-group (&optional n)
"Check for newly arrived news in the current group (and the N-1 next groups).
(when (and level
(> (prefix-numeric-value level) gnus-level-killed))
(gnus-get-killed-groups))
- (gnus-group-prepare-flat
+ (gnus-group-prepare-flat
(or level gnus-level-subscribed) all (or lowest 1) regexp)
(goto-char (point-min))
(gnus-group-position-point))
"Quit reading news after updating .newsrc.eld and .newsrc.
The hook `gnus-exit-gnus-hook' is called before actually exiting."
(interactive)
- (when
+ (when
(or noninteractive ;For gnus-batch-kill
(not gnus-interactive-exit) ;Without confirmation
gnus-expert-user
projects / gnus / blobdiff