Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
12038f9f
Commit
12038f9f
authored
Jun 26, 2003
by
Stefan Monnier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(save_excursion_restore, transpose_markers): Update for new types.
parent
65745fad
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
9 deletions
+8
-9
src/editfns.c
src/editfns.c
+8
-9
No files found.
src/editfns.c
View file @
12038f9f
...
...
@@ -868,7 +868,7 @@ save_excursion_restore (info)
/* Point marker. */
tem
=
XCAR
(
info
);
Fgoto_char
(
tem
);
unchain_marker
(
tem
);
unchain_marker
(
XMARKER
(
tem
)
)
;
/* Mark marker. */
info
=
XCDR
(
info
);
...
...
@@ -876,7 +876,7 @@ save_excursion_restore (info)
omark
=
Fmarker_position
(
current_buffer
->
mark
);
Fset_marker
(
current_buffer
->
mark
,
tem
,
Fcurrent_buffer
());
nmark
=
Fmarker_position
(
tem
);
unchain_marker
(
tem
);
unchain_marker
(
XMARKER
(
tem
)
)
;
/* visible */
info
=
XCDR
(
info
);
...
...
@@ -3814,7 +3814,7 @@ transpose_markers (start1, end1, start2, end2,
register
int
start1_byte
,
end1_byte
,
start2_byte
,
end2_byte
;
{
register
int
amt1
,
amt1_byte
,
amt2
,
amt2_byte
,
diff
,
diff_byte
,
mpos
;
register
Lisp_Object
marker
;
register
struct
Lisp_Marker
*
marker
;
/* Update point as if it were a marker. */
if
(
PT
<
start1
)
...
...
@@ -3849,10 +3849,9 @@ transpose_markers (start1, end1, start2, end2,
amt1_byte
=
(
end2_byte
-
start2_byte
)
+
(
start2_byte
-
end1_byte
);
amt2_byte
=
(
end1_byte
-
start1_byte
)
+
(
start2_byte
-
end1_byte
);
for
(
marker
=
BUF_MARKERS
(
current_buffer
);
!
NILP
(
marker
);
marker
=
XMARKER
(
marker
)
->
chain
)
for
(
marker
=
BUF_MARKERS
(
current_buffer
);
marker
;
marker
=
marker
->
next
)
{
mpos
=
marker
_
byte
_
pos
ition
(
marker
)
;
mpos
=
marker
->
bytepos
;
if
(
mpos
>=
start1_byte
&&
mpos
<
end2_byte
)
{
if
(
mpos
<
end1_byte
)
...
...
@@ -3861,9 +3860,9 @@ transpose_markers (start1, end1, start2, end2,
mpos
+=
diff_byte
;
else
mpos
-=
amt2_byte
;
XMARKER
(
marker
)
->
bytepos
=
mpos
;
marker
->
bytepos
=
mpos
;
}
mpos
=
XMARKER
(
marker
)
->
charpos
;
mpos
=
marker
->
charpos
;
if
(
mpos
>=
start1
&&
mpos
<
end2
)
{
if
(
mpos
<
end1
)
...
...
@@ -3873,7 +3872,7 @@ transpose_markers (start1, end1, start2, end2,
else
mpos
-=
amt2
;
}
XMARKER
(
marker
)
->
charpos
=
mpos
;
marker
->
charpos
=
mpos
;
}
}
...
...
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