summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2016-02-06 11:17:39 -0700
committerSean Whitton <spwhitton@spwhitton.name>2020-01-15 06:47:43 -0700
commit64ea7d80e54aec428fe1e62812bc6823966c5453 (patch)
tree31e86396c7271c076e8fe801c73f7f46bbb5aee1
parent25cbf47bf64d4c112d3393fdacdf76cbd831f67d (diff)
patch emacs-helm.sh for Debian
Gbp-Pq: Name 0004-patch-emacs-helm-sh.patch
-rwxr-xr-xemacs-helm.sh25
1 files changed, 1 insertions, 24 deletions
diff --git a/emacs-helm.sh b/emacs-helm.sh
index 848a72c6..0e121935 100755
--- a/emacs-helm.sh
+++ b/emacs-helm.sh
@@ -135,22 +135,6 @@ done
LOAD_PATH=$($EMACS -q -batch --eval "(prin1 load-path)")
-cd "${0%/*}" || exit 1
-
-# Check if autoload file exists.
-# It may be in a different directory if emacs-helm.sh is a symlink.
-TRUENAME=$(find . -samefile "$0" -printf "%l")
-if [ ! -z "$TRUENAME" ]; then
- AUTO_FILE="${TRUENAME%/*}/helm-autoloads.el"
-else
- AUTO_FILE="helm-autoloads.el"
-fi
-if [ ! -e "$AUTO_FILE" ]; then
- echo No autoloads found, please run make first to generate autoload file
- exit 1
-fi
-
-
cat > $CONF_FILE <<EOF
(setq initial-scratch-message (concat initial-scratch-message
";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;\\n\
@@ -176,13 +160,6 @@ cat > $CONF_FILE <<EOF
(setq load-path (quote $LOAD_PATH))
(require 'package)
-;; User may be using a non standard \`package-user-dir'.
-;; Modify \`package-directory-list' instead of \`package-user-dir'
-;; in case the user starts Helm from a non-ELPA installation.
-(unless (file-equal-p package-user-dir "~/.emacs.d/elpa")
- (add-to-list 'package-directory-list (directory-file-name
- (file-name-directory
- (directory-file-name default-directory)))))
(let* ((str-lst "$LOAD_PACKAGES")
(load-packages (and str-lst
@@ -195,7 +172,7 @@ cat > $CONF_FILE <<EOF
(mapcar (lambda (p) (list (intern p) t)) load-packages)))))
(package-initialize)
-(add-to-list 'load-path (file-name-directory (file-truename "$0")))
+(add-to-list 'package-directory-list "/usr/share/emacs/site-lisp/elpa-src")
(unless (> $TOOLBARS 0)
(setq default-frame-alist '((vertical-scroll-bars . nil)
(tool-bar-lines . 0)