aboutsummaryrefslogtreecommitdiffstats
path: root/src/buffer.c
diff options
context:
space:
mode:
authorKaroly Lorentey2004-04-18 01:40:02 +0000
committerKaroly Lorentey2004-04-18 01:40:02 +0000
commitf2e45864d10657552bbc5cda8f10a5dcf1bfe511 (patch)
tree21af8d850cc6b15905949f6b2bc13733bfa7d184 /src/buffer.c
parent9002956fd888928dcca6ba30bbb90c739741377a (diff)
parent06e2fd488e846d50952025d07a5e12cc0cd4ff81 (diff)
downloademacs-f2e45864d10657552bbc5cda8f10a5dcf1bfe511.tar.gz
emacs-f2e45864d10657552bbc5cda8f10a5dcf1bfe511.zip
Merged in changes from CVS trunk.
Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-220 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-221 Restore deleted tagline in etc/TUTORIAL.ru * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-222 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-223 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-224 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-225 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-144
Diffstat (limited to 'src/buffer.c')
-rw-r--r--src/buffer.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/buffer.c b/src/buffer.c
index ca74dda73bf..6e67f07cf38 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -832,7 +832,8 @@ No argument or nil as argument means use the current buffer. */)
832DEFUN ("buffer-base-buffer", Fbuffer_base_buffer, Sbuffer_base_buffer, 832DEFUN ("buffer-base-buffer", Fbuffer_base_buffer, Sbuffer_base_buffer,
833 0, 1, 0, 833 0, 1, 0,
834 doc: /* Return the base buffer of indirect buffer BUFFER. 834 doc: /* Return the base buffer of indirect buffer BUFFER.
835If BUFFER is not indirect, return nil. */) 835If BUFFER is not indirect, return nil.
836BUFFER defaults to the current buffer. */)
836 (buffer) 837 (buffer)
837 register Lisp_Object buffer; 838 register Lisp_Object buffer;
838{ 839{