hgext/pager.py
changeset 24067 0baf41e02a4d
parent 24066 afdf5f6ab37a
child 25186 80c5b2666a96
--- a/hgext/pager.py	Fri Feb 06 12:07:56 2015 -0800
+++ b/hgext/pager.py	Fri Feb 06 12:09:09 2015 -0800
@@ -159,7 +159,12 @@
             _runpager(ui, p)
         return orig(ui, options, cmd, cmdfunc)
 
-    extensions.wrapfunction(dispatch, '_runcommand', pagecmd)
+    # Wrap dispatch._runcommand after color is loaded so color can see
+    # ui.pageractive. Otherwise, if we loaded first, color's wrapped
+    # dispatch._runcommand would run without having access to ui.pageractive.
+    def afterloaded(loaded):
+        extensions.wrapfunction(dispatch, '_runcommand', pagecmd)
+    extensions.afterloaded('color', afterloaded)
 
 def extsetup(ui):
     commands.globalopts.append(