aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorEli Zaretskii <[email protected]>2006-10-07 11:03:00 +0000
committerEli Zaretskii <[email protected]>2006-10-07 11:03:00 +0000
commit2a575769802b064b083ed41f6a2fa4130e813ebb (patch)
tree0050dae273facdd21dcb8d85d11d943d0ff37347 /lisp
parentd3886822054abef2c356b5e065077caccb0bc874 (diff)
(auto-insert-alist): Doc fix.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/autoinsert.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3129bef085..5deb6f38f6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-07 Magnus Henoch <[email protected]>
+
+ * autoinsert.el (auto-insert-alist): Doc fix.
+
2006-10-07 Johan Bockg,be(Brd <[email protected]>
* mouse-sel.el (mouse-insert-selection-internal): Use
diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el
index c1a2047a9c..15a7461d28 100644
--- a/lisp/autoinsert.el
+++ b/lisp/autoinsert.el
@@ -215,7 +215,7 @@ If this contains a %s, that will be replaced by the matching rule."
;;; " (file-name-nondirectory (buffer-file-name)) " ends here\n"))
"A list specifying text to insert by default into a new file.
Elements look like (CONDITION . ACTION) or ((CONDITION . DESCRIPTION) . ACTION).
-CONDITION maybe a regexp that must match the new file's name, or it may be
+CONDITION may be a regexp that must match the new file's name, or it may be
a symbol that must match the major mode for this element to apply.
Only the first matching element is effective.
Optional DESCRIPTION is a string for filling `auto-insert-prompt'.