[Emacs-diffs] Changes to emacs/lisp/startup.el [lexbind]

[Miles Bader]

Index: emacs/lisp/startup.el
diff -c emacs/lisp/startup.el:1.298.2.1 emacs/lisp/startup.el:1.298.2.2
*** emacs/lisp/startup.el:1.298.2.1     Fri Apr  4 01:20:11 2003
--- emacs/lisp/startup.el       Tue Oct 14 19:51:24 2003
***************
*** 365,370 ****
--- 365,373 ----
  
  (defvar normal-top-level-add-subdirs-inode-list nil)
  
+ (defvar pure-space-overflow nil
+   "Non-nil if building Emacs overflowed pure space.")
+ 
  (defun normal-top-level-add-subdirs-to-load-path ()
    "Add all subdirectories of current directory to `load-path'.
  More precisely, this uses only the subdirectories whose names
***************
*** 1262,1267 ****
--- 1265,1272 ----
    (let ((text (car fancy-current-text)))
      (set-buffer buffer)
      (erase-buffer)
+     (if pure-space-overflow
+       (insert "Warning Warning  Pure space overflow   Warning Warning\n"))
      (fancy-splash-head)
      (apply #'fancy-splash-insert text)
      (fancy-splash-tail)
***************
*** 1274,1280 ****
  
  
  (defun fancy-splash-default-action ()
!   "Default action for events in the splash screen buffer."
    (interactive)
    (push last-command-event unread-command-events)
    (throw 'exit nil))
--- 1279,1288 ----
  
  
  (defun fancy-splash-default-action ()
!   "Stop displaying the splash screen buffer.
! This is an internal function used to turn off the splash screen after
! the user caused an input event by hitting a key or clicking with the
! mouse."
    (interactive)
    (push last-command-event unread-command-events)
    (throw 'exit nil))
***************
*** 1333,1341 ****
  
  (defun use-fancy-splash-screens-p ()
    "Return t if fancy splash screens should be used."
!   (when (or (and (display-color-p)
                 (image-type-available-p 'xpm))
!           (image-type-available-p 'pbm))
      (let ((frame (fancy-splash-frame)))
        (when frame
        (let* ((img (create-image (or fancy-splash-image
--- 1341,1350 ----
  
  (defun use-fancy-splash-screens-p ()
    "Return t if fancy splash screens should be used."
!   (when (and (display-graphic-p)
!              (or (and (display-color-p)
                 (image-type-available-p 'xpm))
!                  (image-type-available-p 'pbm)))
      (let ((frame (fancy-splash-frame)))
        (when frame
        (let* ((img (create-image (or fancy-splash-image
***************
*** 1356,1361 ****
--- 1365,1373 ----
                (mode-line-format (propertize "---- %b %-"
                                              'face '(:weight bold))))
  
+           (if pure-space-overflow
+               (insert "Warning Warning  Pure space overflow   Warning 
Warning\n"))
+ 
            ;; The convention for this piece of code is that
            ;; each piece of output starts with one or two newlines
            ;; and does not end with any newlines.
***************
*** 1506,1513 ****
  Fancy splash screens are used on graphic displays,
  normal otherwise."
    (interactive)
!   (if (and (display-graphic-p)
!          (use-fancy-splash-screens-p))
        (fancy-splash-screens)
      (normal-splash-screen)))
  
--- 1518,1524 ----
  Fancy splash screens are used on graphic displays,
  normal otherwise."
    (interactive)
!   (if (use-fancy-splash-screens-p)
        (fancy-splash-screens)
      (normal-splash-screen)))
  
***************
*** 1542,1547 ****
--- 1553,1560 ----
                            nil t))
                       (error nil))
                   (kill-buffer buffer)))))
+       ;; Stop any "Loading image..." message hiding echo-area-message.
+       (use-fancy-splash-screens-p)
        (display-startup-echo-area-message))
  
    ;; Delay 2 seconds after an init file error message
***************
*** 1765,1771 ****
      ;; clicks the menu bar during the sit-for.
      (when (display-popup-menus-p)
        (precompute-menubar-bindings))
!     (setq menubar-bindings-done t)
  
      ;; If *scratch* is selected and it is empty, insert an
      ;; initial message saying not to create a file there.
--- 1778,1785 ----
      ;; clicks the menu bar during the sit-for.
      (when (display-popup-menus-p)
        (precompute-menubar-bindings))
!     (with-no-warnings
!      (setq menubar-bindings-done t))
  
      ;; If *scratch* is selected and it is empty, insert an
      ;; initial message saying not to create a file there.
***************
*** 1793,1796 ****
--- 1807,1811 ----
        (setq file (replace-match "/" t t file)))
      file))
  
+ ;;; arch-tag: 7e294698-244d-4758-984b-4047f887a5db
  ;;; startup.el ends here