aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/lispref/ChangeLog5
-rw-r--r--doc/lispref/minibuf.texi9
-rw-r--r--src/ChangeLog5
-rw-r--r--src/minibuf.c3
4 files changed, 17 insertions, 5 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 7acfeccea04..596cf8e70f9 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
12010-07-28 Juanma Barranquero <lekktu@gmail.com>
2
3 * minibuf.texi (High-Level Completion): Document args of
4 `read-buffer-function' (bug#5625).
5
12010-07-27 Juanma Barranquero <lekktu@gmail.com> 62010-07-27 Juanma Barranquero <lekktu@gmail.com>
2 7
3 * modes.texi (Defining Minor Modes): Use C-delete in examples, 8 * modes.texi (Defining Minor Modes): Use C-delete in examples,
diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi
index 3588704b054..9bc6be432ae 100644
--- a/doc/lispref/minibuf.texi
+++ b/doc/lispref/minibuf.texi
@@ -1222,10 +1222,11 @@ Buffer name (default foo): @point{}
1222@end defun 1222@end defun
1223 1223
1224@defopt read-buffer-function 1224@defopt read-buffer-function
1225This variable specifies how to read buffer names. For example, if you 1225This variable specifies how to read buffer names. The function is
1226set this variable to @code{iswitchb-read-buffer}, all Emacs commands 1226called with the arguments passed to @code{read-buffer}. For example,
1227that call @code{read-buffer} to read a buffer name will actually use the 1227if you set this variable to @code{iswitchb-read-buffer}, all Emacs
1228@code{iswitchb} package to read it. 1228commands that call @code{read-buffer} to read a buffer name will
1229actually use the @code{iswitchb} package to read it.
1229@end defopt 1230@end defopt
1230 1231
1231@defopt read-buffer-completion-ignore-case 1232@defopt read-buffer-completion-ignore-case
diff --git a/src/ChangeLog b/src/ChangeLog
index 78eb27f0814..08680c1f7f5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12010-07-28 Juanma Barranquero <lekktu@gmail.com>
2
3 * minibuf.c (syms_of_minibuf) <read-buffer-function>:
4 Doc fix (bug#5625).
5
12010-07-27 Ken Brown <kbrown@cornell.edu> 62010-07-27 Ken Brown <kbrown@cornell.edu>
2 7
3 * dired.c (DIRENTRY_NONEMPTY) [cygwin]: Use d_ino instead of 8 * dired.c (DIRENTRY_NONEMPTY) [cygwin]: Use d_ino instead of
diff --git a/src/minibuf.c b/src/minibuf.c
index 043eef13508..564346fd472 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -2131,7 +2131,8 @@ syms_of_minibuf ()
2131 staticpro (&Qread_expression_history); 2131 staticpro (&Qread_expression_history);
2132 2132
2133 DEFVAR_LISP ("read-buffer-function", &Vread_buffer_function, 2133 DEFVAR_LISP ("read-buffer-function", &Vread_buffer_function,
2134 doc: /* If this is non-nil, `read-buffer' does its work by calling this function. */); 2134 doc: /* If this is non-nil, `read-buffer' does its work by calling this function.
2135The function is called with the arguments passed to `read-buffer'. */);
2135 Vread_buffer_function = Qnil; 2136 Vread_buffer_function = Qnil;
2136 2137
2137 DEFVAR_BOOL ("read-buffer-completion-ignore-case", 2138 DEFVAR_BOOL ("read-buffer-completion-ignore-case",