Now on revision 105994. Conflicting tags: mh-e-doc-8.3 mh-e-8.3 ------------------------------------------------------------ revno: 105994 committer: Glenn Morris branch nick: trunk timestamp: Mon 2011-10-03 19:27:29 -0400 message: Tweak debbugs entry in gnus-bug-group-download-format-alist again. * lisp/gnus/gnus-group.el (gnus-bug-group-download-format-alist): Once again get the "maintainer" version of debbugs.gnu.org reports. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-10-02 22:03:55 +0000 +++ lisp/gnus/ChangeLog 2011-10-03 23:27:29 +0000 @@ -1,3 +1,8 @@ +2011-10-03 Glenn Morris + + * gnus-group.el (gnus-bug-group-download-format-alist): Once again get + the "maintainer" version of debbugs.gnu.org reports. + 2011-10-02 Lars Magne Ingebrigtsen * shr.el (shr-tag-img): Add a space at the end of an ALT image text to === modified file 'lisp/gnus/gnus-group.el' --- lisp/gnus/gnus-group.el 2011-09-12 01:00:11 +0000 +++ lisp/gnus/gnus-group.el 2011-10-03 23:27:29 +0000 @@ -2429,7 +2429,7 @@ (gnus-read-ephemeral-gmane-group group start range))) (defcustom gnus-bug-group-download-format-alist - '((emacs . "http://debbugs.gnu.org/%s;mboxstat=yes") + '((emacs . "http://debbugs.gnu.org/%s;mboxmaint=yes;mboxstat=yes") (debian . "http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=%s&mbox=yes;mboxmaint=yes")) "Alist of symbols for bug trackers and the corresponding URL format string. ------------------------------------------------------------ revno: 105993 committer: Stefan Monnier branch nick: trunk timestamp: Mon 2011-10-03 16:50:54 -0400 message: * src/keyboard.c (read_key_sequence_remapped): New var. (read_key_sequence): Compute remapping in the right buffer. (command_loop_1): Use read_key_sequence's remapping directly. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-10-02 04:08:50 +0000 +++ src/ChangeLog 2011-10-03 20:50:54 +0000 @@ -1,3 +1,9 @@ +2011-10-03 Stefan Monnier + + * keyboard.c (read_key_sequence_remapped): New var. + (read_key_sequence): Compute remapping in the right buffer. + (command_loop_1): Use read_key_sequence's remapping directly. + 2011-10-02 Stefan Monnier * dired.c (file_name_completion): Don't expand file name. === modified file 'src/keyboard.c' --- src/keyboard.c 2011-09-09 01:06:52 +0000 +++ src/keyboard.c 2011-10-03 20:50:54 +0000 @@ -252,6 +252,7 @@ /* read_key_sequence stores here the command definition of the key sequence that it reads. */ static Lisp_Object read_key_sequence_cmd; +static Lisp_Object read_key_sequence_remapped; static Lisp_Object Qinput_method_function; @@ -1514,14 +1515,10 @@ reset it before we execute the command. */ Vdeactivate_mark = Qnil; - /* Remap command through active keymaps */ + /* Remap command through active keymaps. */ Vthis_original_command = cmd; - if (SYMBOLP (cmd)) - { - Lisp_Object cmd1; - if (cmd1 = Fcommand_remapping (cmd, Qnil, Qnil), !NILP (cmd1)) - cmd = cmd1; - } + if (!NILP (read_key_sequence_remapped)) + cmd = read_key_sequence_remapped; /* Execute the command. */ @@ -9999,6 +9996,13 @@ read_key_sequence_cmd = (first_binding < nmaps ? defs[first_binding] : Qnil); + read_key_sequence_remapped + /* Remap command through active keymaps. + Do the remapping here, before the unbind_to so it uses the keymaps + of the appropriate buffer. */ + = SYMBOLP (read_key_sequence_cmd) + ? Fcommand_remapping (read_key_sequence_cmd, Qnil, Qnil) + : Qnil; unread_switch_frame = delayed_switch_frame; unbind_to (count, Qnil); @@ -11663,6 +11667,8 @@ read_key_sequence_cmd = Qnil; staticpro (&read_key_sequence_cmd); + read_key_sequence_remapped = Qnil; + staticpro (&read_key_sequence_remapped); menu_bar_one_keymap_changed_items = Qnil; staticpro (&menu_bar_one_keymap_changed_items); ------------------------------------------------------------ revno: 105992 fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9554 committer: Stefan Monnier branch nick: trunk timestamp: Mon 2011-10-03 12:49:56 -0400 message: * lisp/pcmpl-unix.el (pcomplete/scp): Don't assume pcomplete-all-entries returns a list. Add remote file name completion. * lisp/comint.el (comint--table-subvert): Curry and get quote&unquote functions as arguments. (comint--complete-file-name-data): Adjust call accordingly. * lisp/pcomplete.el (pcomplete--table-subvert): Remove. (pcomplete-completions-at-point): Use comint--table-subvert instead. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-03 15:03:00 +0000 +++ lisp/ChangeLog 2011-10-03 16:49:56 +0000 @@ -1,5 +1,13 @@ 2011-10-03 Stefan Monnier + * pcmpl-unix.el (pcomplete/scp): Don't assume pcomplete-all-entries + returns a list (bug#9554). Add remote file name completion. + * comint.el (comint--table-subvert): Curry and get quote&unquote + functions as arguments. + (comint--complete-file-name-data): Adjust call accordingly. + * pcomplete.el (pcomplete--table-subvert): Remove. + (pcomplete-completions-at-point): Use comint--table-subvert instead. + * minibuffer.el (completion-table-case-fold): Use currying. (completion--styles-type, completion--cycling-threshold-type): New constants. === modified file 'lisp/comint.el' --- lisp/comint.el 2011-10-02 04:08:50 +0000 +++ lisp/comint.el 2011-10-03 16:49:56 +0000 @@ -3040,8 +3040,9 @@ (comint--complete-file-name-data))) ;; FIXME: comint--common-suffix, comint--common-quoted-suffix, and -;; comint--table-subvert copied from pcomplete. And they don't fully solve -;; the problem, since selecting a file from *Completions* won't quote it. +;; comint--table-subvert don't fully solve the problem, since +;; selecting a file from *Completions* won't quote it, among several +;; other problems. (defun comint--common-suffix (s1 s2) (assert (not (or (string-match "\n" s1) (string-match "\n" s2)))) @@ -3076,43 +3077,45 @@ (cons (substring s1 0 (- (length s1) cs)) (substring s2 0 (- (length s2) cs)))))) -(defun comint--table-subvert (table s1 s2 string pred action) +(defun comint--table-subvert (table s1 s2 &optional quote-fun unquote-fun) "Completion table that replaces the prefix S1 with S2 in STRING. When TABLE, S1 and S2 are provided by `apply-partially', the result is a completion table which completes strings of the form (concat S1 S) in the same way as TABLE completes strings of the form (concat S2 S)." - (let* ((str (if (eq t (compare-strings string 0 (length s1) s1 nil nil - completion-ignore-case)) - (concat s2 (comint-unquote-filename - (substring string (length s1)))))) - (res (if str (complete-with-action action table str pred)))) - (when res - (cond - ((and (eq (car-safe action) 'boundaries)) - (let ((beg (or (and (eq (car-safe res) 'boundaries) (cadr res)) 0))) - (list* 'boundaries - (max (length s1) - ;; FIXME: Adjust because of quoting/unquoting. - (+ beg (- (length s1) (length s2)))) - (and (eq (car-safe res) 'boundaries) (cddr res))))) - ((stringp res) - (if (eq t (compare-strings res 0 (length s2) s2 nil nil - completion-ignore-case)) - (concat s1 (comint-quote-filename - (substring res (length s2)))))) - ((eq action t) - (let ((bounds (completion-boundaries str table pred ""))) - (if (>= (car bounds) (length s2)) - res - (let ((re (concat "\\`" - (regexp-quote (substring s2 (car bounds)))))) - (delq nil - (mapcar (lambda (c) - (if (string-match re c) - (substring c (match-end 0)))) - res)))))) - ;; E.g. action=nil and it's the only completion. - (res))))) + (lambda (string pred action) + (let* ((str (if (eq t (compare-strings string 0 (length s1) s1 nil nil + completion-ignore-case)) + (let ((rest (substring string (length s1)))) + (concat s2 (if unquote-fun + (funcall unquote-fun rest) rest))))) + (res (if str (complete-with-action action table str pred)))) + (when res + (cond + ((and (eq (car-safe action) 'boundaries)) + (let ((beg (or (and (eq (car-safe res) 'boundaries) (cadr res)) 0))) + (list* 'boundaries + (max (length s1) + ;; FIXME: Adjust because of quoting/unquoting. + (+ beg (- (length s1) (length s2)))) + (and (eq (car-safe res) 'boundaries) (cddr res))))) + ((stringp res) + (if (eq t (compare-strings res 0 (length s2) s2 nil nil + completion-ignore-case)) + (let ((rest (substring res (length s2)))) + (concat s1 (if quote-fun (funcall quote-fun rest) rest))))) + ((eq action t) + (let ((bounds (completion-boundaries str table pred ""))) + (if (>= (car bounds) (length s2)) + res + (let ((re (concat "\\`" + (regexp-quote (substring s2 (car bounds)))))) + (delq nil + (mapcar (lambda (c) + (if (string-match re c) + (substring c (match-end 0)))) + res)))))) + ;; E.g. action=nil and it's the only completion. + (res)))))) (defun comint-completion-file-name-table (string pred action) (if (not (file-name-absolute-p string)) @@ -3146,10 +3149,10 @@ (table (let ((prefixes (comint--common-quoted-suffix unquoted filename))) - (apply-partially - #'comint--table-subvert + (comint--table-subvert #'comint-completion-file-name-table - (cdr prefixes) (car prefixes))))) + (cdr prefixes) (car prefixes) + #'comint-quote-filename #'comint-unquote-filename)))) (nconc (list filename-beg filename-end === modified file 'lisp/pcmpl-unix.el' --- lisp/pcmpl-unix.el 2011-01-25 04:08:28 +0000 +++ lisp/pcmpl-unix.el 2011-10-03 16:49:56 +0000 @@ -193,10 +193,25 @@ "Completion rules for the `scp' command. Includes files as well as host names followed by a colon." (pcomplete-opt "1246BCpqrvcFiloPS") - (while t (pcomplete-here (append (pcomplete-all-entries) - (mapcar (lambda (host) - (concat host ":")) - (pcmpl-ssh-hosts)))))) + (while t (pcomplete-here + (lambda (string pred action) + (let ((table + (cond + ((string-match "\\`[^:/]+:" string) ; Remote file name. + (if (and (eq action 'lambda) + (eq (match-end 0) (length string))) + ;; Avoid connecting to the remote host when we're + ;; only completing the host name. + (list string) + (comint--table-subvert (pcomplete-all-entries) + "" "/ssh:"))) + ((string-match "/" string) ; Local file name. + (pcomplete-all-entries)) + (t ;Host name or local file name. + (append (all-completions string (pcomplete-all-entries)) + (mapcar (lambda (host) (concat host ":")) + (pcmpl-ssh-hosts))))))) + (complete-with-action action table string pred)))))) (provide 'pcmpl-unix) === modified file 'lisp/pcomplete.el' --- lisp/pcomplete.el 2011-10-03 15:03:00 +0000 +++ lisp/pcomplete.el 2011-10-03 16:49:56 +0000 @@ -370,7 +370,7 @@ ;; it pretty much impossible to have completion other than ;; prefix-completion. ;; -;; pcomplete--common-quoted-suffix and pcomplete--table-subvert try to +;; pcomplete--common-quoted-suffix and comint--table-subvert try to ;; work around this difficulty with heuristics, but it's ;; really a hack. @@ -408,45 +408,6 @@ (cons (substring s1 0 (- (length s1) cs)) (substring s2 0 (- (length s2) cs)))))) -(defun pcomplete--table-subvert (table s1 s2 string pred action) - ;; FIXME: Copied in comint.el. - "Completion table that replaces the prefix S1 with S2 in STRING. -When TABLE, S1 and S2 are provided by `apply-partially', the result -is a completion table which completes strings of the form (concat S1 S) -in the same way as TABLE completes strings of the form (concat S2 S)." - (let* ((str (if (eq t (compare-strings string 0 (length s1) s1 nil nil - completion-ignore-case)) - (concat s2 (pcomplete-unquote-argument - (substring string (length s1)))))) - (res (if str (complete-with-action action table str pred)))) - (when res - (cond - ((and (eq (car-safe action) 'boundaries)) - (let ((beg (or (and (eq (car-safe res) 'boundaries) (cadr res)) 0))) - (list* 'boundaries - (max (length s1) - ;; FIXME: Adjust because of quoting/unquoting. - (+ beg (- (length s1) (length s2)))) - (and (eq (car-safe res) 'boundaries) (cddr res))))) - ((stringp res) - (if (eq t (compare-strings res 0 (length s2) s2 nil nil - completion-ignore-case)) - (concat s1 (pcomplete-quote-argument - (substring res (length s2)))))) - ((eq action t) - (let ((bounds (completion-boundaries str table pred ""))) - (if (>= (car bounds) (length s2)) - res - (let ((re (concat "\\`" - (regexp-quote (substring s2 (car bounds)))))) - (delq nil - (mapcar (lambda (c) - (if (string-match re c) - (substring c (match-end 0)))) - res)))))) - ;; E.g. action=nil and it's the only completion. - (res))))) - ;; I don't think such commands are usable before first setting up buffer-local ;; variables to parse args, so there's no point autoloading it. ;; ;;;###autoload @@ -480,7 +441,7 @@ ;; pcomplete-stub and works from the buffer's text instead, ;; we need to trick minibuffer-complete, into using ;; pcomplete-stub without its knowledge. To that end, we - ;; use pcomplete--table-subvert to construct a completion + ;; use comint--table-subvert to construct a completion ;; table which expects strings using a prefix from the ;; buffer's text but internally uses the corresponding ;; prefix from pcomplete-stub. @@ -498,9 +459,9 @@ ;; practice it should work just fine (fingers crossed). (let ((prefixes (pcomplete--common-quoted-suffix pcomplete-stub buftext))) - (apply-partially #'pcomplete--table-subvert - completions - (cdr prefixes) (car prefixes)))) + (comint--table-subvert + completions (cdr prefixes) (car prefixes) + #'pcomplete-quote-argument #'pcomplete-unquote-argument))) (t (lambda (string pred action) (let ((res (complete-with-action ------------------------------------------------------------ revno: 105991 committer: Stefan Monnier branch nick: trunk timestamp: Mon 2011-10-03 11:03:00 -0400 message: * lisp/minibuffer.el (completion-table-case-fold): Use currying. (completion--styles-type, completion--cycling-threshold-type): New constants. (completion-styles, completion-category-overrides) (completion-cycle-threshold): Use them. * lisp/pcomplete.el (pcomplete-completions-at-point): Adjust call to completion-table-case-fold. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-03 14:47:40 +0000 +++ lisp/ChangeLog 2011-10-03 15:03:00 +0000 @@ -1,3 +1,13 @@ +2011-10-03 Stefan Monnier + + * minibuffer.el (completion-table-case-fold): Use currying. + (completion--styles-type, completion--cycling-threshold-type): + New constants. + (completion-styles, completion-category-overrides) + (completion-cycle-threshold): Use them. + * pcomplete.el (pcomplete-completions-at-point): Adjust call to + completion-table-case-fold. + 2011-10-03 Stephen Berman * minibuffer.el (completion-category-overrides): Fix type of styles === modified file 'lisp/minibuffer.el' --- lisp/minibuffer.el 2011-10-03 14:47:40 +0000 +++ lisp/minibuffer.el 2011-10-03 15:03:00 +0000 @@ -216,9 +216,13 @@ (setq ,var (,fun))) ,var)))) -(defun completion-table-case-fold (table string pred action) - (let ((completion-ignore-case t)) - (complete-with-action action table string pred))) +(defun completion-table-case-fold (table &optional dont-fold) + "Return new completion TABLE that is case insensitive. +If DONT-FOLD is non-nil, return a completion table that is +case sensitive instead." + (lambda (string pred action) + (let ((completion-ignore-case (not dont-fold))) + (complete-with-action action table string pred)))) (defun completion-table-with-context (prefix table string pred action) ;; TODO: add `suffix' maybe? @@ -468,6 +472,15 @@ follow the calling convention of `completion-all-completions'), and DOC describes the way this style of completion works.") +(defconst completion--styles-type + `(repeat :tag "insert a new menu to add more styles" + (choice ,@(mapcar (lambda (x) (list 'const (car x))) + completion-styles-alist)))) +(defconst completion--cycling-threshold-type + '(choice (const :tag "No cycling" nil) + (const :tag "Always cycle" t) + (integer :tag "Threshold"))) + (defcustom completion-styles ;; First, use `basic' because prefix completion has been the standard ;; for "ever" and works well in most cases, so using it first @@ -486,8 +499,7 @@ Note that `completion-category-overrides' may override these styles for specific categories, such as files, buffers, etc." - :type `(repeat (choice ,@(mapcar (lambda (x) (list 'const (car x))) - completion-styles-alist))) + :type completion--styles-type :group 'minibuffer :version "23.1") @@ -501,19 +513,16 @@ :type `(alist :key-type (choice :tag "Category" (const buffer) (const file) + (const unicode-name) symbol) :value-type (set :tag "Properties to override" (cons :tag "Completion Styles" (const :tag "Select a style from the menu;" styles) - (repeat :tag "insert a new menu to add more styles" - (choice ,@(mapcar (lambda (x) (list 'const (car x))) - completion-styles-alist)))) + ,completion--styles-type) (cons :tag "Completion Cycling" (const :tag "Select one value from the menu." cycle) - (choice (const :tag "No cycling" nil) - (const :tag "Always cycle" t) - (integer :tag "Threshold")))))) + ,completion--cycling-threshold-type)))) (defun completion--styles (metadata) (let* ((cat (completion-metadata-get metadata 'category)) @@ -599,9 +608,7 @@ If t, cycling is always used. If an integer, cycling is used as soon as there are fewer completion candidates than this number." - :type '(choice (const :tag "No cycling" nil) - (const :tag "Always cycle" t) - (integer :tag "Threshold"))) + :type completion--cycling-threshold-type) (defun completion--cycle-threshold (metadata) (let* ((cat (completion-metadata-get metadata 'category)) === modified file 'lisp/pcomplete.el' --- lisp/pcomplete.el 2011-10-02 04:08:50 +0000 +++ lisp/pcomplete.el 2011-10-03 15:03:00 +0000 @@ -523,8 +523,7 @@ (funcall norm-func (directory-file-name f)) seen))))))) (when pcomplete-ignore-case - (setq table - (apply-partially #'completion-table-case-fold table))) + (setq table (completion-table-case-fold table))) (list beg (point) table :predicate pred :exit-function ------------------------------------------------------------ revno: 105990 fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9660 author: Stephen Berman committer: Stefan Monnier branch nick: trunk timestamp: Mon 2011-10-03 10:47:40 -0400 message: * lisp/minibuffer.el (completion-category-overrides): Fix type of styles and add more user friendly tags. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-03 14:18:42 +0000 +++ lisp/ChangeLog 2011-10-03 14:47:40 +0000 @@ -1,3 +1,8 @@ +2011-10-03 Stephen Berman + + * minibuffer.el (completion-category-overrides): Fix type of styles + and add more user friendly tags (bug#9660). + 2011-10-03 Stefan Monnier * international/mule-cmds.el: Fix abuses of apply-partially (bug#9661). === modified file 'lisp/minibuffer.el' --- lisp/minibuffer.el 2011-09-27 18:51:05 +0000 +++ lisp/minibuffer.el 2011-10-03 14:47:40 +0000 @@ -498,15 +498,19 @@ an association list that can specify properties such as: - `styles': the list of `completion-styles' to use for that category. - `cycle': the `completion-cycle-threshold' to use for that category." - :type `(alist :key-type (choice (const buffer) + :type `(alist :key-type (choice :tag "Category" + (const buffer) (const file) symbol) :value-type - (set - (cons (const style) - (repeat ,@(mapcar (lambda (x) (list 'const (car x))) - completion-styles-alist))) - (cons (const cycle) + (set :tag "Properties to override" + (cons :tag "Completion Styles" + (const :tag "Select a style from the menu;" styles) + (repeat :tag "insert a new menu to add more styles" + (choice ,@(mapcar (lambda (x) (list 'const (car x))) + completion-styles-alist)))) + (cons :tag "Completion Cycling" + (const :tag "Select one value from the menu." cycle) (choice (const :tag "No cycling" nil) (const :tag "Always cycle" t) (integer :tag "Threshold")))))) ------------------------------------------------------------ revno: 105989 fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9661 committer: Stefan Monnier branch nick: trunk timestamp: Mon 2011-10-03 10:18:42 -0400 message: * lisp/international/mule-cmds.el: Fix abuses of apply-partially. (mule-input-method-string): New widget. (default-input-method, language-info-custom-alist): Use it. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-02 23:53:59 +0000 +++ lisp/ChangeLog 2011-10-03 14:18:42 +0000 @@ -1,3 +1,9 @@ +2011-10-03 Stefan Monnier + + * international/mule-cmds.el: Fix abuses of apply-partially (bug#9661). + (mule-input-method-string): New widget. + (default-input-method, language-info-custom-alist): Use it. + 2011-10-02 Stefan Monnier * pcomplete.el: Require comint. === modified file 'lisp/international/mule-cmds.el' --- lisp/international/mule-cmds.el 2011-09-12 02:18:23 +0000 +++ lisp/international/mule-cmds.el 2011-10-03 14:18:42 +0000 @@ -1306,17 +1306,22 @@ (make-variable-buffer-local 'current-input-method-title) (put 'current-input-method-title 'permanent-local t) +(define-widget 'mule-input-method-string 'string + "String widget with completion for input method." + :completions + (lambda (string pred action) + (let ((completion-ignore-case t)) + (complete-with-action action input-method-alist string pred))) + :prompt-history 'input-method-history) + (defcustom default-input-method nil "Default input method for multilingual text (a string). This is the input method activated automatically by the command `toggle-input-method' (\\[toggle-input-method])." :link '(custom-manual "(emacs)Input Methods") :group 'mule - :type '(choice (const nil) - (string - :completions (apply-partially - #'completion-table-case-fold input-method-alist) - :prompt-history input-method-history)) + :type `(choice (const nil) + mule-input-method-string) :set-after '(current-language-environment)) (put 'input-method-function 'permanent-local t) @@ -1879,10 +1884,11 @@ (define-widget 'charset 'symbol "An Emacs charset." :tag "Charset" - :completions (apply-partially #'completion-table-with-predicate - (apply-partially #'completion-table-case-fold - obarray) - #'charsetp 'strict) + :completions + (lambda (string pred action) + (let ((completion-ignore-case t)) + (completion-table-with-predicate + obarray #'charsetp 'strict string pred action))) :value 'ascii :validate (lambda (widget) (unless (charsetp (widget-value widget)) @@ -1917,8 +1923,10 @@ :type `(alist :key-type (string :tag "Language environment" :completions - (apply-partially #'completion-table-case-fold - language-info-alist)) + (lambda (string pred action) + (let ((completion-ignore-case t)) + (complete-with-action + action language-info-alist string pred)))) :value-type (alist :key-type symbol :options ((documentation string) @@ -1929,12 +1937,7 @@ (coding-system (repeat coding-system)) (coding-priority (repeat coding-system)) (nonascii-translation charset) - (input-method - (string - :completions - (apply-partially #'completion-table-case-fold - input-method-alist) - :prompt-history input-method-history)) + (input-method mule-input-method-string) (features (repeat symbol)) (unibyte-display coding-system))))) ------------------------------------------------------------ revno: 105988 committer: Glenn Morris branch nick: trunk timestamp: Mon 2011-10-03 06:18:29 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/configure' --- autogen/configure 2011-09-27 10:19:42 +0000 +++ autogen/configure 2011-10-03 10:18:29 +0000 @@ -10632,13 +10632,13 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - xlinux_first_failure=no + xgnu_linux_first_failure=no else - xlinux_first_failure=yes + xgnu_linux_first_failure=yes fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - if test "${xlinux_first_failure}" = "yes"; then + if test "${xgnu_linux_first_failure}" = "yes"; then OLD_LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE" OLD_C_SWITCH_X_SITE="$C_SWITCH_X_SITE" OLD_CPPFLAGS="$CPPFLAGS" @@ -10659,13 +10659,13 @@ } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - xlinux_second_failure=no + xgnu_linux_second_failure=no else - xlinux_second_failure=yes + xgnu_linux_second_failure=yes fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - if test "${xlinux_second_failure}" = "yes"; then + if test "${xgnu_linux_second_failure}" = "yes"; then # If we get the same failure with -b, there is no use adding -b. # So take it out. This plays safe. LD_SWITCH_X_SITE="$OLD_LD_SWITCH_X_SITE"