From dfb98e5fd1e8bac2e948c2ee95966d139d5bddaa Mon Sep 17 00:00:00 2001 From: Robert Zaremba Date: Sat, 8 Sep 2012 17:28:59 +0200 Subject: [PATCH 1/2] Setting environment variables for make task Made visable environment variables: PYTHON, EMACS, for make task based on values in Makefile header. This is usefull take default values based on the ones in Makefile. Previously if we modyfied Makefile PYTHON value the check task perform check agains PYTHON vale, but prepare didn't. --- Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 726de0f..9aa7187 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,8 @@ install: prepare $(PYSETUP) install prepare: - $(PPPP) Pymacs.py.in pppp.rst.in pymacs.el.in pymacs.rst.in contrib tests + EMACS="$(EMACS)" PYTHON="$(PYTHON)" \ + $(PPPP) Pymacs.py.in pppp.rst.in pymacs.el.in pymacs.rst.in contrib tests clean: clean-debug rm -rf build* contrib/rebox/build @@ -34,7 +35,8 @@ clean-debug: rm -f tests/debug-protocol tests/debug-signals pppp.pdf: pppp.rst.in - $(PPPP) pppp.rst.in + EMACS="$(EMACS)" PYTHON="$(PYTHON)" \ + $(PPPP) pppp.rst.in rm -rf tmp-pdf mkdir tmp-pdf $(RST2LATEX) --use-latex-toc --input-encoding=UTF-8 \ @@ -45,7 +47,8 @@ pppp.pdf: pppp.rst.in rm -rf tmp-pdf pymacs.pdf: pymacs.rst.in - $(PPPP) pymacs.rst.in + EMACS="$(EMACS)" PYTHON="$(PYTHON)" \ + $(PPPP) pymacs.rst.in rm -rf tmp-pdf mkdir tmp-pdf $(RST2LATEX) --use-latex-toc --input-encoding=UTF-8 \ From 94f55f4655bfb724bd331b0f7d90719553438b06 Mon Sep 17 00:00:00 2001 From: Robert Zaremba Date: Fri, 15 Mar 2013 14:59:24 +0100 Subject: [PATCH 2/2] chagene pymacs-timeout-at-start In the new version of Emacs (and probably python-mode) this value makes error: *Pymacs helper did not start within 30 seconds* Incrementing it prohibits this error and makes loading pymacs seamless --- pymacs.el.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pymacs.el.in b/pymacs.el.in index 44ac9db..139533d 100644 --- a/pymacs.el.in +++ b/pymacs.el.in @@ -118,7 +118,7 @@ When this variable is nil, strings are transmitted as copies, and the Python side thus has no way for modifying the original Lisp strings. This variable is ignored whenever `forget-mutability' is set.") -(defvar pymacs-timeout-at-start 30 +(defvar pymacs-timeout-at-start 60 "Maximum reasonable time, in seconds, for starting the Pymacs helper. A machine should be pretty loaded before one needs to increment this.")