[Emacs-diffs] emacs/lisp ChangeLog font-lock.el image.el star...

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/09/12 03:55:50

Modified files:
        lisp           : ChangeLog font-lock.el image.el startup.el 
                         subr.el 

Log message:
        * startup.el (tutorial-directory): Make it a defcustom.
        Use custom-initialize-delay rather than eval-at-startup to set it.
        * image.el (image-load-path): Make it a defcustom.
        Use custom-initialize-delay rather than eval-at-startup to set it.
        * subr.el (eval-at-startup): Remove.
        * font-lock.el (lisp-font-lock-keywords-2): Remove eval-at-startup.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16144&r2=1.16145
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/font-lock.el?cvsroot=emacs&r1=1.352&r2=1.353
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/image.el?cvsroot=emacs&r1=1.88&r2=1.89
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/startup.el?cvsroot=emacs&r1=1.540&r2=1.541
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/subr.el?cvsroot=emacs&r1=1.651&r2=1.652

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16144
retrieving revision 1.16145
diff -u -b -r1.16144 -r1.16145
--- ChangeLog   12 Sep 2009 03:35:40 -0000      1.16144
+++ ChangeLog   12 Sep 2009 03:55:46 -0000      1.16145
@@ -1,5 +1,12 @@
 2009-09-12  Stefan Monnier  <address@hidden>
 
+       * startup.el (tutorial-directory): Make it a defcustom.
+       Use custom-initialize-delay rather than eval-at-startup to set it.
+       * image.el (image-load-path): Make it a defcustom.
+       Use custom-initialize-delay rather than eval-at-startup to set it.
+       * subr.el (eval-at-startup): Remove.
+       * font-lock.el (lisp-font-lock-keywords-2): Remove eval-at-startup.
+
        * subr.el (do-after-load-evaluation): Warn the user after loading an
        obsolete package.
 

Index: font-lock.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/font-lock.el,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -b -r1.352 -r1.353
--- font-lock.el        5 Sep 2009 21:00:43 -0000       1.352
+++ font-lock.el        12 Sep 2009 03:55:49 -0000      1.353
@@ -2265,7 +2265,7 @@
                 "save-match-data" "save-current-buffer"
                 "unwind-protect" "condition-case" "track-mouse"
                 "eval-after-load" "eval-and-compile" "eval-when-compile"
-                "eval-when" "eval-at-startup" "eval-next-after-load"
+                "eval-when" "eval-next-after-load"
                 "with-case-table" "with-category-table"
                 "with-current-buffer" "with-electric-help"
                 "with-local-quit" "with-no-warnings"

Index: image.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/image.el,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- image.el    28 Aug 2009 23:49:11 -0000      1.88
+++ image.el    12 Sep 2009 03:55:50 -0000      1.89
@@ -98,18 +98,17 @@
  - maybe  auto-detect only if the image type is available
            (see `image-type-available-p').")
 
-(defvar image-load-path nil
+(defcustom image-load-path
+  (list (file-name-as-directory (expand-file-name "images" data-directory))
+        'data-directory 'load-path)
   "List of locations in which to search for image files.
 If an element is a string, it defines a directory to search.
 If an element is a variable symbol whose value is a string, that
 value defines a directory to search.
 If an element is a variable symbol whose value is a list, the
-value is used as a list of directories to search.")
-
-(eval-at-startup
- (setq image-load-path
-       (list (file-name-as-directory (expand-file-name "images" 
data-directory))
-            'data-directory 'load-path)))
+value is used as a list of directories to search."
+  :type '(repeat (choice directory variable))
+  :initialize 'custom-initialize-delay)
 
 
 (defun image-load-path-for-library (library image &optional path no-error)

Index: startup.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/startup.el,v
retrieving revision 1.540
retrieving revision 1.541
diff -u -b -r1.540 -r1.541
--- startup.el  11 Sep 2009 21:25:47 -0000      1.540
+++ startup.el  12 Sep 2009 03:55:50 -0000      1.541
@@ -388,13 +388,12 @@
 Warning Warning!!!  Pure space overflow    !!!Warning Warning
 \(See the node Pure Storage in the Lisp manual for details.)\n")
 
-(defvar tutorial-directory nil
-  "Directory containing the Emacs TUTORIAL files.")
-
-;; Get correct value in a dumped, installed Emacs.
-(eval-at-startup
- (setq tutorial-directory (file-name-as-directory
-                           (expand-file-name "tutorials" data-directory))))
+(defcustom tutorial-directory
+  (file-name-as-directory (expand-file-name "tutorials" data-directory))
+  "Directory containing the Emacs TUTORIAL files."
+  :group 'installation
+  :type 'directory
+  :initialize 'custom-initialize-delay)
 
 (defun normal-top-level-add-subdirs-to-load-path ()
   "Add all subdirectories of current directory to `load-path'.

Index: subr.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/subr.el,v
retrieving revision 1.651
retrieving revision 1.652
diff -u -b -r1.651 -r1.652
--- subr.el     12 Sep 2009 03:35:43 -0000      1.651
+++ subr.el     12 Sep 2009 03:55:50 -0000      1.652
@@ -1591,22 +1591,6 @@
 
 ;;;; Specifying things to do later.
 
-(defmacro eval-at-startup (&rest body)
-  "Make arrangements to evaluate BODY when Emacs starts up.
-If this is run after Emacs startup, evaluate BODY immediately.
-Always returns nil.
-
-This works by adding a function to `before-init-hook'.
-That function's doc string says which file created it."
-  `(progn
-     (if command-line-processed
-        (progn . ,body)
-       (add-hook 'before-init-hook
-                '(lambda () ,(concat "From " (or load-file-name "no file"))
-                   . ,body)
-                t))
-     nil))
-
 (defun load-history-regexp (file)
   "Form a regexp to find FILE in `load-history'.
 FILE, a string, is described in the function `eval-after-load'."