summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2012-03-30 21:48:15 +0200
committerBastien Guerry <bzg@altern.org>2012-03-30 21:48:15 +0200
commitc24fa194a62cbbc45fa1b58e39dac293a006a0c9 (patch)
tree42e70d5fc431bd6ca36626ebdc7407c043253ca7
parentfcf13e02aa4bd056316cb7476b94aecf80738b47 (diff)
downloadorg-mode-c24fa194a62cbbc45fa1b58e39dac293a006a0c9.tar.gz
Fix global dynamic variables prefixes in org-mouse.el.
Thanks to Martyn Jago for the patch.
-rw-r--r--lisp/org-mouse.el8
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/org-mouse.el b/lisp/org-mouse.el
index b1d9f22..5a87bd6 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))))