From bfabf70a86dc3506011566d9e06f6251328fa05e Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Sun, 9 Sep 2012 10:10:56 +0200 Subject: [PATCH] * lisp/register.el (register-separator): Rename from separator-register. All uses changed. Doc fix. (register): Fix version. --- etc/NEWS | 7 ++++--- lisp/ChangeLog | 6 ++++++ lisp/register.el | 10 +++++----- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index dac7915767d..49860eab98a 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -188,10 +188,11 @@ end of the buffer. It defaults to t. +++ ** `C-x r +' is now overloaded to invoke `append-to-register. + +++ -** New option `separator-register'. Separator register stores -separator text for use with M-x append-to-register and M-x -prepend-to-register. See manual for details. +** New option `register-separator' specifies the register containing +the text to put between collected texts for use with M-x +append-to-register and M-x prepend-to-register. ** Search changes diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8f089af6f5c..c7ff2571f9d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2012-09-09 Andreas Schwab + + * register.el (register-separator): Rename from + separator-register. All uses changed. Doc fix. + (register): Fix version. + 2012-09-09 Chong Yidong * replace.el (query-replace-map): Bind four new symbols for diff --git a/lisp/register.el b/lisp/register.el index 622a3872e54..fb35a26a653 100644 --- a/lisp/register.el +++ b/lisp/register.el @@ -79,10 +79,10 @@ A list of the form (FRAME-CONFIGURATION POSITION) (defgroup register nil "Register commands." :group 'convenience - :version "24.2.50") + :version "24.3") -(defcustom separator-register nil - "Use contents of this register to separate collected text. +(defcustom register-separator nil + "Register containing the text to put between collected texts, or nil if none. When collecting text with `append-to-register' (resp. `prepend-to-register') contents of @@ -377,7 +377,7 @@ START and END are buffer positions indicating what to append." (interactive "cAppend to register: \nr\nP") (let ((reg (get-register register)) (text (filter-buffer-substring start end)) - (separator (and separator-register (get-register separator-register)))) + (separator (and register-separator (get-register register-separator)))) (set-register register (cond ((not reg) text) ((stringp reg) (concat reg separator text)) @@ -395,7 +395,7 @@ START and END are buffer positions indicating what to prepend." (interactive "cPrepend to register: \nr\nP") (let ((reg (get-register register)) (text (filter-buffer-substring start end)) - (separator (and separator-register (get-register separator-register)))) + (separator (and register-separator (get-register register-separator)))) (set-register register (cond ((not reg) text) ((stringp reg) (concat text separator reg)) -- 2.39.2