X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/5c213454767a305026f9545a4b60cf774962e3cd..ae0317df2293c5f60a82e2a6ee994c9b1f08a195:/lisp/autoinsert.el diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el index 8a72275ae5..9f3f9da1b0 100644 --- a/lisp/autoinsert.el +++ b/lisp/autoinsert.el @@ -3,7 +3,7 @@ ;; Copyright (C) 1985, 86, 87, 94, 95, 98 Free Software Foundation, Inc. ;; Author: Charlie Martin -;; Adapted-By: Daniel.Pfeiffer@Informatik.START.dbp.de, fax (+49 69) 7588-2389 +;; Adapted-By: Daniel Pfeiffer ;; Keywords: convenience ;; Maintainer: FSF @@ -32,7 +32,7 @@ ;; default text much as the mode is automatically set using ;; auto-mode-alist. ;; -;; To use: +;; To use: ;; (add-hook 'find-file-hooks 'auto-insert) ;; setq auto-insert-directory to an appropriate slash-terminated value ;; @@ -46,7 +46,7 @@ ;; Box 3709 ;; Duke University Medical Center ;; Durham, NC 27710 -;; (crm@cs.duke.edu,mcnc!duke!crm) +;; (crm@cs.duke.edu,mcnc!duke!crm) ;;; Code: @@ -58,8 +58,9 @@ (defcustom auto-insert-mode nil - "Toggle auto-insert-mode. -You must modify via \\[customize] for this variable to have an effect." + "Toggle Auto-insert mode. +Setting this variable directly does not take effect; +use either \\[customize] or the function `auto-insert-mode'." :set (lambda (symbol value) (auto-insert-mode (or value 0))) :initialize 'custom-initialize-default @@ -68,7 +69,8 @@ You must modify via \\[customize] for this variable to have an effect." :require 'autoinsert) (defcustom auto-insert 'not-modified - "*Controls automatic insertion into newly found empty files: + "*Controls automatic insertion into newly found empty files. +Possible values: nil do nothing t insert if possible other insert if possible, but mark as unmodified. @@ -77,15 +79,15 @@ Insertion is possible when something appropriate is found in save it with \\[write-file] RET. This variable is used when `auto-insert' is called as a function, e.g. when you do (add-hook 'find-file-hooks 'auto-insert). -With \\[auto-insert], this is always treated as if it were `t'." +With \\[auto-insert], this is always treated as if it were t." :type '(choice (const :tag "Insert if possible" t) (const :tag "Do nothing" nil) - (other :tag "insert if possible, mark as unmodified." + (other :tag "insert if possible, mark as unmodified." not-modified)) :group 'auto-insert) (defcustom auto-insert-query 'function - "*If non-`nil', ask user before auto-inserting. + "*Non-nil means ask user before auto-inserting. When this is `function', only ask when called non-interactively." :type '(choice (const :tag "Don't ask" nil) (const :tag "Ask if called non-interactively" function) @@ -151,7 +153,7 @@ If this contains a %s, that will be replaced by the matching rule." ;; Author: " (user-full-name) '(if (search-backward "&" (save-excursion (beginning-of-line 1) (point)) t) (replace-match (capitalize (user-login-name)) t t)) -'(end-of-line 1) " <" (user-login-name) ?@ (system-name) "> +'(end-of-line 1) " <" (progn user-mail-address) "> ;; Keywords: " '(require 'finder) ;;'(setq v1 (apply 'vector (mapcar 'car finder-known-keywords))) @@ -164,14 +166,12 @@ If this contains a %s, that will be replaced by the matching rule." (completing-read "Keyword, C-h: " v1 nil t)) str ", ") & -2 " -;; This file is part of GNU Emacs. - -;; GNU Emacs is free software; you can redistribute it and/or modify +;; This file is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. -;; GNU Emacs is distributed in the hope that it will be useful, +;; This file is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. @@ -265,7 +265,10 @@ Matches the visited file name against the elements of `auto-insert-alist'." (vector action)))) (and (buffer-modified-p) (not (eq this-command 'auto-insert)) - (set-buffer-modified-p (eq auto-insert t)))))) + (set-buffer-modified-p (eq auto-insert t))))) + ;; Return nil so that it could be used in + ;; `find-file-not-found-hooks', though that's probably inadvisable. + nil) ;;;###autoload @@ -290,11 +293,11 @@ or if CONDITION had no actions, after all other CONDITIONs." ;;;###autoload (defun auto-insert-mode (&optional arg) - "Toggle auto-insert mode. -With prefix ARG, turn auto-insert mode on if and only if ARG is positive. -Returns the new status of auto-insert mode (non-nil means on). + "Toggle Auto-insert mode. +With prefix ARG, turn Auto-insert mode on if and only if ARG is positive. +Returns the new status of Auto-insert mode (non-nil means on). -When auto-insert mode is enabled, when new files are created you can +When Auto-insert mode is enabled, when new files are created you can insert a template for the file depending on the mode of the buffer." (interactive "P") (let ((on-p (if arg @@ -305,8 +308,7 @@ insert a template for the file depending on the mode of the buffer." (remove-hook 'find-file-hooks 'auto-insert)) (if (interactive-p) (message "Auto-insert now %s." (if on-p "on" "off"))) - (setq auto-insert-mode on-p) - )) + (setq auto-insert-mode on-p))) (if auto-insert-mode (auto-insert-mode 1))