Mercurial > emacs
diff lisp/autoinsert.el @ 88155:d7ddb3e565de
sync with trunk
author | Henrik Enberg <henrik.enberg@telia.com> |
---|---|
date | Mon, 16 Jan 2006 00:03:54 +0000 |
parents | 37645a051842 |
children |
line wrap: on
line diff
--- a/lisp/autoinsert.el Sun Jan 15 23:02:10 2006 +0000 +++ b/lisp/autoinsert.el Mon Jan 16 00:03:54 2006 +0000 @@ -1,6 +1,7 @@ ;;; autoinsert.el --- automatic mode-dependent insertion of text into new files -;; Copyright (C) 1985, 86, 87, 94, 95, 98, 2000, 03 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1987, 1994, 1995, 1998, 2000, 2002, 2003, +;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Charlie Martin <crm@cs.duke.edu> ;; Adapted-By: Daniel Pfeiffer <occitan@esperanto.org> @@ -21,8 +22,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -33,7 +34,7 @@ ;; auto-mode-alist. ;; ;; To use: -;; (add-hook 'find-file-hooks 'auto-insert) +;; (add-hook 'find-file-hook 'auto-insert) ;; setq auto-insert-directory to an appropriate slash-terminated value ;; ;; You can also customize the variable `auto-insert-mode' to load the @@ -67,7 +68,7 @@ `auto-insert-alist'. When the insertion is marked as unmodified, you can save it with \\[write-file] RET. This variable is used when the function `auto-insert' is called, e.g. -when you do (add-hook 'find-file-hooks 'auto-insert). +when you do (add-hook 'find-file-hook 'auto-insert). 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) @@ -136,10 +137,10 @@ (("\\.[1-9]\\'" . "Man page skeleton") "Short description: " ".\\\" Copyright (C), " (substring (current-time-string) -4) " " - (getenv "ORGANIZATION") | "Free Software Foundation, Inc." + (getenv "ORGANIZATION") | (progn user-full-name) " .\\\" You may distribute this file under the terms of the GNU Free -.\\\" Documentation Licence. +.\\\" Documentation License. .TH " (file-name-sans-extension (file-name-nondirectory (buffer-file-name))) " " (file-name-extension (buffer-file-name)) " " (format-time-string "%Y-%m-%d ") @@ -167,7 +168,7 @@ ";;; " (file-name-nondirectory (buffer-file-name)) " --- " str " ;; Copyright (C) " (substring (current-time-string) -4) " " - (getenv "ORGANIZATION") | "Free Software Foundation, Inc." " + (getenv "ORGANIZATION") | (progn user-full-name) " ;; Author: " (user-full-name) '(if (search-backward "&" (line-beginning-position) t) @@ -197,8 +198,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -326,9 +327,10 @@ insert a template for the file depending on the mode of the buffer." :global t :group 'auto-insert (if auto-insert-mode - (add-hook 'find-file-hooks 'auto-insert) - (remove-hook 'find-file-hooks 'auto-insert))) + (add-hook 'find-file-hook 'auto-insert) + (remove-hook 'find-file-hook 'auto-insert))) (provide 'autoinsert) +;; arch-tag: 5b6630ac-c735-43cf-b097-b78c622af909 ;;; autoinsert.el ends here