Paul Eggert
15ef875582
Merge from mainline.
2011-01-17 11:24:36 -08:00
Paul Eggert
a3e44e7937
Merge from mainline.
2011-01-17 11:01:01 -08:00
Paul Eggert
717c30e002
* xfns.c (x_real_positions): Fix signedness of local var 'ign'.
...
XGetGeometry wants unsigned int *, not int *, for its last 4 args,
so change the type of 'ign' to unsigned int from int.
2011-01-16 23:45:28 -08:00
Paul Eggert
8865d794dc
* regex.c (analyse_first): Remove unreachable 'continue' statement.
2011-01-16 23:34:14 -08:00
Paul Eggert
4ef36a7b4c
* xterm.h (struct x_display_info): Remove stray semicolon.
...
The extra semicolon didn't conform to the C standard.
Problem reported by Sun cc.
2011-01-16 23:27:25 -08:00
Paul Eggert
6df4097e92
* lisp.h: Redo flags and XSET slightly to avoid overflow diagnostics.
...
These changes make compilation easier to follow with Sun cc.
(ARRAY_MARK_FLAG): Make it signed, so that it can be assigned to
EMACS_INT values without provoking overflow diagnostics.
(PSEUDOVECTOR_FLAG): Likewise, for consistency.
(XSET) [! USE_LSB_TAG]: Use unsigned left shift to avoid overflow
diagnostic with signed left shift.
2011-01-16 23:16:08 -08:00
Paul Eggert
410ed5c357
* fileio.c (make_temp_name): Remove unreachable code.
2011-01-16 23:07:30 -08:00
Paul Eggert
97be3ce36c
* fontset.c (free_realized_fontset): Mark unreachable code with if (0).
...
Previously it was marked by preceding it with "return;", but
Sun cc complains about this.
2011-01-16 19:05:08 -08:00
Paul Eggert
9fba3563f1
* coding.c (decode_coding_emacs_mule): Remove unreachable code.
...
This is a typo left over from 2009-03-06T07:51:52Z!handa@m17n.org,
which fixed Bug#2370. Caught by Sun cc.
2011-01-16 18:55:28 -08:00
Glenn Morris
e9bffc61f2
Refill some copyright headers.
2011-01-15 18:21:30 -08:00
Glenn Morris
4ff155dd40
* src/xsettings.c: Comment fix.
2011-01-15 18:10:13 -08:00
Glenn Morris
0d9f702fd0
Nuke arch-tags.
2011-01-15 15:16:57 -08:00
Glenn Morris
d0d4361dba
Add 2011 to remaining FSF/AIST copyright years.
2011-01-15 14:10:37 -08:00
Glenn Morris
d52969e8af
Merge from emacs-23 branch, up to 2010-05-20T21:33:58Z!juri@jurta.org.
...
Note:
emacs-23 2010-05-20T01:32:08Z!lekktu@gmail.com is rendered unnecessary by pre-existing 2010-05-20
trunk change.
2011-01-15 12:38:27 -08:00
Martin Rudalics
6dc1d2d387
Avoid crash in Fselect_frame due to null selected_window (Bug#7728).
...
* window.c (inhibit_point_swap): New variable.
(Fselect_window): If inhibit_point_swap is nonzero, avoid swapping
point this time.
(Fset_window_configuration): Set inhibit_point_swap to 1 instead
of setting selected_window to nil (Bug#7728).
2011-01-14 21:55:58 -05:00
Paul Eggert
8a1f4a98c1
Merge from mainline.
2011-01-14 10:14:17 -08:00
Glenn Morris
15a1cca8ec
ChangeLog merge fixes.
2011-01-14 09:42:40 -08:00
Stefan Monnier
77ab81d054
Merge from emacs-23
2011-01-14 12:18:41 -05:00
Paul Eggert
193770eec9
Merge from mainline.
2011-01-13 09:17:33 -08:00
Tassilo Horn
03d32f1b22
Minor docfixes in imagemagick_load_image.
2011-01-12 08:35:04 +01:00
Paul Eggert
7ea5475741
Merge from mainline.
2011-01-11 21:57:19 -08:00
Chong Yidong
70ba1ec80c
Distinguish between terminfo and termcap on NetBSD (Bug#7642).
...
* configure.in [netbsd systems]: Check for tputs definition.
* src/config.in (TERMINFO): New definition.
* src/s/netbsd.h: Use it to choose between terminfo and termcap.
2011-01-11 21:29:23 -05:00
Tassilo Horn
f853f59905
* image.c (imagemagick_load_image, Finit_image_library): Free
...
intermediate image after creating a MagickWand from it. Terminate
MagickWand environment after image loading.
2011-01-11 21:14:13 +01:00
Michael Albinus
2bc92a930d
* dbusbind.c (Fdbus_register_service): Raise an error in case of
...
unexpected return values.
(Fdbus_register_method): Remove connection initialization.
2011-01-10 12:28:31 +01:00
Michael Albinus
5b83ba185d
* dbusbind.c (QCdbus_request_name_allow_replacement): New symbol;
...
used by Fdbus_register_service.
(QCdbus_request_name_replace_existing): Likewise.
(QCdbus_request_name_do_not_queue): Likewise.
(QCdbus_request_name_reply_primary_owner): Likewise.
(QCdbus_request_name_reply_in_queue): Likewise.
(QCdbus_request_name_reply_exists): Likewise.
(QCdbus_request_name_reply_already_owner): Likewise.
(Fdbus_register_service): New function.
(Fdbus_register_method): Use Fdbus_register_service to do the name
registration.
(syms_of_dbusbind): Add symbols dbus-register-service,
:allow-replacement, :replace-existing, :do-not-queue,
:primary-owner, :existing, :in-queue and :already-owner.
2011-01-10 10:56:17 +01:00
Chong Yidong
973f1f2a81
* lisp/subr.el (read-char-choice): Use read-key. Suggested by Stefan.
...
* src/fns.c (Fyes_or_no_p): Minor doc fix.
2011-01-09 09:26:29 -05:00
Paul Eggert
6e8e6bf253
Give a name FLOAT_TO_STRING_BUFSIZE to the constant 350.
...
* lisp.h (FLOAT_TO_STRING_BUFSIZE): New macro.
* data.c (Fnumber_to_string): Use it.
* print.c (float_to_string, print_object): Likewise.
2011-01-09 00:21:21 -08:00
Paul Eggert
4004364e67
Include <unistd.h> unilaterally.
2011-01-09 00:12:35 -08:00
Paul Eggert
e275c824b0
Regenerate.
2011-01-08 23:33:50 -08:00
Paul Eggert
1fd182f018
Regenerate.
2011-01-08 22:57:07 -08:00
Paul Eggert
e84aba6975
* mktime.c: Remove; moving to ../lib.
2011-01-08 20:33:54 -08:00
Paul Eggert
1e11dbe3d8
Use gnulib's mktime module.
2011-01-08 20:31:19 -08:00
Chong Yidong
21a76236f6
Minor fix to GTK tool-bar button refresh code.
...
* gtkutil.c (update_frame_tool_bar): Don't advance tool-bar index
when removing extra buttons.
2011-01-08 22:29:49 -05:00
Paul Eggert
a451f14b09
Regenerate.
2011-01-08 17:20:28 -08:00
Paul Eggert
fa2c4f5619
Use gnulib's ftoastr module.
2011-01-08 17:18:39 -08:00
Paul Eggert
743c80a725
Regenerate.
...
* aclocal.m4, compile, depcomp, lib/Makefile.in, lib/dummy.c:
* lib/gnulib.mk, m4/00gnulib.m4, m4/gnulib-cache.m4:
* m4/gnulib-common.m4, m4/gnulib-comp.m4, m4/gnulib-tool.m4, missing:
New files, generated automatically, with 'make sync-from-gnulib'
followed by 'make'.
* configure, lisp/dired.el, src/config.in: Regenerate.
2011-01-08 13:19:44 -08:00
Chong Yidong
3d91e30286
Doc fix for y-or-n-p and yes-or-no-p.
...
* subr.el (y-or-n-p): Doc fix.
* fns.c (Fyes_or_no_p): Doc fix.
2011-01-08 16:17:58 -05:00
Paul Eggert
9a514d4a6c
Automate syncing from gnulib.
2011-01-08 13:02:38 -08:00
Andreas Schwab
0d23ffb5f8
* src/fns.c (Fyes_or_no_p): Add usage.
2011-01-08 14:32:31 +01:00
Glenn Morris
d0981f8286
In Makefiles, -batch implies -q.
...
* leim/makefile.w32-in (RUN_EMACS):
* leim/Makefile.in (RUN-EMACS): -batch implies --no-init-file.
* lisp/makefile.w32-in (EMACSOPT): -batch implies --no-init-file.
* src/makefile.w32-in ($(EMACS)):
* src/Makefile.in (emacs$(EXEEXT)): -batch implies -q.
2011-01-07 18:41:14 -08:00
Glenn Morris
9dc3366b13
Fix bug#7750.
...
* src/xdisp.c (syms_of_xdisp) <Qrisky_local_variable>: Move from here...
* src/emacs.c (syms_of_emacs) <Qrisky_local_variable>: ...to here.
2011-01-07 18:31:57 -08:00
Andreas Schwab
466cbae99a
Fix some resource leaks in ImageMagick image loader
...
* src/image.c (imagemagick_load_image): Fix some resource leaks and
error handling.
2011-01-07 23:33:32 +01:00
Chong Yidong
8c51d2a2c2
Allow format args for y-or-n-p and yes-or-no-p.
...
* lisp/subr.el (y-or-n-p): Accept format string args.
* src/fns.c (Fyes_or_no_p): Accept format string args.
2011-01-07 12:34:02 -05:00
Glenn Morris
66b7b0fe80
Add --no-site-lisp option, make -Q use it. (Bug#5707)
...
* lisp/Makefile.in (EMACSOPT): Add --no-site-lisp.
* src/emacs.c (no_site_lisp): New int.
(USAGE1): Add --no-site-lisp, mention -Q uses it.
(main): Set no_site_lisp.
(standard_args): Add --no-site-lisp.
* src/lisp.h (no_site_lisp): New int.
* src/lread.c (init_lread): If no_site_lisp, don't re-add site-lisp
directories to Vload_path.
* etc/NEWS: Mention --no-site-lisp.
2011-01-06 19:10:39 -08:00
Andreas Schwab
2018939f5d
Use __builtin_unwind_init if available
...
* configure.in: Check for __builtin_unwind_init.
* src/alloc.c (mark_stack): Use __builtin_unwind_init if available.
2011-01-05 14:09:07 +01:00
Michael Albinus
6ed843e5b8
* dbusbind.c (Fdbus_register_method): Added optional parameter
...
dont_register_service. Updated docstring accordingly.
2011-01-04 12:11:43 +01:00
Glenn Morris
3f9b70909a
* src/emacs.c (emacs_copyright): Update short copyright year to 2011.
2011-01-03 20:42:43 -08:00
Jan Djärv
0ad254447b
Backport bug 7517 fixes from trunk.
...
* coding.h (ENCODE_UTF_8): Remove "Used by ..." comment.
* nsfns.m (ns_set_name_iconic): Remove.
(ns_get_screen): Don't assign integer to f.
(ns_set_name_internal): New function.
(Vicon_title_format): Extern declare.
(ns_set_name): Call ns_set_name_internal.
(x_explicitly_set_name): Remove call to ns_set_name_iconic.
(x_implicitly_set_name): Ditto.
(x_set_title): Remove commet about EXPLICIT. Call ns_set_name_internal.
(ns_set_name_as_filename): Encode name with ENCODE_UTF_8.
Always use buffer name for title and buffer filename only for
RepresentedFilename. Handle bad UTF-8 in buffer name (Bug#7517).
2011-01-03 22:26:22 +01:00
Eli Zaretskii
d82bce4a05
Don't use png_jmpbuf, it doesn't work with dynamic loading.
...
image.c (png_jmpbuf): Remove definition.
(my_png_error, png_load): Don't use png_jmpbuf.
2011-01-03 21:35:59 +02:00
Eli Zaretskii
fb724e5537
Don't use png_jmpbuf, it doesn't work with dynamic loading.
...
image.c (png_jmpbuf): Remove definition.
(my_png_error, png_load): Don't use png_jmpbuf.
2011-01-03 21:32:41 +02:00