bug#10996: 24.0.94; Splash screen causes first character to beep with emacsclient

[Stefan Monnier]

> Indeed, the problem is that the key is read using the
> splash-screen-keymap.  My commit is not the actual cause since it only
> affects command remapping, and if you try his recipe and hit `q' (which
> is not using command-remapping), you'll see that it does something even
> more interesting.  I.e. the same problem existed with `q' before
> my change.

I installed the change below which doesn't actually fix the underlying
problem but works around it by disabling the splash screen code when
running as daemon (it doesn't get displayed anyway, so there's no point
running it).


        Stefan


=== modified file 'lisp/startup.el'
--- lisp/startup.el     2012-03-27 06:45:12 +0000
+++ lisp/startup.el     2012-04-10 17:51:56 +0000
@@ -2341,6 +2341,7 @@
     (if (or inhibit-startup-screen
            initial-buffer-choice
            noninteractive
+            (daemonp)
            inhibit-x-resources)
 
        ;; Not displaying a startup screen.  If 3 or more files
@@ -2383,9 +2384,7 @@
       ;; (with-no-warnings
       ;;       (setq menubar-bindings-done t))
 
-      (if (> file-count 0)
-         (display-startup-screen t)
-       (display-startup-screen nil)))))
+      (display-startup-screen (> file-count 0)))))
 
 (defun command-line-normalize-file-name (file)
   "Collapse multiple slashes to one, to handle non-Emacs file names."