diff options
| author | Teodor Zlatanov <tzz@lifelogs.com> | 2011-10-17 22:51:37 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2011-10-17 22:51:37 +0000 |
| commit | aa22bff2be02d0b3f1264276afc04e47d53cd421 (patch) | |
| tree | 9aad3d16b033d03a854c0d4b3ef405daa76096fc /lisp/gnus/nnmairix.el | |
| parent | 67e729a5f78cf54a608297b1be201ed12a676737 (diff) | |
| download | emacs-aa22bff2be02d0b3f1264276afc04e47d53cd421.tar.gz | |
Merge changes made in Gnus trunk.
From Dave Abrahams <dave@boostpro.com>.
gnus-registry.el (gnus-registry-enabled): Add new variable.
(gnus-registry-install-shortcuts): Set `gnus-registry-install' to 'ask only while we need to find out if it should be t or nil.
(gnus-registry-initialize): Don't set `gnus-registry-install' to t.
(gnus-registry-install-hooks): Set `gnus-registry-enabled' to t when the registry is installed. Set it to nil when it's unloaded.
(gnus-registry-install-p): Provide user guidance for the initial value of `gnus-registry-install' when it's 'ask, otherwise return its value.
nnregistry.el (nnregistry-open-server, nnregistry-server-opened): Use `gnus-registry-enabled' instead of `gnus-registry-install'.
nnmairix.el (nnmairix-determine-original-group-from-registry): Use `gnus-registry-enabled' instead of `gnus-registry-install'.
nnir.el (nnir-mode): Use `gnus-registry-enabled' instead of `gnus-registry-install'.
Diffstat (limited to 'lisp/gnus/nnmairix.el')
| -rw-r--r-- | lisp/gnus/nnmairix.el | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lisp/gnus/nnmairix.el b/lisp/gnus/nnmairix.el index 3d1ac02b6aa..f81aa03c269 100644 --- a/lisp/gnus/nnmairix.el +++ b/lisp/gnus/nnmairix.el @@ -603,7 +603,6 @@ Other back ends might or might not work.") nil)) ;; Silence byte-compiler. -(defvar gnus-registry-install) (autoload 'gnus-registry-get-id-key "gnus-registry") (deffoo nnmairix-request-set-mark (group actions &optional server) @@ -1636,8 +1635,7 @@ search in raw mode." (defun nnmairix-determine-original-group-from-registry (mid) "Try to determinale original group for message-id MID from the registry." - (when (and (boundp 'gnus-registry-install) - gnus-registry-install) + (when (bound-and-true-p gnus-registry-enabled) (unless (string-match "^<" mid) (set mid (concat "<" mid))) (unless (string-match ">$" mid) |