[Emacs-diffs] /srv/bzr/emacs/trunk r110618: * lisp/progmodes/which-func.el (which-func-current): The hash-table may have

[Stefan Monnier]

------------------------------------------------------------
revno: 110618
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12338
author: Takafumi Arakaki <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2012-10-22 09:29:28 -0400
message:
  * lisp/progmodes/which-func.el (which-func-current): The hash-table may have
  an explicit nil.
modified:
  lisp/ChangeLog
  lisp/progmodes/which-func.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-22 12:43:54 +0000
+++ b/lisp/ChangeLog    2012-10-22 13:29:28 +0000
@@ -1,3 +1,8 @@
+2012-10-22  Takafumi Arakaki  <address@hidden>  (tiny change)
+
+       * progmodes/which-func.el (which-func-current): The hash-table may have
+       an explicit nil (bug#12338).
+
 2012-10-22  Stefan Monnier  <address@hidden>
 
        * electric.el (electric-pair-delete-selection-self-insert-function):

=== modified file 'lisp/progmodes/which-func.el'
--- a/lisp/progmodes/which-func.el      2012-09-25 04:13:02 +0000
+++ b/lisp/progmodes/which-func.el      2012-10-22 13:29:28 +0000
@@ -182,7 +182,8 @@
 (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