Permalink
Browse files

Merge pull request #114 from syohex/fix_for_bytecompile

Fix for bytecompiling warnings
  • Loading branch information...
2 parents 6449f14 + 7d0c394 commit ab54b9f325add25f8c1ae1ec9d2b8a2dd4c280aa @telaviv telaviv committed Jan 27, 2013
Showing with 10 additions and 7 deletions.
  1. +10 −7 coffee-mode.el
View
17 coffee-mode.el
@@ -251,12 +251,15 @@ with CoffeeScript."
(pop-to-buffer "*CoffeeREPL*"))
(defun coffee-compiled-file-name (&optional filename)
- (setq working-on-file (expand-file-name (or filename (buffer-file-name))))
- (unless (string= coffee-js-directory "")
- (setq working-on-file (expand-file-name (concat (file-name-directory working-on-file) coffee-js-directory (file-name-nondirectory working-on-file)))))
- "Returns the name of the JavaScript file compiled from a CoffeeScript file.
-If FILENAME is omitted, the current buffer's file name is used."
- (concat (file-name-sans-extension working-on-file) ".js"))
+ (let ((working-on-file (expand-file-name (or filename (buffer-file-name)))))
+ (unless (string= coffee-js-directory "")
+ (setq working-on-file
+ (expand-file-name (concat (file-name-directory working-on-file)
+ coffee-js-directory
+ (file-name-nondirectory working-on-file)))))
+ ;; Returns the name of the JavaScript file compiled from a CoffeeScript file.
+ ;; If FILENAME is omitted, the current buffer's file name is used.
+ (concat (file-name-sans-extension working-on-file) ".js")))
(defun coffee-compile-file ()
"Compiles and saves the current file to disk in a file of the same
@@ -833,7 +836,7 @@ END lie."
(progn
(coffee-block-comment-delimiter match)
(goto-char match)
- (next-line)
+ (forward-line)
(coffee-propertize-function (point) end))))))))
;;;###autoload

0 comments on commit ab54b9f

Please sign in to comment.