summaryrefslogtreecommitdiff
path: root/src/textprop.c
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2015-05-27 22:42:33 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2015-05-27 22:42:33 -0400
commitf655987d63e181deb5e6fef1f93b409d96184fae (patch)
treecd6b7a1510e03b33fbaa72fa86d95ac10945f5b9 /src/textprop.c
parent6c52e9b93b68795d1876718d8f3c1d57bf7f6d91 (diff)
downloademacs-f655987d63e181deb5e6fef1f93b409d96184fae.tar.gz
Un-revert changes mistakenly dropped by f9fabb2b
Diffstat (limited to 'src/textprop.c')
-rw-r--r--src/textprop.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/textprop.c b/src/textprop.c
index 0a591d0e05f..96d88edebd2 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -2344,8 +2344,16 @@ returned. */);
DEFVAR_LISP ("inhibit-point-motion-hooks", Vinhibit_point_motion_hooks,
doc: /* If non-nil, don't run `point-left' and `point-entered' text properties.
-This also inhibits the use of the `intangible' text property. */);
- Vinhibit_point_motion_hooks = Qnil;
+This also inhibits the use of the `intangible' text property.
+
+This variable is obsolete since Emacs-25.1. Use `cursor-intangible-mode'
+or `cursor-sensor-mode' instead. */);
+ /* FIXME: We should make-obsolete-variable, but that signals too many
+ warnings in code which does (let ((inhibit-point-motion-hooks t)) ...)
+ Ideally, make-obsolete-variable should let us specify that only the nil
+ value is obsolete, but that requires too many changes in bytecomp.el,
+ so for now we'll keep it "obsolete via the docstring". */
+ Vinhibit_point_motion_hooks = Qt;
DEFVAR_LISP ("text-property-default-nonsticky",
Vtext_property_default_nonsticky,