X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_emacs_el;h=d84dc6e4eb5c766e89bfac3b2c6f9843063cb87e;hb=fb7cc8015acb927b7e0f3e04f1cb4d01f4d3c808;hp=63bfcfa57c424071fad509f6b8095d5e07e9d383;hpb=7867ad02e3b851de019695a0c4606d44551aa4c9;p=sugar.git diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el index 63bfcfa..d84dc6e 100644 --- a/dot-files/_emacs_el +++ b/dot-files/_emacs_el @@ -1,11 +1,17 @@ ;; -*- Mode: emacs-lisp; Coding: utf-8 -*- +;; Added by Package.el. This must come before configurations of +;; installed packages. Don't delete this line. If you don't want it, +;; just comment it out by adding a semicolon to the start of the line. +;; You may delete these explanatory comments. +(package-initialize) + ;; Load paths ----------------------------------------------------------------- (add-to-list 'load-path (expand-file-name "~/.elisp")) (add-to-list 'load-path "/usr/local/share/emacs/site-lisp") ;; Setting for encodings of the environment ----------------------------------- -;(set-language-environment 'Japanese) +(set-locale-environment "en_US.UTF-8") (set-default-coding-systems 'utf-8) (set-terminal-coding-system 'utf-8) (setq default-file-name-coding-system 'utf-8) @@ -119,26 +125,6 @@ ;;(set-fontset-font nil 'katakana-jisx0201 "さざなみゴシック") ))))) -;; Hooks for newline-and-indent ------------------------------------------------ -;(mapcar (lambda (hook) -; (add-hook hook -; (lambda () -; (local-set-key "\C-m" 'newline-and-indent) -; (local-set-key "\C-j" 'newline) -; ))) -; '(perl-mode-hook -; cperl-mode-hook -; java-mode-hook -; javascript-mode-hook -; c-mode-hook -; c++-mode-hook -; objc-mode-hook -; emacs-lisp-mode-hook -; lisp-mode-hook -; yatex-mode-hook -; css-mode-hook -; scheme-mode-hook)) - ;; Setting for Packages -------------------------------------------------------- (defun require-if-present (feature) (condition-case e @@ -161,15 +147,27 @@ (load-file path) (message "Warning: file %s is absent" path))) +;; cmake +(autoload 'cmake-mode "cmake-mode" nil t) +(add-to-list 'auto-mode-alist '("CMakeLists\\.txt\\'" . cmake-mode)) +(add-to-list 'auto-mode-alist '("\\.cmake\\'" . cmake-mode)) + ;; ditz (require-if-present 'ditz) +;; flycheck +(require-if-present 'flycheck) +;(if (featurep 'flycheck) +; (global-flycheck-mode)) + +(require-if-present 'flycheck-inline) +(if (featurep 'flycheck-inline) + (with-eval-after-load 'flycheck + (add-hook 'flycheck-mode-hook #'flycheck-inline-mode))) + ;; flyspell (require-if-present 'flyspell) -;; jaspace -(require-if-present 'jaspace) - ;; glsl (autoload 'glsl-mode "glsl-mode" nil t) (add-to-list 'auto-mode-alist '("\\.glsl\\'" . glsl-mode)) @@ -177,12 +175,30 @@ (add-to-list 'auto-mode-alist '("\\.frag\\'" . glsl-mode)) (add-to-list 'auto-mode-alist '("\\.geom\\'" . glsl-mode)) +;; hengband-pickpref +(autoload 'hengband-pickpref-mode "hengband-pickpref-mode" nil t) + +;; jaspace +(require-if-present 'jaspace) + +;; pkgdiff +(add-to-list 'load-path "~/sandbox/_editors/emacs-pkgdiff") +(autoload 'pkgvi "pkgdiff" "Edit a copy of specified file." t) +(autoload 'pkgdiff "pkgdiff" "Show differences from a backup file." t) + ;; rust (autoload 'rust-mode "rust-mode" nil t) (add-to-list 'auto-mode-alist '("\\.rs\\'" . rust-mode)) +(require-if-present 'flycheck-rust) +(if (featurep 'flycheck-rust) + (with-eval-after-load 'rust-mode + (add-hook 'flycheck-mode-hook #'flycheck-rust-setup))) + ;; session (require-if-present 'session) +(if (featurep 'session) + (session-initialize)) ;; mediawiki (require-if-present 'mediawiki) @@ -225,15 +241,10 @@ Will prompt you shell name when you type `C-u' before this command." t) (paren-activate)) ;; elscreen -(condition-case e - (load "elscreen" "ElScreen" t) - (file-error - (if (equal (cadr e) "Cannot open load file") - (message "Warning: feature %s is absent" feature) ; warn and ignore - (apply 'signal (car e) (cdr e))))) ; rethrow +(require-if-present 'elscreen) +(require-if-present 'elscreen-w3m) (if (featurep 'elscreen) (elscreen-start)) -(require-if-present 'elscreen-w3m) ;; undo-tree (require-if-present 'undo-tree) @@ -269,6 +280,13 @@ Will prompt you shell name when you type `C-u' before this command." t) (autoload 'lua-mode "lua-mode" "Lua editing mode." t) (add-to-list 'auto-mode-alist '("\\.lua$" . lua-mode)) +;; projectile-mode +(require-if-present 'projectile) +(if (featurep 'projectile) + (progn + (projectile-mode +1) + (define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map))) + ;; protobuf-mode (autoload 'protobuf-mode "protobuf-mode") (add-to-list 'auto-mode-alist '("\\.proto\\'" . protobuf-mode)) @@ -300,28 +318,10 @@ Will prompt you shell name when you type `C-u' before this command." t) ;; ECB (require-if-present 'ecb-autoloads) -(let* ((hosts '(("netbsd." . - (("~/sandbox/yxmimeproc" "yxmimeproc") - ("~/sandbox/YxMIME" "YxMIME.pm") - )) - ("g1.cuenote.jp" . - (("~/sandbox/MR/engine/libycom" "libycom") - )) - ("aria.cielonegro.org" . - (("~/sandbox/_web-app/Rakka" "Rakka") - ("~/sandbox/_haskell/Lucu" "Lucu") - ("~/sandbox/_web-app/Kirschbaum" "Kirschbaum") - ("~/sandbox/_haskell/HsOpenSSL" "HsOpenSSL") - ("~/sandbox/_haskell/HsHyperEstraier" "HsHyperEstraier") - ("~/sandbox/_haskell/HsSVN" "HsSVN") - ("~/sandbox/_game/RoRo" "RoRo") - ("~/sandbox/_haskell/HXT" "HXT") - ("~/sandbox/_haskell/hxt-compile" "hxt-compile") - ("~/src/ghc-6.10.1" "ghc-6.10.1") - ("~/sandbox/sugar" "sugar") - ("~/sandbox/_haskell/dns" "dns") - ("~/sandbox/_haskell/blackboard-ddns" "blackboard-ddns") - )))) +(let* ((hosts '( ("yukari.cielonegro.org" . + ( ("~/sandbox/_games/acid-rain" "acid rain") + ("~/sandbox/_games/Natural-Mystic-Shaders" "Natural Mystic") + )))) (paths (cdr (assoc (system-name) hosts)))) (setq ecb-source-path paths)) @@ -345,8 +345,7 @@ Will prompt you shell name when you type `C-u' before this command." t) (autoload 'cleite "cleite" "Cleite RSS Aggregator -- Emacs Interface" t) ;; javascript -(autoload 'js2-mode "js2" nil t) -(add-to-list 'auto-mode-alist '("\\.js$" . js2-mode)) +(add-to-list 'auto-mode-alist '("\\.js$" . javascript-mode)) (add-to-list 'auto-mode-alist '("\\.json$" . javascript-mode)) ;; typescript @@ -393,7 +392,10 @@ Will prompt you shell name when you type `C-u' before this command." t) )) ;; Haskell -(load-if-present "haskell-site-file.el") +(autoload 'haskell-mode "haskell-mode" + "Major mode for editing Haskell scripts." t) +(autoload 'literate-haskell-mode "haskell-mode" + "Major mode for editing literate Haskell scripts." t) (autoload 'run-haskell "inf-haskell" "" t) (autoload 'switch-to-haskell "inf-haskell" "" t) @@ -410,7 +412,9 @@ Will prompt you shell name when you type `C-u' before this command." t) (add-hook 'haskell-mode-hook 'turn-on-haskell-indent) (add-hook 'haskell-mode-hook 'turn-on-haskell-ghci) -(load-if-present "~/sandbox/_input-method/haskell-unicode-input-method/haskell-unicode-input-method") +;(add-hook 'haskell-mode-hook #'flycheck-haskell-setup) + +(load-if-present "~/sandbox/_input-method/emacs-haskell-unicode-input-method/haskell-unicode-input-method") (add-hook 'haskell-mode-hook (lambda () (set-input-method "haskell-unicode"))) @@ -441,21 +445,23 @@ Will prompt you shell name when you type `C-u' before this command." t) (setq erlang-electric-commands nil) ;; SKK -(require 'skk-autoloads) -(require 'skk-study) -(global-set-key "\C-x\C-j" 'skk-mode) -(global-set-key "\C-xj" 'skk-auto-fill-mode) -(global-set-key "\C-xt" 'skk-tutorial) -(setq skk-use-jisx0201-input-method t) -(setq skk-rom-kana-rule-list - '(("@" nil "@") - ("wi" nil ("ヰ" . "ゐ")) - ("we" nil ("ヱ" . "ゑ")) - ;;("hh" "h" ("ン" . "ん")) - ;;("mm" "m" ("ン" . "ん")) - ("zx" nil ("ゝ" . "ヽ")) - ("zc" nil ("ゞ" . "ヾ")))) -(set-input-method 'japanese-skk) ; INPUT METHOD +(require-if-present 'skk-autoloads) +(if (featurep 'skk-autoloads) + (progn + (require-if-present 'skk-study) + (global-set-key "\C-x\C-j" 'skk-mode) + (global-set-key "\C-xj" 'skk-auto-fill-mode) + (global-set-key "\C-xt" 'skk-tutorial) + (setq skk-use-jisx0201-input-method t) + (setq skk-rom-kana-rule-list + '(("@" nil "@") + ("wi" nil ("ヰ" . "ゐ")) + ("we" nil ("ヱ" . "ゑ")) + ;;("hh" "h" ("ン" . "ん")) + ;;("mm" "m" ("ン" . "ん")) + ("zx" nil ("ゝ" . "ヽ")) + ("zc" nil ("ゞ" . "ヾ")))) + (set-input-method 'japanese-skk))) ; INPUT METHOD ;; navi2ch (autoload 'navi2ch "navi2ch" "Navigator for 2ch for Emacs" t) @@ -573,9 +579,6 @@ Will prompt you shell name when you type `C-u' before this command." t) ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. - '(Info-additional-directory-list - (quote - ("/sw/share/info" "/usr/local/info" "/usr/local/share/info"))) '(ac-ignore-case nil) '(appt-display-format (quote window)) '(appt-message-warning-time 20) @@ -600,13 +603,14 @@ Will prompt you shell name when you type `C-u' before this command." t) (left-fringe)))) '(ditz-find-issue-directory-automatically-flag t) '(ecb-add-path-for-not-matching-files (quote (t))) - '(ecb-help-info-path "/sw/share/info/ecb.info") - '(ecb-layout-name "left14") - '(ecb-options-version "2.32") + '(ecb-help-info-path "/usr/pkg/info/ecb.info") + '(ecb-layout-name "left7") + '(ecb-options-version "2.50") '(ecb-show-sources-in-directories-buffer (quote always)) '(ecb-tip-of-the-day nil) - '(ecb-tree-buffer-style (quote ascii-guides)) + '(ecb-tree-buffer-style (quote image)) '(ecb-windows-width 0.2) + '(electric-indent-mode nil) '(elscreen-display-tab t) '(global-whitespace-mode t) '(graphviz-dot-auto-indent-on-newline nil) @@ -710,9 +714,17 @@ Will prompt you shell name when you type `C-u' before this command." t) '(newsticker-url-list-defaults (quote (("slashdot" "http://slashdot.org/index.rss" nil 3600)))) + '(ns-command-modifier (quote meta)) '(nxml-auto-insert-xml-declaration-flag t) '(nxml-slash-auto-complete-flag t) '(org-replace-disputed-keys t) + '(package-archives + (quote + (("gnu" . "https://elpa.gnu.org/packages/") + ("melpa" . "https://melpa.org/packages/")))) + '(package-selected-packages + (quote + (elscreen elscreen-multi-term projectile elixir-mode flycheck-haskell flycheck-inline flycheck-rust undo-tree auto-complete typescript-mode cargo toml-mode rust-mode))) '(rcirc-server-alist (quote (("irc1.ymir.jp" :nick "PHO`cons" nil nil)))) '(riece-layout "default") '(riece-layout-alist @@ -742,6 +754,7 @@ Will prompt you shell name when you type `C-u' before this command." t) '(uniquify-trailing-separator-p t) '(vc-cvs-diff-switches (quote ("-u"))) '(vc-cvs-stay-local nil) + '(vc-handled-backends (quote (Git Hg))) '(w3m-bookmark-file-coding-system (quote utf-8)) '(w3m-coding-system (quote utf-8)) '(w3m-coding-system-priority-list (quote (utf-8))) @@ -759,7 +772,8 @@ Will prompt you shell name when you type `C-u' before this command." t) '(whitespace-style (quote (face tabs trailing space-before-tab newline indentation empty space-after-tab))) - '(woman-cache-filename "~/.wmncach.el")) + '(woman-cache-filename "~/.wmncach.el") + '(yaml-block-literal-electric-alist (quote ((62 . "-"))))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. @@ -768,10 +782,12 @@ Will prompt you shell name when you type `C-u' before this command." t) '(diff-added ((t (:inherit diff-changed :foreground "medium spring green" :weight extra-bold)))) '(diff-removed ((t (:foreground "gold3" :weight extra-bold)))) '(flyspell-incorrect ((t (:foreground "OrangeRed" :overline t)))) + '(font-lock-function-name-face ((t (:foreground "light steel blue" :weight bold)))) '(jaspace-highlight-tab-face ((((class color) (background dark)) (:foreground "gray70" :underline t)))) '(navi2ch-bm-new-unread-face ((t (:foreground "PaleGreen" :weight bold)))) '(navi2ch-bm-updated-cache-face ((t (:foreground "CornflowerBlue" :weight bold)))) '(navi2ch-bm-updated-unread-face ((t (:foreground "DarkSeaGreen3" :weight bold)))) + '(org-level-1 ((t (:foreground "pale turquoise")))) '(textile-link-face ((t (:foreground "cyan")))) '(textile-ol-bullet-face ((t (:foreground "dark orange")))) '(textile-ul-bullet-face ((t (:foreground "deep sky blue"))))