4 files changed, 15 insertions, 4 deletions
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index d482d65d..46665c49 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -38,6 +38,10 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.6.2.orig.tar.xz
   sisu_5.6.2.orig.tar.xz
   sisu_5.6.2-1.dsc
 
+* syntax hilighting, restrict heading matches, minor
+  * vim
+  * emacs
+
 %% 5.6.1.orig.tar.xz (2014-08-12:32/2)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.6.1
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.6.1-1
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index d1ddc7d5..047bee77 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -28,6 +28,10 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.2.3.orig.tar.xz
   sisu_6.2.3.orig.tar.xz
   sisu_6.2.3-1.dsc
 
+* syntax hilighting, restrict heading matches, minor
+  * vim
+  * emacs
+
 %% 6.2.2.orig.tar.xz (2014-08-12:32/2)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.2.2
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.2.2-1
diff --git a/data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el b/data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el
index fe0476fd..748e5f5c 100644
--- a/data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el
+++ b/data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el
@@ -264,7 +264,7 @@
       ;; line break (depreciated)
       (cons "<br>"                      'general-font-lock-red1)
       ;; Section titles
-      (list "^\\(\\([1-8]\\|:?[A-C]\\)\\~\\)\\(.*\\)"
+      (list "^\\(\\([1-4]\\|:?[A-D]\\)\\~\\)\\(.*\\)"
         '(1 sisu-title-1 t)
         '(3 sisu-title-2 t)
       )
@@ -355,5 +355,8 @@
     ))
   (run-hooks 'sisu-mode-hook)
 )
+(add-to-list 'auto-mode-alist '("\\.sst$" . sisu-mode))
+(add-to-list 'auto-mode-alist '("\\.ssm$" . sisu-mode))
+(add-to-list 'auto-mode-alist '("\\.ssi$" . sisu-mode))
 (provide 'sisu-mode)
 ;; sisu-mode.el ends here
diff --git a/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim b/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim
index 3bb1a5ea..30711a13 100644
--- a/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim
@@ -1,7 +1,7 @@
 " SiSU Vim syntax file
 " SiSU Maintainer: Ralph Amissah <ralph@amissah.com>
-" SiSU Markup:     SiSU (sisu-5.4.3)
-" Last Change:     2014-07-01
+" SiSU Markup:     SiSU (sisu-5.6.2)
+" Last Change:     2014-08-18
 " URL: <http://git.sisudoc.org/?p=code/sisu.git;a=blob;f=data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim;hb=HEAD>
 "(originally looked at Ruby Vim by Mirko Nasato)
 
@@ -94,7 +94,7 @@ syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_
 syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_make matchgroup=sisu_header start="^[@]make:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
 
 "% "Headings:
-syn region sisu_heading contains=sisu_mark_endnote,sisu_content_endnote,sisu_marktail,sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_ocn,sisu_error,sisu_error_wspace matchgroup=sisu_structure start="^\([1-8]\|:\?[A-D]\)\~\(\S\+\|[^-]\)" end="$"
+syn region sisu_heading contains=sisu_mark_endnote,sisu_content_endnote,sisu_marktail,sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_ocn,sisu_error,sisu_error_wspace matchgroup=sisu_structure start="^\([1-4]\|:\?[A-D]\)\~\(\S\+\|[^-]\)" end="$"
 
 "% "Block Group Text:
 " table