mostly upstream

49 files changed, 701 insertions, 359 deletions

diff --git a/ChangeLog b/ChangeLog
index 5b5772f13b4..30f22850d40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-04  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * configure.in (HAVE_PTHREAD): Add check for -lpthread (Bug#9216).
+        (HAVE_GTK_AND_PTHREAD): Remove.
+
 2011-07-28  Alp Aker  <alp.tekin.aker@gmail.com>
 
         * configure.in (HAVE_RSVG): Allow use of -lrsvg-2 for any NextStep
diff --git a/README.xwidget b/README.xwidget
index f457b5cd10e..710c10ed7f3 100644
--- a/README.xwidget
+++ b/README.xwidget
@@ -897,6 +897,9 @@ Debugger entered--Lisp error: (error "Two bases given in one event")
 
 for some reason hapens sometimes with xwidget events.
 
+maybe I need to set the originating window?
+  event.frame_or_window = Qnil; //frame; //how to get the frame here? //TODO i store it in the xwidget now
+
 *** TODO console messages
 http://webkitgtk.org/reference/webkitgtk-webkitwebview.html#WebKitWebView-console-message
 http://getfirebug.com/wiki/index.php/Console_API#console.count.28.5Btitle.5D.29
diff --git a/autogen/Makefile.in b/autogen/Makefile.in
index 3348d3a4c02..5b28ad0808b 100644
--- a/autogen/Makefile.in
+++ b/autogen/Makefile.in
@@ -495,6 +495,7 @@ LIBXT_OTHER = @LIBXT_OTHER@
 LIBX_OTHER = @LIBX_OTHER@
 LIB_GCC = @LIB_GCC@
 LIB_MATH = @LIB_MATH@
+LIB_PTHREAD = @LIB_PTHREAD@
 LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@
 LIB_STANDARD = @LIB_STANDARD@
 LTLIBINTL = @LTLIBINTL@
diff --git a/autogen/config.in b/autogen/config.in
index d4ec03b8343..ca44b80c91e 100644
--- a/autogen/config.in
+++ b/autogen/config.in
@@ -321,9 +321,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the `gtk_adjustment_get_page_size' function. */
 #undef HAVE_GTK_ADJUSTMENT_GET_PAGE_SIZE
 
-/* Define to 1 if you have GTK and pthread (-lpthread). */
-#undef HAVE_GTK_AND_PTHREAD
-
 /* Define to 1 if you have the `gtk_dialog_get_action_area' function. */
 #undef HAVE_GTK_DIALOG_GET_ACTION_AREA
 
@@ -582,6 +579,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the `pstat_getdynamic' function. */
 #undef HAVE_PSTAT_GETDYNAMIC
 
+/* Define to 1 if you have pthread (-lpthread). */
+#undef HAVE_PTHREAD
+
 /* Define to 1 if you have the <pthread.h> header file. */
 #undef HAVE_PTHREAD_H
 
diff --git a/autogen/configure b/autogen/configure
index ca256457459..e0de2f2dc33 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -1115,6 +1115,7 @@ IMAGEMAGICK_LIBS
 IMAGEMAGICK_CFLAGS
 RSVG_LIBS
 RSVG_CFLAGS
+LIB_PTHREAD
 VMLIMIT_OBJ
 GMALLOC_OBJ
 HAVE_XSERVER
@@ -9884,6 +9885,72 @@ if test "x$ac_cv_lib_Xbsd_main" = x""yes; then :
 fi
 
 
+LIB_PTHREAD=
+for ac_header in pthread.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
+if test "x$ac_cv_header_pthread_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PTHREAD_H 1
+_ACEOF
+
+fi
+
+done
+
+if test "$ac_cv_header_pthread_h"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_self in -lpthread" >&5
+$as_echo_n "checking for pthread_self in -lpthread... " >&6; }
+if test "${ac_cv_lib_pthread_pthread_self+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpthread  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_self ();
+int
+main ()
+{
+return pthread_self ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_pthread_pthread_self=yes
+else
+  ac_cv_lib_pthread_pthread_self=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_self" >&5
+$as_echo "$ac_cv_lib_pthread_pthread_self" >&6; }
+if test "x$ac_cv_lib_pthread_pthread_self" = x""yes; then :
+  HAVE_PTHREAD=yes
+fi
+
+fi
+if test "$HAVE_PTHREAD" = yes; then
+  case "${canonical}" in
+    *-hpux*) ;;
+    *) LIB_PTHREAD="-lpthread" ;;
+  esac
+
+$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h
+
+fi
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cma_open in -lpthreads" >&5
 $as_echo_n "checking for cma_open in -lpthreads... " >&6; }
 if test "${ac_cv_lib_pthreads_cma_open+set}" = set; then :
@@ -10709,70 +10776,6 @@ done
 
   fi
 
-        HAVE_GTK_AND_PTHREAD=no
-    for ac_header in pthread.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
-if test "x$ac_cv_header_pthread_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_PTHREAD_H 1
-_ACEOF
-
-fi
-
-done
-
-    if test "$ac_cv_header_pthread_h"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_self in -lpthread" >&5
-$as_echo_n "checking for pthread_self in -lpthread... " >&6; }
-if test "${ac_cv_lib_pthread_pthread_self+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pthread_self ();
-int
-main ()
-{
-return pthread_self ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_pthread_pthread_self=yes
-else
-  ac_cv_lib_pthread_pthread_self=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_self" >&5
-$as_echo "$ac_cv_lib_pthread_pthread_self" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_self" = x""yes; then :
-  HAVE_GTK_AND_PTHREAD=yes
-fi
-
-    fi
-    if test "$HAVE_GTK_AND_PTHREAD" = yes; then
-      case "${canonical}" in
-        *-hpux*) ;;
-        *) GTK_LIBS="$GTK_LIBS -lpthread" ;;
-      esac
-
-$as_echo "#define HAVE_GTK_AND_PTHREAD 1" >>confdefs.h
-
-    fi
 
     for ac_func in gtk_widget_get_window gtk_widget_set_has_window \
                  gtk_dialog_get_action_area gtk_widget_get_sensitive \
diff --git a/configure.in b/configure.in
index 0d0c2c5ea25..b27537ce796 100644
--- a/configure.in
+++ b/configure.in
@@ -1689,6 +1689,21 @@ dnl AC_CHECK_LIB(resolv, gethostbyname)
 dnl FIXME replace main with a function we actually want from this library.
 AC_CHECK_LIB(Xbsd, main, LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -lXbsd")
 
+dnl Check if pthreads is available.
+LIB_PTHREAD=
+AC_CHECK_HEADERS(pthread.h)
+if test "$ac_cv_header_pthread_h"; then
+  AC_CHECK_LIB(pthread, pthread_self, HAVE_PTHREAD=yes)
+fi
+if test "$HAVE_PTHREAD" = yes; then
+  case "${canonical}" in
+    *-hpux*) ;;
+    *) LIB_PTHREAD="-lpthread" ;;
+  esac
+  AC_DEFINE(HAVE_PTHREAD, 1, [Define to 1 if you have pthread (-lpthread).])
+fi
+AC_SUBST([LIB_PTHREAD])
+
 AC_CHECK_LIB(pthreads, cma_open)
 
 ## Note: when using cpp in s/aix4.2.h, this definition depended on
@@ -1945,21 +1960,6 @@ if test "${HAVE_GTK}" = "yes"; then
     AC_CHECK_FUNCS(gtk_file_selection_new)
   fi
 
-  dnl Check if pthreads are available.  Emacs only needs this when using
-  dnl gtk_file_chooser under Gnome.
-    HAVE_GTK_AND_PTHREAD=no
-    AC_CHECK_HEADERS(pthread.h)
-    if test "$ac_cv_header_pthread_h"; then
-      AC_CHECK_LIB(pthread, pthread_self, HAVE_GTK_AND_PTHREAD=yes)
-    fi
-    if test "$HAVE_GTK_AND_PTHREAD" = yes; then
-      case "${canonical}" in
-        *-hpux*) ;;
-        *) GTK_LIBS="$GTK_LIBS -lpthread" ;;
-      esac
-      AC_DEFINE(HAVE_GTK_AND_PTHREAD, 1,
-               [Define to 1 if you have GTK and pthread (-lpthread).])
-    fi
 
   dnl Check for functions introduced in 2.14 and later.
   AC_CHECK_FUNCS(gtk_widget_get_window gtk_widget_set_has_window \
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 967f457f3c4..b677c1aa4ee 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-03  Michael Albinus  <michael.albinus@gmx.de>
+
+        * trampver.texi: Update release number.
+
 2011-07-30  Michael Albinus  <michael.albinus@gmx.de>
 
         Sync with Tramp 2.2.2.
diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index 043217a6c9e..31d3ac0204f 100644
--- a/doc/misc/trampver.texi
+++ b/doc/misc/trampver.texi
@@ -8,7 +8,7 @@
 @c In the Tramp CVS, the version number is auto-frobbed from
 @c configure.ac, so you should edit that file and run
 @c "autoconf && ./configure" to change the version number.
-@set trampver 2.2.2
+@set trampver 2.2.3-pre
 
 @c Other flags from configuration
 @set instprefix /usr/local
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6a4d4b9cc9c..7c1fa3a656b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,35 @@
+2011-08-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/js.el (js--regexp-literal): Accept regexps at the beginning
+        of statements and in a few more cases (bug#9183).
+
+        * emacs-lisp/cl-macs.el (cl--make-usage-var, cl--make-usage-args):
+        New functions.
+        (cl-transform-lambda): Use them (bug#9239).
+
+2011-08-05  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (display-buffer-same-window)
+        (display-buffer-same-frame, display-buffer-other-window)
+        (pop-to-buffer-same-window, pop-to-buffer-same-frame)
+        (pop-to-buffer-other-window)
+        (pop-to-buffer-same-frame-other-window)
+        (pop-to-buffer-other-frame): Make them defuns.
+        (switch-to-buffer): Don't set LABEL argument of pop-to-buffer.
+
+2011-08-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * subr.el (make-composed-keymap): Move from C.  Change calling
+        convention, and improve docstring to bring attention to a subtle point.
+        * minibuffer.el (completing-read-default): Adjust accordingly.
+
+2011-08-03  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-open-connection-setup-interactive-shell)
+        (tramp-open-shell): Use `tramp-shell-quote-argument'.
+
+        * net/trampver.el: Update release number.
+
 2011-08-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * progmodes/sh-script.el (sh-font-lock-paren): Don't mistake "main" for
diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el
index 4b9985380c3..7beb4d4b4cc 100644
--- a/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@ -282,7 +282,7 @@ Not documented
 ;;;;;;  flet progv psetq do-all-symbols do-symbols dotimes dolist
 ;;;;;;  do* do loop return-from return block etypecase typecase ecase
 ;;;;;;  case load-time-value eval-when destructuring-bind function*
-;;;;;;  defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "21df83d6106cb0c3d037e75ad79359dc")
+;;;;;;  defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "0907093f7720996444ededb4edfe8072")
 ;;; Generated autoloads from cl-macs.el
 
 (autoload 'gensym "cl-macs" "\
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 6d242eda3ab..fb19115287c 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -238,6 +238,37 @@ It is a list of elements of the form either:
 
 (declare-function help-add-fundoc-usage "help-fns" (docstring arglist))
 
+(defun cl--make-usage-var (x)
+  "X can be a var or a (destructuring) lambda-list."
+  (cond
+   ((symbolp x) (make-symbol (upcase (symbol-name x))))
+   ((consp x) (cl--make-usage-args x))
+   (t x)))
+
+(defun cl--make-usage-args (arglist)
+  ;; `orig-args' can contain &cl-defs (an internal
+  ;; CL thingy I don't understand), so remove it.
+  (let ((x (memq '&cl-defs arglist)))
+    (when x (setq arglist (delq (car x) (remq (cadr x) arglist)))))
+  (let ((state nil))
+    (mapcar (lambda (x)
+              (cond
+               ((symbolp x)
+                (if (eq ?\& (aref (symbol-name x) 0))
+                    (setq state x)
+                  (make-symbol (upcase (symbol-name x)))))
+               ((not (consp x)) x)
+               ((memq state '(nil &rest)) (cl--make-usage-args x))
+               (t        ;(VAR INITFORM SVAR) or ((KEYWORD VAR) INITFORM SVAR).
+                (list*
+                 (if (and (consp (car x)) (eq state '&key))
+                     (list (caar x) (cl--make-usage-var (nth 1 (car x))))
+                   (cl--make-usage-var (car x)))
+                 (nth 1 x)                          ;INITFORM.
+                 (cl--make-usage-args (nthcdr 2 x)) ;SVAR.
+                 ))))
+            arglist)))
+
 (defun cl-transform-lambda (form bind-block)
   (let* ((args (car form)) (body (cdr form)) (orig-args args)
          (bind-defs nil) (bind-enquote nil)
@@ -282,11 +313,8 @@ It is a list of elements of the form either:
                         (require 'help-fns)
                         (cons (help-add-fundoc-usage
                                (if (stringp (car hdr)) (pop hdr))
-                               ;; orig-args can contain &cl-defs (an internal
-                               ;; CL thingy I don't understand), so remove it.
-                               (let ((x (memq '&cl-defs orig-args)))
-                                 (if (null x) orig-args
-                                   (delq (car x) (remq (cadr x) orig-args)))))
+                               (format "(fn %S)"
+                                       (cl--make-usage-args orig-args)))
                               hdr)))
                     (list (nconc (list 'let* bind-lets)
                                  (nreverse bind-forms) body)))))))
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index e88b5154c76..e13d2d594ca 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,27 @@
+2011-08-05  Andrew Cohen  <cohen@andy.bu.edu>
+
+        * gnus-sum.el (gnus-summary-refer-article): Warp to article. This
+        allows article-referral to work from an nnir group.
+
+2011-08-04  Andrew Cohen  <cohen@andy.bu.edu>
+
+        * gnus.el (registry-ignore): Add nnir groups to the ignore-list.
+
+2011-08-04  Daiki Ueno  <ueno@unixuser.org>
+
+        * mml1991.el (mml1991-epg-find-usable-key)
+        (mml1991-epg-find-usable-secret-key): New function.
+        (mml1991-epg-sign): Check if signing key is usable.
+        (mml1991-epg-encrypt): Check if encrypting key is usable (bug#8955).
+
+2011-08-03  Andrew Cohen  <cohen@andy.bu.edu>
+
+        * nnir.el (nnir-read-server-parm): Add an argument to restrict to
+        server-variables only. This should fix a bug introduced with commit
+        e1889675b7f4adf057833c5513c9374134c4e053.
+        (nnir-run-query): 'nnir-search-engine should not be set from the global
+        environment.
+
 2011-08-02  Andrew Cohen  <cohen@andy.bu.edu>
 
         * nnir.el (nnir-search-thread): Position point on referring article
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index a8cf5e7c427..dda9cb3fbf6 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -9037,6 +9037,7 @@ non-numeric or nil fetch the number specified by the
 (defun gnus-summary-refer-article (message-id)
   "Fetch an article specified by MESSAGE-ID."
   (interactive "sMessage-ID: ")
+  (gnus-warp-to-article)
   (when (and (stringp message-id)
              (not (zerop (length message-id))))
     (setq message-id (gnus-replace-in-string message-id " " ""))
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 7ff90f583cf..cd9b6eeb949 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -1875,7 +1875,7 @@ total number of articles in the group.")
  :variable-default (mapcar
                     (lambda (g) (list g t))
                     '("delayed$" "drafts$" "queue$" "INBOX$"
-                      "^nnmairix:" "archive"))
+                      "^nnmairix:" "^nnir:" "archive"))
  :variable-document
  "*Groups in which the registry should be turned off."
  :variable-group gnus-registry
diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el
index a5d778845c1..ad9f95796fe 100644
--- a/lisp/gnus/mml1991.el
+++ b/lisp/gnus/mml1991.el
@@ -247,6 +247,10 @@ Whether the passphrase is cached at all is controlled by
 (autoload 'epg-context-set-textmode "epg")
 (autoload 'epg-context-set-signers "epg")
 (autoload 'epg-context-set-passphrase-callback "epg")
+(autoload 'epg-key-sub-key-list "epg")
+(autoload 'epg-sub-key-capability "epg")
+(autoload 'epg-sub-key-validity "epg")
+(autoload 'epg-sub-key-fingerprint "epg")
 (autoload 'epg-sign-string "epg")
 (autoload 'epg-encrypt-string "epg")
 (autoload 'epg-configuration "epg-config")
@@ -274,17 +278,59 @@ Whether the passphrase is cached at all is controlled by
               (cons key-id mml1991-epg-secret-key-id-list))
         (copy-sequence passphrase)))))
 
+(defun mml1991-epg-find-usable-key (keys usage)
+  (catch 'found
+    (while keys
+      (let ((pointer (epg-key-sub-key-list (car keys))))
+        (while pointer
+          (if (and (memq usage (epg-sub-key-capability (car pointer)))
+                   (not (memq 'disabled (epg-sub-key-capability (car pointer))))
+                   (not (memq (epg-sub-key-validity (car pointer))
+                              '(revoked expired))))
+              (throw 'found (car keys)))
+          (setq pointer (cdr pointer))))
+      (setq keys (cdr keys)))))
+
+;; XXX: since gpg --list-secret-keys does not return validity of each
+;; key, `mml1991-epg-find-usable-key' defined above is not enough for
+;; secret keys.  The function `mml1991-epg-find-usable-secret-key'
+;; below looks at appropriate public keys to check usability.
+(defun mml1991-epg-find-usable-secret-key (context name usage)
+  (let ((secret-keys (epg-list-keys context name t))
+        secret-key)
+    (while (and (not secret-key) secret-keys)
+      (if (mml1991-epg-find-usable-key
+           (epg-list-keys context (epg-sub-key-fingerprint
+                                   (car (epg-key-sub-key-list
+                                         (car secret-keys)))))
+           usage)
+          (setq secret-key (car secret-keys)
+                secret-keys nil)
+        (setq secret-keys (cdr secret-keys))))
+    secret-key))
+
 (defun mml1991-epg-sign (cont)
   (let ((context (epg-make-context))
-        headers cte signers signature)
+        headers cte signer-key signers signature)
     (if (eq mm-sign-option 'guided)
         (setq signers (epa-select-keys context "Select keys for signing.
 If no one is selected, default secret key is used.  "
                                        mml1991-signers t))
       (if mml1991-signers
-          (setq signers (mapcar (lambda (name)
-                                  (car (epg-list-keys context name t)))
-                                mml1991-signers))))
+          (setq signers (delq nil
+                              (mapcar
+                               (lambda (name)
+                                 (setq signer-key
+                                       (mml1991-epg-find-usable-secret-key
+                                        context name 'sign))
+                                 (unless (or signer-key
+                                             (y-or-n-p
+                                              (format
+                                               "No secret key for %s; skip it? "
+                                               name)))
+                                   (error "No secret key for %s" name))
+                                 signer-key)
+                               mml1991-signers)))))
     (epg-context-set-armor context t)
     (epg-context-set-textmode context t)
     (epg-context-set-signers context signers)
@@ -344,7 +390,11 @@ If no one is selected, default secret key is used.  "
              (split-string
               (message-options-get 'message-recipients)
               "[ \f\t\n\r\v,]+")))
-        cipher signers config)
+        recipient-key signer-key cipher signers config)
+    (when mml1991-encrypt-to-self
+      (unless mml1991-signers
+        (error "mml1991-signers is not set"))
+      (setq recipients (nconc recipients mml1991-signers)))
     ;; We should remove this check if epg-0.0.6 is released.
     (if (and (condition-case nil
                  (require 'epg-config)
@@ -363,26 +413,32 @@ If no one is selected, default secret key is used.  "
 If no one is selected, symmetric encryption will be performed.  "
                                recipients))
       (setq recipients
-            (delq nil (mapcar (lambda (name)
-                                (car (epg-list-keys context name)))
-                              recipients))))
-    (if mml1991-encrypt-to-self
-        (if mml1991-signers
-            (setq recipients
-                  (nconc recipients
-                         (mapcar (lambda (name)
-                                   (car (epg-list-keys context name)))
-                                 mml1991-signers)))
-          (error "mml1991-signers not set")))
+            (delq nil (mapcar
+                       (lambda (name)
+                         (setq recipient-key (mml1991-epg-find-usable-key
+                                              (epg-list-keys context name)
+                                              'encrypt))
+                         (unless (or recipient-key
+                                   (y-or-n-p
+                                    (format "No public key for %s; skip it? "
+                                            name)))
+                           (error "No public key for %s" name))
+                         recipient-key)
+                       recipients)))
+      (unless recipients
+        (error "No recipient specified")))
     (when sign
       (if (eq mm-sign-option 'guided)
           (setq signers (epa-select-keys context "Select keys for signing.
 If no one is selected, default secret key is used.  "
                                          mml1991-signers t))
         (if mml1991-signers
-            (setq signers (mapcar (lambda (name)
-                                    (car (epg-list-keys context name t)))
-                                  mml1991-signers))))
+            (setq signers (delq nil
+                                (mapcar
+                                 (lambda (name)
+                                   (mml1991-epg-find-usable-secret-key
+                                    context name 'sign))
+                                 mml1991-signers)))))
       (epg-context-set-signers context signers))
     (epg-context-set-armor context t)
     (epg-context-set-textmode context t)
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index d35e6560e71..17fc3f3fe81 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -1624,7 +1624,7 @@ actually)."
               (let* ((server (car x))
                      (nnir-search-engine
                       (or (nnir-read-server-parm 'nnir-search-engine
-                                                 server)
+                                                 server t)
                           (cdr (assoc (car
                                        (gnus-server-to-method server))
                                       nnir-method-default-engines))))
@@ -1643,14 +1643,16 @@ actually)."
                   nil)))
             groups))))
 
-(defun nnir-read-server-parm (key server)
-  "Returns the parameter value of key for the given server, where
-server is of form 'backend:name'."
+(defun nnir-read-server-parm (key server &optional not-global)
+  "Returns the parameter value corresponding to `key' for
+`server'. If no server-specific value is found consult the global
+environment unless `not-global' is non-nil."
   (let ((method (gnus-server-to-method server)))
     (cond ((and method (assq key (cddr method)))
-           (nth 1 (assq key (cddr method))))
-          ((boundp key) (symbol-value key))
-          (t nil))))
+           (nth 1 (assq key (cddr method))))
+          ((and (not not-global) (boundp key)) (symbol-value key))
+          (t nil))))
+
 
 (defun nnir-possibly-change-server (server)
   (unless (and server (nnir-server-opened server))
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index b13e6a77d5d..5e034b14fde 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -65,7 +65,9 @@
 
 (defun help-split-fundoc (docstring def)
   "Split a function DOCSTRING into the actual doc and the usage info.
-Return (USAGE . DOC) or nil if there's no usage info.
+Return (USAGE . DOC) or nil if there's no usage info, where USAGE info
+is a string describing the argument list of DEF, such as
+\"(apply FUNCTION &rest ARGUMENTS)\".
 DEF is the function whose usage we're looking for in DOCSTRING."
   ;; Functions can get the calling sequence at the end of the doc string.
   ;; In cases where `function' has been fset to a subr we can't search for
@@ -156,12 +158,7 @@ the same names as used in the original source code, when possible."
 (defun help-make-usage (function arglist)
   (cons (if (symbolp function) function 'anonymous)
         (mapcar (lambda (arg)
-                  (if (not (symbolp arg))
-                      (if (and (consp arg) (symbolp (car arg)))
-                          ;; CL style default values for optional args.
-                          (cons (intern (upcase (symbol-name (car arg))))
-                                (cdr arg))
-                        arg)
+                  (if (not (symbolp arg)) arg
                     (let ((name (symbol-name arg)))
                       (cond
                        ((string-match "\\`&" name) arg)
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index d62b377954d..0a2774de572 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -2754,15 +2754,12 @@ See `completing-read' for the meaning of the arguments."
                      base-keymap
                    ;; Layer minibuffer-local-filename-completion-map
                    ;; on top of the base map.
-                   ;; Use make-composed-keymap so that set-keymap-parent
-                   ;; doesn't modify minibuffer-local-filename-completion-map.
-                   (let ((map (make-composed-keymap
-                               minibuffer-local-filename-completion-map)))
-                     ;; Set base-keymap as the parent, so that nil bindings
-                     ;; in minibuffer-local-filename-completion-map can
-                     ;; override bindings in base-keymap.
-                     (set-keymap-parent map base-keymap)
-                     map)))
+                   (make-composed-keymap
+                    minibuffer-local-filename-completion-map
+                    ;; Set base-keymap as the parent, so that nil bindings
+                    ;; in minibuffer-local-filename-completion-map can
+                    ;; override bindings in base-keymap.
+                    base-keymap)))
          (result (read-from-minibuffer prompt initial-input keymap
                                        nil hist def inherit-input-method)))
     (when (and (equal result "") def)
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 5c497748943..428bd6422d8 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -3640,11 +3640,11 @@ file exists and nonzero exit status otherwise."
       (when extra-args (setq shell (concat shell " " extra-args)))
       (tramp-send-command
        vec (format "exec env ENV='' PROMPT_COMMAND='' PS1=%s PS2='' PS3='' %s"
-                   (shell-quote-argument tramp-end-of-output) shell)
+                   (tramp-shell-quote-argument tramp-end-of-output) shell)
        t))
     ;; Setting prompts.
     (tramp-send-command
-     vec (format "PS1=%s" (shell-quote-argument tramp-end-of-output)) t)
+     vec (format "PS1=%s" (tramp-shell-quote-argument tramp-end-of-output)) t)
     (tramp-send-command vec "PS2=''" t)
     (tramp-send-command vec "PS3=''" t)
     (tramp-send-command vec "PROMPT_COMMAND=''" t)))
@@ -3736,7 +3736,7 @@ process to set up.  VEC specifies the connection."
 
   (tramp-message vec 5 "Setting shell prompt")
   (tramp-send-command
-   vec (format "PS1=%s" (shell-quote-argument tramp-end-of-output)) t)
+   vec (format "PS1=%s" (tramp-shell-quote-argument tramp-end-of-output)) t)
   (tramp-send-command vec "PS2=''" t)
   (tramp-send-command vec "PS3=''" t)
   (tramp-send-command vec "PROMPT_COMMAND=''" t)
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index da51662b216..5492441ac77 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -31,7 +31,7 @@
 ;; should be changed only there.
 
 ;;;###tramp-autoload
-(defconst tramp-version "2.2.2"
+(defconst tramp-version "2.2.3-pre"
   "This version of Tramp.")
 
 ;;;###tramp-autoload
@@ -44,7 +44,7 @@
                       (= emacs-major-version 21)
                       (>= emacs-minor-version 4)))
              "ok"
-           (format "Tramp 2.2.2 is not fit for %s"
+           (format "Tramp 2.2.3-pre is not fit for %s"
                    (when (string-match "^.*$" (emacs-version))
                      (match-string 0 (emacs-version)))))))
   (unless (string-match "\\`ok\\'" x) (error "%s" x)))
diff --git a/lisp/org/ob-awk.el b/lisp/org/ob-awk.el
index 368957c2f9b..fe84b906d79 100644
--- a/lisp/org/ob-awk.el
+++ b/lisp/org/ob-awk.el
@@ -24,8 +24,6 @@
 
 ;;; Commentary:
 
-;;; Commentary:
-
 ;; Babel's awk can use special header argument:
 ;; 
 ;; - :in-file takes a path to a file of data to be processed by awk
diff --git a/lisp/org/ob-lilypond.el b/lisp/org/ob-lilypond.el
index 23f5d511d34..557a898ff1a 100644
--- a/lisp/org/ob-lilypond.el
+++ b/lisp/org/ob-lilypond.el
@@ -1,6 +1,6 @@
 ;;; ob-lilypond.el --- org-babel functions for lilypond evaluation
 
-;; Copyright (C) 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
 
 ;; Author: Martyn Jago
 ;; Keywords: babel language, literate programming
diff --git a/lisp/org/ob-maxima.el b/lisp/org/ob-maxima.el
index 7534065f1f7..9e42017168d 100644
--- a/lisp/org/ob-maxima.el
+++ b/lisp/org/ob-maxima.el
@@ -1,28 +1,27 @@
 ;;; ob-maxima.el --- org-babel functions for maxima evaluation
 
-;; Copyright (c) 2009, 2010, 2011 Eric S Fraga, Eric Schulte
+;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
 
-;; Author: Eric S Fraga, Eric Schulte
+;; Author: Eric S Fraga
+;;         Eric Schulte
 ;; Keywords: literate programming, reproducible research, maxima
 ;; Homepage: http://orgmode.org
 ;; Version: 7.7
 
-;;; License:
+;; This file is part of GNU Emacs.
 
-;; This program is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
-;;
+
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/org/org-pcomplete.el b/lisp/org/org-pcomplete.el
index e34ab38e4e5..9b3e49b5101 100644
--- a/lisp/org/org-pcomplete.el
+++ b/lisp/org/org-pcomplete.el
@@ -1,7 +1,6 @@
 ;;; org-pcomplete.el --- In-buffer completion code
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004-2011  Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;;         John Wiegley <johnw at gnu dot org>
diff --git a/lisp/org/org-special-blocks.el b/lisp/org/org-special-blocks.el
index 4f4d5e8e561..c09b27de895 100644
--- a/lisp/org/org-special-blocks.el
+++ b/lisp/org/org-special-blocks.el
@@ -1,25 +1,23 @@
 ;;; org-special-blocks.el --- Turn blocks into LaTeX envs and HTML divs
 
-;; Copyright (C) 2009 Chris Gray
+;; Copyright (C) 2009, 2011  Free Software Foundation, Inc.
 
 ;; Author: Chris Gray <chrismgray@gmail.com>
 
 ;; This file is part of GNU Emacs.
 
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2, or (at
-;; your option) any later version.
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
-;; This program is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; General Public License for more details.
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program ; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 ;;
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 1bdcb4cfa89..4abbe3b895f 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -1658,15 +1658,19 @@ This performs fontification according to `js--class-styles'."
 ;; below.
 (eval-and-compile
   (defconst js--regexp-literal
-    "[=(,:]\\(?:\\s-\\|\n\\)*\\(/\\)\\(?:\\\\.\\|[^/*\\]\\)\\(?:\\\\.\\|[^/\\]\\)*\\(/\\)"
+    (concat
+     ;; We want to match regular expressions only at the beginning of
+     ;; expressions.
+     ;; FIXME: Should we also allow /regexp/ after infix operators such as +,
+     ;; /, -, *, >, ...?
+     "\\(?:\\`\\|[=([{,:;]\\)\\(?:\\s-\\|\n\\)*"
+     "\\(/\\)\\(?:\\\\.\\|[^/*\\]\\)\\(?:\\\\.\\|[^/\\]\\)*\\(/\\)")
   "Regexp matching a JavaScript regular expression literal.
 Match groups 1 and 2 are the characters forming the beginning and
 end of the literal."))
 
 (defconst js-syntax-propertize-function
   (syntax-propertize-rules
-   ;; We want to match regular expressions only at the beginning of
-   ;; expressions.
    (js--regexp-literal (1 "\"") (2 "\""))))
 
 ;;; Indentation
diff --git a/lisp/subr.el b/lisp/subr.el
index ef19797012a..d57c507a548 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -526,6 +526,20 @@ but optional second arg NODIGITS non-nil treats them like other chars."
           (define-key map (char-to-string loop) 'digit-argument)
           (setq loop (1+ loop))))))
 
+(defun make-composed-keymap (maps &optional parent)
+  "Construct a new keymap composed of MAPS and inheriting from PARENT.
+When looking up a key in the returned map, the key is looked in each
+keymap of MAPS in turn until a binding is found.
+If no binding is found in MAPS, the lookup continues in PARENT, if non-nil.
+As always with keymap inheritance, a nil binding in MAPS overrides
+any corresponding binding in PARENT, but it does not override corresponding
+bindings in other keymaps of MAPS.
+MAPS can be a list of keymaps or a single keymap.
+PARENT if non-nil should be a keymap."
+  `(keymap
+    ,@(if (keymapp maps) (list maps) maps)
+    ,@parent))
+
 (defun define-key-after (keymap key definition &optional after)
   "Add binding in KEYMAP for KEY => DEFINITION, right after AFTER's binding.
 This is like `define-key' except that the binding for KEY is placed
diff --git a/lisp/window.el b/lisp/window.el
index 215dbab7849..7e666af6abf 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5796,7 +5796,7 @@ this list as arguments."
           ;; regardless of graphic-only restrictions.
           (display-buffer-pop-up-frame buffer)))))
 
