aboutsummaryrefslogtreecommitdiffstats
path: root/src/xselect.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/xselect.c')
-rw-r--r--src/xselect.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/xselect.c b/src/xselect.c
index d90d056e960..0e8a43717e0 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -2159,10 +2159,9 @@ x_clipboard_manager_save (Lisp_Object frame)
2159static Lisp_Object 2159static Lisp_Object
2160x_clipboard_manager_error_1 (Lisp_Object err) 2160x_clipboard_manager_error_1 (Lisp_Object err)
2161{ 2161{
2162 Fmessage (2, ((Lisp_Object []) 2162 AUTO_STRING (format, "X clipboard manager error: %s\n\
2163 { SCOPED_STRING ("X clipboard manager error: %s\n\ 2163If the problem persists, set `x-select-enable-clipboard-manager' to nil.");
2164If the problem persists, set `x-select-enable-clipboard-manager' to nil."), 2164 Fmessage (2, (Lisp_Object []) {format, CAR (CDR (err))});
2165 CAR (CDR (err)) }));
2166 return Qnil; 2165 return Qnil;
2167} 2166}
2168 2167
@@ -2229,9 +2228,8 @@ x_clipboard_manager_save_all (void)
2229 local_frame = XCAR (XCDR (XCDR (XCDR (local_selection)))); 2228 local_frame = XCAR (XCDR (XCDR (XCDR (local_selection))));
2230 if (FRAME_LIVE_P (XFRAME (local_frame))) 2229 if (FRAME_LIVE_P (XFRAME (local_frame)))
2231 { 2230 {
2232 Fmessage (1, ((Lisp_Object []) 2231 AUTO_STRING (saving, "Saving clipboard to X clipboard manager...");
2233 { SCOPED_STRING 2232 Fmessage (1, &saving);
2234 ("Saving clipboard to X clipboard manager...") }));
2235 internal_condition_case_1 (x_clipboard_manager_save, local_frame, 2233 internal_condition_case_1 (x_clipboard_manager_save, local_frame,
2236 Qt, x_clipboard_manager_error_2); 2234 Qt, x_clipboard_manager_error_2);
2237 } 2235 }