[Python-modules-commits] r20400 - in packages/qscintilla2/trunk/debian (2 files)

[kitterman at users.alioth.debian.org]

    Date: Saturday, February 11, 2012 @ 06:21:38
  Author: kitterman
Revision: 20400

Add new files for the last commit.

Added:
  packages/qscintilla2/trunk/debian/libqscintilla2-doc.links
  packages/qscintilla2/trunk/debian/patches/snapshot-keys.patch

Added: packages/qscintilla2/trunk/debian/libqscintilla2-doc.links
===================================================================
--- packages/qscintilla2/trunk/debian/libqscintilla2-doc.links	                        (rev 0)
+++ packages/qscintilla2/trunk/debian/libqscintilla2-doc.links	2012-02-11 06:21:38 UTC (rev 20400)
@@ -0,0 +1 @@
+/usr/share/javascript/jquery/jquery.min.js usr/share/doc/html-Qt4/jquery.js

Added: packages/qscintilla2/trunk/debian/patches/snapshot-keys.patch
===================================================================
--- packages/qscintilla2/trunk/debian/patches/snapshot-keys.patch	                        (rev 0)
+++ packages/qscintilla2/trunk/debian/patches/snapshot-keys.patch	2012-02-11 06:21:38 UTC (rev 20400)
@@ -0,0 +1,21 @@
+Cherrypick from upstream snapshot
+Index: qscintilla2-2.6/Qt4/qsciscintilla.cpp
+===================================================================
+--- qscintilla2-2.6.orig/Qt4/qsciscintilla.cpp	2011-11-11 14:02:16.000000000 +0100
++++ qscintilla2-2.6/Qt4/qsciscintilla.cpp	2012-02-09 20:29:01.223115096 +0100
+@@ -4037,15 +4039,6 @@
+ 
+         if (ke->key())
+         {
+-            // We want any of the standard context menu shortcuts.
+-            if (ke == QKeySequence::Undo || ke == QKeySequence::Redo ||
+-                ke == QKeySequence::Cut || ke == QKeySequence::Copy ||
+-                ke == QKeySequence::Paste || ke == QKeySequence::SelectAll)
+-            {
+-                ke->accept();
+-                return true;
+-            }
+-
+             // We want ordinary characters.
+             if ((ke->modifiers() == Qt::NoModifier || ke->modifiers() == Qt::ShiftModifier || ke->modifiers() == Qt::KeypadModifier) && ke->key() < Qt::Key_Escape)
+             {