Mercurial > emacs
changeset 68124:32fc565ba875
(tcl-indent-command): Use indent-for-tab-command.
(tcl-indent-line): Return `noindent' if inside a string.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Tue, 10 Jan 2006 19:42:43 +0000 |
| parents | ba5077259cc1 |
| children | b6c30efb3e37 |
| files | lisp/ChangeLog lisp/progmodes/tcl.el |
| diffstat | 2 files changed, 30 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Jan 10 19:31:15 2006 +0000 +++ b/lisp/ChangeLog Tue Jan 10 19:42:43 2006 +0000 @@ -1,5 +1,8 @@ 2006-01-10 Stefan Monnier <monnier@iro.umontreal.ca> + * progmodes/tcl.el (tcl-indent-command): Use indent-for-tab-command. + (tcl-indent-line): Return `noindent' if inside a string. + * progmodes/flymake.el (flymake-split-string): Remove more than one empty string at beg/end of the result. (flymake-find-buildfile, flymake-find-possible-master-files):
--- a/lisp/progmodes/tcl.el Tue Jan 10 19:31:15 2006 +0000 +++ b/lisp/progmodes/tcl.el Tue Jan 10 19:42:43 2006 +0000 @@ -1,6 +1,6 @@ ;;; tcl.el --- Tcl code editing commands for Emacs -;; Copyright (C) 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Maintainer: FSF @@ -682,16 +682,9 @@ 5. Create an empty comment. 6. Move backward to start of comment, indenting if necessary." (interactive "p") - (cond - ((not tcl-tab-always-indent) - ;; Indent if in indentation area, otherwise insert TAB. - (if (<= (current-column) (current-indentation)) - (tcl-indent-line) - (insert-tab arg))) - ((eq tcl-tab-always-indent t) - ;; Always indent. - (tcl-indent-line)) - (t + (if (memq tcl-tab-always-indent '(nil t)) + (let ((tab-always-indent tcl-tab-always-indent)) + (call-interactively 'indent-for-tab-command)) ;; "Perl-mode" style TAB command. (let* ((ipoint (point)) (eolpoint (progn @@ -730,7 +723,7 @@ ;; Go to start of comment. We don't leave point where it is ;; because we want to skip comment-start-skip. (tcl-indent-line) - (indent-for-comment))))))) + (indent-for-comment)))))) (defun tcl-indent-line () "Indent current line as Tcl code. @@ -739,29 +732,28 @@ beg shift-amt (case-fold-search nil) (pos (- (point-max) (point)))) - (beginning-of-line) - (setq beg (point)) - (cond ((eq indent nil) - (setq indent (current-indentation))) - (t - (skip-chars-forward " \t") - (if (listp indent) (setq indent (car indent))) - (cond ((= (following-char) ?}) - (setq indent (- indent tcl-indent-level))) - ((= (following-char) ?\]) - (setq indent (- indent 1)))))) - (skip-chars-forward " \t") - (setq shift-amt (- indent (current-column))) - (if (zerop shift-amt) - (if (> (- (point-max) pos) (point)) - (goto-char (- (point-max) pos))) - (delete-region beg (point)) - (indent-to indent) - ;; If initial point was within line's indentation, - ;; position after the indentation. Else stay at same point in text. - (if (> (- (point-max) pos) (point)) - (goto-char (- (point-max) pos)))) - shift-amt)) + (if (null indent) + 'noindent + (beginning-of-line) + (setq beg (point)) + (skip-chars-forward " \t") + (if (listp indent) (setq indent (car indent))) + (cond ((= (following-char) ?}) + (setq indent (- indent tcl-indent-level))) + ((= (following-char) ?\]) + (setq indent (- indent 1)))) + (skip-chars-forward " \t") + (setq shift-amt (- indent (current-column))) + (if (zerop shift-amt) + (if (> (- (point-max) pos) (point)) + (goto-char (- (point-max) pos))) + (delete-region beg (point)) + (indent-to indent) + ;; If initial point was within line's indentation, + ;; position after the indentation. Else stay at same point in text. + (if (> (- (point-max) pos) (point)) + (goto-char (- (point-max) pos)))) + shift-amt))) (defun tcl-figure-type () "Determine type of sexp at point.