diff options
Diffstat (limited to 'lisp/cedet/mode-local.el')
| -rw-r--r-- | lisp/cedet/mode-local.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/cedet/mode-local.el b/lisp/cedet/mode-local.el index fe87d1ae4b2..3d2fe45fcb1 100644 --- a/lisp/cedet/mode-local.el +++ b/lisp/cedet/mode-local.el @@ -296,8 +296,7 @@ Elements are (SYMBOL . PREVIOUS-VALUE), describing one variable." ;; Hack - ;; do not do this if we are inside set-auto-mode as we may be in ;; an initialization race condition. - (if (or (and (featurep 'emacs) (boundp 'keep-mode-if-same)) - (and (featurep 'xemacs) (boundp 'just-from-file-name))) + (if (boundp 'keep-mode-if-same) ;; We are inside set-auto-mode, as this is an argument that is ;; vaguely unique. |