Commits

Anonymous committed bf3e867

Add toolbar icons
add direntry section to manual

Comments (0)

Files changed (29)

+_pkg.el
+auto-autoloads.el
+custom-load.el
+package-info
+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.
 # 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
 (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.")
 
 @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

etc/ediff-A-up.xbm

+#define ediff-A-up_width 15
+#define ediff-A-up_height 15
+static char ediff-A-up_bits[] = {
+ 0x00,0x80,0x00,0x80,0x00,0x80,0xc0,0x81,0xe0,0x83,0x60,0x83,0x70,0x87,0x30,
+ 0x86,0x38,0x8e,0xf8,0x8f,0x18,0x8c,0x18,0x8c,0x00,0x80,0x00,0x80,0x00,0x80
+ };

etc/ediff-A-up.xpm

+/* XPM */
+static char *ediff_A[] = {
+/* width height num_colors chars_per_pixel */
+"    15   15       2            1",
+/* colors */
+". c blue",
+"# c Gray75 s backgroundToolBarColor",
+/* pixels */
+"###############",
+"###############",
+"###############",
+"######...######",
+"#####.....#####",
+"#####..#..#####",
+"####...#...####",
+"####..###..####",
+"###...###...###",
+"###.........###",
+"###..#####..###",
+"###..#####..###",
+"###############",
+"###############",
+"###############",
+};

etc/ediff-A-xx.xpm

+/* XPM */
+static char *ediff_A[] = {
+/* width height num_colors chars_per_pixel */
+"    15   15       2            1",
+/* colors */
+". c gray60",
+"# c Gray75 s backgroundToolBarColor",
+/* pixels */
+"###############",
+"###############",
+"###############",
+"######...######",
+"#####.....#####",
+"#####..#..#####",
+"####...#...####",
+"####..###..####",
+"###...###...###",
+"###.........###",
+"###..#####..###",
+"###..#####..###",
+"###############",
+"###############",
+"###############",
+};

etc/ediff-B-up.xbm

+#define ediff-B-up_width 15
+#define ediff-B-up_height 15
+static char ediff-B-up_bits[] = {
+ 0x00,0x80,0x00,0x80,0xf8,0x81,0xf8,0x83,0x38,0x87,0x38,0x86,0xf8,0x83,0xf8,
+ 0x87,0x38,0x8e,0x38,0x8c,0x38,0x8e,0xf8,0x87,0xf8,0x83,0x00,0x80,0x00,0x80
+ };

etc/ediff-B-up.xpm

+/* XPM */
+static char *ediff-B-up[] = {
+/* width height num_colors chars_per_pixel */
+"    15    15        2            1",
+/* colors */
+". c blue",
+"# c Gray75 s backgroundToolBarColor",
+/* pixels */
+"###############",
+"###############",
+"###......######",
+"###.......#####",
+"###...##...####",
+"###...###..####",
+"###.......#####",
+"###........####",
+"###...###...###",
+"###...####..###",
+"###...###...###",
+"###........####",
+"###.......#####",
+"###############",
+"###############",
+"###############"
+};

etc/ediff-B-xx.xpm

+/* XPM */
+static char *ediff-B-up[] = {
+/* width height num_colors chars_per_pixel */
+"    15    15        2            1",
+/* colors */
+". c gray60",
+"# c Gray75 s backgroundToolBarColor",
+/* pixels */
+"###############",
+"###############",
+"###......######",
+"###.......#####",
+"###...##...####",
+"###...###..####",
+"###.......#####",
+"###........####",
+"###...###...###",
+"###...####..###",
+"###...###...###",
+"###........####",
+"###.......#####",
+"###############",
+"###############",
+"###############"
+};

etc/ediff-help.xbm

+#define ediff-help_width 15
+#define ediff-help_height 15
+static char ediff-help_bits[] = {
+ 0x00,0x80,0xf0,0x83,0x0c,0x86,0xe4,0x8c,0x74,0x8d,0xb4,0x8c,0x58,0x86,0x20,
+ 0x83,0xa0,0x83,0xa0,0x81,0xc0,0x80,0x20,0x83,0x20,0x83,0xc0,0x81,0x00,0x80
+ };

etc/ediff-help.xpm

+/* XPM */
+static char *help[] = {
+/* width height num_colors chars_per_pixel */
+"    15    15        3            1",
+/* colors */
+". c #000000",
+"b c Gray75 s backgroundToolBarColor",
+"c c #ffff00",
+/* pixels */
+"bbbbbbbbbbbbbbb",
+"bbbb......bbbbb",
+"bbb.ccccc..bbbb",
+"bb.cc...cc..bbb",
+"bb.c..bb.c..bbb",
+"bb.c..b.cc..bbb",
+"bbb..b.cc..bbbb",
+"bbbbb.cc..bbbbb",
+"bbbbb.c..bbbbbb",
+"bbbbb.c..bbbbbb",
+"bbbbbb..bbbbbbb",
+"bbbbb.cc..bbbbb",
+"bbbbb.cc..bbbbb",
+"bbbbbb...bbbbbb",
+"bbbbbbbbbbbbbbb"
+"bbbbbbbbbbbbbbb"
+};

etc/ediff-next.xbm

+#define ediff-next_width 15
+#define ediff-next_height 15
+static char ediff-next_bits[] = {
+ 0x00,0x80,0x80,0x80,0x80,0x83,0x80,0x82,0xfe,0x8c,0x02,0x8a,0xfa,0xb7,0xfa,
+ 0xbf,0xfa,0x9f,0xfe,0x8f,0xfe,0x87,0x80,0x83,0x80,0x81,0x80,0x80,0x00,0x80
+ };

etc/ediff-next.xpm

+/* XPM */
+static char * file[] = {
+/* width height num_colors chars_per_pixel */
+"15 15 5 1",
+" 	c Gray75 s backgroundToolBarColor",
+".	c black",
+"X	c white",
+"o	c black",
+"O	c black",
+"               ",
+"       .       ",
+"       ..      ",
+"       .X.     ",
+" .......XX.    ",
+" .XXXXXXXoX.   ",
+" .XooooooooX.  ",
+" .Xoooooooooo. ",
+" .XooooooooO.  ",
+" .oOOOOOOoO.   ",
+" .......OO.    ",
+"       .O.     ",
+"       ..      ",
+"       .       ",
+"               ",
+};

etc/ediff-prev.xbm

+#define ediff-prev_width 15
+#define ediff-prev_height 15
+static char ediff-prev_bits[] = {
+ 0x00,0x80,0x00,0x81,0x80,0x81,0x40,0x81,0x20,0xbf,0x50,0xa0,0xe8,0xaf,0xfc,
+ 0xaf,0xf8,0xaf,0xf0,0xbf,0xe0,0xbf,0xc0,0x81,0x80,0x81,0x00,0x81,0x00,0x80
+ };

etc/ediff-prev.xpm

+/* XPM */
+static char * left-arrow_xpm[] = {
+/* width height num_colors chars_per_pixel */
+"15 15 3 1",
+" 	c Gray75 s backgroundToolBarColor",
+".	c black",
+"X	c white",
+"               ",
+"        .      ",
+"       ..      ",
+"      .X.      ",
+"     .XX...... ",
+"    .X.XXXXXX. ",
+"   .X.......X. ",
+"  ..........X. ",
+"   .........X. ",
+"    .......... ",
+"     ......... ",
+"      ...      ",
+"       ..      ",
+"        .      ",
+"               ",
+};

etc/ediff-quit.xbm

+#define ediff-quit_width 15
+#define ediff-quit_height 15
+static char ediff-quit_bits[] = {
+ 0x00,0x80,0x06,0xb0,0x1e,0x98,0x3c,0x8c,0x70,0x82,0xe0,0x83,0xc0,0x81,0xe0,
+ 0x83,0x70,0x86,0x38,0x8c,0x1c,0x88,0x1c,0x90,0x08,0x80,0x00,0x80,0x00,0x80
+ };

etc/ediff-quit.xpm

+/* XPM */
+static char *delete[] = {
+/* width height num_colors chars_per_pixel */
+"    15    15        4            1",
+/* colors */
+". c #808080",
+"# c #800000",
+"a c #ffffff",
+"b c #c0c0c0",
+/* pixels */
+"bbbbbbbbbbbbbbb",
+"b##abbbbbbbb##a",
+"b####abbbbb##ab",
+"bb####abbb##abb",
+"bbbb###ab#abbbb",
+"bbbbb#####abbbb",
+"bbbbbb###abbbbb",
+"bbbbb#####abbbb",
+"bbbb###ab##abbb",
+"bbb###abbb##abb",
+"bb###abbbbb#abb",
+"bb###abbbbbb#ab",
+"bbb#abbbbbbbbbb",
+"bbb#abbbbbbbbbb",
+"bbbbbbbbbbbbbbb",
+};

etc/ediff-refine.xbm

+#define ediff-refine_width 15
+#define ediff-refine_height 15
+static char ediff-refine_bits[] = {
+ 0x00,0x80,0x80,0x80,0x84,0x90,0x8c,0x98,0x98,0x8c,0xf0,0x87,0xe0,0x83,0xe0,
+ 0x83,0xe0,0x83,0xf0,0x87,0x98,0x8c,0x8c,0x98,0x84,0x90,0x80,0x80,0x00,0x80
+ };

etc/ediff-refine.xpm

+/* XPM */
+static char *help[] = {
+/* width height num_colors chars_per_pixel */
+"    15    15        2           1",
+/* colors */
+"# c #000000",
+"a c Gray75 s backgroundToolBarColor",
+/* pixels */
+"aaaaaaaaaaaaaaa",
+"aaaaaaa#aaaaaaa",
+"aa#aaaa#aaaa#aa",
+"aa##aaa#aaa##aa",
+"aaa##aa#aa##aaa",
+"aaaa#######aaaa",
+"aaaaa#####aaaaa",
+"aaaaa#####aaaaa",
+"aaaaa#####aaaaa",
+"aaaa#######aaaa",
+"aaa##aa#aa##aaa",
+"aa##aaa#aaa##aa",
+"aa#aaaa#aaaa#aa",
+"aaaaaaa#aaaaaaa",
+"aaaaaaaaaaaaaaa",
+};

etc/ediff-save-xx.xbm

+#define disk-xx_width 15
+#define disk-xx_height 15
+static char disk-xx_bits[] = {
+ 0x00,0x00,0x0a,0x28,0x00,0x00,0x0a,0x28,0x00,0x00,0x0a,0x28,0x00,0x00,0xfa,
+ 0x2f,0x00,0x00,0x02,0x20,0x00,0x00,0x0a,0x29,0x00,0x00,0xf8,0x3f,0x00,0x00
+ };

etc/ediff-save-xx.xpm

+/* XPM */
+static char * disk[] = {
+"15 15 5 1",
+"X	c Gray75 s backgroundToolBarColor",
+"o	c Gray60",
+"O	c Gray60",
+"+	c Gray90",
+"@	c Gray40",
+"XXXXXXXXXXXXXXX",
+"XXXXXXXXXXXXXXX",
+"XoooooooooooooX",
+"XoOo+++++++oOoX",
+"XoOo+++++++oOoX",
+"XoOo+++++++oOoX",
+"XoOo+++++++oOoX",
+"XoOoooooooooOoX",
+"XoOOOOOOOOOOOoX",
+"XoOoooooooooOoX",
+"XoOo@@@@o++oOoX",
+"XoOo@@@@o++oOoX",
+"XoOo@@@@o++oOoX",
+"XXooooooooooooX",
+"XXXXXXXXXXXXXXX",
+"XXXXXXXXXXXXXXX"
+};

etc/ediff-save.xbm

+#define disk-up_width 15
+#define disk-up_height 15
+static char disk-up_bits[] = {
+ 0x00,0x00,0xfe,0x3f,0x0a,0x28,0x0a,0x28,0x0a,0x38,0x0a,0x28,0x0a,0x28,0xfa,
+ 0x2f,0x02,0x20,0xfa,0x2f,0x0a,0x29,0x0a,0x29,0x0c,0x29,0xf8,0x3f,0x00,0x00
+ };

etc/ediff-save.xpm

+/* XPM */
+static char * disk[] = {
+"15 15 5 1",
+"X	c Gray75 s backgroundToolBarColor",
+"o	c black",
+"O	c Gray60",
+"+	c Gray90",
+"@	c Gray40",
+"XXXXXXXXXXXXXXX",
+"XXXXXXXXXXXXXXX",
+"XoooooooooooooX",
+"XoOo+++++++oOoX",
+"XoOo+++++++oOoX",
+"XoOo+++++++oOoX",
+"XoOo+++++++oOoX",
+"XoOoooooooooOoX",
+"XoOOOOOOOOOOOoX",
+"XoOoooooooooOoX",
+"XoOo@@@@o++oOoX",
+"XoOo@@@@o++oOoX",
+"XoOo@@@@o++oOoX",
+"XXooooooooooooX",
+"XXXXXXXXXXXXXXX",
+"XXXXXXXXXXXXXXX"
+};

etc/ediff-toggle-split-up.xbm

+#define ediff-toggle-split-up_width 15
+#define ediff-toggle-split-up_height 15
+static char ediff-toggle-split-up_bits[] = {
+ 0x00,0x80,0xfe,0x87,0xfe,0x87,0x00,0x80,0x00,0xb0,0x7e,0xb0,0x1e,0xb0,0x1e,
+ 0xb0,0x3e,0xb2,0x72,0xb3,0xe2,0xb3,0xc0,0xb3,0xc0,0xb3,0xf0,0xb7,0x00,0x80
+ };

etc/ediff-toggle-split-up.xpm

+/* XPM */
+static char *ediff-toggle-split-up[] = {
+/* width height num_colors chars_per_pixel */
+"    15    15        3            1",
+/* colors */
+"# c #000000",
+"a c firebrick",
+"f c Gray75 s backgroundToolBarColor",
+/* pixels */
+"fffffffffffffff",
+"faaaaaaaaaaffff",
+"faaaaaaaaaaffff",
+"fffffffffffffff",
+"ffffffffffffaaf",
+"f######fffffaaf",
+"f####fffffffaaf",
+"f####fffffffaaf",
+"f#####fff#ffaaf",
+"f#ff###ff#ffaaf",
+"f#fff#####ffaaf",
+"ffffff####ffaaf",
+"ffffff####ffaaf",
+"ffff######ffaaf",
+"fffffffffffffff",
+};

etc/ediff-update.xbm

+#define ediff-update_width 15
+#define ediff-update_height 15
+static char ediff-update_bits[] = {
+ 0x00,0x80,0x78,0x80,0xcc,0x99,0x04,0x9b,0x04,0x9c,0x04,0x9e,0x0c,0x9f,0x00,
+ 0x80,0x7c,0x98,0x3c,0x90,0x1c,0x90,0x6c,0x90,0xcc,0x99,0x00,0x8f,0x00,0x80
+ };

etc/ediff-update.xpm

+/* XPM */
+static char *update[] = {
+/* width height num_colors chars_per_pixel */
+"    15    15        3            1",
+/* colors */
+". c #000000",
+"a c #000080",
+"c c Gray75 s backgroundToolBarColor",
+/* pixels */
+"ccccccccccccccc",
+"ccc.aaacccccccc",
+"cc.acccaacccacc",
+"ccaccccccacaacc",
+"ccacccccccaaacc",
+"ccaccccccaaaacc",
+"cc.accccaaaaacc",
+"ccccccccccccccc",
+"ccaaaaacccca.cc",
+"ccaaaaccccccacc",
+"ccaaacccccccacc",
+"ccaacaccccccacc",
+"ccacccaaccca.cc",
+"ccccccccaaa.ccc",
+"ccccccccccccccc",
+};