From ec96293f2d44298b54a84f308a3d5d735701f122 Mon Sep 17 00:00:00 2001 From: Vinicius Jose Latorre Date: Wed, 1 Aug 2007 21:43:46 +0000 Subject: Adjust load-path --- src/ChangeLog | 5 +++++ src/mac.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 835379d9cde..4a175882a98 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2007-08-01 Seiji Zenitani + + * mac.c (init_mac_osx_environment): Adjust load-path on self-contained + build. + 2007-07-30 Stefan Monnier * eval.c (init_eval_once): Bump max_lisp_eval_depth to 400. diff --git a/src/mac.c b/src/mac.c index 0321e8f2ae1..7f22c19936b 100644 --- a/src/mac.c +++ b/src/mac.c @@ -5331,12 +5331,12 @@ init_mac_osx_environment () q[0] = '\0'; strcpy (p, app_bundle_pathname); - strcat (p, "/Contents/Resources/lisp"); + strcat (p, "/Contents/Resources/site-lisp"); if (stat (p, &st) == 0 && (st.st_mode & S_IFMT) == S_IFDIR) strcat (q, p); strcpy (p, app_bundle_pathname); - strcat (p, "/Contents/Resources/leim"); + strcat (p, "/Contents/Resources/lisp"); if (stat (p, &st) == 0 && (st.st_mode & S_IFMT) == S_IFDIR) { if (q[0] != '\0') @@ -5345,7 +5345,7 @@ init_mac_osx_environment () } strcpy (p, app_bundle_pathname); - strcat (p, "/Contents/Resources/site-lisp"); + strcat (p, "/Contents/Resources/leim"); if (stat (p, &st) == 0 && (st.st_mode & S_IFMT) == S_IFDIR) { if (q[0] != '\0') -- cgit v1.2.1 From 40921745e5d237cd0bf1c6957caab6e274535b99 Mon Sep 17 00:00:00 2001 From: Vinicius Jose Latorre Date: Wed, 1 Aug 2007 22:20:41 +0000 Subject: Adjust load-path comment --- src/mac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/mac.c b/src/mac.c index 7f22c19936b..a641b07dc08 100644 --- a/src/mac.c +++ b/src/mac.c @@ -5322,8 +5322,8 @@ init_mac_osx_environment () /* P should have sufficient room for the pathname of the bundle plus the subpath in it leading to the respective directories. Q should have three times that much room because EMACSLOADPATH can - have the value "::". */ + have the value "::". */ p = (char *) alloca (app_bundle_pathname_len + 50); q = (char *) alloca (3 * app_bundle_pathname_len + 150); if (!getenv ("EMACSLOADPATH")) -- cgit v1.2.1 From d73a9dd7027b166baf389f9ba157b3f989908f9a Mon Sep 17 00:00:00 2001 From: Vinicius Jose Latorre Date: Thu, 2 Aug 2007 00:05:13 +0000 Subject: Adjust load-path comment --- src/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 4a175882a98..96da8d4ee78 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,4 +1,4 @@ -2007-08-01 Seiji Zenitani +2007-08-01 Ryo Yoshitake (tiny change) * mac.c (init_mac_osx_environment): Adjust load-path on self-contained build. -- cgit v1.2.1 From 1ad08acd2bf7e17cd3222f8636bb6dd662b60df7 Mon Sep 17 00:00:00 2001 From: Richard M. Stallman Date: Fri, 3 Aug 2007 03:38:24 +0000 Subject: Comment change. --- src/xselect.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/xselect.c b/src/xselect.c index 0204abb2d96..fc3659faedd 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -1854,9 +1854,9 @@ selection_data_to_lisp_data (display, data, size, type, format) } } - /* Convert a single 16 or small 32 bit number to a Lisp_Int. - If the number is > 16 bits, convert it to a cons of integers, - 16 bits in each half. + /* Convert a single 16-bit number or a small 32-bit number to a Lisp_Int. + If the number is 32 bits and won't fit in a Lisp_Int, + convert it to a cons of integers, 16 bits in each half. */ else if (format == 32 && size == sizeof (int)) return long_to_cons (((unsigned int *) data) [0]); -- cgit v1.2.1 From 73ff9d42c45fed4c2202feeb1a2acbfe00fd3ad9 Mon Sep 17 00:00:00 2001 From: Richard M. Stallman Date: Fri, 3 Aug 2007 03:39:09 +0000 Subject: (Fvisited_file_modtime): Use make_time. --- src/ChangeLog | 4 ++++ src/fileio.c | 8 +++----- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 96da8d4ee78..a1128d19c58 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2007-08-03 Richard Stallman + + * fileio.c (Fvisited_file_modtime): Use make_time. + 2007-08-01 Ryo Yoshitake (tiny change) * mac.c (init_mac_osx_environment): Adjust load-path on self-contained diff --git a/src/fileio.c b/src/fileio.c index 3859f9e35aa..1962035e0bd 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -5692,11 +5692,9 @@ file modification time, this function returns 0. See Info node `(elisp)Modification Time' for more details. */) () { - Lisp_Object tcons; - tcons = long_to_cons ((unsigned long) current_buffer->modtime); - if (CONSP (tcons)) - return list2 (XCAR (tcons), XCDR (tcons)); - return tcons; + if (! current_buffer->modtime) + return make_number (0); + return make_time ((time_t) current_buffer->modtime); } DEFUN ("set-visited-file-modtime", Fset_visited_file_modtime, -- cgit v1.2.1