diff options
| author | Juanma Barranquero | 2007-09-25 10:48:16 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2007-09-25 10:48:16 +0000 |
| commit | 56eaedfe17651dab1582ef4a460953648eb1089e (patch) | |
| tree | 87f723a79c4acf979020a8705d6ee07718c4d7a7 /lisp | |
| parent | 3f0f4f6fc52ef62526d0591396305f9fa78a5a57 (diff) | |
| download | emacs-56eaedfe17651dab1582ef4a460953648eb1089e.tar.gz emacs-56eaedfe17651dab1582ef4a460953648eb1089e.zip | |
(ediff-toggle-multiframe, ediff-toggle-use-toolbar, ediff-really-quit,
ediff-clear-diff-vector): Use `mapc' rather than `mapcar'.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ediff-util.el | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el index e60faa0a0da..14b1be963d7 100644 --- a/lisp/ediff-util.el +++ b/lisp/ediff-util.el | |||
| @@ -122,7 +122,7 @@ Commands: | |||
| 122 | ;; modified by minor modes and such. So, run-mode-hooks doesn't do anything | 122 | ;; modified by minor modes and such. So, run-mode-hooks doesn't do anything |
| 123 | ;; useful here on top of what run-hooks does. | 123 | ;; useful here on top of what run-hooks does. |
| 124 | ;; Second, changing run-hooks to run-mode-hooks would require an | 124 | ;; Second, changing run-hooks to run-mode-hooks would require an |
| 125 | ;; if-statement, since XEmacs doesn't have this. | 125 | ;; if-statement, since XEmacs doesn't have this. |
| 126 | (run-hooks 'ediff-mode-hook)) | 126 | (run-hooks 'ediff-mode-hook)) |
| 127 | 127 | ||
| 128 | 128 | ||
| @@ -1317,10 +1317,10 @@ which see." | |||
| 1317 | ;; change default | 1317 | ;; change default |
| 1318 | (setq-default ediff-window-setup-function window-setup-func) | 1318 | (setq-default ediff-window-setup-function window-setup-func) |
| 1319 | ;; change in all active ediff sessions | 1319 | ;; change in all active ediff sessions |
| 1320 | (mapcar (lambda(buf) (ediff-with-current-buffer buf | 1320 | (mapc (lambda(buf) (ediff-with-current-buffer buf |
| 1321 | (setq ediff-window-setup-function window-setup-func | 1321 | (setq ediff-window-setup-function window-setup-func |
| 1322 | ediff-window-B nil))) | 1322 | ediff-window-B nil))) |
| 1323 | ediff-session-registry) | 1323 | ediff-session-registry) |
| 1324 | (if (ediff-in-control-buffer-p) | 1324 | (if (ediff-in-control-buffer-p) |
| 1325 | (ediff-recenter 'no-rehighlight)))) | 1325 | (ediff-recenter 'no-rehighlight)))) |
| 1326 | 1326 | ||
| @@ -1341,12 +1341,12 @@ To change the default, set the variable `ediff-use-toolbar-p', which see." | |||
| 1341 | ;; do this only after killing the toolbar | 1341 | ;; do this only after killing the toolbar |
| 1342 | (setq ediff-use-toolbar-p (not ediff-use-toolbar-p)) | 1342 | (setq ediff-use-toolbar-p (not ediff-use-toolbar-p)) |
| 1343 | 1343 | ||
| 1344 | (mapcar (lambda(buf) | 1344 | (mapc (lambda(buf) |
| 1345 | (ediff-with-current-buffer buf | 1345 | (ediff-with-current-buffer buf |
| 1346 | ;; force redisplay | 1346 | ;; force redisplay |
| 1347 | (setq ediff-window-config-saved "") | 1347 | (setq ediff-window-config-saved "") |
| 1348 | )) | 1348 | )) |
| 1349 | ediff-session-registry) | 1349 | ediff-session-registry) |
| 1350 | (if (ediff-in-control-buffer-p) | 1350 | (if (ediff-in-control-buffer-p) |
| 1351 | (ediff-recenter 'no-rehighlight))))) | 1351 | (ediff-recenter 'no-rehighlight))))) |
| 1352 | 1352 | ||
| @@ -2439,14 +2439,14 @@ temporarily reverses the meaning of this variable." | |||
| 2439 | 2439 | ||
| 2440 | ;; Apply selective display to narrow or widen | 2440 | ;; Apply selective display to narrow or widen |
| 2441 | (ediff-visible-region) | 2441 | (ediff-visible-region) |
| 2442 | (mapcar (lambda (overl) | 2442 | (mapc (lambda (overl) |
| 2443 | (if (ediff-overlayp overl) | 2443 | (if (ediff-overlayp overl) |
| 2444 | (ediff-delete-overlay overl))) | 2444 | (ediff-delete-overlay overl))) |
| 2445 | ediff-wide-bounds) | 2445 | ediff-wide-bounds) |
| 2446 | (mapcar (lambda (overl) | 2446 | (mapc (lambda (overl) |
| 2447 | (if (ediff-overlayp overl) | 2447 | (if (ediff-overlayp overl) |
| 2448 | (ediff-delete-overlay overl))) | 2448 | (ediff-delete-overlay overl))) |
| 2449 | ediff-narrow-bounds) | 2449 | ediff-narrow-bounds) |
| 2450 | 2450 | ||
| 2451 | ;; restore buffer mode line id's in buffer-A/B/C | 2451 | ;; restore buffer mode line id's in buffer-A/B/C |
| 2452 | (let ((control-buffer ediff-control-buffer) | 2452 | (let ((control-buffer ediff-control-buffer) |
| @@ -3747,13 +3747,13 @@ Ediff Control Panel to restore highlighting." | |||
| 3747 | ;; VEC is either a difference vector or a fine-diff vector | 3747 | ;; VEC is either a difference vector or a fine-diff vector |
| 3748 | (defun ediff-clear-diff-vector (vec-var &optional fine-diffs-also) | 3748 | (defun ediff-clear-diff-vector (vec-var &optional fine-diffs-also) |
| 3749 | (if (vectorp (symbol-value vec-var)) | 3749 | (if (vectorp (symbol-value vec-var)) |
| 3750 | (mapcar (lambda (elt) | 3750 | (mapc (lambda (elt) |
| 3751 | (ediff-delete-overlay | 3751 | (ediff-delete-overlay |
| 3752 | (ediff-get-diff-overlay-from-diff-record elt)) | 3752 | (ediff-get-diff-overlay-from-diff-record elt)) |
| 3753 | (if fine-diffs-also | 3753 | (if fine-diffs-also |
| 3754 | (ediff-clear-fine-diff-vector elt)) | 3754 | (ediff-clear-fine-diff-vector elt)) |
| 3755 | ) | 3755 | ) |
| 3756 | (symbol-value vec-var))) | 3756 | (symbol-value vec-var))) |
| 3757 | ;; allow them to be garbage collected | 3757 | ;; allow them to be garbage collected |
| 3758 | (set vec-var nil)) | 3758 | (set vec-var nil)) |
| 3759 | 3759 | ||