diff options
| author | Gnus developers <ding@gnus.org> | 2011-08-18 22:12:47 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2011-08-18 22:12:47 +0000 |
| commit | c7b98a1c197f91ca0dc85b4eab629b3ef5da7b09 (patch) | |
| tree | cbd1276a0d40798704c0422a088bda616a42ebf0 /lisp/gnus/nnmairix.el | |
| parent | c7557a0f2c61ba5180b8bf53810319cce0bcc30f (diff) | |
| download | emacs-c7b98a1c197f91ca0dc85b4eab629b3ef5da7b09.tar.gz | |
Merge changes made in Gnus trunk.
nnmairix.el (nnmairix-request-set-mark, nnmairix-goto-original-article): Remove adding of article to registry, since `gnus-registry-add-group' isn't available anymore.
(nnmairix-determine-original-group-from-registry): Use `gnus-registry-get-id-key' since `gnus-registry-fetch-groups' isn't available anymore.
gnus-spec.el (gnus-lrm-string): Use 8206 instead of ?\x200e to make things work in Emacs 22 and XEmacs, too.
gnus-sum.el (gnus-summary-from-or-to-or-newsgroups): LRM-ify the default From.
gnus-spec.el (gnus-lrm-string-p): New macro.
(gnus-lrm-string): New constant.
(gnus-summary-line-format-spec): LRM-ify the from.
(gnus-tilde-max-form): LRM-ify string chopping.
gnus-ems.el (gnus-string-mark-left-to-right): New function.
Diffstat (limited to 'lisp/gnus/nnmairix.el')
| -rw-r--r-- | lisp/gnus/nnmairix.el | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/lisp/gnus/nnmairix.el b/lisp/gnus/nnmairix.el index b82d6c2ee7b..3d1ac02b6aa 100644 --- a/lisp/gnus/nnmairix.el +++ b/lisp/gnus/nnmairix.el @@ -604,9 +604,7 @@ Other back ends might or might not work.") ;; Silence byte-compiler. (defvar gnus-registry-install) -(autoload 'gnus-registry-fetch-group "gnus-registry") -(autoload 'gnus-registry-fetch-groups "gnus-registry") -(autoload 'gnus-registry-add-group "gnus-registry") +(autoload 'gnus-registry-get-id-key "gnus-registry") (deffoo nnmairix-request-set-mark (group actions &optional server) (when server @@ -660,13 +658,7 @@ Other back ends might or might not work.") nnmairix-only-use-registry) (setq ogroup (nnmairix-determine-original-group-from-path - mid nnmairix-current-server)) - ;; if available and allowed, add this entry to the registry - (when (and (boundp 'gnus-registry-install) - gnus-registry-install) - (dolist (cur ogroup) - (unless (gnus-parameter-registry-ignore cur) - (gnus-registry-add-group mid cur))))) + mid nnmairix-current-server))) (unless ogroup (nnheader-message 3 "Unable to set mark: couldn't find original group for %s" mid) @@ -1630,14 +1622,7 @@ search in raw mode." ;; registry was not available or did not find article ;; so we search again with mairix in raw mode to get filename (setq allgroups - (nnmairix-determine-original-group-from-path mid server)) - ;; if available and allowed, add this entry to the registry - (when (and (not no-registry) - (boundp 'gnus-registry-install) - gnus-registry-install) - (dolist (cur allgroups) - (unless (gnus-parameter-registry-ignore cur) - (gnus-registry-add-group mid cur))))) + (nnmairix-determine-original-group-from-path mid server))) (if (> (length allgroups) 1) (setq group (gnus-completing-read @@ -1657,7 +1642,7 @@ search in raw mode." (set mid (concat "<" mid))) (unless (string-match ">$" mid) (set mid (concat mid ">"))) - (gnus-registry-fetch-groups mid))) + (gnus-registry-get-id-key mid 'group))) (defun nnmairix-determine-original-group-from-path (mid server) "Determine original group(s) for message-id MID from the file path. |