Ted Zlatanov ba4502fe14 Merge branch 'emacs-24' ...

Conflicts:
	nt/addsection.c
	nt/inc/ms-w32.h
	src/w32.c

2014-11-26 21:31:11 -05:00

..

css-mode.css

* lisp/textmodes/css-mode.el (scss-mode): New major-mode.

2014-10-20 12:36:34 -04:00

js.js

Fix indentation before !=' and after +='

2014-11-16 14:19:16 +02:00

latex-mode.tex

…

Makefile

…

modula2.mod

…

nxml.xml

* lisp/nxml/nxml-mode.el (nxml-fontify-matcher): Make sure propertization

2014-04-16 11:28:26 -04:00

octave.m

Remove stray semicolons.

2014-09-04 09:14:05 -07:00

pascal.pas

* lisp/progmodes/pascal.el (pascal-font-lock-keywords): Fix incorrect format

2014-04-10 09:56:28 -04:00

perl.perl

* lisp/progmodes/perl-mode.el (perl-syntax-propertize-function):

2014-09-21 18:00:28 -04:00

prolog.prolog

* src/eval.c (run_hook_with_args): Use FUNCTIONP.

2013-10-29 10:46:23 -04:00

ps-mode.ps

* test/indent/ps-mode.ps: New file.

2014-05-27 10:28:07 -04:00

ruby.rb

* test/indent/ps-mode.ps: New file.

2014-05-27 10:28:07 -04:00

scheme.scm

Merge from emacs-24; up to 2014-07-04T02:28:54Z!dmantipov@yandex.ru

2014-09-02 21:21:40 -07:00

scss-mode.scss

* lisp/textmodes/css-mode.el (scss-mode): New major-mode.

2014-10-20 12:36:34 -04:00

shell.rc

…

shell.sh

* lisp/progmodes/sh-script.el (sh-smie-sh-rules): Don't align with a && in

2014-07-08 14:38:07 -04:00