(decipher-mode-map): Use command remapping instead of

[gnu-emacs] / lisp / sort.el

diff --git a/lisp/sort.el b/lisp/sort.el
index 0c5d1d9bae00380bd5ef4bd3d3c2d3cb07b4dc44..09123f42ab751fdc68ee55f18e4f4e71e8056130 100644 (file)
--- a/lisp/sort.el
+++ b/lisp/sort.el
@@ -1,6 +1,6 @@
-;;; sort.el --- commands to sort text in an Emacs buffer.
+;;; sort.el --- commands to sort text in an Emacs buffer
 
-;; Copyright (C) 1986, 1987, 1994, 1995 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 1987, 1994, 1995, 2003 Free Software Foundation, Inc.
 
 ;; Author: Howie Kaye
 ;; Maintainer: FSF
@@ -164,37 +164,45 @@ same as ENDRECFUN."
     sort-lists))
 
 (defun sort-reorder-buffer (sort-lists old)
-  (let ((inhibit-quit t)
-       (last (point-min))
-       (min (point-min)) (max (point-max)))
-    ;; Make sure insertions done for reordering
-    ;; do not go after any markers at the end of the sorted region,
-    ;; by inserting a space to separate them.
-    (goto-char (point-max))
-    (insert-before-markers " ")
-    (narrow-to-region min (1- (point-max)))
-    (while sort-lists
+  (let ((last (point-min))
+       (min (point-min)) (max (point-max))
+       (old-buffer (current-buffer))
+       temp-buffer)
+    (with-temp-buffer
+      ;; Record the temporary buffer.
+      (setq temp-buffer (current-buffer))
+
+      ;; Copy the sorted text into the temporary buffer.
+      (while sort-lists
+       (goto-char (point-max))
+       (insert-buffer-substring old-buffer
+                                last
+                                (nth 1 (car old)))
+       (goto-char (point-max))
+       (insert-buffer-substring old-buffer
+                                (nth 1 (car sort-lists))
+                                (cdr (cdr (car sort-lists))))
+       (setq last (cdr (cdr (car old)))
+             sort-lists (cdr sort-lists)
+             old (cdr old)))
       (goto-char (point-max))
-      (insert-buffer-substring (current-buffer)
-                              last
-                              (nth 1 (car old)))
-      (goto-char (point-max))
-      (insert-buffer-substring (current-buffer)
-                              (nth 1 (car sort-lists))
-                              (cdr (cdr (car sort-lists))))
-      (setq last (cdr (cdr (car old)))
-           sort-lists (cdr sort-lists)
-           old (cdr old)))
-    (goto-char (point-max))
-    (insert-buffer-substring (current-buffer)
-                            last
-                            max)
-    ;; Delete the original copy of the text.
-    (delete-region min max)
-    ;; Get rid of the separator " ".
-    (goto-char (point-max))
-    (narrow-to-region min (1+ (point)))
-    (delete-region (point) (1+ (point)))))
+      (insert-buffer-substring old-buffer last max)
+
+      ;; Copy the reordered text from the temporary buffer
+      ;; to the buffer we sorted (OLD-BUFFER).
+      (set-buffer old-buffer)
+      (let ((inhibit-quit t))
+       ;; Make sure insertions done for reordering
+       ;; do not go after any markers at the end of the sorted region,
+       ;; by inserting a space to separate them.
+       (goto-char max)
+       (insert-before-markers " ")
+       ;; Delete the original copy of the text.
+       (delete-region min max)
+       ;; Now replace the separator " " with the sorted text.
+       (goto-char (point-max))
+       (insert-buffer-substring temp-buffer)
+       (delete-region min (1+ min))))))
 
 ;;;###autoload
 (defun sort-lines (reverse beg end) 
@@ -433,7 +441,7 @@ sRegexp specifying key within record: \nr")
       (goto-char (point-min))
       (let (sort-regexp-record-end
            (sort-regexp-fields-regexp record-regexp))
-       (re-search-forward sort-regexp-fields-regexp)
+       (re-search-forward sort-regexp-fields-regexp nil t)
        (setq sort-regexp-record-end (point))
        (goto-char (match-beginning 0))
        (sort-subr reverse
@@ -460,10 +468,10 @@ sRegexp specifying key within record: \nr")
 ;;;###autoload
 (defun sort-columns (reverse &optional beg end)
   "Sort lines in region alphabetically by a certain range of columns.
-For the purpose of this command, the region includes
+For the purpose of this command, the region BEG...END includes
 the entire line that point is in and the entire line the mark is in.
 The column positions of point and mark bound the range of columns to sort on.
-A prefix argument means sort into reverse order.
+A prefix argument means sort into REVERSE order.
 The variable `sort-fold-case' determines whether alphabetic case affects
 the sort order.
 
@@ -486,7 +494,7 @@ Use \\[untabify] to convert tabs to spaces before sorting."
       (setq col-start (min col-beg1 col-end1))
       (setq col-end (max col-beg1 col-end1))
       (if (search-backward "\t" beg1 t)
-         (error "sort-columns does not work with tabs.  Use M-x untabify."))
+         (error "sort-columns does not work with tabs -- use M-x untabify"))
       (if (not (or (eq system-type 'vax-vms)
                   (text-properties-at beg1)
                   (< (next-property-change beg1 nil end1) end1)))
@@ -494,8 +502,8 @@ Use \\[untabify] to convert tabs to spaces before sorting."
          ;; Do not use it if there are any properties in the region,
          ;; since the sort utility would lose the properties.
          (let ((sort-args (list (if reverse "-rt\n" "-t\n")
-                                (concat "+0." col-start)
-                                (concat "-0." col-end))))
+                                (concat "+0." (int-to-string col-start))
+                                (concat "-0." (int-to-string col-end)))))
            (when sort-fold-case
              (push "-f" sort-args))
            (apply #'call-process-region beg1 end1 "sort" t t nil sort-args))