aboutsummaryrefslogtreecommitdiffstats
path: root/test/lisp/progmodes/python-tests.el
diff options
context:
space:
mode:
authorAndrea Corallo2020-10-04 19:45:05 +0200
committerAndrea Corallo2020-10-04 19:45:05 +0200
commit44ef24342fd8a2ac876212124ebf38673acda35a (patch)
tree793dc4ba4197559b4bc65339d713c0807a7b2ca9 /test/lisp/progmodes/python-tests.el
parentafb765ab3cab7b6582d0def543b23603cd076445 (diff)
parentd8665e6d3473403c90a0831e83439a013d0012d3 (diff)
downloademacs-44ef24342fd8a2ac876212124ebf38673acda35a.tar.gz
emacs-44ef24342fd8a2ac876212124ebf38673acda35a.zip
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'test/lisp/progmodes/python-tests.el')
-rw-r--r--test/lisp/progmodes/python-tests.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/lisp/progmodes/python-tests.el b/test/lisp/progmodes/python-tests.el
index 6b3e63653be..bc77443ff4f 100644
--- a/test/lisp/progmodes/python-tests.el
+++ b/test/lisp/progmodes/python-tests.el
@@ -339,7 +339,7 @@ def func(arg):
339 # I don't do much 339 # I don't do much
340 return arg 340 return arg
341 # This comment is badly indented because the user forced so. 341 # This comment is badly indented because the user forced so.
342 # At this line python.el wont dedent, user is always right. 342 # At this line python.el won't dedent, user is always right.
343 343
344comment_wins_over_ender = True 344comment_wins_over_ender = True
345 345
@@ -358,7 +358,7 @@ comment_wins_over_ender = True
358 ;; The return keyword do make indentation lose a level... 358 ;; The return keyword do make indentation lose a level...
359 (should (= (python-indent-calculate-indentation) 0)) 359 (should (= (python-indent-calculate-indentation) 0))
360 ;; ...but the current indentation was forced by the user. 360 ;; ...but the current indentation was forced by the user.
361 (python-tests-look-at "# At this line python.el wont dedent") 361 (python-tests-look-at "# At this line python.el won't dedent")
362 (should (eq (car (python-indent-context)) :after-comment)) 362 (should (eq (car (python-indent-context)) :after-comment))
363 (should (= (python-indent-calculate-indentation) 4)) 363 (should (= (python-indent-calculate-indentation) 4))
364 ;; Should behave the same for blank lines: potentially a comment. 364 ;; Should behave the same for blank lines: potentially a comment.