Permalink
Browse files

Do not call elscreen-goto if server-visit-files returns nil.

The problem is due to a recent change of server.el in Emacs 24 getting
server-visit-files always called regardless of "files" is nil.
  • Loading branch information...
1 parent c3ba585 commit d66b9195c0fa2e8c207d23c6263f4c8c74e1f72a @knu committed Apr 25, 2012
Showing with 6 additions and 4 deletions.
  1. +6 −4 elscreen-server.el
View
@@ -39,10 +39,12 @@
(when (and elscreen-server-dont-use-dedicated-frame
(framep dframe-attached-frame))
(select-frame dframe-attached-frame))
- (elscreen-goto (car (mapcar
- (lambda (buffer)
- (elscreen-find-screen-by-buffer buffer 'create))
- buffer-list)))
+ (let ((screen (car (mapcar
+ (lambda (buffer)
+ (elscreen-find-screen-by-buffer buffer 'create))
+ buffer-list))))
+ (and screen
+ (elscreen-goto screen)))
(elscreen-notify-screen-modification 'force-immediately)
(select-frame selected-frame)))

0 comments on commit d66b919

Please sign in to comment.