Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 99427. ------------------------------------------------------------ revno: 99427 [merge] committer: Kenichi Handa branch nick: trunk timestamp: Sun 2010-01-31 16:08:07 +0900 message: font.c (font_parse_xlfd): If FONT is a font-entity and pixel size in NAME is invalid, return -1. (Bug#5396) diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-01-31 05:23:09 +0000 +++ src/ChangeLog 2010-01-31 07:01:05 +0000 @@ -1,3 +1,8 @@ +2010-01-31 Kenichi Handa + + * font.c (font_parse_xlfd): If FONT is a font-entity and pixel + size in NAME is invalid, return -1 (Bug#5396). + 2010-01-31 Chong Yidong * nsterm.m (ns_defined_color): Block input. Suggested by Mike === modified file 'src/font.c' --- src/font.c 2010-01-13 08:35:10 +0000 +++ src/font.c 2010-01-31 06:46:53 +0000 @@ -1122,6 +1122,8 @@ val = INTERN_FIELD (XLFD_PIXEL_INDEX); if (INTEGERP (val)) ASET (font, FONT_SIZE_INDEX, val); + else if (FONT_ENTITY_P (font)) + return -1; else { double point_size = -1; ------------------------------------------------------------ revno: 99426 committer: Chong Yidong branch nick: trunk timestamp: Sun 2010-01-31 00:23:09 -0500 message: * nsterm.m (ns_defined_color): Block input. Suggested by Mike (Bug#3605). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-01-31 04:49:28 +0000 +++ src/ChangeLog 2010-01-31 05:23:09 +0000 @@ -1,3 +1,8 @@ +2010-01-31 Chong Yidong + + * nsterm.m (ns_defined_color): Block input. Suggested by Mike + (Bug#3605). + 2010-01-31 David De La Harpe Golden * fileio.c (Frename_file): Correctly rename symlinks to === modified file 'src/nsterm.m' --- src/nsterm.m 2010-01-31 03:36:06 +0000 +++ src/nsterm.m 2010-01-31 05:23:09 +0000 @@ -1552,19 +1552,19 @@ Return 0 if not found -------------------------------------------------------------------------- */ { - NSColor *temp; - int notFound = ns_get_color (name, &temp); - + NSColor *col; NSTRACE (ns_defined_color); - if (notFound) - return 0; - + BLOCK_INPUT; + if (ns_get_color (name, &col) != 0) /* Color not found */ + { + UNBLOCK_INPUT; + return 0; + } if (makeIndex && alloc) - color_def->pixel = ns_index_color(temp, f); /* [temp retain]; */ - - ns_query_color (temp, color_def, !makeIndex); - + color_def->pixel = ns_index_color (col, f); + ns_query_color (col, color_def, !makeIndex); + UNBLOCK_INPUT; return 1; } ------------------------------------------------------------ revno: 99425 committer: Chong Yidong branch nick: trunk timestamp: Sat 2010-01-30 23:49:28 -0500 message: * fileio.c (Frename_file): Correctly rename symlinks to directories (Bug#5496). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-01-31 03:36:06 +0000 +++ src/ChangeLog 2010-01-31 04:49:28 +0000 @@ -1,3 +1,8 @@ +2010-01-31 David De La Harpe Golden + + * fileio.c (Frename_file): Correctly rename symlinks to + directories (Bug#5496). + 2010-01-31 Filipe Cabecinhas (tiny change) * nsterm.m (ns_ring_bell): Handle visible bell like X. === modified file 'src/fileio.c' --- src/fileio.c 2010-01-28 17:47:05 +0000 +++ src/fileio.c 2010-01-31 04:49:28 +0000 @@ -2300,7 +2300,12 @@ count = SPECPDL_INDEX (); specbind (Qdelete_by_moving_to_trash, Qnil); - if (!NILP (Ffile_directory_p (file))) + + if (!NILP (Ffile_directory_p (file)) +#ifdef S_IFLNK + && NILP (symlink_target) +#endif + ) call2 (Qdelete_directory, file, Qt); else Fdelete_file (file); ------------------------------------------------------------ revno: 99424 committer: Chong Yidong branch nick: trunk timestamp: Sat 2010-01-30 23:29:06 -0500 message: src/config.in: Regenerate. diff: === modified file 'src/config.in' --- src/config.in 2010-01-13 08:35:10 +0000 +++ src/config.in 2010-01-31 04:29:06 +0000 @@ -741,6 +741,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UTIME_H +/* Define to 1 if you have the header file. */ +#undef HAVE_UTMP_H + /* Define to 1 if you have the `vfork' function. */ #undef HAVE_VFORK ------------------------------------------------------------ revno: 99423 committer: Chong Yidong branch nick: trunk timestamp: Sat 2010-01-30 22:36:06 -0500 message: * nsterm.m (ns_ring_bell): Handle visible bell like X. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-01-30 10:32:39 +0000 +++ src/ChangeLog 2010-01-31 03:36:06 +0000 @@ -1,3 +1,7 @@ +2010-01-31 Filipe Cabecinhas (tiny change) + + * nsterm.m (ns_ring_bell): Handle visible bell like X. + 2010-01-30 Andreas Schwab * character.h (CHAR_PRINTABLE_P): Reparenthesize to avoid warning. === modified file 'src/nsterm.m' --- src/nsterm.m 2010-01-15 01:46:53 +0000 +++ src/nsterm.m 2010-01-31 03:36:06 +0000 @@ -808,23 +808,58 @@ view = FRAME_NS_VIEW (frame); if (view != nil) { - 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); + /* 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]; + [[view window] flushWindow]; ns_timeout (150000); - [[view window] restoreCachedImage]; + + /* 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] flushWindow]; ns_unfocus (frame); } ------------------------------------------------------------ revno: 99422 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-01-30 13:58:56 -0800 message: eieio.texi: Remove execute bit. diff: === modified file 'doc/misc/eieio.texi' (properties changed: +x to -x) ------------------------------------------------------------ revno: 99421 committer: Andreas Schwab branch nick: emacs timestamp: Sat 2010-01-30 11:32:39 +0100 message: * character.h (CHAR_PRINTABLE_P): Reparenthesize to avoid warning. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-01-29 19:02:02 +0000 +++ src/ChangeLog 2010-01-30 10:32:39 +0000 @@ -1,3 +1,7 @@ +2010-01-30 Andreas Schwab + + * character.h (CHAR_PRINTABLE_P): Reparenthesize to avoid warning. + 2010-01-29 Chong Yidong * frame.c (DEFAULT_ROWS): Change default to 35. === modified file 'src/character.h' --- src/character.h 2010-01-13 08:35:10 +0000 +++ src/character.h 2010-01-30 10:32:39 +0000 @@ -136,8 +136,8 @@ /* Nonzero if character C has a printable glyph. */ #define CHAR_PRINTABLE_P(c) \ - (((c) >= 32 && ((c) < 127) \ - || ! NILP (CHAR_TABLE_REF (Vprintable_chars, (c))))) + (((c) >= 32 && (c) < 127) \ + || ! NILP (CHAR_TABLE_REF (Vprintable_chars, (c)))) /* Return byte length of multibyte form for character C. */ #define CHAR_BYTES(c) \ ------------------------------------------------------------ revno: 99420 committer: Juanma Barranquero branch nick: trunk timestamp: Sat 2010-01-30 05:22:37 +0100 message: Fix typos. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-01-29 23:43:31 +0000 +++ lisp/ChangeLog 2010-01-30 04:22:37 +0000 @@ -174,7 +174,7 @@ 2010-01-18 Stephen Leake - * lisp/progmodes/ada-mode.el: Fix bug#5400. + * progmodes/ada-mode.el: Fix bug#5400. (ada-matching-decl-start-re): Move into ada-goto-decl-start. (ada-goto-decl-start): Rename from ada-goto-matching-decl-start; callers changed. Delete RECURSIVE parameter; never used. Improve doc string. @@ -1034,7 +1034,7 @@ 2009-12-11 Michael McNamara - * verilog-mode.el (verilog-vmm-begin-re, verilog-vmm-end-re) + * progmodes/verilog-mode.el (verilog-vmm-begin-re, verilog-vmm-end-re) (verilog-vmm-statement-re, verilog-ovm-statement-re) (verilog-defun-level-not-generate-re, verilog-calculate-indent) (verilog-leap-to-head, verilog-backward-token): @@ -1042,9 +1042,9 @@ 2009-12-11 Wilson Snyder - * verilog-mode.el (verilog-auto-lineup, verilog-nameable-item-re): - Cleanup user-visible spelling and documentation errors. - One reported by Gary Delp. + * progmodes/verilog-mode.el (verilog-auto-lineup) + (verilog-nameable-item-re): Cleanup user-visible spelling and + documentation errors. One reported by Gary Delp. (verilog-submit-bug-report): Mention bug tracking and CC co-author. (verilog-read-decls): Fix AUTOWIRE with types declared in a package, bug195. Reported by Pierre-David Pfister. @@ -2088,7 +2088,7 @@ 2009-11-26 Michael McNamara - * verilog-mode.el (verilog-at-struct-p): Support "signed" and + * progmodes/verilog-mode.el (verilog-at-struct-p): Support "signed" and "unsigned" structs. (verilog-leap-to-head, verilog-backward-token): Handle "disable @@ -2096,9 +2096,10 @@ 2009-11-26 Wilson Snyder - * verilog-mode.el (verilog-auto-insert-lisp, verilog-delete-auto) - (verilog-delete-empty-auto-pair, verilog-library-filenames): - Fix AUTOINSERTLISP to support insert-file. Reported by Clay Douglass. + * progmodes/verilog-mode.el (verilog-auto-insert-lisp) + (verilog-delete-auto, verilog-delete-empty-auto-pair) + (verilog-library-filenames): Fix AUTOINSERTLISP to support insert-file. + Reported by Clay Douglass. (verilog-auto-inst, verilog-auto-star-safe) (verilog-delete-auto-star-implicit, verilog-read-sub-decls): @@ -3490,7 +3491,7 @@ 2009-11-05 Wilson Snyder - * verilog-mode.el (verilog-getopt-file, verilog-set-define): + * progmodes/verilog-mode.el (verilog-getopt-file, verilog-set-define): Remove extra save-excursions and make-variable-buffer-local's. Suggested by Stefan Monnier. @@ -3516,8 +3517,8 @@ 2009-11-05 Michael McNamara - * verilog-mode.el (verilog-label-re): Fix regular expression for - labels. + * progmodes/verilog-mode.el (verilog-label-re): Fix regular expression + for labels. (verilog-label-re, verilog-calc-1): Support proper indent of named asserts. @@ -9721,9 +9722,9 @@ 2009-07-06 Michael McNamara - * verilog-mode.el (verilog-error-regexp-emacs-alist): Coded custom - representation of verilog error regular expressions to work with - Emacs-22's new format. + * progmodes/verilog-mode.el (verilog-error-regexp-emacs-alist): + Coded custom representation of verilog error regular expressions + to work with Emacs-22's new format. (verilog-error-regexp-xemacs-alist): Coded custom representation of verilog error regular expressions to work with XEmacs format. (verilog-error-regexp-add-xemacs): Hook routine to install verilog @@ -9794,7 +9795,7 @@ 2009-07-03 Jay Belanger - * calc-math.el (math-use-emacs-fn): Make sure that the number is + * calc/calc-math.el (math-use-emacs-fn): Make sure that the number is formatted correctly. 2009-07-02 Juri Linkov @@ -9960,7 +9961,7 @@ 2009-06-28 Michael McNamara - * verilog-mode.el (verilog-beg-of-statement) + * progmodes/verilog-mode.el (verilog-beg-of-statement) (verilog-endcomment-reason-re): Support unique case and priority case. (verilog-basic-complete-re): Support localparam lineup. (verilog-beg-of-statement-1): Fix for robustness, unique case. @@ -10025,7 +10026,7 @@ 2009-06-28 Wilson Snyder - * verilog-mode.el (verilog-auto-arg, verilog-auto-arg-sort): + * progmodes/verilog-mode.el (verilog-auto-arg, verilog-auto-arg-sort): Allow sorting AUTOARG lists. Suggested by Andrea Fedeli. (verilog-read-sub-decls-line): Fix AUTOWIRE signals getting lost in concatenations. Reported by Yishay Belkind. ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.