[Emacs-diffs] emacs/lisp ChangeLog Makefile.in ediff-hook.el ...

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/09/27 23:25:07

Modified files:
        lisp           : ChangeLog Makefile.in ediff-hook.el menu-bar.el 
        lisp/emacs-lisp: autoload.el cl-macs.el lisp-mode.el 
        lisp/progmodes : autoconf.el 

Log message:
        * menu-bar.el: Remove menu-bar-ediff-misc-menu from the Tools
        menu.
        
        * ediff-hook.el: Move menu-bar-ediff-misc-menu into
        menu-bar-ediff-menu.
        
        * emacs-lisp/lisp-mode.el: Add doc-string-elt property to
        define-overloadable-function.
        
        * progmodes/autoconf.el: Provide autoconf as well, so that this
        file can be `require'd.
        
        * emacs-lisp/cl-macs.el (deftype): Add to cl-loaddefs.
        
        * emacs-lisp/autoload.el (generated-autoload-feature)
        (generated-autoload-load-name): New vars.
        (autoload-rubric, autoload-generate-file-autoloads): Use them.
        (make-autoload): Recognize define-overloadable-function and
        defclass forms (for EIEIO).
        
        * Makefile.in (update-subdirs): Exclude cedet directory.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16272&r2=1.16273
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/Makefile.in?cvsroot=emacs&r1=1.194&r2=1.195
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ediff-hook.el?cvsroot=emacs&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/menu-bar.el?cvsroot=emacs&r1=1.358&r2=1.359
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emacs-lisp/autoload.el?cvsroot=emacs&r1=1.143&r2=1.144
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emacs-lisp/cl-macs.el?cvsroot=emacs&r1=1.84&r2=1.85
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emacs-lisp/lisp-mode.el?cvsroot=emacs&r1=1.246&r2=1.247
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/autoconf.el?cvsroot=emacs&r1=1.22&r2=1.23

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16272
retrieving revision 1.16273
diff -u -b -r1.16272 -r1.16273
--- ChangeLog   27 Sep 2009 16:11:10 -0000      1.16272
+++ ChangeLog   27 Sep 2009 23:25:03 -0000      1.16273
@@ -1,3 +1,27 @@
+2009-09-27  Chong Yidong  <address@hidden>
+
+       * menu-bar.el: Remove menu-bar-ediff-misc-menu from the Tools
+       menu.
+
+       * ediff-hook.el: Move menu-bar-ediff-misc-menu into
+       menu-bar-ediff-menu.
+
+       * emacs-lisp/lisp-mode.el: Add doc-string-elt property to
+       define-overloadable-function.
+
+       * progmodes/autoconf.el: Provide autoconf as well, so that this
+       file can be `require'd.
+
+       * emacs-lisp/cl-macs.el (deftype): Add to cl-loaddefs.
+
+       * emacs-lisp/autoload.el (generated-autoload-feature)
+       (generated-autoload-load-name): New vars.
+       (autoload-rubric, autoload-generate-file-autoloads): Use them.
+       (make-autoload): Recognize define-overloadable-function and
+       defclass forms (for EIEIO).
+
+       * Makefile.in (update-subdirs): Exclude cedet directory.
+
 2009-09-27  Adrian Robert  <address@hidden>
 
        * term/ns-win.el: Don't set the region face background. (Bug#4381)

Index: Makefile.in
===================================================================
RCS file: /sources/emacs/emacs/lisp/Makefile.in,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -b -r1.194 -r1.195
--- Makefile.in 27 Sep 2009 14:47:56 -0000      1.194
+++ Makefile.in 27 Sep 2009 23:25:06 -0000      1.195
@@ -91,6 +91,15 @@
           esac; \
         done
 
