From a8cf937a702a645757c81682c8011ea539ee50b1 Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Sun, 21 Apr 2019 10:41:16 +0100 Subject: Add diff functions --- emacs/loader.org | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'emacs') diff --git a/emacs/loader.org b/emacs/loader.org index 9db7c9a..9bc61f0 100644 --- a/emacs/loader.org +++ b/emacs/loader.org @@ -925,6 +925,20 @@ lot of different language support. (counsel-projectile-mode t)) #+END_SRC +*** Diff + +#+BEGIN_SRC emacs-lisp + (defun command-line-diff (switch) + (let ((file1 (pop command-line-args-left)) + (file2 (pop command-line-args-left))) + (ediff file1 file2))) + (add-to-list 'command-switch-alist '("diff" . command-line-diff)) + (setq-default ediff-forward-word-function 'forward-char) +#+END_SRC + +#+RESULTS: +: forward-char + ** Language Support *** C++ @@ -1143,6 +1157,15 @@ JSON files should be opened in js-mode. (setq sh-indentation 2) #+END_SRC +*** Verilog + +#+begin_src emacs-lisp + (setq flycheck-verilog-verilator-executable "verilator_bin") +#+end_src + +#+RESULTS: +: verilator_bin + ** Completion Support *** Company #+BEGIN_SRC emacs-lisp @@ -1279,5 +1302,6 @@ Keybindings Setting the gc-cons threshold back to what it was at the beginning. #+BEGIN_SRC emacs-lisp + (server-start) (setq gc-cons-threshold 10000000) #+END_SRC -- cgit