diff options
| author | Tom Tromey | 2013-07-06 23:18:58 -0600 |
|---|---|---|
| committer | Tom Tromey | 2013-07-06 23:18:58 -0600 |
| commit | 6dacdad5fcb278e5a16b38bb81786aac9ca27be4 (patch) | |
| tree | f5f331ea361ba0f99e0f9b638d183ad492a7da31 /lisp/progmodes/python.el | |
| parent | 0a6f2ff0c8ceb29703e76cddd46ea3f176dd873a (diff) | |
| parent | 219afb88d9d484393418820d1c08dc93299110ec (diff) | |
| download | emacs-6dacdad5fcb278e5a16b38bb81786aac9ca27be4.tar.gz emacs-6dacdad5fcb278e5a16b38bb81786aac9ca27be4.zip | |
merge from trunk
this merges frmo trunk and fixes various build issues.
this needed a few ugly tweaks.
this hangs in "make check" now
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) |