aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdrian Robert2008-08-05 16:17:07 +0000
committerAdrian Robert2008-08-05 16:17:07 +0000
commit3d0a4431c9db5bcaf115e48c3b1968a834533304 (patch)
tree9b3b0303e87a466ae513eaf4ccd4f582eae38da8 /src
parentd765e3a3d56e042a8ac91fccc7d82ca26eb03b65 (diff)
downloademacs-3d0a4431c9db5bcaf115e48c3b1968a834533304.tar.gz
emacs-3d0a4431c9db5bcaf115e48c3b1968a834533304.zip
set working dir to /Users/arobert under NS when psn argument given
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/emacs.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index cf158e2cdfb..ce5e7a3a04a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12008-08-04 Adrian Robert <Adrian.B.Robert@gmail.com>
2
3 * emacs.c (main): Under NS, set working dir to $HOME when get a "psn"
4 argument.
5
12008-08-05 Juanma Barranquero <lekktu@gmail.com> 62008-08-05 Juanma Barranquero <lekktu@gmail.com>
2 7
3 * buffer.c (syms_of_buffer) <scroll-up-aggressively>: 8 * buffer.c (syms_of_buffer) <scroll-up-aggressively>:
diff --git a/src/emacs.c b/src/emacs.c
index 1174f18f449..0f9d3fd5554 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1335,11 +1335,13 @@ main (int argc, char **argv)
1335 if (!strncmp(argv[skip_args], "-psn", 4)) 1335 if (!strncmp(argv[skip_args], "-psn", 4))
1336 { 1336 {
1337 skip_args += 1; 1337 skip_args += 1;
1338 chdir (getenv ("HOME"));
1338 } 1339 }
1339 else 1340 else
1340 { 1341 {
1341 if (skip_args+1 < argc && !strncmp(argv[skip_args+1], "-psn", 4)) 1342 if (skip_args+1 < argc && !strncmp(argv[skip_args+1], "-psn", 4))
1342 skip_args += 2; 1343 skip_args += 2;
1344 chdir (getenv ("HOME"));
1343 } 1345 }
1344 } 1346 }
1345#endif 1347#endif