# HG changeset patch # User Eli Zaretskii # Date 1144492219 0 # Node ID dd0c0f578fc9142c8352bad6a9e7de25a8284920 # Parent eb2f5ef264b583492d8b880fdfb45ae44cf98d30 (kill-rectangle): Don't barf if `kill-read-only-ok' is set. (delete-extract-rectangle-line): Use `filter-buffer-substring' instead of `buffer-substring' and `delete-region'. (Most of the code actually copied from `kill-region'.) diff -r eb2f5ef264b5 -r dd0c0f578fc9 lisp/rect.el --- a/lisp/rect.el Sat Apr 08 10:23:53 2006 +0000 +++ b/lisp/rect.el Sat Apr 08 10:30:19 2006 +0000 @@ -141,8 +141,7 @@ ;; else (setq pt (point)) (move-to-column endcol t) - (setcdr lines (cons (buffer-substring pt (point)) (cdr lines))) - (delete-region pt (point))) + (setcdr lines (cons (filter-buffer-substring pt (point) t) (cdr lines)))) )) ;; ### NOTE: this is actually the only function that needs to do complicated @@ -233,12 +232,22 @@ You might prefer to use `delete-extract-rectangle' from a program. With a prefix (or a FILL) argument, also fill lines where nothing has to be -deleted." - (interactive "*r\nP") - (when buffer-read-only - (setq killed-rectangle (extract-rectangle start end)) - (barf-if-buffer-read-only)) - (setq killed-rectangle (delete-extract-rectangle start end fill))) +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) + (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))))))) ;; this one is untouched --dv ;;;###autoload