14 files changed, 65 insertions, 70 deletions
diff --git a/lib/skels/jao-skel-asdf.el b/lib/skels/jao-skel-asdf.el
index 939eb8d..cb5761e 100644
--- a/lib/skels/jao-skel-asdf.el
+++ b/lib/skels/jao-skel-asdf.el
@@ -1,6 +1,6 @@
-;;; asdf-skel.el --- Skels for ASDF system definition files
+;;; jao-skel-asdf.el --- Skels for ASDF system definition files
 
-;; Copyright (C) 2007  Jose Antonio Ortega Ruiz
+;; Copyright (C) 2007, 2022  Jose Antonio Ortega Ruiz
 
 ;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
 ;; Keywords: lisp
@@ -22,7 +22,7 @@
 
 ;;; Code:
 
-(require 'common-skel)
+(require 'jao-skel)
 
 (define-skeleton jao-skel-asdf-file
   "ASDF file header"
@@ -48,5 +48,5 @@
 (add-to-list 'auto-insert-alist '("\\.asd\\'" . jao-skel-asdf-file))
 
 
-(provide 'asdf-skel)
-;;; asdf-skel.el ends here
+(provide 'jao-skel-asdf)
+;;; jao-skel-asdf.el ends here
diff --git a/lib/skels/jao-skel-caml.el b/lib/skels/jao-skel-caml.el
index 65a5db2..bbe6b17 100644
--- a/lib/skels/jao-skel-caml.el
+++ b/lib/skels/jao-skel-caml.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2004, 2005, 2009 Jose Antonio Ortega Ruiz
+;; Copyright (C) 2004, 2005, 2009, 2022 Jose Antonio Ortega Ruiz
 
 ;; Author: Jose A Ortega Ruiz <jao@gnu.org>
 ;; Keywords: tools
@@ -24,7 +24,7 @@
 
 ;;; Code:
 
-(require 'common-skel)
+(require 'jao-skel)
 
 (define-skeleton jao-skel-caml-file
   "OCaml file header"
@@ -38,5 +38,5 @@
 
 (jao-provide-skel "\\.ml[i]?" 'jao-skel-caml-file)
 
-(provide 'caml-skel)
-
+(provide 'jao-skel-caml)
+;;; jao-skel-caml ends here
diff --git a/lib/skels/jao-skel-cpp.el b/lib/skels/jao-skel-cpp.el
index 806f1df..b9bd8a2 100644
--- a/lib/skels/jao-skel-cpp.el
+++ b/lib/skels/jao-skel-cpp.el
@@ -1,6 +1,6 @@
-;;; cpp-skel.el
+;;; jao-skel-cpp.el
 
-;; Copyright (C) 2004, 2005, 2008, 2009 Jose Antonio Ortega Ruiz
+;; Copyright (C) 2004, 2005, 2008, 2009, 2022 Jose Antonio Ortega Ruiz
 
 ;; Author: Jose A Ortega Ruiz <jao@gnu.org>
 ;; Keywords: tools
@@ -22,11 +22,11 @@
 
 ;;; Commentary:
 
-;; C++ skeletons.
+;; C/C++ skeletons.
 
 ;;; Code:
 
-(require 'common-skel)
+(require 'jao-skel)
 (require 'thingatpt)
 
 ;;; Variables
@@ -250,6 +250,5 @@
    ("\\.c$" jao-skel-c-source-header)
    ("\\.h$" jao-skel-c-header)))
 
-(provide 'cpp-skel)
-
-;;; cpp-skel.el ends here
+(provide 'jao-skel-cpp)
+;;; jao-skel-cpp.el ends here
diff --git a/lib/skels/jao-skel-cppunit.el b/lib/skels/jao-skel-cppunit.el
index 729f392..947f1e5 100644
--- a/lib/skels/jao-skel-cppunit.el
+++ b/lib/skels/jao-skel-cppunit.el
@@ -1,6 +1,6 @@
-;;; cppunit-skel.el
+;;; jao-skel-cppunit.el
 
-;; Copyright (C) 2004, 2005 Jose Antonio Ortega Ruiz
+;; Copyright (C) 2004, 2005, 2022 Jose Antonio Ortega Ruiz
 
 ;; Author: Jose A Ortega Ruiz <jao@gnu.org>
 ;; Keywords: tools
@@ -26,7 +26,7 @@
 
 ;;; Code:
 
-(require 'common-skel)
+(require 'jao-skel)
 
 (define-skeleton jao-cppunit-main
   "Insert CPPUNIT main function"
@@ -87,5 +87,4 @@
   "}"
   > \n)
 
-(provide 'cppunit-skel)
-
+(provide 'jao-skel-cppunit)
diff --git a/lib/skels/jao-skel-geiser.el b/lib/skels/jao-skel-geiser.el
index 3c9181a..a622336 100644
--- a/lib/skels/jao-skel-geiser.el
+++ b/lib/skels/jao-skel-geiser.el
@@ -1,11 +1,11 @@
-;; geiser-skel.el -- geiser skeletons
+;; jao-geiser-fuel.el -- geiser skeletons
 
-;; Copyright (C) 2009 Jose Antonio Ortega Ruiz
+;; Copyright (C) 2009, 2022 Jose Antonio Ortega Ruiz
 
 ;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
 ;; Start date: Fri Sep 11, 2009 00:31
 
-(require 'common-skel)
+(require 'jao-skel)
 
 (defconst jao-skel-geiser--bsd
   ";; This program is free software; you can redistribute it and/or
@@ -46,5 +46,5 @@
 
 
 
-(provide 'geiser-skel)
-;;; geiser-skel.el ends here
+(provide 'jao-geiser-fuel)
+;;; jao-geiser-fuel.el ends here
diff --git a/lib/skels/jao-skel-haskell.el b/lib/skels/jao-skel-haskell.el
index 8ea0301..08b12e1 100644
--- a/lib/skels/jao-skel-haskell.el
+++ b/lib/skels/jao-skel-haskell.el
@@ -1,5 +1,5 @@
-;;; haskell-skel.el --- skeleton for haskell source files
-;; Copyright (C) 2003, 2004, 2005, 2009, 2010, 2012 Jose A Ortega Ruiz
+;;; jao-skel-haskell.el --- skeleton for haskell source files
+;; Copyright (C) 2003, 2004, 2005, 2009, 2010, 2012, 2022 Jose A Ortega Ruiz
 
 ;; Author: Jose A Ortega Ruiz <jao@member.fsf.org>
 ;; Keywords: languages
@@ -25,7 +25,7 @@
 
 ;;; Code:
 
-(require 'common-skel)
+(require 'jao-skel)
 (require 'jao-dominating-file)
 
 ;;; Auxiliar
@@ -65,6 +65,6 @@
 (jao-provide-skel "\\.hs\\'"  'jao-skel-haskell-file)
 ;; (jao-provide-skel "\\.lhs\\'" 'jao-skel-lit-haskell-file)
 
-(provide 'haskell-skel)
+(provide 'jao-skel-haskell)
 
-;;; haskell-skel.el ends here
+;;; jao-skel-haskell.el ends here
diff --git a/lib/skels/jao-skel-latex.el b/lib/skels/jao-skel-latex.el
index 330be22..a1c84e0 100644
--- a/lib/skels/jao-skel-latex.el
+++ b/lib/skels/jao-skel-latex.el
@@ -1,6 +1,6 @@
 ;; latex skeletons
 
-;; Copyright (C) 2004, 2005, 2009 Jose Antonio Ortega Ruiz
+;; Copyright (C) 2004, 2005, 2009, 2022 Jose Antonio Ortega Ruiz
 
 ;; Author: Jose A Ortega Ruiz <jao@gnu.org>
 ;; Keywords: tools
@@ -26,7 +26,7 @@
 
 ;;; Code:
 
-(require 'common-skel)
+(require 'jao-skel)
 
 (define-skeleton jao-skel-latex
   "Latex standard header"
@@ -48,5 +48,4 @@
 
 (jao-provide-skel "\\.tex$\\|\\.sty$\\|\\.cls$" 'jao-skel-latex)
 
-(provide 'latex-skel)
-
+(provide 'jao-skel-latex)
diff --git a/lib/skels/jao-skel-lisp.el b/lib/skels/jao-skel-lisp.el
index e5bb91a..501b34f 100644
--- a/lib/skels/jao-skel-lisp.el
+++ b/lib/skels/jao-skel-lisp.el
@@ -1,6 +1,6 @@
-;;; lisp-skel.el --- skeleton for lisp-like languages
+;;; jao-skel-lisp.el --- skeleton for lisp-like languages
 
-;; Copyright (C) 2003, 2004, 2005, 2008, 2009  Jose A Ortega Ruiz
+;; Copyright (C) 2003, 2004, 2005, 2008, 2009, 2022  Jose A Ortega Ruiz
 
 ;; Author: Jose A Ortega Ruiz <jao@gnu.org>
 ;; Keywords: lisp
@@ -26,7 +26,7 @@
 
 ;;; Code:
 
-(require 'common-skel)
+(require 'jao-skel)
 
 (define-skeleton jao-skel-lisp-file
   "Lisp file header"
@@ -44,7 +44,7 @@
   \n
   \n)
 
-(jao-provide-skel "\\.\\(scm\\|ss\\|lisp\\|cl\\|el\\)\\'" 'jao-skel-lisp-file)
+(jao-provide-skel "\\.\\(scm\\|ss\\|lisp\\|cl)\\'" 'jao-skel-lisp-file)
 
-(provide 'lisp-skel)
-;;; lisp-skel.el ends here
+(provide 'jao-skel-lisp)
+;;; jao-skel-lisp.el ends here
diff --git a/lib/skels/jao-skel-make.el b/lib/skels/jao-skel-make.el
index 5607dbe..343c3f9 100644
--- a/lib/skels/jao-skel-make.el
+++ b/lib/skels/jao-skel-make.el
@@ -1,6 +1,6 @@
 ;; makefile skeletons
 
-;; Copyright (C) 2004, 2005, 2009 Jose Antonio Ortega Ruiz
+;; Copyright (C) 2004, 2005, 2009, 2022 Jose Antonio Ortega Ruiz
 
 ;; Author: Jose A Ortega Ruiz <jao@gnu.org>
 ;; Keywords: tools
@@ -26,7 +26,7 @@
 
 ;;; Code:
 
-(require 'common-skel)
+(require 'jao-skel)
 
 (define-skeleton jao-skel-makefile
   "Makefile standard header"
@@ -49,5 +49,4 @@
 
 (jao-provide-skel "\\.mk$\\|Makefile\\(\\.am\\)?\\|configure\\.in" 'jao-skel-makefile)
 
-(provide 'make-skel)
-
+(provide 'jao-skel-make)
diff --git a/lib/skels/jao-skel-perl.el b/lib/skels/jao-skel-perl.el
index a5b5bb4..80c2b8f 100644
--- a/lib/skels/jao-skel-perl.el
+++ b/lib/skels/jao-skel-perl.el
@@ -1,6 +1,6 @@
-;;; perl-skel.el
+;;; jao-skel-perl.el
 
-;; Copyright (C) 2004, 2005, 2009 Jose Antonio Ortega Ruiz
+;; Copyright (C) 2004, 2005, 2009, 2022 Jose Antonio Ortega Ruiz
 
 ;; Author: Jose A Ortega Ruiz <jao@gnu.org>
 ;; Keywords: tools
@@ -26,7 +26,7 @@
 
 ;;; Code:
 
-(require 'common-skel)
+(require 'jao-skel)
 
 (define-skeleton jao-skel-perl-script
   "Standard perl script header"
@@ -74,5 +74,4 @@
 (jao-provide-skel "\\.pl$" 'jao-skel-perl-script)
 (jao-provide-skel "\\.pm$" 'jao-skel-perl-module)
 
-(provide 'perl-skel)
-
+(provide 'jao-skel-perl)
diff --git a/lib/skels/jao-skel-python.el b/lib/skels/jao-skel-python.el
index 536f825..73b0634 100644
--- a/lib/skels/jao-skel-python.el
+++ b/lib/skels/jao-skel-python.el
@@ -1,6 +1,6 @@
-;;; python-skel.el
+;;; jao-skel-python.el
 
-;; Copyright (C) 2004, 2005, 2009 Aleix Conchillo Flaque
+;; Copyright (C) 2004, 2005, 2009, 2022 Aleix Conchillo Flaque
 
 ;; Author: Aleix Conchillo Flaque <aleix@member.fsf.org>
 ;; Keywords: tools
@@ -26,7 +26,7 @@
 
 ;;; Code:
 
-(require 'common-skel)
+(require 'jao-skel)
 
 (define-skeleton jao-skel-python-module
   "Standard python module header"
@@ -49,5 +49,4 @@
 
 (jao-provide-skel "\\.py$" 'jao-skel-python-module)
 
-(provide 'python-skel)
-
+(provide 'jao-skel-python)
diff --git a/lib/skels/jao-skel-readme.el b/lib/skels/jao-skel-readme.el
index 9c22cce..31f92b7 100644
--- a/lib/skels/jao-skel-readme.el
+++ b/lib/skels/jao-skel-readme.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2004, 2005 Jose Antonio Ortega Ruiz
+;; Copyright (C) 2004, 2005, 2022 Jose Antonio Ortega Ruiz
 
 ;; Author: Jose A Ortega Ruiz <jao@gnu.org>
 ;; Keywords: tools
@@ -24,7 +24,7 @@
 
 ;;; Code:
 
-(require 'common-skel)
+(require 'jao-skel)
 
 (define-skeleton jao-skel-readme-file
   "README file header"
@@ -40,5 +40,4 @@
 
 (add-to-list 'auto-insert-alist '("README" . jao-skel-readme-file))
 
-(provide 'readme-skel)
-
+(provide 'jao-skel-readme)
diff --git a/lib/skels/jao-skel-texinfo.el b/lib/skels/jao-skel-texinfo.el
index dc73835..d9f2830 100644
--- a/lib/skels/jao-skel-texinfo.el
+++ b/lib/skels/jao-skel-texinfo.el
@@ -1,4 +1,4 @@
-;;; texinfo-skel.el --- skeletons for texinfo files
+;;; jao-skel-texinfo.el --- skeletons for texinfo files
 
 ;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
 ;; Keywords: languages
@@ -24,7 +24,7 @@
 
 ;;; Code:
 
-(require 'common-skel)
+(require 'jao-skel)
 
 (defun jao-dir-entry ()
   "Read dir file entry"
@@ -122,10 +122,7 @@
      (jao-skel-child-texinfo))
   _)
 
-(add-to-list 'auto-insert-alist '("\\.texi$" . jao-texinfo-skel))
+(add-to-list 'auto-insert-alist '("\\.texi$" . jao-skel-texinfo))
 
-
-(provide 'texinfo-skel)
-
-
-;;; texinfo-skel.el ends here
+(provide 'jao-skel-texinfo)
+;;; jao-skel-texinfo.el ends here
diff --git a/lib/skels/jao-skel-common.el b/lib/skels/jao-skel.el
index 977e7ea..afcd3b3 100644
--- a/lib/skels/jao-skel-common.el
+++ b/lib/skels/jao-skel.el
@@ -1,6 +1,6 @@
-;; common definitions and functions
+;; jao-skel.el: common definitions and functions
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Jose Antonio Ortega Ruiz
+;; Copyright (C) 2004-2012, 2022 Jose Antonio Ortega Ruiz
 
 ;; Author: Jose A Ortega Ruiz <jao@gnu.org>
 ;; Keywords: tools
@@ -149,4 +149,9 @@
 (defsubst jao-skel-provide (lst)
   (mapc (lambda (x) (apply #'jao-provide-skel x))  lst))
 
-(provide 'common-skel)
+(setq auto-insert t)
+(add-hook 'find-file-hooks 'auto-insert)
+(setq auto-insert-directory "~/.autoinsert/")
+(setq auto-insert-query t)
+
+(provide 'jao-skel)