From 6a05cd6a5cfc889e93d47f56be8c74c647208b01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= <larsbj@gullik.org>
Date: Tue, 11 Oct 2005 17:58:38 +0000
Subject: [PATCH] couple of mac updates from Bennet Helm

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10539 a592a061-630c-0410-9148-cb99ea01b6c8
---
 development/ChangeLog                               | 5 +++++
 development/MacOSX/LyX.app/Contents/MacOS/lyxeditor | 5 +++--
 lib/ChangeLog                                       | 5 +++++
 lib/bind/mac.bind                                   | 2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/development/ChangeLog b/development/ChangeLog
index ea41b227b9..db6937f104 100644
--- a/development/ChangeLog
+++ b/development/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-11  Bennet Helm  <bennet.helm@fandm.edu>
+
+	* MacOSX/LyX.app/Contents/MacOS/lyxeditor: Use the new location of
+	the users directory 
+
 2005-10-11  Lars Gullik Bjonnes  <larsbj@localhost.localdomain>
 
 	* Makefile.am (EXTRA_DIST): also dist MacOSX
diff --git a/development/MacOSX/LyX.app/Contents/MacOS/lyxeditor b/development/MacOSX/LyX.app/Contents/MacOS/lyxeditor
index 04d765b3e5..e5f31da0bf 100755
--- a/development/MacOSX/LyX.app/Contents/MacOS/lyxeditor
+++ b/development/MacOSX/LyX.app/Contents/MacOS/lyxeditor
@@ -1,11 +1,12 @@
 #!/bin/sh
 # ron@18james.com, 11 Dec 2003
+# With modifications by Bennett Helm
 
-lyxpipe=/Users/$USER/.lyx/.lyxpipe
+lyxpipe=/Users/$USER/Library/Application\ Support/LyX/.lyxpipe
 if  [ ! -p $lyxpipe.out ]
   then
     lyxprefs=`expr "$0" : '\(.*\)MacOS/lyxeditor'`Resources/lyx/preferences
-    lyxpipe=`perl -n -e 'print,exit if s/^.serverpipe\\s+\"(.+)\"/$1/;' ~/.lyx/preferences $lyxprefs`
+    lyxpipe=`perl -n -e 'print,exit if s/^.serverpipe\\s+\"(.+)\"/$1/;' ~/Library/Application\ Support/LyX/preferences $lyxprefs`
 fi
 [ -p $lyxpipe.in ] || exit 0
 file=`echo "$1" | sed 's|^/private||'`
diff --git a/lib/ChangeLog b/lib/ChangeLog
index f25240044c..7a1b02d39f 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-11  Bennet Helm  <bennet.helm@fandm.edu>
+
+	* bind/mac.bind: change default keybinding for protected spaces
+	from C-space to M-space
+
 2005-10-03  Michael Gerz  <michael.gerz@teststep.org>
 
 	* generate_contributions.py:
diff --git a/lib/bind/mac.bind b/lib/bind/mac.bind
index e367c35d4b..4e5858f5f7 100644
--- a/lib/bind/mac.bind
+++ b/lib/bind/mac.bind
@@ -170,7 +170,7 @@
 \bind "M-Return"		"break-paragraph-keep-layout"
 \bind "C-Return"		"break-line"
 \bind "C-k"			"line-delete-forward"
-\bind "C-space"			"space-insert protected"
+\bind "M-space"			"space-insert protected"
 \bind "C-M-space"			"space-insert normal"
 \bind "S-M-space"			"space-insert thin"
 \bind "C-period"		"end-of-sentence-period-insert"