1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 08:43:40 -07:00
Commit graph

113514 commits

Author SHA1 Message Date
Xue Fuqiao
2a03e2bc6f Doc fix for set-fringe-bitmap-face.
* src/fringe.c (set_fringe_bitmap_face): Add usage note from lispref.
2013-10-26 11:13:18 +08:00
Xue Fuqiao
918a7ad426 Add an index for customizing fringe bitmaps. 2013-10-26 10:25:54 +08:00
Xue Fuqiao
7db9c31e3d * doc/lispref/display.texi (Fringe Indicators): Add indexes for fringe indicators. 2013-10-26 10:20:04 +08:00
Xue Fuqiao
68c9b8763c Comment 2013-10-26 10:02:51 +08:00
Dmitry Gutov
778859a88c * test/indent/ruby.rb: New failing example. 2013-10-26 05:22:50 +04:00
Dmitry Gutov
bae91342a4 * lisp/progmodes/ruby-mode.el (ruby-smie--args-separator-p): Be more
specific in what the first arg can be: a non-keyword word,
string/regexp/percent literal opener, opening paren, or unary
operator followed directly by word.

* test/automated/ruby-mode-tests.el (ruby-toggle-block-to-brace): Fix
the test, in respect to adding the space after the curly.
2013-10-26 05:16:37 +04:00
Stefan Monnier
eb89dc14d9 * lisp/progmodes/prolog.el: Remove old indent; use post-self-insert-hook.
(prolog-align-comments-flag, prolog-indent-mline-comments-flag)
(prolog-object-end-to-0-flag, prolog-electric-newline-flag)
(prolog-electric-tab-flag, prolog-use-prolog-tokenizer-flag):
Remove vars, they do not apply any more.
(prolog-mode-abbrev-table): Remove redundant declaration.
(prolog-upper-case-string, prolog-lower-case-string): Remove.
(prolog-use-smie): Remove.
(prolog-smie-rules): Add indentation rule for the if-then-else layout
supported by prolog-electric-if-then-else-flag.
(prolog-mode-variables, prolog-menu): Use setq-local.
(prolog-mode-keybindings-edit): Don't rebind M-C-p and M-C-n.
Remove binding to `Backspace' since this key doesn't exist anyway.
Remove bindings for electric self-inserting keys.
(prog-mode): Assume it's defined.
(prolog-post-self-insert): New function.
(prolog-mode): Use it.
(prolog-indent-line, prolog-indent-level)
(prolog-find-indent-of-matching-paren)
(prolog-indentation-level-of-line, prolog-goto-comment-column)
(prolog-paren-is-the-first-on-line-p, prolog-region-paren-balance)
(prolog-goto-next-paren, prolog-in-string-or-comment)
(prolog-tokenize, prolog-inside-mline-comment)
(prolog-find-start-of-mline-comment): Remove functions.
(prolog-find-unmatched-paren, prolog-clause-end)
(prolog-guess-fill-prefix, prolog-get-predspec): Use syntax-ppss.
(prolog-electric--if-then-else): Rename from
prolog-insert-spaces-after-paren; use prolog-electric-if-then-else-flag.
(prolog-tokenize-searchkey): Remove const.
(prolog-clause-info): Use forward-sexp.
(prolog-forward-list, prolog-backward-list, prolog-electric-delete)
(prolog-electric-if-then-else): Remove commands.
(prolog-electric--colon): Rename from prolog-electric-colon; adapt it
for use in post-self-insert-hook.
(prolog-electric--dash): Rename from prolog-electric-dash; adapt it
for use in post-self-insert-hook.
(prolog-electric--dot): Rename from prolog-electric-dot; adapt it
for use in post-self-insert-hook.
(prolog-electric--underscore): Rename from prolog-electric--underscore;
adapt it for use in post-self-insert-hook.
2013-10-25 11:23:45 -04:00
Xue Fuqiao
8b022e34fd Improve indexing. 2013-10-25 21:56:59 +08:00
Xue Fuqiao
651c39f8e8 Continuation of previous change. 2013-10-25 21:34:21 +08:00
Xue Fuqiao
3e1300f765 * doc/lispref/display.texi (Low-Level Font): Improve indexing. 2013-10-25 21:12:58 +08:00
Xue Fuqiao
2194b2a4b0 * doc/lispref/nonascii.texi (Character Properties): Add an index for
script symbols.
2013-10-25 20:23:07 +08:00
Michael Albinus
3dab0a832c * emacs-lisp/ert.el (ert-run-tests-interactively):
Use `completing-read'.  (Bug#9756)
2013-10-25 14:07:34 +02:00
Xue Fuqiao
619a46f8d2 * doc/lispref/display.texi (Fontsets): Minor wording fix. 2013-10-25 19:44:35 +08:00
Glenn Morris
a1f7782f07 Auto-commit of generated files. 2013-10-25 06:17:37 -04:00
Eli Zaretskii
f67599d554 Another fix for the MS-Windows build broken 4 revisions ago.
src/w32uniscribe.c (uniscribe_close): Adjust the argument list to
 the changed signature of the font driver's 'close' method.
