phundrak/dotfiles
1
0
Fork 0
Code Issues Pull Requests Activity

[Bin] add script to open ediff as a diff tool

Browse Source
This commit is contained in:
Lucien Cartier-Tilet 2023-05-28 16:33:18 +02:00
parent 3073990aa2
commit 440ebe4a5d
Signed by: phundrak
GPG Key ID: BD7789E705CB8DCA
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.profile
View File

@ -52,6 +52,7 @@ export CHROME_EXECUTABLE=/usr/bin/chromium
export DENO_DIR="$HOME/.config/deno" export DENO_DIR="$HOME/.config/deno"
export DENO_INSTALL_ROOT="$HOME/.local/bin/deno" export DENO_INSTALL_ROOT="$HOME/.local/bin/deno"
export DIFFPROG=ediff
export SUDO_ASKPASS="$HOME/.local/bin/askpass" export SUDO_ASKPASS="$HOME/.local/bin/askpass"
export MANPAGER="sh -c 'col -bx | bat -l man -p'" export MANPAGER="sh -c 'col -bx | bat -l man -p'"

12
org/config/bin.org
View File

@ -616,10 +616,22 @@ xinput map-to-output "$ID" "$SCREEN"
:CUSTOM_ID: Emacs-stuff-Dired-2eeca9da :CUSTOM_ID: Emacs-stuff-Dired-2eeca9da
:HEADER-ARGS: :shebang "#!/bin/bash" :mkdirp yes :tangle ~/.local/bin/dired :HEADER-ARGS: :shebang "#!/bin/bash" :mkdirp yes :tangle ~/.local/bin/dired
:END: :END:
This script allows me to open anything in dired from the command line.
#+BEGIN_SRC bash #+BEGIN_SRC bash
emacsclient -c -a emacs -e "(dired \"$*\")" emacsclient -c -a emacs -e "(dired \"$*\")"
#+END_SRC #+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 ** Emacsmail
:PROPERTIES: :PROPERTIES:
:HEADER-ARGS: :shebang "#!/bin/bash" :mkdirp yes :tangle ~/.local/bin/emacsmail :HEADER-ARGS: :shebang "#!/bin/bash" :mkdirp yes :tangle ~/.local/bin/emacsmail