Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 899-900)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 129-130)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 259-260)

   - Merge from emacs--rel--22
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-272

4 files changed, 33 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c50b6286407..dda5d8e396d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+2007-10-19  Chong Yidong  <cyd@stupidchicken.com>
+
+        * Makefile.in [HAVE_LIBRESOLV]: Add -lresolv to linker flags.
+
+2007-10-19  Richard Stallman  <rms@gnu.org>
+
+        * doc.c (Fdocumentation): Check for and handle an advised function.
+
+2007-10-19  Juanma Barranquero  <lekktu@gmail.com>
+
+        * process.c (Fset_process_filter): Doc fix.
+
 2007-10-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * keyboard.c (read_key_sequence): Undo a change introduced by multi-tty
diff --git a/src/Makefile.in b/src/Makefile.in
index 6fce595a9ec..1ff7ce30339 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -460,6 +460,13 @@ LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM
 #define LIBGPM
 #endif /* not HAVE_GPM */
 
+#if HAVE_LIBRESOLV
+#ifndef LIBRESOLV
+#define LIBRESOLV -lresolv
+#endif /* not defined LIBRESOLV */
+#else /* not HAVE_LIBRESOLV */
+#define LIBRESOLV
+#endif /* not HAVE_LIBRESOLV */
 
 LIBSOUND= @LIBSOUND@
 CFLAGS_SOUND= @CFLAGS_SOUND@
@@ -943,7 +950,7 @@ SOME_MACHINE_LISP = ${dotdot}/lisp/mouse.elc \
    duplicated symbols.  If the standard libraries were compiled
    with GCC, we might need gnulib again after them.  */
 LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) $(RSVG_LIBS) LIBGPM \
-   LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \
+   LIBRESOLV LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \
    LIBS_DEBUG $(GETLOADAVG_LIBS) \
    @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ \
    $(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR)
diff --git a/src/doc.c b/src/doc.c
index f491661a616..c4af523baac 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -434,6 +434,18 @@ string is passed through `substitute-command-keys'.  */)
             doc = tem;
           else
             return Qnil;
+
+          /* Check for an advised function.  Its doc string
+             has an `ad-advice-info' text property.  */
+          if (STRINGP (doc))
+            {
+              Lisp_Object innerfunc;
+              innerfunc = Fget_text_property (make_number (0),
+                                              intern ("ad-advice-info"),
+                                              doc);
+              if (! NILP (innerfunc))
+                doc = call1 (intern ("ad-make-advised-docstring"), innerfunc);
+            }
         }
       else if (EQ (funcar, Qmacro))
         return Fdocumentation (Fcdr (fun), raw);
diff --git a/src/process.c b/src/process.c
index 6bcaef63303..fb10bf2cc8b 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1006,7 +1006,7 @@ DEFUN ("process-mark", Fprocess_mark, Sprocess_mark,
 DEFUN ("set-process-filter", Fset_process_filter, Sset_process_filter,
        2, 2, 0,
        doc: /* Give PROCESS the filter function FILTER; nil means no filter.
-t means stop accepting output from the process.
+A value of t means stop accepting output from the process.
 
 When a process has a filter, its buffer is not used for output.
 Instead, each time it does output, the entire string of output is