pyrox.dev
emacsWithPackages: fix logic of adding EMACSNATIVELOADPATH
Without this change, EMACSNATIVELOADPATH will not be added if
EMACSLOADPATH is added.
authored by Lin Jian and committed by Anderson Torres d3807843 a12258c4
+6
-5
pkgs/build-support/emacs/wrapper.sh
+6
-5
pkgs/build-support/emacs/wrapper.sh
···
4
5
newLoadPath=()
6
newNativeLoadPath=()
7
-
added=
8
9
if [[ -n $EMACSLOADPATH ]]
10
then
11
while read -rd: entry
12
do
13
-
if [[ -z $entry && -z $added ]]
14
then
15
newLoadPath+=(@wrapperSiteLisp@)
16
-
added=1
17
fi
18
newLoadPath+=("$entry")
19
done <<< "$EMACSLOADPATH:"
···
26
then
27
while read -rd: entry
28
do
29
-
if [[ -z $entry && -z $added ]]
30
then
31
newNativeLoadPath+=(@wrapperSiteLispNative@)
32
-
added=1
33
fi
34
newNativeLoadPath+=("$entry")
35
done <<< "$EMACSNATIVELOADPATH:"
···
4
5
newLoadPath=()
6
newNativeLoadPath=()
7
+
addedNewLoadPath=
8
+
addedNewNativeLoadPath=
9
10
if [[ -n $EMACSLOADPATH ]]
11
then
12
while read -rd: entry
13
do
14
+
if [[ -z $entry && -z $addedNewLoadPath ]]
15
then
16
newLoadPath+=(@wrapperSiteLisp@)
17
+
addedNewLoadPath=1
18
fi
19
newLoadPath+=("$entry")
20
done <<< "$EMACSLOADPATH:"
···
27
then
28
while read -rd: entry
29
do
30
+
if [[ -z $entry && -z $addedNewNativeLoadPath ]]
31
then
32
newNativeLoadPath+=(@wrapperSiteLispNative@)
33
+
addedNewNativeLoadPath=1
34
fi
35
newNativeLoadPath+=("$entry")
36
done <<< "$EMACSNATIVELOADPATH:"