This commit was generated by cvs2svn to compensate for changes in r50, which

[chise/xemacs-chise.git.1] / lisp / package-admin.el

diff --git a/lisp/package-admin.el b/lisp/package-admin.el
index 730f5f3..2c99440 100644 (file)
--- a/lisp/package-admin.el
+++ b/lisp/package-admin.el
@@ -38,7 +38,9 @@
 (defvar package-admin-temp-buffer "*Package Output*"
   "Temporary buffer where output of backend commands is saved.")
 
-(defvar package-admin-install-function 'package-admin-default-install-function
+(defvar package-admin-install-function (if (eq system-type 'windows-nt)
+                                          'package-admin-install-function-mswindows
+                                        'package-admin-default-install-function)
   "The function to call to install a package.
 Three args are passed: FILENAME PKG-DIR BUF
 Install package FILENAME into directory PKG-DIR, with any messages output
@@ -126,7 +128,7 @@ The optional `pkg-dir' can be used to override the default package hierarchy
   (let ((default-directory (file-name-as-directory pkg-dir)))
     (unless (file-directory-p default-directory)
       (make-directory default-directory t))
-    (call-process "djtar" nil buf t "-x" file)))
+    (call-process "minitar" nil buf t file)))
 
 (defun package-admin-default-install-function (file pkg-dir buf)
   "Default function to install a package.
@@ -324,7 +326,7 @@ is the top-level directory under which the package was installed."
        start err-list
        )
     (setq pkg-dir (package-admin-get-install-dir 'unknown pkg-dir))
-    ;; Insure that the current directory doesn't change
+    ;; Ensure that the current directory doesn't change
     (save-excursion
       (set-buffer buf)
       ;; This is not really needed
@@ -437,8 +439,7 @@ PACKAGE is a symbol, not a string."
            ;; Delete empty directories.
            (if dirs
                (let ( (orig-default-directory default-directory)
-;                     directory files file
-                      )
+                      directory files file )
                  ;; Make sure we preserve the existing `default-directory'.
                  ;; JV, why does this change the default directory? Does it indeed?
                  (unwind-protect