procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-26

Browse source 
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)
This commit is contained in:
Michael Albinus 2017-12-09 10:13:02 +01:00
commit 836168a65b
3 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/progmodes/python.el
View file

@ -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.

2
lisp/simple.el
View file

@ -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))

24
modules/modhelp.py
View file

@ -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():