mlf176f2 pushed a commit to branch externals/ergoemacs-mode in repository elpa.
commit 8c463b473540c43eaf2f297a676c718bdeb89171 Author: Matthew L. Fidler <[email protected]> Date: Fri May 23 18:06:42 2014 +0800 Fix diffs of patch. --- ergoemacs-advices.el | 8 -------- ergoemacs-theme-engine.el | 16 ---------------- ergoemacs-unbind.el | 4 ---- 3 files changed, 0 insertions(+), 28 deletions(-) diff --git a/ergoemacs-advices.el b/ergoemacs-advices.el index 0db7dae..ba42bd1 100644 --- a/ergoemacs-advices.el +++ b/ergoemacs-advices.el @@ -45,13 +45,9 @@ "Advice to allow `this-command' to be set correctly before running `pre-command-hook' If `pre-command-hook' is used and `ergoemacs-mode' is enabled add to `ergoemacs-pre-command-hook' instead." (cond -<<<<<<< HEAD ((and (boundp 'ergoemacs-mode) ergoemacs-mode (eq hook 'pre-command-hook) (boundp 'ergoemacs-hook-functions) -======= - ((and ergoemacs-mode (eq hook 'pre-command-hook) ->>>>>>> parent of 8e95ab1... Stefan Monnier's Patch (memq hook ergoemacs-hook-functions)) (add-hook 'ergoemacs-pre-command-hook function append local)) (t @@ -62,13 +58,9 @@ If `pre-command-hook' is used and `ergoemacs-mode' is enabled add to `ergoemacs- "Advice to allow `this-command' to be set correctly before running `pre-command-hook'. If `pre-command-hook' is used and `ergoemacs-mode' is remove from `ergoemacs-pre-command-hook' instead." (cond -<<<<<<< HEAD ((and (boundp 'ergoemacs-mode) ergoemacs-mode (eq hook 'pre-command-hook) (boundp 'ergoemacs-hook-functions) -======= - ((and ergoemacs-mode (eq hook 'pre-command-hook) ->>>>>>> parent of 8e95ab1... Stefan Monnier's Patch (memq hook ergoemacs-hook-functions)) (remove-hook 'ergoemacs-pre-command-hook function local)) (t diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el index 9e79181..018b89b 100644 --- a/ergoemacs-theme-engine.el +++ b/ergoemacs-theme-engine.el @@ -1373,7 +1373,6 @@ added to the appropriate startup hooks. (symbol-name component))))) (mapc (lambda(hook) -<<<<<<< HEAD (when (string-match "hook\\'" (symbol-name hook)) (fset (intern (concat "ergoemacs-for-" (symbol-name hook))) `(lambda () @@ -1467,21 +1466,6 @@ added to the appropriate startup hooks. (puthash (concat name "::" ver ":fixed-rm") fixed-rm ergoemacs-theme-component-hash) (puthash (concat name "::" ver ":variable-rm") var-rm ergoemacs-theme-component-hash))) ergoemacs-component-version-list))) -======= - (when (string-match "hook$" (symbol-name hook)) - (eval (macroexpand - `(defun ,(intern (concat "ergoemacs-for-" (symbol-name hook))) () - ,(format "Runs `ergoemacs-theme-hook' for `%s'" (symbol-name hook)) - (ergoemacs-theme-hook ',hook)))) - (if remove-p - (eval - (macroexpand - `(remove-hook ',hook ',(intern (concat "ergoemacs-for-" (symbol-name hook)))))) - (eval - (macroexpand - `(add-hook ',hook ',(intern (concat "ergoemacs-for-" (symbol-name hook))))))))) - (gethash (concat true-component ":minor-list") ergoemacs-theme-component-hash))))) ->>>>>>> parent of 8e95ab1... Stefan Monnier's Patch (defmacro ergoemacs-theme-component (&rest body-and-plist) "A component of an ergoemacs-theme." diff --git a/ergoemacs-unbind.el b/ergoemacs-unbind.el index 4f9a6ab..5da30c2 100644 --- a/ergoemacs-unbind.el +++ b/ergoemacs-unbind.el @@ -755,11 +755,7 @@ elt ;; FIXME: Use `push' or `cl-pushnew' instead of ;; `add-to-list'. -<<<<<<< HEAD - (pushnew 'last fn :test #'equal) -======= (add-to-list 'last fn) ->>>>>>> parent of 8e95ab1... Stefan Monnier's Patch `(,first ,last)))) ergoemacs-emacs-default-bindings)) (ergoemacs-reset-global-where-is))
