Merge from cygw32 branch

[bpt/emacs.git] / lisp / play / meese.el

diff --git a/lisp/play/meese.el b/lisp/play/meese.el
dissimilarity index 85%
index db0b7d2..d811dac 100644 (file)
--- a/lisp/play/meese.el
+++ b/lisp/play/meese.el
@@ -1,23 +1,37 @@
-;; meese.el --- protect the impressionable young minds of America
-
-;; Maintainer: FSF
-;; Keywords: games
-
-;;; Code:
-
-(defun protect-innocence-hook ()
-  (if (and (equal (file-name-nondirectory buffer-file-name) "sex.6")
-          (not (y-or-n-p "Are you over 18? ")))
-      (progn
-       (clear-visited-file-modtime)
-       (setq buffer-file-name (concat (file-name-directory buffer-file-name)
-                                      "celibacy.1"))
-       (let (buffer-read-only) ; otherwise (erase-buffer) may bomb.
-         (erase-buffer)
-         (insert-file-contents buffer-file-name t))
-       (rename-buffer (file-name-nondirectory buffer-file-name)))))
-
-(or (memq 'protect-innocence-hook find-file-hooks)
-    (setq find-file-hooks (cons 'protect-innocence-hook find-file-hooks)))
-
-;;; meese.el ends here
+;;; 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)
+
+;;; meese.el ends here