2013-10-25 12:52:37 +03:00
Eli Zaretskii
fbfd0e1d75 Fix bug #15712 with vertical motion when the goal column needs to hscroll.
lisp/simple.el (line-move): Call line-move-1 instead of
 line-move-visual when the current window hscroll is zero, but
 temporary-goal-column indicates we will need to hscroll as result
 of the movement.
2013-10-25 12:45:51 +03:00
Eli Zaretskii
6702c559da Fix the MS-Windows build broken 2013-10-25T04:35:56Z!dgutov@yandex.ru.
src/w32font.h (w32font_close): Adjust the prototype to the change in
 function definition.
 src/w32font.c (w32font_close): Reintroduce deleted declaration of i.
 src/w32uniscribe.c (uniscribe_close): Adapt the call to
 w32font_close to its new prototype.
2013-10-25 12:42:41 +03:00
Dmitry Antipov
86bd985ec0 Perform font-specific cleanup when font object is swept by GC. See
http://lists.gnu.org/archive/html/emacs-devel/2013-10/msg00740.html.
* alloc.c (cleanup_vector): New function.
(sweep_vector): Call it for each reclaimed vector object.
* font.h (struct font): Adjust comment.
2013-10-25 11:28:16 +04:00
Dmitry Antipov
78e0b35c45 Omit unused frame argument of font API's close function.
* font.h (struct font): Drop frame argument.  Adjust comment.
* font.c (font_clear_cache, font_close_object): Adjust users.
* ftfont.c (ftfont_close):
* ftxfont.c (ftxfont_close):
* macfont.m (macfont_close):
* nsfont.m (nsfont_close):
* w32font.c (w32font_close):
* xfont.c (xfont_close):
* xftfont.c (xftfont_close): Adjust driver-specific close
functions, tweak comments and make functions safe if called
more than once for the same font object.
2013-10-25 10:55:36 +04:00
Dmitry Gutov
963ce6361a * lisp/progmodes/ruby-mode.el (ruby-mode-menu): Use proper
capitalization.  Use :visible instead of :active.  Fix
`ruby-indent-exp' reference.  Add menu items for the generic
commands that are used with SMIE.
(ruby-do-end-to-brace): Insert space after `{'.
2013-10-25 08:35:56 +04:00
John Anthony
f73754c923 * lisp/progmodes/ruby-mode.el (ruby-mode-menu): Add a menu
Fixes: debbugs:15600
2013-10-24 19:38:39 -07:00
John Anthony
a0be396a4a * lisp/progmodes/inf-lisp.el (inferior-lisp-menu): Add menu.
Fixes: debbugs:15599
2013-10-24 19:35:55 -07:00
Glenn Morris
f5bf77dfae * lisp/vc/vc.el (vc-print-log): Don't use a working revision unless
one was explicitly specified.

Fixes: debbugs:15322
2013-10-24 19:33:42 -07:00
Glenn Morris
da504eec70 * configure.ac: It seems _installing_ in non-ASCII is ok, not building. 2013-10-24 19:22:13 -07:00
Stefan Monnier
37241f6206 * lisp/subr.el (add-to-list): Preserve return value in compiler-macro.
Fixes: debbugs:15692
2013-10-24 21:10:27 -04:00
Leo Liu
3eb91f7bf7 Small fix to last change 2013-10-25 08:52:26 +08:00
Rüdiger Sonderfeld
6408a65db5 * progmodes/octave.el (octave-lookfor): Handle empty lookfor
result.  Ask user to retry using '-all' flag.

Fixes: debbugs:15701
2013-10-25 08:49:33 +08:00
Glenn Morris
357a508109 Avoid non-portable " ... \"...\" ... " nesting
* configure.ac:
* Makefile.in (install-arch-indep, install-etcdoc, install-info):
* lib-src/Makefile.in ($(DESTDIR)${archlibdir}):
* nt/Makefile.in ($(DESTDIR)${archlibdir}):
Avoid non-portable "`\" nesting.
2013-10-24 19:04:33 -04:00
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