+# Find all subdirectories in which we might want to create subdirs.el
+
+setwins_for_subdirs=subdirs=`(cd $$wd; find . -type d -print)`; \
+       for file in $$subdirs; do \
+          case $$file in */Old | */RCS | */CVS | */CVS/* | */.* | */.*/* | 
*/=* | */cedet* ) ;; \
+               *) wins="$$wins $$wd/$$file" ;; \
+          esac; \
+        done
+
 # `compile-main' tends to be slower than `recompile' but can be parallelized
 # with "make -j" and results in more deterministic compilation warnings.
 # cus-load and finder-inf are not explicitly requested by anything, so
@@ -144,7 +153,7 @@
 $(lisp)/subdirs.el:
        $(MAKE) $(MFLAGS) update-subdirs
 update-subdirs: doit
-       wd=$(lisp); $(setwins); \
+       wd=$(lisp); $(setwins_for_subdirs); \
        for file in $$wins; do \
           $(srcdir)/update-subdirs $$file; \
        done;

Index: ediff-hook.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff-hook.el,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- ediff-hook.el       17 Sep 2009 02:53:40 -0000      1.45
+++ ediff-hook.el       27 Sep 2009 23:25:06 -0000      1.46
@@ -143,6 +143,9 @@
   (fset 'menu-bar-ediff-menu (symbol-value 'menu-bar-ediff-menu))
   
   ;; define ediff compare menu
