Daniel Colascione
f99714cef2
* xdisp.c (start_hourglass): Call w32_note_current_window when
...
HAVE_NTGUI but not WINDOWSNT, resolving a problem that caused Emacs to
display the hourglass cursor forever.
2012-10-08 11:22:42 -08:00
Daniel Colascione
61af95a53c
Merge into trunk
2012-10-08 10:47:29 -08:00
Daniel Colascione
821812e247
* w32fns.c (Fx_display_color_cells): Instead of using NCOLORS,
...
which is broke under remote desktop, calculating the number of
colors available for a display based on the display's number of
planes and number of bits per pixel per plane. (bug#10397).
2012-10-08 10:44:42 -08:00
Jan Djärv
62c480c90a
Fix wide-int related error and cache error in NS font handling.
...
* nsfont.m (Vfonts_in_cache): New variable.
(nsfont_open): Use unsignedLongLongValue for cache in case wide ints
are used. Add cached fonts to Vfonts_in_cache.
(syms_of_nsfont): Initialize and staticpro Vfonts_in_cache.
2012-10-08 20:31:39 +02:00
Juanma Barranquero
1337353856
lisp/generic-x.el: Make javascript-generic-mode an obsolete alias of js-mode.
2012-10-08 18:20:59 +02:00
Glenn Morris
6b49792308
Add 2012 to copyright years
2012-10-08 09:11:41 -07:00
Glenn Morris
dc098568e2
Distinguish MS Windows
2012-10-08 09:09:00 -07:00
Juanma Barranquero
46979e0b4e
src/makefile.w32-in: Update dependencies.
2012-10-08 16:37:04 +02:00
Juanma Barranquero
fd5125adfe
nt/config.nt: Sync with autogen/config.in.
...
(HAVE_NTGUI): New macro.
src/makefile.w32-in (LOCAL_FLAGS): Don't define HAVE_NTGUI,
it's now in nt/config.nt.
2012-10-08 16:14:22 +02:00
Michael Albinus
775a132d58
* ffap.el (ffap-replace-file-component): Support Tramp file name
...
syntax, not only ange-ftp's one.
2012-10-08 15:59:18 +02:00
Juanma Barranquero
607446ba2c
src/w32term.c: Remove leftover declaration of keyboard_codepage.
2012-10-08 15:46:03 +02:00
Eli Zaretskii
15c720a360
Fix w32 dependencies due to introduction of w32common.h.
...
src/makefile.w32-in ($(BLD)/unexw32.$(O)):
($(BLD)/w32.$(O)):
($(BLD)/w32console.$(O)):
($(BLD)/w32fns.$(O)):
($(BLD)/w32heap.$(O)):
($(BLD)/w32menu.$(O)):
($(BLD)/w32proc.$(O)): Add w32common.h.
2012-10-08 15:31:14 +02:00
Daniel Colascione
501199a3db
Code cleanup for cygw32
2012-10-08 04:53:18 -08:00
Eli Zaretskii
c54ebba4e0
Update w32 dependencies in the wake of cygw32 changes.
...
src/makefile.w32-in (FONT_H): Add $(FRAME_H).
(W32TERM_H): Add $(ATIMER_H) and $(FRAME_H).
($(BLD)/emacs.$(O), $(BLD)/w32console.$(O)): Update dependencies.
(GLOBAL_SOURCES): Add cygw32.c.
lib-src/makefile.w32-in (obj): Add cygw32.o.
2012-10-08 14:21:04 +02:00
Eli Zaretskii
b6f4e30044
Avoid compiler warnings on w32, caused by cygw32 changes.
...
src/w32fns.c (w32_color_map_lookup, x_to_w32_color): Argument is now
'const char *'.
(x_to_w32_color): Don't modify the argument, modify a copy instead.
2012-10-08 13:19:35 +02:00
Eli Zaretskii
303cc1d110
Fix wording of comments in w32fns.c.
2012-10-08 13:03:00 +02:00
Daniel Colascione
93aa5c811f
Improve fix for jpeglib build break
2012-10-08 02:26:10 -08:00
Glenn Morris
5c0255d90b
Auto-commit of generated files.
2012-10-08 06:17:36 -04:00
Eli Zaretskii
8ee4c6ce76
Commit ChangeLog for last change.
2012-10-08 12:07:16 +02:00
Eli Zaretskii
a1d638346f
Remove CHECK_LIB_AVAILABLE from image.c, mistakenly reintroduced by cygw32.
...
src/image.c (CHECK_LIB_AVAILABLE): Remove, no longer used.
2012-10-08 12:05:50 +02:00
Eli Zaretskii
d424f3d8f5
Fix conditional macros in emacs.c, introduced by cygw32 addition.
...
src/emacs.c (DAEMON_MUST_EXEC) [HAVE_NTGUI]: Define this only on Cygwin.
2012-10-08 12:01:59 +02:00
Eli Zaretskii
bb84afd570
Fix comments in src/cygw32.h.
2012-10-08 11:52:25 +02:00
Eli Zaretskii
245dc6da18
Fix copyright years in new cygw32 files.
2012-10-08 11:41:04 +02:00
Eli Zaretskii
8db5e1790b
Fix the MSDOS configury due to changes in 2012-10-08T08:23:13Z!dancol@dancol.org.
...
msdos/sed1v2.inp (W32_LIBS, W32_OBJ): Edit to empty.
2012-10-08 11:32:40 +02:00
Eli Zaretskii
64a261b1ea
etc/NEWS: Fix wording in the Cygwin-related entries of the last change.
2012-10-08 11:23:31 +02:00
Eli Zaretskii
2ae3a8a712
Temporary fix for changes in 2012-10-08T08:23:13Z!dancol@dancol.org.
2012-10-08 11:19:20 +02:00
Daniel Colascione
7148eba270
Merge cygw32
2012-10-08 00:23:13 -08:00
Daniel Colascione
a28a3ae362
fix NT build
2012-10-08 00:18:01 -08:00
Daniel Colascione
de6e3a605d
Add NEWS entries for cygw32
2012-10-08 00:11:21 -08:00
Daniel Colascione
e08348a0e6
Changelog entries for cygw32
2012-10-07 23:58:40 -08:00
Glenn Morris
97fbed8759
Fix for url-https.el neing merged into url-http.el
...
* lisp/url/url-methods.el (url-scheme-get-property): url-https.el was
merged into url-http.el, so load the latter for https.
Fixes: debbugs:12599
2012-10-08 00:47:23 -07:00
Glenn Morris
63820c5c02
Trivial NEWS copyedits
2012-10-08 00:23:49 -07:00
Glenn Morris
57f1dee445
* lisp/cus-start.el (message-log-max): Set :version.
...
* etc/NEWS: No need to mention a simple customization option whose
default has changed, since the :version tag does that.
2012-10-08 00:18:02 -07:00
Glenn Morris
d71a6517cb
Trivial NEWS copyedits
2012-10-08 00:10:21 -07:00
Glenn Morris
cad4f2902e
Document calendar-month-header
...
* doc/emacs/cal-xtra.texi (Calendar Customizing): Mention calendar-month-header.
* etc/NEWS: Related edit.
2012-10-08 00:06:36 -07:00
Glenn Morris
3ab44929c8
* lisp/calendar/calendar.el (calendar-intermonth-header): Doc fix.
2012-10-08 00:05:21 -07:00
Glenn Morris
b859a3833a
Document cal-html-holidays
...
* doc/emacs/calendar.texi (Writing Calendar Files): Mention cal-html-holidays.
* etc/NEWS: Related edit.
2012-10-08 00:00:24 -07:00
Glenn Morris
e499e60744
Fix ChangeLog typo
2012-10-07 23:58:36 -07:00
Martin Rudalics
6a0886306e
In edebug-pop-to-buffer don't try to split the minibuffer window (Bug#10851).
...
* emacs-lisp/edebug.el (edebug-pop-to-buffer): Don't try to split
the minibuffer window (Bug#10851).
2012-10-08 08:42:29 +02:00
Fabián Ezequiel Gallina
8dbce54cc7
Enhancements on forward-sexp movement.
...
* progmodes/python.el (python-nav-beginning-of-statement)
(python-nav-end-of-statement): Return point-marker.
(python-nav-forward-sexp): lisp-like forward-sexp behavior.
(python-info-current-symbol)
(python-info-statement-starts-block-p): Rename from
python-info-beginning-of-block-p.
(python-info-statement-ends-block-p): Rename from
python-info-end-of-block-p.
(python-info-beginning-of-statement-p)
(python-info-end-of-statement-p)
(python-info-beginning-of-block-p, python-info-end-of-block-p):
New functions.
2012-10-08 02:19:15 -03:00
Stefan Monnier
5acd2b3ece
* lisp/comint.el (comint-preinput-scroll-to-bottom): Preserve the
...
frame-selected-windows.
2012-10-07 20:12:26 -04:00
Daniel Colascione
36a305a723
Merge from trunk
2012-10-07 14:31:58 -08:00
Stefan Monnier
795b1482a9
* lisp/subr.el (read-passwd-map): Don't use `defconst'.
...
(read-passwd): Remove a few more potential sources of leaks.
Fixes: debbugs:12597
2012-10-07 15:48:02 -04:00
Fabián Ezequiel Gallina
f27c99dc7e
* progmodes/python.el (inferior-python-mode)
...
(python-shell-make-comint): Fixed initialization of local
variables copied from parent buffer.
2012-10-07 16:37:37 -03:00
Eli Zaretskii
98daa89356
Don't abort when ralloc.c:relinquish cannot return a heap to the system.
...
src/ralloc.c (relinquish): If a heap is ready to be relinquished,
but it still has blocs in it, don't return it to the system,
instead of aborting. (Bug#12402)
2012-10-07 20:33:10 +02:00
David Engster
0aada74e88
Merge changes from CEDET upstream.
2012-10-07 20:29:07 +02:00
David Engster
740877cd23
* semantic/wisent/python.el (semantic-ctxt-current-function)
...
(semantic-ctxt-current-assignment): New overrides, simply returning
nil. The defaults do not work correctly and can send the parser in
an inifinite loop (bug#12458).
2012-10-07 20:23:50 +02:00
David Engster
31e4cc2a18
* semantic/ede-grammar.el (project-compile-target): Fix grammar
...
compilation after introduction of %provide statement.
2012-10-07 20:19:58 +02:00
David Engster
9322b306fc
* semantic.el (semantic-new-buffer-setup-functions): Remove setup
...
function for `f90-mode', since the parser only exists upstream.
2012-10-07 20:12:46 +02:00
Jan Djärv
fcacb55843
* lisp/term/ns-win.el (ns-read-file-name): Update declaration to match
...
nsfns.m.
(ns-respond-to-change-font): Change fontsize separatly so we are sure
it is set when font is acted upon.
2012-10-07 19:47:41 +02:00