[Emacs-diffs] master 498d7fe: Replace `cadar' with `cadr/car', since `cadar' is problematic on Emacs.

[Alan Mackenzie]

branch: master
commit 498d7fe980250b07a25bcb0a588337484d497100
Author: Alan Mackenzie <address@hidden>
Commit: Alan Mackenzie <address@hidden>

    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 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index a1e26b9..e9c4964 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