diff options
| author | Leo Liu | 2011-07-09 11:11:57 +0800 |
|---|---|---|
| committer | Leo Liu | 2011-07-09 11:11:57 +0800 |
| commit | 2d43b8c9716af32033eb778d3fabb1a47dd44535 (patch) | |
| tree | 3a4b9d8d839b76b4da6e931e9dc315e9b3380665 | |
| parent | 2a71c436d00491d3852c52b8551ee5963e2ca3ff (diff) | |
| download | emacs-2d43b8c9716af32033eb778d3fabb1a47dd44535.tar.gz emacs-2d43b8c9716af32033eb778d3fabb1a47dd44535.zip | |
Restore accidental change to insert-register
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/register.el | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 81ce153600c..67615431b8f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-07-09 Leo Liu <sdl.web@gmail.com> | ||
| 2 | |||
| 3 | * register.el (insert-register): Restore accidental change on | ||
| 4 | 2011-06-26. (Bug#9028) | ||
| 5 | |||
| 1 | 2011-07-09 Glenn Morris <rgm@gnu.org> | 6 | 2011-07-09 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * subr.el (remq): Handle the empty list. (Bug#9024) | 8 | * subr.el (remq): Handle the empty list. (Bug#9024) |
diff --git a/lisp/register.el b/lisp/register.el index 221242546ec..89a725f28c5 100644 --- a/lisp/register.el +++ b/lisp/register.el | |||
| @@ -329,6 +329,8 @@ Interactively, second arg is non-nil if prefix arg is supplied." | |||
| 329 | "Don't know how to insert register %s" | 329 | "Don't know how to insert register %s" |
| 330 | (single-key-description register)) | 330 | (single-key-description register)) |
| 331 | (funcall (registerv-insert-func val) (registerv-data val))) | 331 | (funcall (registerv-insert-func val) (registerv-data val))) |
| 332 | ((consp val) | ||
| 333 | (insert-rectangle val)) | ||
| 332 | ((stringp val) | 334 | ((stringp val) |
| 333 | (insert-for-yank val)) | 335 | (insert-for-yank val)) |
| 334 | ((numberp val) | 336 | ((numberp val) |