mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-19 20:30:29 -08:00
Code Issues Projects Releases Wiki Activity

Don't deactivate mark after indenting commands

Browse source
This commit is contained in:
Fabián Ezequiel Gallina 2012-05-17 00:03:04 -03:00 • committed by Fabián Ezequiel Gallina
parent 76eefb1fe5
commit cb42456fc6
1 changed files with 33 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

63
lisp/progmodes/python.el
View file

@ -720,24 +720,25 @@ point is not in between the indentation."
"Indent a python region automagically.
Called from a program, START and END specify the region to indent."
(save-excursion
(goto-char end)
(setq end (point-marker))
(goto-char start)
(or (bolp) (forward-line 1))
(while (< (point) end)
(or (and (bolp) (eolp))
(let (word)
(forward-line -1)
(back-to-indentation)
(setq word (current-word))
(forward-line 1)
(when word
(beginning-of-line)
(delete-horizontal-space)
(indent-to (python-indent-calculate-indentation)))))
(forward-line 1))
(move-marker end nil)))
(let ((deactivate-mark nil))
(save-excursion
(goto-char end)
(setq end (point-marker))
(goto-char start)
(or (bolp) (forward-line 1))
(while (< (point) end)
(or (and (bolp) (eolp))
(let (word)
(forward-line -1)
(back-to-indentation)
(setq word (current-word))
(forward-line 1)
(when word
(beginning-of-line)
(delete-horizontal-space)
(indent-to (python-indent-calculate-indentation)))))
(forward-line 1))
(move-marker end nil))))
(defun python-indent-shift-left (start end &optional count)
"Shift lines contained in region START END by COUNT columns to the left.
@ -758,14 +759,15 @@ than COUNT columns."
(setq count (prefix-numeric-value count))
(setq count python-indent-offset))
(when (> count 0)
(save-excursion
(goto-char start)
(while (< (point) end)
(if (and (< (current-indentation) count)
(not (looking-at "[ \t]*$")))
(error "Can't shift all lines enough"))
(forward-line))
(indent-rigidly start end (- count)))))
(let ((deactivate-mark nil))
(save-excursion
(goto-char start)
(while (< (point) end)
(if (and (< (current-indentation) count)
(not (looking-at "[ \t]*$")))
(error "Can't shift all lines enough"))
(forward-line))
(indent-rigidly start end (- count))))))
(add-to-list 'debug-ignored-errors "^Can't shift all lines enough")
@ -782,10 +784,11 @@ lie."
(if mark-active
(list (region-beginning) (region-end) current-prefix-arg)
(list (line-beginning-position) (line-end-position) current-prefix-arg)))
(if count
(setq count (prefix-numeric-value count))
(setq count python-indent-offset))
(indent-rigidly start end count))
(let ((deactivate-mark nil))
(if count
(setq count (prefix-numeric-value count))
(setq count python-indent-offset))
(indent-rigidly start end count)))
;; Directly from Dave Love's python.el
(defun python-indent-electric-colon (arg)