X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fpackages.el;h=810b1f73698a22c1636e3b77e9fc46cd24b6f103;hb=567bb6a1eb48daa1d25111cfeca4e94e3f30fb9e;hp=11162e412b4e66012885629115fd637a777de545;hpb=dd8f4c0e5ff27909836e7478df6b17d816a0db28;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/packages.el b/lisp/packages.el
index 11162e4..810b1f7 100644
--- a/lisp/packages.el
+++ b/lisp/packages.el
@@ -202,8 +202,10 @@ is used instead of `load-path'."
 			  (member 'crypt-find-file-hook find-file-hooks)))
 		 ;; Compression involved.
 		 (if nosuffix
-		     '("" ".gz" ".Z")
-		   '(".elc" ".elc.gz" "elc.Z" ".el" ".el.gz" ".el.Z" "" ".gz" ".Z")))
+		     '("" ".gz" ".Z" ".bz2")
+		   '(".elc" ".elc.gz" "elc.Z" ".elc.bz2"
+		     ".el" ".el.gz" ".el.Z" ".el.bz2"
+		     "" ".gz" ".Z" ".bz2")))
 		(t
 		 ;; No compression.
 		 (if nosuffix
@@ -355,7 +357,7 @@ This function is basically a wrapper over `locate-file'."
      (and version-directory (list version-directory))
      (and site-directory (list site-directory)))))
 
-(defvar packages-special-base-regexp "^\\(etc\\|info\\|lisp\\|lib-src\\|bin\\|pkginfo\\)$"
+(defvar packages-special-base-regexp "^\\(etc\\|info\\|man\\|lisp\\|lib-src\\|bin\\|pkginfo\\)$"
   "Special subdirectories of packages.")
 
 (defvar packages-no-package-hierarchy-regexp
@@ -418,7 +420,7 @@ DEFAULT is a default list of packages."
   (or default
       (let ((packages '()))
 	(while package-locations
-	  (packages-deconstruct 
+	  (packages-deconstruct
 	   (car package-locations)
 	   #'(lambda (name a-time thunk)
 	       (if (and (eq time a-time)
@@ -529,12 +531,12 @@ Call HANDLE on each file off definitions of PACKAGE-LISP there."
 
 (defun packages-load-package-dumped-lisps (package-load-path)
   "Load dumped-lisp.el files along a load path.
-Also load files off PACKAGE-LISP definitions there"
+Also load files off PACKAGE-LISP definitions there."
   (packages-handle-package-dumped-lisps #'load package-load-path))
 
 (defun packages-collect-package-dumped-lisps (package-load-path)
   "Load dumped-lisp.el files along a load path.
-Return list of files off PACKAGE-LISP definitions there"
+Return list of files off PACKAGE-LISP definitions there."
   (let ((*files* '()))
     (packages-handle-package-dumped-lisps
      #'(lambda (file)