diff options
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/emacs-lisp/package.el | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d97d7cee4b6..e8308059963 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2011-02-12 Phil Hagelberg <phil@hagelb.org> | ||
| 2 | |||
| 3 | * emacs-lisp/package.el: Allow packages to be reinstalled. | ||
| 4 | (package--write-file-no-coding): Remove EXCL arg. | ||
| 5 | (package-unpack-single): Don't use it. | ||
| 6 | |||
| 1 | 2011-02-12 Karl Pflästerer <k@rl.pflaesterer.de> (tiny change) | 7 | 2011-02-12 Karl Pflästerer <k@rl.pflaesterer.de> (tiny change) |
| 2 | 8 | ||
| 3 | * vc/vc-svn.el: Adapt to Subversion change, with no .svn directory | 9 | * vc/vc-svn.el: Adapt to Subversion change, with no .svn directory |
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index af97bb1bd21..20b6514a02a 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el | |||
| @@ -577,23 +577,22 @@ Otherwise it uses an external `tar' program. | |||
| 577 | (let ((load-path (cons pkg-dir load-path))) | 577 | (let ((load-path (cons pkg-dir load-path))) |
| 578 | (byte-recompile-directory pkg-dir 0 t))))) | 578 | (byte-recompile-directory pkg-dir 0 t))))) |
| 579 | 579 | ||
| 580 | (defun package--write-file-no-coding (file-name excl) | 580 | (defun package--write-file-no-coding (file-name) |
| 581 | (let ((buffer-file-coding-system 'no-conversion)) | 581 | (let ((buffer-file-coding-system 'no-conversion)) |
| 582 | (write-region (point-min) (point-max) file-name nil nil nil excl))) | 582 | (write-region (point-min) (point-max) file-name))) |
| 583 | 583 | ||
| 584 | (defun package-unpack-single (file-name version desc requires) | 584 | (defun package-unpack-single (file-name version desc requires) |
| 585 | "Install the contents of the current buffer as a package." | 585 | "Install the contents of the current buffer as a package." |
| 586 | ;; Special case "package". | 586 | ;; Special case "package". |
| 587 | (if (string= file-name "package") | 587 | (if (string= file-name "package") |
| 588 | (package--write-file-no-coding | 588 | (package--write-file-no-coding |
| 589 | (expand-file-name (concat file-name ".el") package-user-dir) | 589 | (expand-file-name (concat file-name ".el") package-user-dir)) |
| 590 | nil) | ||
| 591 | (let* ((pkg-dir (expand-file-name (concat file-name "-" version) | 590 | (let* ((pkg-dir (expand-file-name (concat file-name "-" version) |
| 592 | package-user-dir)) | 591 | package-user-dir)) |
| 593 | (el-file (expand-file-name (concat file-name ".el") pkg-dir)) | 592 | (el-file (expand-file-name (concat file-name ".el") pkg-dir)) |
| 594 | (pkg-file (expand-file-name (concat file-name "-pkg.el") pkg-dir))) | 593 | (pkg-file (expand-file-name (concat file-name "-pkg.el") pkg-dir))) |
| 595 | (make-directory pkg-dir t) | 594 | (make-directory pkg-dir t) |
| 596 | (package--write-file-no-coding el-file 'excl) | 595 | (package--write-file-no-coding el-file) |
| 597 | (let ((print-level nil) | 596 | (let ((print-level nil) |
| 598 | (print-length nil)) | 597 | (print-length nil)) |
| 599 | (write-region | 598 | (write-region |