diff options
| -rw-r--r-- | lisp/fadr.el | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lisp/fadr.el b/lisp/fadr.el index 1bdf80268a0..0ffbef43ec1 100644 --- a/lisp/fadr.el +++ b/lisp/fadr.el | |||
| @@ -75,9 +75,8 @@ FIELD is a symbol." | |||
| 75 | 75 | ||
| 76 | (defmacro fadr-define-select (name regexp &optional doc filter) | 76 | (defmacro fadr-define-select (name regexp &optional doc filter) |
| 77 | "Define a function NAME of one string argument which will | 77 | "Define a function NAME of one string argument which will |
| 78 | extract data from it using the first subgroup in REGEXP. If | 78 | extract data from it using the first subgroup in REGEXP. If |
| 79 | FILTER is specified, it will be called with the resulting | 79 | FILTER is specified, it will be called with the resulting string." |
| 80 | string." | ||
| 81 | `(defun ,name (path) | 80 | `(defun ,name (path) |
| 82 | ,doc | 81 | ,doc |
| 83 | (let ((string (if (string-match ,regexp path) | 82 | (let ((string (if (string-match ,regexp path) |
| @@ -153,8 +152,7 @@ respective values of OBJECT members." | |||
| 153 | string)) | 152 | string)) |
| 154 | 153 | ||
| 155 | (defun fadr-format (string object &rest objects) | 154 | (defun fadr-format (string object &rest objects) |
| 156 | "Format STRING with OBJECTS, then `fadr-expand' the result with | 155 | "Format STRING with OBJECTS, then `fadr-expand' the result with OBJECT." |
| 157 | OBJECT." | ||
| 158 | (let ((new-string (apply 'format (append (list string) objects)))) | 156 | (let ((new-string (apply 'format (append (list string) objects)))) |
| 159 | (fadr-expand new-string object))) | 157 | (fadr-expand new-string object))) |
| 160 | 158 | ||