X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/9b75c1e26efe96f0ed327ee06b0e046a9e5724ed..db18c5fd6fca1633508dc77d687789f38d905dd1:/lisp/autoinsert.el diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el index dcacc6a99f..c01999a7b8 100644 --- a/lisp/autoinsert.el +++ b/lisp/autoinsert.el @@ -1,7 +1,7 @@ ;;; autoinsert.el --- automatic mode-dependent insertion of text into new files ;; Copyright (C) 1985, 1986, 1987, 1994, 1995, 1998, 2000, 2001, 2002, -;; 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. +;; 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ;; Author: Charlie Martin ;; Adapted-By: Daniel Pfeiffer @@ -10,10 +10,10 @@ ;; This file is part of GNU Emacs. -;; GNU Emacs is free software; you can redistribute it and/or modify +;; GNU Emacs 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. +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,9 +21,7 @@ ;; GNU General Public License for more details. ;; 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., 51 Franklin Street, Fifth Floor, -;; Boston, MA 02110-1301, USA. +;; along with GNU Emacs. If not, see . ;;; Commentary: @@ -55,7 +53,8 @@ "Automatic mode-dependent insertion of text into new files." :prefix "auto-insert-" :group 'files - :group 'convenience) + :group 'convenience + :link '(custom-manual "(autotype) Autoinserting")) (defcustom auto-insert 'not-modified @@ -179,27 +178,25 @@ If this contains a %s, that will be replaced by the matching rule." ;;'(setq v1 (apply 'vector (mapcar 'car finder-known-keywords))) '(setq v1 (mapcar (lambda (x) (list (symbol-name (car x)))) finder-known-keywords) - v2 (mapconcat (lambda (x) (format "%10.0s: %s" (car x) (cdr x))) + v2 (mapconcat (lambda (x) (format "%12s: %s" (car x) (cdr x))) finder-known-keywords "\n")) ((let ((minibuffer-help-form v2)) (completing-read "Keyword, C-h: " v1 nil t)) str ", ") & -2 " -\;; This file is free software; you can redistribute it and/or modify +\;; This program 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 3, or (at your option) -\;; any later version. +\;; the Free Software Foundation, either version 3 of the License, or +\;; (at your option) any later version. -\;; This file is distributed in the hope that it will be useful, +\;; This program 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. \;; 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., 51 Franklin Street, Fifth Floor, -\;; Boston, MA 02110-1301, USA. +\;; along with this program. If not, see . \;;; Commentary: @@ -212,7 +209,89 @@ If this contains a %s, that will be replaced by the matching rule." \(provide '" (file-name-sans-extension (file-name-nondirectory (buffer-file-name))) ") -\;;; " (file-name-nondirectory (buffer-file-name)) " ends here\n")) +\;;; " (file-name-nondirectory (buffer-file-name)) " ends here\n") + (("\\.texi\\(nfo\\)?\\'" . "Texinfo file skeleton") + "Title: " + "\\input texinfo @c -*-texinfo-*- +@c %**start of header +@setfilename " + (file-name-sans-extension + (file-name-nondirectory (buffer-file-name))) ".info\n" + "@settitle " str " +@c %**end of header +@copying\n" + (setq short-description (read-string "Short description: ")) + ".\n\n" + "Copyright @copyright{} " (substring (current-time-string) -4) " " + (getenv "ORGANIZATION") | (progn user-full-name) " + +@quotation +Permission is granted to copy, distribute and/or modify this document +under the terms of the GNU Free Documentation License, Version 1.2 +or any later version published by the Free Software Foundation; +with no Invariant Sections, no Front-Cover Texts, and no Back-Cover +Texts. A copy of the license is included in the section entitled ``GNU +Free Documentation License''. + +A copy of the license is also available from the Free Software +Foundation Web site at @url{http://www.gnu.org/licenses/fdl.html}. + +@end quotation + +The document was typeset with +@uref{http://www.texinfo.org/, GNU Texinfo}. + +@end copying + +@titlepage +@title " str " +@subtitle " short-description " +@author " (getenv "ORGANIZATION") | (progn user-full-name) + " <" (progn user-mail-address) "> +@page +@vskip 0pt plus 1filll +@insertcopying +@end titlepage + +@c Output the table of the contents at the beginning. +@contents + +@ifnottex +@node Top +@top " str " + +@insertcopying +@end ifnottex + +@c Generate the nodes for this menu with `C-c C-u C-m'. +@menu +@end menu + +@c Update all node entries with `C-c C-u C-n'. +@c Insert new nodes with `C-c C-c n'. +@node Chapter One +@chapter Chapter One + +" _ " + +@node Copying This Manual +@appendix Copying This Manual + +@menu +* GNU Free Documentation License:: License for copying this manual. +@end menu + +@c Get fdl.texi from http://www.gnu.org/licenses/fdl.html +@include fdl.texi + +@node Index +@unnumbered Index + +@printindex cp + +@bye + +@c " (file-name-nondirectory (buffer-file-name)) " ends here\n")) "A list specifying text to insert by default into a new file. Elements look like (CONDITION . ACTION) or ((CONDITION . DESCRIPTION) . ACTION). CONDITION may be a regexp that must match the new file's name, or it may be @@ -272,7 +351,7 @@ Matches the visited file name against the elements of `auto-insert-alist'." (eq this-command 'auto-insert)) (y-or-n-p (format auto-insert-prompt desc))) t) - (mapcar + (mapc (lambda (action) (if (stringp action) (if (file-readable-p