Add pre-redisplay-function and rectangular region
* lisp/rect.el: Use lexical-binding. Add new rectangular region support.
(rectangle-mark): New command.
(rectangle--region): New var.
(deactivate-mark-hook): Reset rectangle--region.
(rectangle--extract-region, rectangle--insert-for-yank)
(rectangle--highlight-for-redisplay)
(rectangle--unhighlight-for-redisplay): New functions.
(region-extract-function, redisplay-unhighlight-region-function)
(redisplay-highlight-region-function): Use them to handle
rectangular region.
* lisp/simple.el (region-extract-function): New var.
(delete-backward-char, delete-forward-char, deactivate-mark): Use it.
(kill-new, kill-append): Remove obsolete `yank-handler' argument.
(kill-region): Replace obsolete `yank-handler' arg with `region'.
(copy-region-as-kill, kill-ring-save): Add `region' argument.
(redisplay-unhighlight-region-function)
(redisplay-highlight-region-function): New vars.
(redisplay--update-region-highlight): New function.
(pre-redisplay-function): Use it.
(exchange-point-and-mark): Don't deactivate the mark before
reactivate-it anyway.
* lisp/comint.el (comint-kill-region): Remove yank-handler argument.
* lisp/delsel.el (delete-backward-char, backward-delete-char-untabify)
(delete-char): Remove property, since it's now part of their
default behavior.
(self-insert-iso): Remove property since this command doesn't exist.
* src/xdisp.c (prepare_menu_bars): Call Vpre_redisplay_function.
(syms_of_xdisp): Declare pre-redisplay-function.
(markpos_of_region): Remove function.
(init_iterator, compute_stop_pos, handle_face_prop)
(face_before_or_after_it_pos, reseat_to_string)
(get_next_display_element, window_buffer_changed)
(redisplay_internal, try_cursor_movement, redisplay_window)
(try_window_reusing_current_matrix, try_window_id, display_line)
(note_mode_line_or_margin_highlight, note_mouse_highlight)
(display_string, mouse_face_from_buffer_pos): Remove region handling.
* src/window.h (struct window): Remove field `region_showing'.
* src/dispextern.h (struct it): Remove region_beg/end_charpos.
(face_at_buffer_position, face_for_overlay_string)
(face_at_string_position): Update prototypes.
* src/xfaces.c (face_at_buffer_position, face_for_overlay_string)
(face_at_string_position): Remove `region_beg' and `region_end' args.
* src/fontset.c (Finternal_char_font):
* src/font.c (font_at, font_range): Adjust calls accordingly.
* src/insdel.c (Qregion_extract_function): New var.
(syms_of_insdel): Initialize it.
(prepare_to_modify_buffer_1): Use it.
2013-10-29 16:11:50 +00:00
|
|
|
;;; rect.el --- rectangle functions for GNU Emacs -*- lexical-binding:t -*-
|
1992-05-30 22:12:04 +00:00
|
|
|
|
2013-01-01 09:11:05 +00:00
|
|
|
;; Copyright (C) 1985, 1999-2013 Free Software Foundation, Inc.
|
1992-07-22 04:22:30 +00:00
|
|
|
|
2001-10-03 10:52:47 +00:00
|
|
|
;; Maintainer: Didier Verna <didier@xemacs.org>
|
1992-07-17 20:24:00 +00:00
|
|
|
;; Keywords: internal
|
2010-08-29 16:17:13 +00:00
|
|
|
;; Package: emacs
|
1992-07-15 23:29:10 +00:00
|
|
|
|
1989-10-31 16:00:07 +00:00
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
2008-05-06 08:06:51 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
1989-10-31 16:00:07 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 08:06:51 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
1989-10-31 16:00:07 +00:00
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2008-05-06 08:06:51 +00:00
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
1989-10-31 16:00:07 +00:00
|
|
|
|
1993-03-22 05:42:35 +00:00
|
|
|
;;; Commentary:
|
|
|
|
|
1999-08-23 14:28:34 +00:00
|
|
|
;; This package provides the operations on rectangles that are documented
|
1993-03-22 05:42:35 +00:00
|
|
|
;; in the Emacs manual.
|
|
|
|
|
2010-12-15 02:05:38 +00:00
|
|
|
;; ### NOTE: this file was almost completely rewritten by Didier Verna
|
|
|
|
;; <didier@xemacs.org> in July 1999.
|
1999-08-03 18:36:16 +00:00
|
|
|
|
1992-07-15 23:29:10 +00:00
|
|
|
;;; Code:
|
1989-10-31 16:00:07 +00:00
|
|
|
|
2010-12-15 02:05:38 +00:00
|
|
|
;; FIXME: this function should be replaced by `apply-on-rectangle'
|
1989-10-31 16:00:07 +00:00
|
|
|
(defun operate-on-rectangle (function start end coerce-tabs)
|
|
|
|
"Call FUNCTION for each line of rectangle with corners at START, END.
|
|
|
|
If COERCE-TABS is non-nil, convert multi-column characters
|
|
|
|
that span the starting or ending columns on any line
|
|
|
|
to multiple spaces before calling FUNCTION.
|
|
|
|
FUNCTION is called with three arguments:
|
|
|
|
position of start of segment of this line within the rectangle,
|
|
|
|
number of columns that belong to rectangle but are before that position,
|
|
|
|
number of columns that belong to rectangle but are after point.
|
|
|
|
Point is at the end of the segment of this line within the rectangle."
|
|
|
|
(let (startcol startlinepos endcol endlinepos)
|
|
|
|
(save-excursion
|
|
|
|
(goto-char start)
|
|
|
|
(setq startcol (current-column))
|
|
|
|
(beginning-of-line)
|
|
|
|
(setq startlinepos (point)))
|
|
|
|
(save-excursion
|
|
|
|
(goto-char end)
|
|
|
|
(setq endcol (current-column))
|
|
|
|
(forward-line 1)
|
|
|
|
(setq endlinepos (point-marker)))
|
|
|
|
(if (< endcol startcol)
|
1992-11-16 01:40:15 +00:00
|
|
|
(setq startcol (prog1 endcol (setq endcol startcol))))
|
1994-02-05 02:19:28 +00:00
|
|
|
(save-excursion
|
|
|
|
(goto-char startlinepos)
|
|
|
|
(while (< (point) endlinepos)
|
|
|
|
(let (startpos begextra endextra)
|
1998-11-24 03:52:08 +00:00
|
|
|
(if coerce-tabs
|
2001-11-17 00:47:42 +00:00
|
|
|
(move-to-column startcol t)
|
1998-11-24 03:52:08 +00:00
|
|
|
(move-to-column startcol))
|
1994-02-05 02:19:28 +00:00
|
|
|
(setq begextra (- (current-column) startcol))
|
|
|
|
(setq startpos (point))
|
1998-11-24 03:52:08 +00:00
|
|
|
(if coerce-tabs
|
2001-11-17 00:47:42 +00:00
|
|
|
(move-to-column endcol t)
|
1998-11-24 03:52:08 +00:00
|
|
|
(move-to-column endcol))
|
1997-09-03 21:09:39 +00:00
|
|
|
;; If we overshot, move back one character
|
|
|
|
;; so that endextra will be positive.
|
|
|
|
(if (and (not coerce-tabs) (> (current-column) endcol))
|
|
|
|
(backward-char 1))
|
1994-02-05 02:19:28 +00:00
|
|
|
(setq endextra (- endcol (current-column)))
|
|
|
|
(if (< begextra 0)
|
|
|
|
(setq endextra (+ endextra begextra)
|
|
|
|
begextra 0))
|
|
|
|
(funcall function startpos begextra endextra))
|
|
|
|
(forward-line 1)))
|
1989-10-31 16:00:07 +00:00
|
|
|
(- endcol startcol)))
|
|
|
|
|
1999-08-03 18:36:16 +00:00
|
|
|
(defun apply-on-rectangle (function start end &rest args)
|
|
|
|
"Call FUNCTION for each line of rectangle with corners at START, END.
|
|
|
|
FUNCTION is called with two arguments: the start and end columns of the
|
1999-08-23 14:28:34 +00:00
|
|
|
rectangle, plus ARGS extra arguments. Point is at the beginning of line when
|
2011-07-14 15:23:08 +00:00
|
|
|
the function is called.
|
|
|
|
The final point after the last operation will be returned."
|
|
|
|
(let (startcol startpt endcol endpt final-point)
|
1999-08-03 18:36:16 +00:00
|
|
|
(save-excursion
|
|
|
|
(goto-char start)
|
|
|
|
(setq startcol (current-column))
|
|
|
|
(beginning-of-line)
|
|
|
|
(setq startpt (point))
|
|
|
|
(goto-char end)
|
|
|
|
(setq endcol (current-column))
|
|
|
|
(forward-line 1)
|
|
|
|
(setq endpt (point-marker))
|
|
|
|
;; ensure the start column is the left one.
|
|
|
|
(if (< endcol startcol)
|
|
|
|
(let ((col startcol))
|
|
|
|
(setq startcol endcol endcol col)))
|
|
|
|
;; start looping over lines
|
|
|
|
(goto-char startpt)
|
|
|
|
(while (< (point) endpt)
|
|
|
|
(apply function startcol endcol args)
|
2011-07-14 15:23:08 +00:00
|
|
|
(setq final-point (point))
|
1999-08-03 18:36:16 +00:00
|
|
|
(forward-line 1)))
|
2011-07-14 15:23:08 +00:00
|
|
|
final-point))
|
1999-08-03 18:36:16 +00:00
|
|
|
|
|
|
|
(defun delete-rectangle-line (startcol endcol fill)
|
2005-01-29 17:26:39 +00:00
|
|
|
(when (= (move-to-column startcol (if fill t 'coerce)) startcol)
|
2001-11-17 00:47:42 +00:00
|
|
|
(delete-region (point)
|
|
|
|
(progn (move-to-column endcol 'coerce)
|
|
|
|
(point)))))
|
1999-08-03 18:36:16 +00:00
|
|
|
|
|
|
|
(defun delete-extract-rectangle-line (startcol endcol lines fill)
|
|
|
|
(let ((pt (point-at-eol)))
|
2005-01-29 17:26:39 +00:00
|
|
|
(if (< (move-to-column startcol (if fill t 'coerce)) startcol)
|
1999-08-03 18:36:16 +00:00
|
|
|
(setcdr lines (cons (spaces-string (- endcol startcol))
|
|
|
|
(cdr lines)))
|
|
|
|
;; else
|
|
|
|
(setq pt (point))
|
2001-11-17 00:47:42 +00:00
|
|
|
(move-to-column endcol t)
|
2006-04-08 10:30:52 +00:00
|
|
|
(setcdr lines (cons (filter-buffer-substring pt (point) t) (cdr lines))))
|
1999-08-03 18:36:16 +00:00
|
|
|
))
|
|
|
|
|
2010-12-15 02:05:38 +00:00
|
|
|
;; This is actually the only function that needs to do complicated
|
|
|
|
;; stuff like what's happening in `operate-on-rectangle', because the
|
|
|
|
;; buffer might be read-only.
|
1999-08-03 18:36:16 +00:00
|
|
|
(defun extract-rectangle-line (startcol endcol lines)
|
|
|
|
(let (start end begextra endextra line)
|
|
|
|
(move-to-column startcol)
|
|
|
|
(setq start (point)
|
|
|
|
begextra (- (current-column) startcol))
|
|
|
|
(move-to-column endcol)
|
|
|
|
(setq end (point)
|
|
|
|
endextra (- endcol (current-column)))
|
|
|
|
(setq line (buffer-substring start (point)))
|
|
|
|
(if (< begextra 0)
|
|
|
|
(setq endextra (+ endextra begextra)
|
|
|
|
begextra 0))
|
|
|
|
(if (< endextra 0)
|
|
|
|
(setq endextra 0))
|
|
|
|
(goto-char start)
|
1989-10-31 16:00:07 +00:00
|
|
|
(while (search-forward "\t" end t)
|
|
|
|
(let ((width (- (current-column)
|
|
|
|
(save-excursion (forward-char -1)
|
|
|
|
(current-column)))))
|
|
|
|
(setq line (concat (substring line 0 (- (point) end 1))
|
|
|
|
(spaces-string width)
|
1999-08-03 18:36:16 +00:00
|
|
|
(substring line (+ (length line)
|
|
|
|
(- (point) end)))))))
|
1989-10-31 16:00:07 +00:00
|
|
|
(if (or (> begextra 0) (> endextra 0))
|
|
|
|
(setq line (concat (spaces-string begextra)
|
|
|
|
line
|
|
|
|
(spaces-string endextra))))
|
1999-08-03 18:36:16 +00:00
|
|
|
(setcdr lines (cons line (cdr lines)))))
|
1989-10-31 16:00:07 +00:00
|
|
|
|
|
|
|
(defconst spaces-strings
|
|
|
|
'["" " " " " " " " " " " " " " " " "])
|
|
|
|
|
|
|
|
(defun spaces-string (n)
|
Fix typos in docstrings.
* cus-edit.el (customize-apropos-options, custom-comment)
(custom-comment-tag, custom-face-edit-attribute-tag):
Fix typos in docstrings.
(custom-buffer-done-kill): Remove * from defcustom docstring.
(custom-file): Fix typo in doc of defcustom choice.
* frame.el (display-visual-class): Fix typo in docstring.
(initial-frame-alist, minibuffer-frame-alist, pop-up-frame-alist)
(special-display-frame-alist, show-trailing-whitespace)
(auto-hscroll-mode, blink-cursor-delay, blink-cursor-interval)
(display-hourglass, hourglass-delay, cursor-in-non-selected-windows):
Remove * from defcustom docstrings.
* md4.el (md4-buffer): Fix typo in docstring.
(md4, md4-64): Doc fixes.
(md4-pack-int32): Reflow docstring.
* paths.el (rmail-file-name): Remove * from defcustom docstring.
(prune-directory-list, gnus-nntp-service): Fix typos in docstrings.
* rect.el (open-rectangle): Reflow docstring.
(spaces-string): Fix docstring typo. Use "?\s" instead of "? ".
* select.el (x-get-cut-buffer): Fix typo in docstring.
* timezone.el (timezone-zone-to-minute, timezone-time-from-absolute)
(timezone-time-zone-from-absolute, timezone-leap-year-p):
Fix typos in docstrings.
* emacs-lisp/assoc.el (asort, aelement, aput, aget, amake):
Fix typos in docstrings.
2008-11-01 01:24:33 +00:00
|
|
|
"Return a string with N spaces."
|
1989-10-31 16:00:07 +00:00
|
|
|
(if (<= n 8) (aref spaces-strings n)
|
Fix typos in docstrings.
* cus-edit.el (customize-apropos-options, custom-comment)
(custom-comment-tag, custom-face-edit-attribute-tag):
Fix typos in docstrings.
(custom-buffer-done-kill): Remove * from defcustom docstring.
(custom-file): Fix typo in doc of defcustom choice.
* frame.el (display-visual-class): Fix typo in docstring.
(initial-frame-alist, minibuffer-frame-alist, pop-up-frame-alist)
(special-display-frame-alist, show-trailing-whitespace)
(auto-hscroll-mode, blink-cursor-delay, blink-cursor-interval)
(display-hourglass, hourglass-delay, cursor-in-non-selected-windows):
Remove * from defcustom docstrings.
* md4.el (md4-buffer): Fix typo in docstring.
(md4, md4-64): Doc fixes.
(md4-pack-int32): Reflow docstring.
* paths.el (rmail-file-name): Remove * from defcustom docstring.
(prune-directory-list, gnus-nntp-service): Fix typos in docstrings.
* rect.el (open-rectangle): Reflow docstring.
(spaces-string): Fix docstring typo. Use "?\s" instead of "? ".
* select.el (x-get-cut-buffer): Fix typo in docstring.
* timezone.el (timezone-zone-to-minute, timezone-time-from-absolute)
(timezone-time-zone-from-absolute, timezone-leap-year-p):
Fix typos in docstrings.
* emacs-lisp/assoc.el (asort, aelement, aput, aget, amake):
Fix typos in docstrings.
2008-11-01 01:24:33 +00:00
|
|
|
(make-string n ?\s)))
|
2003-02-04 12:29:42 +00:00
|
|
|
|
1991-05-09 21:50:55 +00:00
|
|
|
;;;###autoload
|
1999-08-03 18:36:16 +00:00
|
|
|
(defun delete-rectangle (start end &optional fill)
|
1999-08-23 14:28:34 +00:00
|
|
|
"Delete (don't save) text in the region-rectangle.
|
|
|
|
The same range of columns is deleted in each line starting with the
|
|
|
|
line where the region begins and ending with the line where the region
|
|
|
|
ends.
|
|
|
|
|
|
|
|
When called from a program the rectangle's corners are START and END.
|
|
|
|
With a prefix (or a FILL) argument, also fill lines where nothing has
|
|
|
|
to be deleted."
|
|
|
|
(interactive "*r\nP")
|
1999-08-03 18:36:16 +00:00
|
|
|
(apply-on-rectangle 'delete-rectangle-line start end fill))
|
1989-10-31 16:00:07 +00:00
|
|
|
|
1991-05-09 21:50:55 +00:00
|
|
|
;;;###autoload
|
1999-08-03 18:36:16 +00:00
|
|
|
(defun delete-extract-rectangle (start end &optional fill)
|
1999-08-23 16:14:59 +00:00
|
|
|
"Delete the contents of the rectangle with corners at START and END.
|
1999-08-23 14:28:34 +00:00
|
|
|
Return it as a list of strings, one for each line of the rectangle.
|
1999-08-03 18:36:16 +00:00
|
|
|
|
1999-08-23 14:28:34 +00:00
|
|
|
When called from a program the rectangle's corners are START and END.
|
1999-08-03 18:36:16 +00:00
|
|
|
With an optional FILL argument, also fill lines where nothing has to be
|
|
|
|
deleted."
|
|
|
|
(let ((lines (list nil)))
|
|
|
|
(apply-on-rectangle 'delete-extract-rectangle-line start end lines fill)
|
|
|
|
(nreverse (cdr lines))))
|
1989-10-31 16:00:07 +00:00
|
|
|
|
1991-05-09 21:50:55 +00:00
|
|
|
;;;###autoload
|
1989-10-31 16:00:07 +00:00
|
|
|
(defun extract-rectangle (start end)
|
1999-08-23 14:28:34 +00:00
|
|
|
"Return the contents of the rectangle with corners at START and END.
|
|
|
|
Return it as a list of strings, one for each line of the rectangle."
|
1999-08-03 18:36:16 +00:00
|
|
|
(let ((lines (list nil)))
|
|
|
|
(apply-on-rectangle 'extract-rectangle-line start end lines)
|
|
|
|
(nreverse (cdr lines))))
|
1989-10-31 16:00:07 +00:00
|
|
|
|
|
|
|
(defvar killed-rectangle nil
|
1999-08-23 14:28:34 +00:00
|
|
|
"Rectangle for `yank-rectangle' to insert.")
|
1989-10-31 16:00:07 +00:00
|
|
|
|
1991-05-09 21:50:55 +00:00
|
|
|
;;;###autoload
|
1999-08-03 18:36:16 +00:00
|
|
|
(defun kill-rectangle (start end &optional fill)
|
1999-08-23 14:28:34 +00:00
|
|
|
"Delete the region-rectangle and save it as the last killed one.
|
|
|
|
|
|
|
|
When called from a program the rectangle's corners are START and END.
|
|
|
|
You might prefer to use `delete-extract-rectangle' from a program.
|
1999-08-03 18:36:16 +00:00
|
|
|
|
|
|
|
With a prefix (or a FILL) argument, also fill lines where nothing has to be
|
2006-04-08 10:30:52 +00:00
|
|
|
deleted.
|
|
|
|
|
|
|
|
If the buffer is read-only, Emacs will beep and refrain from deleting
|
|
|
|
the rectangle, but put it in the kill ring anyway. This means that
|
|
|
|
you can use this command to copy text from a read-only buffer.
|
|
|
|
\(If the variable `kill-read-only-ok' is non-nil, then this won't
|
|
|
|
even beep.)"
|
|
|
|
(interactive "r\nP")
|
|
|
|
(condition-case nil
|
|
|
|
(setq killed-rectangle (delete-extract-rectangle start end fill))
|
|
|
|
((buffer-read-only text-read-only)
|
2012-07-29 04:45:48 +00:00
|
|
|
(setq deactivate-mark t)
|
2006-04-08 10:30:52 +00:00
|
|
|
(setq killed-rectangle (extract-rectangle start end))
|
|
|
|
(if kill-read-only-ok
|
|
|
|
(progn (message "Read only text copied to kill ring") nil)
|
|
|
|
(barf-if-buffer-read-only)
|
|
|
|
(signal 'text-read-only (list (current-buffer)))))))
|
1999-08-03 18:36:16 +00:00
|
|
|
|
2012-07-14 02:19:07 +00:00
|
|
|
;;;###autoload
|
|
|
|
(defun copy-rectangle-as-kill (start end)
|
|
|
|
"Copy the region-rectangle and save it as the last killed one."
|
|
|
|
(interactive "r")
|
|
|
|
(setq killed-rectangle (extract-rectangle start end))
|
2012-07-29 04:45:48 +00:00
|
|
|
(setq deactivate-mark t)
|
|
|
|
(if (called-interactively-p 'interactive)
|
|
|
|
(indicate-copied-region (length (car killed-rectangle)))))
|
2012-07-14 02:19:07 +00:00
|
|
|
|
1991-05-09 21:50:55 +00:00
|
|
|
;;;###autoload
|
1989-10-31 16:00:07 +00:00
|
|
|
(defun yank-rectangle ()
|
|
|
|
"Yank the last killed rectangle with upper left corner at point."
|
1999-08-23 14:28:34 +00:00
|
|
|
(interactive "*")
|
1989-10-31 16:00:07 +00:00
|
|
|
(insert-rectangle killed-rectangle))
|
|
|
|
|
1991-05-09 21:50:55 +00:00
|
|
|
;;;###autoload
|
1989-10-31 16:00:07 +00:00
|
|
|
(defun insert-rectangle (rectangle)
|
|
|
|
"Insert text of RECTANGLE with upper left corner at point.
|
1991-04-12 20:15:51 +00:00
|
|
|
RECTANGLE's first line is inserted at point, its second
|
|
|
|
line is inserted at a point vertically under point, etc.
|
1992-11-03 22:25:28 +00:00
|
|
|
RECTANGLE should be a list of strings.
|
|
|
|
After this command, the mark is at the upper left corner
|
|
|
|
and point is at the lower right corner."
|
1989-10-31 16:00:07 +00:00
|
|
|
(let ((lines rectangle)
|
|
|
|
(insertcolumn (current-column))
|
|
|
|
(first t))
|
1992-11-03 22:25:28 +00:00
|
|
|
(push-mark)
|
1989-10-31 16:00:07 +00:00
|
|
|
(while lines
|
|
|
|
(or first
|
|
|
|
(progn
|
|
|
|
(forward-line 1)
|
|
|
|
(or (bolp) (insert ?\n))
|
2001-11-17 00:47:42 +00:00
|
|
|
(move-to-column insertcolumn t)))
|
1989-10-31 16:00:07 +00:00
|
|
|
(setq first nil)
|
2002-04-19 00:23:08 +00:00
|
|
|
(insert-for-yank (car lines))
|
1989-10-31 16:00:07 +00:00
|
|
|
(setq lines (cdr lines)))))
|
|
|
|
|
1991-05-09 21:50:55 +00:00
|
|
|
;;;###autoload
|
1999-08-03 18:36:16 +00:00
|
|
|
(defun open-rectangle (start end &optional fill)
|
1999-08-23 14:28:34 +00:00
|
|
|
"Blank out the region-rectangle, shifting text right.
|
|
|
|
|
|
|
|
The text previously in the region is not overwritten by the blanks,
|
|
|
|
but instead winds up to the right of the rectangle.
|
1999-08-03 18:36:16 +00:00
|
|
|
|
1999-08-23 14:28:34 +00:00
|
|
|
When called from a program the rectangle's corners are START and END.
|
Fix typos in docstrings.
* cus-edit.el (customize-apropos-options, custom-comment)
(custom-comment-tag, custom-face-edit-attribute-tag):
Fix typos in docstrings.
(custom-buffer-done-kill): Remove * from defcustom docstring.
(custom-file): Fix typo in doc of defcustom choice.
* frame.el (display-visual-class): Fix typo in docstring.
(initial-frame-alist, minibuffer-frame-alist, pop-up-frame-alist)
(special-display-frame-alist, show-trailing-whitespace)
(auto-hscroll-mode, blink-cursor-delay, blink-cursor-interval)
(display-hourglass, hourglass-delay, cursor-in-non-selected-windows):
Remove * from defcustom docstrings.
* md4.el (md4-buffer): Fix typo in docstring.
(md4, md4-64): Doc fixes.
(md4-pack-int32): Reflow docstring.
* paths.el (rmail-file-name): Remove * from defcustom docstring.
(prune-directory-list, gnus-nntp-service): Fix typos in docstrings.
* rect.el (open-rectangle): Reflow docstring.
(spaces-string): Fix docstring typo. Use "?\s" instead of "? ".
* select.el (x-get-cut-buffer): Fix typo in docstring.
* timezone.el (timezone-zone-to-minute, timezone-time-from-absolute)
(timezone-time-zone-from-absolute, timezone-leap-year-p):
Fix typos in docstrings.
* emacs-lisp/assoc.el (asort, aelement, aput, aget, amake):
Fix typos in docstrings.
2008-11-01 01:24:33 +00:00
|
|
|
With a prefix (or a FILL) argument, fill with blanks even if there is
|
|
|
|
no text on the right side of the rectangle."
|
1999-08-23 14:28:34 +00:00
|
|
|
(interactive "*r\nP")
|
1999-08-03 18:36:16 +00:00
|
|
|
(apply-on-rectangle 'open-rectangle-line start end fill)
|
1992-11-16 01:40:15 +00:00
|
|
|
(goto-char start))
|
1989-10-31 16:00:07 +00:00
|
|
|
|
1999-08-03 18:36:16 +00:00
|
|
|
(defun open-rectangle-line (startcol endcol fill)
|
2005-01-29 17:26:39 +00:00
|
|
|
(when (= (move-to-column startcol (if fill t 'coerce)) startcol)
|
2000-07-18 12:50:38 +00:00
|
|
|
(unless (and (not fill)
|
|
|
|
(= (point) (point-at-eol)))
|
|
|
|
(indent-to endcol))))
|
1999-08-03 18:36:16 +00:00
|
|
|
|
2011-04-19 13:44:55 +00:00
|
|
|
(defun delete-whitespace-rectangle-line (startcol _endcol fill)
|
2005-01-29 17:26:39 +00:00
|
|
|
(when (= (move-to-column startcol (if fill t 'coerce)) startcol)
|
1999-08-03 18:36:16 +00:00
|
|
|
(unless (= (point) (point-at-eol))
|
2001-04-24 10:57:05 +00:00
|
|
|
(delete-region (point) (progn (skip-syntax-forward " ") (point))))))
|
1989-10-31 16:00:07 +00:00
|
|
|
|
2002-05-07 19:30:21 +00:00
|
|
|
;;;###autoload
|
|
|
|
(defalias 'close-rectangle 'delete-whitespace-rectangle) ;; Old name
|
|
|
|
|
1998-05-24 00:52:38 +00:00
|
|
|
;;;###autoload
|
1999-08-03 18:36:16 +00:00
|
|
|
(defun delete-whitespace-rectangle (start end &optional fill)
|
1998-05-24 00:52:38 +00:00
|
|
|
"Delete all whitespace following a specified column in each line.
|
|
|
|
The left edge of the rectangle specifies the position in each line
|
|
|
|
at which whitespace deletion should begin. On each line in the
|
1999-08-03 18:36:16 +00:00
|
|
|
rectangle, all continuous whitespace starting at that column is deleted.
|
1998-05-24 00:52:38 +00:00
|
|
|
|
1999-08-23 14:28:34 +00:00
|
|
|
When called from a program the rectangle's corners are START and END.
|
1999-08-03 18:36:16 +00:00
|
|
|
With a prefix (or a FILL) argument, also fill too short lines."
|
1999-08-23 14:28:34 +00:00
|
|
|
(interactive "*r\nP")
|
1999-08-03 18:36:16 +00:00
|
|
|
(apply-on-rectangle 'delete-whitespace-rectangle-line start end fill))
|
|
|
|
|
2001-11-17 00:47:42 +00:00
|
|
|
(defvar string-rectangle-history nil)
|
2000-11-22 17:33:21 +00:00
|
|
|
(defun string-rectangle-line (startcol endcol string delete)
|
2001-11-17 00:47:42 +00:00
|
|
|
(move-to-column startcol t)
|
2000-11-22 17:33:21 +00:00
|
|
|
(if delete
|
|
|
|
(delete-rectangle-line startcol endcol nil))
|
1999-08-03 18:36:16 +00:00
|
|
|
(insert string))
|
1993-03-27 01:58:26 +00:00
|
|
|
|
2000-03-09 22:50:30 +00:00
|
|
|
;;;###autoload
|
2001-04-24 10:57:05 +00:00
|
|
|
(defun string-rectangle (start end string)
|
|
|
|
"Replace rectangle contents with STRING on each line.
|
|
|
|
The length of STRING need not be the same as the rectangle width.
|
|
|
|
|
|
|
|
Called from a program, takes three args; START, END and STRING."
|
2001-11-17 00:47:42 +00:00
|
|
|
(interactive
|
|
|
|
(progn (barf-if-buffer-read-only)
|
|
|
|
(list
|
|
|
|
(region-beginning)
|
|
|
|
(region-end)
|
2005-09-24 Emilio C. Lopes <eclig@gmx.net>
* woman.el (woman-file-name):
* wid-edit.el (widget-file-prompt-value)
(widget-coding-system-prompt-value):
* w32-fns.el (set-w32-system-coding-system):
* vc.el (vc-version-diff, vc-annotate):
* textmodes/reftex-auc.el (reftex-arg-cite)
(reftex-arg-index-tag):
* textmodes/refer.el (refer-get-bib-files):
* textmodes/artist.el (artist-figlet-choose-font):
* terminal.el (terminal-emulator):
* replace.el (occur-read-primary-args):
* rect.el (string-rectangle, string-insert-rectangle):
* ps-print.el (ps-print-preprint):
* progmodes/pascal.el (pascal-goto-defun):
* progmodes/etags.el (visit-tags-table, visit-tags-table-buffer):
* progmodes/compile.el (compilation-find-file):
* printing.el (pr-interactive-n-up):
* play/animate.el (animate-birthday-present):
* net/rcompile.el (remote-compile):
* man.el (man, Man-goto-section, Man-follow-manual-reference):
* mail/rmailsum.el (rmail-summary-search-backward)
(rmail-summary-search):
* mail/rmailout.el (rmail-output-read-rmail-file-name)
(rmail-output-read-file-name):
* mail/rmail.el (rmail-search, rmail-search-backwards):
* mail/mailabbrev.el (merge-mail-abbrevs, rebuild-mail-abbrevs):
* locate.el (locate):
* international/quail.el (quail-show-keyboard-layout):
* international/mule.el (set-buffer-file-coding-system)
(revert-buffer-with-coding-system, set-file-name-coding-system)
(set-terminal-coding-system, set-keyboard-coding-system)
(set-next-selection-coding-system):
* international/mule-diag.el (describe-coding-system)
(describe-font, describe-fontset):
* international/mule-cmds.el (universal-coding-system-argument)
(search-unencodable-char, describe-input-method)
(set-language-environment, describe-language-environment):
* international/codepage.el (codepage-setup):
* international/code-pages.el (codepage-setup):
* info.el (Info-search, Info-follow-reference)
(Info-search-backward):
* emacs-lisp/advice.el (ad-read-advised-function)
(ad-read-advice-class, ad-clear-cache, ad-activate)
(ad-deactivate, ad-update, ad-unadvise, ad-read-advice-name)
(ad-enable-advice, ad-disable-advice, ad-remove-advice)
(ad-read-regexp):
* ediff-util.el (ediff-toggle-regexp-match):
* ediff-ptch.el (ediff-prompt-for-patch-file):
* dired-aux.el (dired-diff):
* diff.el (diff):
* cus-edit.el (custom-variable-prompt):
* calendar/timeclock.el (timeclock-ask-for-project):
* calc/calcalg3.el (calc-get-fit-variables):
* calc/calc-store.el (calc-edit-variable)
(calc-permanent-variable):
* vc-mcvs.el (vc-mcvs-register):
* shadowfile.el (shadow-define-literal-group):
* woman.el (woman-file-name):
* vc.el (vc-version-diff, vc-merge):
* textmodes/reftex-index.el (reftex-index-complete-tag):
* format.el (format-decode-buffer, format-decode-region):
* emulation/viper-cmd.el (viper-read-string-with-history):
* emacs-lisp/debug.el (cancel-debug-on-entry):
* emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* ediff.el (ediff-merge-revisions)
(ediff-merge-revisions-with-ancestor, ediff-revision):
* completion.el (interactive-completion-string-reader):
* calc/calc-prog.el (calc-user-define-formula):
Follow convention for reading with the minibuffer.
2005-09-24 13:44:02 +00:00
|
|
|
(read-string (format "String rectangle (default %s): "
|
2001-11-17 00:47:42 +00:00
|
|
|
(or (car string-rectangle-history) ""))
|
|
|
|
nil 'string-rectangle-history
|
|
|
|
(car string-rectangle-history)))))
|
2011-07-14 15:23:08 +00:00
|
|
|
(goto-char
|
|
|
|
(apply-on-rectangle 'string-rectangle-line start end string t)))
|
2000-03-09 22:50:30 +00:00
|
|
|
|
2002-03-28 18:26:36 +00:00
|
|
|
;;;###autoload
|
2001-04-24 10:57:05 +00:00
|
|
|
(defalias 'replace-rectangle 'string-rectangle)
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun string-insert-rectangle (start end string)
|
|
|
|
"Insert STRING on each line of region-rectangle, shifting text right.
|
|
|
|
|
|
|
|
When called from a program, the rectangle's corners are START and END.
|
|
|
|
The left edge of the rectangle specifies the column for insertion.
|
|
|
|
This command does not delete or overwrite any existing text."
|
2001-11-17 00:47:42 +00:00
|
|
|
(interactive
|
|
|
|
(progn (barf-if-buffer-read-only)
|
|
|
|
(list
|
|
|
|
(region-beginning)
|
|
|
|
(region-end)
|
2005-09-24 Emilio C. Lopes <eclig@gmx.net>
* woman.el (woman-file-name):
* wid-edit.el (widget-file-prompt-value)
(widget-coding-system-prompt-value):
* w32-fns.el (set-w32-system-coding-system):
* vc.el (vc-version-diff, vc-annotate):
* textmodes/reftex-auc.el (reftex-arg-cite)
(reftex-arg-index-tag):
* textmodes/refer.el (refer-get-bib-files):
* textmodes/artist.el (artist-figlet-choose-font):
* terminal.el (terminal-emulator):
* replace.el (occur-read-primary-args):
* rect.el (string-rectangle, string-insert-rectangle):
* ps-print.el (ps-print-preprint):
* progmodes/pascal.el (pascal-goto-defun):
* progmodes/etags.el (visit-tags-table, visit-tags-table-buffer):
* progmodes/compile.el (compilation-find-file):
* printing.el (pr-interactive-n-up):
* play/animate.el (animate-birthday-present):
* net/rcompile.el (remote-compile):
* man.el (man, Man-goto-section, Man-follow-manual-reference):
* mail/rmailsum.el (rmail-summary-search-backward)
(rmail-summary-search):
* mail/rmailout.el (rmail-output-read-rmail-file-name)
(rmail-output-read-file-name):
* mail/rmail.el (rmail-search, rmail-search-backwards):
* mail/mailabbrev.el (merge-mail-abbrevs, rebuild-mail-abbrevs):
* locate.el (locate):
* international/quail.el (quail-show-keyboard-layout):
* international/mule.el (set-buffer-file-coding-system)
(revert-buffer-with-coding-system, set-file-name-coding-system)
(set-terminal-coding-system, set-keyboard-coding-system)
(set-next-selection-coding-system):
* international/mule-diag.el (describe-coding-system)
(describe-font, describe-fontset):
* international/mule-cmds.el (universal-coding-system-argument)
(search-unencodable-char, describe-input-method)
(set-language-environment, describe-language-environment):
* international/codepage.el (codepage-setup):
* international/code-pages.el (codepage-setup):
* info.el (Info-search, Info-follow-reference)
(Info-search-backward):
* emacs-lisp/advice.el (ad-read-advised-function)
(ad-read-advice-class, ad-clear-cache, ad-activate)
(ad-deactivate, ad-update, ad-unadvise, ad-read-advice-name)
(ad-enable-advice, ad-disable-advice, ad-remove-advice)
(ad-read-regexp):
* ediff-util.el (ediff-toggle-regexp-match):
* ediff-ptch.el (ediff-prompt-for-patch-file):
* dired-aux.el (dired-diff):
* diff.el (diff):
* cus-edit.el (custom-variable-prompt):
* calendar/timeclock.el (timeclock-ask-for-project):
* calc/calcalg3.el (calc-get-fit-variables):
* calc/calc-store.el (calc-edit-variable)
(calc-permanent-variable):
* vc-mcvs.el (vc-mcvs-register):
* shadowfile.el (shadow-define-literal-group):
* woman.el (woman-file-name):
* vc.el (vc-version-diff, vc-merge):
* textmodes/reftex-index.el (reftex-index-complete-tag):
* format.el (format-decode-buffer, format-decode-region):
* emulation/viper-cmd.el (viper-read-string-with-history):
* emacs-lisp/debug.el (cancel-debug-on-entry):
* emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* ediff.el (ediff-merge-revisions)
(ediff-merge-revisions-with-ancestor, ediff-revision):
* completion.el (interactive-completion-string-reader):
* calc/calc-prog.el (calc-user-define-formula):
Follow convention for reading with the minibuffer.
2005-09-24 13:44:02 +00:00
|
|
|
(read-string (format "String insert rectangle (default %s): "
|
2001-11-17 00:47:42 +00:00
|
|
|
(or (car string-rectangle-history) ""))
|
|
|
|
nil 'string-rectangle-history
|
|
|
|
(car string-rectangle-history)))))
|
2001-04-24 10:57:05 +00:00
|
|
|
(apply-on-rectangle 'string-rectangle-line start end string nil))
|
|
|
|
|
1991-05-09 21:50:55 +00:00
|
|
|
;;;###autoload
|
1999-08-03 18:36:16 +00:00
|
|
|
(defun clear-rectangle (start end &optional fill)
|
1999-08-23 14:28:34 +00:00
|
|
|
"Blank out the region-rectangle.
|
|
|
|
The text previously in the region is overwritten with blanks.
|
1999-08-03 18:36:16 +00:00
|
|
|
|
1999-08-23 14:28:34 +00:00
|
|
|
When called from a program the rectangle's corners are START and END.
|
1999-08-03 18:36:16 +00:00
|
|
|
With a prefix (or a FILL) argument, also fill with blanks the parts of the
|
|
|
|
rectangle which were empty."
|
1999-08-23 14:28:34 +00:00
|
|
|
(interactive "*r\nP")
|
1999-08-03 18:36:16 +00:00
|
|
|
(apply-on-rectangle 'clear-rectangle-line start end fill))
|
|
|
|
|
|
|
|
(defun clear-rectangle-line (startcol endcol fill)
|
2002-02-26 16:05:48 +00:00
|
|
|
(let ((pt (point-at-eol)))
|
2005-01-29 17:26:39 +00:00
|
|
|
(when (= (move-to-column startcol (if fill t 'coerce)) startcol)
|
1999-08-03 18:36:16 +00:00
|
|
|
(if (and (not fill)
|
|
|
|
(<= (save-excursion (goto-char pt) (current-column)) endcol))
|
|
|
|
(delete-region (point) pt)
|
|
|
|
;; else
|
|
|
|
(setq pt (point))
|
2001-11-17 00:47:42 +00:00
|
|
|
(move-to-column endcol t)
|
2002-02-26 16:05:48 +00:00
|
|
|
(setq endcol (current-column))
|
1999-08-03 18:36:16 +00:00
|
|
|
(delete-region pt (point))
|
2002-02-26 16:05:48 +00:00
|
|
|
(indent-to endcol)))))
|
1989-10-31 16:00:07 +00:00
|
|
|
|
2010-12-15 02:56:22 +00:00
|
|
|
;; Line numbers for `rectangle-number-line-callback'.
|
|
|
|
(defvar rectangle-number-line-counter)
|
|
|
|
|
2011-04-19 13:44:55 +00:00
|
|
|
(defun rectangle-number-line-callback (start _end format-string)
|
2010-12-15 02:56:22 +00:00
|
|
|
(move-to-column start t)
|
|
|
|
(insert (format format-string rectangle-number-line-counter))
|
|
|
|
(setq rectangle-number-line-counter
|
|
|
|
(1+ rectangle-number-line-counter)))
|
|
|
|
|
|
|
|
(defun rectange--default-line-number-format (start end start-at)
|
|
|
|
(concat "%"
|
|
|
|
(int-to-string (length (int-to-string (+ (count-lines start end)
|
|
|
|
start-at))))
|
|
|
|
"d "))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun rectangle-number-lines (start end start-at &optional format)
|
|
|
|
"Insert numbers in front of the region-rectangle.
|
|
|
|
|
|
|
|
START-AT, if non-nil, should be a number from which to begin
|
|
|
|
counting. FORMAT, if non-nil, should be a format string to pass
|
|
|
|
to `format' along with the line count. When called interactively
|
|
|
|
with a prefix argument, prompt for START-AT and FORMAT."
|
|
|
|
(interactive
|
|
|
|
(if current-prefix-arg
|
|
|
|
(let* ((start (region-beginning))
|
|
|
|
(end (region-end))
|
|
|
|
(start-at (read-number "Number to count from: " 1)))
|
|
|
|
(list start end start-at
|
|
|
|
(read-string "Format string: "
|
|
|
|
(rectange--default-line-number-format
|
|
|
|
start end start-at))))
|
|
|
|
(list (region-beginning) (region-end) 1 nil)))
|
|
|
|
(unless format
|
|
|
|
(setq format (rectange--default-line-number-format start end start-at)))
|
|
|
|
(let ((rectangle-number-line-counter start-at))
|
|
|
|
(apply-on-rectangle 'rectangle-number-line-callback
|
|
|
|
start end format)))
|
|
|
|
|
Add pre-redisplay-function and rectangular region
* lisp/rect.el: Use lexical-binding. Add new rectangular region support.
(rectangle-mark): New command.
(rectangle--region): New var.
(deactivate-mark-hook): Reset rectangle--region.
(rectangle--extract-region, rectangle--insert-for-yank)
(rectangle--highlight-for-redisplay)
(rectangle--unhighlight-for-redisplay): New functions.
(region-extract-function, redisplay-unhighlight-region-function)
(redisplay-highlight-region-function): Use them to handle
rectangular region.
* lisp/simple.el (region-extract-function): New var.
(delete-backward-char, delete-forward-char, deactivate-mark): Use it.
(kill-new, kill-append): Remove obsolete `yank-handler' argument.
(kill-region): Replace obsolete `yank-handler' arg with `region'.
(copy-region-as-kill, kill-ring-save): Add `region' argument.
(redisplay-unhighlight-region-function)
(redisplay-highlight-region-function): New vars.
(redisplay--update-region-highlight): New function.
(pre-redisplay-function): Use it.
(exchange-point-and-mark): Don't deactivate the mark before
reactivate-it anyway.
* lisp/comint.el (comint-kill-region): Remove yank-handler argument.
* lisp/delsel.el (delete-backward-char, backward-delete-char-untabify)
(delete-char): Remove property, since it's now part of their
default behavior.
(self-insert-iso): Remove property since this command doesn't exist.
* src/xdisp.c (prepare_menu_bars): Call Vpre_redisplay_function.
(syms_of_xdisp): Declare pre-redisplay-function.
(markpos_of_region): Remove function.
(init_iterator, compute_stop_pos, handle_face_prop)
(face_before_or_after_it_pos, reseat_to_string)
(get_next_display_element, window_buffer_changed)
(redisplay_internal, try_cursor_movement, redisplay_window)
(try_window_reusing_current_matrix, try_window_id, display_line)
(note_mode_line_or_margin_highlight, note_mouse_highlight)
(display_string, mouse_face_from_buffer_pos): Remove region handling.
* src/window.h (struct window): Remove field `region_showing'.
* src/dispextern.h (struct it): Remove region_beg/end_charpos.
(face_at_buffer_position, face_for_overlay_string)
(face_at_string_position): Update prototypes.
* src/xfaces.c (face_at_buffer_position, face_for_overlay_string)
(face_at_string_position): Remove `region_beg' and `region_end' args.
* src/fontset.c (Finternal_char_font):
* src/font.c (font_at, font_range): Adjust calls accordingly.
* src/insdel.c (Qregion_extract_function): New var.
(syms_of_insdel): Initialize it.
(prepare_to_modify_buffer_1): Use it.
2013-10-29 16:11:50 +00:00
|
|
|
;;; New rectangle integration with kill-ring.
|
|
|
|
|
2013-11-11 05:18:53 +00:00
|
|
|
;; FIXME: known problems with the new rectangle support:
|
Add pre-redisplay-function and rectangular region
* lisp/rect.el: Use lexical-binding. Add new rectangular region support.
(rectangle-mark): New command.
(rectangle--region): New var.
(deactivate-mark-hook): Reset rectangle--region.
(rectangle--extract-region, rectangle--insert-for-yank)
(rectangle--highlight-for-redisplay)
(rectangle--unhighlight-for-redisplay): New functions.
(region-extract-function, redisplay-unhighlight-region-function)
(redisplay-highlight-region-function): Use them to handle
rectangular region.
* lisp/simple.el (region-extract-function): New var.
(delete-backward-char, delete-forward-char, deactivate-mark): Use it.
(kill-new, kill-append): Remove obsolete `yank-handler' argument.
(kill-region): Replace obsolete `yank-handler' arg with `region'.
(copy-region-as-kill, kill-ring-save): Add `region' argument.
(redisplay-unhighlight-region-function)
(redisplay-highlight-region-function): New vars.
(redisplay--update-region-highlight): New function.
(pre-redisplay-function): Use it.
(exchange-point-and-mark): Don't deactivate the mark before
reactivate-it anyway.
* lisp/comint.el (comint-kill-region): Remove yank-handler argument.
* lisp/delsel.el (delete-backward-char, backward-delete-char-untabify)
(delete-char): Remove property, since it's now part of their
default behavior.
(self-insert-iso): Remove property since this command doesn't exist.
* src/xdisp.c (prepare_menu_bars): Call Vpre_redisplay_function.
(syms_of_xdisp): Declare pre-redisplay-function.
(markpos_of_region): Remove function.
(init_iterator, compute_stop_pos, handle_face_prop)
(face_before_or_after_it_pos, reseat_to_string)
(get_next_display_element, window_buffer_changed)
(redisplay_internal, try_cursor_movement, redisplay_window)
(try_window_reusing_current_matrix, try_window_id, display_line)
(note_mode_line_or_margin_highlight, note_mouse_highlight)
(display_string, mouse_face_from_buffer_pos): Remove region handling.
* src/window.h (struct window): Remove field `region_showing'.
* src/dispextern.h (struct it): Remove region_beg/end_charpos.
(face_at_buffer_position, face_for_overlay_string)
(face_at_string_position): Update prototypes.
* src/xfaces.c (face_at_buffer_position, face_for_overlay_string)
(face_at_string_position): Remove `region_beg' and `region_end' args.
* src/fontset.c (Finternal_char_font):
* src/font.c (font_at, font_range): Adjust calls accordingly.
* src/insdel.c (Qregion_extract_function): New var.
(syms_of_insdel): Initialize it.
(prepare_to_modify_buffer_1): Use it.
2013-10-29 16:11:50 +00:00
|
|
|
;; - lots of commands handle the region without paying attention to its
|
|
|
|
;; rectangular shape.
|
|
|
|
|
|
|
|
(add-hook 'deactivate-mark-hook
|
2013-11-04 03:06:54 +00:00
|
|
|
(lambda () (rectangle-mark-mode -1)))
|
Add pre-redisplay-function and rectangular region
* lisp/rect.el: Use lexical-binding. Add new rectangular region support.
(rectangle-mark): New command.
(rectangle--region): New var.
(deactivate-mark-hook): Reset rectangle--region.
(rectangle--extract-region, rectangle--insert-for-yank)
(rectangle--highlight-for-redisplay)
(rectangle--unhighlight-for-redisplay): New functions.
(region-extract-function, redisplay-unhighlight-region-function)
(redisplay-highlight-region-function): Use them to handle
rectangular region.
* lisp/simple.el (region-extract-function): New var.
(delete-backward-char, delete-forward-char, deactivate-mark): Use it.
(kill-new, kill-append): Remove obsolete `yank-handler' argument.
(kill-region): Replace obsolete `yank-handler' arg with `region'.
(copy-region-as-kill, kill-ring-save): Add `region' argument.
(redisplay-unhighlight-region-function)
(redisplay-highlight-region-function): New vars.
(redisplay--update-region-highlight): New function.
(pre-redisplay-function): Use it.
(exchange-point-and-mark): Don't deactivate the mark before
reactivate-it anyway.
* lisp/comint.el (comint-kill-region): Remove yank-handler argument.
* lisp/delsel.el (delete-backward-char, backward-delete-char-untabify)
(delete-char): Remove property, since it's now part of their
default behavior.
(self-insert-iso): Remove property since this command doesn't exist.
* src/xdisp.c (prepare_menu_bars): Call Vpre_redisplay_function.
(syms_of_xdisp): Declare pre-redisplay-function.
(markpos_of_region): Remove function.
(init_iterator, compute_stop_pos, handle_face_prop)
(face_before_or_after_it_pos, reseat_to_string)
(get_next_display_element, window_buffer_changed)
(redisplay_internal, try_cursor_movement, redisplay_window)
(try_window_reusing_current_matrix, try_window_id, display_line)
(note_mode_line_or_margin_highlight, note_mouse_highlight)
(display_string, mouse_face_from_buffer_pos): Remove region handling.
* src/window.h (struct window): Remove field `region_showing'.
* src/dispextern.h (struct it): Remove region_beg/end_charpos.
(face_at_buffer_position, face_for_overlay_string)
(face_at_string_position): Update prototypes.
* src/xfaces.c (face_at_buffer_position, face_for_overlay_string)
(face_at_string_position): Remove `region_beg' and `region_end' args.
* src/fontset.c (Finternal_char_font):
* src/font.c (font_at, font_range): Adjust calls accordingly.
* src/insdel.c (Qregion_extract_function): New var.
(syms_of_insdel): Initialize it.
(prepare_to_modify_buffer_1): Use it.
2013-10-29 16:11:50 +00:00
|
|
|
|
|
|
|
(add-function :around redisplay-highlight-region-function
|
|
|
|
#'rectangle--highlight-for-redisplay)
|
|
|
|
(add-function :around redisplay-unhighlight-region-function
|
|
|
|
#'rectangle--unhighlight-for-redisplay)
|
|
|
|
(add-function :around region-extract-function
|
|
|
|
#'rectangle--extract-region)
|
|
|
|
|
2013-11-04 03:06:54 +00:00
|
|
|
(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.")
|
|
|
|
|
Add pre-redisplay-function and rectangular region
* lisp/rect.el: Use lexical-binding. Add new rectangular region support.
(rectangle-mark): New command.
(rectangle--region): New var.
(deactivate-mark-hook): Reset rectangle--region.
(rectangle--extract-region, rectangle--insert-for-yank)
(rectangle--highlight-for-redisplay)
(rectangle--unhighlight-for-redisplay): New functions.
(region-extract-function, redisplay-unhighlight-region-function)
(redisplay-highlight-region-function): Use them to handle
rectangular region.
* lisp/simple.el (region-extract-function): New var.
(delete-backward-char, delete-forward-char, deactivate-mark): Use it.
(kill-new, kill-append): Remove obsolete `yank-handler' argument.
(kill-region): Replace obsolete `yank-handler' arg with `region'.
(copy-region-as-kill, kill-ring-save): Add `region' argument.
(redisplay-unhighlight-region-function)
(redisplay-highlight-region-function): New vars.
(redisplay--update-region-highlight): New function.
(pre-redisplay-function): Use it.
(exchange-point-and-mark): Don't deactivate the mark before
reactivate-it anyway.
* lisp/comint.el (comint-kill-region): Remove yank-handler argument.
* lisp/delsel.el (delete-backward-char, backward-delete-char-untabify)
(delete-char): Remove property, since it's now part of their
default behavior.
(self-insert-iso): Remove property since this command doesn't exist.
* src/xdisp.c (prepare_menu_bars): Call Vpre_redisplay_function.
(syms_of_xdisp): Declare pre-redisplay-function.
(markpos_of_region): Remove function.
(init_iterator, compute_stop_pos, handle_face_prop)
(face_before_or_after_it_pos, reseat_to_string)
(get_next_display_element, window_buffer_changed)
(redisplay_internal, try_cursor_movement, redisplay_window)
(try_window_reusing_current_matrix, try_window_id, display_line)
(note_mode_line_or_margin_highlight, note_mouse_highlight)
(display_string, mouse_face_from_buffer_pos): Remove region handling.
* src/window.h (struct window): Remove field `region_showing'.
* src/dispextern.h (struct it): Remove region_beg/end_charpos.
(face_at_buffer_position, face_for_overlay_string)
(face_at_string_position): Update prototypes.
* src/xfaces.c (face_at_buffer_position, face_for_overlay_string)
(face_at_string_position): Remove `region_beg' and `region_end' args.
* src/fontset.c (Finternal_char_font):
* src/font.c (font_at, font_range): Adjust calls accordingly.
* src/insdel.c (Qregion_extract_function): New var.
(syms_of_insdel): Initialize it.
(prepare_to_modify_buffer_1): Use it.
2013-10-29 16:11:50 +00:00
|
|
|
;;;###autoload
|
2013-11-04 03:06:54 +00:00
|
|
|
(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))))
|
Add pre-redisplay-function and rectangular region
* lisp/rect.el: Use lexical-binding. Add new rectangular region support.
(rectangle-mark): New command.
(rectangle--region): New var.
(deactivate-mark-hook): Reset rectangle--region.
(rectangle--extract-region, rectangle--insert-for-yank)
(rectangle--highlight-for-redisplay)
(rectangle--unhighlight-for-redisplay): New functions.
(region-extract-function, redisplay-unhighlight-region-function)
(redisplay-highlight-region-function): Use them to handle
rectangular region.
* lisp/simple.el (region-extract-function): New var.
(delete-backward-char, delete-forward-char, deactivate-mark): Use it.
(kill-new, kill-append): Remove obsolete `yank-handler' argument.
(kill-region): Replace obsolete `yank-handler' arg with `region'.
(copy-region-as-kill, kill-ring-save): Add `region' argument.
(redisplay-unhighlight-region-function)
(redisplay-highlight-region-function): New vars.
(redisplay--update-region-highlight): New function.
(pre-redisplay-function): Use it.
(exchange-point-and-mark): Don't deactivate the mark before
reactivate-it anyway.
* lisp/comint.el (comint-kill-region): Remove yank-handler argument.
* lisp/delsel.el (delete-backward-char, backward-delete-char-untabify)
(delete-char): Remove property, since it's now part of their
default behavior.
(self-insert-iso): Remove property since this command doesn't exist.
* src/xdisp.c (prepare_menu_bars): Call Vpre_redisplay_function.
(syms_of_xdisp): Declare pre-redisplay-function.
(markpos_of_region): Remove function.
(init_iterator, compute_stop_pos, handle_face_prop)
(face_before_or_after_it_pos, reseat_to_string)
(get_next_display_element, window_buffer_changed)
(redisplay_internal, try_cursor_movement, redisplay_window)
(try_window_reusing_current_matrix, try_window_id, display_line)
(note_mode_line_or_margin_highlight, note_mouse_highlight)
(display_string, mouse_face_from_buffer_pos): Remove region handling.
* src/window.h (struct window): Remove field `region_showing'.
* src/dispextern.h (struct it): Remove region_beg/end_charpos.
(face_at_buffer_position, face_for_overlay_string)
(face_at_string_position): Update prototypes.
* src/xfaces.c (face_at_buffer_position, face_for_overlay_string)
(face_at_string_position): Remove `region_beg' and `region_end' args.
* src/fontset.c (Finternal_char_font):
* src/font.c (font_at, font_range): Adjust calls accordingly.
* src/insdel.c (Qregion_extract_function): New var.
(syms_of_insdel): Initialize it.
(prepare_to_modify_buffer_1): Use it.
2013-10-29 16:11:50 +00:00
|
|
|
|
|
|
|
(defun rectangle--extract-region (orig &optional delete)
|
2013-11-04 03:06:54 +00:00
|
|
|
(if (not rectangle-mark-mode)
|
Add pre-redisplay-function and rectangular region
* lisp/rect.el: Use lexical-binding. Add new rectangular region support.
(rectangle-mark): New command.
(rectangle--region): New var.
(deactivate-mark-hook): Reset rectangle--region.
(rectangle--extract-region, rectangle--insert-for-yank)
(rectangle--highlight-for-redisplay)
(rectangle--unhighlight-for-redisplay): New functions.
(region-extract-function, redisplay-unhighlight-region-function)
(redisplay-highlight-region-function): Use them to handle
rectangular region.
* lisp/simple.el (region-extract-function): New var.
(delete-backward-char, delete-forward-char, deactivate-mark): Use it.
(kill-new, kill-append): Remove obsolete `yank-handler' argument.
(kill-region): Replace obsolete `yank-handler' arg with `region'.
(copy-region-as-kill, kill-ring-save): Add `region' argument.
(redisplay-unhighlight-region-function)
(redisplay-highlight-region-function): New vars.
(redisplay--update-region-highlight): New function.
(pre-redisplay-function): Use it.
(exchange-point-and-mark): Don't deactivate the mark before
reactivate-it anyway.
* lisp/comint.el (comint-kill-region): Remove yank-handler argument.
* lisp/delsel.el (delete-backward-char, backward-delete-char-untabify)
(delete-char): Remove property, since it's now part of their
default behavior.
(self-insert-iso): Remove property since this command doesn't exist.
* src/xdisp.c (prepare_menu_bars): Call Vpre_redisplay_function.
(syms_of_xdisp): Declare pre-redisplay-function.
(markpos_of_region): Remove function.
(init_iterator, compute_stop_pos, handle_face_prop)
(face_before_or_after_it_pos, reseat_to_string)
(get_next_display_element, window_buffer_changed)
(redisplay_internal, try_cursor_movement, redisplay_window)
(try_window_reusing_current_matrix, try_window_id, display_line)
(note_mode_line_or_margin_highlight, note_mouse_highlight)
(display_string, mouse_face_from_buffer_pos): Remove region handling.
* src/window.h (struct window): Remove field `region_showing'.
* src/dispextern.h (struct it): Remove region_beg/end_charpos.
(face_at_buffer_position, face_for_overlay_string)
(face_at_string_position): Update prototypes.
* src/xfaces.c (face_at_buffer_position, face_for_overlay_string)
(face_at_string_position): Remove `region_beg' and `region_end' args.
* src/fontset.c (Finternal_char_font):
* src/font.c (font_at, font_range): Adjust calls accordingly.
* src/insdel.c (Qregion_extract_function): New var.
(syms_of_insdel): Initialize it.
(prepare_to_modify_buffer_1): Use it.
2013-10-29 16:11:50 +00:00
|
|
|
(funcall orig delete)
|
|
|
|
(let* ((strs (funcall (if delete
|
|
|
|
#'delete-extract-rectangle
|
|
|
|
#'extract-rectangle)
|
|
|
|
(region-beginning) (region-end)))
|
|
|
|
(str (mapconcat #'identity strs "\n")))
|
|
|
|
(when (eq last-command 'kill-region)
|
|
|
|
;; Try to prevent kill-region from appending this to some
|
|
|
|
;; earlier element.
|
|
|
|
(setq last-command 'kill-region-dont-append))
|
|
|
|
(when strs
|
|
|
|
(put-text-property 0 (length str) 'yank-handler
|
|
|
|
`(rectangle--insert-for-yank ,strs t)
|
|
|
|
str)
|
|
|
|
str))))
|
|
|
|
|
|
|
|
(defun rectangle--insert-for-yank (strs)
|
|
|
|
(push (point) buffer-undo-list)
|
|
|
|
(let ((undo-at-start buffer-undo-list))
|
|
|
|
(insert-rectangle strs)
|
|
|
|
(setq yank-undo-function
|
|
|
|
(lambda (_start _end)
|
|
|
|
(undo-start)
|
|
|
|
(setcar undo-at-start nil) ;Turn it into a boundary.
|
|
|
|
(while (not (eq pending-undo-list (cdr undo-at-start)))
|
|
|
|
(undo-more 1))))))
|
|
|
|
|
|
|
|
(defun rectangle--highlight-for-redisplay (orig start end window rol)
|
|
|
|
(cond
|
2013-11-04 03:06:54 +00:00
|
|
|
((not rectangle-mark-mode)
|
Add pre-redisplay-function and rectangular region
* lisp/rect.el: Use lexical-binding. Add new rectangular region support.
(rectangle-mark): New command.
(rectangle--region): New var.
(deactivate-mark-hook): Reset rectangle--region.
(rectangle--extract-region, rectangle--insert-for-yank)
(rectangle--highlight-for-redisplay)
(rectangle--unhighlight-for-redisplay): New functions.
(region-extract-function, redisplay-unhighlight-region-function)
(redisplay-highlight-region-function): Use them to handle
rectangular region.
* lisp/simple.el (region-extract-function): New var.
(delete-backward-char, delete-forward-char, deactivate-mark): Use it.
(kill-new, kill-append): Remove obsolete `yank-handler' argument.
(kill-region): Replace obsolete `yank-handler' arg with `region'.
(copy-region-as-kill, kill-ring-save): Add `region' argument.
(redisplay-unhighlight-region-function)
(redisplay-highlight-region-function): New vars.
(redisplay--update-region-highlight): New function.
(pre-redisplay-function): Use it.
(exchange-point-and-mark): Don't deactivate the mark before
reactivate-it anyway.
* lisp/comint.el (comint-kill-region): Remove yank-handler argument.
* lisp/delsel.el (delete-backward-char, backward-delete-char-untabify)
(delete-char): Remove property, since it's now part of their
default behavior.
(self-insert-iso): Remove property since this command doesn't exist.
* src/xdisp.c (prepare_menu_bars): Call Vpre_redisplay_function.
(syms_of_xdisp): Declare pre-redisplay-function.
(markpos_of_region): Remove function.
(init_iterator, compute_stop_pos, handle_face_prop)
(face_before_or_after_it_pos, reseat_to_string)
(get_next_display_element, window_buffer_changed)
(redisplay_internal, try_cursor_movement, redisplay_window)
(try_window_reusing_current_matrix, try_window_id, display_line)
(note_mode_line_or_margin_highlight, note_mouse_highlight)
(display_string, mouse_face_from_buffer_pos): Remove region handling.
* src/window.h (struct window): Remove field `region_showing'.
* src/dispextern.h (struct it): Remove region_beg/end_charpos.
(face_at_buffer_position, face_for_overlay_string)
(face_at_string_position): Update prototypes.
* src/xfaces.c (face_at_buffer_position, face_for_overlay_string)
(face_at_string_position): Remove `region_beg' and `region_end' args.
* src/fontset.c (Finternal_char_font):
* src/font.c (font_at, font_range): Adjust calls accordingly.
* src/insdel.c (Qregion_extract_function): New var.
(syms_of_insdel): Initialize it.
(prepare_to_modify_buffer_1): Use it.
2013-10-29 16:11:50 +00:00
|
|
|
(funcall orig start end window rol))
|
|
|
|
((and (eq 'rectangle (car-safe rol))
|
2013-11-04 20:45:36 +00:00
|
|
|
(eq (nth 1 rol) (buffer-chars-modified-tick))
|
Add pre-redisplay-function and rectangular region
* lisp/rect.el: Use lexical-binding. Add new rectangular region support.
(rectangle-mark): New command.
(rectangle--region): New var.
(deactivate-mark-hook): Reset rectangle--region.
(rectangle--extract-region, rectangle--insert-for-yank)
(rectangle--highlight-for-redisplay)
(rectangle--unhighlight-for-redisplay): New functions.
(region-extract-function, redisplay-unhighlight-region-function)
(redisplay-highlight-region-function): Use them to handle
rectangular region.
* lisp/simple.el (region-extract-function): New var.
(delete-backward-char, delete-forward-char, deactivate-mark): Use it.
(kill-new, kill-append): Remove obsolete `yank-handler' argument.
(kill-region): Replace obsolete `yank-handler' arg with `region'.
(copy-region-as-kill, kill-ring-save): Add `region' argument.
(redisplay-unhighlight-region-function)
(redisplay-highlight-region-function): New vars.
(redisplay--update-region-highlight): New function.
(pre-redisplay-function): Use it.
(exchange-point-and-mark): Don't deactivate the mark before
reactivate-it anyway.
* lisp/comint.el (comint-kill-region): Remove yank-handler argument.
* lisp/delsel.el (delete-backward-char, backward-delete-char-untabify)
(delete-char): Remove property, since it's now part of their
default behavior.
(self-insert-iso): Remove property since this command doesn't exist.
* src/xdisp.c (prepare_menu_bars): Call Vpre_redisplay_function.
(syms_of_xdisp): Declare pre-redisplay-function.
(markpos_of_region): Remove function.
(init_iterator, compute_stop_pos, handle_face_prop)
(face_before_or_after_it_pos, reseat_to_string)
(get_next_display_element, window_buffer_changed)
(redisplay_internal, try_cursor_movement, redisplay_window)
(try_window_reusing_current_matrix, try_window_id, display_line)
(note_mode_line_or_margin_highlight, note_mouse_highlight)
(display_string, mouse_face_from_buffer_pos): Remove region handling.
* src/window.h (struct window): Remove field `region_showing'.
* src/dispextern.h (struct it): Remove region_beg/end_charpos.
(face_at_buffer_position, face_for_overlay_string)
(face_at_string_position): Update prototypes.
* src/xfaces.c (face_at_buffer_position, face_for_overlay_string)
(face_at_string_position): Remove `region_beg' and `region_end' args.
* src/fontset.c (Finternal_char_font):
* src/font.c (font_at, font_range): Adjust calls accordingly.
* src/insdel.c (Qregion_extract_function): New var.
(syms_of_insdel): Initialize it.
(prepare_to_modify_buffer_1): Use it.
2013-10-29 16:11:50 +00:00
|
|
|
(eq start (nth 2 rol))
|
|
|
|
(eq end (nth 3 rol)))
|
|
|
|
rol)
|
|
|
|
(t
|
|
|
|
(save-excursion
|
|
|
|
(let* ((nrol nil)
|
|
|
|
(old (if (eq 'rectangle (car-safe rol))
|
|
|
|
(nthcdr 4 rol)
|
|
|
|
(funcall redisplay-unhighlight-region-function rol)
|
|
|
|
nil))
|
|
|
|
(ptcol (progn (goto-char start) (current-column)))
|
|
|
|
(markcol (progn (goto-char end) (current-column)))
|
|
|
|
(leftcol (min ptcol markcol))
|
|
|
|
(rightcol (max ptcol markcol)))
|
|
|
|
(goto-char start)
|
|
|
|
(while (< (point) end)
|
|
|
|
(let* ((mleft (move-to-column leftcol))
|
|
|
|
(left (point))
|
|
|
|
(mright (move-to-column rightcol))
|
|
|
|
(right (point))
|
|
|
|
(ol
|
|
|
|
(if (not old)
|
|
|
|
(let ((ol (make-overlay left right)))
|
|
|
|
(overlay-put ol 'window window)
|
|
|
|
(overlay-put ol 'face 'region)
|
|
|
|
ol)
|
|
|
|
(let ((ol (pop old)))
|
|
|
|
(move-overlay ol left right (current-buffer))
|
|
|
|
ol))))
|
|
|
|
;; `move-to-column' may stop before the column (if bumping into
|
|
|
|
;; EOL) or overshoot it a little, when column is in the middle
|
|
|
|
;; of a char.
|
|
|
|
(cond
|
|
|
|
((< mleft leftcol) ;`leftcol' is past EOL.
|
|
|
|
(overlay-put ol 'before-string
|
|
|
|
(spaces-string (- leftcol mleft)))
|
|
|
|
(setq mright (max mright leftcol)))
|
|
|
|
((and (> mleft leftcol) ;`leftcol' is in the middle of a char.
|
|
|
|
(eq (char-before left) ?\t))
|
|
|
|
(setq left (1- left))
|
|
|
|
(move-overlay ol left right)
|
|
|
|
(goto-char left)
|
|
|
|
(overlay-put ol 'before-string
|
|
|
|
(spaces-string (- leftcol (current-column)))))
|
|
|
|
((overlay-get ol 'before-string)
|
|
|
|
(overlay-put ol 'before-string nil)))
|
|
|
|
(cond
|
|
|
|
((< mright rightcol) ;`rightcol' is past EOL.
|
|
|
|
(let ((str (make-string (- rightcol mright) ?\s)))
|
|
|
|
(put-text-property 0 (length str) 'face 'region str)
|
|
|
|
;; If cursor happens to be here, draw it *before* rather than
|
|
|
|
;; after this highlighted pseudo-text.
|
|
|
|
(put-text-property 0 1 'cursor t str)
|
|
|
|
(overlay-put ol 'after-string str)))
|
|
|
|
((and (> mright rightcol) ;`rightcol' is in the middle of a char.
|
|
|
|
(eq (char-before right) ?\t))
|
|
|
|
(setq right (1- right))
|
|
|
|
(move-overlay ol left right)
|
2013-11-04 03:06:54 +00:00
|
|
|
(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))))
|
Add pre-redisplay-function and rectangular region
* lisp/rect.el: Use lexical-binding. Add new rectangular region support.
(rectangle-mark): New command.
(rectangle--region): New var.
(deactivate-mark-hook): Reset rectangle--region.
(rectangle--extract-region, rectangle--insert-for-yank)
(rectangle--highlight-for-redisplay)
(rectangle--unhighlight-for-redisplay): New functions.
(region-extract-function, redisplay-unhighlight-region-function)
(redisplay-highlight-region-function): Use them to handle
rectangular region.
* lisp/simple.el (region-extract-function): New var.
(delete-backward-char, delete-forward-char, deactivate-mark): Use it.
(kill-new, kill-append): Remove obsolete `yank-handler' argument.
(kill-region): Replace obsolete `yank-handler' arg with `region'.
(copy-region-as-kill, kill-ring-save): Add `region' argument.
(redisplay-unhighlight-region-function)
(redisplay-highlight-region-function): New vars.
(redisplay--update-region-highlight): New function.
(pre-redisplay-function): Use it.
(exchange-point-and-mark): Don't deactivate the mark before
reactivate-it anyway.
* lisp/comint.el (comint-kill-region): Remove yank-handler argument.
* lisp/delsel.el (delete-backward-char, backward-delete-char-untabify)
(delete-char): Remove property, since it's now part of their
default behavior.
(self-insert-iso): Remove property since this command doesn't exist.
* src/xdisp.c (prepare_menu_bars): Call Vpre_redisplay_function.
(syms_of_xdisp): Declare pre-redisplay-function.
(markpos_of_region): Remove function.
(init_iterator, compute_stop_pos, handle_face_prop)
(face_before_or_after_it_pos, reseat_to_string)
(get_next_display_element, window_buffer_changed)
(redisplay_internal, try_cursor_movement, redisplay_window)
(try_window_reusing_current_matrix, try_window_id, display_line)
(note_mode_line_or_margin_highlight, note_mouse_highlight)
(display_string, mouse_face_from_buffer_pos): Remove region handling.
* src/window.h (struct window): Remove field `region_showing'.
* src/dispextern.h (struct it): Remove region_beg/end_charpos.
(face_at_buffer_position, face_for_overlay_string)
(face_at_string_position): Update prototypes.
* src/xfaces.c (face_at_buffer_position, face_for_overlay_string)
(face_at_string_position): Remove `region_beg' and `region_end' args.
* src/fontset.c (Finternal_char_font):
* src/font.c (font_at, font_range): Adjust calls accordingly.
* src/insdel.c (Qregion_extract_function): New var.
(syms_of_insdel): Initialize it.
(prepare_to_modify_buffer_1): Use it.
2013-10-29 16:11:50 +00:00
|
|
|
((overlay-get ol 'after-string)
|
|
|
|
(overlay-put ol 'after-string nil)))
|
|
|
|
(when (= leftcol rightcol)
|
|
|
|
;; Make zero-width rectangles visible!
|
|
|
|
(overlay-put ol 'after-string
|
|
|
|
(concat (propertize " "
|
|
|
|
'face '(region (:height 0.2)))
|
|
|
|
(overlay-get ol 'after-string))))
|
|
|
|
(push ol nrol))
|
|
|
|
(forward-line 1))
|
|
|
|
(mapc #'delete-overlay old)
|
2013-11-04 20:45:36 +00:00
|
|
|
`(rectangle ,(buffer-chars-modified-tick) ,start ,end ,@nrol))))))
|
Add pre-redisplay-function and rectangular region
* lisp/rect.el: Use lexical-binding. Add new rectangular region support.
(rectangle-mark): New command.
(rectangle--region): New var.
(deactivate-mark-hook): Reset rectangle--region.
(rectangle--extract-region, rectangle--insert-for-yank)
(rectangle--highlight-for-redisplay)
(rectangle--unhighlight-for-redisplay): New functions.
(region-extract-function, redisplay-unhighlight-region-function)
(redisplay-highlight-region-function): Use them to handle
rectangular region.
* lisp/simple.el (region-extract-function): New var.
(delete-backward-char, delete-forward-char, deactivate-mark): Use it.
(kill-new, kill-append): Remove obsolete `yank-handler' argument.
(kill-region): Replace obsolete `yank-handler' arg with `region'.
(copy-region-as-kill, kill-ring-save): Add `region' argument.
(redisplay-unhighlight-region-function)
(redisplay-highlight-region-function): New vars.
(redisplay--update-region-highlight): New function.
(pre-redisplay-function): Use it.
(exchange-point-and-mark): Don't deactivate the mark before
reactivate-it anyway.
* lisp/comint.el (comint-kill-region): Remove yank-handler argument.
* lisp/delsel.el (delete-backward-char, backward-delete-char-untabify)
(delete-char): Remove property, since it's now part of their
default behavior.
(self-insert-iso): Remove property since this command doesn't exist.
* src/xdisp.c (prepare_menu_bars): Call Vpre_redisplay_function.
(syms_of_xdisp): Declare pre-redisplay-function.
(markpos_of_region): Remove function.
(init_iterator, compute_stop_pos, handle_face_prop)
(face_before_or_after_it_pos, reseat_to_string)
(get_next_display_element, window_buffer_changed)
(redisplay_internal, try_cursor_movement, redisplay_window)
(try_window_reusing_current_matrix, try_window_id, display_line)
(note_mode_line_or_margin_highlight, note_mouse_highlight)
(display_string, mouse_face_from_buffer_pos): Remove region handling.
* src/window.h (struct window): Remove field `region_showing'.
* src/dispextern.h (struct it): Remove region_beg/end_charpos.
(face_at_buffer_position, face_for_overlay_string)
(face_at_string_position): Update prototypes.
* src/xfaces.c (face_at_buffer_position, face_for_overlay_string)
(face_at_string_position): Remove `region_beg' and `region_end' args.
* src/fontset.c (Finternal_char_font):
* src/font.c (font_at, font_range): Adjust calls accordingly.
* src/insdel.c (Qregion_extract_function): New var.
(syms_of_insdel): Initialize it.
(prepare_to_modify_buffer_1): Use it.
2013-10-29 16:11:50 +00:00
|
|
|
|
|
|
|
(defun rectangle--unhighlight-for-redisplay (orig rol)
|
|
|
|
(if (not (eq 'rectangle (car-safe rol)))
|
|
|
|
(funcall orig rol)
|
|
|
|
(mapc #'delete-overlay (nthcdr 4 rol))
|
|
|
|
(setcar (cdr rol) nil)))
|
|
|
|
|
1992-11-16 01:40:15 +00:00
|
|
|
(provide 'rect)
|
1992-05-30 22:12:04 +00:00
|
|
|
|
|
|
|
;;; rect.el ends here
|