HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug #9221 with memory leak in bidi display.
[bpt/emacs.git]
/
lisp
/
sort.el
diff --git
a/lisp/sort.el
b/lisp/sort.el
index
02e4515
..
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, 2001, 2002, 2003,
-;;
2004, 2005, 2006, 2007, 2008
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
@@
-34,7
+34,7
@@
: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)
;;;###autoload(put 'sort-fold-case 'safe-local-variable 'booleanp)
: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
(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)
: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
(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))))
@@
-374,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")))
@@
-559,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