diff options
author | 2015-10-19 14:42:22 -0400 | |
---|---|---|
committer | 2015-10-19 14:42:22 -0400 | |
commit | 9d12f9199103b3b98b3e3990bbf586ee0fd34130 (patch) | |
tree | a7863db3f0823fa648f3af83da11fe081aea48d5 /src/elisp/urweb-mode.el | |
parent | f425194d947691ceeaad9ec73fdc7c2c176ebfe3 (diff) | |
parent | 3256142dc01f7f173289a1910e726b662a877408 (diff) |
Merge.
Diffstat (limited to 'src/elisp/urweb-mode.el')
-rw-r--r-- | src/elisp/urweb-mode.el | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/elisp/urweb-mode.el b/src/elisp/urweb-mode.el index 5eb36bc4..bc71a052 100644 --- a/src/elisp/urweb-mode.el +++ b/src/elisp/urweb-mode.el @@ -246,7 +246,7 @@ See doc for the variable `urweb-mode-info'." ("\\<\\(signature\\)\\s-+\\(\\sw+\\)" (1 font-lock-keyword-face) (2 (amAttribute font-lock-interface-def-face))) - + (,urweb-keywords-regexp . font-lock-keyword-face) (,urweb-sql-keywords-regexp . font-lock-sql-face) (,urweb-cident-regexp . font-lock-cvariable-face)) @@ -377,7 +377,11 @@ See doc for the variable `urweb-mode-info'." (add-to-list 'auto-mode-alist '("\\.urs?\\'" . urweb-mode)) ;;;###autoload -(define-derived-mode urweb-mode fundamental-mode "Ur/Web" +(defalias 'urweb-mode-derived-from + (if (fboundp 'prog-mode) 'prog-mode 'fundamental-mode)) + +;;;###autoload +(define-derived-mode urweb-mode urweb-mode-derived-from "Ur/Web" "\\<urweb-mode-map>Major mode for editing Ur/Web code. This mode runs `urweb-mode-hook' just before exiting. \\{urweb-mode-map}" @@ -409,7 +413,7 @@ This mode runs `urweb-mode-hook' just before exiting. (set-syntax-table urweb-mode-syntax-table) (setq local-abbrev-table urweb-mode-abbrev-table) ;; A paragraph is separated by blank lines or ^L only. - + (set (make-local-variable 'indent-line-function) 'urweb-indent-line) (set (make-local-variable 'comment-start) "(* ") (set (make-local-variable 'comment-end) " *)") |