Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 100829. ------------------------------------------------------------ revno: 100829 committer: Andreas Schwab branch nick: emacs timestamp: Thu 2010-07-15 23:54:10 +0200 message: * xterm.c (x_fully_uncatch_errors, x_trace_wire, x_check_font): Convert old-style definition. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-07-15 21:53:32 +0000 +++ src/ChangeLog 2010-07-15 21:54:10 +0000 @@ -1,5 +1,8 @@ 2010-07-15 Andreas Schwab + * xterm.c (x_fully_uncatch_errors, x_trace_wire, x_check_font): + Convert old-style definition. + * xmenu.c (create_and_show_popup_menu, xmenu_show): Fix type of timestamp argument. === modified file 'src/xterm.c' --- src/xterm.c 2010-07-14 15:10:59 +0000 +++ src/xterm.c 2010-07-15 21:54:10 +0000 @@ -7503,7 +7503,7 @@ /* Close off all unclosed x_catch_errors calls. */ void -x_fully_uncatch_errors () +x_fully_uncatch_errors (void) { while (x_error_message) x_uncatch_errors (); @@ -7520,7 +7520,7 @@ #if 0 static unsigned int x_wire_count; -x_trace_wire () +x_trace_wire (void) { fprintf (stderr, "Lib call: %d\n", ++x_wire_count); } @@ -9560,9 +9560,7 @@ font table. */ static void -x_check_font (f, font) - struct frame *f; - struct font *font; +x_check_font (struct frame *f, struct font *font) { Lisp_Object frame; ------------------------------------------------------------ revno: 100828 committer: Andreas Schwab branch nick: emacs timestamp: Thu 2010-07-15 23:53:32 +0200 message: * xmenu.c (create_and_show_popup_menu, xmenu_show): Fix type of timestamp argument. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-07-15 16:48:34 +0000 +++ src/ChangeLog 2010-07-15 21:53:32 +0000 @@ -1,3 +1,8 @@ +2010-07-15 Andreas Schwab + + * xmenu.c (create_and_show_popup_menu, xmenu_show): Fix type of + timestamp argument. + 2010-07-15 Eli Zaretskii * fringe.c (update_window_fringes): Restore mistakenly reverted === modified file 'src/xmenu.c' --- src/xmenu.c 2010-07-14 14:32:25 +0000 +++ src/xmenu.c 2010-07-15 21:53:32 +0000 @@ -1562,7 +1562,8 @@ menu pops down. menu_item_selection will be set to the selection. */ static void -create_and_show_popup_menu (FRAME_PTR f, widget_value *first_wv, int x, int y, int for_click, unsigned int timestamp) +create_and_show_popup_menu (FRAME_PTR f, widget_value *first_wv, + int x, int y, int for_click, EMACS_UINT timestamp) { int i; Arg av[2]; @@ -2275,7 +2276,8 @@ Lisp_Object -xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, Lisp_Object title, char **error, unsigned int timestamp) +xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, + Lisp_Object title, char **error, EMACS_UINT timestamp) { Window root; XMenu *menu; ------------------------------------------------------------ revno: 100827 committer: Eli Zaretskii branch nick: trunk timestamp: Thu 2010-07-15 19:48:34 +0300 message: Restore mistakenly reverted code from revno 99854.1.6 merged in revno 99950. fringe.c (update_window_fringes): For R2L rows, swap the bitmaps of continuation indicators on the fringes. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-07-14 15:06:33 +0000 +++ src/ChangeLog 2010-07-15 16:48:34 +0000 @@ -1,3 +1,8 @@ +2010-07-15 Eli Zaretskii + + * fringe.c (update_window_fringes): Restore mistakenly reverted + code from revno 99854.1.6 merged in revno 99950. + 2010-07-14 Jan Djärv * xterm.c (xm_scroll_callback, x_process_timeouts): K&R => prototype. === modified file 'src/fringe.c' --- src/fringe.c 2010-07-10 18:52:53 +0000 +++ src/fringe.c 2010-07-15 16:48:34 +0000 @@ -1196,7 +1196,8 @@ if (bot_ind_max_y >= 0) left_offset = bot_ind_max_y - (row->y + row->visible_height); } - else if (MATRIX_ROW_CONTINUATION_LINE_P (row)) + else if ((!row->reversed_p && MATRIX_ROW_CONTINUATION_LINE_P (row)) + || (row->reversed_p && row->continued_p)) left = LEFT_FRINGE (4, Qcontinuation, 0); else if (row->indicate_empty_line_p && EQ (empty_pos, Qleft)) left = LEFT_FRINGE (5, Qempty_line, 0); @@ -1240,7 +1241,8 @@ if (bot_ind_max_y >= 0) right_offset = bot_ind_max_y - (row->y + row->visible_height); } - else if (row->continued_p) + else if ((!row->reversed_p && row->continued_p) + || (row->reversed_p && MATRIX_ROW_CONTINUATION_LINE_P (row))) right = RIGHT_FRINGE (4, Qcontinuation, 0); else if (row->indicate_top_line_p && EQ (arrow_top, Qright)) { ------------------------------------------------------------ revno: 100826 committer: Simon South branch nick: trunk timestamp: Thu 2010-07-15 10:36:27 -0400 message: Correct my email address in the last update. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-07-15 03:12:37 +0000 +++ lisp/ChangeLog 2010-07-15 14:36:27 +0000 @@ -1,4 +1,4 @@ -2010-07-15 Simon South +2010-07-15 Simon South * progmodes/delphi.el (delphi-previous-indent-of): Indent case blocks within record declarations (i.e. variant parts) correctly. ------------------------------------------------------------ revno: 100825 [merge] committer: Simon South branch nick: trunk timestamp: Thu 2010-07-15 10:21:47 -0400 message: Merge fixes to indentation of case statements, variant parts in record declarations. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-07-14 19:09:28 +0000 +++ lisp/ChangeLog 2010-07-15 03:12:37 +0000 @@ -1,3 +1,15 @@ +2010-07-15 Simon South + + * progmodes/delphi.el (delphi-previous-indent-of): Indent case + blocks within record declarations (i.e. variant parts) correctly. + +2010-07-15 Simon South + + * progmodes/delphi.el (delphi-token-at): Give newlines precedence + over literal tokens when parsing so newlines aren't "absorbed" by + single-line comments. Corrects the indentation of case blocks + that have a comment on the first line. + 2010-07-14 Karl Fogel * bookmark.el (bookmark-load-hook): Fix doc string as suggested === modified file 'lisp/progmodes/delphi.el' --- lisp/progmodes/delphi.el 2010-01-14 18:37:23 +0000 +++ lisp/progmodes/delphi.el 2010-07-15 03:12:37 +0000 @@ -628,7 +628,9 @@ (defun delphi-token-at (p) ;; Returns the token from parsing text at point p. (when (and (<= (point-min) p) (<= p (point-max))) - (cond ((delphi-literal-token-at p)) + (cond ((delphi-char-token-at p ?\n 'newline)) + + ((delphi-literal-token-at p)) ((delphi-space-token-at p)) @@ -638,7 +640,6 @@ ((delphi-char-token-at p ?\) 'close-group)) ((delphi-char-token-at p ?\[ 'open-group)) ((delphi-char-token-at p ?\] 'close-group)) - ((delphi-char-token-at p ?\n 'newline)) ((delphi-char-token-at p ?\; 'semicolon)) ((delphi-char-token-at p ?. 'dot)) ((delphi-char-token-at p ?, 'comma)) @@ -888,7 +889,24 @@ (setq token (delphi-block-start token))) ;; Regular block start found. - ((delphi-is token-kind delphi-block-statements) (throw 'done token)) + ((delphi-is token-kind delphi-block-statements) + (throw 'done + ;; As a special case, when a "case" block appears + ;; within a record declaration (to denote a variant + ;; part), the record declaration should be considered + ;; the enclosing block. + (if (eq 'case token-kind) + (let ((enclosing-token + (delphi-block-start token + 'stop-on-class))) + (if + (eq 'record + (delphi-token-kind enclosing-token)) + (if stop-on-class + enclosing-token + (delphi-previous-token enclosing-token)) + token)) + token))) ;; A class/record start also begins a block. ((delphi-composite-type-start token last-token) @@ -1058,6 +1076,7 @@ (token-kind nil) (from-kind (delphi-token-kind from-token)) (last-colon nil) + (last-of nil) (last-token nil)) (catch 'done (while token @@ -1101,9 +1120,17 @@ ;; Ignore whitespace. ((delphi-is token-kind delphi-whitespace)) - ;; Remember any ':' we encounter, since that affects how we indent to - ;; a case statement. - ((eq 'colon token-kind) (setq last-colon token)) + ;; Remember any "of" we encounter, since that affects how we + ;; indent to a case statement within a record declaration + ;; (i.e. a variant part). + ((eq 'of token-kind) + (setq last-of token)) + + ;; Remember any ':' we encounter (until we reach an "of"), + ;; since that affects how we indent to case statements in + ;; general. + ((eq 'colon token-kind) + (unless last-of (setq last-colon token))) ;; A case statement delimits a previous statement. We indent labels ;; specially. ------------------------------------------------------------ revno: 100824 [merge] committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2010-07-15 00:56:13 +0000 message: Make gnus-summary-bookmark-make-record work for Emacs 23 as well. 2010-07-15 Katsumi Yamaoka * gnus-sum.el (gnus-summary-bookmark-make-record): Make it work for Emacs 23 as well. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-07-14 16:41:40 +0000 +++ lisp/gnus/ChangeLog 2010-07-15 00:54:06 +0000 @@ -1,4 +1,9 @@ -2010-07-13 Thierry Volpiatto +2010-07-15 Katsumi Yamaoka + + * gnus-sum.el (gnus-summary-bookmark-make-record): Make it work for + Emacs 23 as well. + +2010-07-13 Thierry Volpiatto Allow C-w when setting a bookmark in a Gnus Article buffer (Bug#5975). Patch applied by Karl Fogel. @@ -15,14 +20,14 @@ * gnus-art.el (bookmark-make-record-function): New local variable. - * gnus-sum.el (gnus-summary-bookmark-make-record): Allow setting - from article buffer. + * gnus-sum.el (gnus-summary-bookmark-make-record): Allow setting from + article buffer. (gnus-summary-bookmark-jump): Maybe jump to article buffer. 2010-07-13 Karl Fogel - * gnus/gnus-sum.el (bookmark-make-record-default): Adjust - declaration, based on changes in bookmark.el. + * gnus-sum.el (bookmark-make-record-default): Adjust declaration, based + on changes in bookmark.el. 2010-06-22 Mark A. Hershberger === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2010-07-14 16:41:40 +0000 +++ lisp/gnus/gnus-sum.el 2010-07-15 00:54:06 +0000 @@ -12645,7 +12645,10 @@ (head (gnus-summary-article-header art)) (id (mail-header-id head))) `(,subject - ,@(bookmark-make-record-default 'no-file 'no-context pos) + ,@(condition-case nil + (bookmark-make-record-default 'no-file 'no-context (point)) + (wrong-number-of-arguments + (bookmark-make-record-default 'point-only))) (location . ,(format "Gnus-%s %s:%d:%s" buf grp art id)) (group . ,grp) (article . ,art) (message-id . ,id) (handler . gnus-summary-bookmark-jump))))) ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.