aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2002-04-30 17:46:15 +0000
committerRichard M. Stallman2002-04-30 17:46:15 +0000
commit8a76146c4c716dfd48a278b668379358cab40a1b (patch)
treefa0a1d49b5d54077ef09ed6336595f760fb1c544
parent93f7e65790e88012060740ec2459823d2d58ef5c (diff)
downloademacs-8a76146c4c716dfd48a278b668379358cab40a1b.tar.gz
emacs-8a76146c4c716dfd48a278b668379358cab40a1b.zip
Remove autoload cookies.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/ediff-hook.el4
2 files changed, 2 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 20c9e1844b8..0dc314641a8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12002-04-30 Richard M. Stallman <rms@gnu.org> 12002-04-30 Richard M. Stallman <rms@gnu.org>
2 2
3 * ediff-hook.el: Remove autoload cookies.
4
3 * language/tibetan.el (tibetan-obsolete-glyphs): Now in tibet-util.el. 5 * language/tibetan.el (tibetan-obsolete-glyphs): Now in tibet-util.el.
4 6
5 * language/tibet-util.el (tibetan-obsolete-glyphs): From tibetan.el. 7 * language/tibet-util.el (tibetan-obsolete-glyphs): From tibetan.el.
diff --git a/lisp/ediff-hook.el b/lisp/ediff-hook.el
index 23baeb49d7d..daae55827a9 100644
--- a/lisp/ediff-hook.el
+++ b/lisp/ediff-hook.el
@@ -44,7 +44,6 @@
44;; end pacifier 44;; end pacifier
45 45
46;; allow menus to be set up without ediff-wind.el being loaded 46;; allow menus to be set up without ediff-wind.el being loaded
47;;;###autoload
48(defvar ediff-window-setup-function) 47(defvar ediff-window-setup-function)
49 48
50;; This macro is used to avoid compilation warnings. 49;; This macro is used to avoid compilation warnings.
@@ -52,14 +51,12 @@
52;; compiler at hand (emacs or xemacs). 51;; compiler at hand (emacs or xemacs).
53;; The autoload, below, is useless in Emacs because ediff-hook.el 52;; The autoload, below, is useless in Emacs because ediff-hook.el
54;; is dumped with emacs, but it is needed in XEmacs 53;; is dumped with emacs, but it is needed in XEmacs
55;;;###autoload
56(defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form) 54(defmacro ediff-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form)
57 (if (string-match "XEmacs" emacs-version) 55 (if (string-match "XEmacs" emacs-version)
58 xemacs-form emacs-form)) 56 xemacs-form emacs-form))
59 57
60;; This autoload is useless in Emacs because ediff-hook.el is dumped with 58;; This autoload is useless in Emacs because ediff-hook.el is dumped with
61;; emacs, but it is needed in XEmacs 59;; emacs, but it is needed in XEmacs
62;;;###autoload
63(ediff-cond-compile-for-xemacs-or-emacs 60(ediff-cond-compile-for-xemacs-or-emacs
64 ;; xemacs form 61 ;; xemacs form
65 (defun ediff-xemacs-init-menus () 62 (defun ediff-xemacs-init-menus ()
@@ -82,7 +79,6 @@
82 79
83;; This autoload is useless in Emacs because ediff-hook.el is dumped with 80;; This autoload is useless in Emacs because ediff-hook.el is dumped with
84;; emacs, but it is needed in XEmacs 81;; emacs, but it is needed in XEmacs
85;;;###autoload
86(ediff-cond-compile-for-xemacs-or-emacs 82(ediff-cond-compile-for-xemacs-or-emacs
87 (progn 83 (progn
88 (defvar ediff-menu 84 (defvar ediff-menu