2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1b680eadc08..e208b06189e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-22  Takafumi Arakaki  <aka.tkf@gmail.com>  (tiny change)
+
+        * progmodes/which-func.el (which-func-current): The hash-table may have
+        an explicit nil (bug#12338).
+
 2012-10-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * electric.el (electric-pair-delete-selection-self-insert-function):
diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el
index 4819149bdf6..c2ce12b6ad4 100644
--- a/lisp/progmodes/which-func.el
+++ b/lisp/progmodes/which-func.el
@@ -182,7 +182,8 @@ and you want to simplify them for the mode line
 (defconst which-func-current
   '(:eval (replace-regexp-in-string
            "%" "%%"
-           (gethash (selected-window) which-func-table which-func-unknown))))
+           (or (gethash (selected-window) which-func-table)
+               which-func-unknown))))
 ;;;###autoload (put 'which-func-current 'risky-local-variable t)
 
 (defvar which-func-mode nil