procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

python.el: Handle tabs in python-indent-dedent-line.

Browse source 
Fixes: debbugs:19730

* lisp/progmodes/python.el (python-indent-dedent-line): Fixes for
indentation with tabs.  Thanks to <dale@codefu.org>.

* test/automated/python-tests.el
(python-indent-dedent-line-backspace-2)
(python-indent-dedent-line-backspace-3): New tests.
This commit is contained in:
Fabián Ezequiel Gallina 2015-01-30 00:41:52 -03:00
parent 41c3b9241c
commit 6c8231ee8c
4 changed files with 63 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

@ -1,3 +1,10 @@
2015-01-30 Fabián Ezequiel Gallina <fgallina@gnu.org>
python.el: Handle tabs in python-indent-dedent-line.
* progmodes/python.el (python-indent-dedent-line): Fixes for
indentation with tabs. Thanks to <dale@codefu.org> (Bug#19730).
2015-01-30 Fabián Ezequiel Gallina <fgallina@gnu.org> 2015-01-30 Fabián Ezequiel Gallina <fgallina@gnu.org>
* progmodes/python.el (python-indent-context): Respect user * progmodes/python.el (python-indent-context): Respect user

4
lisp/progmodes/python.el
View file

@ -1067,9 +1067,7 @@ indentation levels from right to left."
(interactive "*") (interactive "*")
(when (and (not (bolp)) (when (and (not (bolp))
(not (python-syntax-comment-or-string-p)) (not (python-syntax-comment-or-string-p))
(= (+ (line-beginning-position) (= (current-indentation) (current-column)))
(current-indentation))
(point)))
(python-indent-line t) (python-indent-line t)
t)) t))

6
test/ChangeLog
View file

@ -1,3 +1,9 @@
2015-01-30 Fabián Ezequiel Gallina <fgallina@gnu.org>
* automated/python-tests.el
(python-indent-dedent-line-backspace-2)
(python-indent-dedent-line-backspace-3): New tests.
2015-01-30 Fabián Ezequiel Gallina <fgallina@gnu.org> 2015-01-30 Fabián Ezequiel Gallina <fgallina@gnu.org>
* automated/python-tests.el (python-indent-pep8-1) * automated/python-tests.el (python-indent-pep8-1)

49
test/automated/python-tests.el
View file

@ -2127,6 +2127,55 @@ if True:
(call-interactively #'python-indent-dedent-line-backspace) (call-interactively #'python-indent-dedent-line-backspace)
(should (zerop (current-indentation))))) (should (zerop (current-indentation)))))
(ert-deftest python-indent-dedent-line-backspace-2 ()
"Check de-indentation with tabs. Bug#19730."
(let ((tab-width 8))
(python-tests-with-temp-buffer
"
if x:
\tabcdefg
"
(python-tests-look-at "abcdefg")
(goto-char (line-end-position))
(call-interactively #'python-indent-dedent-line-backspace)
(should
(string= (buffer-substring-no-properties
(line-beginning-position) (line-end-position))
"\tabcdef")))))
(ert-deftest python-indent-dedent-line-backspace-3 ()
"Paranoid check of de-indentation with tabs. Bug#19730."
(let ((tab-width 8))
(python-tests-with-temp-buffer
"
if x:
\tif y:
\t abcdefg
"
(python-tests-look-at "abcdefg")
(goto-char (line-end-position))
(call-interactively #'python-indent-dedent-line-backspace)
(should
(string= (buffer-substring-no-properties
(line-beginning-position) (line-end-position))
"\t abcdef"))
(back-to-indentation)
(call-interactively #'python-indent-dedent-line-backspace)
(should
(string= (buffer-substring-no-properties
(line-beginning-position) (line-end-position))
"\tabcdef"))
(call-interactively #'python-indent-dedent-line-backspace)
(should
(string= (buffer-substring-no-properties
(line-beginning-position) (line-end-position))
" abcdef"))
(call-interactively #'python-indent-dedent-line-backspace)
(should
(string= (buffer-substring-no-properties
(line-beginning-position) (line-end-position))
"abcdef")))))
;;; Shell integration ;;; Shell integration