From 497cfacf276f20bd041c109e30ea4f99c3e43b17 Mon Sep 17 00:00:00 2001 From: John Paul Wallington Date: Fri, 25 Jul 2003 12:21:01 +0000 Subject: [PATCH] (mouse-sel-get-selection-function): Check `x-last-selected-text-primary'. Don't barf if it or `x-last-selected-text' aren't bound. --- lisp/ChangeLog | 14 ++++++++++++++ lisp/mouse-sel.el | 4 +++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c85c6df1698..1849cd0172a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,17 @@ +2003-07-25 John Paul Wallington + + * server.el (server-start): Check `server-process' is non-nil + before killing it to avoid killing current buffer's process. + + * simple.el (choose-completion-string): Use `minibufferp'; + test `completion-reference-buffer' if `buffer' arg is nil. + (push-mark): Use `when' and `unless'. + (pop-mark): Use `when'. + + * mouse-sel.el (mouse-sel-get-selection-function): + Check `x-last-selected-text-primary'. Don't barf if it or + `x-last-selected-text' aren't bound. + 2003-07-25 Kevin Rodgers (tiny change) * menu-bar.el (menu-bar-tools-menu): Minor change in strings. diff --git a/lisp/mouse-sel.el b/lisp/mouse-sel.el index bba41a0dbf9..bbbb1e54595 100644 --- a/lisp/mouse-sel.el +++ b/lisp/mouse-sel.el @@ -313,7 +313,9 @@ unless `mouse-sel-default-bindings' is `interprogram-cut-paste'.") (defvar mouse-sel-get-selection-function (lambda (selection) (if (eq selection 'PRIMARY) - (or (x-cut-buffer-or-selection-value) x-last-selected-text) + (or (x-cut-buffer-or-selection-value) + (bound-and-true-p x-last-selected-text) + (bound-and-true-p x-last-selected-text-primary)) (x-get-selection selection))) "Function to call to get the selection. Called with one argument: -- 2.11.4.GIT