diff options
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/ange-ftp.el | 2 | ||||
| -rw-r--r-- | lisp/net/net-utils.el | 27 | ||||
| -rw-r--r-- | lisp/net/rcirc.el | 35 |
3 files changed, 35 insertions, 29 deletions
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index ec138ca5d70..92f2253626f 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -297,7 +297,7 @@ ;; you would type: ;; C-x C-f /anonymous@ymir.claremont.edu:CSV/POLICY/RULES.MEM ;; -;; A legal VMS filename is of the form: FILE.TYPE;## +;; A valid VMS filename is of the form: FILE.TYPE;## ;; where FILE can be up to 39 characters ;; TYPE can be up to 39 characters ;; ## is a version number (an integer between 1 and 32,767) diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el index ea3161b3d97..c01da4fd50b 100644 --- a/lisp/net/net-utils.el +++ b/lisp/net/net-utils.el @@ -93,7 +93,7 @@ These options can be used to limit how many ICMP packets are emitted." :group 'net-utils :type '(repeat string)) -(defcustom ipconfig-program +(defcustom ifconfig-program (if (eq system-type 'windows-nt) "ipconfig" "ifconfig") @@ -101,11 +101,13 @@ These options can be used to limit how many ICMP packets are emitted." :group 'net-utils :type 'string) -(defcustom ipconfig-program-options +(define-obsolete-variable-alias 'ipconfig-program 'ifconfig-program "22.2") + +(defcustom ifconfig-program-options (list (if (eq system-type 'windows-nt) "/all" "-a")) - "Options for ipconfig-program." + "Options for `ifconfig-program'." :group 'net-utils :type '(repeat string)) @@ -121,6 +123,9 @@ These options can be used to limit how many ICMP packets are emitted." :type '(repeat string) :version "23.1") +(define-obsolete-variable-alias 'ipconfig-program-options + 'ifconfig-program-options "22.2") + (defcustom netstat-program "netstat" "Program to print network statistics." :group 'net-utils @@ -364,18 +369,18 @@ If your system's ping continues until interrupted, you can try setting options))) ;;;###autoload -(defun ipconfig () - "Run ipconfig program." +(defun ifconfig () + "Run ifconfig program." (interactive) (net-utils-run-program - "Ipconfig" - (concat "** Ipconfig ** " ipconfig-program " ** ") - ipconfig-program - ipconfig-program-options)) + "Ifconfig" + (concat "** Ifconfig ** " ifconfig-program " ** ") + ifconfig-program + ifconfig-program-options)) -;; This is the normal name on most Unixes. +;; Windows uses this name. ;;;###autoload -(defalias 'ifconfig 'ipconfig) +(defalias 'ipconfig 'ifconfig) ;;;###autoload (defun iwconfig () diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el index 4a41ed96f74..eda3f1aeaee 100644 --- a/lisp/net/rcirc.el +++ b/lisp/net/rcirc.el @@ -2137,23 +2137,24 @@ keywords when no KEYWORD is given." string)) (defvar rcirc-url-regexp - (rx-to-string - `(and word-boundary - (or (and - (or (and (or "http" "https" "ftp" "file" "gopher" "news" - "telnet" "wais" "mailto") - "://") - "www.") - (1+ (char "-a-zA-Z0-9_.")) - (1+ (char "-a-zA-Z0-9_")) - (optional ":" (1+ (char "0-9")))) - (and (1+ (char "-a-zA-Z0-9_.")) - (or ".com" ".net" ".org") - word-boundary)) - (optional - (and "/" - (1+ (char "-a-zA-Z0-9_='!?#$\@~`%&*+|\\/:;.,{}[]()")) - (char "-a-zA-Z0-9_=#$\@~`%&*+|\\/:;{}[]()"))))) + (concat + "\\b\\(\\(www\\.\\|\\(s?https?\\|ftp\\|file\\|gopher\\|" + "nntp\\|news\\|telnet\\|wais\\|mailto\\|info\\):\\)" + "\\(//[-a-z0-9_.]+:[0-9]*\\)?" + (if (string-match "[[:digit:]]" "1") ;; Support POSIX? + (let ((chars "-a-z0-9_=#$@~%&*+\\/[:word:]") + (punct "!?:;.,")) + (concat + "\\(?:" + ;; Match paired parentheses, e.g. in Wikipedia URLs: + "[" chars punct "]+" "(" "[" chars punct "]+" "[" chars "]*)" "[" chars "]" + "\\|" + "[" chars punct "]+" "[" chars "]" + "\\)")) + (concat ;; XEmacs 21.4 doesn't support POSIX. + "\\([-a-z0-9_=!?#$@~%&*+\\/:;.,]\\|\\w\\)+" + "\\([-a-z0-9_=#$@~%&*+\\/]\\|\\w\\)")) + "\\)") "Regexp matching URLs. Set to nil to disable URL features in rcirc.") (defun rcirc-browse-url (&optional arg) |