Mercurial > emacs

comparison etc/emacs.bash @ 90100:72cf6261961e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-11 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-69 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-71 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-72 src/dispextern.h (xassert): Enable unconditionally. * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-73 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-81 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-82 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-12 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-13 Update from CVS
author Miles Bader <miles@gnu.org>
date Sun, 06 Feb 2005 12:06:02 +0000
parents 68c22ea6027c 615a90f44f52
children f83d17e1ace6
comparison
equal deleted inserted replaced
90099:fa9654493afb 90100:72cf6261961e
20 windowsys="${windowsys:-${DISPLAY+x}}" 20 windowsys="${windowsys:-${DISPLAY+x}}"
21 21
22 if [ -n "${windowsys:+set}" ]; then 22 if [ -n "${windowsys:+set}" ]; then
23 # Do not just test if these files are sockets. On some systems 23 # Do not just test if these files are sockets. On some systems
24 # ordinary files or fifos are used instead. Just see if they exist. 24 # ordinary files or fifos are used instead. Just see if they exist.
25 if [ -e "${HOME}/.emacs_server" -o -e "/tmp/esrv${UID}-"* ]; then 25 if [ -e "${HOME}/.emacs_server" -o -e "/tmp/emacs${UID}/server" ]; then
26 emacsclient "$@" 26 emacsclient "$@"
27 return $? 27 return $?
28 else 28 else
29 echo "edit: starting emacs in background..." 1>&2 29 echo "edit: starting emacs in background..." 1>&2
30 fi 30 fi