From c24fa194a62cbbc45fa1b58e39dac293a006a0c9 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Fri, 30 Mar 2012 21:48:15 +0200 Subject: [PATCH] Fix global dynamic variables prefixes in org-mouse.el. Thanks to Martyn Jago for the patch. --- lisp/org-mouse.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lisp/org-mouse.el b/lisp/org-mouse.el index b1d9f22a4..5a87bd646 100644 --- a/lisp/org-mouse.el +++ b/lisp/org-mouse.el @@ -315,11 +315,11 @@ nor a function, elements of KEYWORDS are used directly." (replace-match "") (just-one-space)) -(defvar rest) +(defvar org-mouse-rest) (defun org-mouse-replace-match-and-surround (newtext &optional fixedcase literal string subexp) "The same as `replace-match', but surrounds the replacement with spaces." - (apply 'replace-match rest) + (apply 'replace-match org-mouse-rest) (save-excursion (goto-char (match-beginning (or subexp 0))) (just-one-space) @@ -990,7 +990,7 @@ This means, between the beginning of line and the point." (replace-match replace-text)) (forward-line)))) -(defvar _cmd) ;dynamically scoped from `org-with-remote-undo'. +(defvar org-mouse-cmd) ;dynamically scoped from `org-with-remote-undo'. (defun org-mouse-do-remotely (command) ; (org-agenda-check-no-diary) @@ -1021,7 +1021,7 @@ This means, between the beginning of line and the point." (setq marker (copy-marker (point))) (goto-char (max (point-at-bol) (- (point-at-eol) anticol))) (funcall command) - (message "_cmd: %S" _cmd) + (message "_cmd: %S" org-mouse-cmd) (message "this-command: %S" this-command) (unless (eq (marker-position marker) (marker-position endmarker)) (setq newhead (org-get-heading)))) -- 2.11.4.GIT