diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-08-29 08:24:03 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-08-29 08:24:03 -0700 |
| commit | d8bef4b519624de20baa1428dd103f61dfb220fa (patch) | |
| tree | ed458e2d88b9a0a422fd46e50c1d2654d24b07a9 /lisp/calc | |
| parent | b28d5333e0144acc7385339578d907196c4b6f3e (diff) | |
| parent | 2670cbf9a87eb498d73770c381ca51657d390a1e (diff) | |
| download | emacs-d8bef4b519624de20baa1428dd103f61dfb220fa.tar.gz | |
Merge from origin/emacs-26
2670cbf (origin/emacs-26) ; * configure.ac: Remove outdated comment (...
3b71bef admin.el: respect environment settings for makeinfo etc
3764ab4 * etc/PROBLEMS: New entry about GTK+ 3 crash with some X serv...
9d61344 Index profiler commands in elisp manual
f088817 Fix math-imaginary-i check
fca935e ; Let pre-commit git hook check merged in changes (Bug#29197)
fe06fcc Avoid infinite hscrolling loops when line numbers are displayed
63e59c8 Avoid crashes in malformed defvar
785682c * configure.ac (emacs_config_features): Add GLIB, XDBE, XIM.
2695b7e * configure.ac: Doc fixes related to --with-xim.
d0d162c Small checkdoc quoting fix (bug#32546)
Conflicts:
configure.ac
Diffstat (limited to 'lisp/calc')
| -rw-r--r-- | lisp/calc/calc-cplx.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/calc/calc-cplx.el b/lisp/calc/calc-cplx.el index 4a453a73d72..35cd31dfb4f 100644 --- a/lisp/calc/calc-cplx.el +++ b/lisp/calc/calc-cplx.el @@ -273,8 +273,8 @@ (or (eq (car-safe val) 'special-const) (equal val '(cplx 0 1)) (and (eq (car-safe val) 'polar) - (eq (nth 1 val) 0) - (Math-equal (nth 1 val) (math-quarter-circle nil)))))) + (eq (nth 1 val) 1) + (Math-equal (nth 2 val) (math-quarter-circle nil)))))) ;;; Extract the real or complex part of a complex number. [R N] [Public] ;;; Also extracts the real part of a modulo form. |