mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-25 23:10:47 -08:00
Code Issues Projects Releases Wiki Activity

Fix incorrect changes introduced in 2011-02-02T17:59:44Z!sds@gnu.org.

Browse source 
* 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.
This commit is contained in:
Chong Yidong 2011-02-18 17:52:58 -05:00
parent b166dcd8bb
commit abd20d91ab
4 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lisp/ChangeLog
View file

@ -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)

5
lisp/apropos.el
View file

@ -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

4
lisp/emacs-lisp/package.el
View file

@ -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)))

5
lisp/play/solitaire.el
View file

@ -196,14 +196,15 @@ Pick your favourite shortcuts:
(interactive "P")
(switch-to-buffer "*Solitaire*")
(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)))
(solitaire-mode))
(setq buffer-undo-list (list (point)))))
(defun solitaire-build-modeline ()
(setq mode-line-format