* lisp/progmodes/make-mode.el (makefile-fill-paragraph): Reset syntax-table

[gnu-emacs] / lisp / register.el

diff --git a/lisp/register.el b/lisp/register.el
index 622a3872e54e0cfba7b459f386db8a4b2cb3f096..ae2f7cf3e2ade415a49955dbd0669c20ab21302e 100644 (file)
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -1,6 +1,7 @@
 ;;; register.el --- register commands for Emacs
 
-;; Copyright (C) 1985, 1993-1994, 2001-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1993-1994, 2001-2013 Free Software Foundation,
+;; Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -79,10 +80,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,11 +378,12 @@ 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))
                     (t (error "Register does not contain text")))))
+  (setq deactivate-mark t)
   (cond (delete-flag
         (delete-region start end))
        ((called-interactively-p 'interactive)
@@ -395,11 +397,12 @@ 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))
                     (t (error "Register does not contain text")))))
+  (setq deactivate-mark t)
   (cond (delete-flag
         (delete-region start end))
        ((called-interactively-p 'interactive)