summaryrefslogtreecommitdiff
path: root/lisp/apropos.el
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2011-02-18 17:52:58 -0500
committerChong Yidong <cyd@stupidchicken.com>2011-02-18 17:52:58 -0500
commitabd20d91abead79a6a40be445b5926515fbfd5a8 (patch)
tree8ffb9cab1649148cd91a761abf3f446de1e577f3 /lisp/apropos.el
parentb166dcd8bb8bf236ca43f62175b636ff3965862c (diff)
downloademacs-abd20d91abead79a6a40be445b5926515fbfd5a8.tar.gz
Fix incorrect changes introduced in 2011-02-02T17:59:44Z!sds@gnu.org.
* 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.
Diffstat (limited to 'lisp/apropos.el')
-rw-r--r--lisp/apropos.el5
1 files changed, 3 insertions, 2 deletions
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