diff options
| author | Glenn Morris | 2014-05-26 18:53:45 -0700 |
|---|---|---|
| committer | Glenn Morris | 2014-05-26 18:53:45 -0700 |
| commit | e9e341bb4bf06b25bc4feb754544c77b0021a3bd (patch) | |
| tree | 649355b23a679308903efa3d0f31619f6b5c0463 /lisp | |
| parent | 4a12fa5c2e0d69d3dfbf94c9367006ab545e93cc (diff) | |
| download | emacs-e9e341bb4bf06b25bc4feb754544c77b0021a3bd.tar.gz emacs-e9e341bb4bf06b25bc4feb754544c77b0021a3bd.zip | |
Doc updates re filter-buffer-substring
* lisp/simple.el (filter-buffer-substring-functions)
(filter-buffer-substring-function, buffer-substring-filters)
(filter-buffer-substring, buffer-substring--filter): Doc fixes.
* doc/lispref/text.texi (Buffer Contents):
Update for filter-buffer-substring changes.
* doc/lispref/hooks.texi: Remove old comment.
* etc/NEWS: Related markup.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/simple.el | 50 |
2 files changed, 31 insertions, 23 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 13f68a4f476..1b886000014 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2014-05-27 Glenn Morris <rgm@gnu.org> | 1 | 2014-05-27 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * simple.el (filter-buffer-substring-functions) | ||
| 4 | (filter-buffer-substring-function, buffer-substring-filters) | ||
| 5 | (filter-buffer-substring, buffer-substring--filter): Doc fixes. | ||
| 6 | |||
| 3 | * minibuffer.el (completion-in-region-functions, completion-in-region) | 7 | * minibuffer.el (completion-in-region-functions, completion-in-region) |
| 4 | (completion--in-region): Doc fixes. | 8 | (completion--in-region): Doc fixes. |
| 5 | 9 | ||
diff --git a/lisp/simple.el b/lisp/simple.el index 4e10de77964..f8499744194 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -3463,46 +3463,50 @@ These commands include \\[set-mark-command] and \\[start-kbd-macro]." | |||
| 3463 | 3463 | ||
| 3464 | 3464 | ||
| 3465 | (defvar filter-buffer-substring-functions nil | 3465 | (defvar filter-buffer-substring-functions nil |
| 3466 | "This variable is a wrapper hook around `filter-buffer-substring'.") | 3466 | "This variable is a wrapper hook around `buffer-substring--filter'.") |
| 3467 | (make-obsolete-variable 'filter-buffer-substring-functions | 3467 | (make-obsolete-variable 'filter-buffer-substring-functions |
| 3468 | 'filter-buffer-substring-function "24.4") | 3468 | 'filter-buffer-substring-function "24.4") |
| 3469 | 3469 | ||
| 3470 | (defvar filter-buffer-substring-function #'buffer-substring--filter | 3470 | (defvar filter-buffer-substring-function #'buffer-substring--filter |
| 3471 | "Function to perform the filtering in `filter-buffer-substring'. | 3471 | "Function to perform the filtering in `filter-buffer-substring'. |
| 3472 | The function is called with 3 arguments: | 3472 | The function is called with the same 3 arguments (BEG END DELETE) |
| 3473 | \(BEG END DELETE). The arguments BEG, END, and DELETE are the same | 3473 | that `filter-buffer-substring' received. It should return the |
| 3474 | as those of `filter-buffer-substring' in each case. | 3474 | buffer substring between BEG and END, after filtering. If DELETE is |
| 3475 | It should return the buffer substring between BEG and END, after filtering.") | 3475 | non-nil, it should delete the text between BEG and END from the buffer.") |
| 3476 | 3476 | ||
| 3477 | (defvar buffer-substring-filters nil | 3477 | (defvar buffer-substring-filters nil |
| 3478 | "List of filter functions for `filter-buffer-substring'. | 3478 | "List of filter functions for `buffer-substring--filter'. |
| 3479 | Each function must accept a single argument, a string, and return | 3479 | Each function must accept a single argument, a string, and return a string. |
| 3480 | a string. The buffer substring is passed to the first function | 3480 | The buffer substring is passed to the first function in the list, |
| 3481 | in the list, and the return value of each function is passed to | 3481 | and the return value of each function is passed to the next. |
| 3482 | the next. | ||
| 3483 | As a special convention, point is set to the start of the buffer text | 3482 | As a special convention, point is set to the start of the buffer text |
| 3484 | being operated on (i.e., the first argument of `filter-buffer-substring') | 3483 | being operated on (i.e., the first argument of `buffer-substring--filter') |
| 3485 | before these functions are called.") | 3484 | before these functions are called.") |
| 3486 | (make-obsolete-variable 'buffer-substring-filters | 3485 | (make-obsolete-variable 'buffer-substring-filters |
| 3487 | 'filter-buffer-substring-function "24.1") | 3486 | 'filter-buffer-substring-function "24.1") |
| 3488 | 3487 | ||
| 3489 | (defun filter-buffer-substring (beg end &optional delete) | 3488 | (defun filter-buffer-substring (beg end &optional delete) |
| 3490 | "Return the buffer substring between BEG and END, after filtering. | 3489 | "Return the buffer substring between BEG and END, after filtering. |
| 3491 | The hook `filter-buffer-substring-function' performs the actual filtering. | 3490 | If DELETE is non-nil, delete the text between BEG and END from the buffer. |
| 3492 | By default, no filtering is done. | 3491 | |
| 3493 | 3492 | This calls the function that `filter-buffer-substring-function' specifies | |
| 3494 | If DELETE is non-nil, the text between BEG and END is deleted | 3493 | \(passing the same three arguments that it received) to do the work, |
| 3495 | from the buffer. | 3494 | and returns whatever it does. The default function does no filtering, |
| 3496 | 3495 | unless a hook has been set. | |
| 3497 | This function should be used instead of `buffer-substring', | 3496 | |
| 3498 | `buffer-substring-no-properties', or `delete-and-extract-region' | 3497 | Use `filter-buffer-substring' instead of `buffer-substring', |
| 3499 | when you want to allow filtering to take place. For example, | 3498 | `buffer-substring-no-properties', or `delete-and-extract-region' when |
| 3500 | major or minor modes can use `filter-buffer-substring-function' to | 3499 | you want to allow filtering to take place. For example, major or minor |
| 3501 | extract characters that are special to a buffer, and should not | 3500 | modes can use `filter-buffer-substring-function' to extract characters |
| 3502 | be copied into other buffers." | 3501 | that are special to a buffer, and should not be copied into other buffers." |
| 3503 | (funcall filter-buffer-substring-function beg end delete)) | 3502 | (funcall filter-buffer-substring-function beg end delete)) |
| 3504 | 3503 | ||
| 3505 | (defun buffer-substring--filter (beg end &optional delete) | 3504 | (defun buffer-substring--filter (beg end &optional delete) |
| 3505 | "Default function to use for `filter-buffer-substring-function'. | ||
| 3506 | Its arguments and return value are as specified for `filter-buffer-substring'. | ||
| 3507 | This respects the wrapper hook `filter-buffer-substring-functions', | ||
| 3508 | and the abnormal hook `buffer-substring-filters'. | ||
| 3509 | No filtering is done unless a hook says to." | ||
| 3506 | (with-wrapper-hook filter-buffer-substring-functions (beg end delete) | 3510 | (with-wrapper-hook filter-buffer-substring-functions (beg end delete) |
| 3507 | (cond | 3511 | (cond |
| 3508 | ((or delete buffer-substring-filters) | 3512 | ((or delete buffer-substring-filters) |