Mercurial > emacs
comparison lisp/ediff.el @ 90389:146cd8369025
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-60
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 259-273)
- Update from CVS
- lisp/replace.el (occur-engine): Bind `inhibit-field-text-motion' to t
- Merge from gnus--rel--5.10
- Rename "field-at-point" to "field-at-pos"
- (comint-insert-input): Remove redundant calls to setq and goto-char
* gnus--rel--5.10 (patch 99-100)
- Merge from emacs--devo--0
- Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 10 May 2006 20:42:41 +0000 |
| parents | d1c5430c5bff 522ce5c1839a |
| children | 4094c5298ae1 |
comparison
equal
deleted
inserted
replaced
| 90388:a786f674d33f | 90389:146cd8369025 |
|---|---|
| 208 (setq dir-B | 208 (setq dir-B |
| 209 (if ediff-use-last-dir | 209 (if ediff-use-last-dir |
| 210 ediff-last-dir-B | 210 ediff-last-dir-B |
| 211 (file-name-directory f))) | 211 (file-name-directory f))) |
| 212 (progn | 212 (progn |
| 213 (setq file-name-history | 213 (add-to-history 'file-name-history |
| 214 (cons (ediff-abbreviate-file-name | 214 (ediff-abbreviate-file-name |
| 215 (expand-file-name | 215 (expand-file-name |
| 216 (file-name-nondirectory f) | 216 (file-name-nondirectory f) |
| 217 dir-B)) | 217 dir-B))) |
| 218 file-name-history)) | |
| 219 (ediff-get-default-file-name f 1))) | 218 (ediff-get-default-file-name f 1))) |
| 220 ))) | 219 ))) |
| 221 (ediff-files-internal file-A | 220 (ediff-files-internal file-A |
| 222 (if (file-directory-p file-B) | 221 (if (file-directory-p file-B) |
| 223 (expand-file-name | 222 (expand-file-name |
| 244 (setq dir-B | 243 (setq dir-B |
| 245 (if ediff-use-last-dir | 244 (if ediff-use-last-dir |
| 246 ediff-last-dir-B | 245 ediff-last-dir-B |
| 247 (file-name-directory f))) | 246 (file-name-directory f))) |
| 248 (progn | 247 (progn |
| 249 (setq file-name-history | 248 (add-to-history 'file-name-history |
| 250 (cons | 249 (ediff-abbreviate-file-name |
| 251 (ediff-abbreviate-file-name | 250 (expand-file-name |
| 252 (expand-file-name | 251 (file-name-nondirectory f) |
| 253 (file-name-nondirectory f) | 252 dir-B))) |
| 254 dir-B)) | |
| 255 file-name-history)) | |
| 256 (ediff-get-default-file-name f 1)))) | 253 (ediff-get-default-file-name f 1)))) |
| 257 (ediff-read-file-name "File C to compare" | 254 (ediff-read-file-name "File C to compare" |
| 258 (setq dir-C (if ediff-use-last-dir | 255 (setq dir-C (if ediff-use-last-dir |
| 259 ediff-last-dir-C | 256 ediff-last-dir-C |
| 260 (file-name-directory ff))) | 257 (file-name-directory ff))) |
| 261 (progn | 258 (progn |
| 262 (setq file-name-history | 259 (add-to-history 'file-name-history |
| 263 (cons (ediff-abbreviate-file-name | 260 (ediff-abbreviate-file-name |
| 264 (expand-file-name | 261 (expand-file-name |
| 265 (file-name-nondirectory ff) | 262 (file-name-nondirectory ff) |
| 266 dir-C)) | 263 dir-C))) |
| 267 file-name-history)) | |
| 268 (ediff-get-default-file-name ff 2))) | 264 (ediff-get-default-file-name ff 2))) |
| 269 ))) | 265 ))) |
| 270 (ediff-files-internal file-A | 266 (ediff-files-internal file-A |
| 271 (if (file-directory-p file-B) | 267 (if (file-directory-p file-B) |
| 272 (expand-file-name | 268 (expand-file-name |
| 1107 (setq dir-B | 1103 (setq dir-B |
| 1108 (if ediff-use-last-dir | 1104 (if ediff-use-last-dir |
| 1109 ediff-last-dir-B | 1105 ediff-last-dir-B |
| 1110 (file-name-directory f))) | 1106 (file-name-directory f))) |
| 1111 (progn | 1107 (progn |
| 1112 (setq file-name-history | 1108 (add-to-history 'file-name-history |
| 1113 (cons (ediff-abbreviate-file-name | 1109 (ediff-abbreviate-file-name |
| 1114 (expand-file-name | 1110 (expand-file-name |
| 1115 (file-name-nondirectory f) | 1111 (file-name-nondirectory f) |
| 1116 dir-B)) | 1112 dir-B))) |
| 1117 file-name-history)) | |
| 1118 (ediff-get-default-file-name f 1))) | 1113 (ediff-get-default-file-name f 1))) |
| 1119 ))) | 1114 ))) |
| 1120 (setq startup-hooks (cons 'ediff-merge-on-startup startup-hooks)) | 1115 (setq startup-hooks (cons 'ediff-merge-on-startup startup-hooks)) |
| 1121 (ediff-files-internal file-A | 1116 (ediff-files-internal file-A |
| 1122 (if (file-directory-p file-B) | 1117 (if (file-directory-p file-B) |
| 1151 (setq dir-B | 1146 (setq dir-B |
| 1152 (if ediff-use-last-dir | 1147 (if ediff-use-last-dir |
| 1153 ediff-last-dir-B | 1148 ediff-last-dir-B |
| 1154 (file-name-directory f))) | 1149 (file-name-directory f))) |
| 1155 (progn | 1150 (progn |
| 1156 (setq file-name-history | 1151 (add-to-history 'file-name-history |
| 1157 (cons | 1152 (ediff-abbreviate-file-name |
| 1158 (ediff-abbreviate-file-name | 1153 (expand-file-name |
| 1159 (expand-file-name | 1154 (file-name-nondirectory f) |
| 1160 (file-name-nondirectory f) | 1155 dir-B))) |
| 1161 dir-B)) | |
| 1162 file-name-history)) | |
| 1163 (ediff-get-default-file-name f 1)))) | 1156 (ediff-get-default-file-name f 1)))) |
| 1164 (ediff-read-file-name "Ancestor file" | 1157 (ediff-read-file-name "Ancestor file" |
| 1165 (setq dir-ancestor | 1158 (setq dir-ancestor |
| 1166 (if ediff-use-last-dir | 1159 (if ediff-use-last-dir |
| 1167 ediff-last-dir-ancestor | 1160 ediff-last-dir-ancestor |
| 1168 (file-name-directory ff))) | 1161 (file-name-directory ff))) |
| 1169 (progn | 1162 (progn |
| 1170 (setq file-name-history | 1163 (add-to-history 'file-name-history |
| 1171 (cons (ediff-abbreviate-file-name | 1164 (ediff-abbreviate-file-name |
| 1172 (expand-file-name | 1165 (expand-file-name |
| 1173 (file-name-nondirectory ff) | 1166 (file-name-nondirectory ff) |
| 1174 dir-ancestor)) | 1167 dir-ancestor))) |
| 1175 file-name-history)) | |
| 1176 (ediff-get-default-file-name ff 2))) | 1168 (ediff-get-default-file-name ff 2))) |
| 1177 ))) | 1169 ))) |
| 1178 (setq startup-hooks (cons 'ediff-merge-on-startup startup-hooks)) | 1170 (setq startup-hooks (cons 'ediff-merge-on-startup startup-hooks)) |
| 1179 (ediff-files-internal file-A | 1171 (ediff-files-internal file-A |
| 1180 (if (file-directory-p file-B) | 1172 (if (file-directory-p file-B) |