Skip to content
This repository was archived by the owner on Aug 3, 2025. It is now read-only.

Fixes for lock and emacs #7

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fixes for lock and emacs #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7f829bf
added support for locking on gnome3
silverdev May 25, 2014
a2e5e81
no having an editor set is so annoying lets try a little harder to av…
silverdev May 25, 2014
91dcade
bug fix to emacs init and renamed it to make syntax highlighting work
silverdev May 25, 2014
a29456c
It's pico not peco
silverdev May 26, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions commonsh/10_alias
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ for dircolors in gdircolors dircolors ; do
fi
done

# gimmie an editor, make it a nice vi clone
for EDITOR in vimx vim elvis vile nvi vi ; do
# gimmie an editor, make it emacs or a nice vi clone
# but you can't find a vi clone keep trying!!
for EDITOR in vimx vim elvis vile nvi vi emacs nano pico; do
command -v $EDITOR >/dev/null 2>&1 && break
done
export EDITOR
Expand Down
2 changes: 1 addition & 1 deletion emacsrc → emacsrc.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@

;; Turn on line numbering (hopefully with linum-mode)
(if (boundp 'global-linum-mode)
'(global-linum-mode 1)
(global-linum-mode 1)
(desire 'linum "linum.el"
'(global-linum-mode 1)
'(global-line-number-mode 1)))
Expand Down
2 changes: 1 addition & 1 deletion install.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
'_vimrc': '_vimrc',
'gvimrc': '.gvimrc',

'emacsrc': '.emacs',
'emacsrc.el': '.emacs',
'emacs': '.emacsdir',

'commonsh': '.commonsh',
Expand Down
2 changes: 1 addition & 1 deletion lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ fi
# Certain combinations of desktop managers and locking programs
# allow new sessions to be started.
KDE_LOCK='kdesktop_lock --forcelock || krunner_lock --forcelock || /usr/libexec/kde4/krunner_lock --forcelock || /usr/lib/kde4/libexec/krunner_lock --forcelock'
GNOME_LOCK='gnome-screensaver-command --lock'
GNOME_LOCK='gnome-screensaver-command --lock || dbus-send --type=method_call --dest=org.gnome.ScreenSaver /org/gnome/ScreenSaver org.gnome.ScreenSaver.Lock'
XSCREEN_LOCK='xscreensaver-command -lock || xlock'

if ps -e | grep gdm >/dev/null 2>/dev/null ; then
Expand Down