emacs-diffs
[Top][All Lists]
Advanced

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

[Emacs-diffs] Changes to emacs/lisp/ediff-util.el,v


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

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

Index: ediff-util.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff-util.el,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- ediff-util.el       2 Nov 2007 06:03:11 -0000       1.78
+++ ediff-util.el       9 Nov 2007 05:20:56 -0000       1.79
@@ -38,7 +38,6 @@
 (defvar bottom-toolbar-visible-p)
 (defvar bottom-toolbar-height)
 (defvar mark-active)
-(defvar ediff-emacs-p)
 
 (defvar ediff-after-quit-hook-internal nil)
 
@@ -64,7 +63,7 @@
     (or (featurep 'ediff)
        (load "ediff.el" nil nil 'nosuffix))
     (or (featurep 'ediff-tbar)
-       ediff-emacs-p
+       (featurep 'emacs)
        (load "ediff-tbar.el" 'noerror nil 'nosuffix))
     ))
 ;; end pacifier
@@ -77,7 +76,7 @@
 (require 'ediff-diff)
 (require 'ediff-merg)
 
-(if ediff-xemacs-p
+(if (featurep 'xemacs)
     (require 'ediff-tbar))
 
 
@@ -154,7 +153,7 @@
   (suppress-keymap ediff-mode-map)
 
   (define-key ediff-mode-map
-    (if ediff-emacs-p [mouse-2] [button2]) 'ediff-help-for-quick-help)
+    (if (featurep 'emacs) [mouse-2] [button2]) 'ediff-help-for-quick-help)
   (define-key ediff-mode-map "\C-m"  'ediff-help-for-quick-help)
 
   (define-key ediff-mode-map "p" 'ediff-previous-difference)
@@ -1275,7 +1274,7 @@
   (ediff-barf-if-not-control-buffer)
   (or (ediff-window-display-p)
       (error "%sEmacs is not running as a window application"
-            (if ediff-emacs-p "" "X")))
+            (if (featurep 'emacs) "" "X")))
   (ediff-recenter 'no-rehighlight) ; make sure buffs are displayed in windows
   (let ((ctl-buf ediff-control-buffer))
     (setq ediff-wide-display-p (not ediff-wide-display-p))
@@ -1283,7 +1282,7 @@
        (ediff-with-current-buffer ctl-buf
          (modify-frame-parameters
           ediff-wide-display-frame ediff-wide-display-orig-parameters)
-         ;;(sit-for (if ediff-xemacs-p 0.4 0))
+         ;;(sit-for (if (featurep 'xemacs) 0.4 0))
          ;; restore control buf, since ctl window may have been deleted
          ;; during resizing
          (set-buffer ctl-buf)
@@ -1291,7 +1290,7 @@
                ediff-window-B nil) ; force update of window config
          (ediff-recenter 'no-rehighlight))
       (funcall ediff-make-wide-display-function)
-      ;;(sit-for (if ediff-xemacs-p 0.4 0))
+      ;;(sit-for (if (featurep 'xemacs) 0.4 0))
       (ediff-with-current-buffer ctl-buf
        (setq ediff-window-B nil) ; force update of window config
        (ediff-recenter 'no-rehighlight)))))
@@ -1305,7 +1304,7 @@
   (let (window-setup-func)
     (or (ediff-window-display-p)
        (error "%sEmacs is not running as a window application"
-              (if ediff-emacs-p "" "X")))
+              (if (featurep 'emacs) "" "X")))
 
   (cond ((eq ediff-window-setup-function 'ediff-setup-windows-multiframe)
         (setq window-setup-func 'ediff-setup-windows-plain))
@@ -1335,7 +1334,7 @@
       (progn
        (or (ediff-window-display-p)
            (error "%sEmacs is not running as a window application"
-                  (if ediff-emacs-p "" "X")))
+                  (if (featurep 'emacs) "" "X")))
        (if (ediff-use-toolbar-p)
            (ediff-kill-bottom-toolbar))
        ;; do this only after killing the toolbar
@@ -2529,7 +2528,7 @@
        (cond ((ediff-good-frame-under-mouse))
              (t warp-frame)))
   (if (and (ediff-window-display-p) (frame-live-p warp-frame) ediff-grab-mouse)
-      (set-mouse-position (if ediff-emacs-p
+      (set-mouse-position (if (featurep 'emacs)
                              warp-frame
                            (frame-selected-window warp-frame))
                          2 1))
@@ -2544,11 +2543,11 @@
        (buf-name "")
        frame obj-ok)
     (setq obj-ok
-         (if ediff-emacs-p
+         (if (featurep 'emacs)
              (frame-live-p frame-or-win)
            (window-live-p frame-or-win)))
     (if obj-ok
-       (setq frame (if ediff-emacs-p frame-or-win (window-frame frame-or-win))
+       (setq frame (if (featurep 'emacs) frame-or-win (window-frame 
frame-or-win))
              buf-name
              (buffer-name (window-buffer (frame-selected-window frame)))))
     (if (string-match "Minibuf" buf-name)
@@ -3031,7 +3030,7 @@
               (ediff-get-symbol-from-alist
                buf-type ediff-current-diff-overlay-alist))))
 
-       (if ediff-xemacs-p
+       (if (featurep 'xemacs)
            (ediff-move-overlay current-diff-overlay begin end-hilit)
          (ediff-move-overlay current-diff-overlay begin end-hilit buff))
        (ediff-overlay-put current-diff-overlay 'priority
@@ -3611,11 +3610,11 @@
 (defun ediff-remove-flags-from-buffer (buffer overlay)
   (ediff-with-current-buffer buffer
     (let ((inhibit-read-only t))
-      (if ediff-xemacs-p
+      (if (featurep 'xemacs)
          (ediff-overlay-put overlay 'begin-glyph nil)
        (ediff-overlay-put overlay 'before-string nil))
 
-      (if ediff-xemacs-p
+      (if (featurep 'xemacs)
          (ediff-overlay-put overlay 'end-glyph nil)
        (ediff-overlay-put overlay 'after-string nil))
       )))
@@ -3643,7 +3642,7 @@
                         ediff-before-flag-bol ediff-before-flag-mol))))
 
     ;; insert the flag itself
-    (if ediff-xemacs-p
+    (if (featurep 'xemacs)
        (ediff-overlay-put curr-overl 'begin-glyph flag)
       (ediff-overlay-put curr-overl 'before-string flag))
 
@@ -3659,7 +3658,7 @@
                         ediff-after-flag-eol ediff-after-flag-mol))))
 
     ;; insert the flag itself
-    (if ediff-xemacs-p
+    (if (featurep 'xemacs)
        (ediff-overlay-put curr-overl 'end-glyph flag)
       (ediff-overlay-put curr-overl 'after-string flag))
     ))
@@ -3786,10 +3785,10 @@
 
          ;; never detach
          (ediff-overlay-put
-          overl (if ediff-emacs-p 'evaporate 'detachable) nil)
+          overl (if (featurep 'emacs) 'evaporate 'detachable) nil)
          ;; make overlay open-ended
          ;; In emacs, it is made open ended at creation time
-         (if ediff-xemacs-p
+         (if (featurep 'xemacs)
              (progn
                (ediff-overlay-put overl 'start-open nil)
                (ediff-overlay-put overl 'end-open nil)))




reply via email to

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