Merge pull request #1 from purescript-emacs/misc-fixes

Misc fixes

Author: kritzcreek

Makefile

@@ -34,7 +34,6 @@ ELCHECKS=$(addprefix check-, $(ELFILES:.el=))
 
 %.elc: %.el
 	@$(BATCH) \
-	   --eval "(byte-compile-disable-warning 'cl-functions)" \
 	   -f batch-byte-compile $<
 
 .PHONY: all compile info clean check $(ELCHECKS) elpa package
@@ -47,7 +46,6 @@ $(ELCHECKS): check-%: %.el
 	@$(BATCH) --eval '(when (check-declare-file "$*.el") (error "check-declare failed"))'
 	@$(BATCH) \
 		 --eval "(setq byte-compile-error-on-warn t)" \
-	 	 --eval "(byte-compile-disable-warning 'cl-functions)" \
 		 -f batch-byte-compile $*.el
 	@$(RM) $*.elc
 	@if [ -f "$(<:%.el=tests/%-tests.el)" ]; then \
@@ -105,6 +103,6 @@ $(AUTOLOADS): $(ELFILES) purescript-mode.elc
 # HACK: embed version number into .elc file
 purescript-mode.elc: purescript-mode.el
 	$(SUBST_ATAT) < purescript-mode.el > purescript-mode.tmp.el
-	@$(BATCH) --eval "(byte-compile-disable-warning 'cl-functions)" -f batch-byte-compile purescript-mode.tmp.el
+	@$(BATCH) -f batch-byte-compile purescript-mode.tmp.el
 	mv purescript-mode.tmp.elc purescript-mode.elc
 	$(RM) purescript-mode.tmp.el

README.md

@@ -23,10 +23,16 @@ be referred to as the `.emacs` file.
 Installation
 ------------
 
-GNU Emacs version 23 or later is officially supported.  It may work
+GNU Emacs version 24 or later is officially supported.  It may work
 with other Emacsen, but we don't have the resources to support other
 versions.
 
