(cua-paste): Check if mouse-region-match is fbound

to not fail on mouseless tty.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 21df22350defbe05b4b83be0147ef7e1e102c3f0..f45cc865e3afce16263abba88bb6b20a03aa3a69 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,21 @@
+2007-10-06  Juri Linkov  <juri@jurta.org>
+
+       * textmodes/fill.el (fill-paragraph-or-region): New function.
+
+       * bindings.el (esc-map): Bind M-q to fill-paragraph-or-region
+       instead of fill-paragraph.
+
+       * tutorial.el (tutorial--default-keys): Replace fill-paragraph
+       with fill-paragraph-or-region.  Suspend command is now the same
+       `suspend-frame' on window systems and on tty.
+
+       * image.el (image-type): Check if image-types is bound to not fail
+       on tty.
+
+       * delsel.el (delete-selection-pre-hook):
+       * emulation/cua-base.el (cua-paste): Check if mouse-region-match
+       is fbound to not fail on mouseless tty.
+
 2007-10-06  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp.el (top): Move loading of tramp-util.el and

diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 5e18953752a5956c5e91684d958d24aadfc6ed2c..fbb39ee66d33cfea1817508a2d0255967210282f 100644 (file)
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -911,6 +911,7 @@ If global mark is active, copy from register or one character."
            ;; That would make yank a no-op.
            (if (and (string= (filter-buffer-substring (point) (mark))
                              (car kill-ring))
+                    (fboundp 'mouse-region-match)
                     (mouse-region-match))
                (current-kill 1))
            (cua-delete-region)))