(calc-arithmetic-menu): Add item for `calc-symclip'.

[gnu-emacs] / lib-src / emacsclient.c

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 5e6db54a90221a2664400e1d3eae50ab99eb76a2..e818f2f920225b86b41bf0768d8aa2490c5e12be 100644 (file)
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -396,7 +396,7 @@ void
 w32_set_user_model_id ()
 {
   HMODULE shell;
-  HRESULT (WINAPI * set_user_model) (PWCSTR);
+  HRESULT (WINAPI * set_user_model) (wchar_t * id);
 
   /* On Windows 7 and later, we need to set the user model ID
      to associate emacsclient launched files with Emacs frames
@@ -670,7 +670,7 @@ The following OPTIONS are accepted:\n\
                        mode and try connecting again\n"
 #endif /* not WINDOWSNT */
 "\n\
-Report bugs to bug-gnu-emacs@gnu.org.\n", progname);
+Report bugs with M-x report-emacs-bug.\n", progname);
   exit (EXIT_SUCCESS);
 }