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

113636 commits

Author SHA1 Message Date
Dmitry Gutov
41784d0ba6 * test/indent/ruby.rb: Move a now-successful example. 2013-11-04 13:04:50 +02:00
Dmitry Gutov
dca01b0923 * lisp/progmodes/ruby-mode.el (ruby-smie--forward-token)
(ruby-smie--backward-token): Tokenize heredocs as semicolons.

* test/automated/ruby-mode-tests.el: Remove outdated comment.

* test/indent/ruby.rb: Add a statement on the line after heredoc.
2013-11-04 12:50:47 +02:00
Paul Eggert
91f2d27289 Port to stricter C99 platforms.
Especially, C99 prohibits nesting a struct X inside struct Y if
struct X has a flexible array member.
Also, merge from gnulib, incorporating:
2013-11-03 intprops: port to Oracle Studio c99
* lib/intprops.h: Update from gnulib.
* src/alloc.c (struct sdata): New type.
(sdata): Implement in terms of struct sdata.
Remove u member; all uses replaced by next_vector, set_next_vector.
(SDATA_SELECTOR, SDATA_DATA, SDATA_DATA_OFFSET): Adjust to sdata change.
(SDATA_DATA_OFFSET): Now a constant, not a macro.
(struct sblock): Rename first_data member to data, which is now
a flexible array member.  All uses changed.
(next_vector, set_next_vector, large_vector_vec): New functions.
(vector_alignment): New constant.
(roundup_size): Make it a multiple of ALIGNOF_STRUCT_LISP_VECTOR, too.
(struct large-vector): Now merely a NEXT member, since the old approach
ran afoul of stricter C99.  All uses changed to use
large_vector_vec or large_vector_offset.
(large_vector_offset): New constant.
* src/dispnew.c: Include tparam.h, for tgetent.
Do not include term.h; no longer needed.
* src/gnutls.c (Fgnutls_boot): Don't continue after calling a _Noreturn.
* src/lisp.h (ENUM_BF) [__SUNPRO_C && __STDC__]: Use unsigned int.
(struct Lisp_Vector): Use a flexible array member for contents,
instead of a union with a member that is an array of size 1.
All uses changed.
(ALIGNOF_STRUCT_LISP_VECTOR): New constant, to make up for the
fact that the struct no longer contains a union.
(struct Lisp_Misc_Any, struct Lisp_Marker, struct Lisp_Overlay)
(struct Lisp_Save_Value, struct Lisp_Free):
Use unsigned, not int, for spacers, to avoid c99 warning.
(union specbinding): Use unsigned, not bool, for bitfield, as
bool is not portable to pre-C99 hosts.
2013-11-03 22:09:03 -08:00
Michal Nazarewicz
0a749fa0e6 * lisp/textmodes/fill.el (fill-single-char-nobreak-p): New function
checking whether point is after a 1-letter word.
2013-11-03 23:29:59 -05:00
Nathan Trapuzzano
ec79b92bfa * lisp/progmodes/cperl-mode.el (cperl-font-lock-fontify-region-function):
Don't infloop when expanding region over `multiline' syntax-type that
begins a line.

Fixes: debbugs:15778
2013-11-03 22:44:23 -05:00
Stefan Monnier
4aca7145ff * lisp/rect.el (rectangle-mark-mode): Rename from rectangle-mark.
Make it into a proper minor mode.
(rectangle--region): (implicitly) rename to rectangle-mark-mode.
(rectangle-mark-mode-map): New keymap.
(rectangle--highlight-for-redisplay): Fix some corner cases.

