Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/
Now on revision 102707.
------------------------------------------------------------
revno: 102707
committer: Eli Zaretskii <eliz@gnu.org>
branch nick: trunk
timestamp: Sat 2010-12-25 12:57:02 +0200
message:
  Fix bug #7699 with pasting selected text on MS-Windows.
  
   mouse.el (mouse-yank-primary): On MS-Windows, try the (emulated)
   PRIMARY first, then the clipboard.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2010-12-23 00:00:12 +0000
+++ lisp/ChangeLog	2010-12-25 10:57:02 +0000
@@ -1,3 +1,8 @@
+2010-12-25  Eli Zaretskii  <eliz@gnu.org>
+
+	* mouse.el (mouse-yank-primary): On MS-Windows, try the (emulated)
+	PRIMARY first, then the clipboard.  (Bug#7699)
+
 2010-12-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* emacs-lisp/bytecomp.el (byte-compile-output-docform): Fix up use of

=== modified file 'lisp/mouse.el'
--- lisp/mouse.el	2010-12-13 15:27:36 +0000
+++ lisp/mouse.el	2010-12-25 10:57:02 +0000
@@ -1282,7 +1282,16 @@
   (or mouse-yank-at-point (mouse-set-point click))
   (let ((primary
 	 (cond
-	  ((fboundp 'x-get-selection-value) ; MS-DOS, MS-Windows and X.
+	  ((eq system-type 'windows-nt)
+	   ;; MS-Windows emulates PRIMARY in x-get-selection, but not
+	   ;; in x-get-selection-value (the latter only accesses the
+	   ;; clipboard).  So try PRIMARY first, in case they selected
+	   ;; something with the mouse in the current Emacs session.
+	   (or (x-get-selection 'PRIMARY)
+	       (x-get-selection-value)))
+	  ((fboundp 'x-get-selection-value) ; MS-DOS and X.
+	   ;; On X, x-get-selection-value supports more formats and
+	   ;; encodings, so use it in preference to x-get-selection.
 	   (or (x-get-selection-value)
 	       (x-get-selection 'PRIMARY)))
 	  ;; FIXME: What about xterm-mouse-mode etc.?
------------------------------------------------------------
revno: 102706
committer: Andreas Schwab <schwab@linux-m68k.org>
branch nick: emacs
timestamp: Fri 2010-12-24 10:25:18 +0100
message:
  Fix indentation
diff:
=== modified file 'src/print.c'
--- src/print.c	2010-12-23 00:00:12 +0000
+++ src/print.c	2010-12-24 09:25:18 +0000
@@ -1813,11 +1813,11 @@
 		      {
 			Lisp_Object num = Fgethash (obj, Vprint_number_table, Qnil);
 			if (INTEGERP (num))
-				{
-				  strout (" . ", 3, 3, printcharfun, 0);
-				  print_object (obj, printcharfun, escapeflag);
-			      goto end_of_list;
-			    }
+			  {
+			    strout (" . ", 3, 3, printcharfun, 0);
+			    print_object (obj, printcharfun, escapeflag);
+			    goto end_of_list;
+			  }
 		      }
 		  }
------------------------------------------------------------
revno: 102705
author: Julien Danjou <julien@danjou.info>
committer: Katsumi Yamaoka <yamaoka@jpl.org>
branch nick: trunk
timestamp: Thu 2010-12-23 22:24:24 +0000
message:
  gnus-gravatar.el (gnus-gravatar-transform-address): Set `mail-extr-ignore-realname-equals-mailbox-name' to nil when extracting the addresses, otherwise we might misplaced the gravatar.
diff:
=== modified file 'lisp/gnus/ChangeLog'
--- lisp/gnus/ChangeLog	2010-12-22 07:04:25 +0000
+++ lisp/gnus/ChangeLog	2010-12-23 22:24:24 +0000
@@ -1,3 +1,9 @@
+2010-12-23  Julien Danjou  <julien@danjou.info>
+
+	* gnus-gravatar.el (gnus-gravatar-transform-address): Set
+	`mail-extr-ignore-realname-equals-mailbox-name' to nil when extracting
+	the addresses, otherwise we might misplaced the gravatar.
+
 2010-12-21  Daiki Ueno  <ueno@unixuser.org>
 
 	* mml1991.el (pgg-sign-region, pgg-encrypt-region):

=== modified file 'lisp/gnus/gnus-gravatar.el'
--- lisp/gnus/gnus-gravatar.el	2010-12-17 22:45:16 +0000
+++ lisp/gnus/gnus-gravatar.el	2010-12-23 22:24:24 +0000
@@ -54,6 +54,7 @@
 (defun gnus-gravatar-transform-address (header category &optional force)
   (gnus-with-article-headers
     (let* ((mail-extr-disable-voodoo t)
+           (mail-extr-ignore-realname-equals-mailbox-name nil)
 	   (addresses (mail-extract-address-components
 		       (or (mail-fetch-field header) "") t))
 	   (gravatar-size (or gnus-gravatar-size gravatar-size))