[Emacs-diffs] /srv/bzr/emacs/trunk r103342: Fix incorrect changes introduced in r103083.

[Chong Yidong]

------------------------------------------------------------
revno: 103342
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Fri 2011-02-18 17:52:58 -0500
message:
  Fix incorrect changes introduced in r103083.
  
  * lisp/apropos.el (apropos-print): Call apropos-mode before setting up
  buffer variables.  Use inhibit-read-only.
  
  * lisp/emacs-lisp/package.el (package--list-packages): Call
  package-menu-mode before setting up buffer variables.
  
  * lisp/play/solitaire.el (solitaire): Call solitaire-mode before
  setting up buffer variables.  Use inhibit-read-only.
modified:
  lisp/ChangeLog
  lisp/apropos.el
  lisp/emacs-lisp/package.el
  lisp/play/solitaire.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-02-18 21:46:08 +0000
+++ b/lisp/ChangeLog    2011-02-18 22:52:58 +0000
@@ -1,3 +1,16 @@
+2011-02-18  Chong Yidong  <address@hidden>
+
+       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  <address@hidden>
 
        * progmodes/sh-script.el (sh-syntax-propertize-here-doc): (bug#8053)

=== modified file 'lisp/apropos.el'
--- a/lisp/apropos.el   2011-02-02 17:59:44 +0000
+++ b/lisp/apropos.el   2011-02-18 22:52:58 +0000
@@ -972,8 +972,10 @@
     (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 @@
          (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
 

=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el        2011-02-12 01:18:15 +0000
+++ b/lisp/emacs-lisp/package.el        2011-02-18 22:52:58 +0000
@@ -1657,10 +1657,10 @@
   (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)))

=== modified file 'lisp/play/solitaire.el'
--- a/lisp/play/solitaire.el    2011-02-10 16:56:00 +0000
+++ b/lisp/play/solitaire.el    2011-02-18 22:52:58 +0000
@@ -196,14 +196,15 @@
 
   (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