Mercurial > emacs
comparison lib-src/emacsclient.c @ 112330:56d3e9c28eb0
Merge from mainline.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Mon, 17 Jan 2011 11:01:01 -0800 |
| parents | 17e0028efc29 ef719132ddfa |
| children |
comparison
equal
deleted
inserted
replaced
| 112329:e36b2f5d36cd | 112330:56d3e9c28eb0 |
|---|---|
| 1800 return (char *) "Unknown error"; | 1800 return (char *) "Unknown error"; |
| 1801 } | 1801 } |
| 1802 | 1802 |
| 1803 #endif /* ! HAVE_STRERROR */ | 1803 #endif /* ! HAVE_STRERROR */ |
| 1804 | 1804 |
| 1805 /* arch-tag: f39bb9c4-73eb-477e-896d-50832e2ca9a7 | |
| 1806 (do not change this comment) */ | |
| 1807 | 1805 |
| 1808 /* emacsclient.c ends here */ | 1806 /* emacsclient.c ends here */ |