4 files changed, 27 insertions, 12 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0f6fac51a95..7fd32d19e3a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2011-02-18  Chong Yidong  <cyd@stupidchicken.com>
+
+        Fix 2011-02-02 changes.
+
+        * apropos.el (apropos-print): Call apropos-mode before setting up
+        buffer variables.  Use inhibit-read-only.
+
+        * emacs-lisp/package.el (package--list-packages): Call
+        package-menu-mode before setting up buffer variables.
+
+        * play/solitaire.el (solitaire): Call solitaire-mode before
+        setting up buffer variables.  Use inhibit-read-only.
+
 2011-02-18  Lawrence Mitchell  <wence@gmx.li>
 
         * progmodes/sh-script.el (sh-syntax-propertize-here-doc): (bug#8053)
diff --git a/lisp/apropos.el b/lisp/apropos.el
index 70ce860e1d7..734b2fb2f6b 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -972,8 +972,10 @@ If non-nil TEXT is a string that will be printed as a heading."
     (with-output-to-temp-buffer "*Apropos*"
       (let ((p apropos-accumulator)
             (old-buffer (current-buffer))
+            (inhibit-read-only t)
             symbol item)
         (set-buffer standard-output)
+        (apropos-mode)
         (if (display-mouse-p)
             (insert
              "If moving the mouse over text changes the text's color, "
@@ -1064,8 +1066,7 @@ If non-nil TEXT is a string that will be printed as a heading."
           (apropos-print-doc 5 'apropos-widget t)
           (apropos-print-doc 4 'apropos-plist nil))
         (set (make-local-variable 'truncate-partial-width-windows) t)
-        (set (make-local-variable 'truncate-lines) t)
-        (apropos-mode))))
+        (set (make-local-variable 'truncate-lines) t))))
   (prog1 apropos-accumulator
     (setq apropos-accumulator ())))     ; permit gc
 
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 20b6514a02a..ab5ba1bea56 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1657,10 +1657,10 @@ list; the default is to display everything in `package-alist'."
   (require 'finder-inf nil t)
   (let ((buf (get-buffer-create "*Packages*")))
     (with-current-buffer buf
+      (package-menu-mode)
       (set (make-local-variable 'package-menu-package-list) packages)
       (set (make-local-variable 'package-menu-sort-key) nil)
-      (package--generate-package-list)
-      (package-menu-mode))
+      (package--generate-package-list))
     ;; The package menu buffer has keybindings.  If the user types
     ;; `M-x list-packages', that suggests it should become current.
     (switch-to-buffer buf)))
diff --git a/lisp/play/solitaire.el b/lisp/play/solitaire.el
index 9d6a0ef52b1..2fe62ed0e60 100644
--- a/lisp/play/solitaire.el
+++ b/lisp/play/solitaire.el
@@ -196,14 +196,15 @@ Pick your favourite shortcuts:
 
   (interactive "P")
   (switch-to-buffer "*Solitaire*")
-  (setq buffer-read-only t)
-  (setq solitaire-stones 32)
-  (solitaire-insert-board)
-  (solitaire-build-modeline)
-  (goto-char (point-max))
-  (setq solitaire-center (search-backward "."))
-  (setq buffer-undo-list (list (point)))
-  (solitaire-mode))
+  (let ((inhibit-read-only t))
+    (solitaire-mode)
+    (setq buffer-read-only t)
+    (setq solitaire-stones 32)
+    (solitaire-insert-board)
+    (solitaire-build-modeline)
+    (goto-char (point-max))
+    (setq solitaire-center (search-backward "."))
+    (setq buffer-undo-list (list (point)))))
 
 (defun solitaire-build-modeline ()
   (setq mode-line-format