(browse-url-browser-function): Delete grail.

(browse-url-grail): Function and variable deleted.
(browse-url-browser-function): Delete IXI Mosaic.
(browse-url-default-browser): Don't try IXI Mosaic.
(browse-url-iximosaic): Function deleted.
(browse-url-browser-function): Delete MMM.
(browse-url-default-browser): Don't try MMM.
(browse-url-mmm): Function deleted.

3 files changed, 20 insertions, 69 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 28b6ac0b7a8..f56c16ad951 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -312,8 +312,12 @@ functions `read-from-minibuffer', `read-string', `read-command',
 are available for inserting into the minibuffer by typing `M-n'.
 For empty input these functions return the first element of this list.
 
+** `custom-note-var-changed' tells Custom to treat the change in a certain
+variable as having been made within Custom.
+
 ** `frame-inherited-parameters' lets new frames inherit parameters from
 the selected frame.
+
 ** New keymap `input-decode-map' overrides like key-translation-map, but
 applies before function-key-map.  Also it is terminal-local contrary to
 key-translation-map.  Terminal-specific key-sequences are generally added to
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b7a6a0dafa6..e613f36822a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2007-10-26  Gwern Branwen  <gwern0@gmail.com>  (tiny change)
+
+        * net/browse-url.el (browse-url-browser-function): Delete grail.
+        (browse-url-grail): Function and variable deleted.
+        (browse-url-browser-function): Delete IXI Mosaic.
+        (browse-url-default-browser): Don't try IXI Mosaic.
+        (browse-url-iximosaic): Function deleted.
+        (browse-url-browser-function): Delete MMM.
+        (browse-url-default-browser): Don't try MMM.
+        (browse-url-mmm): Function deleted.
+
+2007-10-26  Drew Adams  <drew.adams@oracle.com>
+
+        * custom.el (custom-note-var-changed): New function.
+
 2007-10-25  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * emulation/edt-mapper.el (edt-emacs-variant): Replace the only
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index cfb3f2742e9..9715c775eb1 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -46,10 +46,7 @@
 ;; browse-url-cci                     XMosaic     2.5
 ;; browse-url-w3                      w3          0
 ;; browse-url-w3-gnudoit              w3 remotely
-;; browse-url-iximosaic               IXI Mosaic  ?
 ;; browse-url-lynx-*                  Lynx           0
-;; browse-url-grail                   Grail       0.3b1
-;; browse-url-mmm                     MMM         ?
 ;; browse-url-generic                 arbitrary
 ;; browse-url-default-windows-browser MS-Windows browser
 ;; browse-url-default-macosx-browser  Mac OS X browser
@@ -80,14 +77,6 @@
 ;; Emacs process is available from
 ;; <URL:ftp://ftp.splode.com/pub/users/friedman/packages/>.
 
-;; Grail is the freely available WWW browser implemented in Python, a
-;; cool object-oriented freely available interpreted language.  Grail
-;; 0.3b1 was the first version to have remote control as distributed.
-;; For more information on Grail see
-;; <URL:http://grail.cnri.reston.va.us/> and for more information on
-;; Python see <url:http://www.python.org/>.  Grail support in
-;; browse-url.el written by Barry Warsaw <bwarsaw@python.org>.
-
 ;; Lynx is now distributed by the FSF.  See also
 ;; <URL:http://lynx.browser.org/>.
 
@@ -257,13 +246,10 @@ regexp should probably be \".\" to specify a default browser."
           (function-item :tag "Netscape" :value  browse-url-netscape)
           (function-item :tag "Mosaic" :value  browse-url-mosaic)
           (function-item :tag "Mosaic using CCI" :value  browse-url-cci)
-          (function-item :tag "IXI Mosaic" :value  browse-url-iximosaic)
           (function-item :tag "Lynx in an xterm window"
                          :value browse-url-lynx-xterm)
           (function-item :tag "Lynx in an Emacs window"
                          :value browse-url-lynx-emacs)
