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

108502 commits

Author SHA1 Message Date
Chong Yidong
6fe566a752 * xml.el (xml-parse-dtd): Use proper regexps for ELEMENT declarations.
* test/automated/xml-parse-tests.el: Update testcase.

Fixes: debbugs:7172
2012-07-01 19:05:17 +08:00
Glenn Morris
7c603e3ed3 Auto-commit of loaddefs files. 2012-07-01 06:23:35 -04:00
Glenn Morris
397f7161fc Auto-commit of generated files. 2012-07-01 06:18:49 -04:00
Chong Yidong
fbf2e7ad3b Improve xml parameter entity parsing, and add a new ERT test.
* test/automated/xml-parse-tests.el: New file.

* lisp/xml.el (xml--parse-buffer): New function.  Move most of
xml-parse-region here.
(xml-parse-region): Copy region into a temporary buffer, since
parameter entity substitution requires changing buffer contents.
Use xml--parse-buffer.
(xml-parse-file): Use xml--parse-buffer.
(xml-parse-dtd): Make parameter entity substitution work right.
2012-07-01 15:17:05 +08:00
Juanma Barranquero
b95b72547b lib-src/makefile.w32-in (CTAGS_CFLAGS): Remove EMACS_NAME.
Already defined in ETAGS_CFLAGS.
2012-07-01 01:01:52 +02:00
Glenn Morris
2e4c531287 * src/nsterm.m (ns_init_paths): Ignore site-lisp if --no-site-lisp. 2012-06-30 14:35:20 -07:00
Glenn Morris
bbce28533b * lisp/comint.el (follow-comint-scroll-to-bottom): Fix declaration. 2012-06-30 14:23:38 -07:00
Glenn Morris
9bf0aa1594 Remove outdated and unnecessary dbus- declarations.
* net/secrets.el, net/tramp-gvfs.el, net/xesam.el, net/zeroconf.el:
Remove outdated and unnecessary dbus- declarations.
(They are in defined dbus.el now.)
2012-06-30 14:22:18 -07:00
Glenn Morris
938beca46e * url-vars.el (mm-mime-mule-charset-alist, mm-coding-system-p): Declare. 2012-06-30 14:13:05 -07:00
Glenn Morris
ca26824cb0 Make --no-site-lisp work for --enable-locallisppath elements
without "site-lisp" in the name.
Ref http://debbugs.gnu.org/10208#25, point iii).

* configure.in (standardlisppath): New output variable.
(lisppath): Use standardlisppath.
* Makefile.in (standardlisppath): New, set by configure.
(epaths-force): Use standardlisppath and locallisppath rather than lisppath.

* src/epaths.in (PATH_SITELOADSEARCH): New.
* src/lread.c (init_lread): Use PATH_SITELOADSEARCH.

* nt/paths.h (PATH_SITELOADSEARCH): New.

