[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 1e9df93 13/14: Merge branch 'master' of git.sv.gnu.org:/sr
From: |
Rocky Bernstein |
Subject: |
[elpa] master 1e9df93 13/14: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs/elpa |
Date: |
Wed, 25 Feb 2015 01:24:41 +0000 |
branch: master
commit 1e9df930c91d46208fe55bcde58c763992496dc4
Merge: 8bacd50 286ef6a
Author: rocky <address@hidden>
Commit: rocky <address@hidden>
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs/elpa
---
packages/jgraph-mode/jgraph-mode.el | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/packages/jgraph-mode/jgraph-mode.el
b/packages/jgraph-mode/jgraph-mode.el
index a56449e..ea2a0d2 100644
--- a/packages/jgraph-mode/jgraph-mode.el
+++ b/packages/jgraph-mode/jgraph-mode.el
@@ -1,9 +1,9 @@
;;; jgraph-mode.el --- Major mode for Jgraph files -*- lexical-binding:t -*-
-;; Copyright (C) 2006, 2011-2012, 2014 Free Software Foundation, Inc
+;; Copyright (C) 2006, 2011-2012, 2014, 2015 Free Software Foundation, Inc
;; Author: Stefan Monnier <address@hidden>
-;; Version: 1.0
+;; Version: 1.1
;; Package-Requires: ((cl-lib "0.5"))
;; Keywords: tex, wp
@@ -138,7 +138,8 @@
(,(concat "\\_<"
(regexp-opt (cons "include"
(apply 'append (mapcar 'cdr jgraph-commands))))
- "\\_>") . font-lock-keyword-face)
+ "\\_>")
+ . font-lock-keyword-face)
)
"Keyword highlighting specification for `jgraph-mode'.")
@@ -172,6 +173,20 @@
;;;###autoload
(add-to-list 'auto-mode-alist '("\\.jgr\\'" . jgraph-mode))
+(defun jgraph--syntax-end-of-string (limit)
+ (when (eq t (nth 3 (syntax-ppss)))
+ (when (re-search-forward "\\(?:\\=\\|[^\\]\\)\\(\n\\)" limit t)
+ (put-text-property (match-beginning 1) (match-end 1)
+ 'syntax-table (string-to-syntax "|")))))
+
+(defun jgraph--syntax-propertize (start end)
+ (goto-char start)
+ (jgraph--syntax-end-of-string end)
+ (funcall
+ (syntax-propertize-rules
+ ("\\s-:\\(\\s-\\)" (1 (prog1 "|" (jgraph--syntax-end-of-string end)))))
+ start end))
+
;;;###autoload
(define-derived-mode jgraph-mode prog-mode "Jgraph"
"A major mode for editing Jgraph files."
@@ -182,9 +197,7 @@
(set (make-local-variable 'font-lock-defaults)
'(jgraph-font-lock-keywords))
(set (make-local-variable 'syntax-propertize-function)
- (syntax-propertize-rules
- ;; FIXME: naive(broken) multiline pattern.
- ("\\s-\\(:\\)\\s-\\(?:.*\\\\\n\\)*.*\\(\n\\)" (1 "|") (2 "|"))))
+ #'jgraph--syntax-propertize)
(set (make-local-variable 'indent-line-function) 'jgraph-indent-line)
;; (set (make-local-variable 'imenu-generic-expression)
;; jgraph-imenu-generic-expression)
@@ -195,7 +208,6 @@
(defcustom jgraph-indent-offset 4
"Basic indentation step size in `jgraph-mode'."
- :group 'jgraph-mode
:type 'integer)
(defun jgraph-indent-line ()
- [elpa] master fd0e5ca 06/14: with-relative-file is now idempotent and tests!, (continued)
- [elpa] master fd0e5ca 06/14: with-relative-file is now idempotent and tests!, Rocky Bernstein, 2015/02/24
- [elpa] master c72495c 08/14: Change require to path relative load., Rocky Bernstein, 2015/02/24
- [elpa] master 44980ef 07/14: Merge pull request #4 from phillord/feature/find-file-relative, Rocky Bernstein, 2015/02/24
- [elpa] master 933969e 05/14: Merge pull request #3 from phillord/feature/find-file-relative, Rocky Bernstein, 2015/02/24
- [elpa] master c0eb1f2 09/14: Commentary updates for new functions., Rocky Bernstein, 2015/02/24
- [elpa] master 8bacd50 03/14: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs/elpa, Rocky Bernstein, 2015/02/24
- [elpa] master 4e7b211 11/14: Thank you, Phil Lord!, Rocky Bernstein, 2015/02/24
- [elpa] master 61be439 10/14: Merge pull request #5 from phillord/feature/find-file-relative, Rocky Bernstein, 2015/02/24
- [elpa] master a0983c1 14/14: Merge commit '0e1d1440e4819d76cc68b213431722884af66e89', Rocky Bernstein, 2015/02/24
- [elpa] master 0e1d144 12/14: Bump version number, Rocky Bernstein, 2015/02/24
- [elpa] master 1e9df93 13/14: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs/elpa,
Rocky Bernstein <=