Browse Source

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

pull/1/head
10sr 13 years ago
parent
commit
508917875f
2 changed files with 9 additions and 4 deletions
  1. +3
    -2
      .bashrc
  2. +6
    -2
      .emacs.el

+ 3
- 2
.bashrc View File

@@ -405,9 +405,10 @@ echo "Japanese letters are 表示可能"

safe-cmd diskinfo

test -n "${DESKTOP_SESSION}" && type xrandr >/dev/null 2>&1 && {
! isdarwin && test -n "${DESKTOP_SESSION}" && type xrandr >/dev/null 2>&1 && {
xrandr | grep --color=never ^Screen
}
iswindows || safe-cmd finger $USER

! iswindows && safe-cmd finger $USER
LANG=C safe-cmd id


+ 6
- 2
.emacs.el View File

@@ -579,8 +579,9 @@ return nil if LIB unfound and downloading failed, otherwise the path of LIB."

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; share clipboard with x
(when (or window-system
(when (and window-system
;; (getenv "DESKTOP_SESSION")
(not (eq window-system 'mac))
)
(setq x-select-enable-clipboard t ; these settings seems to be useless when using emacs in terminal
x-select-enable-primary nil)
@@ -1323,7 +1324,10 @@ otherwise, use `pack-default-extension' for pack."
(not (get-buffer-window bf)))
(kill-buffer bf))))

(setq dired-listing-switches "-lhFG --time-style=long-iso")
(if (eq window-system 'mac)
(setq dired-listing-switches "-lhFG")
(setq dired-listing-switches "-lhFG --time-style=long-iso")
)
(define-minor-mode my-dired-display-all-mode
""
:init-value nil


Loading…
Cancel
Save