Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 300-313)

   - Update from CVS
   - Update from CVS: lispref/display.texi (Forcing Redisplay): Fix typo.
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 105-106)

   - Update from CVS

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

4 files changed, 10 insertions, 194 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 557d8a2d492..040f155221f 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,12 @@
+2006-06-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * yow.c: Remove file.
+
+        * makefile.w32-in ($(BLD)/yow.$(O)): Remove target.
+
+        * Makefile.in (UTILITIES): Remove yow${EXEEXT}.
+        yow${EXEEXT}: Remove target.
+
 2006-06-04  Masatake YAMATO  <jet@gyve.org>
 
         * ebrowse.c (main): Exit with EXIT_FAILURE if BROWSE file
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 85a7c13c95a..4eb1658ac0a 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -107,7 +107,7 @@ INSTALLABLE_SCRIPTS = rcs-checkin grep-changelog
 # Things that Emacs runs internally, or during the build process,
 #  which should not be installed in bindir.
 UTILITIES=  profile${EXEEXT} digest-doc${EXEEXT} sorted-doc${EXEEXT} movemail${EXEEXT} cvtmail${EXEEXT} fakemail${EXEEXT} \
-            yow${EXEEXT} hexl${EXEEXT} update-game-score${EXEEXT}
+            hexl${EXEEXT} update-game-score${EXEEXT}
 
 DONT_INSTALL= test-distrib${EXEEXT} make-docfile${EXEEXT}
 
@@ -449,9 +449,6 @@ cvtmail${EXEEXT}: ${srcdir}/cvtmail.c
 fakemail${EXEEXT}: ${srcdir}/fakemail.c ../src/config.h
         $(CC) ${ALL_CFLAGS} ${srcdir}/fakemail.c $(LOADLIBES) -o fakemail
 
-yow${EXEEXT}: ${srcdir}/yow.c ../src/epaths.h
-        $(CC) ${ALL_CFLAGS} ${srcdir}/yow.c $(LOADLIBES) -o yow
-
 emacsclient${EXEEXT}: ${srcdir}/emacsclient.c ../src/config.h $(GETOPTDEPS)
         $(CC) ${ALL_CFLAGS} ${srcdir}/emacsclient.c $(GETOPTOBJS)  \
            -DVERSION="\"${version}\"" \
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index f941e862514..564487a5858 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -120,7 +120,6 @@ $(BLD)/ctags.$(O): ctags.c
 #
 # don't know what to do with these yet...
 #
-# $(BLD)/yow.exe:               $(BLD)/yow.$(O)
 # $(BLD)/emacstool.exe:         $(BLD)/emacstool.$(O)
 # $(BLD)/server.exe:            $(BLD)/server.$(O)
 # $(BLD)/cvtmail.exe:           $(BLD)/cvtmail.$(O)
@@ -458,7 +457,3 @@ $(BLD)/timer.$(O) : \
         $(EMACS_ROOT)/src/s/ms-w32.h \
         $(EMACS_ROOT)/src/m/intel386.h \
         $(EMACS_ROOT)/lib-src/../src/config.h
