Merge from emacs-24; up to 2012-11-09T14:45:15Z!dmantipov@yandex.ru

[gnu-emacs] / lisp / cedet / ChangeLog

diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 6f2669e9feeaac27132c441de911e9b3f46f7dd1..755f4c8159b0f18a8bbe51928fc78377de56e6ba 100644 (file)
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,7 +1,20 @@
+2012-11-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * semantic/mru-bookmark.el (semantic-mru-bookmark-mode):
+       * semantic/grammar.el (semantic-grammar-mode):
+       * semantic/util-modes.el (semantic-highlight-edits-mode)
+       (semantic-show-parser-state-mode): Avoid obsolete name
+       semantic-edits-new-change-hooks (bug#12869).
+
+2012-11-13  Glenn Morris  <rgm@gnu.org>
+
+       * srecode/srt-mode.el (srecode-template-mode):
+       Don't change global values of comment-start, comment-end.  (Bug#12781)
+
 2012-10-25  David Engster  <deng@randomsample.de>
 
-       * semantic/analyze.el (semantic-analyze-dereference-alias): New
-       function to dereference aliases.
+       * semantic/analyze.el (semantic-analyze-dereference-alias):
+       New function to dereference aliases.
        (semantic-analyze-current-context-default): Use it.
 
        * semantic/grammar.el (semantic-grammar-create-package):
@@ -12,8 +25,8 @@
 
        * semantic.el (semantic-elapsed-time): Make it a defsubst.
 
-       * srecode/dictionary.el (srecode-adebug-dictionary): Remove
-       require for `semantic'.
+       * srecode/dictionary.el (srecode-adebug-dictionary):
+       Remove require for `semantic'.
 
        * srecode/map.el:
        * srecode/insert.el: Declare functions from `data-debug'.