mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 18:40:39 -08:00
Code Issues Projects Releases Wiki Activity
113486 commits 241 branches 194 tags 7.7 GiB
Commit graph

113486 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stefan Monnier
71e3276bc5 * lisp/emacs-lisp/smie.el: New smie-config system. 
(smie-config): New defcustom.
(smie-edebug, smie-config-show-indent, smie-config-set-indent)
(smie-config-guess, smie-config-save): New commands.
(smie-config--mode-local, smie-config--buffer-local)
(smie-config--trace, smie-config--modefuns): New vars.
(smie-config--advice, smie-config--mode-hook)
(smie-config--setter, smie-config-local, smie-config--get-trace)
(smie-config--guess-value, smie-config--guess): New functions.
(smie-indent-forward-token, smie-indent-backward-token): Don't copy
text properties.  Treat "string fence" syntax like string syntax.

* lisp/progmodes/sh-script.el (sh-use-smie): Change default.
(sh-smie-sh-rules, sh-smie-rc-rules): Obey legacy sh-indent-* vars.
(sh-var-value): Simplify by CSE.
(sh-show-indent, sh-set-indent, sh-learn-line-indent)
(sh-learn-buffer-indent): Redirect to their SMIE equivalent when SMIE
is used.
(sh-guess-basic-offset): Use cl-incf.
(sh-guess-basic-offset): Use push+nreverse to avoid O(n^2).
 2013-10-24 17:16:20 -04:00
Helmut Eller
60db713e4d * lisp/emacs-lisp/lisp-mode.el (lisp-cl-font-lock-keywords-2): Fix cut&paste. 
Fixes: debbugs:15699
 2013-10-24 13:49:12 -04:00
Glenn Morris
8b251df61e * lisp/Makefile.in (abs_top_srcdir): Remove. 
(update-subdirs): Use relative path to update-subdirs.
 2013-10-24 13:18:46 -04:00
Eli Zaretskii
6be0e22b4f Fix last changes to support whitespace in directory names. 
lisp/Makefile.in ($(MH_E_DIR)/mh-loaddefs.el)
 ($(TRAMP_DIR)/tramp-loaddefs.el, $(CAL_DIR)/cal-loaddefs.el)
 ($(CAL_DIR)/diary-loaddefs.el, $(CAL_DIR)/hol-loaddefs.el): Call
 unmsys--file-name before expand-file-name, not after it.
 2013-10-24 19:28:05 +03:00
Xue Fuqiao
4fa11a3664 Improve indexing. 2013-10-24 22:00:59 +08:00
Xue Fuqiao
8b78f36c3a * doc/lispref/display.texi (Low-Level Font): Add an index for font registry. 2013-10-24 21:53:20 +08:00
Xue Fuqiao
235bd03a9f * doc/lispref/display.texi (Font Selection): Add indexes for font selection. 2013-10-24 21:16:51 +08:00
Xue Fuqiao
578ef6b9a2 * doc/lispref/display.texi (Face Remapping): Add indexes for face remapping. 2013-10-24 20:17:57 +08:00
Glenn Morris
545a9008df Auto-commit of generated files. 2013-10-24 06:17:42 -04:00
Michael Albinus
990b9f68ce Mention the `skip-unless' macro of ert.el. 2013-10-24 09:42:18 +02:00
Michael Albinus
955ada112b * ert.texi (Running Tests Interactively): Adapt examle output. 
(Tests and Their Environment): Mention skip-unless.
 2013-10-24 09:40:05 +02:00
Michael Albinus
4ddbf12836 * automated/ert-tests.el (ert-test-skip-unless): New test case. 
(ert-test-deftest): Adapt test for changed macro expansion.
(ert-test-run-tests-interactively):
* automated/ert-x-tests.el (ert-test-run-tests-interactively-2):
Add a skipping test.

* automated/file-notify-tests.el (top): Do not require tramp-sh.el.
(file-notify--test-local-enabled): Make it a function.  Check also
for `file-remote-p' of `temporary-file-directory'.
(file-notify--test-remote-enabled-checked): New defvar.
(file-notify--test-remote-enabled): Rewrite.  Do not use Tramp
internal functions.  Cache result.
(file-notify--deftest-remote, file-notify-test00-availability)
(file-notify-test01-add-watch, file-notify-test02-events)
(file-notify-test03-autorevert): Add checks with `skip_unless'.
(file-notify-test-all): Do not check `file-notify--test-local-enabled'.
 2013-10-24 09:38:45 +02:00
