Mercurial > emacs
diff lisp/progmodes/python.el @ 90200:f9a65d7ebd29
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-68
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 459-473)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 86-87)
- Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Thu, 07 Jul 2005 12:43:14 +0000 |
| parents | bb71c6cf2009 18a818a2ee7c |
| children | a3716f7538f2 |
line wrap: on
line diff
--- a/lisp/progmodes/python.el Thu Jun 30 00:31:46 2005 +0000 +++ b/lisp/progmodes/python.el Thu Jul 07 12:43:14 2005 +0000 @@ -21,8 +21,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -70,7 +70,7 @@ (autoload 'compilation-start "compile") (defgroup python nil - "Silly walks in the Python language" + "Silly walks in the Python language." :group 'languages :version "22.1" :link '(emacs-commentary-link "python")) @@ -1067,7 +1067,7 @@ ;; Still required by `comint-redirect-send-command', for instance ;; (and we need to match things like `>>> ... >>> '): (set (make-local-variable 'comint-prompt-regexp) - (rx (and line-start (1+ (and (repeat 3 (any ">.")) ?\ ))))) + (rx (and line-start (1+ (and (repeat 3 (any ">.")) ?\s))))) (set (make-local-variable 'compilation-error-regexp-alist) python-compilation-regexp-alist) (compilation-shell-minor-mode 1))
