diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 11 | ||||
| -rw-r--r-- | lisp/Makefile.in | 2 | ||||
| -rw-r--r-- | lisp/hfy-cmap.el | 10 | ||||
| -rw-r--r-- | lisp/htmlfontify.el | 56 |
4 files changed, 43 insertions, 36 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index feb33ec4807..f23a9156c18 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -12,6 +12,17 @@ (authors-canonical-file-name, authors-scan-el): Use authors-disambiguate-file-name. + * hfy-cmap.el (htmlfontify-load-rgb-file, hfy-fallback-colour-values): + Add autoload cookies. + (htmlfontify-unload-rgb-file, hfy-fallback-colour-values): Add docs. + (generated-autoload-file): Set file-local value to "htmlfontify.el". + * htmlfontify.el (caddr, cadddr): Remove fallback definitions. + They have definitions / compiler macros in cl.el. + (htmlfontify-load-rgb-file, hfy-fallback-colour-values): + Replace manual autoloads with generated ones. + (htmlfontify-unload-rgb-file): Remove autoload. + * Makefile.in (autoloads): Ensure htmlfontify.el is writable. + 2010-04-23 Stefan Monnier <monnier@iro.umontreal.ca> * emacs-lisp/bytecomp.el (byte-compile-set-default): New function. diff --git a/lisp/Makefile.in b/lisp/Makefile.in index e4a211399aa..fe7dcfa4e99 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -151,7 +151,7 @@ finder-data: doit autoloads: $(LOADDEFS) doit chmod +w $(lisp)/ps-print.el $(lisp)/emulation/tpu-edt.el \ $(lisp)/emacs-lisp/cl-loaddefs.el $(lisp)/mail/rmail.el \ - $(lisp)/dired.el $(lisp)/ibuffer.el + $(lisp)/dired.el $(lisp)/ibuffer.el $(lisp)/htmlfontify.el cd $(lisp); $(setwins_almost); \ echo Directories: $$wins; \ $(emacs) -l autoload --eval '(setq generated-autoload-file "$(lisp)/loaddefs.el")' -f batch-update-autoloads $$wins diff --git a/lisp/hfy-cmap.el b/lisp/hfy-cmap.el index fc5359e1f65..0eff90d2298 100644 --- a/lisp/hfy-cmap.el +++ b/lisp/hfy-cmap.el @@ -803,6 +803,7 @@ (defconst hfy-rgb-regex "^\\s-*\\([0-9]+\\)\\s-+\\([0-9]+\\)\\s-+\\([0-9]+\\)\\s-+\\(.+\\)\\s-*$") +;;;###autoload (defun htmlfontify-load-rgb-file (&optional file) "Load an X11 style rgb.txt FILE. Search `hfy-rgb-load-path' if FILE is not specified. @@ -832,14 +833,21 @@ Loads the variable `hfy-rgb-txt-colour-map', which is used by (kill-buffer rgb-buffer))))) (defun htmlfontify-unload-rgb-file () + "Unload the current color name -> rgb translation map." (interactive) (setq hfy-rgb-txt-colour-map nil)) +;;;###autoload (defun hfy-fallback-colour-values (colour-string) + "Use a fallback method for obtaining the rgb values for a color." (cdr (assoc-string colour-string (or hfy-rgb-txt-colour-map hfy-fallback-colour-map))) ) (provide 'hfy-cmap) -;;; hfy-cmap.el ends here + +;; Local Variables: +;; generated-autoload-file: "htmlfontify.el" +;; End: ;; arch-tag: dff7feea-add4-48ba-937c-e79ac40cec9b +;;; hfy-cmap.el ends here diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index 19aae590cb2..d4dd49ac17d 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el @@ -90,39 +90,6 @@ ;; (`font-lock-fontify-region') (require 'cus-edit) -(eval-and-compile - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ;; I want these - can't be bothered requiring all of cl though. - (if (not (fboundp 'caddr)) - (defun caddr (list) - "Return the `car' of the `cddr' of LIST." - (car (cddr list)))) - - (if (not (fboundp 'cadddr)) - (defun cadddr (list) - "Return the `cadr' of the `cddr' of LIST." - (cadr (cddr list)))) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - - (autoload - 'htmlfontify-load-rgb-file - "hfy-cmap" - "Load an rgb.txt file for color name -> rgb translation purposes." - 'interactive) - - (autoload - 'htmlfontify-unload-rgb-file - "hfy-cmap" - "Unload the current color name -> rgb translation map." - 'interactive) - - (autoload - 'hfy-fallback-colour-values - "hfy-cmap" - "Use a fallback method for obtaining the rgb values for a color." - 'interactive) - ) - (defconst htmlfontify-version 0.21) (defconst hfy-meta-tags @@ -2368,7 +2335,28 @@ You may also want to set `hfy-page-header' and `hfy-page-footer'." (let ((file (hfy-initfile))) (load file 'NOERROR nil nil) )) + +;;;### (autoloads (hfy-fallback-colour-values htmlfontify-load-rgb-file) +;;;;;; "hfy-cmap" "hfy-cmap.el" "3de2db2d213813bb3afe170ffd66cdde") +;;; Generated autoloads from hfy-cmap.el + +(autoload 'htmlfontify-load-rgb-file "hfy-cmap" "\ +Load an X11 style rgb.txt FILE. +Search `hfy-rgb-load-path' if FILE is not specified. +Loads the variable `hfy-rgb-txt-colour-map', which is used by +`hfy-fallback-colour-values'. + +\(fn &optional FILE)" t nil) + +(autoload 'hfy-fallback-colour-values "hfy-cmap" "\ +Use a fallback method for obtaining the rgb values for a color. + +\(fn COLOUR-STRING)" nil nil) + +;;;*** + + (provide 'htmlfontify) -;;; htmlfontify.el ends here ;; arch-tag: 944e5e63-c81d-4baa-a82a-0275f9c30e61 +;;; htmlfontify.el ends here |