Index: pathauto.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/pathauto.admin.inc,v
retrieving revision 1.43
diff -u -p -r1.43 pathauto.admin.inc
--- pathauto.admin.inc	26 Oct 2010 20:56:14 -0000	1.43
+++ pathauto.admin.inc	14 Dec 2010 18:58:45 -0000
@@ -165,30 +165,17 @@ function pathauto_settings_form($form) {
       PATHAUTO_UPDATE_ACTION_NO_NEW => t('Do nothing. Leave the old alias intact.'),
       PATHAUTO_UPDATE_ACTION_LEAVE => t('Create a new alias. Leave the existing alias functioning.'),
       PATHAUTO_UPDATE_ACTION_DELETE => t('Create a new alias. Delete the old alias.'),
-      PATHAUTO_UPDATE_ACTION_REDIRECT => t('Create a new alias. Redirect from old alias.'),
     ),
     '#description' => t('What should Pathauto do when updating an existing content item which already has an alias?'),
   );
-  if (!module_exists('path_redirect')) {
-    // Remove the redirection option if Path redirect is not enabled.
-    unset($form['pathauto_update_action']['#options'][PATHAUTO_UPDATE_ACTION_REDIRECT]);
-    if (variable_get('pathauto_update_action', NULL) == PATHAUTO_UPDATE_ACTION_REDIRECT) {
-      // Fix the current update action variable as well.
-      variable_set('pathauto_update_action', PATHAUTO_UPDATE_ACTION_DELETE);
-    }
-  }
 
   $form['pathauto_transliterate'] = array(
     '#type' => 'checkbox',
     '#title' => t('Transliterate prior to creating alias'),
-    '#default_value' => variable_get('pathauto_transliterate', FALSE),
+    '#default_value' => variable_get('pathauto_transliterate', FALSE) && module_exists('transliteration'),
     '#description' => t('When a pattern includes certain characters (such as those with accents) should Pathauto attempt to transliterate them into the ASCII-96 alphabet? Transliteration is handled by the Transliteration module.'),
+    '#access' => module_exists('transliteration'),
   );
-  if (!module_exists('transliteration')) {
-    // Remove the redirection option if Transliteration is not enabled.
-    $form['pathauto_transliterate']['#access'] = FALSE;
-    variable_set('pathauto_transliterate', FALSE);
-  }
 
   $form['pathauto_reduce_ascii'] = array(
     '#type' => 'checkbox',
Index: pathauto.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/pathauto.inc,v
retrieving revision 1.93
diff -u -p -r1.93 pathauto.inc
--- pathauto.inc	11 Nov 2010 17:39:05 -0000	1.93
+++ pathauto.inc	14 Dec 2010 18:58:45 -0000
@@ -39,13 +39,6 @@ define('PATHAUTO_UPDATE_ACTION_LEAVE', 1
 define('PATHAUTO_UPDATE_ACTION_DELETE', 2);
 
 /**
- * "Create a new alias. Redirect from old alias."
- *
- * This is only available when the Path Redirect module is.
- */
-define('PATHAUTO_UPDATE_ACTION_REDIRECT', 3);
-
-/**
  * Remove the punctuation from the alias.
  */
 define('PATHAUTO_PUNCTUATION_REMOVE', 0);
@@ -80,20 +73,7 @@ function _pathauto_alias_exists($alias, 
     ':language_none' => LANGUAGE_NONE,
   ))->fetchField();
 
-  if (module_exists('path_redirect') && function_exists('path_redirect_delete_multiple')) {
-    // Delete from path_redirect the exact same alias to the same node.
-    path_redirect_delete_multiple(NULL, array('source' => $alias, 'redirect' => $source));
-
-    // If there still is this alias used in path_redirect, then create a different alias.
-    $redirects = path_redirect_load_multiple(NULL, array('source' => $alias));
-  }
-
-  if ($pid || !empty($redirects)) {
-    return TRUE;
-  }
-  else {
-    return FALSE;
-  }
+  return !empty($pid);
 }
 
 /**
@@ -472,7 +452,7 @@ function _pathauto_set_alias(array $path
 
   // Skip replacing the current alias with an identical alias
   if (empty($existing_alias) || $existing_alias['alias'] != $path['alias']) {
-    $path += array('pathauto' => TRUE);
+    $path += array('pathauto' => TRUE, 'original' => $existing_alias);
 
     // If there is already an alias, respect some update actions.
     if (!empty($existing_alias)) {
@@ -484,20 +464,8 @@ function _pathauto_set_alias(array $path
           // Create a new alias instead of overwriting the existing by leaving
           // $path['pid'] empty.
           break;
-        case PATHAUTO_UPDATE_ACTION_REDIRECT:
-          // Create a redirect
-          if (module_exists('path_redirect') && function_exists('path_redirect_save')) {
-            $redirect = array(
-              'source' => $existing_alias['alias'],
-              'redirect' => $path['source'],
-            );
-            path_redirect_save($redirect);
-          }
-          // Intentionally fall through to the next condition since we still
-          // want to replace the existing alias.
         case PATHAUTO_UPDATE_ACTION_DELETE:
-          // Both the redirect and delete actions should overwrite the existing
-          // alias.
+          // The delete actions should overwrite the existing alias.
           $path['pid'] = $existing_alias['pid'];
           break;
       }
@@ -507,10 +475,7 @@ function _pathauto_set_alias(array $path
     path_save($path);
 
     if ($verbose) {
-      if (!empty($redirect)) {
-        _pathauto_verbose(t('Created new alias %alias for %source, replacing %old_alias. %old_alias now redirects to %alias.', array('%alias' => $path['alias'], '%source' => $path['source'], '%old_alias' => $existing_alias['alias'])));
-      }
-      elseif (!empty($existing_alias['pid'])) {
+      if (!empty($existing_alias['pid'])) {
         _pathauto_verbose(t('Created new alias %alias for %source, replacing %old_alias.', array('%alias' => $path['alias'], '%source' => $path['source'], '%old_alias' => $existing_alias['alias'])));
       }
       else {
Index: pathauto.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/pathauto.info,v
retrieving revision 1.13
diff -u -p -r1.13 pathauto.info
--- pathauto.info	11 Aug 2010 17:30:01 -0000	1.13
+++ pathauto.info	14 Dec 2010 18:58:45 -0000
@@ -11,4 +11,4 @@ files[] = pathauto.install
 files[] = pathauto.test
 files[] = pathauto.pathauto.inc
 configure = admin/config/search/path/patterns
-recommends[] = path_redirect
+recommends[] = redirect