[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/flymake-refactor 245114e 33/52: Fix autoload confl
From: |
João Távora |
Subject: |
[Emacs-diffs] scratch/flymake-refactor 245114e 33/52: Fix autoload conflict between flymake.el and flymake-ui.el |
Date: |
Sun, 1 Oct 2017 12:40:48 -0400 (EDT) |
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
- [Emacs-diffs] scratch/flymake-refactor 740572e 05/52: Completely rewrite flymake's subprocess output processing, (continued)
- [Emacs-diffs] scratch/flymake-refactor 740572e 05/52: Completely rewrite flymake's subprocess output processing, João Távora, 2017/10/01
- [Emacs-diffs] scratch/flymake-refactor 14db516 22/52: flymake-ui.el checks file names before considering diagnostics, João Távora, 2017/10/01
- [Emacs-diffs] scratch/flymake-refactor 61ba20b 21/52: Echo flymake error messages when navigating errors interactively, João Távora, 2017/10/01
- [Emacs-diffs] scratch/flymake-refactor b2c4135 15/52: Clarify logic around flymake-diagnostic-types-alist, João Távora, 2017/10/01
- [Emacs-diffs] scratch/flymake-refactor bac7512 12/52: New flymake-diagnostic-types-alist and more cleanup, João Távora, 2017/10/01
- [Emacs-diffs] scratch/flymake-refactor 7140018 25/52: Protect flymake-ui against commands like fill-paragraph, João Távora, 2017/10/01
- [Emacs-diffs] scratch/flymake-refactor d3168cf 09/52: Make lisp/progmodes/flymake-ui.el some 150 lines lighter, João Távora, 2017/10/01
- [Emacs-diffs] scratch/flymake-refactor f3b8a72 20/52: Refactor flymake-tests.el in preparation for more tests, João Távora, 2017/10/01
- [Emacs-diffs] scratch/flymake-refactor 593d4303 23/52: Add a new flymake test for multiple errors and warnings, João Távora, 2017/10/01
- [Emacs-diffs] scratch/flymake-refactor d68448f 26/52: More cleanup before advancing to backend redesign, João Távora, 2017/10/01
- [Emacs-diffs] scratch/flymake-refactor 245114e 33/52: Fix autoload conflict between flymake.el and flymake-ui.el,
João Távora <=
- [Emacs-diffs] scratch/flymake-refactor 4fea8a9 30/52: Allow filtering in flymake-goto-[next/prev]-error, João Távora, 2017/10/01
- [Emacs-diffs] scratch/flymake-refactor 192cb7f 24/52: flymake-ui.el highlights GCC notes detected by flymake-proc.el, João Távora, 2017/10/01
- [Emacs-diffs] scratch/flymake-refactor 879dcef 29/52: Misc cleanup in flymake-proc.el, João Távora, 2017/10/01
- [Emacs-diffs] scratch/flymake-refactor 820b460 35/52: Add interactive flymake-start function, João Távora, 2017/10/01
- [Emacs-diffs] scratch/flymake-refactor 8e42a5d 31/52: Cleanup some flymake-ui.el internals, João Távora, 2017/10/01
- [Emacs-diffs] scratch/flymake-refactor e1b913f 36/52: Re-implement wraparound for flymake-goto-next-error, João Távora, 2017/10/01
- [Emacs-diffs] scratch/flymake-refactor 3dfe11c 28/52: Simplify flymake logging and erroring., João Távora, 2017/10/01
- [Emacs-diffs] scratch/flymake-refactor 9329265 40/52: Treat flymake errors as just another type of diagnostic, João Távora, 2017/10/01
- [Emacs-diffs] scratch/flymake-refactor 38c7d4f 41/52: Remove old flymake-display-err-menu-for-current-line, it's useless, João Távora, 2017/10/01
- [Emacs-diffs] scratch/flymake-refactor 7a22358 34/52: A couple of new flymake backends for emacs-lisp-mode, João Távora, 2017/10/01