From: Karoly Lorentey <lorentey@elte.hu>
Date: Mon, 11 Apr 2005 12:40:15 +0000 (+0000)
Subject: Merged from miles@gnu.org--gnu-2005 (patch 59, 240-245)
X-Git-Tag: emacs-pretest-23.0.90~11236^2~141^2~274
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=221d5c8772dc29f854292ec7cb423fce925daecf;p=emacs.git

Merged from miles@gnu.org--gnu-2005 (patch 59, 240-245)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-240
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-241
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-242
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-243
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-244
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-245
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-59
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-326
---

221d5c8772dc29f854292ec7cb423fce925daecf
diff --cc lisp/startup.el
index 43faae63022,98cadbc9d9c..957a97081cd
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@@ -721,8 -720,8 +725,8 @@@ opening the first frame (e.g. open a co
  
    ;; If frame was created with a menu bar, set menu-bar-mode on.
    (unless (or noninteractive
- 	      emacs-quick-startup
+ 	      emacs-basic-display
 -              (and (memq window-system '(x w32))
 +              (and (memq initial-window-system '(x w32))
                     (<= (frame-parameter nil 'menu-bar-lines) 0)))
      (menu-bar-mode 1))