1. xemacs
  2. ediff

Commits

steveb  committed bf3e867

Add toolbar icons
add direntry section to manual

  • Participants
  • Parent commits 726a31e
  • Branches default

Comments (0)

Files changed (29)

File .cvsignore

View file
+_pkg.el
+auto-autoloads.el
+custom-load.el
+package-info

File ChangeLog

View file
+1998-02-25  SL Baur  <steve@altair.xemacs.org>
+
+	* ediff-tbar.el (ediff-toolbar-icon-directory): New variable.
+	(ediff-toolbar-next-icon): Use it.
+	(ediff-toolbar-previous-icon): Ditto.
+	(ediff-toolbar-A-icon): Ditto.
+	(ediff-toolbar-B-icon): Ditto.
+	(ediff-toolbar-toggle-split-icon): Ditto.
+	(ediff-toolbar-save-icon): Ditto.
+	(ediff-toolbar-quit-icon): Ditto.
+	(ediff-toolbar-help-icon): Ditto.
+	(ediff-toolbar-refresh-icon): Ditto.
+	(ediff-toolbar-refine-icon): Ditto.
+
+	* ediff.texi: Add direntry section for automated installation.
+
 1998-01-24  SL Baur  <steve@altair.xemacs.org>
 
 	* Makefile (VERSION): Update to package standard 1.0.

File Makefile

View file
 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-VERSION = 1.04
+VERSION = 1.05
 AUTHOR_VERSION = 2.70
 MAINTAINER = XEmacs Development Team <xemacs-beta@xemacs.org>
 PACKAGE = ediff
 
 srckit: srckit-std
 
-binkit: binkit-sourceinfo
+binkit: binkit-sourcedatainfo

File ediff-tbar.el

View file
 (provide 'ediff-tbar)
 
 ;; compiler pacifier
-(defvar toolbar-icon-directory)
+(defvar ediff-toolbar-icon-directory (locate-data-directory "ediff")
+  "Where the Ediff toolbar icons are.")
 
 (eval-when-compile
   (let ((load-path (cons (expand-file-name ".") load-path)))
       (toolbar-make-button-list
        (expand-file-name
 	(if (featurep 'xpm) "ediff-next.xpm" "ediff-next.xbm")
-	toolbar-icon-directory)))
+	ediff-toolbar-icon-directory)))
   "Next difference icon in toolbar.")
 
 (defvar ediff-toolbar-previous-icon
       (toolbar-make-button-list
        (expand-file-name
 	(if (featurep 'xpm) "ediff-prev.xpm" "ediff-prev.xbm")
-	toolbar-icon-directory)))
+	ediff-toolbar-icon-directory)))
   "Previous difference icon in toolbar.")
 
 (defvar ediff-toolbar-A-icon
        (expand-file-name
 	;; UP
 	(if (featurep 'xpm) "ediff-A-up.xpm" "ediff-A-up.xbm")
-	toolbar-icon-directory)
+	ediff-toolbar-icon-directory)
        (expand-file-name
 	;; DOWN
 	(if (featurep 'xpm) "ediff-A-up.xpm" "ediff-A-up.xbm")
-	toolbar-icon-directory)
+	ediff-toolbar-icon-directory)
        (expand-file-name
 	;; DISABLED
 	(if (featurep 'xpm) "ediff-A-xx.xpm" "ediff-A-up.xbm")
-	toolbar-icon-directory)
+	ediff-toolbar-icon-directory)
        ))
   "Select diff A icon in toolbar.")
 
        (expand-file-name
 	;; UP
 	(if (featurep 'xpm) "ediff-B-up.xpm" "ediff-B-up.xbm")
-	toolbar-icon-directory)
+	ediff-toolbar-icon-directory)
        (expand-file-name
 	;; DOWN
 	(if (featurep 'xpm) "ediff-B-up.xpm" "ediff-B-up.xbm")
-	toolbar-icon-directory)
+	ediff-toolbar-icon-directory)
        (expand-file-name
 	;; DISABLED
 	(if (featurep 'xpm) "ediff-B-xx.xpm" "ediff-B-up.xbm")
-	toolbar-icon-directory)
+	ediff-toolbar-icon-directory)
        ))
   "Select diff B icon in toolbar.")
 
 	;; UP
 	(if (featurep 'xpm)
 	    "ediff-toggle-split-up.xpm" "ediff-toggle-split-up.xbm")
-	toolbar-icon-directory)
+	ediff-toolbar-icon-directory)
        ))
   "Toggle split mode between side-to-side and one-on-top-of-another.")
 
        (expand-file-name
 	;; UP
 	(if (featurep 'xpm) "ediff-save.xpm" "ediff-save.xbm")
-	toolbar-icon-directory)
+	ediff-toolbar-icon-directory)
        (expand-file-name
 	;; DOWN
 	(if (featurep 'xpm) "ediff-save.xpm" "ediff-save.xbm")
-	toolbar-icon-directory)
+	ediff-toolbar-icon-directory)
        (expand-file-name
 	;; DISABLED
 	(if (featurep 'xpm) "ediff-save-xx.xpm" "ediff-save-xx.xbm")
-	toolbar-icon-directory)
+	ediff-toolbar-icon-directory)
        ))
   "Save merge buffer.")
 
       (toolbar-make-button-list
        (expand-file-name
 	(if (featurep 'xpm) "ediff-quit.xpm" "ediff-quit.xbm")
-	toolbar-icon-directory)))
+	ediff-toolbar-icon-directory)))
   "Exit Ediff session.")
 
 (defvar ediff-toolbar-help-icon
       (toolbar-make-button-list
        (expand-file-name
 	(if (featurep 'xpm) "ediff-help.xpm" "ediff-help.xbm")
-	toolbar-icon-directory)))
+	ediff-toolbar-icon-directory)))
   "Show Ediff help.")
 
 (defvar ediff-toolbar-refresh-icon
       (toolbar-make-button-list
        (expand-file-name
 	(if (featurep 'xpm) "ediff-update.xpm" "ediff-update.xbm")
-	toolbar-icon-directory)))
+	ediff-toolbar-icon-directory)))
   "Refresh Ediff display (aka recenter).")
 
 (defvar ediff-toolbar-refine-icon
        (expand-file-name
 	;; UP
 	(if (featurep 'xpm) "ediff-refine.xpm" "ediff-refine.xbm")
-	toolbar-icon-directory)
+	ediff-toolbar-icon-directory)
        ))
   "Refine current difference region by computing fine diffs.")
 

