Package: helm / 3.0-1

0004-patch-emacs-helm-sh.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Sat, 6 Feb 2016 11:17:39 -0700
Subject: patch emacs-helm.sh for Debian

---
 emacs-helm.sh | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/emacs-helm.sh b/emacs-helm.sh
index 2f688ee..bcfd4a6 100755
--- a/emacs-helm.sh
+++ b/emacs-helm.sh
@@ -41,22 +41,6 @@ esac
 
 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\
@@ -79,17 +63,10 @@ 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)))))
 
 (setq package-load-list '((helm-core t) (helm t) (async t) (popup t)))
 (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")
 (setq default-frame-alist '((vertical-scroll-bars . nil)
                             (tool-bar-lines . 0)
                             (menu-bar-lines . 0)