diff options
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/comp.el | 15 | ||||
| -rw-r--r-- | lisp/emacs-lisp/ert.el | 4 | ||||
| -rw-r--r-- | lisp/emacs-lisp/shortdoc.el | 4 |
3 files changed, 7 insertions, 16 deletions
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el index 63d4a74b546..0052fd0f8db 100644 --- a/lisp/emacs-lisp/comp.el +++ b/lisp/emacs-lisp/comp.el @@ -3876,26 +3876,13 @@ processes from `comp-async-compilations'" do (remhash file-name comp-async-compilations)) (hash-table-count comp-async-compilations)) -(declare-function w32-get-nproc "w32.c") (defvar comp-num-cpus nil) (defun comp-effective-async-max-jobs () "Compute the effective number of async jobs." (if (zerop native-comp-async-jobs-number) (or comp-num-cpus (setf comp-num-cpus - ;; FIXME: we already have a function to determine - ;; the number of processors, see get_native_system_info in w32.c. - ;; The result needs to be exported to Lisp. - (max 1 (/ (cond ((eq 'windows-nt system-type) - (w32-get-nproc)) - ((executable-find "nproc") - (string-to-number - (shell-command-to-string "nproc"))) - ((eq 'berkeley-unix system-type) - (string-to-number - (shell-command-to-string "sysctl -n hw.ncpu"))) - (t 1)) - 2)))) + (max 1 (/ (num-processors) 2)))) native-comp-async-jobs-number)) (defvar comp-last-scanned-async-output nil) diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el index 21b3fbf98b3..57655403c20 100644 --- a/lisp/emacs-lisp/ert.el +++ b/lisp/emacs-lisp/ert.el @@ -781,6 +781,10 @@ This mainly sets up debugger-related bindings." (ert--run-test-debugger test-execution-info args))) (debug-on-error t) + ;; Don't infloop if the error being called is erroring + ;; out, and we have `debug-on-error' bound to nil inside + ;; the test. + (backtrace-on-error-noninteractive nil) (debug-on-quit t) ;; FIXME: Do we need to store the old binding of this ;; and consider it in `ert--run-test-debugger'? diff --git a/lisp/emacs-lisp/shortdoc.el b/lisp/emacs-lisp/shortdoc.el index 51c822d21e2..25bd17bdb96 100644 --- a/lisp/emacs-lisp/shortdoc.el +++ b/lisp/emacs-lisp/shortdoc.el @@ -1319,11 +1319,11 @@ function's documentation in the Info manual"))) (princ value (current-buffer)) (insert "\n")) (:eg-result - (insert " eg. " double-arrow " ") + (insert " e.g. " double-arrow " ") (prin1 value (current-buffer)) (insert "\n")) (:eg-result-string - (insert " eg. " double-arrow " ") + (insert " e.g. " double-arrow " ") (princ value (current-buffer)) (insert "\n"))))) ;; Insert the arglist after doing the evals, in case that's pulled |