Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-17 01:34:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

* vc/ediff-ptch.el (ediff-map-patch-buffer): Use `point-min-marker'.

Browse source 
Adjust comment.
This commit is contained in:
Dmitry Antipov 2012-12-20 09:05:41 +04:00
parent ed7367b19a
commit 87523aedc8
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2012-12-20 Dmitry Antipov <dmantipov@yandex.ru>
* vc/ediff-ptch.el (ediff-map-patch-buffer): Use `point-min-marker'.
Adjust comment.
2012-12-19 Jonas Bernoulli <jonas@bernoul.li>
* emacs-lisp/lisp-mnt.el (lm-section-end): Always end before the

6
lisp/vc/ediff-ptch.el
View file

@ -190,15 +190,15 @@ program."
;; We usually come up with two candidates and ediff-file-name-sans-prefix
;; resolves this later.
;;
;; The marker `marker1' delimits the beginning of the corresponding patch and
;; `marker2' does it for the end.
;; The marker `mark1' delimits the beginning of the corresponding patch and
;; `mark2' does it for the end.
;; The result of ediff-map-patch-buffer is a list, which is then assigned
;; to ediff-patch-map.
;; The function returns the number of elements in the list ediff-patch-map
(defun ediff-map-patch-buffer (buf)
(ediff-with-current-buffer buf
(let ((count 0)
(mark1 (move-marker (make-marker) (point-min)))
(mark1 (point-min-marker))
(mark1-end (point-min))
(possible-file-names '("/dev/null" . "/dev/null"))
mark2-end mark2 filenames