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

bashrc

@@ -294,8 +294,9 @@ man(){
 }
 
 scr(){
+    test -n "$1" && pf="${1}-"
     local _tformat="%Y%m%d-%H%M%S%z"
-    local _file="${HOME}/`date +${_tformat}`.script"
+    local _file="${HOME}/${pf}`date +${_tformat}`.script"
     SCRIPT=${_file} script ${_file} "$@"
 }
 

emacs.el

@@ -45,27 +45,28 @@ otherwise the path where the library installed."
 
 (defun download-file (url path &optional ok-if-already-exists)
   "Download file from URL and output to PATH."
-  (or (ignore-errors
+  (or
+   (let ((curl (executable-find "curl")))
+     (when curl
+       (if (and (not ok-if-already-exists)
+                (file-exists-p path))
+           nil
+         (and (eq 0
+                  (call-process curl
+                                nil
+                                nil
+                                nil
+                                "--output"
+                                path
+                                url
+                                ))
+              path))))
+   (ignore-errors
         (require 'url)
         (url-copy-file url
                        path
                        ok-if-already-exists)
-        path)
-      (let ((curl (executable-find "curl")))
-        (when curl
-          (if (and (not ok-if-already-exists)
-                   (file-exists-p path))
-              nil
-            (and (eq 0
-                     (call-process curl
-                                   nil
-                                   nil
-                                   nil
-                                   "--output"
-                                   path
-                                   url
-                                   ))
-                 path))))))
+        path)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; autoload

xinitrc

@@ -1,5 +1,6 @@
 test -n "$DISPLAY" || return
 test -z "$ROXTERM_PID" || return
+test -z "$SSH_CONNECTION" || return
 
 test "`hostname`" == "arch-aspireone" &&
 setxkbmap -model "acer_laptop" -layout "jp" # this line must comes first