[Emacs-diffs] /srv/bzr/emacs/trunk r106109: Merge changes made in Gnus trunk.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 106109
author: Teodor Zlatanov <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2011-10-17 22:51:37 +0000
message:
  Merge changes made in Gnus trunk.
  
  From Dave Abrahams <address@hidden>.
  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'.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-registry.el
  lisp/gnus/nnir.el
  lisp/gnus/nnmairix.el
  lisp/gnus/nnregistry.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-10-17 04:29:19 +0000
+++ b/lisp/gnus/ChangeLog       2011-10-17 22:51:37 +0000
@@ -1,3 +1,21 @@
+2011-10-17  Teodor Zlatanov  <address@hidden>
+
+       * 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'.
+       From Dave Abrahams <address@hidden>.
+
 2011-10-17  Daiki Ueno  <address@hidden>
 
        * mml2015.el (mml2015-epg-find-usable-key): Skip the whole key if the

=== modified file 'lisp/gnus/gnus-registry.el'
--- a/lisp/gnus/gnus-registry.el        2011-06-26 22:21:48 +0000
+++ b/lisp/gnus/gnus-registry.el        2011-10-17 22:51:37 +0000
@@ -164,6 +164,8 @@
                  (const :tag "Always Install" t)
                  (const :tag "Ask Me" ask)))
 
+(defvar gnus-registry-enabled)
+
 (defvar gnus-summary-misc-menu) ;; Avoid byte compiler warning.
 
 (defvar gnus-registry-misc-menus nil)   ; ugly way to keep the menus
@@ -873,8 +875,9 @@
 
                  ;; if this is called and the user doesn't want the
                  ;; registry enabled, we'll ask anyhow
-                 (when (eq gnus-registry-install nil)
-                   (setq gnus-registry-install 'ask))
+                 (unless gnus-registry-install
+                   (let ((gnus-registry-install 'ask))
+                     (gnus-registry-install-p)))
 
                  ;; now the user is asked if gnus-registry-install is 'ask
                  (when (gnus-registry-install-p)
@@ -1151,7 +1154,6 @@
 "Initialize the Gnus registry."
   (interactive)
   (gnus-message 5 "Initializing the registry")
-  (setq gnus-registry-install t)        ; in case it was 'ask or nil
   (gnus-registry-install-hooks)
   (gnus-registry-install-shortcuts)
   (gnus-registry-read))
@@ -1160,6 +1162,7 @@
 (defun gnus-registry-install-hooks ()
   "Install the registry hooks."
   (interactive)
+  (setq gnus-registry-enabled t)
   (add-hook 'gnus-summary-article-move-hook 'gnus-registry-action)
   (add-hook 'gnus-summary-article-delete-hook 'gnus-registry-action)
   (add-hook 'gnus-summary-article-expire-hook 'gnus-registry-action)
@@ -1181,23 +1184,25 @@
   (remove-hook 'gnus-save-newsrc-hook 'gnus-registry-save)
   (remove-hook 'gnus-read-newsrc-el-hook 'gnus-registry-read)
 
-  (remove-hook 'gnus-summary-prepare-hook 'gnus-registry-register-message-ids))
+  (remove-hook 'gnus-summary-prepare-hook 'gnus-registry-register-message-ids)
+  (setq gnus-registry-enabled nil))
 
 (add-hook 'gnus-registry-unload-hook 'gnus-registry-unload-hook)
 
 (defun gnus-registry-install-p ()
+  "If the registry is not already enabled, and `gnus-registry-install' is t,
+the registry is enabled.  If `gnus-registry-install' is `ask',
+the user is asked first.  Returns non-nil iff the registry is enabled."
   (interactive)
-  (when (eq gnus-registry-install 'ask)
-    (setq gnus-registry-install
-          (gnus-y-or-n-p
-           (concat "Enable the Gnus registry?  "
-                   "See the variable `gnus-registry-install' "
-                   "to get rid of this query permanently. ")))
-    (when gnus-registry-install
-      ;; we just set gnus-registry-install to t, so initialize the registry!
+  (unless gnus-registry-enabled
+    (when (if (eq gnus-registry-install 'ask)
+              (gnus-y-or-n-p
+               (concat "Enable the Gnus registry?  "
+                       "See the variable `gnus-registry-install' "
+                       "to get rid of this query permanently. "))
+            gnus-registry-install)
       (gnus-registry-initialize)))
-;;; we could call it here: (customize-variable 'gnus-registry-install)
-  gnus-registry-install)
+  gnus-registry-enabled)
 
 ;; TODO: a few things
 

=== modified file 'lisp/gnus/nnir.el'
--- a/lisp/gnus/nnir.el 2011-09-05 22:07:34 +0000
+++ b/lisp/gnus/nnir.el 2011-10-17 22:51:37 +0000
@@ -290,8 +290,7 @@
   (autoload 'nnimap-command "nnimap")
   (autoload 'nnimap-possibly-change-group "nnimap")
   (autoload 'nnimap-make-thread-query "nnimap")
-  (autoload 'gnus-registry-action "gnus-registry")
-  (defvar gnus-registry-install))
+  (autoload 'gnus-registry-action "gnus-registry"))
 
 
 (nnoo-declare nnir)
@@ -1741,8 +1740,7 @@
   (when (eq (car (gnus-find-method-for-group gnus-newsgroup-name)) 'nnir)
     (setq gnus-summary-line-format
          (or nnir-summary-line-format gnus-summary-line-format))
-    (when (and (boundp 'gnus-registry-install)
-                      (eq gnus-registry-install t))
+    (when (bound-and-true-p gnus-registry-enabled)
       (remove-hook 'gnus-summary-article-delete-hook 'gnus-registry-action t)
       (remove-hook 'gnus-summary-article-move-hook 'gnus-registry-action t)
       (remove-hook 'gnus-summary-article-expire-hook 'gnus-registry-action t)

=== modified file 'lisp/gnus/nnmairix.el'
--- a/lisp/gnus/nnmairix.el     2011-08-18 22:12:47 +0000
+++ b/lisp/gnus/nnmairix.el     2011-10-17 22:51:37 +0000
@@ -603,7 +603,6 @@
     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 @@
 
 (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)

=== modified file 'lisp/gnus/nnregistry.el'
--- a/lisp/gnus/nnregistry.el   2011-04-05 22:35:05 +0000
+++ b/lisp/gnus/nnregistry.el   2011-10-17 22:51:37 +0000
@@ -36,8 +36,11 @@
 
 (nnoo-declare nnregistry)
 
+;; Suppress byte-compiler warning `reference to free variable'
+(defvar gnus-registry-enabled)
+
 (deffoo nnregistry-server-opened (server)
-  (eq gnus-registry-install t))
+  gnus-registry-enabled)
 
 (deffoo nnregistry-close-server (server)
   t)
@@ -46,7 +49,7 @@
   nil)
 
 (deffoo nnregistry-open-server (server &optional defs)
-  (eq gnus-registry-install t))
+  gnus-registry-enabled)
 
 (defvar nnregistry-within-nnregistry nil)