[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/gnuplot 6da76ee 052/184: Merge branch 'devel'
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/gnuplot 6da76ee 052/184: Merge branch 'devel' |
Date: |
Sun, 29 Aug 2021 11:03:14 -0400 (EDT) |
branch: elpa/gnuplot
commit 6da76eebd9d02568d94ed34aea8e701a88457f1b
Merge: 5030976 674a21d
Author: Jonathan Oddie <j.j.oddie@gmail.com>
Commit: Jonathan Oddie <j.j.oddie@gmail.com>
Merge branch 'devel'
---
gnuplot.el | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/gnuplot.el b/gnuplot.el
index afae5db..1ead637 100644
--- a/gnuplot.el
+++ b/gnuplot.el
@@ -1613,8 +1613,8 @@ These are highlighted using `font-lock-reference-face'.")
'("\\[\\([^]]+\\)\\]" 1 font-lock-reference-face)
;; variable/function definitions
- '("\\(\\<[a-z]+[a-z_0-9(),\t]*\\)[ \t]*=" 1
- font-lock-variable-name-face)
+
'("\\(\\(\\sw\\|\\s_\\)+\\s-*\\((\\s-*\\(\\sw\\|\\s_\\)*\\s-*\\(,\\s-*\\sw*\\)*\\s-*)\\)?\\s-*=\\)[^=]"
+ 1 font-lock-variable-name-face)
;; built-in function names
(cons (gnuplot-make-regexp gnuplot-keywords-builtin-functions)
@@ -1658,8 +1658,8 @@ These are highlighted using `font-lock-reference-face'.")
;; backslash to escape the newline
;;
;; - double quoted strings can contain escaped quotes \" and escaped
-;; backslashes \\, but there's no way to quote the delimiter in
-;; single quoted strings
+;; backslashes \\, while single quotes can escape the quote by
+;; doubling '' and backslash is not special (except at eol)
;;
;; - strings can end at newline without needing a closing delimiter
;;
@@ -1704,7 +1704,7 @@ string was found, otherwise nil."
(end-at-eob-p nil)
(re
(cond ((string= opener "#") nil)
- ((string= opener "'") "'")
+ ((string= opener "'") "''?")
((string= opener "\"") "\\\\\"\\|\\\\\\\\\\|\""))))
(while (not end)
(if (and (not (eobp)) (bolp) (eolp)) ; Empty continuation line:
@@ -1715,8 +1715,10 @@ string was found, otherwise nil."
(if end
(when (and re
- (or (string= (match-string 0) "\\\"")
- (string= (match-string 0) "\\\\")))
+ (let ((m (match-string 0)))
+ (or (string= m "\\\"")
+ (string= m "\\\\")
+ (string= m "''"))))
(setq end nil)) ; Skip over escapes and look again
;; We got to EOL without finding an ending delimiter
@@ -2300,7 +2302,6 @@ Add additional indentation for continuation lines."
;;
;; Functions for finding the start and end of continuation blocks
-;; (a bunch of
;;
;; Check if line containing point is a continuation
@@ -2866,6 +2867,7 @@ a list:
(if (or (fboundp 'hilit-set-mode-patterns)
(equal gnuplot-keywords-when 'immediately)) ; <HW>
(gnuplot-setup-info-look)) ;; <SE>
+
(if (fboundp 'hilit-set-mode-patterns) ; deal with hilit19 (ho hum!)
(let ((keywords (concat "\\b\\(" (mapconcat 'identity
gnuplot-keywords "\\|")
- [nongnu] elpa/gnuplot 8169bb8 045/184: Minor updates to info pages for some "set" commands, (continued)
- [nongnu] elpa/gnuplot 8169bb8 045/184: Minor updates to info pages for some "set" commands, ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot a4d00db 014/184: Added gnuplot-comint-mode. Improved completion, version check (?), ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot ca6841b 041/184: Added experimental context-sensitive completion and help code., ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot 7cb3975 047/184: Cleaned up the tokenizer and got rid of gnuplot-token-at-point., ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot a276f0d 033/184: Fix bug #8: remove `eval-when-compile' from definition of `gnuplot-make-regexp', ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot cd73487 064/184: Remove other cruft, ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot 76cfd01 043/184: Lots of fixes to grammar, and some bugfixes., ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot 59f7a94 061/184: Better prompt tracking. Setup inline images on creating comint buffer., ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot 18dccc2 058/184: Merge branch 'context' into devel, ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot d4f8c3a 082/184: display progress while running parse tests, ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot 6da76ee 052/184: Merge branch 'devel',
ELPA Syncer <=
- [nongnu] elpa/gnuplot d26d498 062/184: Added a customization option for gnuplot-inline-image-mode., ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot d70c94a 065/184: Better docstrings for context-sensitive and inline-image modes, ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot 43effb0 068/184: Add gnuplot-context to makefiles., ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot f0b1ea7 085/184: Update lists of font-lock keywords., ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot 70dd22e 060/184: Keyboard shortcut and menu item for toggling inline mode., ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot a0fee02 086/184: use `many1' for iteration spec, and tweak its test case, ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot 2dc71de 077/184: Move window-full-height-p up with other compatibility hacks, ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot 3245468 084/184: Fixes to context-sensitive grammar, ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot a290617 079/184: Make info window/frame handling work alike in context and non-context modes, ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot af7e8de 073/184: Remove references to obsolete kw-compl and hilit19 packages, ELPA Syncer, 2021/08/29