From f8310f1fee11b0e2b381207f592997f4a00397e7 Mon Sep 17 00:00:00 2001 From: tastytea Date: Sun, 29 Sep 2019 16:09:42 +0200 Subject: [PATCH] Fix clang-include-fixer and disable keybinding. --- init.el | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/init.el b/init.el index 6e49d03..72d263a 100644 --- a/init.el +++ b/init.el @@ -1,5 +1,5 @@ ;;; init.el --- tastytea's Emacs init file. -;; Time-stamp: <2019-09-29T13:08:56+00:00> +;; Time-stamp: <2019-09-29T13:46:54+00:00> ;;; Commentary: ;; Requires at least Emacs 24.3. @@ -550,21 +550,21 @@ With argument, do this that many times." ) ;; Add #include directives for missing symbols. -;; Broken: Can't pass build directory, run-find-all-symbols.py crashes. +;; Broken: Can't pass build directory, needs .clang-format. (use-package clang-include-fixer :ensure nil ; Installed by clang. :if (executable-find "clang-include-fixer") :init - (defvar my/clang-tool-path - (concat (file-name-directory (executable-find "clang-include-fixer")) - "../share/clang")) - (add-to-list 'load-path my/clang-tool-path) + (defvar my/llvm-path + (concat (file-name-directory (executable-find "clang-include-fixer")) "..")) + (add-to-list 'load-path (concat my/llvm-path "/share/clang")) :config (defun my/clang-find-all-symbols () - (shell-command (concat my/clang-tool-path - "/run-find-all-symbols.py -p build"))) + (shell-command (concat my/llvm-path + "/share/clang/run-find-all-symbols.py -b " + my/llvm-path "/bin/find-all-symbols"))) :bind - ("C-x M-i" . clang-include-fixer) + ;; ("C-x M-i" . clang-include-fixer) ) ;;;;;;;;;;;;;;;;;;;; Appearance ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;