From 3544c17936f16b69e16c4b9fdca0c00fe7a4d667 Mon Sep 17 00:00:00 2001
From: Per Cederqvist <ceder@lysator.liu.se>
Date: Tue, 31 Dec 2013 22:06:37 +0100
Subject: [PATCH] Use utf-8 in menus on Mac.

* menus.el (lyskom-menu-encoding-rules): Use utf-8 if window-system is
eq to 'ns.  This fixes a crash on MacOS X 10.9.  It might possibly
cause issues on older MacOS X releases and/or GNUstep.  If so, please
report the issue!
---
 src/ChangeLog | 8 ++++++++
 src/menus.el  | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/src/ChangeLog b/src/ChangeLog
index 505e9ecd..f6df2cf8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2013-12-31  Per Cederqvist  <ceder@lysator.liu.se>
+
+	Use utf-8 in menus on Mac.
+	* menus.el (lyskom-menu-encoding-rules): Use utf-8 if
+	window-system is eq to 'ns.  This fixes a crash on MacOS X 10.9.
+	It might possibly cause issues on older MacOS X releases and/or
+	GNUstep.  If so, please report the issue!
+
 2013-05-11  Per Cederqvist  <cederp@opera.com>
 
 	* <all files>: Removed $Id$ and lyskom-clientversion-long.
diff --git a/src/menus.el b/src/menus.el
index 5a270915..5b65056c 100644
--- a/src/menus.el
+++ b/src/menus.el
@@ -457,6 +457,9 @@
 	 ((boundp 'gtk-version-string) '((title . utf-8)
 					(item . utf-8)
 					(keys . utf-8)))
+	 ((eq window-system 'ns) '((title . utf-8)
+				   (item . utf-8)
+				   (keys . utf-8)))
 	 ((eq window-system 'mac) '((title . mac-roman)
 				    (item . nil)
 				    (keys . nil)))
-- 
GitLab