Rename 'register-yank-media-handler'

* lisp/textmodes/sgml-mode.el (html-mode):
* lisp/gnus/message.el (message-mode):
* doc/lispref/frames.texi (Yanking Media): Adjust.
* lisp/yank-media.el (yank-media): Adjust doc string.
(yank-media-handler): Rename from `register-' because that may
cause confusion with register.el functions.

diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index a05651300223b483c316cd0e90bc63b9392650e7..8a77fdef3fb6e06e91ad5265f455c1f3d4e9a295 100644 (file)
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -3936,13 +3936,13 @@ it by default.
   So Emacs has a system to let modes register handlers for these
 ``complicated'' selections.
 
-@defun register-yank-media-handler types handler
+@defun yank-media-handler types handler
 @var{types} can be a @acronym{MIME} media type symbol, a regexp to
 match these, or a list of these symbols and regexps.  For instance:
 
 @example
-(register-yank-media-handler 'text/html #'my-html-handler)
-(register-yank-media-handler "image/.*" #'my-image-handler)
+(yank-media-handler 'text/html #'my-html-handler)
+(yank-media-handler "image/.*" #'my-image-handler)
 @end example
 
 A mode can register as many handlers as required.

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index b7d98d52de5b21d6e069f180ae9627a5b0d9f67f..77e8fcdfd16f34588c30d28f516b880506e88147 100644 (file)
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -3157,7 +3157,7 @@ Like `text-mode', but with these additional commands:
   (setq-local message-checksum nil)
   (setq-local message-mime-part 0)
   (message-setup-fill-variables)
-  (register-yank-media-handler "image/.*" #'message--yank-media-image-handler)
+  (yank-media-handler "image/.*" #'message--yank-media-image-handler)
   (when message-fill-column
     (setq fill-column message-fill-column)
     (turn-on-auto-fill))

diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 8985fe5cdf98221ea0bc59963e548b643e30f06d..3b0c5d8b65c03a0bcf9586893b413213bb9b99ff 100644 (file)
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -2415,8 +2415,8 @@ To work around that, do:
     (setq-local css-id-list-function #'html-current-buffer-ids))
 
   (setq imenu-create-index-function 'html-imenu-index)
-  (register-yank-media-handler 'text/html #'html-mode--html-yank-handler)
-  (register-yank-media-handler "image/.*" #'html-mode--image-yank-handler)
+  (yank-media-handler 'text/html #'html-mode--html-yank-handler)
+  (yank-media-handler "image/.*" #'html-mode--image-yank-handler)
 
   (setq-local sgml-empty-tags
              ;; From HTML-4.01's loose.dtd, parsed with

diff --git a/lisp/yank-media.el b/lisp/yank-media.el
index 6d0d0b1a18119e9b231a8e2bfd405cea79032370..2c79a14e7d320b4c92c192bcf086867d868b8661 100644 (file)
--- a/lisp/yank-media.el
+++ b/lisp/yank-media.el
@@ -33,7 +33,7 @@
   "Yank media (images, HTML and the like) from the clipboard.
 This command depends on the current major mode having support for
 accepting the media type.  The mode has to register itself using
-the `register-yank-media-handler' mechanism."
+the `yank-media-handler' mechanism."
   (interactive)
   (unless yank-media--registered-handlers
     (user-error "The `%s' mode hasn't registered any handlers" major-mode))
@@ -89,7 +89,7 @@ the `register-yank-media-handler' mechanism."
       data)))
 
 ;;;###autoload
-(defun register-yank-media-handler (types handler)
+(defun yank-media-handler (types handler)
   "Register HANDLER for dealing with `yank-media' actions for TYPES.
 TYPES should be a MIME media type symbol, a regexp, or a list
 that can contain both symbols and regexps.