summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.emacs11
-rw-r--r--.emacs-custom.el2
2 files changed, 12 insertions, 1 deletions
diff --git a/.emacs b/.emacs
index 2b2ffdf..8d68ccb 100644
--- a/.emacs
+++ b/.emacs
@@ -118,6 +118,11 @@
(let ((default-directory (my/project-root)))
(call-interactively f))))
+(defun my/magit-project ()
+ (interactive)
+ (require 'project)
+ (magit-status (project-prompt-project-dir)))
+
(global-set-key (kbd "C-c c") 'compile)
(global-set-key (kbd "C-c e f") 'auto-fill-mode)
(global-set-key (kbd "C-c i t") (my/make-toggle-input-method 'TeX))
@@ -127,6 +132,7 @@
(global-set-key (kbd "C-c k !") 'my/kill-ring-shell)
(global-set-key (kbd "C-c m") 'man)
(global-set-key (kbd "C-c p c") (my/make-project-wide 'compile))
+(global-set-key (kbd "C-c p g") 'my/magit-project)
(global-set-key (kbd "C-c p !") (my/make-project-wide 'shell-command))
(global-set-key (kbd "C-c p &") (my/make-project-wide 'async-shell-command))
(global-set-key (kbd "C-c p f") 'project-find-file)
@@ -310,7 +316,10 @@
(mode . lisp-interaction-mode)))
("Programming" (derived-mode . prog-mode))
("Folders" (mode . dired-mode))
- ("Chat" (mode . erc-mode))
+ ("Messaging"
+ (or (mode . erc-mode)
+ (mode . message-mode)
+ (derived-mode . gnus-mode)))
("Documentation"
(or (mode . Info-mode)
(mode . Man-mode)
diff --git a/.emacs-custom.el b/.emacs-custom.el
index d16cc94..973e602 100644
--- a/.emacs-custom.el
+++ b/.emacs-custom.el
@@ -45,6 +45,7 @@
'(isearch-allow-scroll t)
'(isearch-lazy-count t)
'(line-number-display-limit-width 2000)
+ '(lua-indent-level 2)
'(magit-diff-refine-hunk t)
'(magit-ediff-dwim-show-on-hunks t)
'(magit-log-arguments '("--graph" "--color" "--decorate" "-n256"))
@@ -56,6 +57,7 @@
'(markdown-indent-on-enter 'indent-and-new-item)
'(menu-bar-mode nil)
'(minibuffer-depth-indicate-mode t)
+ '(org-fontify-done-headline nil)
'(org-fontify-quote-and-verse-blocks t)
'(org-startup-indented t)
'(package-archives