diff options
| -rw-r--r-- | lisp/replace.el | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/lisp/replace.el b/lisp/replace.el index 416d9f1d1ec..43534d23bb5 100644 --- a/lisp/replace.el +++ b/lisp/replace.el | |||
| @@ -1386,15 +1386,22 @@ If the value is nil, don't highlight the buffer names specially." | |||
| 1386 | 1386 | ||
| 1387 | (defcustom list-matching-lines-jump-to-current-line nil | 1387 | (defcustom list-matching-lines-jump-to-current-line nil |
| 1388 | "If non-nil, \\[list-matching-lines] shows the current line highlighted. | 1388 | "If non-nil, \\[list-matching-lines] shows the current line highlighted. |
| 1389 | Set the point right after such line when there are matches after it." | 1389 | The current line for this purpose is the line of the original buffer |
| 1390 | which was current when \\[list-matching-lines] was invoked. | ||
| 1391 | Point in the `*Occur*' buffer will be set right after such line when | ||
| 1392 | there are matches after it." | ||
| 1390 | :type 'boolean | 1393 | :type 'boolean |
| 1391 | :group 'matching | 1394 | :group 'matching |
| 1392 | :version "26.1") | 1395 | :version "26.1") |
| 1393 | 1396 | ||
| 1394 | (defcustom list-matching-lines-prefix-face 'shadow | 1397 | (defcustom list-matching-lines-prefix-face 'shadow |
| 1395 | "Face used by \\[list-matching-lines] to show the prefix column. | 1398 | "Face used by \\[list-matching-lines] to show the prefix column. |
| 1396 | If the face doesn't differ from the default face, | 1399 | The prefix column is the part of display that precedes the actual |
| 1397 | don't highlight the prefix with line numbers specially." | 1400 | contents of the line; it normally shows the line number. \(For |
| 1401 | multiline matches, the prefix column shows the line number for the | ||
| 1402 | first line and whitespace for the rest of the lines.\) | ||
| 1403 | If this face will display the same as the default face, the prefix | ||
| 1404 | column will not be highlighted speciall." | ||
| 1398 | :type 'face | 1405 | :type 'face |
| 1399 | :group 'matching | 1406 | :group 'matching |
| 1400 | :version "24.4") | 1407 | :version "24.4") |
| @@ -1471,11 +1478,24 @@ REGION must be a list of (START . END) positions as returned by | |||
| 1471 | `region-bounds'. | 1478 | `region-bounds'. |
| 1472 | 1479 | ||
| 1473 | The lines are shown in a buffer named `*Occur*'. | 1480 | The lines are shown in a buffer named `*Occur*'. |
| 1474 | It serves as a menu to find any of the occurrences in this buffer. | 1481 | That buffer can serve as a menu for finding any of the matches for REGEXP |
| 1482 | in the current buffer. | ||
| 1475 | \\<occur-mode-map>\\[describe-mode] in that buffer will explain how. | 1483 | \\<occur-mode-map>\\[describe-mode] in that buffer will explain how. |
| 1476 | If `list-matching-lines-jump-to-current-line' is non-nil, then show | 1484 | |
| 1477 | the current line highlighted with `list-matching-lines-current-line-face' | 1485 | Matches for REGEXP are shown in the face determined by the |
| 1478 | and set point at the first match after such line. | 1486 | variable `list-matching-lines-face'. |
| 1487 | Names of buffers with matched lines are shown in the face determined | ||
| 1488 | by the variable `list-matching-lines-buffer-name-face'. | ||
| 1489 | The line numbers of the matching lines are shown in the face | ||
| 1490 | determined by the variable `list-matching-lines-prefix-face'. | ||
| 1491 | |||
| 1492 | If `list-matching-lines-jump-to-current-line' is non-nil, then the | ||
| 1493 | line in the current buffer which was current when the command was | ||
| 1494 | invoked will be shown in the `*Occur*' buffer highlighted with | ||
| 1495 | the `list-matching-lines-current-line-face', with point at the end | ||
| 1496 | of that line. (If the current line doesn't match REGEXP, it will | ||
| 1497 | nonetheless be inserted into the `*Occur*' buffer between the 2 | ||
| 1498 | closest lines that do match REGEXP.) | ||
| 1479 | 1499 | ||
| 1480 | If REGEXP contains upper case characters (excluding those preceded by `\\') | 1500 | If REGEXP contains upper case characters (excluding those preceded by `\\') |
| 1481 | and `search-upper-case' is non-nil, the matching is case-sensitive. | 1501 | and `search-upper-case' is non-nil, the matching is case-sensitive. |