From 129bc6b7a21d96c9fa0786ee1e50b700c4f54d81 Mon Sep 17 00:00:00 2001 From: Hugo Thunnissen Date: Mon, 21 Aug 2023 14:05:30 +0200 Subject: [PATCH] Add native compilation and el-config sourcing --- Dockerfile | 7 ++++--- emacs/init.el | 9 +++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index a7ccf37..037f85b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,18 +29,19 @@ RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install \ libxpm-dev libpng-dev zlib1g-dev libgmp-dev autoconf pkg-config \ p11-kit libp11-kit-dev nettle-dev libgnutls28-dev libtool \ libncurses-dev bash cmake htop net-tools dnsutils libgtk-3-dev wget \ - libmagickwand-dev imagemagick libacl1-dev libxml2-dev + libmagickwand-dev imagemagick libacl1-dev libxml2-dev libgccjit-11-dev -RUN wget https://ftp.gnu.org/gnu/emacs/emacs-28.2.tar.gz \ +RUN wget https://ftp.gnu.org/gnu/emacs/emacs-29.1.tar.gz \ -O /tmp/emacs.tar.gz WORKDIR /tmp/emacs RUN tar --strip-components=1 -xf /tmp/emacs.tar.gz +RUN CC="gcc-11" ./autogen.sh -RUN ./configure +RUN ./configure --with-native-compilation RUN sed -i 's!static unsigned char sigsegv_stack\[SIGSTKSZ\]!static max_align_t sigsegv_stack\[(64 * 1024 + sizeof (max_align_t) - 1) / sizeof (max_align_t)\]!g' ./src/sysdep.c diff --git a/emacs/init.el b/emacs/init.el index 53ea18f..1c1f69c 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -31,7 +31,8 @@ (require 'flyspell) (add-hook 'prog-mode-hook 'flyspell-prog-mode) -(add-hook 'prog-mode-hook 'linum-mode) +;;(add-hook 'prog-mode-hook 'linum-mode) +(add-hook 'prog-mode-hook 'display-line-numbers-mode) (add-hook 'prog-mode-hook 'show-paren-mode) (add-hook 'prog-mode-hook 'display-fill-column-indicator-mode) @@ -149,6 +150,10 @@ (add-to-list 'load-path "~/projects/emcn.el") (add-to-list 'load-path "~/projects/notes-list") +(when (file-directory-p "~/projects/el-config/enabled") + (dolist (file (directory-files "~/projects/el-config/enabled" t "^[^.]")) + (load file t nil t))) + (when (require 'qtoot nil 'noerror) (setq qtoot-enable-drafts t)) @@ -624,7 +629,7 @@ See `yank' for documentation of ARG." ;; END IDO -(require 'hyperbole) +;(require 'hyperbole) ;(eval-after-load 'kotl-mode '(require 'hugot-kotl-mode)) ;; Emoji support