aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorChong Yidong2011-06-04 17:02:42 -0400
committerChong Yidong2011-06-04 17:02:42 -0400
commit4b80f6746dc824f1ec36a96abe684480ed06e62e (patch)
tree7d00f349f4c2722d315a673aeb4692141d227457 /src/ChangeLog
parent99a33b77e15b9a075024701d060d912b2fd87caf (diff)
downloademacs-4b80f6746dc824f1ec36a96abe684480ed06e62e.tar.gz
emacs-4b80f6746dc824f1ec36a96abe684480ed06e62e.zip
Handle errors when saving to clipboard manager (Bug#8779).
* src/xselect.c (x_clipboard_manager_save): Remove redundant arg. (x_clipboard_manager_save): Add return value. (x_clipboard_manager_error_1, x_clipboard_manager_error_2): New error handlers. (x_clipboard_manager_save_frame, x_clipboard_manager_save_all): Obey Vx_select_enable_clipboard_manager. Catch errors in x_clipboard_manager_save (Bug#8779). (Vx_select_enable_clipboard_manager): New variable.
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2ce41e3b35b..a75fecc3d8e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
12011-06-04 Chong Yidong <cyd@stupidchicken.com>
2
3 * xselect.c (x_clipboard_manager_save): Remove redundant arg.
4 (x_clipboard_manager_save): Add return value.
5 (x_clipboard_manager_error_1, x_clipboard_manager_error_2): New
6 error handlers.
7 (x_clipboard_manager_save_frame, x_clipboard_manager_save_all):
8 Obey Vx_select_enable_clipboard_manager. Catch errors in
9 x_clipboard_manager_save (Bug#8779).
10 (Vx_select_enable_clipboard_manager): New variable.
11
12011-06-04 Dan Nicolaescu <dann@ics.uci.edu> 122011-06-04 Dan Nicolaescu <dann@ics.uci.edu>
2 13
3 * emacs.c (main): Warn when starting a GTK emacs in daemon mode. 14 * emacs.c (main): Warn when starting a GTK emacs in daemon mode.