upstream

7 files changed, 91 insertions, 25 deletions

diff --git a/README.xwidget b/README.xwidget
index 01902702033..a1587f2eb76 100644
--- a/README.xwidget
+++ b/README.xwidget
@@ -226,6 +226,9 @@ delete-other-windows-internal
 delete_all_subwindows
 unshow_buffer
 
+Added cleanup those window configuration hook which works in practice
+but feels kludgy.
+
 ** DONE BUG annoying backtrace
    CLOSED: [2011-07-19 Tue 14:28]
 (this no longer seems to happen even under heavy usage. seems merging
@@ -304,7 +307,7 @@ xwidget, but it doesnt currently work very well.
 *** TODO try gtk event creation instead 
 since that works fine in the webkit osr code. 
 but, oh no, that didn't work for some reason.
-the event seems to receive the event but then the embedded widgets
+the widgets seems to receive the event but then the embedded widgets
 hangs.
 
 
@@ -444,7 +447,7 @@ with at the lisp level.
 ** DONE MVC mode for xwidgets
    CLOSED: [2011-06-27 Mon 12:53]
 It appears unfruitful to chase using the same display mode for all
-types of xwidgets. Composition is fun but not robust the way I'm
+types of xwidgets. Composition is fun but not robust the way I
 tried to do it.
 
 Instead there should be a set of MVC xwidgets. Each on-screen instance
@@ -526,7 +529,8 @@ make
 
 
 *** webkit html 5
-expose the DOM to lisp or something
+expose the DOM to lisp or something. The webkit xwidget works pretty
+well now, so this might be the way ahead.
 ** DONE mvc code crashes after a while
    CLOSED: [2011-07-12 Tue 18:52]
 seemingly only when compiling with optimizations.
@@ -944,7 +948,7 @@ crashes taking emacs with it.
 *** TODO webkit downloads
 when clicking a download link in Webkit Emacs should take over and handle it
 from there. Probably need signals. There are Emacs libraries to
-download things, with wget etc.
+download things, with wget etc. an url.el facility should be made.
 "download-requested"
 *** TODO webkit alt-text not handled
 XKCD use image-title to display a cartoon comment. These mysteriously
@@ -956,14 +960,15 @@ have a look at how docview solves it
 webkit_web_view_search_text ()
 *** TODO webkit relative references doesn't work
 probably because we handle scrolling in a non-standard way. It does
-work sort of when theres a html frameset and webkit scrols by itself.
+work sort of when theres a html frameset and webkit scrolls by itself.
+
 *** TODO webkit width adjustment handling issue
 since there are so many levels of clipping and whatnot in xwidgets
 sizing issues are difficult.
 
 - an xwidget is told how large it can be by emacs. thats the end of
   it. if the xwidget thinks otherwise it will be clipped.
-- but emacs can ask the xwudget how large it wants to be. it can then
+- but emacs can ask the xwidget how large it wants to be. it can then
   resize the reserved area and inform the xwidget thusly. 
 
 That should have been enough. but webkit never reports less than what
@@ -983,6 +988,9 @@ and then compare by resizing in Epiphany, which is also webkit based.
     CLOSED: [2011-08-01 Mon 22:38]
 was rather hurried. end result is that the lisp layer only really
 allows for one webkit session.
+*** TODO extract DOM so SHR can render it
+then the SHR html renderer from Gnus could render the DOM as created
+by Webkit.
 *** TODO C-X b in other buffer from webkit
 bafflingly resets the webkit view to the top. Maybe the window
 reconfiguration hook code? further mystification is added because it
@@ -1003,6 +1011,9 @@ can't be reused for xwidget, in particular image-mode.
 Maybe a new image type could be added that was a wraper on an
 xwidget. Then image mode could be reused for webkit mode. 
 
+I tried some adaptor code in xwidget.el so webkit mode now delegates
+to image mode buh its a kludge.
+
 ** socket related
 *** TODO some flickering during redisplay of sockets
 with gtk3 an size allocation workaround is used.
@@ -1029,10 +1040,14 @@ get reaped and a new socket thus created.
 didn't work too well in the inkscape case. it might be that some other
 bitmap copy method works better though.
 
-** TODO synchronise emacs background with xwidget color
-fine-tuning to reduce flicker.
+basically sockets doesn't like to be offscreen because they want their
+own gdk window.
 
+** DONE synchronise emacs background with xwidget color
+   CLOSED: [2011-08-11 Thu 11:04]
+fine-tuning to reduce flicker.
 
+isn't needed if emacs bg erase disabled
 
 ** DONE xwidgets doesn't work during bootstrap all of a sudden
    CLOSED: [2011-08-01 Mon 22:33]
@@ -1046,7 +1061,8 @@ that way it would be possible to merge to trunk in stages.
 so, webkit could be used to display the SVG. the display spec for
 images would be used. multiple webkits would be used rather than
 offscreen rendering, so it would be GTK2 compatible. 
-** TODO xwidget movement doesn't work all of a sudden
+** DONE xwidget movement doesn't work all of a sudden
+   CLOSED: [2011-08-11 Thu 11:03]
 this used to work great. now it doesn't.
 
 suspects:
@@ -1078,6 +1094,26 @@ old behaviour, GLYPH_DEBUG doesn't seem needed.
 ** DONE GLYPH_DEBUG doesn't work
    CLOSED: [2011-08-08 Mon 17:30]
 was stupid accidental line removal that was hard to spot
+** TODO osc xwidget example  
+a couple of xwidget sliders that control a csound/supercollider song with osc.
+so, for that to work we need slider callbacks to work. when a slider
+changes send an osc message. use ocssend:
+
+ oscsend localhost 7777 /sample/address iTfs 1 3.14 hello
+
+or better:
+http://delysid.org/emacs/osc.el
+
+sliders could be defined in csound comments or something to illustrate
+the point. or if real fanciness is desired parse the csound source
+with Semantic and provide a control buffer corresponding to the
+defined controls.
+
+
+
+Added: [2011-08-11 Thu 10:53]
+
+
 * old notes from x_draw_xwidget_glyph_string
 
     BUG it seems this method for some reason is called with bad s->x and s->y sometimes.
diff --git a/etc/NEWS b/etc/NEWS
index 6a1bb6c1c5e..6f8c125f7f9 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1038,6 +1038,12 @@ of function value which looks like (closure ENV ARGS &rest BODY).
 *** New function `special-variable-p' to check whether a variable is
 declared as dynamically bound.
 
+** New function `string-mark-left-to-right' appends a Unicode LRM
+(left-to-right mark) character to a string if it terminates in
+right-to-left script.  This is useful when the buffer has overall
+left-to-right paragraph direction and you need to insert a string
+whose contents (and directionality) are not known in advance.
+
 ** pre/post-command-hook are not reset to nil upon error.
 Instead, the offending function is removed.
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 66874bdb29a..ad300b10f47 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,21 @@
+2011-08-10  Chong Yidong  <cyd@stupidchicken.com>
+
+        * subr.el (string-mark-left-to-right): New function.
+
+        * buff-menu.el (Buffer-menu-buffer+size): Remove LRM argument.
+        Use string-mark-left-to-right.
+        (list-buffers-noselect): Caller changed.
+
+        * emacs-lisp/tabulated-list.el (tabulated-list-print-entry): Use
+        string-mark-left-to-right.
+        (tabulated-list-print): Recenter after moving point.
+
+2011-08-10  Juri Linkov  <juri@jurta.org>
+
+        * progmodes/grep.el (rgrep): Don't bind `process-connection-type'.
+        This finishes incomplete reversion of 2011-06-30T01:09:13Z!larsi@gnus.org
+        intended by 2011-07-06T15:49:19Z!larsi@gnus.org.
+
 2011-08-09  Chong Yidong  <cyd@stupidchicken.com>
 
         * hi-lock.el (hi-lock-unface-buffer): Fix interactive spec
diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index f0a44747378..a5b45921d28 100644
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -666,7 +666,7 @@ For more information, see the function `buffer-menu'."
   ":" ;; (if (char-displayable-p ?…) "…" ":")
   )
 
-(defun Buffer-menu-buffer+size (name size &optional name-props size-props lrm)
+(defun Buffer-menu-buffer+size (name size &optional name-props size-props)
   (if (> (+ (string-width name) (string-width size) 2)
          Buffer-menu-buffer+size-width)
       (setq name
@@ -681,17 +681,9 @@ For more information, see the function `buffer-menu'."
                           (string-width tail)
                           2))
                       Buffer-menu-short-ellipsis
