Merge from trunk.

6 files changed, 33 insertions, 18 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b922e21681f..e3fe51454e5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2011-08-26  Chong Yidong  <cyd@stupidchicken.com>
+
+        * emacs-lisp/package.el (package-install): Call package-initialize
+        if called interactively.
+
+2011-08-26  Leo Liu  <sdl.web@gmail.com>
+
+        * emacs-lisp/cl-macs.el (defstruct): Fix format.  (Bug#9357)
+
 2011-08-25  Juri Linkov  <juri@jurta.org>
 
         * isearch.el (isearch-occur): Let-bind `search-spaces-regexp' to
diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el
index 7beb4d4b4cc..d6512306ad1 100644
--- a/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@ -282,7 +282,7 @@ Not documented
 ;;;;;;  flet progv psetq do-all-symbols do-symbols dotimes dolist
 ;;;;;;  do* do loop return-from return block etypecase typecase ecase
 ;;;;;;  case load-time-value eval-when destructuring-bind function*
-;;;;;;  defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "0907093f7720996444ededb4edfe8072")
+;;;;;;  defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "cc8cbd8c86e2facbe61986e992e6c508")
 ;;; Generated autoloads from cl-macs.el
 
 (autoload 'gensym "cl-macs" "\
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index fb19115287c..d9531cc5261 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -2416,9 +2416,8 @@ value, that slot cannot be set via `setf'.
                         (append
                          (and pred-check
                               (list (list 'or pred-check
-                                          (list 'error
-                                                (format "%s accessing a non-%s"
-                                                        accessor name)))))
+                                          `(error "%s accessing a non-%s"
+                                                  ',accessor ',name))))
                          (list (if (eq type 'vector) (list 'aref 'cl-x pos)
                                  (if (= pos 0) '(car cl-x)
                                    (list 'nth pos 'cl-x)))))) forms)
@@ -2426,9 +2425,8 @@ value, that slot cannot be set via `setf'.
               (push (list 'define-setf-method accessor '(cl-x)
                              (if (cadr (memq :read-only (cddr desc)))
                                  (list 'progn '(ignore cl-x)
-                                       (list 'error
-                                             (format "%s is a read-only slot"
-                                                     'accessor)))
+                                       `(error "%s is a read-only slot"
+                                               ',accessor))
                                ;; If cl is loaded only for compilation,
                                ;; the call to cl-struct-setf-expander would
                                ;; cause a warning because it may not be
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 19e8375966b..88282606aa8 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -852,18 +852,26 @@ using `package-compute-transaction'."
        (t
         (error "Unknown package kind: %s" (symbol-name kind)))))))
 
+(defvar package--initialized nil)
+
 ;;;###autoload
 (defun package-install (name)
   "Install the package named NAME.
-Interactively, prompt for the package name.
-The package is found on one of the archives in `package-archives'."
+NAME should be the name of one of the available packages in an
+archive in `package-archives'.  Interactively, prompt for NAME."
   (interactive
-   (list (intern (completing-read "Install package: "
-                                  (mapcar (lambda (elt)
-                                            (cons (symbol-name (car elt))
-                                                  nil))
-                                          package-archive-contents)
-                                  nil t))))
+   (progn
+     ;; Initialize the package system to get the list of package
+     ;; symbols for completion.
+     (unless package--initialized
+       (package-initialize t))
+     (list (intern (completing-read
+                    "Install package: "
+                    (mapcar (lambda (elt)
+                              (cons (symbol-name (car elt))
+                                    nil))
+                            package-archive-contents)
+                    nil t)))))
   (let ((pkg-desc (assq name package-archive-contents)))
     (unless pkg-desc
       (error "Package `%s' is not available for installation"
@@ -1076,8 +1084,6 @@ makes them available for download."
                       (car archive)))))
   (package-read-all-archive-contents))
 
-(defvar package--initialized nil)
-
 ;;;###autoload
 (defun package-initialize (&optional no-activate)
   "Load Emacs Lisp packages, and activate them.
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 076afdd2323..5c8b4333332 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,7 @@
 2011-08-26  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+        * mailcap.el (mailcap-mime-data): Regexp-quote MIME subtype.
+
         * gnus-msg.el (gnus-setup-message): Remove extra apostrophe.
 
 2011-08-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
diff --git a/lisp/gnus/mailcap.el b/lisp/gnus/mailcap.el
index dffb279daba..7959104d646 100644
--- a/lisp/gnus/mailcap.el
+++ b/lisp/gnus/mailcap.el
@@ -90,7 +90,7 @@ This is a compatibility function for different Emacsen."
 ;; files for the rest?  -- fx
 (defvar mailcap-mime-data
   `(("application"
-     ("vnd.ms-excel"
+     ("vnd\\.ms-excel"
       (viewer . "gnumeric %s")
       (test   . (getenv "DISPLAY"))
       (type . "application/vnd.ms-excel"))