Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
c66cd0ff
Commit
c66cd0ff
authored
Jun 22, 2009
by
Glenn Morris
Browse files
Remove leading "*" from defcustom docs.
Refill.
parent
3fde45af
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
13 deletions
+24
-13
lisp/ChangeLog
lisp/ChangeLog
+2
-0
lisp/emacs-lisp/cl-indent.el
lisp/emacs-lisp/cl-indent.el
+22
-13
No files found.
lisp/ChangeLog
View file @
c66cd0ff
2009-06-22 Glenn Morris <rgm@gnu.org>
2009-06-22 Glenn Morris <rgm@gnu.org>
* emacs-lisp/cl-indent.el: Remove leading "*" from defcustom docs.
* emacs-lisp/lisp-mode.el (lisp-indent-offset): Fix safe-local-variable
* emacs-lisp/lisp-mode.el (lisp-indent-offset): Fix safe-local-variable
property.
property.
(lisp-indent-function): Make it a defcustom.
(lisp-indent-function): Make it a defcustom.
...
...
lisp/emacs-lisp/cl-indent.el
View file @
c66cd0ff
...
@@ -53,20 +53,20 @@
...
@@ -53,20 +53,20 @@
(
defcustom
lisp-indent-maximum-backtracking
3
(
defcustom
lisp-indent-maximum-backtracking
3
"
*
Maximum depth to backtrack out from a sublist for structured indentation.
"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'
If this variable is 0, no backtracking will occur and forms such as `flet'
may not be correctly indented."
may not be correctly indented."
:type
'integer
:type
'integer
:group
'lisp-indent
)
:group
'lisp-indent
)
(
defcustom
lisp-tag-indentation
1
(
defcustom
lisp-tag-indentation
1
"
*
Indentation of tags relative to containing list.
"Indentation of tags relative to containing list.
This variable is used by the function `lisp-indent-tagbody'."
This variable is used by the function `lisp-indent-tagbody'."
:type
'integer
:type
'integer
:group
'lisp-indent
)
:group
'lisp-indent
)
(
defcustom
lisp-tag-body-indentation
3
(
defcustom
lisp-tag-body-indentation
3
"
*
Indentation of non-tagged lines relative to containing list.
"Indentation of non-tagged lines relative to containing list.
This variable is used by the function `lisp-indent-tagbody' to indent normal
This variable is used by the function `lisp-indent-tagbody' to indent normal
lines (lines without tags).
lines (lines without tags).
The indentation is relative to the indentation of the parenthesis enclosing
The indentation is relative to the indentation of the parenthesis enclosing
...
@@ -78,31 +78,30 @@ by `lisp-body-indent'."
...
@@ -78,31 +78,30 @@ by `lisp-body-indent'."
:group
'lisp-indent
)
:group
'lisp-indent
)
(
defcustom
lisp-backquote-indentation
t
(
defcustom
lisp-backquote-indentation
t
"
*
Whether or not to indent backquoted lists as code.
"Whether or not to indent backquoted lists as code.
If nil, indent backquoted lists as data, i.e., like quoted lists."
If nil, indent backquoted lists as data, i.e., like quoted lists."
:type
'boolean
:type
'boolean
:group
'lisp-indent
)
:group
'lisp-indent
)
(
defcustom
lisp-loop-keyword-indentation
3
(
defcustom
lisp-loop-keyword-indentation
3
"
*
Indentation of loop keywords in extended loop forms."
"Indentation of loop keywords in extended loop forms."
:type
'integer
:type
'integer
:group
'lisp-indent
)
:group
'lisp-indent
)
(
defcustom
lisp-loop-forms-indentation
5
(
defcustom
lisp-loop-forms-indentation
5
"
*
Indentation of forms in extended loop forms."
"Indentation of forms in extended loop forms."
:type
'integer
:type
'integer
:group
'lisp-indent
)
:group
'lisp-indent
)
(
defcustom
lisp-simple-loop-indentation
3
(
defcustom
lisp-simple-loop-indentation
3
"
*
Indentation of forms in simple loop forms."
"Indentation of forms in simple loop forms."
:type
'integer
:type
'integer
:group
'lisp-indent
)
:group
'lisp-indent
)
(
defvar
lisp-indent-error-function
)
(
defvar
lisp-indent-defun-method
'
(
4
&lambda
&body
)
(
defvar
lisp-indent-defun-method
'
(
4
&lambda
&body
)
"Indentation for function with `common-lisp-indent-function' property `defun'."
)
"Indentation for function with `common-lisp-indent-function' property `defun'."
)
...
@@ -374,6 +373,9 @@ For example, the function `case' has an indent property
...
@@ -374,6 +373,9 @@ For example, the function `case' has an indent property
(
lisp-indent-259
method
path
state
indent-point
(
lisp-indent-259
method
path
state
indent-point
sexp-column
normal-indent
))))
sexp-column
normal-indent
))))
;; Dynamically bound in common-lisp-indent-call-method.
(
defvar
lisp-indent-error-function
)
(
defun
lisp-indent-report-bad-format
(
m
)
(
defun
lisp-indent-report-bad-format
(
m
)
(
error
"%s has a badly-formed %s property: %s"
(
error
"%s has a badly-formed %s property: %s"
;; Love those free variable references!!
;; Love those free variable references!!
...
@@ -558,8 +560,11 @@ For example, the function `case' has an indent property
...
@@ -558,8 +560,11 @@ For example, the function `case' has an indent property
(
let
((
l
'
((
block
1
)
(
let
((
l
'
((
block
1
)
(
case
(
4
&rest
(
&whole
2
&rest
1
)))
(
case
(
4
&rest
(
&whole
2
&rest
1
)))
(
ccase
.
case
)
(
ecase
.
case
)
(
ccase
.
case
)
(
typecase
.
case
)
(
etypecase
.
case
)
(
ctypecase
.
case
)
(
ecase
.
case
)
(
typecase
.
case
)
(
etypecase
.
case
)
(
ctypecase
.
case
)
(
catch
1
)
(
catch
1
)
(
cond
(
&rest
(
&whole
2
&rest
1
)))
(
cond
(
&rest
(
&whole
2
&rest
1
)))
(
defvar
(
4
2
2
))
(
defvar
(
4
2
2
))
...
@@ -574,7 +579,9 @@ For example, the function `case' has an indent property
...
@@ -574,7 +579,9 @@ For example, the function `case' has an indent property
(
defun
(
4
&lambda
&body
))
(
defun
(
4
&lambda
&body
))
(
define-setf-method
.
defun
)
(
define-setf-method
.
defun
)
(
define-setf-expander
.
defun
)
(
define-setf-expander
.
defun
)
(
defmacro
.
defun
)
(
defsubst
.
defun
)
(
deftype
.
defun
)
(
defmacro
.
defun
)
(
defsubst
.
defun
)
(
deftype
.
defun
)
(
defmethod
lisp-indent-defmethod
)
(
defmethod
lisp-indent-defmethod
)
(
defpackage
(
4
2
))
(
defpackage
(
4
2
))
(
defstruct
((
&whole
4
&rest
(
&whole
2
&rest
1
))
(
defstruct
((
&whole
4
&rest
(
&whole
2
&rest
1
))
...
@@ -589,7 +596,8 @@ For example, the function `case' has an indent property
...
@@ -589,7 +596,8 @@ For example, the function `case' has an indent property
(
flet
((
&whole
4
&rest
(
&whole
1
&lambda
&body
))
&body
))
(
flet
((
&whole
4
&rest
(
&whole
1
&lambda
&body
))
&body
))
(
labels
.
flet
)
(
labels
.
flet
)
(
macrolet
.
flet
)
(
macrolet
.
flet
)
(
generic-flet
.
flet
)
(
generic-labels
.
flet
)
(
generic-flet
.
flet
)
(
generic-labels
.
flet
)
(
handler-case
(
4
&rest
(
&whole
2
&lambda
&body
)))
(
handler-case
(
4
&rest
(
&whole
2
&lambda
&body
)))
(
restart-case
.
handler-case
)
(
restart-case
.
handler-case
)
;; `else-body' style
;; `else-body' style
...
@@ -600,7 +608,8 @@ For example, the function `case' has an indent property
...
@@ -600,7 +608,8 @@ For example, the function `case' has an indent property
(
let
((
&whole
4
&rest
(
&whole
1
1
2
))
&body
))
(
let
((
&whole
4
&rest
(
&whole
1
1
2
))
&body
))
(
let*
.
let
)
(
let*
.
let
)
(
compiler-let
.
let
)
;barf
(
compiler-let
.
let
)
;barf
(
handler-bind
.
let
)
(
restart-bind
.
let
)
(
handler-bind
.
let
)
(
restart-bind
.
let
)
(
locally
1
)
(
locally
1
)
;(loop lisp-indent-loop)
;(loop lisp-indent-loop)
(
:method
(
&lambda
&body
))
; in `defgeneric'
(
:method
(
&lambda
&body
))
; in `defgeneric'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment