[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Proposed patch for Bug#24627
From: |
Tino Calancha |
Subject: |
Proposed patch for Bug#24627 |
Date: |
Thu, 27 Oct 2016 18:26:47 +0900 (JST) |
User-agent: |
Alpine 2.20 (DEB 67 2015-01-07) |
Dear all,
if no further comments in ~1 week, then i will push following fix
into master branch.
Thank you.
Tino
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
From 2539012f0e3966874b5645d440ec9e23b7b528b5 Mon Sep 17 00:00:00 2001
From: Tino Calancha <address@hidden>
Date: Thu, 27 Oct 2016 18:18:45 +0900
Subject: [PATCH] (thing-at-point 'list) return nil if no list at point
* lisp/thingatpt.el (thing-at-point-bounds-of-list-at-point):
Check first if we are at the beginning of a top-level sexp (Bug#24627).
If point is inside a comment or string, look for a list out of the
comment/string.
Escape '[' in doc string.
* test/lisp/thingatpt-tests.el (thing-at-point-bug24627): Update
expected test result as pass.
---
lisp/thingatpt.el | 25 ++++++++++---------------
test/lisp/thingatpt-tests.el | 1 -
2 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index 6d1014b..e423630 100644
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -219,22 +219,17 @@ 'beginning-of-sexp
(defun thing-at-point-bounds-of-list-at-point ()
"Return the bounds of the list at point.
-[Internal function used by `bounds-of-thing-at-point'.]"
+\[Internal function used by `bounds-of-thing-at-point'.]"
(save-excursion
- (let ((opoint (point))
- (beg (ignore-errors
- (up-list -1)
- (point))))
- (ignore-errors
- (if beg
- (progn (forward-sexp)
- (cons beg (point)))
- ;; Are we are at the beginning of a top-level sexp?
- (forward-sexp)
- (let ((end (point)))
- (backward-sexp)
- (if (>= opoint (point))
- (cons opoint end))))))))
+ (let* ((st (parse-partial-sexp (point-min) (point)))
+ (beg (or (and (eq 4 (car (syntax-after (point))))
+ (not (nth 8 st))
+ (point))
+ (nth 1 st))))
+ (when beg
+ (goto-char beg)
+ (forward-sexp)
+ (cons beg (point))))))
;; Defuns
diff --git a/test/lisp/thingatpt-tests.el b/test/lisp/thingatpt-tests.el
index 71d2c88..9d72db4 100644
--- a/test/lisp/thingatpt-tests.el
+++ b/test/lisp/thingatpt-tests.el
@@ -88,7 +88,6 @@ thing-at-point-test-data
;; `thing-at-point-bounds-of-list-at-point'.
(ert-deftest thing-at-point-bug24627 ()
"Test for http://debbugs.gnu.org/24627 ."
- :expected-result :failed
(let ((string-result '(("(a \"b\" c)" . (a "b" c))
(";(a \"b\" c)")
("(a \"b\" c\n)" . (a "b" c))
--
2.9.3
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
In GNU Emacs 26.0.50.8 (x86_64-pc-linux-gnu, GTK+ Version 3.22.1)
of 2016-10-27
Repository revision: 0465bf511521ea780a61f1a0eb67731280e689a5
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Proposed patch for Bug#24627,
Tino Calancha <=