From: Pip Cet <pipcet@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: 36190@debbugs.gnu.org
Subject: bug#36190: 27.0.50; `put-text-property' etc. with buffer argument calls current buffer's `after-change-functions'
Date: Sat, 15 Jun 2019 19:27:30 +0000 [thread overview]
Message-ID: <CAOqdjBc85g11BWqVFViAURuh3sqrphWbUNJ6KvuKcF_F8u4L0Q@mail.gmail.com> (raw)
In-Reply-To: <83wohmvpng.fsf@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 724 bytes --]
On Sat, Jun 15, 2019 at 3:23 PM Eli Zaretskii <eliz@gnu.org> wrote:
> > From: Pip Cet <pipcet@gmail.com>
> > Date: Sat, 15 Jun 2019 15:14:43 +0000
> > Cc: 36190@debbugs.gnu.org
> >
> > How about simply emulating (with-current-buffer buffer
> > (put-text-property ...)), as the attached patch does? That should fix
> > the immediate problem.
>
> Looks better to me, but I'd suggest a comment explaining why we do
> such an unusual thing.
Sounds good to me. The attached patch contains the comments and a hint
in the documentation. (Maybe the comments should be a FIXME, because
there's really no need to switch buffers at all when there are no
applicable hooks?)
Obviously, feel free to reword as you consider appropriate.
[-- Attachment #2: 0001-Update-current-buffer-when-changing-text-properties.patch --]
[-- Type: text/x-patch, Size: 4965 bytes --]
From 01784e6b16c40aef362f39519a4e8b29982c8fcd Mon Sep 17 00:00:00 2001
From: Pip Cet <pipcet@gmail.com>
Date: Sat, 15 Jun 2019 15:12:14 +0000
Subject: [PATCH] Update current buffer when changing text properties.
* src/textprop.c (add_text_properties_1, set_text_properties)
(set_text_properties_1, Fremove_text_properties):
---
doc/lispref/text.texi | 2 +-
src/textprop.c | 58 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 59 insertions(+), 1 deletion(-)
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 2e7c497f57..035fea6a6b 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -2800,7 +2800,7 @@ Examining Properties
These functions handle both strings and buffers. Keep in mind that
positions in a string start from 0, whereas positions in a buffer start
-from 1.
+from 1. Passing a buffer other than the current buffer may be slow.
@defun get-text-property pos prop &optional object
This function returns the value of the @var{prop} property of the
diff --git a/src/textprop.c b/src/textprop.c
index ae42c44185..56f276b9ad 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -1141,6 +1141,17 @@ DEFUN ("previous-single-property-change", Fprevious_single_property_change,
add_text_properties_1 (Lisp_Object start, Lisp_Object end,
Lisp_Object properties, Lisp_Object object,
enum property_set_type set_type) {
+ /* Ensure we run the modification hooks for the right buffer,
+ without switching buffers twice (bug 36190). */
+ if (BUFFERP (object) && XBUFFER (object) != current_buffer)
+ {
+ ptrdiff_t count = SPECPDL_INDEX ();
+ record_unwind_current_buffer ();
+ set_buffer_internal (XBUFFER (object));
+ return unbind_to (count, add_text_properties_1 (start, end, properties,
+ object, set_type));
+ }
+
INTERVAL i, unchanged;
ptrdiff_t s, len;
bool modified = false;
@@ -1342,6 +1353,17 @@ face(s) are retained. This is done by setting the `face' property to
set_text_properties (Lisp_Object start, Lisp_Object end, Lisp_Object properties,
Lisp_Object object, Lisp_Object coherent_change_p)
{
+ /* Ensure we run the modification hooks for the right buffer,
+ without switching buffers twice (bug 36190). */
+ if (BUFFERP (object) && XBUFFER (object) != current_buffer)
+ {
+ ptrdiff_t count = SPECPDL_INDEX ();
+ record_unwind_current_buffer ();
+ set_buffer_internal (XBUFFER (object));
+ return unbind_to (count, set_text_properties (start, end, properties,
+ object, coherent_change_p));
+ }
+
INTERVAL i;
bool first_time = true;
@@ -1412,6 +1434,19 @@ set_text_properties (Lisp_Object start, Lisp_Object end, Lisp_Object properties,
set_text_properties_1 (Lisp_Object start, Lisp_Object end,
Lisp_Object properties, Lisp_Object object, INTERVAL i)
{
+ /* Ensure we run the modification hooks for the right buffer,
+ without switching buffers twice (bug 36190). */
+ if (BUFFERP (object) && XBUFFER (object) != current_buffer)
+ {
+ ptrdiff_t count = SPECPDL_INDEX ();
+ record_unwind_current_buffer ();
+ set_buffer_internal (XBUFFER (object));
+
+ set_text_properties_1 (start, end, properties, object, i);
+ unbind_to (count, Qnil);
+ return;
+ }
+
INTERVAL prev_changed = NULL;
ptrdiff_t s = XFIXNUM (start);
ptrdiff_t len = XFIXNUM (end) - s;
@@ -1494,6 +1529,17 @@ DEFUN ("remove-text-properties", Fremove_text_properties,
Use `set-text-properties' if you want to remove all text properties. */)
(Lisp_Object start, Lisp_Object end, Lisp_Object properties, Lisp_Object object)
{
+ /* Ensure we run the modification hooks for the right buffer,
+ without switching buffers twice (bug 36190). */
+ if (BUFFERP (object) && XBUFFER (object) != current_buffer)
+ {
+ ptrdiff_t count = SPECPDL_INDEX ();
+ record_unwind_current_buffer ();
+ set_buffer_internal (XBUFFER (object));
+ return unbind_to (count, Fremove_text_properties (start, end, properties,
+ object));
+ }
+
INTERVAL i, unchanged;
ptrdiff_t s, len;
bool modified = false;
@@ -1606,6 +1652,18 @@ DEFUN ("remove-list-of-text-properties", Fremove_list_of_text_properties,
Return t if any property was actually removed, nil otherwise. */)
(Lisp_Object start, Lisp_Object end, Lisp_Object list_of_properties, Lisp_Object object)
{
+ /* Ensure we run the modification hooks for the right buffer,
+ without switching buffers twice (bug 36190). */
+ if (BUFFERP (object) && XBUFFER (object) != current_buffer)
+ {
+ ptrdiff_t count = SPECPDL_INDEX ();
+ record_unwind_current_buffer ();
+ set_buffer_internal (XBUFFER (object));
+ return unbind_to (count, Fremove_list_of_text_properties (start, end,
+ list_of_properties,
+ object));
+ }
+
INTERVAL i, unchanged;
ptrdiff_t s, len;
bool modified = false;
--
2.20.1
next prev parent reply other threads:[~2019-06-15 19:27 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-13 13:48 bug#36190: 27.0.50; `put-text-property' etc. with buffer argument calls current buffer's `after-change-functions' Pip Cet
2019-06-13 16:36 ` Eli Zaretskii
2019-06-13 18:48 ` Pip Cet
2019-06-13 19:05 ` Eli Zaretskii
2019-06-13 19:27 ` Eli Zaretskii
2019-06-13 19:42 ` Pip Cet
2019-06-13 20:01 ` Eli Zaretskii
2019-06-13 20:57 ` Pip Cet
2019-06-13 21:37 ` Pip Cet
2019-06-14 7:41 ` Eli Zaretskii
2019-06-14 11:14 ` Pip Cet
2019-06-14 12:10 ` Eli Zaretskii
2019-06-15 15:14 ` Pip Cet
2019-06-15 15:23 ` Eli Zaretskii
2019-06-15 19:27 ` Pip Cet [this message]
2019-07-06 8:08 ` Eli Zaretskii
2019-07-06 15:27 ` Pip Cet
2019-07-06 16:22 ` Eli Zaretskii
2019-06-14 7:36 ` Eli Zaretskii
2019-06-17 11:38 ` Pip Cet
2019-06-17 15:59 ` Eli Zaretskii
2019-06-18 17:14 ` Pip Cet
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=CAOqdjBc85g11BWqVFViAURuh3sqrphWbUNJ6KvuKcF_F8u4L0Q@mail.gmail.com \
--to=pipcet@gmail.com \
--cc=36190@debbugs.gnu.org \
--cc=eliz@gnu.org \
/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.