Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
a5fa8eb4
Commit
a5fa8eb4
authored
Nov 25, 2013
by
Stefan Monnier
Browse files
* src/textprop.c (text_property_stickiness): Fix front-stickiness at BOB.
parent
5f5b128d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
src/ChangeLog
src/ChangeLog
+2
-0
src/textprop.c
src/textprop.c
+4
-4
No files found.
src/ChangeLog
View file @
a5fa8eb4
2013-11-25 Stefan Monnier <monnier@iro.umontreal.ca>
* textprop.c (text_property_stickiness): Fix front-stickiness at BOB.
* frame.c (Fhandle_focus_in, Fhandle_focus_out): Move to frame.el.
(syms_of_frame): Don't defsubr them.
...
...
src/textprop.c
View file @
a5fa8eb4
...
...
@@ -1820,7 +1820,7 @@ int
text_property_stickiness
(
Lisp_Object
prop
,
Lisp_Object
pos
,
Lisp_Object
buffer
)
{
Lisp_Object
prev_pos
,
front_sticky
;
bool
is_rear_sticky
=
1
,
is_front_sticky
=
0
;
/* defaults */
bool
is_rear_sticky
=
true
,
is_front_sticky
=
false
;
/* defaults */
Lisp_Object
defalt
=
Fassq
(
prop
,
Vtext_property_default_nonsticky
);
if
(
NILP
(
buffer
))
...
...
@@ -1841,10 +1841,10 @@ text_property_stickiness (Lisp_Object prop, Lisp_Object pos, Lisp_Object buffer)
?
Fmemq
(
prop
,
rear_non_sticky
)
:
rear_non_sticky
))
/* PROP is rear-non-sticky. */
is_rear_sticky
=
0
;
is_rear_sticky
=
false
;
}
else
return
0
;
is_rear_sticky
=
false
;
/* Consider following character. */
/* This signals an arg-out-of-range error if pos is outside the
...
...
@@ -1855,7 +1855,7 @@ text_property_stickiness (Lisp_Object prop, Lisp_Object pos, Lisp_Object buffer)
||
(
CONSP
(
front_sticky
)
&&
!
NILP
(
Fmemq
(
prop
,
front_sticky
))))
/* PROP is inherited from after. */
is_front_sticky
=
1
;
is_front_sticky
=
true
;
/* Simple cases, where the properties are consistent. */
if
(
is_rear_sticky
&&
!
is_front_sticky
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment