diff options
author | Rasmus <rasmus@gmx.us> | 2017-09-29 10:41:51 +0200 |
---|---|---|
committer | Rasmus <rasmus@gmx.us> | 2017-09-29 10:41:51 +0200 |
commit | d4b2bbdc73ace5cb0971a32a75941486489d1cc5 (patch) | |
tree | dc92eb83d4a66f112e3688ad10632e14ca6601ff /lisp/emacs-lisp/subr-x.el | |
parent | eaefbc26d5c6cffbe4a22d3a9f4c7e6209a7b5a7 (diff) | |
parent | af130f900fc499f71ea22f10ba055a75ce35ed4e (diff) | |
download | emacs-d4b2bbdc73ace5cb0971a32a75941486489d1cc5.tar.gz emacs-d4b2bbdc73ace5cb0971a32a75941486489d1cc5.tar.bz2 emacs-d4b2bbdc73ace5cb0971a32a75941486489d1cc5.zip |
Merge branch 'emacs-26' into scratch/org-mode-merge
Diffstat (limited to 'lisp/emacs-lisp/subr-x.el')
-rw-r--r-- | lisp/emacs-lisp/subr-x.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/subr-x.el b/lisp/emacs-lisp/subr-x.el index 077ad22c75d..edba6550fa2 100644 --- a/lisp/emacs-lisp/subr-x.el +++ b/lisp/emacs-lisp/subr-x.el @@ -128,7 +128,7 @@ binding value is nil. If all are non-nil, the value of THEN is returned, or the last form in ELSE is returned. Each element of VARLIST is a list (SYMBOL VALUEFORM) which binds -SYMBOL to the value of VALUEFORM). An element can additionally +SYMBOL to the value of VALUEFORM. An element can additionally be of the form (VALUEFORM), which is evaluated and checked for nil; i.e. SYMBOL can be omitted if only the test result is of interest." |