Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
dac24db4
Commit
dac24db4
authored
Mar 12, 2005
by
Stefan Monnier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(Fmake_symbolic_link): Fix last change.
parent
e0402468
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
16 deletions
+16
-16
src/ChangeLog
src/ChangeLog
+14
-14
src/fileio.c
src/fileio.c
+2
-2
No files found.
src/ChangeLog
View file @
dac24db4
2005-03-11 Stefan Monnier <monnier@iro.umontreal.ca>
* fileio.c (Fmake_symbolic_link): Fix last change.
2005-03-11 Richard M. Stallman <rms@gnu.org>
* fileio.c (Frename_file, Fadd_name_to_file)
...
...
@@ -32,8 +36,7 @@
available font is found.
* fontset.c (set_default_ascii_font): New function.
(syms_of_fontset): Don't set FONTSET_ASCII (Vdefault_fontset)
here.
(syms_of_fontset): Don't set FONTSET_ASCII (Vdefault_fontset) here.
* fontset.h (set_default_ascii_font): Extern it.
...
...
@@ -94,13 +97,11 @@
* emacs.c (main): Change `#ifdef HAVE_CARBON' to `#if
defined (MAC_OSX) && defined (HAVE_CARBON)'.
* image.c [!MAC_OSX && TARGET_API_MAC_CARBON]: Include
QuickTime.h.
* image.c [!MAC_OSX && TARGET_API_MAC_CARBON]: Include QuickTime.h.
* mac.c [!MAC_OSX && HAVE_CARBON]: Include Carbon.h.
[!MAC_OSX] (select) [TARGET_API_MAC_CARBON]: Use ReceiveNextEvent.
(posix_pathname_to_fsspec, fsspec_to_posix_pathname): New
functions.
(posix_pathname_to_fsspec, fsspec_to_posix_pathname): New functions.
(mac_clear_font_name_table): Move extern to macterm.h.
* macfns.c (install_window_handler): Move extern to macterm.h.
...
...
@@ -108,16 +109,15 @@
valid. Don't check !NILP (dir) because it is already checked with
CHECK_STRING.
(Fx_file_dialog) [!MAC_OSX]: Use FSSpec instead of FSRef for
specifying the default location and obtaining the selected
filename.
specifying the default location and obtaining the selected filename.
* macgui.h [!MAC_OSX && HAVE_CARBON]: Include Carbon.h.
* macmenu.c [TARGET_API_MAC_CARBON]: Don't include headers that
are included via Carbon.h.
* macterm.c [TARGET_API_MAC_CARBON && !MAC_OSX]:
Define
USE_CARBON_EVENTS to 1.
* macterm.c [TARGET_API_MAC_CARBON && !MAC_OSX]:
Define
USE_CARBON_EVENTS to 1.
(qd) [__MRC__ && TARGET_API_MAC_CARBON]: Don't declare.
(x_free_frame_resources): Call remove_window_handler for
non-tooltip windows.
...
...
@@ -130,12 +130,12 @@
(install_window_handler) [TARGET_API_MAC_CARBON]: Create UPPs for
drag-and-drop handler functions and register them.
(remove_window_handler): New function.
(do_ae_open_documents, mac_do_receive_drag) [!MAC_OSX]:
Use
fsspec_to_posix_pathname.
(do_ae_open_documents, mac_do_receive_drag) [!MAC_OSX]:
Use
fsspec_to_posix_pathname.
(main): Change #if !TARGET_API_MAC_CARBON to #ifdef MAC_OS8.
(XTread_socket) [!MAC_OSX]: Don't pass keyboard events to TSM.
[MAC_OS8] (make_mac_terminal_frame) [TARGET_API_MAC_CARBON]:
Set
default cursors.
[MAC_OS8] (make_mac_terminal_frame) [TARGET_API_MAC_CARBON]:
Set
default cursors.
(mac_initialize) [USE_CARBON_EVENTS && !MAC_OSX] : Don't call
init_service_handler or init_quit_char_handler.
(mac_initialize) [!MAC_OSX]: Don't call MakeMeTheFrontProcess.
...
...
src/fileio.c
View file @
dac24db4
/* File IO for GNU Emacs.
Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996, 1997, 1998,
1999, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
1999, 2000, 2001, 2003, 2004
, 2005
Free Software Foundation, Inc.
This file is part of GNU Emacs.
...
...
@@ -2851,7 +2851,7 @@ This happens for interactive use with M-x. */)
filename
=
Fexpand_file_name
(
filename
,
Qnil
);
if
(
!
NILP
(
Ffile_directory_p
(
linkname
)))
linkname = Fexpand_file_name (Ffile_name_nondirectory (file), linkname);
linkname
=
Fexpand_file_name
(
Ffile_name_nondirectory
(
file
name
),
linkname
);
else
linkname
=
Fexpand_file_name
(
linkname
,
Qnil
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment