Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 99409. ------------------------------------------------------------ revno: 99409 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-01-23 19:58:14 -0800 message: (aelement): Fix typo in previous. diff: === modified file 'lisp/emacs-lisp/assoc.el' --- lisp/emacs-lisp/assoc.el 2010-01-23 22:46:32 +0000 +++ lisp/emacs-lisp/assoc.el 2010-01-24 03:58:14 +0000 @@ -1,7 +1,7 @@ ;;; assoc.el --- insert/delete/sort functions on association lists -;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005, -;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, +;; 2009, 2010 Free Software Foundation, Inc. ;; Author: Barry A. Warsaw ;; Keywords: extensions @@ -42,7 +42,7 @@ (defun aelement (key value) "Make a list of a cons cell containing car of KEY and cdr of VALUE. -The returned list is suitable for concatanating with an existing +The returned list is suitable for concatenating with an existing alist, via `nconc'." (list (cons key value))) ------------------------------------------------------------ revno: 99408 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-01-23 15:25:25 -0800 message: Small fixes. diff: === modified file 'admin/notes/bugtracker' --- admin/notes/bugtracker 2010-01-23 23:18:58 +0000 +++ admin/notes/bugtracker 2010-01-23 23:25:25 +0000 @@ -59,8 +59,8 @@ (e.g. bug-cc-mode@gnu.org), do NOT just use a Cc: header. Instead, use "X-Debbugs-CC:". This ensures the Cc address will get a mail with the bug report number in. If you do not do this, each reply -in the subsequent discussion will end up creating a new bug. This is -annoying. +in the subsequent discussion will end up creating a new bug. +This is annoying. If a new report contains X-Debbugs-CC in the input, this is converted to a real Cc header in the output. (See Bug#1720). @@ -188,8 +188,7 @@ See "Usertags" are very similar to tags: a set of labels that can be added -to a bug. There are two differences between normal tags and user -tags: +to a bug. There are two differences between normal tags and user tags: 1) Anyone can define any valid usertag they like. In contrast, only a limited, predefined set of normal tags are available (see above). @@ -368,7 +367,7 @@ ** Bazaar stuff -*** You can use the commit --fixes emacs:123 to mark that a commit fixes +*** You can use `bzr commit --fixes emacs:123' to mark that a commit fixes Emacs bug 123. You will first need to add a line to your bazaar.conf (untested): ------------------------------------------------------------ revno: 99407 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-01-23 15:18:58 -0800 message: Fix some details of previous change. diff: === modified file 'admin/notes/bugtracker' --- admin/notes/bugtracker 2010-01-23 23:11:24 +0000 +++ admin/notes/bugtracker 2010-01-23 23:18:58 +0000 @@ -37,9 +37,9 @@ See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=37078) See also http://debbugs.gnu.org/5439 -Do NOT send a separate copy to the bug list, since this may generate a -new report. The only time to send mail to the bug list is to create a -new report. +Do NOT send a separate copy to the bug list address, since this may +generate a new report. The only time to send mail to the bug list +address is to create a new report. Gnus users can add the following to message-dont-reply-to-names; similarly with Rmail and rmail-dont-reply-to-names: @@ -68,9 +68,14 @@ ** How does Debbugs send out mails? -The mails are sent out to the bug list with From: and To: unchanged. -Eg if you file a bug with "submit@debbugs.gnu.org", that -remains in the To: address. They reach the bug list by being resent. +The mails are sent out to the bug list by being resent. The From: +header is unchanged. In new reports only (at present), the To: +address is altered as follows. Any "bug-gnu-emacs", +"emacs-pretest-bug", or "submit@debbugs" address is replaced by +123@debbugs in the mail that gets sent out. (This also applies to any +Cc: header, though you should be using X-Debbugs-CC instead in new +reports). The original header is stored as X-Debbugs-Original-To, if +it was changed. Any X-Debbugs-CC is merged into the Cc. Mails arriving at the bug list have the following Resent-* headers: @@ -80,10 +85,6 @@ The "maintainer email address" is "bug-gnu-emacs@gnu.org" in most cases. -In a new report, any "bug-gnu-emacs", "emacs-pretest-bug", or -"submit@debbugs" address in the original To or Cc is replaced by -123@debbugs in the mail that gets sent out to the bug list. - ** To not get acknowledgement mail from the tracker, add an "X-Debbugs-No-Ack:" header (with any value). If you use Gnus, you can add an element to gnus-posting-styles to do this automatically, eg: ------------------------------------------------------------ revno: 99406 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-01-23 15:11:24 -0800 message: Update X-Debbugs-CC details. Remove Mail-Followup-To, since it is no longer set. Mention replacement of addresses in new reports. Mention bazaar --fixes. Mention debbugs-submit administrivia setting. Mention how to test Debbugs changes. diff: === modified file 'admin/notes/bugtracker' --- admin/notes/bugtracker 2010-01-15 03:51:48 +0000 +++ admin/notes/bugtracker 2010-01-23 23:11:24 +0000 @@ -35,6 +35,7 @@ (Many people think the submitter SHOULD be automatically subscribed to subsequent discussion, but this does not seem to be implemented. See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=37078) +See also http://debbugs.gnu.org/5439 Do NOT send a separate copy to the bug list, since this may generate a new report. The only time to send mail to the bug list is to create a @@ -61,18 +62,9 @@ in the subsequent discussion will end up creating a new bug. This is annoying. -Note that the way this feature works is perhaps not ideal (Bug#1720). -If X-Debbugs-CC: was specifed by a real header, that header is removed -in the mail sent out to the bug list, and the addresses merged into -the Resent-CC header (see below). They don't appear as an explicit CC: -header, nor do they appear in the Reply-To: header. So people you -X-Debbugs-CC are not included in any following discussion unless they are -manually cc'd. So this feature really only serves to notify them that -a bug has been filed. It's then up to them to follow any subsequent -discussion. - -If X-Debbugs-CC were merged into the Reply-To header, this might work -more the way people expect. +If a new report contains X-Debbugs-CC in the input, this is +converted to a real Cc header in the output. (See Bug#1720). +It is also merged into the Resent-CC header (see below). ** How does Debbugs send out mails? @@ -88,9 +80,9 @@ The "maintainer email address" is "bug-gnu-emacs@gnu.org" in most cases. -A new report also has: - -Mail-Followup-To: bug submitter, 123@debbugs.gnu.org +In a new report, any "bug-gnu-emacs", "emacs-pretest-bug", or +"submit@debbugs" address in the original To or Cc is replaced by +123@debbugs in the mail that gets sent out to the bug list. ** To not get acknowledgement mail from the tracker, add an "X-Debbugs-No-Ack:" header (with any value). If you use Gnus, @@ -124,10 +116,10 @@ ^X-Emacs-PR-Message: closed ** How to avoid multiple copies of mails. -When you reply to a bug, respect the Reply-To address, ie send mail -only to the submitter address and the numbered bug address. Do not -send mail direct to bug-gnu-emacs or emacs-pretest-bug unless you are -reporting a new bug. +If you reply to reports in the normal way, this should work fine. +Basically, reply only to the numbered bug address (and any individual +people's addresses). Do not send mail direct to bug-gnu-emacs or +emacs-pretest-bug unless you are reporting a new bug. ** To close bug #123 (for example), send mail @@ -362,7 +354,7 @@ Similarly, when you close a bug, it can be helpful to include the relevant ChangeLog entry in the message to the bug tracker, so people -can see eaxctly what the fix was. +can see exactly what the fix was. *** bug-reference-mode @@ -373,6 +365,17 @@ http://lists.gnu.org/archive/html/emacs-devel/2009-11/msg00440.html +** Bazaar stuff + +*** You can use the commit --fixes emacs:123 to mark that a commit fixes +Emacs bug 123. You will first need to add a line to your bazaar.conf +(untested): + +bugtracker_emacs_url = http://debbugs.gnu.org/{id} + +Note that all this does is add some metadata to the commit, it doesn't +actually mark the bug as closed in the tracker. + ** Gnus-specific voodoo *** Put point on a bug-number and try: M-x gnus-read-ephemeral-emacs-bug-group @@ -456,3 +459,18 @@ The latter is because that is the address that debbugs actually sends to. An /etc/aliases entry redirects it to the real emacs-bug-tracker address. + +** Administrivia + +The debbugs-submit list should have the administrivia option off, +else it can by mistake filter out requests to subscribe to bugs. +But, this feature doesn't work anyway (see bug#5439). + +** How to test changes + +Add an entry to /etc/debbugs/Maintainers like: + +mytest my.email.address + +Then if you do all your testing with 'Package: mytest', the resulting +mails should only go to your email address. ------------------------------------------------------------ revno: 99405 committer: Chong Yidong branch nick: trunk timestamp: Sat 2010-01-23 18:05:16 -0500 message: * emacs-lisp/advice.el (ad-set-orig-definition): Fix typo (Bug#3541). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-01-23 22:46:32 +0000 +++ lisp/ChangeLog 2010-01-23 23:05:16 +0000 @@ -1,7 +1,12 @@ +2010-01-23 Dmitri Paduchikh (tiny change) + + * emacs-lisp/advice.el (ad-set-orig-definition): Fix typo + (Bug#3541). + 2010-01-23 Chong Yidong - * emacs-lisp/assoc.el (aput, adelete, amake): Use lexical-let (Bug#5450). - (aelement): Doc fix. + * emacs-lisp/assoc.el (aelement): Doc fix. + (aput, adelete, amake): Use lexical-let (Bug#5450). 2010-01-23 Stephen Leake === modified file 'lisp/emacs-lisp/advice.el' --- lisp/emacs-lisp/advice.el 2010-01-16 21:20:43 +0000 +++ lisp/emacs-lisp/advice.el 2010-01-23 23:05:16 +0000 @@ -2191,7 +2191,7 @@ (defmacro ad-set-orig-definition (function definition) `(ad-safe-fset - (ad-get-advice-info-field function 'origname) ,definition)) + (ad-get-advice-info-field ,function 'origname) ,definition)) (defmacro ad-clear-orig-definition (function) `(fmakunbound (ad-get-advice-info-field ,function 'origname))) ------------------------------------------------------------ revno: 99404 committer: Chong Yidong branch nick: trunk timestamp: Sat 2010-01-23 17:50:13 -0500 message: * url-util.el: Require url-vars (Bug#5459). diff: === modified file 'lisp/url/ChangeLog' --- lisp/url/ChangeLog 2010-01-13 08:35:10 +0000 +++ lisp/url/ChangeLog 2010-01-23 22:50:13 +0000 @@ -1,3 +1,7 @@ +2010-01-23 Chong Yidong + + * url-util.el: Require url-vars (Bug#5459). + 2009-11-27 Stefan Monnier * url-parse.el (url-generic-parse-url): Bind deactivate-mark. === modified file 'lisp/url/url-util.el' --- lisp/url/url-util.el 2010-01-13 08:35:10 +0000 +++ lisp/url/url-util.el 2010-01-23 22:50:13 +0000 @@ -26,6 +26,7 @@ ;;; Code: (require 'url-parse) +(require 'url-vars) (eval-when-compile (require 'cl)) (autoload 'timezone-parse-date "timezone") (autoload 'timezone-make-date-arpa-standard "timezone") ------------------------------------------------------------ revno: 99403 committer: Chong Yidong branch nick: trunk timestamp: Sat 2010-01-23 17:46:32 -0500 message: * emacs-lisp/assoc.el (aelement): Doc fix. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-01-23 22:44:03 +0000 +++ lisp/ChangeLog 2010-01-23 22:46:32 +0000 @@ -1,6 +1,7 @@ 2010-01-23 Chong Yidong * emacs-lisp/assoc.el (aput, adelete, amake): Use lexical-let (Bug#5450). + (aelement): Doc fix. 2010-01-23 Stephen Leake === modified file 'lisp/emacs-lisp/assoc.el' --- lisp/emacs-lisp/assoc.el 2010-01-23 22:44:03 +0000 +++ lisp/emacs-lisp/assoc.el 2010-01-23 22:46:32 +0000 @@ -42,7 +42,8 @@ (defun aelement (key value) "Make a list of a cons cell containing car of KEY and cdr of VALUE. -The returned list is suitable as an element of an alist." +The returned list is suitable for concatanating with an existing +alist, via `nconc'." (list (cons key value))) ------------------------------------------------------------ revno: 99402 committer: Chong Yidong branch nick: trunk timestamp: Sat 2010-01-23 17:44:03 -0500 message: * emacs-lisp/assoc.el (aput, adelete, amake): Use lexical-let (Bug#5450). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-01-23 12:42:22 +0000 +++ lisp/ChangeLog 2010-01-23 22:44:03 +0000 @@ -1,3 +1,7 @@ +2010-01-23 Chong Yidong + + * emacs-lisp/assoc.el (aput, adelete, amake): Use lexical-let (Bug#5450). + 2010-01-23 Stephen Leake * progmodes/ada-mode.el (ada-in-paramlist-p): Pragma syntax === modified file 'lisp/emacs-lisp/assoc.el' --- lisp/emacs-lisp/assoc.el 2010-01-13 08:35:10 +0000 +++ lisp/emacs-lisp/assoc.el 2010-01-23 22:44:03 +0000 @@ -27,6 +27,7 @@ ;; fetching off key-value pairs in association lists. ;;; Code: +(eval-when-compile (require 'cl)) (defun asort (alist-symbol key) "Move a specified key-value pair to the head of an alist. @@ -71,8 +72,8 @@ modified, but will be moved to the head of the alist. If the key-value pair cannot be found in the alist, it will be inserted into the head of the alist (with value nil if VALUE is nil or not supplied)." - (let ((elem (aelement key value)) - alist) + (lexical-let ((elem (aelement key value)) + alist) (asort alist-symbol key) (setq alist (eval alist-symbol)) (cond ((null alist) (set alist-symbol elem)) @@ -86,7 +87,7 @@ Alist is referenced by ALIST-SYMBOL and the key-value pair to remove is pair matching KEY. Returns the altered alist." (asort alist-symbol key) - (let ((alist (eval alist-symbol))) + (lexical-let ((alist (eval alist-symbol))) (cond ((null alist) nil) ((anot-head-p alist key) alist) (t (set alist-symbol (cdr alist)))))) @@ -123,10 +124,10 @@ this isn't enforced. If VALUELIST is smaller than KEYLIST, remaining keys are associated with nil. If VALUELIST is larger than KEYLIST, extra values are ignored. Returns the created alist." - (let ((keycar (car keylist)) - (keycdr (cdr keylist)) - (valcar (car valuelist)) - (valcdr (cdr valuelist))) + (lexical-let ((keycar (car keylist)) + (keycdr (cdr keylist)) + (valcar (car valuelist)) + (valcdr (cdr valuelist))) (cond ((null keycdr) (aput alist-symbol keycar valcar)) (t ------------------------------------------------------------ revno: 99401 committer: Chong Yidong branch nick: trunk timestamp: Sat 2010-01-23 17:15:22 -0500 message: Account for utmp.h availability. * configure.in: Check for utmp.h availability (FreeBSD 9.x lacks this header file). * filelock.c: Include utmp.h only when HAVE_UTMP_H (FreeBSD 9.x lacks this header file). diff: === modified file 'ChangeLog' --- ChangeLog 2010-01-13 08:35:10 +0000 +++ ChangeLog 2010-01-23 22:15:22 +0000 @@ -1,3 +1,8 @@ +2010-01-23 Giorgos Keramidas (tiny change) + + * configure.in: Check for utmp.h availability (FreeBSD 9.x lacks + this header file). + 2010-01-12 Juanma Barranquero * .bzrignore: Ignore all .exe, instead of individual files. === modified file 'configure' --- configure 2010-01-12 16:25:08 +0000 +++ configure 2010-01-23 22:15:22 +0000 @@ -6665,11 +6665,12 @@ + for ac_header in sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \ linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \ termcap.h stdio_ext.h fcntl.h strings.h coff.h pty.h sys/mman.h \ sys/param.h sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \ - sys/utsname.h pwd.h + sys/utsname.h pwd.h utmp.h do as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then === modified file 'configure.in' --- configure.in 2010-01-13 08:35:10 +0000 +++ configure.in 2010-01-23 22:15:22 +0000 @@ -1106,7 +1106,7 @@ linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \ termcap.h stdio_ext.h fcntl.h strings.h coff.h pty.h sys/mman.h \ sys/param.h sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \ - sys/utsname.h pwd.h) + sys/utsname.h pwd.h utmp.h) AC_MSG_CHECKING(if personality LINUX32 can be set) AC_TRY_COMPILE([#include ], [personality (PER_LINUX32)], === modified file 'src/ChangeLog' --- src/ChangeLog 2010-01-23 05:20:38 +0000 +++ src/ChangeLog 2010-01-23 22:15:22 +0000 @@ -1,3 +1,8 @@ +2010-01-23 Giorgos Keramidas (tiny change) + + * filelock.c: Include utmp.h only when HAVE_UTMP_H (FreeBSD 9.x + lacks this header file). + 2010-01-23 YAMAMOTO Mitsuharu * xdisp.c (draw_glyphs): Update `start' for left_overwritten case === modified file 'src/filelock.c' --- src/filelock.c 2010-01-13 08:35:10 +0000 +++ src/filelock.c 2010-01-23 22:15:22 +0000 @@ -63,7 +63,9 @@ #ifdef CLASH_DETECTION +#ifdef HAVE_UTMP_H #include +#endif #if !defined (S_ISLNK) && defined (S_IFLNK) #define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK) ------------------------------------------------------------ revno: 99400 [merge] author: Stephen Leake committer: Juanma Barranquero branch nick: trunk timestamp: Sat 2010-01-23 13:42:22 +0100 message: Fix bug#5435: ada-mode; pragma parameter list indented incorrectly. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-01-23 11:02:28 +0000 +++ lisp/ChangeLog 2010-01-23 12:42:22 +0000 @@ -1,3 +1,8 @@ +2010-01-23 Stephen Leake + + * progmodes/ada-mode.el (ada-in-paramlist-p): Pragma syntax + is the same as subprogram call, not declaration. (Bug#5435). + 2010-01-23 Michael Albinus * net/tramp-smb.el (tramp-smb-conf): New defcustom. === modified file 'lisp/progmodes/ada-mode.el' --- lisp/progmodes/ada-mode.el 2010-01-18 23:10:57 +0000 +++ lisp/progmodes/ada-mode.el 2010-01-23 12:34:52 +0000 @@ -257,7 +257,7 @@ For instance: A := 1; -- A multi-line comment - -- aligned if ada-indent-align-comments is t" + -- aligned if `ada-indent-align-comments' is t" :type 'boolean :group 'ada) (defcustom ada-indent-comment-as-code t @@ -4163,7 +4163,7 @@ (defun ada-in-paramlist-p () - "Return t if point is inside a parameter-list." + "Return t if point is inside the parameter-list of a declaration, but not a subprogram call or aggregate." (save-excursion (and (ada-search-ignore-string-comment "(\\|)" t nil t) @@ -4194,13 +4194,13 @@ ;; right keyword two words before parenthesis ? ;; Type is in this list because of discriminants + ;; pragma is not, because the syntax is that of a subprogram call. (looking-at (eval-when-compile (concat "\\<\\(" "procedure\\|function\\|body\\|" "task\\|entry\\|accept\\|" "access[ \t]+procedure\\|" "access[ \t]+function\\|" - "pragma\\|" "type\\)\\>")))))) (defun ada-search-ignore-complex-boolean (regexp backwardp) ------------------------------------------------------------ revno: 99399 committer: Juanma Barranquero branch nick: trunk timestamp: Sat 2010-01-23 13:38:02 +0100 message: * mail/rmail.el: Update autoload checksum. diff: === modified file 'lisp/mail/rmail.el' --- lisp/mail/rmail.el 2010-01-22 16:43:54 +0000 +++ lisp/mail/rmail.el 2010-01-23 12:38:02 +0000 @@ -4270,7 +4270,7 @@ ;;;*** -;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "d196de6dfb74fe87a3d02189096b795f") +;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "93033f2136fcd111e2b52a116ff4cf29") ;;; Generated autoloads from rmailmm.el (autoload 'rmail-mime "rmailmm" "\ ------------------------------------------------------------ revno: 99398 committer: Michael Albinus branch nick: trunk timestamp: Sat 2010-01-23 12:02:28 +0100 message: * net/tramp-smb.el (tramp-smb-conf): New defcustom. (tramp-smb-maybe-open-connection): Use it. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-01-22 21:17:11 +0000 +++ lisp/ChangeLog 2010-01-23 11:02:28 +0000 @@ -1,6 +1,11 @@ +2010-01-23 Michael Albinus + + * net/tramp-smb.el (tramp-smb-conf): New defcustom. + (tramp-smb-maybe-open-connection): Use it. + 2010-01-22 Michael Albinus - * net/tramp-imap.el (top): Autoload needed packages. + * net/tramp-imap.el (top): Autoload needed packages. (Bug#5448) 2010-01-22 Stefan Monnier === modified file 'lisp/net/tramp-smb.el' --- lisp/net/tramp-smb.el 2010-01-13 08:35:10 +0000 +++ lisp/net/tramp-smb.el 2010-01-23 11:02:28 +0000 @@ -61,6 +61,13 @@ :group 'tramp :type 'string) +(defcustom tramp-smb-conf "/dev/null" + "*Path of the smb.conf file. +If it is nil, no smb.conf will be added to the `tramp-smb-program' +call, letting the SMB client use the default one." + :group 'tramp + :type '(choice (const nil) (file :must-match t))) + (defvar tramp-smb-version nil "*Version string of the SMB client.") @@ -1281,7 +1288,8 @@ (when domain (setq args (append args (list "-W" domain)))) (when port (setq args (append args (list "-p" port)))) - (setq args (append args (list "-s" "/dev/null"))) + (when tramp-smb-conf + (setq args (append args (list "-s" tramp-smb-conf)))) ;; OK, let's go. (tramp-message ------------------------------------------------------------ revno: 99397 committer: YAMAMOTO Mitsuharu branch nick: trunk timestamp: Sat 2010-01-23 14:20:38 +0900 message: * xdisp.c (draw_glyphs): Update `start' for left_overwritten case as in Emacs 22. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-01-22 09:10:04 +0000 +++ src/ChangeLog 2010-01-23 05:20:38 +0000 @@ -1,3 +1,8 @@ +2010-01-23 YAMAMOTO Mitsuharu + + * xdisp.c (draw_glyphs): Update `start' for left_overwritten case + as in Emacs 22. + 2010-01-22 YAMAMOTO Mitsuharu * lisp.h (make_pure_string): String pointer arg now points to const. === modified file 'src/xdisp.c' --- src/xdisp.c 2010-01-16 11:58:42 +0000 +++ src/xdisp.c 2010-01-23 05:20:38 +0000 @@ -20401,6 +20401,7 @@ j = i; BUILD_GLYPH_STRINGS (j, start, h, t, overlap_hl, dummy_x, last_x); + start = i; compute_overhangs_and_x (t, head->x, 1); prepend_glyph_string_lists (&head, &tail, h, t); clip_head = head; @@ -20450,6 +20451,8 @@ BUILD_GLYPH_STRINGS (end, i, h, t, overlap_hl, x, last_x); + /* Because BUILD_GLYPH_STRINGS updates the first argument, + we don't have `end = i;' here. */ compute_overhangs_and_x (h, tail->x + tail->width, 0); append_glyph_string_lists (&head, &tail, h, t); clip_tail = tail; ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.