diff options
| -rw-r--r-- | lisp/init-abbrev.el | 2 | ||||
| -rw-r--r-- | lisp/init-general.el | 4 | ||||
| -rw-r--r-- | lisp/init-mail.el | 15 |
3 files changed, 11 insertions, 10 deletions
diff --git a/lisp/init-abbrev.el b/lisp/init-abbrev.el index 89de45e..c96eb10 100644 --- a/lisp/init-abbrev.el +++ b/lisp/init-abbrev.el @@ -1,6 +1,4 @@ -(setq save-abbrevs 'silently) - (add-hook 'text-mode-hook 'abbrev-mode) (add-hook 'prog-mode-hook 'abbrev-mode) diff --git a/lisp/init-general.el b/lisp/init-general.el index 757b50d..18da556 100644 --- a/lisp/init-general.el +++ b/lisp/init-general.el @@ -14,9 +14,7 @@ ;; This is intentionally not loaded. (setq custom-file "~/.emacs.d/.custom.el") -(setq save-abbrevs 'silently) - -(setq bookmark-save-flag 1) +(setq bookmark-save-flag nil) (defalias 'yes-or-no-p 'y-or-n-p) diff --git a/lisp/init-mail.el b/lisp/init-mail.el index 0163420..eda2883 100644 --- a/lisp/init-mail.el +++ b/lisp/init-mail.el @@ -1,10 +1,15 @@ (require 'init-gnus) -(if (equal (daemonp) "mail") - (progn - (setq mode-line-misc-info (cons " [Mail] " mode-line-misc-info)) - (key-chord-define-global "jg" 'km/mail-map)) - (global-set-key (kbd "C-x m") nil)) +(let ((server (daemonp))) + (cond + ((string= server "default") + (global-set-key (kbd "C-x m") nil) + (setq save-abbrevs 'silently + bookmark-save-flag 1)) + ((string= server "mail") + (setq mode-line-misc-info (cons " [Mail] " mode-line-misc-info)) + (key-chord-define-global "jg" 'km/mail-map) + (setq save-abbrevs nil)))) (provide 'init-mail) |