[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 1ea669d 6/6: Merge from origin/emacs-25
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master 1ea669d 6/6: Merge from origin/emacs-25 |
Date: |
Tue, 25 Oct 2016 19:52:28 +0000 (UTC) |
branch: master
commit 1ea669d6f0269784b3e69238fd2813f55340d53a
Merge: b0eecfc 4c3f738
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
Merge from origin/emacs-25
4c3f738 Comment for bug#24793
---
lisp/info.el | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lisp/info.el b/lisp/info.el
index 6b8b369..c8b8002 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -4230,6 +4230,9 @@ With a zero prefix arg, put the name inside a function
call to `info'."
'((t :inherit fixed-pitch-serif))
"Face used for quoted elements.")
+;; We deliberately fontify only ‘..’ quoting, and not `..', because
+;; the former can be done much more reliably, i.e. without risking
+;; false positives.
(defvar Info-mode-font-lock-keywords
'(("‘\\([^’]*\\)’" (1 'Info-quoted))))
- [Emacs-diffs] master updated (eca10c1 -> 1ea669d), Paul Eggert, 2016/10/25
- [Emacs-diffs] master b0eecfc 5/6: ; Merge from origin/emacs-25, Paul Eggert, 2016/10/25
- [Emacs-diffs] master 43645b4 3/6: ; Merge from origin/emacs-25, Paul Eggert, 2016/10/25
- [Emacs-diffs] master 1ea669d 6/6: Merge from origin/emacs-25,
Paul Eggert <=
- [Emacs-diffs] master f8eecb1 4/6: Merge from origin/emacs-25, Paul Eggert, 2016/10/25
- [Emacs-diffs] master 630f535 1/6: ; Merge from origin/emacs-25, Paul Eggert, 2016/10/25
- [Emacs-diffs] master a37820a 2/6: Merge from origin/emacs-25, Paul Eggert, 2016/10/25