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
4d4cd289
Commit
4d4cd289
authored
Mar 28, 1994
by
Richard M. Stallman
Browse files
(emerge-goto-line): New function.
(emerge-convert-diffs-to-markers): Use it.
parent
3e01fd9d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
5 deletions
+17
-5
lisp/emerge.el
lisp/emerge.el
+17
-5
No files found.
lisp/emerge.el
View file @
4d4cd289
...
...
@@ -1432,6 +1432,12 @@ These characteristics are restored by `emerge-restore-buffer-characteristics'."
(
emerge-restore-variables
emerge-saved-variables
B-values
))))
;; Move to line DESIRED-LINE assuming we are at line CURRENT-LINE.
;; Return DESIRED-LINE.
(
defun
emerge-goto-line
(
desired-line
current-line
)
(
forward-line
(
-
desired-line
current-line
))
current-line
)
(
defun
emerge-convert-diffs-to-markers
(
A-buffer
B-buffer
merge-buffer
...
...
@@ -1449,7 +1455,13 @@ These characteristics are restored by `emerge-restore-buffer-characteristics'."
B-buffer
(
save-restriction
(
widen
)
(
count-lines
1
B-point-min
)))))
(
count-lines
1
B-point-min
))))
;; Record current line number in each buffer
;; so we don't have to count from the beginning.
(
a-line
A-hidden-lines
)
(
b-line
B-hidden-lines
))
(
emerge-eval-in-buffer
A-buffer
(
goto-char
(
point-min
)))
(
emerge-eval-in-buffer
B-buffer
(
goto-char
(
point-min
)))
(
while
lineno-list
(
let*
((
list-element
(
car
lineno-list
))
a-begin-marker
...
...
@@ -1466,15 +1478,15 @@ These characteristics are restored by `emerge-restore-buffer-characteristics'."
;; place markers at the appropriate places in the buffers
(
emerge-eval-in-buffer
A-buffer
(
goto-line
(
+
a-begin
A-hidden-lines
))
(
setq
a-line
(
emerge-
goto-line
(
+
a-begin
A-hidden-lines
)
a-line
)
)
(
setq
a-begin-marker
(
point-marker
))
(
goto-line
(
+
a-end
A-hidden-lines
))
(
setq
a-line
(
emerge-
goto-line
(
+
a-end
A-hidden-lines
)
a-line
)
)
(
setq
a-end-marker
(
point-marker
)))
(
emerge-eval-in-buffer
B-buffer
(
goto-line
(
+
b-begin
B-hidden-lines
))
(
setq
b-line
(
emerge-
goto-line
(
+
b-begin
B-hidden-lines
)
b-line
)
)
(
setq
b-begin-marker
(
point-marker
))
(
goto-line
(
+
b-end
B-hidden-lines
))
(
setq
b-line
(
emerge-
goto-line
(
+
b-end
B-hidden-lines
)
b-line
)
)
(
setq
b-end-marker
(
point-marker
)))
(
setq
merge-begin-marker
(
set-marker
(
make-marker
)
...
...
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