Commits

Anonymous committed 48ba126

version 2.70.1

Comments (0)

Files changed (6)

 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-VERSION = 1.05
-AUTHOR_VERSION = 2.70
+VERSION = 1.06
+AUTHOR_VERSION = 2.70.1
 MAINTAINER = XEmacs Development Team <xemacs-beta@xemacs.org>
 PACKAGE = ediff
 PKG_TYPE = regular
 (provide 'ediff-tbar)
 
 ;; compiler pacifier
-(defvar ediff-toolbar-icon-directory (locate-data-directory "ediff")
+(defvar ediff-toolbar-icon-directory (or
+				      (stringp (locate-data-directory "ediff"))
+				      toolbar-icon-directory)
   "Where the Ediff toolbar icons are.")
 
 (eval-when-compile
     (or (featurep 'ediff)
 	(load "ediff.el" nil nil 'nosuffix))
     (or (featurep 'ediff-tbar)
+	ediff-emacs-p
 	(load "ediff-tbar.el" 'noerror nil 'nosuffix))
     ))
 ;; end pacifier
 
+
 (require 'ediff-init)
 (require 'ediff-help)
 (require 'ediff-mult)
 (require 'ediff-diff)
 (require 'ediff-merg)
 
-
 (if ediff-xemacs-p
     (require 'ediff-tbar))
 
 
 
 (defsubst ediff-file-checked-out-p (file)
-  (and (vc-backend file)
-       (vc-locking-user file)))
+  (or (not (featurep 'vc-hooks))
+      (and (vc-backend file)
+	   (vc-locking-user file))))
 (defsubst ediff-file-checked-in-p (file)
-  (and (vc-backend file)
+  (and (featurep 'vc-hooks)
+       (vc-backend file)
        (not (vc-locking-user file))))
       
 (defun ediff-swap-buffers ()
     (or (featurep 'ediff-help)
 	(load "ediff-help.el" nil nil 'nosuffix))
     (or (featurep 'ediff-tbar)
+	ediff-emacs-p
 	(load "ediff-tbar.el" 'noerror nil 'nosuffix))
     ))
 ;; end pacifier
 ;; Created: February 2, 1994
 ;; Keywords: comparing, merging, patching, version control.
 
-(defconst ediff-version "2.70" "The current version of Ediff")
-(defconst ediff-date "December 15, 1997" "Date of last update")  
+(defconst ediff-version "2.70.1" "The current version of Ediff")
+(defconst ediff-date "March 7, 1998" "Date of last update")  
 
 
 ;; This file is part of GNU Emacs.
 @titlepage
 @title Ediff User's Manual
 @sp 4
-@subtitle Ediff version 2.67
+@subtitle Ediff version 2.70
 @sp 1
-@subtitle August 1997
+@subtitle March 1998
 @sp 5
 @author Michael Kifer
 @page
 
 
 @menu
-* Introduction::                About Ediff 2.67.
+* Introduction::                About Ediff.
 * Major Entry Points::          How to use Ediff.
 * Session Commands::            Ediff commands used within a session.
 * Registry of Ediff Sessions::  Keeping track of multiple Ediff sessions.