------------------------------------------------------------
revno: 117210
committer: Jan D. <jan.h.d@swipnet.se>
branch nick: trunk
timestamp: Sun 2014-06-01 10:23:18 +0200
message:
  * nsfns.m (ns_appkit_version_str): Add os version for Cocoa.
diff:
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2014-05-30 09:02:55 +0000
+++ src/ChangeLog	2014-06-01 08:23:18 +0000
@@ -1,3 +1,7 @@
+2014-06-01  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* nsfns.m (ns_appkit_version_str): Add os version for Cocoa.
+
 2014-05-30  Eli Zaretskii  <eliz@gnu.org>
 
 	* w32heap.c (malloc_before_dump, malloc_after_dump)

=== modified file 'src/nsfns.m'
--- src/nsfns.m	2014-05-26 11:26:24 +0000
+++ src/nsfns.m	2014-06-01 08:23:18 +0000
@@ -873,12 +873,16 @@
 static Lisp_Object
 ns_appkit_version_str (void)
 {
-  char tmp[80];
+  char tmp[256];
 
 #ifdef NS_IMPL_GNUSTEP
   sprintf(tmp, "gnustep-gui-%s", Xstr(GNUSTEP_GUI_VERSION));
 #elif defined (NS_IMPL_COCOA)
-  sprintf(tmp, "apple-appkit-%.2f", NSAppKitVersionNumber);
+  NSString *osversion
+    = [[NSProcessInfo processInfo] operatingSystemVersionString];
+  sprintf(tmp, "appkit-%.2f %s",
+          NSAppKitVersionNumber,
+          [osversion UTF8String]);
 #else
   tmp = "ns-unknown";
 #endif
------------------------------------------------------------
revno: 117209
fixes bug: http://debbugs.gnu.org/17629
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Sat 2014-05-31 19:36:40 -0700
message:
  * loadup.el (load-prefer-newer): Set non-nil when dumping. 
  --eval doesn't work (or not early enough) during dumping.
  Making load-prefer-newer non-nil by default would be simpler...
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2014-05-31 02:27:22 +0000
+++ lisp/ChangeLog	2014-06-01 02:36:40 +0000
@@ -1,3 +1,7 @@
+2014-06-01  Glenn Morris  <rgm@gnu.org>
+
+	* loadup.el (load-prefer-newer): Set non-nil when dumping.  (Bug#17629)
+
 2014-05-31  Glenn Morris  <rgm@gnu.org>
 
 	* files.el (locate-dominating-file): Expand file argument.  (Bug#17641)

=== modified file 'lisp/loadup.el'
--- lisp/loadup.el	2014-05-30 23:50:09 +0000
+++ lisp/loadup.el	2014-06-01 02:36:40 +0000
@@ -72,9 +72,12 @@
 ;; This is a poor man's `last', since we haven't loaded subr.el yet.
 (if (or (equal (member "bootstrap" command-line-args) '("bootstrap"))
 	(equal (member "dump" command-line-args) '("dump")))
-    ;; To reduce the size of dumped Emacs, we avoid making huge
-    ;; char-tables.
-    (setq inhibit-load-charset-map t))
+    (progn
+      ;; To reduce the size of dumped Emacs, we avoid making huge char-tables.
+      (setq inhibit-load-charset-map t)
+      ;; --eval gets handled too late.
+      (defvar load--prefer-newer load-prefer-newer)
+      (setq load-prefer-newer t)))
 
 ;; We don't want to have any undo records in the dumped Emacs.
 (set-buffer "*scratch*")
@@ -358,6 +361,12 @@
 
 (remove-hook 'after-load-functions (lambda (f) (garbage-collect)))
 
+(if (boundp 'load--prefer-newer)
+    (progn
+      (setq load-prefer-newer load--prefer-newer)
+      (put 'load-prefer-newer 'standard-value load--prefer-newer)
+      (makunbound 'load--prefer-newer)))
+
 (setq inhibit-load-charset-map nil)
 (clear-charset-maps)
 (garbage-collect)
------------------------------------------------------------
revno: 117208
fixes bug: http://debbugs.gnu.org/17641
committer: Glenn Morris <rgm@gnu.org>
branch nick: trunk
timestamp: Fri 2014-05-30 19:27:22 -0700
message:
  * lisp/files.el (locate-dominating-file): Expand file argument.
diff:
=== modified file 'lisp/ChangeLog'
--- lisp/ChangeLog	2014-05-30 23:50:09 +0000
+++ lisp/ChangeLog	2014-05-31 02:27:22 +0000
@@ -1,3 +1,7 @@
+2014-05-31  Glenn Morris  <rgm@gnu.org>
+
+	* files.el (locate-dominating-file): Expand file argument.  (Bug#17641)
+
 2014-05-30  Glenn Morris  <rgm@gnu.org>
 
 	* loadup.el: Treat `command-line-args' more flexibly.

=== modified file 'lisp/files.el'
--- lisp/files.el	2014-05-21 01:54:33 +0000
+++ lisp/files.el	2014-05-31 02:27:22 +0000
@@ -883,7 +883,7 @@
   ;;
   ;; Represent /home/luser/foo as ~/foo so that we don't try to look for
   ;; `name' in /home or in /.
-  (setq file (abbreviate-file-name file))
+  (setq file (abbreviate-file-name (expand-file-name file)))
   (let ((root nil)
         ;; `user' is not initialized outside the loop because
         ;; `file' may not exist, so we may have to walk up part of the