summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2016-01-08 15:19:12 -0700
committerSean Whitton <spwhitton@spwhitton.name>2016-01-08 15:20:35 -0700
commitc381c227de7f17a21461a330bcfed09a7144f6e7 (patch)
treea64b8b356888a736a65dda2ee58d4b523bb040be /debian/patches
parentae5638215180d2f3d5915d10215168084699ebf7 (diff)
d/patches: fix emacs-helm.sh
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/0004-patch-emacs-helm-sh.patch28
-rw-r--r--debian/patches/series1
2 files changed, 29 insertions, 0 deletions
diff --git a/debian/patches/0004-patch-emacs-helm-sh.patch b/debian/patches/0004-patch-emacs-helm-sh.patch
new file mode 100644
index 00000000..b9a6ee61
--- /dev/null
+++ b/debian/patches/0004-patch-emacs-helm-sh.patch
@@ -0,0 +1,28 @@
+From: Sean Whitton <spwhitton@spwhitton.name>
+Date: Fri, 8 Jan 2016 15:11:56 -0700
+Subject: patch-emacs-helm-sh
+
+---
+ emacs-helm.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/emacs-helm.sh b/emacs-helm.sh
+index a593813..e820dcd 100755
+--- a/emacs-helm.sh
++++ b/emacs-helm.sh
+@@ -40,7 +40,7 @@ case $1 in
+ ;;
+ esac
+
+-cd $(dirname "$0")
++cd /usr/share/emacs/site-lisp/elpa-src/helm-1* # avoid matching helm-core
+
+ # Check if autoload file exists.
+ # It is maybe in a different directory if
+@@ -97,5 +97,5 @@ cat > $CONF_FILE <<EOF
+ (add-hook 'kill-emacs-hook #'(lambda () (and (file-exists-p "$CONF_FILE") (delete-file "$CONF_FILE"))))
+ EOF
+
+-$EMACS -Q -l $CONF_FILE $@
++$EMACS -Q -L /usr/share/emacs/site-lisp/elpa-src/helm-1* -L /usr/share/emacs/site-lisp/elpa-src/helm-core-* -l $CONF_FILE $@
+
diff --git a/debian/patches/series b/debian/patches/series
index 536e2fe3..b9d4c478 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
0001-dummy-upstream-changelog.patch
0002-delete-Makefile.patch
0003-decruft-README.patch
+0004-patch-emacs-helm-sh.patch