emacs-diffs
[Top][All Lists]
Advanced

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

[Emacs-diffs] master a8e1414c: Fix delete-duplicate-lines


From: Stephen Berman
Subject: [Emacs-diffs] master a8e1414c: Fix delete-duplicate-lines
Date: Thu, 14 Jul 2016 07:55:47 +0000 (UTC)

branch: master
commit a8e1414c0d66903884059361ecc8ec70da37cf35
Author: Stephen Berman <address@hidden>
Commit: Stephen Berman <address@hidden>

    Fix delete-duplicate-lines
    
    * lisp/sort.el (delete-duplicate-lines): Delete duplicate
    first line when operating backward (bug#23863).
---
 lisp/sort.el |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/sort.el b/lisp/sort.el
index 4d7311f..8bc7138 100644
--- a/lisp/sort.el
+++ b/lisp/sort.el
@@ -596,7 +596,7 @@ is non-nil, it also prints a message describing the number 
of deletions."
           (equal current-prefix-arg '(64))
           t)))
   (let ((lines (unless adjacent (make-hash-table :test 'equal)))
-       line prev-line
+       line prev-line first-line
        (count 0)
        (beg (copy-marker beg))
        (end (copy-marker end)))
@@ -604,8 +604,9 @@ is non-nil, it also prints a message describing the number 
of deletions."
       (goto-char (if reverse end beg))
       (if (and reverse (bolp)) (forward-char -1))
       (while (if reverse
-                (and (> (point) beg) (not (bobp)))
+                (not first-line)
               (and (< (point) end) (not (eobp))))
+       (setq first-line (and reverse (or (<= (point) beg) (bobp))))
        (setq line (buffer-substring-no-properties
                    (line-beginning-position) (line-end-position)))
         (if (and keep-blanks (string= "" line))



reply via email to

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