* align.el:

[bpt/emacs.git] / lisp / autoinsert.el

diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el
index e7dc061..92a5f9f 100644 (file)
--- a/lisp/autoinsert.el
+++ b/lisp/autoinsert.el
@@ -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 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.
 
 ;; 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 <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -55,11 +53,12 @@
   "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
-  "*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
@@ -77,7 +76,7 @@ With \\[auto-insert], this is always treated as if it were t."
   :group 'auto-insert)
 
 (defcustom auto-insert-query 'function
-  "*Non-nil means 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)
@@ -85,7 +84,7 @@ When this is `function', only ask when called non-interactively."
   :group 'auto-insert)
 
 (defcustom auto-insert-prompt "Perform %s auto-insertion? "
-  "*Prompt to use when querying whether to auto-insert.
+  "Prompt to use when querying whether to auto-insert.
 If this contains a %s, that will be replaced by the matching rule."
   :type 'string
   :group 'auto-insert)
@@ -94,9 +93,9 @@ If this contains a %s, that will be replaced by the matching rule."
 (defcustom auto-insert-alist
   '((("\\.\\([Hh]\\|hh\\|hpp\\)\\'" . "C / C++ header")
      (upcase (concat (file-name-nondirectory
-                     (substring buffer-file-name 0 (match-beginning 0)))
+                     (file-name-sans-extension buffer-file-name))
                     "_"
-                    (substring buffer-file-name (1+ (match-beginning 0)))))
+                    (file-name-extension buffer-file-name)))
      "#ifndef " str \n
      "#define " str "\n\n"
      _ "\n\n#endif")
@@ -186,20 +185,18 @@ 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 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 <http://www.gnu.org/licenses/>.
 
 \;;; Commentary:
 
@@ -230,10 +227,11 @@ If this contains a %s, that will be replaced by the matching rule."
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, and no Cover Texts.  A copy of the license is
-included in the section entitled ``GNU Free Documentation License.''
+under the terms of the GNU Free Documentation License, Version 1.3
+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}.
@@ -310,7 +308,7 @@ described above, e.g. [\"header.insert\" date-and-author-update]."
 
 ;; Establish a default value for auto-insert-directory
 (defcustom auto-insert-directory "~/insert/"
-  "*Directory from which auto-inserted files are taken.
+  "Directory from which auto-inserted files are taken.
 The value must be an absolute directory name;
 thus, on a GNU or Unix system, it must end in a slash."
   :type 'directory