Minor additions for previous emacsclient change.

* lib-src/emacsclient.c (decode_options) <opt>: Add `F:'.
(print_help_and_exit): Mention --frame-parameters.

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 99ec98d62b0fc369ca759746dfc9e8bcbc089e22..b7a95fe8043e750c56cab397454b5515848da053 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-25  Glenn Morris  <rgm@gnu.org>
+
+       * emacsclient.c (decode_options) <opt>: Add `F:'.
+       (print_help_and_exit): Mention --frame-parameters.
+
 2011-06-25  Andreas Rottmann  <a.rottmann@gmx.at>
 
        * emacsclient.c (longopts, decode_options, main): Add frame-parameters.

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 56535a02990d3d1e879183dbda34575574b62e37..2daed7eb9da14683c855e217d83eb96c462929bd 100644 (file)
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -531,9 +531,9 @@ decode_options (int argc, char **argv)
     {
       int opt = getopt_long_only (argc, argv,
 #ifndef NO_SOCKETS_IN_FILE_SYSTEM
-                            "VHneqa:s:f:d:tc",
+                            "VHneqa:s:f:d:F:tc",
 #else
-                            "VHneqa:f:d:tc",
+                            "VHneqa:f:d:F:tc",
 #endif
                             longopts, 0);
 
@@ -674,6 +674,7 @@ The following OPTIONS are accepted:\n\
 -nw, -t, --tty                 Open a new Emacs frame on the current terminal\n\
 -c, --create-frame     Create a new frame instead of trying to\n\
                        use the current Emacs frame\n\
+-F, --frame-parameters Set the parameters of a new frame\n\
 -e, --eval             Evaluate the FILE arguments as ELisp expressions\n\
 -n, --no-wait          Don't wait for the server to return\n\
 -q, --quiet            Don't display messages on success\n\