From 0f1df0db903ba576fd17b08197d3066af7a61e5f Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sat, 18 Nov 2023 23:23:40 +0100 Subject: A lot of changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- emacs/Makefile | 27 ++++++++++++++++++--------- emacs/init-gdb.el | 1 + 2 files changed, 19 insertions(+), 9 deletions(-) create mode 100644 emacs/init-gdb.el (limited to 'emacs') diff --git a/emacs/Makefile b/emacs/Makefile index c7f8527..9fa5799 100644 --- a/emacs/Makefile +++ b/emacs/Makefile @@ -1,5 +1,4 @@ .POSIX: -include ../common.mk install: mkdir -p -- ~/.config @@ -8,38 +7,48 @@ install: else \ set -e; \ if test -d ~/.emacs.d; then \ - test ! -e ~/.config/emacs; \ + (test ! -e ~/.config/emacs || test -L ~/.config/emacs); \ mv -- ~/.emacs.d ~/.config/emacs; \ else \ mkdir -p -- ~/.config/emacs; \ fi; \ ln -sf -- .config/emacs ~/.emacs.d; \ fi - printf '; %s\n\n' 'This file is generated by ~/.dotfiles/emacs/Makefile' > ~/.config/emacs/init.el + printf '; %s\n; %s\n\n' > ~/.config/emacs/init.el \ + 'This file is generated by ~/.dotfiles/emacs/Makefile' \ + '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!' cat -- init.el >> ~/.config/emacs/init.el - if $(CHECK_INSTALLED) emacs-go-mode 2>/dev/null; then\ + if ../check-installed emacs-go-mode 2>/dev/null; then \ printf '\n' >> ~/.config/emacs/init.el && \ cat -- init-go-mode.el >> ~/.config/emacs/init.el; \ fi - if $(CHECK_INSTALLED) emacs-haskell-mode 2>/dev/null; then\ + if ../check-installed emacs-haskell-mode; then\ printf '\n' >> ~/.config/emacs/init.el && \ cat -- init-haskell-mode.el >> ~/.config/emacs/init.el; \ fi + if ../check-installed gdb; then \ + printf '\n' >> ~/.config/emacs/init.el && \ + cat -- init-gdb.el >> ~/.config/emacs/init.el; \ + fi if grep Ubuntu < /etc/lsb-release >/dev/null 2>/dev/null; then \ mkdir -p -- ~/.config/profile.d && \ - test ! -d ~/.config/profile.d/emacs && \ + (test ! -e ~/.config/profile.d/emacs || \ + test -L ~/.config/profile.d/emacs) && \ ln -sf -- ~/.dotfiles/emacs/user-profile ~/.config/profile.d/emacs; \ fi mkdir -p -- ~/.local/bin - test ! -d ~/.local/bin/e + test ! -e ~/.local/bin/e || test -L ~/.local/bin/e ln -sf -- "$$(which emacs)" ~/.local/bin/e uninstall: + +! ../check-installed emacs + +! ../check-installed emacs-gtk + +! ../check-installed emacs-gtk2 + +! ../check-installed emacs-lucid + +! ../check-installed emacs-nox -unlink -- ~/.config/profile.d/emacs -rmdir -- ~/.config/profile.d -unlink -- ~/.config/emacs/init.el -unlink -- ~/.emacs.d -rmdir -- ~/.config/emacs -unlink -- ~/.local/bin/e - -.PHONY: install uninstall diff --git a/emacs/init-gdb.el b/emacs/init-gdb.el new file mode 100644 index 0000000..51b1a35 --- /dev/null +++ b/emacs/init-gdb.el @@ -0,0 +1 @@ +(setq gdb-many-windows t) -- cgit v1.2.3-70-g09d2