Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1d0f8a7..55fc1a7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,11 @@
+2002-10-11  Jesper harder  <harder@ifa.au.dk>
+
+       * gnus-spec.el (gnus-balloon-face-function): Use the help-echo
+       text property in Emacs.
+
 2002-10-11  Simon Josefsson  <jas@extundo.com>
 
-       * mml2015.el (mml2015-pgg-decrypt, mml2015-pgg-clear-decrypt) 
+       * mml2015.el (mml2015-pgg-decrypt, mml2015-pgg-clear-decrypt)
        (mml2015-pgg-verify, mml2015-pgg-clear-verify): Remove CR.
 
        * mml1991.el (mml1991-pgg-sign): Remove CR.
@@ -15,11 +20,12 @@
        (mml2015-gpg-extract-signature-details): Use it.
 
 2002-10-10  Ted Zlatanov <tzz@lifelogs.com>
-        * spam.el: compilation fixes, spam-check-bbdb function is nil if no
-        BBDB installed
-    
-        * spam-stat.el: added code from Alex Schroeder <alex@gnu.org> to do
-        statistical analysis of spam in Lisp only
+
+       * spam.el: compilation fixes, spam-check-bbdb function is nil if no
+       BBDB installed
+
+       * spam-stat.el: added code from Alex Schroeder <alex@gnu.org> to do
+       statistical analysis of spam in Lisp only
 
 2002-10-10  Simon Josefsson  <jas@extundo.com>
 
@@ -154,7 +160,7 @@
        (pgg-scheme-snarf-keys-region): Use pgg-temporary-file-directory.
 
        * pgg-parse.el (pgg-char-int): Defalias.
-       (pgg-format-key-identifier, pgg-byte-after, pgg-read-byte) 
+       (pgg-format-key-identifier, pgg-byte-after, pgg-read-byte)
        (pgg-read-bytes, pgg-read-body): Use it.
        (pgg-decode-packets): Don't use MEL, use base64-*.
        (pgg-parse-armor): Don't assume set-buffer-multibyte exists.

