aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/textmodes
diff options
context:
space:
mode:
authorGlenn Morris2014-02-02 16:40:49 -0800
committerGlenn Morris2014-02-02 16:40:49 -0800
commit6a6b8e405e82dfcc506bb926f742c9fa1f5b080b (patch)
tree5469241861b6b0501fdbce2486caec0789053e2b /lisp/textmodes
parent5dca7759a78e8b2a50308a9d5f276799ec46c975 (diff)
downloademacs-6a6b8e405e82dfcc506bb926f742c9fa1f5b080b.tar.gz
emacs-6a6b8e405e82dfcc506bb926f742c9fa1f5b080b.zip
Be more consistent in using register-read-with-preview to read registers
* frameset.el (frameset-to-register): * kmacro.el (kmacro-to-register): * register.el (increment-register): * calc/calc-yank.el (calc-copy-to-register, calc-insert-register) (calc-append-to-register, calc-prepend-to-register): * play/gametree.el (gametree-layout-to-register) (gametree-apply-register-layout): * textmodes/picture.el (picture-clear-rectangle-to-register) (picture-yank-rectangle-from-register): * vc/emerge.el (emerge-combine-versions-register): Use register-read-with-preview to read registers. * cedet/semantic/senator.el (senator-copy-tag-to-register): Use register-read-with-preview, if available. * calculator.el, emulation/viper-cmd.el: Comments.
Diffstat (limited to 'lisp/textmodes')
-rw-r--r--lisp/textmodes/picture.el15
1 files changed, 11 insertions, 4 deletions
diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el
index b7ab729abae..615d4c7ed41 100644
--- a/lisp/textmodes/picture.el
+++ b/lisp/textmodes/picture.el
@@ -494,8 +494,12 @@ prefix argument, the rectangle is actually killed, shifting remaining text."
494(defun picture-clear-rectangle-to-register (start end register &optional killp) 494(defun picture-clear-rectangle-to-register (start end register &optional killp)
495 "Clear rectangle delineated by point and mark into REGISTER. 495 "Clear rectangle delineated by point and mark into REGISTER.
496The rectangle is saved in REGISTER and replaced with whitespace. With 496The rectangle is saved in REGISTER and replaced with whitespace. With
497prefix argument, the rectangle is actually killed, shifting remaining text." 497prefix argument, the rectangle is actually killed, shifting remaining text.
498 (interactive "r\ncRectangle to register: \nP") 498
499Interactively, reads the register using `register-read-with-preview'."
500 (interactive (list (region-beginning) (region-end)
501 (register-read-with-preview "Rectangle to register: ")
502 current-prefix-arg))
499 (set-register register (picture-snarf-rectangle start end killp))) 503 (set-register register (picture-snarf-rectangle start end killp)))
500 504
501(defun picture-snarf-rectangle (start end &optional killp) 505(defun picture-snarf-rectangle (start end &optional killp)
@@ -534,8 +538,11 @@ regardless of where you click."
534The rectangle is positioned with upper left corner at point, overwriting 538The rectangle is positioned with upper left corner at point, overwriting
535existing text. With prefix argument, the rectangle is 539existing text. With prefix argument, the rectangle is
536inserted instead, shifting existing text. Leaves mark at one corner 540inserted instead, shifting existing text. Leaves mark at one corner
537of rectangle and point at the other (diagonally opposed) corner." 541of rectangle and point at the other (diagonally opposed) corner.
538 (interactive "cRectangle from register: \nP") 542
543Interactively, reads the register using `register-read-with-preview'."
544 (interactive (list (register-read-with-preview "Rectangle from register: ")
545 current-prefix-arg))
539 (let ((rectangle (get-register register))) 546 (let ((rectangle (get-register register)))
540 (if (not (consp rectangle)) 547 (if (not (consp rectangle))
541 (error "Register %c does not contain a rectangle" register) 548 (error "Register %c does not contain a rectangle" register)