diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-10-09 13:12:56 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-10-09 13:12:56 -0700 |
| commit | b89b5ca648015fc00db4328f5019095e0dc7b6db (patch) | |
| tree | 28f4ac148a2383ed03574698e339dd194260088a /lisp/simple.el | |
| parent | 641d98531ef7177d9ff0cf6f7362c7ff5ad2fc1c (diff) | |
| parent | 14c032d5f8d4ccb608cc906db34ddf17ce465449 (diff) | |
| download | emacs-b89b5ca648015fc00db4328f5019095e0dc7b6db.tar.gz | |
Merge from origin/emacs-26
14c032d Avoid assertion violations in nonsensical calls to 'signal'
b99192f * lisp/simple.el (transient-mark-mode): Correct documentation...
7e42294 Update the locale and language database
8c53d9f Fix a typo in a doc string.
79bda3b Make nneething allow CRLF-encoded files (bug#32940)
Diffstat (limited to 'lisp/simple.el')
| -rw-r--r-- | lisp/simple.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/simple.el b/lisp/simple.el index e41630d4ed1..96128c6b9ba 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -5823,10 +5823,10 @@ its earlier value." Transient Mark mode is a global minor mode. When enabled, the region is highlighted with the `region' face whenever the mark -is active. The mark is \"deactivated\" by changing the buffer, -and after certain other operations that set the mark but whose -main purpose is something else--for example, incremental search, -\\[beginning-of-buffer], and \\[end-of-buffer]. +is active. The mark is \"deactivated\" after certain non-motion +commands, including those that change the text in the buffer, and +during shift or mouse selection by any unshifted cursor motion +command (see Info node `Shift Selection' for more details). You can also deactivate the mark by typing \\[keyboard-quit] or \\[keyboard-escape-quit]. |