Mercurial > emacs
view mkinstalldirs @ 65067:52de8046c483
(smerge-basic-map): Bind smerge-combine-with-next.
(smerge-auto-leave): Make undo re-enable the mode.
(debug-ignored-errors): Add the user-error of impossible resolution.
(smerge-resolve): Move things around a bit, in preparation for later.
(smerge-diff): Don't fail if the buffer has no associated file.
(ediff-ancestor-buffer, ediff-quit-hook): Quieten byte-compiler.
(smerge-conflict-overlay): New function.
(smerge-match-conflict): Don't add text properties here.
(smerge-find-conflict): Instead, add an overlay here.
Also check for the case where we're inside a conflict already, so as to
obviate the need for font-lock-multiline, which is unbearably slow with
large conflicts and ciomplex font-lock patterns.
(smerge-remove-props): Remove overlay rather than text-properties.
(smerge-mode): Don't set font-lock-multiline.
Remove overlays when turned off.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Mon, 22 Aug 2005 14:38:51 +0000 |
parents | 746c40973d25 |
children | 730155197b96 eb7e8d483840 |
line wrap: on
line source
#! /bin/sh # mkinstalldirs --- make directory hierarchy # Author: Noah Friedman <friedman@prep.ai.mit.edu> # Created: 1993-05-16 # Public domain errstatus=0 for file do set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` shift pathcomp= for d do pathcomp="$pathcomp$d" case "$pathcomp" in -* ) pathcomp=./$pathcomp ;; esac if test ! -d "$pathcomp"; then echo "mkdir $pathcomp" 1>&2 (mkdir "$pathcomp" && chmod a+rx "$pathcomp") || lasterr=$? if test ! -d "$pathcomp"; then errstatus=$lasterr fi fi pathcomp="$pathcomp/" done done exit $errstatus # mkinstalldirs ends here