[Emacs-diffs] /srv/bzr/emacs/trunk r110561: Merge from emacs-24; up to r108162

[Glenn Morris]

------------------------------------------------------------
revno: 110561 [merge]
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-10-16 20:44:00 -0700
message:
  Merge from emacs-24; up to r108162
modified:
  doc/lispintro/ChangeLog
  doc/lispintro/emacs-lisp-intro.texi
  lisp/gnus/ChangeLog
  lisp/gnus/starttls.el

=== modified file 'doc/lispintro/ChangeLog'
--- a/doc/lispintro/ChangeLog   2012-08-28 16:01:59 +0000
+++ b/doc/lispintro/ChangeLog   2012-10-17 03:44:00 +0000
@@ -1,3 +1,8 @@
+2012-10-17  Gregor Zattler  <address@hidden>  (tiny change)
+
+       * emacs-lisp-intro.texi (Narrowing advantages):
+       Minor update for changed what-line implementation.  (Bug#12629)
+
 2012-06-21  Glenn Morris  <address@hidden>
 
        * Makefile.in: Rename infodir to buildinfodir throughout.  (Bug#11737)

=== modified file 'doc/lispintro/emacs-lisp-intro.texi'
--- a/doc/lispintro/emacs-lisp-intro.texi       2012-05-29 00:53:40 +0000
+++ b/doc/lispintro/emacs-lisp-intro.texi       2012-10-17 03:44:00 +0000
@@ -6600,8 +6600,8 @@
 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
address@hidden, 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.
 

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-10-09 02:28:34 +0000
+++ b/lisp/gnus/ChangeLog       2012-10-17 03:44:00 +0000
@@ -1,3 +1,7 @@
+2012-10-17  Kazuhiro Ito  <address@hidden>  (tiny change)
+
+       * starttls.el (starttls-extra-arguments): Doc fix.
+
 2012-10-09  Lars Magne Ingebrigtsen  <address@hidden>
 
        * shr.el (shr-insert): \r is also not inserted, so don't try to delete

=== modified file 'lisp/gnus/starttls.el'
--- a/lisp/gnus/starttls.el     2012-01-19 07:21:25 +0000
+++ b/lisp/gnus/starttls.el     2012-10-09 17:55:08 +0000
@@ -149,7 +149,7 @@
   :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