aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2009-03-26 16:21:25 +0000
committerJuanma Barranquero2009-03-26 16:21:25 +0000
commit6c01cfb68373280db726a5fc157f00826132f159 (patch)
treefa21c22a8f4875ce05e71e056acd767ef4d514a4
parentbcf3f1f5de62dae69a1023c90d697bf5bc649a10 (diff)
downloademacs-6c01cfb68373280db726a5fc157f00826132f159.tar.gz
emacs-6c01cfb68373280db726a5fc157f00826132f159.zip
* align.el (align-large-region, align-perl-modes, align-rules-list)
(align-open-comment-modes): Fix typos in docstrings. (align-region-separate): Doc fixes.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/align.el22
2 files changed, 17 insertions, 11 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ec4cff9df1a..4731bceadc6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12009-03-26 Juanma Barranquero <lekktu@gmail.com>
2
3 * align.el (align-large-region, align-perl-modes, align-rules-list)
4 (align-open-comment-modes): Fix typos in docstrings.
5 (align-region-separate): Doc fixes.
6
12009-03-26 Stefan Monnier <monnier@iro.umontreal.ca> 72009-03-26 Stefan Monnier <monnier@iro.umontreal.ca>
2 8
3 * arc-mode.el (archive-ar-summarize): Don't burp on special GNU 9 * arc-mode.el (archive-ar-summarize): Don't burp on special GNU
diff --git a/lisp/align.el b/lisp/align.el
index cb69bc51947..0917e7d4187 100644
--- a/lisp/align.el
+++ b/lisp/align.el
@@ -174,7 +174,7 @@ may cause unexpected behavior at times."
174 174
175(defcustom align-large-region 10000 175(defcustom align-large-region 10000
176 "If an integer, defines what constitutes a \"large\" region. 176 "If an integer, defines what constitutes a \"large\" region.
177If nil,then no messages will ever be printed to the minibuffer." 177If nil, then no messages will ever be printed to the minibuffer."
178 :type 'integer 178 :type 'integer
179 :group 'align) 179 :group 'align)
180 180
@@ -184,7 +184,7 @@ If nil,then no messages will ever be printed to the minibuffer."
184 :group 'align) 184 :group 'align)
185 185
186(defcustom align-perl-modes '(perl-mode cperl-mode) 186(defcustom align-perl-modes '(perl-mode cperl-mode)
187 "A list of modes where perl syntax is to be seen." 187 "A list of modes where Perl syntax is to be seen."
188 :type '(repeat symbol) 188 :type '(repeat symbol)
189 :group 'align) 189 :group 'align)
190 190
@@ -222,7 +222,7 @@ If nil,then no messages will ever be printed to the minibuffer."
222 (append align-lisp-modes align-c++-modes align-perl-modes 222 (append align-lisp-modes align-c++-modes align-perl-modes
223 '(python-mode makefile-mode)) 223 '(python-mode makefile-mode))
224 "A list of modes with a single-line comment syntax. 224 "A list of modes with a single-line comment syntax.
225These are comments as in Lisp, which have a beginning but, end with 225These are comments as in Lisp, which have a beginning, but end with
226the line (i.e., `comment-end' is an empty string)." 226the line (i.e., `comment-end' is an empty string)."
227 :type '(repeat symbol) 227 :type '(repeat symbol)
228 :group 'align) 228 :group 'align)
@@ -259,8 +259,8 @@ The possible settings for `align-region-separate' are:
259 259
260 `group' Each contiguous set of lines where a specific alignment 260 `group' Each contiguous set of lines where a specific alignment
261 occurs is considered a section for that alignment rule. 261 occurs is considered a section for that alignment rule.
262 Note that each rule will may have any entirely different 262 Note that each rule may have any entirely different set
263 set of section divisions than another. 263 of section divisions than another.
264 264
265 int alpha = 1; /* one */ 265 int alpha = 1; /* one */
266 double beta = 2.0; 266 double beta = 2.0;
@@ -292,7 +292,7 @@ The possible settings for `align-region-separate' are:
292 between sections, the behavior will be very similar to 292 between sections, the behavior will be very similar to
293 `largest', and faster. But if the mode does not use clear 293 `largest', and faster. But if the mode does not use clear
294 separators (for example, if you collapse your braces onto 294 separators (for example, if you collapse your braces onto
295 the preceding statement in C or perl), `largest' is 295 the preceding statement in C or Perl), `largest' is
296 probably the better alternative. 296 probably the better alternative.
297 297
298 function A function that will be passed the beginning and ending 298 function A function that will be passed the beginning and ending
@@ -301,8 +301,8 @@ The possible settings for `align-region-separate' are:
301 both of these parameters will be nil, in which case the 301 both of these parameters will be nil, in which case the
302 function should return non-nil if it wants each rule to 302 function should return non-nil if it wants each rule to
303 define its own section, or nil if it wants the largest 303 define its own section, or nil if it wants the largest
304 section found to be used as the common section for all rules 304 section found to be used as the common section for all
305 that occur there. 305 rules that occur there.
306 306
307 list A list of markers within the buffer that represent where 307 list A list of markers within the buffer that represent where
308 the section dividers lie. Be certain to use markers! For 308 the section dividers lie. Be certain to use markers! For
@@ -623,8 +623,8 @@ The following attributes are meaningful:
623 the purposes of alignment. The \"alignment character\" is 623 the purposes of alignment. The \"alignment character\" is
624 always the first character immediately following this 624 always the first character immediately following this
625 parenthesis group. This attribute may also be a list of 625 parenthesis group. This attribute may also be a list of
626 integer, in which case multiple alignment characters will 626 integers, in which case multiple alignment characters will
627 be aligned, with the list of integer identifying the 627 be aligned, with the list of integers identifying the
628 whitespace groups which precede them. The default for 628 whitespace groups which precede them. The default for
629 this attribute is 1. 629 this attribute is 1.
630 630
@@ -636,7 +636,7 @@ The following attributes are meaningful:
636`case-fold' If `regexp' is an ordinary regular expression string 636`case-fold' If `regexp' is an ordinary regular expression string
637 containing alphabetic character, sometimes you may want 637 containing alphabetic character, sometimes you may want
638 the search to proceed case-insensitively (for languages 638 the search to proceed case-insensitively (for languages
639 that ignore case, such as pascal for example). In that 639 that ignore case, such as Pascal for example). In that
640 case, set `case-fold' to a non-nil value, and the regular 640 case, set `case-fold' to a non-nil value, and the regular
641 expression search will ignore case. If `regexp' is set to 641 expression search will ignore case. If `regexp' is set to
642 a function, that function must handle the job of ignoring 642 a function, that function must handle the job of ignoring