summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/cl-indent.el
diff options
context:
space:
mode:
authorBill Wohler <wohler@newt.com>2012-11-24 19:43:02 -0800
committerBill Wohler <wohler@newt.com>2012-11-24 19:43:02 -0800
commit5244bc019bf7376caff3bb198ff674e0ad9fb0e6 (patch)
tree02ee1615e904771f692ec2957c79a08ae029a13d /lisp/emacs-lisp/cl-indent.el
parent9f7e719509474e92f85955e22e57ffeebd4e96f3 (diff)
parentc07a6ded1df2f4156badc9add2953579622c3722 (diff)
downloademacs-5244bc019bf7376caff3bb198ff674e0ad9fb0e6.tar.gz
emacs-5244bc019bf7376caff3bb198ff674e0ad9fb0e6.tar.bz2
emacs-5244bc019bf7376caff3bb198ff674e0ad9fb0e6.zip
Merge from trunk.
Diffstat (limited to 'lisp/emacs-lisp/cl-indent.el')
-rw-r--r--lisp/emacs-lisp/cl-indent.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el
index 81af2030ebe..01bdfbf4bf2 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-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1987, 2000-2012 Free Software Foundation, Inc.
;; Author: Richard Mlynarik <mly@eddie.mit.edu>
;; Created: July 1987
@@ -104,6 +104,7 @@ If non-nil, alignment is done with the first keyword
\(defun foo (arg1 arg2 &rest rest
&key key1 key2)
#|...|#)"
+ :version "24.1"
:type 'boolean
:group 'lisp-indent)
@@ -111,6 +112,7 @@ If non-nil, alignment is done with the first keyword
"Indentation of lambda list keyword parameters.
See `lisp-lambda-list-keyword-parameter-alignment'
for more information."
+ :version "24.1"
:type 'integer
:group 'lisp-indent)
@@ -130,6 +132,7 @@ If non-nil, alignment is done with the first parameter
\(defun foo (arg1 arg2 &key key1 key2
key3 key4)
#|...|#)"
+ :version "24.1"
:type 'boolean
:group 'lisp-indent)