|
@@ -1,9 +1,13 @@
|
|
|
-#!/usr/bin/zsh
|
|
|
+#!/bin/zsh
|
|
|
+# ediff-script, my-init.org
|
|
|
+executablename `which $0`
|
|
|
+programname=`basename ${executablename}`
|
|
|
|
|
|
-progname=`basename $0`
|
|
|
-
|
|
|
-if [ $# -eq 0 ] ; then
|
|
|
- echo "Usage: $progname file-1 file-2"
|
|
|
+if [ $# -eq 0 ] ;
|
|
|
+then
|
|
|
+ echo "Usage ${programname} file-a file-b"
|
|
|
+ exit
|
|
|
fi
|
|
|
|
|
|
-emacsclient -diff ${1} ${2}
|
|
|
+emacsclient -c --eval "(ediff-files \"${1}\" \"${2}\")"
|
|
|
+# ediff-script ends here
|