summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuri Linkov <juri@jurta.org>2011-09-18 22:49:13 +0300
committerJuri Linkov <juri@jurta.org>2011-09-18 22:49:13 +0300
commitc9384295aa5f189930013c80955748604d10dd52 (patch)
tree5ca86afbfdf2dcb859c209aa8f6e88add233e683
parent3e62b7e0044df3960bc6b2b70814c6ca4831d7fb (diff)
downloademacs-c9384295aa5f189930013c80955748604d10dd52.tar.gz
* lisp/info.el (Info-file-supports-index-cookies): Increment
line-beginning-position's arg from 3 to 4 because makeinfo outputs one more line for long file names. Fixes: debbugs:4142
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/info.el2
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 459e360c8d7..62cdd4d61c9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-18 Juri Linkov <juri@jurta.org>
+
+ * info.el (Info-file-supports-index-cookies): Increment
+ line-beginning-position's arg from 3 to 4 because makeinfo outputs
+ one more line for long file names (bug#4142).
+
2011-09-18 Chong Yidong <cyd@stupidchicken.com>
* newcomment.el (comment-normalize-vars): If prompting for
diff --git a/lisp/info.el b/lisp/info.el
index 40959885edb..42278621bbc 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -540,7 +540,7 @@ in `Info-file-supports-index-cookies-list'."
(condition-case ()
(if (and (re-search-forward
"makeinfo[ \n]version[ \n]\\([0-9]+.[0-9]+\\)"
- (line-beginning-position 3) t)
+ (line-beginning-position 4) t)
(not (version< (match-string 1) "4.7")))
(setq found t))
(error nil))