Commit 17ee4625 authored by Dan Nicolaescu's avatar Dan Nicolaescu
Browse files

* 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.
parent 9f7e1e6e
2007-09-24 Dan Nicolaescu <dann@ics.uci.edu>
* 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.
2007-09-24 Micha,Ak(Bl Cadilhac <michael@cadilhac.name>
* whitespace.el (whitespace-tickle-timer): Don't install the timer if
......
......@@ -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))))
......
......@@ -269,7 +269,9 @@ control). See \"cc-mode.el\" for more info."
'c-indent-new-comment-line
c-mode-base-map global-map)
(substitute-key-definition 'indent-for-tab-command
'c-indent-command
;; XXX Is this the right thing to do
;; here?
'c-indent-line-or-region
c-mode-base-map global-map)
(when (fboundp 'comment-indent-new-line)
;; indent-new-comment-line has changed name to
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment