Changes committed gnus/lisp (ChangeLog netrc.el)

Modified: ChangeLog netrc.el

* netrc.el: Bind encrypt-file-alist for Emacs 21 and XEmacs when compiling.
(netrc-bound-and-true-p): New macro.
(netrc-parse): Use it instead of bound-and-true-p that is not available in
 XEmacs 21.4.


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.1716 gnus/lisp/ChangeLog:7.1717
--- ChangeLog:7.1716	Wed Dec 19 02:13:30 2007
+++ ChangeLog	Wed Dec 19 03:16:18 2007
@@ -1,3 +1,11 @@
+2007-12-19  Katsumi Yamaoka  <[email protected]>
+
+	* netrc.el: Bind encrypt-file-alist for Emacs 21 and XEmacs when
+	compiling.
+	(netrc-bound-and-true-p): New macro.
+	(netrc-parse): Use it instead of bound-and-true-p that is not available
+	in XEmacs 21.4.
+
 2007-12-19  Teodor Zlatanov  <[email protected]>
 
 	* gnus-registry.el (gnus-registry-mark-article)
Index: netrc.el
diff -u gnus/lisp/netrc.el:7.18 gnus/lisp/netrc.el:7.19
--- netrc.el:7.18	Tue Dec 18 21:29:33 2007
+++ netrc.el	Wed Dec 19 03:16:18 2007
@@ -42,6 +42,14 @@
   (if (fboundp 'point-at-eol)
       'point-at-eol
     'line-end-position))
+(eval-when-compile
+  (defvar encrypt-file-alist)
+  ;; This is unnecessary in the compiled version as it is a macro.
+  (if (fboundp 'bound-and-true-p)
+      (defalias 'netrc-bound-and-true-p 'bound-and-true-p)
+    (defmacro netrc-bound-and-true-p (var)
+      "Return the value of symbol VAR if it is bound, else nil."
+      `(and (boundp (quote ,var)) ,var))))
 
 (defgroup netrc nil
  "Netrc configuration."
@@ -58,7 +66,7 @@
       (let ((tokens '("machine" "default" "login"
 		      "password" "account" "macdef" "force"
 		      "port"))
-	    (encryption-model (when (bound-and-true-p encrypt-file-alist)
+	    (encryption-model (when (netrc-bound-and-true-p encrypt-file-alist)
 				(encrypt-find-model file)))
 	    alist elem result pair)
 	(if encryption-model