[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114931: * lisp/rect.el (rectangle-mark-mode): Renam
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] trunk r114931: * lisp/rect.el (rectangle-mark-mode): Rename from rectangle-mark. |
Date: |
Mon, 04 Nov 2013 03:06:59 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114931
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=15796
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Sun 2013-11-03 22:06:54 -0500
message:
* lisp/rect.el (rectangle-mark-mode): Rename from rectangle-mark.
Make it into a proper minor mode.
(rectangle--region): (implicitly) rename to rectangle-mark-mode.
(rectangle-mark-mode-map): New keymap.
(rectangle--highlight-for-redisplay): Fix some corner cases.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/rect.el rect.el-20091113204419-o5vbwnq5f7feedwu-83
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-11-04 01:36:14 +0000
+++ b/lisp/ChangeLog 2013-11-04 03:06:54 +0000
@@ -1,3 +1,11 @@
+2013-11-04 Stefan Monnier <address@hidden>
+
+ * rect.el (rectangle-mark-mode): Rename from rectangle-mark.
+ Make it into a proper minor mode.
+ (rectangle--region): (implicitly) rename to rectangle-mark-mode.
+ (rectangle-mark-mode-map): New keymap.
+ (rectangle--highlight-for-redisplay): Fix some corner cases (bug#15796).
+
2013-11-04 Glenn Morris <address@hidden>
* startup.el (command-line-1): Allow `-L :...' to append to load-path.
=== modified file 'lisp/rect.el'
--- a/lisp/rect.el 2013-10-29 16:11:50 +0000
+++ b/lisp/rect.el 2013-11-04 03:06:54 +0000
@@ -420,11 +420,8 @@
;; - lots of commands handle the region without paying attention to its
;; rectangular shape.
-(defvar-local rectangle--region nil
- "If non-nil, the region is meant to delimit a rectangle.")
-
(add-hook 'deactivate-mark-hook
- (lambda () (kill-local-variable 'rectangle--region)))
+ (lambda () (rectangle-mark-mode -1)))
(add-function :around redisplay-highlight-region-function
#'rectangle--highlight-for-redisplay)
@@ -433,17 +430,25 @@
(add-function :around region-extract-function
#'rectangle--extract-region)
+(defvar rectangle-mark-mode-map
+ (let ((map (make-sparse-keymap)))
+ (define-key map [?\C-o] 'open-rectangle)
+ (define-key map [?\C-t] 'string-rectangle)
+ ;; (define-key map [remap open-line] 'open-rectangle)
+ ;; (define-key map [remap transpose-chars] 'string-rectangle)
+ map)
+ "Keymap used while marking a rectangular region.")
+
;;;###autoload
-(defun rectangle-mark ()
- "Toggle the region as rectangular."
- (interactive)
- (if rectangle--region
- (kill-local-variable 'rectangle--region)
- (unless (region-active-p) (push-mark-command t))
- (setq rectangle--region t)))
+(define-minor-mode rectangle-mark-mode
+ "Toggle the region as rectangular.
+Activates the region if needed. Only lasts until the region is deactivated."
+ nil nil nil
+ (when rectangle-mark-mode
+ (unless (region-active-p) (push-mark-command t))))
(defun rectangle--extract-region (orig &optional delete)
- (if (not rectangle--region)
+ (if (not rectangle-mark-mode)
(funcall orig delete)
(let* ((strs (funcall (if delete
#'delete-extract-rectangle
@@ -473,7 +478,7 @@
(defun rectangle--highlight-for-redisplay (orig start end window rol)
(cond
- ((not rectangle--region)
+ ((not rectangle-mark-mode)
(funcall orig start end window rol))
((and (eq 'rectangle (car-safe rol))
(eq (nth 1 rol) (buffer-modified-tick))
@@ -535,10 +540,17 @@
(eq (char-before right) ?\t))
(setq right (1- right))
(move-overlay ol left right)
- (goto-char right)
- (let ((str (make-string (- rightcol (current-column)) ?\s)))
- (put-text-property 0 (length str) 'face 'region str)
- (overlay-put ol 'after-string str)))
+ (if (= rightcol leftcol)
+ (overlay-put ol 'after-string nil)
+ (goto-char right)
+ (let ((str (make-string
+ (- rightcol (max leftcol (current-column))) ?\s)))
+ (put-text-property 0 (length str) 'face 'region str)
+ (when (= left right)
+ ;; If cursor happens to be here, draw it *before* rather
+ ;; than after this highlighted pseudo-text.
+ (put-text-property 0 1 'cursor 1 str))
+ (overlay-put ol 'after-string str))))
((overlay-get ol 'after-string)
(overlay-put ol 'after-string nil)))
(when (= leftcol rightcol)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114931: * lisp/rect.el (rectangle-mark-mode): Rename from rectangle-mark.,
Stefan Monnier <=