Mercurial > emacs
changeset 104926:71f778b32ef5
(delphi-tab): Indent region when Transient Mark mode is enabled and
region is active; otherwise indent or insert TAB as usual.
(delphi-mode): Update description of TAB-key binding.
| author | Simon South <ssouth@slowcomputing.org> |
|---|---|
| date | Fri, 11 Sep 2009 02:28:50 +0000 |
| parents | 54e4fb84ea5d |
| children | d76b30182911 |
| files | lisp/ChangeLog lisp/progmodes/delphi.el |
| diffstat | 2 files changed, 25 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Sep 11 02:14:05 2009 +0000 +++ b/lisp/ChangeLog Fri Sep 11 02:28:50 2009 +0000 @@ -23,6 +23,13 @@ than using advertised-undo. * tutorial.el (tutorial--default-keys): Adjust accordingly. +2009-09-10 Simon South <ssouth@slowcomputing.org> + + * progmodes/delphi.el (delphi-tab): Indent region when Transient + Mark mode is enabled and region is active; otherwise indent or + insert TAB as usual. + (delphi-mode): Update description of TAB-key binding. + 2009-09-10 Stefan Monnier <monnier@iro.umontreal.ca> * subr.el (define-key-rebound-commands): Mark obsolete.
--- a/lisp/progmodes/delphi.el Fri Sep 11 02:14:05 2009 +0000 +++ b/lisp/progmodes/delphi.el Fri Sep 11 02:28:50 2009 +0000 @@ -1652,14 +1652,23 @@ (defun delphi-tab () - "Indent the current line or insert a TAB, depending on the value of -`delphi-tab-always-indents' and the current line position." + "Indent the region, when Transient Mark mode is enabled and the region is +active. Otherwise, indent the current line or insert a TAB, depending on the +value of `delphi-tab-always-indents' and the current line position." (interactive) - (if (or delphi-tab-always-indents ; We are always indenting - ;; Or we are before the first non-space character on the line. - (save-excursion (skip-chars-backward delphi-space-chars) (bolp))) - (delphi-indent-line) - (insert "\t"))) + (cond ((use-region-p) + ;; If Transient Mark mode is enabled and the region is active, indent + ;; the entire region. + (indent-region (region-beginning) (region-end))) + ((or delphi-tab-always-indents + (save-excursion (skip-chars-backward delphi-space-chars) (bolp))) + ;; Otherwise, if we are configured always to indent (regardless of the + ;; point's position in the line) or we are before the first non-space + ;; character on the line, indent the line. + (delphi-indent-line)) + (t + ;; Otherwise, insert a tab character. + (insert "\t")))) (defun delphi-is-directory (path) @@ -1935,7 +1944,8 @@ ;;;###autoload (defun delphi-mode (&optional skip-initial-parsing) "Major mode for editing Delphi code. \\<delphi-mode-map> -\\[delphi-tab]\t- Indents the current line for Delphi code. +\\[delphi-tab]\t- Indents the current line (or region, if Transient Mark mode +\t is enabled and the region is active) of Delphi code. \\[delphi-find-unit]\t- Search for a Delphi source file. \\[delphi-fill-comment]\t- Fill the current comment. \\[delphi-new-comment-line]\t- If in a // comment, do a new comment line.