aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2004-09-02 16:36:18 +0000
committerJuri Linkov2004-09-02 16:36:18 +0000
commitfc11ddc8d7b8eb0013a8573fcecf6e0e934348e5 (patch)
treeccd5f92f08a268489063d53d08f5769b8e188fab
parent277df08871a1da3b83e648af97e336861c1b8742 (diff)
downloademacs-fc11ddc8d7b8eb0013a8573fcecf6e0e934348e5.tar.gz
emacs-fc11ddc8d7b8eb0013a8573fcecf6e0e934348e5.zip
(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."
3525 other-tag) 3525 other-tag)
3526 (when not-fontified-p 3526 (when not-fontified-p
3527 (when Info-hide-note-references 3527 (when Info-hide-note-references
3528 ;; *Note is often used where *note should have been 3528 (when (not (eq Info-hide-note-references 'hide))
3529 (goto-char start) 3529 ;; *Note is often used where *note should have been
3530 (skip-syntax-backward " ") 3530 (goto-char start)
3531 (setq other-tag 3531 (skip-syntax-backward " ")
3532 (cond ((memq (char-before) '(nil ?\. ?! ??)) 3532 (setq other-tag
3533 "See ") 3533 (cond ((memq (char-before) '(nil ?\. ?! ??))
3534 ((memq (char-before) '(?\, ?\; ?\: ?-)) 3534 "See ")
3535 "see ") 3535 ((memq (char-before) '(?\, ?\; ?\: ?-))
3536 ((memq (char-before) '(?\( ?\[ ?\{)) 3536 "see ")
3537 ;; Check whether the paren is preceded by 3537 ((memq (char-before) '(?\( ?\[ ?\{))
3538 ;; an end of sentence 3538 ;; Check whether the paren is preceded by
3539 (skip-syntax-backward " (") 3539 ;; an end of sentence
3540 (if (memq (char-before) '(nil ?\. ?! ??)) 3540 (skip-syntax-backward " (")
3541 "See " 3541 (if (memq (char-before) '(nil ?\. ?! ??))
3542 "see ")) 3542 "See "
3543 ((save-match-data (looking-at "\n\n")) 3543 "see "))
3544 "See "))) 3544 ((save-match-data (looking-at "\n\n"))
3545 "See "))))
3545 (goto-char next) 3546 (goto-char next)
3546 (add-text-properties 3547 (add-text-properties
3547 (match-beginning 1) 3548 (match-beginning 1)
@@ -3551,7 +3552,7 @@ Preserve text properties."
3551 (if (string-match "\n" (match-string 1)) 3552 (if (string-match "\n" (match-string 1))
3552 (+ start1 (match-beginning 0))))) 3553 (+ start1 (match-beginning 0)))))
3553 (match-end 1)) 3554 (match-end 1))
3554 (if (and other-tag (not (eq Info-hide-note-references 'hide))) 3555 (if other-tag
3555 `(display ,other-tag front-sticky nil rear-nonsticky t) 3556 `(display ,other-tag front-sticky nil rear-nonsticky t)
3556 '(invisible t front-sticky nil rear-nonsticky t)))) 3557 '(invisible t front-sticky nil rear-nonsticky t))))
3557 (add-text-properties 3558 (add-text-properties