From 0e963201d03d9229bb8ac4323291d2b0119526ed Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 1 Jan 2016 01:16:19 -0800 Subject: Update copyright year to 2016 Run admin/update-copyright. --- src/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/buffer.c') diff --git a/src/buffer.c b/src/buffer.c index ab91aaa4e81..c07b2dc021e 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1,6 +1,6 @@ /* Buffer manipulation primitives for GNU Emacs. -Copyright (C) 1985-1989, 1993-1995, 1997-2015 Free Software Foundation, +Copyright (C) 1985-1989, 1993-1995, 1997-2016 Free Software Foundation, Inc. This file is part of GNU Emacs. -- cgit v1.2.1 From 0d9e80d79dccf3f0811c630d91be0d170d56ee0c Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 4 Jan 2016 18:58:20 +0200 Subject: Fix a doc string of 'transient-mark-mode' * src/buffer.c (syms_of_buffer) : Prevent "lambda" in doc string from becoming a link to lambda expressions. --- src/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/buffer.c') diff --git a/src/buffer.c b/src/buffer.c index c07b2dc021e..51c36de0c6b 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -6201,7 +6201,7 @@ all windows or just the selected window. Lisp programs may give this variable certain special values: -- A value of `lambda' enables Transient Mark mode temporarily. +- A value of \\='lambda (literally) enables Transient Mark mode temporarily. It is disabled again after any subsequent action that would normally deactivate the mark (e.g. buffer modification). -- cgit v1.2.1 From 977d3eabe3c1a6eb3577f36117409d76c5ffc0b7 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 5 Jan 2016 17:49:50 +0200 Subject: Update doc string of 'selective-display' * src/buffer.c (syms_of_buffer) : Say that using it with the value of 't' is obsolete. (Bug#1092) --- src/buffer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/buffer.c') diff --git a/src/buffer.c b/src/buffer.c index 51c36de0c6b..493312b52bf 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -5803,11 +5803,14 @@ you probably should set this to -2 in that buffer. */); DEFVAR_PER_BUFFER ("selective-display", &BVAR (current_buffer, selective_display), Qnil, doc: /* Non-nil enables selective display. + An integer N as value means display only lines that start with less than N columns of space. + A value of t means that the character ^M makes itself and all the rest of the line invisible; also, when saving the buffer -in a file, save the ^M as a newline. */); +in a file, save the ^M as a newline. This usage is obsolete; use +overlays or text properties instead. */); DEFVAR_PER_BUFFER ("selective-display-ellipses", &BVAR (current_buffer, selective_display_ellipses), -- cgit v1.2.1 From 221240c9254957a1f2df1e9a1687e757d0b5d59b Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 5 Jan 2016 09:01:21 -0800 Subject: Reword transient-mark-mode doc string * src/buffer.c (syms_of_buffer): Reword doc string to avoid confusion. The value 'lambda (literally) can be interpreted as (quote lambda), which is not intended here; we want just the lambda symbol. --- src/buffer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/buffer.c') diff --git a/src/buffer.c b/src/buffer.c index 493312b52bf..29f38d1b9b1 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -6204,11 +6204,11 @@ all windows or just the selected window. Lisp programs may give this variable certain special values: -- A value of \\='lambda (literally) enables Transient Mark mode temporarily. - It is disabled again after any subsequent action that would +- The symbol ‘lambda’ enables Transient Mark mode temporarily. + The mode is disabled again after any subsequent action that would normally deactivate the mark (e.g. buffer modification). -- A value of (only . OLDVAL) enables Transient Mark mode +- The pair (only . OLDVAL) enables Transient Mark mode temporarily. After any subsequent point motion command that is not shift-translated, or any other action that would normally deactivate the mark (e.g. buffer modification), the value of -- cgit v1.2.1 From d400753a0d1c4080c6c2addf6d0be4660e076c75 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 5 Jan 2016 09:17:58 -0800 Subject: * src/buffer.c: Stick with ASCII in doc string. --- src/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/buffer.c') diff --git a/src/buffer.c b/src/buffer.c index 29f38d1b9b1..3f9371652e7 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -6204,7 +6204,7 @@ all windows or just the selected window. Lisp programs may give this variable certain special values: -- The symbol ‘lambda’ enables Transient Mark mode temporarily. +- The symbol `lambda' enables Transient Mark mode temporarily. The mode is disabled again after any subsequent action that would normally deactivate the mark (e.g. buffer modification). -- cgit v1.2.1 From ee83b77f5ddede0fed518d0c23cf0ae38ce5b745 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 13 Jan 2016 12:49:50 -0500 Subject: * src/buffer.c (Fset_buffer_major_mode): Allow default major-mode, or its hook, to move point. (Bug#22348) --- src/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/buffer.c') diff --git a/src/buffer.c b/src/buffer.c index 3f9371652e7..1468e7a2be1 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1999,7 +1999,7 @@ the current buffer's major mode. */) /* To select a nonfundamental mode, select the buffer temporarily and then call the mode function. */ - record_unwind_protect (save_excursion_restore, save_excursion_save ()); + record_unwind_current_buffer (); Fset_buffer (buffer); call0 (function); -- cgit v1.2.1