comparison lisp/emacs-lisp/lisp-mode.el @ 90984:a1be62cbd32a

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
author Miles Bader <miles@gnu.org>
date Wed, 18 Jul 2007 22:15:15 +0000
parents a66921565bcb d330cbad60ac
children f55f9811f5d7
comparison
equal deleted inserted replaced
90983:8cdd8b5fa891 90984:a1be62cbd32a
930 ;; uncommented line. 930 ;; uncommented line.
931 (and (save-excursion 931 (and (save-excursion
932 (goto-char indent-point) 932 (goto-char indent-point)
933 (skip-chars-forward " \t") 933 (skip-chars-forward " \t")
934 (looking-at ":")) 934 (looking-at ":"))
935 ;; The last sexp may not be at the indentation
936 ;; where it begins, so find that one, instead.
937 (save-excursion
938 (goto-char calculate-lisp-indent-last-sexp)
939 (while (and (not (looking-back "^[ \t]*"))
940 (or (not containing-sexp)
941 (< (1+ containing-sexp) (point))))
942 (forward-sexp -1)
943 (backward-prefix-chars))
944 (setq calculate-lisp-indent-last-sexp (point)))
935 (> calculate-lisp-indent-last-sexp 945 (> calculate-lisp-indent-last-sexp
936 (save-excursion 946 (save-excursion
937 (goto-char (1+ containing-sexp)) 947 (goto-char (1+ containing-sexp))
938 (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t) 948 (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t)
939 (point))) 949 (point)))