summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuri Linkov <juri@jurta.org>2004-09-02 16:36:18 +0000
committerJuri Linkov <juri@jurta.org>2004-09-02 16:36:18 +0000
commitfc11ddc8d7b8eb0013a8573fcecf6e0e934348e5 (patch)
treeccd5f92f08a268489063d53d08f5769b8e188fab
parent277df08871a1da3b83e648af97e336861c1b8742 (diff)
downloademacs-fc11ddc8d7b8eb0013a8573fcecf6e0e934348e5.tar.gz
(Info-fontify-node): Don't compute other-tag if Info-hide-note-references=hide.
-rw-r--r--lisp/info.el37
1 files changed, 19 insertions, 18 deletions
diff --git a/lisp/info.el b/lisp/info.el
index 13bf3901d6d..802fcf1642e 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -3525,23 +3525,24 @@ Preserve text properties."
other-tag)
(when not-fontified-p
(when Info-hide-note-references
- ;; *Note is often used where *note should have been
- (goto-char start)
- (skip-syntax-backward " ")
- (setq other-tag
- (cond ((memq (char-before) '(nil ?\. ?! ??))
- "See ")
- ((memq (char-before) '(?\, ?\; ?\: ?-))
- "see ")
- ((memq (char-before) '(?\( ?\[ ?\{))
- ;; Check whether the paren is preceded by
- ;; an end of sentence
- (skip-syntax-backward " (")
- (if (memq (char-before) '(nil ?\. ?! ??))
- "See "
- "see "))
- ((save-match-data (looking-at "\n\n"))
- "See ")))
+ (when (not (eq Info-hide-note-references 'hide))
+ ;; *Note is often used where *note should have been
+ (goto-char start)
+ (skip-syntax-backward " ")
+ (setq other-tag
+ (cond ((memq (char-before) '(nil ?\. ?! ??))
+ "See ")
+ ((memq (char-before) '(?\, ?\; ?\: ?-))
+ "see ")
+ ((memq (char-before) '(?\( ?\[ ?\{))
+ ;; Check whether the paren is preceded by
+ ;; an end of sentence
+ (skip-syntax-backward " (")
+ (if (memq (char-before) '(nil ?\. ?! ??))
+ "See "
+ "see "))
+ ((save-match-data (looking-at "\n\n"))
+ "See "))))
(goto-char next)
(add-text-properties
(match-beginning 1)
@@ -3551,7 +3552,7 @@ Preserve text properties."
(if (string-match "\n" (match-string 1))
(+ start1 (match-beginning 0)))))
(match-end 1))
- (if (and other-tag (not (eq Info-hide-note-references 'hide)))
+ (if other-tag
`(display ,other-tag front-sticky nil rear-nonsticky t)
'(invisible t front-sticky nil rear-nonsticky t))))
(add-text-properties