andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(sort-columns): Don't use external 'sort' on ms-windows. Otherwise,

Browse source 
do use it if the region only contains font-lock text properties.
This commit is contained in:
Richard M. Stallman 2004-03-05 11:31:58 +00:00
parent e4ff63a27c
commit 2e8d40a1da
2 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2004-03-04 Jesper Harder <harder@ifa.au.dk>
* sort.el (sort-columns): Don't use external 'sort' on ms-windows.
Otherwise, do use it if the region only contains font-lock text
properties.
2004-03-04 Masatake YAMATO <jet@gyve.org>
* hexl.el (hexl-mode): Set `hexl-print-current-point-info'

23
lisp/sort.el
View file

@ -480,19 +480,30 @@ 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 (eq system-type 'vax-vms)
(text-properties-at beg1)
(< (next-property-change beg1 nil end1) end1)))
(if (not (or (memq system-type '(vax-vms windows-nt ms-dos))
(let ((pos beg1) plist fontified)
(catch 'found
(while (< pos end1)
(setq plist (text-properties-at pos))
(setq fontified (plist-get plist 'fontified))
(while (consp plist)
(unless (or (eq (car plist) 'fontified)
(and (eq (car plist) 'face)
fontified))
(throw 'found t))
(setq plist (cddr plist)))
(setq pos (next-property-change pos nil end1)))))))
;; Use the sort utility if we can; it is 4 times as fast.
;; Do not use it if there are any properties in the region,
;; since the sort utility would lose the properties.
;; 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")
(concat "+0." (int-to-string col-start))
(concat "-0." (int-to-string col-end)))))
(when sort-fold-case
(push "-f" sort-args))
(apply #'call-process-region beg1 end1 "sort" t t nil sort-args))
;; On VMS, use Emacs's own facilities.
;; On VMS and ms-windows, use Emacs's own facilities.
(save-excursion
(save-restriction
(narrow-to-region beg1 end1)