[PATCH] Fix "Error during redisplay" from which-func.el

[Takafumi Arakaki <aka.tkf@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 370 bytes --]

Hi,

This patch should fix the following error when there is no function
defined at point.

Error during redisplay: (eval (replace-regexp-in-string "%" "%%"
(gethash (selected-window) which-func-table which-func-unknown)))
signaled (wrong-type-argument arrayp nil)

I get this error at point in python file when there is no function
defined before the cursor.

Takafumi

[-- Attachment #2: which-func-current-safer.patch --]
[-- Type: application/octet-stream, Size: 595 bytes --]

diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el
index 4819149..1dd56c6 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)
+	       which-func-unknown))))
 ;;;###autoload (put 'which-func-current 'risky-local-variable t)
 
 (defvar which-func-mode nil