--- a/.emacs-my	Sun Jan 13 16:31:05 2013 +0200
+++ b/.emacs-my	Sun Jan 27 21:51:57 2013 +0200
@@ -876,8 +876,8 @@
 (defun my-file-name-tmp-p (file)
   (string-match
    `,(concat
-    "\\(?:^#.*#\\|~\\|^.?\\.diff\\|"
-    "\\." (regexp-opt '("base" "local" "orig" "other" "log" "stackdump" "rej"))
+    "\\(?:^#.*#\\|~\\|"
+    "\\." (regexp-opt '("base" "local" "orig" "other" "rej" "diff" "log" "stackdump" "pyc" "pyo"))
     "\\)\\'")
    (or (and (file-directory-p file) "") (file-name-nondirectory file))))
 
@@ -2295,6 +2295,7 @@
 (setq python-indent 4)
 
 (eval-after-load 'python-mode
+  (define-key inferior-python-mode-map "\C-c\C-f" 'python-describe-symbol)
   (when (and (boundp 'py-version) (equal py-version "5.1.0"))
     (setq-default py-which-shell py-python-command)
     ;; (py-toggle-shells 'cpython)