procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes made in Gnus trunk.

Browse source 
gnus-util.el (gnus-bound-and-true-p): Macro for XEmacs compatibility.
nnir.el (nnir-mode): Use it.
nnmairix.el (nnmairix-determine-original-group-from-registry): Use it.
nnir.el (gnus-registry-enabled): Defvar to keep the compiler happy.
nnmairix.el (gnus-registry-enabled): Ditto.
This commit is contained in:
Teodor Zlatanov 2011-10-18 14:10:52 +00:00 • committed by Katsumi Yamaoka
parent 6978a1514a
commit 97d0a92c79
4 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lisp/gnus/ChangeLog
View file

@ -1,3 +1,13 @@
2011-10-18 Teodor Zlatanov <tzz@lifelogs.com>
* gnus-util.el (gnus-bound-and-true-p): Macro for XEmacs compatibility.
* nnir.el (nnir-mode): Use it.
* nnmairix.el (nnmairix-determine-original-group-from-registry):
Use it.
* nnir.el (gnus-registry-enabled): Defvar to keep the compiler happy.
* nnmairix.el (gnus-registry-enabled): Ditto.
2011-10-17 Teodor Zlatanov <tzz@lifelogs.com>
* gnus-registry.el (gnus-registry-enabled): Add new variable.

8
lisp/gnus/gnus-util.el
View file

@ -1986,6 +1986,14 @@ definitions to shadow the loaded ones for use in file byte-compilation."
(gnus-macroexpand-all expanded environment)))
form))))
(eval-when-compile
;; This is unnecessary in the compiled version as it is a macro.
(if (fboundp 'bound-and-true-p)
(defalias 'gnus-bound-and-true-p 'bound-and-true-p)
(defmacro gnus-bound-and-true-p (var)
"Return the value of symbol VAR if it is bound, else nil."
`(and (boundp (quote ,var)) ,var))))
(provide 'gnus-util)
;;; gnus-util.el ends here

4
lisp/gnus/nnir.el
View file

@ -292,6 +292,8 @@ is `(valuefunc member)'."
(autoload 'nnimap-make-thread-query "nnimap")
(autoload 'gnus-registry-action "gnus-registry"))
;; Suppress byte-compiler warning `reference to free variable'
(defvar gnus-registry-enabled)
(nnoo-declare nnir)
(nnoo-define-basics nnir)
@ -1740,7 +1742,7 @@ environment unless `not-global' is non-nil."
(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 (bound-and-true-p gnus-registry-enabled)
(when (gnus-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)

5
lisp/gnus/nnmairix.el
View file

@ -605,6 +605,9 @@ Other back ends might or might not work.")
;; Silence byte-compiler.
(autoload 'gnus-registry-get-id-key "gnus-registry")
;; Suppress byte-compiler warning `reference to free variable'
(defvar gnus-registry-enabled)
(deffoo nnmairix-request-set-mark (group actions &optional server)
(when server
(nnmairix-open-server server))
@ -1635,7 +1638,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 (bound-and-true-p gnus-registry-enabled)
(when (gnus-bound-and-true-p gnus-registry-enabled)
(unless (string-match "^<" mid)
(set mid (concat "<" mid)))
(unless (string-match ">$" mid)