[Emacs-diffs] trunk r116031: * lisp/indent.el (indent-rigidly): Set deactivate-mark to nil

[Juri Linkov]

------------------------------------------------------------
revno: 116031
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16438
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Wed 2014-01-15 10:22:41 +0200
message:
  * lisp/indent.el (indent-rigidly): Set deactivate-mark to nil
  in transient indentation mode.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/indent.el                 indent.el-20091113204419-o5vbwnq5f7feedwu-230

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-01-15 04:58:06 +0000
+++ b/lisp/ChangeLog    2014-01-15 08:22:41 +0000
@@ -1,3 +1,8 @@
+2014-01-15  Juri Linkov  <address@hidden>
+
+       * indent.el (indent-rigidly): Set deactivate-mark to nil
+       in transient indentation mode.  (Bug#16438)
+
 2014-01-15  Dmitry Gutov  <address@hidden>
 
        * emacs-lisp/package.el (package-desc-keywords): New function

=== modified file 'lisp/indent.el'
--- a/lisp/indent.el    2014-01-13 05:03:31 +0000
+++ b/lisp/indent.el    2014-01-15 08:22:41 +0000
@@ -214,7 +214,10 @@
               (indent-to (max 0 (+ indent (prefix-numeric-value arg))) 0))
           (delete-region (point) (progn (skip-chars-forward " \t") (point))))
         (forward-line 1))
-      (move-marker end nil))))
+      (move-marker end nil)
+      ;; Keep the active region in transient mode.
+      (when (eq (cadr overriding-terminal-local-map) indent-rigidly-map)
+       (setq deactivate-mark nil)))))
 
 (defun indent-rigidly--pop-undo ()
   (and (memq last-command '(indent-rigidly-left indent-rigidly-right