Fixes: debbugs:15796
2013-11-03 22:06:54 -05:00
Glenn Morris
8b77446f3f * test/automated/Makefile.in (abs_srcdir): Remove.
(emacs): Unset EMACSLOADPATH.
(.el.elc, check): Use -L to append srcdir to load-path.
2013-11-03 17:48:08 -08:00
Glenn Morris
6dc6d30179 * src/emacs.c (usage_message): Mention that `-L :...' appends. 2013-11-03 17:38:16 -08:00
Glenn Morris
a0833f62d5 * lisp/startup.el (command-line-1): Allow `-L :...' to append to load-path.
* doc/emacs/cmdargs.texi (Action Arguments): Mention that `-L :...' appends.

* etc/NEWS: Mention this.
2013-11-03 17:36:14 -08:00
Stefan Monnier
e61845c1db * lisp/emacs-lisp/smie.el (smie-rule-parent): Always call
smie-indent-virtual rather than only for hanging tokens.
(smie--next-indent-change): New helper command.
* lisp/progmodes/ruby-mode.el (ruby-smie--rule-parent-skip-assign): Remove.
(ruby-smie-rules): Use smie-rule-parent instead.
2013-11-03 17:56:03 -05:00
Johan Bockgård
295559b0fd * cedet/semantic/lex.el (semantic-lex-start-block)
(semantic-lex-end-block): Move after definition of
semantic-lex-token macro.
2013-11-03 22:51:25 +01:00
Glenn Morris
62942f895f Unset EMACSLOADPATH in some Makefiles rather than setting it to the default
* leim/Makefile.in (abs_srcdir): Remove.
(RUN_EMACS): Unset EMACSLOADPATH.

* lisp/Makefile.in (abs_srcdir): Remove.
(emacs): Unset EMACSLOADPATH.
2013-11-03 11:25:29 -08:00
Glenn Morris
fca2fccbea * src/Makefile.in (bootstrap_exe): Use relative filename.
(abs_builddir): Remove.
2013-11-02 16:49:54 -07:00
Glenn Morris
8061810d42 * lisp/Makefile.in (abs_top_builddir): Remove 2013-11-02 16:39:49 -07:00
Glenn Morris
5ba08a2e48 Comment markup fix 2013-11-02 16:37:59 -07:00
Glenn Morris
881db7e0c4 * doc/emacs/cmdargs.texi (Action Arguments): Clarify `-L' a bit. 2013-11-02 16:36:32 -07:00
Glenn Morris
1ba6984e42 * doc/emacs/cmdargs.texi (Action Arguments): Clarify that `-L' prepends 2013-11-02 16:29:01 -07:00
Glenn Morris
67fb4e6a86 test/automated: Use relative filename for emacs executable
* Makefile.in (check): Depend on all.

* test/automated/Makefile.in (abs_top_builddir): Remove variable.
(EMACS): Use a relative file name.
(lisp-compile): Remove (assume it's up-to-date).
(compile-main): Do not run lisp-compile.
(check): Use --chdir.
2013-11-02 13:54:08 -07:00
Glenn Morris
67bb589ef9 test/automated/Makefile.in remove stuff unnecessarily copied from lisp
* test/automated/Makefile.in (abs_top_srcdir): Remove variable.
(emacs): Use abs_srcdir rather than abs_top_srcdir.
(doit, compile, compile-always): Remove stuff copied from lisp/.
(all, check, bootstrap-clean, distclean, maintainer-clean): Declare PHONY.

Remove comments copied from lisp/.
2013-11-02 13:32:22 -07:00
Glenn Morris
90d2a845cc * leim/Makefile.in (buildlisppath): Remove.
(RUN_EMACS): Use abs_srcdir directly.
2013-11-02 13:30:13 -07:00
Eli Zaretskii
bd9565cdfb Fix commentary in lisp/Makefile.in. 2013-11-02 22:12:59 +02:00
Glenn Morris
6f8225faee * test/automated/Makefile.in (abs_srcdir): New, set by configure. 2013-11-02 13:12:12 -07:00
Glenn Morris
18ba6a334d * lisp/Makefile.in (EMACS): Use a relative filename.
(custom-deps, finder-data, autoloads): Use --chdir.
2013-11-02 13:05:15 -07:00
Glenn Morris
1f43ed4177 * automated/Makefile.in (test): Remove variable.
(compile-main, compile-clean, compile-always, bootstrap-clean)
(check): Use srcdir rather than $test.  Check cd return value.
(compile-always): Depend on bootstrap-clean.
2013-11-02 12:56:54 -07:00
Glenn Morris
2ffcf5fef9 Minor simplifications for test/automated/Makefile
* test/automated/Makefile.in (top_builddir, abs_test, abs_lispsrc, lisp):
Remove variables.
(emacs): Use abs_top_srcdir, abs_srcdir rather than abs_lispsrc, abs_test.
(lisp-compile): Use ../../lisp rather than $lisp.
2013-11-02 12:50:41 -07:00
Glenn Morris
6a8b929e7f * lisp/Makefile.in (abs_lisp): Remove, replace by abs_srcdir 2013-11-02 12:43:11 -07:00
Glenn Morris
c617f3d0b1 Use relative filenames in TAGS files.
* src/Makefile.in (abs_srcdir): Remove it again.
(.PHONY): Remove frc.
(maintainer-clean): No more TAGS-LISP file.
(TAGS): Pass relative file names to etags.
(../lisp/TAGS): Rename from TAGS-LISP.  Work in ../lisp.

* lisp/Makefile.in (lisptagsfiles1, lisptagsfiles2, lisptagsfiles3)
(lisptagsfiles4, TAGS): Use relative file names.
(TAGS-LISP): Remove.
(maintainer-clean): No more TAGS-LISP file.

* lwlib/Makefile.in (abs_srcdir): Remove it again.
(ctagsfiles, TAGS): Use relative filenames.

* .bzrignore: Remove TAGS-LISP.
2013-11-02 12:41:33 -07:00
Glenn Morris
739f57cd1f * src/Makefile.in (lispdir): Remove.
(TAGS-LISP): Replace lispdir with its expansion.
2013-11-02 12:23:45 -07:00
Glenn Morris
b0b9e59232 Small Makefile cleanup mainly related to tags file generation
* src/Makefile.in (abs_srcdir): New, set by configure.
(maintainer-clean): Remove pointless echo.  That should be in the
top-level Makefile, if anywhere.  Delete TAGS-LISP.
(extraclean): No s/ and m/ directories for some time.
(TAGS): Remove no-longer-defined S_FILE.
Pass absolute filenames to etags once more.
(TAGS-LISP, $(lwlibdir)/TAGS): Correctly pass ETAGS to sub-makes.
($(lwlibdir)/TAGS): Remove useless subshell, check cd return value.

* lisp/Makefile.in (lisptagsfiles1, lisptagsfiles2, lisptagsfiles3)
(lisptagsfiles4): Use absolute filenames again.
(TAGS, TAGS-LISP): Not everything needs to run in one line.
Remove all *loaddefs files, not just the first.  Remove esh-groups.
(maintainer-clean): Delete TAGS, TAGS-LISP.

* lwlib/Makefile.in (abs_srcdir): New, set by configure.
(ETAGS, ctagsfiles): New variables.
(TAGS): Use ETAGS, ctagsfiles.  Use absolute filenames again.
2013-11-02 12:18:50 -07:00
Bozhidar Batsov
5246583bdb * lisp/ChangeLog: Fix a typo. 2013-11-02 16:58:38 +02:00
Jan Djärv
39dd7bb286 * xfaces.c (realize_default_face): Set DISTANT_FOREGROUND to unspecified_fg. 2013-11-02 14:14:55 +01:00
Xue Fuqiao
920d06544a NEWS tweak 2013-11-02 19:37:14 +08:00
Bozhidar Batsov
d1c0ea6a18 * lisp/emacs-lisp/package.el (package-version-join): Recognize snapshot versions. 2013-11-02 12:55:22 +02:00
Bozhidar Batsov
684d71c6b4 * subr.el (version-regexp-alist): Add support for snapshot versions. 2013-11-02 11:48:11 +02:00
Jan Djärv
0c21fa44f0 * xfaces.c (check_lface_attrs, realize_default_face): Add
LFACE_DISTANT_FOREGROUND_INDEX.

Fixes: debbugs:15788
2013-11-02 08:58:54 +01:00
Dmitry Gutov
3d42b96899 * lisp/progmodes/ruby-mode.el (ruby-smie--rule-parent-skip-assign): New
function, replacement for `smie-rule-parent' for when we want to
skip over our direct parent if it's an assignment token..
(ruby-smie-rules): Use it.
2013-11-02 09:18:11 +04:00
Paul Eggert
a90e5a330c * emacs.c (original_pwd): Remove global var by making it local.
(init_cmdargs): New arg ORIGINAL_PWD; caller changed.
2013-11-01 19:11:37 -07:00
Dmitry Gutov
7ffd37219b * lisp/progmodes/ruby-mode.el Use `syntax-propertize-function'
unconditionally.  Remove now unnecessary forward declarations.
Remove XEmacs-specific setup.
(ruby-here-doc-end-re, ruby-here-doc-beg-match)
(ruby-font-lock-syntactic-keywords)
(ruby-comment-beg-syntax, ruby-in-here-doc-p)
(ruby-here-doc-find-end, ruby-here-doc-beg-syntax)
(ruby-here-doc-end-syntax): Remove.
(ruby-mode): Don't check whether `syntax-propertize-rules' is
defined as function.
2013-11-02 05:10:10 +04:00
Bozhidar Batsov
a3996a2eba * lisp/progmodes/ruby-mode.el (ruby-mode-variables, ruby-mode): Use `setq-local'. 2013-11-02 04:17:54 +04:00
Bozhidar Batsov
6f9260e8f8 * lisp/progmodes/ruby-mode.el (ruby-mode-variables): Don't set syntax
table and abbrev table, `define-derived-mode' does that for us
anyway.
2013-11-02 03:55:15 +04:00
Glenn Morris
6014de8418 * lisp/Makefile.in: Remove manual mh-e dependencies
(writing .elc files is atomic for some time,
so no parallel compilation issues)
2013-11-01 13:26:29 -04:00
Jan Djärv
3c334c1412 Add :distant-foreground to faces.
* doc/lispref/display.texi (Face Attributes): Document :distant-foreground.

