summaryrefslogtreecommitdiff
path: root/emacs
diff options
context:
space:
mode:
Diffstat (limited to 'emacs')
-rw-r--r--emacs/inits/01-basic.el5
-rw-r--r--emacs/inits/20-programming.el15
2 files changed, 4 insertions, 16 deletions
diff --git a/emacs/inits/01-basic.el b/emacs/inits/01-basic.el
index 7e07e1d..af5e3cf 100644
--- a/emacs/inits/01-basic.el
+++ b/emacs/inits/01-basic.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2023-10-24 19h06 CEST (anker)>
+;; Time-stamp: <2023-12-05 10h22 CET (23c7555b)>
;; -----------------------------------------------------------------------------
;; Interface
@@ -126,7 +126,8 @@
(use-package tramp
:config
- (setq tramp-use-ssh-controlmaster-options nil))
+ (setq tramp-use-ssh-controlmaster-options nil)
+ (setq tramp-ssh-controlmaster-options ""))
(require 'saveplace)
(save-place-mode)
diff --git a/emacs/inits/20-programming.el b/emacs/inits/20-programming.el
index 23e9b53..9f37c71 100644
--- a/emacs/inits/20-programming.el
+++ b/emacs/inits/20-programming.el
@@ -1,4 +1,4 @@
-;; Time-stamp: <2023-10-29 14h47 CET (anker)>
+;; Time-stamp: <2023-12-05 12h55 CET (23c7555b)>
;; -----------------------------------------------------------------------------
;; General setup
@@ -306,19 +306,6 @@
:bind (:map json-mode-map
("C-c C-f" . nil)))
-(use-package jinja2-mode
- :ensure t
- :defer t
- :mode ("\\.jinja\\'" . jinja2-mode)
- :hook (jinja2-mode . (lambda ()
- (setq indent-line-function 'indent-relative)
- (highlight-indent-guides-mode)
- (programming-setup)
- (spell-fu-mode -1)
- (auto-fill-mode -1)))
- :bind (:map jinja2-mode-map
- ("C-c C-f" . nil)))
-
(use-package zig-mode
:ensure t
:defer t