diff options
| -rw-r--r-- | .emacs | 13 | ||||
| -rw-r--r-- | .emacs-custom.el | 10 |
2 files changed, 11 insertions, 12 deletions
@@ -321,17 +321,10 @@ (lambda () (ibuffer-switch-to-saved-filter-groups "my/ibuffer-groups"))) - -;; Minor modes configuration - -;; See erc-modules customization above for an explanation on these -;; shenanigans. tl;dr I do not want to maintain an exhaustive list of -;; whitespace elements and risk missing out on future additions to the -;; default value; I just want to remove one specific item. -(eval-after-load 'whitespace +(eval-after-load 'org-keys '(progn - (let ((new-items (remq 'lines whitespace-style))) - (customize-set-variable 'whitespace-style new-items)))) + (define-key org-mode-map (kbd "C-j") 'org-return) + (define-key org-mode-map (kbd "RET") 'org-return-indent))) ;; Helper functions and miscellaneous settings. diff --git a/.emacs-custom.el b/.emacs-custom.el index c17bbdc..727295e 100644 --- a/.emacs-custom.el +++ b/.emacs-custom.el @@ -15,6 +15,7 @@ '(dired-listing-switches "-al -Fhv --group-directories-first") '(ediff-merge-split-window-function 'split-window-vertically) '(ediff-split-window-function 'split-window-horizontally) + '(ediff-window-setup-function 'ediff-setup-windows-plain) '(electric-pair-mode t) '(enable-recursive-minibuffers t) '(erc-log-channels-directory "~/.irc-logs") @@ -36,11 +37,13 @@ '(global-page-break-lines-mode t nil (page-break-lines)) '(gnus-cloud-method "nnimap:gmail") '(hscroll-step 1) + '(ibuffer-default-sorting-mode 'filename/process) '(icomplete-mode t) '(indent-tabs-mode nil) '(inhibit-startup-screen t) '(isearch-allow-scroll t) '(isearch-lazy-count t) + '(line-number-display-limit-width 2000) '(magit-diff-refine-hunk t) '(magit-ediff-dwim-show-on-hunks t) '(magit-log-arguments '("--graph" "--color" "--decorate" "-n256")) @@ -52,6 +55,7 @@ '(markdown-indent-on-enter 'indent-and-new-item) '(menu-bar-mode nil) '(minibuffer-depth-indicate-mode t) + '(org-fontify-quote-and-verse-blocks t) '(org-startup-indented t) '(package-archives '(("melpa" . "https://melpa.org/packages/") @@ -67,14 +71,16 @@ '(read-buffer-completion-ignore-case t) '(read-file-name-completion-ignore-case t) '(scroll-bar-mode nil) - '(scroll-conservatively 101) + '(scroll-conservatively 10) '(scroll-preserve-screen-position t) '(send-mail-function 'smtpmail-send-it) '(show-paren-mode t) '(split-width-threshold 120) '(tool-bar-mode nil) '(truncate-lines t) - '(visual-line-fringe-indicators '(left-curly-arrow right-curly-arrow))) + '(visual-line-fringe-indicators '(left-curly-arrow right-curly-arrow)) + '(whitespace-style + '(face trailing tabs spaces newline empty indentation space-after-tab space-before-tab space-mark tab-mark newline-mark))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. |