* etc/NEWS: Mention :distant-foreground.

* lisp/faces.el (face-x-resources): Add :distant-foreground.
(region): Use :distant-foreground for gtk and ns.

* src/dispextern.h (lface_attribute_index): Add
LFACE_DISTANT_FOREGROUND_INDEX.

* src/xfaces.c: Declare color_distance.
(QCdistant_foreground): New variable.
(NEAR_SAME_COLOR_THRESHOLD): New define.
(load_color2): New function.
(load_color): Call load_color2.
(load_face_colors): Call load_color2 and if distant-color is specified
calculate distant and use distant-color if colors are near.
(LFACE_DISTANT_FOREGROUND): New define.
(merge_face_ref, Finternal_set_lisp_face_attribute)
(Finternal_get_lisp_face_attribute)
(x_supports_face_attributes_p): Handle distant-foreground similar to
foreground.
(syms_of_xfaces): DEFSYM QCdistant_foreground.
2013-11-01 16:47:10 +01:00
Tassilo Horn
9bc236c826 Allow multiple bibliographies when BibLaTeX is used rathen than
BibTeX.
* textmodes/reftex-parse.el (reftex-using-biblatex-p): New function.
(reftex-locate-bibliography-files): Us it.
2013-11-01 11:27:21 +01:00
Glenn Morris
82bd64d838 Auto-commit of loaddefs files. 2013-11-01 06:21:34 -04:00
Glenn Morris
30904de318 Auto-commit of generated files. 2013-11-01 06:17:43 -04:00
Eli Zaretskii
ef9b591f11 Fix whitespace in src/casefiddle.c. 2013-11-01 12:00:47 +02:00
Claudio Bley
a814bc1087 Fix ChangeLog entry of last commit. 2013-11-01 11:18:39 +02:00
Claudio Bley
0e7690deac Fix handling of comments in NetPBM image files.
src/image.c (pbm_next_char): New function.
 (pbm_scan_number): Use it.

 lisp/image.el (image-type-header-regexps): Fix the 'pbm' part to
 allow comments in pbm files.
2013-11-01 11:10:13 +02:00
Claudio Bley
019c8218f0 lisp/term/w32-win.el (dynamic-library-alist): Support libtiff v4.x on w32. 2013-11-01 11:04:16 +02:00
Claudio Bley
ac1bf374c2 Support libpng DLLs of versions beyond 1.4.x on MS-Windows.
lisp/term/w32-win.el (dynamic-library-alist): Support versions of
 libpng beyond 1.4.x.
2013-11-01 10:57:55 +02:00