aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/cedet
diff options
context:
space:
mode:
authorGlenn Morris2017-04-13 20:12:02 -0400
committerGlenn Morris2017-04-13 20:12:02 -0400
commitad128fee434a954da2ead75647b6396ddbf91f6a (patch)
tree826f29235924b1def24da2ed63851494b3f4f3e9 /lisp/cedet
parent8201263765d01ab02d45830c03b2b8992c2b5759 (diff)
downloademacs-ad128fee434a954da2ead75647b6396ddbf91f6a.tar.gz
emacs-ad128fee434a954da2ead75647b6396ddbf91f6a.zip
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.el7
-rw-r--r--lisp/cedet/semantic/fw.el2
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.
1116 ;; Enable all the global auxiliary minor modes in 1116 ;; Enable all the global auxiliary minor modes in
1117 ;; `semantic-submode-list'. 1117 ;; `semantic-submode-list'.
1118 (dolist (mode semantic-submode-list) 1118 (dolist (mode semantic-submode-list)
1119 (if (memq mode semantic-default-submodes) 1119 (and (memq mode semantic-default-submodes)
1120 (funcall mode 1))) 1120 (fboundp mode)
1121 (funcall mode 1)))
1121 (unless semantic-load-system-cache-loaded 1122 (unless semantic-load-system-cache-loaded
1122 (setq semantic-load-system-cache-loaded t) 1123 (setq semantic-load-system-cache-loaded t)
1123 (when (and (boundp 'semanticdb-default-system-save-directory) 1124 (when (and (boundp 'semanticdb-default-system-save-directory)
@@ -1139,7 +1140,7 @@ Semantic mode.
1139 (add-hook 'completion-at-point-functions 1140 (add-hook 'completion-at-point-functions
1140 'semantic-analyze-completion-at-point-function) 1141 'semantic-analyze-completion-at-point-function)
1141 1142
1142 (if global-ede-mode 1143 (if (bound-and-true-p global-ede-mode)
1143 (define-key cedet-menu-map [cedet-menu-separator] '("--"))) 1144 (define-key cedet-menu-map [cedet-menu-separator] '("--")))
1144 (dolist (b (buffer-list)) 1145 (dolist (b (buffer-list))
1145 (with-current-buffer b 1146 (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 @@
30;; 30;;
31(require 'mode-local) 31(require 'mode-local)
32(require 'eieio) 32(require 'eieio)
33(load "semantic/loaddefs" nil 'nomessage) 33(load "semantic/loaddefs" 'noerror 'nomessage)
34 34
35;;; Compatibility 35;;; Compatibility
36;; 36;;