aboutsummaryrefslogtreecommitdiffstats
path: root/emacs
diff options
context:
space:
mode:
authorYann Herklotz <git@ymhg.org>2019-04-21 10:41:16 +0100
committerYann Herklotz <git@ymhg.org>2019-04-21 10:41:16 +0100
commita8cf937a702a645757c81682c8011ea539ee50b1 (patch)
tree16467b03811bfb2c1477f121c182407f41d1790a /emacs
parent0fd01378c0df639b5731f1d8383382ee65d627e5 (diff)
downloaddotfiles-a8cf937a702a645757c81682c8011ea539ee50b1.tar.gz
dotfiles-a8cf937a702a645757c81682c8011ea539ee50b1.zip
Add diff functions
Diffstat (limited to 'emacs')
-rw-r--r--emacs/loader.org24
1 files changed, 24 insertions, 0 deletions
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