Mercurial > emacs
diff etc/emacs.bash @ 90100:72cf6261961e
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 |
line wrap: on
line diff
--- a/etc/emacs.bash Wed Feb 02 01:54:00 2005 +0000 +++ b/etc/emacs.bash Sun Feb 06 12:06:02 2005 +0000 @@ -22,7 +22,7 @@ if [ -n "${windowsys:+set}" ]; then # Do not just test if these files are sockets. On some systems # ordinary files or fifos are used instead. Just see if they exist. - if [ -e "${HOME}/.emacs_server" -o -e "/tmp/esrv${UID}-"* ]; then + if [ -e "${HOME}/.emacs_server" -o -e "/tmp/emacs${UID}/server" ]; then emacsclient "$@" return $? else