commit 8411253d1ed2d1eaffcb7999978249456e78e16c parent 1431d04cde2f610244e190a12adbc727b2f37d6c Author: Alex Balgavy <alex@balgavy.eu> Date: Tue, 29 Nov 2022 12:06:09 +0100 emacs: fix org and pdf-tools installation Diffstat:
| M | emacs/config.org | | | 2 | +- |
| M | emacs/init.el | | | 15 | ++++++++++----- |
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/emacs/config.org b/emacs/config.org @@ -2343,7 +2343,7 @@ A better replacement for DocView: #+begin_src emacs-lisp (use-package pdf-tools :init - (pdf-tools-install 'noquery) + (pdf-tools-install) :custom (pdf-annot-default-annotation-properties '((t diff --git a/emacs/init.el b/emacs/init.el @@ -65,11 +65,16 @@ (require 'use-package-ensure) (setq use-package-always-ensure t) -;; Replace built-in Org with newest Org -;; See here: https://github.com/jwiegley/use-package/issues/319 -(assq-delete-all 'org package--builtins) -(assq-delete-all 'org package--builtin-versions) -(use-package org) +(defun za/ignore-builtin (pkg) + "Ignore built-in package PKG." + (assq-delete-all pkg package--builtins) + (assq-delete-all pkg package--builtin-versions)) +(za/ignore-builtin 'org) + +;; :pin does not actually install from GNU. See +;; https://github.com/jwiegley/use-package/issues/319 and +;; https://github.com/jwiegley/use-package/issues/955 +(use-package org :pin gnu) ;; Follow symlinks without prompting (the org file is a symlink) (setq vc-follow-symlinks t)