diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/simple.el | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d0d4a31ab65..7ec5cdb5565 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-08-07 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * simple.el (deactivate-mark): Preserve text properties when | ||
| 4 | saving the primary selection (Bug#8384). | ||
| 5 | |||
| 1 | 2012-08-07 Kevin Ryde <user42@zip.com.au> | 6 | 2012-08-07 Kevin Ryde <user42@zip.com.au> |
| 2 | 7 | ||
| 3 | * woman.el (woman0-if): Quietly treat ".if v" as false (Bug#12109). | 8 | * woman.el (woman0-if): Quietly treat ".if v" as false (Bug#12109). |
diff --git a/lisp/simple.el b/lisp/simple.el index 6b5da29b3bb..0877f396faa 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -3960,9 +3960,8 @@ run `deactivate-mark-hook'." | |||
| 3960 | (or (x-selection-owner-p 'PRIMARY) | 3960 | (or (x-selection-owner-p 'PRIMARY) |
| 3961 | (null (x-selection-exists-p 'PRIMARY)))) | 3961 | (null (x-selection-exists-p 'PRIMARY)))) |
| 3962 | (x-set-selection 'PRIMARY | 3962 | (x-set-selection 'PRIMARY |
| 3963 | (buffer-substring-no-properties | 3963 | (buffer-substring (region-beginning) |
| 3964 | (region-beginning) | 3964 | (region-end)))))) |
| 3965 | (region-end)))))) | ||
| 3966 | (if (and (null force) | 3965 | (if (and (null force) |
| 3967 | (or (eq transient-mark-mode 'lambda) | 3966 | (or (eq transient-mark-mode 'lambda) |
| 3968 | (and (eq (car-safe transient-mark-mode) 'only) | 3967 | (and (eq (car-safe transient-mark-mode) 'only) |