Ignore some files.

[riece] / lisp / riece-url.el

diff --git a/lisp/riece-url.el b/lisp/riece-url.el
index 9ec45f5..ec0ffe0 100644 (file)
--- a/lisp/riece-url.el
+++ b/lisp/riece-url.el
@@ -19,8 +19,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -30,6 +30,7 @@
 
 (require 'riece-options)
 (require 'riece-menu)                  ;riece-menu-items
+(require 'easymenu)
 
 (autoload 'browse-url "browse-url")
 (defvar browse-url-browser-function)
@@ -104,7 +105,8 @@ This maps a string \"Bug#12345\" to a URL
 
 (defun riece-command-browse-url (&optional url)
   (interactive
-   (list (completing-read "Open URL: " (mapcar #'list riece-urls))))
+   (list (completing-read (riece-mcat "Open URL: ")
+                         (mapcar #'list riece-urls))))
   (browse-url url))
 
 (defun riece-url-create-menu (menu)
@@ -123,7 +125,10 @@ This maps a string \"Bug#12345\" to a URL
 (defun riece-url-command-mode-hook ()
   (easy-menu-add-item
    nil (list (car riece-menu-items))
-   '("Open URL..." :filter riece-url-create-menu)))
+   (list (if (featurep 'xemacs)
+            "Open URL..."
+          (riece-mcat "Open URL..."))
+        :filter 'riece-url-create-menu)))
 
 (defun riece-url-insinuate ()
   (add-hook 'riece-after-insert-functions 'riece-url-scan-region)
@@ -135,7 +140,9 @@ This maps a string \"Bug#12345\" to a URL
 (defun riece-url-uninstall ()
   (easy-menu-remove-item
    nil (list (car riece-menu-items))
-   "Open URL...")
+   (if (featurep 'xemacs)
+       "Open URL..."
+     (riece-mcat "Open URL...")))
   (remove-hook 'riece-after-insert-functions 'riece-url-scan-region)
   (remove-hook 'riece-command-mode-hook
               'riece-url-command-mode-hook))