2003-04-17 Steve Youngs <youngs@xemacs.org>

	* dgnushack.el: 'setenv' is in env.el for XEmacsen <= 21.4, but in
	process.el in XEmacsen >= 21.5.

I hope I haven't messed up the ChangeLog again...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c1ea21d..46f0a21 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -16,6 +16,11 @@
        the broken-reply-to group parameter is set.  Idea from Vasily
        Korytov <deskpot@myrealbox.com>.
 
+2003-04-17  Steve Youngs  <youngs@xemacs.org>
+
+       * dgnushack.el: 'setenv' is in env.el for XEmacsen <= 21.4, but in
+       process.el in XEmacsen >= 21.5.
+
 2003-04-17  Steve Youngs  <youngs@xemacs.org>
 
        * dgnushack.el: Add a whole swag of autoloads and defaliases to

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 6d0f4e2..8eaee3d 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -163,7 +163,9 @@
     (autoload 'read-passwd "passwd")
     (autoload 'regexp-opt "regexp-opt")
     (autoload 'reporter-submit-bug-report "reporter")
-    (autoload 'setenv "process" nil t)
+    (if (emacs-version>= 21 5)
+       (autoload 'setenv "process" nil t)
+      (autoload 'setenv "env" nil t))
     (autoload 'smtpmail-send-it "smtpmail")
     (autoload 'sort-numeric-fields "sort" nil t)
     (autoload 'sort-subr "sort")