Mercurial > emacs
comparison lisp/info.el @ 90519:138ce2701550
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 320-342)
- Update from CVS
- Merge from gnus--rel--5.10
- lisp/play/cookie1.el (cookie): Work properly when there's only one entry
- Add note about "link" button-class to etc/TODO
* gnus--rel--5.10 (patch 108-112)
- Merge from emacs--devo--0
- Clean up merge mistakes
- Update from CVS
- Update from CVS: texi/gnus.texi (Summary Buffer Lines): Fix typo.
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-86
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 06 Jul 2006 08:59:39 +0000 |
parents | a8190f7e546e f6293eaa5979 |
children | 8a8e69664178 |
comparison
equal
deleted
inserted
replaced
90518:64c755511769 | 90519:138ce2701550 |
---|---|
842 ;; Check makeinfo version for index cookie support | 842 ;; Check makeinfo version for index cookie support |
843 (let ((found nil)) | 843 (let ((found nil)) |
844 (goto-char (point-min)) | 844 (goto-char (point-min)) |
845 (condition-case () | 845 (condition-case () |
846 (if (and (re-search-forward | 846 (if (and (re-search-forward |
847 "makeinfo version \\([0-9]+.[0-9]+\\)" | 847 "makeinfo[ \n]version[ \n]\\([0-9]+.[0-9]+\\)" |
848 (line-beginning-position 3) t) | 848 (line-beginning-position 3) t) |
849 (not (version< (match-string 1) "4.7"))) | 849 (not (version< (match-string 1) "4.7"))) |
850 (setq found t)) | 850 (setq found t)) |
851 (error nil)) | 851 (error nil)) |
852 (set (make-local-variable 'Info-file-supports-index-cookies) found)) | 852 (set (make-local-variable 'Info-file-supports-index-cookies) found)) |