diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/progmodes/python.el | 4 | ||||
| -rw-r--r-- | lisp/simple.el | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 9e09bfc5941..9d3e428e23c 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 24ecf6929d9..03855d5f2b0 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)) |