Mercurial > emacs

comparison lisp/progmodes/python.el @ 112228:417b1e4d63cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs-23
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 14 Jan 2011 12:18:41 -0500
parents b47e85affa59 02196c405b19
children
comparison
equal deleted inserted replaced
112227:07e52ed69b5d 112228:417b1e4d63cd
1 ;;; python.el --- silly walks for Python -*- coding: iso-8859-1 -*- 1 ;;; python.el --- silly walks for Python -*- coding: iso-8859-1 -*-
2 2
3 ;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 3 ;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
4 ;; Free Software Foundation, Inc. 4 ;; Free Software Foundation, Inc.
5 5
6 ;; Author: Dave Love <fx@gnu.org> 6 ;; Author: Dave Love <fx@gnu.org>
7 ;; Maintainer: FSF 7 ;; Maintainer: FSF
8 ;; Created: Nov 2003 8 ;; Created: Nov 2003
2547 '((< '(backward-delete-char-untabify (min python-indent 2547 '((< '(backward-delete-char-untabify (min python-indent
2548 (current-column)))) 2548 (current-column))))
2549 (^ '(- (1+ (current-indentation)))))) 2549 (^ '(- (1+ (current-indentation))))))
2550 ;; Python defines TABs as being 8-char wide. 2550 ;; Python defines TABs as being 8-char wide.
2551 (set (make-local-variable 'tab-width) 8) 2551 (set (make-local-variable 'tab-width) 8)
2552 (unless font-lock-mode (font-lock-mode 1))
2553 (when python-guess-indent (python-guess-indent)) 2552 (when python-guess-indent (python-guess-indent))
2554 ;; Let's make it harder for the user to shoot himself in the foot. 2553 ;; Let's make it harder for the user to shoot himself in the foot.
2555 (unless (= tab-width python-indent) 2554 (unless (= tab-width python-indent)
2556 (setq indent-tabs-mode nil)) 2555 (setq indent-tabs-mode nil))
2557 (set (make-local-variable 'python-command) python-python-command) 2556 (set (make-local-variable 'python-command) python-python-command)