From 22b762c7e3b370c5d9e02b4369daa3177df30f60 Mon Sep 17 00:00:00 2001
From: David Engster <dengste@eml.cc>
Date: Wed, 14 Nov 2012 21:20:20 +0100
Subject: [PATCH] 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.
---
 lisp/cedet/ChangeLog               | 13 +++++++++++++
 lisp/cedet/semantic/fw.el          |  9 +--------
 lisp/cedet/semantic/symref.el      |  2 +-
 lisp/cedet/semantic/symref/list.el |  2 +-
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 56207c7ae5..4bde3421f1 100644
--- 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 5a12047eb7..14ffc808c4 100644
--- 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 540c766cc9..ad897680d7 100644
--- 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 55ccf1c103..729bd8e153 100644
--- 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)
-- 
2.39.2