[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107985: Don't add modes to which-func-modes if already set to t.

[Juanma Barranquero]

------------------------------------------------------------
revno: 107985
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Sat 2012-04-21 18:57:49 +0200
message:
  Don't add modes to which-func-modes if already set to t.
  
  * lisp/progmodes/verilog-mode.el (verilog-mode): Check whether
    which-func-modes is t before adding verilog-mode.
    Reported by Andy Moreton <address@hidden>.
  
  * lisp/mh-e/mh-folder.el (top): Check whether which-func-modes
    is t before adding mh-folder-mode.
modified:
  lisp/ChangeLog
  lisp/mh-e/ChangeLog
  lisp/mh-e/mh-folder.el
  lisp/progmodes/verilog-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-04-21 14:12:27 +0000
+++ b/lisp/ChangeLog    2012-04-21 16:57:49 +0000
@@ -1,7 +1,12 @@
+2012-04-21  Juanma Barranquero  <address@hidden>
+
+       * progmodes/verilog-mode.el (verilog-mode): Check whether
+       which-func-modes is t before adding verilog-mode.
+       Reported by Andy Moreton <address@hidden>.
+
 2012-04-21  Leo Liu  <address@hidden>
 
-       * net/rcirc.el (rcirc): Avoid error when process-contact returns
-       t.
+       * net/rcirc.el (rcirc): Avoid error when process-contact returns t.
 
 2012-04-21  Michael Vehrs  <address@hidden>
 

=== modified file 'lisp/mh-e/ChangeLog'
--- a/lisp/mh-e/ChangeLog       2012-02-09 07:48:22 +0000
+++ b/lisp/mh-e/ChangeLog       2012-04-21 16:57:49 +0000
@@ -1,3 +1,8 @@
+2012-04-21  Juanma Barranquero  <address@hidden>
+
+       * mh-folder.el (top): Check whether which-func-modes is t before
+       adding mh-folder-mode.
+
 2011-11-20  Bill Wohler  <address@hidden>
 
        * Release MH-E version 8.3.1.

=== modified file 'lisp/mh-e/mh-folder.el'
--- a/lisp/mh-e/mh-folder.el    2012-01-19 07:21:25 +0000
+++ b/lisp/mh-e/mh-folder.el    2012-04-21 16:57:49 +0000
@@ -520,7 +520,7 @@
 
 ;; Register mh-folder-mode as supporting which-function-mode...
 (mh-require 'which-func nil t)
-(when (boundp 'which-func-modes)
+(when (and (boundp 'which-func-modes) (listp which-func-modes))
   (add-to-list 'which-func-modes 'mh-folder-mode))
 
 ;; Shush compiler.

=== modified file 'lisp/progmodes/verilog-mode.el'
--- a/lisp/progmodes/verilog-mode.el    2012-04-09 13:05:48 +0000
+++ b/lisp/progmodes/verilog-mode.el    2012-04-21 16:57:49 +0000
@@ -3592,7 +3592,7 @@
   (set (make-local-variable 'imenu-generic-expression)
        verilog-imenu-generic-expression)
   ;; Tell which-func-modes that imenu knows about verilog
-  (when (boundp 'which-func-modes)
+  (when (and (boundp 'which-func-modes) (listp which-func-modes))
     (add-to-list 'which-func-modes 'verilog-mode))
   ;; hideshow support
   (when (boundp 'hs-special-modes-alist)