-
-$(BLD)/yow.$(O) : \
-        $(SRC)/yow.c \
-        $(EMACS_ROOT)/lib-src/../src/paths.h
diff --git a/lib-src/yow.c b/lib-src/yow.c
deleted file mode 100644
index 18f0f7b2e13..00000000000
--- a/lib-src/yow.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * yow.c
- *
- * Print a quotation from Zippy the Pinhead.
- * Qux <Kaufman-David@Yale> March 6, 1986
- *
- * This file is in the public domain because the author published it
- * with no copyright notice before the US signed the Bern Convention.
- *
- * With dynamic memory allocation.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <ctype.h>
-#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include "epaths.h"             /* For PATH_DATA.  */
-
-#define BUFSIZE  80
-#define SEP      '\0'
-
-#ifndef YOW_FILE
-#define YOW_FILE "yow.lines"
-#endif
-
-#ifdef MSDOS
-#define rootrelativepath(rel) \
-({\
-    static char res[BUFSIZE], *p;\
-    strcpy (res, argv[0]);\
-    p = res + strlen (res);\
-    while (p != res && *p != '/' && *p != '\\' && *p != ':') p--;\
-    strcpy (p + 1, "../");\
-    strcpy (p + 4, rel);\
-    &res;})
-#endif
-
-void yow();
-void setup_yow();
-
-int
-main (argc, argv)
-     int argc;
-     char *argv[];
-{
-  FILE *fp;
-  char file[BUFSIZ];
-
-  if (argc > 2 && !strcmp (argv[1], "-f"))
-    strcpy (file, argv[2]);
-  else
-#ifdef vms
-    sprintf (file, "%s%s", PATH_DATA, YOW_FILE);
-#else
-    sprintf (file, "%s/%s", PATH_DATA, YOW_FILE);
-#endif
-
-  if ((fp = fopen(file, "r")) == NULL) {
-    fprintf(stderr, "yow: ");
-    perror(file);
-    exit(EXIT_FAILURE);
-  }
-
-  /* initialize random seed */
-  srand((int) (getpid() + time((time_t *) 0)));
-
-  setup_yow(fp);
-  yow(fp);
-  fclose(fp);
-  return EXIT_SUCCESS;
-}
-
-static long len = -1;
-static long header_len;
-
-#define AVG_LEN 40              /* average length of a quotation */
-
-/* Sets len and header_len */
-void
-setup_yow(fp)
-     FILE *fp;
-{
-  int c;
-
-  /* Get length of file */
-  /* Because the header (stuff before the first SEP) can be very long,
-   * thus biasing our search in favor of the first quotation in the file,
-   * we explicitly skip that. */
-  while ((c = getc(fp)) != SEP) {
-    if (c == EOF) {
-      fprintf(stderr, "yow: file contains no separators\n");
-      exit(EXIT_FAILURE);
-    }
-  }
-  header_len = ftell(fp);
-  if (header_len > AVG_LEN)
-    header_len -= AVG_LEN;      /* allow the first quotation to appear */
-
-  if (fseek(fp, 0L, 2) == -1) {
-    perror("yow");
-    exit(EXIT_FAILURE);
-  }
-  len = ftell(fp) - header_len;
-}
-
-
-/* go to a random place in the file and print the quotation there */
-void
-yow (fp)
-     FILE *fp;
-{
-  long offset;
-  int c, i = 0;
-  char *buf;
-  unsigned int bufsize;
-
-  offset = rand() % len + header_len;
-  if (fseek(fp, offset, 0) == -1) {
-    perror("yow");
-    exit(EXIT_FAILURE);
-  }
-
-  /* Read until SEP, read next line, print it.
-     (Note that we will never print anything before the first separator.)
-     If we hit EOF looking for the first SEP, just recurse. */
-  while ((c = getc(fp)) != SEP)
-    if (c == EOF) {
-      yow(fp);
-      return;
-    }
-
-  /* Skip leading whitespace, then read in a quotation.
-     If we hit EOF before we find a non-whitespace char, recurse. */
-  while (isspace(c = getc(fp)))
-    ;
-  if (c == EOF) {
-    yow(fp);
-    return;
-  }
-
-  bufsize = BUFSIZE;
-  buf = (char *) malloc(bufsize);
-  if (buf == (char *)0) {
-    fprintf(stderr, "yow: virtual memory exhausted\n");
-    exit (EXIT_FAILURE);
-  }
-
-  buf[i++] = c;
-  while ((c = getc(fp)) != SEP && c != EOF) {
-    buf[i++] = c;
-
-    if (i == bufsize-1) {
-      /* Yow! Is this quotation too long yet? */
-      bufsize *= 2;
-      buf = (char *) realloc(buf, bufsize);
-      if (buf == (char *)0) {
-        fprintf(stderr, "yow: virtual memory exhausted\n");
-        exit (EXIT_FAILURE);
-      }
-    }
-  }
-  buf[i++] = 0;
-  printf("%s\n", buf);
-  free (buf);
-}
-
-/* arch-tag: e40fc0df-bafb-4001-af24-5c883d1c685e
-   (do not change this comment) */
-
-/* yow.c ends here */