9 files changed, 18 insertions, 52 deletions

diff --git a/.emacs b/.emacs
index b89bcb7..50d6ae0 100644
--- a/.emacs
+++ b/.emacs
@@ -105,6 +105,9 @@
 (setq split-height-threshold nil)
 (setq split-width-threshold 160)
 
+;; disable terminal mouse by default
+(xterm-mouse-mode -1)
+
 
 ;; Programming section
 
diff --git a/.emacs.d/lisp/yaml-mode.el b/.emacs.d/lisp/yaml-mode.el
index dad0380..3add6b7 100644
--- a/.emacs.d/lisp/yaml-mode.el
+++ b/.emacs.d/lisp/yaml-mode.el
@@ -6,7 +6,7 @@
 ;;         Marshall T. Vandegrift <llasram@gmail.com>
 ;; Maintainer: Vasilij Schneidermann <mail@vasilij.de>
 ;; URL: https://github.com/yoshiki/yaml-mode
-;; Package-Requires: ((emacs "24.1"))
+;; Package-Requires: ((emacs "24.3"))
 ;; Keywords: data yaml
 ;; Version: 0.0.16
 
@@ -109,7 +109,7 @@ that key is pressed to begin a block literal."
   :group 'yaml)
 
 (defcustom yaml-imenu-generic-expression
-  '((nil  "^\\(:?[a-zA-Z_-]+\\):"          1))
+  '((nil  "^\\(:?[a-zA-Z_][-a-zA-Z0-9_.]*\\):"          1))
   "The imenu regex to parse an outline of the yaml file."
   :type 'string
   :group 'yaml)
@@ -218,17 +218,17 @@ that key is pressed to begin a block literal."
 (define-derived-mode yaml-mode text-mode "YAML"
   "Simple mode to edit YAML."
   (setq-local electric-indent-inhibit t) ;We can't *re*indent reliably.
-  (set (make-local-variable 'comment-start) "# ")
-  (set (make-local-variable 'comment-start-skip) "#+ *")
-  (set (make-local-variable 'comment-end) "")
-  (set (make-local-variable 'indent-line-function) #'yaml-indent-line)
-  (set (make-local-variable 'indent-tabs-mode) nil)
-  (set (make-local-variable 'fill-paragraph-function) #'yaml-fill-paragraph)
-  (set (make-local-variable 'page-delimiter) "^---\\([ \t].*\\)*\n")
+  (setq-local comment-start "# ")
+  (setq-local comment-start-skip "#+ *")
+  (setq-local comment-end "")
+  (setq-local indent-line-function #'yaml-indent-line)
+  (setq-local indent-tabs-mode nil)
+  (setq-local fill-paragraph-function #'yaml-fill-paragraph)
+  (setq-local page-delimiter "^---\\([ \t].*\\)*\n")
 
-  (set (make-local-variable 'syntax-propertize-function)
-       #'yaml-mode-syntax-propertize-function)
-  (setq font-lock-defaults '(yaml-font-lock-keywords)))
+  (setq-local syntax-propertize-function  #'yaml-mode-syntax-propertize-function)
+  (setq-local imenu-generic-expression yaml-imenu-generic-expression)
+  (setq-local font-lock-defaults '(yaml-font-lock-keywords)))
 
 
 ;; Font-lock support
@@ -464,16 +464,6 @@ this will do usual adaptive fill behaviors."
       (or (fill-comment-paragraph justify)
           (fill-paragraph justify region)))))
 
-(defun yaml-set-imenu-generic-expression ()
-  ;; FIXME: Why set this var to its default value?
-  (setq-local imenu-create-index-function #'imenu-default-create-index-function)
-  (setq-local imenu-generic-expression yaml-imenu-generic-expression))
-
-;; FIXME: Why not inline `yaml-set-imenu-generic-expression' into the
-;; major mode function?
-(add-hook 'yaml-mode-hook #'yaml-set-imenu-generic-expression)
-
-
 (defun yaml-mode-version ()
   "Display version of `yaml-mode'."
   (interactive)
diff --git a/.emacs.d/snippets/python-mode.statnett/__repr__ b/.emacs.d/snippets/python-mode.statnett/__repr__
deleted file mode 100644
index 85cb80f..0000000
--- a/.emacs.d/snippets/python-mode.statnett/__repr__
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: __repr__
-# key: _repr
-# group: Special methods
-# --
-def __repr__(self):
-    return $0
diff --git a/.emacs.d/snippets/python-mode.statnett/__str__ b/.emacs.d/snippets/python-mode.statnett/__str__
deleted file mode 100644
index f623df7..0000000
--- a/.emacs.d/snippets/python-mode.statnett/__str__
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: __str__
-# key: _str
-# group: Special methods
-# --
-def __str__(self):
-    return $0
diff --git a/.emacs.d/snippets/python-mode.statnett/function_docstring b/.emacs.d/snippets/python-mode.statnett/function_docstring
index 685eaf5..1f7f35b 100644
--- a/.emacs.d/snippets/python-mode.statnett/function_docstring
+++ b/.emacs.d/snippets/python-mode.statnett/function_docstring
@@ -2,7 +2,6 @@
 # name: function_docstring
 # key: fd
 # group: definitions
-# NOTE: Use minimum indentation, because Emacs 25+ doesn't dedent docstrings.
 # --
 def ${1:name}($2):
     \"\"\"$3
diff --git a/.emacs.d/snippets/python-mode/__repr__ b/.emacs.d/snippets/python-mode/__repr__
deleted file mode 100644
index 85cb80f..0000000
--- a/.emacs.d/snippets/python-mode/__repr__
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: __repr__
-# key: _repr
-# group: Special methods
-# --
-def __repr__(self):
-    return $0
diff --git a/.emacs.d/snippets/python-mode/__str__ b/.emacs.d/snippets/python-mode/__str__
deleted file mode 100644
index f623df7..0000000
--- a/.emacs.d/snippets/python-mode/__str__
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: __str__
-# key: _str
-# group: Special methods
-# --
-def __str__(self):
-    return $0
diff --git a/.emacs.d/snippets/python-mode/function_docstring b/.emacs.d/snippets/python-mode/function_docstring
index 685eaf5..1f7f35b 100644
--- a/.emacs.d/snippets/python-mode/function_docstring
+++ b/.emacs.d/snippets/python-mode/function_docstring
@@ -2,7 +2,6 @@
 # name: function_docstring
 # key: fd
 # group: definitions
-# NOTE: Use minimum indentation, because Emacs 25+ doesn't dedent docstrings.
 # --
 def ${1:name}($2):
     \"\"\"$3
diff --git a/.emacs.pure b/.emacs.pure
index 9dc4f05..71852b8 100644
--- a/.emacs.pure
+++ b/.emacs.pure
@@ -105,6 +105,9 @@
 (setq split-height-threshold nil)
 (setq split-width-threshold 160)
 
+;; disable terminal mouse by default
+(xterm-mouse-mode -1)
+
 
 ;; Programming section