diff options
| author | Miles Bader | 2006-05-02 05:51:52 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-05-02 05:51:52 +0000 |
| commit | fe682fb2f05fcbd9fcd2d12c2110719adcfcb58a (patch) | |
| tree | 2a89d2d9ea2689cfe80a7618885cdd9f449761dd /lib-src | |
| parent | 7e635d0ed3c42e6e779821f5c0c1c62289f4c1ee (diff) | |
| parent | 6cf93749317c2e18f850cd0f47f905895e850bfc (diff) | |
| download | emacs-fe682fb2f05fcbd9fcd2d12c2110719adcfcb58a.tar.gz emacs-fe682fb2f05fcbd9fcd2d12c2110719adcfcb58a.zip | |
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-58
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 239-258)
- Update from CVS
- (Ffield_beginning, find_field): Undo change of 2006-04-23.
- Rcirc patch from Ryan Yeske
- Merge from gnus--rel--5.10
- Clean up lisp/gnus/ChangeLog a bit
* gnus--rel--5.10 (patch 91-98)
- Merge from emacs--devo--0
- Update from CVS
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 14 | ||||
| -rw-r--r-- | lib-src/etags.c | 1 | ||||
| -rw-r--r-- | lib-src/fakemail.c | 2 | ||||
| -rw-r--r-- | lib-src/movemail.c | 2 | ||||
| -rw-r--r-- | lib-src/sorted-doc.c | 2 | ||||
| -rw-r--r-- | lib-src/yow.c | 1 |
6 files changed, 20 insertions, 2 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index a38c0cb6770..115e43c2d03 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,17 @@ | |||
| 1 | 2006-04-29 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * sorted-doc.c (main): Initialize docs to NULL. | ||
| 4 | |||
| 5 | * yow.c (yow): Free buf. | ||
| 6 | |||
| 7 | * etags.c: Delete c-indentation-style local variable. | ||
| 8 | |||
| 9 | 2006-04-29 Richard Stallman <rms@gnu.org> | ||
| 10 | |||
| 11 | * movemail.c (main): Check for negative value from `read'. | ||
| 12 | |||
| 13 | * fakemail.c (read_header): Give fatal error if input has no header. | ||
| 14 | |||
| 1 | 2006-04-02 Paul Eggert <eggert@cs.ucla.edu> | 15 | 2006-04-02 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 16 | ||
| 3 | * b2m.c (main): Don't include <limits.h>. | 17 | * b2m.c (main): Don't include <limits.h>. |
diff --git a/lib-src/etags.c b/lib-src/etags.c index a073acb92d6..a7c98f090bb 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c | |||
| @@ -6887,7 +6887,6 @@ xrealloc (ptr, size) | |||
| 6887 | 6887 | ||
| 6888 | /* | 6888 | /* |
| 6889 | * Local Variables: | 6889 | * Local Variables: |
| 6890 | * c-indentation-style: gnu | ||
| 6891 | * indent-tabs-mode: t | 6890 | * indent-tabs-mode: t |
| 6892 | * tab-width: 8 | 6891 | * tab-width: 8 |
| 6893 | * fill-column: 79 | 6892 | * fill-column: 79 |
diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c index 6b8634f34ab..30d39db533e 100644 --- a/lib-src/fakemail.c +++ b/lib-src/fakemail.c | |||
| @@ -694,6 +694,8 @@ read_header () | |||
| 694 | 694 | ||
| 695 | } while (true); | 695 | } while (true); |
| 696 | 696 | ||
| 697 | if (! the_header) | ||
| 698 | fatal ("input message has no header"); | ||
| 697 | return the_header->next; | 699 | return the_header->next; |
| 698 | } | 700 | } |
| 699 | 701 | ||
diff --git a/lib-src/movemail.c b/lib-src/movemail.c index d3ec1fcd178..1f73ee88ba8 100644 --- a/lib-src/movemail.c +++ b/lib-src/movemail.c | |||
| @@ -466,6 +466,8 @@ main (argc, argv) | |||
| 466 | while (1) | 466 | while (1) |
| 467 | { | 467 | { |
| 468 | nread = read (indesc, buf, sizeof buf); | 468 | nread = read (indesc, buf, sizeof buf); |
| 469 | if (nread < 0) | ||
| 470 | pfatal_with_name (inname); | ||
| 469 | if (nread != write (outdesc, buf, nread)) | 471 | if (nread != write (outdesc, buf, nread)) |
| 470 | { | 472 | { |
| 471 | int saved_errno = errno; | 473 | int saved_errno = errno; |
diff --git a/lib-src/sorted-doc.c b/lib-src/sorted-doc.c index a2416993a1b..0a06aa2c984 100644 --- a/lib-src/sorted-doc.c +++ b/lib-src/sorted-doc.c | |||
| @@ -131,7 +131,7 @@ main () | |||
| 131 | register enum state state = WAITING; /* state at start */ | 131 | register enum state state = WAITING; /* state at start */ |
| 132 | int cnt = 0; /* number of DOCSTRs read */ | 132 | int cnt = 0; /* number of DOCSTRs read */ |
| 133 | 133 | ||
| 134 | DOCSTR *docs; /* chain of allocated DOCSTRS */ | 134 | DOCSTR *docs = NULL; /* chain of allocated DOCSTRS */ |
| 135 | char buf[512]; /* line buffer */ | 135 | char buf[512]; /* line buffer */ |
| 136 | 136 | ||
| 137 | while (1) /* process one char at a time */ | 137 | while (1) /* process one char at a time */ |
diff --git a/lib-src/yow.c b/lib-src/yow.c index 1356ac6db18..18f0f7b2e13 100644 --- a/lib-src/yow.c +++ b/lib-src/yow.c | |||
| @@ -176,6 +176,7 @@ yow (fp) | |||
| 176 | } | 176 | } |
| 177 | buf[i++] = 0; | 177 | buf[i++] = 0; |
| 178 | printf("%s\n", buf); | 178 | printf("%s\n", buf); |
| 179 | free (buf); | ||
| 179 | } | 180 | } |
| 180 | 181 | ||
| 181 | /* arch-tag: e40fc0df-bafb-4001-af24-5c883d1c685e | 182 | /* arch-tag: e40fc0df-bafb-4001-af24-5c883d1c685e |