aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRĂ¼diger Sonderfeld2014-11-18 18:01:55 +0100
committerRĂ¼diger Sonderfeld2014-11-18 18:01:55 +0100
commitcb4f666ade76181223c197fe38fc600ea4d7ab01 (patch)
tree14aca224bcb0daf3c565cdf714916d05b357c9ed
parentb2c4e6c82541a3d7e6544a33073039da38e13d0d (diff)
downloademacs-cb4f666ade76181223c197fe38fc600ea4d7ab01.tar.gz
emacs-cb4f666ade76181223c197fe38fc600ea4d7ab01.zip
lisp/ChangeLog: Fix bug#11386.
-rw-r--r--lisp/ChangeLog3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0b1456a3dee..adf82739b2e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2731,7 +2731,8 @@
2731 (c-typeless-decl-kwds): Append "auto" onto the C++ value. 2731 (c-typeless-decl-kwds): Append "auto" onto the C++ value.
2732 (c-not-decl-init-keywords): Also exclude c-typeof-kwds from value. 2732 (c-not-decl-init-keywords): Also exclude c-typeof-kwds from value.
2733 2733
2734 Make ">>" act as double template ender in C++ Mode. 2734 Make ">>" act as double template ender in C++ Mode. Fix
2735 bug#11386.
2735 * progmodes/cc-langs.el (c->-op-cont-tokens): New lang-const split 2736 * progmodes/cc-langs.el (c->-op-cont-tokens): New lang-const split
2736 off from c->-op-cont-re. 2737 off from c->-op-cont-re.
2737 (c->-op-cont-tokens): Change to use the above. 2738 (c->-op-cont-tokens): Change to use the above.