From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 21 Apr 2017 16:14:59 +0000 (-0400)
Subject: Improve prefix handling for dash.el
X-Git-Tag: emacs-26.0.90~521^2~581
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a3b8618d79657af0d7fea9cb6fd914ccf0f67849;p=emacs.git

Improve prefix handling for dash.el

* lisp/emacs-lisp/autoload.el (autoload--make-defs-autoload):
Don't drop dash's "-<letter>" prefixes.
---

diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index ca46f317677..4d0554e6101 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -598,7 +598,8 @@ Don't try to split prefixes that are already longer than that.")
               (lambda (x)
                 (let ((prefix (car x)))
                   (if (or (> (length prefix) 2) ;Long enough!
-                          (string-match ".[[:punct:]]\\'" prefix))
+                          (and (eq (length prefix) 2)
+                               (string-match "[[:punct:]]" prefix)))
                       prefix
                     ;; Some packages really don't follow the rules.
                     ;; Drop the most egregious cases such as the