aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2013-05-05 11:48:44 +0300
committerJuri Linkov2013-05-05 11:48:44 +0300
commitd44014cb5dc85973be34d1d3392b3f6441ef945f (patch)
treea03d4d6eca4f6ed96eb91b6981c9ce61c8ac058c
parenta37d34f3b470e3fb4013e01d207488e3ddb78798 (diff)
downloademacs-d44014cb5dc85973be34d1d3392b3f6441ef945f.tar.gz
emacs-d44014cb5dc85973be34d1d3392b3f6441ef945f.zip
* lisp/info.el (Info-read-subfile): Use (point-min) instead of (point)
to not add the length of the summary segment to the return value. Fixes: debbugs:14125
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/info.el5
2 files changed, 10 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f7aa1d48fa0..77c6f0b450a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12013-05-05 Juri Linkov <juri@jurta.org>
2
3 * info.el (Info-read-subfile): Use (point-min) instead of (point)
4 to not add the length of the summary segment to the return value.
5 (Bug#14125)
6
12013-05-05 Leo Liu <sdl.web@gmail.com> 72013-05-05 Leo Liu <sdl.web@gmail.com>
2 8
3 * progmodes/octave.el (inferior-octave-strip-ctrl-g) 9 * progmodes/octave.el (inferior-octave-strip-ctrl-g)
diff --git a/lisp/info.el b/lisp/info.el
index 58ebf0b17da..f67dc9ab987 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1530,11 +1530,14 @@ a case-insensitive match is tried."
1530 ;; Widen in case we are in the same subfile as before. 1530 ;; Widen in case we are in the same subfile as before.
1531 (widen) 1531 (widen)
1532 (goto-char (point-min)) 1532 (goto-char (point-min))
1533 ;; Skip the summary segment for `Info-search'.
1533 (if (looking-at "\^_") 1534 (if (looking-at "\^_")
1534 (forward-char 1) 1535 (forward-char 1)
1535 (search-forward "\n\^_")) 1536 (search-forward "\n\^_"))
1537 ;; Don't add the length of the skipped summary segment to
1538 ;; the value returned to `Info-find-node-2'. (Bug#14125)
1536 (if (numberp nodepos) 1539 (if (numberp nodepos)
1537 (+ (- nodepos lastfilepos) (point))))) 1540 (+ (- nodepos lastfilepos) (point-min)))))
1538 1541
1539(defun Info-unescape-quotes (value) 1542(defun Info-unescape-quotes (value)
1540 "Unescape double quotes and backslashes in VALUE." 1543 "Unescape double quotes and backslashes in VALUE."