+  (define-key menu-bar-ediff-menu [ediff-misc]
+    (list 'menu-item "Ediff Miscellanea" menu-bar-ediff-misc-menu))
+  (define-key menu-bar-ediff-menu [separator-ediff-misc] '("--"))
   (define-key menu-bar-ediff-menu [window]
     `(menu-item ,(purecopy "This Window and Next Window") compare-windows
                :help ,(purecopy "Compare the current window and the next 
window")))

Index: menu-bar.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/menu-bar.el,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -b -r1.358 -r1.359
--- menu-bar.el 25 Sep 2009 18:49:05 -0000      1.358
+++ menu-bar.el 27 Sep 2009 23:25:06 -0000      1.359
@@ -1307,8 +1307,6 @@
 (define-key menu-bar-tools-menu [separator-compare]
   '("--"))
 
-(define-key menu-bar-tools-menu [ediff-misc]
-  `(menu-item ,(purecopy "Ediff Miscellanea") menu-bar-ediff-misc-menu))
 (define-key menu-bar-tools-menu [epatch]
   `(menu-item ,(purecopy "Apply Patch") menu-bar-epatch-menu))
 (define-key menu-bar-tools-menu [ediff-merge]

Index: emacs-lisp/autoload.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emacs-lisp/autoload.el,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -b -r1.143 -r1.144
--- emacs-lisp/autoload.el      5 Jan 2009 03:20:44 -0000       1.143
+++ emacs-lisp/autoload.el      27 Sep 2009 23:25:06 -0000      1.144
@@ -42,6 +42,18 @@
 ;;;###autoload
 (put 'generated-autoload-file 'safe-local-variable 'stringp)
 
+(defvar generated-autoload-feature nil
+  "Feature for `generated-autoload-file' to provide.
+If nil, this defaults to `generated-autoload-file', sans extension.")
+;;;###autoload
+(put 'generated-autoload-feature 'safe-local-variable 'symbolp)
+
+(defvar generated-autoload-load-name nil
+  "Load name for `autoload' statements generated from autoload cookies.
+If nil, this defaults to the file name, sans extension.")
+;;;###autoload
+(put 'generated-autoload-load-name 'safe-local-variable 'stringp)
+
 ;; This feels like it should be a defconst, but MH-E sets it to
 ;; ";;;###mh-autoload" for the autoloads that are to go into mh-loaddefs.el.
 (defvar generate-autoload-cookie ";;;###autoload"
@@ -95,11 +107,12 @@
                   easy-mmode-define-global-mode define-global-minor-mode
                   define-globalized-minor-mode
                   easy-mmode-define-minor-mode define-minor-mode
-                  defun* defmacro*))
+                  defun* defmacro* define-overloadable-function))
       (let* ((macrop (memq car '(defmacro defmacro*)))
             (name (nth 1 form))
             (args (case car
-                   ((defun defmacro defun* defmacro*) (nth 2 form))
+                   ((defun defmacro defun* defmacro*
+                      define-overloadable-function) (nth 2 form))
                    ((define-skeleton) '(&optional str arg))
                    ((define-generic-mode define-derived-mode
                        define-compilation-mode) nil)
@@ -122,6 +135,14 @@
                  (eq (car-safe (car body)) 'interactive))
              (if macrop (list 'quote 'macro) nil))))
 
+     ;; For defclass forms, use `eieio-defclass-autoload'.
+     ((eq car 'defclass)
+      (let ((name (nth 1 form))
+           (superclasses (nth 2 form))
+           (doc (nth 4 form)))
+       (list 'eieio-defclass-autoload (list 'quote name)
+             (list 'quote superclasses) file doc)))
+
      ;; Convert defcustom to less space-consuming data.
      ((eq car 'defcustom)
       (let ((varname (car-safe (cdr-safe form)))
@@ -245,7 +266,12 @@
            ";;\n"
            ";;; Code:\n\n"
            "\n"
-           "(provide '" (file-name-sans-extension basename) ")\n"
+           "(provide '"
+           (if (and generated-autoload-feature
+                    (symbolp generated-autoload-feature))
+               (format "%s" generated-autoload-feature)
+             (file-name-sans-extension basename))
+           ")\n"
            ";; Local Variables:\n"
            ";; version-control: never\n"
            ";; no-byte-compile: t\n"
@@ -336,7 +362,7 @@
 \(or OUTBUF if OUTFILE is nil)."
   (catch 'done
     (let ((autoloads-done '())
-          (load-name (autoload-file-load-name file))
+         load-name
           (print-length nil)
          (print-level nil)
           (print-readably t)           ; This does something in Lucid Emacs.
@@ -354,6 +380,10 @@
         ;; Obey the no-update-autoloads file local variable.
         (unless no-update-autoloads
           (message "Generating autoloads for %s..." file)
+         (setq load-name
+               (if (stringp generated-autoload-load-name)
+                   generated-autoload-load-name
+                 (autoload-file-load-name file)))
           (save-excursion
             (save-restriction
               (widen)

Index: emacs-lisp/cl-macs.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emacs-lisp/cl-macs.el,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- emacs-lisp/cl-macs.el       11 Sep 2009 22:59:39 -0000      1.84
+++ emacs-lisp/cl-macs.el       27 Sep 2009 23:25:06 -0000      1.85
@@ -2438,6 +2438,7 @@
 
 ;;; Types and assertions.
 
+;;;###autoload
 (defmacro deftype (name arglist &rest body)
   "Define NAME as a new data type.
 The type name can then be used in `typecase', `check-type', etc."

Index: emacs-lisp/lisp-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emacs-lisp/lisp-mode.el,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -b -r1.246 -r1.247
--- emacs-lisp/lisp-mode.el     17 Sep 2009 06:28:35 -0000      1.246
+++ emacs-lisp/lisp-mode.el     27 Sep 2009 23:25:07 -0000      1.247
@@ -156,6 +156,7 @@
 (put 'defalias 'doc-string-elt 3)
 (put 'defvaralias 'doc-string-elt 3)
 (put 'define-category 'doc-string-elt 2)
+(put 'define-overloadable-function 'doc-string-elt 3)
 
 (defvar lisp-doc-string-elt-property 'doc-string-elt
   "The symbol property that holds the docstring position info.")

Index: progmodes/autoconf.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/autoconf.el,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- progmodes/autoconf.el       5 Jan 2009 03:23:15 -0000       1.22
+++ progmodes/autoconf.el       27 Sep 2009 23:25:07 -0000      1.23
@@ -107,6 +107,7 @@
   (run-mode-hooks 'autoconf-mode-hook))
 
 (provide 'autoconf-mode)
+(provide 'autoconf)
 
 ;; arch-tag: 4f44778f-2ab3-49a1-a103-f0acb9df2de4
 ;;; autoconf.el ends here