[Emacs-diffs] nsm 01/01: Revert commit 75ccb64a946a6668288aee50508888be392a0e7f

[Lars Ingebrigtsen]

branch: nsm
commit 8c9ee5e03ce782a9c9bef07671dea6af60a26aa1
Author: Lars Magne Ingebrigtsen <address@hidden>
Date:   Wed Nov 19 00:07:55 2014 +0100

    Revert commit 75ccb64a946a6668288aee50508888be392a0e7f
    
    Exporting running_async_code does not help the NSM user interface
---
 src/ChangeLog |    5 -----
 src/emacs.c   |   10 ++++------
 src/lisp.h    |    2 ++
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index d171b65..7245205 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,11 +3,6 @@
        * gnutls.c (Fgnutls_peer_status): SIGNER_NOT_FOUND probably means
        :self-signed more than SIGNER_NOT_CA does.
 
-       * emacs.c (syms_of_emacs): Export running_asynch_code to Lisp so
-       that functions can tell what context they are being run under.
-
-       * lisp.h: Remove "extern bool running_asynch_code".
-
        * gnutls.c (gnutls_certificate_details): New function.
        (gnutls_hex_string): New utility function.
 
diff --git a/src/emacs.c b/src/emacs.c
index 17102cb..4c3857e 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -151,6 +151,10 @@ static Lisp_Object Qkill_emacs_hook;
    but instead should use the virtual terminal under which it was started.  */
 bool inhibit_window_system;
 
+/* If true, a filter or a sentinel is running.  Tested to save the match
+   data on the first attempt to change it inside asynchronous code.  */
+bool running_asynch_code;
+
 #if defined (HAVE_X_WINDOWS) || defined (HAVE_NS)
 /* If true, -d was specified, meaning we're using some window system.  */
 bool display_arg;
@@ -2451,12 +2455,6 @@ Emacs is running.  */);
   DEFVAR_BOOL ("noninteractive", noninteractive1,
               doc: /* Non-nil means Emacs is running without interactive 
terminal.  */);
 
-  /* If true, a filter or a sentinel is running.  Tested to save the match
-     data on the first attempt to change it inside asynchronous code.  */
-  DEFVAR_BOOL ("running-asynch-code", running_asynch_code,
-              doc: /* Non-nil means that asynchronous code is running.
-This could be a process filter, a sentinel or the like.  */);
-
   DEFVAR_LISP ("kill-emacs-hook", Vkill_emacs_hook,
               doc: /* Hook run when `kill-emacs' is called.
 Since `kill-emacs' may be invoked when the terminal is disconnected (or
diff --git a/src/lisp.h b/src/lisp.h
index 58ebcbc..0bcc0ec 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -4180,6 +4180,8 @@ extern bool fatal_error_in_progress;
 
 /* True means don't do use window-system-specific display code.  */
 extern bool inhibit_window_system;
+/* True means that a filter or a sentinel is running.  */
+extern bool running_asynch_code;
 
 /* Defined in process.c.  */
 extern Lisp_Object QCtype, Qlocal;