diff options
| author | Stefan Monnier | 2012-03-25 16:37:21 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2012-03-25 16:37:21 -0400 |
| commit | 699c782b7668c44d0fa4446331b0590a6d5dac82 (patch) | |
| tree | 5dcce364741d0761920a3d274b0fc8aba4103d45 /lib-src/hexl.c | |
| parent | 98fb480ee31bf74cf554044f60f21df16566dd7f (diff) | |
| parent | e99a9b8bdccadded1f6fae88ee7a2a93dfd4eacf (diff) | |
| download | emacs-pending.tar.gz emacs-pending.zip | |
Merge from trunkpending
Diffstat (limited to 'lib-src/hexl.c')
| -rw-r--r-- | lib-src/hexl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib-src/hexl.c b/lib-src/hexl.c index 89ea7d9f60c..f8fb11f8218 100644 --- a/lib-src/hexl.c +++ b/lib-src/hexl.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* Convert files for Emacs Hexl mode. | 1 | /* Convert files for Emacs Hexl mode. |
| 2 | Copyright (C) 1989, 2001-2011 Free Software Foundation, Inc. | 2 | Copyright (C) 1989, 2001-2012 Free Software Foundation, Inc. |
| 3 | 3 | ||
| 4 | Author: Keith Gabryelski | 4 | Author: Keith Gabryelski |
| 5 | (according to authors.el) | 5 | (according to authors.el) |
| @@ -48,7 +48,7 @@ int base = DEFAULT_BASE, un_flag = FALSE, iso_flag = FALSE, endian = 1; | |||
| 48 | int group_by = DEFAULT_GROUPING; | 48 | int group_by = DEFAULT_GROUPING; |
| 49 | char *progname; | 49 | char *progname; |
| 50 | 50 | ||
| 51 | void usage(void) NO_RETURN; | 51 | void usage (void) NO_RETURN; |
| 52 | 52 | ||
| 53 | int | 53 | int |
| 54 | main (int argc, char **argv) | 54 | main (int argc, char **argv) |