summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorStefan Kangas <stefankangas@gmail.com>2020-05-03 16:19:09 +0200
committerStefan Kangas <stefankangas@gmail.com>2020-05-03 16:19:09 +0200
commitd55b3b59666c6c0d966f2ddbc7b88e84b9499812 (patch)
tree069a2c841a7b6c8d06955dda4e301de769d40108 /lisp/emacs-lisp
parentb82dbba5e0d0e35e8944e517f05f726ac70fd43d (diff)
downloademacs-d55b3b59666c6c0d966f2ddbc7b88e84b9499812.tar.gz
emacs-d55b3b59666c6c0d966f2ddbc7b88e84b9499812.tar.bz2
emacs-d55b3b59666c6c0d966f2ddbc7b88e84b9499812.zip
Improve indentation of 'loop' forms
* lisp/emacs-lisp/cl-indent.el (lisp-loop-keyword-indentation) (lisp-loop-forms-indentation, lisp-simple-loop-indentation): Use a more standard indentation of 'loop' forms. (Bug#2160) (lisp-indent-maximum-backtracking, lisp-tag-indentation) (lisp-tag-body-indentation, lisp-backquote-indentation) (lisp-loop-keyword-indentation, lisp-loop-forms-indentation) (lisp-simple-loop-indentation): Remove redundant :group args.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/cl-indent.el24
1 files changed, 10 insertions, 14 deletions
diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el
index fd8715962a3..361414ef1f2 100644
--- a/lisp/emacs-lisp/cl-indent.el
+++ b/lisp/emacs-lisp/cl-indent.el
@@ -46,14 +46,12 @@
"Maximum depth to backtrack out from a sublist for structured indentation.
If this variable is 0, no backtracking will occur and forms such as `flet'
may not be correctly indented."
- :type 'integer
- :group 'lisp-indent)
+ :type 'integer)
(defcustom lisp-tag-indentation 1
"Indentation of tags relative to containing list.
This variable is used by the function `lisp-indent-tagbody'."
- :type 'integer
- :group 'lisp-indent)
+ :type 'integer)
(defcustom lisp-tag-body-indentation 3
"Indentation of non-tagged lines relative to containing list.
@@ -64,32 +62,30 @@ the special form. If the value is t, the body of tags will be indented
as a block at the same indentation as the first s-expression following
the tag. In this case, any forms before the first tag are indented
by `lisp-body-indent'."
- :type 'integer
- :group 'lisp-indent)
+ :type 'integer)
(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)
+ :type 'boolean)
-(defcustom lisp-loop-keyword-indentation 3
+(defcustom lisp-loop-keyword-indentation 6
"Indentation of loop keywords in extended loop forms."
:type 'integer
- :group 'lisp-indent)
+ :version "28.1")
-(defcustom lisp-loop-forms-indentation 5
+(defcustom lisp-loop-forms-indentation 6
"Indentation of forms in extended loop forms."
:type 'integer
- :group 'lisp-indent)
+ :version "28.1")
-(defcustom lisp-simple-loop-indentation 3
+(defcustom lisp-simple-loop-indentation 1
"Indentation of forms in simple loop forms."
:type 'integer
- :group 'lisp-indent)
+ :version "28.1")
(defcustom lisp-lambda-list-keyword-alignment nil
"Whether to vertically align lambda-list keywords together.