[gnus git] branch master updated: n0-15-26-gd1ab535 =2= Only do the defcustom compilation thing on XEmacs, where it seems to be needed. ; Resolve merge conflict.

       via  d1ab5358b3fac6fd9885eb03a3a8d7e2602f3bd1 (commit)
       via  d7a53355e2299eecd6d80014cc2561ca20613ab9 (commit)
      from  06f8178fff242510622829d31a4c994c46724c1d (commit)


- Log -----------------------------------------------------------------
commit d1ab5358b3fac6fd9885eb03a3a8d7e2602f3bd1
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Wed Mar 30 18:09:31 2011 +0200

    Only do the defcustom compilation thing on XEmacs, where it seems to be needed.

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index a8783cd..d758100 100644
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -250,7 +250,8 @@ in `defcustom' forms."
 	    (search-forward " 'foo '(byte-code " nil t))
 	(kill-buffer outbuf)))))
 
-(when (dgnushack-emacs-compile-defcustom-p)
+(when (and (featurep 'xemacs)
+	   (dgnushack-emacs-compile-defcustom-p))
   (maybe-fbind '(defined-colors face-attribute))
   (maybe-bind '(idna-program installation-directory)))
 

commit d7a53355e2299eecd6d80014cc2561ca20613ab9
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Wed Mar 30 18:10:33 2011 +0200

    Resolve merge conflict.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 76b8dc1..98d06b3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -15,6 +15,11 @@
 	nntp-open-plain-stream value.
 	(nntp-open-connection): Recognize that value.
 
+2011-03-30  Lars Magne Ingebrigtsen  <[email protected]>
+
+	* dgnushack.el: Only do the defcustom compilation thing on XEmacs,
+	where it seems to be needed.
+
 2011-03-29  Lars Magne Ingebrigtsen  <[email protected]>
 
 	* gssapi.el (open-gssapi-stream): Remove the last mentions of the IMAP

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog    |    5 +++++
 lisp/dgnushack.el |    3 ++-
 2 files changed, 7 insertions(+), 1 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project