Merge branch 'NetHack-3.6'

src/cmd.c

@@ -2134,8 +2134,7 @@ int final;
                 *ocl ? "'" : "", *ocl ? ocl : "all types", *ocl ? "'" : "");
         if (flags.pickup_thrown && *ocl) /* *ocl: don't show if 'all types' */
             Strcat(buf, " plus thrown");
-        if (iflags.autopickup_exceptions[AP_GRAB]
-            || iflags.autopickup_exceptions[AP_LEAVE])
+        if (apelist)
             Strcat(buf, ", with exceptions");
     } else
         Strcpy(buf, "off");