-                      tail
-                      ;; Append an invisible LRM character to the
-                      ;; buffer's name to avoid ugly display with the
-                      ;; buffer size to the left of the name, when the
-                      ;; name begins with R2L character.
-                      (if lrm (propertize (string ?\x200e) 'invisible t) ""))))
+                      (string-mark-left-to-right tail))))
     ;; Don't put properties on (buffer-name).
-    (setq name (concat (copy-sequence name)
-                       (if lrm
-                           (propertize (string ?\x200e) 'invisible t)
-                         ""))))
+    (setq name (string-mark-left-to-right name)))
   (add-text-properties 0 (length name) name-props name)
   (add-text-properties 0 (length size) size-props size)
   (let ((name+space-width (- Buffer-menu-buffer+size-width
@@ -929,8 +921,7 @@ For more information, see the function `buffer-menu'."
                                                    (max (length size) 3)
                                                    2))
                                             name
-                                          "mouse-2: select this buffer"))
-                         nil t))
+                                          "mouse-2: select this buffer"))))
                 "  "
                 (if (> (string-width (nth 4 buffer)) Buffer-menu-mode-width)
                     (truncate-string-to-width (nth 4 buffer)
diff --git a/lisp/emacs-lisp/tabulated-list.el b/lisp/emacs-lisp/tabulated-list.el
index 2fdfa9525b1..9b485b58608 100644
--- a/lisp/emacs-lisp/tabulated-list.el
+++ b/lisp/emacs-lisp/tabulated-list.el
@@ -258,7 +258,8 @@ to the entry with the same ID element as the current line."
     ;; If REMEMBER-POS was specified, move to the "old" location.
     (if saved-pt
         (progn (goto-char saved-pt)
-               (move-to-column saved-col))
+               (move-to-column saved-col)
+               (recenter))
       (goto-char (point-min)))))
 
 (defun tabulated-list-print-entry (id cols)
@@ -282,6 +283,7 @@ of column descriptors."
              (> (length label) width)
              (setq label (concat (substring label 0 (- width 3))
                                  "...")))
+        (setq label (string-mark-left-to-right label))
         (if (stringp desc)
             (insert (propertize label 'help-echo help-echo))
           (apply 'insert-text-button label (cdr desc)))
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 5561575ea20..db8e82193b3 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -1023,8 +1023,7 @@ This command shares argument histories with \\[lgrep] and \\[grep-find]."
                     (read-from-minibuffer "Confirm: "
                                           command nil nil 'grep-find-history))
             (add-to-history 'grep-find-history command))
-          (let ((default-directory dir)
-                (process-connection-type nil))
+          (let ((default-directory dir))
             (compilation-start command 'grep-mode))
           ;; Set default-directory if we started rgrep in the *grep* buffer.
           (if (eq next-error-last-buffer (current-buffer))
diff --git a/lisp/subr.el b/lisp/subr.el
index d57c507a548..a897da1d9ba 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3538,6 +3538,20 @@ If IGNORE-CASE is non-nil, the comparison is done without paying attention
 to case differences."
   (eq t (compare-strings str1 nil nil
                          str2 0 (length str1) ignore-case)))
+
+(defun string-mark-left-to-right (str)
+  "Return a string that can be safely embedded in left-to-right text.
+If STR ends in right-to-left (RTL) script, return a string
+consisting of STR followed by an invisible left-to-right
+mark (LRM) character.  Otherwise, return STR."
+  (unless (stringp str)
+    (signal 'wrong-type-argument (list 'stringp str)))
+  (if (and (> (length str) 0)
+           (eq (get-char-code-property (aref str (1- (length str)))
+                                       'bidi-class)
+               'R))
+      (concat str (propertize (string ?\x200e) 'invisible t))
+    str))
 
 ;;;; invisibility specs