diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/startup.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b62d061fe7b..f09c5fa9d9e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2011-03-15 Chong Yidong <cyd@stupidchicken.com> + + * startup.el (command-line): Update package subdirectory regexp. + 2011-03-15 Stefan Monnier <monnier@iro.umontreal.ca> * allout.el (allout-abbreviate-flattened-numbering) diff --git a/lisp/startup.el b/lisp/startup.el index 384d81391ab..2bdb6fef505 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1191,7 +1191,7 @@ the `--debug-init' option to view a complete error backtrace." (dolist (subdir (directory-files dir)) (when (and (file-directory-p (expand-file-name subdir dir)) ;; package-subdirectory-regexp from package.el - (string-match "^\\([^.].*\\)-\\([0-9]+\\(?:[.][0-9]+\\)*\\)$" + (string-match "\\`\\([^.].*?\\)-\\([0-9]+\\(?:[.][0-9]+\\|\\(?:pre\\|beta\\|alpha\\)[0-9]+\\)*\\)\\'" subdir)) (throw 'package-dir-found t))))))) (package-initialize)) |