/[emacs]/emacs/lisp/startup.el
ViewVC logotype

Diff of /emacs/lisp/startup.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.328 by monnier, Fri May 28 21:04:52 2004 UTC revision 1.328.2.1 by miles, Sat Sep 4 12:01:08 2004 UTC
# Line 220  Setting `init-file-user' does not preven Line 220  Setting `init-file-user' does not preven
220    "File containing site-wide run-time initializations.    "File containing site-wide run-time initializations.
221  This file is loaded at run-time before `~/.emacs'.  It contains inits  This file is loaded at run-time before `~/.emacs'.  It contains inits
222  that need to be in place for the entire site, but which, due to their  that need to be in place for the entire site, but which, due to their
223  higher incidence of change, don't make sense to load into emacs'  higher incidence of change, don't make sense to load into Emacs's
224  dumped image.  Thus, the run-time load order is: 1. file described in  dumped image.  Thus, the run-time load order is: 1. file described in
225  this variable, if non-nil; 2. `~/.emacs'; 3. `default.el'.  this variable, if non-nil; 2. `~/.emacs'; 3. `default.el'.
226    
# Line 293  or `CVS', and any subdirectory that cont Line 293  or `CVS', and any subdirectory that cont
293        (let* ((this-dir (car dirs))        (let* ((this-dir (car dirs))
294               (contents (directory-files this-dir))               (contents (directory-files this-dir))
295               (default-directory this-dir)               (default-directory this-dir)
296               (canonicalized (and (eq system-type 'windows-nt)               (canonicalized (if (fboundp 'untranslated-canonical-name)
297                                   (untranslated-canonical-name this-dir))))                                  (untranslated-canonical-name this-dir))))
298          ;; The Windows version doesn't report meaningful inode          ;; The Windows version doesn't report meaningful inode
299          ;; numbers, so use the canonicalized absolute file name of the          ;; numbers, so use the canonicalized absolute file name of the
300          ;; directory instead.          ;; directory instead.
# Line 343  or `CVS', and any subdirectory that cont Line 343  or `CVS', and any subdirectory that cont
343      ;; Give *Messages* the same default-directory as *scratch*,      ;; Give *Messages* the same default-directory as *scratch*,
344      ;; just to keep things predictable.      ;; just to keep things predictable.
345      (let ((dir default-directory))      (let ((dir default-directory))
346        (save-excursion        (with-current-buffer "*Messages*"
         (set-buffer (get-buffer "*Messages*"))  
347          (setq default-directory dir)))          (setq default-directory dir)))
348      ;; `user-full-name' is now known; reset its standard-value here.      ;; `user-full-name' is now known; reset its standard-value here.
349      (put 'user-full-name 'standard-value      (put 'user-full-name 'standard-value
# Line 357  or `CVS', and any subdirectory that cont Line 356  or `CVS', and any subdirectory that cont
356      ;; of that dir into load-path,      ;; of that dir into load-path,
357      ;; Look for a leim-list.el file too.  Loading it will register      ;; Look for a leim-list.el file too.  Loading it will register
358      ;; available input methods.      ;; available input methods.
359      (let ((tail load-path)      (dolist (dir load-path)
360            new)        (let ((default-directory dir))
361        (while tail          (load (expand-file-name "subdirs.el") t t t))
362          (push (car tail) new)        (let ((default-directory dir))
363          (condition-case nil          (load (expand-file-name "leim-list.el") t t t)))
364              (let ((default-directory (car tail)))      (unless (eq system-type 'vax-vms)
365                (load (expand-file-name "subdirs.el" (car tail)) t t t)))        ;; If the PWD environment variable isn't accurate, delete it.
366          (condition-case nil        (let ((pwd (getenv "PWD")))
367              (let ((default-directory (car tail)))          (and (stringp pwd)
368                (load (expand-file-name "leim-list.el" (car tail)) t t t)))               ;; Use FOO/., so that if FOO is a symlink, file-attributes
369          (setq tail (cdr tail))))               ;; describes the directory linked to, not FOO itself.
370      (if (not (eq system-type 'vax-vms))               (or (equal (file-attributes
371          (progn                           (concat (file-name-as-directory pwd) "."))
372            ;; If the PWD environment variable isn't accurate, delete it.                          (file-attributes
373            (let ((pwd (getenv "PWD")))                           (concat (file-name-as-directory default-directory)
374              (and (stringp pwd)                                   ".")))
375                   ;; Use FOO/., so that if FOO is a symlink, file-attributes                   (setq process-environment
376                   ;; describes the directory linked to, not FOO itself.                         (delete (concat "PWD=" pwd)
377                   (or (equal (file-attributes                                 process-environment))))))
                              (concat (file-name-as-directory pwd) "."))  
                             (file-attributes  
                              (concat (file-name-as-directory default-directory)  
                                      ".")))  
                      (setq process-environment  
                            (delete (concat "PWD=" pwd)  
                                    process-environment)))))))  
378      (setq default-directory (abbreviate-file-name default-directory))      (setq default-directory (abbreviate-file-name default-directory))
379      (let ((menubar-bindings-done nil))      (let ((menubar-bindings-done nil))
380        (unwind-protect        (unwind-protect

Legend:
Removed from v.1.328  
changed lines
  Added in v.1.328.2.1

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26