From 32be0c6389e15c650fdd950c6220ea2e2ff0d845 Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Tue, 25 Sep 2012 21:49:27 +0900 Subject: [PATCH 01/10] add conf/updatefiles.sh --- conf/updatefiles.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 conf/updatefiles.sh diff --git a/conf/updatefiles.sh b/conf/updatefiles.sh new file mode 100755 index 0000000..21deedc --- /dev/null +++ b/conf/updatefiles.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +diff -u /usr/share/doc/moc/config.example ~/.moc/config > moc.config.diff From ec7e0e00bedd12be46453ee7a8c09ab52b736868 Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Wed, 26 Sep 2012 08:19:56 +0900 Subject: [PATCH 02/10] do not use kill-whole-line as C-k --- emacs.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emacs.el b/emacs.el index cf8f407..5878eb5 100644 --- a/emacs.el +++ b/emacs.el @@ -515,7 +515,7 @@ drill-instructor.el" ;; (newline-and-indent)) (kbd "C-e C-m") ) -(global-set-key (kbd "C-k") 'kill-whole-line) +;(global-set-key (kbd "C-k") 'kill-whole-line) (global-set-key (kbd "M-k") 'my-copy-whole-line) ;; (global-set-key "\C-z" 'undo) ; undo is M-u (global-set-key (kbd "M-u") 'undo) From f88cb6ed477b599411a7f1cf5daf1bb40d74c2f2 Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Wed, 26 Sep 2012 23:59:33 +0900 Subject: [PATCH 03/10] add alias setup.py --- bashrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bashrc b/bashrc index 62d130c..baa59fd 100755 --- a/bashrc +++ b/bashrc @@ -202,6 +202,8 @@ then || complete -o default -o nospace -F _git g fi +alias setup.py="sudo python3 setup.py install --record files.txt" + scr(){ _time="%Y-%m-%dT%H:%M:%S%z" script `date +${_time}`.script "$@" From 5f44aab6047e8328dd3231612c6ee5b91df660a4 Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Thu, 27 Sep 2012 21:15:38 +0900 Subject: [PATCH 04/10] add sl --- emacs.el | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/emacs.el b/emacs.el index 5878eb5..b45b405 100644 --- a/emacs.el +++ b/emacs.el @@ -859,6 +859,11 @@ drill-instructor.el" (smart-revert-on) ) +(and (dllib-if-unfound + "http://www.emacswiki.org/emacs/download/sl.el" + t) + (require 'sl nil t)) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; term mode From 350cb9b23b8081a201c4df3fc3e016c8d43cb0ad Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Tue, 2 Oct 2012 11:59:16 +0900 Subject: [PATCH 05/10] update keybind for dired, but i think more update needed --- emacs.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/emacs.el b/emacs.el index b45b405..594d7ba 100644 --- a/emacs.el +++ b/emacs.el @@ -1279,6 +1279,8 @@ drill-instructor.el" 'my-dired-previous-line dired-mode-map) (define-key dired-mode-map (kbd "") 'my-dired-scroll-up) (define-key dired-mode-map (kbd "") 'my-dired-scroll-down) + (define-key dired-mode-map (kbd "ESC p") 'my-dired-scroll-up) + (define-key dired-mode-map (kbd "ESC n") 'my-dired-scroll-down) (let ((file "._Icon\015")) (when nil (file-readable-p file) (delete-file file))))) From 91edb3855308430457067bd3b1e646a7025fbc94 Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Tue, 2 Oct 2012 13:19:58 +0900 Subject: [PATCH 06/10] update some aliases --- bashrc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bashrc b/bashrc index be64c17..7d96a6b 100755 --- a/bashrc +++ b/bashrc @@ -137,14 +137,15 @@ alias sh="ENV=$HOME/.shrc PS1=\$\ PROMPT_COMMAND="" sh" # type trash >/dev/null 2>&1 && alias rm=trash alias mpg123="mpg123 -C -v --title" export PLAYER="mpg123 -C -v --title" -alias screen="screen -e^z^z" +null type screen && alias screen="screen -e^z^z" alias zcd="cd \`zenity --file-selection --directory\`" -alias gtags="gtags -v" -alias htags="htags -ansx" +null type gtags && alias gtags="gtags -v" +null type htags && alias htags="htags -ansxF" alias pad=notepad null type gedit && alias pad=gedit null type leafpad && alias pad=leafpad +isdarwin && alias pad="open -e" alias wic=wicd-curses alias wil="wicd-cli -y -l | head" From 9492267f17f2083e1101d6efea76c9ea8fda6b3e Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Tue, 2 Oct 2012 13:27:42 +0900 Subject: [PATCH 07/10] fix gtags alias --- bashrc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bashrc b/bashrc index 7d96a6b..b287064 100755 --- a/bashrc +++ b/bashrc @@ -139,8 +139,9 @@ alias mpg123="mpg123 -C -v --title" export PLAYER="mpg123 -C -v --title" null type screen && alias screen="screen -e^z^z" alias zcd="cd \`zenity --file-selection --directory\`" -null type gtags && alias gtags="gtags -v" -null type htags && alias htags="htags -ansxF" +null type gtags && alias gtags="gtags --verbose" +null type htags && alias htags="htags --xhtml --symbol --line-number \ +--frame --alphabet --verbose" alias pad=notepad null type gedit && alias pad=gedit From 6e7ba6ee432a9f1d17d6a80528a04ad0a59695a8 Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Tue, 2 Oct 2012 19:22:31 +0900 Subject: [PATCH 08/10] change show-paren-style --- emacs.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emacs.el b/emacs.el index 594d7ba..d275fb3 100644 --- a/emacs.el +++ b/emacs.el @@ -315,7 +315,7 @@ drill-instructor.el" (show-paren-mode 1) (setq show-paren-delay 0.5 - show-paren-style 'mixed) + show-paren-style 'parenthesis) ; mixed is hard to read (set-face-background 'show-paren-match (face-foreground 'default)) (set-face-inverse-video-p 'show-paren-match From 49ef6824ee6d4a59e59c0e3290ea43ec04f2c1d5 Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Wed, 3 Oct 2012 01:44:39 +0900 Subject: [PATCH 09/10] modify var for set-terminal-title --- emacs.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/emacs.el b/emacs.el index d275fb3..4e8eeb5 100644 --- a/emacs.el +++ b/emacs.el @@ -233,14 +233,16 @@ drill-instructor.el" '(setq-default header-line-format (list " " 'display-time-string)) -(setq set-terminal-title-regexp "^\\(rxvt\\|xterm\\|aterm$\\|screen\\)") +(defvar set-terminal-title-term-regexp "" + "Rexexp for `set-terminal-title'.") +(setq set-terminal-title-term-regexp "^\\(rxvt\\|xterm\\|aterm$\\|screen\\)") (defun set-terminal-title (&rest args) "" (interactive "sString to set as title: ") (let ((tty (frame-parameter nil 'tty-type))) (when (and tty - (string-match set-terminal-title-regexp + (string-match set-terminal-title-term-regexp tty)) (send-string-to-terminal (apply 'concat "\033]0;" From f073685a5e2beeb56fd0548f00085469a9870abd Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Wed, 3 Oct 2012 01:51:27 +0900 Subject: [PATCH 10/10] update title format for xterm --- emacs.el | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/emacs.el b/emacs.el index 4e8eeb5..e22913c 100644 --- a/emacs.el +++ b/emacs.el @@ -249,20 +249,27 @@ drill-instructor.el" `(,@args "\007")))))) (defun my-set-terminal-title () "" - (set-terminal-title (abbreviate-file-name (or buffer-file-name + (set-terminal-title "[" + user-login-name + "@" + system-name + ":" + (abbreviate-file-name (or buffer-file-name default-directory)) - " | " - (number-to-string (length - (buffer-list-not-start-with-space))) - " buffers in " - (frame-parameter nil 'name) - " [" + "][" invocation-name " " emacs-version " " (symbol-name system-type) - "] ")) + "][" + "FRAME:" + (frame-parameter nil 'name) + ":" + (number-to-string (length + (buffer-list-not-start-with-space))) + "]" + )) (add-hook 'buffer-file-changed-functions (lambda (p c) (my-set-terminal-title)))