From 5854c2677e0a197d8adedfdf3d558b35f874beb7 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Thu, 15 Apr 2010 01:41:21 +0300 Subject: [PATCH] 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'. --- doc/lispref/ChangeLog | 14 ++++++++++++++ doc/lispref/abbrevs.texi | 4 ++-- doc/lispref/buffers.texi | 2 +- doc/lispref/windows.texi | 10 +++++----- 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 52587432152..7c2a8bd08bd 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,17 @@ +2010-04-14 Juri Linkov + + 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 * nonascii.texi (Text Representations): Don't mark diff --git a/doc/lispref/abbrevs.texi b/doc/lispref/abbrevs.texi index 5434aa62357..1bb33475240 100644 --- a/doc/lispref/abbrevs.texi +++ b/doc/lispref/abbrevs.texi @@ -281,7 +281,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 @@ -289,7 +289,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 diff --git a/doc/lispref/buffers.texi b/doc/lispref/buffers.texi index 2aa1f725641..2a7a603e733 100644 --- a/doc/lispref/buffers.texi +++ b/doc/lispref/buffers.texi @@ -1135,7 +1135,7 @@ non-@code{nil}, the initial state is copied from the actual base 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 --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index 54006b35eb4..0e1062a622f 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -525,7 +525,7 @@ horizontal, the ordering is top to bottom in the left part, and so on. 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 @@ buffer @samp{windows.texi}: @result{} # @end group @end example -@end deffn +@end defun -@deffn previous-window &optional window minibuf all-frames +@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 @@ This function updates the buffer list just like @code{switch-to-buffer} 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