aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXue Fuqiao2013-08-13 22:26:39 +0800
committerXue Fuqiao2013-08-13 22:26:39 +0800
commitf73f4ce69f4b2e8f6c422aca8f8cc36ef72fa725 (patch)
tree772f6c658f53e506fce760c1498345428618b777
parent956720afe49a46bc64c3bdd5447b318808565809 (diff)
downloademacs-f73f4ce69f4b2e8f6c422aca8f8cc36ef72fa725.tar.gz
emacs-f73f4ce69f4b2e8f6c422aca8f8cc36ef72fa725.zip
Doc fix for forward-word and backward-word.
* doc/lispref/positions.texi (Word Motion): Remove redundant sentence. * lisp/simple.el (backward-word): Mention the optional argument. * src/syntax.c (forward_word): Mention the optional argument.
-rw-r--r--doc/lispref/ChangeLog4
-rw-r--r--doc/lispref/positions.texi6
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/simple.el4
-rw-r--r--src/ChangeLog1
-rw-r--r--src/syntax.c1
6 files changed, 16 insertions, 4 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 6df8c3912a3..42b9600a0ac 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
12013-08-13 Xue Fuqiao <xfq.free@gmail.com>
2
3 * positions.texi (Word Motion): Remove redundant sentence.
4
12013-08-13 Glenn Morris <rgm@gnu.org> 52013-08-13 Glenn Morris <rgm@gnu.org>
2 6
3 * lists.texi (List Elements): 7 * lists.texi (List Elements):
diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi
index 119ad98a53d..5cb1a851a5b 100644
--- a/doc/lispref/positions.texi
+++ b/doc/lispref/positions.texi
@@ -191,8 +191,8 @@ whether a given character is part of a word. @xref{Syntax Tables}.
191 191
192@deffn Command forward-word &optional count 192@deffn Command forward-word &optional count
193This function moves point forward @var{count} words (or backward if 193This function moves point forward @var{count} words (or backward if
194@var{count} is negative). If @var{count} is @code{nil}, it moves 194@var{count} is negative). If @var{count} is omitted or @code{nil}, it
195forward one word. 195defaults to 1.
196 196
197``Moving one word'' means moving until point crosses a 197``Moving one word'' means moving until point crosses a
198word-constituent character and then encounters a word-separator 198word-constituent character and then encounters a word-separator
@@ -210,7 +210,7 @@ If @code{inhibit-field-text-motion} is non-@code{nil},
210this function ignores field boundaries. 210this function ignores field boundaries.
211 211
212In an interactive call, @var{count} is specified by the numeric prefix 212In an interactive call, @var{count} is specified by the numeric prefix
213argument. If @var{count} is omitted or @code{nil}, it defaults to 1. 213argument.
214@end deffn 214@end deffn
215 215
216@deffn Command backward-word &optional count 216@deffn Command backward-word &optional count
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ff9f4ff8707..0c8791d8af7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12013-08-13 Xue Fuqiao <xfq.free@gmail.com>
2
3 * simple.el (backward-word): Mention the optional argument.
4
12013-08-13 Stefan Monnier <monnier@iro.umontreal.ca> 52013-08-13 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * frameset.el (frameset--make): Rename constructor from make-frameset. 7 * frameset.el (frameset--make): Rename constructor from make-frameset.
diff --git a/lisp/simple.el b/lisp/simple.el
index 0edf5ca8d9c..6825c41becc 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3338,6 +3338,7 @@ extract characters that are special to a buffer, and should not
3338be copied into other buffers." 3338be copied into other buffers."
3339 (funcall filter-buffer-substring-function beg end delete)) 3339 (funcall filter-buffer-substring-function beg end delete))
3340 3340
3341;; FIXME: `with-wrapper-hook' is obsolete
3341(defun buffer-substring--filter (beg end &optional delete) 3342(defun buffer-substring--filter (beg end &optional delete)
3342 (with-wrapper-hook filter-buffer-substring-functions (beg end delete) 3343 (with-wrapper-hook filter-buffer-substring-functions (beg end delete)
3343 (cond 3344 (cond
@@ -5670,7 +5671,8 @@ current object."
5670 5671
5671(defun backward-word (&optional arg) 5672(defun backward-word (&optional arg)
5672 "Move backward until encountering the beginning of a word. 5673 "Move backward until encountering the beginning of a word.
5673With argument ARG, do this that many times." 5674With argument ARG, do this that many times.
5675If ARG is omitted or nil, move point backward one word."
5674 (interactive "^p") 5676 (interactive "^p")
5675 (forward-word (- (or arg 1)))) 5677 (forward-word (- (or arg 1))))
5676 5678
diff --git a/src/ChangeLog b/src/ChangeLog
index a0a37f0628d..28e8ab66e37 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,6 @@
12013-08-13 Xue Fuqiao <xfq.free@gmail.com> 12013-08-13 Xue Fuqiao <xfq.free@gmail.com>
2 2
3 * syntax.c (forward_word):
3 * cmds.c (forward_char, backward_char): Mention the optional argument. 4 * cmds.c (forward_char, backward_char): Mention the optional argument.
4 5
52013-08-13 Dmitry Antipov <dmantipov@yandex.ru> 62013-08-13 Dmitry Antipov <dmantipov@yandex.ru>
diff --git a/src/syntax.c b/src/syntax.c
index 6d52d115889..f5b37303a4a 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -1464,6 +1464,7 @@ scan_words (register ptrdiff_t from, register EMACS_INT count)
1464 1464
1465DEFUN ("forward-word", Fforward_word, Sforward_word, 0, 1, "^p", 1465DEFUN ("forward-word", Fforward_word, Sforward_word, 0, 1, "^p",
1466 doc: /* Move point forward ARG words (backward if ARG is negative). 1466 doc: /* Move point forward ARG words (backward if ARG is negative).
1467If ARG is omitted or nil, move point forward one word.
1467Normally returns t. 1468Normally returns t.
1468If an edge of the buffer or a field boundary is reached, point is left there 1469If an edge of the buffer or a field boundary is reached, point is left there
1469and the function returns nil. Field boundaries are not noticed if 1470and the function returns nil. Field boundaries are not noticed if