HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rudimentary support for vc-pull and vc-merge in Git and Mercurial.
[bpt/emacs.git]
/
lisp
/
sort.el
diff --git
a/lisp/sort.el
b/lisp/sort.el
index
798d2da
..
8ea3dec
100644
(file)
--- a/
lisp/sort.el
+++ b/
lisp/sort.el
@@
-1,7
+1,7
@@
;;; 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, 2002, 2003,
-;;
2004, 2005, 2006
Free Software Foundation, Inc.
+;; Copyright (C) 1986
-1987, 1994-1995, 2001-2011
+;; Free Software Foundation, Inc.
;; Author: Howie Kaye
;; Maintainer: FSF
;; Author: Howie Kaye
;; Maintainer: FSF
@@
-9,10
+9,10
@@
;; This file is part of GNU Emacs.
;; 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
;; 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 Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-20,9
+20,7
@@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; 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:
;;; Commentary:
@@
-36,9
+34,10
@@
:group 'data)
(defcustom sort-fold-case nil
: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)
:group 'sort
:type 'boolean)
+;;;###autoload(put 'sort-fold-case 'safe-local-variable 'booleanp)
;;;###autoload
(defun sort-subr (reverse nextrecfun endrecfun
;;;###autoload
(defun sort-subr (reverse nextrecfun endrecfun
@@
-156,8
+155,10
@@
it defaults to `<', otherwise it defaults to `string<'."
(let ((last (point-min))
(min (point-min)) (max (point-max))
(old-buffer (current-buffer))
(let ((last (point-min))
(min (point-min)) (max (point-max))
(old-buffer (current-buffer))
+ (mb enable-multibyte-characters)
temp-buffer)
(with-temp-buffer
temp-buffer)
(with-temp-buffer
+ (set-buffer-multibyte mb)
;; Record the temporary buffer.
(setq temp-buffer (current-buffer))
;; Record the temporary buffer.
(setq temp-buffer (current-buffer))
@@
-248,16
+249,17
@@
the sort order."
(while (< i 256)
(modify-syntax-entry i "w" table)
(setq i (1+ i)))
(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
(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)
:group 'sort
:type 'integer)
+;;;###autoload(put 'sort-numeric-base 'safe-local-variable 'integerp)
;;;###autoload
(defun sort-numeric-fields (field beg end)
;;;###autoload
(defun sort-numeric-fields (field beg end)
@@
-359,8
+361,8
@@
the sort order."
(if (eolp)
(error "Line has too few fields: %s"
(buffer-substring
(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))))
(end-of-line)
;; Skip back across - N - 1 fields.
(let ((i (1- (- n))))
@@
-372,8
+374,8
@@
the sort order."
(if (bolp)
(error "Line has too few fields: %s"
(buffer-substring
(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")))
;; Position at the front of the field
;; even if moving backwards.
(skip-chars-backward "^ \t\n")))
@@
-489,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"))
(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)
(let ((pos beg1) plist fontified)
(catch 'found
(while (< pos end1)
@@
-514,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))
(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)
(save-excursion
(save-restriction
(narrow-to-region beg1 end1)
@@
-557,5
+559,4
@@
From a program takes two point or marker arguments, BEG and END."
(provide 'sort)
(provide 'sort)
-;;; arch-tag: fbac12be-2a7b-4c8a-9665-264d61f70bd9
;;; sort.el ends here
;;; sort.el ends here