aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-11-02 20:40:54 -0700
committerGlenn Morris2010-11-02 20:40:54 -0700
commitcf503f7c08c73b89485ac3d00af917875ed13b39 (patch)
tree3dbcb4188ab6ade8a624d01dbbff20210897ec88
parent52365e61364fad61094812c86965d6e0bb0faee3 (diff)
downloademacs-cf503f7c08c73b89485ac3d00af917875ed13b39.tar.gz
emacs-cf503f7c08c73b89485ac3d00af917875ed13b39.zip
Mere anarchy is loosed upon the world.
* doc/misc/gnus.texi (Agent Variables): Spelling fix.
-rw-r--r--doc/misc/ChangeLog4
-rw-r--r--doc/misc/gnus.texi2
-rw-r--r--lisp/emulation/viper-init.el2
-rw-r--r--lisp/gnus/ChangeLog.22
-rw-r--r--src/buffer.h11
5 files changed, 12 insertions, 9 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 5e99132389e..e5b2fa62836 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
12010-11-03 Glenn Morris <rgm@gnu.org>
2
3 * gnus.texi (Agent Variables): Spelling fix.
4
12010-10-31 Lars Magne Ingebrigtsen <larsi@gnus.org> 52010-10-31 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 6
3 * gnus.texi (Paging the Article): Document C-u g/C-u C-u g. 7 * gnus.texi (Paging the Article): Document C-u g/C-u C-u g.
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index c3dd2b31a50..7d3b87759de 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -19840,7 +19840,7 @@ limit to control how often the cycling occurs. A large value improves
19840performance. A small value minimizes the time lost should the 19840performance. A small value minimizes the time lost should the
19841connection be lost while fetching (You may need to run 19841connection be lost while fetching (You may need to run
19842@code{gnus-agent-regenerate-group} to update the group's state. 19842@code{gnus-agent-regenerate-group} to update the group's state.
19843However, all articles parsed prior to loosing the connection will be 19843However, all articles parsed prior to losing the connection will be
19844available while unplugged). The default is 10M so it is unusual to 19844available while unplugged). The default is 10M so it is unusual to
19845see any cycling. 19845see any cycling.
19846 19846
diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index ebd18d47e15..9f7b473c67a 100644
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -784,7 +784,7 @@ Related buffers can be cycled through via :R and :P commands."
784 784
785;; These two vars control the interaction of jumps performed by ' and `. 785;; These two vars control the interaction of jumps performed by ' and `.
786;; In this new version, '' doesn't erase the marks set by ``, so one can 786;; In this new version, '' doesn't erase the marks set by ``, so one can
787;; use both kinds of jumps interchangeably and without loosing positions 787;; use both kinds of jumps interchangeably and without losing positions
788;; inside the lines. 788;; inside the lines.
789 789
790;; Remembers position of the last jump done using ``'. 790;; Remembers position of the last jump done using ``'.
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2
index 799b8b0938c..767b50bbe09 100644
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@ -16433,7 +16433,7 @@
164332001-01-09 Didier Verna <didier@xemacs.org> 164332001-01-09 Didier Verna <didier@xemacs.org>
16434 16434
16435 * gnus-agent.el: Moved some XEmacs specific hook add-ons from 16435 * gnus-agent.el: Moved some XEmacs specific hook add-ons from
16436 `gnus-xmas-[re]define' to avoid loosing user custom settings. 16436 `gnus-xmas-[re]define' to avoid losing user custom settings.
16437 * gnus-art.el: Ditto. 16437 * gnus-art.el: Ditto.
16438 * gnus-group.el: Ditto. 16438 * gnus-group.el: Ditto.
16439 * gnus-salt.el: Ditto. 16439 * gnus-salt.el: Ditto.
diff --git a/src/buffer.h b/src/buffer.h
index 3a4dd106360..9e3de6f23d5 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -1,7 +1,8 @@
1/* Header file for the buffer manipulation primitives. 1/* Header file for the buffer manipulation primitives.
2 Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2
3 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 3Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000,
4 Free Software Foundation, Inc. 4 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
5 Free Software Foundation, Inc.
5 6
6This file is part of GNU Emacs. 7This file is part of GNU Emacs.
7 8
@@ -459,7 +460,7 @@ struct buffer_text
459 struct Lisp_Marker *markers; 460 struct Lisp_Marker *markers;
460 461
461 /* Usually 0. Temporarily set to 1 in decode_coding_gap to 462 /* Usually 0. Temporarily set to 1 in decode_coding_gap to
462 prevent Fgarbage_collect from shrinking the gap and loosing 463 prevent Fgarbage_collect from shrinking the gap and losing
463 not-yet-decoded bytes. */ 464 not-yet-decoded bytes. */
464 int inhibit_shrinking; 465 int inhibit_shrinking;
465 }; 466 };
@@ -1019,5 +1020,3 @@ extern int last_per_buffer_idx;
1019#define PER_BUFFER_VALUE(BUFFER, OFFSET) \ 1020#define PER_BUFFER_VALUE(BUFFER, OFFSET) \
1020 (*(Lisp_Object *)((OFFSET) + (char *) (BUFFER))) 1021 (*(Lisp_Object *)((OFFSET) + (char *) (BUFFER)))
1021 1022
1022/* arch-tag: 679305dd-d41c-4a50-b170-3caf5c97b2d1
1023 (do not change this comment) */