X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_emacs_el;h=38c9cee4fab1b0e4065ddf5238e6f9136330e8b5;hb=93f74e9a1a644a1a964c553c58cf7a69580cb4b3;hp=7d282bdc2e73818b5fb47eadc91effb073a7d988;hpb=e21bff65f716e6b4d474426569632196c374035d;p=sugar.git diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el index 7d282bd..38c9cee 100644 --- a/dot-files/_emacs_el +++ b/dot-files/_emacs_el @@ -19,7 +19,8 @@ (setq read-file-name-completion-ignore-case t) (tool-bar-mode nil) -(global-set-key "\C-\\" 'toggle-input-method) +(global-set-key (kbd "C-\\" ) 'toggle-input-method) +(global-set-key (kbd "C-RET") 'completion-at-point) (unless window-system (normal-erase-is-backspace-mode t)) @@ -48,10 +49,12 @@ (setq browse-url-firefox-program "/opt/local/bin/firefox") ;; Specify how to connect to some of the remote servers. (setq tramp-default-proxies-alist nil) - (add-to-list 'tramp-default-proxies-alist - '("rd8" nil "/sshx:pho@yebisu1.ymir.jp:")) - (add-to-list 'tramp-default-proxies-alist - '("yebisu1\\.ymir\\.jp" nil "/sshx:pho@boss:")))))) + (mapcar #'(lambda (proxy) + (add-to-list 'tramp-default-proxies-alist proxy)) + '( ("rd8" nil "/sshx:pho@yebisu1.ymir.jp:") + ("pho\\.dev\\.office\\.ymir\\.co\\.jp" nil "/sshx:pho@yebisu1.ymir.jp:") + ("yebisu1\\.ymir\\.jp" nil "/sshx:pho@boss:" ) + )))))) ;; Settings for Browser -------------------------------------------------------- (setq browse-url-browser-function 'w3m-browse-url) @@ -134,6 +137,9 @@ ;; ditz (require-if-present 'ditz) +;; mediawiki +(require-if-present 'mediawiki) + ;; jaspace (require-if-present 'jaspace) @@ -168,6 +174,7 @@ ;; elscreen (load "elscreen" "ElScreen" t) +(elscreen-start) (require-if-present 'elscreen-w3m) ;; undo-tree @@ -344,7 +351,6 @@ (setq cperl-indent-parens-as-block t) ;; Erlang -(add-to-list 'load-path "/usr/pkg/lib/erlang/lib/tools-2.6/emacs") (require-if-present 'erlang-start) (setq erlang-electric-commands nil) @@ -370,6 +376,7 @@ ;; migemo (require-if-present 'migemo) +(setq migemo-isearch-enable-p nil) ;; tiarra-conf (setq load-path (cons (expand-file-name "~/sandbox/Tiarra") load-path)) @@ -460,10 +467,10 @@ ;; emacs auto edit (put 'narrow-to-region 'disabled nil) (custom-set-variables - ;; custom-set-variables was added by Custom. - ;; 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. + ;; custom-set-variables was added by Custom. + ;; 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)) @@ -486,7 +493,6 @@ '(ecb-tree-buffer-style (quote ascii-guides)) '(ecb-windows-width 0.2) '(elscreen-display-tab t) - '(global-whitespace-mode t) '(haskell-program-name "ghci") '(ido-enable-flex-matching t) '(ido-everywhere t) @@ -503,8 +509,9 @@ '(js2-indent-on-enter-key nil) '(js2-mirror-mode nil) '(js2-use-font-lock-faces t) + '(mediawiki-site-alist (quote (("Wikipedia" "http://en.wikipedia.org/w/" "username" "password" "Main Page") ("YmirDev" "https://ymirlink:santamo@update.forcast.jp/fcdiv/mwiki/" "PHO" "" "メインページ")))) '(mew-field-spec (quote (("^Resent-\\(From\\|To\\|Cc\\|Date\\)" t mew-face-header-important mew-face-header-important) ("^Subject:$" t mew-face-header-important mew-face-header-subject) ("^From:$" t mew-face-header-important mew-face-header-from) ("^\\(To\\|Apparently-To\\):$" t mew-face-header-important mew-face-header-to) ("^\\(Cc\\|Dcc\\|Bcc\\):$" t mew-face-header-important mew-face-header-to) ("^Newsgroups:$" t mew-face-header-important mew-face-header-to) ("^Date:$" t mew-face-header-important mew-face-header-date) ("^Reply-To:$" t) ("^X-Mailer:$" t) ("^X-Mew:$" t mew-face-header-important mew-face-header-xmew) ("^\\(Received\\|Return-Path\\|Sender\\|Errors-To\\):$" nil) ("^\\(Path\\|Distribution\\|Xref\\):$" nil) ("^NNTP-Posting-" nil) ("^\\(Message-Id\\|Posted\\|In-Reply-To\\|References\\|Precedence\\):$" nil) ("^Delivered-" nil) ("^List-" nil) ("^\\(Mime-Version\\|Lines\\):$" nil) ("^From$" nil) ("^Status:$" nil) ("^Face:$" nil mew-face-header-private mew-face-header-marginal) ("^X-Text-Classification:$" t mew-face-header-important mew-face-header-important) ("^X-POPFile-Link:$" t mew-face-header-important mew-face-body-url) ("^\\(X\\|Original\\)-" nil mew-face-header-private mew-face-header-marginal)))) - '(mew-refile-guess-alist (quote (("From:" ("noreply@adc1.apple.com" . "+mm/adc") ("mag2 ID 0000022139" . "+mm/2ch") ("noreply@sourceforge.net" . "+from/sf-net")) ("Subject:" ("w3m-dev" . "+ml/w3m-dev")) ("To:" ("glasgow-haskell-users@haskell.org" . "+ml/ghc-users") ("fink-devel@lists.sourceforge.net" . "+ml/fink-devel")) ("Reply-To:" ("yun@kokonoe.com" . "+mm/kokonoe")) ("Cc:" ("glasgow-haskell-users@haskell.org" . "+ml/ghc-users"))))) + '(mew-refile-guess-alist (quote (("From:" ("noreply@adc1.apple.com" "+mm/adc") ("mag2 ID 0000022139" "+mm/2ch") ("noreply@sourceforge.net" "+from/sf-net")) ("Subject:" ("w3m-dev" "+ml/w3m-dev")) ("To:" ("glasgow-haskell-users@haskell.org" "+ml/ghc-users") ("fink-devel@lists.sourceforge.net" "+ml/fink-devel")) ("Reply-To:" ("yun@kokonoe.com" "+mm/kokonoe")) ("Cc:" ("glasgow-haskell-users@haskell.org" "+ml/ghc-users"))))) '(mew-scan-fields (quote ("Folder:" "Filename:" "Subject:" "Date:" "From:" "To:" "Cc:" "Content-Type:" "Content-Transfer-Encoding:" "X-Mew-Uidl:" "Message-Id:" "In-Reply-To:" "References:" "X-Mew-Ref:" "X-Text-Classification:" "Body"))) '(mew-spam: "X-Text-Classification:") '(mew-summary-form (quote (type (5 date) " " (14 from) " " t (14 x-classification) " " (30 subj) "|" (0 body)))) @@ -548,18 +555,21 @@ '(w3m-output-coding-system (quote utf-8)) '(w3m-terminal-coding-system (quote utf-8)) '(w3m-use-cookies t) - '(whitespace-style (quote (face tabs trailing lines space-before-tab newline indentation empty space-after-tab tab-mark))) + '(whitespace-style (quote (face tabs trailing lines-tail space-before-tab newline indentation empty space-after-tab tab-mark))) '(woman-cache-filename "~/.wmncach.el") '(x-select-enable-clipboard t)) (custom-set-faces - ;; custom-set-faces was added by Custom. - ;; 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. + ;; custom-set-faces was added by Custom. + ;; 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. + '(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)))) '(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)))) '(which-func-face ((t (:background "black" :foreground "dark orange")))) - '(whitespace-indentation ((t (:foreground "dimgray" :underline t))))) + '(whitespace-indentation ((t (:foreground "dimgray" :underline t)))) + '(whitespace-line ((t (:background "gray20")))))