(mouse-sel-get-selection-function):

Check `x-last-selected-text-primary'.  Don't barf if it or
`x-last-selected-text' aren't bound.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c85c6df1698577c9498bd068b1ec8a3c55c81d7c..1849cd0172a8faecddc48f400c777bcb995d4e18 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2003-07-25  John Paul Wallington  <jpw@gnu.org>
+
+       * 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  <ihs_4664@yahoo.com>  (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 bba41a0dbf9aca6d7d72057b348581d1cdc0c611..bbbb1e54595a05823eda338bc41f3b8743985f5a 100644 (file)
--- 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: