Changeset 3841

Timestamp:

2005年09月03日 04時16分05秒 (3 years ago)

Author:

horiguti

Message:

Refine process wrapper functions.
* nt/dot.emacs.jp: Alter sample setting of fakecygpty.

* src/process.c (Fmw32_set_pty_flag): New Lisp function.
(create_process): Correct data type of
Vmw32_process_expects_pty. Set process under setup to
Vmw32_process_under_setup.

* src/callproc.c (Vmw32_process_under_setup): New Lisp variable.
(Fcall_process): Set nil to Vmw32_process_under_setup.

* lisp/international/mw32misc.el (mw32-process-wrapper-alist): Alter
comment after the change of format.
(set-process-connection-type-pty): New function.
(find-process-wrapper-function): Handle new data structure.
(general-process-argument-editing-function): Ditto.

Files:

• trunk/lisp/ChangeLog.Meadow (modified) (2 diffs)
• trunk/lisp/international/mw32misc.el (modified) (4 diffs)
• trunk/nt/ChangeLog.Meadow (modified) (1 diff)
• trunk/nt/dot.emacs.ja (modified) (1 diff)
• trunk/src/ChangeLog.Meadow (modified) (1 diff)
• trunk/src/callproc.c (modified) (3 diffs)
• trunk/src/process.c (modified) (3 diffs)

trunk/lisp/ChangeLog.Meadow

@@ +1 @@
+2005-09-03  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
+
+        * international/mw32misc.el (mw32-process-wrapper-alist): Alter
+        comment after the change of format.
+        (set-process-connection-type-pty): New function.
+        (find-process-wrapper-function): Handle new data structure.
+        (general-process-argument-editing-function): Ditto.
+
-2005-09-02  Masayuki FUJII  <boochang@m4.kcn.ne.jp>
-
@@ -6 +14 @@
-
-        * international/mw32script.el (mw32script-resolve-script): Make
-singlebyte to ensure return strings are single
+unibyte to ensure return strings are uni
-
-2005-08-28  MIYOSHI Masanori  <miyoshi@meadowy.org>

trunk/lisp/international/mw32misc.el

@@ -884 +884 @@
-
-(defvar mw32-process-wrapper-alist nil
-p
-
+
+a
-PATTERN-OR-FUN is a regular expression matching a program name,
-or a function checking a program name.
@@ -891 +891 @@
-program name of the process and check if the process should be
-invoked by a wrapper program.
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-See also the function `find-process-wrapper-function'.")
@@ -918 +927 @@
-          (setq elem nil)))
-      (setq ret
-
+
+
+
+
+
-                (if mw32-process-expects-pty (cdr elem) (car elem))
+                  ;;; a WRAPPER
-              elem))
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-(defun general-process-argument-editing-function
@@ -929 +952 @@
-  (let* ((wrapper (find-process-wrapper-function (car argument)))
-         (argtmp argument))
-
-
+
+
+
+
+
+
+
+
-    (setq argument (cond ((eq quoting 'msvc)
-                          (msvc-process-argument-quoting argument))

trunk/nt/ChangeLog.Meadow

@@ +1 @@
+2005-09-03  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
+
+        * dot.emacs.jp: Alter sample setting of fakecygpty.
+
-2005-09-02  Masayuki FUJII  <boochang@m4.kcn.ne.jp>
-

trunk/nt/dot.emacs.ja

@@ -223 +223 @@
-;; (setq mw32-process-wrapper-alist
-;;       '(("/\\(bash\\|tcsh\\|svn\\|ssh\\|gpg[esvk]?\\)\\.exe" .
-       (nil . "fakecygpty.exe"
+       (nil . ("fakecygpty.exe" . set-process-connection-type-pty)
-
-;;;

trunk/src/ChangeLog.Meadow

@@ +1 @@
+2005-09-03  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
+
+        * process.c (Fmw32_set_pty_flag): New Lisp function.
+        (create_process): Correct data type of
+        Vmw32_process_expects_pty. Set process under setup to
+        Vmw32_process_under_setup.
+
+        * callproc.c (Vmw32_process_under_setup): New Lisp variable.
+        (Fcall_process): Set nil to Vmw32_process_under_setup.
+
-2005-09-02  Masayuki FUJII  <boochang@m4.kcn.ne.jp>
-

trunk/src/callproc.c

@@ -116 +116 @@
-#ifdef MEADOW
-int Vmw32_process_expects_pty;
+Lisp_Object Vmw32_process_under_setup;
-#endif
-
@@ -641 +642 @@
-#ifdef MEADOW
-    Vmw32_process_expects_pty = 0;
+    Vmw32_process_under_setup = Qnil;
-#endif
-    pid = child_setup (filefd, fd1, fd_error, (char **) new_argv,
@@ -1731 +1733 @@
-#ifdef MEADOW
-  DEFVAR_BOOL ("mw32-process-expects-pty", &Vmw32_process_expects_pty,
-invoking process
+the process currently under startup sequence
-This variable has meaning only within process argument edithing functions.
-
+
+
-  Vmw32_process_expects_pty = 1;
+
+  DEFVAR_LISP ("mw32-process-under-setup", &Vmw32_process_under_setup,
+               doc: /* The process currently under startup sequence.
+This variable has meaning only within process argument edithing functions.
+See also `mw32-process-expects-pty'. */);
+  Vmw32_process_under_setup = Qnil;
-#endif
-

trunk/src/process.c

@@ -1707 +1707 @@
-}
-
+#ifdef MEADOW
+DEFUN ("mw32-set-pty-flag", Fmw32_set_pty_flag, Smw32_set_pty_flag,
+       1, 2, 0,
+       doc: /* Set pty_flag of PROCESS for pty faking.
+Set pty_flag if ISPTY is no-nil, and clear if nil.
+PROCESS may be a process, a buffer, the name of a process or buffer, or
+nil, indicating the current buffer's process. */)
+  (ispty, process)
+     Lisp_Object ispty, process;
+{
+  Lisp_Object proc;
+
+  if (DATAGRAM_CONN_P (process))
+    return process;
+
+  proc = get_process (process);
+
+  if (NILP (ispty))
+    XPROCESS (proc)->pty_flag = 0;
+  else
+    XPROCESS (proc)->pty_flag = 1;
+  
+  return process;
+}
+#endif
-/* This function is the unwind_protect form for Fstart_process.  If
-   PROC doesn't have its pid set, then we know someone has signaled
@@ -2092 +2117 @@
-#ifdef MEADOW
- {
-
+
+
+
+
-   if (Vprocess_connection_type != Qnil)
-     Vmw32_process_expects_pty = 1;
@@ -6891 +6919 @@
-  defsubr (&Sprocess_list);
-  defsubr (&Sstart_process);
+#ifdef MEADOW
+  defsubr (&Smw32_set_pty_flag);
+#endif
-#ifdef HAVE_SOCKETS
-  defsubr (&Sset_network_process_option);