diff --git a/emacs.spec b/emacs.spec
index 3e4edcb..734e23f 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -1,7 +1,7 @@
 Summary: The libraries needed to run the GNU Emacs text editor.
 Name: emacs
 Version: 21.2
-Release: 16
+Release: 17
 License: GPL
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -229,6 +229,8 @@ fi
 /usr/share/emacs/site-lisp/site-start.d/php-mode-init.el
 /usr/share/emacs/site-lisp/site-start.d/po-mode-init.el
 /usr/share/emacs/site-lisp/lang
+/usr/share/emacs/%{version}/site-lisp/subdirs.el
+
 %dir /usr/share/emacs
 %dir /usr/share/emacs/site-lisp
 %dir /usr/share/emacs/%{version}
@@ -255,6 +257,9 @@ fi
 %dir /usr/share/emacs/%{version}/leim
 
 %changelog
+* Tue Aug 27 2002 Trond Eivind Glomsr�d <teg@redhat.com> 21.2-17
+- Fix gdb arrow when used in non-windowed mode (#56890)
+
 * Fri Aug  9 2002 Trond Eivind Glomsr�d <teg@redhat.com> 21.2-16
 - Handle UTF-8 input (#70855).
 
diff --git a/python-mode.el b/python-mode.el
index 7740cef..95f698d 100644
--- a/python-mode.el
+++ b/python-mode.el
@@ -8,7 +8,7 @@
 ;; Created:    Feb 1992
 ;; Keywords:   python languages oop
 
-(defconst py-version "$Revision: 4.6 $"
+(defconst py-version "$Revision: 4.6.18.2 $"
   "`python-mode' version number.")
 
 ;; This software is provided as-is, without express or implied
@@ -184,8 +184,8 @@ indentation is used as a hint for this line's indentation.  Lines that
 begin with `py-block-comment-prefix' are ignored for indentation
 purposes.
 
-When not nil or t, comment lines that begin with a `#' are used as
-indentation hints, unless the comment character is in column zero."
+When not nil or t, comment lines that begin with a single `#' are used
+as indentation hints, unless the comment character is in column zero."
   :type '(choice
 	  (const :tag "Skip all comment lines (fast)" nil)
 	  (const :tag "Single # `sets' indentation for next line" t)
@@ -204,13 +204,14 @@ indentation hints, unless the comment character is in column zero."
     (or (funcall ok (getenv "TMPDIR"))
 	(funcall ok "/usr/tmp")
 	(funcall ok "/tmp")
+	(funcall ok "/var/tmp")
 	(funcall ok  ".")
 	(error
 	 "Couldn't find a usable temp directory -- set `py-temp-directory'")))
-  "*Directory used for temp files created by a *Python* process.
+  "*Directory used for temporary files created by a *Python* process.
 By default, the first directory from this list that exists and that you
-can write into:  the value (if any) of the environment variable TMPDIR,
-/usr/tmp, /tmp, or the current directory."
+can write into: the value (if any) of the environment variable TMPDIR,
+/usr/tmp, /tmp, /var/tmp, or the current directory."
   :type 'string
   :group 'python)
 
@@ -1108,7 +1109,7 @@ This function is appropriate for `comint-output-filter-functions'."
 	 (setq overlay-arrow-string "=>")
 	 (set-marker overlay-arrow-position (py-point 'bol) (current-buffer))
 	 (setq py-pdbtrack-is-tracking-p t))
-	(overlay-arrow-position
+	(py-pdbtrack-is-tracking-p
 	 (setq overlay-arrow-position nil)
 	 (setq py-pdbtrack-is-tracking-p nil))
 	))
@@ -1902,7 +1903,11 @@ dedenting."
 			     (and (not (eq py-honor-comment-indentation t))
 				  (save-excursion
 				    (back-to-indentation)
-				    (not (zerop (current-column)))))
+				    (and (not (looking-at prefix-re))
+					 (or (looking-at "[^#]")
+					     (not (zerop (current-column)))
+					     ))
+				    ))
 			     ))
 	      )))
 	;; if we landed inside a string, go to the beginning of that