Show
Ignore:
Timestamp:
09/09/06 16:30:10 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/lisp/emulation/viper.el

    r4098 r4161  
    535535  "Turn on Viper emulation of Vi in Emacs. See Info node `(viper)Viper'." 
    536536  (interactive) 
    537   (if (null viper-vi-state-cursor-color) 
    538       (modify-frame-parameters 
    539         (selected-frame) 
    540         (list (cons 'viper-vi-state-cursor-color (viper-get-cursor-color))))) 
    541537  (if (not noninteractive) 
    542538      (progn 
     
    619615        (or (memq major-mode viper-emacs-state-mode-list) ; don't switch to Vi 
    620616            (memq major-mode viper-insert-state-mode-list) ; don't switch 
    621             (viper-change-state-to-vi))))) 
     617            (viper-change-state-to-vi)) 
     618        ))) 
    622619 
    623620 
     
    863860  ;; So do it via the window-setup-hook 
    864861  (add-hook 'window-setup-hook 
    865             '(lambda () 
    866                (setq viper-vi-state-cursor-color (viper-get-cursor-color)))) 
     862            '(lambda () 
     863               (modify-frame-parameters 
     864                (selected-frame) 
     865                (list (cons 'viper-vi-state-cursor-color 
     866                            (viper-get-cursor-color)))))) 
    867867 
    868868  ;; Tell vc-diff to put *vc* in Vi mode 
     
    904904  (defadvice set-cursor-color (after viper-set-cursor-color-ad activate) 
    905905    "Change cursor color in VI state." 
    906     ;;(setq viper-vi-state-cursor-color (ad-get-arg 0)) 
    907906    (modify-frame-parameters 
    908907        (selected-frame) 
     
    10091008(defun viper-non-hook-settings () 
    10101009 
    1011   ;; Viper changes the default mode-line-buffer-identification 
    1012   (setq-default mode-line-buffer-identification '(" %b")) 
     1010  ;;;; Viper changes the default mode-line-buffer-identification 
     1011  ;;(setq-default mode-line-buffer-identification '(" %b")) 
    10131012 
    10141013  ;; setup emacs-supported vi-style feel