[Emacs-diffs] Changes to emacs/lisp/textmodes/texinfmt.el,v

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/07/31 05:33:56

Index: lisp/textmodes/texinfmt.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/textmodes/texinfmt.el,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- lisp/textmodes/texinfmt.el  6 May 2008 04:33:13 -0000       1.94
+++ lisp/textmodes/texinfmt.el  31 Jul 2008 05:33:48 -0000      1.95
@@ -2963,29 +2963,6 @@
     ("ky" . texinfo-format-kindex)))
 
 
-;;; Sort and index (for VMS)
-
-;; Sort an index which is in the current buffer between START and END.
-;; Used on VMS, where the `sort' utility is not available.
-(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
 
 (put 'printindex 'texinfo-format 'texinfo-format-printindex)
@@ -3002,9 +2979,7 @@
     (insert "\n* Menu:\n\n")
     (setq opoint (point))
     (texinfo-print-index nil indexelts)
-    (if (memq system-type '(vax-vms windows-nt ms-dos))
-        (texinfo-sort-region opoint (point))
-      (shell-command-on-region opoint (point) "sort -fd" 1))))
+    (shell-command-on-region opoint (point) "sort -fd" 1)))
 
 (defun texinfo-print-index (file indexelts)
   (while indexelts