aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorPaul Eggert2011-06-25 11:31:36 -0700
committerPaul Eggert2011-06-25 11:31:36 -0700
commit948b98fd3c17e56b5fa606eedbe6487091f2b66d (patch)
tree470d98f5aa36d512902da3db4d9f35b3c0fe6f07 /etc
parent7a7ef429182915745380c3074771d9f747dab964 (diff)
parent11fdef7d0cf3ef1ce30d1cd09ca9ca9a2b099d20 (diff)
downloademacs-948b98fd3c17e56b5fa606eedbe6487091f2b66d.tar.gz
emacs-948b98fd3c17e56b5fa606eedbe6487091f2b66d.zip
Merge from trunk.
Diffstat (limited to 'etc')
-rw-r--r--etc/NEWS4
1 files changed, 4 insertions, 0 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 243058a46b2..32e4a0dc11f 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -84,6 +84,10 @@ client frame in parent X window ID, via XEmbed. This works like the
84+++ 84+++
85*** New emacsclient argument -q/--quiet suppresses some status messages. 85*** New emacsclient argument -q/--quiet suppresses some status messages.
86 86
87+++
88*** New emacsclient argument --frame-parameters can be used to set the
89frame parameters of a newly-created graphical frame.
90
87*** If emacsclient shuts down as a result of Emacs signalling an 91*** If emacsclient shuts down as a result of Emacs signalling an
88error, its exit status is 1. 92error, its exit status is 1.
89 93