summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2015-11-01 02:55:16 +0100
committerJuanma Barranquero <lekktu@gmail.com>2015-11-01 02:55:16 +0100
commit590a820fd9a7a0ab92b4b2927d4ca4a3582af528 (patch)
treec4f7e4d7c1dee1a99c4914d1d9b5529d576b8419
parent92780954424c7c2e815b2234cb0b23064119a172 (diff)
Fix bug#21762
* lisp/progmodes/python.el (python-syntax-closing-paren-p): Check with `eql' instead of `=' to accommodate the case that (syntax-after (point)) returns nil. * test/automated/python-tests.el (python-indent-inside-paren-7): New test.
-rw-r--r--lisp/progmodes/python.el4
-rw-r--r--test/automated/python-tests.el8
2 files changed, 10 insertions, 2 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 6ff12b5497..b6f7da6575 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -490,8 +490,8 @@ The type returned can be `comment', `string' or `paren'."
(defsubst python-syntax-closing-paren-p ()
"Return non-nil if char after point is a closing paren."
- (= (syntax-class (syntax-after (point)))
- (syntax-class (string-to-syntax ")"))))
+ (eql (syntax-class (syntax-after (point)))
+ (syntax-class (string-to-syntax ")"))))
(define-obsolete-function-alias
'python-info-ppss-context #'python-syntax-context "24.3")
diff --git a/test/automated/python-tests.el b/test/automated/python-tests.el
index f930ffba30..9da6807c14 100644
--- a/test/automated/python-tests.el
+++ b/test/automated/python-tests.el
@@ -563,6 +563,14 @@ CHOICES = (('some', 'choice'),
(should (eq (car (python-indent-context)) :inside-paren))
(should (= (python-indent-calculate-indentation) 11))))
+(ert-deftest python-indent-inside-paren-7 ()
+ "Test for Bug#21762."
+ (python-tests-with-temp-buffer
+ "import re as myre\nvar = [\n"
+ (goto-char (point-max))
+ ;; This signals an error if the test fails
+ (should (eq (car (python-indent-context)) :inside-paren-newline-start))))
+
(ert-deftest python-indent-after-block-1 ()
"The most simple after-block case that shouldn't fail."
(python-tests-with-temp-buffer