[Emacs-diffs] scratch/flymake-refactor 245114e 08/12: Fix autoload conflict between flymake.el and flymake-ui.el

[João Távora]

branch: scratch/flymake-refactor
commit 245114ea01940bf79280e53961767464ee9b469c
Author: João Távora <address@hidden>
Commit: João Távora <address@hidden>

    Fix autoload conflict between flymake.el and flymake-ui.el
    
    Ensures that starting M-x flymake-mode from a fresh session will load
    flymake.el, which is a proxy for the flymake UI and its backends.
    
    * lisp/progmodes/flymake-ui.el (flymake-mode)
    (flymake-mode-on, flymake-mode-off, flymake-find-file-hook):
    No longer causes flymake-ui.el to be autoloaded.
    
    * lisp/progmodes/flymake.el (flymake-mode-on)
    (flymake-mode-off, flymake-mode): Autoload flymake.el
---
 lisp/progmodes/flymake-ui.el |  4 ----
 lisp/progmodes/flymake.el    | 13 +++++++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/lisp/progmodes/flymake-ui.el b/lisp/progmodes/flymake-ui.el
index 5616d38..feaa9d8 100644
--- a/lisp/progmodes/flymake-ui.el
+++ b/lisp/progmodes/flymake-ui.el
@@ -585,7 +585,6 @@ non-nil."
         (add-hook 'post-command-hook #'start 'append 'local)
       (start))))
 
-;;;###autoload
 (define-minor-mode flymake-mode nil
   :group 'flymake :lighter flymake--mode-line-format
   (setq flymake--running-backends nil
@@ -621,13 +620,11 @@ non-nil."
       (cancel-timer flymake-timer)
       (setq flymake-timer nil)))))
 
-;;;###autoload
 (defun flymake-mode-on ()
   "Turn flymake mode on."
   (flymake-mode 1)
   (flymake-log 1 "flymake mode turned ON"))
 
-;;;###autoload
 (defun flymake-mode-off ()
   "Turn flymake mode off."
   (flymake-mode 0)
@@ -652,7 +649,6 @@ non-nil."
     (cancel-timer flymake-timer)
     (setq flymake-timer nil)))
 
-;;;###autoload
 (defun flymake-find-file-hook ()
   (unless (or flymake-mode
               (null flymake-diagnostic-functions))
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 6ae2280..aa89417 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -34,8 +34,21 @@
 
 ;;; Code:
 
+;;; Dummy autoloads ensure that this file gets autoloaded, not just
+;;; flymake-ui.el where they actually live.
+
+;;;###autoload
+(defun flymake-mode-on () "Turn flymake mode on." nil)
+
+;;;###autoload
+(defun flymake-mode-off () "Turn flymake mode off." nil)
+
+;;;###autoload
+(define-minor-mode flymake-mode nil)
+
 (require 'flymake-ui)
 (require 'flymake-proc)
+(require 'flymake-elisp)
 
 (provide 'flymake)
 ;;; flymake.el ends here