emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Dan Nicolaescu
Subject: [Emacs-diffs] Changes to emacs/lisp/emulation/viper.el,v
Date: Fri, 09 Nov 2007 05:21:01 +0000

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   07/11/09 05:20:59

Index: emulation/viper.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emulation/viper.el,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- emulation/viper.el  26 Sep 2007 00:18:58 -0000      1.106
+++ emulation/viper.el  9 Nov 2007 05:20:23 -0000       1.107
@@ -690,7 +690,7 @@
   (setq default-major-mode
        (viper-standard-value 'default-major-mode 
viper-saved-non-viper-variables))
 
-  (if viper-emacs-p
+  (if (featurep 'emacs)
       (setq-default
        mark-even-if-inactive
        (viper-standard-value
@@ -701,7 +701,7 @@
       (and (fboundp 'add-to-ordered-list) (boundp 'emulation-mode-map-alists))
     (viper-delocalize-var 'minor-mode-map-alist))
   (viper-delocalize-var 'require-final-newline)
-  (if viper-xemacs-p (viper-delocalize-var 'bar-cursor))
+  (if (featurep 'xemacs) (viper-delocalize-var 'bar-cursor))
 
 
   ;; deactivate all advices done by Viper.
@@ -788,7 +788,7 @@
   ;; In emacs, we have to advice handle-switch-frame
   ;; This advice is undone earlier, when all advices matchine "viper-" are
   ;; deactivated.
-  (if viper-xemacs-p
+  (if (featurep 'xemacs)
       (remove-hook 'mouse-leave-frame-hook 'viper-remember-current-frame))
   ) ; end viper-go-away
 
@@ -981,7 +981,7 @@
        )))
 
   ;; International input methods
-  (if viper-emacs-p
+  (if (featurep 'emacs)
       (eval-after-load "mule-cmds"
        '(progn
           (defadvice inactivate-input-method (after viper-mule-advice activate)
@@ -1022,7 +1022,7 @@
        require-final-newline t)
 
   ;; don't bark when mark is inactive
-  (if viper-emacs-p
+  (if (featurep 'emacs)
       (setq mark-even-if-inactive t))
 
   (setq scroll-step 1)
@@ -1094,12 +1094,12 @@
     "Use `read-file-name' for reading arguments."
     (interactive (cons (read-file-name "Find file: " nil default-directory)
                       ;; XEmacs: if Mule & prefix arg, ask for coding system
-                      (cond ((and viper-xemacs-p (featurep 'mule))
+                      (cond ((and (featurep 'xemacs) (featurep 'mule))
                              (list
                               (and current-prefix-arg
                                    (read-coding-system "Coding-system: "))))
                             ;; Emacs: do wildcards
-                            ((and viper-emacs-p (boundp 'find-file-wildcards))
+                            ((and (featurep 'emacs) (boundp 
'find-file-wildcards))
                                   (list find-file-wildcards))))
                 ))
 
@@ -1108,12 +1108,12 @@
     (interactive (cons (read-file-name "Find file in other window: "
                                       nil default-directory)
                       ;; XEmacs: if Mule & prefix arg, ask for coding system
-                      (cond ((and viper-xemacs-p (featurep 'mule))
+                      (cond ((and (featurep 'xemacs) (featurep 'mule))
                              (list
                               (and current-prefix-arg
                                    (read-coding-system "Coding-system: "))))
                             ;; Emacs: do wildcards
-                            ((and viper-emacs-p (boundp 'find-file-wildcards))
+                            ((and (featurep 'emacs) (boundp 
'find-file-wildcards))
                              (list find-file-wildcards))))
                 ))
 
@@ -1123,12 +1123,12 @@
     (interactive (cons (read-file-name "Find file in other frame: "
                                       nil default-directory)
                       ;; XEmacs: if Mule & prefix arg, ask for coding system
-                      (cond ((and viper-xemacs-p (featurep 'mule))
+                      (cond ((and (featurep 'xemacs) (featurep 'mule))
                              (list
                               (and current-prefix-arg
                                    (read-coding-system "Coding-system: "))))
                             ;; Emacs: do wildcards
-                            ((and viper-emacs-p (boundp 'find-file-wildcards))
+                            ((and (featurep 'emacs) (boundp 
'find-file-wildcards))
                              (list find-file-wildcards))))
                 ))
 
@@ -1159,7 +1159,7 @@
 
   ;; catch frame switching event
   (if (viper-window-display-p)
-      (if viper-xemacs-p
+      (if (featurep 'xemacs)
             (add-hook 'mouse-leave-frame-hook
                       'viper-remember-current-frame)
           (defadvice handle-switch-frame (before viper-frame-advice activate)
@@ -1227,7 +1227,7 @@
           (cons 'mode-line-buffer-identification
                 (list (default-value 'mode-line-buffer-identification)))
           (cons 'global-mode-string (list global-mode-string))
-          (if viper-emacs-p
+          (if (featurep 'emacs)
               (cons 'mark-even-if-inactive (list mark-even-if-inactive)))
           )))
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]