[Emacs-diffs] /srv/bzr/emacs/trunk r103661: * lisp/startup.el (command-line): Update package subdirectory regexp.

[Chong Yidong]

------------------------------------------------------------
revno: 103661
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Tue 2011-03-15 12:21:30 -0400
message:
  * lisp/startup.el (command-line): Update package subdirectory regexp.
modified:
  lisp/ChangeLog
  lisp/startup.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-03-15 02:46:18 +0000
+++ b/lisp/ChangeLog    2011-03-15 16:21:30 +0000
@@ -1,3 +1,7 @@
+2011-03-15  Chong Yidong  <address@hidden>
+
+       * startup.el (command-line): Update package subdirectory regexp.
+
 2011-03-15  Stefan Monnier  <address@hidden>
 
        * allout.el (allout-abbreviate-flattened-numbering)

=== modified file 'lisp/startup.el'
--- a/lisp/startup.el   2011-01-25 04:08:28 +0000
+++ b/lisp/startup.el   2011-03-15 16:21:30 +0000
@@ -1191,7 +1191,7 @@
               (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))