diff --git a/core/core-ui.el b/core/core-ui.el index 321f83662..5dffb9b4e 100644 --- a/core/core-ui.el +++ b/core/core-ui.el @@ -344,7 +344,7 @@ treat Emacs as a non-application window." (setq mode-line-default-help-echo nil show-help-function nil) -;; y/n is easier to type than yes/no +;; Typing yes/no is obnoxious when y/n will do (fset #'yes-or-no-p #'y-or-n-p) ;; Try really hard to keep the cursor from getting stuck in the read-only prompt @@ -372,11 +372,11 @@ treat Emacs as a non-application window." (use-package! ediff :defer t - :init + :config (setq ediff-diff-options "-w" ; turn off whitespace checking ediff-split-window-function #'split-window-horizontally ediff-window-setup-function #'ediff-setup-windows-plain) - :config + (defvar doom--ediff-saved-wconf nil) ;; Restore window config after quitting ediff (add-hook! 'ediff-before-setup-hook diff --git a/init.example.el b/init.example.el index 39303ef3f..c854a7f4e 100644 --- a/init.example.el +++ b/init.example.el @@ -126,10 +126,10 @@ ;;nix ; I hereby declare "nix geht mehr!" ;;ocaml ; an objective camel (org ; organize your plain life in plain text - +dragndrop ; file drag & drop support - +ipython ; ipython support for babel - +pandoc ; pandoc integration into org's exporter - +present) ; using Emacs for presentations + +dragndrop ; drag & drop files/images into org buffers + +ipython ; ipython/jupyter support for babel + +pandoc ; export-with-pandoc support + +present) ; using org-mode for presentations ;;perl ; write code no one else can comprehend ;;php ; perl's insecure younger brother ;;plantuml ; diagrams for confusing people more diff --git a/modules/lang/ess/config.el b/modules/lang/ess/config.el index afbde141b..1041a5130 100644 --- a/modules/lang/ess/config.el +++ b/modules/lang/ess/config.el @@ -1,7 +1,7 @@ ;;; lang/ess/config.el -*- lexical-binding: t; -*- (use-package! ess - :commands (stata SAS) + :commands stata SAS :init (setq ess-smart-S-assign-key nil) (unless (featurep! :lang julia)