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.el28
1 files changed, 14 insertions, 14 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index c55b69e33ec..654a0d3aea7 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -342,7 +342,7 @@ It returns a file name which can be used directly as argument of
342 (substitute-key-definition 'complete-symbol 'completion-at-point 342 (substitute-key-definition 'complete-symbol 'completion-at-point
343 map global-map) 343 map global-map)
344 (easy-menu-define python-menu map "Python Mode menu" 344 (easy-menu-define python-menu map "Python Mode menu"
345 `("Python" 345 '("Python"
346 :help "Python-specific Features" 346 :help "Python-specific Features"
347 ["Shift region left" python-indent-shift-left :active mark-active 347 ["Shift region left" python-indent-shift-left :active mark-active
348 :help "Shift region left by a single indentation step"] 348 :help "Shift region left by a single indentation step"]
@@ -469,13 +469,13 @@ This variant of `rx' supports common Python named REGEXPS."
469(eval-and-compile 469(eval-and-compile
470 (defun python-syntax--context-compiler-macro (form type &optional syntax-ppss) 470 (defun python-syntax--context-compiler-macro (form type &optional syntax-ppss)
471 (pcase type 471 (pcase type
472 (`'comment 472 (''comment
473 `(let ((ppss (or ,syntax-ppss (syntax-ppss)))) 473 `(let ((ppss (or ,syntax-ppss (syntax-ppss))))
474 (and (nth 4 ppss) (nth 8 ppss)))) 474 (and (nth 4 ppss) (nth 8 ppss))))
475 (`'string 475 (''string
476 `(let ((ppss (or ,syntax-ppss (syntax-ppss)))) 476 `(let ((ppss (or ,syntax-ppss (syntax-ppss))))
477 (and (nth 3 ppss) (nth 8 ppss)))) 477 (and (nth 3 ppss) (nth 8 ppss))))
478 (`'paren 478 (''paren
479 `(nth 1 (or ,syntax-ppss (syntax-ppss)))) 479 `(nth 1 (or ,syntax-ppss (syntax-ppss))))
480 (_ form)))) 480 (_ form))))
481 481
@@ -486,9 +486,9 @@ character address of the specified TYPE."
486 (declare (compiler-macro python-syntax--context-compiler-macro)) 486 (declare (compiler-macro python-syntax--context-compiler-macro))
487 (let ((ppss (or syntax-ppss (syntax-ppss)))) 487 (let ((ppss (or syntax-ppss (syntax-ppss))))
488 (pcase type 488 (pcase type
489 (`comment (and (nth 4 ppss) (nth 8 ppss))) 489 ('comment (and (nth 4 ppss) (nth 8 ppss)))
490 (`string (and (nth 3 ppss) (nth 8 ppss))) 490 ('string (and (nth 3 ppss) (nth 8 ppss)))
491 (`paren (nth 1 ppss)) 491 ('paren (nth 1 ppss))
492 (_ nil)))) 492 (_ nil))))
493 493
494(defun python-syntax-context-type (&optional syntax-ppss) 494(defun python-syntax-context-type (&optional syntax-ppss)
@@ -4015,11 +4015,11 @@ JUSTIFY should be used (if applicable) as in `fill-paragraph'."
4015 ;; is NIL means to not add any newlines for start or end 4015 ;; is NIL means to not add any newlines for start or end
4016 ;; of docstring. See `python-fill-docstring-style' for a 4016 ;; of docstring. See `python-fill-docstring-style' for a
4017 ;; graphic idea of each style. 4017 ;; graphic idea of each style.
4018 (`django (cons 1 1)) 4018 ('django (cons 1 1))
4019 (`onetwo (and multi-line-p (cons 1 2))) 4019 ('onetwo (and multi-line-p (cons 1 2)))
4020 (`pep-257 (and multi-line-p (cons nil 2))) 4020 ('pep-257 (and multi-line-p (cons nil 2)))
4021 (`pep-257-nn (and multi-line-p (cons nil 1))) 4021 ('pep-257-nn (and multi-line-p (cons nil 1)))
4022 (`symmetric (and multi-line-p (cons 1 1))))) 4022 ('symmetric (and multi-line-p (cons 1 1)))))
4023 (fill-paragraph-function)) 4023 (fill-paragraph-function))
4024 (save-restriction 4024 (save-restriction
4025 (narrow-to-region str-start-pos str-end-pos) 4025 (narrow-to-region str-start-pos str-end-pos)
@@ -5252,7 +5252,7 @@ configuration could be:
5252By default messages are considered errors." 5252By default messages are considered errors."
5253 :version "26.1" 5253 :version "26.1"
5254 :group 'python-flymake 5254 :group 'python-flymake
5255 :type `(alist :key-type (regexp) 5255 :type '(alist :key-type (regexp)
5256 :value-type (symbol))) 5256 :value-type (symbol)))
5257 5257
5258(defvar-local python--flymake-proc nil) 5258(defvar-local python--flymake-proc nil)
@@ -5414,7 +5414,7 @@ REPORT-FN is Flymake's callback function."
5414 5414
5415 (add-to-list 5415 (add-to-list
5416 'hs-special-modes-alist 5416 'hs-special-modes-alist
5417 `(python-mode 5417 '(python-mode
5418 "\\s-*\\_<\\(?:def\\|class\\)\\_>" 5418 "\\s-*\\_<\\(?:def\\|class\\)\\_>"
5419 ;; Use the empty string as end regexp so it doesn't default to 5419 ;; Use the empty string as end regexp so it doesn't default to
5420 ;; "\\s)". This way parens at end of defun are properly hidden. 5420 ;; "\\s)". This way parens at end of defun are properly hidden.