Fredrik Fornwall
7 years ago
5 changed files with 14 additions and 58 deletions
@ -1,13 +0,0 @@ |
|||
diff -u -r ../emacs-25.0.92/lisp/loadup.el ./lisp/loadup.el |
|||
--- ../emacs-25.0.92/lisp/loadup.el 2016-03-02 05:21:42.000000000 -0500 |
|||
+++ ./lisp/loadup.el 2016-03-31 18:41:25.609790054 -0400 |
|||
@@ -69,7 +73,8 @@ |
|||
|
|||
;; Prevent build-time PATH getting stored in the binary. |
|||
;; Mainly cosmetic, but helpful for Guix. (Bug#20330) |
|||
-(setq exec-path nil) |
|||
+;; Termux patch: Keep exec-path when running undumped: |
|||
+;; (setq exec-path nil) |
|||
|
|||
(if (eq t purify-flag) |
|||
;; Hash consing saved around 11% of pure space in my tests. |
@ -1,12 +1,12 @@ |
|||
diff -u -r ../emacs-25.0.95/lisp/net/tramp.el ./lisp/net/tramp.el |
|||
--- ../emacs-25.0.95/lisp/net/tramp.el 2016-05-17 12:16:28.000000000 -0400 |
|||
+++ ./lisp/net/tramp.el 2016-08-21 09:48:00.190856327 -0400 |
|||
@@ -156,7 +156,7 @@ |
|||
diff -u -r ../emacs-26.1/lisp/net/tramp.el ./lisp/net/tramp.el |
|||
--- ../emacs-26.1/lisp/net/tramp.el 2018-04-23 14:17:48.000000000 +0000 |
|||
+++ ./lisp/net/tramp.el 2018-05-29 09:26:34.017326913 +0000 |
|||
@@ -127,7 +127,7 @@ |
|||
:require 'tramp) |
|||
|
|||
(defcustom tramp-encoding-shell |
|||
(if (memq system-type '(windows-nt)) |
|||
(getenv "COMSPEC") |
|||
- "/bin/sh") |
|||
+ "@TERMUX_PREFIX@/bin/sh") |
|||
- (or (tramp-compat-funcall 'w32-shell-name) "/bin/sh") |
|||
+ (or (tramp-compat-funcall 'w32-shell-name) "@TERMUX_PREFIX@/bin/sh") |
|||
"Use this program for encoding and decoding commands on the local host. |
|||
This shell is used to execute the encoding and decoding command on the |
|||
local host, so if you want to use `~' in those commands, you should |
|||
|
@ -1,12 +0,0 @@ |
|||
diff -u -r ../emacs-24.3/src/print.c ./src/print.c
|
|||
--- ../emacs-24.3/src/print.c 2013-01-01 21:37:17.000000000 +0100
|
|||
+++ ./src/print.c 2014-02-19 03:24:04.000000000 +0100
|
|||
@@ -733,7 +733,7 @@
|
|||
print_output_debug_flag = x; |
|||
} |
|||
|
|||
-#if defined (GNU_LINUX)
|
|||
+#if defined (GNU_LINUX) && !defined (__ANDROID__)
|
|||
|
|||
/* This functionality is not vitally important in general, so we rely on |
|||
non-portable ability to use stderr as lvalue. */ |
Loading…
Reference in new issue