Browse Source

Merge branch 'master' of github.com:10sr/dotfiles

pull/1/head
10sr 12 years ago
parent
commit
4744155951
2 changed files with 23 additions and 11 deletions
  1. +21
    -10
      emacs.el
  2. +2
    -1
      setup.sh

+ 21
- 10
emacs.el View File

@@ -1289,12 +1289,12 @@ delete; o: select other; j, l: enlarge; h, k: shrink; q: quit."
(interactive "p")
(if (> arg 0)
(progn
;; (ignore 'my-dired-print-current-dir-and-file)
(forward-line -1)
(when (eq (line-number-at-pos)
(if (eq (line-number-at-pos)
1)
(goto-char (point-max)))
(my-dired-previous-line (if (dired-get-filename nil t)
(goto-char (point-max))
(forward-line -1))
(my-dired-previous-line (if (or (dired-get-filename nil t)
(dired-get-subdir))
(- arg 1)
arg)))
(dired-move-to-filename)))
@@ -1304,12 +1304,12 @@ delete; o: select other; j, l: enlarge; h, k: shrink; q: quit."
(interactive "p")
(if (> arg 0)
(progn
;; (ignore 'my-dired-print-current-dir-and-file)
(forward-line 1)
(when (eq (point)
(if (eq (point)
(point-max))
(goto-char (point-min)))
(my-dired-next-line (if (dired-get-filename nil t)
(goto-char (point-min))
(forward-line 1))
(my-dired-next-line (if (or (dired-get-filename nil t)
(dired-get-subdir))
(- arg 1)
arg)))
(dired-move-to-filename)))
@@ -1871,6 +1871,17 @@ when SEC is nil, stop auto save if enabled."
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; misc funcs

(defvar sed-in-place-history nil
"History of `sed-in-place'")

(defun sed-in-place (command)
"sed in place"
(interactive (list (read-shell-command "sed in place: "
"sed --in-place=.bak -e "
'sed-in-place-history)))
(shell-command command
"*sed in place*"))

(defun dir-show (&optional dir)
(interactive)
(let ((bf (get-buffer-create "*dir show*"))


+ 2
- 1
setup.sh View File

@@ -65,7 +65,8 @@ git_config(){
git config --global alias.cim "commit --verbose -m"
git config --global alias.di "diff --color"
git config --global alias.me "merge --no-ff --stat -v"
git config --global alias.ls "ls-files -v --full-name"
# git config --global alias.ls "ls-files -v --full-name"
git config --global alias.ls "status -u -s ."
git config --global alias.sl "!sl"
# git config --global alias.my-ls "ls-files | xargs ls"
# git config --global alias.ll "!git ls-files | xargs ls -l -CFG --color=auto --time-style=long-iso"


Loading…
Cancel
Save