summaryrefslogtreecommitdiff
path: root/contrib/lisp/org-panel.el
diff options
context:
space:
mode:
authorSebastien Delafond <seb@debian.org>2013-08-11 16:27:56 +0200
committerS├ębastien Delafond <sdelafond@gmail.com>2014-07-13 13:35:27 +0200
commit53b246b7d66bfa03ab9bcf47d4647913b401e3d6 (patch)
treeb5ea4e732c2219456d13048feb05b37b22a76391 /contrib/lisp/org-panel.el
parent8606e2621fc00fd8b334a06924aeef3aab7a2e4d (diff)
parente32a45ed36d6000db4b39171149072d11b77af72 (diff)
Imported Debian patch 8.0.7-1
Diffstat (limited to 'contrib/lisp/org-panel.el')
-rw-r--r--contrib/lisp/org-panel.el21
1 files changed, 9 insertions, 12 deletions
diff --git a/contrib/lisp/org-panel.el b/contrib/lisp/org-panel.el
index 3ffdfaf..dec7241 100644
--- a/contrib/lisp/org-panel.el
+++ b/contrib/lisp/org-panel.el
@@ -50,9 +50,7 @@
;; General Public License for more details.
;;
;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-;; Floor, Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
@@ -133,8 +131,6 @@ active.)"
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; Hook functions etc
-;;(defvar orgpan-this-panel-window nil)
-
(defun orgpan-delete-panel ()
"Remove the panel."
(interactive)
@@ -203,8 +199,7 @@ active.)"
(unless (and orgpan-point
(= (point) orgpan-point))
;; Go backward so it is possible to click on a "button":
- (orgpan-backward-field)))))
- (setq orgpan-this-panel-window nil))
+ (orgpan-backward-field))))))
(error (lwarn 't :warning "orgpan-post: %S" err))))
;; (defun orgpan-window-config-change ()
@@ -294,7 +289,7 @@ active.)"
(defun orgpan-check-panel-mode ()
(unless (derived-mode-p 'orgpan-mode)
- (error "Not orgpan-mode in buffer: " major-mode)))
+ (error "Not orgpan-mode in buffer: %s" major-mode)))
(defun orgpan-display-bindings-help ()
(orgpan-check-panel-mode)
@@ -401,6 +396,9 @@ There can be only one such buffer at any time.")
(defvar orgpan-point nil)
;;(make-variable-buffer-local 'orgpan-point)
+(defvar viper-emacs-state-mode-list)
+(defvar viper-new-major-mode-buffer-list)
+
(defun orgpan-avoid-viper-in-buffer ()
;; Fix-me: This is ugly. However see `this-major-mode-requires-vi-state':
(set (make-local-variable 'viper-emacs-state-mode-list) '(orgpan-mode))
@@ -598,12 +596,11 @@ button changes the binding of the arrow keys."
org-mode-map))
;;(org-back-to-heading)
;;(remove-hook 'window-configuration-change-hook 'orgpan-window-config-change)
- (split-window)
+ (setq orgpan-org-window (selected-window))
+ (setq orgpan-panel-window (split-window nil -4 'below))
+ (select-window orgpan-panel-window)
(set-window-buffer (selected-window) (orgpan-make-panel-buffer))
- (setq orgpan-panel-window (selected-window))
;;(set-window-dedicated-p (selected-window) t)
- (fit-window-to-buffer nil nil 3)
- (setq orgpan-org-window (next-window))
;; The minor mode version starts here:
(when orgpan-minor-mode-version
(select-window orgpan-org-window)