diff --git a/lisp/gnus-spec.el b/lisp/gnus-spec.el
index eec204e..5468cb7 100644 (file)
--- a/lisp/gnus-spec.el
+++ b/lisp/gnus-spec.el
@@ -289,7 +289,9 @@
 (defun gnus-balloon-face-function (form type)
   `(gnus-put-text-property
     (point) (progn ,@form (point))
-    'balloon-help
+    ,(if (fboundp 'balloon-help-mode)
+        ''balloon-help
+       ''help-echo)
     ,(intern (format "gnus-balloon-face-%d" type))))
 
 (defun gnus-spec-tab (column)

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 93ed1a0..0beab05 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-11  Jesper harder  <harder@ifa.au.dk>
+
+       * gnus.texi (Formatting Fonts): Fix for balloon help in GNU Emacs.
+
 2002-10-11  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus.texi (Delayed Articles): Fix gnus-delay-initialize.
@@ -287,7 +291,7 @@
 2002-05-01  Lars Magne Ingebrigtsen  <larsi@quimbies.gnus.org>
 
        * message.texi (Message Headers): Remove colon from index
-       entries. 
+       entries.
 
 2002-05-01  Simon Josefsson  <jas@extundo.com>
 

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 5f89c1b..761d80f 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -19017,14 +19017,14 @@ gnus \e$B$O4X?t\e(B @code{gnus-user-format-function-}@samp{foo} \e$B$r8F$S=P$7$^$9!
 \e$B$9\e(B---@samp{hello} \e$B$,\e(B @code{gnus-mouse-face-3} \e$B$G%^%&%9!]%O%$%i%$%H$5$l$k\e(B
 \e$B$?$a$K$O!"\e(B@samp{%3(hello%)} \e$B$H$9$k;v$,$G$-$^$9!#\e(B
 
-@samp{%<} \e$B$H\e(B @samp{%>} \e$B;X<(;R$N4V$N%F%-%9%H$OFCJL\e(B
+@samp{%<<} \e$B$H\e(B @samp{%>>} \e$B;X<(;R$N4V$N%F%-%9%H$OFCJL\e(B
 \e$B$J\e(B @code{balloon-help} \e$B%W%m%Q%F%#$,\e(B @code{gnus-balloon-face-0} \e$B$K@_Dj$5\e(B
-\e$B$l$^$9!#\e(B@samp{%1<} \e$B$H$9$k$H!"\e(B@code{gnus-balloon-face-1} \e$B$rF@$F!"B>$bF1MM\e(B
-\e$B$G$9!#\e(B@code{gnus-balloon-face-*} \e$BJQ?t$OJ8;zNs$+J8;zNs$rJV$94X?t$r;X$9%7\e(B
-\e$B%s%\%k$N$I$A$i$+$G$"$kI,MW$,$"$j$^$9!#\e(B@code{balloon-help-mode} \e$B$G$O!"%^\e(B
-\e$B%&%9$,%W%m%Q%F%#$N@_Dj$5$l$F$$$k%F%-%9%H$N>e$rDL2a$9$k$H!"%P%k!<%s%&%#%s\e(B
-\e$B%I%&$,8=$l$F!"J8;zNs$rI=<($7$^$9!#$3$l$N>\$7$$>pJs\e(B
-\e$B$O\e(B @code{balloon-help-mode} \e$B$N@bL@J8;zNs$r;2>H$7$F$/$@$5$$!#\e(B
+\e$B$l$^$9!#\e(B@samp{%1<<} \e$B$H$9$k$H!"\e(B@code{gnus-balloon-face-1} \e$B$rF@$F!"B>$bF1\e(B
+\e$BMM$G$9!#\e(B@code{gnus-balloon-face-*} \e$BJQ?t$OJ8;zNs$+J8;zNs$rJV$94X?t$r;X$9\e(B
+\e$B%7%s%\%k$N$I$A$i$+$G$"$kI,MW$,$"$j$^$9!#%^%&%9$,%W%m%Q%F%#$N@_Dj$5$l$F$$\e(B
+\e$B$k%F%-%9%H$N>e$rDL2a$9$k$H!"%P%k!<%s%&%#%s%I%&$,8=$l$F!"J8;zNs$rI=<($7$^\e(B
+\e$B$9!#$3$l$N>\$7$$>pJs$O\e(B @ref{(emacs)Help Echo} (GNU Emacs) \e$B$^$?\e(B
+\e$B$O\e(B @code{balloon-help-mode} (XEmacs) \e$B$N@bL@J8;zNs$r;2>H$7$F$/$@$5$$!#\e(B
 
 \e$B$3$l$O%0%k!<%W%P%C%U%!$NBeBX<jK!$G$9\e(B:
 

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 5181bfe..81c6a9e 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -19414,14 +19414,15 @@ and so on.  Create as many faces as you wish.  The same goes for the
 @code{mouse-face} specs---you can say @samp{%3(hello%)} to have
 @samp{hello} mouse-highlighted with @code{gnus-mouse-face-3}.
 
-Text inside the @samp{%<} and @samp{%>} specifiers will get the special
-@code{balloon-help} property set to @code{gnus-balloon-face-0}.  If you
-say @samp{%1<}, you'll get @code{gnus-balloon-face-1} and so on.  The
-@code{gnus-balloon-face-*} variables should be either strings or symbols
-naming functions that return a string.  Under @code{balloon-help-mode},
-when the mouse passes over text with this property set, a balloon window
-will appear and display the string.  Please refer to the doc string of
-@code{balloon-help-mode} for more information on this.
+Text inside the @samp{%<<} and @samp{%>>} specifiers will get the
+special @code{balloon-help} property set to @code{gnus-balloon-face-0}.
+If you say @samp{%1<<}, you'll get @code{gnus-balloon-face-1} and so on.
+The @code{gnus-balloon-face-*} variables should be either strings or
+symbols naming functions that return a string.  When the mouse passes
+over text with this property set, a balloon window will appear and
+display the string.  Please refer to @ref{(emacs)Help Echo} (in GNU
+Emacs) or the doc string of @code{balloon-help-mode} (in XEmacs) for
+more information on this.
 
 Here's an alternative recipe for the group buffer: