Merge from trunk.

1 files changed, 21 insertions, 0 deletions

diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 755f4c8159b..a01ce4c30a3 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,24 @@
+2012-11-16  David Engster  <deng@randomsample.de>
+
+        * semantic/symref/list.el (semantic-symref-symbol): Use
+        `semantic-complete-read-tag-project' instead of
+        `semantic-complete-read-tag-buffer-deep', since the latter is not
+        working correctly.
+
+        * semantic/symref.el (semantic-symref-result-get-tags): Use
+        `find-buffer-visiting' to follow symbolic links.
+
+        * semantic/fw.el (semantic-find-file-noselect): Always set
+        `enable-local-variables' to `:safe' when loading files.
+
+2012-11-16  Glenn Morris  <rgm@gnu.org>
+
+        * semantic/lex-spp.el (semantic-lex-spp-lex-text-string):
+        * semantic/util.el (semantic-describe-buffer):
+        * semantic/bovine/c.el (semantic-c-parse-lexical-token)
+        (semantic-default-c-setup):
+        Use new names for hooks rather than obsolete aliases.
+
 2012-11-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * semantic/mru-bookmark.el (semantic-mru-bookmark-mode):