[elpa] master updated (4e906cf -> 54ced08)
fourier pushed a change to branch master. from 4e906cf Add pinentry to externals-list new 17e843e Updated comment - removed redundant 'GNU Emacs' statement in compatibility new 52e5fd3 Removed workaround for fixing issue with electric-indent new 54ced08 Merge remote-tracking branch 'ztree/master' Summary of changes: packages/ztree/ztree-diff-model.el |2 +- packages/ztree/ztree-diff.el |2 +- packages/ztree/ztree-dir.el|2 +- packages/ztree/ztree-util.el |4 ++-- packages/ztree/ztree-view.el | 12 ++-- packages/ztree/ztree.el|2 +- 6 files changed, 8 insertions(+), 16 deletions(-)
[elpa] master 54ced08 3/3: Merge remote-tracking branch 'ztree/master'
branch: master commit 54ced08517ff57102ca2575941fb3ba2edb0dfde Merge: 4e906cf 52e5fd3 Author: Alexey Veretennikov Commit: Alexey Veretennikov Merge remote-tracking branch 'ztree/master' 1) Removed redundant comments about compatibility with GNU Emacs 2) Removed workaround for electric-indent-mode --- packages/ztree/ztree-diff-model.el |2 +- packages/ztree/ztree-diff.el |2 +- packages/ztree/ztree-dir.el|2 +- packages/ztree/ztree-util.el |4 ++-- packages/ztree/ztree-view.el | 12 ++-- packages/ztree/ztree.el|2 +- 6 files changed, 8 insertions(+), 16 deletions(-) diff --git a/packages/ztree/ztree-diff-model.el b/packages/ztree/ztree-diff-model.el index 572d976..54a9615 100644 --- a/packages/ztree/ztree-diff-model.el +++ b/packages/ztree/ztree-diff-model.el @@ -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 --git a/packages/ztree/ztree-diff.el b/packages/ztree/ztree-diff.el index 8d1d9d0..6caa73e 100644 --- a/packages/ztree/ztree-diff.el +++ b/packages/ztree/ztree-diff.el @@ -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 --git a/packages/ztree/ztree-dir.el b/packages/ztree/ztree-dir.el index 47a57cd..7506b84 100644 --- a/packages/ztree/ztree-dir.el +++ b/packages/ztree/ztree-dir.el @@ -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 --git a/packages/ztree/ztree-util.el b/packages/ztree/ztree-util.el index f5d3506..45f297d 100644 --- a/packages/ztree/ztree-util.el +++ b/packages/ztree/ztree-util.el @@ -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 @@ Taken from http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg01238.html"; (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 --git a/packages/ztree/ztree-view.el b/packages/ztree/ztree-view.el index c623bd6..a251be8 100644 --- a/packages/ztree/ztree-view.el +++ b/packages/ztree/ztree-view.el @@ -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 @@ 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 --git a/packages/ztree/ztree.el b/packages/ztree/ztree.el index 3958daa..79e6fe6 100644 --- a/packages/ztree/ztree.el +++ b/packages/ztree/ztree.el @@ -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. ;;
[elpa] master 52e5fd3 2/3: Removed workaround for fixing issue with electric-indent
branch: master commit 52e5fd34cc5d0b7f6ee9cc092681da5a93ac3a93 Author: Alexey Veretennikov Commit: Alexey Veretennikov Removed workaround for fixing issue with electric-indent --- ztree-util.el |2 +- ztree-view.el | 10 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/ztree-util.el b/ztree-util.el index 7a79fbc..45f297d 100644 --- a/ztree-util.el +++ b/ztree-util.el @@ -56,7 +56,7 @@ Taken from http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg01238.html"; (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 --git a/ztree-view.el b/ztree-view.el index 5a47a4c..a251be8 100644 --- a/ztree-view.el +++ b/ztree-view.el @@ -176,15 +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.
[elpa] master 17e843e 1/3: Updated comment - removed redundant 'GNU Emacs' statement in compatibility
branch: master commit 17e843e6f6d24660fdf66a657c00965242b086ec Author: Alexey Veretennikov Commit: Alexey Veretennikov Updated comment - removed redundant 'GNU Emacs' statement in compatibility --- ztree-diff-model.el |2 +- ztree-diff.el |2 +- ztree-dir.el|2 +- ztree-util.el |2 +- ztree-view.el |2 +- ztree.el|2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ztree-diff-model.el b/ztree-diff-model.el index 572d976..54a9615 100644 --- a/ztree-diff-model.el +++ b/ztree-diff-model.el @@ -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 --git a/ztree-diff.el b/ztree-diff.el index 8d1d9d0..6caa73e 100644 --- a/ztree-diff.el +++ b/ztree-diff.el @@ -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 --git a/ztree-dir.el b/ztree-dir.el index 47a57cd..7506b84 100644 --- a/ztree-dir.el +++ b/ztree-dir.el @@ -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 --git a/ztree-util.el b/ztree-util.el index f5d3506..7a79fbc 100644 --- a/ztree-util.el +++ b/ztree-util.el @@ -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 --git a/ztree-view.el b/ztree-view.el index c623bd6..5a47a4c 100644 --- a/ztree-view.el +++ b/ztree-view.el @@ -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 --git a/ztree.el b/ztree.el index 3958daa..79e6fe6 100644 --- a/ztree.el +++ b/ztree.el @@ -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. ;;
