From 79b0edebdb1614ed51eebe0a637daf8a9984fb6d Mon Sep 17 00:00:00 2001 From: tastytea Date: Fri, 19 Apr 2019 03:10:30 +0200 Subject: [PATCH] Disable colored manpages (not necessary), Tell cmake-ide to behave. --- init.el | 22 ++++++++++------------ server/server | 2 +- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/init.el b/init.el index 282e552..8803454 100644 --- a/init.el +++ b/init.el @@ -1,5 +1,5 @@ ;;; init.el --- tastytea's Emacs init file. -;; Time-stamp: <2019-04-16T17:15:54+00:00> +;; Time-stamp: <2019-04-16T20:51:04+00:00> ;;; Commentary: ;; I am using this file with Emacs 26, but most of it will probably work with @@ -224,15 +224,6 @@ With argument, do this that many times." :hook (prog-mode . dtrt-indent-mode)) -;; Define default cmake configuration command. Other variables are aliases to -;; this one. -(defvar my/cmake-config-command nil) -(setq my/cmake-config-command - "cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ --G Unix\ Makefiles ..") -;; Mark variable as safe. This prevents prompts when using .dir-locals.el. -(put 'my/cmake-config-command 'safe-local-variable #'stringp) - ;; Automatic project management. (unless slow-computer (use-package projectile @@ -250,12 +241,16 @@ With argument, do this that many times." :custom (projectile-project-compilation-dir "build") (projectile-switch-project-action 'neotree-projectile-action) + (projectile-project-configure-cmd + "cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ +-GUnix\\ Makefiles ..") :config - (defvaralias 'projectile-project-configure-cmd 'my/cmake-config-command) (setq projectile-project-compilation-cmd (concat my/cmake-compile-command " && ctest -Q")) (projectile-mode +1) (put 'projectile-project-compilation-cmd 'safe-local-variable #'stringp) + ;; Mark variable as safe. This prevents prompts when using .dir-locals.el. + (put 'projectile-project-configure-cmd 'safe-local-variable #'stringp) :bind ("C-c p" . 'projectile-command-map) (:map projectile-command-map @@ -371,8 +366,11 @@ With argument, do this that many times." :after irony :custom (cmake-ide-build-dir "build") + ;; (cmake-ide-cmake-args '("-DCMAKE_BUILD_TYPE=Debug" + ;; "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON" + ;; "-GUnix Makefiles")) + (cmake-ide-cmake-opts "") ; Use the already configured options. :config - (defvaralias 'cmake-ide-cmake-opts 'my/cmake-config-command) (cmake-ide-setup)) ) ; unless slow-computer diff --git a/server/server b/server/server index 9b3d867..cd6f67c 100644 --- a/server/server +++ b/server/server @@ -1,2 +1,2 @@ -127.0.0.1:51313 23816 +127.0.0.1:51313 31973 phahw2ohVoh0oopheish7IVie9desh8aequeenei3uo8wahShe%thuadaeNa4ieh \ No newline at end of file