From a6a3601e69c34f037f8742c08b5950a7013fe612 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 29 Dec 2015 12:16:18 -0500 Subject: sisu-mode.el apply patch from Kevin Ryde of 2015-12-18 --- data/doc/sisu/CHANGELOG_v7 | 3 +++ data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el | 17 +++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v7 b/data/doc/sisu/CHANGELOG_v7 index 8e8d136c..e2941211 100644 --- a/data/doc/sisu/CHANGELOG_v7 +++ b/data/doc/sisu/CHANGELOG_v7 @@ -23,6 +23,9 @@ Reverse Chronological: * sisu_7.1.7.orig.tar.xz (Open commit window: 2015-12-29; Pre-Release) http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.1.7 + * emacs sisu-mode.el + * apply patch from Kevin Ryde of 2015-12-18 + * sisu_7.1.6.orig.tar.xz (2015-12-15:50/2) http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_7.1.6 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 03b2ebfa..7dbdaa53 100644 --- a/data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el +++ b/data/sisu/conf/editor-syntax-etc/emacs/sisu-mode.el @@ -470,8 +470,7 @@ ;; enables outlining for sisu (add-hook 'sisu-mode-hook '(lambda () - (outline-minor-mode) - (setq outline-regexp "^\\(\\([1-4]\\|:?[A-D]\\)\\~\\|\\@[a-z]+:\\( \\|$\\)\\)"))) + (outline-minor-mode))) ;;; outline mode "folding" if available ;;; TODO make sure linum (line numbering) is off, else performance penalty, sucks bigtime @@ -491,7 +490,7 @@ ;; C-c @ C-d hide subtree at cursor location ;; Sisu & Autoload: -;; ##autoload +;;;###autoload (define-derived-mode sisu-mode text-mode "SiSU" "Major mode for editing SiSU files." (interactive) @@ -505,6 +504,9 @@ (make-local-variable 'paragraph-ignore-fill-prefix) (setq paragraph-ignore-fill-prefix t) + (set (make-local-variable 'outline-regexp) + "^\\(\\([1-4]\\|:?[A-D]\\)\\~\\|\\@[a-z]+:\\( \\|$\\)\\)") + (make-local-variable 'require-final-newline) (setq require-final-newline t) @@ -517,9 +519,12 @@ )) (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)) +;;;###autoload +(add-to-list 'auto-mode-alist '("\\.sst\\'" . sisu-mode)) +;;;###autoload +(add-to-list 'auto-mode-alist '("\\.ssm\\'" . sisu-mode)) +;;;###autoload +(add-to-list 'auto-mode-alist '("\\.ssi\\'" . sisu-mode)) ;;;; ChangeLog: -- cgit v1.2.3