From 459cf7cb92445e9336d649f128ec1af274e3f5a1 Mon Sep 17 00:00:00 2001 From: Phillip Lord Date: Wed, 16 Dec 2015 23:15:44 +0000 Subject: [PATCH] htmlfontify generate autoload to non-versioned file. * lisp/Makefile.in: Add htmlfontity-loaddefs to autogenel. * lisp/hfy-cmap.el: Update file local. * lisp/htmlfontify.el: Remove autoloads, add require. * test/lisp/htmlfontify-tests.el: Test autoload functionality. --- lisp/Makefile.in | 3 ++- lisp/hfy-cmap.el | 2 +- lisp/htmlfontify.el | 22 ++-------------------- test/lisp/htmlfontify-tests.el | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 22 deletions(-) create mode 100644 test/lisp/htmlfontify-tests.el diff --git a/lisp/Makefile.in b/lisp/Makefile.in index c98b427d785..9ebdc5b454c 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -91,7 +91,8 @@ AUTOGENEL = loaddefs.el \ org/org-loaddefs.el \ textmodes/reftex-loaddefs.el \ mail/rmail-loaddefs.el \ - ibuffer-loaddefs.el + ibuffer-loaddefs.el \ + htmlfontify-loaddefs # Set load-prefer-newer for the benefit of the non-bootstrappers. BYTE_COMPILE_FLAGS = \ diff --git a/lisp/hfy-cmap.el b/lisp/hfy-cmap.el index 6b7f2caed1e..0dc532f0c19 100644 --- a/lisp/hfy-cmap.el +++ b/lisp/hfy-cmap.el @@ -845,7 +845,7 @@ Loads the variable `hfy-rgb-txt-colour-map', which is used by (provide 'hfy-cmap) ;; Local Variables: -;; generated-autoload-file: "htmlfontify.el" +;; generated-autoload-file: "htmlfontify-loaddefs.el" ;; End: ;;; hfy-cmap.el ends here diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index 719cb50ac77..d00fae26793 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el @@ -90,6 +90,8 @@ ;; (`font-lock-fontify-region') (require 'cus-edit) +(require 'htmlfontify-loaddefs) + (defconst htmlfontify-version 0.21) (defconst hfy-meta-tags @@ -2411,26 +2413,6 @@ You may also want to set `hfy-page-header' and `hfy-page-footer'." (let ((file (hfy-initfile))) (load file 'NOERROR nil nil) )) - -;;;### (autoloads nil "hfy-cmap" "hfy-cmap.el" "1fb78b15b18622256262c7246b2a3520") -;;; 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 diff --git a/test/lisp/htmlfontify-tests.el b/test/lisp/htmlfontify-tests.el new file mode 100644 index 00000000000..a5a92fa8fac --- /dev/null +++ b/test/lisp/htmlfontify-tests.el @@ -0,0 +1,34 @@ +;;; htmlfontify-tests.el --- Test suite. -*- lexical-binding: t -*- + +;; Copyright (C) 2015 Free Software Foundation, Inc. + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Code: +(require 'ert) +(require 'htmlfontify) + +(ert-deftest htmlfontify-autoload () + "Tests to see whether reftex-auc has been autoloaded" + (should + (fboundp 'htmlfontify-load-rgb-file)) + (should + (autoloadp + (symbol-function + 'htmlfontify-load-rgb-file)))) + +(provide 'htmlfontify-tests) +;; htmlfontify-tests.el ends here -- 2.39.2