diff options
| author | Mark Oteiza <mvoteiza@udel.edu> | 2017-09-13 10:19:59 -0400 |
|---|---|---|
| committer | Mark Oteiza <mvoteiza@udel.edu> | 2017-09-13 10:19:59 -0400 |
| commit | 9a8bbb9d5d3a55d4a31658e188f305669bd26e79 (patch) | |
| tree | 86e8eccc65c556d00d1ff1f26d915b45b76af996 /lisp/emacs-lisp/subr-x.el | |
| parent | d532caaeee1d604e72e75072310c4447b694a070 (diff) | |
| download | emacs-9a8bbb9d5d3a55d4a31658e188f305669bd26e79.tar.gz emacs-9a8bbb9d5d3a55d4a31658e188f305669bd26e79.tar.bz2 emacs-9a8bbb9d5d3a55d4a31658e188f305669bd26e79.zip | |
; Fix previous commit
Removing extraneous code, thanks to Michael Heerdegen.
* lisp/emacs-lisp/subr-x.el (internal--listify): Remove latter
condition which always evaluates to t.
(internal--build-binding-value-form): Remove dead code.
Diffstat (limited to 'lisp/emacs-lisp/subr-x.el')
| -rw-r--r-- | lisp/emacs-lisp/subr-x.el | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lisp/emacs-lisp/subr-x.el b/lisp/emacs-lisp/subr-x.el index 3ea01065c8b..ba0ab6cb4c7 100644 --- a/lisp/emacs-lisp/subr-x.el +++ b/lisp/emacs-lisp/subr-x.el @@ -87,9 +87,7 @@ threading." If ELT is of the form ((EXPR)), listify (EXPR) with a dummy symbol." (cond ((symbolp elt) (list elt elt)) - ((and (null (cdr elt)) - (let ((form (car elt))) - (or (listp form) (atom form)))) + ((null (cdr elt)) (list (make-symbol "s") (car elt))) (t elt))) @@ -104,9 +102,7 @@ If ELT is of the form ((EXPR)), listify (EXPR) with a dummy symbol." (defsubst internal--build-binding-value-form (binding prev-var) "Build the conditional value form for BINDING using PREV-VAR." (let ((var (car binding))) - (if (and (null (cdr binding)) (atom (car binding)) (not (symbolp (car binding)))) - `(,var (and ,prev-var ,var)) - `(,var (and ,prev-var ,(cadr binding)))))) + `(,var (and ,prev-var ,(cadr binding))))) (defun internal--build-binding (binding prev-var) "Check and build a single BINDING with PREV-VAR." |