diff options
Diffstat (limited to 'lisp/subr.el')
| -rw-r--r-- | lisp/subr.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/subr.el b/lisp/subr.el index 68cd230c5e2..deadca6efa0 100644 --- a/lisp/subr.el +++ b/lisp/subr.el | |||
| @@ -136,8 +136,8 @@ ARGS is a list of the first N arguments to pass to FUN. | |||
| 136 | The result is a new function which does the same as FUN, except that | 136 | The result is a new function which does the same as FUN, except that |
| 137 | the first N arguments are fixed at the values with which this function | 137 | the first N arguments are fixed at the values with which this function |
| 138 | was called." | 138 | was called." |
| 139 | `(closure (t) (&rest args) | 139 | (lambda (&rest args2) |
| 140 | (apply ',fun ,@(mapcar (lambda (arg) `',arg) args) args))) | 140 | (apply fun (append args args2)))) |
| 141 | 141 | ||
| 142 | (defmacro push (newelt place) | 142 | (defmacro push (newelt place) |
| 143 | "Add NEWELT to the list stored in the generalized variable PLACE. | 143 | "Add NEWELT to the list stored in the generalized variable PLACE. |
| @@ -316,7 +316,7 @@ Defaults to `error'." | |||
| 316 | (unless parent (setq parent 'error)) | 316 | (unless parent (setq parent 'error)) |
| 317 | (let ((conditions | 317 | (let ((conditions |
| 318 | (if (consp parent) | 318 | (if (consp parent) |
| 319 | (apply #'nconc | 319 | (apply #'append |
| 320 | (mapcar (lambda (parent) | 320 | (mapcar (lambda (parent) |
| 321 | (cons parent | 321 | (cons parent |
| 322 | (or (get parent 'error-conditions) | 322 | (or (get parent 'error-conditions) |
| @@ -1274,6 +1274,7 @@ is converted into a string by expressing it in decimal." | |||
| 1274 | (set-advertised-calling-convention | 1274 | (set-advertised-calling-convention |
| 1275 | 'all-completions '(string collection &optional predicate) "23.1") | 1275 | 'all-completions '(string collection &optional predicate) "23.1") |
| 1276 | (set-advertised-calling-convention 'unintern '(name obarray) "23.3") | 1276 | (set-advertised-calling-convention 'unintern '(name obarray) "23.3") |
| 1277 | (set-advertised-calling-convention 'indirect-function '(object) "25.1") | ||
| 1277 | (set-advertised-calling-convention 'redirect-frame-focus '(frame focus-frame) "24.3") | 1278 | (set-advertised-calling-convention 'redirect-frame-focus '(frame focus-frame) "24.3") |
| 1278 | (set-advertised-calling-convention 'decode-char '(ch charset) "21.4") | 1279 | (set-advertised-calling-convention 'decode-char '(ch charset) "21.4") |
| 1279 | (set-advertised-calling-convention 'encode-char '(ch charset) "21.4") | 1280 | (set-advertised-calling-convention 'encode-char '(ch charset) "21.4") |