Index: modules/poll/poll.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.module,v
retrieving revision 1.295
diff -u -p -r1.295 poll.module
--- modules/poll/poll.module	25 May 2009 10:43:52 -0000	1.295
+++ modules/poll/poll.module	27 May 2009 14:35:41 -0000
@@ -641,7 +645,7 @@ function poll_view_voting_validate($form
 }
 
 /**
- * Submit handler for processing a vote
+ * Submit handler for processing a vote.
  */
 function poll_vote($form, &$form_state) {
   $node = $form['#node'];
@@ -773,7 +777,7 @@ function theme_poll_choices($form) {
 function template_preprocess_poll_results(&$variables) {
   $variables['links'] = theme('links', $variables['raw_links']);
   if (isset($variables['vote']) && $variables['vote'] > -1 && user_access('cancel own vote')) {
-    $variables['cancel_form'] = drupal_get_form('poll_cancel_form', $variables['nid']);
+    $variables['cancel_form'] = drupal_render(drupal_get_form('poll_cancel_form', $variables['nid']));
   }
   $variables['title'] = check_plain($variables['raw_title']);
 
@@ -822,7 +826,7 @@ function poll_cancel_form(&$form_state, 
 }
 
 /**
- * Submit callback for poll_cancel_form
+ * Submit callback for poll_cancel_form().
  */
 function poll_cancel($form, &$form_state) {
   global $user;
@@ -838,6 +842,8 @@ function poll_cancel($form, &$form_state
     ->expression('chvotes', 'chvotes - 1')
     ->condition('chid', $node->vote)
     ->execute();
+
+  drupal_set_message(t('Your vote was cancelled.'));
 }
 
 /**
Index: modules/poll/poll.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.pages.inc,v
retrieving revision 1.17
diff -u -p -r1.17 poll.pages.inc
--- modules/poll/poll.pages.inc	22 May 2009 11:33:17 -0000	1.17
+++ modules/poll/poll.pages.inc	27 May 2009 14:35:41 -0000
@@ -42,7 +42,7 @@ function poll_page() {
     $output .= '<li>' . l($node->title, "node/$node->nid") . ' - ' . format_plural($node->votes, '1 vote', '@count votes') . ' - ' . ($node->active ? t('open') : t('closed')) . '</li>';
   }
   $output .= '</ul>';
-  $output .= theme("pager", NULL, $polls_per_page);
+  $output .= theme("pager", NULL);
   return $output;
 }