diff options
| author | Dmitry Antipov | 2012-12-20 09:05:41 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2012-12-20 09:05:41 +0400 |
| commit | 87523aedc8a36a3be17e2918b0c8bd43cbe3618c (patch) | |
| tree | 55f835078a9697ec3c54133961f52eb96fd85690 | |
| parent | ed7367b19a22052629bdc80abb15868f9b344f83 (diff) | |
| download | emacs-87523aedc8a36a3be17e2918b0c8bd43cbe3618c.tar.gz emacs-87523aedc8a36a3be17e2918b0c8bd43cbe3618c.zip | |
* vc/ediff-ptch.el (ediff-map-patch-buffer): Use `point-min-marker'.
Adjust comment.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | 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 @@ | |||
| 1 | 2012-12-20 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 2 | |||
| 3 | * vc/ediff-ptch.el (ediff-map-patch-buffer): Use `point-min-marker'. | ||
| 4 | Adjust comment. | ||
| 5 | |||
| 1 | 2012-12-19 Jonas Bernoulli <jonas@bernoul.li> | 6 | 2012-12-19 Jonas Bernoulli <jonas@bernoul.li> |
| 2 | 7 | ||
| 3 | * emacs-lisp/lisp-mnt.el (lm-section-end): Always end before the | 8 | * 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." | |||
| 190 | ;; We usually come up with two candidates and ediff-file-name-sans-prefix | 190 | ;; We usually come up with two candidates and ediff-file-name-sans-prefix |
| 191 | ;; resolves this later. | 191 | ;; resolves this later. |
| 192 | ;; | 192 | ;; |
| 193 | ;; The marker `marker1' delimits the beginning of the corresponding patch and | 193 | ;; The marker `mark1' delimits the beginning of the corresponding patch and |
| 194 | ;; `marker2' does it for the end. | 194 | ;; `mark2' does it for the end. |
| 195 | ;; The result of ediff-map-patch-buffer is a list, which is then assigned | 195 | ;; The result of ediff-map-patch-buffer is a list, which is then assigned |
| 196 | ;; to ediff-patch-map. | 196 | ;; to ediff-patch-map. |
| 197 | ;; The function returns the number of elements in the list ediff-patch-map | 197 | ;; The function returns the number of elements in the list ediff-patch-map |
| 198 | (defun ediff-map-patch-buffer (buf) | 198 | (defun ediff-map-patch-buffer (buf) |
| 199 | (ediff-with-current-buffer buf | 199 | (ediff-with-current-buffer buf |
| 200 | (let ((count 0) | 200 | (let ((count 0) |
| 201 | (mark1 (move-marker (make-marker) (point-min))) | 201 | (mark1 (point-min-marker)) |
| 202 | (mark1-end (point-min)) | 202 | (mark1-end (point-min)) |
| 203 | (possible-file-names '("/dev/null" . "/dev/null")) | 203 | (possible-file-names '("/dev/null" . "/dev/null")) |
| 204 | mark2-end mark2 filenames | 204 | mark2-end mark2 filenames |