From 4d101ad75155722f0f08cd7ff60aaf8d18daf206 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Thu, 28 Apr 2016 09:56:22 -0400 Subject: [PATCH] emacs: Backport patch for resizing during startup --- packages/emacs/build.sh | 1 + .../lisp-window.el.patch.beforehostbuild | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 packages/emacs/lisp-window.el.patch.beforehostbuild diff --git a/packages/emacs/build.sh b/packages/emacs/build.sh index 59bf0d50e..0a8c2faba 100644 --- a/packages/emacs/build.sh +++ b/packages/emacs/build.sh @@ -1,6 +1,7 @@ TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/emacs/ TERMUX_PKG_DESCRIPTION="Extensible, customizable text editor-and more" TERMUX_PKG_VERSION=25.0.93 +TERMUX_PKG_BUILD_REVISION=1 TERMUX_PKG_SRCURL=ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${TERMUX_PKG_VERSION}.tar.xz 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" diff --git a/packages/emacs/lisp-window.el.patch.beforehostbuild b/packages/emacs/lisp-window.el.patch.beforehostbuild new file mode 100644 index 000000000..fc9bc3338 --- /dev/null +++ b/packages/emacs/lisp-window.el.patch.beforehostbuild @@ -0,0 +1,25 @@ +Fix failed startup when resizing. + +From http://debbugs.gnu.org/cgi/bugreport.cgi?bug=23369 +and will hopefully be in the next emacs upstream version. + +diff -u -r ../emacs-25.0.93/lisp/window.el ./lisp/window.el +--- ../emacs-25.0.93/lisp/window.el 2016-04-22 08:17:00.000000000 -0400 ++++ ./lisp/window.el 2016-04-28 08:44:26.318178636 -0400 +@@ -8520,6 +8520,7 @@ + displaying that processes's buffer." + (let ((processes (process-list)) + (process-windows nil)) ++ (when processes + (walk-windows + (lambda (window) + (let ((buffer (window-buffer window)) +@@ -8538,7 +8539,7 @@ + nil) + (setf iter (cdr iter))))))) + 1 t) +- process-windows)) ++ process-windows))) + + (defun window--adjust-process-windows () + "Update process window sizes to match the current window configuration."