diff --git a/emacs.el b/emacs.el index 5cfc910..6f4d57b 100644 --- a/emacs.el +++ b/emacs.el @@ -346,10 +346,11 @@ drill-instructor.el" )) (when (require 'whitespace nil t) - (setq whitespace-style '(face newline newline-mark empty tabs lines trailing)) + (setq whitespace-style '(face newline newline-mark empty tabs lines-trail trailing)) ;; (setq whitespace-newline 'font-lock-comment-face) (add-to-list 'whitespace-display-mappings - `(newline-mark ?\n ,(vconcat "$\n"))) + `(newline-mark ?\n ,(vconcat "$\n")) + ) (global-whitespace-mode t)) ;; highlight current line diff --git a/xprograms b/xprograms index b2c6c3a..129723d 100755 --- a/xprograms +++ b/xprograms @@ -26,8 +26,8 @@ _gsoundap(){ } _conky(){ - conky -c ~/.dotfiles/conkyrc >~/.backup/log/conky.log 2>&1 & - conky -c ~/.dotfiles/conkyrc.2 >~/.backup/log/conky.2.log 2>&1 & + conky -c ~/.dotfiles/conkyrc >~/.my/log/conky.log 2>&1 & + conky -c ~/.dotfiles/conkyrc.2 >~/.my/log/conky.2.log 2>&1 & } _wicd(){