# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1271287237 0
# Node ID 69a98e3103c2fc035e8b1fbada5cacd5d7b8646a
# Parent  18f276a67de9cb99d5f5f39cdc50e880e323dd29# Parent  0cc12709c3b500ab5bd820f8d0ac402401fdce47
Merge from mainline.

diff -r 18f276a67de9 -r 69a98e3103c2 doc/lispref/ChangeLog
--- a/doc/lispref/ChangeLog	Wed Apr 14 22:44:33 2010 +0000
+++ b/doc/lispref/ChangeLog	Wed Apr 14 23:20:37 2010 +0000
@@ -1,3 +1,17 @@
+2010-04-14  Juri Linkov  <juri@jurta.org>
+
+	Fix @deffn without category.
+
+	* abbrevs.texi (Abbrev Expansion): Replace @deffn with @defun
+	for `abbrev-insert'.
+
+	* buffers.texi (Indirect Buffers): Add category `Command'
+	to @deffn of `clone-indirect-buffer'.
+
+	* windows.texi (Cyclic Window Ordering): Replace @deffn with @defun
+	for `next-window' and `previous-window'.  Add category `Command'
+	to @deffn of `pop-to-buffer'.
+
 2010-04-01  Chong Yidong  <cyd@stupidchicken.com>
 
 	* nonascii.texi (Text Representations): Don't mark
diff -r 18f276a67de9 -r 69a98e3103c2 doc/lispref/abbrevs.texi
--- a/doc/lispref/abbrevs.texi	Wed Apr 14 22:44:33 2010 +0000
+++ b/doc/lispref/abbrevs.texi	Wed Apr 14 23:20:37 2010 +0000
@@ -281,7 +281,7 @@
 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
@@ -289,7 +289,7 @@
 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
diff -r 18f276a67de9 -r 69a98e3103c2 doc/lispref/buffers.texi
--- a/doc/lispref/buffers.texi	Wed Apr 14 22:44:33 2010 +0000
+++ b/doc/lispref/buffers.texi	Wed Apr 14 23:20:37 2010 +0000
@@ -1135,7 +1135,7 @@
 buffer, not from @var{base-buffer}.
 @end deffn
 
-@deffn clone-indirect-buffer newname display-flag &optional norecord
+@deffn Command clone-indirect-buffer newname display-flag &optional norecord
 This function creates and returns a new indirect buffer that shares
 the current buffer's base buffer and copies the rest of the current
 buffer's attributes.  (If the current buffer is not indirect, it is
diff -r 18f276a67de9 -r 69a98e3103c2 doc/lispref/windows.texi
--- a/doc/lispref/windows.texi	Wed Apr 14 22:44:33 2010 +0000
+++ b/doc/lispref/windows.texi	Wed Apr 14 23:20:37 2010 +0000
@@ -525,7 +525,7 @@
 In general, within each set of siblings at any level in the window tree
 (@pxref{Window Tree}), the order is left to right, or top to bottom.
 
-@deffn next-window &optional window minibuf all-frames
+@defun next-window &optional window minibuf all-frames
 @cindex minibuffer window, and @code{next-window}
 This function returns the window following @var{window} in the cyclic
 ordering of windows.  This is the window @kbd{C-x o} selects if typed
@@ -588,13 +588,13 @@
      @result{} #<window 56 on windows.texi>
 @end group
 @end example
-@end deffn
-
-@deffn previous-window &optional window minibuf all-frames
+@end defun
+
+@defun previous-window &optional window minibuf all-frames
 This function returns the window preceding @var{window} in the cyclic
 ordering of windows.  The other arguments specify which windows to
 include in the cycle, as in @code{next-window}.
-@end deffn
+@end defun
 
 @deffn Command other-window count &optional all-frames
 This function selects another window in the cyclic ordering of windows.
@@ -827,7 +827,7 @@
 unless @var{norecord} is non-@code{nil}.
 @end deffn
 
-@deffn pop-to-buffer buffer-or-name &optional other-window norecord
+@deffn Command pop-to-buffer buffer-or-name &optional other-window norecord
 This command makes @var{buffer-or-name} the current buffer and switches
 to it in some window, preferably not the window previously selected.
 The ``popped-to'' window becomes the selected window.  Its frame is