aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/vc
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/vc
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/vc')
-rw-r--r--lisp/vc/emerge.el8
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/vc/emerge.el b/lisp/vc/emerge.el
index af13665fc2a..0cf4484aac1 100644
--- a/lisp/vc/emerge.el
+++ b/lisp/vc/emerge.el
@@ -2516,8 +2516,12 @@ for how the template is interpreted.
2516Refuses to function if this difference has been edited, i.e., if it is 2516Refuses to function if this difference has been edited, i.e., if it is
2517neither the A nor the B variant. 2517neither the A nor the B variant.
2518An argument forces the variant to be selected even if the difference has 2518An argument forces the variant to be selected even if the difference has
2519been edited." 2519been edited.
2520 (interactive "cRegister containing template: \nP") 2520
2521Interactively, reads the register using `register-read-with-preview'."
2522 (interactive (list
2523 (register-read-with-preview "Register containing template: ")
2524 current-prefix-arg))
2521 (let ((template (get-register char))) 2525 (let ((template (get-register char)))
2522 (if (not (stringp template)) 2526 (if (not (stringp template))
2523 (error "Register does not contain text")) 2527 (error "Register does not contain text"))