[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r106120: Merge changes made in Gnus t
From: |
Katsumi Yamaoka |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r106120: Merge changes made in Gnus trunk. |
Date: |
Tue, 18 Oct 2011 14:10:52 +0000 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 106120
author: Teodor Zlatanov <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2011-10-18 14:10:52 +0000
message:
Merge changes made in Gnus trunk.
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.
modified:
lisp/gnus/ChangeLog
lisp/gnus/gnus-util.el
lisp/gnus/nnir.el
lisp/gnus/nnmairix.el
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2011-10-18 08:12:19 +0000
+++ b/lisp/gnus/ChangeLog 2011-10-18 14:10:52 +0000
@@ -1,3 +1,13 @@
+2011-10-18 Teodor Zlatanov <address@hidden>
+
+ * 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 <address@hidden>
* gnus-registry.el (gnus-registry-enabled): Add new variable.
=== modified file 'lisp/gnus/gnus-util.el'
--- a/lisp/gnus/gnus-util.el 2011-09-11 16:12:42 +0000
+++ b/lisp/gnus/gnus-util.el 2011-10-18 14:10:52 +0000
@@ -1986,6 +1986,14 @@
(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
=== modified file 'lisp/gnus/nnir.el'
--- a/lisp/gnus/nnir.el 2011-10-17 22:51:37 +0000
+++ b/lisp/gnus/nnir.el 2011-10-18 14:10:52 +0000
@@ -292,6 +292,8 @@
(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 @@
(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)
=== modified file 'lisp/gnus/nnmairix.el'
--- a/lisp/gnus/nnmairix.el 2011-10-17 22:51:37 +0000
+++ b/lisp/gnus/nnmairix.el 2011-10-18 14:10:52 +0000
@@ -605,6 +605,9 @@
;; 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 @@
(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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r106120: Merge changes made in Gnus trunk.,
Katsumi Yamaoka <=