This commit was manufactured by cvs2svn to create branch 'tomo'.

[chise/xemacs-chise.git] / lisp / select.el

diff --git a/lisp/select.el b/lisp/select.el
index aebf676..df593f8 100644 (file)
--- a/lisp/select.el
+++ b/lisp/select.el
@@ -68,7 +68,7 @@
     (otherwise nil)))
 
 (defun selection-owner-p (&optional selection)
-  "Return t if current emacs process owns the given Selection.
+  "Return t if current XEmacs process owns the given Selection.
 The arg should be the name of the selection in question, typically one
 of the symbols PRIMARY, SECONDARY, or CLIPBOARD.  (For convenience,
 the symbol nil is the same as PRIMARY, and t is the same as
@@ -249,7 +249,7 @@ secondary selection instead of the primary selection."
 (defun cut-copy-clear-internal (mode)
   (or (memq mode '(cut copy clear)) (error "unkown mode %S" mode))
   (or (selection-owner-p)
-      (error "emacs does not own the primary selection"))
+      (error "XEmacs does not own the primary selection"))
   (setq last-command nil)
   (or primary-selection-extent
       (error "the primary selection is not an extent?"))
@@ -273,7 +273,7 @@ secondary selection instead of the primary selection."
                   ;; why is killed-rectangle free?  Is it used somewhere?
                   ;; should it be defvarred?
                   (setq killed-rectangle (extract-rectangle s e))
-                  (kill-new (mapconcat 'identity killed-rectangle "\n")))
+                  (kill-new (mapconcat #'identity killed-rectangle "\n")))
               (copy-region-as-kill s e))
             ;; Maybe killing doesn't own clipboard.  Make sure it happens.
             ;; This memq is kind of grody, because they might have done it