Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
94b73aef
Commit
94b73aef
authored
Apr 05, 2008
by
Glenn Morris
Browse files
Require loaddef file rather than loading it.
parent
099659f9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
13 deletions
+23
-13
lisp/ChangeLog
lisp/ChangeLog
+19
-2
lisp/calendar/calendar.el
lisp/calendar/calendar.el
+2
-5
lisp/calendar/diary-lib.el
lisp/calendar/diary-lib.el
+1
-3
lisp/calendar/holidays.el
lisp/calendar/holidays.el
+1
-3
No files found.
lisp/ChangeLog
View file @
94b73aef
2008-04-05 Glenn Morris <rgm@gnu.org>
* emacs-lisp/autoload.el (autoload-ensure-default-file):
Provide a feature.
* calendar/calendar.el, calendar/diary-lib.el, calendar/holidays.el:
Require loaddef file rather than loading it.
* Makefile.in ($(lisp)/mh-e/mh-loaddefs.el): Simplify rule now that
autoload-ensure-default-file provides a feature.
* Makefile.in (LOADDEFS): Add mh-loaddefs.el.
(AUTOGENEL): mh-loaddefs is in $LOADDEFS now.
(compile, compile-always, recompile): Use $LOADDEFS.
(cal-autoloads): Remove.
* calendar/cal-x.el (calendar-dedicate-diary): Use get-buffer rather
than buffer-live-p. Reported by David Koppelman <koppel@ece.lsu.edu>.
2008-04-05 Stefan Monnier <monnier@iro.umontreal.ca>
* server.el: Undo part of the multi-tty change, which is only
...
...
@@ -91,9 +108,9 @@
2008-04-04 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff*el:
r
eplace
d
load with require in eval-when-compile.
* ediff*
.
el:
R
eplace load with require in eval-when-compile.
* ediff-hook:
d
elete
d
all invocations of (autoload ...).
* ediff-hook:
D
elete all invocations of (autoload ...).
* ediff-util.el (ediff-setup): Make window-min-height a local variable
in ediff control window, and set its min height to 2.
...
...
lisp/calendar/calendar.el
View file @
94b73aef
...
...
@@ -116,12 +116,9 @@
;;; Code:
;; (elisp) Eval During Compile: "Effectively `require' is
;; automatically `eval-and-compile'" [but `load' is not]
(
eval-and-compile
(
load
"cal-loaddefs"
nil
'quiet
))
(
require
'cal-loaddefs
)
;; Avoid recursive load of calendar when loading cal-menu.
;; Avoid recursive load of calendar when loading cal-menu.
Yuck.
(
provide
'calendar
)
(
require
'cal-menu
)
...
...
lisp/calendar/diary-lib.el
View file @
94b73aef
...
...
@@ -31,9 +31,7 @@
;;; Code:
(
require
'calendar
)
(
eval-and-compile
(
load
"diary-loaddefs"
nil
'quiet
))
(
require
'diary-loaddefs
)
(
defcustom
diary-include-string
"#include"
"The string indicating inclusion of another file of diary entries.
...
...
lisp/calendar/holidays.el
View file @
94b73aef
...
...
@@ -31,9 +31,7 @@
;;; Code:
(
require
'calendar
)
(
eval-and-compile
(
load
"hol-loaddefs"
nil
'quiet
))
(
require
'hol-loaddefs
)
;;;###diary-autoload
(
defun
calendar-holiday-list
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment