projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(U+515A): Fix `ideographic-structure'.
[chise/xemacs-chise.git-]
/
lisp
/
packages.el
diff --git
a/lisp/packages.el
b/lisp/packages.el
index
de7a272
..
07832ce
100644
(file)
--- a/
lisp/packages.el
+++ b/
lisp/packages.el
@@
-2,8
+2,8
@@
;; Copyright (C) 1997 Free Software Foundation, Inc.
;; Copyright (C) 1997 Free Software Foundation, Inc.
-;; Author: Steven L Baur <steve@altair.xemacs.org>
-;; Maintainer: Steven L Baur <steve@altair.xemacs.org>
+;; Author: Steven L Baur <steve@xemacs.org>
+;; Maintainer: Steven L Baur <steve@xemacs.org>
;; Keywords: internal, lisp, dumped
;; This file is part of XEmacs.
;; Keywords: internal, lisp, dumped
;; This file is part of XEmacs.
@@
-38,8
+38,8
@@
;; (this goes for any package loaded before `subr.el'.)
;;
;; - not to use macros, because they are not yet available (and this
;; (this goes for any package loaded before `subr.el'.)
;;
;; - not to use macros, because they are not yet available (and this
-;; file must be loadable uncompiled.) This rules out CL-style
-;; macros like `when', for instance.
+;; file must be loadable uncompiled.) Built in macros, such as
+;; `when' and `unless' are fine, of course.
;;
;; - not to use `defcustom'. If you must add user-customizable
;; variables here, use `defvar', and add the variable to
;;
;; - not to use `defcustom'. If you must add user-customizable
;; variables here, use `defvar', and add the variable to
@@
-55,7
+55,7
@@
;;; Package versioning
(defvar packages-package-list nil
;;; Package versioning
(defvar packages-package-list nil
- "Database of loaded packages and version numbers")
+ "Database of installed packages and version numbers")
(defvar packages-hierarchy-depth 1
"Depth of package hierarchies.")
(defvar packages-hierarchy-depth 1
"Depth of package hierarchies.")
@@
-202,8
+202,10
@@
is used instead of `load-path'."
(member 'crypt-find-file-hook find-file-hooks)))
;; Compression involved.
(if nosuffix
(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
(t
;; No compression.
(if nosuffix
@@
-350,12
+352,12
@@
This function is basically a wrapper over `locate-file'."
;; make sure paths-find-version-directory and paths-find-site-directory
;; don't both pick up version-independent directories ...
(let ((version-directory (paths-find-version-directory roots base nil nil t))
;; make sure paths-find-version-directory and paths-find-site-directory
;; don't both pick up version-independent directories ...
(let ((version-directory (paths-find-version-directory roots base nil nil t))
- (site-directory (paths-find-site-directory roots base)))
+ (site-directory (paths-find-site-directory roots base nil nil t)))
(paths-uniq-append
(and version-directory (list version-directory))
(and site-directory (list site-directory)))))
(paths-uniq-append
(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
"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
(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)
(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.
(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.
(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)
(let ((*files* '()))
(packages-handle-package-dumped-lisps
#'(lambda (file)