summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/cl-indent.el
diff options
context:
space:
mode:
authorGerd Moellmann <gerd@gnu.org>2002-03-12 16:27:15 +0000
committerGerd Moellmann <gerd@gnu.org>2002-03-12 16:27:15 +0000
commit59e0f5794231dc51c529c61ea1adf7d7f9d7d6d4 (patch)
tree7243e4e347cabbb44cd0a8a4b7a8f67f05c5f1e6 /lisp/emacs-lisp/cl-indent.el
parenta13d6523e020883906e323b4509194a4651b9459 (diff)
downloademacs-59e0f5794231dc51c529c61ea1adf7d7f9d7d6d4.tar.gz
(lisp-loop-keyword-indentation)
(lisp-loop-forms-indentation, lisp-simple-loop-indentation): New user options. (extended-loop-p, common-lisp-loop-part-indentation): New functions. (common-lisp-indent-function-1): Renamed from common-lisp-indent-function. (common-lisp-indent-function): Handle loop forms specially. (lisp-indent-defmethod): Use car/cdr instead of first/rest.
Diffstat (limited to 'lisp/emacs-lisp/cl-indent.el')
-rw-r--r--lisp/emacs-lisp/cl-indent.el74
1 files changed, 69 insertions, 5 deletions
diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el
index 294b7b7f5d2..6b40051193e 100644
--- a/lisp/emacs-lisp/cl-indent.el
+++ b/lisp/emacs-lisp/cl-indent.el
@@ -1,6 +1,6 @@
;;; cl-indent.el --- enhanced lisp-indent mode
-;; Copyright (C) 1987, 2000, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1987, 2000, 2001, 2002 Free Software Foundation, Inc.
;; Author: Richard Mlynarik <mly@eddie.mit.edu>
;; Created: July 1987
@@ -78,12 +78,71 @@ by `lisp-body-indent'."
:type 'integer
:group 'lisp-indent)
+(defcustom lisp-backquote-indentation t
+ "*Whether or not to indent backquoted lists as code.
+If nil, indent backquoted lists as data, i.e., like quoted lists."
+ :type 'boolean
+ :group 'lisp-indent)
+
+
+(defcustom lisp-loop-keyword-indentation 3
+ "*Indentation of loop keywords in extended loop forms."
+ :type 'integer
+ :group 'lisp-indent)
+
+
+(defcustom lisp-loop-forms-indentation 5
+ "*Indentation of forms in extended loop forms."
+ :type 'integer
+ :group 'lisp-indent)
+
+
+(defcustom lisp-simple-loop-indentation 3
+ "*Indentation of forms in simple loop forms."
+ :type 'integer
+ :group 'lisp-indent)
+
(defvar lisp-indent-error-function)
(defvar lisp-indent-defun-method '(4 &lambda &body))
+
+(defun extended-loop-p (loop-start)
+ "True if an extended loop form starta at LOOP-START."
+ (condition-case ()
+ (save-excursion
+ (goto-char loop-start)
+ (forward-char 1)
+ (forward-sexp 2)
+ (backward-sexp 1)
+ (looking-at "\\sw"))
+ (error t)))
+
+
+(defun common-lisp-loop-part-indentation (indent-point state)
+ "Compute the indentation of loop form constituents."
+ (let* ((loop-indentation (save-excursion
+ (goto-char (elt state 1))
+ (current-column))))
+ (goto-char indent-point)
+ (beginning-of-line)
+ (cond ((not (extended-loop-p (elt state 1)))
+ lisp-simple-loop-indentation)
+ ((looking-at "^\\s-*\\(:?\\sw+\\|;\\)")
+ (+ loop-indentation lisp-loop-keyword-indentation))
+ (t
+ (+ loop-indentation lisp-loop-forms-indentation)))))
+
+
;;;###autoload
(defun common-lisp-indent-function (indent-point state)
+ (if (save-excursion (goto-char (elt state 1))
+ (looking-at "([Ll][Oo][Oo][Pp]"))
+ (common-lisp-loop-part-indentation indent-point state)
+ (common-lisp-indent-function-1 indent-point state)))
+
+
+(defun common-lisp-indent-function-1 (indent-point state)
(let ((normal-indent (current-column)))
;; Walk up list levels until we see something
;; which does special things with subforms.
@@ -102,6 +161,7 @@ by `lisp-body-indent'."
;; Move to start of innermost containing list
(goto-char containing-form-start)
(setq sexp-column (current-column))
+
;; Look over successively less-deep containing forms
(while (and (not calculated)
(< depth lisp-indent-maximum-backtracking))
@@ -160,7 +220,9 @@ by `lisp-body-indent'."
((eq method 'defun)
(setq method lisp-indent-defun-method)))
- (cond ((and (memq (char-after (1- containing-sexp)) '(?\' ?\`))
+ (cond ((and (or (eq (char-after (1- containing-sexp)) ?\')
+ (and (not lisp-backquote-indentation)
+ (eq (char-after (1- containing-sexp)) ?\`)))
(not (eq (char-after (- containing-sexp 2)) ?\#)))
;; No indentation for "'(...)" elements
(setq calculated (1+ sexp-column)))
@@ -355,11 +417,12 @@ by `lisp-body-indent'."
(&whole nil &rest 1))
path state indent-point sexp-column normal-indent)))
+
(defun lisp-indent-defmethod (path state indent-point sexp-column
normal-indent)
"Indentation function defmethod."
- (lisp-indent-259 (if (and (>= (first path) 3)
- (null (rest path))
+ (lisp-indent-259 (if (and (>= (car path) 3)
+ (null (cdr path))
(save-excursion (goto-char (elt state 1))
(forward-char 1)
(forward-sexp 3)
@@ -388,6 +451,7 @@ by `lisp-body-indent'."
(+ sexp-column lisp-body-indent)))
(error (+ sexp-column lisp-body-indent)))))
+
(let ((l '((block 1)
(case (4 &rest (&whole 2 &rest 1)))
@@ -435,7 +499,7 @@ by `lisp-body-indent'."
(compiler-let . let) ;barf
(handler-bind . let) (restart-bind . let)
(locally 1)
- ;(loop ...)
+ ;(loop lisp-indent-loop)
(:method (&lambda &body)) ; in `defgeneric'
(multiple-value-bind ((&whole 6 &rest 1) 4 &body))
(multiple-value-call (4 &body))