Merge from emacs-24; up to 2012-05-08T15:19:18Z!monnier@iro.umontreal.ca

diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 11eacf25c96eb65bd91d176ec66ccb22980900d9..6c524f5a0aef6b07917166a81ea6b4f091ff0c8c 100644 (file)
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-17  Gregor Zattler  <grfz@gmx.de>  (tiny change)
+
+       * emacs-lisp-intro.texi (Narrowing advantages):
+       Minor update for changed what-line implementation.  (Bug#12629)
+
 2012-06-21  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in: Rename infodir to buildinfodir throughout.  (Bug#11737)

diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 04e3e0c8649d3944096788fc4c57dcd8d6e51fc7..55c3ef4e09ecbc5de7272b474d935266d36b6a5c 100644 (file)
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -6600,8 +6600,8 @@ buffer; or conversely, an Emacs Lisp function needs to work on all of a
 buffer that has been narrowed.  The @code{what-line} function, for
 example, removes the narrowing from a buffer, if it has any narrowing
 and when it has finished its job, restores the narrowing to what it was.
-On the other hand, the @code{count-lines} function, which is called by
-@code{what-line}, uses narrowing to restrict itself to just that portion
+On the other hand, the @code{count-lines} function
+uses narrowing to restrict itself to just that portion
 of the buffer in which it is interested and then restores the previous
 situation.
 

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index c6b2a4c37a784417b3fbb380c600f5a190025356..dade2b4bbe5521699da7ad163c8141f70def822b 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-17  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>  (tiny change)
+
+       * starttls.el (starttls-extra-arguments): Doc fix.
+
 2012-10-09  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * shr.el (shr-insert): \r is also not inserted, so don't try to delete

diff --git a/lisp/gnus/starttls.el b/lisp/gnus/starttls.el
index 2d40365053355a1aede65b63d86a08ce6d1c12c8..346e76b2ccc1b283ac454209d92f6b5254ce135b 100644 (file)
--- a/lisp/gnus/starttls.el
+++ b/lisp/gnus/starttls.el
@@ -149,7 +149,7 @@ These apply when the `starttls' command is used, i.e. when
   :group 'starttls)
 
 (defcustom starttls-extra-arguments nil
-  "Extra arguments to `starttls-program'.
+  "Extra arguments to `starttls-gnutls-program'.
 These apply when GnuTLS is used, i.e. when `starttls-use-gnutls' is non-nil.
 
 For example, non-TLS compliant servers may require