aboutsummaryrefslogtreecommitdiffstats
path: root/src/buffer.c
diff options
context:
space:
mode:
authorKaroly Lorentey2004-07-18 21:49:24 +0000
committerKaroly Lorentey2004-07-18 21:49:24 +0000
commit31d7e9bc5a474c2da8c40f4812ea3e09cd5fb82c (patch)
tree729a3c238e43ed5625290e994d9ef0d09c18241a /src/buffer.c
parent4cb2afc64f004ba91ff0bd37cf8ca6669b228988 (diff)
parentcdfa3eccb179fe579a5e38949d0a2ad3d2757524 (diff)
downloademacs-31d7e9bc5a474c2da8c40f4812ea3e09cd5fb82c.tar.gz
emacs-31d7e9bc5a474c2da8c40f4812ea3e09cd5fb82c.zip
Merged in changes from CVS trunk.
Patches applied: * lorentey@elte.hu--2004/emacs--hacks--0--patch-2 Prevent special events from appending dashes to the echo string. * lorentey@elte.hu--2004/emacs--hacks--0--patch-4 Added ChangeLog entry. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-454 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-455 Bash the dashes * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-456 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-457 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-458 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-459 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-460 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-219
Diffstat (limited to 'src/buffer.c')
-rw-r--r--src/buffer.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/buffer.c b/src/buffer.c
index c5783ade2a0..f55ae7983f4 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5861,7 +5861,10 @@ all windows or just the selected window.
5861 5861
5862If the value is `lambda', that enables Transient Mark mode temporarily 5862If the value is `lambda', that enables Transient Mark mode temporarily
5863until the next buffer modification. If a command sets the value to `only', 5863until the next buffer modification. If a command sets the value to `only',
5864that enables Transient Mark mode for the following command only. */); 5864that enables Transient Mark mode for the following command only.
5865During that following command, the value of `transient-mark-mode'
5866is `identity'. If it is still `identity' at the end of that command,
5867it changes to nil. */);
5865 Vtransient_mark_mode = Qnil; 5868 Vtransient_mark_mode = Qnil;
5866 5869
5867 DEFVAR_LISP ("inhibit-read-only", &Vinhibit_read_only, 5870 DEFVAR_LISP ("inhibit-read-only", &Vinhibit_read_only,