X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/01f17ae208c1bd9e70fa7fc76f5463aa46602815..1ef1990cbe59bb07e6dd46b609bb6cd7768acbda:/doc/lispref/abbrevs.texi

diff --git a/doc/lispref/abbrevs.texi b/doc/lispref/abbrevs.texi
index 9e14c3d4e9..f7fd8b541e 100644
--- a/doc/lispref/abbrevs.texi
+++ b/doc/lispref/abbrevs.texi
@@ -1,7 +1,6 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1999, 2001, 2002, 2003,
-@c   2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+@c Copyright (C) 1990-1994, 1999, 2001-2012  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../../info/abbrevs
 @node Abbrevs, Processes, Syntax Tables, Top
@@ -72,11 +71,6 @@ but they are not expanded automatically.
 This variable automatically becomes buffer-local when set in any fashion.
 @end defopt
 
-@defvar default-abbrev-mode
-This is the value of @code{abbrev-mode} for buffers that do not
-override it.  It is the same as @code{(default-value 'abbrev-mode)}.
-@end defvar
-
 @node Abbrev Tables, Defining Abbrevs, Abbrev Mode, Abbrevs
 @section Abbrev Tables
 
@@ -286,7 +280,7 @@ function returns @code{nil} as its value, then @code{expand-abbrev}
 returns @code{nil} even though expansion did occur.
 @end deffn
 
-@deffn abbrev-insert abbrev &optional name start end
+@defun abbrev-insert abbrev &optional name start end
 This function inserts the abbrev expansion of @code{abbrev}, replacing
 the text between @code{start} and @code{end}.  If @code{start} is
 omitted, it defaults to point.  @code{name}, if non-@code{nil}, should
@@ -294,7 +288,7 @@ be the name by which this abbrev was found (a string); it is used to
 figure out whether to adjust the capitalization of the expansion.  The
 function returns @code{abbrev} if the abbrev was successfully
 inserted.
-@end deffn
+@end defun
 
 @deffn Command abbrev-prefix-mark &optional arg
 This command marks the current location of point as the beginning of
@@ -381,10 +375,10 @@ definitions of @code{local-abbrev-table} and @code{text-mode-abbrev-table}.
       (funcall expand))))
 
 (add-hook 'foo-mode-hook
-	  #'(lambda ()
-	      (add-hook 'abbrev-expand-functions
-			'foo-mode-abbrev-expand-function
-			nil t)))
+          #'(lambda ()
+              (add-hook 'abbrev-expand-functions
+                        'foo-mode-abbrev-expand-function
+                        nil t)))
 @end smallexample
 
 @node Standard Abbrev Tables, Abbrev Properties, Abbrev Expansion, Abbrevs
@@ -516,8 +510,3 @@ This property holds a counter incremented each time a new abbrev is
 added to the table.
 
 @end table
-
-
-@ignore
-   arch-tag: 5ffdbe08-2cd4-48ec-a5a8-080f95756eec
-@end ignore