Follow subfile patch for info.el

--=-=-=
Content-Type: text/plain


[email protected] (Henry S. Thompson) writes:

> It appears that some releases of makeinfo, in particular 5.1, which
> ships with RHEL7, have a small incompatibility with the way we (and
> Emacs) read subfiles.  Although this problem doesn't arise in makeinfo
> 6, it would be good to fix it.  Fortunately Emacs has a fix, described
> here (along with analysis of the problem):
>
>   http://lists.gnu.org/archive/html/bug-texinfo/2013-04/msg00029.html
>
> Could we have this done to our info.el, please?  Note that it does
> _not_ break forward compatibility to do this, i.e it works with old
> (4.13), middle-aged (5.1) and young (6.0) versions of makeinfo.

Like so?

2015-09-26  Michael Sperber  <[email protected]>

	* info.el (Info-read-subfile): Follow change in Makeinfo 5.0 with
	arithmetic of node positions.

I'll push on Tuesday if nobody objects.

-- 
Regards,
Mike

--=-=-=
Content-Type: text/plain
Content-Disposition: inline

diff --git a/lisp/info.el b/lisp/info.el
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1440,7 +1440,7 @@
 	  (setq Info-current-subfile lastfilename)))
     (goto-char (point-min))
     (search-forward "\n\^_")
-    (+ (- nodepos lastfilepos) (point))))
+    (+ (- nodepos lastfilepos) (point-min))))
 
 (defun Info-all-case-regexp (str)
   (let ((regexp "")

--=-=-=
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
XEmacs-Beta mailing list
[email protected]
http://lists.xemacs.org/mailman/listinfo/xemacs-beta

--=-=-=--