Commit 595ef4ad authored by Juanma Barranquero's avatar Juanma Barranquero
Browse files

lisp/textmodes/texinfmt.el: Fix bug#11640 (reverts part of 2008-07-31T05:33:56Z!dann@ics.uci.edu).

(texinfo-format-printindex): Use `texinfo-sort-region' in all platforms,
instead of calling external sort utility.
(texinfo-sort-region, texinfo-sort-startkeyfun): Restore functions.
parent d4a8f5c1
2012-06-08 Juanma Barranquero <lekktu@gmail.com>
* textmodes/texinfmt.el: Fix bug#11640 (reverts part of 2008-07-31T05:33:56Z!dann@ics.uci.edu).
(texinfo-format-printindex): Use `texinfo-sort-region' in all platforms,
instead of calling external sort utility.
(texinfo-sort-region, texinfo-sort-startkeyfun): Restore functions.
2012-06-08 Eli Zaretskii <eliz@gnu.org>
 
* descr-text.el (describe-char): Mention how to insert the
......
......@@ -2957,6 +2957,28 @@ Default is to leave paragraph indentation as is."
("pg" . texinfo-format-pindex)
("ky" . texinfo-format-kindex)))
;;; Sort and index
;; Sort an index which is in the current buffer between START and END.
(defun texinfo-sort-region (start end)
(require 'sort)
(save-restriction
(narrow-to-region start end)
(goto-char (point-min))
(sort-subr nil 'forward-line 'end-of-line 'texinfo-sort-startkeyfun)))
;; Subroutine for sorting an index.
;; At start of a line, return a string to sort the line under.
(defun texinfo-sort-startkeyfun ()
(let ((line (buffer-substring-no-properties (point) (line-end-position))))
;; Canonicalize whitespace and eliminate funny chars.
(while (string-match "[ \t][ \t]+\\|[^a-z0-9 ]+" line)
(setq line (concat (substring line 0 (match-beginning 0))
" "
(substring line (match-end 0)))))
line))
;;; @printindex
......@@ -2974,7 +2996,7 @@ Default is to leave paragraph indentation as is."
(insert "\n* Menu:\n\n")
(setq opoint (point))
(texinfo-print-index nil indexelts)
(shell-command-on-region opoint (point) "sort -fd" 1)))
(texinfo-sort-region opoint (point))))
(defun texinfo-print-index (file indexelts)
(while indexelts
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment