diff options
| author | Glenn Morris | 2011-06-25 11:13:14 -0700 |
|---|---|---|
| committer | Glenn Morris | 2011-06-25 11:13:14 -0700 |
| commit | 3794a2d3a43433c27f65c902bfdc21479d7d309f (patch) | |
| tree | 3cf8f1eb3a16df8d42dde32b47d806aeb88e5a77 /lib-src | |
| parent | 74f53697495eeb2caaa73d100d19591c0ee7bfaf (diff) | |
| download | emacs-3794a2d3a43433c27f65c902bfdc21479d7d309f.tar.gz emacs-3794a2d3a43433c27f65c902bfdc21479d7d309f.zip | |
Minor additions for previous emacsclient change.
* lib-src/emacsclient.c (decode_options) <opt>: Add `F:'.
(print_help_and_exit): Mention --frame-parameters.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 5 | ||||
| -rw-r--r-- | lib-src/emacsclient.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 99ec98d62b0..b7a95fe8043 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-06-25 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * emacsclient.c (decode_options) <opt>: Add `F:'. | ||
| 4 | (print_help_and_exit): Mention --frame-parameters. | ||
| 5 | |||
| 1 | 2011-06-25 Andreas Rottmann <a.rottmann@gmx.at> | 6 | 2011-06-25 Andreas Rottmann <a.rottmann@gmx.at> |
| 2 | 7 | ||
| 3 | * emacsclient.c (longopts, decode_options, main): Add frame-parameters. | 8 | * emacsclient.c (longopts, decode_options, main): Add frame-parameters. |
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 56535a02990..2daed7eb9da 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c | |||
| @@ -531,9 +531,9 @@ decode_options (int argc, char **argv) | |||
| 531 | { | 531 | { |
| 532 | int opt = getopt_long_only (argc, argv, | 532 | int opt = getopt_long_only (argc, argv, |
| 533 | #ifndef NO_SOCKETS_IN_FILE_SYSTEM | 533 | #ifndef NO_SOCKETS_IN_FILE_SYSTEM |
| 534 | "VHneqa:s:f:d:tc", | 534 | "VHneqa:s:f:d:F:tc", |
| 535 | #else | 535 | #else |
| 536 | "VHneqa:f:d:tc", | 536 | "VHneqa:f:d:F:tc", |
| 537 | #endif | 537 | #endif |
| 538 | longopts, 0); | 538 | longopts, 0); |
| 539 | 539 | ||
| @@ -674,6 +674,7 @@ The following OPTIONS are accepted:\n\ | |||
| 674 | -nw, -t, --tty Open a new Emacs frame on the current terminal\n\ | 674 | -nw, -t, --tty Open a new Emacs frame on the current terminal\n\ |
| 675 | -c, --create-frame Create a new frame instead of trying to\n\ | 675 | -c, --create-frame Create a new frame instead of trying to\n\ |
| 676 | use the current Emacs frame\n\ | 676 | use the current Emacs frame\n\ |
| 677 | -F, --frame-parameters Set the parameters of a new frame\n\ | ||
| 677 | -e, --eval Evaluate the FILE arguments as ELisp expressions\n\ | 678 | -e, --eval Evaluate the FILE arguments as ELisp expressions\n\ |
| 678 | -n, --no-wait Don't wait for the server to return\n\ | 679 | -n, --no-wait Don't wait for the server to return\n\ |
| 679 | -q, --quiet Don't display messages on success\n\ | 680 | -q, --quiet Don't display messages on success\n\ |