Fix autoload of flymake from elisp-mode during bootstrap (bug#28994)

* lisp/loadup.el: add `progmodes` to load-path so we can find flymake.el.
* lisp/kmacro.el: Require `replace` since we use query-replace-map.
* lisp/replace.el: Require `text-mode` since we use text-mode-map.

diff --git a/lisp/kmacro.el b/lisp/kmacro.el
index 4abc571db44ce9f7e45d3df596e385f47cfa9d1b..5729f2fc8d3ae3e9f829568384887f3d54dadf70 100644 (file)
--- a/lisp/kmacro.el
+++ b/lisp/kmacro.el
@@ -111,6 +111,7 @@
 ;;; Code:
 
 ;; Customization:
+(require 'replace)
 
 (defgroup kmacro nil
   "Simplified keyboard macro user interface."

diff --git a/lisp/loadup.el b/lisp/loadup.el
index d048f0736be14c28a4639ed501085d0483191703..40e5651aa1dcbd96652c35969c4e4af0cd988aaa 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -76,6 +76,7 @@
       (setq max-lisp-eval-depth 2200)
       (setq load-path (list (expand-file-name "." dir)
                            (expand-file-name "emacs-lisp" dir)
+                           (expand-file-name "progmodes" dir)
                            (expand-file-name "language" dir)
                            (expand-file-name "international" dir)
                            (expand-file-name "textmodes" dir)

diff --git a/lisp/replace.el b/lisp/replace.el
index a5548f461d8b2733ddd1d449a1659706b32d2110..cdaeb9240ad4a9b9096adec1ee325ce3eefcab0f 100644 (file)
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -28,6 +28,7 @@
 
 ;;; Code:
 
+(require 'text-mode)
 (eval-when-compile (require 'cl-lib))
 
 (defcustom case-replace t