mlf176f2 pushed a commit to branch externals/ergoemacs-mode in repository elpa.
commit 2657ab9e21eb9fe37981184ea8d8f01ac666b5eb Author: Matthew L. Fidler <[email protected]> Date: Wed Jun 18 14:32:31 2014 -0500 Add ergoemacs fixes for 24.4 --- ergoemacs-functions.el | 70 ++++++++++++++++++++++++------------------------ ergoemacs-test.el | 2 +- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/ergoemacs-functions.el b/ergoemacs-functions.el index f69b091..14c8086 100644 --- a/ergoemacs-functions.el +++ b/ergoemacs-functions.el @@ -1524,41 +1524,41 @@ If a smart-punctuation mode is active, use it by placing the initial pair in the :type 'boolean :group 'ergoemacs-mode) -(declare-function ergoemacs-pretty-key "ergoemacs-translate.el") -(defun ergoemacs-smart-punctuation () - "Smart Punctuation Function for `ergoemacs-mode'." - (interactive) - (unless (run-hook-with-args-until-success 'ergoemacs-smart-punctuation-hooks) - (cond - ((and (eq last-command this-command) - (looking-back (regexp-opt (mapcar (lambda(pair) (substring pair 0 1)) ergoemacs-smart-punctuation-pairs) t))) - (undo) - (when ergoemacs-smart-punctuation-last-mark - ;; I use set-mark because I don't want it to be added to the mark-stack. - (set-mark ergoemacs-smart-punctuation-last-mark)) - (setq ergoemacs-smart-punctuation-last-mark (condition-case err - (mark) - (error nil))) - (ergoemacs-smart-punctuation-insert-pair (nth ergoemacs-smart-punctuation-next-pair - ergoemacs-smart-punctuation-pairs))) - (t - (setq ergoemacs-smart-punctuation-last-mark (condition-case err - (mark) - (error nil))) - (ergoemacs-smart-punctuation-insert-pair (nth 0 ergoemacs-smart-punctuation-pairs)) - (setq ergoemacs-smart-punctuation-next-pair 0))) - (setq ergoemacs-smart-punctuation-next-pair (+ ergoemacs-smart-punctuation-next-pair 1)) - (unless (nth ergoemacs-smart-punctuation-next-pair ergoemacs-smart-punctuation-pairs) - (setq ergoemacs-smart-punctuation-next-pair 0)) - (when ergoemacs-repeat-smart-punctuation - (let ((repeat-key (key-description (this-single-command-keys))) - (temp-map (make-sparse-keymap)) - message-log-max) - (setq repeat-key (substring repeat-key (- (length repeat-key) 1))) - (define-key temp-map (read-kbd-macro repeat-key) this-command) - (set-temporary-overlay-map temp-map) - (when (eq (ergoemacs-real-key-binding (read-kbd-macro repeat-key) t) this-command) - (message "Cycle with %s" (ergoemacs-pretty-key repeat-key))))))) +;; (declare-function ergoemacs-pretty-key "ergoemacs-translate.el") +;; (defun ergoemacs-smart-punctuation () +;; "Smart Punctuation Function for `ergoemacs-mode'." +;; (interactive) +;; (unless (run-hook-with-args-until-success 'ergoemacs-smart-punctuation-hooks) +;; (cond +;; ((and (eq last-command this-command) +;; (looking-back (regexp-opt (mapcar (lambda(pair) (substring pair 0 1)) ergoemacs-smart-punctuation-pairs) t))) +;; (undo) +;; (when ergoemacs-smart-punctuation-last-mark +;; ;; I use set-mark because I don't want it to be added to the mark-stack. +;; (set-mark ergoemacs-smart-punctuation-last-mark)) +;; (setq ergoemacs-smart-punctuation-last-mark (condition-case err +;; (mark) +;; (error nil))) +;; (ergoemacs-smart-punctuation-insert-pair (nth ergoemacs-smart-punctuation-next-pair +;; ergoemacs-smart-punctuation-pairs))) +;; (t +;; (setq ergoemacs-smart-punctuation-last-mark (condition-case err +;; (mark) +;; (error nil))) +;; (ergoemacs-smart-punctuation-insert-pair (nth 0 ergoemacs-smart-punctuation-pairs)) +;; (setq ergoemacs-smart-punctuation-next-pair 0))) +;; (setq ergoemacs-smart-punctuation-next-pair (+ ergoemacs-smart-punctuation-next-pair 1)) +;; (unless (nth ergoemacs-smart-punctuation-next-pair ergoemacs-smart-punctuation-pairs) +;; (setq ergoemacs-smart-punctuation-next-pair 0)) +;; (when ergoemacs-repeat-smart-punctuation +;; (let ((repeat-key (key-description (this-single-command-keys))) +;; (temp-map (make-sparse-keymap)) +;; message-log-max) +;; (setq repeat-key (substring repeat-key (- (length repeat-key) 1))) +;; (define-key temp-map (read-kbd-macro repeat-key) this-command) +;; (set-temporary-overlay-map temp-map) +;; (when (eq (ergoemacs-real-key-binding (read-kbd-macro repeat-key) t) this-command) +;; (message "Cycle with %s" (ergoemacs-pretty-key repeat-key))))))) (defvar org-table-any-line-regexp) (declare-function cua-set-rectangle-mark "cua-rect.el") diff --git a/ergoemacs-test.el b/ergoemacs-test.el index a172973..f9208f8 100644 --- a/ergoemacs-test.el +++ b/ergoemacs-test.el @@ -473,7 +473,7 @@ Test next and prior translation." (ergoemacs-handle-ctl-c-or-ctl-x 'both)) (with-temp-buffer (insert ergoemacs-test-lorem-ipsum) - (mark-whole-buffer) + (call-interactively 'mark-whole-buffer) (with-timeout (0.15 nil) (call-interactively 'ergoemacs-ctl-x)) (setq ret (string= "" (buffer-string))))
