# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: pj@irregularexpressions.net-20110130045542-\
#   nuvqsje84yncvflq
# target_branch: bzr://bzr.savannah.gnu.org/emacs/trunk/
# testament_sha1: b4d2fcdcc523cadc51d5f47e1965a9610cfcb2db
# timestamp: 2011-01-29 20:56:16 -0800
# base_revision_id: schwab@linux-m68k.org-20110130003535-\
#   jminwifpi767oiw5
# 
# Begin patch
=== modified file 'lisp/emulation/pc-select.el'
--- lisp/emulation/pc-select.el	2011-01-25 04:08:28 +0000
+++ lisp/emulation/pc-select.el	2011-01-30 04:55:42 +0000
@@ -366,8 +366,11 @@
 If scan reaches end of buffer, stop there without error."
   (interactive "p")
   (pc-select-ensure-mark)
-  (end-of-line arg)
-  (setq this-command 'end-of-line))
+  (let ((eol-command (if visual-line-mode
+                         'end-of-visual-line
+                       'end-of-line)))
+    (funcall eol-command arg)
+    (setq this-command eol-command)))
 
 (defun backward-line-mark (&optional arg)
   "Ensure mark is active; move cursor vertically up ARG lines."
@@ -501,8 +504,11 @@
 If scan reaches end of buffer, stop there without error."
   (interactive "p")
   (pc-select-maybe-deactivate-mark)
-  (end-of-line arg)
-  (setq this-command 'end-of-line))
+  (let ((eol-command (if visual-line-mode
+                         'end-of-visual-line
+                       'end-of-line)))
+    (funcall eol-command arg)
+    (setq this-command eol-command)))
 
 (defun backward-line-nomark (&optional arg)
   "Deactivate mark; move cursor vertically up ARG lines."
@@ -628,8 +634,9 @@
 If scan reaches end of buffer, stop there without error."
   (interactive "p")
   (pc-select-ensure-mark)
-  (beginning-of-line arg))
-
+  (if visual-line-mode
+      (beginning-of-visual-line arg)
+    (beginning-of-line arg)))
 
 (defun scroll-up-mark (&optional arg)
   "Ensure mark is active; scroll upward ARG lines; or near full screen if no ARG.
@@ -728,7 +735,9 @@
 If scan reaches end of buffer, stop there without error."
   (interactive "p")
   (pc-select-maybe-deactivate-mark)
-  (beginning-of-line arg))
+  (if visual-line-mode
+      (beginning-of-visual-line arg)
+    (beginning-of-line arg)))
 
 (defun scroll-up-nomark (&optional arg)
   "Deactivate mark; scroll upward ARG lines; or near full screen if no ARG.

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRC6JvgAAed/gFAQCgBQ4//3
UhJAgL////BQBD5T3uvBYo9T2u73CSSNGiZTTwJoAp6eqe1Gp6R6j1DE9IMoJhNqaaJ6U9IeiAAA
ABoMSaJo0pjQj1B6Jo9IAAAGgilGqeKeieET1GR6QGQAAAAkkTETKeQmeoaTRhAxAAAQAw3lYeef
1M04C3ipM5mIQotSMsIPjeRqjCNoCHAHwOOBBxl4aWGYPXxKaJFljmeQGTDWtzs+2mz7/y3CNPGO
rdiId27xSXTNBg1nYJIe2zPTfXNNzHMLabjUbTcdQ4ekxuDQMMXOFjHmc+tmMoDYLXVEgExiUdae
GQGR+qsItp2CvVpcDG411hLyxqtblv4nf1X5b5B0QdsOyOVsYGx0wJtKSfccbmALQrF4csGUjUwe
D1PWK2YRUMYeCIGAv1ZKBFCkT5J3wbz1V9I0HWdQosUfxQ8LPtzvvWYnVt8aWUgsaVNY0xSp9IjO
VEBomJ13xJCixsTQdXHOWDYHJ+edkomIZeL2o9H5yMBguRiDHeXZA5qBy+hV8LQ8TSiHLAGoyvkV
sGDDgWwBugNTweS12InsfQfwUrafIz1YC5eLILi3IOfS9wEXxH6W1oYB4SsVBa8WjQppsS1EPCJU
GsaHjadSsQ5wZSvBdoCgcIPddbN9rIxL4KadBZRpVruqIzQZzsVS8OhIyngxIKc5YasxaWYBpCYE
5Klvmktt2i1m0rZ6vCWH6TqMaIJL5a3aNCKhgy5xm4siDSaMB5skK/nFU5e+fP5hzQcuJCx+ouYG
Y8aEeSUYo07HE4DSpjqGeKGv5W5KgxxbltiLC+N19KpdkBTmMAlQmZJqYbyJEHp6ZyafsAogsgsE
nmdYmEAgFexKzXLP0At47OQWc+tNZIMXBwbkXKRb9Eyw8G6VzBxSt79F60zN4+zjeHrj7h8Um1Ms
h4a9+51mbjx4TpNuNCXeUekTLVLAKPIBrdiu5ehvGUDRwvwFY4hImwK0h4ZI8Aqj7xJWm0mGB5dQ
rhRoNCqLN/8mhcGY8FNUGS8OZCtrDeE8aqrkuU9rMIuS9C7ShVS7VLRoScK5YYZJ1t+kKi1VivQO
B3TYEKA7gNScG28woU1Ws9OnUKuSfMDKqcOm46OKlBBUKUjFTAOLD53EvYTCKApCIRo7FmSvSFU4
amhaUnhvpGdDPM2jmcBWpRWb9iCYWTJQPoFQZ6VwjWyq6q/BmX1d2dGUVsiRFGvJo+FlgWEPAxsH
RjDYGbBZJlWvjzjkzQMwIw2wA3mnwkxjFHgcZSXxhWateAUMQzC2ISSd3CqXbgQSCSBnFzCssT3v
mVs+rETwYnkV1QMSQCGQVY5ZjsK3ECfKTt2mFjiB2GazcDcDALkxG15mllixc0NQm46x6Z8MhN/i
7kinChICF0TfAA==