branch: elpa/multiple-cursors
commit 49fe803f3b20f648ca61bd417ab1533f78068dd1
Merge: f3daf86 912342e
Author: Magnar Sveen <[email protected]>
Commit: Magnar Sveen <[email protected]>
Merge pull request #163 from Silex/master
Improve mc-hide-unmatched-lines-mode.el
---
mc-hide-unmatched-lines-mode.el | 33 ++++++++++-----------------------
multiple-cursors-core.el | 1 +
rectangular-region-mode.el | 1 +
3 files changed, 12 insertions(+), 23 deletions(-)
diff --git a/mc-hide-unmatched-lines-mode.el b/mc-hide-unmatched-lines-mode.el
index 67375bf..684080e 100644
--- a/mc-hide-unmatched-lines-mode.el
+++ b/mc-hide-unmatched-lines-mode.el
@@ -29,7 +29,6 @@
;;; Code:
-
(require 'multiple-cursors-core)
(defvar hum/hide-unmatched-lines-mode-map (make-sparse-keymap)
@@ -45,15 +44,15 @@
;; used only in in multiple-cursors-mode-disabled-hook
(defun hum/disable-hum-mode ()
- (mc-hide-unmatched-lines-mode 0)
-)
+ (mc-hide-unmatched-lines-mode 0))
+;;;###autoload
(define-minor-mode mc-hide-unmatched-lines-mode
"Minor mode when enabled hides all lines where no cursos (and
also hum/lines-to-expand below and above) To make use of this
mode press \"C-'\" while multiple-cursor-mode is active. You can
still edit lines while you are in mc-hide-unmatched-lines
-mode. To leave this mode press <return> or \"C-g\""
+mode. To leave this mode press <return> or \"C-g\""
nil " hu"
hum/hide-unmatched-lines-mode-map
(if mc-hide-unmatched-lines-mode
@@ -63,9 +62,7 @@ mode. To leave this mode press <return> or \"C-g\""
(add-hook 'multiple-cursors-mode-disabled-hook 'hum/disable-hum-mode t
t))
(progn
(hum/unhide-unmatched-lines)
- (remove-hook 'multiple-cursors-mode-disabled-hook 'hum/disable-hum-mode))
- )
-)
+ (remove-hook 'multiple-cursors-mode-disabled-hook
'hum/disable-hum-mode))))
(defconst hum/invisible-overlay-name 'hum/invisible-overlay-name)
@@ -77,8 +74,7 @@ mode. To leave this mode press <return> or \"C-g\""
(defcustom hum/placeholder "..."
"Placeholder which will be placed insted of hiden text"
:type '(string)
- :group 'multiple-cursors
-)
+ :group 'multiple-cursors)
(defun hum/add-invisible-overlay (begin end)
(let ((overlay (make-overlay begin
@@ -91,10 +87,7 @@ mode. To leave this mode press <return> or \"C-g\""
(overlay-put overlay 'invisible t)
(overlay-put overlay 'intangible t)
(overlay-put overlay 'evaporate t)
- (overlay-put overlay 'after-string hum/placeholder)
- )
- )
-
+ (overlay-put overlay 'after-string hum/placeholder)))
(defun hum/hide-unmatched-lines ()
(let ((begin (point-min)))
@@ -102,18 +95,12 @@ mode. To leave this mode press <return> or \"C-g\""
(save-excursion
(goto-char (mc/cursor-beg cursor))
(if (< begin (line-beginning-position (- hum/lines-to-expand)))
- (hum/add-invisible-overlay begin (line-end-position (-
hum/lines-to-expand)))
- )
- (setq begin (line-beginning-position (+ 2 hum/lines-to-expand)))
- )
- )
- (hum/add-invisible-overlay begin (point-max))
- )
- )
+ (hum/add-invisible-overlay begin (line-end-position (-
hum/lines-to-expand))))
+ (setq begin (line-beginning-position (+ 2 hum/lines-to-expand)))))
+ (hum/add-invisible-overlay begin (point-max))))
(defun hum/unhide-unmatched-lines ()
- (remove-overlays nil nil hum/invisible-overlay-name t)
- )
+ (remove-overlays nil nil hum/invisible-overlay-name t))
(provide 'mc-hide-unmatched-lines-mode)
(define-key mc/keymap (kbd "C-'") 'mc-hide-unmatched-lines-mode)
diff --git a/multiple-cursors-core.el b/multiple-cursors-core.el
index bc8a279..2e46183 100644
--- a/multiple-cursors-core.el
+++ b/multiple-cursors-core.el
@@ -459,6 +459,7 @@ They are temporarily disabled when multiple-cursors are
active.")
:group 'multiple-cursors)
(put 'mc/mode-line 'risky-local-variable t)
+;;;###autoload
(define-minor-mode multiple-cursors-mode
"Mode while multiple cursors are active."
nil mc/mode-line mc/keymap
diff --git a/rectangular-region-mode.el b/rectangular-region-mode.el
index 6bd54c7..8cbe1de 100644
--- a/rectangular-region-mode.el
+++ b/rectangular-region-mode.el
@@ -108,6 +108,7 @@ an exceedingly quick way of adding multiple cursors to
multiple lines."
(when rectangular-region-mode
(rrm/switch-to-multiple-cursors)))
+;;;###autoload
(define-minor-mode rectangular-region-mode
"A mode for creating a rectangular region to edit"
nil " rr" rectangular-region-mode-map
