diff options
| author | Joakim Verona | 2013-06-12 12:32:25 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-06-12 12:32:25 +0200 |
| commit | e6fa6da6899bf1b4877b96c450eae3934085d560 (patch) | |
| tree | 48e6fda463d24a792ec8428fb8044a250ee2ff82 /etc/srecode | |
| parent | 4f0994366d33f8f76db4662cc126720866df3461 (diff) | |
| parent | 84d6f46535554f9f51aae3314313112e8d755c65 (diff) | |
| download | emacs-e6fa6da6899bf1b4877b96c450eae3934085d560.tar.gz emacs-e6fa6da6899bf1b4877b96c450eae3934085d560.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/Makefile.in
src/keyboard.c
src/termhooks.h
Diffstat (limited to 'etc/srecode')
| -rw-r--r-- | etc/srecode/c.srt | 2 |
1 files changed, 1 insertions, 1 deletions
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 | |||
| 44 | {{/HEADER}} | 44 | {{/HEADER}} |
| 45 | ---- | 45 | ---- |
| 46 | 46 | ||
| 47 | template header_guard :file :blank | 47 | template header_guard :file :blank :c |
| 48 | ---- | 48 | ---- |
| 49 | #ifndef {{FILENAME_SYMBOL:upcase}} | 49 | #ifndef {{FILENAME_SYMBOL:upcase}} |
| 50 | #define {{FILENAME_SYMBOL:upcase}} 1 | 50 | #define {{FILENAME_SYMBOL:upcase}} 1 |