dgnushack.el (byte-optimize-apply): Make the use-mapcan advice work

for (function nconc) as well as (quote nconc).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fc261cb..4e1430e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-16  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * dgnushack.el (byte-optimize-apply): Make the use-mapcan advice work
+       for (function nconc) as well as (quote nconc).
+
 2015-12-04  Daiki Ueno  <ueno@gnu.org>
 
        * qp.el (quoted-printable-encode-region): Bind `case-fold-search' to

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index ec791a8..b2c73e0 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -272,7 +272,7 @@ in `defcustom' forms."
       (when (and (eq last (third form))
                 (consp last)
                 (eq 'mapcar (car last))
-                (equal (nth 1 form) ''nconc))
+                (member (nth 1 form) '(''nconc #'nconc)))
        (setq form (cons 'mapcan (cdr last)))))))
 
 (if (featurep 'emacs)