Merge from emacs-23

[gnu-emacs] / lisp / sort.el

diff --git a/lisp/sort.el b/lisp/sort.el
index 1c10a7377df04af12936271d1cad897168d13d43..404601a6f8a4795d4bce0e5f97d7696160d58e40 100644 (file)
--- a/lisp/sort.el
+++ b/lisp/sort.el
@@ -361,8 +361,8 @@ the sort order."
        (if (eolp)
            (error "Line has too few fields: %s"
                   (buffer-substring
-                   (save-excursion (beginning-of-line) (point))
-                   (save-excursion (end-of-line) (point))))))
+                   (line-beginning-position)
+                   (line-end-position)))))
     (end-of-line)
     ;; Skip back across - N - 1 fields.
     (let ((i (1- (- n))))
@@ -374,8 +374,8 @@ the sort order."
     (if (bolp)
        (error "Line has too few fields: %s"
               (buffer-substring
-               (save-excursion (beginning-of-line) (point))
-               (save-excursion (end-of-line) (point)))))
+               (line-beginning-position)
+               (line-end-position))))
     ;; Position at the front of the field
     ;; even if moving backwards.
     (skip-chars-backward "^ \t\n")))
@@ -559,5 +559,4 @@ From a program takes two point or marker arguments, BEG and END."
 
 (provide 'sort)
 
-;; arch-tag: fbac12be-2a7b-4c8a-9665-264d61f70bd9
 ;;; sort.el ends here