From 485fe977a0675ce3fad9b14ce187341d40d684f8 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 13 Jul 2003 00:20:39 +0000 Subject: [PATCH] (c-declare-lang-variables): Don't use mapcan. --- lisp/ChangeLog | 6 ++++++ lisp/progmodes/cc-engine.el | 13 +++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 507f9b0496a..eb35550cbf7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,11 @@ 2003-07-12 Richard M. Stallman + * progmodes/cc-engine.el (c-declare-lang-variables): Don't use mapcan. + + * progmodes/cc-defs.el (c-make-keywords-re): + Don't use delete-duplicates. + (c-lang-const): Don't use mapcan. + * apropos.el (apropos-show-scores): Make it customizable. Document new meaning. (apropos): Compute scores from symbols. diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 7d0d146a744..dd1e1d62974 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -155,12 +155,13 @@ (defmacro c-declare-lang-variables () `(progn - ,@(mapcan (lambda (init) - `(,(if (elt init 2) - `(defvar ,(car init) nil ,(elt init 2)) - `(defvar ,(car init) nil)) - (make-variable-buffer-local ',(car init)))) - (cdr c-lang-variable-inits)))) + ,@(apply 'nconc + (mapcar (lambda (init) + `(,(if (elt init 2) + `(defvar ,(car init) nil ,(elt init 2)) + `(defvar ,(car init) nil)) + (make-variable-buffer-local ',(car init)))) + (cdr c-lang-variable-inits))))) (c-declare-lang-variables) -- 2.39.2