[Emacs-diffs] /srv/bzr/emacs/trunk r109953: * lisp/register.el (register-separator): Rename from

[Andreas Schwab]

------------------------------------------------------------
revno: 109953
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Sun 2012-09-09 10:10:56 +0200
message:
  * lisp/register.el (register-separator): Rename from
  separator-register.  All uses changed.  Doc fix.
  (register): Fix version.
modified:
  etc/NEWS
  lisp/ChangeLog
  lisp/register.el

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2012-09-09 06:43:47 +0000
+++ b/etc/NEWS  2012-09-09 08:10:56 +0000
@@ -188,10 +188,11 @@
 
 +++
 ** `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
 

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-09-09 06:43:47 +0000
+++ b/lisp/ChangeLog    2012-09-09 08:10:56 +0000
@@ -1,3 +1,9 @@
+2012-09-09  Andreas Schwab  <address@hidden>
+
+       * register.el (register-separator): Rename from
+       separator-register.  All uses changed.  Doc fix.
+       (register): Fix version.
+
 2012-09-09  Chong Yidong  <address@hidden>
 
        * replace.el (query-replace-map): Bind four new symbols for

=== modified file 'lisp/register.el'
--- a/lisp/register.el  2012-09-08 20:09:06 +0000
+++ b/lisp/register.el  2012-09-09 08:10:56 +0000
@@ -79,10 +79,10 @@
 (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 @@
   (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 @@
   (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))