diff options
| author | Chong Yidong | 2012-04-20 18:04:19 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-04-20 18:04:19 +0800 |
| commit | de6ff46dce80a715d46c34ff46f01a28afb63db9 (patch) | |
| tree | 2c75ba401e4b3bbc3079eddedac99ffaac083e54 /lisp/ChangeLog | |
| parent | c07a4c0b599e0debfb10acdf02ac6559b998a88a (diff) | |
| download | emacs-de6ff46dce80a715d46c34ff46f01a28afb63db9.tar.gz emacs-de6ff46dce80a715d46c34ff46f01a28afb63db9.zip | |
* lisp/server.el (server-execute): Respect initial-buffer-choice
if it is a string and there are no files to open.
(server-create-window-system-frame, server-create-tty-frame):
Don't switch buffers here.
Fixes: debbugs:2825
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c9cece95445..947ae6f17f6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2012-04-20 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * server.el (server-execute): Respect initial-buffer-choice if it | ||
| 4 | is a string and there are no files to open (Bug#2825). | ||
| 5 | (server-create-window-system-frame, server-create-tty-frame): | ||
| 6 | Don't switch buffers here. | ||
| 7 | |||
| 1 | 2012-04-20 Dan Nicolaescu <dann@gnu.org> | 8 | 2012-04-20 Dan Nicolaescu <dann@gnu.org> |
| 2 | 9 | ||
| 3 | * battery.el (battery-echo-area-format): Display remaining time | 10 | * battery.el (battery-echo-area-format): Display remaining time |