Merge branch 'master' of github.com:10sr/dotfiles

Makefile

@@ -357,6 +357,7 @@ endif
 	$(git_conf) alias.snap '! gitdir="`git rev-parse --git-dir`" && export GIT_INDEX_FILE="$$gitdir"/snapshot.index && cp "$$gitdir"/index "$$GIT_INDEX_FILE" && git add -A && : >>"$$gitdir"/logs/refs/snapshot && git update-ref refs/snapshot $$(git commit-tree $$(git write-tree) -m Snapshot -p HEAD) && git show --stat snapshot'
 
 	$(git_conf) alias.setcmd '! f(){ git config alias.$$1 "! $$2"; }; f'
+	$(git_conf) alias.make '!make'
 
 	#$(git_conf) alias.wc "!git ls-files -z | xargs -0 wc"
 	# $(git_conf) push.default "simple"

emacs.el

@@ -699,8 +699,8 @@ IF OK-IF-ALREADY-EXISTS is true force download."
 (when (safe-require-or-eval 'whitespace)
   (add-to-list 'whitespace-display-mappings ; not work
                `(tab-mark ?\t ,(vconcat "^I\t")))
-  (add-to-list 'whitespace-display-mappings
-               `(newline-mark ?\n ,(vconcat "$\n")))
+  ;; (add-to-list 'whitespace-display-mappings
+  ;;              `(newline-mark ?\n ,(vconcat "$\n")))
   (setq whitespace-style '(face
                            trailing     ; trailing blanks
                            newline      ; newlines
@@ -861,10 +861,11 @@ IF OK-IF-ALREADY-EXISTS is true force download."
 ;; some modes and hooks
 
 ;; http://qiita.com/sune2/items/b73037f9e85962f5afb7
-(global-company-mode)
-(set-variable 'company-idle-delay 0.5)
-(set-variable 'company-minimum-prefix-length 2)
-(set-variable 'company-selection-wrap-around t)
+(when (safe-require-or-eval 'company)
+  (global-company-mode)
+  (set-variable 'company-idle-delay 0.5)
+  (set-variable 'company-minimum-prefix-length 2)
+  (set-variable 'company-selection-wrap-around t))
 
 
 ;; https://github.com/lunaryorn/flycheck
@@ -910,6 +911,13 @@ IF OK-IF-ALREADY-EXISTS is true force download."
        t)
   (autoload-eval-lazily 'sl))
 
+(with-eval-after-load 'jdee
+  (add-hook 'jdee-mode-hook
+            (lambda ()
+              (make-local-variable 'global-mode-string)
+              (add-to-list 'global-mode-string
+                           mode-line-position))))
+
 (with-eval-after-load 'make-mode
   (defvar makefile-mode-map (make-sparse-keymap))
   (define-key makefile-mode-map (kbd "C-m") 'newline-and-indent)
@@ -1849,4 +1857,37 @@ Commands are searched from ALIST."
 (defalias 'make 'compile)
 (define-key ctl-x-map "c" 'compile)
 
+
+;;;;;;;;;;;;;;;;;;;;;;;
+;; adoc-simple-mode
+
+(when (safe-require-or-eval 'adoc-mode)
+  (defvar adoc-simple-font-lock-keywords
+    nil)
+  (define-derived-mode adoc-simple-mode adoc-mode
+    "Adoc-Simple"
+    "Major mode for editing AsciiDoc text files.
+This mode is a simplified version of `adoc-mode'."
+    '(set (make-local-variable 'font-lock-defaults)
+         '(adoc-simple-font-lock-keywords
+           nil nil nil nil
+           (font-lock-multiline . t)
+           (font-lock-mark-block-function . adoc-font-lock-mark-block-function))))
+  (add-to-list 'auto-mode-alist
+               '("\\.adoc\\'" . adoc-simple-mode)))
+
+(when (and (safe-require-or-eval 'google-translate)
+           (safe-require-or-eval 'google-translate-smooth-ui))
+  (add-to-list 'google-translate-translation-directions-alist
+               '("en" . "ja"))
+  (defun translate-echo-at-point ()
+    "Translate popup at point."
+    (interactive)
+    (let ((google-translate-output-destination 'echo-area))
+      (google-translate-translate "en" "ja" (current-word t t))))
+  (define-minor-mode auto-translate-mode
+    "Translate word at point automatically."
+    :global nil
+    :lighter "ATranslate"))
+
 ;;; emacs.el ends here