;;; sort.el --- commands to sort text in an Emacs buffer
-;; Copyright (C) 1986, 1987, 1994, 1995, 2002, 2003,
-;; 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 1987, 1994, 1995, 2001, 2002, 2003, 2004, 2005,
+;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Howie Kaye
;; Maintainer: FSF
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
: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)
;;;###autoload
(defun sort-subr (reverse nextrecfun endrecfun
(let ((last (point-min))
(min (point-min)) (max (point-max))
(old-buffer (current-buffer))
+ (mb enable-multibyte-characters)
temp-buffer)
(with-temp-buffer
+ (set-buffer-multibyte mb)
;; Record the temporary buffer.
(setq temp-buffer (current-buffer))
(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
(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)
;;;###autoload
(defun sort-numeric-fields (field beg end)
(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))))
(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")))
(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)
;; 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.
- (let ((sort-args (list (if reverse "-rt\n" "-t\n")
+ ;; 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)
(1+ col-end)))))
(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)
(provide 'sort)
-;;; arch-tag: fbac12be-2a7b-4c8a-9665-264d61f70bd9
;;; sort.el ends here