Changeset 4079 for trunk/lisp/ediff.el
- Timestamp:
- 05/13/06 11:31:18 (3 years ago)
- Files:
-
- trunk/lisp/ediff.el (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lisp/ediff.el
r4058 r4079 211 211 (file-name-directory f))) 212 212 (progn 213 (setq file-name-history 214 (cons (ediff-abbreviate-file-name 215 (expand-file-name 216 (file-name-nondirectory f) 217 dir-B)) 218 file-name-history)) 213 (add-to-history 'file-name-history 214 (ediff-abbreviate-file-name 215 (expand-file-name 216 (file-name-nondirectory f) 217 dir-B))) 219 218 (ediff-get-default-file-name f 1))) 220 219 ))) … … 247 246 (file-name-directory f))) 248 247 (progn 249 (setq file-name-history 250 (cons 251 (ediff-abbreviate-file-name 252 (expand-file-name 253 (file-name-nondirectory f) 254 dir-B)) 255 file-name-history)) 248 (add-to-history 'file-name-history 249 (ediff-abbreviate-file-name 250 (expand-file-name 251 (file-name-nondirectory f) 252 dir-B))) 256 253 (ediff-get-default-file-name f 1)))) 257 254 (ediff-read-file-name "File C to compare" … … 260 257 (file-name-directory ff))) 261 258 (progn 262 (setq file-name-history 263 (cons (ediff-abbreviate-file-name 264 (expand-file-name 265 (file-name-nondirectory ff) 266 dir-C)) 267 file-name-history)) 259 (add-to-history 'file-name-history 260 (ediff-abbreviate-file-name 261 (expand-file-name 262 (file-name-nondirectory ff) 263 dir-C))) 268 264 (ediff-get-default-file-name ff 2))) 269 265 ))) … … 1110 1106 (file-name-directory f))) 1111 1107 (progn 1112 (setq file-name-history 1113 (cons (ediff-abbreviate-file-name 1114 (expand-file-name 1115 (file-name-nondirectory f) 1116 dir-B)) 1117 file-name-history)) 1108 (add-to-history 'file-name-history 1109 (ediff-abbreviate-file-name 1110 (expand-file-name 1111 (file-name-nondirectory f) 1112 dir-B))) 1118 1113 (ediff-get-default-file-name f 1))) 1119 1114 ))) … … 1154 1149 (file-name-directory f))) 1155 1150 (progn 1156 (setq file-name-history 1157 (cons 1158 (ediff-abbreviate-file-name 1159 (expand-file-name 1160 (file-name-nondirectory f) 1161 dir-B)) 1162 file-name-history)) 1151 (add-to-history 'file-name-history 1152 (ediff-abbreviate-file-name 1153 (expand-file-name 1154 (file-name-nondirectory f) 1155 dir-B))) 1163 1156 (ediff-get-default-file-name f 1)))) 1164 1157 (ediff-read-file-name "Ancestor file" … … 1168 1161 (file-name-directory ff))) 1169 1162 (progn 1170 (setq file-name-history 1171 (cons (ediff-abbreviate-file-name 1172 (expand-file-name 1173 (file-name-nondirectory ff) 1174 dir-ancestor)) 1175 file-name-history)) 1163 (add-to-history 'file-name-history 1164 (ediff-abbreviate-file-name 1165 (expand-file-name 1166 (file-name-nondirectory ff) 1167 dir-ancestor))) 1176 1168 (ediff-get-default-file-name ff 2))) 1177 1169 )))
