[ jEdit-devel ] [ jedit-Merge Requests-3572796 ] add a "German Keyboard" keymap that replaces shortcuts that

[SourceForge.net <no...@so...>]

Merge Requests item #3572796, was opened at 2012-09-28 08:50
Message generated for change (Comment added) made by vampire0
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=1235750&aid=3572796&group_id=588

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: None
Group: for 5.0.x
Status: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Björn Kautler (vampire0)
Assigned to: Nobody/Anonymous (nobody)
Summary: add a "German Keyboard" keymap that replaces shortcuts that 

Initial Comment:
r22267

----------------------------------------------------------------------

>Comment By: Björn Kautler (vampire0)
Date: 2012-10-14 15:40

Message:
That was unintentional,
Please also merge r22376, then you get only the intended changes.
Also the changes to German_Keyboard_keys.props of revision r22375 should be
merged with this merge request.

svn merge -c 22267 -c 22376 --accept mine-conflict
https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/trunk

followed by

svn diff -c 22375
https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/trunk/keymaps/German_Keyboard_keys.props
| patch -d keymaps

and then adding the CHANGES.txt entry at the proper place

should give the desired result.

----------------------------------------------------------------------

Comment By: Alan Ezust (ezust)
Date: 2012-10-14 10:50

Message:
There are conflicts in jedit_de.props because it looks like you escaped a
bunch of unicode characters that in props that were otherwise unchanged.



----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=1235750&aid=3572796&group_id=588