Mercurial > emacs
changeset 31909:36892782f26a
(browse-url-file-url): Check for null maps.
| author | Sam Steingold <sds@gnu.org> |
|---|---|
| date | Tue, 26 Sep 2000 13:05:29 +0000 |
| parents | 06869c11cb90 |
| children | b54fba72959b |
| files | lisp/ChangeLog lisp/net/browse-url.el |
| diffstat | 2 files changed, 12 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Sep 26 13:03:24 2000 +0000 +++ b/lisp/ChangeLog Tue Sep 26 13:05:29 2000 +0000 @@ -1,3 +1,7 @@ +2000-09-25 Sam Steingold <sds@gnu.org> + + * net/browse-url.el (browse-url-file-url): Check for null maps. + 2000-09-26 Gerd Moellmann <gerd@gnu.org> * frame.el (frame-notice-user-settings): Make tool-bar-mode and @@ -10,9 +14,9 @@ * bytecomp.el (byte-compile-defvar-or-defconst): Only cons onto current-load-list in top-level forms. Else this leaks a cons cell every time a defun is called. - + * mail/mail-utils.el (rmail-dont-reply-to): Fix last change. - + 2000-09-25 Dave Love <fx@gnu.org> * startup.el (fancy-splash-head): Check XPM is available. @@ -32,10 +36,10 @@ * mail/mail-utils.el (rmail-dont-reply-to): Avoid infinite loop if rmail-dont-reply-to-names matches the empty string. - + 2000-09-25 Gerd Moellmann <gerd@gnu.org> - * startup.el (command-line-1, fancy-splash-text): Change the + * startup.el (command-line-1, fancy-splash-text): Change the text to sound more friendly. 2000-09-23 Thien-Thi Nguyen <ttn@gnu.org>
--- a/lisp/net/browse-url.el Tue Sep 26 13:03:24 2000 +0000 +++ b/lisp/net/browse-url.el Tue Sep 26 13:05:29 2000 +0000 @@ -405,7 +405,7 @@ :type '(repeat (string :tag "Argument")) :group 'browse-url) -(defcustom browse-url-lynx-emacs-args (and (not window-system) +(defcustom browse-url-lynx-emacs-args (and (not window-system) '("-show_cursor")) "A list of strings defining options for Lynx in an Emacs buffer. @@ -540,14 +540,9 @@ (while (string-match "[*\"()',=;? ]" file) (let ((enc (format "%%%x" (aref file (match-beginning 0))))) (setq file (replace-match enc t t file)))) - (let ((maps browse-url-filename-alist)) - (while maps - (let* ((map (car maps)) - (from-re (car map)) - (to-string (cdr map))) - (setq maps (cdr maps)) - (and (string-match from-re file) - (setq file (replace-match to-string t nil file)))))) + (dolist (map browse-url-filename-alist) + (when (and map (string-match (car map) file)) + (setq file (replace-match (cdr map) t nil file)))) file) ;;;###autoload