diff options
| author | Mattias Andrée <maandree@kth.se> | 2023-11-18 23:23:40 +0100 |
|---|---|---|
| committer | Mattias Andrée <maandree@kth.se> | 2023-11-18 23:23:40 +0100 |
| commit | 0f1df0db903ba576fd17b08197d3066af7a61e5f (patch) | |
| tree | a59c04307b1382257afa3c3512ec3abadf7e0e47 /emacs | |
| parent | Use losetup -d instead of --detach and add clean up (diff) | |
| download | dotfiles-0f1df0db903ba576fd17b08197d3066af7a61e5f.tar.gz dotfiles-0f1df0db903ba576fd17b08197d3066af7a61e5f.tar.bz2 dotfiles-0f1df0db903ba576fd17b08197d3066af7a61e5f.tar.xz | |
A lot of changes
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to '')
| l--------- | emacs-gtk | 1 | ||||
| l--------- | emacs-gtk2 | 1 | ||||
| l--------- | emacs-lucid | 1 | ||||
| l--------- | emacs-nox | 1 | ||||
| -rw-r--r-- | emacs/Makefile | 27 | ||||
| -rw-r--r-- | emacs/init-gdb.el | 1 |
6 files changed, 23 insertions, 9 deletions
diff --git a/emacs-gtk b/emacs-gtk new file mode 120000 index 0000000..a7642dd --- /dev/null +++ b/emacs-gtk @@ -0,0 +1 @@ +emacs
\ No newline at end of file diff --git a/emacs-gtk2 b/emacs-gtk2 new file mode 120000 index 0000000..a7642dd --- /dev/null +++ b/emacs-gtk2 @@ -0,0 +1 @@ +emacs
\ No newline at end of file diff --git a/emacs-lucid b/emacs-lucid new file mode 120000 index 0000000..a7642dd --- /dev/null +++ b/emacs-lucid @@ -0,0 +1 @@ +emacs
\ No newline at end of file diff --git a/emacs-nox b/emacs-nox new file mode 120000 index 0000000..a7642dd --- /dev/null +++ b/emacs-nox @@ -0,0 +1 @@ +emacs
\ No newline at end of file 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) |