Merge bug fixes from CEDET upstream.

* 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.

diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 56207c7ae57da3ea107bf1a27007df3b35bfe8a6..4bde3421f1361575ffd0a82154aac0d1599bef9e 100644 (file)
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,16 @@
+2012-11-14  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-13  Glenn Morris  <rgm@gnu.org>
 
        * semantic/lex-spp.el (semantic-lex-spp-lex-text-string):

diff --git a/lisp/cedet/semantic/fw.el b/lisp/cedet/semantic/fw.el
index 5a12047eb76f8b45b025ae622f54f92bc62dec90..14ffc808c44f43eace644a67514ce9e50a308f27 100644 (file)
--- a/lisp/cedet/semantic/fw.el
+++ b/lisp/cedet/semantic/fw.el
@@ -421,14 +421,7 @@ into `mode-local-init-hook'." file filename)
         ;; Don't prompt to insert a template if we visit an empty file
         (auto-insert nil)
         ;; We don't want emacs to query about unsafe local variables
-        (enable-local-variables
-         (if (featurep 'xemacs)
-             ;; XEmacs only has nil as an option?
-             nil
-           ;; Emacs 23 has the spiffy :safe option, nil otherwise.
-           (if (>= emacs-major-version 22)
-               nil
-             :safe)))
+        (enable-local-variables :safe)
         ;; ... or eval variables
         (enable-local-eval nil)
         )

diff --git a/lisp/cedet/semantic/symref.el b/lisp/cedet/semantic/symref.el
index 540c766cc9453d448c565e1a4d1099b97b56775d..ad897680d7fe7541342b45b9a0e72bf2b8bda62e 100644 (file)
--- a/lisp/cedet/semantic/symref.el
+++ b/lisp/cedet/semantic/symref.el
@@ -356,7 +356,7 @@ already."
          (lambda (hit)
            (let* ((line (car hit))
                   (file (cdr hit))
-                  (buff (get-file-buffer file))
+                  (buff (find-buffer-visiting file))
                   (tag nil)
                   )
              (cond

diff --git a/lisp/cedet/semantic/symref/list.el b/lisp/cedet/semantic/symref/list.el
index 55ccf1c103fc3b21eb71a0e9d3417b947ec7ed68..729bd8e153c7a9743610196569d9f9020426e4a8 100644 (file)
--- a/lisp/cedet/semantic/symref/list.el
+++ b/lisp/cedet/semantic/symref/list.el
@@ -69,7 +69,7 @@ current project to find references to the input SYM.  The
 references are organized by file and the name of the function
 they are used in.
 Display the references in `semantic-symref-results-mode'."
-  (interactive (list (semantic-tag-name (semantic-complete-read-tag-buffer-deep
+  (interactive (list (semantic-tag-name (semantic-complete-read-tag-project
                                         "Symrefs for: "))))
   (semantic-fetch-tags)
   (let ((res nil)