diff options
| author | Thien-Thi Nguyen <ttn@gnuvola.org> | 2007-07-21 09:06:17 +0000 |
|---|---|---|
| committer | Thien-Thi Nguyen <ttn@gnuvola.org> | 2007-07-21 09:06:17 +0000 |
| commit | 26716cc246dafe884123457cc1cd6bb17c39cf88 (patch) | |
| tree | a52a2e565b1c419bcbd0c3264cf74d580538e403 /lisp | |
| parent | 1d2646ccb61b4163dd1aae11ac5ddb2a7b03a563 (diff) | |
| download | emacs-26716cc246dafe884123457cc1cd6bb17c39cf88.tar.gz | |
(calculate-lisp-indent): In the
case of alignment under a constant symbol, find and consider
the sexp actually at indentation to be the "last sexp".
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 10 |
2 files changed, 16 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b6a9389a734..a37a2b0a658 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2007-07-21 Thien-Thi Nguyen <ttn@gnuvola.org> + + * emacs-lisp/lisp-mode.el (calculate-lisp-indent): In the + case of alignment under a constant symbol, find and consider + the sexp actually at indentation to be the "last sexp". + 2007-07-20 Eli Zaretskii <eliz@gnu.org> * makefile.w32-in (install-lisp-SH, install-lisp-CMD): New targets. diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 374d3ae2327..3160af5d80d 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -932,6 +932,16 @@ is the buffer position of the start of the containing expression." (goto-char indent-point) (skip-chars-forward " \t") (looking-at ":")) + ;; The last sexp may not be at the indentation + ;; where it begins, so find that one, instead. + (save-excursion + (goto-char calculate-lisp-indent-last-sexp) + (while (and (not (looking-back "^[ \t]*")) + (or (not containing-sexp) + (< (1+ containing-sexp) (point)))) + (forward-sexp -1) + (backward-prefix-chars)) + (setq calculate-lisp-indent-last-sexp (point))) (> calculate-lisp-indent-last-sexp (save-excursion (goto-char (1+ containing-sexp)) |