Merge remote-tracking branch 'ztree/master'

1) Removed redundant comments about compatibility with GNU Emacs
2) Removed workaround for electric-indent-mode

diff --combined packages/ztree/ztree-diff-model.el
index 572d9766b781295fef2b03ee26f4e9cda7e08caa,54a9615228ec925a226d0bac4b8c8ec1e92b4a50..54a9615228ec925a226d0bac4b8c8ec1e92b4a50
--- 1/packages/ztree/ztree-diff-model.el
--- 2/ztree-diff-model.el
+++ b/packages/ztree/ztree-diff-model.el
@@@ -8,7 -8,7 +8,7 @@@
  ;;
  ;; Keywords: files tools
  ;; URL: https://github.com/fourier/ztree
- ;; Compatibility: GNU Emacs GNU Emacs 24.x
+ ;; Compatibility: GNU Emacs 24.x
  ;;
  ;; This file is part of GNU Emacs.
  ;;

diff --combined packages/ztree/ztree-diff.el
index 8d1d9d0c9842652eaf80de90d32f8678d360ee2b,6caa73eae1cf6a5a255d58d0778091ff917e2a96..6caa73eae1cf6a5a255d58d0778091ff917e2a96
--- 1/packages/ztree/ztree-diff.el
--- 2/ztree-diff.el
+++ b/packages/ztree/ztree-diff.el
@@@ -8,7 -8,7 +8,7 @@@
  ;;
  ;; Keywords: files tools
  ;; URL: https://github.com/fourier/ztree
- ;; Compatibility: GNU Emacs GNU Emacs 24.x
+ ;; Compatibility: GNU Emacs 24.x
  ;;
  ;; This file is part of GNU Emacs.
  ;;

diff --combined packages/ztree/ztree-dir.el
index 47a57cd9cea1dd9388201cebc89abef9c7d6f07e,7506b8469d67948739c269dee186c3cfaf7b727c..7506b8469d67948739c269dee186c3cfaf7b727c
--- 1/packages/ztree/ztree-dir.el
--- 2/ztree-dir.el
+++ b/packages/ztree/ztree-dir.el
@@@ -8,7 -8,7 +8,7 @@@
  ;;
  ;; Keywords: files tools
  ;; URL: https://github.com/fourier/ztree
- ;; Compatibility: GNU Emacs GNU Emacs 24.x
+ ;; Compatibility: GNU Emacs 24.x
  ;;
  ;; This file is part of GNU Emacs.
  ;;

diff --combined packages/ztree/ztree-util.el
index f5d3506a7a4ffcc84b4905a0a571eaa49a8a146a,45f297de13a6f88b2cbf1791c0256e34c99e5f2a..45f297de13a6f88b2cbf1791c0256e34c99e5f2a
--- 1/packages/ztree/ztree-util.el
--- 2/ztree-util.el
+++ b/packages/ztree/ztree-util.el
@@@ -8,7 -8,7 +8,7 @@@
  ;;
  ;; Keywords: files tools
  ;; URL: https://github.com/fourier/ztree
- ;; Compatibility: GNU Emacs GNU Emacs 24.x
+ ;; Compatibility: GNU Emacs 24.x
  ;;
  ;; This file is part of GNU Emacs.
  ;;
@@@ -56,7 -56,7 +56,7 @@@ Taken from http://lists.gnu.org/archive
  
  (defun newline-and-begin ()
    "Move a point to the beginning of the next line."
-   (newline)
+   (insert "\n")
    (beginning-of-line))
  
  (defun car-atom (value)

diff --combined packages/ztree/ztree-view.el
index c623bd681c8724d79de23f0da588bea31d1caa01,a251be8da0ea19291b4dab94fc959f883cdde3e0..a251be8da0ea19291b4dab94fc959f883cdde3e0
--- 1/packages/ztree/ztree-view.el
--- 2/ztree-view.el
+++ b/packages/ztree/ztree-view.el
@@@ -8,7 -8,7 +8,7 @@@
  ;;
  ;; Keywords: files tools
  ;; URL: https://github.com/fourier/ztree
- ;; Compatibility: GNU Emacs GNU Emacs 24.x
+ ;; Compatibility: GNU Emacs 24.x
  ;;
  ;; This file is part of GNU Emacs.
  ;;
@@@ -176,15 -176,7 +176,7 @@@ the buffer is split to 2 trees"
  (define-derived-mode ztree-mode special-mode "Ztree"
    "A major mode for displaying the directory tree in text mode."
    ;; only spaces
-   (setq indent-tabs-mode nil)
-   ;; fix for electric-indent-mode
-   ;; for emacs 24.4
-   (if (fboundp 'electric-indent-local-mode)
-       (electric-indent-local-mode -1)
-     ;; for emacs 24.3 or less
-     (add-hook 'electric-indent-functions
-               (lambda (arg) 'no-indent) nil 'local)))
- 
+   (setq indent-tabs-mode nil))
  
  (defun ztree-find-node-in-line (line)
    "Return the node for the LINE specified.

diff --combined packages/ztree/ztree.el
index 3958daa738d042fa2ce61b872e85c2c1a65460e8,79e6fe6d2b68e5f17192228ffe4c8c1b3cb00703..79e6fe6d2b68e5f17192228ffe4c8c1b3cb00703
--- 1/packages/ztree/ztree.el
--- 2/ztree.el
+++ b/packages/ztree/ztree.el
@@@ -10,7 -10,7 +10,7 @@@
  ;;
  ;; Keywords: files tools
  ;; URL: https://github.com/fourier/ztree
- ;; Compatibility: GNU Emacs GNU Emacs 24.x
+ ;; Compatibility: GNU Emacs 24.x
  ;;
  ;; This file is part of GNU Emacs.
  ;;