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

emacs.el

@@ -1889,10 +1889,11 @@ if arg given, use that eshell buffer, otherwise make new eshell buffer."
 
 (define-key ctl-x-map "s" 'my-rgrep)
 
-(defun make ()
-  "Run \"make -k\" in current directory."
-  (interactive)
-  (compile "make -k"))
+;; (defun make ()
+;;   "Run \"make -k\" in current directory."
+;;   (interactive)
+;;   (compile "make -k"))
+(defalias 'make 'compile)
 
 (defvar sed-in-place-history nil
   "History of `sed-in-place'")

profile

@@ -38,4 +38,5 @@ export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$_python_pkg_conf"
 #export MANPATH="`manpath`:$HOME/.local/share/man"
 
 # in my environment powerdown does not work
-type setterm >/dev/null 2>&1 && setterm -blank 30 -powersave on # -powerdown 10
+test -z "$SSH_CONNECTION" && \
+    type setterm >/dev/null 2>&1 && setterm -blank 30 -powersave on # -powerdown 10