Mercurial > emacs
diff lisp/server.el @ 90951:3619e7770f2e
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 793-802)
- Update from CVS
- Remove RCS keywords
- Merge from emacs--rel--22
* emacs--rel--22 (patch 42-50)
- Update from CVS
- Merge from gnus--rel--5.10
- Gnus ChangeLog tweaks
* gnus--rel--5.10 (patch 229-232)
- Merge from emacs--devo--0, emacs--rel--22
- ChangeLog tweak
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-223
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 16 Jun 2007 22:32:13 +0000 |
parents | c0409ee15cee 5f86f2151f34 |
children | f55f9811f5d7 |
line wrap: on
line diff
--- a/lisp/server.el Sat Jun 16 21:50:56 2007 +0000 +++ b/lisp/server.el Sat Jun 16 22:32:13 2007 +0000 @@ -105,7 +105,7 @@ :version "22.1") (put 'server-host 'risky-local-variable t) -(defcustom server-auth-dir "~/.emacs.d/server/" +(defcustom server-auth-dir (concat user-emacs-directory "server/") "Directory for server authentication files." :group 'server :type 'directory @@ -735,8 +735,7 @@ (select-window win) (set-buffer next-buffer)) ;; Otherwise, let's find an appropriate window. - (cond ((and (windowp server-window) - (window-live-p server-window)) + (cond ((window-live-p server-window) (select-window server-window)) ((framep server-window) (unless (frame-live-p server-window)