From 6312e5f78c6904267e0bebff5b8e9b4138e1491b Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Fri, 3 Jun 2005 10:40:12 +0000 Subject: *** empty log message *** --- src/ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index dbcac952b51..1982a76162e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2005-06-03 Juanma Barranquero + + * xfaces.c (Finternal_lisp_face_equal_p): Really report + on faces in a frame, if the argument FRAME is non-nil. + Improve argument/docstring consistency. + 2005-06-02 Kim F. Storm * xdisp.c (MODE_LINE_NOPROP_LEN): New macro. -- cgit v1.3 From 555228aa599a4132c51d7daae62377f1e1ae8921 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Fri, 3 Jun 2005 23:47:56 +0000 Subject: *** empty log message *** --- lisp/ChangeLog | 2 ++ src/ChangeLog | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) (limited to 'src/ChangeLog') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index af17cd24d4a..eb2206642ef 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2005-06-04 Kim F. Storm + * simple.el (line-move): Only call sit-for when moving backwards. + * ido.el (ido-make-merged-file-list-1): New defun split from ido-make-merged-file-list. (ido-make-merged-file-list): Bind throw-on-input around call to diff --git a/src/ChangeLog b/src/ChangeLog index 1982a76162e..5f724fe8450 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,19 @@ +2005-06-04 Kim F. Storm + + * coding.c (decode_coding_string): Handle CODING_FINISH_INTERRUPT. + + * callproc.c (Fcall_process): Don't use alloca to gradually + increase size of buf, as it effectively uses twice the necessary + space on the stack. Instead, pre-allocate buf of full size, and + gradually increase the read size. + + * bytecode.c (BYTE_CODE_QUIT): Check Vthrow_on_input. + + * eval.c (unbind_to): Preserve value of Vquit_flag. + + * xterm.c (handle_one_xevent): Also ignore mouse motion just + before a button release event. + 2005-06-03 Juanma Barranquero * xfaces.c (Finternal_lisp_face_equal_p): Really report -- cgit v1.3 From b89875707ce5b8e88097b7d4d365b480b17733a6 Mon Sep 17 00:00:00 2001 From: Jan Djärv Date: Sat, 4 Jun 2005 08:06:57 +0000 Subject: * macmenu.c (cleanup_popup_menu): New function. (Fx_popup_menu): unwind protect cleanup_popup_menu in case mac_menu_show Quit:s. (mac_menu_show): Quit on cancel if not popped up on click (i.e. a dialog). --- src/ChangeLog | 8 ++++++++ src/macmenu.c | 16 ++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index 5f724fe8450..36650215350 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2005-06-04 Jan Dj,Ad(Brv + + * macmenu.c (cleanup_popup_menu): New function. + (Fx_popup_menu): unwind protect cleanup_popup_menu in case + mac_menu_show Quit:s. + (mac_menu_show): Quit on cancel if not popped up on click (i.e. + a dialog). + 2005-06-04 Kim F. Storm * coding.c (decode_coding_string): Handle CODING_FINISH_INTERRUPT. diff --git a/src/macmenu.c b/src/macmenu.c index 54393bca594..e97a968d92d 100644 --- a/src/macmenu.c +++ b/src/macmenu.c @@ -602,6 +602,13 @@ list_of_items (pane) } } +static Lisp_Object +cleanup_popup_menu (arg) + Lisp_Object arg; +{ + discard_menu_items (); +} + DEFUN ("x-popup-menu", Fx_popup_menu, Sx_popup_menu, 2, 2, 0, doc: /* Pop up a deck-of-cards menu and return user's selection. POSITION is a position specification. This is either a mouse button @@ -647,6 +654,8 @@ cached information about equivalent key sequences. */) int keymaps = 0; int for_click = 0; struct gcpro gcpro1; + int specpdl_count = SPECPDL_INDEX (); + #ifdef HAVE_MENUS if (! NILP (position)) @@ -806,13 +815,13 @@ cached information about equivalent key sequences. */) #ifdef HAVE_MENUS /* Display them in a menu. */ + record_unwind_protect (cleanup_popup_menu, Qnil); BLOCK_INPUT; selection = mac_menu_show (f, xpos, ypos, for_click, keymaps, title, &error_name); UNBLOCK_INPUT; - - discard_menu_items (); + unbind_to (specpdl_count, Qnil); UNGCPRO; #endif /* HAVE_MENUS */ @@ -1931,6 +1940,9 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error) } } } + else if (!for_click) + /* Make "Cancel" equivalent to C-g. */ + Fsignal (Qquit, Qnil); return Qnil; } -- cgit v1.3 From 196ac78ce159aaeb675c57e8cabb5747cbba3713 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sat, 4 Jun 2005 18:09:16 +0000 Subject: (popup_get_selection): Click not in menu deactivates menu. --- src/ChangeLog | 4 ++++ src/xmenu.c | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index 36650215350..c0466275d4a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2005-06-04 Richard M. Stallman + + * xmenu.c (popup_get_selection): Click not in menu deactivates menu. + 2005-06-04 Jan Dj,Ad(Brv * macmenu.c (cleanup_popup_menu): New function. diff --git a/src/xmenu.c b/src/xmenu.c index 6f758d12fc7..6e3a21604c1 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -1235,6 +1235,10 @@ popup_get_selection (initial_event, dpyinfo, id, do_timers) if (event.type == ButtonRelease && dpyinfo->display == event.xbutton.display) { + /* If the click is not on the menu, deactivate the menu. */ + if (x_any_window_to_frame (dpyinfo, event.xexpose.window)) + popup_activated_flag = 0; + dpyinfo->grabbed &= ~(1 << event.xbutton.button); #ifdef USE_MOTIF /* Pretending that the event came from a Btn1Down seems the only way to convince Motif to -- cgit v1.3 From 910182298af7f21498c03a2edfdf4331539de386 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 4 Jun 2005 19:47:24 +0000 Subject: *** empty log message *** --- lisp/ChangeLog | 5 +++++ src/ChangeLog | 4 ++++ 2 files changed, 9 insertions(+) (limited to 'src/ChangeLog') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dbfdd995279..7fcdef18f5e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-06-04 Matt Hodges + + * iswitchb.el (iswitchb-get-matched-buffers): Handle + invalid-regexp errors in post-command-hook. + 2005-06-04 David Reitter (tiny change) * url-http.el (url-http-chunked-encoding-after-change-function): diff --git a/src/ChangeLog b/src/ChangeLog index c0466275d4a..2264a791014 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2005-06-04 Eli Zaretskii + + * makefile.w32-in (DOC): Define to point to the generated DOC-X. + 2005-06-04 Richard M. Stallman * xmenu.c (popup_get_selection): Click not in menu deactivates menu. -- cgit v1.3 From d01a9710746df2584e6f24b1398cbe2d0e87728d Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 4 Jun 2005 20:00:54 +0000 Subject: *** empty log message *** --- man/ChangeLog | 23 +++++++++++++++++++++++ src/ChangeLog | 3 +++ 2 files changed, 26 insertions(+) (limited to 'src/ChangeLog') diff --git a/man/ChangeLog b/man/ChangeLog index 9fe0433aaff..74b6e19d0ed 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,26 @@ +2005-06-05 Chong Yidong + + * emacs.texi: Rename Hardcopy to Printing. + Make PostScript and PostScript Variables subnodes of it. + + * misc.texi (Printing): Rename node from Hardcopy. + Mention menu bar options. + Move PostScript and PostScript Variables to submenu. + (Printing package): New node. + + * mark.texi (Using Region): Change Hardcopy xref to Printing. + + * dired.texi (Operating on Files): Likewise. + + * calendar.texi (Displaying the Diary): Likewise. + + * msdog.texi (MS-DOS Printing, MS-DOS Processes): Likewise. + + * glossary.texi (Glossary): Likewise. + + * frames.texi (Mode Line Mouse): Mention mode-line-highlight + effect. + 2005-06-04 Richard M. Stallman * trouble.texi (After a Crash): Polish previous change. diff --git a/src/ChangeLog b/src/ChangeLog index 2264a791014..9d9062e2aa9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2005-06-04 Eli Zaretskii + * emacs.c: Include w32heap.h, to avoid compiler warning about + sbrk. + * makefile.w32-in (DOC): Define to point to the generated DOC-X. 2005-06-04 Richard M. Stallman -- cgit v1.3 From b6f0a39717ed4be8f35c059ab32d4b4bd9199129 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 4 Jun 2005 20:09:13 +0000 Subject: *** empty log message *** --- lisp/ChangeLog | 20 ++++++++++++++++++-- src/ChangeLog | 2 ++ 2 files changed, 20 insertions(+), 2 deletions(-) (limited to 'src/ChangeLog') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7fcdef18f5e..7b9058c6284 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,23 @@ 2005-06-04 Matt Hodges - * iswitchb.el (iswitchb-get-matched-buffers): Handle - invalid-regexp errors in post-command-hook. + * iswitchb.el (iswitchb-single-match-face) + (iswitchb-current-match-face, iswitchb-virtual-matches-face) + (iswitchb-invalid-regexp-face): New faces. + (iswitchb-completions): Use them. + (iswitchb-use-faces): Renamed from iswitchb-use-fonts, which is + now marked as an obsolete alias. + (iswitchb-read-buffer): Remove check for bound font variables. + (iswitchb-invalid-regexp): New free variable. + (iswitchb-get-matched-buffers): Catch invalid-regexp errors and + set iswitchb-invalid-regexp. + (iswitchb, iswitchb-complete, iswitchb-completions): Deal with + invalid regexps. + (iswitchb-completions): Add check for complete match when entering + a regexp. + (iswitchb-completions): Remove require-match argument. + (iswitchb-exhibit): Fix caller. + (iswitchb-common-match-inserted): New variable. + (iswitchb-complete, iswitchb-completion-help): Use it. 2005-06-04 David Reitter (tiny change) diff --git a/src/ChangeLog b/src/ChangeLog index 9d9062e2aa9..f4f9b8d6537 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2005-06-04 Eli Zaretskii + * s/ms-w32.h (fileno): Don't define if already defined. + * emacs.c: Include w32heap.h, to avoid compiler warning about sbrk. -- cgit v1.3 From 1a8fb4262f0bfaa1244885834feb8963dd615d6a Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 4 Jun 2005 20:40:00 +0000 Subject: *** empty log message *** --- lib-src/ChangeLog | 4 ++++ nt/ChangeLog | 4 ++++ src/ChangeLog | 4 ++++ 3 files changed, 12 insertions(+) (limited to 'src/ChangeLog') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index aa9d3fe7fc6..196d2fe70dc 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2005-06-04 Eli Zaretskii + + * ntlib.h (fileno): Don't define if already defined. + 2005-05-25 Thien-Thi Nguyen * yow.c (setup_yow): Use EXIT_FAILURE in case no separators found. diff --git a/nt/ChangeLog b/nt/ChangeLog index 33507ef581d..5061cec0d8f 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2005-06-04 Eli Zaretskii + + * inc/pwd.h (getpwnam, getpwuid): Add prototypes. + 2005-05-24 Juanma Barranquero * INSTALL: Add more pointers to ports of Unix tools to Windows, diff --git a/src/ChangeLog b/src/ChangeLog index f4f9b8d6537..3c72b4e7982 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2005-06-04 Eli Zaretskii + * w32.c (gettimeofday): Use struct _timeb, not struct timeb. + (open_unc_volume): Cast return value of map_w32_filename, to avoid + compiler warnings. + * s/ms-w32.h (fileno): Don't define if already defined. * emacs.c: Include w32heap.h, to avoid compiler warning about -- cgit v1.3 From 17a7c5c2b024a97106c865f76e2cbd3b90591615 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Sun, 5 Jun 2005 17:09:55 +0000 Subject: *** empty log message *** --- src/ChangeLog | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index 3c72b4e7982..12fc70289aa 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -6,8 +6,7 @@ * s/ms-w32.h (fileno): Don't define if already defined. - * emacs.c: Include w32heap.h, to avoid compiler warning about - sbrk. + * emacs.c: Include w32heap.h, to avoid compiler warning about sbrk. * makefile.w32-in (DOC): Define to point to the generated DOC-X. -- cgit v1.3 From a0c3832890dad9977f12eacd1beafb9c50dd7a12 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 5 Jun 2005 19:16:55 +0000 Subject: *** empty log message *** --- nt/ChangeLog | 5 +++++ src/ChangeLog | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'src/ChangeLog') diff --git a/nt/ChangeLog b/nt/ChangeLog index 5061cec0d8f..cfc93422a69 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,8 @@ +2005-06-05 Eli Zaretskii + + * inc/sys/socket.h: Change arg 4 of sys_setsockopt to + `const void *', for consistency with Posix. + 2005-06-04 Eli Zaretskii * inc/pwd.h (getpwnam, getpwuid): Add prototypes. diff --git a/src/ChangeLog b/src/ChangeLog index 12fc70289aa..7ddc5911729 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2005-06-05 Eli Zaretskii + + * w32.c (sys_setsockopt): Change arg 4 to `const void *'. In the + call to pfn_setsockopt, cast optval to `const char *'. + 2005-06-04 Eli Zaretskii * w32.c (gettimeofday): Use struct _timeb, not struct timeb. -- cgit v1.3 From a9b4333620eb259e974445066a8e64cee0c21d69 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Mon, 6 Jun 2005 00:45:57 +0000 Subject: *** empty log message *** --- src/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index 7ddc5911729..f5bbebbb760 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -5129,7 +5129,7 @@ 2004-06-11 Kenichi Handa - * coding.c (decode_coding_string): Check CODING_FINISH_INTERRUPT. + * coding.c (encode_coding_string): Check CODING_FINISH_INTERRUPT. 2004-06-11 Kim F. Storm -- cgit v1.3 From 5494d7bcdba82b2c33278b8d37fee6b0c9bd14e5 Mon Sep 17 00:00:00 2001 From: Jan Djärv Date: Mon, 6 Jun 2005 10:38:40 +0000 Subject: * window.c (delete_window): Handle the case where a h/vchild has a h/vchild. --- src/ChangeLog | 5 +++++ src/window.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 53 insertions(+), 1 deletion(-) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index f5bbebbb760..308d55187d2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2005-06-06 Jan Dj,Ad(Brv + + * window.c (delete_window): Handle the case where a h/vchild has + a h/vchild. + 2005-06-05 Eli Zaretskii * w32.c (sys_setsockopt): Change arg 4 to `const void *'. In the diff --git a/src/window.c b/src/window.c index faf88c91ffc..4839830b177 100644 --- a/src/window.c +++ b/src/window.c @@ -1452,8 +1452,10 @@ delete_window (window) tem = par->hchild; if (NILP (tem)) tem = par->vchild; - if (NILP (XWINDOW (tem)->next)) + if (NILP (XWINDOW (tem)->next)) { replace_window (parent, tem); + par = XWINDOW (tem); + } /* Since we may be deleting combination windows, we must make sure that not only p but all its children have been marked as deleted. */ @@ -1465,6 +1467,51 @@ delete_window (window) /* Mark this window as deleted. */ p->buffer = p->hchild = p->vchild = Qnil; + if (! NILP (par->parent)) + par = XWINDOW (par->parent); + + /* Check if we have a v/hchild with a v/hchild. In that case remove + one of them. */ + + if (! NILP (par->vchild) && ! NILP (XWINDOW (par->vchild)->vchild)) + { + p = XWINDOW (par->vchild); + par->vchild = p->vchild; + tem = p->vchild; + } + else if (! NILP (par->hchild) && ! NILP (XWINDOW (par->hchild)->hchild)) + { + p = XWINDOW (par->hchild); + par->hchild = p->hchild; + tem = p->hchild; + } + else + p = 0; + + if (p) + { + while (! NILP (tem)) { + XWINDOW (tem)->parent = p->parent; + if (NILP (XWINDOW (tem)->next)) + break; + tem = XWINDOW (tem)->next; + } + if (! NILP (tem)) { + /* The next of the v/hchild we are removing is now the next of the + last child for the v/hchild: + Before v/hchild -> v/hchild -> next1 -> next2 + | + -> next3 + After: v/hchild -> next1 -> next2 -> next3 + */ + XWINDOW (tem)->next = p->next; + if (! NILP (p->next)) + XWINDOW (p->next)->prev = tem; + } + p->next = p->prev = p->vchild = p->hchild = p->buffer = Qnil; + } + + /* Adjust glyph matrices. */ adjust_glyphs (f); UNBLOCK_INPUT; -- cgit v1.3 From c476bcb06c7fff47d9223555be774236e06462ce Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Mon, 6 Jun 2005 12:37:46 +0000 Subject: *** empty log message *** --- etc/ChangeLog | 7 +++++++ lisp/ChangeLog | 22 ++++++++++++++++++++++ src/ChangeLog | 8 ++++++++ 3 files changed, 37 insertions(+) (limited to 'src/ChangeLog') diff --git a/etc/ChangeLog b/etc/ChangeLog index 2a21b596300..7a09fa3ac23 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,10 @@ +2005-06-06 Juri Linkov + + * TUTORIAL.cs, TUTORIAL.sk: Change NBSP to space. + + * TUTORIAL.ro: Change NBSP to space. Move coding cookie from the + second line to Local Variables. Fix title line. + 2005-05-30 Miles Bader * emacs-buffer.gdb: Remove RCS keywords. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b03d78af3cd..570b6a91a06 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,25 @@ +2005-06-06 Juri Linkov + + * font-lock.el (font-lock-regexp-backslash) + (font-lock-regexp-backslash-construct): New faces. + (lisp-font-lock-keywords-2): Use new faces. Match `?:' only + after `('. Add `while-no-input' to control structures. + + * faces.el (no-break-space, shadow): New faces. + (escape-glyph): Use less loud colors pink2 and red4. + + * diff-mode.el (diff-context-face) + * dired.el (dired-ignored) + * rfn-eshadow.el (file-name-shadow) + * tmm.el (tmm-inactive-face): Inherit from `shadow' face. + + * info.el (Info-title-1-face): Use green instead of yellow because + bold yellow is not readable on light backgrounds. + + * progmodes/compile.el (compilation-start): Move `erase-buffer' up + before selecting the desired mode to not spend time fontifying + old contents. + 2005-06-06 Juanma Barranquero * isearchb.el (isearchb): Don't pass a spurious second argument to diff --git a/src/ChangeLog b/src/ChangeLog index 308d55187d2..5d49e82d875 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2005-06-06 Juri Linkov + + * xdisp.c (Qno_break_space): New variable. + (syms_of_xdisp): Initialize it. + (get_next_display_element): Add no-break space and soft hypen + codes for iso8859-2 and iso8859-5. Don't add `\' for them. + Use `no-break-space' face for no-break spaces. + 2005-06-06 Jan Dj,Ad(Brv * window.c (delete_window): Handle the case where a h/vchild has -- cgit v1.3 From ce6e10af528e2caeee454097bde62bc65f2ea220 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Mon, 6 Jun 2005 12:58:13 +0000 Subject: *** empty log message *** --- lisp/ChangeLog | 34 ++++++++++++++++++++++++++++++++++ man/ChangeLog | 7 +++++++ src/ChangeLog | 4 ++++ 3 files changed, 45 insertions(+) (limited to 'src/ChangeLog') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c3a74cfbd28..874572c69b7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,36 @@ +2005-06-06 Richard M. Stallman + + * progmodes/make-mode.el (makefile-dependency-regex): Handle whitespace + just like other allowed characters. + (makefile-match-dependency): Exclude leading and training whitespace + from the range of regexp subexp 1. + (makefile-macroassign-regex): Don't try to match the body, + just the name of the macro being defined. + + * info.el (Info-read-node-name-2): New function. + (Info-read-node-name-1): Use that. + Add a completion-base-size-function property. + + * simple.el (completion-setup-function): Look for + completion-base-size-function property of + minibuffer-completion-table. + + * files.el (locate-file-completion): Doc fix. + + * printing.el: Don't call pr-update-menus; user must do that. + + * emacs-lisp/debug.el (debugger-window): New variable. + (debug): Use debugger-window if it is set and still alive. + Record debugger-window for next entry. + + * mail/supercite.el (sc-mail-glom-frame): Mark as risky. + +2005-06-05 Matthias F,Av(Brste + + * files.el (hack-local-variables-confirm): New arg FLAG-TO-CHECK. + (hack-one-local-variable, hack-local-variables) + (hack-local-variables-prop-line): Pass that arg. + 2005-06-06 Kim F. Storm * ido.el (ido-first-match, ido-only-match, ido-subdir) @@ -25,6 +58,7 @@ before selecting the desired mode to not spend time fontifying old contents. +>>>>>>> 1.7678 2005-06-06 Juanma Barranquero * isearchb.el (isearchb): Don't pass a spurious second argument to diff --git a/man/ChangeLog b/man/ChangeLog index 74b6e19d0ed..d50afecf0cc 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,10 @@ +2005-06-06 Richard M. Stallman + + * misc.texi (Printing Package): Explain how to initialize + printing package. + + * cmdargs.texi (Action Arguments): Clarify directory default for -l. + 2005-06-05 Chong Yidong * emacs.texi: Rename Hardcopy to Printing. diff --git a/src/ChangeLog b/src/ChangeLog index 5d49e82d875..c4734dd67f7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2005-06-06 Richard M. Stallman + + * xmenu.c (popup_get_selection): Undo previous change. + 2005-06-06 Juri Linkov * xdisp.c (Qno_break_space): New variable. -- cgit v1.3 From 24e55febf48bcd6bef8c5a0343a2f7bbcd24637d Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Mon, 6 Jun 2005 16:14:46 +0000 Subject: *** empty log message *** --- src/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index c4734dd67f7..6ae26d7f5e9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2005-06-06 Luc Teirlinck + + * keyboard.c (command_loop_1): Update Vthis_original_command. + 2005-06-06 Richard M. Stallman * xmenu.c (popup_get_selection): Undo previous change. -- cgit v1.3 From b6cc2ad0e9215dd8da7a4adeee5aeecf45a256c2 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 6 Jun 2005 19:29:58 +0000 Subject: ($(BLD)/emacs.$(O), $(BLD)/w32select.$(O)): Depend on w32heap.h. --- src/ChangeLog | 14 ++++++++++++++ src/makefile.w32-in | 2 ++ 2 files changed, 16 insertions(+) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index 6ae26d7f5e9..ff49eff9284 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,17 @@ +2005-06-06 Eli Zaretskii + + * w32heap.h (OFFSET_TO_RVA, RVA_TO_OFFSET, RVA_TO_PTR): Remove + macros. + + * unexw32.c (RVA_TO_PTR): Moved here from w32heap.h. + + * w32proc.c (RVA_TO_PTR): New macro. + + * w32heap.c (RVA_TO_PTR): No need to #undef now. + + * makefile.w32-in ($(BLD)/emacs.$(O), $(BLD)/w32select.$(O)): + Depend on w32heap.h. + 2005-06-06 Luc Teirlinck * keyboard.c (command_loop_1): Update Vthis_original_command. diff --git a/src/makefile.w32-in b/src/makefile.w32-in index b5890593cd8..f25af87cb92 100644 --- a/src/makefile.w32-in +++ b/src/makefile.w32-in @@ -595,6 +595,7 @@ $(BLD)/emacs.$(O) : \ $(SRC)/termhooks.h \ $(SRC)/w32bdf.h \ $(SRC)/w32gui.h \ + $(SRC)/w32heap.h \ $(SRC)/window.h $(BLD)/eval.$(O) : \ @@ -1430,6 +1431,7 @@ $(BLD)/w32select.$(O): \ $(SRC)/systime.h \ $(SRC)/w32bdf.h \ $(SRC)/w32gui.h \ + $(SRC)/w32heap.h \ $(SRC)/w32term.h $(BLD)/w32reg.$(O): \ -- cgit v1.3 From 16d2e7043a77f41e4afbe4dfd98ba6414a479b52 Mon Sep 17 00:00:00 2001 From: Jan Djärv Date: Mon, 6 Jun 2005 20:23:30 +0000 Subject: * macmenu.c (menu_quit_handler, install_menu_quit_handler): New functions for popping down menus on C-g. (set_frame_menubar, mac_menu_show): Call install_menu_quit_handler. * macterm.c: Make mac_quit_char_modifiers and mac_quit_char_keycode non-static. * config.in: Added HAVE_CANCELMENUTRACKING --- src/ChangeLog | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index ff49eff9284..05713fba1dc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,14 @@ +2005-06-06 Jan Dj,Ad(Brv + + * macmenu.c (menu_quit_handler, install_menu_quit_handler): New + functions for popping down menus on C-g. + (set_frame_menubar, mac_menu_show): Call install_menu_quit_handler. + + * macterm.c: Make mac_quit_char_modifiers and mac_quit_char_keycode + non-static. + + * config.in: Added HAVE_CANCELMENUTRACKING + 2005-06-06 Eli Zaretskii * w32heap.h (OFFSET_TO_RVA, RVA_TO_OFFSET, RVA_TO_PTR): Remove -- cgit v1.3 From 3d031334d8861fbb143b40a777da75bee8295660 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 6 Jun 2005 21:33:29 +0000 Subject: *** empty log message *** --- lisp/ChangeLog | 4 ++++ src/ChangeLog | 5 +++++ 2 files changed, 9 insertions(+) (limited to 'src/ChangeLog') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0ae3efa38e8..d3f7c9e175c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2005-06-06 Stefan Monnier + + * international/iso-cvt.el (iso-sgml2iso-trans-tab): Add NBSP. + 2005-06-06 Luc Teirlinck * font-lock.el (font-lock-add-keywords): Doc fix. diff --git a/src/ChangeLog b/src/ChangeLog index 05713fba1dc..9b6d5f93744 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2005-06-06 Stefan Monnier + + * xterm.c (x_create_toolkit_scroll_bar): Use XtNarrowScrollbars + if available. + 2005-06-06 Jan Dj,Ad(Brv * macmenu.c (menu_quit_handler, install_menu_quit_handler): New -- cgit v1.3 From 8b793bed5341add3be4ece580ace65dfd5aa24bf Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Tue, 7 Jun 2005 13:19:11 +0000 Subject: *** empty log message *** --- src/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index 9b6d5f93744..0651dc206a0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2005-06-07 Kim F. Storm + + * process.c: Improve commentary for adaptive read buffering. + 2005-06-06 Stefan Monnier * xterm.c (x_create_toolkit_scroll_bar): Use XtNarrowScrollbars -- cgit v1.3 From 602907aea1d3cbebcbe51ca1be18c043b5df3140 Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Tue, 7 Jun 2005 14:32:23 +0000 Subject: * xdisp.c (note_mode_line_or_margin_highlight): Check the overlapping of re-rendering area to avoid flickering. (note_mouse_highlight): Call clear_mouse_face if PART is not ON_MODE_LINE nor ON_HEADER_LINE. --- src/ChangeLog | 7 +++++++ src/xdisp.c | 34 ++++++++++++++++++++++++---------- 2 files changed, 31 insertions(+), 10 deletions(-) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index 0651dc206a0..003668db560 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2005-06-07 Masatake YAMATO + + * xdisp.c (note_mode_line_or_margin_highlight): Check + the overlapping of re-rendering area to avoid flickering. + (note_mouse_highlight): Call clear_mouse_face if PART + is not ON_MODE_LINE nor ON_HEADER_LINE. + 2005-06-07 Kim F. Storm * process.c: Improve commentary for adaptive read buffering. diff --git a/src/xdisp.c b/src/xdisp.c index c1ea2a9389a..47421d13115 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -21491,10 +21491,8 @@ note_mode_line_or_margin_highlight (window, x, y, area) int total_pixel_width; int ignore; - - if (clear_mouse_face (dpyinfo)) - cursor = No_Cursor; - + int vpos, hpos; + b = Fprevious_single_property_change (make_number (charpos + 1), Qmouse_face, string, Qnil); if (NILP (b)) @@ -21537,15 +21535,30 @@ note_mode_line_or_margin_highlight (window, x, y, area) for (tmp_glyph = glyph - gpos; tmp_glyph != glyph; tmp_glyph++) total_pixel_width += tmp_glyph->pixel_width; - dpyinfo->mouse_face_beg_col = (x - gpos); - dpyinfo->mouse_face_beg_row = (area == ON_MODE_LINE - ? (w->current_matrix)->nrows - 1 - : 0); + /* Pre calculation of re-rendering position */ + vpos = (x - gpos); + hpos = (area == ON_MODE_LINE + ? (w->current_matrix)->nrows - 1 + : 0); + + /* If the re-rendering position is included in the last + re-rendering area, we should do nothing. */ + if ( window == dpyinfo->mouse_face_window + && dpyinfo->mouse_face_beg_col <= vpos + && vpos < dpyinfo->mouse_face_end_col + && dpyinfo->mouse_face_beg_row == hpos ) + return; + + if (clear_mouse_face (dpyinfo)) + cursor = No_Cursor; + + dpyinfo->mouse_face_beg_col = vpos; + dpyinfo->mouse_face_beg_row = hpos; dpyinfo->mouse_face_beg_x = original_x_pixel - (total_pixel_width + dx); dpyinfo->mouse_face_beg_y = 0; - dpyinfo->mouse_face_end_col = (x - gpos) + gseq_length; + dpyinfo->mouse_face_end_col = vpos + gseq_length; dpyinfo->mouse_face_end_row = dpyinfo->mouse_face_beg_row; dpyinfo->mouse_face_end_x = 0; @@ -21617,7 +21630,8 @@ note_mouse_highlight (f, x, y) /* If we were displaying active text in another window, clear that. Also clear if we move out of text area in same window. */ if (! EQ (window, dpyinfo->mouse_face_window) - || (part != ON_TEXT && !NILP (dpyinfo->mouse_face_window))) + || (part != ON_TEXT && part != ON_MODE_LINE && part != ON_HEADER_LINE + && !NILP (dpyinfo->mouse_face_window))) clear_mouse_face (dpyinfo); /* Not on a window -> return. */ -- cgit v1.3 From 547d2b37972e31e448d85c0b99e64a3e42b4f5ba Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Wed, 8 Jun 2005 15:26:33 +0000 Subject: (get_next_display_element): Alter previous change: Distinguish Vshow_nonbreak_escape = t or not t. For t, use escape_glyph once again, as before previous change. Use space or hyphen for display, instead of the non-ASCII char. (syms_of_xdisp) : Doc fix. --- src/ChangeLog | 15 ++++++++++++++ src/xdisp.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 64 insertions(+), 14 deletions(-) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index 003668db560..cfbbe7b47c0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,18 @@ +2005-06-08 Richard M. Stallman + + * xdisp.c (get_next_display_element): Alter previous change: + Distinguish Vshow_nonbreak_escape = t or not t. + For t, use escape_glyph once again, as before previous change. + Use space or hyphen for display, instead of the non-ASCII char. + (syms_of_xdisp) : Doc fix. + + * process.c (Fstart_process): Don't touch command_channel_p slot. + + * process.h (struct process): Conditionalize slots + adaptive_read_buffering, read_output_delay and read_output_skip + on ADAPTIVE_READ_BUFFERING. + Delete command_channel_p. + 2005-06-07 Masatake YAMATO * xdisp.c (note_mode_line_or_margin_highlight): Check diff --git a/src/xdisp.c b/src/xdisp.c index 47421d13115..fb5b8fbe6f2 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -5116,6 +5116,8 @@ get_next_display_element (it) int face_id, lface_id = 0 ; GLYPH escape_glyph; + /* Handle control characters with ^. */ + if (it->c < 128 && it->ctl_arrow_p) { g = '^'; /* default glyph for Control */ @@ -5147,7 +5149,28 @@ get_next_display_element (it) goto display_control; } - escape_glyph = '\\'; /* default for Octal display */ + /* Handle non-break space in the mode where it only gets + highlighting. */ + + if (! EQ (Vshow_nonbreak_escape, Qt) + && (it->c == 0x8a0 || it->c == 0x920 + || it->c == 0xe20 || it->c == 0xf20)) + { + /* Merge the no-break-space face into the current face. */ + face_id = merge_faces (it->f, Qno_break_space, 0, + it->face_id); + + g = it->c = ' '; + XSETINT (it->ctl_chars[0], g); + ctl_len = 1; + goto display_control; + } + + /* Handle sequences that start with the "escape glyph". */ + + /* the default escape glyph is \. */ + escape_glyph = '\\'; + if (it->dp && INTEGERP (DISP_ESCAPE_GLYPH (it->dp)) && GLYPH_CHAR_VALID_P (XFASTINT (DISP_ESCAPE_GLYPH (it->dp)))) @@ -5157,6 +5180,8 @@ get_next_display_element (it) } if (lface_id) { + /* The display table specified a face. + Merge it into face_id and also into escape_glyph. */ escape_glyph = FAST_GLYPH_CHAR (escape_glyph); face_id = merge_faces (it->f, Qt, lface_id, it->face_id); @@ -5168,25 +5193,31 @@ get_next_display_element (it) it->face_id); } - if (it->c == 0x8a0 || it->c == 0x920 - || it->c == 0xe20 || it->c == 0xf20) - { - /* Merge the no-break-space face into the current face. */ - face_id = merge_faces (it->f, Qno_break_space, 0, - it->face_id); + /* Handle soft hyphens in the mode where they only get + highlighting. */ - g = it->c; + if (! EQ (Vshow_nonbreak_escape, Qt) + && (it->c == 0x8ad || it->c == 0x92d + || it->c == 0xe2d || it->c == 0xf2d)) + { + g = it->c = '-'; XSETINT (it->ctl_chars[0], g); ctl_len = 1; goto display_control; } - if (it->c == 0x8ad || it->c == 0x92d - || it->c == 0xe2d || it->c == 0xf2d) + /* Handle non-break space and soft hyphen + with the escape glyph. */ + + if (it->c == 0x8a0 || it->c == 0x8ad + || it->c == 0x920 || it->c == 0x92d + || it->c == 0xe20 || it->c == 0xe2d + || it->c == 0xf20 || it->c == 0xf2d) { - g = it->c; - XSETINT (it->ctl_chars[0], g); - ctl_len = 1; + XSETINT (it->ctl_chars[0], escape_glyph); + g = it->c = ((it->c & 0xf) == 0 ? ' ' : '-'); + XSETINT (it->ctl_chars[1], g); + ctl_len = 2; goto display_control; } @@ -22854,7 +22885,11 @@ The face used for trailing whitespace is `trailing-whitespace'. */); Vshow_trailing_whitespace = Qnil; DEFVAR_LISP ("show-nonbreak-escape", &Vshow_nonbreak_escape, - doc: /* *Non-nil means display escape character before non-break space and hyphen. */); + doc: /* *Control highlighting of non-break space and soft hyphen. +t means highlight the character itself (for non-break space, +use face `non-break-space'. +nil means no highlighting. +other values mean display the escape glyph before the character. */); Vshow_nonbreak_escape = Qt; DEFVAR_LISP ("void-text-area-pointer", &Vvoid_text_area_pointer, -- cgit v1.3 From 995987378d97aed8094f27262f37aefcf6b7f2cc Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Wed, 8 Jun 2005 15:55:18 +0000 Subject: *** empty log message *** --- lisp/ChangeLog | 24 +++++++++++++++++++++++- lispref/ChangeLog | 20 ++++++++++++++++++++ src/ChangeLog | 5 +---- 3 files changed, 44 insertions(+), 5 deletions(-) (limited to 'src/ChangeLog') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 87452a66f50..d3363bf4138 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,25 @@ +2005-06-08 Richard M. Stallman + + * emacs-lisp/easy-mmode.el (define-minor-mode): If BODY is empty, + give the variable a doc string that doesn't say don't set it directly. + + * textmodes/ispell.el (ispell-check-version): + Use match-string-no-properties. + (ispell-region, ispell-buffer-local-parsing, ispell-buffer-local-dict) + (ispell-buffer-local-words): Likewise. + + * progmodes/make-mode.el (makefile-shell-face): Make this a no-op + except on terminals with enough colors to really display it. + (makefile-dependency-regex): Delete spurious `bb'. + + * faces.el (escape-glyph): Use blue once again in last case. + (no-break-space): Redefined so that it isn't invisible on a tty. + +2005-06-07 Richard M. Stallman + + * progmodes/make-mode.el (makefile-dependency-regex): + Remove `bb' inserted by mistake. + 2005-06-08 Kim F. Storm * ido.el (ido-read-file-name): Fallback to read-file-name on C-f @@ -16,7 +38,7 @@ 2005-06-07 David McCabe (tiny change) - * emacs-lisp/lisp-mode.el (defstruct): Set doc-string-elt property. + * emacs-lisp/lisp-mode.el (defstruct): Set `doc-string-elt' property. 2005-06-06 Stefan Monnier diff --git a/lispref/ChangeLog b/lispref/ChangeLog index 1536f0a2d93..6eb1c7be5e1 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,3 +1,23 @@ +2005-06-08 Richard M. Stallman + + * searching.texi (Entire Match Data): Clarify when match-data + returns markers and when integers. + + * display.texi (Defining Faces): Explain that face name should not + end in `-face'. + + * modes.texi (Mode Line Data): Minor cleanup. + (Customizing Keywords): Node split out of Search-based Fontification. + Add example of using font-lock-add-keywords from a hook. + Clarify when MODE should be non-nil, and when nil. + +2005-06-06 Richard M. Stallman + + * modes.texi (Mode Line Data): Explain what happens when the car + of a list is a void symbol. + (Search-based Fontification): Explain MODE arg to + font-lock-add-keywords and warn about calls from major modes. + 2005-06-08 Juri Linkov * display.texi (Standard Faces): Add `shadow' face. diff --git a/src/ChangeLog b/src/ChangeLog index cfbbe7b47c0..28824b94e36 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -8,10 +8,7 @@ * process.c (Fstart_process): Don't touch command_channel_p slot. - * process.h (struct process): Conditionalize slots - adaptive_read_buffering, read_output_delay and read_output_skip - on ADAPTIVE_READ_BUFFERING. - Delete command_channel_p. + * process.h (struct process): Delete command_channel_p. 2005-06-07 Masatake YAMATO -- cgit v1.3 From b7aae902ed6d45976a249e44e296df9a97737c16 Mon Sep 17 00:00:00 2001 From: "Kim F. Storm" Date: Wed, 8 Jun 2005 23:04:27 +0000 Subject: *** empty log message *** --- etc/NEWS | 8 ++++++++ lisp/ChangeLog | 8 ++++++++ lispref/ChangeLog | 5 +++++ src/ChangeLog | 25 ++++++++++++++++++++++++- 4 files changed, 45 insertions(+), 1 deletion(-) (limited to 'src/ChangeLog') diff --git a/etc/NEWS b/etc/NEWS index a7b557435bf..54934adbe53 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -3528,6 +3528,14 @@ properties from surrounding text. element, if the last match was on a buffer. `set-match-data' accepts such a list for restoring the match state. ++++ +*** Functions `match-data' and `set-match-data' now have an optional +argument `reseat'. When non-nil, all markers in the match data list +passed to these function will be reseated to point to nowhere, and if +the value of `reseat' is `evaporate', the markers are put onto the +free list. Note that no other references to those markers must exist +if `evaporate' is specified for the `reseat' argument. + +++ *** The default value of `sentence-end' is now defined using the new variable `sentence-end-without-space', which contains such characters diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 82055d3e613..a0a5c227413 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2005-06-09 Kim F. Storm + + * subr.el (save-match-data): Add RESEAT arg `evaporate' to + set-match-data to free markers in match-data. + + * replace.el (replace-match-data): Pass RESEAT arg `t' to + match-data to unchain markers in match-data. + 2005-06-08 Stefan Monnier * emacs-lisp/debug.el (debug): Don't iconify if we know we'll re-enter diff --git a/lispref/ChangeLog b/lispref/ChangeLog index 6eb1c7be5e1..6742080bd03 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,3 +1,8 @@ +2005-06-09 Kim F. Storm + + * searching.texi (Entire Match Data): Explain new `reseat' argument to + match-data and set-match-data. + 2005-06-08 Richard M. Stallman * searching.texi (Entire Match Data): Clarify when match-data diff --git a/src/ChangeLog b/src/ChangeLog index 28824b94e36..077b0da84b3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,26 @@ +2005-06-09 Kim F. Storm + + * search.c (Fmatch_data): Add optional RESEAT arg. Unchain markers + in REUSE list if non-nil; free them if equal to evaporate. + (Fset_match_data): Add optional RESEAT arg. Unchain markers in LIST + if non-nil; free them if equal to evaporate. Use XCAR/XCDR. + (restore_search_regs): Rename from restore_match_data. Uses changed. + (unwind_set_match_data): New function. + (record_unwind_save_match_data): New function like save-match-data. + + * lisp.h (Fmatch_data, Fset_match_data): Fix EXFUN. + (record_unwind_save_match_data): Add prototype. + (restore_search_regs): Rename from restore_match_data. + + * composite.c (compose_chars_in_text): + * eval.c (do_autoload): + * macmenu.c (set_frame_menubar): + * process.c (read_process_output, exec_sentinel): + * xmenu.c (set_frame_menubar): + * xdisp.c (prepare_menu_bars, update_menu_bar, update_tool_bar): + * w32menu.c (set_frame_menubar): + Use record_unwind_save_match_data. + 2005-06-08 Richard M. Stallman * xdisp.c (get_next_display_element): Alter previous change: @@ -14,7 +37,7 @@ * xdisp.c (note_mode_line_or_margin_highlight): Check the overlapping of re-rendering area to avoid flickering. - (note_mouse_highlight): Call clear_mouse_face if PART + (note_mouse_highlight): Call clear_mouse_face if PART is not ON_MODE_LINE nor ON_HEADER_LINE. 2005-06-07 Kim F. Storm -- cgit v1.3 From 427c5b1be2e6473c6792b375c8976c88e77570f7 Mon Sep 17 00:00:00 2001 From: Steven Tamm Date: Thu, 9 Jun 2005 03:37:20 +0000 Subject: unexmacosx.c (copy_data_segment): Copy __la_sym_ptr2 section used by gcc4 on intel mac. --- src/ChangeLog | 5 +++++ src/unexmacosx.c | 1 + 2 files changed, 6 insertions(+) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index 077b0da84b3..2d506df58cb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2005-06-08 Steven Tamm + + * unexmacosx.c (copy_data_segment): Copy __la_sym_ptr2 section + used by gcc4 on intel mac. + 2005-06-09 Kim F. Storm * search.c (Fmatch_data): Add optional RESEAT arg. Unchain markers diff --git a/src/unexmacosx.c b/src/unexmacosx.c index e54dbea448c..1a2c211a09d 100644 --- a/src/unexmacosx.c +++ b/src/unexmacosx.c @@ -695,6 +695,7 @@ copy_data_segment (struct load_command *lc) } else if (strncmp (sectp->sectname, "__la_symbol_ptr", 16) == 0 || strncmp (sectp->sectname, "__nl_symbol_ptr", 16) == 0 + || strncmp (sectp->sectname, "__la_sym_ptr2", 16) == 0 || strncmp (sectp->sectname, "__dyld", 16) == 0 || strncmp (sectp->sectname, "__const", 16) == 0 || strncmp (sectp->sectname, "__cfstring", 16) == 0) -- cgit v1.3 From 9fed2905dd854ab0647b337973f1c543b93be1ff Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 9 Jun 2005 10:39:02 +0000 Subject: (Fdisplay_supports_face_attributes_p): Fix typo in docstring. --- src/ChangeLog | 11 ++++++++--- src/xfaces.c | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index 2d506df58cb..4c43422e660 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2005-06-09 Juanma Barranquero + + * xfaces.c (Fdisplay_supports_face_attributes_p): + Fix typo in docstring. + 2005-06-08 Steven Tamm * unexmacosx.c (copy_data_segment): Copy __la_sym_ptr2 section @@ -63,7 +68,7 @@ * macterm.c: Make mac_quit_char_modifiers and mac_quit_char_keycode non-static. - * config.in: Added HAVE_CANCELMENUTRACKING + * config.in: Add HAVE_CANCELMENUTRACKING. 2005-06-06 Eli Zaretskii @@ -12994,9 +12999,9 @@ * sound.c: Added a partial implementation of play-sound-internal for Microsoft Windows. Added various #ifdef / #else / #endif code blocks to separate the code that will compile under - Microsoft Windows from the code that is specific to Gnu/Linux. + Microsoft Windows from the code that is specific to GNU/Linux. Moved several blocks of code around to make this separation of code - into Windows compatible and Gnu/Linux compatible code blocks easier. + into Windows compatible and GNU/Linux compatible code blocks easier. * makefile.w32-in: Include sound.c and link with WinMM.lib. diff --git a/src/xfaces.c b/src/xfaces.c index 606a854980a..11e72ab7d05 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -6109,7 +6109,7 @@ DEFUN ("display-supports-face-attributes-p", 1, 2, 0, doc: /* Return non-nil if all the face attributes in ATTRIBUTES are supported. The optional argument DISPLAY can be a display name, a frame, or -nil (meaning the selected frame's display) +nil (meaning the selected frame's display). The definition of `supported' is somewhat heuristic, but basically means that a face containing all the attributes in ATTRIBUTES, when merged @@ -6122,7 +6122,7 @@ Point (2) implies that a `:weight black' attribute will be satisfied by any display that can display bold, and a `:foreground \"yellow\"' as long as it can display a yellowish color, but `:slant italic' will _not_ be satisfied by the tty display code's automatic substitution of a `dim' -face for italic. */) +face for italic. */) (attributes, display) Lisp_Object attributes, display; { -- cgit v1.3 From c14ec13543ea0bef97466957bc17e071a16b7419 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 9 Jun 2005 23:27:58 +0000 Subject: (Fmemq, Fmaphash): Doc fixes. --- src/ChangeLog | 4 ++++ src/fns.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index 4c43422e660..4ab24a42e41 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2005-06-10 Juanma Barranquero + + * fns.c (Fmemq, Fmaphash): Doc fixes. + 2005-06-09 Juanma Barranquero * xfaces.c (Fdisplay_supports_face_attributes_p): diff --git a/src/fns.c b/src/fns.c index e910c87375b..a36789b4a92 100644 --- a/src/fns.c +++ b/src/fns.c @@ -1471,7 +1471,7 @@ The value is actually the tail of LIST whose car is ELT. */) DEFUN ("memq", Fmemq, Smemq, 2, 2, 0, doc: /* Return non-nil if ELT is an element of LIST. -Comparison done with EQ. The value is actually the tail of LIST +Comparison done with `eq'. The value is actually the tail of LIST whose car is ELT. */) (elt, list) Lisp_Object elt, list; @@ -5486,7 +5486,7 @@ DEFUN ("remhash", Fremhash, Sremhash, 2, 2, 0, DEFUN ("maphash", Fmaphash, Smaphash, 2, 2, 0, doc: /* Call FUNCTION for all entries in hash table TABLE. -FUNCTION is called with 2 arguments KEY and VALUE. */) +FUNCTION is called with two arguments, KEY and VALUE. */) (function, table) Lisp_Object function, table; { -- cgit v1.3 From c869384d74ca1fc2c33b25eb28316b3a6415dcf8 Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Fri, 10 Jun 2005 02:36:07 +0000 Subject: (Fselect_window): Adapt call to Fselect_frame. --- src/ChangeLog | 12 ++++++++++++ src/window.c | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index 4ab24a42e41..0962308155e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,15 @@ +2005-06-09 Luc Teirlinck + + * window.c (Fselect_window): Adapt call to Fselect_frame. + + * lisp.h: Update EXFUN of Fselect_frame. + + * keyboard.c (command_loop_1): Adapt call to Fselect_frame. + + * frame.c (do_switch_frame, Fselect_frame): Delete unused arg no_enter. + (set-mouse-position, set-mouse-pixel-position, iconify-frame): + Adapt to above change. + 2005-06-10 Juanma Barranquero * fns.c (Fmemq, Fmaphash): Doc fixes. diff --git a/src/window.c b/src/window.c index 4839830b177..1f2af647677 100644 --- a/src/window.c +++ b/src/window.c @@ -3234,7 +3234,7 @@ selects the buffer of the selected window before each command. */) so that FRAME_FOCUS_FRAME is moved appropriately as we move around in the state where a minibuffer in a separate frame is active. */ - Fselect_frame (WINDOW_FRAME (w), Qnil); + Fselect_frame (WINDOW_FRAME (w)); } else sf->selected_window = window; -- cgit v1.3 From 6ecf436de1ade9aed4741f91608bf605bc166e64 Mon Sep 17 00:00:00 2001 From: Luc Teirlinck Date: Fri, 10 Jun 2005 02:45:38 +0000 Subject: *** empty log message *** --- src/ChangeLog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index 0962308155e..2622787d3aa 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -6,8 +6,9 @@ * keyboard.c (command_loop_1): Adapt call to Fselect_frame. - * frame.c (do_switch_frame, Fselect_frame): Delete unused arg no_enter. - (set-mouse-position, set-mouse-pixel-position, iconify-frame): + * frame.c (Fhandle_switch_frame, Fselect_frame): Delete unused arg + no_enter. + (Fset_mouse_position, Fset_mouse_pixel_position, Ficonify_frame): Adapt to above change. 2005-06-10 Juanma Barranquero -- cgit v1.3 From 121c59a3e42a0d596967bf3e4baa323ea9bd4ff2 Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Fri, 10 Jun 2005 05:31:45 +0000 Subject: * xdisp.c (note_mode_line_or_margin_highlight): Call clear_mouse_face when mouse_face is not given. Remove unnecessary tabs. --- src/ChangeLog | 6 ++++++ src/xdisp.c | 11 ++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index 2622787d3aa..94479694c7a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2005-06-10 Masatake YAMATO + + * xdisp.c (note_mode_line_or_margin_highlight): Call clear_mouse_face + when mouse_face is not given. + Remove unnecessary tabs. + 2005-06-09 Luc Teirlinck * window.c (Fselect_window): Adapt call to Fselect_frame. diff --git a/src/xdisp.c b/src/xdisp.c index 3a44cc808c0..b32f43b97b9 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -21523,7 +21523,7 @@ note_mode_line_or_margin_highlight (window, x, y, area) int ignore; int vpos, hpos; - + b = Fprevious_single_property_change (make_number (charpos + 1), Qmouse_face, string, Qnil); if (NILP (b)) @@ -21571,7 +21571,7 @@ note_mode_line_or_margin_highlight (window, x, y, area) hpos = (area == ON_MODE_LINE ? (w->current_matrix)->nrows - 1 : 0); - + /* If the re-rendering position is included in the last re-rendering area, we should do nothing. */ if ( window == dpyinfo->mouse_face_window @@ -21579,10 +21579,10 @@ note_mode_line_or_margin_highlight (window, x, y, area) && vpos < dpyinfo->mouse_face_end_col && dpyinfo->mouse_face_beg_row == hpos ) return; - + if (clear_mouse_face (dpyinfo)) cursor = No_Cursor; - + dpyinfo->mouse_face_beg_col = vpos; dpyinfo->mouse_face_beg_row = hpos; @@ -21607,8 +21607,9 @@ note_mode_line_or_margin_highlight (window, x, y, area) if (NILP (pointer)) pointer = Qhand; } + else if ((area == ON_MODE_LINE) || (area == ON_HEADER_LINE)) + clear_mouse_face (dpyinfo); } - define_frame_cursor1 (f, cursor, pointer); } -- cgit v1.3 From 4162f25f3e4ca44c19e4b121ee56ba7463ffac6f Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 10 Jun 2005 11:04:20 +0000 Subject: (COPY_CHUNK, COPY_PROC_CHUNK): Add a new argument `verbose'; print diagnostic messages only if it is non-zero. All callers changed to pass a zero value unless DEBUG_DUMP is defined in the environment. (copy_executable_and_dump_data): Print section names with %.8s. --- src/ChangeLog | 8 ++++++++ src/unexw32.c | 54 ++++++++++++++++++++++++++++++++++-------------------- 2 files changed, 42 insertions(+), 20 deletions(-) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index 94479694c7a..3f76f1f8eb3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2005-06-10 Eli Zaretskii + + * unexw32.c (COPY_CHUNK, COPY_PROC_CHUNK): Add a new argument + `verbose'; print diagnostic messages only if it is non-zero. All + callers changed to pass a zero value unless DEBUG_DUMP is defined + in the environment. + (copy_executable_and_dump_data): Print section names with %.8s. + 2005-06-10 Masatake YAMATO * xdisp.c (note_mode_line_or_margin_highlight): Call clear_mouse_face diff --git a/src/unexw32.c b/src/unexw32.c index 1b2dbe74c31..6c565ff7491 100644 --- a/src/unexw32.c +++ b/src/unexw32.c @@ -491,27 +491,34 @@ copy_executable_and_dump_data (file_data *p_infile, PIMAGE_SECTION_HEADER dst_section; DWORD offset; int i; + int be_verbose = GetEnvironmentVariable ("DEBUG_DUMP", NULL, 0) > 0; -#define COPY_CHUNK(message, src, size) \ +#define COPY_CHUNK(message, src, size, verbose) \ do { \ unsigned char *s = (void *)(src); \ unsigned long count = (size); \ - printf ("%s\n", (message)); \ - printf ("\t0x%08x Offset in input file.\n", s - p_infile->file_base); \ - printf ("\t0x%08x Offset in output file.\n", dst - p_outfile->file_base); \ - printf ("\t0x%08x Size in bytes.\n", count); \ + if (verbose) \ + { \ + printf ("%s\n", (message)); \ + printf ("\t0x%08x Offset in input file.\n", s - p_infile->file_base); \ + printf ("\t0x%08x Offset in output file.\n", dst - p_outfile->file_base); \ + printf ("\t0x%08x Size in bytes.\n", count); \ + } \ memcpy (dst, s, count); \ dst += count; \ } while (0) -#define COPY_PROC_CHUNK(message, src, size) \ +#define COPY_PROC_CHUNK(message, src, size, verbose) \ do { \ unsigned char *s = (void *)(src); \ unsigned long count = (size); \ - printf ("%s\n", (message)); \ - printf ("\t0x%08x Address in process.\n", s); \ - printf ("\t0x%08x Offset in output file.\n", dst - p_outfile->file_base); \ - printf ("\t0x%08x Size in bytes.\n", count); \ + if (verbose) \ + { \ + printf ("%s\n", (message)); \ + printf ("\t0x%08x Address in process.\n", s); \ + printf ("\t0x%08x Offset in output file.\n", dst - p_outfile->file_base); \ + printf ("\t0x%08x Size in bytes.\n", count); \ + } \ memcpy (dst, s, count); \ dst += count; \ } while (0) @@ -542,13 +549,14 @@ copy_executable_and_dump_data (file_data *p_infile, dst = (unsigned char *) p_outfile->file_base; COPY_CHUNK ("Copying DOS header...", dos_header, - (DWORD) nt_header - (DWORD) dos_header); + (DWORD) nt_header - (DWORD) dos_header, be_verbose); dst_nt_header = (PIMAGE_NT_HEADERS) dst; COPY_CHUNK ("Copying NT header...", nt_header, - (DWORD) section - (DWORD) nt_header); + (DWORD) section - (DWORD) nt_header, be_verbose); dst_section = (PIMAGE_SECTION_HEADER) dst; COPY_CHUNK ("Copying section table...", section, - nt_header->FileHeader.NumberOfSections * sizeof (*section)); + nt_header->FileHeader.NumberOfSections * sizeof (*section), + be_verbose); /* Align the first section's raw data area, and set the header size field accordingly. */ @@ -558,7 +566,9 @@ copy_executable_and_dump_data (file_data *p_infile, for (i = 0; i < nt_header->FileHeader.NumberOfSections; i++) { char msg[100]; - sprintf (msg, "Copying raw data for %s...", section->Name); + /* Windows section names are fixed 8-char strings, only + zero-terminated if the name is shorter than 8 characters. */ + sprintf (msg, "Copying raw data for %.8s...", section->Name); dst_save = dst; @@ -571,7 +581,7 @@ copy_executable_and_dump_data (file_data *p_infile, /* Can always copy the original raw data. */ COPY_CHUNK (msg, OFFSET_TO_PTR (section->PointerToRawData, p_infile), - section->SizeOfRawData); + section->SizeOfRawData, be_verbose); /* Ensure alignment slop is zeroed. */ ROUND_UP_DST_AND_ZERO (dst_nt_header->OptionalHeader.FileAlignment); @@ -580,7 +590,8 @@ copy_executable_and_dump_data (file_data *p_infile, { dst = dst_save + RVA_TO_SECTION_OFFSET (PTR_TO_RVA (data_start), dst_section); - COPY_PROC_CHUNK ("Dumping initialized data...", data_start, data_size); + COPY_PROC_CHUNK ("Dumping initialized data...", + data_start, data_size, be_verbose); dst = dst_save + dst_section->SizeOfRawData; } if (section == bss_section) @@ -589,7 +600,8 @@ copy_executable_and_dump_data (file_data *p_infile, data size as necessary. */ dst = dst_save + RVA_TO_SECTION_OFFSET (PTR_TO_RVA (bss_start), dst_section); - COPY_PROC_CHUNK ("Dumping bss data...", bss_start, bss_size); + COPY_PROC_CHUNK ("Dumping bss data...", bss_start, + bss_size, be_verbose); ROUND_UP_DST (dst_nt_header->OptionalHeader.FileAlignment); dst_section->PointerToRawData = PTR_TO_OFFSET (dst_save, p_outfile); /* Determine new size of raw data area. */ @@ -604,7 +616,8 @@ copy_executable_and_dump_data (file_data *p_infile, section's raw data size as necessary. */ dst = dst_save + RVA_TO_SECTION_OFFSET (PTR_TO_RVA (bss_start_static), dst_section); - COPY_PROC_CHUNK ("Dumping static bss data...", bss_start_static, bss_size_static); + COPY_PROC_CHUNK ("Dumping static bss data...", bss_start_static, + bss_size_static, be_verbose); ROUND_UP_DST (dst_nt_header->OptionalHeader.FileAlignment); dst_section->PointerToRawData = PTR_TO_OFFSET (dst_save, p_outfile); /* Determine new size of raw data area. */ @@ -622,7 +635,8 @@ copy_executable_and_dump_data (file_data *p_infile, section's size to the appropriate size. */ dst = dst_save + RVA_TO_SECTION_OFFSET (PTR_TO_RVA (heap_start), dst_section); - COPY_PROC_CHUNK ("Dumping heap...", heap_start, heap_size); + COPY_PROC_CHUNK ("Dumping heap...", heap_start, heap_size, + be_verbose); ROUND_UP_DST (dst_nt_header->OptionalHeader.FileAlignment); dst_section->PointerToRawData = PTR_TO_OFFSET (dst_save, p_outfile); /* Determine new size of raw data area. */ @@ -657,7 +671,7 @@ copy_executable_and_dump_data (file_data *p_infile, COPY_CHUNK ("Copying remainder of executable...", OFFSET_TO_PTR (offset, p_infile), - p_infile->size - offset); + p_infile->size - offset, be_verbose); /* Final size for new image. */ p_outfile->size = DST_TO_OFFSET (); -- cgit v1.3 From 578c1340ea0f4d6a6aa9d86ff5d89bdf690e8fbb Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Fri, 10 Jun 2005 15:00:48 +0000 Subject: *** empty log message *** --- lisp/ChangeLog | 9 +++++++++ src/ChangeLog | 5 +++++ 2 files changed, 14 insertions(+) (limited to 'src/ChangeLog') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 14f2191fdce..09ce2a4e50a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -14,6 +14,15 @@ 2005-06-10 Juanma Barranquero + * thumbs.el: Fixes for changes of 2005-06-09. + (thumbs-thumbsdir): Force `thumbs-thumbsdir' to be interpretable + as a directory. + (thumbs-thumbname): Remove directory separator from format string; + `thumbs-thumbsdir' now returns a valid directory name. + (thumbs-temp-dir): New defsubst. + (thumbs-temp-file, thumbs-resize-image, thumbs-modify-image): + Use it. + * cus-edit.el (minibuffer): * files.el (make-backup-file-name-function): * filesets.el (filesets-external-viewers): diff --git a/src/ChangeLog b/src/ChangeLog index 3f76f1f8eb3..8a9f2914519 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2005-06-10 Juanma Barranquero + + * process.c (syms_of_process) [ADAPTIVE_READ_BUFFERING]: + * w32fns.c (syms_of_w32fns): Fix spellings. + 2005-06-10 Eli Zaretskii * unexw32.c (COPY_CHUNK, COPY_PROC_CHUNK): Add a new argument -- cgit v1.3 From cd4344a3ee945afa2e5623b975ef80e21252d204 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 10 Jun 2005 17:47:00 +0000 Subject: ($(TEMACS)): Depend on addsection.exe. --- src/ChangeLog | 4 ++++ src/makefile.w32-in | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index 8a9f2914519..da7ce8af7ea 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2005-06-10 Eli Zaretskii + + * makefile.w32-in ($(TEMACS)): Depend on addsection.exe. + 2005-06-10 Juanma Barranquero * process.c (syms_of_process) [ADAPTIVE_READ_BUFFERING]: diff --git a/src/makefile.w32-in b/src/makefile.w32-in index f25af87cb92..c631852c0f0 100644 --- a/src/makefile.w32-in +++ b/src/makefile.w32-in @@ -167,7 +167,8 @@ $(EMACS): $(DOC) $(TEMACS) # (it is the preload heap size in MB). # temacs: $(BLD) $(TEMACS) -$(TEMACS): $(TLIB0) $(TLIB1) $(TLIBW32) $(TLASTLIB) $(TOBJ) $(TRES) +$(TEMACS): $(TLIB0) $(TLIB1) $(TLIBW32) $(TLASTLIB) $(TOBJ) $(TRES) \ + ../nt/$(BLD)/addsection.exe $(LINK) $(LINK_OUT)$(TEMACS_TMP) $(FULL_LINK_FLAGS) $(TOBJ) $(TRES) $(LIBS) "../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP 16 echo $(OBJ0) > $(BLD)/buildobj.lst -- cgit v1.3 From d11f8e1ab9bd57d2c9346520858a328e9bc6d0d5 Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Fri, 10 Jun 2005 23:04:18 +0000 Subject: *** empty log message *** --- lisp/ChangeLog | 5 +++++ src/ChangeLog | 6 ++++++ 2 files changed, 11 insertions(+) (limited to 'src/ChangeLog') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 724d86a95b6..3d75c4cfd7b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-06-10 Michael Hotchin (tiny change) + + * progmodes/compile.el (compilation-error-regexp-alist-alist) + [msft]: update regexp for newer msft compilers. + 2005-06-10 Mark A. Hershberger * xml.el (start-chars, xml-parse-dtd): Add the ability to skip diff --git a/src/ChangeLog b/src/ChangeLog index da7ce8af7ea..34c19326c98 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2005-06-11 Jason Rumney + + * w32fns.c (Fx_file_dialog): Unblock input before falling back to + minibuffer. + * macfns.c (Fx_file_dialog): Likewise. + 2005-06-10 Eli Zaretskii * makefile.w32-in ($(TEMACS)): Depend on addsection.exe. -- cgit v1.3 From 099a3eead27b2b63747e778aaf55565dd7ad698c Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Jun 2005 15:11:34 +0000 Subject: *** empty log message *** --- nt/ChangeLog | 6 +++++- src/ChangeLog | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'src/ChangeLog') diff --git a/nt/ChangeLog b/nt/ChangeLog index f07d0e1e8f3..66e1ea15438 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,5 +1,9 @@ 2005-06-11 Eli Zaretskii + * configure.bat: If their fc.exe returns a meaningful exit status, + don't overwrite src/config.h and src/epaths.h with identical + copies. + * INSTALL: Warn about using "cvs up -kb" if one intends to commit changes. Add a pointer to another site with detailed configure and build instructions. Suggest to look at config.log when @@ -9,7 +13,7 @@ * gmake.defs (ARCH_CFLAGS): Use $(MCPU_FLAG) instead of a literal "-mcpu=i686". - * configure1.bat: Update copyright years. + * configure.bat: Update copyright years. Delete config.log before doing anything else. Write additional diagnostics to config.log in case of failures to compile test programs, including the failed test program itself. diff --git a/src/ChangeLog b/src/ChangeLog index 34c19326c98..0232aea8b48 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2005-06-11 Eli Zaretskii + + * w32bdf.c (create_offscreen_bitmap): Cast `bitsp' to `void **' in + the call to CreateDIBSection, to avoid a compiler warning. + 2005-06-11 Jason Rumney * w32fns.c (Fx_file_dialog): Unblock input before falling back to -- cgit v1.3 From 2e09fef1ac0317fc63a1a628de0cb7371c1427d1 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Jun 2005 16:25:14 +0000 Subject: (x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg to CreateDIBSection to avoid a compiler warning. (pbm_load): Cast 3rd arg to IMAGE_BACKGROUND to avoid a compiler warning. (png_load): Cast return values of fn_png_create_read_struct and fn_png_create_info_struct, to avoid compiler warnings on W32. Cast 3rd arg to IMAGE_BACKGROUND and image_background_transparent to avoid compiler warnings. (jpeg_load): Cast return value of fn_jpeg_std_error to avoid a compiler warning on W32. Cast 3rd arg to IMAGE_BACKGROUND to avoid a compiler warning. (tiff_load): Cast return values of fn_TIFFOpen and fn_TIFFClientOpen to avoid compiler warning on W32. Cast 3rd arg to IMAGE_BACKGROUND to avoid a compiler warning. (gif_load): Cast return values of fn_DGifOpenFileName and fn_DGifOpen to avoid compiler warnings on W32. Cast 3rd arg to IMAGE_BACKGROUND to avoid a compiler warning. (DrawText) [HAVE_NTGUI || MAC_OS]: If already defined, undef before redefining. --- src/ChangeLog | 20 +++++++++++++++ src/image.c | 82 +++++++++++++++++++++++++++++++++++++---------------------- 2 files changed, 71 insertions(+), 31 deletions(-) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index 0232aea8b48..5b71d4b089f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,25 @@ 2005-06-11 Eli Zaretskii + * image.c (x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg + to CreateDIBSection to avoid a compiler warning. + (pbm_load): Cast 3rd arg to IMAGE_BACKGROUND to avoid a compiler + warning. + (png_load): Cast return values of fn_png_create_read_struct and + fn_png_create_info_struct, to avoid compiler warnings on W32. + Cast 3rd arg to IMAGE_BACKGROUND and image_background_transparent + to avoid compiler warnings. + (jpeg_load): Cast return value of fn_jpeg_std_error to avoid a + compiler warning on W32. Cast 3rd arg to IMAGE_BACKGROUND to + avoid a compiler warning. + (tiff_load): Cast return values of fn_TIFFOpen and + fn_TIFFClientOpen to avoid compiler warning on W32. Cast 3rd arg + to IMAGE_BACKGROUND to avoid a compiler warning. + (gif_load): Cast return values of fn_DGifOpenFileName and + fn_DGifOpen to avoid compiler warnings on W32. Cast 3rd arg to + IMAGE_BACKGROUND to avoid a compiler warning. + (DrawText) [HAVE_NTGUI || MAC_OS]: If already defined, undef + before redefining. + * w32bdf.c (create_offscreen_bitmap): Cast `bitsp' to `void **' in the call to CreateDIBSection, to avoid a compiler warning. diff --git a/src/image.c b/src/image.c index bc88c9d1d04..462294b33b4 100644 --- a/src/image.c +++ b/src/image.c @@ -1972,7 +1972,8 @@ x_create_x_image_and_pixmap (f, width, height, depth, ximg, pixmap) and store its handle in *pixmap. */ *pixmap = CreateDIBSection (hdc, &((*ximg)->info), (depth < 16) ? DIB_PAL_COLORS : DIB_RGB_COLORS, - &((*ximg)->data), NULL, 0); + /* casting avoids a GCC warning */ + (void **)&((*ximg)->data), NULL, 0); /* Realize display palette and garbage all frames. */ release_frame_dc (f, hdc); @@ -5517,7 +5518,8 @@ pbm_load (f, img) /* Maybe fill in the background field while we have ximg handy. */ if (NILP (image_spec_value (img->spec, QCbackground, NULL))) - IMAGE_BACKGROUND (img, f, ximg); + /* Casting avoids a GCC warning. */ + IMAGE_BACKGROUND (img, f, (XImagePtr_or_DC)ximg); /* Put the image into a pixmap. */ x_put_x_image (f, ximg, img->pixmap, width, height); @@ -5843,9 +5845,11 @@ png_load (f, img) tbr.bytes += sizeof (sig); } - /* Initialize read and info structs for PNG lib. */ - png_ptr = fn_png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, - my_png_error, my_png_warning); + /* Initialize read and info structs for PNG lib. Casting return + value avoids a GCC warning on W32. */ + png_ptr = (png_structp)fn_png_create_read_struct (PNG_LIBPNG_VER_STRING, + NULL, my_png_error, + my_png_warning); if (!png_ptr) { if (fp) fclose (fp); @@ -5853,7 +5857,8 @@ png_load (f, img) return 0; } - info_ptr = fn_png_create_info_struct (png_ptr); + /* Casting return value avoids a GCC warning on W32. */ + info_ptr = (png_infop)fn_png_create_info_struct (png_ptr); if (!info_ptr) { fn_png_destroy_read_struct (&png_ptr, NULL, NULL); @@ -5862,7 +5867,8 @@ png_load (f, img) return 0; } - end_info = fn_png_create_info_struct (png_ptr); + /* Casting return value avoids a GCC warning on W32. */ + end_info = (png_infop)fn_png_create_info_struct (png_ptr); if (!end_info) { fn_png_destroy_read_struct (&png_ptr, &info_ptr, NULL); @@ -6135,8 +6141,9 @@ png_load (f, img) img->width = width; img->height = height; - /* Maybe fill in the background field while we have ximg handy. */ - IMAGE_BACKGROUND (img, f, ximg); + /* Maybe fill in the background field while we have ximg handy. + Casting avoids a GCC warning. */ + IMAGE_BACKGROUND (img, f, (XImagePtr_or_DC)ximg); /* Put the image into the pixmap, then free the X image and its buffer. */ x_put_x_image (f, ximg, img->pixmap, width, height); @@ -6145,9 +6152,9 @@ png_load (f, img) /* Same for the mask. */ if (mask_img) { - /* Fill in the background_transparent field while we have the mask - handy. */ - image_background_transparent (img, f, mask_img); + /* Fill in the background_transparent field while we have the + mask handy. Casting avoids a GCC warning. */ + image_background_transparent (img, f, (XImagePtr_or_DC)mask_img); x_put_x_image (f, mask_img, img->mask, img->width, img->height); x_destroy_x_image (mask_img); @@ -6494,8 +6501,9 @@ jpeg_load (f, img) } /* Customize libjpeg's error handling to call my_error_exit when an - error is detected. This function will perform a longjmp. */ - cinfo.err = fn_jpeg_std_error (&mgr.pub); + error is detected. This function will perform a longjmp. + Casting return value avoids a GCC warning on W32. */ + cinfo.err = (struct jpeg_error_mgr *)fn_jpeg_std_error (&mgr.pub); mgr.pub.error_exit = my_error_exit; if ((rc = setjmp (mgr.setjmp_buffer)) != 0) @@ -6606,7 +6614,8 @@ jpeg_load (f, img) /* Maybe fill in the background field while we have ximg handy. */ if (NILP (image_spec_value (img->spec, QCbackground, NULL))) - IMAGE_BACKGROUND (img, f, ximg); + /* Casting avoids a GCC warning. */ + IMAGE_BACKGROUND (img, f, (XImagePtr_or_DC)ximg); /* Put the image into the pixmap. */ x_put_x_image (f, ximg, img->pixmap, width, height); @@ -6932,8 +6941,9 @@ tiff_load (f, img) return 0; } - /* Try to open the image file. */ - tiff = fn_TIFFOpen (SDATA (file), "r"); + /* Try to open the image file. Casting return value avoids a + GCC warning on W32. */ + tiff = (TIFF *)fn_TIFFOpen (SDATA (file), "r"); if (tiff == NULL) { image_error ("Cannot open `%s'", file, Qnil); @@ -6948,14 +6958,15 @@ tiff_load (f, img) memsrc.len = SBYTES (specified_data); memsrc.index = 0; - tiff = fn_TIFFClientOpen ("memory_source", "r", &memsrc, - (TIFFReadWriteProc) tiff_read_from_memory, - (TIFFReadWriteProc) tiff_write_from_memory, - tiff_seek_in_memory, - tiff_close_memory, - tiff_size_of_memory, - tiff_mmap_memory, - tiff_unmap_memory); + /* Casting return value avoids a GCC warning on W32. */ + tiff = (TIFF *)fn_TIFFClientOpen ("memory_source", "r", &memsrc, + (TIFFReadWriteProc) tiff_read_from_memory, + (TIFFReadWriteProc) tiff_write_from_memory, + tiff_seek_in_memory, + tiff_close_memory, + tiff_size_of_memory, + tiff_mmap_memory, + tiff_unmap_memory); if (!tiff) { @@ -7018,7 +7029,8 @@ tiff_load (f, img) /* Maybe fill in the background field while we have ximg handy. */ if (NILP (image_spec_value (img->spec, QCbackground, NULL))) - IMAGE_BACKGROUND (img, f, ximg); + /* Casting avoids a GCC warning on W32. */ + IMAGE_BACKGROUND (img, f, (XImagePtr_or_DC)ximg); /* Put the image into the pixmap, then free the X image and its buffer. */ x_put_x_image (f, ximg, img->pixmap, width, height); @@ -7126,6 +7138,11 @@ gif_image_p (object) #ifdef HAVE_GIF #if defined (HAVE_NTGUI) || defined (MAC_OS) +/* winuser.h might define DrawText to DrawTextA or DrawTextW. + Undefine before redefining to avoid a preprocessor warning. */ +#ifdef DrawText +#undef DrawText +#endif /* avoid conflict with QuickdrawText.h */ #define DrawText gif_DrawText #include @@ -7239,8 +7256,9 @@ gif_load (f, img) return 0; } - /* Open the GIF file. */ - gif = fn_DGifOpenFileName (SDATA (file)); + /* Open the GIF file. Casting return value avoids a GCC warning + on W32. */ + gif = (GifFileType *)fn_DGifOpenFileName (SDATA (file)); if (gif == NULL) { image_error ("Cannot open `%s'", file, Qnil); @@ -7256,7 +7274,8 @@ gif_load (f, img) memsrc.len = SBYTES (specified_data); memsrc.index = 0; - gif = fn_DGifOpen(&memsrc, gif_read_from_memory); + /* Casting return value avoids a GCC warning on W32. */ + gif = (GifFileType *)fn_DGifOpen(&memsrc, gif_read_from_memory); if (!gif) { image_error ("Cannot open memory source `%s'", img->spec, Qnil); @@ -7390,7 +7409,8 @@ gif_load (f, img) /* Maybe fill in the background field while we have ximg handy. */ if (NILP (image_spec_value (img->spec, QCbackground, NULL))) - IMAGE_BACKGROUND (img, f, ximg); + /* Casting avoids a GCC warning. */ + IMAGE_BACKGROUND (img, f, (XImagePtr_or_DC)ximg); /* Put the image into the pixmap, then free the X image and its buffer. */ x_put_x_image (f, ximg, img->pixmap, width, height); @@ -7400,7 +7420,7 @@ gif_load (f, img) return 1; } -#else +#else /* !HAVE_GIF */ #ifdef MAC_OS static int -- cgit v1.3 From a1e8cad6ea6d8281cdbf7b70d20f5241329da14c Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 12 Jun 2005 11:28:55 +0000 Subject: *** empty log message *** --- lisp/ChangeLog | 5 +++++ src/ChangeLog | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'src/ChangeLog') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7fd8b519dd4..40127c8510a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-06-12 Eli Zaretskii + + * makefile.w32-in (bootstrap-clean-CMD, bootstrap-clean-SH): Don't + use an old loaddefs.el, as in Makefile.in. + 2005-06-12 Lute Kamstra * Makefile.in (bootstrap-prepare): Don't use an old loaddefs.el. diff --git a/src/ChangeLog b/src/ChangeLog index 5b71d4b089f..a2c70f13109 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2005-06-12 Eli Zaretskii + + * w32fns.c (w32_abort): Use the MB_YESNO dialog instead of + MB_ABORTRETRYIGNORE. Never return, even if DebugBreak does. + 2005-06-11 Eli Zaretskii * image.c (x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg -- cgit v1.3 From 7f2b4738d9c69b3e4ca564d53c01493c0af9b247 Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Sun, 12 Jun 2005 19:23:28 +0000 Subject: (NEWOPENFILENAME): New struct. (Fx_file_dialog): Use it to trick the system into giving us up to date dialogs on systems that are documented to support it. Do not set OFN_FILEMUSTEXIST flag if looking for a directory. --- src/ChangeLog | 7 +++++++ src/w32fns.c | 59 +++++++++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 50 insertions(+), 16 deletions(-) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index a2c70f13109..76cdc9893ba 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2005-06-12 Jason Rumney + + * w32fns.c (NEWOPENFILENAME): New struct. + (Fx_file_dialog): Use it to trick the system into giving us up to + date dialogs on systems that are documented to support it. + Do not set OFN_FILEMUSTEXIST flag if looking for a directory. + 2005-06-12 Eli Zaretskii * w32fns.c (w32_abort): Use the MB_YESNO dialog instead of diff --git a/src/w32fns.c b/src/w32fns.c index 7f625916926..6a2f98c4c7d 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -7759,6 +7759,19 @@ file_dialog_callback (hwnd, msg, wParam, lParam) return 0; } +/* Since we compile with _WIN32_WINNT set to 0x0400 (for NT4 compatibility) + we end up with the old file dialogs. Define a big enough struct for the + new dialog to trick GetOpenFileName into giving us the new dialogs on + Windows 2000 and XP. */ +typedef struct +{ + OPENFILENAME real_details; + void * pReserved; + DWORD dwReserved; + DWORD FlagsEx; +} NEWOPENFILENAME; + + DEFUN ("x-file-dialog", Fx_file_dialog, Sx_file_dialog, 2, 5, 0, doc: /* Read file name, prompting with PROMPT in directory DIR. Use a file selection dialog. @@ -7807,44 +7820,58 @@ If ONLY-DIR-P is non-nil, the user can only select directories. */) filename[0] = '\0'; { - OPENFILENAME file_details; + NEWOPENFILENAME new_file_details; BOOL file_opened = FALSE; - + OPENFILENAME * file_details = &new_file_details.real_details; + /* Prevent redisplay. */ specbind (Qinhibit_redisplay, Qt); BLOCK_INPUT; - bzero (&file_details, sizeof (file_details)); - file_details.lStructSize = sizeof (file_details); - file_details.hwndOwner = FRAME_W32_WINDOW (f); + bzero (&new_file_details, sizeof (new_file_details)); + /* Apparently NT4 crashes if you give it an unexpected size. + I'm not sure about Windows 9x, so play it safe. */ + if (w32_major_version > 4 && w32_major_version < 95) + file_details->lStructSize = sizeof (new_file_details); + else + file_details->lStructSize = sizeof (file_details); + + file_details->hwndOwner = FRAME_W32_WINDOW (f); /* Undocumented Bug in Common File Dialog: If a filter is not specified, shell links are not resolved. */ - file_details.lpstrFilter = "All Files (*.*)\0*.*\0Directories\0*|*\0\0"; - file_details.lpstrFile = filename; - file_details.nMaxFile = sizeof (filename); - file_details.lpstrInitialDir = init_dir; - file_details.lpstrTitle = SDATA (prompt); + file_details->lpstrFilter = "All Files (*.*)\0*.*\0Directories\0*|*\0\0"; + file_details->lpstrFile = filename; + file_details->nMaxFile = sizeof (filename); + file_details->lpstrInitialDir = init_dir; + file_details->lpstrTitle = SDATA (prompt); if (! NILP (only_dir_p)) default_filter_index = 2; - file_details.nFilterIndex = default_filter_index; + file_details->nFilterIndex = default_filter_index; - file_details.Flags = (OFN_HIDEREADONLY | OFN_NOCHANGEDIR + file_details->Flags = (OFN_HIDEREADONLY | OFN_NOCHANGEDIR | OFN_EXPLORER | OFN_ENABLEHOOK); if (!NILP (mustmatch)) - file_details.Flags |= OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST; + { + /* Require that the path to the parent directory exists. */ + file_details->Flags |= OFN_PATHMUSTEXIST; + /* If we are looking for a file, require that it exists. */ + if (NILP (only_dir_p)) + file_details->Flags |= OFN_FILEMUSTEXIST; + } - file_details.lpfnHook = (LPOFNHOOKPROC) file_dialog_callback; + file_details->lpfnHook = (LPOFNHOOKPROC) file_dialog_callback; - file_opened = GetOpenFileName (&file_details); + file_opened = GetOpenFileName (file_details); UNBLOCK_INPUT; if (file_opened) { dostounix_filename (filename); - if (file_details.nFilterIndex == 2) + + if (file_details->nFilterIndex == 2) { /* "Directories" selected - strip dummy file name. */ char * last = strrchr (filename, '/'); -- cgit v1.3 From 0e0dddda54491f07cb5a1b871eefd2517144361c Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 13 Jun 2005 12:19:38 +0000 Subject: *** empty log message *** --- lib-src/ChangeLog | 4 ++++ src/ChangeLog | 9 +++++++++ 2 files changed, 13 insertions(+) (limited to 'src/ChangeLog') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 73641f765bf..ff62d4fc343 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2005-06-13 Eli Zaretskii + + * makefile.w32-in ($(DOC)): Fix last change. + 2005-06-12 Eli Zaretskii * makefile.w32-in ($(DOC)): Depend on make-docfile.exe, diff --git a/src/ChangeLog b/src/ChangeLog index 76cdc9893ba..1866d894ac3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,12 @@ +2005-06-13 Eli Zaretskii + + * w32term.c (x_use_underline_position_properties): New variable. + (x_draw_glyph_string): Remind in a comment to change doc string of + x-use-underline-position-properties if/when underline positioning + is implemented. + (syms_of_w32term): DEFVAR_BOOL x-use-underline-position-properties, + and initialize it to nil. + 2005-06-12 Jason Rumney * w32fns.c (NEWOPENFILENAME): New struct. -- cgit v1.3 From 5aa6db5755dd0a5c1f855ba7e98044945b368b1a Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 13 Jun 2005 20:50:25 +0000 Subject: *** empty log message *** --- lisp/ChangeLog | 37 +++++++++++++++++++++++++------------ src/ChangeLog | 34 +++++++++++++++++++++------------- 2 files changed, 46 insertions(+), 25 deletions(-) (limited to 'src/ChangeLog') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9a8e5adc897..08191493111 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,17 @@ +2005-06-13 Stefan Monnier + + * subr.el (complete-in-turn): New macro. + (dynamic-completion-table, lazy-completion-table): Add debug info. + + * faces.el (read-face-name): Use complete-in-turn complete non-aliases + in preference to face aliases. + + * textmodes/fill.el (fill-match-adaptive-prefix): New function. + (fill-context-prefix): Use it to avoid guessing absurdly long prefixes. + Remove unused vars `start' and `firstline'. + (fill-nobreak-p): Fix line-move-invisible -> line-move-invisible-p. + (justify-current-line, fill-individual-paragraphs): Remove unused vars. + 2005-06-13 Eli Zaretskii * cus-start.el (all): Don't complain about missing GTK-related @@ -16,11 +30,10 @@ * woman.el (woman-mode-line-format): Delete constant. (woman-mode-map): Initialize it properly. - (woman-mode): Set mode-class property to special. Use - delay-mode-hooks and run-mode-hooks. Use the right keymap. Set - major-mode and mode-name. Don't set mode-line-format directly. - (Man-getpage-in-background): Don't reference - woman-mode-line-format. + (woman-mode): Set mode-class property to special. + Use delay-mode-hooks and run-mode-hooks. Use the right keymap. + Set major-mode and mode-name. Don't set mode-line-format directly. + (Man-getpage-in-background): Don't reference woman-mode-line-format. * emacs-lisp/debug.el (cancel-debug-on-entry): Make the empty string argument obsolete. @@ -46,9 +59,9 @@ (org-insert-link, org-store-link): Use org-make-link. (org-open-file): Quote file name for shell command, to allow spaces in file names. - (org-link-regexp): Fixed bug with mailto link. - (org-link-maybe-angles-regexp, org-protected-link-regexp): New - constant. + (org-link-regexp): Fix bug with mailto link. + (org-link-maybe-angles-regexp, org-protected-link-regexp): + New constants. (org-export-as-html): Deal with the optional angles around a link. Better treatment of file: links. (org-open-at-point): Replace @{ and @} with < and >. @@ -79,8 +92,8 @@ * loadup.el: Don't say we are dumping under 2 names on windows-nt and cygwin. - * makefile.w32-in (bootstrap-clean-CMD, bootstrap-clean-SH): Don't - use an old loaddefs.el, as in Makefile.in. + * makefile.w32-in (bootstrap-clean-CMD, bootstrap-clean-SH): + Don't use an old loaddefs.el, as in Makefile.in. 2005-06-12 Lute Kamstra @@ -126,8 +139,8 @@ 2005-06-11 Frederik Fouvry * thumbs.el (thumbs-per-line, thumbs-thumbsdir-max-size) - (thumbs-relief, thumbs-margin, thumbs-image-resizing-step): Fix - :type--it is `integer', not `string'. + (thumbs-relief, thumbs-margin, thumbs-image-resizing-step): + Fix :type--it is `integer', not `string'. * faces.el (modeline-highlight): Rename from (the erroneous) `modeline-higilight'. diff --git a/src/ChangeLog b/src/ChangeLog index 1866d894ac3..965d7357b44 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2005-06-13 Stefan Monnier + + * xdisp.c (note_mode_line_or_margin_highlight): Lisp_Object/int mixup. + (get_phys_cursor_geometry, format_mode_line_unwind_data) + (get_line_height_property, x_produce_glyphs): Remove unused vars. + + * coding.c (run_pre_post_conversion_on_str): Remove unused var `buf'. + 2005-06-13 Eli Zaretskii * w32term.c (x_use_underline_position_properties): New variable. @@ -62,8 +70,8 @@ 2005-06-10 Eli Zaretskii * unexw32.c (COPY_CHUNK, COPY_PROC_CHUNK): Add a new argument - `verbose'; print diagnostic messages only if it is non-zero. All - callers changed to pass a zero value unless DEBUG_DUMP is defined + `verbose'; print diagnostic messages only if it is non-zero. + All callers changed to pass a zero value unless DEBUG_DUMP is defined in the environment. (copy_executable_and_dump_data): Print section names with %.8s. @@ -137,8 +145,8 @@ 2005-06-07 Masatake YAMATO - * xdisp.c (note_mode_line_or_margin_highlight): Check - the overlapping of re-rendering area to avoid flickering. + * xdisp.c (note_mode_line_or_margin_highlight): + Check the overlapping of re-rendering area to avoid flickering. (note_mouse_highlight): Call clear_mouse_face if PART is not ON_MODE_LINE nor ON_HEADER_LINE. @@ -153,8 +161,8 @@ 2005-06-06 Jan Dj,Ad(Brv - * macmenu.c (menu_quit_handler, install_menu_quit_handler): New - functions for popping down menus on C-g. + * macmenu.c (menu_quit_handler, install_menu_quit_handler): + New functions for popping down menus on C-g. (set_frame_menubar, mac_menu_show): Call install_menu_quit_handler. * macterm.c: Make mac_quit_char_modifiers and mac_quit_char_keycode @@ -164,10 +172,10 @@ 2005-06-06 Eli Zaretskii - * w32heap.h (OFFSET_TO_RVA, RVA_TO_OFFSET, RVA_TO_PTR): Remove - macros. + * w32heap.h (OFFSET_TO_RVA, RVA_TO_OFFSET, RVA_TO_PTR): + Remove macros. - * unexw32.c (RVA_TO_PTR): Moved here from w32heap.h. + * unexw32.c (RVA_TO_PTR): Move here from w32heap.h. * w32proc.c (RVA_TO_PTR): New macro. @@ -291,11 +299,11 @@ (format_mode_line_unwind_data, unwind_format_mode_line): New functions for unwind protection in mode line formatting. (x_consider_frame_title): Use them and new local var 'title_start' - to support nested calls to format-mode-line and redisplay. Set - mode_line_target to MODE_LINE_TITLE. + to support nested calls to format-mode-line and redisplay. + Set mode_line_target to MODE_LINE_TITLE. (Fformat_mode_line): Use them and new local var 'string_start' to - support nested calls to format-mode-line and redisplay. Set - mode_line_target to MODE_LINE_NOPROP or MODE_LINE_STRING. + support nested calls to format-mode-line and redisplay. + Set mode_line_target to MODE_LINE_NOPROP or MODE_LINE_STRING. Don't trim trailing dashes. (decode_mode_spec): Don't make infinite number of trailing dashes for MODE_LINE_NOPROP and MODE_LINE_STRING targets. -- cgit v1.3 From 4a9308b8e2b100ab15a7eded063304c8a4fbc144 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 14 Jun 2005 00:39:32 +0000 Subject: (Fdefvaralias): Rename arguments SYMBOL and ALIASED to NEW-ALIAS and BASE-VARIABLE, respectively. --- src/ChangeLog | 5 +++++ src/eval.c | 39 ++++++++++++++++++++------------------- 2 files changed, 25 insertions(+), 19 deletions(-) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index 965d7357b44..0224932301c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2005-06-14 Juanma Barranquero + + * eval.c (Fdefvaralias): Rename arguments SYMBOL and ALIASED to + NEW-ALIAS and BASE-VARIABLE, respectively. + 2005-06-13 Stefan Monnier * xdisp.c (note_mode_line_or_margin_highlight): Lisp_Object/int mixup. diff --git a/src/eval.c b/src/eval.c index 46affcac418..445eb283114 100644 --- a/src/eval.c +++ b/src/eval.c @@ -722,35 +722,36 @@ usage: (defmacro NAME ARGLIST [DOCSTRING] [DECL] BODY...) */) DEFUN ("defvaralias", Fdefvaralias, Sdefvaralias, 2, 3, 0, - doc: /* Make SYMBOL a variable alias for symbol ALIASED. -Setting the value of SYMBOL will subsequently set the value of ALIASED, -and getting the value of SYMBOL will return the value ALIASED has. -Third arg DOCSTRING, if non-nil, is documentation for SYMBOL. If it is -omitted or nil, SYMBOL gets the documentation string of ALIASED, or of the -variable at the end of the chain of aliases, if ALIASED is itself an alias. -The return value is ALIASED. */) - (symbol, aliased, docstring) - Lisp_Object symbol, aliased, docstring; + doc: /* Make NEW-ALIAS a variable alias for symbol BASE-VARIABLE. +Setting the value of NEW-ALIAS will subsequently set the value of BASE-VARIABLE, + and getting the value of NEW-ALIAS will return the value BASE-VARIABLE has. +Third arg DOCSTRING, if non-nil, is documentation for NEW-ALIAS. If it is + omitted or nil, NEW-ALIAS gets the documentation string of BASE-VARIABLE, + or of the variable at the end of the chain of aliases, if BASE-VARIABLE is + itself an alias. +The return value is BASE-VARIABLE. */) + (new_alias, base_variable, docstring) + Lisp_Object new_alias, base_variable, docstring; { struct Lisp_Symbol *sym; - CHECK_SYMBOL (symbol); - CHECK_SYMBOL (aliased); + CHECK_SYMBOL (new_alias); + CHECK_SYMBOL (base_variable); - if (SYMBOL_CONSTANT_P (symbol)) + if (SYMBOL_CONSTANT_P (new_alias)) error ("Cannot make a constant an alias"); - sym = XSYMBOL (symbol); + sym = XSYMBOL (new_alias); sym->indirect_variable = 1; - sym->value = aliased; - sym->constant = SYMBOL_CONSTANT_P (aliased); - LOADHIST_ATTACH (symbol); + sym->value = base_variable; + sym->constant = SYMBOL_CONSTANT_P (base_variable); + LOADHIST_ATTACH (new_alias); if (!NILP (docstring)) - Fput (symbol, Qvariable_documentation, docstring); + Fput (new_alias, Qvariable_documentation, docstring); else - Fput (symbol, Qvariable_documentation, Qnil); + Fput (new_alias, Qvariable_documentation, Qnil); - return aliased; + return base_variable; } -- cgit v1.3 From 950850233d48dddfb6ef972ed22764f3d0662571 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Wed, 15 Jun 2005 02:30:03 +0000 Subject: (mac_compute_glyph_string_overhangs): Don't set overhangs unless the given glyph type is noncomposite CHAR_GLYPH. [USE_CARBON_EVENTS] (mac_convert_event_ref): Convert dead key down events. (XTread_socket): Don't pass keyboard events with the option modifier to the system when Vmac_command_key_is_meta is nil or Vmac_option_modifier is non-nil. [USE_CARBON_EVENTS] (read_socket_inev): New variable. [USE_CARBON_EVENTS] (init_command_handler): Fix argument. [USE_CARBON_EVENTS] (mac_handle_mouse_event): New Carbon event handler function. (install_window_handler) [USE_CARBON_EVENTS]: Install it. (XTread_socket) [USE_CARBON_EVENTS]: Move mouse wheel event handler part to mac_handle_mouse_event. --- src/ChangeLog | 17 ++++ src/macterm.c | 314 +++++++++++++++++++++++++++++++++++----------------------- 2 files changed, 207 insertions(+), 124 deletions(-) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index 0224932301c..46cab9c1cba 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,20 @@ +2005-06-15 YAMAMOTO Mitsuharu + + * macterm.c (mac_compute_glyph_string_overhangs): Don't set + overhangs unless the given glyph type is noncomposite CHAR_GLYPH. + [USE_CARBON_EVENTS] (mac_convert_event_ref): Convert dead key down + events. + (XTread_socket): Don't pass keyboard events with the option + modifier to the system when Vmac_command_key_is_meta is nil or + Vmac_option_modifier is non-nil. + [USE_CARBON_EVENTS] (read_socket_inev): New variable. + [USE_CARBON_EVENTS] (init_command_handler): Fix argument. + [USE_CARBON_EVENTS] (mac_handle_mouse_event): New Carbon event + handler function. + (install_window_handler) [USE_CARBON_EVENTS]: Install it. + (XTread_socket) [USE_CARBON_EVENTS]: Move mouse wheel event + handler part to mac_handle_mouse_event. + 2005-06-14 Juanma Barranquero * eval.c (Fdefvaralias): Rename arguments SYMBOL and ALIASED to diff --git a/src/macterm.c b/src/macterm.c index 093b60a639a..26e7b117fc5 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -1996,33 +1996,37 @@ static void mac_compute_glyph_string_overhangs (s) struct glyph_string *s; { - Rect r; - MacFontStruct *font = s->font; - - TextFont (font->mac_fontnum); - TextSize (font->mac_fontsize); - TextFace (font->mac_fontface); - - if (s->two_byte_p) - QDTextBounds (s->nchars * 2, (char *)s->char2b, &r); - else + if (s->cmp == NULL + && s->first_glyph->type == CHAR_GLYPH) { - int i; - char *buf = xmalloc (s->nchars); + Rect r; + MacFontStruct *font = s->font; - if (buf == NULL) - SetRect (&r, 0, 0, 0, 0); + TextFont (font->mac_fontnum); + TextSize (font->mac_fontsize); + TextFace (font->mac_fontface); + + if (s->two_byte_p) + QDTextBounds (s->nchars * 2, (char *)s->char2b, &r); else { - for (i = 0; i < s->nchars; ++i) - buf[i] = s->char2b[i].byte2; - QDTextBounds (s->nchars, buf, &r); - xfree (buf); + int i; + char *buf = xmalloc (s->nchars); + + if (buf == NULL) + SetRect (&r, 0, 0, 0, 0); + else + { + for (i = 0; i < s->nchars; ++i) + buf[i] = s->char2b[i].byte2; + QDTextBounds (s->nchars, buf, &r); + xfree (buf); + } } - } - s->right_overhang = r.right > s->width ? r.right - s->width : 0; - s->left_overhang = r.left < 0 ? -r.left : 0; + s->right_overhang = r.right > s->width ? r.right - s->width : 0; + s->left_overhang = r.left < 0 ? -r.left : 0; + } } @@ -7469,6 +7473,11 @@ Lisp_Object Vmac_pass_command_to_system; /* If Non-nil, the Mac "Control" key is passed on to the Mac Toolbox for processing before Emacs sees it. */ Lisp_Object Vmac_pass_control_to_system; + +/* Points to the variable `inev' in the function XTread_socket. It is + used for passing an input event to the function back from a Carbon + event handler. */ +static struct input_event *read_socket_inev = NULL; #endif /* Set in term/mac-win.el to indicate that event loop can now generate @@ -7601,45 +7610,79 @@ mac_get_mouse_btn (EventRef ref) /* Normally, ConvertEventRefToEventRecord will correctly handle all events. However the click of the mouse wheel is not converted to a - mouseDown or mouseUp event. This calls ConvertEventRef, but then - checks to see if it is a mouse up or down carbon event that has not - been converted, and if so, converts it by hand (to be picked up in - the XTread_socket loop). */ + mouseDown or mouseUp event. Likewise for dead key down events. + This calls ConvertEventRef, but then checks to see if it is a mouse + up/down, or a dead key down carbon event that has not been + converted, and if so, converts it by hand (to be picked up in the + XTread_socket loop). */ static Boolean mac_convert_event_ref (EventRef eventRef, EventRecord *eventRec) { Boolean result = ConvertEventRefToEventRecord (eventRef, eventRec); - /* Do special case for mouse wheel button. */ - if (!result && GetEventClass (eventRef) == kEventClassMouse) + + if (result) + return result; + + switch (GetEventClass (eventRef)) { - UInt32 kind = GetEventKind (eventRef); - if (kind == kEventMouseDown && !(eventRec->what == mouseDown)) + case kEventClassMouse: + switch (GetEventKind (eventRef)) { + case kEventMouseDown: eventRec->what = mouseDown; - result=1; - } - if (kind == kEventMouseUp && !(eventRec->what == mouseUp)) - { + result = 1; + break; + + case kEventMouseUp: eventRec->what = mouseUp; - result=1; + result = 1; + break; + + default: + break; } - if (result) + + case kEventClassKeyboard: + switch (GetEventKind (eventRef)) { - /* Need where and when. */ - UInt32 mods; - GetEventParameter (eventRef, kEventParamMouseLocation, - typeQDPoint, NULL, sizeof (Point), - NULL, &eventRec->where); - /* Use two step process because new event modifiers are - 32-bit and old are 16-bit. Currently, only loss is - NumLock & Fn. */ - GetEventParameter (eventRef, kEventParamKeyModifiers, - typeUInt32, NULL, sizeof (UInt32), - NULL, &mods); - eventRec->modifiers = mods; - - eventRec->when = EventTimeToTicks (GetEventTime (eventRef)); + case kEventRawKeyDown: + { + unsigned char char_codes; + UInt32 key_code; + + eventRec->what = keyDown; + GetEventParameter (eventRef, kEventParamKeyMacCharCodes, typeChar, + NULL, sizeof (char), NULL, &char_codes); + GetEventParameter (eventRef, kEventParamKeyCode, typeUInt32, + NULL, sizeof (UInt32), NULL, &key_code); + eventRec->message = char_codes | ((key_code & 0xff) << 8); + result = 1; + } + break; + + default: + break; } + + default: + break; } + + if (result) + { + /* Need where and when. */ + UInt32 mods; + + GetEventParameter (eventRef, kEventParamMouseLocation, typeQDPoint, + NULL, sizeof (Point), NULL, &eventRec->where); + /* Use two step process because new event modifiers are 32-bit + and old are 16-bit. Currently, only loss is NumLock & Fn. */ + GetEventParameter (eventRef, kEventParamKeyModifiers, typeUInt32, + NULL, sizeof (UInt32), NULL, &mods); + eventRec->modifiers = mods; + + eventRec->when = EventTimeToTicks (GetEventTime (eventRef)); + } + return result; } @@ -8209,8 +8252,7 @@ mac_handle_command_event (next_handler, event, data) } static OSErr -init_command_handler (window) - WindowPtr window; +init_command_handler () { OSErr err = noErr; EventTypeSpec specs[] = {{kEventClassCommand, kEventCommandProcess}}; @@ -8295,6 +8337,68 @@ mac_handle_window_event (next_handler, event, data) return eventNotHandledErr; } + +static pascal OSStatus +mac_handle_mouse_event (next_handler, event, data) + EventHandlerCallRef next_handler; + EventRef event; + void *data; +{ + OSStatus result; + + switch (GetEventKind (event)) + { + case kEventMouseWheelMoved: + { + WindowPtr wp; + struct frame *f; + EventMouseWheelAxis axis; + SInt32 delta; + Point point; + + result = CallNextEventHandler (next_handler, event); + if (result != eventNotHandledErr || read_socket_inev == NULL) + return result; + + GetEventParameter (event, kEventParamWindowRef, typeWindowRef, + NULL, sizeof (WindowRef), NULL, &wp); + f = mac_window_to_frame (wp); + if (f != mac_focus_frame (&one_mac_display_info)) + break; + + GetEventParameter (event, kEventParamMouseWheelAxis, + typeMouseWheelAxis, NULL, + sizeof (EventMouseWheelAxis), NULL, &axis); + if (axis != kEventMouseWheelAxisY) + break; + + GetEventParameter (event, kEventParamMouseWheelDelta, typeSInt32, + NULL, sizeof (SInt32), NULL, &delta); + GetEventParameter (event, kEventParamMouseLocation, typeQDPoint, + NULL, sizeof (Point), NULL, &point); + read_socket_inev->kind = WHEEL_EVENT; + read_socket_inev->code = 0; + read_socket_inev->modifiers = + (mac_event_to_emacs_modifiers (event) + | ((delta < 0) ? down_modifier : up_modifier)); + SetPortWindowPort (wp); + GlobalToLocal (&point); + XSETINT (read_socket_inev->x, point.h); + XSETINT (read_socket_inev->y, point.v); + XSETFRAME (read_socket_inev->frame_or_window, f); + read_socket_inev->timestamp = + EventTimeToTicks (GetEventTime (event)) * (1000/60); + + return noErr; + } + break; + + default: + break; + } + + return eventNotHandledErr; +} #endif /* USE_CARBON_EVENTS */ @@ -8304,16 +8408,24 @@ install_window_handler (window) { OSErr err = noErr; #if USE_CARBON_EVENTS - EventTypeSpec specs[] = {{kEventClassWindow, kEventWindowUpdate}, - {kEventClassWindow, kEventWindowBoundsChanging}}; - static EventHandlerUPP handle_window_event_UPP = NULL; - - if (handle_window_event_UPP == NULL) - handle_window_event_UPP = NewEventHandlerUPP (mac_handle_window_event); - - err = InstallWindowEventHandler (window, handle_window_event_UPP, - GetEventTypeCount (specs), specs, - NULL, NULL); + EventTypeSpec specs_window[] = + {{kEventClassWindow, kEventWindowUpdate}, + {kEventClassWindow, kEventWindowBoundsChanging}}; + EventTypeSpec specs_mouse[] = {{kEventClassMouse, kEventMouseWheelMoved}}; + static EventHandlerUPP handle_window_eventUPP = NULL; + static EventHandlerUPP handle_mouse_eventUPP = NULL; + + if (handle_window_eventUPP == NULL) + handle_window_eventUPP = NewEventHandlerUPP (mac_handle_window_event); + if (handle_mouse_eventUPP == NULL) + handle_mouse_eventUPP = NewEventHandlerUPP (mac_handle_mouse_event); + err = InstallWindowEventHandler (window, handle_window_eventUPP, + GetEventTypeCount (specs_window), + specs_window, NULL, NULL); + if (err == noErr) + err = InstallWindowEventHandler (window, handle_mouse_eventUPP, + GetEventTypeCount (specs_mouse), + specs_mouse, NULL, NULL); #endif #if TARGET_API_MAC_CARBON if (mac_do_track_dragUPP == NULL) @@ -8865,68 +8977,19 @@ XTread_socket (sd, expected, hold_quit) #if USE_CARBON_EVENTS /* Handle new events */ if (!mac_convert_event_ref (eventRef, &er)) - switch (GetEventClass (eventRef)) - { - case kEventClassWindow: - if (GetEventKind (eventRef) == kEventWindowBoundsChanged) - { - WindowPtr window_ptr; - GetEventParameter(eventRef, kEventParamDirectObject, - typeWindowRef, NULL, sizeof(WindowPtr), - NULL, &window_ptr); - f = mac_window_to_frame (window_ptr); - if (f && !f->async_iconified) - x_real_positions (f, &f->left_pos, &f->top_pos); - SendEventToEventTarget (eventRef, toolbox_dispatcher); - } - break; - case kEventClassMouse: - if (GetEventKind (eventRef) == kEventMouseWheelMoved) - { - SInt32 delta; - Point point; - struct frame *f = mac_focus_frame (dpyinfo); - WindowPtr window_ptr; - -#if 0 - if (dpyinfo->x_focus_frame == NULL) - { - /* Beep if wheel move occurs when all the frames - are invisible. */ - SysBeep(1); - break; - } -#endif - - GetEventParameter(eventRef, kEventParamMouseWheelDelta, - typeSInt32, NULL, sizeof (SInt32), - NULL, &delta); - GetEventParameter(eventRef, kEventParamMouseLocation, - typeQDPoint, NULL, sizeof (Point), - NULL, &point); - inev.kind = WHEEL_EVENT; - inev.code = 0; - inev.modifiers = (mac_event_to_emacs_modifiers (eventRef) - | ((delta < 0) ? down_modifier - : up_modifier)); - window_ptr = FRAME_MAC_WINDOW (f); - SetPortWindowPort (window_ptr); - GlobalToLocal (&point); - XSETINT (inev.x, point.h); - XSETINT (inev.y, point.v); - XSETFRAME (inev.frame_or_window, - mac_window_to_frame (window_ptr)); - inev.timestamp = EventTimeToTicks (GetEventTime (eventRef))*(1000/60); - } - else - SendEventToEventTarget (eventRef, toolbox_dispatcher); - - break; - - default: - /* Send the event to the appropriate receiver. */ - SendEventToEventTarget (eventRef, toolbox_dispatcher); - } + { + /* There used to be a handler for the kEventMouseWheelMoved + event here. But as of Mac OS X 10.4, this kind of event + is not directly posted to the main event queue by + two-finger scrolling on the trackpad. Instead, some + private event is posted and it is converted to a wheel + event by the default handler for the application target. + The converted one can be received by a Carbon event + handler installed on a window target. */ + read_socket_inev = &inev; + SendEventToEventTarget (eventRef, toolbox_dispatcher); + read_socket_inev = NULL; + } else #endif /* USE_CARBON_EVENTS */ switch (er.what) @@ -9362,7 +9425,10 @@ XTread_socket (sd, expected, hold_quit) if ((!NILP (Vmac_pass_command_to_system) || !(er.modifiers & cmdKey)) && (!NILP (Vmac_pass_control_to_system) - || !(er.modifiers & controlKey))) + || !(er.modifiers & controlKey)) + && (!NILP (Vmac_command_key_is_meta) + && NILP (Vmac_option_modifier) + || !(er.modifiers & optionKey))) if (SendEventToEventTarget (eventRef, toolbox_dispatcher) != eventNotHandledErr) break; -- cgit v1.3