diff options
| author | Glenn Morris <rgm@gnu.org> | 2017-04-13 20:12:02 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2017-04-13 20:12:02 -0400 |
| commit | ad128fee434a954da2ead75647b6396ddbf91f6a (patch) | |
| tree | 826f29235924b1def24da2ed63851494b3f4f3e9 /lisp/cedet | |
| parent | 8201263765d01ab02d45830c03b2b8992c2b5759 (diff) | |
| download | emacs-ad128fee434a954da2ead75647b6396ddbf91f6a.tar.gz | |
Create generated lisp files before main loaddefs.el
This should improve reproducibility of lisp/loaddefs.el.
* lisp/Makefile.in (gen-lisp): New phony target.
($(lisp)/loaddefs.el, compile-main): Depend on gen-lisp.
* src/Makefile.in ($(leimdir)/leim-list.el): Depend on all of ../leim.
* lisp/cedet/semantic.el (semantic-mode):
* lisp/cedet/semantic/fw.el (top-level):
* lisp/emacs-lisp/eieio-core.el (top-level):
Robustify to generated input files maybe not yet existing.
Diffstat (limited to 'lisp/cedet')
| -rw-r--r-- | lisp/cedet/semantic.el | 7 | ||||
| -rw-r--r-- | lisp/cedet/semantic/fw.el | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el index 6a264cabd65..c38afed3964 100644 --- a/lisp/cedet/semantic.el +++ b/lisp/cedet/semantic.el @@ -1116,8 +1116,9 @@ Semantic mode. ;; Enable all the global auxiliary minor modes in ;; `semantic-submode-list'. (dolist (mode semantic-submode-list) - (if (memq mode semantic-default-submodes) - (funcall mode 1))) + (and (memq mode semantic-default-submodes) + (fboundp mode) + (funcall mode 1))) (unless semantic-load-system-cache-loaded (setq semantic-load-system-cache-loaded t) (when (and (boundp 'semanticdb-default-system-save-directory) @@ -1139,7 +1140,7 @@ Semantic mode. (add-hook 'completion-at-point-functions 'semantic-analyze-completion-at-point-function) - (if global-ede-mode + (if (bound-and-true-p global-ede-mode) (define-key cedet-menu-map [cedet-menu-separator] '("--"))) (dolist (b (buffer-list)) (with-current-buffer b diff --git a/lisp/cedet/semantic/fw.el b/lisp/cedet/semantic/fw.el index 3884cd09ccc..3527f3e6af8 100644 --- a/lisp/cedet/semantic/fw.el +++ b/lisp/cedet/semantic/fw.el @@ -30,7 +30,7 @@ ;; (require 'mode-local) (require 'eieio) -(load "semantic/loaddefs" nil 'nomessage) +(load "semantic/loaddefs" 'noerror 'nomessage) ;;; Compatibility ;; |