diff options
| author | Chong Yidong | 2014-01-07 12:36:52 +0800 |
|---|---|---|
| committer | Chong Yidong | 2014-01-07 12:36:52 +0800 |
| commit | de7ce2d169a1ad5642715eddd95615a9c563b308 (patch) | |
| tree | a761c5cf06b2791fea6ff38eb2064cf45437fd50 | |
| parent | 809d2ce4cfadf189ca134fd59e31016ef32043bc (diff) | |
| download | emacs-de7ce2d169a1ad5642715eddd95615a9c563b308.tar.gz emacs-de7ce2d169a1ad5642715eddd95615a9c563b308.zip | |
More doc updates.
* doc/emacs/search.texi (Special Isearch): Document C-x 8 RET in isearch.
(Word Search): Document incremental word search changes.
(Isearch Yank): Document M-s C-e with a prefix argument.
* doc/lispref/files.texi (Changing Files): Document copy-file changes.
* lisp/isearch.el (isearch-yank-char, isearch-yank-word)
(isearch-yank-line): Doc fix.
| -rw-r--r-- | doc/emacs/ChangeLog | 6 | ||||
| -rw-r--r-- | doc/emacs/search.texi | 59 | ||||
| -rw-r--r-- | doc/lispref/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/lispref/files.texi | 27 | ||||
| -rw-r--r-- | etc/NEWS | 7 | ||||
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/isearch.el | 9 |
7 files changed, 81 insertions, 36 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index cfe35028275..ba18eefaed8 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2014-01-07 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * search.texi (Special Isearch): Document C-x 8 RET in isearch. | ||
| 4 | (Word Search): Document incremental word search changes. | ||
| 5 | (Isearch Yank): Document M-s C-e with a prefix argument. | ||
| 6 | |||
| 1 | 2014-01-07 Glenn Morris <rgm@gnu.org> | 7 | 2014-01-07 Glenn Morris <rgm@gnu.org> |
| 2 | 8 | ||
| 3 | * cal-xtra.texi (Calendar Customizing): | 9 | * cal-xtra.texi (Calendar Customizing): |
diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi index bf47dec99b8..ff82434a205 100644 --- a/doc/emacs/search.texi +++ b/doc/emacs/search.texi | |||
| @@ -229,12 +229,14 @@ spaces in the text. Hence, @samp{foo bar} matches @samp{foo bar}, | |||
| 229 | @samp{foo bar}, @samp{foo bar}, and so on (but not @samp{foobar}). | 229 | @samp{foo bar}, @samp{foo bar}, and so on (but not @samp{foobar}). |
| 230 | More precisely, Emacs matches each sequence of space characters in the | 230 | More precisely, Emacs matches each sequence of space characters in the |
| 231 | search string to a regular expression specified by the variable | 231 | search string to a regular expression specified by the variable |
| 232 | @code{search-whitespace-regexp}. For example, set it to | 232 | @code{search-whitespace-regexp}. For example, to make spaces match |
| 233 | @samp{"[[:space:]\n]+"} to make spaces match sequences of newlines as | 233 | sequences of newlines as well as spaces, set it to |
| 234 | well as spaces. To toggle lax space matching, type @kbd{M-s SPC} | 234 | @samp{"[[:space:]\n]+"}. |
| 235 | |||
| 236 | To toggle lax space matching, type @kbd{M-s SPC} | ||
| 235 | (@code{isearch-toggle-lax-whitespace}). To disable this feature | 237 | (@code{isearch-toggle-lax-whitespace}). To disable this feature |
| 236 | entirely, change @code{search-whitespace-regexp} to @code{nil}; then | 238 | entirely, change @code{search-whitespace-regexp} to @code{nil}; then |
| 237 | each space in the search string matches exactly one space | 239 | each space in the search string matches exactly one space. |
| 238 | 240 | ||
| 239 | If the search string you entered contains only lower-case letters, | 241 | If the search string you entered contains only lower-case letters, |
| 240 | the search is case-insensitive; as long as an upper-case letter exists | 242 | the search is case-insensitive; as long as an upper-case letter exists |
| @@ -244,15 +246,29 @@ have this effect. @xref{Search Case}. | |||
| 244 | 246 | ||
| 245 | To search for a newline character, type @kbd{C-j}. | 247 | To search for a newline character, type @kbd{C-j}. |
| 246 | 248 | ||
| 247 | To search for other control characters, such as @key{control-S}, | 249 | To search for non-@acronym{ASCII} characters, use one of the |
| 248 | quote it by typing @kbd{C-q} first (@pxref{Inserting Text}). To | 250 | following methods: |
| 249 | search for non-@acronym{ASCII} characters, you can either use | 251 | |
| 250 | @kbd{C-q} and enter its octal code, or use an input method | 252 | @itemize @bullet |
| 251 | (@pxref{Input Methods}). If an input method is enabled in the current | 253 | @item |
| 252 | buffer when you start the search, you can use it in the search string | 254 | Type @kbd{C-q}, followed by a non-graphic character or a sequence of |
| 253 | also. While typing the search string, you can toggle the input method | 255 | octal digits. This adds a character to the search string, similar to |
| 254 | with the command @kbd{C-\} (@code{isearch-toggle-input-method}). You | 256 | inserting into a buffer using @kbd{C-q} (@pxref{Inserting Text}). For |
| 255 | can also turn on a non-default input method with @kbd{C-^} | 257 | example, @kbd{C-q C-s} during incremental search adds the |
| 258 | @key{control-S} character to the search string. | ||
| 259 | |||
| 260 | @item | ||
| 261 | Type @kbd{C-x 8 @key{RET}}, followed by a Unicode name or code-point. | ||
| 262 | This adds the specified character into the search string, similar to | ||
| 263 | the usual @code{insert-char} command (@pxref{Inserting Text}). | ||
| 264 | |||
| 265 | @item | ||
| 266 | Use an input method (@pxref{Input Methods}). If an input method is | ||
| 267 | enabled in the current buffer when you start the search, you can use | ||
| 268 | it in the search string also. While typing the search string, you can | ||
| 269 | toggle the input method with @kbd{C-\} | ||
| 270 | (@code{isearch-toggle-input-method}). You can also turn on a | ||
| 271 | non-default input method with @kbd{C-^} | ||
| 256 | (@code{isearch-toggle-specified-input-method}), which prompts for the | 272 | (@code{isearch-toggle-specified-input-method}), which prompts for the |
| 257 | name of the input method. When an input method is active during | 273 | name of the input method. When an input method is active during |
| 258 | incremental search, the search prompt includes the input method | 274 | incremental search, the search prompt includes the input method |
| @@ -268,6 +284,7 @@ I-search [@var{im}]: | |||
| 268 | where @var{im} is the mnemonic of the active input method. Any input | 284 | where @var{im} is the mnemonic of the active input method. Any input |
| 269 | method you enable during incremental search remains enabled in the | 285 | method you enable during incremental search remains enabled in the |
| 270 | current buffer afterwards. | 286 | current buffer afterwards. |
| 287 | @end itemize | ||
| 271 | 288 | ||
| 272 | @kindex M-% @r{(Incremental search)} | 289 | @kindex M-% @r{(Incremental search)} |
| 273 | Typing @kbd{M-%} in incremental search invokes @code{query-replace} | 290 | Typing @kbd{M-%} in incremental search invokes @code{query-replace} |
| @@ -315,7 +332,8 @@ of whether to copy a character or a word is heuristic.) | |||
| 315 | @findex isearch-yank-line | 332 | @findex isearch-yank-line |
| 316 | Similarly, @kbd{M-s C-e} (@code{isearch-yank-line}) appends the rest | 333 | Similarly, @kbd{M-s C-e} (@code{isearch-yank-line}) appends the rest |
| 317 | of the current line to the search string. If point is already at the | 334 | of the current line to the search string. If point is already at the |
| 318 | end of a line, it appends the next line. | 335 | end of a line, it appends the next line. With a prefix argument |
| 336 | @var{n}, it appends the next @var{n} lines. | ||
| 319 | 337 | ||
| 320 | If the search is currently case-insensitive, both @kbd{C-w} and | 338 | If the search is currently case-insensitive, both @kbd{C-w} and |
| 321 | @kbd{M-s C-e} convert the text they copy to lower case, so that the | 339 | @kbd{M-s C-e} convert the text they copy to lower case, so that the |
| @@ -481,12 +499,13 @@ These run the commands @code{word-search-forward} and | |||
| 481 | @code{word-search-backward} respectively. | 499 | @code{word-search-backward} respectively. |
| 482 | 500 | ||
| 483 | Incremental and nonincremental word searches differ slightly in the | 501 | Incremental and nonincremental word searches differ slightly in the |
| 484 | way they find a match. In a nonincremental word search, the last word | 502 | way they find a match. In a nonincremental word search, each word in |
| 485 | in the search string must exactly match a whole word. In an | 503 | the search string must exactly match a whole word. In an incremental |
| 486 | incremental word search, the matching is more lax: the last word in | 504 | word search, the matching is more lax: while you are typing the search |
| 487 | the search string can match part of a word, so that the matching | 505 | string, its first and last words need not match whole words. This is |
| 488 | proceeds incrementally as you type. This additional laxity does not | 506 | so that the matching can proceed incrementally as you type. This |
| 489 | apply to the lazy highlight, which always matches whole words. | 507 | additional laxity does not apply to the lazy highlight, which always |
| 508 | matches whole words. | ||
| 490 | 509 | ||
| 491 | @node Symbol Search | 510 | @node Symbol Search |
| 492 | @section Symbol Search | 511 | @section Symbol Search |
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index fc2580385f4..4de37bdb1af 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-01-07 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * files.texi (Changing Files): Document copy-file changes. | ||
| 4 | |||
| 1 | 2014-01-07 Glenn Morris <rgm@gnu.org> | 5 | 2014-01-07 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * display.texi (Logging Messages): Copyedits re messages-buffer. | 7 | * display.texi (Logging Messages): Copyedits re messages-buffer. |
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index 076c91c0c58..934ccaeadbe 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi | |||
| @@ -1561,11 +1561,15 @@ file. This works only on some operating systems, and only if you have | |||
| 1561 | the correct permissions to do so. | 1561 | the correct permissions to do so. |
| 1562 | 1562 | ||
| 1563 | If the optional argument @var{preserve-permissions} is non-@code{nil}, | 1563 | If the optional argument @var{preserve-permissions} is non-@code{nil}, |
| 1564 | this function copies the file modes (or ``permissions''), as well as | 1564 | this function copies the file modes (or ``permissions'') of |
| 1565 | its Access Control List and SELinux context (if any). | 1565 | @var{oldname} to @var{newname}, as well as the Access Control List and |
| 1566 | @xref{Information about Files}. Otherwise, if the destination is | 1566 | SELinux context (if any). @xref{Information about Files}. |
| 1567 | created its file permission bits are those of the source, masked by | 1567 | |
| 1568 | the default file permissions. | 1568 | Otherwise, the file modes of @var{newname} are left unchanged if it is |
| 1569 | an existing file, and set to those of @var{oldname}, masked by the | ||
| 1570 | default file permissions (see @code{set-default-file-modes} below), if | ||
| 1571 | @var{newname} is to be newly created. The Access Control List or | ||
| 1572 | SELinux context are not copied over in either case. | ||
| 1569 | @end deffn | 1573 | @end deffn |
| 1570 | 1574 | ||
| 1571 | @deffn Command make-symbolic-link filename newname &optional ok-if-exists | 1575 | @deffn Command make-symbolic-link filename newname &optional ok-if-exists |
| @@ -1636,13 +1640,12 @@ returns the permissions of a file. | |||
| 1636 | 1640 | ||
| 1637 | @defun set-default-file-modes mode | 1641 | @defun set-default-file-modes mode |
| 1638 | @cindex umask | 1642 | @cindex umask |
| 1639 | This function sets the default file permissions for new files created | 1643 | This function sets the default permissions for new files created by |
| 1640 | by Emacs and its subprocesses. Every file created with Emacs | 1644 | Emacs and its subprocesses. Every file created with Emacs initially |
| 1641 | initially has these permissions, or a subset of them | 1645 | has these permissions, or a subset of them (@code{write-region} will |
| 1642 | (@code{write-region} will not grant execute permissions even if the | 1646 | not grant execute permissions even if the default file permissions |
| 1643 | default file permissions allow execution). On Unix and GNU/Linux, the | 1647 | allow execution). On Unix and GNU/Linux, the default permissions are |
| 1644 | default permissions are given by the bitwise complement of the | 1648 | given by the bitwise complement of the ``umask'' value. |
| 1645 | ``umask'' value. | ||
| 1646 | 1649 | ||
| 1647 | The argument @var{mode} should be an integer which specifies the | 1650 | The argument @var{mode} should be an integer which specifies the |
| 1648 | permissions, similar to @code{set-file-modes} above. Only the lowest | 1651 | permissions, similar to @code{set-file-modes} above. Only the lowest |
| @@ -702,6 +702,7 @@ rather than mboxo. Customize `unrmail-mbox-format' to change this. | |||
| 702 | starts a symbol (identifier) incremental search forward with the | 702 | starts a symbol (identifier) incremental search forward with the |
| 703 | symbol found near point added to the search string initially. | 703 | symbol found near point added to the search string initially. |
| 704 | 704 | ||
| 705 | +++ | ||
| 705 | *** `C-x 8 RET' in Isearch mode reads a character by its Unicode name | 706 | *** `C-x 8 RET' in Isearch mode reads a character by its Unicode name |
| 706 | and adds it to the search string. | 707 | and adds it to the search string. |
| 707 | 708 | ||
| @@ -721,10 +722,12 @@ backward, `M-s w words M-- M-%' replaces a sequence of words backward. | |||
| 721 | *** By default, prefix arguments do not now terminate Isearch mode. | 722 | *** By default, prefix arguments do not now terminate Isearch mode. |
| 722 | Set `isearch-allow-prefix' to nil to restore old behavior. | 723 | Set `isearch-allow-prefix' to nil to restore old behavior. |
| 723 | 724 | ||
| 725 | +++ | ||
| 724 | *** More Isearch commands accept prefix arguments, namely | 726 | *** More Isearch commands accept prefix arguments, namely |
| 725 | `isearch-printing-char', `isearch-quote-char', `isearch-yank-word', | 727 | `isearch-printing-char', `isearch-quote-char', `isearch-yank-word', |
| 726 | `isearch-yank-line'. | 728 | `isearch-yank-line'. |
| 727 | 729 | ||
| 730 | +++ | ||
| 728 | *** Word search now matches whitespace at the beginning/end | 731 | *** Word search now matches whitespace at the beginning/end |
| 729 | of the search string if it contains leading/trailing whitespace. | 732 | of the search string if it contains leading/trailing whitespace. |
| 730 | In an incremental word search or when using a non-nil LAX argument | 733 | In an incremental word search or when using a non-nil LAX argument |
| @@ -739,7 +742,7 @@ that it matches symbols, and non-symbol characters between symbols. | |||
| 739 | *** New command `ses-rename-cell' allows assigning names to SES cells. | 742 | *** New command `ses-rename-cell' allows assigning names to SES cells. |
| 740 | 743 | ||
| 741 | ** Shell | 744 | ** Shell |
| 742 | 745 | --- | |
| 743 | *** `explicit-bash-args' now always defaults to use --noediting. | 746 | *** `explicit-bash-args' now always defaults to use --noediting. |
| 744 | During initialization, Emacs no longer expends a process to decide | 747 | During initialization, Emacs no longer expends a process to decide |
| 745 | whether it is safe to use Bash's --noediting option. These days | 748 | whether it is safe to use Bash's --noediting option. These days |
| @@ -971,6 +974,7 @@ alist of extended attributes as returned by the new function | |||
| 971 | `file-extended-attributes'. The attributes can be applied to another | 974 | `file-extended-attributes'. The attributes can be applied to another |
| 972 | file using `set-file-extended-attributes'. | 975 | file using `set-file-extended-attributes'. |
| 973 | 976 | ||
| 977 | +++ | ||
| 974 | ** By default `copy-file' no longer copies file permission bits to an | 978 | ** By default `copy-file' no longer copies file permission bits to an |
| 975 | existing destination; and it sets the file permission bits of a newly | 979 | existing destination; and it sets the file permission bits of a newly |
| 976 | created destination to those of the source, masked by the default file | 980 | created destination to those of the source, masked by the default file |
| @@ -1146,6 +1150,7 @@ Unix file permission bits as well as SELinux context. | |||
| 1146 | argument GROUP which causes it check for file group too. This can be | 1150 | argument GROUP which causes it check for file group too. This can be |
| 1147 | used in place of the 9th element of `file-attributes'. | 1151 | used in place of the 9th element of `file-attributes'. |
| 1148 | 1152 | ||
| 1153 | --- | ||
| 1149 | *** The function `set-visited-file-modtime' now accepts a 0 or -1 | 1154 | *** The function `set-visited-file-modtime' now accepts a 0 or -1 |
| 1150 | argument, with the same interpretation as the returned value of | 1155 | argument, with the same interpretation as the returned value of |
| 1151 | `visited-file-modtime'. | 1156 | `visited-file-modtime'. |
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8b6462b2d6b..48f11813d49 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-01-07 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * isearch.el (isearch-yank-char, isearch-yank-word) | ||
| 4 | (isearch-yank-line): Doc fix. | ||
| 5 | |||
| 1 | 2014-01-06 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2014-01-06 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * abbrev.el (define-abbrev): Beware new meaning of fboundp. | 8 | * abbrev.el (define-abbrev): Beware new meaning of fboundp. |
diff --git a/lisp/isearch.el b/lisp/isearch.el index 69d081e9a56..fe2f1ace339 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el | |||
| @@ -1946,7 +1946,8 @@ or it might return the position of the end of the line." | |||
| 1946 | (forward-char arg))) | 1946 | (forward-char arg))) |
| 1947 | 1947 | ||
| 1948 | (defun isearch-yank-char (&optional arg) | 1948 | (defun isearch-yank-char (&optional arg) |
| 1949 | "Pull next character from buffer into search string." | 1949 | "Pull next character from buffer into search string. |
| 1950 | If optional ARG is non-nil, pull in the next ARG characters." | ||
| 1950 | (interactive "p") | 1951 | (interactive "p") |
| 1951 | (isearch-yank-internal (lambda () (forward-char arg) (point)))) | 1952 | (isearch-yank-internal (lambda () (forward-char arg) (point)))) |
| 1952 | 1953 | ||
| @@ -1965,12 +1966,14 @@ Subword is used when `subword-mode' is activated. " | |||
| 1965 | (forward-char 1)) (point)))) | 1966 | (forward-char 1)) (point)))) |
| 1966 | 1967 | ||
| 1967 | (defun isearch-yank-word (&optional arg) | 1968 | (defun isearch-yank-word (&optional arg) |
| 1968 | "Pull next word from buffer into search string." | 1969 | "Pull next word from buffer into search string. |
| 1970 | If optional ARG is non-nil, pull in the next ARG words." | ||
| 1969 | (interactive "p") | 1971 | (interactive "p") |
| 1970 | (isearch-yank-internal (lambda () (forward-word arg) (point)))) | 1972 | (isearch-yank-internal (lambda () (forward-word arg) (point)))) |
| 1971 | 1973 | ||
| 1972 | (defun isearch-yank-line (&optional arg) | 1974 | (defun isearch-yank-line (&optional arg) |
| 1973 | "Pull rest of line from buffer into search string." | 1975 | "Pull rest of line from buffer into search string. |
| 1976 | If optional ARG is non-nil, yank the next ARG lines." | ||
| 1974 | (interactive "p") | 1977 | (interactive "p") |
| 1975 | (isearch-yank-internal | 1978 | (isearch-yank-internal |
| 1976 | (lambda () (let ((inhibit-field-text-motion t)) | 1979 | (lambda () (let ((inhibit-field-text-motion t)) |