Michael Albinus
50b5b85741 * emacs-lisp/ert.el (ert-deftest): Bind macro `skip-unless'. 
(ert-test-skipped): New error.
(ert-skip, ert-stats-skipped): New defuns.
(ert--skip-unless): New macro.
(ert-test-skipped): New struct.
(ert--run-test-debugger, ert-test-result-type-p)
(ert-test-result-expected-p, ert--stats, ert-stats-completed)
(ert--stats-set-test-and-result, ert-char-for-test-result)
(ert-string-for-test-result, ert-run-tests-batch)
(ert--results-update-ewoc-hf, ert-run-tests-interactively): Handle
skipped tests.
 2013-10-24 09:34:41 +02:00
Glenn Morris
9698f11c57 ChangeLog fixes 2013-10-24 00:04:01 -07:00
Glenn Morris
11e5e2eba1 Fix whitespace in previous Makefile.in changes 2013-10-23 21:05:54 -07:00
Glenn Morris
bc00793e2a * leim/Makefile.in (.el.elc, changed.tit, changed.misc, leim-list.el) 
($(srcdir)/ja-dic/ja-dic.el, check-declare):
Remove unnecessary path in -l argument (RUN_EMACS sets EMACSLOADPATH).
We just need to be careful because "quail" is also a directory...
 2013-10-23 19:29:29 -07:00
Glenn Morris
e43817c1e0 * lisp/Makefile.in (check-declare): Remove unnecessary path in -l argument 2013-10-23 19:21:23 -07:00
Glenn Morris
eb9a36619e Attempt at a fix for mingw CPPFLAGS 
* configure.ac (CPPFLAGS) [mingw32]: Use abs_top_srcdir.

* Makefile.in (abs_top_srcdir):
* lib-src/Makefile.in (abs_top_srcdir):
* lwlib/Makefile.in (abs_top_srcdir):
* nt/Makefile.in (abs_top_srcdir):
* oldXMenu/Makefile.in (abs_top_srcdir):
* src/Makefile.in (abs_top_srcdir):
New, set by configure.
 2013-10-23 19:15:16 -07:00
Glenn Morris
6f317c2faa * lisp/Makefile.in (abs_top_srcdir): New, set by configure. 
(update-subdirs): Correct build-aux location.
 2013-10-23 18:52:44 -07:00
Dmitry Gutov
8297b2cfdd * lisp/vc/vc.el (vc-print-root-log): Always set `default-directory' 
value, whether we could auto-deduce `backend', or not.
 2013-10-24 05:27:29 +04:00
Dmitry Gutov
369bbf7198 * lisp/progmodes/ruby-mode.el (ruby-smie-rules): Fix the "curly block 
with parameters" example.  Simplify the "is it block or is it
hash" check, but also make it more thorough.

* test/indent/ruby.rb: Fix syntax error in the latest example.
 2013-10-24 04:47:28 +04:00
Glenn Morris
9843415589 * configure.ac (src/.gdbinit): Use ac_abs_top_srcdir. 2013-10-23 19:27:19 -04:00
Glenn Morris
4b56b9d703 * Makefile.in (epaths-force-w32): Use abs_srcdir 2013-10-23 18:33:08 -04:00
Glenn Morris
fb6f3c4a16 configure.ac: Tweak previous change 2013-10-23 18:02:42 -04:00
Glenn Morris
7b65c8d0b9 * configure.ac: Explicit error for non-ASCII directories 
Fixes: debbugs:15260
 2013-10-23 16:46:46 -04:00
Masashi Fujimoto
d5f1282f05 * lisp/battery.el (battery-pmset): Handle OS X Mavericks (tiny change) 
Fixes: debbugs:15694
 2013-10-23 15:44:28 -04:00
Stefan Monnier
03d44565bb * lisp/progmodes/ruby-mode.el (ruby-smie-rules): Only align with parent of 
{ if it is hanging.
 2013-10-23 13:55:53 -04:00
Glenn Morris
76f1a3c314 Remove remaining @refills from doc/*/*.texi files 2013-10-23 13:20:09 -04:00
Stefan Monnier
bc4aaa31e2 * lisp/progmodes/ruby-mode.el (ruby-smie-rules): Don't return 0 for 
:before ";".
 2013-10-23 13:18:11 -04:00
Jed Brown
f493ff19e9 compile: Support GNU Make-4.0 directory quoting (tiny change) 
* lisp/progmodes/compile.el (compilation-directory-matcher)
(compilation-page-delimiter): Support GNU Make-4.0 directory quoting.

Fixes: debbugs:15678
 2013-10-23 09:25:56 -07:00
Dmitry Antipov
66b238dff6 Fix ChangeLog entry. 2013-10-23 20:11:30 +04:00
Dmitry Antipov
df24a230c7 Tweak last font-related changes to fix bug#15686. 
* alloc.c (mark_object) [HAVE_WINDOW_SYSTEM]: If marked frame
is a live window system frame, mark it's default font too.
 2013-10-23 20:07:30 +04:00
Xue Fuqiao
93be1936a3 Comment 2013-10-23 21:29:39 +08:00
Leo Liu
c744a3b9f7 * ido.el (ido-tidy): Handle read-only text. 2013-10-23 20:15:31 +08:00
Glenn Morris
48823f4eb4 Auto-commit of generated files. 2013-10-23 06:17:41 -04:00
Glenn Morris
a318e28f0d More Makefile quoting 
* Makefile.in (install-arch-dep, install-nt, uninstall, uninstall-nt):
Quote entities that might contain whitespace.
 2013-10-23 00:28:30 -07:00
Glenn Morris
48f73cfbf3 Progress towards allowing installation in directories with whitespace 
* Makefile.in (COPYDESTS, write_subdir, install-arch-dep)
(install-arch-indep, install-etcdoc, install-info, install-man)
(install-etc, uninstall): Quote entities that might contain whitespace.

* build-aux/update-subdirs: Handle whitespace in argument.
Check cd return value.

* doc/emacs/Makefile.in (install-dvi, install-html, install-pdf)
(install-ps, uninstall-dvi, uninstall-html, uninstall-ps)
(uninstall-pdf): Quote entities that might contain whitespace.

* doc/lispintro/Makefile.in (install-dvi, install-html, install-pdf)
(install-ps, uninstall-dvi, uninstall-html, uninstall-ps)
(uninstall-pdf): Quote entities that might contain whitespace.

* doc/lispref/Makefile.in (install-dvi, install-html, install-pdf)
(install-ps, uninstall-dvi, uninstall-html, uninstall-ps)
(uninstall-pdf): Quote entities that might contain whitespace.

* doc/misc/Makefile.in (install-dvi, install-html, install-pdf)
(install-ps, uninstall-dvi, uninstall-html, uninstall-ps)
(uninstall-pdf): Quote entities that might contain whitespace.

* lib-src/Makefile.in ($(DESTDIR)${archlibdir}, need-blessmail, install)
(uninstall): Quote entities that might contain whitespace.

* nt/Makefile.in ($(DESTDIR)${archlibdir}, install, uninstall):
Quote entities that might contain whitespace.
 2013-10-23 00:20:57 -07:00
Glenn Morris
b8e3b0a9ec Make building in directories with whitespace possible 
Make has trouble with targets containing whitespace, 
http://savannah.gnu.org/bugs/?712, so the general approach is
to use relative paths where possible.  It's generally only Emacs
itself that needs absolute paths, eg in src/epaths.h.

* configure.ac (srcdir): Don't make it absolute - abs_srcdir exists.

* Makefile.in (abs_srcdir): New, set by configure.
(buildlisppath): Use abs_srcdir.
(install-arch-indep, install-etcdoc, install-info, install-man)
(install-etc): Quote entities that might contain whitespace.

* admin/unidata/Makefile.in (emacs, ${DSTDIR}/charprop.el):
Quote entities that might contain whitespace.

* leim/Makefile.in (abs_srcdir): New, set by configure.
(buildlisppath): Use abs_srcdir.
(RUN_EMACS, .el.elc, changed.tit, changed.misc, leim-list.el)
($(srcdir)/ja-dic/ja-dic.el, setwins, distclean, check-declare):
Quote entities that might contain whitespace.

* lib-src/Makefile.in ($(DESTDIR)${archlibdir}):
Quote entities that might contain whitespace.

* lisp/Makefile.in (abs_srcdir, abs_lisp): New, set by configure.
(emacs, compile, compile-always):
Quote entities that might contain whitespace.
(custom-deps, finder-data, autoloads): Use abs_lisp.
($(MH_E_DIR)/mh-loaddefs.el, $(TRAMP_DIR)/tramp-loaddefs.el)
($(CAL_DIR)/cal-loaddefs.el, $(CAL_DIR)/diary-loaddefs.el)
($(CAL_DIR)/hol-loaddefs.el): Manually expand target file name.

* nextstep/Makefile.in (${ns_check_file} ${ns_appdir}):
Quote entities that might contain whitespace.

* nt/Makefile.in ($(DESTDIR)${archlibdir}):
Quote entities that might contain whitespace.

* src/Makefile.in (RUN_TEMACS): Make relative (again).
($(leimdir)/leim-list.el, .el.elc, $(lispsource)/loaddefs.el)
(bootstrap-emacs$(EXEEXT)):
Quote entities that might contain whitespace.

* test/automated/Makefile.in (abs_top_srcdir, top_builddir):
New, set by configure.
(top_srcdir): Remove.
(abs_test, abs_lispsrc): New.
(lisp): No longer absolute.
(emacs, lisp-compile, compile, compile-always):
Quote entities that might contain whitespace.

Fixes: debbugs:15675
 2013-10-22 23:22:54 -07:00
Paul Eggert
e4ea223d73 Port to Solaris 10 and its bundled GCC. 
Problem reported by Timothy C. Burt.
* floatfns.c (isfinite, isnan): Redefine unconditionally.
 2013-10-22 21:37:17 -07:00
Paul Eggert
758bed52af Merge from gnulib. 
This incorporates:
2013-10-14 acl: allow cross-compilation to Gentoo
2013-10-18 extern-inline: make safe for -Wundef usage
2013-09-30 fpending: use pure+const function attrs
* lib/fpending.h, m4/acl.m4, m4/extern-inline.m4: Update from gnulib.
 2013-10-22 21:01:46 -07:00
Katsumi Yamaoka
967a72c957 lisp/gnus/mm-decode.el (mm-dissect-buffer): Revert last change 
lisp/gnus/nndoc.el (nndoc-dissect-mime-parts-sub): Ditto

The problem that motivated those changes was attributed to a broken
mail sender, and has been fixed.
 2013-10-23 03:35:49 +00:00
Dmitry Gutov
ee4282cde2 * lisp/progmodes/ruby-mode.el (ruby-smie--at-dot-call): Use 
`following-char'.
 2013-10-23 06:59:45 +04:00
