diff options
author | Glenn Morris <rgm@gnu.org> | 2013-02-12 20:31:09 -0800 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2013-02-12 20:31:09 -0800 |
commit | 01fcc3a532872b29784a4d888ab9cc1aef0eed01 (patch) | |
tree | e1fba1dfe3ec5b61ddc3e5e3824e4536b2c39429 /doc/emacs | |
parent | d0009c7351874e853c63ce67cea6103f33afa60b (diff) | |
parent | 1a359750bbac95fd6bf8fe1233e747a1d26f0082 (diff) | |
download | emacs-01fcc3a532872b29784a4d888ab9cc1aef0eed01.tar.gz |
Merge from emacs-24; up to 2012-12-17T11:17:34Z!rgm@gnu.org
Diffstat (limited to 'doc/emacs')
-rw-r--r-- | doc/emacs/ack.texi | 2 | ||||
-rw-r--r-- | doc/emacs/mark.texi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi index a0ab8223ae0..99e0c690a09 100644 --- a/doc/emacs/ack.texi +++ b/doc/emacs/ack.texi @@ -726,7 +726,7 @@ the display of the Emacs tool bar. With Riccardo Murri he wrote Eric Ludlam wrote the Speedbar package; @file{checkdoc.el}, for checking doc strings in Emacs Lisp programs; @file{dframe.el}, providing dedicated frame support modes; @file{ezimage.el}, a generalized way to -place images over text; @file{chart.el} for drawing bar charts etc; and +place images over text; @file{chart.el} for drawing bar charts etc.; and the EIEIO (Enhanced Implementation of Emacs Interpreted Objects) package. He was also the main author of the CEDET (Collection of Emacs Development Environment Tools) package. Portions were also written by diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi index 6ed3b2e6d37..05b2a5be3a4 100644 --- a/doc/emacs/mark.texi +++ b/doc/emacs/mark.texi @@ -131,7 +131,7 @@ detailed description of these mouse commands. @cindex shift-selection Finally, you can set the mark by holding down the shift key while typing certain cursor motion commands (such as @kbd{S-@key{right}}, -@kbd{S-C-f}, @kbd{S-C-n}, etc.) This is called @dfn{shift-selection}. +@kbd{S-C-f}, @kbd{S-C-n}, etc.). This is called @dfn{shift-selection}. It sets the mark at point before moving point, but only if there is no active mark set via shift-selection. The mark set by mouse commands and by shift-selection behaves slightly differently from the usual |