[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110868: Merge bug fixes from CEDET upstream.

[David Engster]

------------------------------------------------------------
revno: 110868
committer: David Engster <address@hidden>
branch nick: emacs-24
timestamp: Wed 2012-11-14 21:20:20 +0100
message:
  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.
modified:
  lisp/cedet/ChangeLog
  lisp/cedet/semantic/fw.el
  lisp/cedet/semantic/symref.el
  lisp/cedet/semantic/symref/list.el

=== modified file 'lisp/cedet/ChangeLog'
--- a/lisp/cedet/ChangeLog      2012-11-13 03:11:46 +0000
+++ b/lisp/cedet/ChangeLog      2012-11-14 20:20:20 +0000
@@ -1,3 +1,16 @@
+2012-11-14  David Engster  <address@hidden>
+
+       * 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  <address@hidden>
 
        * semantic/lex-spp.el (semantic-lex-spp-lex-text-string):

=== modified file 'lisp/cedet/semantic/fw.el'
--- a/lisp/cedet/semantic/fw.el 2012-10-05 05:57:24 +0000
+++ b/lisp/cedet/semantic/fw.el 2012-11-14 20:20:20 +0000
@@ -421,14 +421,7 @@
         ;; 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)
         )

=== modified file 'lisp/cedet/semantic/symref.el'
--- a/lisp/cedet/semantic/symref.el     2012-10-01 18:10:29 +0000
+++ b/lisp/cedet/semantic/symref.el     2012-11-14 20:20:20 +0000
@@ -356,7 +356,7 @@
          (lambda (hit)
            (let* ((line (car hit))
                   (file (cdr hit))
-                  (buff (get-file-buffer file))
+                  (buff (find-buffer-visiting file))
                   (tag nil)
                   )
              (cond

=== modified file 'lisp/cedet/semantic/symref/list.el'
--- a/lisp/cedet/semantic/symref/list.el        2012-10-01 18:10:29 +0000
+++ b/lisp/cedet/semantic/symref/list.el        2012-11-14 20:20:20 +0000
@@ -69,7 +69,7 @@
 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)