# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1264236555 18000
# Node ID 86c10cac941a956c2bf91dc978d5104f0278edee
# Parent  c253a43c75af2d8ab4b86630964deb640a4408da# Parent  9a7965a5cdaf74a1eb391885c7df46b98f80fc1d
Merger from mainline.

diff -r c253a43c75af -r 86c10cac941a lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Jan 22 15:45:21 2010 -0500
+++ b/lisp/ChangeLog	Sat Jan 23 03:49:15 2010 -0500
@@ -1,3 +1,7 @@
+2010-01-22  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp-imap.el (top): Autoload needed packages.
+
 2010-01-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* mail/rmailmm.el (rmail-mime-handle): Don't set the buffer to unibyte
diff -r c253a43c75af -r 86c10cac941a lisp/net/tramp-imap.el
--- a/lisp/net/tramp-imap.el	Fri Jan 22 15:45:21 2010 -0500
+++ b/lisp/net/tramp-imap.el	Sat Jan 23 03:49:15 2010 -0500
@@ -55,13 +55,23 @@
 (require 'assoc)
 (require 'tramp)
 (require 'tramp-compat)
-(require 'message)
-(require 'imap-hash)
-(require 'epa)
+
 (autoload 'auth-source-user-or-password "auth-source")
+(autoload 'epg-context-operation "epg")
+(autoload 'epg-context-set-armor "epg")
+(autoload 'epg-context-set-passphrase-callback "epg")
+(autoload 'epg-context-set-progress-callback "epg")
+(autoload 'epg-decrypt-string "epg")
+(autoload 'epg-encrypt-string "epg")
+(autoload 'imap-hash-get "imap-hash")
+(autoload 'imap-hash-make "imap-hash")
+(autoload 'imap-hash-map "imap-hash")
+(autoload 'imap-hash-put "imap-hash")
+(autoload 'imap-hash-rem "imap-hash")
 
 ;; We use the additional header "X-Size" for encoding the size of a file.
-(add-to-list 'imap-hash-headers 'X-Size 'append)
+(eval-after-load "imap-hash"
+  '(add-to-list 'imap-hash-headers 'X-Size 'append))
 
 ;; Define Tramp IMAP method ...
 (defconst tramp-imap-method "imap"
@@ -662,7 +672,8 @@
 		  (read-passwd
 		   (if (eq key-id 'PIN)
 		       "Tramp-IMAP passphrase for PIN: "
-		     (let ((entry (assoc key-id epg-user-id-alist)))
+		     (let ((entry (assoc key-id
+					 (symbol-value 'epg-user-id-alist))))
 		       (if entry
 			   (format "Tramp-IMAP passphrase for %s %s: "
 				   key-id (cdr entry))
diff -r c253a43c75af -r 86c10cac941a src/ChangeLog
--- a/src/ChangeLog	Fri Jan 22 15:45:21 2010 -0500
+++ b/src/ChangeLog	Sat Jan 23 03:49:15 2010 -0500
@@ -1,3 +1,8 @@
+2010-01-23  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* xdisp.c (draw_glyphs): Update `start' for left_overwritten case
+	as in Emacs 22.
+
 2010-01-22  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* lisp.h (make_pure_string): String pointer arg now points to const.
diff -r c253a43c75af -r 86c10cac941a src/xdisp.c
--- a/src/xdisp.c	Fri Jan 22 15:45:21 2010 -0500
+++ b/src/xdisp.c	Sat Jan 23 03:49:15 2010 -0500
@@ -20939,6 +20939,7 @@
 	  j = i;
 	  BUILD_GLYPH_STRINGS (j, start, h, t,
 			       overlap_hl, dummy_x, last_x);
+	  start = i;
 	  compute_overhangs_and_x (t, head->x, 1);
 	  prepend_glyph_string_lists (&head, &tail, h, t);
 	  clip_head = head;
@@ -20988,6 +20989,8 @@
 
 	  BUILD_GLYPH_STRINGS (end, i, h, t,
 			       overlap_hl, x, last_x);
+	  /* Because BUILD_GLYPH_STRINGS updates the first argument,
+	     we don't have `end = i;' here.  */
 	  compute_overhangs_and_x (h, tail->x + tail->width, 0);
 	  append_glyph_string_lists (&head, &tail, h, t);
 	  clip_tail = tail;