Another merge from trunk.

5 files changed, 19 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 6ccd80ae323..795313685eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,6 @@
-2013-12-06  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
+2013-12-11  Glenn Morris  <rgm@gnu.org>
 
-        * doc/misc/octave-mode.texi: Imported from GNU Octave
-          (doc/interpreter/emacs.txi).
-        * doc/misc/Makefile.in: Add octave-mode.texi.
+        * info/dir: Add octave-mode.
 
 2013-12-11  Paul Eggert  <eggert@cs.ucla.edu>
 
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 83e681990aa..3a8fe5b540d 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,12 @@
+2013-12-11  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
+
+        * Makefile.in: Add octave-mode.texi.
+
+2013-12-11  Kurt Hornik  <Kurt.Hornik@wu-wien.ac.at>
+            Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
+
+        * octave-mode.texi: Import from GNU Octave (doc/interpreter/emacs.txi).
+
 2013-12-08  Juanma Barranquero  <lekktu@gmail.com>
 
         * dbus.texi (Properties and Annotations): Fix typo.
diff --git a/info/dir b/info/dir
index f6ccbda30ff..414f45f29d3 100644
--- a/info/dir
+++ b/info/dir
@@ -36,6 +36,7 @@ Emacs editing modes
                                   Java, Pike, AWK, and CORBA IDL code.
 * IDLWAVE: (idlwave).           Major mode and shell for IDL files.
 * nXML Mode: (nxml-mode).       XML editing mode with RELAX NG support.
+* Octave mode: (octave-mode).   Emacs mode for editing GNU Octave files.
 * Org Mode: (org).              Outline-based notes management and organizer.
 
 Emacs network features
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 22ff12fe6b4..85776c07a74 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-11  Eli Zaretskii  <eliz@gnu.org>
+
+        * Makefile.in (custom-deps, finder-data): Run output file names
+        through unmsys--file-name.  (Bug#16099)
+
 2013-12-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * emacs-lisp/smie.el (smie-indent--hanging-p): Don't bother matching
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 3675cd90e46..0cc22839f99 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -158,7 +158,7 @@ custom-deps: doit
         $(setwins_almost); \
         echo Directories: $$wins; \
         $(emacs) -l cus-dep \
-          --eval '(setq generated-custom-dependencies-file "$(srcdir)/cus-load.el")' \
+          --eval '(setq generated-custom-dependencies-file (unmsys--file-name "$(srcdir)/cus-load.el"))' \
           -f custom-make-dependencies $$wins
 
 $(lisp)/finder-inf.el:
@@ -167,7 +167,7 @@ finder-data: doit
         $(setwins_almost); \
         echo Directories: $$wins; \
         $(emacs) -l finder \
-          --eval '(setq generated-finder-keywords-file "$(srcdir)/finder-inf.el")' \
+          --eval '(setq generated-finder-keywords-file (unmsys--file-name "$(srcdir)/finder-inf.el"))' \
           -f finder-compile-keywords-make-dist $$wins
 
 # The chmod +w is to handle env var CVSREAD=1.