diff options
| author | David Engster <dengste@eml.cc> | 2012-11-14 21:20:20 +0100 |
|---|---|---|
| committer | David Engster <dengste@eml.cc> | 2012-11-14 21:20:20 +0100 |
| commit | 22b762c7e3b370c5d9e02b4369daa3177df30f60 (patch) | |
| tree | cc480a90d4b291cc6d2812ae5f6ccd554f27d162 /lisp/cedet/semantic/fw.el | |
| parent | 730b2d8f6b5851dc462b79b8bd48068c1b9f1932 (diff) | |
| download | emacs-22b762c7e3b370c5d9e02b4369daa3177df30f60.tar.gz emacs-22b762c7e3b370c5d9e02b4369daa3177df30f60.tar.bz2 emacs-22b762c7e3b370c5d9e02b4369daa3177df30f60.zip | |
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.
Diffstat (limited to 'lisp/cedet/semantic/fw.el')
| -rw-r--r-- | lisp/cedet/semantic/fw.el | 9 |
1 files changed, 1 insertions, 8 deletions
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) ) |