New guard constant names.

diff --git a/skelrc.h b/skelrc.h
index b46eb71..ec7ab24 100644 (file)
--- a/skelrc.h
+++ b/skelrc.h
@@ -14,13 +14,18 @@
 (defun skelrc-c-guard-name ()
   (if buffer-file-name
       (skelrc-c-sanitize-guard
-       (file-name-sans-extension (file-name-nondirectory buffer-file-name)))
+       (concat
+       (let ((pre (or (skelrc-assq 'guard-prefix skel-alist)
+                      (skelrc-assq 'library skel-alist)
+                      (skelrc-assq 'Library skel-alist))))
+         (if pre (concat pre "/")))
+       (file-name-nondirectory buffer-file-name)))
     (skel-lookup 'include-guard-name)))
 
 (setq skel-alist
       (append
        '((preamble . "[[guard]][[c++-guard]][[includes]][[structures]][[functions]]")
-        (guard . "#ifndef [[guard-name]]_H\n#define [[guard-name]]_H\n\n")
+        (guard . "#ifndef [[guard-name]]\n#define [[guard-name]]\n\n")
         (guard-name . (skelrc-c-guard-name))
         (c++-guard . "#ifdef __cplusplus\n  extern \"C\" {\n#endif\n\n")
         (includes . "[[includes-banner]]\n\n[[headers]]")