This change means that Tramp is no longer dependent on the fsf-compat
package. And I found a dependency that was missing... sh-script (for
`executable-find').
Michael, I haven't committed this, but if you want me to, just
yell.:-)
tramp patch:
ChangeLog files diff command: cvs -q diff -U 0
Files affected: lisp/ChangeLog ChangeLog
Source files diff command: cvs -q diff -uN
Files affected: lisp/tramp.el Makefile
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/tramp/ChangeLog,v
retrieving revision 1.53
diff -u -p -U0 -r1.53 ChangeLog
--- ChangeLog 9 Oct 2005 11:54:41 -0000 1.53
+++ ChangeLog 11 Oct 2005 10:08:00 -0000
@@ -0,0 +1,5 @@
+2005-10-11 Steve Youngs <steve(a)sxemacs.org>
+
+ * Makefile (REQUIRES): Remove fsf-compat, add sh-script (for
+ executable-find).
+
Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/tramp/Makefile,v
retrieving revision 1.53
diff -u -p -u -r1.53 Makefile
--- Makefile 9 Oct 2005 11:54:41 -0000 1.53
+++ Makefile 11 Oct 2005 10:07:43 -0000
@@ -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
Index: lisp/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/tramp/lisp/ChangeLog,v
retrieving revision 1.28
diff -u -p -U0 -r1.28 ChangeLog
--- lisp/ChangeLog 8 Oct 2005 15:02:20 -0000 1.28
+++ lisp/ChangeLog 11 Oct 2005 10:08:11 -0000
@@ -0,0 +1,5 @@
+2005-10-11 Steve Youngs <steve(a)sxemacs.org>
+
+ * tramp.el: Require `timer-funcs' instead of `timer' if in
+ XEmacs.
+
Index: lisp/tramp.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/tramp/lisp/tramp.el,v
retrieving revision 1.28
diff -u -p -u -r1.28 tramp.el
--- lisp/tramp.el 8 Oct 2005 15:02:20 -0000 1.28
+++ lisp/tramp.el 11 Oct 2005 10:07:49 -0000
@@ -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
--
|---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---|
| I am Dyslexic of Borg. |
| Fusistance is retile. Your arse will be laminated. |
|------------------------------------<steve(a)sxemacs.org>---|