-(defsubst display-buffer-same-window (&optional buffer-or-name label)
+(defun display-buffer-same-window (&optional buffer-or-name label)
   "Display buffer specified by BUFFER-OR-NAME in the selected window.
 Another window will be used only if the buffer can't be shown in
 the selected window, usually because it is dedicated to another
@@ -5805,7 +5805,7 @@ buffer.  Optional argument BUFFER-OR-NAME and LABEL are as for
   (interactive "BDisplay buffer in same window:\nP")
   (display-buffer buffer-or-name 'same-window label))
 
-(defsubst display-buffer-same-frame (&optional buffer-or-name label)
+(defun display-buffer-same-frame (&optional buffer-or-name label)
   "Display buffer specified by BUFFER-OR-NAME in a window on the same frame.
 Another frame will be used only if there is no other choice.
 Optional argument BUFFER-OR-NAME and LABEL are as for
@@ -5813,7 +5813,7 @@ Optional argument BUFFER-OR-NAME and LABEL are as for
   (interactive "BDisplay buffer on same frame:\nP")
   (display-buffer buffer-or-name 'same-frame label))
 
-(defsubst display-buffer-other-window (&optional buffer-or-name label)
+(defun display-buffer-other-window (&optional buffer-or-name label)
   "Display buffer specified by BUFFER-OR-NAME in another window.
 The selected window will be used only if there is no other
 choice.  Windows on the selected frame are preferred to windows
@@ -5887,7 +5887,7 @@ additional information."
       (select-frame-set-input-focus new-frame norecord))
     buffer))
 
-(defsubst pop-to-buffer-same-window (&optional buffer-or-name norecord label)
+(defun pop-to-buffer-same-window (&optional buffer-or-name norecord label)
   "Pop to buffer specified by BUFFER-OR-NAME in the selected window.
 Another window will be used only if the buffer can't be shown in
 the selected window, usually because it is dedicated to another
@@ -5896,7 +5896,7 @@ as for `pop-to-buffer'."
   (interactive "BPop to buffer in selected window:\nP")
   (pop-to-buffer buffer-or-name 'same-window norecord label))
 
-(defsubst pop-to-buffer-same-frame (&optional buffer-or-name norecord label)
+(defun pop-to-buffer-same-frame (&optional buffer-or-name norecord label)
   "Pop to buffer specified by BUFFER-OR-NAME in a window on the selected frame.
 Another frame will be used only if there is no other choice.
 Optional arguments BUFFER-OR-NAME, NORECORD and LABEL are as for
@@ -5904,7 +5904,7 @@ Optional arguments BUFFER-OR-NAME, NORECORD and LABEL are as for
   (interactive "BPop to buffer on same frame:\nP")
   (pop-to-buffer buffer-or-name 'same-frame norecord label))
 
-(defsubst pop-to-buffer-other-window (&optional buffer-or-name norecord label)
+(defun pop-to-buffer-other-window (&optional buffer-or-name norecord label)
   "Pop to buffer specified by BUFFER-OR-NAME in another window.
 The selected window will be used only if there is no other
 choice.  Windows on the selected frame are preferred to windows
@@ -5913,7 +5913,7 @@ LABEL are as for `pop-to-buffer'."
   (interactive "BPop to buffer in another window:\nP")
   (pop-to-buffer buffer-or-name 'other-window norecord))
 
-(defsubst pop-to-buffer-same-frame-other-window (&optional buffer-or-name norecord label)
+(defun pop-to-buffer-same-frame-other-window (&optional buffer-or-name norecord label)
   "Pop to buffer specified by BUFFER-OR-NAME in another window on the selected frame.
 The selected window or another frame will be used only if there
 is no other choice.  Optional arguments BUFFER-OR-NAME, NORECORD
@@ -5921,7 +5921,7 @@ and LABEL are as for `pop-to-buffer'."
   (interactive "BPop to buffer in another window on same frame:\nP")
   (pop-to-buffer buffer-or-name 'same-frame-other-window norecord label))
 
-(defsubst pop-to-buffer-other-frame (&optional buffer-or-name norecord label)
+(defun pop-to-buffer-other-frame (&optional buffer-or-name norecord label)
   "Pop to buffer specified by BUFFER-OR-NAME on another frame.
 The selected frame will be used only if there's no other choice.
 Optional arguments BUFFER-OR-NAME, NORECORD and LABEL are as for
@@ -5994,8 +5994,7 @@ Return the buffer switched to."
   (let ((buffer (window-normalize-buffer-to-switch-to buffer-or-name)))
     (if (null force-same-window)
         (pop-to-buffer
-         buffer '(same-window (reuse-window-dedicated . weak))
-         norecord 'switch-to-buffer)
+         buffer '(same-window (reuse-window-dedicated . weak)) norecord)
       (cond
        ;; Don't call set-window-buffer if it's not needed since it
        ;; might signal an error (e.g. if the window is dedicated).
@@ -6005,6 +6004,7 @@ Return the buffer switched to."
        ((eq (window-dedicated-p) t)
         (error "Cannot switch buffers in a dedicated window"))
        (t (set-window-buffer nil buffer)))
+
       (unless norecord
         (select-window (selected-window)))
       (set-buffer buffer))))
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index 0a1d22b9224..df6e77b708b 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -82,7 +82,12 @@ defaults to the string looking like a url around the cursor position."
 (defmacro xwidget-image-mode-navigation-adaptor (fn)
   `(lambda () (interactive)
      (flet ((image-display-size (spec) (xwidget-image-display-size spec)))
-       (funcall ,fn))))
+       (funcall ,fn ))))
+
+(defmacro xwidget-image-mode-navigation-adaptor-p (fn)
+  `(lambda (n) (interactive "p")
+     (flet ((image-display-size (spec) (xwidget-image-display-size spec)))
+       (funcall ,fn n))))
 
 
 ;;todo.
@@ -109,12 +114,12 @@ defaults to the string looking like a url around the cursor position."
     (define-key map [remap scroll-down-command]       (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))
-    (define-key map [remap right-char]       (xwidget-image-mode-navigation-adaptor  'image-forward-hscroll))
-    (define-key map [remap left-char]       (xwidget-image-mode-navigation-adaptor  'image-backward-hscroll))
-    (define-key map [remap previous-line]       (xwidget-image-mode-navigation-adaptor  'image-previous-line))
-    (define-key map [remap next-line]       (xwidget-image-mode-navigation-adaptor  'image-next-line))
+    (define-key map [remap forward-char]       (xwidget-image-mode-navigation-adaptor-p  'image-forward-hscroll))
+    (define-key map [remap backward-char]       (xwidget-image-mode-navigation-adaptor-p  'image-backward-hscroll))
+    (define-key map [remap right-char]       (xwidget-image-mode-navigation-adaptor-p  'image-forward-hscroll))
+    (define-key map [remap left-char]       (xwidget-image-mode-navigation-adaptor-p  'image-backward-hscroll))
+    (define-key map [remap previous-line]       (xwidget-image-mode-navigation-adaptor-p  'image-previous-line))
+    (define-key map [remap next-line]       (xwidget-image-mode-navigation-adaptor-p  'image-next-line))
 
 
     (define-key map [remap move-beginning-of-line]       (xwidget-image-mode-navigation-adaptor  'image-bol))
diff --git a/src/ChangeLog b/src/ChangeLog
index 7c043f6d087..039c225c1f6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,77 @@
+2011-08-06  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (set_cursor_from_row): Fix cursor positioning when a
+        display property strides EOL and includes a newline, as in
+        longlines-mode.  (Bug#9254)
+        (move_it_in_display_line_to): Fix vertical-motion in a buffer with
+        word-wrap under bidirectional display.  (Bug#9224)
+
+        * bidi.c (bidi_unshelve_cache): Don't reset the cache if JUST_FREE
+        is non-zero, even if the data buffer is NULL.  Fixes a crash in
+        vertical-motion with longlines-mode.  (Bug#9254)
+
+2011-08-05  Eli Zaretskii  <eliz@gnu.org>
+
+        * bidi.c <bidi_cache_total_alloc>: Now static.
+        (bidi_initialize): Initialize bidi_cache_total_alloc.
+
+        *xdisp.c (display_line): Release buffer allocated for shelved bidi
+        cache.  (Bug#9221)
+
+        * bidi.c (bidi_shelve_cache, bidi_unshelve_cache): Track total
+        amount allocated this far in `bidi_cache_total_alloc'.
+        (bidi_unshelve_cache): Accept an additional argument JUST_FREE; if
+        non-zero, only free the data buffer without restoring the cache
+        contents.  All callers changed.
+
+        * dispextern.h (bidi_unshelve_cache): Update prototype.
+
+        * xdisp.c (SAVE_IT, pos_visible_p, move_it_in_display_line_to)
+        (move_it_in_display_line, move_it_to)
+        (move_it_vertically_backward, move_it_by_lines): Replace the call
+        to xfree to an equivalent call to bidi_unshelve_cache.
+        (move_it_in_display_line_to): Fix logic of returning
+        MOVE_POS_MATCH_OR_ZV in the bidi case.  (Bug#9224)
+
+2011-08-05  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (set_cursor_from_row): Prefer the candidate glyph that
+        came from a string character with a `cursor' property.  (Bug#9229)
+
+2011-08-04  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * Makefile.in (LIB_PTHREAD): New variable.
+        (LIBES): Add LIB_PTHREAD (Bug#9216).
+
+        * alloc.c, emacs.c, gmalloc.c, gtkutil.c, keyboard.c, syssignal.h:
+        Rename HAVE_GTK_AND_PTHREAD to HAVE_PTHREAD (Bug#9216).
+
+2011-08-04  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * regex.c (re_iswctype): Remove some redundant boolean
+        conversions.
+
+2011-08-04  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.c (x_find_topmost_parent): New function.
+        (x_set_frame_alpha): Find topmost parent window with
+        x_find_topmost_parent and set the property there also (bug#9181).
+        (handle_one_xevent): Call x_set_frame_alpha on ReparentNotify.
+
+2011-08-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * callproc.c (Fcall_process): Avoid vfork clobbering
+        the local vars buffer, coding_systems, current_dir.
+
+2011-08-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keymap.c (Fmake_composed_keymap): Move to subr.el.
+
 2011-08-03  Paul Eggert  <eggert@cs.ucla.edu>
 
+        * fontset.c (dump_fontset) [FONTSET_DEBUG]: Declare EXTERNALLY_VISIBLE
+        so that it is not optimized away.
+
         * xdisp.c (compute_display_string_pos): Remove unused local.
 
 2011-08-02  Eli Zaretskii  <eliz@gnu.org>
@@ -16,8 +88,8 @@
         non-zero.
 
         * bidi.c (bidi_fetch_char): Accept an additional argument
-        DISP_PROP_P, and pass it to compute_display_string_pos.  Only
-        handle text covered by a display string if DISP_PROP_P is returned
+        DISP_PROP_P, and pass it to compute_display_string_pos.
+        Only handle text covered by a display string if DISP_PROP_P is returned
         non-zero.  All callers of bidi_fetch_char changed.
 
 2011-08-02  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -363,8 +435,8 @@
 
         * xdisp.c (move_it_in_display_line_to): Record the best matching
         position for TO_CHARPOS while scanning the line, and restore it on
-        exit if none of the characters scanned was an exact match.  Fixes
-        vertical-motion and pos-visible-in-window-p under bidi redisplay
+        exit if none of the characters scanned was an exact match.
+        Fixes vertical-motion and pos-visible-in-window-p under bidi redisplay
         when exact match is impossible due to invisible text, and the
         lines are truncated.
 
@@ -549,8 +621,8 @@
         (reseat_to_string): Initialize bidi_it->string.s and
         bidi_it->string.schars.
         (Fcurrent_bidi_paragraph_direction): Initialize itb.string.s to
-        NULL (avoids a crash in bidi_paragraph_init).  Initialize
-        itb.string.lstring.
+        NULL (avoids a crash in bidi_paragraph_init).
+        Initialize itb.string.lstring.
         (init_iterator): Call bidi_init_it only of a valid
         buffer position was specified.  Initialize paragraph_embedding to
         L2R.
@@ -566,12 +638,12 @@
         (init_iterator, reseat_1, reseat_to_string): Initialize the
         string.bufpos member to 0 (zero, for compatibility with IT_CHARPOS
         when iterating on a string not from display properties).
-        (compute_display_string_pos, compute_display_string_end): Fix
-        calculation of the object to scan.  Fixes an error when using
+        (compute_display_string_pos, compute_display_string_end):
+        Fix calculation of the object to scan.  Fixes an error when using
         arrow keys.
         (next_element_from_buffer): Don't abort when IT_CHARPOS is before
-        base_level_stop; instead, set base_level_stop to BEGV.  Fixes
-        crashes in vertical-motion.
+        base_level_stop; instead, set base_level_stop to BEGV.
+        Fixes crashes in vertical-motion.
         (next_element_from_buffer): Improve commentary for when
         the iterator is before prev_stop.
         (init_iterator): Initialize bidi_p from the default value of
@@ -584,8 +656,8 @@
         (next_element_from_string): Support bidi reordering of Lisp
         strings.
         (handle_stop_backwards): Support Lisp strings as well.
-        (display_string): Support display of R2L glyph rows.  Use
-        IT_STRING_CHARPOS when displaying from a Lisp string.
+        (display_string): Support display of R2L glyph rows.
+        Use IT_STRING_CHARPOS when displaying from a Lisp string.
         (init_iterator): Don't initialize it->bidi_p for strings
         here.
         (reseat_to_string): Initialize it->bidi_p for strings here.
@@ -667,8 +739,8 @@
         displayed in margins.  (Bug#8133) (Bug#8867)
         Return MOVE_POS_MATCH_OR_ZV only if iterator position is past
         TO_CHARPOS.
-        (pos_visible_p): Support positions in bidi-reordered lines.  Save
-        and restore bidi cache.
+        (pos_visible_p): Support positions in bidi-reordered lines.
+        Save and restore bidi cache.
 
         * bidi.c (bidi_level_of_next_char): clen should be EMACS_NT, not int.
         (bidi_paragraph_info): Delete unused struct.
@@ -688,8 +760,8 @@
         `len' according to what STRING_CHAR_AND_LENGTH expects.
         (bidi_paragraph_init, bidi_resolve_explicit_1)
         (bidi_resolve_explicit, bidi_resolve_weak)
-        (bidi_level_of_next_char, bidi_move_to_visually_next): Support
-        iteration over a string.
+        (bidi_level_of_next_char, bidi_move_to_visually_next):
+        Support iteration over a string.
         (bidi_set_sor_type, bidi_resolve_explicit_1)
         (bidi_resolve_explicit, bidi_type_of_next_char): ignore_bn_limit
         can now be zero (for strings); special values 0 and -1 were
@@ -720,20 +792,20 @@
         (bidi_cache_fetch_state, bidi_cache_search)
         (bidi_cache_find_level_change, bidi_cache_ensure_space)
         (bidi_cache_iterator_state, bidi_cache_find)
-        (bidi_find_other_level_edge, bidi_cache_start_stack): All
-        variables related to cache indices are now EMACS_INT.
+        (bidi_find_other_level_edge, bidi_cache_start_stack):
+        All variables related to cache indices are now EMACS_INT.
 
         * dispextern.h (struct bidi_string_data): New structure.
         (struct bidi_it): New member `string'.  Make flag members be 1-bit
         fields, and put them last in the struct.
-        (compute_display_string_pos, compute_display_string_end): Update
-        prototypes.
+        (compute_display_string_pos, compute_display_string_end):
+        Update prototypes.
         (bidi_push_it, bidi_pop_it): Add prototypes.
         (struct iterator_stack_entry): New members bidi_p,
         paragraph_embedding, and from_disp_prop_p.
         (struct it): Member bidi_p is now a bit field 1 bit wide.
-        (bidi_shelve_cache, bidi_unshelve_cache): Declare
-        prototypes.
+        (bidi_shelve_cache, bidi_unshelve_cache):
+        Declare prototypes.
 
         * .gdbinit (xvectype, xvector, xcompiled, xchartable, xboolvector)
         (xpr, xfont, xbacktrace): Use "header.size" when accessing vectors
@@ -1015,7 +1087,7 @@
         (char_table_set_range): Adjuted for the above change.
         (map_sub_char_table): Delete args default_val and parent.  Add arg
         top.  Give decoded values to a Lisp function.
-        (map_char_table): Adjusted for the above change.  Give decoded
+        (map_char_table): Adjust for the above change.  Give decoded
         values to a Lisp function.  Gcpro more variables.
         (uniprop_table_uncompress)
         (uniprop_decode_value_run_length): New functions.
@@ -1032,10 +1104,10 @@
         and Sput_unicode_property_internal. Defvar_lisp
         char-code-property-alist.
 
-        * composite.c (CHAR_COMPOSABLE_P): Adjusted for the change of
+        * composite.c (CHAR_COMPOSABLE_P): Adjust for the change of
         Vunicode_category_table.
 
-        * font.c (font_range): Adjusted for the change of
+        * font.c (font_range): Adjust for the change of
         Vunicode_category_table.
 
 2011-07-07  Dan Nicolaescu  <dann@ics.uci.edu>
@@ -1064,14 +1136,14 @@
         (store_monospaced_changed): Add comment. Call dpyinfo_valid.
         (struct xsettings): Move font inside HAVE_XFT.
         (GSETTINGS_TOOL_BAR_STYLE, GSETTINGS_FONT_NAME): New defines.
-        (GSETTINGS_MONO_FONT): Renamed from SYSTEM_MONO_FONT.
+        (GSETTINGS_MONO_FONT): Rename from SYSTEM_MONO_FONT.
         Move inside HAVE_XFT.
-        (something_changed_gsettingsCB): Renamed from something_changedCB.
+        (something_changed_gsettingsCB): Rename from something_changedCB.
         Check for changes in GSETTINGS_TOOL_BAR_STYLE and GSETTINGS_FONT_NAME
         also.
         (GCONF_TOOL_BAR_STYLE, GCONF_FONT_NAME): New defines.
-        (GCONF_MONO_FONT): Renamed from SYSTEM_MONO_FONT. Move inside HAVE_XFT.
-        (something_changed_gconfCB): Renamed from something_changedCB.
+        (GCONF_MONO_FONT): Rename from SYSTEM_MONO_FONT. Move inside HAVE_XFT.
+        (something_changed_gconfCB): Rename from something_changedCB.
         Check for changes in GCONF_TOOL_BAR_STYLE and GCONF_FONT_NAME also.
         (parse_settings): Move check for font inside HAVE_XFT.
         (read_settings, apply_xft_settings): Add comment.
@@ -1084,8 +1156,8 @@
         (init_gconf): Add comment.  Get values for GCONF_TOOL_BAR_STYLE
         and GCONF_FONT_NAME.  Move check for fonts within HAVE_XFT.
         (xsettings_initialize): Call init_gsettings last.
-        (xsettings_get_system_font, xsettings_get_system_normal_font): Add
-        comment.
+        (xsettings_get_system_font, xsettings_get_system_normal_font):
+        Add comment.
 
 2011-07-05  Paul Eggert  <eggert@cs.ucla.edu>
 
@@ -1268,7 +1340,7 @@
         (syms_of_xsettings): Initialize gsettings_client, gsettings_obj
         to NULL.
 
-        * Makefile.in (SETTINGS_CFLAGS, SETTINGS_LIBS): Renamed from
+        * Makefile.in (SETTINGS_CFLAGS, SETTINGS_LIBS): Rename from
         GCONF_CFLAGS/LIBS.
 
 2011-06-29  Martin Rudalics  <rudalics@gmx.at>
@@ -2015,7 +2087,7 @@
 
         * character.c, coding.c, doprnt.c, editfns.c, eval.c:
         All uses of STRING_BYTES_MAX replaced by STRING_BYTES_BOUND.
-        * lisp.h (STRING_BYTES_BOUND): Renamed from STRING_BYTES_MAX.
+        * lisp.h (STRING_BYTES_BOUND): Rename from STRING_BYTES_MAX.
 
         * character.c (string_escape_byte8): Fix nbytes/nchars typo.
 
@@ -2124,8 +2196,8 @@
         Qclone_number.  Remove external declaration of Qdelete_window.
         (Fbuffer_list): Rewrite doc-string.  Minor restructuring of
         code.
-        (Fget_buffer_create, Fmake_indirect_buffer, Frename_buffer): Run
-        Qbuffer_list_update_hook if allowed.
+        (Fget_buffer_create, Fmake_indirect_buffer, Frename_buffer):
+        Run Qbuffer_list_update_hook if allowed.
         (Fother_buffer): Rewrite doc-string.  Major rewrite for new
         buffer list implementation.
         (other_buffer_safely): New function.
@@ -2136,8 +2208,8 @@
         (record_buffer): Inhibit quitting and rewrite using quittable
         functions.  Run Qbuffer_list_update_hook if allowed.
         (Frecord_buffer, Funrecord_buffer): New functions.
-        (switch_to_buffer_1, Fswitch_to_buffer): Remove.  Move
-        switch-to-buffer to window.el.
+        (switch_to_buffer_1, Fswitch_to_buffer): Remove.
+        Move switch-to-buffer to window.el.
         (bury-buffer): Move to window.el.
         (Vbuffer_list_update_hook): New variable.
 
@@ -2165,8 +2237,8 @@
         (select_window_norecord, select_frame_norecord): Move in front
         of run_window_configuration_change_hook.  Remove now obsolete
         declarations.
-        (Fset_window_buffer): Rewrite doc-string.  Call
-        Qrecord_window_buffer.
+        (Fset_window_buffer): Rewrite doc-string.
+        Call Qrecord_window_buffer.
         (keys_of_window): Move binding for other-window to window.el.
 
 2011-06-11  Chong Yidong  <cyd@stupidchicken.com>
@@ -2248,8 +2320,8 @@
         orig_total_lines.
         (Fdelete_window, delete_window): Remove.  Window deletion is
         handled by window.el.
-        (window_loop): Remove DELETE_OTHER_WINDOWS case.  Replace
-        Fdelete_window calls with calls to Qdelete_window.
+        (window_loop): Remove DELETE_OTHER_WINDOWS case.
+        Replace Fdelete_window calls with calls to Qdelete_window.
         (Fdelete_other_windows): Remove.  Deleting other windows is
         handled by window.el.
         (window_fixed_size_p): Remove.  Fixed-sizeness of windows is
@@ -2272,8 +2344,8 @@
         (grow_mini_window, shrink_mini_window): Implement by calling
         Qresize_root_window_vertically, resize_window_check and
         resize_window_apply.
-        (saved_window, Fset_window_configuration, save_window_save): Do
-        not handle orig_top_line, orig_total_lines, and
+        (saved_window, Fset_window_configuration, save_window_save):
+        Do not handle orig_top_line, orig_total_lines, and
         resize_proportionally.
         (window_min_height, window_min_width): Move to window.el.
         (keys_of_window): Move bindings for delete-other-windows,
@@ -2293,8 +2365,8 @@
         * xdisp.c (init_xdisp): Don't use set_window_height but set
         heights directly.
 
-        * xfns.c (x_set_menu_bar_lines, x_set_tool_bar_lines): Use
-        resize_frame_windows instead of change_window_heights and run
+        * xfns.c (x_set_menu_bar_lines, x_set_tool_bar_lines):
+        Use resize_frame_windows instead of change_window_heights and run
         run_window_configuration_change_hook.
 
         * w32fns.c (x_set_tool_bar_lines): Use resize_frame_windows
@@ -2316,8 +2388,8 @@
         (Frun_window_configuration_change_hook, make_parent_window)
         (resize_window_check, resize_window_apply, Fresize_window_apply)
         (resize_frame_windows, Fsplit_window_internal)
-        (Fdelete_window_internal, Fresize_mini_window_internal): New
-        functions.
+        (Fdelete_window_internal, Fresize_mini_window_internal):
+        New functions.
         (syms_of_window): New variables Vwindow_splits and Vwindow_nest.
 
 2011-06-08  Martin Rudalics  <rudalics@gmx.at>
@@ -2337,8 +2409,8 @@
         (Fwindow_nest, Fset_window_nest, Fwindow_new_total)
         (Fwindow_normal_size, Fwindow_new_normal, Fwindow_prev_buffers)
         (Fset_window_prev_buffers, Fwindow_next_buffers)
-        (Fset_window_next_buffers, Fset_window_clone_number): New
-        functions.
+        (Fset_window_next_buffers, Fset_window_clone_number):
+        New functions.
         (Fwindow_hscroll, Fwindow_at, Fwindow_point, Fwindow_start)
         (Fwindow_end, Fwindow_line_height, Fset_window_dedicated_p):
         Doc-string fixes.
@@ -2364,10 +2436,10 @@
         (Fwindow_top_line, window_body_lines, Fwindow_body_size)
         (Fwindow_list_1): New functions.
         (window_box_text_cols): Replace with window_body_cols.
-        (Fwindow_width, Fscroll_left, Fscroll_right): Use
-        window_body_cols instead of window_box_text_cols.
-        (delete_window, Fset_window_configuration): Call
-        delete_all_subwindows with window as argument.
+        (Fwindow_width, Fscroll_left, Fscroll_right):
+        Use window_body_cols instead of window_box_text_cols.
+        (delete_window, Fset_window_configuration):
+        Call delete_all_subwindows with window as argument.
         (delete_all_subwindows): Take a window as argument and not a
         structure.  Rewrite.
         (window_loop): Remove handling of GET_LRU_WINDOW and
@@ -2378,8 +2450,8 @@
         window_box_text_cols.  delete_all_subwindows now takes a
         Lisp_Object as argument.
 
-        * indent.c (compute_motion, Fcompute_motion): Use
-        window_body_cols instead of window_box_text_cols.
+        * indent.c (compute_motion, Fcompute_motion):
+        Use window_body_cols instead of window_box_text_cols.
 
         * frame.c (delete_frame): Call delete_all_subwindows with root
         window as argument.
diff --git a/src/Makefile.in b/src/Makefile.in
index 2dfef64a762..e5b1c5b4eb8 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -130,6 +130,9 @@ START_FILES = @START_FILES@
 ## -lm, or empty.
 LIB_MATH=@LIB_MATH@
 
+## -lpthreads, or empty.
+LIB_PTHREAD=@LIB_PTHREAD@
+
 LIBTIFF=@LIBTIFF@
 LIBJPEG=@LIBJPEG@
 LIBPNG=@LIBPNG@
@@ -395,7 +398,7 @@ LIBES = $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \
    $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \
    $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \
    $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \
-   $(LIBGNUTLS_LIBS) $(LIB_PTHREAD_SIGMASK) \
+   $(LIBGNUTLS_LIBS) $(LIB_PTHREAD) $(LIB_PTHREAD_SIGMASK) \
    $(LIB_GCC) $(LIB_MATH) $(LIB_STANDARD) $(LIB_GCC)
 
 all: emacs$(EXEEXT) $(OTHER_FILES)
diff --git a/src/alloc.c b/src/alloc.c
index b96fc1f0642..36ad645612d 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -24,7 +24,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <signal.h>
 
-#ifdef HAVE_GTK_AND_PTHREAD
+#ifdef HAVE_PTHREAD
 #include <pthread.h>
 #endif
 
@@ -84,13 +84,15 @@ extern size_t __malloc_extra_blocks;
 #endif /* not DOUG_LEA_MALLOC */
 
 #if ! defined SYSTEM_MALLOC && ! defined SYNC_INPUT
-#ifdef HAVE_GTK_AND_PTHREAD
+#ifdef HAVE_PTHREAD
 
 /* When GTK uses the file chooser dialog, different backends can be loaded
    dynamically.  One such a backend is the Gnome VFS backend that gets loaded
    if you run Gnome.  That backend creates several threads and also allocates
    memory with malloc.
 
+   Also, gconf and gsettings may create several threads.
+
    If Emacs sets malloc hooks (! SYSTEM_MALLOC) and the emacs_blocked_*
    functions below are called from malloc, there is a chance that one
    of these threads preempts the Emacs main thread and the hook variables
@@ -122,12 +124,12 @@ static pthread_mutex_t alloc_mutex;
     }                                                   \
   while (0)
 
-#else /* ! defined HAVE_GTK_AND_PTHREAD */
+#else /* ! defined HAVE_PTHREAD */
 
 #define BLOCK_INPUT_ALLOC BLOCK_INPUT
 #define UNBLOCK_INPUT_ALLOC UNBLOCK_INPUT
 
-#endif /* ! defined HAVE_GTK_AND_PTHREAD */
+#endif /* ! defined HAVE_PTHREAD */
 #endif /* ! defined SYSTEM_MALLOC && ! defined SYNC_INPUT */
 
 /* Mark, unmark, query mark bit of a Lisp string.  S must be a pointer
@@ -1265,7 +1267,7 @@ emacs_blocked_realloc (void *ptr, size_t size, const void *ptr2)
 }
 
 
-#ifdef HAVE_GTK_AND_PTHREAD
+#ifdef HAVE_PTHREAD
 /* Called from Fdump_emacs so that when the dumped Emacs starts, it has a
    normal malloc.  Some thread implementations need this as they call
    malloc before main.  The pthread_self call in BLOCK_INPUT_ALLOC then
@@ -1278,7 +1280,7 @@ reset_malloc_hooks (void)
   __malloc_hook = old_malloc_hook;
   __realloc_hook = old_realloc_hook;
 }
-#endif /* HAVE_GTK_AND_PTHREAD */
+#endif /* HAVE_PTHREAD */
 
 
 /* Called from main to set up malloc to use our hooks.  */
@@ -1286,7 +1288,7 @@ reset_malloc_hooks (void)
 void
 uninterrupt_malloc (void)
 {
-#ifdef HAVE_GTK_AND_PTHREAD
+#ifdef HAVE_PTHREAD
 #ifdef DOUG_LEA_MALLOC
   pthread_mutexattr_t attr;
 
@@ -1300,7 +1302,7 @@ uninterrupt_malloc (void)
      and the bundled gmalloc.c doesn't require it.  */
   pthread_mutex_init (&alloc_mutex, NULL);
 #endif /* !DOUG_LEA_MALLOC */
-#endif /* HAVE_GTK_AND_PTHREAD */
+#endif /* HAVE_PTHREAD */
 
   if (__free_hook != emacs_blocked_free)
     old_free_hook = __free_hook;
diff --git a/src/bidi.c b/src/bidi.c
index ae5143b37e0..2879198ce31 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -620,12 +620,15 @@ bidi_pop_it (struct bidi_it *bidi_it)
   bidi_cache_last_idx = -1;
 }
 
+static ptrdiff_t bidi_cache_total_alloc;
+
 /* Stash away a copy of the cache and its control variables.  */
 void *
 bidi_shelve_cache (void)
 {
   unsigned char *databuf;
 
+  /* Empty cache.  */
   if (bidi_cache_idx == 0)
     return NULL;
 
@@ -634,6 +637,12 @@ bidi_shelve_cache (void)
                      + sizeof (bidi_cache_start_stack)
                      + sizeof (bidi_cache_sp) + sizeof (bidi_cache_start)
                      + sizeof (bidi_cache_last_idx));
+  bidi_cache_total_alloc +=
+    sizeof (bidi_cache_idx) + bidi_cache_idx * sizeof (struct bidi_it)
+    + sizeof (bidi_cache_start_stack)
+    + sizeof (bidi_cache_sp) + sizeof (bidi_cache_start)
+    + sizeof (bidi_cache_last_idx);
+
   memcpy (databuf, &bidi_cache_idx, sizeof (bidi_cache_idx));
   memcpy (databuf + sizeof (bidi_cache_idx),
           bidi_cache, bidi_cache_idx * sizeof (struct bidi_it));
@@ -657,45 +666,69 @@ bidi_shelve_cache (void)
   return databuf;
 }
 
-/* Restore the cache state from a copy stashed away by bidi_shelve_cache.  */
+/* Restore the cache state from a copy stashed away by
+   bidi_shelve_cache, and free the buffer used to stash that copy.
+   JUST_FREE non-zero means free the buffer, but don't restore the
+   cache; used when the corresponding iterator is discarded instead of
+   being restored.  */
 void
-bidi_unshelve_cache (void *databuf)
+bidi_unshelve_cache (void *databuf, int just_free)
 {
   unsigned char *p = databuf;
 
   if (!p)
     {
-      /* A NULL pointer means an empty cache.  */
-      bidi_cache_start = 0;
-      bidi_cache_sp = 0;
-      bidi_cache_reset ();
+      if (!just_free)
+        {
+          /* A NULL pointer means an empty cache.  */
+          bidi_cache_start = 0;
+          bidi_cache_sp = 0;
+          bidi_cache_reset ();
+        }
     }
   else
     {
-      memcpy (&bidi_cache_idx, p, sizeof (bidi_cache_idx));
-      bidi_cache_ensure_space (bidi_cache_idx);
-      memcpy (bidi_cache, p + sizeof (bidi_cache_idx),
-              bidi_cache_idx * sizeof (struct bidi_it));
-      memcpy (bidi_cache_start_stack,
-              p + sizeof (bidi_cache_idx)
-              + bidi_cache_idx * sizeof (struct bidi_it),
-              sizeof (bidi_cache_start_stack));
-      memcpy (&bidi_cache_sp,
-              p + sizeof (bidi_cache_idx)
-              + bidi_cache_idx * sizeof (struct bidi_it)
-              + sizeof (bidi_cache_start_stack),
-              sizeof (bidi_cache_sp));
-      memcpy (&bidi_cache_start,
-              p + sizeof (bidi_cache_idx)
-              + bidi_cache_idx * sizeof (struct bidi_it)
-              + sizeof (bidi_cache_start_stack) + sizeof (bidi_cache_sp),
-              sizeof (bidi_cache_start));
-      memcpy (&bidi_cache_last_idx,
-              p + sizeof (bidi_cache_idx)
-              + bidi_cache_idx * sizeof (struct bidi_it)
-              + sizeof (bidi_cache_start_stack) + sizeof (bidi_cache_sp)
-              + sizeof (bidi_cache_start),
-              sizeof (bidi_cache_last_idx));
+      if (just_free)
+        {
+          ptrdiff_t idx;
+
+          memcpy (&idx, p, sizeof (bidi_cache_idx));
+          bidi_cache_total_alloc -=
+            sizeof (bidi_cache_idx) + idx * sizeof (struct bidi_it)
+            + sizeof (bidi_cache_start_stack) + sizeof (bidi_cache_sp)
+            + sizeof (bidi_cache_start) + sizeof (bidi_cache_last_idx);
+        }
+      else
+        {
+          memcpy (&bidi_cache_idx, p, sizeof (bidi_cache_idx));
+          bidi_cache_ensure_space (bidi_cache_idx);
+          memcpy (bidi_cache, p + sizeof (bidi_cache_idx),
+                  bidi_cache_idx * sizeof (struct bidi_it));
+          memcpy (bidi_cache_start_stack,
+                  p + sizeof (bidi_cache_idx)
+                  + bidi_cache_idx * sizeof (struct bidi_it),
+                  sizeof (bidi_cache_start_stack));
+          memcpy (&bidi_cache_sp,
+                  p + sizeof (bidi_cache_idx)
+                  + bidi_cache_idx * sizeof (struct bidi_it)
+                  + sizeof (bidi_cache_start_stack),
+                  sizeof (bidi_cache_sp));
+          memcpy (&bidi_cache_start,
+                  p + sizeof (bidi_cache_idx)
+                  + bidi_cache_idx * sizeof (struct bidi_it)
+                  + sizeof (bidi_cache_start_stack) + sizeof (bidi_cache_sp),
+                  sizeof (bidi_cache_start));
+          memcpy (&bidi_cache_last_idx,
+                  p + sizeof (bidi_cache_idx)
+                  + bidi_cache_idx * sizeof (struct bidi_it)
+                  + sizeof (bidi_cache_start_stack) + sizeof (bidi_cache_sp)
+                  + sizeof (bidi_cache_start),
+                  sizeof (bidi_cache_last_idx));
+          bidi_cache_total_alloc -=
+            sizeof (bidi_cache_idx) + bidi_cache_idx * sizeof (struct bidi_it)
+            + sizeof (bidi_cache_start_stack) + sizeof (bidi_cache_sp)
+            + sizeof (bidi_cache_start) + sizeof (bidi_cache_last_idx);
+        }
 
       xfree (p);
     }
@@ -742,6 +775,7 @@ bidi_initialize (void)
   staticpro (&paragraph_separate_re);
 
   bidi_cache_sp = 0;
+  bidi_cache_total_alloc = 0;
 
   bidi_initialized = 1;
 }
diff --git a/src/callproc.c b/src/callproc.c
index f148f6233d4..3a91be3d8da 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -603,6 +603,9 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
 
     /* vfork, and prevent local vars from being clobbered by the vfork.  */
     {
+      Lisp_Object volatile buffer_volatile = buffer;
+      Lisp_Object volatile coding_systems_volatile = coding_systems;
+      Lisp_Object volatile current_dir_volatile = current_dir;
       int volatile fd1_volatile = fd1;
       int volatile fd_error_volatile = fd_error;
       int volatile fd_output_volatile = fd_output;
@@ -611,6 +614,9 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
 
       pid = vfork ();
 
+      buffer = buffer_volatile;
+      coding_systems = coding_systems_volatile;
+      current_dir = current_dir_volatile;
       fd1 = fd1_volatile;
       fd_error = fd_error_volatile;
       fd_output = fd_output_volatile;
diff --git a/src/dispextern.h b/src/dispextern.h
index a3dfcff3521..fa831b56a7d 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -3006,7 +3006,7 @@ extern int  bidi_mirror_char (int);
 extern void bidi_push_it (struct bidi_it *);
 extern void bidi_pop_it (struct bidi_it *);
 extern void *bidi_shelve_cache (void);
-extern void bidi_unshelve_cache (void *);
+extern void bidi_unshelve_cache (void *, int);
 
 /* Defined in xdisp.c */
 
diff --git a/src/dispnew.c b/src/dispnew.c
index 1d9f849c43e..d4da4297529 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -5284,7 +5284,7 @@ buffer_posn_from_coords (struct window *w, int *x, int *y, struct display_pos *p
      argument is ZV to prevent move_it_in_display_line from matching
      based on buffer positions.  */
   move_it_in_display_line (&it, ZV, to_x, MOVE_TO_X);
-  bidi_unshelve_cache (itdata);
+  bidi_unshelve_cache (itdata, 0);
 
   Fset_buffer (old_current_buffer);
 
diff --git a/src/emacs.c b/src/emacs.c
index bda56740e83..868df894353 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1123,7 +1123,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
 #if defined (USG5) && defined (INTERRUPT_INPUT)
       setpgrp ();
 #endif
-#if defined (HAVE_GTK_AND_PTHREAD) && !defined (SYSTEM_MALLOC) && !defined (DOUG_LEA_MALLOC)
+#if defined (HAVE_PTHREAD) && !defined (SYSTEM_MALLOC) && !defined (DOUG_LEA_MALLOC)
       {
         extern void malloc_enable_thread (void);
 
@@ -2191,7 +2191,7 @@ You must run Emacs in batch mode in order to dump it.  */)
     memory_warnings (my_edata, malloc_warning);
   }
 #endif /* not WINDOWSNT */
-#if defined (HAVE_GTK_AND_PTHREAD) && !defined SYNC_INPUT
+#if defined (HAVE_PTHREAD) && !defined SYNC_INPUT
   /* Pthread may call malloc before main, and then we will get an endless
      loop, because pthread_self (see alloc.c) calls malloc the first time
      it is called on some systems.  */
diff --git a/src/fontset.c b/src/fontset.c
index 3091f43d6e9..74eb61d2665 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -2100,6 +2100,8 @@ DEFUN ("fontset-list", Ffontset_list, Sfontset_list, 0, 0, 0,
 
 #ifdef FONTSET_DEBUG
 
+Lisp_Object dump_fontset (Lisp_Object) EXTERNALLY_VISIBLE;
+
 Lisp_Object
 dump_fontset (Lisp_Object fontset)
 {
diff --git a/src/gmalloc.c b/src/gmalloc.c
index fa4aa1fdf6a..916bb300fe1 100644
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -37,7 +37,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.
 #include <config.h>
 #endif
 
-#ifdef HAVE_GTK_AND_PTHREAD
+#ifdef HAVE_PTHREAD
 #define USE_PTHREAD
 #endif
 
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 8826b08851a..dd4d99b9d33 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1907,12 +1907,12 @@ xg_get_file_name (FRAME_PTR f,
   int filesel_done = 0;
   xg_get_file_func func;
 
-#if defined (HAVE_GTK_AND_PTHREAD) && defined (__SIGRTMIN)
+#if defined (HAVE_PTHREAD) && defined (__SIGRTMIN)
   /* I really don't know why this is needed, but without this the GLIBC add on
      library linuxthreads hangs when the Gnome file chooser backend creates
      threads.  */
   sigblock (sigmask (__SIGRTMIN));
-#endif /* HAVE_GTK_AND_PTHREAD */
+#endif /* HAVE_PTHREAD */
 
 #ifdef HAVE_GTK_FILE_SELECTION_NEW
 
@@ -1932,7 +1932,7 @@ xg_get_file_name (FRAME_PTR f,
 
   filesel_done = xg_dialog_run (f, w);
 
-#if defined (HAVE_GTK_AND_PTHREAD) && defined (__SIGRTMIN)
+#if defined (HAVE_PTHREAD) && defined (__SIGRTMIN)
   sigunblock (sigmask (__SIGRTMIN));
 #endif
 
@@ -1960,9 +1960,9 @@ xg_get_font_name (FRAME_PTR f, const char *default_name)
   char *fontname = NULL;
   int done = 0;
 
-#if defined (HAVE_GTK_AND_PTHREAD) && defined (__SIGRTMIN)
+#if defined (HAVE_PTHREAD) && defined (__SIGRTMIN)
   sigblock (sigmask (__SIGRTMIN));
-#endif /* HAVE_GTK_AND_PTHREAD */
+#endif /* HAVE_PTHREAD */
 
   w = gtk_font_selection_dialog_new ("Pick a font");
   if (!default_name)
@@ -1974,7 +1974,7 @@ xg_get_font_name (FRAME_PTR f, const char *default_name)
 
   done = xg_dialog_run (f, w);
 
-#if defined (HAVE_GTK_AND_PTHREAD) && defined (__SIGRTMIN)
+#if defined (HAVE_PTHREAD) && defined (__SIGRTMIN)
   sigunblock (sigmask (__SIGRTMIN));
 #endif
 
diff --git a/src/indent.c b/src/indent.c
index aaeaaf591ef..70689311dd5 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -2135,7 +2135,7 @@ whether or not it is currently displayed in some window.  */)
         }
 
       SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it));
-      bidi_unshelve_cache (itdata);
+      bidi_unshelve_cache (itdata, 0);
     }
 
   if (BUFFERP (old_buffer))
diff --git a/src/keyboard.c b/src/keyboard.c
index b1d95a69124..95f64847a4f 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -44,7 +44,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "process.h"
 #include <errno.h>
 
-#ifdef HAVE_GTK_AND_PTHREAD
+#ifdef HAVE_PTHREAD
 #include <pthread.h>
 #endif
 #ifdef MSDOS
diff --git a/src/keymap.c b/src/keymap.c
index c461fdddbbc..3b0edbf4fb3 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -150,17 +150,6 @@ in case you use it as a menu with `x-popup-menu'.  */)
   return Fcons (Qkeymap, Qnil);
 }
 
-DEFUN ("make-composed-keymap", Fmake_composed_keymap, Smake_composed_keymap,
-       0, MANY, 0,
-       doc: /* Construct and return a new keymap composed of KEYMAPS.
-When looking up a key in the returned map, the key is looked in each
-keymap in turn until a binding is found.
-usage: (make-composed-keymap &rest KEYMAPS)  */)
-  (ptrdiff_t nargs, Lisp_Object *args)
-{
-  return Fcons (Qkeymap, Flist (nargs, args));
-}
-
 /* This function is used for installing the standard key bindings
    at initialization time.
 
@@ -3761,7 +3750,6 @@ be preferred.  */);
   defsubr (&Sset_keymap_parent);
   defsubr (&Smake_keymap);
   defsubr (&Smake_sparse_keymap);
-  defsubr (&Smake_composed_keymap);
   defsubr (&Smap_keymap_internal);
   defsubr (&Smap_keymap);
   defsubr (&Scopy_keymap);
diff --git a/src/regex.c b/src/regex.c
index 545a198acd7..d1b835621d9 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -2106,9 +2106,9 @@ re_iswctype (int ch, re_wctype_t cc)
     case RECC_UPPER: return ISUPPER (ch) != 0;
     case RECC_XDIGIT: return ISXDIGIT (ch) != 0;
     case RECC_ASCII: return IS_REAL_ASCII (ch) != 0;
-    case RECC_NONASCII: return !IS_REAL_ASCII (ch) != 0;
+    case RECC_NONASCII: return !IS_REAL_ASCII (ch);
     case RECC_UNIBYTE: return ISUNIBYTE (ch) != 0;
-    case RECC_MULTIBYTE: return !ISUNIBYTE (ch) != 0;
+    case RECC_MULTIBYTE: return !ISUNIBYTE (ch);
     case RECC_WORD: return ISWORD (ch) != 0;
     case RECC_ERROR: return false;
     default:
diff --git a/src/syssignal.h b/src/syssignal.h
index c5c749407cc..7533a5a64fd 100644
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -18,7 +18,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 extern void init_signals (void);
 
-#if defined (HAVE_GTK_AND_PTHREAD) || defined (HAVE_NS)
+#ifdef HAVE_PTHREAD
 #include <pthread.h>
 /* If defined, asynchronous signals delivered to a non-main thread are
    forwarded to the main thread.  */
diff --git a/src/window.c b/src/window.c
index c945e0695f2..c7a4e1872fc 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1381,7 +1381,7 @@ if it isn't already recorded.  */)
       if (it.current_y < it.last_visible_y)
         move_it_past_eol (&it);
       value = make_number (IT_CHARPOS (it));
-      bidi_unshelve_cache (itdata);
+      bidi_unshelve_cache (itdata, 0);
 
       if (old_buffer)
         set_buffer_internal (old_buffer);
@@ -4278,7 +4278,7 @@ window_scroll_pixel_based (Lisp_Object window, int n, int whole, int noerror)
         }
 
       start = it.current.pos;
-      bidi_unshelve_cache (itdata);
+      bidi_unshelve_cache (itdata, 0);
     }
   else if (auto_window_vscroll_p)
     {
@@ -4422,7 +4422,7 @@ window_scroll_pixel_based (Lisp_Object window, int n, int whole, int noerror)
             }
           else
             {
-              bidi_unshelve_cache (itdata);
+              bidi_unshelve_cache (itdata, 0);
               if (noerror)
                 return;
               else if (n < 0)   /* could happen with empty buffers */
@@ -4439,7 +4439,7 @@ window_scroll_pixel_based (Lisp_Object window, int n, int whole, int noerror)
             w->vscroll = 0;
           else
             {
-              bidi_unshelve_cache (itdata);
+              bidi_unshelve_cache (itdata, 0);
               if (noerror)
                 return;
               else
@@ -4588,7 +4588,7 @@ window_scroll_pixel_based (Lisp_Object window, int n, int whole, int noerror)
             SET_PT_BOTH (charpos, bytepos);
         }
     }
-  bidi_unshelve_cache (itdata);
+  bidi_unshelve_cache (itdata, 0);
 }
 
 
@@ -5015,7 +5015,7 @@ displayed_window_lines (struct window *w)
   start_display (&it, w, start);
   move_it_vertically (&it, height);
   bottom_y = line_bottom_y (&it);
-  bidi_unshelve_cache (itdata);
+  bidi_unshelve_cache (itdata, 0);
 
   /* rms: On a non-window display,
      the value of it.vpos at the bottom of the screen
@@ -5121,7 +5121,7 @@ and redisplay normally--don't erase and redraw the frame.  */)
           move_it_vertically_backward (&it, window_box_height (w) / 2);
           charpos = IT_CHARPOS (it);
           bytepos = IT_BYTEPOS (it);
-          bidi_unshelve_cache (itdata);
+          bidi_unshelve_cache (itdata, 0);
         }
       else if (iarg < 0)
         {
@@ -5169,7 +5169,7 @@ and redisplay normally--don't erase and redraw the frame.  */)
             }
           if (h <= 0)
             {
-              bidi_unshelve_cache (itdata);
+              bidi_unshelve_cache (itdata, 0);
               return Qnil;
             }
 
@@ -5192,7 +5192,7 @@ and redisplay normally--don't erase and redraw the frame.  */)
           charpos = IT_CHARPOS (it);
           bytepos = IT_BYTEPOS (it);
 
-          bidi_unshelve_cache (itdata);
+          bidi_unshelve_cache (itdata, 0);
         }
       else
         {
diff --git a/src/xdisp.c b/src/xdisp.c
index 6f871903ed5..f01b277d35c 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -606,7 +606,7 @@ int current_mode_line_height, current_header_line_height;
 #define SAVE_IT(ITCOPY,ITORIG,CACHE)            \
   do {                                          \
     if (CACHE)                                  \
-      xfree (CACHE);                            \
+      bidi_unshelve_cache (CACHE, 1);           \
     ITCOPY = ITORIG;                            \
     CACHE = bidi_shelve_cache();                \
   } while (0)
@@ -615,7 +615,7 @@ int current_mode_line_height, current_header_line_height;
   do {                                          \
     if (pITORIG != pITCOPY)                     \
       *(pITORIG) = *(pITCOPY);                  \
-    bidi_unshelve_cache (CACHE);                \
+    bidi_unshelve_cache (CACHE, 0);             \
     CACHE = NULL;                               \
   } while (0)
 
@@ -1346,9 +1346,9 @@ pos_visible_p (struct window *w, EMACS_INT charpos, int *x, int *y,
           *vpos = it2.vpos;
         }
       else
-        xfree (it2data);
+        bidi_unshelve_cache (it2data, 1);
     }
