(texinfo-insert-@uref): Renamed from

texinfo-insert-@url.
(texinfo-insert-@url): A defalias for texinfo-insert-@uref.
(texinfo-mode-map): Bind "C-c C-c u" to texinfo-insert-@uref.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c9cd1f99c48c61c187eab731963de81f928762b5..4ad68f464767c4e3d99d3cc4f249a54f314a8362 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2000-11-15  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * textmodes/texinfo.el (texinfo-insert-@uref): Renamed from
+       texinfo-insert-@url.
+       (texinfo-insert-@url): A defalias for texinfo-insert-@uref.
+       (texinfo-mode-map): Bind "C-c C-c u" to texinfo-insert-@uref.
+
 2000-11-14  Stefan Monnier  <monnier@cs.yale.edu>
 
        * emacs-lisp/checkdoc.el (checkdoc-minor-mode) <defvar>: Remove.

diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el
index d578362f5173e381508a53aecb27849c9628b555..7f5ff90484b84b0dc204bb47bb32c0a4d3afd794 100644 (file)
--- a/lisp/textmodes/texinfo.el
+++ b/lisp/textmodes/texinfo.el
@@ -398,10 +398,9 @@ chapter."
   (define-key texinfo-mode-map "\C-c\C-c\C-e" 'texinfo-insert-@emph)
 
   (define-key texinfo-mode-map "\C-c\C-cv"    'texinfo-insert-@var)
-  (define-key texinfo-mode-map "\C-c\C-cu"    'texinfo-insert-@url)
+  (define-key texinfo-mode-map "\C-c\C-cu"    'texinfo-insert-@uref)
   (define-key texinfo-mode-map "\C-c\C-ct"    'texinfo-insert-@table)
   (define-key texinfo-mode-map "\C-c\C-cs"    'texinfo-insert-@samp)
-  ;; (define-key texinfo-mode-map "\C-c\C-cr"    'texinfo-insert-@uref)
   (define-key texinfo-mode-map "\C-c\C-cq"    'texinfo-insert-@quotation)
   (define-key texinfo-mode-map "\C-c\C-co"    'texinfo-insert-@noindent)
   (define-key texinfo-mode-map "\C-c\C-cn"    'texinfo-insert-@node)
@@ -822,12 +821,13 @@ The default is not to surround any existing words with the braces."
   (interactive "P")
   (texinfo-insert-@-with-arg "var" arg))
 
-(defun texinfo-insert-@url (&optional arg)
+(defun texinfo-insert-@uref (&optional arg)
   "Insert a `@url{}' command in a Texinfo buffer.
 A numeric argument says how many words the braces should surround.
 The default is not to surround any existing words with the braces."
   (interactive "P")
-  (texinfo-insert-@-with-arg "url" arg))
+  (texinfo-insert-@-with-arg "uref" arg))
+(defalias 'texinfo-insert-@url 'texinfo-insert-@uref)
 \f
 ;;; Texinfo file structure