[Emacs-diffs] scratch/gnus-cloud 73e10a8 15/28: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[Teodor Zlatanov]

branch: scratch/gnus-cloud
commit 73e10a81a807177829992448d673c03d2db942e6
Merge: 864e344 a8e1414c
Author: Ted Zlatanov <address@hidden>
Commit: Ted Zlatanov <address@hidden>

    Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---
 lisp/sort.el    |    5 +++--
 src/Makefile.in |    1 -
 2 files changed, 3 insertions(+), 3 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))
diff --git a/src/Makefile.in b/src/Makefile.in
index 8639eff..89f7a92 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -407,7 +407,6 @@ base_obj = dispnew.o frame.o scroll.o xdisp.o menu.o 
$(XMENU_OBJ) window.o \
        $(XWIDGETS_OBJ) \
        profiler.o decompress.o \
        $(if $(HYBRID_MALLOC),sheap.o) \
-       $(SHEAP_OBJ) \
        $(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ) \
        $(W32_OBJ) $(WINDOW_SYSTEM_OBJ) $(XGSELOBJ)
 obj = $(base_obj) $(NS_OBJC_OBJ)