Auto commit by The Sugar System.

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index c3dd61a5f5c7f7199d371f5edc23d2f29c2e13ca..80357297a3a7d2cf16c6c69dc28c55a41c103129 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -57,7 +57,6 @@
                ))))))
 
 ;; Settings for Browser --------------------------------------------------------
-(setq browse-url-browser-function 'w3m-browse-url)
 (global-set-key "\C-xm" 'browse-url-at-point)
 
 ;; Setting for the Mode Line ---------------------------------------------------
@@ -524,6 +523,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
  '(ac-ignore-case nil)
  '(appt-display-format (quote window))
  '(appt-message-warning-time 20)
+ '(browse-url-browser-function (quote browse-url-firefox))
  '(canlock-password "a14fa4d2601465d55585c291fa8b3943e189e716")
  '(cleite:auto-refresh-interval nil)
  '(cleite:measure-srpc-call-time t)
@@ -570,6 +570,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
  '(js2-mirror-mode nil)
  '(js2-use-font-lock-faces t)
  '(makefile-mode-hook (quote ((lambda nil (set-variable (quote tab-width) 8)))))
+ '(markdown-live-preview-delete-export (quote delete-on-export))
  '(mediawiki-site-alist
    (quote
     (("Wikipedia" "http://en.wikipedia.org/w/" "username" "password" "Main Page")
@@ -669,6 +670,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
     ("schemas.xml" "~/share/nxml/schemas.xml" "/usr/pkg/share/emacs/site-lisp/nxml-mode/schema/schemas.xml")))
  '(rst-level-face-base-light 50)
  '(safe-local-variable-values (quote ((todo-categories "Todo" "Todo" "Todo" "Todo"))))
+ '(select-enable-clipboard t)
  '(session-use-package t nil (session))
  '(tramp-auto-save-directory "/tmp/tramp-auto-save")
  '(tramp-completion-reread-directory-timeout 2)
@@ -695,8 +697,7 @@ 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")
- '(x-select-enable-clipboard t))
+ '(woman-cache-filename "~/.wmncach.el"))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.

diff --git a/dot-files/_zshrc b/dot-files/_zshrc
index cef980790710cbbaf5e661c82234aedf47a54270..60ac6167201e1ddd580dff31d11cf5443c81a0ff 100644 (file)
--- a/dot-files/_zshrc
+++ b/dot-files/_zshrc
@@ -291,6 +291,13 @@ elif [[ $(hostname) = "yukari.cielonegro.org" ]]; then
         done
         ssh kurumi open -a Safari ${args[@]}
     }
+    function mfirefox () {
+        local -a args
+        for arg in $@; do
+            args=(${args[@]} $(printf %q "$arg"))
+        done
+        ssh kurumi open -a Firefox ${args[@]}
+    }
 fi
 
 if [[ $(uname) = "Darwin" ]]; then