diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-11-19 20:47:40 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-11-19 20:47:40 +0000 |
| commit | e3353a780dbf1db468b0b7dd801f0d40b8df78df (patch) | |
| tree | 4828ac89b529321dc39bc2358a5b5d3cdd0f91cf /lisp/hfy-cmap.el | |
| parent | 0de9f8b7886ca72447275b559d47319881afd549 (diff) | |
| download | emacs-e3353a780dbf1db468b0b7dd801f0d40b8df78df.tar.gz | |
* hfy-cmap.el (hfy-rgb-file): Use locate-file.
(htmlfontify-load-rgb-file): Remove unnused var `ff'.
Use with-current-buffer and string-to-number.
(hfy-fallback-colour-values): Use assoc-string.
* htmlfontify.el (hfy-face-to-css): Remove unused var `style'.
(hfy-face-at): Remove unused var `found-face'.
(hfy-compile-stylesheet): Remove unused var `css'.
(hfy-fontify-buffer): Remove unused vars `in-style', `invis-button',
and `orig-buffer'.
(hfy-buffer, hfy-copy-and-fontify-file, hfy-parse-tags-buffer):
Use with-current-buffer.
(hfy-text-p): Use expand-file-name and fewer setq.
Diffstat (limited to 'lisp/hfy-cmap.el')
| -rw-r--r-- | lisp/hfy-cmap.el | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/lisp/hfy-cmap.el b/lisp/hfy-cmap.el index 62d09899611..0327dec2a1c 100644 --- a/lisp/hfy-cmap.el +++ b/lisp/hfy-cmap.el @@ -798,12 +798,7 @@ (defun hfy-rgb-file () "Return a fully qualified path to the X11 style rgb.txt file." - (catch 'rgb-file - (mapcar - (lambda (DIR) - (let ((rgb-file (concat DIR "/rgb.txt"))) - (if (file-readable-p rgb-file) - (throw 'rgb-file rgb-file) nil)) ) hfy-rgb-load-path) nil)) + (locate-file "rgb.txt" hfy-rgb-load-path)) (defconst hfy-rgb-regex "^\\s-*\\([0-9]+\\)\\s-+\\([0-9]+\\)\\s-+\\([0-9]+\\)\\s-+\\(.+\\)\\s-*$") @@ -818,36 +813,31 @@ Loads the variable `hfy-rgb-txt-colour-map', which is used by (read-file-name "rgb.txt \(equivalent\) file: " "" nil t (hfy-rgb-file)))) (let ((rgb-buffer nil) (end-of-rgb 0) - (rgb-txt nil) - (ff 255.0)) + (rgb-txt nil)) (if (and (setq rgb-txt (or file (hfy-rgb-file))) (file-readable-p rgb-txt)) - (save-excursion - (setq rgb-buffer (find-file-noselect rgb-txt 'nowarn)) - (set-buffer rgb-buffer) - (goto-char (point-min)) + (with-current-buffer + (setq rgb-buffer (find-file-noselect rgb-txt 'nowarn)) + (goto-char (point-min)) (htmlfontify-unload-rgb-file) (while (/= end-of-rgb 1) (if (looking-at hfy-rgb-regex) (setq hfy-rgb-txt-colour-map (cons (list (match-string 4) - (string-to-int (match-string 1)) - (string-to-int (match-string 2)) - (string-to-int (match-string 3))) + (string-to-number (match-string 1)) + (string-to-number (match-string 2)) + (string-to-number (match-string 3))) hfy-rgb-txt-colour-map)) ) (setq end-of-rgb (forward-line))) - (kill-buffer rgb-buffer)) - ) - ) - ) + (kill-buffer rgb-buffer))))) (defun htmlfontify-unload-rgb-file () (interactive) (setq hfy-rgb-txt-colour-map nil)) (defun hfy-fallback-colour-values (colour-string) - (cdr (assoc-ignore-case colour-string (or hfy-rgb-txt-colour-map - hfy-fallback-colour-map))) ) + (cdr (assoc-string colour-string (or hfy-rgb-txt-colour-map + hfy-fallback-colour-map))) ) (provide 'hfy-cmap) ;;; hfy-cmap.el ends here |