merge upstream + stray par fix

6 files changed, 89 insertions, 31 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ef85ffab8a4..791233439bb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2011-08-01  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (display-buffer-in-window): Don't set dedicated status
+        of window here (Bug#9215).
+        (display-buffer-pop-up-window, display-buffer-pop-up-frame)
+        (display-buffer-pop-up-side-window)
+        (display-buffer-in-side-window): Set dedicated status of window
+        here.
+
+2011-08-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/package.el (package-generate-autoloads): Load autoloads
+        before binding generated-autoload-file.
+
 2011-08-01  Deniz Dogan  <deniz@dogan.se>
 
         * net/rcirc.el (rcirc-handler-333): Clarify docstring.
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index e42103a7a01..19e8375966b 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -570,11 +570,11 @@ EXTRA-PROPERTIES is currently unused."
   file)
 
 (defun package-generate-autoloads (name pkg-dir)
+  (require 'autoload)         ;Load before we let-bind generated-autoload-file!
   (let* ((auto-name (concat name "-autoloads.el"))
          (ignore-name (concat name "-pkg.el"))
          (generated-autoload-file (expand-file-name auto-name pkg-dir))
          (version-control 'never))
-    (require 'autoload)
     (unless (fboundp 'autoload-ensure-default-file)
       (package-autoload-ensure-default-file generated-autoload-file))
     (update-directory-autoloads pkg-dir)))
diff --git a/lisp/window.el b/lisp/window.el
index 905db8dc9b6..215dbab7849 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -4715,15 +4715,12 @@ documentation of `display-buffer-alist' for a description."
   (setq window (window-normalize-live-window window))
   (let* ((old-frame (selected-frame))
          (new-frame (window-frame window))
-         (dedicate (cdr (assq 'dedicate specifiers)))
          (no-other-window (cdr (assq 'no-other-window specifiers))))
     ;; Show BUFFER in WINDOW.
     (unless (eq buffer (window-buffer window))
       ;; If we show another buffer in WINDOW, undedicate it first.
       (set-window-dedicated-p window nil))
     (set-window-buffer window buffer)
-    (when dedicate
-      (set-window-dedicated-p window dedicate))
     (when no-other-window
       (set-window-parameter window 'no-other-window t))
     (unless (or (eq old-frame new-frame)
@@ -4965,7 +4962,7 @@ Return the new window, nil if it could not be created."
         (selected-window (selected-window))
         root new new-parent)
 
-      ;; We are in an atomic window.
+    ;; We are in an atomic window.
     (when (and (window-parameter window 'window-atom) (not nest))
       ;; Split the root window.
       (setq window (window-atom-root window)))
@@ -5059,6 +5056,10 @@ description."
               (setq display-buffer-window (cons window 'new-window))
               ;; Install BUFFER in the new window.
               (display-buffer-in-window buffer window specifiers)
+              (let ((dedicate (cdr (assq 'dedicate specifiers))))
+                (when dedicate
+                  ;; Dedicate window to buffer.
+                  (set-window-dedicated-p window dedicate)))
               ;; Adjust sizes if asked for (for `fit-window-to-buffer'
               ;; and friends BUFFER must be already shown in the new
               ;; window).
@@ -5094,7 +5095,12 @@ documentation of `display-buffer-alist' for a description."
           (set-window-parameter
            window 'quit-restore (list 'new-frame buffer selected-window))
           (setq display-buffer-window (cons window 'new-frame))
-          (display-buffer-in-window buffer window specifiers))))))
+          (display-buffer-in-window buffer window specifiers)
+          (let ((dedicate (cdr (assq 'dedicate specifiers))))
+            (when dedicate
+              ;; Dedicate window to buffer.
+              (set-window-dedicated-p window dedicate)))
+          window)))))
 
 (defun display-buffer-pop-up-side-window (buffer side slot &optional specifiers)
   "Display BUFFER in a new window on SIDE of the selected frame.
@@ -5142,6 +5148,10 @@ failed."
       (setq display-buffer-window (cons window 'new-window))
       ;; Install BUFFER in new window.
       (display-buffer-in-window buffer window specifiers)
+      (let ((dedicate (cdr (assq 'dedicate specifiers))))
+        (when dedicate
+          ;; Dedicate window to buffer.
+          (set-window-dedicated-p window dedicate)))
       ;; Adjust sizes of new window if asked for.
       (display-buffer-set-height window specifiers)
       (display-buffer-set-width window specifiers)
@@ -5282,6 +5292,10 @@ SPECIFIERS must be a list of buffer display specifiers."
           (set-window-parameter window 'window-slot slot))
         ;; Install BUFFER in the window.
         (display-buffer-in-window buffer window specifiers)
+        (let ((dedicate (cdr (assq 'dedicate specifiers))))
+          (when dedicate
+            ;; Dedicate window to buffer.
+            (set-window-dedicated-p window dedicate)))
         (when new-window
           ;; Adjust sizes if asked for (for `fit-window-to-buffer' and
           ;; friends BUFFER must be already shown in the new window).
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index 5ca8fb58d69..0c6208f59ec 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -5,7 +5,7 @@
 
 ;;TODO model after make-text-button instead!
 (defun xwidget-insert (pos type title width height)
- "Insert an xwidget at POS, given ID, TYPE, TITLE WIDTH and HEIGHT.
+  "Insert an xwidget at POS, given ID, TYPE, TITLE WIDTH and HEIGHT.
 Return ID
 
 see xwidget.c for types suitable for TYPE.
@@ -71,6 +71,17 @@ defaults to the string looking like a url around the cursor position."
       (xwidget-webkit-goto-url url))))
 
 
+;;shims for adapting image mode code to the webkit browser window
+(defun xwidget-image-display-size  (spec &optional pixels frame)
+  (let ((xwi (xwidget-info  (xwidget-at 1))))
+    (cons (aref xwi 2)
+          (aref xwi 3))))
+
+(defmacro xwidget-image-mode-navigation-adaptor (fn)
+  `(lambda () (interactive)
+     (flet ((image-display-size (spec &optional pixels frame) (xwidget-image-display-size spec)))
+       (funcall ,fn))))
+
 
 ;;todo.
 ;; - check that the webkit support is compiled in
@@ -84,8 +95,8 @@ defaults to the string looking like a url around the cursor position."
     (define-key map [xwidget-event] 'xwidget-webkit-event-handler)
 
     ;;similar to image mode bindings
-    (define-key map (kbd "SPC")       'image-scroll-up)
-    (define-key map (kbd "DEL")       'image-scroll-down)
+    (define-key map (kbd "SPC")       (xwidget-image-mode-navigation-adaptor   'image-scroll-up))
+    (define-key map (kbd "DEL")       (xwidget-image-mode-navigation-adaptor   'image-scroll-down))
     
     (define-key map [remap forward-char]       (xwidget-image-mode-navigation-adaptor  'image-forward-hscroll))
     (define-key map [remap backward-char]       (xwidget-image-mode-navigation-adaptor  'image-backward-hscroll))
@@ -109,16 +120,6 @@ defaults to the string looking like a url around the cursor position."
   
   "Keymap for `xwidget-webkit-mode'.")
 
-(defun xwidget-image-display-size  (spec &optional pixels frame)
-  (let ((xwi (xwidget-info  (xwidget-at 1))))
-    (cons (aref xwi 2)
-          (aref xwi 3))))
-
-(defmacro xwidget-image-mode-navigation-adaptor (fn)
-  `(lambda () (interactive)
-     (flet ((image-display-size (spec &optional pixels frame) (xwidget-image-display-size spec)))
-       (funcall ,fn))))
-  )
 
 (defun xwidget-webkit-event-handler ()
   (interactive)
diff --git a/src/ChangeLog b/src/ChangeLog
index 623ccc6f4be..4e8217cdf5f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2011-08-01  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (forward_to_next_line_start): Accept additional argument
+        BIDI_IT_PREV, and store into it the state of the bidi iterator had
+        on the newline.
+        (reseat_at_next_visible_line_start): Use the bidi iterator state
+        returned by forward_to_next_line_start to restore the state of
+        it->bidi_it after backing up to previous newline.  (Bug#9212)
+
 2011-07-30  Andreas Schwab  <schwab@linux-m68k.org>
 
         * regex.c (re_comp): Protoize.
diff --git a/src/xdisp.c b/src/xdisp.c
index 14541eb9df0..22d353b840b 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -904,7 +904,7 @@ static void init_to_row_start (struct it *, struct window *,
 static int init_to_row_end (struct it *, struct window *,
                             struct glyph_row *);
 static void back_to_previous_line_start (struct it *);
-static int forward_to_next_line_start (struct it *, int *);
+static int forward_to_next_line_start (struct it *, int *, struct bidi_it *);
 static struct text_pos string_pos_nchars_ahead (struct text_pos,
                                                 Lisp_Object, EMACS_INT);
 static struct text_pos string_pos (EMACS_INT, Lisp_Object);
@@ -5529,6 +5529,9 @@ back_to_previous_line_start (struct it *it)
    continuously over the text).  Otherwise, don't change the value
    of *SKIPPED_P.
 
+   If BIDI_IT_PREV is non-NULL, store into it the state of the bidi
+   iterator on the newline, if it was found.
+
    Newlines may come from buffer text, overlay strings, or strings
    displayed via the `display' property.  That's the reason we can't
    simply use find_next_newline_no_quit.
@@ -5541,7 +5544,8 @@ back_to_previous_line_start (struct it *it)
    leads to wrong cursor motion.  */
 
 static int
-forward_to_next_line_start (struct it *it, int *skipped_p)
+forward_to_next_line_start (struct it *it, int *skipped_p,
+                            struct bidi_it *bidi_it_prev)
 {
   EMACS_INT old_selective;
   int newline_found_p, n;
@@ -5553,6 +5557,8 @@ forward_to_next_line_start (struct it *it, int *skipped_p)
       && it->c == '\n'
       && CHARPOS (it->position) == IT_CHARPOS (*it))
     {
+      if (it->bidi_p && bidi_it_prev)
+        *bidi_it_prev = it->bidi_it;
       set_iterator_to_next (it, 0);
       it->c = 0;
       return 1;
@@ -5574,6 +5580,8 @@ forward_to_next_line_start (struct it *it, int *skipped_p)
       if (!get_next_display_element (it))
         return 0;
       newline_found_p = it->what == IT_CHARACTER && it->c == '\n';
+      if (newline_found_p && it->bidi_p && bidi_it_prev)
+        *bidi_it_prev = it->bidi_it;
       set_iterator_to_next (it, 0);
     }
 
@@ -5608,6 +5616,8 @@ forward_to_next_line_start (struct it *it, int *skipped_p)
                  && !newline_found_p)
             {
               newline_found_p = ITERATOR_AT_END_OF_LINE_P (it);
+              if (newline_found_p && it->bidi_p && bidi_it_prev)
+                *bidi_it_prev = it->bidi_it;
               set_iterator_to_next (it, 0);
             }
         }
@@ -5731,8 +5741,9 @@ static void
 reseat_at_next_visible_line_start (struct it *it, int on_newline_p)
 {
   int newline_found_p, skipped_p = 0;
+  struct bidi_it bidi_it_prev;
 
-  newline_found_p = forward_to_next_line_start (it, &skipped_p);
+  newline_found_p = forward_to_next_line_start (it, &skipped_p, &bidi_it_prev);
 
   /* Skip over lines that are invisible because they are indented
      more than the value of IT->selective.  */
@@ -5743,7 +5754,8 @@ reseat_at_next_visible_line_start (struct it *it, int on_newline_p)
       {
         xassert (IT_BYTEPOS (*it) == BEGV
                  || FETCH_BYTE (IT_BYTEPOS (*it) - 1) == '\n');
-        newline_found_p = forward_to_next_line_start (it, &skipped_p);
+        newline_found_p =
+          forward_to_next_line_start (it, &skipped_p, &bidi_it_prev);
       }
 
   /* Position on the newline if that's what's requested.  */
@@ -5759,11 +5771,14 @@ reseat_at_next_visible_line_start (struct it *it, int on_newline_p)
                   --IT_STRING_BYTEPOS (*it);
                 }
               else
-                /* Setting this flag will cause
-                   bidi_move_to_visually_next not to advance, but
-                   instead deliver the current character (newline),
-                   which is what the ON_NEWLINE_P flag wants.  */
-                it->bidi_it.first_elt = 1;
+                {
+                  /* We need to restore the bidi iterator to the state
+                     it had on the newline, and resync the IT's
+                     position with that.  */
+                  it->bidi_it = bidi_it_prev;
+                  IT_STRING_CHARPOS (*it) = it->bidi_it.charpos;
+                  IT_STRING_BYTEPOS (*it) = it->bidi_it.bytepos;
+                }
             }
         }
       else if (IT_CHARPOS (*it) > BEGV)
@@ -5773,9 +5788,14 @@ reseat_at_next_visible_line_start (struct it *it, int on_newline_p)
               --IT_CHARPOS (*it);
               --IT_BYTEPOS (*it);
             }
-          /* With bidi iteration, the call to `reseat' will cause
-             bidi_move_to_visually_next deliver the current character,
-             the newline, instead of advancing.  */
+          else
+            {
+              /* We need to restore the bidi iterator to the state it
+                 had on the newline and resync IT with that.  */
+              it->bidi_it = bidi_it_prev;
+              IT_CHARPOS (*it) = it->bidi_it.charpos;
+              IT_BYTEPOS (*it) = it->bidi_it.bytepos;
+            }
           reseat (it, it->current.pos, 0);
         }
     }