aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-05-11 16:58:36 -0700
committerGlenn Morris2013-05-11 16:58:36 -0700
commit0060ac73c0c2e67f4780909ed9b9600f85de4baf (patch)
treeffd55fbe8c7fc98246d03c7d85a6224b57122c28
parent6b91f9030914b0a3455d6086497a01a55bf097d5 (diff)
downloademacs-0060ac73c0c2e67f4780909ed9b9600f85de4baf.tar.gz
emacs-0060ac73c0c2e67f4780909ed9b9600f85de4baf.zip
* lisp/emacs-lisp/autoload.el (generated-autoload-load-name): Doc fix.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/emacs-lisp/autoload.el5
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1e10c828de5..cc1703b2ca9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12013-05-11 Glenn Morris <rgm@gnu.org> 12013-05-11 Glenn Morris <rgm@gnu.org>
2 2
3 * emacs-lisp/autoload.el (generated-autoload-load-name): Doc fix.
4
3 * cus-dep.el (custom-make-dependencies): Only use safe local variables. 5 * cus-dep.el (custom-make-dependencies): Only use safe local variables.
4 Treat cc-provide like provide. 6 Treat cc-provide like provide.
5 7
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index edaecd7ff19..dbb4a239f02 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -52,7 +52,10 @@ FormFeed character.")
52 52
53(defvar generated-autoload-load-name nil 53(defvar generated-autoload-load-name nil
54 "Load name for `autoload' statements generated from autoload cookies. 54 "Load name for `autoload' statements generated from autoload cookies.
55If nil, this defaults to the file name, sans extension.") 55If nil, this defaults to the file name, sans extension.
56Typically, you need to set this when the directory containing the file
57is not in `load-path'.
58This also affects the generated cus-load.el file.")
56;;;###autoload 59;;;###autoload
57(put 'generated-autoload-load-name 'safe-local-variable 'stringp) 60(put 'generated-autoload-load-name 'safe-local-variable 'stringp)
58 61