diff options
| author | Joakim Verona | 2013-07-02 22:46:17 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-07-02 22:46:17 +0200 |
| commit | 3718127221fbbc31f8ebd027ab7c95403dbe9118 (patch) | |
| tree | ef422898f3344c8f94f6ecf63eb583122bbf2bd8 /lisp/progmodes/python.el | |
| parent | 1ce45b902c67b8a0dda8d71bd2812de29a9988a6 (diff) | |
| parent | a3b49114c186d84404226af75ae7905bd1cd018f (diff) | |
| download | emacs-3718127221fbbc31f8ebd027ab7c95403dbe9118.tar.gz emacs-3718127221fbbc31f8ebd027ab7c95403dbe9118.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/window.c
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index ccb2dcba42e..915b52ce04d 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -2881,6 +2881,8 @@ The skeleton will be bound to python-skeleton-NAME." | |||
| 2881 | (when module-file | 2881 | (when module-file |
| 2882 | (substring-no-properties module-file 1 -1)))))) | 2882 | (substring-no-properties module-file 1 -1)))))) |
| 2883 | 2883 | ||
| 2884 | (defvar ffap-alist) | ||
| 2885 | |||
| 2884 | (eval-after-load "ffap" | 2886 | (eval-after-load "ffap" |
| 2885 | '(progn | 2887 | '(progn |
| 2886 | (push '(python-mode . python-ffap-module-path) ffap-alist) | 2888 | (push '(python-mode . python-ffap-module-path) ffap-alist) |