Re: Multi-tty branch status (Re: Reordering etc/NEWS)

[rentey <address@hidden>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Glenn Morris wrote:
> Karoly Lorentey wrote:
> 
>>> Another concern would be whether we have papers for everyone
>>> who has contributed to this branch.
>> I changed employers last summer and need to have the papers signed again
>> before the merge; this shouldn't be a problem.  Dan Nicolaescu, Han
>> Boetes and Kalle Olavi Niemitalo helped by submitting short patches.
> 
> FYI, the last two don't have (relevant) assignments AFAICS, so they
> would need to sign papers if they made non-trivial contributions.

I think their contributions can be considered trivial as far as
copyrights are concerned.

Han Boetes sent me a patch copying a few lines from lisp.h into
emacsclient.c:

- --- orig/lib-src/emacsclient.c
+++ mod/lib-src/emacsclient.c
@@ -45,6 +45,25 @@
 #include <signal.h>
 #include <errno.h>

+/* From lisp.h */
+#ifndef DIRECTORY_SEP
+#define DIRECTORY_SEP '/'
+#endif
+#ifndef IS_DIRECTORY_SEP
+#define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP)
+#endif
+#ifndef IS_DEVICE_SEP
+#ifndef DEVICE_SEP
+#define IS_DEVICE_SEP(_c_) 0
+#else
+#define IS_DEVICE_SEP(_c_) ((_c_) == DEVICE_SEP)
+#endif
+#endif
+#ifndef IS_ANY_SEP
+#define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_))
+#endif
+
+
 
 char *getenv (), *getwd ();
 char *(getcwd) ();



Kalle Olavi Niemitalo contributed the following bugfix:

*** orig/src/keyboard.c
- --- mod/src/keyboard.c
***************
*** 10574,10580 ****
    SIGNAL_THREAD_CHECK (signalnum);

    /* See if we have an active terminal on our controlling tty. */
!   terminal = get_named_tty (NULL);
    if (!terminal)
      {
        /* If there are no frames there, let's pretend that we are a
- --- 10574,10580 ----
    SIGNAL_THREAD_CHECK (signalnum);

    /* See if we have an active terminal on our controlling tty. */
!   terminal = get_named_tty ("/dev/tty");
    if (!terminal)
      {
        /* If there are no frames there, let's pretend that we are a
***************
*** 10618,10624 ****
    /* XXX This code needs to be revised for multi-tty support. */
    if (!NILP (Vquit_flag)
  #ifndef MSDOS
!       && get_named_tty (NULL)
  #endif
        )
      {
- --- 10618,10624 ----
    /* XXX This code needs to be revised for multi-tty support. */
    if (!NILP (Vquit_flag)
  #ifndef MSDOS
!       && get_named_tty ("/dev/tty")
  #endif
        )
      {
***************
*** 10915,10928 ****
         doc: /* Specify character used for quitting.
  QUIT must be an ASCII character.

! This function only has an effect on the terminal on the controlling
! tty of the Emacs process.

  See also `current-input-mode'.  */)
         (quit)
         Lisp_Object quit;
  {
!   struct terminal *t = get_named_tty (NULL);
    struct tty_display_info *tty;
    if (t == NULL || t->type != output_termcap)
      return Qnil;
- --- 10915,10928 ----
         doc: /* Specify character used for quitting.
  QUIT must be an ASCII character.

! This function only has an effect on the controlling tty of the Emacs
! process.

  See also `current-input-mode'.  */)
         (quit)
         Lisp_Object quit;
  {
!   struct terminal *t = get_named_tty ("/dev/tty");
    struct tty_display_info *tty;
    if (t == NULL || t->type != output_termcap)
      return Qnil;

I believe these two are the only patches that didn't come from Dan.

> The delay this will inevitably introduce is IMO another reason to
> merge unicode2 first.

I am arguing neither for nor against that.  But where does this sudden
hurry come from?

- --
Karoly
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGRZdZ6eoyqA+yej8RAo0nAJ9/exKzg2K687OLmGL+UmLcymVfkgCfbo9B
wYIV86lO9OjRVf1W0GPr3II=
=gAzS
-----END PGP SIGNATURE-----