[PACKAGES (efs)] Fix EFS for SXEmacs

Hi Mike! Here's the EFS version of the Dired patch I just sent. Could you please add this to your next release. Thanks. efs patch: ChangeLog files diff command: cvs -q diff -U 0 Files affected: ChangeLog Source files diff command: cvs -q diff -uN Files affected: efs-fnh.el Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/efs/ChangeLog,v retrieving revision 1.41 diff -u -U0 -r1.41 ChangeLog --- ChangeLog 4 Oct 2004 08:54:56 -0000 1.41 +++ ChangeLog 14 Jan 2005 02:43:10 -0000 ＠＠ -0,0 +1,6 ＠＠ +2005-01-14 Steve Youngs <steve(a)sxemacs.org&gt; + + * efs-fnh.el (efs-handle-emacs-version): Use `emacs-*-version' + variables for version info instead of string-matching through + `emacs-version'. + Index: efs-fnh.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/efs/efs-fnh.el,v retrieving revision 1.13 diff -u -u -r1.13 efs-fnh.el --- efs-fnh.el 2 Oct 2004 14:06:00 -0000 1.13 +++ efs-fnh.el 14 Jan 2005 02:42:59 -0000 ＠＠ -36,15 +36,17 ＠＠ (let ((ehev-match-data (match-data))) (unwind-protect (let ((xemacsp (string-match "XEmacs" emacs-version)) - ver subver) - (or (string-match "^\\([0-9]+\\)\\.\\([0-9]+\\)" emacs-version) - (error "efs does not work with emacs version %s" emacs-version)) - (setq ver (string-to-int (substring emacs-version - (match-beginning 1) - (match-end 1))) - subver (string-to-int (substring emacs-version - (match-beginning 2) - (match-end 2)))) + (ver emacs-major-version) + (subver emacs-minor-version)) + (unless ver + (or (string-match "^\\([0-9]+\\)\\.\\([0-9]+\\)" emacs-version) + (error "efs does not work with emacs version %s" emacs-version)) + (setq ver (string-to-int (substring emacs-version + (match-beginning 1) + (match-end 1))) + subver (string-to-int (substring emacs-version + (match-beginning 2) + (match-end 2))))) (cond ;; XEmacs (emacs-version looks like \"19.xx XEmacs\") -- |---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---| | In space, | | No one can hear you rip a stinky | |------------------------------------&lt;steve(a)sxemacs.org&gt;---|