-  bidi_unshelve_cache (itdata);
+  bidi_unshelve_cache (itdata, 0);
 
   if (old_buffer)
     set_buffer_internal_1 (old_buffer);
@@ -2632,7 +2632,7 @@ init_iterator (struct it *it, struct window *w,
             it->paragraph_embedding = R2L;
           else
             it->paragraph_embedding = NEUTRAL_DIR;
-          bidi_unshelve_cache (NULL);
+          bidi_unshelve_cache (NULL, 0);
           bidi_init_it (charpos, IT_BYTEPOS (*it), FRAME_WINDOW_P (it->f),
                         &it->bidi_it);
         }
@@ -5653,7 +5653,7 @@ back_to_previous_visible_line_start (struct it *it)
         pos = --IT_CHARPOS (it2);
         --IT_BYTEPOS (it2);
         it2.sp = 0;
-        bidi_unshelve_cache (NULL);
+        bidi_unshelve_cache (NULL, 0);
         it2.string_from_display_prop_p = 0;
         it2.from_disp_prop_p = 0;
         if (handle_display_prop (&it2) == HANDLED_RETURN
@@ -5863,7 +5863,7 @@ reseat_1 (struct it *it, struct text_pos pos, int set_stop_p)
     {
       bidi_init_it (IT_CHARPOS (*it), IT_BYTEPOS (*it), FRAME_WINDOW_P (it->f),
                     &it->bidi_it);
-      bidi_unshelve_cache (NULL);
+      bidi_unshelve_cache (NULL, 0);
       it->bidi_it.paragraph_dir = NEUTRAL_DIR;
       it->bidi_it.string.s = NULL;
       it->bidi_it.string.lstring = Qnil;
@@ -8063,13 +8063,19 @@ move_it_in_display_line_to (struct it *it,
              positions smaller than TO_CHARPOS, return
              MOVE_POS_MATCH_OR_ZV, like the unidirectional display
              did.  */
-          if ((op & MOVE_TO_POS) != 0
-              && !saw_smaller_pos
-              && IT_CHARPOS (*it) > to_charpos)
+          if (it->bidi_p && (op & MOVE_TO_POS) != 0)
             {
-              result = MOVE_POS_MATCH_OR_ZV;
-              if (it->bidi_p && IT_CHARPOS (ppos_it) < ZV)
-                RESTORE_IT (it, &ppos_it, ppos_data);
+              if (!saw_smaller_pos && IT_CHARPOS (*it) > to_charpos)
+                {
+                  if (IT_CHARPOS (ppos_it) < ZV)
+                    RESTORE_IT (it, &ppos_it, ppos_data);
+                  goto buffer_pos_reached;
+                }
+              else if (it->line_wrap == WORD_WRAP && atpos_it.sp >= 0
+                       && IT_CHARPOS (*it) > to_charpos)
+                goto buffer_pos_reached;
+              else
+                result = MOVE_NEWLINE_OR_CR;
             }
           else
             result = MOVE_NEWLINE_OR_CR;
@@ -8108,14 +8114,13 @@ move_it_in_display_line_to (struct it *it,
                      character positions smaller than TO_CHARPOS,
                      return MOVE_POS_MATCH_OR_ZV, like the
                      unidirectional display did.  */
-                  || ((op & MOVE_TO_POS) != 0
+                  || (it->bidi_p && (op & MOVE_TO_POS) != 0
                       && !saw_smaller_pos
                       && IT_CHARPOS (*it) > to_charpos))
                 {
-                  result = MOVE_POS_MATCH_OR_ZV;
-                  if (it->bidi_p && !at_eob_p && IT_CHARPOS (ppos_it) < ZV)
+                  if (!at_eob_p && IT_CHARPOS (ppos_it) < ZV)
                     RESTORE_IT (it, &ppos_it, ppos_data);
-                  break;
+                  goto buffer_pos_reached;
                 }
               if (ITERATOR_AT_END_OF_LINE_P (it))
                 {
@@ -8123,14 +8128,13 @@ move_it_in_display_line_to (struct it *it,
                   break;
                 }
             }
-          else if ((op & MOVE_TO_POS) != 0
+          else if (it->bidi_p && (op & MOVE_TO_POS) != 0
                    && !saw_smaller_pos
                    && IT_CHARPOS (*it) > to_charpos)
             {
-              result = MOVE_POS_MATCH_OR_ZV;
-              if (it->bidi_p && IT_CHARPOS (ppos_it) < ZV)
+              if (IT_CHARPOS (ppos_it) < ZV)
                 RESTORE_IT (it, &ppos_it, ppos_data);
-              break;
+              goto buffer_pos_reached;
             }
           result = MOVE_LINE_TRUNCATED;
           break;
@@ -8150,13 +8154,13 @@ move_it_in_display_line_to (struct it *it,
  done:
 
   if (atpos_data)
-    xfree (atpos_data);
+    bidi_unshelve_cache (atpos_data, 1);
   if (atx_data)
-    xfree (atx_data);
+    bidi_unshelve_cache (atx_data, 1);
   if (wrap_data)
-    xfree (wrap_data);
+    bidi_unshelve_cache (wrap_data, 1);
   if (ppos_data)
-    xfree (ppos_data);
+    bidi_unshelve_cache (ppos_data, 1);
 
   /* Restore the iterator settings altered at the beginning of this
      function.  */
@@ -8191,7 +8195,7 @@ move_it_in_display_line (struct it *it,
             (it, -1, prev_x, MOVE_TO_X);
         }
       else
-        xfree (save_data);
+        bidi_unshelve_cache (save_data, 1);
     }
   else
     move_it_in_display_line_to (it, to_charpos, to_x, op);
@@ -8450,7 +8454,7 @@ move_it_to (struct it *it, EMACS_INT to_charpos, int to_x, int to_y, int to_vpos
     }
 
   if (backup_data)
-    xfree (backup_data);
+    bidi_unshelve_cache (backup_data, 1);
 
   TRACE_MOVE ((stderr, "move_it_to: reached %d\n", reached));
 }
@@ -8529,7 +8533,7 @@ move_it_vertically_backward (struct it *it, int dy)
       RESTORE_IT (it, it, it2data);
       if (nlines > 0)
         move_it_by_lines (it, nlines);
-      xfree (it3data);
+      bidi_unshelve_cache (it3data, 1);
     }
   else
     {
@@ -8725,7 +8729,7 @@ move_it_by_lines (struct it *it, int dvpos)
           if (IT_CHARPOS (*it) >= start_charpos)
             RESTORE_IT (it, &it2, it2data);
           else
-            xfree (it2data);
+            bidi_unshelve_cache (it2data, 1);
         }
       else
         RESTORE_IT (it, it, it2data);
@@ -13341,6 +13345,9 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
   /* Last buffer position covered by an overlay string with an integer
      `cursor' property.  */
   EMACS_INT bpos_covered = 0;
+  /* Non-zero means the display string on which to display the cursor
+     comes from a text property, not from an overlay.  */
+  int string_from_text_prop = 0;
 
   /* Skip over glyphs not having an object at the start and the end of
      the row.  These are special glyphs like truncation marks on
@@ -13659,9 +13666,14 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
                 {
                   Lisp_Object str;
                   EMACS_INT tem;
+                  /* If the display property covers the newline, we
+                     need to search for it one position farther.  */
+                  EMACS_INT lim = pos_after
+                    + (pos_after == MATRIX_ROW_END_CHARPOS (row) + delta);
 
+                  string_from_text_prop = 0;
                   str = glyph->object;
-                  tem = string_buffer_position_lim (str, pos, pos_after, 0);
+                  tem = string_buffer_position_lim (str, pos, lim, 0);
                   if (tem == 0  /* from overlay */
                       || pos <= tem)
                     {
@@ -13685,7 +13697,10 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
                           EMACS_INT strpos = glyph->charpos;
 
                           if (tem)
-                            cursor = glyph;
+                            {
+                              cursor = glyph;
+                              string_from_text_prop = 1;
+                            }
                           for ( ;
                                (row->reversed_p ? glyph > stop : glyph < stop)
                                  && EQ (glyph->object, str);
@@ -13760,14 +13775,12 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
       w->cursor.vpos >= 0
       /* that candidate is not the row we are processing */
       && MATRIX_ROW (matrix, w->cursor.vpos) != row
-      /* the row we are processing is part of a continued line */
-      && (row->continued_p || MATRIX_ROW_CONTINUATION_LINE_P (row))
       /* Make sure cursor.vpos specifies a row whose start and end
          charpos occlude point.  This is because some callers of this
          function leave cursor.vpos at the row where the cursor was
          displayed during the last redisplay cycle.  */
       && MATRIX_ROW_START_CHARPOS (MATRIX_ROW (matrix, w->cursor.vpos)) <= pt_old
-      && pt_old < MATRIX_ROW_END_CHARPOS (MATRIX_ROW (matrix, w->cursor.vpos)))
+      && pt_old <= MATRIX_ROW_END_CHARPOS (MATRIX_ROW (matrix, w->cursor.vpos)))
     {
       struct glyph *g1 =
         MATRIX_ROW_GLYPH_START (matrix, w->cursor.vpos) + w->cursor.hpos;
@@ -13776,15 +13789,29 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
       if (!(row->reversed_p ? glyph > glyphs_end : glyph < glyphs_end))
         return 0;
       /* Keep the candidate whose buffer position is the closest to
-         point.  */
+         point or has the `cursor' property.  */
       if (/* previous candidate is a glyph in TEXT_AREA of that row */
           w->cursor.hpos >= 0
           && w->cursor.hpos < MATRIX_ROW_USED (matrix, w->cursor.vpos)
-          && BUFFERP (g1->object)
-          && (g1->charpos == pt_old /* an exact match always wins */
-              || (BUFFERP (glyph->object)
-                  && eabs (g1->charpos - pt_old)
-                   < eabs (glyph->charpos - pt_old))))
+          && ((BUFFERP (g1->object)
+               && (g1->charpos == pt_old /* an exact match always wins */
+                   || (BUFFERP (glyph->object)
+                       && eabs (g1->charpos - pt_old)
+                       < eabs (glyph->charpos - pt_old))))
+              /* previous candidate is a glyph from a string that has
+                 a non-nil `cursor' property */
+              || (STRINGP (g1->object)
+                  && (!NILP (Fget_char_property (make_number (g1->charpos),
+                                                Qcursor, g1->object))
+                      /* pevious candidate is from the same display
+                         string as this one, and the display string
+                         came from a text property */
+                      || (EQ (g1->object, glyph->object)
+                          && string_from_text_prop)
+                      /* this candidate is from newline and its
+                         position is not an exact match */
+                      || (INTEGERP (glyph->object)
+                          && glyph->charpos != pt_old)))))
         return 0;
       /* If this candidate gives an exact match, use that.  */
       if (!(BUFFERP (glyph->object) && glyph->charpos == pt_old)
@@ -18853,6 +18880,9 @@ display_line (struct it *it)
         }
     }
 
+  if (wrap_data)
+    bidi_unshelve_cache (wrap_data, 1);
+
   /* If line is not empty and hscrolled, maybe insert truncation glyphs
      at the left window margin.  */
   if (it->first_visible_x
diff --git a/src/xterm.c b/src/xterm.c
index 510016e3d45..7087f2eeccb 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -445,6 +445,27 @@ x_display_info_for_display (Display *dpy)
   return 0;
 }
 
+static Window
+x_find_topmost_parent (struct frame *f)
+{
+  struct x_output *x = f->output_data.x;
+  Window win = None, wi = x->parent_desc;
+  Display *dpy = FRAME_X_DISPLAY (f);
+
+  while (wi != FRAME_X_DISPLAY_INFO (f)->root_window)
+    {
+      Window root;
+      Window *children;
+      unsigned int nchildren;
+
+      win = wi;
+      XQueryTree (dpy, win, &root, &wi, &children, &nchildren);
+      XFree (children);
+    }
+
+  return win;
+}
+
 #define OPAQUE  0xffffffff
 
 void
@@ -456,6 +477,7 @@ x_set_frame_alpha (struct frame *f)
   double alpha = 1.0;
   double alpha_min = 1.0;
   unsigned long opac;
+  Window parent;
 
   if (dpyinfo->x_highlight_frame == f)
     alpha = f->alpha[0];
@@ -476,6 +498,19 @@ x_set_frame_alpha (struct frame *f)
 
   opac = alpha * OPAQUE;
 
+  x_catch_errors (dpy);
+
+  /* If there is a parent from the window manager, put the property there
+     also, to work around broken window managers that fail to do that.
+     Do this unconditionally as this function is called on reparent when
+     alpha has not changed on the frame.  */
+
+  parent = x_find_topmost_parent (f);
+  if (parent != None)
+    XChangeProperty (dpy, parent, dpyinfo->Xatom_net_wm_window_opacity,
+                     XA_CARDINAL, 32, PropModeReplace,
+                     (unsigned char *) &opac, 1L);
+
   /* return unless necessary */
   {
     unsigned char *data;
@@ -483,7 +518,6 @@ x_set_frame_alpha (struct frame *f)
     int rc, format;
     unsigned long n, left;
 
-    x_catch_errors (dpy);
     rc = XGetWindowProperty (dpy, win, dpyinfo->Xatom_net_wm_window_opacity,
                              0L, 1L, False, XA_CARDINAL,
                              &actual, &format, &n, &left,
@@ -6097,6 +6131,8 @@ handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventptr,
           /* Perhaps reparented due to a WM restart.  Reset this.  */
           FRAME_X_DISPLAY_INFO (f)->wm_type = X_WMTYPE_UNKNOWN;
           FRAME_X_DISPLAY_INFO (f)->net_supported_window = 0;
+
+          x_set_frame_alpha (f);
         }
       goto OTHER;
 
diff --git a/src/xwidget.c b/src/xwidget.c
index 1a3e76dd4a2..0a5ce3c6f0c 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -402,7 +402,6 @@ void     webkit_osr_document_load_finished_callback (WebKitWebView  *webkitwebvi
   event.frame_or_window = Qnil; //frame; //how to get the frame here? //TODO i store it in the xwidget now
 
   event.arg = Qnil;
-  //event.arg = Fcons (make_number (xembedid), event.arg);
   event.arg = Fcons (xw, event.arg); //TODO
   event.arg = Fcons (intern ("document-load-finished"), event.arg);