[Emacs-diffs] emacs/lisp ChangeLog emacs-lisp/autoload.el

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/11/05 03:22:58

Modified files:
        lisp           : ChangeLog 
        lisp/emacs-lisp: autoload.el 

Log message:
        (autoload-rubric): Add optional feature arg.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16562&r2=1.16563
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emacs-lisp/autoload.el?cvsroot=emacs&r1=1.151&r2=1.152

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16562
retrieving revision 1.16563
diff -u -b -r1.16562 -r1.16563
--- ChangeLog   5 Nov 2009 03:22:18 -0000       1.16562
+++ ChangeLog   5 Nov 2009 03:22:55 -0000       1.16563
@@ -1,5 +1,7 @@
 2009-11-05  Glenn Morris  <address@hidden>
 
+       * emacs-lisp/autoload.el (autoload-rubric): Add optional feature arg.
+
        * calendar/diary-lib.el (top-level): Make load behave more like require.
 
 2009-11-04  Dan Nicolaescu  <address@hidden>

Index: emacs-lisp/autoload.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emacs-lisp/autoload.el,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -b -r1.151 -r1.152
--- emacs-lisp/autoload.el      3 Nov 2009 21:45:31 -0000       1.151
+++ emacs-lisp/autoload.el      5 Nov 2009 03:22:58 -0000       1.152
@@ -253,16 +253,25 @@
              (print-escape-nonascii t))
          (print form outbuf)))))))
 
-(defun autoload-rubric (file &optional type)
+(defun autoload-rubric (file &optional type feature)
   "Return a string giving the appropriate autoload rubric for FILE.
 TYPE (default \"autoloads\") is a string stating the type of
-information contained in FILE."
+information contained in FILE.  If FEATURE is non-nil, FILE
+will provide a feature.  FEATURE may be a string naming the
+feature, otherwise it will be based on FILE's name."
   (let ((basename (file-name-nondirectory file)))
     (concat ";;; " basename
            " --- automatically extracted " (or type "autoloads") "\n"
            ";;\n"
            ";;; Code:\n\n"
            "\n"
+           ;; This is used outside of autoload.el.
+           (if feature
+               (concat "(provide '"
+                       (if (stringp feature) feature
+                         (file-name-sans-extension basename))
+                       ")\n")
+             "")
            ";; Local Variables:\n"
            ";; version-control: never\n"
            ";; no-byte-compile: t\n"