From ff2cfcaaafd0fa4d8d5a6fb4ea7e10fc71e4074f Mon Sep 17 00:00:00 2001 From: michener Date: Fri, 13 Aug 2010 00:51:44 +0000 Subject: [PATCH] fixing emacs stuff git-svn-id: http://photonzero.com/dotfiles/trunk@57 23f722f6-122a-0410-8cef-c75bd312dd78 --- .emacs.d/init.el | 8 ++++++++ .emacs.d/vimpulse.el | 4 ++-- .tmux.conf | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 608d170..154db87 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -55,6 +55,7 @@ (vimpulse-map "gn" 'tabbar-forward-tab) (vimpulse-map "gp" 'tabbar-backward-tab) (vimpulse-map "gw" 'vimpulse-search-forward-for-symbol-at-point) +(vimpulse-map "gK" 'kill-buffer-and-window) ;(define-key viper-insert-global-user-map "\C-d" 'delete-char)) (add-hook 'window-setup-hook 'delete-other-windows) @@ -83,4 +84,11 @@ (color-theme-barak) +; ;(defun my-emacs-startup-hook () (my-close-scratch)) (add-hook 'emacs-startup-hook 'my-emacs-startup-hook) +(defadvice viper-maybe-checkout (around viper-svn-checkin-fix activate) +"Advise viper-maybe-checkout to ignore svn files." +(let ((file (expand-file-name (buffer-file-name buf)))) +(when (and (featurep 'vc-hooks) + (not (memq (vc-backend file) '(nil SVN)))) + ad-do-it))) diff --git a/.emacs.d/vimpulse.el b/.emacs.d/vimpulse.el index f78685a..4779811 100644 --- a/.emacs.d/vimpulse.el +++ b/.emacs.d/vimpulse.el @@ -2025,7 +2025,7 @@ docstring. The variable becomes buffer-local whenever set.") (if (and (not fail-if-not-found) viper-search-wrap-around) (progn - (message "Search wrapped around BOTTOM of buffer") + (message "search hit BOTTOM, continuing at TOP") (goto-char (point-min)) (viper-search string forward (cons 1 com) t start-point 'fail) @@ -2054,7 +2054,7 @@ docstring. The variable becomes buffer-local whenever set.") (search-failed (if (and (not fail-if-not-found) viper-search-wrap-around) (progn - (message "Search wrapped around TOP of buffer") + (message "search hit TOP, continuing at BOTTOM") (goto-char (point-max)) (viper-search string forward (cons 1 com) t start-point 'fail) diff --git a/.tmux.conf b/.tmux.conf index 6a56f48..d5f621f 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -3,7 +3,7 @@ bind-key C-a last-window bind-key C-n next-window bind-key C-p previous-window set -g set-titles off -set -g default-terminal screen +set -g default-terminal xterm-256color new -d