diff options
| author | Paul Eggert | 2012-01-09 09:36:10 -0800 |
|---|---|---|
| committer | Paul Eggert | 2012-01-09 09:36:10 -0800 |
| commit | 35cf62d95cdcd5323dcea4a5385942c342ff1d9c (patch) | |
| tree | 90358cbb033a126c4d48793a80fd804b7baaca24 /lisp/progmodes/python.el | |
| parent | 59815c02506eb39b61e672528ed03885749ba529 (diff) | |
| parent | 7655cb66d86564e792b825f1a0e1a4de7d6e6db5 (diff) | |
| download | emacs-35cf62d95cdcd5323dcea4a5385942c342ff1d9c.tar.gz emacs-35cf62d95cdcd5323dcea4a5385942c342ff1d9c.zip | |
Merge from trunk.
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index fbf7c3c42f7..0c29891cd92 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -1,6 +1,6 @@ | |||
| 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-2011 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2003-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Dave Love <fx@gnu.org> | 5 | ;; Author: Dave Love <fx@gnu.org> |
| 6 | ;; Maintainer: FSF | 6 | ;; Maintainer: FSF |
| @@ -2343,7 +2343,7 @@ Interactively, prompt for the name with completion." | |||
| 2343 | ;;;; Bicycle Repair Man support | 2343 | ;;;; Bicycle Repair Man support |
| 2344 | 2344 | ||
| 2345 | (autoload 'pymacs-load "pymacs" nil t) | 2345 | (autoload 'pymacs-load "pymacs" nil t) |
| 2346 | (autoload 'brm-init "bikemacs") | 2346 | (autoload 'brm-init "bikeemacs") |
| 2347 | (defvar brm-menu) | 2347 | (defvar brm-menu) |
| 2348 | 2348 | ||
| 2349 | ;; I'm not sure how useful BRM really is, and it's certainly dangerous | 2349 | ;; I'm not sure how useful BRM really is, and it's certainly dangerous |