From 5051f6e818c371cf314d1690e5d01a6b112da617 Mon Sep 17 00:00:00 2001 From: Magnus Henoch Date: Mon, 20 Jul 2009 15:37:50 -0800 Subject: [PATCH] * p4-lowlevel.el (p4-lowlevel-buffer-to-alist): Strip CR from end of line. [git-p4: depot-paths = "//guest/Ben_Key/vc-p4/,//guest/jonathan_kamens/vc-p4/,//guest/magnus_henoch/vc-p4/": change = 7331] --- p4-lowlevel.el | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/p4-lowlevel.el b/p4-lowlevel.el index 4b816e2..dfed451 100644 --- a/p4-lowlevel.el +++ b/p4-lowlevel.el @@ -142,6 +142,10 @@ block of untagged text (including newlines other than the last one). The alist is in the same order as the contents of the buffer." (save-excursion (if buffer (set-buffer buffer)) + ;; Strip CR from end of line + (goto-char (point-min)) + (while (search-forward "\r" nil t) + (delete-char -1)) (let (alist tag value (last-match-end (point-min))) (goto-char last-match-end)