summaryrefslogtreecommitdiff
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f7f42011575..4f3cf82e7e0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-16 Juanma Barranquero <lekktu@gmail.com>
+
+ * progmodes/prog-mode.el (prog--prettify-font-lock-compose-symbol):
+ Save relevant match data before calling `syntax-ppss' (bug#14595).
+
2013-06-15 Juri Linkov <juri@jurta.org>
* files-x.el (modify-file-local-variable-prop-line): Add local