diff options
| author | Stefan-W. Hahn | 2014-03-19 15:12:50 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2014-03-19 15:12:50 -0400 |
| commit | 6a72e405532b56406306cda56b4e2ef0807e2760 (patch) | |
| tree | 20f050eb6778e0759715ed3b6913faad01276bef | |
| parent | 722493d794101ebabceb63bac72d94c4cae6e965 (diff) | |
| download | emacs-6a72e405532b56406306cda56b4e2ef0807e2760.tar.gz emacs-6a72e405532b56406306cda56b4e2ef0807e2760.zip | |
* lisp/ps-print.el (ps-generate-postscript-with-faces):
Explicitly deactivate the mark.
* lisp/simple.el (deactivate-mark): Update region highlight.
Fixes: debbugs:16866
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/ps-print.el | 1 | ||||
| -rw-r--r-- | lisp/simple.el | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 50afbc2002d..4e75e88c68e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2014-03-19 Stefan-W. Hahn <stefan.hahn@s-hahn.de> | ||
| 2 | |||
| 3 | * ps-print.el (ps-generate-postscript-with-faces): | ||
| 4 | Explicitly deactivate the mark (bug#16866). | ||
| 5 | * simple.el (deactivate-mark): Update region highlight. | ||
| 6 | |||
| 1 | 2014-03-19 Juanma Barranquero <lekktu@gmail.com> | 7 | 2014-03-19 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 8 | ||
| 3 | * emacs-lisp/package.el (describe-package-1): | 9 | * emacs-lisp/package.el (describe-package-1): |
diff --git a/lisp/ps-print.el b/lisp/ps-print.el index 6251a6caa87..004bdce1f6a 100644 --- a/lisp/ps-print.el +++ b/lisp/ps-print.el | |||
| @@ -6429,6 +6429,7 @@ If FACE is not a valid face name, use default face." | |||
| 6429 | (save-restriction | 6429 | (save-restriction |
| 6430 | (narrow-to-region from to) | 6430 | (narrow-to-region from to) |
| 6431 | (ps-print-ensure-fontified from to) | 6431 | (ps-print-ensure-fontified from to) |
| 6432 | (deactivate-mark) ;bug#16866. | ||
| 6432 | (ps-generate-postscript-with-faces1 from to))) | 6433 | (ps-generate-postscript-with-faces1 from to))) |
| 6433 | 6434 | ||
| 6434 | (defun ps-generate-postscript (from to) | 6435 | (defun ps-generate-postscript (from to) |
diff --git a/lisp/simple.el b/lisp/simple.el index 09a9d45c43a..d77de2f567b 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -4386,7 +4386,8 @@ run `deactivate-mark-hook'." | |||
| 4386 | (if (eq (car-safe transient-mark-mode) 'only) | 4386 | (if (eq (car-safe transient-mark-mode) 'only) |
| 4387 | (setq transient-mark-mode (cdr transient-mark-mode))) | 4387 | (setq transient-mark-mode (cdr transient-mark-mode))) |
| 4388 | (setq mark-active nil) | 4388 | (setq mark-active nil) |
| 4389 | (run-hooks 'deactivate-mark-hook)))) | 4389 | (run-hooks 'deactivate-mark-hook)) |
| 4390 | (redisplay--update-region-highlight (selected-window)))) | ||
| 4390 | 4391 | ||
| 4391 | (defun activate-mark (&optional no-tmm) | 4392 | (defun activate-mark (&optional no-tmm) |
| 4392 | "Activate the mark. | 4393 | "Activate the mark. |