aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes/python.el
diff options
context:
space:
mode:
authorRoss Donaldson2017-12-25 12:51:19 -0800
committerNoam Postavsky2018-01-01 11:16:00 -0500
commitc59ecb005e560420d927ad7884c9030ba15319a4 (patch)
treea3cbff6c48e362e44da3e91ee00f9ab261020866 /lisp/progmodes/python.el
parent4e20c8f22031d6f19e70f0dfcb11c09606446d88 (diff)
downloademacs-c59ecb005e560420d927ad7884c9030ba15319a4.tar.gz
emacs-c59ecb005e560420d927ad7884c9030ba15319a4.zip
New customization variable for python-mode indentation (Bug#28475)
* lisp/progmodes/python.el (python-indent-def-block-scale): New variable. (python-indent--calculate-indentation): Let it control how many indent levels are inserted for multi-line function signatures. Copyright-paperwork-exempt: yes
Diffstat (limited to 'lisp/progmodes/python.el')
-rw-r--r--lisp/progmodes/python.el10
1 files changed, 8 insertions, 2 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 68926b275ea..5baf6e0f80a 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -752,6 +752,12 @@ It makes underscores and dots word constituent chars.")
752 :type '(repeat symbol) 752 :type '(repeat symbol)
753 :group 'python) 753 :group 'python)
754 754
755(defcustom python-indent-def-block-scale 2
756 "Multiplier applied to indentation inside multi-line def blocks."
757 :version "26.1"
758 :type 'integer
759 :safe 'natnump)
760
755(defvar python-indent-current-level 0 761(defvar python-indent-current-level 0
756 "Deprecated var available for compatibility.") 762 "Deprecated var available for compatibility.")
757 763
@@ -1071,9 +1077,9 @@ possibilities can be narrowed to specific indentation points."
1071 (current-indentation))) 1077 (current-indentation)))
1072 opening-block-start-points)))) 1078 opening-block-start-points))))
1073 (`(,(or :inside-paren-newline-start-from-block) . ,start) 1079 (`(,(or :inside-paren-newline-start-from-block) . ,start)
1074 ;; Add two indentation levels to make the suite stand out.
1075 (goto-char start) 1080 (goto-char start)
1076 (+ (current-indentation) (* python-indent-offset 2)))))) 1081 (+ (current-indentation)
1082 (* python-indent-offset python-indent-def-block-scale))))))
1077 1083
1078(defun python-indent--calculate-levels (indentation) 1084(defun python-indent--calculate-levels (indentation)
1079 "Calculate levels list given INDENTATION. 1085 "Calculate levels list given INDENTATION.