Dmitry Gutov
a6462ef558 * test/indent/ruby.rb: Move two examples to "working" section, add one 
more.
 2013-10-23 00:47:29 +04:00
Stefan Monnier
7790a27058 * lisp/emacs-lisp/smie.el (smie-rule-parent): Fix opener-test. 
* lisp/progmodes/ruby-mode.el (ruby-smie-rules):
Remove corresponding workaround.  Fix indentation rule of ";" so it
also applies when ";" is the parent.
 2013-10-22 11:45:56 -04:00
Katsumi Yamaoka
a034ece066 lisp/gnus/nndoc.el (nndoc-dissect-mime-parts-sub): Fix last change 2013-10-22 13:55:27 +00:00
Katsumi Yamaoka
84efb042f3 lisp/gnus/mm-decode.el (mm-dissect-buffer): Guess content-type if the first token is missing in the Content-Type header 
lisp/gnus/nndoc.el (nndoc-dissect-mime-parts-sub): Ditto
 2013-10-22 10:22:59 +00:00
Xue Fuqiao
d40a46d75b Mention the optional ‘display’ argument in doc strings. 
* frame.el (display-screens, display-pixel-height)
(display-pixel-width, display-mm-width, display-backing-store)
(display-save-under, display-planes, display-color-cells)
(display-visual-class, display-monitor-attributes-list): Mention
the optional ‘display’ argument in doc strings.
 2013-10-22 16:07:51 +08:00
Michael Gauland
a0f143c90a * lisp/progmodes/ebnf2ps.el (ebnf-prologue): Avoid PS error with some 
viewers such as evince when ebnf-production-name-p is nil.

Fixes: debbugs:15625
 2013-10-21 20:47:32 -04:00
Dmitry Gutov
18cacc392d * lisp/progmodes/ruby-mode.el (ruby-smie-grammar): Remove outdated 
TODO.  Add "." after " @ ".
(ruby-smie--at-dot-call): New function.  Checks if point at method
call with explicit target.
(ruby-smie--forward-token, ruby-smie--backward-token): Prepend "."
to the method name tokens when it precedes them.
(ruby-smie--backward-id, ruby-smie--forward-id): Remove.
(ruby-smie-rules): Add rule for indentation before and after "."
token.
 2013-10-22 02:25:59 +04:00
Xue Fuqiao
1257317a7c Remove unnecessary @refill. 2013-10-22 06:10:55 +08:00