aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2014-01-15 10:22:41 +0200
committerJuri Linkov2014-01-15 10:22:41 +0200
commitccc6b208d5f3d10f682fe191b811cea60ddb06c4 (patch)
treee7ca968ad625c648f19975eaaade7d0844a821de
parent5c92e00da487df29752ec5dc21bc59fca2598626 (diff)
downloademacs-ccc6b208d5f3d10f682fe191b811cea60ddb06c4.tar.gz
emacs-ccc6b208d5f3d10f682fe191b811cea60ddb06c4.zip
* lisp/indent.el (indent-rigidly): Set deactivate-mark to nil
in transient indentation mode. Fixes: debbugs:16438
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/indent.el5
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5bd724527df..0e100336b94 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-01-15 Juri Linkov <juri@jurta.org>
2
3 * indent.el (indent-rigidly): Set deactivate-mark to nil
4 in transient indentation mode. (Bug#16438)
5
12014-01-15 Dmitry Gutov <dgutov@yandex.ru> 62014-01-15 Dmitry Gutov <dgutov@yandex.ru>
2 7
3 * emacs-lisp/package.el (package-desc-keywords): New function 8 * emacs-lisp/package.el (package-desc-keywords): New function
diff --git a/lisp/indent.el b/lisp/indent.el
index 2af5a58f6c5..4b51cf04ad1 100644
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@ -214,7 +214,10 @@ indentation by specifying a large negative ARG."
214 (indent-to (max 0 (+ indent (prefix-numeric-value arg))) 0)) 214 (indent-to (max 0 (+ indent (prefix-numeric-value arg))) 0))
215 (delete-region (point) (progn (skip-chars-forward " \t") (point)))) 215 (delete-region (point) (progn (skip-chars-forward " \t") (point))))
216 (forward-line 1)) 216 (forward-line 1))
217 (move-marker end nil)))) 217 (move-marker end nil)
218 ;; Keep the active region in transient mode.
219 (when (eq (cadr overriding-terminal-local-map) indent-rigidly-map)
220 (setq deactivate-mark nil)))))
218 221
219(defun indent-rigidly--pop-undo () 222(defun indent-rigidly--pop-undo ()
220 (and (memq last-command '(indent-rigidly-left indent-rigidly-right 223 (and (memq last-command '(indent-rigidly-left indent-rigidly-right