From 87523aedc8a36a3be17e2918b0c8bd43cbe3618c Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Thu, 20 Dec 2012 09:05:41 +0400 Subject: [PATCH] * vc/ediff-ptch.el (ediff-map-patch-buffer): Use `point-min-marker'. Adjust comment. --- lisp/ChangeLog | 5 +++++ lisp/vc/ediff-ptch.el | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f61eb7b2bfd..c5ad40f5b15 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-12-20 Dmitry Antipov + + * vc/ediff-ptch.el (ediff-map-patch-buffer): Use `point-min-marker'. + Adjust comment. + 2012-12-19 Jonas Bernoulli * emacs-lisp/lisp-mnt.el (lm-section-end): Always end before the diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el index def450373cf..b6a59ce2770 100644 --- a/lisp/vc/ediff-ptch.el +++ b/lisp/vc/ediff-ptch.el @@ -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 -- 2.39.5