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

[Stefan Monnier]

Index: emacs/lisp/startup.el
diff -c emacs/lisp/startup.el:1.375 emacs/lisp/startup.el:1.376
*** emacs/lisp/startup.el:1.375 Sat Aug 20 21:48:20 2005
--- emacs/lisp/startup.el       Mon Sep 12 15:47:31 2005
***************
*** 976,995 ****
    (unless (or noninteractive
                window-system
                (null term-file-prefix))
!     (let ((term (getenv "TERM"))
            hyphend)
        (while (and term
                    (not (load (concat term-file-prefix term) t t)))
          ;; Strip off last hyphen and what follows, then try again
          (setq term
!               (if (setq hyphend (string-match "[-_][^-_]+$" term))
                    (substring term 0 hyphend)
                  nil)))
!       (when term
!       ;; The terminal file has been loaded, now call the terminal
!       ;; specific initialization function.
!       (let ((term-init-func (intern (concat "terminal-init-" term))))
!         (when (fboundp term-init-func)
            (funcall term-init-func))))))
  
    ;; Update the out-of-memory error message based on user's key bindings
--- 976,1003 ----
    (unless (or noninteractive
                window-system
                (null term-file-prefix))
!     (let* ((TERM (getenv "TERM"))
!            (term TERM)
            hyphend)
        (while (and term
                    (not (load (concat term-file-prefix term) t t)))
          ;; Strip off last hyphen and what follows, then try again
          (setq term
!               (if (setq hyphend (string-match "[-_][^-_]+\\'" term))
                    (substring term 0 hyphend)
                  nil)))
!       (setq term TERM)
!       ;; The terminal file has been loaded, now call the terminal specific
!       ;; initialization function.
!       (while term
!       (let ((term-init-func (intern-soft (concat "terminal-init-" term))))
!         (if (not (fboundp term-init-func))
!               ;; Strip off last hyphen and what follows, then try again
!               (setq term
!                     (if (setq hyphend (string-match "[-_][^-_]+\\'" term))
!                         (substring term 0 hyphend)
!                       nil))
!             (setq term nil)
            (funcall term-init-func))))))
  
    ;; Update the out-of-memory error message based on user's key bindings