Permalink
Browse files

Merge branch 'add-comment-style' of https://github.com/jasonblewis/op…

…enscad into jasonblewis-add-comment-style

Conflicts:
	contrib/scad-mode.el
  • Loading branch information...
2 parents aa20f8e + 77c20c0 commit 85ffbd5119354f0b0be26fbd9c9fc6394067a9e7 @kintel kintel committed Jul 6, 2012
Showing with 12 additions and 6 deletions.
  1. +12 −6 contrib/{scad.el → 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) "*/")
+
)

0 comments on commit 85ffbd5

Please sign in to comment.