From 7636a8db2004d834f09f5dc523324d3544d69bca Mon Sep 17 00:00:00 2001 From: 10sr Date: Sat, 10 Dec 2011 13:09:09 +0900 Subject: [PATCH 1/4] fix bug --- .emacs.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.emacs.el b/.emacs.el index c4a318c..96ee88b 100644 --- a/.emacs.el +++ b/.emacs.el @@ -340,7 +340,7 @@ ;; (my-set-ascii-and-jp-font-with-size '("monaco" 90 "takaogothic" 13)) ;; (my-set-ascii-and-jp-font-with-size '("ProggyCleanTTSZ" 120 "takaogothic" 11)) ;; あ a - +emacs-major-version (defun my-22-set-ascii-and-jp-font-with-size (list) "" (set-face-attribute 'default nil @@ -1586,7 +1586,7 @@ if arg given, use that eshell buffer, otherwise make new eshell buffer." (eshell/export "GIT_EDITOR=") (eshell/export "LC_MESSAGES=C") (eshell/export "TERM=xterm") - ))))) + )) ;; (eval-after-load "em-alias" ;; '(progn ;; (eshell/alias "ll" "ls -l") From cd2e997438acc658059b331caddb11d2100a0489 Mon Sep 17 00:00:00 2001 From: 10sr Date: Sat, 10 Dec 2011 20:25:52 +0900 Subject: [PATCH 2/4] show untracked files in git --- .bashrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 .bashrc diff --git a/.bashrc b/.bashrc old mode 100644 new mode 100755 index 711f803..0dfa181 --- a/.bashrc +++ b/.bashrc @@ -167,7 +167,7 @@ _mygitconfig(){ git config --global core.autocrlf false git config --global color.ui auto git config --global status.relativePaths false - git config --global status.showUntrackedFiles no + git config --global status.showUntrackedFiles normal git config --global alias.graph "log --graph --date-order -C -M --pretty=format:\"<%h> %ad [%an] %Cgreen%d%Creset %s\" --all --date=short" git config --global alias.st "status -s" git config --global alias.b "branch" From 0ba90b3ba37e03d5aaa7df150003b8a4a5d4cf17 Mon Sep 17 00:00:00 2001 From: 10sr Date: Sun, 11 Dec 2011 15:28:51 +0900 Subject: [PATCH 3/4] small changes and bug fix of packing functions. --- .emacs.el | 50 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/.emacs.el b/.emacs.el index 96ee88b..7894a36 100644 --- a/.emacs.el +++ b/.emacs.el @@ -1119,7 +1119,9 @@ if arg is omitted use value of `buffer-list'." (require 'dired-aux) ;; needed to use dired-dwim-target-directory (defun my-dired-do-pack-or-unpack () - "" + "pack or unpack files. +if targetting one file and that is archive file defined in `pack-program-alist', unpack that. +otherwise, pack marked files. prompt user to decide filename for archive." (interactive) (let* ((infiles (dired-get-marked-files t)) (onefile (and (eq 1 ; filename if only one file targeted, otherwise nil. @@ -1146,14 +1148,6 @@ if arg is omitted use value of `buffer-list'." ;; (dired-unmark-all-marks) ) -(defun my-pack-file-name-association (filename) - "" - (let ((case-fold-search nil)) - (assoc-default filename - my-pack-program-alist - 'string-match-p - nil))) - (defun my-file-name-extension-with-tar (filename) "if FILENAME has extension with tar, like \"tar.gz\", return that. otherwise, return extension normally." @@ -1173,28 +1167,44 @@ otherwise, return FILENAME with `my-pack-default-extension'" (or (executable-find "7z") (executable-find "7za") (executable-find "7zr")) - "path to 7z program.") + "7z program.") (defvar my-pack-default-extension "7z" - "default suffix for packing. filename with this suffix must matches `pack-program-alist'") + "default suffix for packing. filename with this suffix must matches one of `pack-program-alist'") + +(defun my-pack-file-name-association (filename) + "if the pattern matching FILENAME is found at car of the list in `pack-program-alist', return cdr of that list. +otherwise, return nil." + (let ((case-fold-search nil)) + (assoc-default filename + my-pack-program-alist + 'string-match-p + nil))) (defvar my-pack-program-alist - `(("\\.7z\\'" ,(concat my-7z-program-name " a"), (concat my-7z-program-name " x")) + `( + ("\\.7z\\'" ,(concat my-7z-program-name " a") ,(concat my-7z-program-name " x")) + ("\\.zip\\'" "zip -r" "unzip") ("\\.tar\\'" "tar cf" "tar xf") ("\\.tgz\\'" "tar czf" "tar xzf") - ("\\.zip\\'" "zip -r" "unzip"))) + ("\\.tar\\.gz\\'" "tar czf" "tar xzf") + ) + "Alist of filename patterns, command for pack and unpack. +Each element looks like (REGEXP PACKING-COMMAND UNPACKING-COMMAND). +PACKING-COMMAND and UNPACKING-COMMAND can be nil if the command is not available. +alist is searched from the beginning so pattern for \".tar.gz\" should be ahead of pattern for \".gz\"") ;; (string-match-p "\\.gz\\'" "aaa.gz") ; \' matches string end, $ also matches the point before newline. (defun my-unpack (archive) "unpack ARCHIVE. command for unpacking is defined in `pack-program-alist'" (interactive "fArchive to extract: ") (let* ((earchive (expand-file-name archive)) - (lst (my-pack-file-name-association earchive)) + (cmd (nth 1 + (my-pack-file-name-association earchive))) ) - (if lst - (shell-command (concat (nth 1 - lst) + (if cmd + (shell-command (concat cmd " " (shell-quote-argument earchive))) (message "this is not archive file defined in `pack-program-alist'!")))) @@ -1204,10 +1214,10 @@ otherwise, return FILENAME with `my-pack-default-extension'" if ARCHIVE have extension defined in `pack-program-alist', use that command. otherwise, use `pack-default-extension' for pack." (let* ((archive-ext (my-pack-file-extension (expand-file-name archive))) - (lst (my-pack-file-name-association archive-ext)) + (cmd (car (my-pack-file-name-association archive-ext))) ) - (if lst - (shell-command (concat (nth 0 lst) + (if cmd + (shell-command (concat cmd " " (shell-quote-argument archive-ext) " " From f9e0e3e467b65c745f48e1a3abb620ca8615759c Mon Sep 17 00:00:00 2001 From: 10sr Date: Sun, 11 Dec 2011 15:56:36 +0900 Subject: [PATCH 4/4] when windows ignore filemode in git --- .bashrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.bashrc b/.bashrc index 0dfa181..356581e 100755 --- a/.bashrc +++ b/.bashrc @@ -179,6 +179,9 @@ _mygitconfig(){ git config --global alias.ls "!git ls-files | xargs ls -CFG --color=auto --time-style=long-iso" git config --global alias.ll "!git ls-files | xargs ls -l -CFG --color=auto --time-style=long-iso" git config --global alias.addi "add -i" + if iswindows; then + git config --global core.fileMode false + fi } __my_parse_svn_branch() {