X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig.org;h=0520fa7341224cd8923158becb606e0a680ac642;hb=1ffc8a8c9140267430951925844887f51e4e55cb;hp=217f64b3efea87bfc825e39772f3307ef84429da;hpb=54f0561d3c6c571b6027b93cf5d8cf6fc3cc204c;p=dotfiles.git

diff --git a/emacs.d/config.org b/emacs.d/config.org
index 217f64b..0520fa7 100644
--- a/emacs.d/config.org
+++ b/emacs.d/config.org
@@ -350,6 +350,8 @@ clean mode line, Refer to [[https://www.masteringemacs.org/article/hiding-replac
       (auto-revert-mode . "")
       ;; default is Ind
       (org-indent-mode . "")
+      ;; default is  Fly
+      (flyspell-mode . "")
       ;; Major modes
       (lisp-interaction-mode . "λ")
       (hi-lock-mode . "")
@@ -581,7 +583,83 @@ Use [[https://github.com/DarwinAwardWinner/ido-ubiquitous][ido-ubiquitous]] for
   (global-set-key (kbd "s-u") 'undo-tree-visualize)
 #+END_SRC
 
+*** flyspell
+Stolen from [[https://github.com/redguardtoo/emacs.d/blob/master/lisp/init-spelling.el][here]], hunspell will search dictionary in =DICPATH=
+#+BEGIN_SRC emacs-lisp :tangle yes :results silent
+  (setenv "DICPATH" "/usr/local/share/hunspell")
+
+  (when (executable-find "hunspell")
+    (setq-default ispell-program-name "hunspell")
+    (setq ispell-really-hunspell t))
+
+  ;; (defun text-mode-hook-setup ()
+  ;;   ;; Turn off RUN-TOGETHER option when spell check text-mode
+  ;;   (setq-local ispell-extra-args (flyspell-detect-ispell-args)))
+  ;; (add-hook 'text-mode-hook 'text-mode-hook-setup)
+  (add-hook 'text-mode-hook 'flyspell-mode)
+
+  ;; enable flyspell check on comments and strings in progmamming modes
+  (add-hook 'prog-mode-hook 'flyspell-prog-mode)
+#+END_SRC
+
+Make flyspell enabled for org-mode, see [[http://emacs.stackexchange.com/questions/9333/how-does-one-use-flyspell-in-org-buffers-without-flyspell-triggering-on-tangled][here]]
+#+BEGIN_SRC emacs-lisp :tangle yes :results silent
+  ;; NO spell check for embedded snippets
+  (defadvice org-mode-flyspell-verify (after org-mode-flyspell-verify-hack activate)
+    (let ((rlt ad-return-value)
+          (begin-regexp "^[ \t]*#\\+begin_\\(src\\|html\\|latex\\)")
+          (end-regexp "^[ \t]*#\\+end_\\(src\\|html\\|latex\\)")
+          old-flag
+          b e)
+      (when ad-return-value
+        (save-excursion
+          (setq old-flag case-fold-search)
+          (setq case-fold-search t)
+          (setq b (re-search-backward begin-regexp nil t))
+          (if b (setq e (re-search-forward end-regexp nil t)))
+          (setq case-fold-search old-flag))
+        (if (and b e (< (point) e)) (setq rlt nil)))
+      (setq ad-return-value rlt)))
+#+END_SRC
+
+*** Expand-region
+#+BEGIN_SRC emacs-lisp :tangle yes :results silent
+  (use-package expand-region
+    :ensure t
+    :config
+    (global-set-key (kbd "C-=") 'er/expand-region))
+#+END_SRC
+
 ** Motion
+*** Avy
+#+BEGIN_SRC emacs-lisp :tangle yes :results silent
+  (use-package avy
+    :ensure t
+    :config
+    (avy-setup-default))
+#+END_SRC
+
+*** =M-g= prefix
+#+BEGIN_SRC emacs-lisp :tangle yes :results silent
+  (global-set-key (kbd "M-g g") 'avy-goto-line)
+  (global-set-key (kbd "M-g e") 'avy-goto-word-0)
+  (global-set-key (kbd "M-g w") 'avy-goto-word-1)
+  (global-set-key (kbd "M-g c") 'avy-goto-char-timer)
+  (global-set-key (kbd "M-g f") 'avy-goto-char-in-line)
+
+  ;; M-g TAB              move-to-column
+  ;; M-g ESC              Prefix Command
+  ;; M-g c                goto-char
+  ;; M-g g                goto-line
+  ;; M-g n                next-error
+  ;; M-g p                previous-error
+
+  ;; M-g M-g              goto-line
+  ;; M-g M-n              next-error
+  ;; M-g M-p              previous-error
+#+END_SRC
+
+
 ** Search & highlight
 * Key bindings
 
@@ -818,7 +896,7 @@ use the prefix =M-s= for searching in buffers
   (sd/make-keymap "\M-s"
                   '(("w" . save-buffer)
                     ;; ("\M-w" . save-buffer)
-                    ("W" . revert-buffer)
+                    ("e" . revert-buffer)
                     ("s" . isearch-forward-regexp)
                     ("r" . isearch-backward-regexp)
                     ("." . isearch-forward-symbol-at-point)
@@ -1226,7 +1304,8 @@ and Defined keys, using vi keybindings, Refer abo-abo's setting [[https://github
                        magit-staged-section-map))
       (define-key map "j" 'magit-section-forward)
       (define-key map "k" 'magit-section-backward)
-      (define-key map "D" 'magit-discard-file)
+      (define-key map "D" 'magit-discard)
+      (define-key map "O" 'magit-discard-file)
       (define-key map "n" nil)
       (define-key map "p" nil)
       (define-key map "v" 'recenter-top-bottom)
@@ -1658,6 +1737,26 @@ Play Go in Emacs, gnugo xpm refert [[https://github.com/okanotor/dotemacs/blob/f
 ** TODO bookmark
 
 ** TODO Calendar
+** advice info
+#+BEGIN_SRC emacs-lisp :tangle yes :results silent
+  (defun sd/info-mode ()
+    (interactive)
+    (unless (equal major-mode 'Info-mode)
+      (unless (> (length (window-list)) 1)
+        (split-window-right))
+      (other-window 1)
+      ;; (info)
+      ))
+
+  ;; (global-set-key (kbd "C-h i") 'sd/info-mode)
+
+  ;; open Info buffer in other window instead of current window
+  (defadvice info (before my-info (&optional file buf) activate)
+    (sd/info-mode))
+
+  (defadvice Info-exit (after my-info-exit activate)
+    (sd/delete-current-window))
+#+END_SRC
 
 * Programming