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

[Juri Linkov]

Index: emacs/lisp/startup.el
diff -c emacs/lisp/startup.el:1.338 emacs/lisp/startup.el:1.339
*** emacs/lisp/startup.el:1.338 Sat Feb 12 18:00:53 2005
--- emacs/lisp/startup.el       Sat Mar  5 04:31:59 2005
***************
*** 283,288 ****
--- 283,290 ----
  
  (defvar normal-top-level-add-subdirs-inode-list nil)
  
+ (defvar no-blinking-cursor nil)
+ 
  (defvar pure-space-overflow nil
    "Non-nil if building Emacs overflowed pure space.")
  
***************
*** 667,673 ****
      ;; does things.
      (while (and (not done) args)
        (let* ((longopts '(("--no-init-file") ("--no-site-file") ("--user")
!                          ("--debug-init") ("--iconic") ("--icon-type")))
               (argi (pop args))
               (orig-argi argi)
               argval)
--- 669,676 ----
      ;; does things.
      (while (and (not done) args)
        (let* ((longopts '(("--no-init-file") ("--no-site-file") ("--user")
!                          ("--debug-init") ("--iconic") ("--icon-type")
!                        ("--no-blinking-cursor")))
               (argi (pop args))
               (orig-argi argi)
               argval)
***************
*** 690,695 ****
--- 693,699 ----
         ((equal argi "-Q")
          (setq init-file-user nil
                site-run-file nil
+               no-blinking-cursor t
                emacs-quick-startup t)
          (push '(vertical-scroll-bars . nil) initial-frame-alist))
         ((member argi '("-q" "-no-init-file"))
***************
*** 705,710 ****
--- 709,716 ----
          (push '(visibility . icon) initial-frame-alist))
         ((member argi '("-icon-type" "-i" "-itype"))
          (push '(icon-type . t) default-frame-alist))
+        ((member argi '("-nbc" "-no-blinking-cursor"))
+         (setq no-blinking-cursor t))
         ;; Push the popped arg back on the list of arguments.
         (t
            (push argi args)
***************
*** 740,746 ****
    ;; you should also change the corresponding expression in the
    ;; defcustom in frame.el, or Custom will be badly confused.
    (unless (or noninteractive
!             emacs-quick-startup
                (eq system-type 'ms-dos)
                (not (memq window-system '(x w32))))
      (blink-cursor-mode 1))
--- 746,752 ----
    ;; you should also change the corresponding expression in the
    ;; defcustom in frame.el, or Custom will be badly confused.
    (unless (or noninteractive
!             no-blinking-cursor
                (eq system-type 'ms-dos)
                (not (memq window-system '(x w32))))
      (blink-cursor-mode 1))