Use TextMate’s display name for untitled documents

Also remove use of rescan_project (as this is a no-op in 2.0).
textmate · Feb 6, 2013 · acfb7ba · acfb7ba
1 parent 61ec837
commit acfb7ba
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/Commands/Active File With Arbitrary File….tmCommand b/Commands/Active File With Arbitrary File….tmCommand
@@ -21,7 +21,7 @@ APPLESCRIPT)
 
 if [[ "$file" == "" ]]; then exit_discard; fi
 
-if diff --strip-trailing-cr --label "$file" --label "${TM_FILENAME:-untitled}" -u "$file" -; then
+if diff --strip-trailing-cr --label "$file" --label "${TM_DISPLAYNAME}" -u "$file" -; then
   exit_show_tool_tip "There are no differences."
 fi
 </string>

diff --git a/Commands/Apply Patch from Clipboard.tmCommand b/Commands/Apply Patch from Clipboard.tmCommand
@@ -15,9 +15,6 @@ if [[ -z $TM_FILEPATH ]]
   then exit_discard
   else pbpaste | patch "$TM_FILEPATH" -p0
 fi
-
-# Reload patched file
-rescan_project
 </string>
 	<key>fallbackInput</key>
 	<string>none</string>

diff --git a/Commands/Diff Buffer With Clipboard.plist b/Commands/Diff Buffer With Clipboard.plist
@@ -9,7 +9,7 @@
 [[ -f "${TM_SUPPORT_PATH}/lib/bash_init.sh" ]] &amp;&amp; . "${TM_SUPPORT_PATH}/lib/bash_init.sh"
 
 # set defaultCStringEncoding to UTF-8
-if diff --strip-trailing-cr --label "${TM_FILENAME:-untitled}" --label "(clipboard)" -u - &lt;(__CF_USER_TEXT_ENCODING=$UID:0x8000100:0x8000100 pbpaste); then
+if diff --strip-trailing-cr --label "${TM_DISPLAYNAME}" --label "(clipboard)" -u - &lt;(__CF_USER_TEXT_ENCODING=$UID:0x8000100:0x8000100 pbpaste); then
   echo "There are no differences."
 else
   exit_create_new_document

diff --git a/Commands/Merge Selected Files.plist b/Commands/Merge Selected Files.plist
@@ -13,7 +13,7 @@ export __CF_USER_TEXT_ENCODING=$UID:0x8000100:0x8000100
 
 eval arr=("$TM_SELECTED_FILES")
 if [[ ${#arr[@]} == 2 ]];
-   then ${TM_OPENDIFF:-opendiff} "${arr[0]}" "${arr[1]}"; rescan_project
+   then ${TM_OPENDIFF:-opendiff} "${arr[0]}" "${arr[1]}"
    else echo -e "You need to select exactly two\nfiles in the project drawer."
 fi
 </string>