about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <vincent@spotify.com>2013-08-05T13·37+0200
committerVincent Ambo <vincent@spotify.com>2013-08-05T13·37+0200
commitedb2ca67d3d4809af7f164142a318b65e6ecae69 (patch)
tree42fe1bb9826972cdace3674c3897375b3f231932
parent1ba56be2ee45cf902199223d6ed86d04739c1399 (diff)
Rename irc.el to init-irc.el
-rw-r--r--.gitignore2
-rw-r--r--init.el2
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index c6aee83ff21f..e0336e08dea0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 scripts/
 init-local.el
-irc.el
+init-irc.el
 elpa/
 themes/
 other/
diff --git a/init.el b/init.el
index a448bf2f2dde..50b140ac4235 100644
--- a/init.el
+++ b/init.el
@@ -77,7 +77,7 @@
 
 ;; IRC configuration (erc)
 ;; Actual servers and such are loaded from irc.el
-(load-file-if-exists "~/.emacs.d/irc.el")
+(load-file-if-exists "~/.emacs.d/init-irc.el")
 
 ;; Load magnars' string manipulation library
 (require 's)