Mercurial > emacs
changeset 65811:8b5704a2934a
(c-setup-paragraph-variables): Make sure we do
not change the global value of those vars.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Mon, 03 Oct 2005 21:21:35 +0000 |
| parents | 0534e10b621e |
| children | 2d888e7b750c |
| files | lisp/progmodes/cc-styles.el |
| diffstat | 1 files changed, 26 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/progmodes/cc-styles.el Mon Oct 03 21:19:15 2005 +0000 +++ b/lisp/progmodes/cc-styles.el Mon Oct 03 21:21:35 2005 +0000 @@ -498,33 +498,34 @@ (let ((comment-line-prefix (concat "[ \t]*\\(" c-current-comment-prefix "\\)[ \t]*"))) - (setq paragraph-start (concat comment-line-prefix - c-paragraph-start - "\\|" - page-delimiter) - paragraph-separate (concat comment-line-prefix - c-paragraph-separate - "\\|" - page-delimiter) - paragraph-ignore-fill-prefix t - adaptive-fill-mode t - adaptive-fill-regexp - (concat comment-line-prefix - (if (default-value 'adaptive-fill-regexp) - (concat "\\(" - (default-value 'adaptive-fill-regexp) - "\\)") - ""))) + (set (make-local-variable 'paragraph-start) + (concat comment-line-prefix + c-paragraph-start + "\\|" + page-delimiter)) + (set (make-local-variable 'paragraph-separate) + (concat comment-line-prefix + c-paragraph-separate + "\\|" + page-delimiter)) + (set (make-local-variable 'paragraph-ignore-fill-prefix) t) + (set (make-local-variable 'adaptive-fill-mode) t) + (set (make-local-variable 'adaptive-fill-regexp) + (concat comment-line-prefix + (if (default-value 'adaptive-fill-regexp) + (concat "\\(" + (default-value 'adaptive-fill-regexp) + "\\)") + ""))) (when (boundp 'adaptive-fill-first-line-regexp) ;; XEmacs (20.x) adaptive fill mode doesn't have this. - (make-local-variable 'adaptive-fill-first-line-regexp) - (setq adaptive-fill-first-line-regexp - (concat "\\`" comment-line-prefix - ;; Maybe we should incorporate the old value here, - ;; but then we have to do all sorts of kludges to - ;; deal with the \` and \' it probably contains. - "\\'"))))) + (set (make-local-variable 'adaptive-fill-first-line-regexp) + (concat "\\`" comment-line-prefix + ;; Maybe we should incorporate the old value here, + ;; but then we have to do all sorts of kludges to + ;; deal with the \` and \' it probably contains. + "\\'"))))) ;; Helper for setting up Filladapt mode. It's not used by CC Mode itself. @@ -626,5 +627,5 @@ (cc-provide 'cc-styles) -;;; arch-tag: c764f61a-96ba-484a-a68f-101c0e9d5d2c +;; arch-tag: c764f61a-96ba-484a-a68f-101c0e9d5d2c ;;; cc-styles.el ends here