Fixes: debbugs:11658
2012-06-30 14:10:50 -07:00
Eli Zaretskii
9ff8f76bbc Fix last entry in src/ChangeLog. 2012-06-30 19:09:47 +03:00
Eli Zaretskii
c9240d7a6e Adapt the MS-DOS build to the latest changes.
msdos/mainmake.v2 (bootstrap-clean): Do a maintainer-clean in lib, not
  bootstrap-clean (which doesn't exist).
  msdos/inttypes.h (PRIuMAX) [__DJGPP__ < 2.04]: Define to "llu".
  msdos/sedleim.inp (MKDIR_P): Edit to DOS "md" command.
  msdos/sed1v2.inp: (LIB_CLOCK_GETTIME): Edit to empty.
  Remove lines that invoke PAXCTL.
  (clean): Fix recipe not to run Unixy shell commands.
  msdos/sed2v2.inp (GETTIMEOFDAY_TIMEZONE): Edit to 'struct timezone'.
  (HAVE_STRNCASECMP): Edit to 1.
  msdos/sed3v2.inp (LIB_CLOCK_GETTIME): Edit to empty.
  (C_SWITCH_SYSTEM): Add "-I../msdos".
  msdos/sedlibmk.inp (GNULIB_GETTIMEOFDAY, GNULIB_PSELECT)
  (GNULIB_SELECT, HAVE_STRUCT_TIMEVAL, HAVE_SYS_SELECT_H)
  (HAVE_SYS_TIME_H, NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H)
  (NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H, NEXT_SYS_SELECT_H)
  (NEXT_SYS_TIME_H, REPLACE_GETTIMEOFDAY, REPLACE_PSELECT)
  (REPLACE_STRUCT_TIMEVAL): Edit to appropriate values.
  (BUILT_SOURCES): Edit out sys/select.h and sys/time.h.
  (mostlyclean-local, distclean-generic): Fix recipe not to run
  Unixy shell commands.

  src/sysselect.h [DOS_NT]: Don't include sys/select.h.
  src/sysselect.h (pselect) [!HAVE_PSELECT]: Redirect to sys_select.
  src/sysdep.c: Don't include dos.h and dosfns.h.
  src/process.c (sys_select):
  src/msdos.c (sys_select): Accept one more argument and ignore it.
  src/msdos.c (event_timestamp, sys_select): Use gnulib's gettime;
  adapt data types and code to that.
  src/dosfns.c:
  src/msdos.c (gettime, settime): Define away the prototypes in dos.h,
  which clashes with the gnulib function of the same name.
  src/ w32proc.c (sys_select): Accept and ignore one more argument.
  src/w32.c (emacs_gnutls_pull): Call select with one more argument.

  lisp/emacs-lisp/timer.el (timer-until): Subtract results of
  float-time, instead of taking float-time of the result of
  time-subtract, since float-time signals an error for negative time
  arguments.
2012-06-30 18:55:27 +03:00
Eli Zaretskii
0d23c240ea Adapt the MS-DOS build to the latest changes.
msdos/mainmake.v2 (bootstrap-clean): Do a maintainer-clean in lib, not
 bootstrap-clean (which doesn't exist).
 msdos/inttypes.h (PRIuMAX) [__DJGPP__ < 2.04]: Define to "llu".
 msdos/sedleim.inp (MKDIR_P): Edit to DOS "md" command.
 msdos/sed1v2.inp: (LIB_CLOCK_GETTIME): Edit to empty.
 Remove lines that invoke PAXCTL.
 (clean): Fix recipe not to run Unixy shell commands.
 msdos/sed2v2.inp (GETTIMEOFDAY_TIMEZONE): Edit to 'struct timezone'.
 (HAVE_STRNCASECMP): Edit to 1.
 msdos/sed3v2.inp (LIB_CLOCK_GETTIME): Edit to empty.
 (C_SWITCH_SYSTEM): Add "-I../msdos".
 msdos/sedlibmk.inp (GNULIB_GETTIMEOFDAY, GNULIB_PSELECT)
 (GNULIB_SELECT, HAVE_STRUCT_TIMEVAL, HAVE_SYS_SELECT_H)
 (HAVE_SYS_TIME_H, NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H)
 (NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H, NEXT_SYS_SELECT_H)
 (NEXT_SYS_TIME_H, REPLACE_GETTIMEOFDAY, REPLACE_PSELECT)
 (REPLACE_STRUCT_TIMEVAL): Edit to appropriate values.
 (BUILT_SOURCES): Edit out sys/select.h and sys/time.h.
 (mostlyclean-local, distclean-generic): Fix recipe not to run
 Unixy shell commands.

 src/sysselect.h [DOS_NT]: Don't include sys/select.h.
 src/s/ms-w32.h (select, pselect): Don't define here, they are
 defined in sysselect.h
 src/sysselect.h (pselect) [!HAVE_PSELECT]: Redirect to sys_select.
 src/sysdep.c: Don't include dos.h and dosfns.h.
 src/process.c (sys_select):
 src/msdos.c (sys_select): Accept one more argument and ignore it.
 src/msdos.c (event_timestamp, sys_select): Use gnulib's gettime;
 adapt data types and code to that.
 src/dosfns.c:
 src/msdos.c (gettime, settime): Define away the prototypes in dos.h,
 which clashes with the gnulib function of the same name.

 lisp/emacs-lisp/timer.el (timer-until): Subtract results of
 float-time, instead of taking float-time of the result of
 time-subtract, since float-time signals an error for negative time
 arguments.
2012-06-30 18:32:51 +03:00
Chong Yidong
b3218de111 Fix use of eval-and-compile in regexps in xml.el.
* xml.el (xml-*-re): Convert defvars into defconsts, and
eval-and-compile them so eval-and-compile works on derivatives.
(xml--entity-replacement-text): Use eval-and-comple.
2012-06-30 22:21:24 +08:00
Chong Yidong
53dc3c68ea xml.el: Fix last change. 2012-06-30 21:57:55 +08:00
Michael Albinus
a40c87a009 * vc/vc-git.el (vc-git-registered): Use cache property
`git-registered'.
(vc-git-mode-line-string): Call `vc-working-revision' instead of
`vc-git-working-revision' in order to benefit from the cache.
(vc-git-root): Use cache property `git-root'.
2012-06-30 15:18:16 +02:00
Dmitry Gutov
ac87de9763 * vc/vc-hooks.el (vc-before-save): Clear cache if file has been
removed (likely outside Emacs).
2012-06-30 15:14:00 +02:00
Stefan Monnier
40c2a14362 * lisp/emacs-lisp/cl-lib.el: Require macroexp. 2012-06-30 08:52:08 -04:00
Stefan Monnier
ac10fe06c9 * lisp/emacs-lisp/cl-lib.el: Require macroexp for its macros. 2012-06-30 08:05:22 -04:00
Chong Yidong
7f3fbd5d73 * xml.el: Implement XML parameter entities.
(xml-parameter-entity-alist): New variable.
(xml-parse-region, xml-parse-fragment): Preserve previous values
of xml-entity-alist and xml-parameter-entity-alist, so that
repeated calls on different documents do not change them.
(xml-parse-tag): Fix doctype regexp.
(xml--entity-replacement-text): New function.
(xml-parse-dtd): Use it.  Don't handle system entities; doing that
properly requires url retrieval which is unimplemented.
(xml-escape-string): Doc fix.
2012-06-30 19:33:22 +08:00
Andreas Schwab
c5e4379cef * font.c (font_style_to_value, font_style_symbolic)
(font_prop_validate_style): Add type checks for values in
font_style_table.
2012-06-30 11:13:54 +02:00
Andreas Schwab
af5a5a98c8 * lisp.h (CHECK_RANGED_INTEGER): Make value to check the first
argument.
* character.c, charset.c, menu.c, process.c, window.c: Adjust all
uses.
2012-06-30 11:13:54 +02:00
Stefan Monnier
3cfbebba71 * lisp/emacs-lisp/cl-lib.el (cl-pushnew): Use macroexp-let2. 2012-06-29 22:00:08 -04:00
Eli Zaretskii
2e5a663126 Undo change in xdisp.c in 2012-06-29T11:48:08Z!dmantipov@yandex.ru.
src/xdisp.c (try_window_id): Undo last change.  'int' is wide 
 enough to hold vertical pixel positions on screen.
2012-06-29 21:52:54 +03:00
Chong Yidong
3812efdc6c Texinfo markup fixes for Emacs manual.
* doc/emacs/maintaining.texi (Basic VC Editing, VC Pull, Merging):
* doc/emacs/basic.texi (Erasing, Basic Undo): Fix markup.
2012-06-29 22:54:02 +08:00
Eli Zaretskii
8d38f4616b Fix the current directory of the Emacs process on MS-Windows.
src/w32.c (getwd): Adjust commentary about startup_dir.
 (init_environment): Always call sys_access, even in non-MSVC
 builds.  Don't chdir to the directory of the Emacs executable.
 This undoes code from 1997 which was justified by the need to
 "avoid conflicts when removing and renaming directories".  But its
 downside was that every relative file name was being interpreted
 relative to the directory of the Emacs executable, which can never
 be TRT.  In particular, it broke sys_access when called with
 relative file names.
 (sys_access): Map GetLastError to errno.
2012-06-29 16:11:54 +03:00
Dmitry Antipov
2af3565e0f * lisp/fringe.el (fringe-mode): Doc fix.
* src/window.h (struct window): Change type of 'fringes_outside_margins'
to bitfield.  Fix comment.  Adjust users accordingly.
(struct window): Change type of 'window_end_bytepos' to ptrdiff_t.
Adjust comment.
* src/xdisp.c (try_window_id): Change type of 'first_vpos' and 'vpos'
to ptrdiff_t.
2012-06-29 15:48:08 +04:00
Glenn Morris
e4d3503065 Auto-commit of generated files. 2012-06-29 06:17:31 -04:00
Michael Albinus
929df0e722 * net/ange-ftp.el (ange-ftp-get-passwd): Throw if `non-essential'
is non-nil.
(ange-ftp-ignore-errors-if-non-essential): New defmacro.
(ange-ftp-file-name-all-completions): Use it.  (Bug#11808)
2012-06-29 09:14:36 +02:00
Glenn Morris
c8d3a25c09 Merge from emacs-24; up to 2012-04-30T11:57:47Z!sdl.web@gmail.com 2012-06-28 23:28:37 -07:00
Katsumi Yamaoka
5437effdb8 lisp/gnus/tests/: Remove 2012-06-29 04:15:43 +00:00
Dmitry Antipov
3e984ee810 * editfns.c (region_limit): Fix type mismatch. 2012-06-29 06:19:32 +04:00
Dmitry Antipov
ef884f239f * nsfns.m: Fix GLYPH_DEBUG usage assuming that it may be
undefined.  Convert from xassert to eassert.
* nsmenu.m: Convert from xassert to eassert.
* nsterm.m: Likewise.
2012-06-29 05:35:32 +04:00
Juanma Barranquero
2badeec4f4 lisp/emacs-lisp/cl-lib.el (cl-pushnew): Don't capture X (bug#11811). 2012-06-29 01:04:27 +02:00
Stefan Monnier
7d7e0027e7 * src/editfns.c (region_limit): Clip to narrowing.
Fixes: debbugs:11770
2012-06-28 15:09:41 -04:00
Dmitry Antipov
94eb8e0a5a * configure.in: Fix previous change. Remove --enable-asserts.
(CPPFLAGS): Remove conditional -DXASSERTS=1.
Add --enable-link-time-optimization.
* INSTALL: Mention this.
2012-06-28 20:34:05 +04:00
Paul Eggert
aa754e6a9e Avoid integer overflow on scroll-left and scroll-right.
* window.c (HSCROLL_MAX): New macro.
(Fscroll_left, Fscroll_right): Avoid undefined behavior on integer
overflow when requested scroll falls outside ptrdiff_t range.
2012-06-28 08:50:11 -07:00
Dmitry Antipov
80b00b0885 * window.h (struct window): Change type of 'hscroll',
'min_hscroll' and 'last_point' from Lisp_Object to ptrdiff_t,
'last_modified' and 'last_overlay_modified' to EMACS_INT.
Adjust users accordingly.
* xdisp.c (try_cursor_movement): Replace type check with eassert.
* window.c (Fscroll_left, Fscroll_right): Change type of 'hscroll'
from EMACS_INT to ptrdiff_t.
(make_window): Omit redundant initialization.
2012-06-28 16:29:37 +04:00
Andreas Schwab
3d8b9024ad * calendar/cal-dst.el (calendar-current-time-zone): Return
calendar-current-time-zone-cache if non-nil.
2012-06-28 14:13:38 +02:00
Juanma Barranquero
62b2bcf611 src/makefile.w32-in ($(BLD)/regex.$(O)): Update dependencies. 2012-06-28 13:37:27 +02:00
Dmitry Antipov
45942c7dd0 * window.h (struct window): Change type of 'use_time' and
'sequence_number' from Lisp_Object to int.
* frame.c (make_frame): Adjust users accordingly.
* print.c (print_object): Likewise.
* window.c (select_window, Fwindow_use_time, make_parent_window)
(make_window): Likewise.
2012-06-28 15:11:48 +04:00
Julien Danjou
ae4969c2d6 term: rework color cutomizing
* term.el (term-handle-colors-array): Use a set of new faces to
color the terminal.  Also uses :inverse-video property.
(term-default-fg-color): Set to nil by default, deprecate in favor
of `term-face'.
(term-default-bg-color): Set to nil by default, deprecate in favor
of `term-face'.
(term-current-face): Use `term-face' by default.
(term-bold-attribute): Variable deleted.
2012-06-28 12:40:24 +02:00
Glenn Morris
7ee3791f5b Auto-commit of generated files. 2012-06-28 06:17:30 -04:00
Juanma Barranquero
0e711109c1 nt/nmake.defs,gmake.defs (CHECKING_FLAGS): Remove XASSERTS. 2012-06-28 11:06:11 +02:00
Dmitry Antipov
e509cfa606 * configure.in: Add glyphs category to --enable-checking option.
(GLYPH_DEBUG): Define if glyphs debugging is enabled.
* src/dispextern.h (GLYPH_DEBUG): Now defined in config.h if
enabled with --enable-checking=[all,glyphs] configure option.
Fix GLYPH_DEBUG usage assuming that it may be undefined,
adjust comments accordingly.
* src/dispnew.c: Fix GLYPH_DEBUG usage assuming that it may be
undefined, adjust comments accordingly.
* src/image.c: Likewise.
* src/scroll.c: Likewise.
* src/w32fns.c: Likewise.
* src/w32term.c: Likewise.
* src/xdisp.c: Likewise.
* src/xfaces.c: Likewise.
* src/xfns.c: Likewise.
* src/xterm.c: Likewise.
2012-06-28 11:50:50 +04:00
Dmitry Antipov
a54e2c050b Generalize run-time debugging checks.
* configure.in (ENABLE_CHECKING): Update comment.
* src/dispextern.h (XASSERTS): Remove.
* src/fontset.c (xassert): Remove.
Convert from xassert to eassert.
* src/alloc.c: Convert from xassert to eassert.
* src/bidi.c: Likewise.
* src/dispnew.c: Likewise.
* src/fns.c: Likewise.
* src/fringe.c: Likewise.
* src/ftfont.c: Likewise.
* src/gtkutil.c: Likewise.
* src/image.c: Likewise.
* src/keyboard.c: Likewise.
* src/menu.c: Likewise.
* src/process.c: Likewise.
* src/scroll.c: Likewise.
* src/sound.c: Likewise.
* src/term.c: Likewise.
* src/w32console.c: Likewise.
* src/w32fns.c: Likewise.
* src/w32term.c: Likewise.
* src/window.c: Likewise.
* src/xdisp.c: Likewise.
* src/xfaces.c: Likewise.
* src/xfns.c: Likewise.
* src/xselect.c: Likewise.
* src/xterm.c: Likewise.
2012-06-28 11:50:27 +04:00
Glenn Morris
538044ed9e Add a PROBLEMS note about the libotf name-clash annoyance 2012-06-28 00:47:19 -07:00
Glenn Morris
1c9bd87017 * simple.el (completion-list-mode-finish): Don't use toggle-read-only.
Since completion-list-mode has a special mode-class, it wasn't doing
anything extra anyway.
2012-06-28 00:21:41 -07:00
Andreas Schwab
57570cd38d * gnutls.c (emacs_gnutls_handshake): Revert last change. Add QUIT
to make the loop interruptible.
2012-06-28 09:12:59 +02:00
Glenn Morris
acd97ed658 TODO updates; add wishlist section 2012-06-28 00:05:15 -07:00