From f0ffb9b76754ef7dcc4842e969aa16d451f117e9 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 21 Apr 2014 16:31:22 -0400 Subject: [PATCH] * lisp/progmodes/prog-mode.el (prettify-symbols--compose-symbol): Don't prettify a word within a symbol. --- lisp/ChangeLog | 5 +++++ lisp/progmodes/prog-mode.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0b7de93cc02..f9d9521e412 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-04-21 Stefan Monnier + + * progmodes/prog-mode.el (prettify-symbols--compose-symbol): + Don't prettify a word within a symbol. + 2014-04-20 Michael Albinus * net/tramp-sh.el (tramp-get-ls-command): Use "-b" argument if diff --git a/lisp/progmodes/prog-mode.el b/lisp/progmodes/prog-mode.el index 3b850f3305b..407466932d9 100644 --- a/lisp/progmodes/prog-mode.el +++ b/lisp/progmodes/prog-mode.el @@ -67,7 +67,7 @@ Regexp match data 0 points to the chars." (let* ((start (match-beginning 0)) (end (match-end 0)) (syntaxes (if (eq (char-syntax (char-after start)) ?w) - '(?w) '(?. ?\\))) + '(?w ?_) '(?. ?\\))) match) (if (or (memq (char-syntax (or (char-before start) ?\s)) syntaxes) (memq (char-syntax (or (char-after end) ?\s)) syntaxes) -- 2.39.5