import xemacs-21.2.37

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

diff --git a/lisp/package-get.el b/lisp/package-get.el
index eb395a9..88be9d3 100644 (file)
--- a/lisp/package-get.el
+++ b/lisp/package-get.el
@@ -184,6 +184,7 @@ order until the package is found.  As a special case, `site-name' can be
 (defcustom package-get-download-sites
   '(
     ;; North America
+    ("Pre-Releases" "ftp.xemacs.org" "pub/xemacs/beta/experimental/packages")
     ("xemacs.org" "ftp.xemacs.org" "pub/xemacs/packages")
     ("crc.ca (Canada)" "ftp.crc.ca" "pub/packages/editors/xemacs/packages")
     ("ualberta.ca (Canada)" "sunsite.ualberta.ca" "pub/Mirror/xemacs/packages")
@@ -373,7 +374,8 @@ if different."
        (unless (and location (file-writable-p location))
          (setq location package-get-user-index-filename))
        (when (y-or-n-p (concat "Update package index in " location "? "))
-         (write-file location))))))
+         (let ((coding-system-for-write 'binary))
+           (write-file location)))))))
 
 
 ;;;###autoload
@@ -399,7 +401,7 @@ Unless FORCE-CURRENT is non-nil never try to update the database."
         (save-excursion
           (set-buffer buf)
           (erase-buffer buf)
-          (insert-file-contents-internal db-file)
+          (insert-file-contents-literally db-file)
           (package-get-update-base-from-buffer buf)
          (if (file-remote-p db-file)
              (package-get-maybe-save-index db-file)))
@@ -456,11 +458,11 @@ used interactively, for example from a mail or news buffer."
       (package-get-update-base-entries content-beg content-end)
       (message "Updated package-get database"))))
 
-(defun package-get-update-base-entries (beg end)
+(defun package-get-update-base-entries (start end)
   "Update the package-get database with the entries found between
-BEG and END in the current buffer."
+START and END in the current buffer."
   (save-excursion
-    (goto-char beg)
+    (goto-char start)
     (if (not (re-search-forward "^(package-get-update-base-entry" nil t))
         (error "Buffer does not contain package-get database entries"))
     (beginning-of-line)
@@ -638,7 +640,6 @@ required by PACKAGES."
                              (mapcar
                               #'(lambda (reqd)
                                   (let* ((reqd-package (package-get-package-provider reqd))
-                                         (reqd-version (cadr reqd-package))
                                          (reqd-name    (car reqd-package)))
                                     (if (null reqd-name)
                                         (error "Unable to find a provider for %s" reqd))
@@ -844,9 +845,7 @@ successfully installed but errors occurred during initialization, or
       ;; Doing it with XEmacs removes the need for an external md5 program
       (message "Validating checksum for `%s'..." package) (sit-for 0)
       (with-temp-buffer
-       ;; What ever happened to i-f-c-literally
-       (let (file-name-handler-alist)
-         (insert-file-contents-internal full-package-filename))
+       (insert-file-contents-literally full-package-filename)
        (if (not (string= (md5 (current-buffer))
                          (package-get-info-prop this-package
                                                 'md5sum)))