Add 2012 to FSF copyright years for Emacs files

[bpt/emacs.git] / lisp / sort.el

diff --git a/lisp/sort.el b/lisp/sort.el
index d08e07d..d38e475 100644 (file)
--- a/lisp/sort.el
+++ b/lisp/sort.el
@@ -1,7 +1,7 @@
 ;;; sort.el --- commands to sort text in an Emacs buffer
 
-;; Copyright (C) 1986, 1987, 1994, 1995, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1986-1987, 1994-1995, 2001-2012
+;;   Free Software Foundation, Inc.
 
 ;; Author: Howie Kaye
 ;; Maintainer: FSF
@@ -34,7 +34,7 @@
   :group 'data)
 
 (defcustom sort-fold-case nil
-  "*Non-nil if the buffer sort functions should ignore case."
+  "Non-nil if the buffer sort functions should ignore case."
   :group 'sort
   :type 'boolean)
 ;;;###autoload(put 'sort-fold-case 'safe-local-variable 'booleanp)
@@ -256,7 +256,7 @@ the sort order."
     (setq sort-fields-syntax-table table)))
 
 (defcustom sort-numeric-base 10
-  "*The default base used by `sort-numeric-fields'."
+  "The default base used by `sort-numeric-fields'."
   :group 'sort
   :type 'integer)
 ;;;###autoload(put 'sort-numeric-base 'safe-local-variable 'integerp)
@@ -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")))
@@ -491,7 +491,7 @@ Use \\[untabify] to convert tabs to spaces before sorting."
       (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"))
-      (if (not (or (memq system-type '(vax-vms windows-nt))
+      (if (not (or (memq system-type '(windows-nt))
                   (let ((pos beg1) plist fontified)
                     (catch 'found
                       (while (< pos end1)
@@ -516,7 +516,7 @@ Use \\[untabify] to convert tabs to spaces before sorting."
            (when sort-fold-case
              (push "-f" sort-args))
            (apply #'call-process-region beg1 end1 "sort" t t nil sort-args))
-       ;; On VMS and ms-windows, use Emacs's own facilities.
+       ;; On ms-windows, use Emacs's own facilities.
        (save-excursion
          (save-restriction
            (narrow-to-region beg1 end1)
@@ -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