Merge with CEDET upstream (rev. 8564).

2 files changed, 6 insertions, 1 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 8822992dfcb..53dab540e54 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-02  Eric Ludlam <zappo@gnu.org>
+
+        * srecode/c.srt (header_guard): Add :c parameter so it works
+        standalone
+
 2013-06-01  Alex Ott  <alexott@gmail.com>
 
         * tutorials/TUTORIAL.ru: Fix incorrectly translated wording.
diff --git a/etc/srecode/c.srt b/etc/srecode/c.srt
index 479f5c9b33d..03e4c369307 100644
--- a/etc/srecode/c.srt
+++ b/etc/srecode/c.srt
@@ -44,7 +44,7 @@ template empty :time :user :file :c
 {{/HEADER}}
 ----
 
-template header_guard :file :blank
+template header_guard :file :blank :c
 ----
 #ifndef {{FILENAME_SYMBOL:upcase}}
 #define {{FILENAME_SYMBOL:upcase}} 1