xemacs-beta: lisp/prim/startup.el comparison

comparison lisp/prim/startup.el @ 177:6075d714658b r20-3b15

Import from CVS: tag r20-3b15

author	cvs
date	Mon, 13 Aug 2007 09:51:16 +0200
parents	929b76928fce
children	9ad43877534d

comparison

equal deleted inserted replaced

-:6866abce6aaf
+:6075d714658b
 	  (push (pop args) new-args)))
 (t (push arg new-args))))
 (nreverse new-args)))
+(defconst initial-scratch-message "\
+;; If you want to create a file, don't type the text in this buffer.
+;; This buffer is for notes you don't want to save, and for Lisp evaluation.
+;; If you want to create a file, first visit that file with C-x C-f,
+;; then enter the text in that file's own buffer.
+"
+"Initial message displayed in *scratch* buffer at startup.")
 (defun command-line ()
 (let ((command-line-args-left (cdr command-line-args)))
 (let ((debugger 'early-error-handler)
 	  (debug-on-error t))
 ;;
 ;;; Load init files.
 (load-init-file)
-;; If *scratch* exists and init file didn't change its mode, initialize it.
+(with-current-buffer (get-buffer "*scratch*")
-(when (get-buffer "*scratch*")
+(erase-buffer)
-(save-excursion
+;; (insert initial-scratch-message)
-	(set-buffer "*scratch*")
+(set-buffer-modified-p nil)
-	(when (eq major-mode 'fundamental-mode)
+(when (eq major-mode 'fundamental-mode)
-	  (funcall initial-major-mode))))
+	(funcall initial-major-mode)))
 ;; Load library for our terminal type.
 ;; User init file can set term-file-prefix to nil to prevent this.
 ;; Note that for any TTY's opened subsequently, the TTY init
 ;; code will run this.
 		(or nil;; (pos-visible-in-window-p (point-min))
 		    (goto-char (point-min)))
 		(sit-for 0)
 		(setq unread-command-event (next-command-event)))
 	    (when timeout (disable-timeout timeout))
-	    (save-excursion
+	    (with-current-buffer (get-buffer "*scratch*")
+	      (erase-buffer)
+	      (insert initial-scratch-message)
 	      ;; In case the XEmacs server has already selected
 	      ;; another buffer, erase the one our message is in.
-	      (set-buffer (get-buffer "*scratch*"))
-	      (erase-buffer)
 	      (set-buffer-modified-p nil)))))
 ;; Command-line-options exist
 (let ((dir command-line-default-directory)
 	  (file-count 0)
 			      (substring emacs-version (match-beginning 1)
 					 (match-end 1)))))
 (concat "lib/xemacs-" version)))
 (defun find-emacs-root-internal-1 (path lisp-p)
+(prin1 (format "f-e-r-i-1:  %s\n" path))
 (let ((dir (file-name-directory path)))
 (or
 ;;
 ;; If this directory is a plausible root of the XEmacs tree, return it.
 ;;
 ;;  (send-string-to-terminal (format "FINDING ROOT FOR %S\n" path))
 ;; first look for lisp/prim and lib-src; then just look for lib-src.
 ;; XEmacs can run (kind of) if the lisp directory is omitted, which
 ;; some people might want to do for space reasons.
 (or (find-emacs-root-internal-1 path t)
-(find-emacs-root-internal-1 path nil)
+;; (find-emacs-root-internal-1 path nil)
 ;; If we don't succeed we are going to crash and burn for sure.
 ;; Try some paths relative to prefix-directory if it isn't nil.
 ;; This is definitely necessary in cases such as when we're used
 ;; as a login shell since we can't determine the invocation
 ;; directory in that case.
 (find-emacs-root-internal-1
 (format "%s/bin/%s" prefix-directory invocation-name) t)
 (find-emacs-root-internal-1
 (format "%s/bin/%s" prefix-directory invocation-name) nil)
 (find-emacs-root-internal-1
 (format "%s/lib/%s" prefix-directory invocation-name) t)
 (find-emacs-root-internal-1
 (format "%s/lib/%s" prefix-directory invocation-name) nil)
+;; We're desperate -- try the prefix-directory correctly.
+(find-emacs-root-internal-1
+(format "%s/%s/foo" prefix-directory (startup-make-version-dir)) t)
+(find-emacs-root-internal-1
+(format "%s/%s/foo" prefix-directory (startup-make-version-dir)) nil)
 ))
 (defun set-default-load-path ()
 ;; XEmacs -- Steven Baur says invocation directory is nil if you
 ;; try to use XEmacs as a login shell.
 		      (list site-lisp))
 		  (if lisp
 		      (list lisp)
 		    )
 		  ))
 ;; 1997/03/06 by Jeff Miller <jmiller@bayserve.net>
 ;; initialize 'site-directory'.  This is the site-lisp dir used by
 ;; XEmacs
 (if site-lisp
 	(setq site-directory (file-name-as-directory site-lisp))
 (when (or (and (null data-directory) etc)
 	      (and (string= etc (expand-file-name "etc" root))
 		   (not (string= data-directory etc))))
 (setq data-directory (file-name-as-directory etc)))
 ;; If `configure' specified an info dir, use it.
 (or (boundp 'Info-default-directory-list)
 	(setq Info-default-directory-list nil))
 (cond (configure-info-directory
 	   (setq configure-info-directory (file-name-as-directory
 		       (file-name-directory superlock-file))))
 	     (setq superlock-file
 		   (expand-file-name "!!!SuperLock!!!"
 				     lock-directory)))))
-(set-default-load-path-warning)))
+(set-default-load-path-warning)
+(when (and data-directory Info-default-directory-list)
+(setq data-directory-list (list data-directory))
+(packages-find-packages package-path nil))))
 (defun set-default-load-path-warning ()
 (let ((lock (if (boundp 'lock-directory) lock-directory 't))
 	warnings message guess)

Mercurial > hg > xemacs-beta

comparison lisp/prim/startup.el @ 177:6075d714658b r20-3b15