mlf176f2 pushed a commit to branch externals/ergoemacs-mode in repository elpa.
commit f1661dea89dfd88528bc1a9f655878db9a4ad98a Author: Matthew L. Fidler <[email protected]> Date: Fri Jun 27 00:02:54 2014 -0500 Fix warnings for cua-clear-rectangle-mark. --- ergoemacs-shortcuts.el | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ergoemacs-shortcuts.el b/ergoemacs-shortcuts.el index 8bb51cf..bef677d 100644 --- a/ergoemacs-shortcuts.el +++ b/ergoemacs-shortcuts.el @@ -518,13 +518,15 @@ It will replace anything defined by `ergoemacs-translation'" (declare-function minibuffer-keyboard-quit "delsel.el") (declare-function ergoemacs-key-fn-lookup "ergoemacs-translate.el") (declare-function ergoemacs-modal-toggle "ergoemacs-modal.el") - +(declare-function cua-clear-rectangle-mark "cua-rect.el") (defun ergoemacs-keyboard-quit () "Replacement for `keyboard-quit' and `minibuffer-keyboard-quit'." (cond ((minibufferp) (minibuffer-keyboard-quit)) - ((and (boundp 'cua--rectangle) cua--rectangle (boundp 'cua-mode) cua-mode) + ((and (boundp 'cua--rectangle) cua--rectangle + (boundp 'cua-mode) cua-mode + (fboundp 'cua-clear-rectangle-mark)) (cua-clear-rectangle-mark)) (t (let (defined-fn
