diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-06-26 10:24:59 -0400 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2019-06-26 10:24:59 -0400 |
commit | 0b4e003766f15225dede9bdba4ead33e493856e2 (patch) | |
tree | 99de57fe8feeca540f398acb232b75e9c802418c /lisp/subr.el | |
parent | 699fce296b13d7db386b1cb5cecf2710e5196691 (diff) | |
download | emacs-0b4e003766f15225dede9bdba4ead33e493856e2.tar.gz emacs-0b4e003766f15225dede9bdba4ead33e493856e2.tar.bz2 emacs-0b4e003766f15225dede9bdba4ead33e493856e2.zip |
Revert "* lisp/calc/calc-ext.el (math-scalarp): Fix typo"
This reverts commit 698ff554ac2699ec48fefc85a1307cbc4a183b0d.
Diffstat (limited to 'lisp/subr.el')
-rw-r--r-- | lisp/subr.el | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/lisp/subr.el b/lisp/subr.el index 3f5e1d7a3a4..baff1e909a1 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -825,11 +825,11 @@ Example: "Return a copy of SEQ with all occurrences of ELT removed. SEQ must be a list, vector, or string. The comparison is done with `equal'." (declare (side-effect-free t)) - (delete elt (if (nlistp seq) - ;; If SEQ isn't a list, there's no need to copy SEQ because - ;; `delete' will return a new object. - seq - (copy-sequence seq)))) + (if (nlistp seq) + ;; If SEQ isn't a list, there's no need to copy SEQ because + ;; `delete' will return a new object. + (delete elt seq) + (delete elt (copy-sequence seq)))) (defun remq (elt list) "Return LIST with all occurrences of ELT removed. @@ -851,10 +851,10 @@ This is the same format used for saving keyboard macros (see `edmacro-mode'). For an approximate inverse of this, see `key-description'." - (declare (pure t)) ;; Don't use a defalias, since the `pure' property is only true for ;; the calling convention of `kbd'. (read-kbd-macro keys)) +(put 'kbd 'pure t) (defun undefined () "Beep to tell the user this binding is undefined." @@ -5586,17 +5586,6 @@ returned list are in the same order as in TREE. (defalias 'flatten-list 'flatten-tree) ;; The initial anchoring is for better performance in searching matches. -(defun internal--opportunistic-gc () - "Run the GC during idle time." - (let ((gc-cons-threshold (/ gc-cons-threshold 2)) - ;; FIXME: This doesn't work because it's only consulted at the end - ;; of a GC in order to set the next `gc_relative_threshold'! - (gc-cons-percentage (/ gc-cons-percentage 2))) - ;; HACK ATTACK: the purpose of this dummy call to `eval' is to call - ;; `maybe_gc', so we will trigger a GC if we allocated half of the maximum - ;; allowed before the GC is forced upon us. - (eval 1 t))) - (defconst regexp-unmatchable "\\`a\\`" "Standard regexp guaranteed not to match any string at all.") |