-          (function-item :tag "Grail" :value  browse-url-grail)
-          (function-item :tag "MMM" :value  browse-url-mmm)
           (function-item :tag "KDE" :value browse-url-kde)
           (function-item :tag "Elinks" :value browse-url-elinks)
           (function-item :tag "Specified by `Browse Url Generic Program'"
@@ -880,8 +866,7 @@ When called non-interactively, optional second argument NEW-WINDOW is
 used instead of `browse-url-new-window-flag'.
 
 The order attempted is gnome-moz-remote, Mozilla, Firefox,
-Galeon, Konqueror, Netscape, Mosaic, IXI Mosaic, Lynx in an
-xterm, MMM, and then W3."
+Galeon, Konqueror, Netscape, Mosaic, Lynx in an xterm, and then W3."
   (apply
    (cond
     ((executable-find browse-url-gnome-moz-program) 'browse-url-gnome-moz)
@@ -891,9 +876,7 @@ xterm, MMM, and then W3."
     ((executable-find browse-url-kde-program) 'browse-url-kde)
     ((executable-find browse-url-netscape-program) 'browse-url-netscape)
     ((executable-find browse-url-mosaic-program) 'browse-url-mosaic)
-    ((executable-find "tellw3b") 'browse-url-iximosaic)
     ((executable-find browse-url-xterm-program) 'browse-url-lynx-xterm)
-    ((executable-find "mmm") 'browse-url-mmm)
     ((locate-library "w3") 'browse-url-w3)
     (t
      (lambda (&ignore args) (error "No usable browser found"))))
@@ -1257,28 +1240,6 @@ used instead of `browse-url-new-window-flag'."
              (append browse-url-mosaic-arguments (list url)))
       (message "Starting %s...done" browse-url-mosaic-program))))
 
-;; --- Grail ---
-
-(defvar browse-url-grail
-  (concat (or (getenv "GRAILDIR") "~/.grail") "/user/rcgrail.py")
-  "Location of Grail remote control client script `rcgrail.py'.
-Typically found in $GRAILDIR/rcgrail.py, or ~/.grail/user/rcgrail.py.")
-
-;;;###autoload
-(defun browse-url-grail (url &optional new-window)
-  "Ask the Grail WWW browser to load URL.
-Default to the URL around or before point.  Runs the program in the
-variable `browse-url-grail'."
-  (interactive (browse-url-interactive-arg "Grail URL: "))
-  (message "Sending URL to Grail...")
-  (with-current-buffer (get-buffer-create " *Shell Command Output*")
-    (erase-buffer)
-    ;; don't worry about this failing.
-    (if (browse-url-maybe-new-window new-window)
-        (call-process browse-url-grail nil 0 nil "-b" url)
-      (call-process browse-url-grail nil 0 nil url))
-    (message "Sending URL to Grail... done")))
-
 ;; --- Mosaic using CCI ---
 
 ;;;###autoload
@@ -1310,17 +1271,6 @@ used instead of `browse-url-new-window-flag'."
   (process-send-string "browse-url" "disconnect\r\n")
   (delete-process "browse-url"))
 
-;; --- IXI Mosaic ---
-
-;;;###autoload
-(defun browse-url-iximosaic (url &optional new-window)
-  ;; new-window ignored
-  "Ask the IXIMosaic WWW browser to load URL.
-Default to the URL around or before point."
-  (interactive (browse-url-interactive-arg "IXI Mosaic URL: "))
-  (start-process "tellw3b" nil "tellw3b"
-                 "-service WWW_BROWSER ixi_showurl " url))
-
 ;; --- W3 ---
 
 ;;;###autoload
@@ -1433,24 +1383,6 @@ used instead of `browse-url-new-window-flag'."
                                      url
                                      "\r")))))
 
-;; --- MMM ---
-
-;;;###autoload
-(defun browse-url-mmm (url &optional new-window)
-  "Ask the MMM WWW browser to load URL.
-Default to the URL around or before point."
-  (interactive (browse-url-interactive-arg "MMM URL: "))
-  (message "Sending URL to MMM...")
-  (with-current-buffer (get-buffer-create " *Shell Command Output*")
-    (erase-buffer)
-    ;; mmm_remote just SEGVs if the file isn't there...
-    (if (or (file-exists-p (expand-file-name "~/.mmm_remote"))
-            ;; location in v 0.4:
-            (file-exists-p (expand-file-name "~/.mmm/remote")))
-        (call-process "mmm_remote" nil 0 nil url)
-      (call-process "mmm" nil 0 nil "-external" url))
-    (message "Sending URL to MMM... done")))
-
 ;; --- mailto ---
 
 (autoload 'rfc2368-parse-mailto-url "rfc2368")