comparison lisp/emacs-lisp/lisp-mode.el @ 90776:dd7c098af727

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 638-652) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 202) - Update from CVS Revision: [e-mail]/emacs--unicode--0--patch-177

90775:7d8921cab8aa

      ;; or if the desired indentation has already been computed.
      (let ((normal-indent (current-column)))
        (cond ((elt state 3)
               ;; Inside a string, don't change indentation.
	       nil)
              ((and (integerp lisp-indent-offset) containing-sexp)
               ;; Indent by constant offset
               (goto-char containing-sexp)
               (+ (current-column) lisp-indent-offset))
              (desired-indent)

90776:dd7c098af727

      ;; or if the desired indentation has already been computed.
      (let ((normal-indent (current-column)))
        (cond ((elt state 3)
               ;; Inside a string, don't change indentation.
	       nil)
              ((save-excursion
                 ;; test whether current line begins with a constant
                 (goto-char indent-point)
                 (skip-chars-forward " \t")
                 (looking-at ":"))
               (let ((desired-indent
                      (save-excursion
                        (goto-char (1+ containing-sexp))
                        (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t)
                        (point)))
                     (parse-sexp-ignore-comments t))
                 ;; Align a constant symbol under the last constant symbol
                 (goto-char calculate-lisp-indent-last-sexp)
                 (while (> (point) desired-indent)
                   (if (looking-at ":")
                       (setq desired-indent (point))
                     (backward-sexp 1))))
                 (current-column))
              ((and (integerp lisp-indent-offset) containing-sexp)
               ;; Indent by constant offset
               (goto-char containing-sexp)
               (+ (current-column) lisp-indent-offset))
              (desired-indent)