--- a/.emacs-my	Mon Nov 30 00:49:45 2015 +0200
+++ b/.emacs-my	Wed Dec 02 23:41:53 2015 +0200
@@ -920,6 +920,7 @@
 
 (setq ido-use-filename-at-point 'guess)
 (setq ido-use-url-at-point t)
+(setq ido-auto-merge-work-directories-length -1)
 (setq ido-enable-tramp-completion t)
 (setq ido-use-virtual-buffers t)
 (setq ido-max-prospects 16)
@@ -972,6 +973,7 @@
 (setq uniquify-buffer-name-style 'post-forward)
 (setq uniquify-separator "|")
 (setq uniquify-after-kill-buffer-p t)
+(setq uniquify-strip-common-suffix t)
 
 (setq read-buffer-completion-ignore-case t)
 (setq read-file-name-completion-ignore-case t)