diff options
| author | Miles Bader <miles@gnu.org> | 2007-07-24 01:25:28 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-07-24 01:25:28 +0000 |
| commit | 492d9f3e3ccd2b640958e840caa451e9e04e86db (patch) | |
| tree | c87779daf272535b621216ef05179fa48102e57e /lisp/emacs-lisp | |
| parent | 7eb1e4534e88a32fe5e549e630fdabf3e062be2b (diff) | |
| parent | 1e8995158740b15936887264a3d7183beb5c51d9 (diff) | |
| download | emacs-492d9f3e3ccd2b640958e840caa451e9e04e86db.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 814-823)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 59-69)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 237-238)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-26
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/copyright.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/copyright.el b/lisp/emacs-lisp/copyright.el index facdf9e9aae..222a903efb8 100644 --- a/lisp/emacs-lisp/copyright.el +++ b/lisp/emacs-lisp/copyright.el @@ -111,7 +111,7 @@ When this is `function', only ask when called non-interactively." (save-match-data (forward-line 1) (and (looking-at comment-start-skip) - (goto-char (match-end 1)))) + (goto-char (match-end 0)))) (save-match-data (looking-at copyright-years-regexp)))) (forward-line 1) 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)) |