diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-27 20:52:59 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-27 20:52:59 -0500 |
commit | 786fcda41a731654dd2de7496d5f28bc7bb19743 (patch) | |
tree | ab557aa22a6463fd15667ec738b12f7fd78d7aa1 /.selected_editor | |
parent | 614636d8e5a1f643d3c91d0d5e52482aef38bb5e (diff) | |
parent | 5f7de477be298f158369862c1a3cc80286fc7e32 (diff) |
Merge remote-tracking branch 'origin/master' into build64-par
Conflicts:
.kde/share/apps
.kde/share/config
.kde4
Diffstat (limited to '.selected_editor')
-rw-r--r-- | .selected_editor | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.selected_editor b/.selected_editor index 81a95de..7631487 100644 --- a/.selected_editor +++ b/.selected_editor @@ -1,4 +1,4 @@ # Generated by /usr/bin/select-editor -SELECTED_EDITOR="emacsclient -a ''" -ALTERNATE_EDITOR="$SELECTED_EDITOR -c" -VISUAL="$SELECTED_EDITOR -c" +SELECTED_EDITOR="emacsclient -a '' -c" +ALTERNATE_EDITOR='nano' +VISUAL="$SELECTED_EDITOR" |