[Date Prev][Date Next][Thread Prev][][Date Index][Thread Index]

ffap-url-regexp bug



Hi Guy's,

Spotted the following very minor bug in w3m.el.
If ffap-url-regexp is nil then w3m.el freaks out on load.
See below for the fix.

Ciao!

Kal.

diff -c emacs-w3m-1.3.2.orig/w3m.el emacs-w3m-1.3.2/w3m.el
*** emacs-w3m-1.3.2.orig/w3m.el	Fri Sep 20 13:58:49 2002
--- emacs-w3m-1.3.2/w3m.el	Sat Sep 21 17:08:53 2002
***************
*** 2537,2549 ****
        '(progn
  	 ;; Under Emacs 19, 20 or XEmacs, `ffap-url-regexp' won't match
  	 ;; to https urls by default.
! 	 (if (and (not (string-match ffap-url-regexp "https://foo";))
  		  (string-match "\\((\\|\\\\|\\)\\(http\\)\\(\\\\|\\|\\\\)\\)"
  				ffap-url-regexp))
  	     (setq ffap-url-regexp (replace-match "\\1\\2s?\\3"
  						  nil nil ffap-url-regexp)))
  	 ;; Add nntp:.
! 	 (if (and (not (string-match ffap-url-regexp "nntp://bar";))
  		  (string-match "\\(\\\\(news\\\\(post\\\\)\\?:\\)\\(\\\\|\\)"
  				ffap-url-regexp))
  	     (setq ffap-url-regexp (replace-match "\\1\\\\|nntp:\\2";
--- 2537,2551 ----
        '(progn
  	 ;; Under Emacs 19, 20 or XEmacs, `ffap-url-regexp' won't match
  	 ;; to https urls by default.
! 	 (if (and ffap-url-regexp
! 		  (not (string-match ffap-url-regexp "https://foo";))
  		  (string-match "\\((\\|\\\\|\\)\\(http\\)\\(\\\\|\\|\\\\)\\)"
  				ffap-url-regexp))
  	     (setq ffap-url-regexp (replace-match "\\1\\2s?\\3"
  						  nil nil ffap-url-regexp)))
  	 ;; Add nntp:.
! 	 (if (and ffap-url-regexp
! 		  (not (string-match ffap-url-regexp "nntp://bar";))
  		  (string-match "\\(\\\\(news\\\\(post\\\\)\\?:\\)\\(\\\\|\\)"
  				ffap-url-regexp))
  	     (setq ffap-url-regexp (replace-match "\\1\\\\|nntp:\\2";