[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit 50039e4c12992a738eeb625a8ffa7a67477a66e9
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 29 16:38:26 2004 +0000

            Made menu shortcuts work again when editing HTML
    
            Reviewed by Darin.
    
            * khtml/xml/dom_elementimpl.cpp:
            (ElementImpl::defaultEventHandler):
            Don't treat key events with command key down as
            editing events.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6269 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 0be6293..4701421 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2004-03-29  John Sullivan  <sullivan at apple.com>
+
+        Made menu shortcuts work again when editing HTML
+
+        Reviewed by Darin.
+
+        * khtml/xml/dom_elementimpl.cpp:
+        (ElementImpl::defaultEventHandler):
+        Don't treat key events with command key down as
+        editing events.
+
 2004-03-28  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebCore/khtml/xml/dom_elementimpl.cpp b/WebCore/khtml/xml/dom_elementimpl.cpp
index d4cbfbd..d80708c 100644
--- a/WebCore/khtml/xml/dom_elementimpl.cpp
+++ b/WebCore/khtml/xml/dom_elementimpl.cpp
@@ -377,7 +377,8 @@ void ElementImpl::defaultEventHandler(EventImpl *evt)
 #if APPLE_CHANGES
     if (evt->id() == EventImpl::KEYPRESS_EVENT && isContentEditable()) {
         KHTMLPart *part = getDocument()->part();
-        if (part) {
+        // Don't treat command-key combos as editing key events
+        if (part && !static_cast<KeyboardEventImpl*>(evt)->metaKey()) {
             KWQ(part)->editingKeyEvent();
             evt->setDefaultHandled();
         }

-- 
WebKit Debian packaging