[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/gnuplot 2387f12 016/184: Restored some XEmacs compatibilit
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/gnuplot 2387f12 016/184: Restored some XEmacs compatibility that I broke. |
Date: |
Sun, 29 Aug 2021 11:03:06 -0400 (EDT) |
branch: elpa/gnuplot
commit 2387f12f6bf0dbaf7db95f108ba8ca010d0e672f
Author: Jonathan Oddie <j.j.oddie@gmail.com>
Commit: Jonathan Oddie <j.j.oddie@gmail.com>
Restored some XEmacs compatibility that I broke.
- use \\s- and \\S- instead of [[:space:]] in regexps
- use a save-excursion instead of looking-back for finding
continuation lines
- put a condition-case around gnuplot-continuation-line-p in case
we're at beginning of buffer
---
gnuplot.el | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/gnuplot.el b/gnuplot.el
index d880d1f..03aca8e 100644
--- a/gnuplot.el
+++ b/gnuplot.el
@@ -1718,7 +1718,9 @@ This sets `gnuplot-recently-sent' to 'line."
(gnuplot-back-to-continuation-beginning)
(setq start (point))
(end-of-line)
- (while (looking-back "\\\\") ; go to end of last
continuation line
+ (while (save-excursion
+ (backward-char)
+ (looking-at "\\\\")) ; go to end of last
continuation line
(end-of-line 2))
(beginning-of-line 2)
(setq end (point)))
@@ -2085,7 +2087,7 @@ Add additional indentation for continuation lines."
(progn
(gnuplot-back-to-continuation-beginning)
(back-to-indentation)
- (re-search-forward "[^[:space:]]+[[:space:]]+" (point-at-eol)
'end-at-limit)
+ (re-search-forward "\\S-+\\s-+" (point-at-eol) 'end-at-limit)
(setq indent (- (point) (point-at-bol))))
;; Not a continuation line; go back to the first non-blank,
@@ -2093,7 +2095,7 @@ Add additional indentation for continuation lines."
(beginning-of-line 0)
(while (and (not (bobp))
(or (gnuplot-continuation-line-p)
- (looking-at "[[:space:]]*$")))
+ (looking-at "\\s-*$")))
(beginning-of-line 0))
(if (bobp)
(setq indent 0)
@@ -2110,8 +2112,12 @@ Add additional indentation for continuation lines."
(defun gnuplot-continuation-line-p ()
"Return t if the line containing point is a continuation line"
(save-excursion
- (end-of-line 0)
- (looking-back "\\\\")))
+ (condition-case ()
+ (progn
+ (end-of-line 0)
+ (backward-char)
+ (looking-at "\\\\"))
+ (error nil))))
;; Move point back to start of continued command
(defun gnuplot-back-to-continuation-beginning ()
- [nongnu] elpa/gnuplot 674a21d 040/184: Merge remote-tracking branch 'origin/devel' into devel, (continued)
- [nongnu] elpa/gnuplot 674a21d 040/184: Merge remote-tracking branch 'origin/devel' into devel, ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot de13740 038/184: Added experimental context-sensitive completion and help code., ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot 23f2060 032/184: Merge branch 'master' into devel, ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot 78d691b 003/184: Updated readme, ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot e679a59 002/184: import everything, ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot 00cb492 010/184: Improved continuation line handling by indentation & gnuplot-send-line-*, ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot a375477 031/184: Merge pull request #7 from mcraveiro/master, ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot 566e92f 027/184: Fixed a dumb bug in gnuplot-indent-line., ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot aba40f1 034/184: Document the change to `gnuplot-make-regexp', ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot 72ccda3 017/184: Improved syntax parsing and highlighting, ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot 2387f12 016/184: Restored some XEmacs compatibility that I broke.,
ELPA Syncer <=
- [nongnu] elpa/gnuplot df865fc 013/184: Slight change to font-lock regexps, and use buffer-local variables, ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot 0faec4f 022/184: Check that gnuplot-process is not nil in gnuplot-close-down, ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot 57fd4a2 036/184: Attempt to fix issue #9, void-function gnuplot-start-comint-function, ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot ca241a7 035/184: Merge remote-tracking branch 'origin/devel' into devel, ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot 7f29578 023/184: Minor improvements to movement-by-command functions, ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot 8d367f5 028/184: Better assignment-matching regexp (?), ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot 049f953 044/184: Use absolute locations in all jump/call/choice/commit instructions., ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot 40efb8e 067/184: Make loading of gnuplot work with and without gnuplot-context., ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot 0d2079a 056/184: Fixed a regression in 7cb3975 relating to scanning stack at end-of-command, ELPA Syncer, 2021/08/29
- [nongnu] elpa/gnuplot 2bf9779 063/184: Remove macro hacks for ancient Emacs versions, as per issue #12, ELPA Syncer, 2021/08/29