diff options
Diffstat (limited to 'lisp/+emacs.el')
-rw-r--r-- | lisp/+emacs.el | 69 |
1 files changed, 33 insertions, 36 deletions
diff --git a/lisp/+emacs.el b/lisp/+emacs.el index 2e3d257..7453913 100644 --- a/lisp/+emacs.el +++ b/lisp/+emacs.el | |||
@@ -80,8 +80,8 @@ Do this only if the buffer is not visiting a file." | |||
80 | mark-ring-max 50 | 80 | mark-ring-max 50 |
81 | minibuffer-eldef-shorten-default t | 81 | minibuffer-eldef-shorten-default t |
82 | minibuffer-prompt-properties (list 'read-only t | 82 | minibuffer-prompt-properties (list 'read-only t |
83 | 'cursor-intangible t | 83 | 'cursor-intangible t |
84 | 'face 'minibuffer-prompt) | 84 | 'face 'minibuffer-prompt) |
85 | mode-require-final-newline 'visit-save | 85 | mode-require-final-newline 'visit-save |
86 | mouse-drag-copy-region t | 86 | mouse-drag-copy-region t |
87 | mouse-wheel-progressive-speed nil | 87 | mouse-wheel-progressive-speed nil |
@@ -90,8 +90,8 @@ Do this only if the buffer is not visiting a file." | |||
90 | read-answer-short t | 90 | read-answer-short t |
91 | read-buffer-completion-ignore-case t | 91 | read-buffer-completion-ignore-case t |
92 | read-extended-command-predicate (when (fboundp | 92 | read-extended-command-predicate (when (fboundp |
93 | 'command-completion-default-include-p) | 93 | 'command-completion-default-include-p) |
94 | 'command-completion-default-include-p) | 94 | 'command-completion-default-include-p) |
95 | recenter-positions '(top middle bottom) | 95 | recenter-positions '(top middle bottom) |
96 | regexp-search-ring-max 100 | 96 | regexp-search-ring-max 100 |
97 | regexp-search-ring-max 200 | 97 | regexp-search-ring-max 200 |
@@ -169,23 +169,23 @@ Do this only if the buffer is not visiting a file." | |||
169 | ;;; Modes | 169 | ;;; Modes |
170 | 170 | ||
171 | (dolist (enable-mode '(global-auto-revert-mode | 171 | (dolist (enable-mode '(global-auto-revert-mode |
172 | blink-cursor-mode | 172 | blink-cursor-mode |
173 | electric-pair-mode | 173 | electric-pair-mode |
174 | show-paren-mode | 174 | show-paren-mode |
175 | global-so-long-mode | 175 | global-so-long-mode |
176 | minibuffer-depth-indicate-mode | 176 | minibuffer-depth-indicate-mode |
177 | file-name-shadow-mode | 177 | file-name-shadow-mode |
178 | minibuffer-electric-default-mode | 178 | minibuffer-electric-default-mode |
179 | delete-selection-mode | 179 | delete-selection-mode |
180 | column-number-mode)) | 180 | column-number-mode)) |
181 | (when (fboundp enable-mode) | 181 | (when (fboundp enable-mode) |
182 | (funcall enable-mode +1))) | 182 | (funcall enable-mode +1))) |
183 | 183 | ||
184 | (dolist (disable-mode '(tooltip-mode | 184 | (dolist (disable-mode '(tooltip-mode |
185 | tool-bar-mode | 185 | tool-bar-mode |
186 | menu-bar-mode | 186 | menu-bar-mode |
187 | scroll-bar-mode | 187 | scroll-bar-mode |
188 | horizontal-scroll-bar-mode)) | 188 | horizontal-scroll-bar-mode)) |
189 | (when (fboundp disable-mode) | 189 | (when (fboundp disable-mode) |
190 | (funcall disable-mode -1))) | 190 | (funcall disable-mode -1))) |
191 | 191 | ||
@@ -243,19 +243,16 @@ kill without asking." | |||
243 | ("C-s" . isearch-forward-regexp) | 243 | ("C-s" . isearch-forward-regexp) |
244 | ("C-r" . isearch-backward-regexp) | 244 | ("C-r" . isearch-backward-regexp) |
245 | ("C-M-s" . isearch-forward) | 245 | ("C-M-s" . isearch-forward) |
246 | ("C-M-r" . isearch-backward) | 246 | ("C-M-r" . isearch-backward))) |
247 | ("M-u" . upcase-dwim) | ||
248 | ("M-l" . downcase-dwim) | ||
249 | ("M-c" . capitalize-dwim))) | ||
250 | (define-key +key-mode-map (kbd (car binding)) (cdr binding))) | 247 | (define-key +key-mode-map (kbd (car binding)) (cdr binding))) |
251 | 248 | ||
252 | ;;; Required libraries | 249 | ;;; Required libraries |
253 | 250 | ||
254 | (when (require 'uniquify nil :noerror) | 251 | (when (require 'uniquify nil :noerror) |
255 | (setq-default uniquify-buffer-name-style 'forward | 252 | (setq-default uniquify-buffer-name-style 'forward |
256 | uniquify-separator path-separator | 253 | uniquify-separator path-separator |
257 | uniquify-after-kill-buffer-p t | 254 | uniquify-after-kill-buffer-p t |
258 | uniquify-ignore-buffers-re "^\\*")) | 255 | uniquify-ignore-buffers-re "^\\*")) |
259 | 256 | ||
260 | (when (require 'goto-addr) | 257 | (when (require 'goto-addr) |
261 | (if (fboundp 'global-goto-address-mode) | 258 | (if (fboundp 'global-goto-address-mode) |
@@ -264,36 +261,36 @@ kill without asking." | |||
264 | 261 | ||
265 | (when (require 'recentf nil :noerror) | 262 | (when (require 'recentf nil :noerror) |
266 | (setq-default recentf-save-file (.etc "recentf.el") | 263 | (setq-default recentf-save-file (.etc "recentf.el") |
267 | recentf-max-menu-items 100 | 264 | recentf-max-menu-items 100 |
268 | recentf-max-saved-items nil | 265 | recentf-max-saved-items nil |
269 | recentf-auto-cleanup 'mode) | 266 | recentf-auto-cleanup 'mode) |
270 | (add-to-list 'recentf-exclude .etc) | 267 | (add-to-list 'recentf-exclude .etc) |
271 | (recentf-mode +1)) | 268 | (recentf-mode +1)) |
272 | 269 | ||
273 | (when (require 'repeat nil :noerror) | 270 | (when (require 'repeat nil :noerror) |
274 | (setq-default repeat-exit-key "g" | 271 | (setq-default repeat-exit-key "g" |
275 | repeat-exit-timeout 5) | 272 | repeat-exit-timeout 5) |
276 | (when (fboundp 'repeat-mode) | 273 | (when (fboundp 'repeat-mode) |
277 | ;; `repeat-mode' is defined in repeat.el, which is an older library. | 274 | ;; `repeat-mode' is defined in repeat.el, which is an older library. |
278 | (repeat-mode +1))) | 275 | (repeat-mode +1))) |
279 | 276 | ||
280 | (when (require 'savehist nil :noerror) | 277 | (when (require 'savehist nil :noerror) |
281 | (setq-default history-length t | 278 | (setq-default history-length t |
282 | history-delete-duplicates t | 279 | history-delete-duplicates t |
283 | history-autosave-interval 60 | 280 | history-autosave-interval 60 |
284 | savehist-file (.etc "savehist.el")) | 281 | savehist-file (.etc "savehist.el")) |
285 | (dolist (var '(extended-command-history | 282 | (dolist (var '(extended-command-history |
286 | global-mark-ring | 283 | global-mark-ring |
287 | kill-ring | 284 | kill-ring |
288 | regexp-search-ring | 285 | regexp-search-ring |
289 | search-ring | 286 | search-ring |
290 | mark-ring)) | 287 | mark-ring)) |
291 | (add-to-list 'savehist-additional-variables var)) | 288 | (add-to-list 'savehist-additional-variables var)) |
292 | (savehist-mode +1)) | 289 | (savehist-mode +1)) |
293 | 290 | ||
294 | (when (require 'saveplace nil :noerror) | 291 | (when (require 'saveplace nil :noerror) |
295 | (setq-default save-place-file (.etc "places.el") | 292 | (setq-default save-place-file (.etc "places.el") |
296 | save-place-forget-unreadable-files (eq system-type 'gnu/linux)) | 293 | save-place-forget-unreadable-files (eq system-type 'gnu/linux)) |
297 | (save-place-mode +1)) | 294 | (save-place-mode +1)) |
298 | 295 | ||
299 | ;; (when (require 'tramp) | 296 | ;; (when (require 'tramp) |