diff options
author | Miles Bader <miles@gnu.org> | 2006-12-16 01:29:26 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2006-12-16 01:29:26 +0000 |
commit | 4bc5d7668ef47295810f28a14d67b4a9e12a341f (patch) | |
tree | 2e22bd79984f0772c43e294babc07c1508ce95ce /src/marker.c | |
parent | b44bfd5e9bf3a0e853bc0d4788e4c89a01a70d6a (diff) | |
parent | c3342e8eb3eaf4560210fd030383a940640648f2 (diff) | |
download | emacs-4bc5d7668ef47295810f28a14d67b4a9e12a341f.tar.gz |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 545-562)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- erc-iswitchb: Temporarily enable iswitchb mode
* gnus--rel--5.10 (patch 172-176)
- Merge from emacs--devo--0
- Update from CVS
- Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice.
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-156
Diffstat (limited to 'src/marker.c')
-rw-r--r-- | src/marker.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/marker.c b/src/marker.c index 9f2aa4826b4..bac8e46fc3f 100644 --- a/src/marker.c +++ b/src/marker.c @@ -848,7 +848,7 @@ see `marker-insertion-type'. */) DEFUN ("marker-insertion-type", Fmarker_insertion_type, Smarker_insertion_type, 1, 1, 0, doc: /* Return insertion type of MARKER: t if it stays after inserted text. -nil means the marker stays before text inserted there. */) +The value nil means the marker stays before text inserted there. */) (marker) register Lisp_Object marker; { |