[Emacs-diffs] emacs-24 r116997: * lisp/progmodes/prog-mode.el (prettify-symbols--compose-symbol):

[Stefan Monnier]

------------------------------------------------------------
revno: 116997
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Mon 2014-04-21 16:31:22 -0400
message:
  * lisp/progmodes/prog-mode.el (prettify-symbols--compose-symbol):
  Don't prettify a word within a symbol.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/prog-mode.el    progmode.el-20091230193750-bspzfk1gt8nm2mal-14

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-04-20 21:35:55 +0000
+++ b/lisp/ChangeLog    2014-04-21 20:31:22 +0000
@@ -1,3 +1,8 @@
+2014-04-21  Stefan Monnier  <address@hidden>
+
+       * progmodes/prog-mode.el (prettify-symbols--compose-symbol):
+       Don't prettify a word within a symbol.
+
 2014-04-20  Michael Albinus  <address@hidden>
 
        * net/tramp-sh.el (tramp-get-ls-command): Use "-b" argument if

=== modified file 'lisp/progmodes/prog-mode.el'
--- a/lisp/progmodes/prog-mode.el       2014-02-10 01:34:22 +0000
+++ b/lisp/progmodes/prog-mode.el       2014-04-21 20:31:22 +0000
@@ -67,7 +67,7 @@
   (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)