mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-05 11:45:45 +00:00
Code Issues Releases Activity

(browse-url-file-url): Check for null maps.

Browse Source
This commit is contained in:
Sam Steingold 2000-09-26 13:05:29 +00:00
parent c98863bfb9
commit 63900fcf00
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lisp/ChangeLog
View File

@ -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>

13
lisp/net/browse-url.el
View File

@ -405,7 +405,7 @@ These might set its size, for instance."
: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 @@ Use variable `browse-url-filename-alist' to map filenames to URLs."
(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