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 | 6cc3bec9030c1e0e863be83be59cc710ad95b332 (patch) | |
tree | ac9827bc441c985371d4cec037adc556dc009c6f /src/marker.c | |
parent | c9dcf1274c41a43d8f321821b52275938806c71c (diff) | |
parent | c86d56a52995ed9b656b079a7f9aef269792ffe1 (diff) | |
download | emacs-6cc3bec9030c1e0e863be83be59cc710ad95b332.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; { |