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
fc30d803
Commit
fc30d803
authored
May 21, 2013
by
Stefan Monnier
Browse files
* src/search.c (looking_at_1): Only set last_thing_searched if the match
changed the match-data. Fixes: debbugs:14281
parent
c2d41179
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
10 deletions
+15
-10
src/ChangeLog
src/ChangeLog
+9
-4
src/search.c
src/search.c
+6
-6
No files found.
src/ChangeLog
View file @
fc30d803
2013-05-21 Barry OReilly <gundaetiapo@gmail.com>
* search.c (looking_at_1): Only set last_thing_searched if the match
changed the match-data (bug#14281).
2013-05-21 Dmitry Antipov <dmantipov@yandex.ru>
* xdisp.c (reseat_at_previous_visible_line_start):
...
...
@@ -8,8 +13,8 @@
* xfns.c (check_x_display_info): Don't use XINT for terminal object.
(Fx_display_pixel_width, Fx_display_pixel_height)
(Fx_display_mm_width, Fx_display_mm_height):
Mention
`display-monitor-attributes-list' in docstrings.
(Fx_display_mm_width, Fx_display_mm_height):
Mention
`display-monitor-attributes-list' in docstrings.
* nsfns.m (ns_get_screen): Remove function. All uses removed.
(check_ns_display_info): Sync with check_x_display_info in xfns.c.
...
...
@@ -25,8 +30,8 @@
(Fx_display_pixel_width, Fx_display_pixel_width): Return width or
height for all physical monitors as in X11.
* nsterm.m (x_display_pixel_width, x_display_pixel_height):
Return
pixel width or height for all physical monitors as in X11.
* nsterm.m (x_display_pixel_width, x_display_pixel_height):
Return
pixel width or height for all physical monitors as in X11.
2013-05-18 Paul Eggert <eggert@cs.ucla.edu>
...
...
src/search.c
View file @
fc30d803
...
...
@@ -328,18 +328,18 @@ looking_at_1 (Lisp_Object string, bool posix)
val
=
(
i
>=
0
?
Qt
:
Qnil
);
if
(
NILP
(
Vinhibit_changing_match_data
)
&&
i
>=
0
)
{
for
(
i
=
0
;
i
<
search_regs
.
num_regs
;
i
++
)
if
(
search_regs
.
start
[
i
]
>=
0
)
{
search_regs
.
start
[
i
]
=
BYTE_TO_CHAR
(
search_regs
.
start
[
i
]
+
BEGV_BYTE
);
search_regs
.
end
[
i
]
=
BYTE_TO_CHAR
(
search_regs
.
end
[
i
]
+
BEGV_BYTE
);
}
/* Set last_thing_searched only when match data is changed. */
if
(
NILP
(
Vinhibit_changing_match_data
))
search_regs
.
end
[
i
]
=
BYTE_TO_CHAR
(
search_regs
.
end
[
i
]
+
BEGV_BYTE
);
}
/* Set last_thing_searched only when match data is changed. */
XSETBUFFER
(
last_thing_searched
,
current_buffer
);
}
return
val
;
}
...
...
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