Commit 41d58f61 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(c-copy-tree): New function.

(c-initialize-builtin-style): Use c-copy-tree.
parent 785eecbb
......@@ -553,7 +553,6 @@ offset for that syntactic element. Optional ADD says to add SYMBOL to
;; crucial because future c-set-style calls will always reset the
;; variables first to the `cc-mode' style before instituting the new
;; style. Only do this once!
(require 'cl)
(or (assoc "cc-mode" c-style-alist)
(progn
(c-add-style "cc-mode"
......@@ -562,7 +561,7 @@ offset for that syntactic element. Optional ADD says to add SYMBOL to
(lambda (var)
(let ((val (symbol-value var)))
(cons var (if (atom val) val
(copy-tree val)
(c-copy-tree val)
))
)))
'(c-backslash-column
......@@ -580,6 +579,24 @@ offset for that syntactic element. Optional ADD says to add SYMBOL to
;; c-mode-common-hook or {c,c++,objc,java}-mode-hook.
(c-set-style c-site-default-style))))
(defun c-copy-tree (tree &optional vecp)
"Make a copy of TREE.
If TREE is a cons cell, this recursively copies both its car and its cdr.
Contrast to copy-sequence, which copies only along the cdrs. With second
argument VECP, this copies vectors as well as conses."
(if (consp tree)
(let ((p (setq tree (copy-list tree))))
(while (consp p)
(if (or (consp (car p)) (and vecp (vectorp (car p))))
(setcar p (c-copy-tree (car p) vecp)))
(or (listp (cdr p)) (setcdr p (c-copy-tree (cdr p) vecp)))
(setq p (cdr p))))
(if (and vecp (vectorp tree))
(let ((i (length (setq tree (copy-sequence tree)))))
(while (>= (setq i (1- i)) 0)
(aset tree i (c-copy-tree (aref tree i) vecp))))))
tree)
(defun c-make-styles-buffer-local ()
"Make all CC Mode style variables buffer local.
If you edit primarily one style of C (or C++, Objective-C, Java) code,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment