[Emacs-diffs] /srv/bzr/emacs/trunk r102312: Use line-beginning-position in some texinfo.el files.

[Glenn Morris]

------------------------------------------------------------
revno: 102312
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2010-11-09 20:35:18 -0800
message:
  Use line-beginning-position in some texinfo.el files.
  
  * lisp/textmodes/texnfo-upd.el (texinfo-all-menus-update)
  (texinfo-menu-copy-old-description, texinfo-start-menu-description)
  (texinfo-master-menu, texinfo-insert-node-lines)
  (texinfo-multiple-files-update):
  * lisp/textmodes/texinfmt.el (texinfo-append-refill, texinfo-copying):
  Use line-beginning-position.
modified:
  lisp/ChangeLog
  lisp/textmodes/texinfmt.el
  lisp/textmodes/texnfo-upd.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-11-10 04:30:21 +0000
+++ b/lisp/ChangeLog    2010-11-10 04:35:18 +0000
@@ -1,5 +1,12 @@
 2010-11-10  Glenn Morris  <address@hidden>
 
+       * textmodes/texnfo-upd.el (texinfo-all-menus-update)
+       (texinfo-menu-copy-old-description, texinfo-start-menu-description)
+       (texinfo-master-menu, texinfo-insert-node-lines)
+       (texinfo-multiple-files-update):
+       * textmodes/texinfmt.el (texinfo-append-refill, texinfo-copying):
+       Use line-beginning-position.
+
        * progmodes/cperl-mode.el (cperl-find-pods-heres, cperl-write-tags):
        No recent Emacs supports system-type `emx'.
 

=== modified file 'lisp/textmodes/texinfmt.el'
--- a/lisp/textmodes/texinfmt.el        2010-06-22 08:10:26 +0000
+++ b/lisp/textmodes/texinfmt.el        2010-11-10 04:35:18 +0000
@@ -663,11 +663,12 @@
         ;; Else
         ;; 3. Do not refill a paragraph containing @w or @*, or ending
         ;;    with @<newline> followed by a newline.
-        (if  (or (>= (point) (point-max))
-                (re-search-forward
-                 "@w{\\|@\\*\\|@\n\n"
-                 (save-excursion (forward-paragraph) (forward-line 1) (point))
-                 t))
+        (if (or (>= (point) (point-max))
+                (re-search-forward
+                 "@w{\\|@\\*\\|@\n\n"
+                 (save-excursion (forward-paragraph)
+                                 (line-beginning-position 2))
+                 t))
             ;; Go to end of paragraph and do nothing.
             (forward-paragraph)
           ;; 4. Else go to end of paragraph and insert @refill
@@ -944,8 +945,8 @@
         (end  (progn (re-search-forward "address@hidden copying[ \t]*\n") 
(point))))
     (setq texinfo-copying-text
           (buffer-substring-no-properties
-           (save-excursion (goto-char beg) (forward-line 1) (point))
-           (save-excursion (goto-char end) (forward-line -1) (point))))
+           (save-excursion (goto-char beg) (line-beginning-position 2))
+           (save-excursion (goto-char end) (line-beginning-position 0))))
     (delete-region beg end)))
 
 (defun texinfo-insertcopying ()
@@ -4297,5 +4298,4 @@
 ;;; Place `provide' at end of file.
 (provide 'texinfmt)
 
-;; arch-tag: 1e8d9a2d-bca0-40a0-ac6c-dab01bc6f725
 ;;; texinfmt.el ends here

=== modified file 'lisp/textmodes/texnfo-upd.el'
--- a/lisp/textmodes/texnfo-upd.el      2010-11-06 20:23:42 +0000
+++ b/lisp/textmodes/texnfo-upd.el      2010-11-10 04:35:18 +0000
@@ -1,7 +1,7 @@
 ;;; texnfo-upd.el --- utilities for updating nodes and menus in Texinfo files
 
-;; Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Robert J. Chassell
 ;; Maintainer: address@hidden
@@ -349,9 +349,7 @@
        (when (search-forward texinfo-master-menu-header nil t)
          ;; Check if @detailmenu kludge is used;
          ;; if so, leave point before @detailmenu.
-         (search-backward "address@hidden"
-                          (save-excursion (forward-line -3) (point))
-                          t)
+         (search-backward "address@hidden" (line-beginning-position -2) t)
          ;; Remove detailed master menu listing
          (setq master-menu-p t)
          (goto-char (match-beginning 0))
@@ -627,9 +625,7 @@
        (point)
        (save-excursion
         (re-search-forward "\\(^\\* \\|address@hidden|address@hidden menu\\)" 
end-of-menu t)
-        (forward-line -1)
-        (end-of-line)                  ; go to end of last description line
-        (point)))
+        (line-end-position 0)))        ; end of last description line
     ""))
 
 (defun texinfo-menu-end ()
@@ -737,16 +733,14 @@
        (skip-chars-forward " \t")
        (setq beginning (point))
        ;; Menu entry line ends in a period, comma, or tab.
-       (if (re-search-forward "[.,\t]"
-                              (save-excursion (forward-line 1) (point)) t)
+       (if (re-search-forward "[.,\t]" (line-beginning-position 2) t)
            (progn
              (if (looking-at "[ \t]*[^ \t\n]+")
                  (error "Descriptive text already exists"))
              (skip-chars-backward "., \t")
              (setq node-name (buffer-substring beginning (point))))
          ;; Menu entry line ends in a return.
-         (re-search-forward ".*\n"
-                            (save-excursion (forward-line 1) (point)) t)
+         (re-search-forward ".*\n" (line-beginning-position 2) t)
          (skip-chars-backward " \t\n")
          (setq node-name (buffer-substring beginning (point)))
          (if (= 0 (length node-name))
@@ -904,9 +898,7 @@
          (progn
            ;; Check if @detailmenu kludge is used;
            ;; if so, leave point before @detailmenu.
-           (search-backward "address@hidden"
-                            (save-excursion (forward-line -3) (point))
-                            t)
+           (search-backward "address@hidden" (line-beginning-position -2) t)
            ;; Remove detailed master menu listing
            (goto-char (match-beginning 0))
            (let ((end-of-detailed-menu-descriptions
@@ -941,9 +933,7 @@
            (goto-char (match-beginning 0))
            ;; Check if @detailmenu kludge is used;
            ;; if so, leave point before @detailmenu.
-           (search-backward "address@hidden"
-                            (save-excursion (forward-line -3) (point))
-                            t)
+           (search-backward "address@hidden" (line-beginning-position -2) t)
            (insert "\n")
            (delete-blank-lines)
            (goto-char (point-min))))
@@ -1449,6 +1439,7 @@
           (end-of-line)                ; this handles prev node top case
           (re-search-backward          ; when point is already
            "address@hidden"                    ; at the beginning of @node line
+           ;; FIXME this can't be right.  Missing the point?
            (save-excursion (forward-line -3))
            t)
           (setq name (texinfo-copy-node-name)))
@@ -1649,7 +1640,8 @@
           "address@hidden"
           ;; Avoid finding previous node line if node lines are close.
           (or last-section-position
-              (save-excursion (forward-line -2) (point))) t)
+              (line-beginning-position -1))
+          t)
          ;;  @node is present, and point at beginning of that line
          (forward-word 1)          ; Leave point just after @node.
        ;; Else @node missing; insert one.
@@ -1671,7 +1663,7 @@
                  (message "Inserted title %s ... " title)))))
       ;; Go forward beyond current section title.
       (re-search-forward texinfo-section-types-regexp
-                        (save-excursion (forward-line 3) (point)) t)
+                        (line-beginning-position 4) t)
       (setq last-section-position (point))
       (forward-line 1))
 
@@ -2015,9 +2007,7 @@
                (goto-char (match-beginning 0))
                ;; Check if @detailmenu kludge is used;
                ;; if so, leave point before @detailmenu.
-               (search-backward "address@hidden"
-                                (save-excursion (forward-line -3) (point))
-                                t)
+               (search-backward "address@hidden" (line-beginning-position -2) 
t)
                ;; Remove detailed master menu listing
                (let ((end-of-detailed-menu-descriptions
                       (save-excursion  ; beginning of end menu line