X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig.org;h=90b3ad1a80b6e14521ab6695e1a6df56f15c10db;hb=225141d6f7444d2bc6cbff3b3998d463e6ecacb9;hp=d6e6b70b26562634ab16b00e6b406fd3c09a9b85;hpb=5aae6ccd189a41b3e84c885b653f6c5a1c82340a;p=dotfiles.git diff --git a/emacs.d/config.org b/emacs.d/config.org index d6e6b70..90b3ad1 100644 --- a/emacs.d/config.org +++ b/emacs.d/config.org @@ -827,26 +827,23 @@ extend org-mode's easy templates, refer to [[http://coldnew.github.io/coldnew-em [[https://github.com/magit/magit][Magit]] is a very cool git interface on Emacs. -#+BEGIN_SRC emacs-lisp :tangle yes :results silent +and Defined keys, using vi keybindings, Refer abo-abo's setting [[https://github.com/abo-abo/oremacs/blob/c5cafdcebc88afe9e73cc8bd40c49b70675509c7/modes/ora-nextmagit.el][here]] +#+BEGIN_SRC emacs-lisp :tangle yes :results silent (use-package magit :ensure t - :commands magit-status magit-blame) - -#+END_SRC - -Defined keys, using vi keybindings, Refer abo-abo's setting [[https://github.com/abo-abo/oremacs/blob/c5cafdcebc88afe9e73cc8bd40c49b70675509c7/modes/ora-nextmagit.el][here]] -#+BEGIN_SRC emacs-lisp :tangle yes :results silent - (dolist (map (list magit-status-mode-map - magit-log-mode-map - magit-diff-mode-map - magit-staged-section-map)) - (define-key map "j" 'magit-section-forward) - (define-key map "k" 'magit-section-backward) - (define-key map "n" nil) - (define-key map "p" nil) - (define-key map "v" 'recenter-top-bottom) - (define-key map "i" 'magit-section-toggle)) + :commands magit-status magit-blame + :config + (dolist (map (list magit-status-mode-map + magit-log-mode-map + magit-diff-mode-map + magit-staged-section-map)) + (define-key map "j" 'magit-section-forward) + (define-key map "k" 'magit-section-backward) + (define-key map "n" nil) + (define-key map "p" nil) + (define-key map "v" 'recenter-top-bottom) + (define-key map "i" 'magit-section-toggle))) #+END_SRC * IDO & SMEX @@ -1260,13 +1257,11 @@ Quickly start eshll in split window below, refer [[http://www.howardism.org/Tech (progn (split-window-vertically (- (/ (window-total-height) 3))) (other-window 1) - (unless (get-buffer eshell-buffer-name) + (unless (and (boundp 'eshell-buffer-name) (get-buffer eshell-buffer-name)) (eshell)) (switch-to-buffer eshell-buffer-name) (goto-char (point-max)) (eshell-kill-input) - (message "wowo is %s" default-directory) - (message "wowo is %s" (file-name-directory (buffer-name))) (insert (format "cd %s" default-directory)) (eshell-send-input))))