(doc-view-scroll-up-or-next-page)

[gnu-emacs] / lisp / startup.el

diff --git a/lisp/startup.el b/lisp/startup.el
index 2fa1a6c15cdf89402d030cf9172be02e3b678dbb..22a9fa02103e97b26b261dbd3d3cb8b2165edf6c 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1,7 +1,7 @@
 ;;; startup.el --- process Emacs shell arguments
 
 ;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-;;   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+;;   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 ;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
@@ -1223,7 +1223,11 @@ the `--debug-init' option to view a complete error backtrace."
       (server-start)
       (if server-process
          (daemon-initialized)
-       (message "Unable to start daemon: Emacs server named %S already running" server-name)
+       (if (stringp dn)
+           (message
+            "Unable to start daemon: Emacs server named %S already running"
+            server-name)
+         (message "Unable to start the daemon.\nAnother instance of Emacs is running the server, either as daemon or interactively.\nYou can use emacsclient to connect to that Emacs process."))
        (kill-emacs 1))))
 
   ;; Run emacs-session-restore (session management) if started by