Typo fix.

[gnu-emacs] / lisp / emacs-lisp / package-x.el

diff --git a/lisp/emacs-lisp/package-x.el b/lisp/emacs-lisp/package-x.el
index 3300e89ec1efcf5c5a06e8947fd4d800701392cf..6a6a62dc91669a99988cd7e6d1fe9fb0cc154d95 100644 (file)
--- a/lisp/emacs-lisp/package-x.el
+++ b/lisp/emacs-lisp/package-x.el
@@ -1,10 +1,9 @@
 ;;; package-x.el --- Package extras
 
-;; Copyright (C) 2007-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2014 Free Software Foundation, Inc.
 
 ;; Author: Tom Tromey <tromey@redhat.com>
 ;; Created: 10 Mar 2007
-;; Version: 0.9
 ;; Keywords: tools
 ;; Package: package
 
@@ -205,12 +204,13 @@ if it exists."
                              package--default-summary)
                         (read-string "Description of package: ")
                       (package-desc-summary pkg-desc)))
-              (pkg-version (package-desc-version pkg-desc))
+              (split-version (package-desc-version pkg-desc))
               (commentary
                 (pcase file-type
                   (`single (lm-commentary))
                   (`tar nil))) ;; FIXME: Get it from the README file.
-              (split-version (version-to-list pkg-version))
+               (extras (package-desc-extras pkg-desc))
+              (pkg-version (package-version-join split-version))
               (pkg-buffer (current-buffer)))
 
          ;; Get archive-contents from ARCHIVE-URL if it's non-nil, or
@@ -218,13 +218,13 @@ if it exists."
          (let ((contents (or (package--archive-contents-from-url archive-url)
                              (package--archive-contents-from-file)))
                (new-desc (package-make-ac-desc
-                           split-version requires desc file-type)))
+                           split-version requires desc file-type extras)))
            (if (> (car contents) package-archive-version)
                (error "Unrecognized archive version %d" (car contents)))
            (let ((elt (assq pkg-name (cdr contents))))
              (if elt
                  (if (version-list-<= split-version
-                                      (package-desc-version (cdr elt)))
+                                      (package--ac-desc-version (cdr elt)))
                      (error "New package has smaller version: %s" pkg-version)
                    (setcdr elt new-desc))
                (setq contents (cons (car contents)
@@ -291,10 +291,11 @@ If `package-archive-upload-base' does not specify a valid upload
 destination, prompt for one."
   (interactive "fPackage file name: ")
   (with-temp-buffer
-    (insert-file-contents-literally file)
+    (insert-file-contents file)
     (let ((pkg-desc
            (cond
-            ((string-match "\\.tar\\'" file) (package-tar-file-info file))
+            ((string-match "\\.tar\\'" file)
+             (tar-mode) (package-tar-file-info))
             ((string-match "\\.el\\'" file) (package-buffer-info))
             (t (error "Unrecognized extension `%s'"
                       (file-name-extension file))))))