all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Tino Calancha <tino.calancha@gmail.com>
To: "Andreas Röhler" <andreas.roehler@easy-emacs.de>
Cc: 24627@debbugs.gnu.org, Tino Calancha <tino.calancha@gmail.com>
Subject: bug#24627: 24.5; (thing-at-point 'list) may return a non-empty string without a list
Date: Thu, 13 Oct 2016 17:50:05 +0900	[thread overview]
Message-ID: <87eg3keipu.fsf@gmail.com> (raw)
In-Reply-To: <a8758564-4610-5dd0-2bec-7d968b2cf473@easy-emacs.de> ("Andreas \=\?utf-8\?Q\?R\=C3\=B6hler\=22's\?\= message of "Wed, 12 Oct 2016 09:10:42 +0200")

Andreas Röhler <andreas.roehler@easy-emacs.de> writes:

> beg still needs a check like
>
> (not (nth 8 (parse-partial-sexp (point-min) (point))))
>
> otherwise it could match inside a string or comment

I have the feeling that this should return the local list
at point, even if inside a string or comment.  Then, if
point is inside a comment/string and there is no list there,
the function might look for a list around (i.e., outside) that
comment/string region.  See patch below.

Anyway, neither the doc string of `thing-at-point' nor
`thing-at-point-bounds-of-list-at-point' mention what expect
when point is inside a comment/string.  That's why i believe it
might be better to request that in a different bug report.
Writting additional tests also might be helpful to find a robust implementation.

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
From bfc9b7fb739dfeab09c2ffd064a6ebe65a28b686 Mon Sep 17 00:00:00 2001
From: Tino Calancha <tino.calancha@gmail.com>
Date: Thu, 13 Oct 2016 16:34:35 +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 found a list inside a comment or string return it.  Otherwise, look
for a list around the comment/string.
Escape '[' in doc string.
---
 lisp/thingatpt.el | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index 6d1014b..656d2c7 100644
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -219,22 +219,26 @@ '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))))
+    (let* ((opoint (point))
+	   (st (syntax-ppss))
+	   (find-list-fn (lambda ()
+                           (ignore-errors
+                             (up-list -1)
+                             (point))))
+	   (beg (if (eq 4 (car (syntax-after (point))))
+		    (point)
+		  (funcall find-list-fn))))
+      ;; If inside a string or comment and there is no list
+      ;; at point, check for a list surrounding the string/comment region.
+      (when (and (nth 8 st) (= opoint (point)))
+	(goto-char (nth 8 st))
+	(setq beg (funcall find-list-fn)))
       (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))))))))
+        (when beg
+          (forward-sexp)
+          (cons beg (point)))))))
 
 ;; Defuns
 
-- 
2.9.3

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
In GNU Emacs 26.0.50.1 (x86_64-pc-linux-gnu, GTK+ Version 3.22.1)
 of 2016-10-13
Repository revision: 1dd54e3eef7543720eff161457677a35fae2435c





  reply	other threads:[~2016-10-13  8:50 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-06  9:43 bug#24627: 24.5; (thing-at-point 'list) may return a non-empty string without a list Tino Calancha
2016-10-07  6:42 ` Andreas Röhler
2016-10-11  3:42   ` Tino Calancha
2016-10-11 15:37     ` Andreas Röhler
2016-10-11 16:29       ` Tino Calancha
2016-10-11 16:47         ` Noam Postavsky
2016-10-11 17:09           ` Tino Calancha
2016-10-11 17:15             ` Noam Postavsky
2016-10-11 17:21               ` Tino Calancha
2016-10-11 17:16         ` bug#24627: "internal" designation [was: bug#24627: 24.5; (thing-at-point 'list) ...] Drew Adams
2016-10-11 17:21           ` Drew Adams
2016-10-11 17:20         ` Drew Adams
2016-10-11 19:13           ` Andreas Röhler
2016-10-12  5:11             ` "internal" designation [ Tino Calancha
2016-10-12  6:47               ` Andreas Röhler
2016-10-11 18:40         ` bug#24627: 24.5; (thing-at-point 'list) may return a non-empty string without a list Andreas Röhler
2016-10-12  4:58           ` Tino Calancha
2016-10-12  7:10             ` Andreas Röhler
2016-10-13  8:50               ` Tino Calancha [this message]
2016-10-13 17:50                 ` Andreas Röhler
2016-10-15  9:44                   ` Tino Calancha
2016-10-15 10:26                     ` Andreas Röhler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87eg3keipu.fsf@gmail.com \
    --to=tino.calancha@gmail.com \
    --cc=24627@debbugs.gnu.org \
    --cc=andreas.roehler@easy-emacs.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.