diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2006-12-22 08:27:36 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2006-12-22 08:27:36 +0000 |
| commit | 2f0fd19a322dabde0d252255dff492fcef25cdce (patch) | |
| tree | 3acdedaf6a57d8b4418dd3323d077d3f4adfae85 | |
| parent | 9b9e104e5f73c6aaa37998af324f207170624216 (diff) | |
| download | emacs-2f0fd19a322dabde0d252255dff492fcef25cdce.tar.gz | |
(mac_update_title_bar) [TARGET_API_MAC_CARBON]: Call
mac_update_proxy_icon also when buffer modification flag changed.
[TARGET_API_MAC_CARBON] (mac_update_proxy_icon): Don't update alias,
but compare FSRef/FSSpec of resolved alias.
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/macfns.c | 27 |
2 files changed, 25 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 740f9b229cf..3428722beca 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2006-12-22 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * macfns.c (mac_update_title_bar) [TARGET_API_MAC_CARBON]: Call + mac_update_proxy_icon also when buffer modification flag changed. + [TARGET_API_MAC_CARBON] (mac_update_proxy_icon): Don't update alias, + but compare FSRef/FSSpec of resolved alias. + 2006-12-21 Kim F. Storm <storm@cua.dk> * w32.c (_sys_wait_accept): Fix handle leak. diff --git a/src/macfns.c b/src/macfns.c index 521156a0de6..21cff69dd40 100644 --- a/src/macfns.c +++ b/src/macfns.c @@ -1969,9 +1969,9 @@ mac_update_proxy_icon (f) { AEDesc desc; #ifdef MAC_OSX - FSRef fref; + FSRef fref, fref_proxy; #else - FSSpec fss; + FSSpec fss, fss_proxy; #endif Boolean changed; Lisp_Object encoded_file_name = ENCODE_FILE (file_name); @@ -1997,10 +1997,19 @@ mac_update_proxy_icon (f) { if (alias) { + /* (FS)ResolveAlias never sets `changed' to true if + `alias' is minimal. */ #ifdef MAC_OSX - err = FSUpdateAlias (NULL, &fref, alias, &changed); + err = FSResolveAlias (NULL, alias, &fref_proxy, &changed); + if (err == noErr) + err = FSCompareFSRefs (&fref, &fref_proxy); #else - err = UpdateAlias (NULL, &fss, alias, &changed); + err = ResolveAlias (NULL, alias, &fss_proxy, &changed); + if (err == noErr) + err = !(fss.vRefNum == fss_proxy.vRefNum + && fss.parID == fss_proxy.parID + && EqualString (fss.name, fss_proxy.name, + false, true)); #endif } if (err != noErr || alias == NULL) @@ -2051,11 +2060,11 @@ mac_update_title_bar (f, save_match_data) confusing. */ || (!MINI_WINDOW_P (w) && (modified_p != !NILP (w->last_had_star)))) - SetWindowModified (FRAME_MAC_WINDOW (f), - !MINI_WINDOW_P (w) && modified_p); - - if (windows_or_buffers_changed) - mac_update_proxy_icon (f); + { + SetWindowModified (FRAME_MAC_WINDOW (f), + !MINI_WINDOW_P (w) && modified_p); + mac_update_proxy_icon (f); + } #endif } |