aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2014-05-10 23:49:53 -0400
committerStefan Monnier2014-05-10 23:49:53 -0400
commit80a78d23ea06e4bd449096f207fcda41827de9de (patch)
tree139fbfbd3be1cfc7980f361c17768f94414683f3
parent4eb436826bd7912925634624beaf4173546dad49 (diff)
downloademacs-80a78d23ea06e4bd449096f207fcda41827de9de.tar.gz
emacs-80a78d23ea06e4bd449096f207fcda41827de9de.zip
* lisp/info.el (Info-quoted): New face.
(Info-mode-font-lock-keywords): New var. (Info-mode): Use it.
-rw-r--r--lisp/ChangeLog16
-rw-r--r--lisp/info.el10
2 files changed, 19 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a44ba6dc000..72c6d943710 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
12014-05-11 Stefan Monnier <monnier@iro.umontreal.ca> 12014-05-11 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * info.el (Info-quoted): New face.
4 (Info-mode-font-lock-keywords): New var.
5 (Info-mode): Use it.
6
3 * emacs-lisp/lisp-mode.el (preceding-sexp): Exclude leading "," which 7 * emacs-lisp/lisp-mode.el (preceding-sexp): Exclude leading "," which
4 are a hindrance for C-x C-e. 8 are a hindrance for C-x C-e.
5 9
@@ -232,14 +236,14 @@
232 (diary-chinese-insert-yearly-entry): New commands to insert 236 (diary-chinese-insert-yearly-entry): New commands to insert
233 Chinese diary entries. 237 Chinese diary entries.
234 238
235 * calendar/diary-lib.el (diary-font-lock-keywords): Support 239 * calendar/diary-lib.el (diary-font-lock-keywords):
236 font-locking Chinese dates. 240 Support font-locking Chinese dates.
237 241
238 * calendar/cal-menu.el (cal-menu-diary-menu): Add entries for 242 * calendar/cal-menu.el (cal-menu-diary-menu): Add entries for
239 inserting Chinese diary entries. 243 inserting Chinese diary entries.
240 244
241 * calendar/calendar.el (diary-chinese-entry-symbol): New 245 * calendar/calendar.el (diary-chinese-entry-symbol):
242 customizable variable. 246 New customizable variable.
243 (calendar-mode-map): Add bindings for inserting Chinese diary 247 (calendar-mode-map): Add bindings for inserting Chinese diary
244 entries. 248 entries.
245 249
@@ -258,8 +262,8 @@
258 incorrectness of position adjustments when undoing in region. 262 incorrectness of position adjustments when undoing in region.
259 (Bug#17235) 263 (Bug#17235)
260 (undo-elt-crosses-region): Make obsolete. 264 (undo-elt-crosses-region): Make obsolete.
261 (undo-adjust-elt, undo-adjust-beg-end, undo-adjust-pos): New 265 (undo-adjust-elt, undo-adjust-beg-end, undo-adjust-pos):
262 functions to adjust positions using undo-deltas. 266 New functions to adjust positions using undo-deltas.
263 267
2642014-05-01 Stefan Monnier <monnier@iro.umontreal.ca> 2682014-05-01 Stefan Monnier <monnier@iro.umontreal.ca>
265 269
diff --git a/lisp/info.el b/lisp/info.el
index 42b78f03526..89ca8bdbe33 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -4209,9 +4209,16 @@ With a zero prefix arg, put the name inside a function call to `info'."
4209 st) 4209 st)
4210 "Syntax table used in `Info-mode'.") 4210 "Syntax table used in `Info-mode'.")
4211 4211
4212(defface Info-quoted
4213 '((t :family "courier"))
4214 "Face used for quoted elements.")
4215
4216(defvar Info-mode-font-lock-keywords
4217 '(("‘\\([^’]*\\)’" (1 'Info-quoted))))
4218
4212;; Autoload cookie needed by desktop.el 4219;; Autoload cookie needed by desktop.el
4213;;;###autoload 4220;;;###autoload
4214(define-derived-mode Info-mode nil "Info" 4221(define-derived-mode Info-mode nil "Info" ;FIXME: Derive from special-mode?
4215 "Info mode provides commands for browsing through the Info documentation tree. 4222 "Info mode provides commands for browsing through the Info documentation tree.
4216Documentation in Info is divided into \"nodes\", each of which discusses 4223Documentation in Info is divided into \"nodes\", each of which discusses
4217one topic and contains references to other nodes which discuss related 4224one topic and contains references to other nodes which discuss related
@@ -4297,6 +4304,7 @@ Advanced commands:
4297 (setq-local isearch-push-state-function #'Info-isearch-push-state) 4304 (setq-local isearch-push-state-function #'Info-isearch-push-state)
4298 (setq-local isearch-filter-predicate #'Info-isearch-filter) 4305 (setq-local isearch-filter-predicate #'Info-isearch-filter)
4299 (setq-local revert-buffer-function #'Info-revert-buffer-function) 4306 (setq-local revert-buffer-function #'Info-revert-buffer-function)
4307 (setq-local font-lock-defaults '(Info-mode-font-lock-keywords t t))
4300 (Info-set-mode-line) 4308 (Info-set-mode-line)
4301 (setq-local bookmark-make-record-function #'Info-bookmark-make-record)) 4309 (setq-local bookmark-make-record-function #'Info-bookmark-make-record))
4302 4310