# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1273704047 0
# Node ID cf6250d3887539c5052926645ee808b7189e59e5
# Parent  4e5c3f6510c751500ac79115c8a7c134a756d397# Parent  24e2a1f40d573c37e3ac4a2790b6d7d7e7ee8e12
Merge from mainline.

diff -r 4e5c3f6510c7 -r cf6250d38875 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed May 12 08:24:25 2010 +0000
+++ b/lisp/ChangeLog	Wed May 12 22:40:47 2010 +0000
@@ -1,3 +1,8 @@
+2010-05-12  Alan Mackenzie  <acm@muc.de>
+
+	* progmodes/cc-cmds.el (c-beginning-of-defun, c-end-of-defun):
+	Push the mark at the start of these functions when appropriate.
+
 2010-05-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* minibuffer.el (completion-cycle-threshold): New custom var.
diff -r 4e5c3f6510c7 -r cf6250d38875 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Wed May 12 08:24:25 2010 +0000
+++ b/lisp/gnus/ChangeLog	Wed May 12 22:40:47 2010 +0000
@@ -1,3 +1,8 @@
+2010-05-12  Andreas Seltenreich  <seltenreich@gmx.de>
+
+	* gnus-sum.el (gnus-summary-read-group-1): Don't jump to next group
+	when catching the `C-g'.  Reported by: "Leo"
+
 2010-05-12  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* message.el (message-forward-make-body-plain)
diff -r 4e5c3f6510c7 -r cf6250d38875 lisp/gnus/gnus-sum.el
--- a/lisp/gnus/gnus-sum.el	Wed May 12 08:24:25 2010 +0000
+++ b/lisp/gnus/gnus-sum.el	Wed May 12 22:40:47 2010 +0000
@@ -3931,7 +3931,6 @@
 	  (progn
 	    (set-buffer gnus-group-buffer)
 	    (gnus-group-jump-to-group group)
-	    (gnus-group-next-unread-group 1)
 	    (gnus-configure-windows 'group 'force))
 	(gnus-handle-ephemeral-exit quit-config))
       ;; Finally signal the quit.
diff -r 4e5c3f6510c7 -r cf6250d38875 lisp/progmodes/cc-cmds.el
--- a/lisp/progmodes/cc-cmds.el	Wed May 12 08:24:25 2010 +0000
+++ b/lisp/progmodes/cc-cmds.el	Wed May 12 22:40:47 2010 +0000
@@ -1501,6 +1501,11 @@
   (interactive "p")
   (or arg (setq arg 1))
 
+  (or (not (eq this-command 'c-beginning-of-defun))
+      (eq last-command 'c-beginning-of-defun)
+      (and transient-mark-mode mark-active)
+      (push-mark))
+
   (c-save-buffer-state
       (beginning-of-defun-function end-of-defun-function
        (start (point))
@@ -1604,6 +1609,11 @@
   (interactive "p")
   (or arg (setq arg 1))
 
+  (or (not (eq this-command 'c-end-of-defun))
+      (eq last-command 'c-end-of-defun)
+      (and transient-mark-mode mark-active)
+      (push-mark))
+
   (c-save-buffer-state
       (beginning-of-defun-function end-of-defun-function
        (start (point))