summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--lisp/general.el4
2 files changed, 3 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index d36154d..4b1b2a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ auto-save-list
projects
.emacs.desktop
.mc-lists.el
+.emacs.desktop.lock \ No newline at end of file
diff --git a/lisp/general.el b/lisp/general.el
index 9e8586a..b1ae275 100644
--- a/lisp/general.el
+++ b/lisp/general.el
@@ -22,8 +22,8 @@
;; Margin
(global-linum-mode 1)
- (require 'minimap)
- (minimap-mode 1)
+ ;;(require 'minimap)
+ ;;(minimap-mode 1)
(require 'perfect-margin)
(perfect-margin-mode 1)