aboutsummaryrefslogtreecommitdiff
path: root/Emacs
diff options
context:
space:
mode:
authorAryadev Chavali <aryadev@aryadevchavali.com>2022-02-08 22:50:38 +0000
committerAryadev Chavali <aryadev@aryadevchavali.com>2022-02-08 22:50:38 +0000
commitbb9f4d0ee1645562df0fb5a2b8e18342de98cb63 (patch)
tree33ff1f9fc24a3854e127020e67b44c9c6c9ee7a7 /Emacs
parent8ab655dc4b4e295a83a2ee462aa8fc4bda23993c (diff)
downloaddotfiles-bb9f4d0ee1645562df0fb5a2b8e18342de98cb63.tar.gz
dotfiles-bb9f4d0ee1645562df0fb5a2b8e18342de98cb63.tar.bz2
dotfiles-bb9f4d0ee1645562df0fb5a2b8e18342de98cb63.zip
(Emacs)~resolve a merge conflict
Forgot I had this.
Diffstat (limited to 'Emacs')
-rw-r--r--Emacs/.config/emacs/config.org20
1 files changed, 0 insertions, 20 deletions
diff --git a/Emacs/.config/emacs/config.org b/Emacs/.config/emacs/config.org
index 3a26fa7..d3f813a 100644
--- a/Emacs/.config/emacs/config.org
+++ b/Emacs/.config/emacs/config.org
@@ -99,29 +99,9 @@ the buffer with name buf-name and creation function buf-create."
(display-buffer buffer)
(select-window (get-buffer-window buffer))))))))
#+end_src
-<<<<<<< HEAD
-** Create auto save
-Macro that defines functionality that runs after a buffer save.
-Requires a list of conditions (so it doesn't happen FOR ALL saved
-buffers) and a function to run if the buffer satisfies the condition.
-Then automatically adds it to the ~after-save-hook~.
-
-On a Luke Smith video on YouTube, I saw a vim feature which I really
-liked. He uses it in his DWM videos, but it's essentially an
-"autocmd" call that, upon saving a certain file with vim, will run
-a shell command (such as =make= or =pdflatex=).
-
-It's arbitrary to program this functionality in Emacs. This macro
-essentially performs the same task. In particular if you use
-=start-process-shell-command= in the =to-run= function then you also
-get a generated buffer of output from the command, useful for checking
-errors and general messages. Better than vim, eh?
-
-=======
** Auto-run command after-save-hook
Define a macro that can run a body of functionality on a given set of
files on after-save-hook.
->>>>>>> origin/master
#+begin_src emacs-lisp
(use-package simple
:straight nil