summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Rudalics <rudalics@gmx.at>2012-12-07 10:45:03 +0100
committerMartin Rudalics <rudalics@gmx.at>2012-12-07 10:45:03 +0100
commit2cec368c81f0056f7d3f4ce9aa247ef56d3053a7 (patch)
treed366bc31a57e690dbf473a6a6c7c257750f7827a
parent3a21537c13a64983fadbdf64c19b5822297e89cc (diff)
downloademacs-2cec368c81f0056f7d3f4ce9aa247ef56d3053a7.tar.gz
Reword doc-string of Fcompare_buffer_substrings.
* editfns.c (Fcompare_buffer_substrings): Reword doc-string.
-rw-r--r--etc/NEWS4
-rw-r--r--src/ChangeLog4
-rw-r--r--src/editfns.c8
3 files changed, 12 insertions, 4 deletions
diff --git a/etc/NEWS b/etc/NEWS
index a16bdcfd44a..4cf2e9d6da9 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -702,6 +702,10 @@ that substring is inserted literally even if the LITERAL arg is
non-nil, instead of causing an error to be signaled.
+++
+** `select-window' now always makes the window's buffer current.
+It does so even if the window was selected before.
+
++++
** Docstrings starting with `*' no longer indicate user options.
Only variables defined using `defcustom' are considered user options.
The function `user-variable-p' is now an obsolete alias for
diff --git a/src/ChangeLog b/src/ChangeLog
index 106333ac8ed..f9edb039b1c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-07 Martin Rudalics <rudalics@gmx.at>
+
+ * editfns.c (Fcompare_buffer_substrings): Reword doc-string.
+
2012-12-05 Eli Zaretskii <eliz@gnu.org>
* callproc.c (Fcall_process_region) [!HAVE_MKSTEMP]: If mktemp
diff --git a/src/editfns.c b/src/editfns.c
index 8122ffdd0d4..f0f380329cf 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -2650,10 +2650,10 @@ They default to the values of (point-min) and (point-max) in BUFFER. */)
DEFUN ("compare-buffer-substrings", Fcompare_buffer_substrings, Scompare_buffer_substrings,
6, 6, 0,
doc: /* Compare two substrings of two buffers; return result as number.
-the value is -N if first string is less after N-1 chars,
-+N if first string is greater after N-1 chars, or 0 if strings match.
-Each substring is represented as three arguments: BUFFER, START and END.
-That makes six args in all, three for each substring.
+Return -N if first string is less after N-1 chars, +N if first string is
+greater after N-1 chars, or 0 if strings match. Each substring is
+represented as three arguments: BUFFER, START and END. That makes six
+args in all, three for each substring.
The value of `case-fold-search' in the current buffer
determines whether case is significant or ignored. */)