Auto commit by The Sugar System.

diff --git a/IGNORE b/IGNORE
index 87f2f3d8cbab847a001d43837a40f660f37407ec..27fa865eb8558f4e6b7bf5866a3d129faa2f9199 100644 (file)
--- a/IGNORE
+++ b/IGNORE
@@ -38,6 +38,7 @@
 .config/gmpc
 .config/gtk-2.0/gtkfilechooser.ini
 .config/gtk-3.0/bookmarks
+.config/htop
 .config/mimeapps.list
 .config/pavucontrol.ini
 .config/pulse

diff --git a/dot-files/_config/htop/htoprc b/dot-files/_config/htop/htoprc
deleted file mode 100644 (file)
index b4b1ae9..0000000
--- a/dot-files/_config/htop/htoprc
+++ /dev/null
@@ -1,23 +0,0 @@
-# Beware! This file is rewritten by htop when settings are changed in the interface.
-# The parser is also very primitive, and not human-friendly.
-fields=0 48 17 18 38 39 40 2 46 47 49 1 
-sort_key=46
-sort_direction=1
-hide_threads=0
-hide_kernel_threads=1
-hide_userland_threads=0
-shadow_other_users=0
-show_thread_names=0
-highlight_base_name=1
-highlight_megabytes=1
-highlight_threads=0
-tree_view=0
-header_margin=1
-detailed_cpu_time=0
-cpu_count_from_zero=0
-color_scheme=5
-delay=15
-left_meters=AllCPUs Memory Swap 
-left_meter_modes=1 1 1 
-right_meters=Tasks LoadAverage Uptime 
-right_meter_modes=2 2 2 

diff --git a/dot-files/_emacs_el b/dot-files/_emacs_el
index 6418da407b87deca6308fdbcd5c013a955e94034..8f200fc20f2a31d065686c0c75149b9b71a6d8cd 100644 (file)
--- a/dot-files/_emacs_el
+++ b/dot-files/_emacs_el
@@ -751,6 +751,7 @@ Will prompt you shell name when you type `C-u' before this command." t)
  '(uniquify-trailing-separator-p t)
  '(vc-cvs-diff-switches (quote ("-u")))
  '(vc-cvs-stay-local nil)
+ '(vc-handled-backends (quote (Git Hg)))
  '(w3m-bookmark-file-coding-system (quote utf-8))
  '(w3m-coding-system (quote utf-8))
  '(w3m-coding-system-priority-list (quote (utf-8)))