aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes/python.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/progmodes/python.el')
-rw-r--r--lisp/progmodes/python.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 9cd9cc8b7c0..be96ac32a01 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2436,7 +2436,7 @@ banner and the initial prompt are received separately."
2436(defun python-shell-comint-end-of-output-p (output) 2436(defun python-shell-comint-end-of-output-p (output)
2437 "Return non-nil if OUTPUT is ends with input prompt." 2437 "Return non-nil if OUTPUT is ends with input prompt."
2438 (string-match 2438 (string-match
2439 ;; XXX: It seems on OSX an extra carriage return is attached 2439 ;; XXX: It seems on macOS an extra carriage return is attached
2440 ;; at the end of output, this handles that too. 2440 ;; at the end of output, this handles that too.
2441 (concat 2441 (concat
2442 "\r?\n?" 2442 "\r?\n?"
@@ -5170,7 +5170,7 @@ returned as is."
5170 (add-to-list 5170 (add-to-list
5171 'hs-special-modes-alist 5171 'hs-special-modes-alist
5172 `(python-mode 5172 `(python-mode
5173 "\\s-*\\(?:def\\|class\\)\\>" 5173 "\\s-*\\_<\\(?:def\\|class\\)\\_>"
5174 ;; Use the empty string as end regexp so it doesn't default to 5174 ;; Use the empty string as end regexp so it doesn't default to
5175 ;; "\\s)". This way parens at end of defun are properly hidden. 5175 ;; "\\s)". This way parens at end of defun are properly hidden.
5176 "" 5176 ""