[COMMIT (pkgs)] Backward compatibility in texinfo
NOTE: This patch has been committed.
Hi!
This makes the packages compile on my machine using a stable 21.4.15
XEmacs.
norbert.
ChangeLog addition:
2004-12-08 Norbert Koch <viteno(a)xemacs.org>
* texinfmt.el (texinfo-format-region):
* texinfmt.el (texinfo-format-buffer-1):
* texinfmt.el (texinfo-sort-startkeyfun):
line-(beginning|end)-position -> point-at-(b|e)ol. The former are
not known in 21.4.
texinfo source patch:
Diff command: cvs -f -z3 -q diff -u -N
Files affected: texinfmt.el
Index: texinfmt.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/texinfo/texinfmt.el,v
retrieving revision 1.12
diff -u -r1.12 texinfmt.el
--- texinfmt.el 7 Dec 2004 10:28:25 -0000 1.12
+++ texinfmt.el 8 Dec 2004 19:16:15 -0000
＠＠ -282,9 +282,9 ＠＠
(goto-char (point-min))
;; Remove `＠setfilename' line from included file, if any,
;; so ＠setfilename command not duplicated.
- (if (re-search-forward "^＠setfilename" (line-end-position 100) t)
- (delete-region (line-beginning-position 1)
- (line-beginning-position 2)))))))
+ (if (re-search-forward "^＠setfilename" (point-at-eol 100) t)
+ (delete-region (point-at-bol 1)
+ (point-at-bol 2)))))))
;; Raise or lower level of each section, if necessary.
(goto-char (point-min))
＠＠ -306,7 +306,7 ＠＠
(goto-char (point-min))
(if (looking-at "\\\\input[ \t]+texinfo")
- (delete-region (point) (line-beginning-position 2)))
+ (delete-region (point) (point-at-bol 2)))
;; Insert Info region title text.
(goto-char (point-min))
＠＠ -439,7 +439,7 ＠＠
(let ((filename (concat input-directory
(texinfo-parse-line-arg))))
(re-search-backward "^＠include")
- (delete-region (point) (line-beginning-position 2))
+ (delete-region (point) (point-at-bol 2))
(message "Reading included file: %s" filename)
(save-excursion
(save-restriction
＠＠ -449,9 +449,9 ＠＠
(goto-char (point-min))
;; Remove `＠setfilename' line from included file, if any,
;; so ＠setfilename command not duplicated.
- (if (re-search-forward "^＠setfilename" (line-end-position 100) t)
- (delete-region (line-beginning-position 1)
- (line-beginning-position 2)))))))
+ (if (re-search-forward "^＠setfilename" (point-at-eol 100) t)
+ (delete-region (point-at-bol 1)
+ (point-at-bol 2)))))))
;; Raise or lower level of each section, if necessary.
(goto-char (point-min))
(texinfo-raise-lower-sections)
＠＠ -3044,7 +3044,7 ＠＠
;; 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))))
+ (let ((line (buffer-substring-no-properties (point) (point-at-eol))))
;; Canonicalize whitespace and eliminate funny chars.
(while (string-match "[ \t][ \t]+\\|[^a-z0-9 ]+" line)
(setq line (concat (substring line 0 (match-beginning 0))