From d0770a0111173a4d4829b10a1ab4147bbe050de5 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 7 May 2016 21:56:21 -0400 Subject: [PATCH] Disable flycheck-pos-tip in emacs >= 25 --- core/core-defuns.el | 12 ++++++------ core/core-flycheck.el | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/core/core-defuns.el b/core/core-defuns.el index e92036e6c..fefe1028b 100644 --- a/core/core-defuns.el +++ b/core/core-defuns.el @@ -252,11 +252,11 @@ Examples: (defun narf|update-scratch-buffer-cwd (&optional dir) ; see core-editor.el "Make sure scratch buffer is always 'in a project.'" (let ((dir (or dir (narf/project-root)))) - (with-current-buffer (get-buffer-create "*scratch*") - (setq default-directory dir) - (setq header-line-format - '(:eval - (concat " ∴ " (abbreviate-file-name default-directory))))))) + (with-current-buffer (get-buffer-create "*scratch*") + (setq default-directory dir) + (setq header-line-format + '(:eval + (concat " ∴ " (abbreviate-file-name default-directory))))))) ;;;; Global Defuns ;;;;;;;;;;;;;;;;;;;;; @@ -267,7 +267,7 @@ Examples: (f-directories narf-core-dir nil t) (f-directories narf-modules-dir nil t) (f-directories narf-packages-dir) - (f-directories (expand-file-name "../bootstrap" narf-packages-dir)) + (f-directories (f-expand "../bootstrap" narf-packages-dir)) narf--load-path))) (defun narf-reload-autoloads () diff --git a/core/core-flycheck.el b/core/core-flycheck.el index 5ef64ad20..73c52f680 100644 --- a/core/core-flycheck.el +++ b/core/core-flycheck.el @@ -49,6 +49,7 @@ :config (flycheck-package-setup)) (use-package flycheck-pos-tip + :when (= emacs-major-version 24) :after flycheck :config (setq flycheck-pos-tip-timeout 10