From 17ee46255fade92111505295c38c29a0865f32ce Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Mon, 24 Sep 2007 17:48:50 +0000 Subject: * progmodes/cc-mode.el (c-mode-base-map): Use c-indent-line-or-region instead of c-indent-line. * indent.el (indent-for-tab-command): First check if the region is active. --- lisp/indent.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lisp/indent.el') diff --git a/lisp/indent.el b/lisp/indent.el index 2108b340f1b..db8958bd1ca 100644 --- a/lisp/indent.el +++ b/lisp/indent.el @@ -88,6 +88,10 @@ The function actually called to indent the line is determined by the value of `indent-line-function'." (interactive "P") (cond + ;; The region is active, indent it. + ((and transient-mark-mode mark-active + (not (eq (region-beginning) (region-end)))) + (indent-region (region-beginning) (region-end))) ((or ;; indent-to-left-margin is only meant for indenting, ;; so we force it to always insert a tab here. (eq indent-line-function 'indent-to-left-margin) @@ -99,10 +103,6 @@ The function actually called to indent the line is determined by the value of ;; indenting, so we can't pass them to indent-according-to-mode. ((memq indent-line-function '(indent-relative indent-relative-maybe)) (funcall indent-line-function)) - ;; The region is active, indent it. - ((and transient-mark-mode mark-active - (not (eq (region-beginning) (region-end)))) - (indent-region (region-beginning) (region-end))) ;; Indent the line. (t (indent-according-to-mode)))) -- cgit v1.2.3