emacs: lisp/ffap.el comparison

comparison lisp/ffap.el @ 90737:95d0cdf160ea

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 586-614) - Update from CVS - Update from erc--emacs--22 - Merge from gnus--rel--5.10 - Merge from erc--main--0 - Make byte compiler correctly write circular constants * gnus--rel--5.10 (patch 186-196) - Update from CVS - Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162

author	Miles Bader <miles@gnu.org>
date	Fri, 26 Jan 2007 06:16:11 +0000
parents	f1d13e615070 c456d15d23fd
children	4ef881a120fe

comparison

equal deleted inserted replaced

-:ef1369583937
+:95d0cdf160ea
 ;;; ffap.el --- find file (or url) at point
 ;; Copyright (C) 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 ;; Author: Michelangelo Grigni <mic@mathcs.emory.edu>
 ;; Maintainer: FSF
 ;; Created: 29 Mar 1993
 ;; Keywords: files, hypermedia, matching, mouse, convenience
 ;; (and ffap-url-regexp (string-match "\\\\`" ffap-url-regexp)
 ;;	  (concat "\\<" (substring ffap-url-regexp 2))))
 ;;
 ;; It pays to put a big fancy regexp here, since ffap-guesser is
 ;; much more time-consuming than regexp searching:
-"[/:.~a-zA-Z]/\\|@[a-zA-Z][-a-zA-Z0-9]*\\."
+"[/:.~[:alpha:]]/\\|@[[:alpha:]][-[:alnum:]]*\\."
 "*Regular expression governing movements of `ffap-next'."
 :type 'regexp
 :group 'ffap)
 (defvar ffap-next-guess nil
 ;; (ffap-machine-p "nonesuch" nil nil 'ping)
 ;; (ffap-machine-p "ftp.mathcs.emory.edu" nil nil 'ping)
 ;; (ffap-machine-p "mathcs" 5678 nil 'ping)
 ;; (ffap-machine-p "foo.bonk" nil nil 'ping)
 ;; (ffap-machine-p "foo.bonk.com" nil nil 'ping)
-(if (or (string-match "[^-a-zA-Z0-9.]" host) ; Illegal chars (?)
+(if (or (string-match "[^-[:alnum:].]" host) ; Illegal chars (?)
 	  (not (string-match "[^0-9]" host))) ; 1: a number? 2: quick reject
 nil
 (let* ((domain
 	    (and (string-match "\\.[^.]*$" host)
 		 (downcase (substring host (1+ (match-beginning 0))))))
 (concat "http://" mach "/"))
 ;; More cases?  Maybe "telnet:" for archie?
 (ffap-ftp-regexp (ffap-host-to-filename mach))
 ))
-(defvar ffap-newsgroup-regexp "^[a-z]+\\.[-+a-z_0-9.]+$"
+(defvar ffap-newsgroup-regexp "^[[:lower:]]+\\.[-+[:lower:]_0-9.]+$"
 "Strings not matching this fail `ffap-newsgroup-p'.")
 (defvar ffap-newsgroup-heads		; entirely inadequate
 '("alt" "comp" "gnu" "misc" "news" "sci" "soc" "talk")
 "Used by `ffap-newsgroup-p' if gnus is not running.")
 		  (setq ret string htbs nil))
 	     ;; If we made it this far, gnus is running, so ignore "heads":
 	     (setq heads nil))
 	 (error nil)))
 (or ret (not heads)
-	 (let ((head (string-match "\\`\\([a-z]+\\)\\." string)))
+	 (let ((head (string-match "\\`\\([[:lower:]]+\\)\\." string)))
 	   (and head (setq head (substring string 0 (match-end 1)))
 		(member head heads)
 		(setq ret string))))
 ;; Is there ever a need to modify string as a newsgroup name?
 ret)))
 (defvar ffap-alist
 '(
 ("" . ffap-completable)		; completion, slow on some systems
 ("\\.info\\'" . ffap-info)		; gzip.info
 ("\\`info/" . ffap-info-2)		; info/emacs
-("\\`[-a-z]+\\'" . ffap-info-3)	; (emacs)Top [only in the parentheses]
+("\\`[-[:lower:]]+\\'" . ffap-info-3) ; (emacs)Top [only in the parentheses]
 ("\\.elc?\\'" . ffap-el)		; simple.el, simple.elc
 (emacs-lisp-mode . ffap-el-mode)	; rmail, gnus, simple, custom
 ;; (lisp-interaction-mode . ffap-el-mode) ; maybe
 (finder-mode . ffap-el-mode)	; type {C-h p} and try it
 (help-mode . ffap-el-mode)		; maybe useful
 '(
 ;; The default, used when the `major-mode' is not found.
 ;; Slightly controversial decisions:
 ;; * strip trailing "@" and ":"
 ;; * no commas (good for latex)
-(file "--:$+<>@-Z_a-z~*?" "<@" "@>;.,!:")
+(file "--:$+<>@-Z_[:lower:]~*?" "<@" "@>;.,!:")
 ;; An url, or maybe a email/news message-id:
-(url "--:=&?$+@-Z_a-z~#,%;*" "^A-Za-z0-9" ":;.,!?")
+(url "--:=&?$+@-Z_[:lower:]~#,%;*" "^[:alnum:]" ":;.,!?")
 ;; Find a string that does *not* contain a colon:
-(nocolon "--9$+<>@-Z_a-z~" "<@" "@>;.,!?")
+(nocolon "--9$+<>@-Z_[:lower:]~" "<@" "@>;.,!?")
 ;; A machine:
-(machine "-a-zA-Z0-9." "" ".")
+(machine "-[:alnum:]." "" ".")
 ;; Mathematica paths: allow backquotes
-(math-mode ",-:$+<>@-Z_a-z~`" "<" "@>;.,!?`:")
+(math-mode ",-:$+<>@-Z_[:lower:]~`" "<" "@>;.,!?`:")
 )
 "Alist of \(MODE CHARS BEG END\), where MODE is a symbol,
 possibly a major-mode name, or one of the symbol
 `file', `url', `machine', and `nocolon'.
 `ffap-string-at-point' uses the data fields as follows:
 	 (w3-view-this-url t))
 ;; Is there a reason not to strip trailing colon?
 (let ((name (ffap-string-at-point 'url)))
 (cond
 ((string-match "^url:" name) (setq name (substring name 4)))
-((and (string-match "\\`[^:</>@]+@[^:</>@]+[a-zA-Z0-9]\\'" name)
+((and (string-match "\\`[^:</>@]+@[^:</>@]+[[:alnum:]]\\'" name)
 	     ;; "foo@bar": could be "mailto" or "news" (a Message-ID).
 	     ;; Without "<>" it must be "mailto".  Otherwise could be
 	     ;; either, so consult `ffap-foo-at-bar-prefix'.
 	     (let ((prefix (if (and (equal (ffap-string-around) "<>")
 				    ;; Expect some odd characters:
 			       ;; Could be news:
 			       ffap-foo-at-bar-prefix
 			     "mailto")))
 	       (and prefix (setq name (concat prefix ":" name))))))
 ((ffap-newsgroup-p name) (setq name (concat "news:" name)))
-((and (string-match "\\`[a-z0-9]+\\'" name) ; <mic> <root> <nobody>
+((and (string-match "\\`[[:alnum:]]+\\'" name) ; <mic> <root> <nobody>
 	     (equal (ffap-string-around) "<>")
 	     ;;	(ffap-user-p name):
 	     (not (string-match "~" (expand-file-name (concat "~" name))))
 	     )
 	(setq name (concat "mailto:" name)))

Mercurial > emacs

comparison lisp/ffap.el @ 90737:95d0cdf160ea