HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs-23; up to 2010-06-08T03:06:47Z!dann@ics.uci.edu.
[bpt/emacs.git]
/
doc
/
misc
/
autotype.texi
diff --git
a/doc/misc/autotype.texi
b/doc/misc/autotype.texi
index
a2ea8ad
..
2e66c78
100644
(file)
--- a/
doc/misc/autotype.texi
+++ b/
doc/misc/autotype.texi
@@
-10,8
+10,7
@@
@c @cindex autotypist
@copying
@c @cindex autotypist
@copying
-Copyright @copyright{} 1994, 1995, 1999, 2001, 2002, 2003, 2004,
-2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+Copyright @copyright{} 1994-1995, 1999, 2001-2011 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@quotation
Permission is granted to copy, distribute and/or modify this document
@@
-27,10
+26,10
@@
developing GNU and promoting software freedom.''
@end quotation
@end copying
@end quotation
@end copying
-@dircategory Emacs
+@dircategory Emacs
misc features
@direntry
@direntry
-* Autotype: (autotype).
Convenient features for text that you enter frequently
- in Emacs.
+* Autotype: (autotype).
Convenient features for text that you
+
enter frequently
in Emacs.
@end direntry
@titlepage
@end direntry
@titlepage
@@
-92,7
+91,7
@@
completions and expansions of text at point.
after point.
* Autoinserting:: Filling up empty files as soon as you visit them.
* Copyrights:: Inserting and updating copyrights.
after point.
* Autoinserting:: Filling up empty files as soon as you visit them.
* Copyrights:: Inserting and updating copyrights.
-* Executables::
Turning interpreter scripts into executables.
+* Executables:: Turning interpreter scripts into executables.
* Timestamps:: Updating dates and times in modified files.
* QuickURL:: Inserting URLs based on text at point.
* Tempo:: Flexible template insertion.
* Timestamps:: Updating dates and times in modified files.
* QuickURL:: Inserting URLs based on text at point.
* Tempo:: Flexible template insertion.
@@
-201,7
+200,7
@@
the output from @kbd{M-x list-abbrevs} to make it look like this:
@example
(c-mode-abbrev-table)
@example
(c-mode-abbrev-table)
-"if" 0 "" c-if
+"if"
0 "" c-if
@end example
@noindent
@end example
@noindent
@@
-664,7
+663,3
@@
of the expansion possibilities.
@printindex vr
@bye
@printindex vr
@bye
-
-@ignore
- arch-tag: 54001b27-5ef8-4a9d-a199-905d650fafba
-@end ignore