[Emacs-diffs] Changes to emacs/lisp/emulation/viper-ex.el

[Michael Kifer]

Index: emacs/lisp/emulation/viper-ex.el
diff -c emacs/lisp/emulation/viper-ex.el:1.42 
emacs/lisp/emulation/viper-ex.el:1.43
*** emacs/lisp/emulation/viper-ex.el:1.42       Mon Dec 24 00:50:31 2001
--- emacs/lisp/emulation/viper-ex.el    Mon Jan  7 23:36:00 2002
***************
*** 1,8 ****
  ;;; viper-ex.el --- functions implementing the Ex commands for Viper
  
! ;; Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
  
! ;; Author: Michael Kifer <address@hidden>
  
  ;; This file is part of GNU Emacs.
  
--- 1,8 ----
  ;;; viper-ex.el --- functions implementing the Ex commands for Viper
  
! ;; Copyright (C) 1994, 95, 96, 97, 98, 2000, 01, 02 Free Software Foundation, 
Inc.
  
! ;; Author: Michael Kifer <address@hidden>
  
  ;; This file is part of GNU Emacs.
  
***************
*** 39,44 ****
--- 39,45 ----
  (defvar viper-custom-file-name)
  (defvar viper-case-fold-search)
  (defvar explicit-shell-file-name)
+ (defvar compile-command)
  
  ;; loading happens only in non-interactive compilation
  ;; in order to spare non-viperized emacs from being viperized
***************
*** 2016,2024 ****
    (let ((end (car ex-addresses))
        (beg (car (cdr ex-addresses))) 
        (orig-buf (current-buffer))
!       (orig-buf-file-name (buffer-file-name))
!       (orig-buf-name (buffer-name))
!       (buff-changed-p (buffer-modified-p))
        temp-buf writing-same-file region
        file-exists writing-whole-file)
      (if (> beg end) (error viper-FirstAddrExceedsSecond))
--- 2017,2025 ----
    (let ((end (car ex-addresses))
        (beg (car (cdr ex-addresses))) 
        (orig-buf (current-buffer))
!       ;;(orig-buf-file-name (buffer-file-name))
!       ;;(orig-buf-name (buffer-name))
!       ;;(buff-changed-p (buffer-modified-p))
        temp-buf writing-same-file region
        file-exists writing-whole-file)
      (if (> beg end) (error viper-FirstAddrExceedsSecond))
***************
*** 2072,2080 ****
              ;; create temp buffer for the region
              (setq temp-buf (get-buffer-create " *ex-write*"))
              (set-buffer temp-buf)
!             (if viper-xemacs-p
!                 (set-visited-file-name ex-file)
!               (set-visited-file-name ex-file 'noquerry))
              (erase-buffer)
              (if (and file-exists ex-append)
                  (insert-file-contents ex-file))
--- 2073,2082 ----
              ;; create temp buffer for the region
              (setq temp-buf (get-buffer-create " *ex-write*"))
              (set-buffer temp-buf)
!             (viper-cond-compile-for-xemacs-or-emacs
!              (set-visited-file-name ex-file) ; xemacs
!              (set-visited-file-name ex-file 'noquerry) ; emacs
!              )
              (erase-buffer)
              (if (and file-exists ex-append)
                  (insert-file-contents ex-file))