diff --git a/.gitignore b/.gitignore
index 4b87a69..437db59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,30 @@
-.DS*
-.waf-1*
-.waf3-*
-.lock*
-*.pyc
-*.pyo
-build/
-VERSION
-unit-tests.conf
+# Emacs
+*~
+\#*\#
+/.emacs.desktop
+/.emacs.desktop.lock
+*.elc
+.\#*
+
+# Visual Studio Code
+.vscode/
+
+# macOS
+.DS_Store
+.AppleDouble
+.LSOverride
+._*
+
+# Waf build system
+/build/
+.waf-*-*/
+.waf3-*-*/
+.lock-waf*
+
+# Compiled python code
+__pycache__/
+*.py[cod]
+
+# Other
+/unit-tests.conf
+/VERSION