Merge branch 'dgud/tools/emacs/erlang-mode-cleanup'

* dgud/tools/emacs/erlang-mode-cleanup:
  Fix a command's name
  Clean-up erldoc.el
  Set some useful file-local variables in erlang-edoc.el
  Clean-up erlang-eunit.el
  Clean-up erlang-start.el
  Update erlang-pkg.el
  Set erlang-mode's encoding to utf-8
  Remove redundant wrappers around Emacs version constants
  Convert some defvars to defcustoms and fix some docstrings
  Remove some unneeded backward compatibility code
  Remove redundant erlang-interactive-p
  Remove redundant function prog-mode
  Remove redundant function erlang-string-to-int
  Require Emacs 24.1 in erlang-mode
  Fix some whitespace in erlang-mode

1 files changed, 12 insertions, 7 deletions

diff --git a/lib/tools/emacs/erlang-start.el b/lib/tools/emacs/erlang-start.el
index 160057e179..66bd3dd3a2 100644
--- a/lib/tools/emacs/erlang-start.el
+++ b/lib/tools/emacs/erlang-start.el
@@ -39,7 +39,7 @@
 ;;
 ;; Please state as exactly as possible:
 ;;    - Version number of Erlang Mode (see the menu), Emacs, Erlang,
-;;	and of any other relevant software.
+;;      and of any other relevant software.
 ;;    - What the expected result was.
 ;;    - What you did, preferably in a repeatable step-by-step form.
 ;;    - A description of the unexpected result.
@@ -60,7 +60,7 @@
 ;;
 
 (autoload 'erlang-mode "erlang" "Major mode for editing Erlang code." t)
-(autoload 'erlang-version "erlang" 
+(autoload 'erlang-version "erlang"
   "Return the current version of Erlang mode." t)
 (autoload 'erlang-shell "erlang" "Start a new Erlang shell." t)
 (autoload 'run-erlang "erlang" "Start a new Erlang shell." t)
@@ -68,7 +68,7 @@
 (autoload 'erlang-compile "erlang"
   "Compile Erlang module in current buffer." t)
 
-(autoload 'erlang-man-module "erlang" 
+(autoload 'erlang-man-module "erlang"
   "Find manual page for MODULE." t)
 (autoload 'erlang-man-function "erlang"
   "Find manual page for NAME, where NAME is module:function." t)
@@ -108,7 +108,7 @@ A function suitable for `eldoc-documentation-function'.\n\n(fn)" nil nil)
 
 ;;
 ;; Associate files using interpreter "escript" with Erlang mode.
-;; 
+;;
 
 ;;;###autoload
 (add-to-list 'interpreter-mode-alist (cons "escript" 'erlang-mode))
@@ -123,10 +123,10 @@ A function suitable for `eldoc-documentation-function'.\n\n(fn)" nil nil)
   (while erl-ext
     (let ((cie completion-ignored-extensions))
       (while (and cie (not (string-equal (car cie) (car erl-ext))))
-	(setq cie (cdr cie)))
+        (setq cie (cdr cie)))
       (if (null cie)
-	  (setq completion-ignored-extensions
-		(cons (car erl-ext) completion-ignored-extensions))))
+          (setq completion-ignored-extensions
+                (cons (car erl-ext) completion-ignored-extensions))))
     (setq erl-ext (cdr erl-ext))))
 
 
@@ -136,4 +136,9 @@ A function suitable for `eldoc-documentation-function'.\n\n(fn)" nil nil)
 
 (provide 'erlang-start)
 
+;; Local variables:
+;; coding: utf-8
+;; indent-tabs-mode: nil
+;; End:
+
 ;; erlang-start.el ends here.