[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 836168a 1/4: Merge from origin/emacs-26
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] master 836168a 1/4: Merge from origin/emacs-26 |
Date: |
Sat, 9 Dec 2017 04:20:31 -0500 (EST) |
branch: master
commit 836168a65b63fa32f60bbf211e4238bde49e1f01
Merge: 7367ea4 1fdac2d
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>
Merge from origin/emacs-26
1fdac2d65c Don't add newlines in minibuffer history
de68f337e3 modhelp.py: Support Python 3 (Bug#24954)
afb04f7f3c Use forward slashes for python w32 config example (Bug#21656)
---
lisp/progmodes/python.el | 4 ++--
lisp/simple.el | 2 ++
modules/modhelp.py | 24 ++++++++++++------------
3 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 9e09bfc..9d3e428 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -91,9 +91,9 @@
;; is as follows (of course you need to modify the paths according to
;; your system):
-;; (setq python-shell-interpreter "C:\\Python27\\python.exe"
+;; (setq python-shell-interpreter "C:/Python27/python.exe"
;; python-shell-interpreter-args
-;; "-i C:\\Python27\\Scripts\\ipython-script.py")
+;; "-i C:/Python27/Scripts/ipython-script.py")
;; Missing or delayed output used to happen due to differences between
;; Operating Systems' pipe buffering (e.g. CPython 3.3.4 in Windows 7.
diff --git a/lisp/simple.el b/lisp/simple.el
index 24ecf69..03855d5 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2114,6 +2114,8 @@ next element of the minibuffer history in the minibuffer."
(interactive "^p")
(or arg (setq arg 1))
(let* ((old-point (point))
+ ;; Don't add newlines if they have the mode enabled globally.
+ (next-line-add-newlines nil)
;; Remember the original goal column of possibly multi-line input
;; excluding the length of the prompt on the first line.
(prompt-end (minibuffer-prompt-end))
diff --git a/modules/modhelp.py b/modules/modhelp.py
index 78fadda..9f8d306 100755
--- a/modules/modhelp.py
+++ b/modules/modhelp.py
@@ -45,31 +45,31 @@ def cmd_test(args):
failed = []
for m in mods:
- print '[*] %s: ------- start -------' % m
- print '[*] %s: running make' % m
+ print('[*] %s: ------- start -------' % m)
+ print('[*] %s: running make' % m)
r = sp.call(make_cmd, cwd=m)
if r != 0:
- print '[E] %s: make failed' % m
+ print('[E] %s: make failed' % m)
failed += [m]
continue
- print '[*] %s: running test' % m
+ print('[*] %s: running test' % m)
testpath = os.path.join(m, 'test.el')
if os.path.isfile(testpath):
emacs_cmd = [EMACS, '-batch', '-L', '.', '-l', 'ert',
'-l', testpath, '-f', 'ert-run-tests-batch-and-exit']
- print ' '.join(emacs_cmd)
+ print(' '.join(emacs_cmd))
r = sp.call(emacs_cmd)
if r != 0:
- print '[E] %s: test failed' % m
+ print('[E] %s: test failed' % m)
failed += [m]
continue
else:
- print '[W] %s: no test to run' % m
+ print('[W] %s: no test to run' % m)
- print '\n[*] %d/%d MODULES OK' % (len(mods)-len(failed), len(mods))
+ print('\n[*] %d/%d MODULES OK' % (len(mods)-len(failed), len(mods)))
for m in failed:
- print '\tfailed: %s' % m
+ print('\tfailed: %s' % m)
def to_lisp_sym(sym):
sym = re.sub('[_ ]', '-', sym)
@@ -81,7 +81,7 @@ def to_c_sym(sym):
def cmd_init(args):
if os.path.exists(args.module):
- print "%s: file/dir '%s' already exists" % (__file__, args.module)
+ print("%s: file/dir '%s' already exists" % (__file__, args.module))
return
os.mkdir(args.module)
@@ -98,10 +98,10 @@ def cmd_init(args):
if isinstance(path, string.Template):
path = path.substitute(template_vars)
path = os.path.join(args.module, path)
- print "writing %s..." % path
+ print("writing %s..." % path)
with open(path, "w+") as f:
f.write(t.substitute(template_vars))
- print "done! you can run %s test %s" % (__file__, args.module)
+ print("done! you can run %s test %s" % (__file__, args.module))
def main():