summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Schmidt <christopher@ch.ristopher.com>2012-12-08 11:16:45 +0800
committerChong Yidong <cyd@gnu.org>2012-12-08 11:16:45 +0800
commit76b92feef1ce7919484065b0ee66e8bb891aff51 (patch)
tree4b2cd05caf18d74ca3723fb7a99f32b317c4782f
parent8d43bd30230ee2315aade40db688716679ebcf7c (diff)
downloademacs-76b92feef1ce7919484065b0ee66e8bb891aff51.tar.gz
* lread.c (Vload_source_file_function): Doc fix.
Fixes: debbugs:11647
-rw-r--r--src/ChangeLog4
-rw-r--r--src/lread.c16
2 files changed, 14 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 1cca404d2aa..427f729730f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-08 Christopher Schmidt <christopher@ch.ristopher.com>
+
+ * lread.c (Vload_source_file_function): Doc fix (Bug#11647).
+
2012-12-07 Eli Zaretskii <eliz@gnu.org>
* indent.c (Fvertical_motion): If a display string will be
diff --git a/src/lread.c b/src/lread.c
index 94744620279..be7b44e603b 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -4518,12 +4518,16 @@ The default is nil, which means use the function `read'. */);
Vload_read_function = Qnil;
DEFVAR_LISP ("load-source-file-function", Vload_source_file_function,
- doc: /* Function called in `load' for loading an Emacs Lisp source file.
-This function is for doing code conversion before reading the source file.
-If nil, loading is done without any code conversion.
-Arguments are FULLNAME, FILE, NOERROR, NOMESSAGE, where
- FULLNAME is the full name of FILE.
-See `load' for the meaning of the remaining arguments. */);
+ doc: /* Function called in `load' to load an Emacs Lisp source file.
+The value should be a function for doing code conversion before
+reading a source file. It can also be nil, in which case loading is
+done without any code conversion.
+
+If the value is a function, it is called with four arguments,
+FULLNAME, FILE, NOERROR, NOMESSAGE. FULLNAME is the absolute name of
+the file to load, FILE is the non-absolute name (for messages etc.),
+and NOERROR and NOMESSAGE are the corresponding arguments passed to
+`load'. The function should return t if the file was loaded. */);
Vload_source_file_function = Qnil;
DEFVAR_BOOL ("load-force-doc-strings", load_force_doc_strings,