Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned!

[gnu-emacs] / lisp / sort.el

diff --git a/lisp/sort.el b/lisp/sort.el
index 10426fa5244a55c1679a5b0adb4985c1e79edfbc..99293d6b51b7e9a2684e2a5eaad62f982174b915 100644 (file)
--- a/lisp/sort.el
+++ b/lisp/sort.el
@@ -248,7 +248,7 @@ the sort order."
     (while (< i 256)
       (modify-syntax-entry i "w" table)
       (setq i (1+ i)))
-    (modify-syntax-entry ?\  " " table)
+    (modify-syntax-entry ?\s " " table)
     (modify-syntax-entry ?\t " " table)
     (modify-syntax-entry ?\n " " table)
     (modify-syntax-entry ?\. "_" table)        ; for floating pt. numbers. -wsr
@@ -505,10 +505,8 @@ Use \\[untabify] to convert tabs to spaces before sorting."
          ;; Use the sort utility if we can; it is 4 times as fast.
          ;; Do not use it if there are any non-font-lock properties
          ;; in the region, since the sort utility would lose the
-         ;; properties.
-         ;; Set the field separator to tab to have the same effect as 
-         ;; sort-columns which makes sure there are no tabs in the region
-         ;; worked.
+         ;; properties.  Tabs are used as field separator; on NetBSD,
+         ;; sort complains if "\n" is used as field separator.
          (let ((sort-args (list (if reverse "-rt\t" "-t\t")
                                 (format "-k1.%d,1.%d"
                                         (1+ col-start)