Merge from emacs-24; up to 117634

3 files changed, 12 insertions, 29 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 82e768c6564..1ecc0a65741 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,12 @@
+2014-10-30  Glenn Morris  <rgm@gnu.org>
+
+        * efaq.texi (Gnus does not work with NNTP): Remove; ancient.
+
+2014-10-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * eieio.texi (Accessing Slots, CLOS compatibility): Adjust wording
+        since `setf' is in core rather than in CL nowadays.
+
 2014-10-29  Paul Eggert  <eggert@cs.ucla.edu>
 
         Simplify use of current-time and friends.
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index 4d1df8b97dc..0159101916d 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -4190,7 +4190,6 @@ fontset, or you can select it by setting the default font in your
 * Replying to the sender of a message::
 * Automatically starting a mail or news reader::
 * Reading news with Emacs::
-* Gnus does not work with NNTP::
 * Making Gnus faster::
 * Catching up in all newsgroups::
 @end menu
@@ -4384,27 +4383,6 @@ Manual, gnus, The Gnus Manual}, which includes @ref{Frequently Asked
 Questions,, the Gnus FAQ, gnus, The Gnus Manual}.
 
 
-@node Gnus does not work with NNTP
-@section Why doesn't Gnus work via NNTP?
-@cindex Gnus and NNTP
-@cindex NNTP, Gnus fails to work with
-
-There is a bug in NNTP version 1.5.10, such that when multiple requests
-are sent to the NNTP server, the server only handles the first one
-before blocking waiting for more input which never comes.  NNTP version
-1.5.11 claims to fix this.
-
-You can work around the bug inside Emacs like this:
-
-@lisp
-(setq nntp-maximum-request 1)
-@end lisp
-
-You can find out what version of NNTP your news server is running by
-telnetting to the NNTP port (usually 119) on the news server machine
-(i.e., @kbd{telnet server-machine 119}).  The server should give its
-version number in the welcome message.  Type @kbd{quit} to get out.
-
 @node Making Gnus faster
 @section How do I make Gnus faster?
 @cindex Faster, starting Gnus
diff --git a/doc/misc/eieio.texi b/doc/misc/eieio.texi
index 8f93300e24a..80e52baf255 100644
--- a/doc/misc/eieio.texi
+++ b/doc/misc/eieio.texi
@@ -755,8 +755,8 @@ Unlike @code{oref}, the symbol for @var{slot} must be quoted.
 
 @defun set-slot-value object slot value
 @anchor{set-slot-value}
-This is not a CLOS function, but is meant to mirror @code{slot-value} if
-you don't want to use the cl package's @code{setf} function.  This
+This is not a CLOS function, but is the setter for @code{slot-value}
+used by the @code{setf} macro.  This
 function sets the value of @var{slot} from @var{object}.  Unlike
 @code{oset}, the symbol for @var{slot} must be quoted.
 @end defun
@@ -790,7 +790,7 @@ This establishes a lexical environment for referring to the slots in
 the instance named by the given slot-names as though they were
 variables.  Within such a context the value of the slot can be
 specified by using its slot name, as if it were a lexically bound
-variable.  Both setf and setq can be used to set the value of the
+variable.  Both @code{setf} and @code{setq} can be used to set the value of the
 slot.
 
 @var{spec-list} is of a form similar to @dfn{let}.  For example:
@@ -1850,10 +1850,6 @@ for the given object.  This is different than that found in CLOS because
 in @eieio{} this function accepts replacement arguments.  This permits
 subclasses to modify arguments as they are passed up the tree.  If no
 arguments are given, the expected CLOS behavior is used.
-@item setf
-If the common-lisp subsystem is loaded, the setf parameters are also
-loaded so the form @code{(setf (slot-value object slot) t)} should
-work.
 @end table
 
 CLOS supports the @code{describe} command, but @eieio{} provides