aboutsummaryrefslogtreecommitdiffhomepage
path: root/generic/pg-user.el
diff options
context:
space:
mode:
authorGravatar Stefan Monnier <monnier@iro.umontreal.ca>2012-06-08 13:00:47 +0000
committerGravatar Stefan Monnier <monnier@iro.umontreal.ca>2012-06-08 13:00:47 +0000
commit43493a243f3099e38c39a52cafa801aa4d716a94 (patch)
tree2f0ffd0678519cc88d10ddd86a31b9caa8a8c5e9 /generic/pg-user.el
parent7ecdbfb869b5e9d6cd75c610ef125823b3727071 (diff)
Summary: Handle the new t value of which-func-modes.
Diffstat (limited to 'generic/pg-user.el')
-rw-r--r--generic/pg-user.el10
1 files changed, 7 insertions, 3 deletions
diff --git a/generic/pg-user.el b/generic/pg-user.el
index 8a5675fc..15db8478 100644
--- a/generic/pg-user.el
+++ b/generic/pg-user.el
@@ -928,12 +928,16 @@ If CALLBACK is set, we invoke that when the command completes."
"Add or remove index menu."
;; NB: next two a bit interferring, but we suppose use-case is PG.
(which-function-mode (if proof-imenu-enable 1 0))
- (add-to-list 'which-func-modes proof-mode-for-script)
+ (when (listp which-func-modes)
+ ;; FIXME: It's not PG's business to decide whether to use
+ ;; which-function-mode.
+ (add-to-list 'which-func-modes proof-mode-for-script))
(if proof-imenu-enable
(imenu-add-to-menubar "Index")
(progn
- (setq which-func-modes
- (remove proof-mode-for-script which-func-modes))
+ (when (listp which-func-modes)
+ (setq which-func-modes
+ (remove proof-mode-for-script which-func-modes)))
(let ((oldkeymap (keymap-parent (current-local-map))))
(if ;; sanity checks in case someone else set local keymap
(and oldkeymap