aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2011-05-03 11:33:05 -0400
committerChong Yidong2011-05-03 11:33:05 -0400
commitb7d22a83c2ad41cd922ff0b6e7e7250fec287315 (patch)
tree9def2805d5f8c81fc1fc454a0b7fcba7f9dde970
parentcdc4a04778d323bba9dbb90b2cf477e4beec1f58 (diff)
downloademacs-b7d22a83c2ad41cd922ff0b6e7e7250fec287315.tar.gz
emacs-b7d22a83c2ad41cd922ff0b6e7e7250fec287315.zip
* emacs-lisp/autoload.el (generated-autoload-file): Doc fix (Bug#7989).
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/emacs-lisp/autoload.el16
2 files changed, 16 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 73282f752b5..2c1ab1c7f6f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12011-05-03 Chong Yidong <cyd@stupidchicken.com>
2
3 * emacs-lisp/autoload.el (generated-autoload-file): Doc fix (Bug#7989).
4
12011-05-03 Agustín Martín Domingo <agustin.martin@hispalinux.es> 52011-05-03 Agustín Martín Domingo <agustin.martin@hispalinux.es>
2 6
3 * textmodes/ispell.el (ispell-add-per-file-word-list): 7 * textmodes/ispell.el (ispell-add-per-file-word-list):
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index 5a5d6b88a2d..dffbf3418ca 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -35,10 +35,18 @@
35(eval-when-compile (require 'cl)) 35(eval-when-compile (require 'cl))
36 36
37(defvar generated-autoload-file "loaddefs.el" 37(defvar generated-autoload-file "loaddefs.el"
38 "*File \\[update-file-autoloads] puts autoloads into. 38 "File \\[update-file-autoloads] puts autoloads into.
39A `.el' file can set this in its local variables section to make its 39A Lisp file can set this in its local variables section to make
40autoloads go somewhere else. The autoload file is assumed to contain a 40its autoloads go somewhere else.
41trailer starting with a FormFeed character.") 41
42If this is a relative file name, the directory is determined as
43follows:
44 - If a Lisp file defined `generated-autoload-file' as a
45 file-local variable, use its containing directory.
46 - Otherwise use the \"lisp\" subdirectory of `source-directory'.
47
48The autoload file is assumed to contain a trailer starting with a
49FormFeed character.")
42;;;###autoload 50;;;###autoload
43(put 'generated-autoload-file 'safe-local-variable 'stringp) 51(put 'generated-autoload-file 'safe-local-variable 'stringp)
44 52