From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 21 Apr 2014 20:31:22 +0000 (-0400)
Subject: * lisp/progmodes/prog-mode.el (prettify-symbols--compose-symbol):
X-Git-Tag: emacs-24.3.91~111
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f0ffb9b76754ef7dcc4842e969aa16d451f117e9;p=emacs.git

* lisp/progmodes/prog-mode.el (prettify-symbols--compose-symbol):
Don't prettify a word within a symbol.
---

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  <monnier@iro.umontreal.ca>
+
+	* progmodes/prog-mode.el (prettify-symbols--compose-symbol):
+	Don't prettify a word within a symbol.
+
 2014-04-20  Michael Albinus  <michael.albinus@gmx.de>
 
 	* 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)