Merge from emacs-24; up to 2012-11-13T18:57:26Z!dgutov@yandex.ru

7 files changed, 31 insertions, 17 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):
diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index 02ad6e05d1a..a3d57108d1d 100644
--- a/lisp/cedet/semantic/bovine/c.el
+++ b/lisp/cedet/semantic/bovine/c.el
@@ -931,8 +931,8 @@ the regular parser."
 	  (setq semantic-new-buffer-fcn-was-run t)
 	  (semantic-lex-init)
 	  (semantic-clear-toplevel-cache)
-	  (remove-hook 'semantic-lex-reset-hooks 'semantic-lex-spp-reset-hook
-		       t)
+	  (remove-hook 'semantic-lex-reset-functions
+		       'semantic-lex-spp-reset-hook t)
 	  )
 	;; Get the macro symbol table right.
 	(setq semantic-lex-spp-dynamic-macro-symbol-obarray spp-syms)
@@ -2073,7 +2073,7 @@ actually in their parent which is not accessible.")
         )
 
   (setq semantic-lex-analyzer #'semantic-c-lexer)
-  (add-hook 'semantic-lex-reset-hooks 'semantic-lex-spp-reset-hook nil t)
+  (add-hook 'semantic-lex-reset-functions 'semantic-lex-spp-reset-hook nil t)
   (when (eq major-mode 'c++-mode)
     (add-to-list 'semantic-lex-c-preprocessor-symbol-map '("__cplusplus" . "")))
   )
diff --git a/lisp/cedet/semantic/fw.el b/lisp/cedet/semantic/fw.el
index 5a12047eb76..14ffc808c44 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/lex-spp.el b/lisp/cedet/semantic/lex-spp.el
index 406f2900563..ad366c2b94f 100644
--- a/lisp/cedet/semantic/lex-spp.el
+++ b/lisp/cedet/semantic/lex-spp.el
@@ -30,7 +30,7 @@
 ;; If you use SPP in your language, be sure to specify this in your
 ;; semantic language setup function:
 ;;
-;; (add-hook 'semantic-lex-reset-hooks 'semantic-lex-spp-reset-hook nil t)
+;; (add-hook 'semantic-lex-reset-functions 'semantic-lex-spp-reset-hook nil t)
 ;;
 ;;
 ;; Special Lexical Tokens:
@@ -947,8 +947,8 @@ and variable state from the current buffer."
 	    (setq semantic-new-buffer-fcn-was-run t)
 	    (semantic-lex-init)
 	    (semantic-clear-toplevel-cache)
-	    (remove-hook 'semantic-lex-reset-hooks 'semantic-lex-spp-reset-hook
-			 t)
+	    (remove-hook 'semantic-lex-reset-functions
+			 'semantic-lex-spp-reset-hook t)
 	    ))
 
 	;; Second Cheat: copy key variables regarding macro state from the
diff --git a/lisp/cedet/semantic/symref.el b/lisp/cedet/semantic/symref.el
index 540c766cc94..ad897680d7f 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 55ccf1c103f..729bd8e153c 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)
diff --git a/lisp/cedet/semantic/util.el b/lisp/cedet/semantic/util.el
index 65201c4fd12..f3d30f6af5c 100644
--- a/lisp/cedet/semantic/util.el
+++ b/lisp/cedet/semantic/util.el
@@ -280,7 +280,7 @@ If TAG is not specified, use the tag at point."
 		      semantic-parser-name
 		      semantic-parse-tree-state
 		      semantic-lex-analyzer
-		      semantic-lex-reset-hooks
+		      semantic-lex-reset-functions
 		      semantic-lex-syntax-modifications
 		      )))
 	  (dolist (V vars)