diff options
| author | Miles Bader <miles@gnu.org> | 2007-07-18 22:15:15 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-07-18 22:15:15 +0000 |
| commit | 4dacf5c59890f619e2285e6afae1061c763d87fa (patch) | |
| tree | eee51e638782332d75082c4f420708c35ffdd451 /lisp/emacs-lisp | |
| parent | 4bb99e3a15f1e7e13103df4908814294dc974463 (diff) | |
| parent | 6e3aa3f58ef253559ce6416d6aa02885cd944ff1 (diff) | |
| download | emacs-4dacf5c59890f619e2285e6afae1061c763d87fa.tar.gz emacs-4dacf5c59890f619e2285e6afae1061c763d87fa.tar.bz2 emacs-4dacf5c59890f619e2285e6afae1061c763d87fa.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 814-815)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-232
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/cl-loaddefs.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el index 1589e19cbb2..12514b43534 100644 --- a/lisp/emacs-lisp/cl-loaddefs.el +++ b/lisp/emacs-lisp/cl-loaddefs.el @@ -283,7 +283,7 @@ Not documented ;;;;;; do* do loop return-from return block etypecase typecase ecase ;;;;;; case load-time-value eval-when destructuring-bind function* ;;;;;; defmacro* defun* gentemp gensym cl-compile-time-init) "cl-macs" -;;;;;; "cl-macs.el" "7ccc827d272482ca276937ca18a7895a") +;;;;;; "cl-macs.el" "6990af555f962480552cf0867f3d5bab") ;;; Generated autoloads from cl-macs.el (autoload (quote cl-compile-time-init) "cl-macs" "\ 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)) |