From 440ebe4a5d410fe76995f2093e2d82b9591a9d99 Mon Sep 17 00:00:00 2001 From: Lucien Cartier-Tilet Date: Sun, 28 May 2023 16:33:18 +0200 Subject: [PATCH] [Bin] add script to open ediff as a diff tool --- .profile | 1 + org/config/bin.org | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/.profile b/.profile index 1db1bb9..4f8cad1 100644 --- a/.profile +++ b/.profile @@ -52,6 +52,7 @@ export CHROME_EXECUTABLE=/usr/bin/chromium export DENO_DIR="$HOME/.config/deno" export DENO_INSTALL_ROOT="$HOME/.local/bin/deno" +export DIFFPROG=ediff export SUDO_ASKPASS="$HOME/.local/bin/askpass" export MANPAGER="sh -c 'col -bx | bat -l man -p'" diff --git a/org/config/bin.org b/org/config/bin.org index 2ce4866..dd24cae 100644 --- a/org/config/bin.org +++ b/org/config/bin.org @@ -616,10 +616,22 @@ xinput map-to-output "$ID" "$SCREEN" :CUSTOM_ID: Emacs-stuff-Dired-2eeca9da :HEADER-ARGS: :shebang "#!/bin/bash" :mkdirp yes :tangle ~/.local/bin/dired :END: +This script allows me to open anything in dired from the command line. #+BEGIN_SRC bash emacsclient -c -a emacs -e "(dired \"$*\")" #+END_SRC +** Ediff +:PROPERTIES: +:CUSTOM_ID: EmacsstuffEdiff-a6adcl503uj0 +:HEADER-ARGS: :shebang "#!/bin/bash" :mkdirp yes :tangle ~/.local/bin/ediff +:END: +I want Ediff as my merge tool, not just with Git but with other +programs too such as =pacdiff=. +#+begin_src bash +emacsclient -c -a emacs -e "(ediff-files \"$1\" \"$2\")" +#+end_src + ** Emacsmail :PROPERTIES: :HEADER-ARGS: :shebang "#!/bin/bash" :mkdirp yes :tangle ~/.local/bin/emacsmail