Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/emacs/patches/tty_startup_hang.patch
author Ali Bahrami <Ali.Bahrami@Oracle.COM>
Thu, 07 Feb 2013 15:54:53 -0700
changeset 1147 6095231b2f75
permissions -rw-r--r--
15810316 problem in UTILITY/EMACS 16171813 emacs rgrep assumes gnu find in path; fails using GNU-specific options 16246357 emacs -nw hangs on startup starting with s12_14
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1147
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     1
 
*** emacs-23.4.orig/src/lisp.h	Wed Jan 11 05:35:01 2012
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     2
 
--- emacs-23.4/src/lisp.h	Fri Feb  1 11:12:55 2013
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     3
 
***************
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     4
 
*** 3435,3440 ****
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     5
 
--- 3435,3441 ----
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     6
 
  #ifdef HAVE_X_WINDOWS
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     7
 
  /* Defined in xfns.c */
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     8
 
  extern void syms_of_xfns P_ ((void));
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     9
 
+ extern int x_in_use;
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    10
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    11
 
  /* Defined in xsmfns.c */
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    12
 
  extern void syms_of_xsmfns P_ ((void));
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    13
 
*** emacs-23.4.orig/src/xfns.c	Wed Jan 11 05:35:01 2012
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    14
 
--- emacs-23.4/src/xfns.c	Fri Feb  1 11:13:27 2013
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    15
 
***************
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    16
 
*** 183,189 ****
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    17
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    18
 
  /* Nonzero if using X.  */
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    19
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    20
 
! static int x_in_use;
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    21
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    22
 
  /* Non nil if no window manager is in use.  */
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    23
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    24
 
--- 183,189 ----
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    25
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    26
 
  /* Nonzero if using X.  */
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    27
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    28
 
! int x_in_use;
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    29
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    30
 
  /* Non nil if no window manager is in use.  */
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    31
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    32
 
*** emacs-23.4.orig/src/xgselect.c	Wed Jan 11 05:35:01 2012
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    33
 
--- emacs-23.4/src/xgselect.c	Fri Feb  1 11:13:54 2013
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    34
 
***************
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    35
 
*** 44,49 ****
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    36
 
--- 44,52 ----
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    37
 
    int n_gfds = 0, our_tmo = 0, retval = 0, our_fds = 0;
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    38
 
    int prio, i, nfds, tmo_in_millisec;
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    39
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    40
 
+   if (!x_in_use)
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    41
 
+     return select (max_fds, rfds, wfds, efds, timeout);
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    42
 
+
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    43
 
    if (rfds) memcpy (&all_rfds, rfds, sizeof (all_rfds));
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    44
 
    else FD_ZERO (&all_rfds);
6095231b2f75 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    45
 
    if (wfds) memcpy (&all_wfds, wfds, sizeof (all_rfds));
upstream/oracle/userland-gate