User: youngs
Date: 05/10/11 14:42:16
Modified: packages/xemacs-packages/tramp/lisp ChangeLog tramp.el
Log:
2005-10-11 Steve Youngs <steve(a)sxemacs.org>
* Makefile (REQUIRES): Remove fsf-compat, add sh-script (for
executable-find).
2005-10-11 Steve Youngs <steve(a)sxemacs.org>
* tramp.el: Require `timer-funcs' instead of `timer' if in
XEmacs.
Revision Changes Path
1.54 +5 -0 XEmacs/packages/xemacs-packages/tramp/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/tramp/ChangeLog,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- ChangeLog 2005/10/09 11:54:41 1.53
+++ ChangeLog 2005/10/11 12:42:12 1.54
@@ -1,3 +1,8 @@
+2005-10-11 Steve Youngs <steve(a)sxemacs.org>
+
+ * Makefile (REQUIRES): Remove fsf-compat, add sh-script (for
+ executable-find).
+
2005-10-09 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.27 released.
1.54 +1 -1 XEmacs/packages/xemacs-packages/tramp/Makefile
Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/tramp/Makefile,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- Makefile 2005/10/09 11:54:41 1.53
+++ Makefile 2005/10/11 12:42:13 1.54
@@ -22,7 +22,7 @@ AUTHOR_VERSION = 2.0.51
MAINTAINER = Kai Großjohann <kai.grossjohann(a)gmx.net>
PACKAGE = tramp
PKG_TYPE = regular
-REQUIRES = tramp xemacs-base vc fsf-compat efs dired mail-lib gnus ediff
+REQUIRES = tramp xemacs-base vc efs dired mail-lib gnus ediff sh-script
CATEGORY = standard
include ../../Local.rules.inc
1.29 +5 -0 XEmacs/packages/xemacs-packages/tramp/lisp/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/tramp/lisp/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- ChangeLog 2005/10/08 15:02:20 1.28
+++ ChangeLog 2005/10/11 12:42:15 1.29
@@ -1,3 +1,8 @@
+2005-10-11 Steve Youngs <steve(a)sxemacs.org>
+
+ * tramp.el: Require `timer-funcs' instead of `timer' if in
+ XEmacs.
+
2005-10-08 Michael Albinus <michael.albinus(a)gmx.de>
Version 2.0.51 released.
1.29 +4 -1 XEmacs/packages/xemacs-packages/tramp/lisp/tramp.el
Index: tramp.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/tramp/lisp/tramp.el,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- tramp.el 2005/10/08 15:02:20 1.28
+++ tramp.el 2005/10/11 12:42:15 1.29
@@ -68,7 +68,10 @@
;; The Tramp version number and bug report address, as prepared by configure.
(require 'trampver)
-(require 'timer)
+(if (featurep 'xemacs)
+ (require 'timer-funcs)
+ (require 'timer))
+
(require 'format-spec) ;from Gnus 5.8, also in tar ball
;; As long as password.el is not part of (X)Emacs, it shouldn't
;; be mandatory