emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r111274: * vc/ediff-ptch.el (ediff-ma


From: Dmitry Antipov
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r111274: * vc/ediff-ptch.el (ediff-map-patch-buffer): Use `point-min-marker'.
Date: Thu, 20 Dec 2012 09:05:41 +0400
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 111274
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Thu 2012-12-20 09:05:41 +0400
message:
  * vc/ediff-ptch.el (ediff-map-patch-buffer): Use `point-min-marker'.
  Adjust comment.
modified:
  lisp/ChangeLog
  lisp/vc/ediff-ptch.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-12-19 19:51:40 +0000
+++ b/lisp/ChangeLog    2012-12-20 05:05:41 +0000
@@ -1,3 +1,8 @@
+2012-12-20  Dmitry Antipov  <address@hidden>
+
+       * vc/ediff-ptch.el (ediff-map-patch-buffer): Use `point-min-marker'.
+       Adjust comment.
+
 2012-12-19  Jonas Bernoulli  <address@hidden>
 
        * emacs-lisp/lisp-mnt.el (lm-section-end): Always end before the

=== modified file 'lisp/vc/ediff-ptch.el'
--- a/lisp/vc/ediff-ptch.el     2012-01-19 07:21:25 +0000
+++ b/lisp/vc/ediff-ptch.el     2012-12-20 05:05:41 +0000
@@ -190,15 +190,15 @@
 ;; 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


reply via email to

[Prev in Thread] Current Thread [Next in Thread]