From: Alan Mackenzie <acm@muc.de>
Date: Mon, 14 Sep 2015 12:44:09 +0000 (+0000)
Subject: Replace `cadar' with `cadr/car', since `cadar' is problematic on Emacs.
X-Git-Tag: emacs-25.0.90~1224^2~134
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=498d7fe980250b07a25bcb0a588337484d497100;p=emacs.git

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'.
---

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