comparison lisp/ediff-mult.el @ 14040:187735b53d52

Comment fixes.
author Karl Heuer <kwzh@gnu.org>
date Fri, 05 Jan 1996 22:21:28 +0000
parents 0b081d93ee6c
children 83f275dcd93a
comparison
equal deleted inserted replaced
14039:831c5fda97f4 14040:187735b53d52
41 ;; in the following format: 41 ;; in the following format:
42 ;; ((obj1 obj2 [optional obj3]) (...) ...) 42 ;; ((obj1 obj2 [optional obj3]) (...) ...)
43 ;; Actually, the format of this list is pretty much up to the 43 ;; Actually, the format of this list is pretty much up to the
44 ;; developer. The only thing is that it must be a list of lists. 44 ;; developer. The only thing is that it must be a list of lists.
45 ;; Also, keep in mind that the function ediff-prepare-meta-buffer 45 ;; Also, keep in mind that the function ediff-prepare-meta-buffer
46 ;; (which see) prepends nil in fron of each list (i.e., the above list 46 ;; (which see) prepends nil in front of each list (i.e., the above list
47 ;; will become ((nil obj1 obj2 ...) (nil ...) ...). 47 ;; will become ((nil obj1 obj2 ...) (nil ...) ...).
48 ;; Ediff expects that your function (in 2 above) will arrange to 48 ;; Ediff expects that your function (in 2 above) will arrange to
49 ;; replace this prepended nil (via setcar) with the actual ediff 49 ;; replace this prepended nil (via setcar) with the actual ediff
50 ;; control buffer associated with an appropriate Ediff session. 50 ;; control buffer associated with an appropriate Ediff session.
51 ;; This is arranged through internal startup hooks that can be passed 51 ;; This is arranged through internal startup hooks that can be passed
1207 (ediff-update-registry) 1207 (ediff-update-registry)
1208 (if (not (ediff-buffer-live-p ediff-registry-buffer)) 1208 (if (not (ediff-buffer-live-p ediff-registry-buffer))
1209 (error "No active Ediff sessions or corrupted session registry")) 1209 (error "No active Ediff sessions or corrupted session registry"))
1210 (let (wind frame) 1210 (let (wind frame)
1211 ;; for some reason, point moves in ediff-registry-buffer, so we preserve it 1211 ;; for some reason, point moves in ediff-registry-buffer, so we preserve it
1212 ;; explicity 1212 ;; explictly
1213 (ediff-eval-in-buffer ediff-registry-buffer 1213 (ediff-eval-in-buffer ediff-registry-buffer
1214 (save-excursion 1214 (save-excursion
1215 (cond ((setq wind 1215 (cond ((setq wind
1216 (ediff-get-visible-buffer-window ediff-registry-buffer)) 1216 (ediff-get-visible-buffer-window ediff-registry-buffer))
1217 (message "Already showing the registry") 1217 (message "Already showing the registry")