upstream+selection support

3 files changed, 22 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d8342df4da5..68b48f5047e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2012-03-07  Eli Zaretskii  <eliz@gnu.org>
+
+        * international/quail.el (quail-help): Force
+        bidi-paragraph-direction be left-to-right.  See discussion in
+        http://lists.gnu.org/archive/html/emacs-devel/2012-03/msg00062.html
+        for the reason.
+
 2012-03-07  Michael Albinus  <Michael.Albinus@alcatel-lucent.com>
 
         Avoid superfluous registering of signals.  (Bug#10807)
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index 1dd5e3551c7..48aa013c674 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -2485,6 +2485,11 @@ package to describe."
     ;; the width of the window in which the buffer displayed.
     (with-current-buffer (help-buffer)
       (setq buffer-read-only nil)
+      ;; Without this, a keyboard layout with R2L characters might be
+      ;; displayed reversed, right to left.  See the thread starting at
+      ;; http://lists.gnu.org/archive/html/emacs-devel/2012-03/msg00062.html
+      ;; for a description of one such situation.
+      (setq bidi-paragraph-direction 'left-to-right)
       (insert "Input method: " (quail-name)
               " (mode line indicator:"
               (quail-title)
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index 4329382081c..78bef103d34 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -387,6 +387,16 @@ Argument H height."
 ;; (declare-function xwidget-resize-internal "xwidget.c" )
 ;; check-declare-function?
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defun xwidget-webkit-get-selection ()
+  (xwidget-webkit-execute-script-rv (xwidget-webkit-current-session)
+                                    "window.getSelection().toString();"))
+
+(defun xwidget-webkit-copy-selection-as-kill ()
+  (interactive)
+  (kill-new (xwidget-webkit-get-selection)))
+
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; xwidget plist management(similar to the process plist functions)