]> git.eshelyaron.com Git - emacs.git/commitdiff
Replace `cadar' with `cadr/car', since `cadar' is problematic on Emacs.
authorAlan Mackenzie <acm@muc.de>
Mon, 14 Sep 2015 12:44:09 +0000 (12:44 +0000)
committerAlan Mackenzie <acm@muc.de>
Mon, 14 Sep 2015 12:44:09 +0000 (12:44 +0000)
(c-make-init-lang-vars-fun): Replace two occurrences of `cadar' with
`cadr/car'.

lisp/progmodes/cc-langs.el

index a1e26b9fcc4e5ebb1a7a07b4f2d9663cc3449097..e9c496446767341890e7c3f238279be42a3c8b68 100644 (file)
@@ -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