Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 99520. ------------------------------------------------------------ revno: 99520 committer: Chong Yidong branch nick: trunk timestamp: Thu 2010-02-18 02:21:15 -0500 message: * nsterm.m (ns_ring_bell): Revert last change (Bug#5569). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-02-18 06:35:21 +0000 +++ src/ChangeLog 2010-02-18 07:21:15 +0000 @@ -1,3 +1,7 @@ +2010-02-18 Chong Yidong + + * nsterm.m (ns_ring_bell): Revert last change (Bug#5569). + 2010-02-18 Glenn Morris * callint.c (Finteractive): Doc fix. === modified file 'src/nsterm.m' --- src/nsterm.m 2010-01-31 05:23:09 +0000 +++ src/nsterm.m 2010-02-18 07:21:15 +0000 @@ -808,58 +808,23 @@ view = FRAME_NS_VIEW (frame); if (view != nil) { - /* Get the bounds of our NSView */ - NSRect viewBounds = [view bounds]; - - /* Height of each line to flash. */ - int flash_height = FRAME_LINE_HEIGHT (frame); - int width = FRAME_PIXEL_WIDTH (frame) - - NS_SCROLL_BAR_WIDTH (frame); - - /* Get the GraphicsContext */ - CGContextRef ctxt = [[NSGraphicsContext currentContext] graphicsPort]; - CGRect lowerLine, upperLine; - lowerLine = - CGRectMake(viewBounds.origin.x, viewBounds.origin.y, - width + NS_SCROLL_BAR_WIDTH(frame), - flash_height + FRAME_INTERNAL_BORDER_WIDTH (frame)); - upperLine = - CGRectMake(viewBounds.origin.x, - viewBounds.origin.y + viewBounds.size.height - - (flash_height + FRAME_INTERNAL_BORDER_WIDTH (frame)), - width, - flash_height + FRAME_INTERNAL_BORDER_WIDTH (frame)); - - /* Invert the colors using a difference blend. */ - CGContextSetBlendMode(ctxt, kCGBlendModeDifference); - CGContextSetGrayFillColor(ctxt, 1, 1); - - /* If window is tall, flash top and bottom line. */ - if (viewBounds.size.height > 3 * FRAME_LINE_HEIGHT (frame)) - { - CGContextFillRect(ctxt, upperLine); - CGContextFillRect(ctxt, lowerLine); - } - else - /* If it is short, flash it all. */ - CGContextFillRect(ctxt, NSRectToCGRect([view bounds])); - - /* Bounce Dock icon. Maybe we can allow some configuration here. */ - [NSApp requestUserAttention: NSInformationalRequest]; - + NSRect r, surr; + NSPoint dim = NSMakePoint (128, 128); + + r = [view bounds]; + r.origin.x += (r.size.width - dim.x) / 2; + r.origin.y += (r.size.height - dim.y) / 2; + r.size.width = dim.x; + r.size.height = dim.y; + surr = NSInsetRect (r, -2, -2); + ns_focus (frame, &surr, 1); + [[view window] cacheImageInRect: [view convertRect: surr toView:nil]]; + [ns_lookup_indexed_color (NS_FACE_FOREGROUND + (FRAME_DEFAULT_FACE (frame)), frame) set]; + NSRectFill (r); [[view window] flushWindow]; ns_timeout (150000); - - /* If window is tall, flash top and bottom line. */ - if (viewBounds.size.height > 3 * FRAME_LINE_HEIGHT (frame)) - { - CGContextFillRect(ctxt, upperLine); - CGContextFillRect(ctxt, lowerLine); - } - else - /* If it is short, flash it all. */ - CGContextFillRect(ctxt, NSRectToCGRect([view bounds])); - + [[view window] restoreCachedImage]; [[view window] flushWindow]; ns_unfocus (frame); } ------------------------------------------------------------ revno: 99519 committer: Glenn Morris branch nick: trunk timestamp: Wed 2010-02-17 22:35:21 -0800 message: * callint.c (Finteractive): Doc fix. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-02-18 02:27:25 +0000 +++ src/ChangeLog 2010-02-18 06:35:21 +0000 @@ -1,3 +1,7 @@ +2010-02-18 Glenn Morris + + * callint.c (Finteractive): Doc fix. + 2010-02-18 Kazuhiro Ito (tiny change) * coding.c (record_conversion_result): Handle === modified file 'src/callint.c' --- src/callint.c 2010-01-13 08:35:10 +0000 +++ src/callint.c 2010-02-18 06:35:21 +0000 @@ -127,7 +127,7 @@ invoked the command for its first mouse click (or any other event which specifies a window). If the string begins with `^' and `shift-select-mode' is non-nil, - Emacs first calls the function `handle-shift-select'. + Emacs first calls the function `handle-shift-selection'. You may use `@', `*', and `^' together. They are processed in the order that they appear, before reading any arguments. usage: (interactive &optional ARGS) */) ------------------------------------------------------------ revno: 99518 committer: Glenn Morris branch nick: trunk timestamp: Wed 2010-02-17 22:18:49 -0800 message: * commits: Mention not to mix changes in any given commit. diff: === modified file 'admin/notes/commits' --- admin/notes/commits 2010-01-16 20:24:08 +0000 +++ admin/notes/commits 2010-02-18 06:18:49 +0000 @@ -1,10 +1,17 @@ HOW TO COMMIT CHANGES TO EMACS +Most of these points are from: + http://lists.gnu.org/archive/html/emacs-devel/2009-03/msg00555.html From: Miles Bader Subject: commit style redux Date: Tue, 31 Mar 2009 12:21:20 +0900 +(0) Each commit should correspond to a single change (whether spread + over multiple files or not). Do not mix different changes in the + same commit (eg adding a feature in one file, fixing a bug in + another should be two commits, not one). + (1) Commit all changed files at once with a single log message (which in CVS will result in an identical log message for all committed files), not one-by-one. This is pretty easy using vc-dir now. @@ -41,6 +48,7 @@ Followup discussion: http://lists.gnu.org/archive/html/emacs-devel/2010-01/msg00897.html +http://lists.gnu.org/archive/html/emacs-devel/2010-02/msg00401.html PREVIOUS GUIDELINES FOR CVS ------------------------------------------------------------ revno: 99517 committer: Glenn Morris branch nick: trunk timestamp: Wed 2010-02-17 22:05:45 -0800 message: * emacs-lisp/authors.el (authors-renamed-files-alist): Add entries for INSTALL.CVS. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-02-17 21:39:21 +0000 +++ lisp/ChangeLog 2010-02-18 06:05:45 +0000 @@ -1,3 +1,8 @@ +2010-02-18 Glenn Morris + + * emacs-lisp/authors.el (authors-renamed-files-alist): + Add entries for INSTALL.CVS. + 2010-02-17 Mark A. Hershberger * vc-bzr.el: fix typo in Known Bugs section. === modified file 'lisp/emacs-lisp/authors.el' --- lisp/emacs-lisp/authors.el 2010-01-13 08:35:10 +0000 +++ lisp/emacs-lisp/authors.el 2010-02-18 06:05:45 +0000 @@ -504,7 +504,9 @@ ;; index and pick merged into search. ("mh-index.el" . "mh-search.el") ("mh-pick.el" . "mh-search.el") - ("INSTALL-CVS" . "INSTALL.CVS") + ;; INSTALL-CVS -> .CVS -> .BZR + ("INSTALL-CVS" . "INSTALL.BZR") + ("INSTALL.CVS" . "INSTALL.BZR") ("refcards/fr-drdref.pdf" . "refcards/fr-dired-ref.pdf") ("gnus-logo.eps" . "refcards/gnus-logo.eps") ("build-install" . "build-ins.in") ------------------------------------------------------------ revno: 99516 committer: Glenn Morris branch nick: trunk timestamp: Wed 2010-02-17 22:02:35 -0800 message: INSTALL.BZR: Minor edit. Remove section about developer access to the Bazaar repository, which is not really relevant to this file. diff: === modified file 'INSTALL.BZR' --- INSTALL.BZR 2010-01-12 05:11:05 +0000 +++ INSTALL.BZR 2010-02-18 06:02:35 +0000 @@ -64,15 +64,6 @@ someone to fix it. -Note on accessing the Bazaar repository ---------------------------------------- - -Write access to the Bazaar repository is currently done via Bazaar's -sftp:// protocol; see http://www.emacswiki.org/emacs/BzrForEmacsDevs. -We plan to offer bzr+ssh:// access later. More discussion about that -is at https://savannah.gnu.org/support/?107077. - - This file is part of GNU Emacs. ------------------------------------------------------------ revno: 99515 committer: Glenn Morris branch nick: trunk timestamp: Wed 2010-02-17 21:39:06 -0800 message: CONTRIBUTE: Various minor updates and changes. Mostly related to the change from CVS to Bazaar. diff: === modified file 'etc/CONTRIBUTE' --- etc/CONTRIBUTE 2010-01-12 05:11:05 +0000 +++ etc/CONTRIBUTE 2010-02-18 05:39:06 +0000 @@ -1,4 +1,5 @@ -Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +Copyright (C) 2006, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. See end for license conditions. @@ -30,7 +31,7 @@ * Coding Standards -Contributed code should follow the GNU Coding Standard. +Contributed code should follow the GNU Coding Standards. If it doesn't, we'll need to find someone to fix the code before we can use it. @@ -44,24 +45,24 @@ * Copyright Assignment -We can accept small changes without legal papers, and for medium-size -changes a copyright disclaimer is ok too. To accept substantial -contributions from you, we need a copyright assignment form filled out -and filed with the FSF. - -Contact us at emacs-devel@gnu.org to obtain the relevant forms. +We can accept small changes (roughly, fewer than 15 lines) without +legal papers. Anything more substantial requires a copyright +disclaimer or assignment (the latter is preferred, especially for +larger changes). Both of these involved filling out a short form and +filing it with the FSF. The process is straightforward -- contact us +at emacs-devel@gnu.org to obtain the relevant forms. * Getting the Source Code -The latest version of Emacs can be downloaded using CVS (or other -version control systems) from the Savannah web site. It is important -to write your patch based on this version; if you start from an older -version, your patch may be outdated when you write it, and maintainers -will have a hard time applying it. +The latest version of Emacs can be downloaded using Bazaar from the +Savannah web site. It is important to write your patch based on the +latest version. If you start from an older version, your patch may be +outdated (so that maintainers will have a hard time applying it), or +changes in Emacs may have made your patch unnecessary. -After you have downloaded the CVS source, you should read the file -INSTALL.CVS for build instructions (they differ to some extent from a +After you have downloaded the Bazaar source, you should read the file +INSTALL.BZR for build instructions (they differ to some extent from a normal build). Ref: http://savannah.gnu.org/projects/emacs @@ -75,7 +76,7 @@ When you have all these pieces, bundle them up in a mail message and send it to bug-gnu-emacs@gnu.org or emacs-devel@gnu.org. -All subsequent discussion should also be sent to the mailing list. +All subsequent discussion should be sent to the same mailing list. ** Description @@ -88,7 +89,7 @@ A ChangeLog entry as plaintext (separate from the patch). -See the various ChangeLog files for format and content. Note that, +See the various ChangeLog files for format and content. Note that, unlike some other projects, we do require ChangeLogs also for documentation, i.e. Texinfo files. @@ -99,9 +100,10 @@ Please use "Context Diff" format. -If you are accessing the CVS repository use - cvs update; cvs diff -cp -else, use +If you are accessing the Bazaar repository, make sure your copy is +up-to-date (e.g. with `bzr pull'), then use + bzr diff --no-aliases --diff-options=-cp +Else, use diff -cp OLD NEW If your version of diff does not support these options, then get the @@ -122,6 +124,11 @@ If you send several unrelated changes together, we will ask you to separate them so we can consider each of the changes by itself. +** Do not make formatting changes. + +Making cosmetic formatting changes (indentation, etc) makes it harder +to see what you have really changed. + * Coding style and conventions. @@ -139,17 +146,17 @@ * Supplemental information for Emacs Developers. -** Write access to Emacs' CVS repository. +** Write access to the Emacs repository. Once you become a frequent contributor to Emacs, we can consider -giving you write access to the CVS repository. +giving you write access to the Bazaar repository. ** Emacs Mailing lists. Discussion about Emacs development takes place on emacs-devel@gnu.org. -Bug reports are sent to bug-gnu-emacs@gnu.org. +Bug reports and feature requests are sent to bug-gnu-emacs@gnu.org. You can subscribe to the mailing lists at savannah.gnu.org/projects/emacs. ------------------------------------------------------------ revno: 99514 [merge] committer: Kenichi Handa branch nick: trunk timestamp: Thu 2010-02-18 11:32:37 +0900 message: Fix handling of CODING_RESULT_INSUFFICIENT_DST. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-02-17 06:47:32 +0000 +++ src/ChangeLog 2010-02-18 02:27:25 +0000 @@ -1,3 +1,10 @@ +2010-02-18 Kazuhiro Ito (tiny change) + + * coding.c (record_conversion_result): Handle + CODING_RESULT_INSUFFICIENT_DST. + (decode_coding_object): Record CODING_RESULT_INSUFFICIENT_MEM on + memory allocation error. + 2010-02-17 Kenichi Handa * coding.c (decode_coding_ccl): Don't setup ccl program here. Fix === modified file 'src/coding.c' --- src/coding.c 2010-02-17 06:47:32 +0000 +++ src/coding.c 2010-02-18 02:27:25 +0000 @@ -993,6 +993,11 @@ case CODING_RESULT_INSUFFICIENT_MEM: Vlast_code_conversion_error = Qinsufficient_memory; break; + case CODING_RESULT_INSUFFICIENT_DST: + /* Don't record this error in Vlast_code_conversion_error + because it happens just temporarily and is resolved when the + whole conversion is finished. */ + break; case CODING_RESULT_SUCCESS: break; default: @@ -7865,7 +7870,7 @@ if (! destination) { record_conversion_result (coding, - CODING_RESULT_INSUFFICIENT_DST); + CODING_RESULT_INSUFFICIENT_MEM); unbind_to (count, Qnil); return; } ------------------------------------------------------------ revno: 99513 committer: Mark A. Hershberger branch nick: local timestamp: Wed 2010-02-17 16:39:21 -0500 message: 2010-02-17 Mark A. Hershberger * vc-bzr.el: fix typo in Known Bugs section. * isearch.el (isearch-update-post-hook): New hook (isearch-update): Use the new hook. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-02-16 16:03:29 +0000 +++ lisp/ChangeLog 2010-02-17 21:39:21 +0000 @@ -1,3 +1,10 @@ +2010-02-17 Mark A. Hershberger + + * vc-bzr.el: fix typo in Known Bugs section. + + * isearch.el (isearch-update-post-hook): New hook + (isearch-update): Use the new hook. + 2010-02-16 Michael Albinus * net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix === modified file 'lisp/isearch.el' --- lisp/isearch.el 2010-01-22 16:32:31 +0000 +++ lisp/isearch.el 2010-02-17 21:39:21 +0000 @@ -156,6 +156,9 @@ (defvar isearch-mode-hook nil "Function(s) to call after starting up an incremental search.") +(defvar isearch-update-post-hook nil + "Function(s) to call after isearch has found matches in the buffer.") + (defvar isearch-mode-end-hook nil "Function(s) to call after terminating an incremental search. When these functions are called, `isearch-mode-end-hook-quit' @@ -868,7 +871,8 @@ (isearch-lazy-highlight-new-loop)) ;; We must prevent the point moving to the end of composition when a ;; part of the composition has just been searched. - (setq disable-point-adjustment t)) + (setq disable-point-adjustment t) + (run-hooks 'isearch-update-post-hook)) (defun isearch-done (&optional nopush edit) "Exit Isearch mode. === modified file 'lisp/vc-bzr.el' --- lisp/vc-bzr.el 2010-02-06 04:23:59 +0000 +++ lisp/vc-bzr.el 2010-02-17 21:39:21 +0000 @@ -35,7 +35,7 @@ ;; Known bugs ;; ========== -;; When edititing a symlink and *both* the symlink and its target +;; When editing a symlink and *both* the symlink and its target ;; are bzr-versioned, `vc-bzr` presently runs `bzr status` on the ;; symlink, thereby not detecting whether the actual contents ;; (that is, the target contents) are changed. ------------------------------------------------------------ revno: 99512 [merge] committer: Kenichi Handa branch nick: trunk timestamp: Wed 2010-02-17 15:52:12 +0900 message: Fix the ccl decoder for the case that the output buffer is fullfilled. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-02-13 13:27:32 +0000 +++ src/ChangeLog 2010-02-17 06:47:32 +0000 @@ -1,3 +1,13 @@ +2010-02-17 Kenichi Handa + + * coding.c (decode_coding_ccl): Don't setup ccl program here. Fix + for the case that the output buffer is fullfilled. + (decode_coding): Setup ccl program here. Keep looping when the + decoder stopped because the output buffer is + fullfilled (bug#5534). + + * ccl.c (ccl_driver): Never reset ic to CCL_HEADER_MAIN. + 2010-02-13 Jan Djärv * xterm.c (x_clear_frame_area): Call gtk_widget_queue_draw if USE_GTK, === modified file 'src/ccl.c' --- src/ccl.c 2010-02-14 17:32:16 +0000 +++ src/ccl.c 2010-02-17 06:47:32 +0000 @@ -883,9 +883,6 @@ int eof_ic = ccl->eof_ic; int eof_hit = 0; - if (ic >= eof_ic) - ic = CCL_HEADER_MAIN; - if (ccl->buf_magnification == 0) /* We can't read/produce any bytes. */ dst = NULL; === modified file 'src/coding.c' --- src/coding.c 2010-01-20 02:33:52 +0000 +++ src/coding.c 2010-02-17 06:47:32 +0000 @@ -5220,18 +5220,16 @@ int *charbuf_end = coding->charbuf + coding->charbuf_size; int consumed_chars = 0; int multibytep = coding->src_multibyte; - struct ccl_program ccl; + struct ccl_program *ccl = &coding->spec.ccl->ccl; int source_charbuf[1024]; int source_byteidx[1024]; Lisp_Object attrs, charset_list; CODING_GET_INFO (coding, attrs, charset_list); - setup_ccl_program (&ccl, CODING_CCL_DECODER (coding)); - while (src < src_end) + while (1) { const unsigned char *p = src; - int *source, *source_end; int i = 0; if (multibytep) @@ -5245,37 +5243,26 @@ source_charbuf[i++] = *p++; if (p == src_end && coding->mode & CODING_MODE_LAST_BLOCK) - ccl.last_block = 1; - - source = source_charbuf; - source_end = source + i; - while (source < source_end) - { - ccl_driver (&ccl, source, charbuf, - source_end - source, charbuf_end - charbuf, - charset_list); - source += ccl.consumed; - charbuf += ccl.produced; - if (ccl.status != CCL_STAT_SUSPEND_BY_DST) - break; - } - if (source < source_end) - src += source_byteidx[source - source_charbuf]; + ccl->last_block = 1; + ccl_driver (ccl, source_charbuf, charbuf, i, charbuf_end - charbuf, + charset_list); + charbuf += ccl->produced; + if (multibytep && ccl->consumed < i) + src += source_byteidx[ccl->consumed]; else - src = p; - consumed_chars += source - source_charbuf; - - if (ccl.status != CCL_STAT_SUSPEND_BY_SRC - && ccl.status != CODING_RESULT_INSUFFICIENT_SRC) + src += ccl->consumed; + consumed_chars += ccl->consumed; + if (p == src_end || ccl->status != CCL_STAT_SUSPEND_BY_SRC) break; } - switch (ccl.status) + switch (ccl->status) { case CCL_STAT_SUSPEND_BY_SRC: record_conversion_result (coding, CODING_RESULT_INSUFFICIENT_SRC); break; case CCL_STAT_SUSPEND_BY_DST: + record_conversion_result (coding, CODING_RESULT_INSUFFICIENT_DST); break; case CCL_STAT_QUIT: case CCL_STAT_INVALID_CMD: @@ -7117,6 +7104,7 @@ Lisp_Object attrs; Lisp_Object undo_list; Lisp_Object translation_table; + struct ccl_spec cclspec; int carryover; int i; @@ -7149,6 +7137,11 @@ translation_table = get_translation_table (attrs, 0, NULL); carryover = 0; + if (coding->decoder == decode_coding_ccl) + { + coding->spec.ccl = &cclspec; + setup_ccl_program (&cclspec.ccl, CODING_CCL_DECODER (coding)); + } do { EMACS_INT pos = coding->dst_pos + coding->produced_char; @@ -7165,9 +7158,10 @@ coding->charbuf[i] = coding->charbuf[coding->charbuf_used - carryover + i]; } - while (coding->consumed < coding->src_bytes - && (coding->result == CODING_RESULT_SUCCESS - || coding->result == CODING_RESULT_INVALID_SRC)); + while (coding->result == CODING_RESULT_INSUFFICIENT_DST + || (coding->consumed < coding->src_bytes + && (coding->result == CODING_RESULT_SUCCESS + || coding->result == CODING_RESULT_INVALID_SRC))); if (carryover > 0) { ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.