Permalink
Browse files

Synch with APEL XEmacs package 1.32.

2006-04-24  Katsumi Yamaoka  <yamaoka@jpl.org>

	* install.el (install-detect-elisp-directory): Fix 2002-11-29
	change; assume default-load-path contains nil; use regexp-quote to
	compare directories even in Emacs.

2005-12-06  Ville Skytta  <scop@xemacs.org>

	* poe.el (minor-mode-overriding-map-alist): Doc fix.

	* product.el (product-version-as-string): Doc fix.

2002-11-29  Ben Wing  <ben@xemacs.org>

	* install.el (install-detect-elisp-directory): Fix problems
	handling backslashes in filenames (Windows).
  • Loading branch information...
yamaoka
yamaoka committed Apr 24, 2006
1 parent eefe87e commit e7259bc605257d843386e4007cae0a26a4c75541
Showing with 47 additions and 9 deletions.
  1. +17 −0 ChangeLog
  2. +28 −7 install.el
  3. +1 −1 poe.el
  4. +1 −1 product.el
View
@@ -1,3 +1,20 @@
+2006-04-24 Katsumi Yamaoka <yamaoka@jpl.org>
+
+ * install.el (install-detect-elisp-directory): Fix 2002-11-29
+ change; assume default-load-path contains nil; use regexp-quote to
+ compare directories even in Emacs.
+
+2005-12-06 Ville Skytt$(D+#(B <scop@xemacs.org>
+
+ * poe.el (minor-mode-overriding-map-alist): Doc fix.
+
+ * product.el (product-version-as-string): Doc fix.
+
+2002-11-29 Ben Wing <ben@xemacs.org>
+
+ * install.el (install-detect-elisp-directory): Fix problems
+ handling backslashes in filenames (Windows).
+
2005-06-06 Katsumi Yamaoka <yamaoka@jpl.org>
* filename.el (filename-special-filter-1): New macro defined for
View
@@ -158,25 +158,46 @@
;; v18 does not have standard site directory.
"local.lisp"))
+;; Avoid compile warning.
+(eval-when-compile (autoload 'replace-in-string "subr"))
+
(defun install-detect-elisp-directory (&optional prefix elisp-prefix
allow-version-specific)
(or prefix
(setq prefix install-prefix))
(or elisp-prefix
(setq elisp-prefix install-elisp-prefix))
(or (catch 'tag
- (let ((rest default-load-path)
- (regexp (concat "^"
- (expand-file-name (concat ".*/" elisp-prefix)
- prefix)
- "/?$")))
+ (let ((rest (delq nil (copy-sequence default-load-path)))
+ (regexp
+ (concat "^"
+ (regexp-quote (if (featurep 'xemacs)
+ ;; Handle backslashes (Windows)
+ (replace-in-string
+ (file-name-as-directory
+ (expand-file-name prefix))
+ "\\\\" "/")
+ (file-name-as-directory
+ (expand-file-name prefix))))
+ ".*/"
+ (regexp-quote
+ (if (featurep 'xemacs)
+ ;; Handle backslashes (Windows)
+ (replace-in-string elisp-prefix "\\\\" "/")
+ elisp-prefix))
+ "/?$"))
+ dir)
(while rest
- (if (string-match regexp (car rest))
+ (setq dir (if (featurep 'xemacs)
+ ;; Handle backslashes (Windows)
+ (replace-in-string (car rest) "\\\\" "/")
+ (car rest)))
+ (if (string-match regexp dir)
(if (or allow-version-specific
(not (string-match (format "/%d\\.%d"
emacs-major-version
emacs-minor-version)
- (car rest))))
+ dir)))
(throw 'tag (car rest))))
(setq rest (cdr rest)))))
(expand-file-name (concat (if (and (not (featurep 'xemacs))
View
2 poe.el
@@ -900,7 +900,7 @@ On other systems, this variable is normally always nil.")
;; Emacs 20.3 or later.
(defvar-maybe minor-mode-overriding-map-alist nil
"Alist of keymaps to use for minor modes, in current major mode.
-APEL provides this as dummy for a compatibility.")
+APEL provides this as dummy for compatibility.")
;; Emacs 20.1/XEmacs 20.3(?) and later: (save-current-buffer &rest BODY)
;;
View
@@ -252,7 +252,7 @@ PRODUCT-DEF is a definition of the product."
"Return version number of product as a string.
PRODUCT is a product structure which returned by `product-define'.
If optional argument UPDATE is non-nil, then regenerate
-`produce-version-string' from `product-version'."
+`product-version-string' from `product-version'."
(setq product (product-find product))
(or (product-version-string product)
(and (product-version product)

0 comments on commit e7259bc

Please sign in to comment.