Mercurial > cpython-lru_cache-weakref

diff Misc/python-mode.el @ 8924:0954ad4acdfd legacy-trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(py-compute-indentation): Changes to the `t' condition which affect indetnation of normal statements: The regular expression that searches for indenting comment lines has been changed to not require a space/tab after the first `#'. We then explicitly look for py-block-comment-prefix depending on the value of py-honor-comment-indentation. I think this more accurately reflects the documentation for py-honor-comment-indentation.
author Barry Warsaw <barry@python.org>
date Mon, 10 Aug 1998 21:44:37 +0000
parents 9a984276cc56
children be935851dc50
line wrap: on
line diff
--- a/Misc/python-mode.el	Mon Aug 10 20:15:32 1998 +0000
+++ b/Misc/python-mode.el	Mon Aug 10 21:44:37 1998 +0000
@@ -305,9 +305,9 @@
 
 (defcustom py-jump-on-exception t
   "*Jump to innermost exception frame in *Python Output* buffer.
-When this variable is non-nil and ane exception occurs when running
+When this variable is non-nil and an exception occurs when running
 Python code synchronously in a subprocess, jump immediately to the
-source code of the innermost frame."
+source code of the innermost traceback frame."
   :type 'boolean
   :group 'python)
 
@@ -1506,7 +1506,7 @@
     (message "Jumping to exception in file %s on line %d" file line)))
 
 (defun py-mouseto-exception (event)
-  "Jump to the code which cased the Python exception at EVENT.
+  "Jump to the code which caused the Python exception at EVENT.
 EVENT is usually a mouse click."
   (interactive "e")
   (cond
@@ -1841,12 +1841,18 @@
 	    (forward-comment (- (point-max)))
 	  (let (done)
 	    (while (not done)
-	      (re-search-backward "^[ \t]*\\([^ \t\n#]\\|#[ \t\n]\\)"
-				  nil 'move)
-	      (setq done (or (eq py-honor-comment-indentation t)
-			     (bobp)
-			     (/= (following-char) ?#)
-			     (not (zerop (current-column)))))
+	      (re-search-backward "^[ \t]*\\([^ \t\n#]\\|#\\)" nil 'move)
+	      (setq done (or (bobp)
+			     (and (eq py-honor-comment-indentation t)
+				  (save-excursion
+				    (back-to-indentation)
+				    (not (looking-at py-block-comment-prefix))
+				    ))
+			     (and (not (eq py-honor-comment-indentation t))
+				  (save-excursion
+				    (back-to-indentation)
+				    (not (zerop (current-column)))))
+			     ))
 	      )))
 	;; if we landed inside a string, go to the beginning of that
 	;; string. this handles triple quoted, multi-line spanning