summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/autoload.el
diff options
context:
space:
mode:
authorNoam Postavsky <npostavs@gmail.com>2017-04-19 23:01:43 -0400
committerNoam Postavsky <npostavs@gmail.com>2017-04-19 23:11:44 -0400
commit4364a769b489c044c4e9eeac6cfbabcc844ab332 (patch)
treeb19fdb488f597a80dc6010b19c9413d68d8a8d9b /lisp/emacs-lisp/autoload.el
parentcd56490fef9cf585708b9d11de2f3f2ec1e2d5b2 (diff)
downloademacs-4364a769b489c044c4e9eeac6cfbabcc844ab332.tar.gz
emacs-4364a769b489c044c4e9eeac6cfbabcc844ab332.tar.bz2
emacs-4364a769b489c044c4e9eeac6cfbabcc844ab332.zip
Don't register "def" as an autoload prefix (Bug#26412)
* lisp/emacs-lisp/autoload.el (autoload--make-defs-autoload): Don't accept "def" as a prefix.
Diffstat (limited to 'lisp/emacs-lisp/autoload.el')
-rw-r--r--lisp/emacs-lisp/autoload.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index 90e6aec4e75..ca46f317677 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -547,7 +547,9 @@ Don't try to split prefixes that are already longer than that.")
;; "cc-helper" and "c-mode", you'll get "c" in the root prefixes.
(dolist (pair (prog1 prefixes (setq prefixes nil)))
(let ((s (car pair)))
- (if (or (> (length s) 2) ;Long enough!
+ (if (or (and (> (length s) 2) ; Long enough!
+ ;; But don't use "def" from deffoo-pkg-thing.
+ (not (string= "def" s)))
(string-match ".[[:punct:]]\\'" s) ;A real (tho short) prefix?
(radix-tree-lookup (cdr pair) "")) ;Nothing to expand!
(push pair prefixes) ;Keep it as is.