(U-00024182): Apply new conventions for glyph granularity.

[chise/xemacs-chise.git.1] / lisp / x-init.el

diff --git a/lisp/x-init.el b/lisp/x-init.el
index cfeaf46..0d642cc 100644 (file)
--- a/lisp/x-init.el
+++ b/lisp/x-init.el
@@ -55,7 +55,7 @@
 
 (defun x-activate-region-as-selection ()
   (if (marker-buffer (mark-marker t))
-      (x-own-selection (cons (point-marker t) (mark-marker t)))))
+      (own-selection (cons (point-marker t) (mark-marker t)))))
 
 ;; OpenWindows-like "find" processing.  These functions are really Sunisms,
 ;; but we put them here instead of in x-win-sun.el in case someone wants
@@ -68,8 +68,8 @@
 (defun ow-find (&optional backward-p)
   "Search forward the next occurrence of the text of the selection."
   (interactive)
-  (let ((sel (condition-case () (x-get-selection) (error nil)))
-       (clip (condition-case () (x-get-clipboard) (error nil)))
+  (let ((sel  (ignore-errors (get-selection)))
+       (clip (ignore-errors (get-clipboard)))
        text)
     (setq text (cond
                (sel)
@@ -311,7 +311,7 @@
     (add-hook 'zmacs-deactivate-region-hook
              (lambda ()
                (when (console-on-window-system-p)
-                 (x-disown-selection))))
+                 (disown-selection))))
     (add-hook 'zmacs-activate-region-hook
              (lambda ()
                (when (console-on-window-system-p)