emacs: Update from 25.0.92 to 25.0.93
This commit is contained in:
parent
e275a95fbb
commit
b3db567c9e
@ -1,7 +1,6 @@
|
|||||||
TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/emacs/
|
TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/emacs/
|
||||||
TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor-and more"
|
TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor-and more"
|
||||||
TERMUX_PKG_VERSION=25.0.92
|
TERMUX_PKG_VERSION=25.0.93
|
||||||
TERMUX_PKG_BUILD_REVISION=7
|
|
||||||
TERMUX_PKG_SRCURL=ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${TERMUX_PKG_VERSION}.tar.xz
|
TERMUX_PKG_SRCURL=ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${TERMUX_PKG_VERSION}.tar.xz
|
||||||
TERMUX_PKG_DEPENDS="ncurses, gnutls, libxml2"
|
TERMUX_PKG_DEPENDS="ncurses, gnutls, libxml2"
|
||||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-x --with-xpm=no --with-jpeg=no --with-png=no --with-gif=no --with-tiff=no --without-gconf --without-gsettings --with-gnutls --with-xml2"
|
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-x --with-xpm=no --with-jpeg=no --with-png=no --with-gif=no --with-tiff=no --without-gconf --without-gsettings --with-gnutls --with-xml2"
|
||||||
|
@ -1,14 +1,6 @@
|
|||||||
diff -u -r ../emacs-25.0.92/lisp/loadup.el ./lisp/loadup.el
|
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
|
--- ../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
|
+++ ./lisp/loadup.el 2016-03-31 18:41:25.609790054 -0400
|
||||||
@@ -1,3 +1,7 @@
|
|
||||||
+;; Termux patch: See
|
|
||||||
+;; https://lists.gnu.org/archive/html/bug-gnu-emacs/2016-03/msg00471.html
|
|
||||||
+(setq-default bidi-display-reordering nil)
|
|
||||||
+
|
|
||||||
;;; loadup.el --- load up standardly loaded Lisp files for Emacs
|
|
||||||
|
|
||||||
;; Copyright (C) 1985-1986, 1992, 1994, 2001-2016 Free Software
|
|
||||||
@@ -69,7 +73,8 @@
|
@@ -69,7 +73,8 @@
|
||||||
|
|
||||||
;; Prevent build-time PATH getting stored in the binary.
|
;; Prevent build-time PATH getting stored in the binary.
|
||||||
@ -19,24 +11,3 @@ diff -u -r ../emacs-25.0.92/lisp/loadup.el ./lisp/loadup.el
|
|||||||
|
|
||||||
(if (eq t purify-flag)
|
(if (eq t purify-flag)
|
||||||
;; Hash consing saved around 11% of pure space in my tests.
|
;; Hash consing saved around 11% of pure space in my tests.
|
||||||
@@ -110,6 +115,12 @@
|
|
||||||
(load "format")
|
|
||||||
(load "bindings")
|
|
||||||
(load "window") ; Needed here for `replace-buffer-in-windows'.
|
|
||||||
+;; Termux patch: See
|
|
||||||
+;; https://lists.gnu.org/archive/html/bug-gnu-emacs/2016-03/msg00679.html
|
|
||||||
+;; We are now capable of resizing the mini-windows, so give the
|
|
||||||
+;; variable its advertised default value (it starts as nil, see
|
|
||||||
+;; xdisp.c).
|
|
||||||
+(setq resize-mini-windows 'grow-only)
|
|
||||||
(setq load-source-file-function 'load-with-code-conversion)
|
|
||||||
(load "files")
|
|
||||||
|
|
||||||
@@ -465,3 +476,7 @@
|
|
||||||
;; End:
|
|
||||||
|
|
||||||
;;; loadup.el ends here
|
|
||||||
+
|
|
||||||
+;; Termux patch: See
|
|
||||||
+;; https://lists.gnu.org/archive/html/bug-gnu-emacs/2016-03/msg00471.html
|
|
||||||
+(setq-default bidi-display-reordering t)
|
|
||||||
|
@ -1,21 +0,0 @@
|
|||||||
See https://lists.gnu.org/archive/html/bug-gnu-emacs/2016-03/msg00679.html
|
|
||||||
|
|
||||||
The other part of that patch is in lisp-loadup.el.patch
|
|
||||||
|
|
||||||
diff -u -r ../emacs-25.0.92/src/xdisp.c ./src/xdisp.c
|
|
||||||
--- ../emacs-25.0.92/src/xdisp.c 2016-03-02 05:21:43.000000000 -0500
|
|
||||||
+++ ./src/xdisp.c 2016-03-25 21:25:36.960819633 -0400
|
|
||||||
@@ -31598,7 +31598,12 @@
|
|
||||||
A value of `grow-only', the default, means let mini-windows grow only;
|
|
||||||
they return to their normal size when the minibuffer is closed, or the
|
|
||||||
echo area becomes empty. */);
|
|
||||||
- Vresize_mini_windows = Qgrow_only;
|
|
||||||
+ /* Contrary to the doc string, we initialize this to nil, so that
|
|
||||||
+ loading loadup.el won't try to resize windows before loading
|
|
||||||
+ window.el, where some functions we need to call for this live.
|
|
||||||
+ We assign the 'grow-only' value right after loading window.el
|
|
||||||
+ during loadup. */
|
|
||||||
+ Vresize_mini_windows = Qnil;
|
|
||||||
|
|
||||||
DEFVAR_LISP ("blink-cursor-alist", Vblink_cursor_alist,
|
|
||||||
doc: /* Alist specifying how to blink the cursor off.
|
|
Loading…
Reference in New Issue
Block a user