direx with popwin

diff --git a/.gitmodules b/.gitmodules
index 0315f889c9b59598a8d20c483236edbba4c53ffd..c71de2bfb11ad9b7dc9232be34d948e9a42b9c37 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -91,3 +91,9 @@
 [submodule "markdown-mode"]
        path = packages/markdown-mode
        url = https://github.com/jrblevin/markdown-mode.git
+[submodule "direx"]
+       path = packages/direx
+       url = https://github.com/m2ym/direx-el.git
+[submodule "popwin"]
+       path = packages/popwin
+       url = https://github.com/m2ym/popwin-el.git

diff --git a/README.md b/README.md
index 54574a3ce3b98a5b5447510ac3728a353c610277..7c8c65aaa001ecd7e71ceb863ca0a4453628eb69 100644 (file)
--- a/README.md
+++ b/README.md
@@ -151,7 +151,7 @@ C-u F3                                          Play last macro then append keys
 F4                                              Play back macro
 
 # Mode switching
-C-x C-j                                         Open dired at current file
+C-x C-j                                         Open direx at current file
 F8                                              Toggle flyspell-mode
 F9                                              Toggle whitespace mode
 F10                                             Toggle word wrap

diff --git a/lisp/my-keys.el b/lisp/my-keys.el
index b64ed97619c2a54ac01ba12dab4b39a38fb8f577..9885cf9a863e3b333fc6acde6befd12d41fa74db 100644 (file)
--- a/lisp/my-keys.el
+++ b/lisp/my-keys.el
@@ -43,6 +43,7 @@
 (global-set-key (kbd "M-z") 'zap-up-to-char)
 
 ;; Mode switching
+(global-set-key (kbd "C-x C-j") 'direx:jump-to-directory-other-window)
 (global-set-key (kbd "<f8>") 'flyspell-mode)
 (global-set-key (kbd "<f9>") 'whitespace-mode)
 (global-set-key (kbd "<f10>") 'toggle-truncate-lines)

diff --git a/lisp/my-other-modes.el b/lisp/my-other-modes.el
index 58848b665a6a19b1d903127c5d9631f95475102e..e0195cdc372091f6e20a6a32a13b1eec7c063cfa 100644 (file)
--- a/lisp/my-other-modes.el
+++ b/lisp/my-other-modes.el
@@ -3,7 +3,7 @@
 (setq global-auto-revert-non-file-buffers t)
 (setq auto-revert-verbose nil)
 
-(require 'dired-x)
+(require 'direx)
 
 (setq disabled-command-function nil)
 
@@ -14,10 +14,15 @@
             (unless (eq ibuffer-sorting-mode 'alphabetic)
               (ibuffer-do-sort-by-alphabetic))))
 
-(setq require-final-newline t)
-
 (require 'restclient)
 
+(require 'popwin)
+(popwin-mode 1)
+(push '(direx:direx-mode :position left :width 25 :dedicated t)
+      popwin:special-display-config)
+
+(setq require-final-newline t)
+
 (setq save-interprogram-paste-before-kill t)
 
 (setq shift-select-mode nil)

diff --git a/packages/direx b/packages/direx
new file mode 160000 (submodule)
index 0000000..9497231
--- /dev/null
+++ b/packages/direx
@@ -0,0 +1 @@
+Subproject commit 9497231cf50767987494718db073731b05a4f970

diff --git a/packages/popwin b/packages/popwin
new file mode 160000 (submodule)
index 0000000..95dea14
--- /dev/null
+++ b/packages/popwin
@@ -0,0 +1 @@
+Subproject commit 95dea14c60019d6cccf9a3b33e0dec4e1f22c304