Merge commit 'e0454a100541ce3f1f732b97894a3441cef3316f' from hydra

[gnu-emacs-elpa] / packages / hydra / hydra-examples.el

diff --git a/packages/hydra/hydra-examples.el b/packages/hydra/hydra-examples.el
index c20299771b54ff0e8fa7f0ab568cd7e3c8225cc3..9264feb86af297236f19495e3ac3d7226ca98363 100644 (file)
--- a/packages/hydra/hydra-examples.el
+++ b/packages/hydra/hydra-examples.el
@@ -225,6 +225,7 @@ _~_: modified      ^ ^                ^ ^                ^^
 ;;** Example 9: s-expressions in the docstring
 ;; You can inline s-expresssions into the docstring like this:
 (defvar dired-mode-map)
+(declare-function dired-mark "dired")
 (when (bound-and-true-p hydra-examples-verbatim)
   (require 'dired)
   (defhydra hydra-marked-items (dired-mode-map "")
@@ -259,6 +260,7 @@ _v_ariable       _u_ser-option
 ;; (global-set-key (kbd "C-c h") 'hydra-apropos/body)
 
 ;;** Example 11: rectangle-mark-mode
+(require 'rect)
 (defhydra hydra-rectangle (:body-pre (rectangle-mark-mode 1)
                            :color pink
                            :post (deactivate-mark))
@@ -269,10 +271,10 @@ _h_   _l_   _o_k        _y_ank
 ^^^^        _e_xchange  _u_ndo
 ^^^^        ^ ^         _p_aste
 "
-  ("h" backward-char nil)
-  ("l" forward-char nil)
-  ("k" previous-line nil)
-  ("j" next-line nil)
+  ("h" rectangle-backward-char nil)
+  ("l" rectangle-forward-char nil)
+  ("k" rectangle-previous-line nil)
+  ("j" rectangle-next-line nil)
   ("e" hydra-ex-point-mark nil)
   ("n" copy-rectangle-as-kill nil)
   ("d" delete-rectangle nil)
@@ -328,7 +330,7 @@ _h_   _l_   _o_k        _y_ank
   "Exchange point and mark."
   (interactive)
   (if rectangle-mark-mode
-      (exchange-point-and-mark)
+      (rectangle-exchange-point-and-mark)
     (let ((mk (mark)))
       (rectangle-mark-mode 1)
       (goto-char mk))))