diff options
author | Glenn Morris <rgm@gnu.org> | 2019-12-30 09:12:25 -0800 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2019-12-30 09:12:25 -0800 |
commit | 90083b7d78df1b8a054f3028cc9eb8c55a632b1e (patch) | |
tree | 458355c729fe23f2f3ca5788fc374e36c9935116 /lisp/emacs-lisp/cl-extra.el | |
parent | 00c9308ae86dbc2ace7e0154586be84f17036a2b (diff) | |
parent | 59f71d20eade09e6c2ef99fc4d9b99a161bff040 (diff) | |
download | emacs-90083b7d78df1b8a054f3028cc9eb8c55a632b1e.tar.gz emacs-90083b7d78df1b8a054f3028cc9eb8c55a632b1e.tar.bz2 emacs-90083b7d78df1b8a054f3028cc9eb8c55a632b1e.zip |
Merge from origin/emacs-27
59f71d20ea (origin/emacs-27) Fix tar-mode reading the oldgnu Tar format
e3ec84fd7d Ensure mini-window is resized to show active minibuffer co...
450633f85a Fix mini-window resizing under resize-mini-windows = t
219d47893a (emacs-27) Fixes for makeinfo 4.13
4bbfd2b42f ; fix previous NEWS entry
81b697d106 Fix crash under -nw on macOS properly this time
9ce4207969 Revert "Check for GUI frame in ns_color_index_to_rgba"
732dcfc850 Ignore all color fonts when using XFT
aa0c679f48 Avoid unbounded growth of cl-random-state components (bug#...
# Conflicts:
# etc/NEWS
# src/nsterm.m
Diffstat (limited to 'lisp/emacs-lisp/cl-extra.el')
-rw-r--r-- | lisp/emacs-lisp/cl-extra.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el index 7e9d8fe870b..2e0b37c14de 100644 --- a/lisp/emacs-lisp/cl-extra.el +++ b/lisp/emacs-lisp/cl-extra.el @@ -469,7 +469,7 @@ Optional second arg STATE is a random-state object." (while (< (setq i (1+ i)) 200) (cl-random 2 state)))) (let* ((i (cl-callf (lambda (x) (% (1+ x) 55)) (cl--random-state-i state))) (j (cl-callf (lambda (x) (% (1+ x) 55)) (cl--random-state-j state))) - (n (logand 8388607 (aset vec i (- (aref vec i) (aref vec j)))))) + (n (aset vec i (logand 8388607 (- (aref vec i) (aref vec j)))))) (if (integerp lim) (if (<= lim 512) (% n lim) (if (> lim 8388607) (setq n (+ (ash n 9) (cl-random 512 state)))) |