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

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/03/05 08:50:20

Index: ediff-mult.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff-mult.el,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- ediff-mult.el       8 Jan 2008 20:44:55 -0000       1.57
+++ ediff-mult.el       5 Mar 2008 08:50:20 -0000       1.58
@@ -939,10 +939,9 @@
       (erase-buffer)
       ;; delete phony overlays that used to represent sessions before the buff
       ;; was redrawn
-      (ediff-cond-compile-for-xemacs-or-emacs
-       (map-extents 'delete-extent)   ; xemacs
-       (mapc 'delete-overlay (overlays-in 1 1))  ; emacs
-       )
+      (if (featurep 'xemacs)
+         (map-extents 'delete-extent)
+       (mapc 'delete-overlay (overlays-in 1 1)))
 
       (setq regexp (ediff-get-group-regexp meta-list)
            merge-autostore-dir
@@ -1047,8 +1046,8 @@
 (defun ediff-update-session-marker-in-dir-meta-buffer (session-num)
   (let (buffer-meta-overlays session-info overl buffer-read-only)
     (setq overl
-         (ediff-cond-compile-for-xemacs-or-emacs
-          (map-extents ; xemacs
+         (if (featurep 'xemacs)
+             (map-extents
            (lambda (ext maparg)
              (if (and
                   (ediff-overlay-get ext 'ediff-meta-info)
@@ -1057,7 +1056,6 @@
                  ext)))
            ;; Emacs doesn't have map-extents, so try harder
            ;; Splice overlay lists to get all buffer overlays
-          (progn
             (setq buffer-meta-overlays (overlay-lists)
                   buffer-meta-overlays (append (car buffer-meta-overlays)
                                                (cdr buffer-meta-overlays)))
@@ -1071,8 +1069,7 @@
                                 overl 'ediff-meta-session-number)
                                session-num))
                           overl))
-                    buffer-meta-overlays))))
-          ))
+                   buffer-meta-overlays)))))
     (or overl
        (error
         "Bug in ediff-update-session-marker-in-dir-meta-buffer: no overlay 
with given number %S"
@@ -1388,10 +1385,9 @@
       (erase-buffer)
       ;; delete phony overlays that used to represent sessions before the buff
       ;; was redrawn
-      (ediff-cond-compile-for-xemacs-or-emacs
-       (map-extents 'delete-extent) ; xemacs
-       (mapc 'delete-overlay (overlays-in 1 1)) ; emacs
-       )
+      (if (featurep 'xemacs)
+         (map-extents 'delete-extent)
+       (mapc 'delete-overlay (overlays-in 1 1)))
 
       (insert "This is a registry of all active Ediff sessions.
 
@@ -2213,42 +2209,33 @@
   (let (result olist tmp)
     (if (and point (ediff-buffer-live-p buf))
        (ediff-with-current-buffer buf
-         (ediff-cond-compile-for-xemacs-or-emacs
-          (setq result  ; xemacs
+         (if (featurep 'xemacs)
+             (setq result
                 (if (setq tmp (extent-at point buf 'ediff-meta-info))
                     (ediff-overlay-get tmp 'ediff-meta-info)))
-          (progn ; emacs
-            (setq olist (overlays-at point))
             (setq olist
                   (mapcar (lambda (elt)
                             (unless (overlay-get elt 'invisible)
                               (overlay-get elt 'ediff-meta-info)))
-                          olist))
+                         (overlays-at point)))
             (while (and olist (null (car olist)))
               (setq olist (cdr olist)))
-            (setq result (car olist)))
-          )
-         ))
-    (if result
-       result
-      (if noerror
-         nil
+           (setq result (car olist)))))
+    (or result
+       (unless noerror
        (ediff-update-registry)
        (error "No session info in this line")))))
 
 
 (defun ediff-get-meta-overlay-at-pos (point)
-  (ediff-cond-compile-for-xemacs-or-emacs
-   (extent-at point (current-buffer) 'ediff-meta-info) ; xemacs
-   ;; emacs
+  (if (featurep 'xemacs)
+      (extent-at point (current-buffer) 'ediff-meta-info)
    (let* ((overl-list (overlays-at point))
          (overl (car overl-list)))
      (while (and overl (null (overlay-get overl 'ediff-meta-info)))
        (setq overl-list (cdr overl-list)
             overl (car overl-list)))
-     overl)
-   )
-  )
+      overl)))
 
 (defsubst ediff-get-session-number-at-pos (point &optional meta-buffer)
   (setq meta-buffer (if (ediff-buffer-live-p meta-buffer)
@@ -2264,7 +2251,7 @@
   (if (eobp)
       (goto-char (point-min))
     (let ((overl (ediff-get-meta-overlay-at-pos point)))
-      (ediff-cond-compile-for-xemacs-or-emacs
+      (if (featurep 'xemacs)
        (progn ; xemacs
         (if overl
             (setq overl (next-extent overl))
@@ -2276,17 +2263,14 @@
        (if overl
           ;; note: end of current overlay is the beginning of the next one
           (overlay-end overl)
-        (next-overlay-change point))
-       )
-      )
-    ))
+         (next-overlay-change point))))))
 
 
 (defun ediff-previous-meta-overlay-start (point)
   (if (bobp)
       (goto-char (point-max))
     (let ((overl (ediff-get-meta-overlay-at-pos point)))
-      (ediff-cond-compile-for-xemacs-or-emacs
+      (if (featurep 'xemacs)
        (progn
         (if overl
             (setq overl (previous-extent overl))
@@ -2294,7 +2278,6 @@
         (if overl
             (extent-start-position overl)
           (point-min)))
-       (progn
         (if overl (setq point (overlay-start overl)))
         ;; to get to the beginning of prev overlay
         (if (not (bobp))
@@ -2307,9 +2290,7 @@
         ;; goto the top of the registry buffer.
         (or (car (overlays-at point))
             (setq point (point-min)))
-        point)
-       )
-      )))
+       point))))
 
 ;; this is the action invoked when the user selects a patch from the meta
 ;; buffer.