+### Installation using package.el
+
+Users of [MELPA](https://melpa.org) can install `purescript-mode`
+using `M-x package-install`. This is the most straightforward
+and recommended installation method.
+
 ### Installation from Git
 
 -   `git clone https://github.com/purescript-emacs/purescript-mode.git` into a

purescript-align-imports.el

@@ -95,7 +95,7 @@
 
 ;;; Code:
 
-(with-no-warnings (require 'cl))
+(require 'cl-lib)
 
 (defvar purescript-align-imports-regexp
   (concat "^\\(import[ ]+\\)"
@@ -147,8 +147,8 @@
         (when line
           (let ((match
                  (purescript-align-imports-merge-parts
-                  (loop for i from 1 to 8
-                        collect (purescript-align-imports-chomp (match-string i line))))))
+                  (cl-loop for i from 1 to 8
+                           collect (purescript-align-imports-chomp (match-string i line))))))
             (setq imports (cons (cons match (line-beginning-position))
                                 imports)))))
       (forward-line))
@@ -227,8 +227,4 @@
 
 (provide 'purescript-align-imports)
 
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions)
-;; End:
-
 ;;; purescript-align-imports.el ends here

purescript-decl-scan.el

@@ -102,7 +102,7 @@
 
 (require 'purescript-mode)
 (require 'syntax)
-(with-no-warnings (require 'cl))
+(require 'cl-lib)
 (require 'imenu)
 
 (defgroup purescript-decl-scan nil
@@ -125,10 +125,7 @@
 ;; General declaration scanning functions.
 
 (defvar purescript-ds-start-keywords-re
-  (concat "\\(\\<"
-          "class\\|data\\|derive instance\\|i\\(mport\\|n\\(fix\\(\\|[lr]\\)\\|stance\\)\\)\\|"
-          "module\\|primitive\\|type\\|newtype"
-          "\\)\\>")
+  (regexp-opt '("class" "data" "derive instance" "import" "instance" "infixl" "infixr" "module" "primitive" "type" "newtype") 'words)
   "Keywords that may start a declaration.")
 
 (defvar purescript-ds-syntax-table
@@ -195,7 +192,7 @@ current line that starts with REGEXP and is not in `font-lock-comment-face'."
   "Like purescript-ds-move-to-start-regexp, but uses syntax-ppss to
   skip comments"
   (let (p)
-    (loop
+    (cl-loop
      do (setq p (point))
      (purescript-ds-move-to-start-regexp inc regexp)
      while (and (nth 4 (syntax-ppss))
@@ -602,8 +599,4 @@ Invokes `purescript-decl-scan-mode-hook' on activation."
 
 (provide 'purescript-decl-scan)
 
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions)
-;; End:
-
 ;;; purescript-decl-scan.el ends here

purescript-font-lock.el

@@ -278,17 +278,14 @@ Returns keywords suitable for `font-lock-keywords'."
                   "\\S_"))
          ;; Reserved identifiers
          (reservedid
-          (concat "\\<"
-                  ;; `as', `hiding', and `qualified' are part of the import
-                  ;; spec syntax, but they are not reserved.
-                  ;; `_' can go in here since it has temporary word syntax.
-                  ;; (regexp-opt
-                  ;;  '("case" "class" "data" "default" "deriving" "do"
-                  ;;    "else" "if" "import" "in" "infix" "infixl"
-                  ;;    "infixr" "instance" "let" "module" "newtype" "of"
-                  ;;    "then" "type" "where" "_") t)
-                  "\\(_\\|c\\(ase\\|lass\\)\\|d\\(ata\\|e\\(fault\\|riving\\)\\|o\\)\\|else\\|i\\(mport\\|n\\(fix[lr]?\\|stance\\)\\|[fn]\\)\\|let\\|module\\|mdo\\|newtype\\|of\\|rec\\|proc\\|t\\(hen\\|ype\\)\\|where\\)"
-                  "\\>"))
+          ;; `as', `hiding', and `qualified' are part of the import
+          ;; spec syntax, but they are not reserved.
+          ;; `_' can go in here since it has temporary word syntax.
+          (regexp-opt
+           '("case" "class" "data" "default" "deriving" "do"
+             "else" "if" "import" "in" "infix" "infixl"
+             "infixr" "instance" "let" "module" "newtype" "of"
+             "then" "type" "where" "_") 'words))
 
          ;; This unreadable regexp matches strings and character
          ;; constants.  We need to do this with one regexp to handle
@@ -640,7 +637,6 @@ Invokes `purescript-font-lock-hook' if not nil."
 (provide 'purescript-font-lock)
 
 ;; Local Variables:
-;; byte-compile-warnings: (not cl-functions)
 ;; tab-width: 8
 ;; End:
 

purescript-indent.el

@@ -1584,7 +1584,6 @@ Invokes `purescript-indent-hook' if not nil."
 (provide 'purescript-indent)
 
 ;; Local Variables:
-;; byte-compile-warnings: (not cl-functions)
 ;; End:
 
 ;;; purescript-indent.el ends here

purescript-indentation.el

@@ -1041,7 +1041,6 @@ Preserves indentation and removes extra whitespace"
 (provide 'purescript-indentation)
 
 ;; Local Variables:
-;; byte-compile-warnings: (not cl-functions)
 ;; tab-width: 8
 ;; End:
 

purescript-mode-pkg.el.in

@@ -1 +1,2 @@
-(define-package "purescript-mode" "@VERSION@" "A PureScript editing mode")
+(define-package "purescript-mode" "@VERSION@" "A PureScript editing mode"
+  '((cl-lib "0.6")))

purescript-mode.el

@@ -35,7 +35,7 @@
 (require 'purescript-align-imports)
 (require 'purescript-sort-imports)
 (require 'purescript-string)
-(with-no-warnings (require 'cl))
+(require 'cl-lib)
 
 ;; All functions/variables start with `(literate-)purescript-'.
 
@@ -288,13 +288,9 @@ details."
 
 (defvar eldoc-print-current-symbol-info-function)
 
-;; For compatibility with Emacs < 24, derive conditionally
-(defalias 'purescript-parent-mode
-  (if (fboundp 'prog-mode) 'prog-mode 'fundamental-mode))
-
 ;; The main mode functions
 ;;;###autoload
-(define-derived-mode purescript-mode purescript-parent-mode "PureScript"
+(define-derived-mode purescript-mode prog-mode "PureScript"
   "Major mode for editing PureScript programs.
 
 See also Info node `(purescript-mode)Getting Started' for more
@@ -344,8 +340,6 @@ see documentation for that variable for more details."
   (set (make-local-variable 'dabbrev-case-distinction) nil)
   (set (make-local-variable 'dabbrev-case-replace) nil)
   (set (make-local-variable 'dabbrev-abbrev-char-regexp) "\\sw\\|[.]")
-  (add-hook 'before-save-hook 'purescript-mode-before-save-handler nil t)
-  (add-hook 'after-save-hook 'purescript-mode-after-save-handler nil t)
   )
 
 (defun purescript-fill-paragraph (justify)
@@ -433,17 +427,19 @@ is asked to show extra info for the items matching QUERY.."
            current-prefix-arg)))
   (browse-url (format "https://pursuit.purescript.org/search?q=%s" query)))
 
-(defcustom purescript-completing-read-function 'ido-completing-read
+(defcustom purescript-completing-read-function 'completing-read
   "Default function to use for completion."
   :group 'purescript
   :type '(choice
+          (function-item :tag "completing-read" :value completing-read)
           (function-item :tag "ido" :value ido-completing-read)
           (function-item :tag "helm" :value helm--completing-read-default)
-          (function-item :tag "completing-read" :value completing-read)
           (function :tag "Custom function")))
 
 (defcustom purescript-indent-spaces 2
-  "Number of spaces to indent inwards.")
+  "Number of spaces to indent inwards."
+  :type 'integer
+  :safe 'integerp)
 
 (defun purescript-mode-suggest-indent-choice ()
   "Ran when the user tries to indent in the buffer but no indentation mode has been selected.
@@ -469,20 +465,7 @@ Brings up the documentation for purescript-mode-hook."
                            (format " [ %s .. ]" (purescript-string-take (purescript-trim (cadr lines)) 10))
                          ""))))))
 
-(defun purescript-mode-before-save-handler ()
-  "Function that will be called before buffer's saving."
-  )
-
-(defun purescript-mode-after-save-handler ()
-  "Function that will be called after buffer's saving."
-  )
-
-;; Provide ourselves:
 
 (provide 'purescript-mode)
 
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions)
-;; End:
-
 ;;; purescript-mode.el ends here

purescript-package.el

@@ -154,8 +154,4 @@
 
 (provide 'purescript-package)
 
-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions)
-;; End:
-
 ;;; purescript-package.el ends here