Mercurial > emacs
view lisp/play/meese.el @ 109383:dcdf09a52e2c
[[[
* lisp/bookmark.el (bookmark-bmenu-switch-other-window,
bookmark-bmenu-other-window, bookmark-bmenu-2-window): Don't override
ambient binding of `bookmark-automatically-show-annotations'. (Bug #6515)
]]]
=== modified file 'lisp/bookmark.el'
--- lisp/bookmark.el 2010-04-14 15:07:53 +0000
+++ lisp/bookmark.el 2010-06-27 03:40:14 +0000
@@ -1860,8 +1860,7 @@
(pop-up-windows t))
(delete-other-windows)
(switch-to-buffer (other-buffer))
- (let ((bookmark-automatically-show-annotations nil)) ;FIXME: needed?
- (bookmark--jump-via bmrk 'pop-to-buffer))
+ (bookmark--jump-via bmrk 'pop-to-buffer)
(bury-buffer menu)))
@@ -1875,8 +1874,7 @@
"Select this line's bookmark in other window, leaving bookmark menu visible."
(interactive)
(let ((bookmark (bookmark-bmenu-bookmark)))
- (let ((bookmark-automatically-show-annotations t)) ;FIXME: needed?
- (bookmark--jump-via bookmark 'switch-to-buffer-other-window))))
+ (bookmark--jump-via bookmark 'switch-to-buffer-other-window)))
(defun bookmark-bmenu-switch-other-window ()
@@ -1887,8 +1885,7 @@
(pop-up-windows t)
same-window-buffer-names
same-window-regexps)
- (let ((bookmark-automatically-show-annotations t)) ;FIXME: needed?
- (bookmark--jump-via bookmark 'display-buffer))))
+ (bookmark--jump-via bookmark 'display-buffer)))
(defun bookmark-bmenu-other-window-with-mouse (event)
"Select bookmark at the mouse pointer in other window, leaving bookmark menu visible."
=== modified file 'lisp/saveplace.el'
--- lisp/saveplace.el 2010-01-13 08:35:10 +0000
+++ lisp/saveplace.el 2010-02-07 23:14:52 +0000
@@ -213,7 +213,7 @@
(symbol-name coding-system-for-write)))
(let ((print-length nil)
(print-level nil))
- (print save-place-alist (current-buffer)))
+ (pp save-place-alist (current-buffer)))
(let ((version-control
(cond
((null save-place-version-control) nil)
author | Karl Fogel <kfogel@red-bean.com> |
---|---|
date | Tue, 13 Jul 2010 18:09:20 -0400 |
parents | 1e3a407766b9 |
children | ef719132ddfa |
line wrap: on
line source
;;; meese.el --- protect the impressionable young minds of America ;; This is in the public domain on account of being distributed since ;; 1985 or 1986 without a copyright notice. ;; This file is part of GNU Emacs. ;; Maintainer: FSF ;; Keywords: games ;;; Commentary: ;; Adds a hook to protect the impressionable young minds of America ;; from reading certain files in the Emacs distribution using Emacs. ;; This file is named after Ed Meese, the US Attorney General ;; under President Reagan, because of his support for censorship. ;;; Code: (defun protect-innocence-hook () (let ((dir (file-name-directory buffer-file-name))) (if (and (equal buffer-file-name (expand-file-name "sex.6" dir)) (file-exists-p buffer-file-name) (not (y-or-n-p "Are you over 18? "))) (progn (clear-visited-file-modtime) (setq buffer-file-name (expand-file-name "celibacy.1" dir)) (let ((inhibit-read-only t)) ; otherwise (erase-buffer) may bomb. (erase-buffer) (insert-file-contents buffer-file-name t)) (rename-buffer (file-name-nondirectory buffer-file-name)))))) (add-hook 'find-file-hook 'protect-innocence-hook) (provide 'meese) ;; arch-tag: 47af12d2-6a7d-4e2e-a1ea-eae75a77e3f0 ;;; meese.el ends here