From 498d7fe980250b07a25bcb0a588337484d497100 Mon Sep 17 00:00:00 2001 From: Alan Mackenzie Date: Mon, 14 Sep 2015 12:44:09 +0000 Subject: [PATCH] Replace `cadar' with `cadr/car', since `cadar' is problematic on Emacs. (c-make-init-lang-vars-fun): Replace two occurrences of `cadar' with `cadr/car'. --- lisp/progmodes/cc-langs.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index a1e26b9fcc4..e9c49644676 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el @@ -3306,7 +3306,7 @@ accomplish that conveniently." (cdr c-lang-variable-inits)))) (while init (setq current-var (caar init)) - (set (caar init) (eval (cadar init))) + (set (caar init) (eval (cadr (car init)))) (setq init (cdr init))))) (error @@ -3335,7 +3335,7 @@ accomplish that conveniently." (while init (setq current-var (caar init)) - (set (caar init) (eval (cadar init))) + (set (caar init) (eval (cadr (car init)))) (setq init (cdr init))) (error -- 2.39.2