File ediff.texi

View file
 @synindex vr cp
 @synindex fn cp
 @synindex pg cp
+
+@direntry
+* Ediff::       A Visual Interface to Unix Diff and Patch Utilities.
+@end direntry
+
 @iftex
 @finalout
 @end iftex

File etc/ediff-A-up.xbm

View file
Added
New image

File etc/ediff-A-up.xpm

View file
Added
New image

File etc/ediff-A-xx.xpm

View file
Added
New image

File etc/ediff-B-up.xbm

View file
Added
New image

File etc/ediff-B-up.xpm

View file
Added
New image

File etc/ediff-B-xx.xpm

View file
Added
New image

File etc/ediff-help.xbm

View file
Added
New image

File etc/ediff-help.xpm

View file
Added
New image

File etc/ediff-next.xbm

View file
Added
New image

File etc/ediff-next.xpm

View file
Added
New image

File etc/ediff-prev.xbm

View file
Added
New image

File etc/ediff-prev.xpm

View file
Added
New image

File etc/ediff-quit.xbm

View file
Added
New image

File etc/ediff-quit.xpm

View file
Added
New image

File etc/ediff-refine.xbm

View file
Added
New image

File etc/ediff-refine.xpm

View file
Added
New image

File etc/ediff-save-xx.xbm

View file
Added
New image

File etc/ediff-save-xx.xpm

View file
Added
New image

File etc/ediff-save.xbm

View file
Added
New image

File etc/ediff-save.xpm

View file
Added
New image

File etc/ediff-toggle-split-up.xbm

View file
Added
New image

File etc/ediff-toggle-split-up.xpm

View file
Added
New image

File etc/ediff-update.xbm

View file
Added
New image

File etc/ediff-update.xpm

View file
Added
New image