]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge remote-tracking branch 'origin/master' into feature/android
authorPo Lu <luangruo@yahoo.com>
Sat, 6 May 2023 12:35:42 +0000 (20:35 +0800)
committerPo Lu <luangruo@yahoo.com>
Sat, 6 May 2023 12:35:42 +0000 (20:35 +0800)
1  2 
doc/lispref/processes.texi
lisp/speedbar.el
lisp/subr.el
src/sysdep.c

Simple merge
Simple merge
diff --cc lisp/subr.el
Simple merge
diff --cc src/sysdep.c
index cb63d8bba08d098e741b8267babb8f4d96e71510,443602a2d6d50a01c772d2ad323b45796a6eb2e9..bec2c00d3e59fff7e5a22f1cb0ec9a25e6177f44
@@@ -2078,11 -2020,13 +2080,16 @@@ init_signals (void
      {
        emacs_sigaction_init (&action, deliver_arith_signal);
        sigaction (SIGFPE, &action, 0);
+ #ifdef __vax__
+       /* NetBSD/vax generates SIGILL upon some floating point errors,
+        such as taking the log of 0.0.  */
+       sigaction (SIGILL, &action, 0);
+ #endif /* __vax__ */
      }
  
 +  /* SIGUSR1 and SIGUSR2 are used internally by the android_select
 +     function.  */
 +#if !defined HAVE_ANDROID
  #ifdef SIGUSR1
    add_user_signal (SIGUSR1, "sigusr1");
  #endif