diff options
| author | Marius Kintel <marius@kintel.net> | 2012-07-06 14:01:47 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-07-06 14:01:47 (GMT) |
| commit | 85ffbd5119354f0b0be26fbd9c9fc6394067a9e7 (patch) | |
| tree | 928ecb4afaa7be757ab77440f75e8fb4d904909b /contrib | |
| parent | aa20f8e4be93765150244f63b4ef3f8b3123c40a (diff) | |
| parent | 77c20c0d71b063e446f85d2857898d4449d498aa (diff) | |
Merge branch 'add-comment-style' of https://github.com/jasonblewis/openscad into jasonblewis-add-comment-style
Conflicts:
contrib/scad-mode.el
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/scad-mode.el (renamed from contrib/scad.el) | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/contrib/scad.el b/contrib/scad-mode.el index 268ad61..b4d6e9e 100644 --- a/contrib/scad.el +++ b/contrib/scad-mode.el @@ -3,9 +3,9 @@ ;; Author: Len Trigg ;; Maintainer: Len Trigg <lenbok@gmail.com> ;; Created: March 2010 -;; Modified: November 2011 -;; URL: https://raw.github.com/openscad/openscad/master/contrib/scad.el -;; Version: $Revision: 88 $ +;; Modified: 06 July 2012 +;; URL: https://raw.github.com/openscad/openscad/master/contrib/scad-mode.el +;; Version: $Revision: 89 $ ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -29,7 +29,7 @@ ;; ;; To use, insert the following into your emacs startup: ;; -;; (autoload 'scad-mode "scad" "Major mode for editing SCAD code." t) +;; (autoload 'scad-mode "scad-mode" "Major mode for editing SCAD code." t) ;; (add-to-list 'auto-mode-alist '("\\.scad$" . scad-mode)) ;;; To Do: @@ -153,8 +153,14 @@ :syntax-table scad-mode-syntax-table (set (make-local-variable 'font-lock-defaults) '(scad-font-lock-keywords)) (set (make-local-variable 'indent-line-function) 'scad-indent-line) - ;(set (make-local-variable 'imenu-generic-expression) scad-imenu-generic-expression) - ;(set (make-local-variable 'outline-regexp) scad-outline-regexp) + ;(set (make-local-variable 'imenu-generic-expression) scad-imenu-generic-expression) + ;(set (make-local-variable 'outline-regexp) scad-outline-regexp) + ;; set comment styles for scad mode + (set (make-local-variable 'comment-start) "//") + (set (make-local-variable 'comment-end) "") + (set (make-local-variable 'block-comment-start) "/*") + (set (make-local-variable 'block-comment-end) "*/") + ) |