diff options
| author | Jambunathan K | 2012-10-06 13:16:26 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2012-10-06 13:16:26 -0400 |
| commit | 5694896dfc322e90c0e7e064002cf25296394d75 (patch) | |
| tree | fefaf90f909c43b10eddf63ce11e9e61239bb7ab /lisp | |
| parent | 50d92e32c2770a98fed777e3a676fca1205d28ae (diff) | |
| download | emacs-5694896dfc322e90c0e7e064002cf25296394d75.tar.gz emacs-5694896dfc322e90c0e7e064002cf25296394d75.zip | |
* lisp/register.el (append-to-register, prepend-to-register):
Deactivate mark, as does `copy-to-register'.
Fixes: debbugs:12389
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 15 | ||||
| -rw-r--r-- | lisp/register.el | 2 |
2 files changed, 12 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5d93a386a21..6235f9f28ca 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-10-06 Jambunathan K <kjambunathan@gmail.com> | ||
| 2 | |||
| 3 | * register.el (append-to-register, prepend-to-register): | ||
| 4 | Deactivate mark, as does `copy-to-register' (bug#12389). | ||
| 5 | |||
| 1 | 2012-10-06 Chong Yidong <cyd@gnu.org> | 6 | 2012-10-06 Chong Yidong <cyd@gnu.org> |
| 2 | 7 | ||
| 3 | * files.el (auto-mode-alist): Add .by and .wy (Semantic grammars). | 8 | * files.el (auto-mode-alist): Add .by and .wy (Semantic grammars). |
| @@ -68,7 +73,7 @@ | |||
| 68 | (python-fill-decorator-function, python-fill-paren-function): | 73 | (python-fill-decorator-function, python-fill-paren-function): |
| 69 | Remove :safe for defcustoms. | 74 | Remove :safe for defcustoms. |
| 70 | (python-fill-string-style): New defcustom | 75 | (python-fill-string-style): New defcustom |
| 71 | (python-fill-paragraph-function): Enhanced context detection. | 76 | (python-fill-paragraph-function): Enhance context detection. |
| 72 | (python-fill-string): Honor python-fill-string-style settings. | 77 | (python-fill-string): Honor python-fill-string-style settings. |
| 73 | 78 | ||
| 74 | 2012-10-04 Martin Rudalics <rudalics@gmx.at> | 79 | 2012-10-04 Martin Rudalics <rudalics@gmx.at> |
| @@ -100,8 +105,8 @@ | |||
| 100 | 105 | ||
| 101 | 2012-10-02 Chong Yidong <cyd@gnu.org> | 106 | 2012-10-02 Chong Yidong <cyd@gnu.org> |
| 102 | 107 | ||
| 103 | * progmodes/hideif.el (hif-lookup, hif-defined): Handle | 108 | * progmodes/hideif.el (hif-lookup, hif-defined): |
| 104 | semantic-c-takeover-hideif. | 109 | Handle semantic-c-takeover-hideif. |
| 105 | 110 | ||
| 106 | 2012-10-02 Paul Eggert <eggert@cs.ucla.edu> | 111 | 2012-10-02 Paul Eggert <eggert@cs.ucla.edu> |
| 107 | 112 | ||
| @@ -117,8 +122,8 @@ | |||
| 117 | 122 | ||
| 118 | 2012-10-02 Sergio Durigan Junior <sergiodj@riseup.net> (tiny change) | 123 | 2012-10-02 Sergio Durigan Junior <sergiodj@riseup.net> (tiny change) |
| 119 | 124 | ||
| 120 | * net/eudcb-bbdb.el (eudc-bbdb-format-record-as-result): Fix | 125 | * net/eudcb-bbdb.el (eudc-bbdb-format-record-as-result): |
| 121 | querying BBDB for entries without a last name (Bug#11580). | 126 | Fix querying BBDB for entries without a last name (Bug#11580). |
| 122 | 127 | ||
| 123 | 2012-10-02 Chong Yidong <cyd@gnu.org> | 128 | 2012-10-02 Chong Yidong <cyd@gnu.org> |
| 124 | 129 | ||
diff --git a/lisp/register.el b/lisp/register.el index fb35a26a653..7c2d9337fa2 100644 --- a/lisp/register.el +++ b/lisp/register.el | |||
| @@ -382,6 +382,7 @@ START and END are buffer positions indicating what to append." | |||
| 382 | register (cond ((not reg) text) | 382 | register (cond ((not reg) text) |
| 383 | ((stringp reg) (concat reg separator text)) | 383 | ((stringp reg) (concat reg separator text)) |
| 384 | (t (error "Register does not contain text"))))) | 384 | (t (error "Register does not contain text"))))) |
| 385 | (setq deactivate-mark t) | ||
| 385 | (cond (delete-flag | 386 | (cond (delete-flag |
| 386 | (delete-region start end)) | 387 | (delete-region start end)) |
| 387 | ((called-interactively-p 'interactive) | 388 | ((called-interactively-p 'interactive) |
| @@ -400,6 +401,7 @@ START and END are buffer positions indicating what to prepend." | |||
| 400 | register (cond ((not reg) text) | 401 | register (cond ((not reg) text) |
| 401 | ((stringp reg) (concat text separator reg)) | 402 | ((stringp reg) (concat text separator reg)) |
| 402 | (t (error "Register does not contain text"))))) | 403 | (t (error "Register does not contain text"))))) |
| 404 | (setq deactivate-mark t) | ||
| 403 | (cond (delete-flag | 405 | (cond (delete-flag |
| 404 | (delete-region start end)) | 406 | (delete-region start end)) |
| 405 | ((called-interactively-p 'interactive) | 407 | ((called-interactively-p 'interactive) |