procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Another merge from trunk.

Browse source
This commit is contained in:
Eli Zaretskii 2013-12-11 19:06:50 +02:00
commit 0ec6c340e9
5 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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>

9
doc/misc/ChangeLog
View file

@ -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.

1
info/dir
View file

@ -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

5
lisp/ChangeLog
View file

@ -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

4
lisp/Makefile.in
View file

@ -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.