diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-11 21:15:47 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-11 21:15:47 -0800 |
| commit | 7cd330deb66863a144d7e2c36210f13d10db5245 (patch) | |
| tree | 23bfb062fc6e34d3e86fabc5e99379e82d4d6346 /lisp/emacs-lisp | |
| parent | 78998ca9cf65cc65579c8b756d35a2db9d3c8ef7 (diff) | |
| parent | af59aa6e3c661fcd547df8bc4175750f9edb20ec (diff) | |
| download | emacs-7cd330deb66863a144d7e2c36210f13d10db5245.tar.gz emacs-7cd330deb66863a144d7e2c36210f13d10db5245.tar.bz2 emacs-7cd330deb66863a144d7e2c36210f13d10db5245.zip | |
Merge from mainline.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/cl-specs.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/package.el | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/lisp/emacs-lisp/cl-specs.el b/lisp/emacs-lisp/cl-specs.el index 7359da65e07..3556b6c1ecf 100644 --- a/lisp/emacs-lisp/cl-specs.el +++ b/lisp/emacs-lisp/cl-specs.el @@ -67,7 +67,7 @@ (def-edebug-spec multiple-value-list (form)) (def-edebug-spec multiple-value-call (function-form body)) (def-edebug-spec multiple-value-bind - ((&rest symbolp) form cl-declarations body)) + ((&rest symbolp) form body)) (def-edebug-spec multiple-value-setq ((&rest symbolp) form)) (def-edebug-spec multiple-value-prog1 (form body)) 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. (let ((load-path (cons pkg-dir load-path))) (byte-recompile-directory pkg-dir 0 t))))) -(defun package--write-file-no-coding (file-name excl) +(defun package--write-file-no-coding (file-name) (let ((buffer-file-coding-system 'no-conversion)) - (write-region (point-min) (point-max) file-name nil nil nil excl))) + (write-region (point-min) (point-max) file-name))) (defun package-unpack-single (file-name version desc requires) "Install the contents of the current buffer as a package." ;; Special case "package". (if (string= file-name "package") (package--write-file-no-coding - (expand-file-name (concat file-name ".el") package-user-dir) - nil) + (expand-file-name (concat file-name ".el") package-user-dir)) (let* ((pkg-dir (expand-file-name (concat file-name "-" version) package-user-dir)) (el-file (expand-file-name (concat file-name ".el") pkg-dir)) (pkg-file (expand-file-name (concat file-name "-pkg.el") pkg-dir))) (make-directory pkg-dir t) - (package--write-file-no-coding el-file 'excl) + (package--write-file-no-coding el-file) (let ((print-level nil) (print-length nil)) (write-region |