Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1090

15 files changed, 145 insertions, 63 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index d1353392779..b4ff0a3d199 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -3,6 +3,10 @@
         * NEWS (Gnus): Mention problem with coding system `utf-8-emacs'
         when using different Emacs versions.
 
+2008-02-25  Jan Dj$(Q)Z(Brv  <jan.h.d@swipnet.se>
+
+        * NEWS.22: Mention stock icons for Gtk+.
+
 2008-02-22  Kenichi Handa  <handa@ni.aist.go.jp>
 
         * NEWS: Mention the new language environments Bengali, Punjabi,
diff --git a/etc/DEBUG b/etc/DEBUG
index a266827d9e3..bca9b6ac4f6 100644
--- a/etc/DEBUG
+++ b/etc/DEBUG
@@ -5,7 +5,7 @@ Copyright (C) 1985, 2000, 2001, 2002, 2003, 2004,
 See the end of the file for license conditions.
 
 
-[People who debug Emacs on Windows using native Windows debuggers
+[People who debug Emacs on Windows using Microsoft debuggers
 should read the Windows-specific section near the end of this
 document.]
 
diff --git a/etc/NEWS.22 b/etc/NEWS.22
index d8600a6b0ba..c97ec91fb51 100644
--- a/etc/NEWS.22
+++ b/etc/NEWS.22
@@ -53,6 +53,14 @@ like that, customize the value of the new option `find-name-arg'.
 than the window, the usual keys for moving the cursor cause the image
 to be scrolled horizontally or vertically instead.
 
+** Emacs can use stock icons in the tool bar when compiled with Gtk+.
+However, this feature is disabled by default.  To enable it, put
+
+  (setq icon-map-list '(x-gtk-stock-map))
+
+in your .emacs or some other startup file.  For more information, see
+the documentation for the two variables icon-map-list and x-gtk-stock-map.
+
 ** Scrollbars follow the system theme on Windows XP and later.
 Windows XP introduced themed scrollbars, but applications have to take
 special steps to use them. Emacs now has the appropriate resources linked
@@ -153,6 +161,14 @@ of strings, undoing any quoting added by `combine-and-quote-strings'.
 (For some separator/string combinations, the original strings cannot
 be recovered.)
 
+* Systems that will not be supported in the future
+configure will print a warning and exit for a set of systems that are
+believed to not be in use anymore.  The support has not been removed
+yet, but configure will need to be edited in order to allow
+compilation to proceed on such a system.  If you are using such a
+system, please send a message to emacs-devel@gnu.org in order to take
+off the list of systems.
+
 
 * Installation Changes in Emacs 22.1
 
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index f8650c8cc70..d726ec108a2 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-27  Yuri Shtil  <yuris@juniper.net>  (tiny change)
+
+        * etags.c (Perl_functions): Fix call to skip_spaces.
+
 2008-02-24  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * Makefile.in (NO_SHORTNAMES):
diff --git a/lib-src/etags.c b/lib-src/etags.c
index d71f849d2c1..2fe0c6314fd 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -4552,7 +4552,7 @@ Perl_functions (inf)
 
   LOOP_ON_INPUT_LINES (inf, lb, cp)
     {
-      skip_spaces(cp);
+      cp = skip_spaces (cp);
 
       if (LOOKING_AT (cp, "package"))
         {
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6dc48287ab3..9b9b7eaee76 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,44 @@
+2008-03-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * diff-mode.el (diff-sanity-check-hunk): Only accept an empty line if
+        we still expect more lines.
+
+2008-03-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * textmodes/fill.el (fill-comment-paragraph): Don't try to do
+        comment-paragraph filling if the commark doesn't match
+        comment-start-skip.
+
+2008-03-01  Daiki Ueno  <ueno@unixuser.org>
+
+        * international/utf-7.el (utf-7-encode): Never skip the trailing - for
+        the `imap' variant.
+
+2008-03-01  Jason Rumney  <jasonr@gnu.org>
+
+        * files.el (make-auto-save-file-name): Encode more characters in
+        non-file buffer names.  Use url-encoding.
+
+2008-03-01  Juanma Barranquero  <lekktu@gmail.com>
+
+        * net/net-utils.el (ftp-program): Fix typo in docstring.
+        (ifconfig-program-options, netstat-program-options)
+        (arp-program-options, route-program-options, nslookup-program-options)
+        (ftp-program-options, smbclient-program-options)
+        (dns-lookup-program-options, arp, route): Doc fixes.
+
+        * progmodes/gdb-ui.el (gdb-pc-address, gdb-source-file-list)
+        (gdb-cpp-define-alist-program, gdb-mouse-jump, gdb-get-buffer-create)
+        (gdb-set-gud-minor-mode-existing-buffers-1, gdb-debug-log):
+        Fix typos in docstrings.
+        (gdb-pending-triggers): Reflow docstring.
+        (gdb, gdb-init-1): Fix typos in docstrings of gud-def definitions.
+
+2008-03-01  Alan Mackenzie  <acm@muc.de>
+
+        * progmodes/cc-mode.el (c-neutralize-syntax-in-CPP): Fix a bug on
+        typing "#" at EOB.
+
 2008-03-01  Juanma Barranquero  <lekktu@gmail.com>
 
         * emulation/cua-base.el (cua-remap-control-z): Fix typo in docstring.
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 8a3433537b0..afd9399d1e5 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -1363,7 +1363,8 @@ Only works for unified diffs."
                    (cond
                     ((and diff-valid-unified-empty-line
                           ;; Not just (eolp) so we don't infloop at eob.
-                          (eq (char-after) ?\n))
+                          (eq (char-after) ?\n)
+                          (> before 0) (> after 0))
                      (decf before) (decf after) t)
                     ((and (zerop before) (zerop after)) nil)
                     ((or (< before 0) (< after 0))
diff --git a/lisp/files.el b/lisp/files.el
index d1b8cd2f30e..740bba2764a 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4656,15 +4656,18 @@ See also `auto-save-file-name-p'."
     (let ((buffer-name (buffer-name))
           (limit 0)
           file-name)
-      ;; Eliminate all slashes and backslashes by
-      ;; replacing them with sequences that start with %.
-      ;; Quote % also, to keep distinct names distinct.
-      (while (string-match "[/\\%]" buffer-name limit)
+      ;; Restrict the characters used in the file name to those which
+      ;; are known to be safe on all filesystems, url-encoding the
+      ;; rest.
+      ;; We do this on all platforms, because even if we are not
+      ;; running on DOS/Windows, the current directory may be on a
+      ;; mounted VFAT filesystem, such as a USB memory stick.
+      (while (string-match "[^A-Za-z0-9-_.~#+]" buffer-name limit)
         (let* ((character (aref buffer-name (match-beginning 0)))
                (replacement
-                (cond ((eq character ?%) "%%")
-                      ((eq character ?/) "%+")
-                      ((eq character ?\\) "%-"))))
+                ;; For multibyte characters, this will produce more than
+                ;; 2 hex digits, so is not true URL encoding.
+                (format "%%%02X" character)))
           (setq buffer-name (replace-match replacement t t buffer-name))
           (setq limit (1+ (match-end 0)))))
       ;; Generate the file name.
diff --git a/lisp/international/utf-7.el b/lisp/international/utf-7.el
index 77e2a18c684..e2fe6949cae 100644
--- a/lisp/international/utf-7.el
+++ b/lisp/international/utf-7.el
@@ -110,7 +110,9 @@ ESC and SKIP-CHARS are adjusted for the normal and IMAP versions."
               ;; consistent with iconv, at least regarding `='.
               (skip-chars-forward "^= \t\n")
               (delete-region (point) (point-max))))
-          (unless (eobp)
+          ;; RFC2060 stipulates that all names MUST end in US-ASCII (i.e.
+          ;; a name that ends with a Unicode octet MUST end with a "-").
+          (if (or imap (not (eobp)))
             (insert ?-)))))
     nil))
 
diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el
index 8492fa2912d..910dd322b6f 100644
--- a/lisp/net/net-utils.el
+++ b/lisp/net/net-utils.el
@@ -105,7 +105,7 @@ These options can be used to limit how many ICMP packets are emitted."
   (list
    (if (eq system-type 'windows-nt)
        "/all" "-a"))
-  "Options for `ifconfig-program'."
+  "Options for the ifconfig program."
   :group 'net-utils
   :type  '(repeat string))
 
@@ -124,25 +124,25 @@ These options can be used to limit how many ICMP packets are emitted."
 (define-obsolete-variable-alias 'ipconfig-program-options
   'ifconfig-program-options "22.2")
 
-(defcustom netstat-program  "netstat"
+(defcustom netstat-program "netstat"
   "Program to print network statistics."
   :group 'net-utils
   :type  'string)
 
 (defcustom netstat-program-options
   (list "-a")
-  "Options for netstat-program."
+  "Options for the netstat program."
   :group 'net-utils
   :type  '(repeat string))
 
-(defcustom arp-program  "arp"
+(defcustom arp-program "arp"
   "Program to print IP to address translation tables."
   :group 'net-utils
   :type  'string)
 
 (defcustom arp-program-options
   (list "-a")
-  "Options for arp-program."
+  "Options for the arp program."
   :group 'net-utils
   :type  '(repeat string))
 
@@ -158,17 +158,17 @@ These options can be used to limit how many ICMP packets are emitted."
   (if (eq system-type 'windows-nt)
       (list "print")
     (list "-r"))
-  "Options for route-program."
+  "Options for the route program."
   :group 'net-utils
   :type  '(repeat string))
 
-(defcustom nslookup-program  "nslookup"
+(defcustom nslookup-program "nslookup"
   "Program to interactively query DNS information."
   :group 'net-utils
   :type  'string)
 
-(defcustom nslookup-program-options  nil
-  "List of options to pass to the nslookup program."
+(defcustom nslookup-program-options nil
+  "Options for the nslookup program."
   :group 'net-utils
   :type  '(repeat string))
 
@@ -180,18 +180,18 @@ This variable is only used if the variable
   :group 'net-utils
   :type  'regexp)
 
-(defcustom dig-program  "dig"
+(defcustom dig-program "dig"
   "Program to query DNS information."
   :group 'net-utils
   :type  'string)
 
 (defcustom ftp-program "ftp"
-  "Progam to run to do FTP transfers."
+  "Program to run to do FTP transfers."
   :group 'net-utils
   :type  'string)
 
 (defcustom ftp-program-options nil
-  "List of options to pass to the FTP program."
+  "Options for the ftp program."
   :group 'net-utils
   :type  '(repeat string))
 
@@ -209,7 +209,7 @@ This variable is only used if the variable
   :type  'string)
 
 (defcustom smbclient-program-options nil
-  "List of options to pass to the smbclient program."
+  "Options for the smbclient program."
   :group 'net-utils
   :type  '(repeat string))
 
@@ -221,17 +221,15 @@ This variable is only used if the variable
   :group 'net-utils
   :type  'regexp)
 
-(defcustom dns-lookup-program  "host"
+(defcustom dns-lookup-program "host"
   "Program to interactively query DNS information."
   :group 'net-utils
-  :type  'string
-  )
+  :type  'string)
 
-(defcustom dns-lookup-program-options  nil
-  "List of options to pass to the dns-lookup program."
+(defcustom dns-lookup-program-options nil
+  "Options for the dns-lookup program."
   :group 'net-utils
-  :type  '(repeat string)
-  )
+  :type  '(repeat string))
 
 ;; Internal variables
 (defvar network-connection-service nil)
@@ -397,7 +395,7 @@ If your system's ping continues until interrupted, you can try setting
 
 ;;;###autoload
 (defun arp ()
-  "Run the arp program."
+  "Run arp program."
   (interactive)
   (net-utils-run-program
    "Arp"
@@ -407,7 +405,7 @@ If your system's ping continues until interrupted, you can try setting
 
 ;;;###autoload
 (defun route ()
-  "Run the route program."
+  "Run route program."
   (interactive)
   (net-utils-run-program
    "Route"
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 607ee54e30f..2d8e66ab3fc 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -848,13 +848,11 @@ Note that the style variables are always made local to the buffer."
     (if (setq limits (c-literal-limits))
         (goto-char (cdr limits)))
 
-    (while (and (< (point) end)
-                (search-forward-regexp c-anchored-cpp-prefix end t))
+    (while (search-forward-regexp c-anchored-cpp-prefix end t)
       (when (c-beginning-of-macro)    ; Guard against being in a string/comment.
         (setq mbeg (point))
         (c-end-of-macro)          ; Do we need to go forward 1 char here?  No!
-        (c-neutralize-CPP-line mbeg (point)))
-      (forward-char))))         ; We might still be in a comment - this is OK.
+        (c-neutralize-CPP-line mbeg (point)))))) ; We might still be in a comment - this is OK.
 
 (defun c-before-change (beg end)
   ;; Function to be put on `before-change-function'.  Primarily, this calls
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 111f8903fd3..7cbea06889f 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -100,7 +100,7 @@
 (defvar speedbar-initial-expansion-list-name)
 
 (defvar gdb-pc-address nil "Initialization for Assembler buffer.
-Set to \"main\" at start if gdb-show-main is t.")
+Set to \"main\" at start if `gdb-show-main' is t.")
 (defvar gdb-frame-address nil "Identity of frame for watch expression.")
 (defvar gdb-previous-frame-address nil)
 (defvar gdb-memory-address "main")
@@ -109,7 +109,7 @@ Set to \"main\" at start if gdb-show-main is t.")
 (defvar gdb-frame-number nil)
 (defvar gdb-current-language nil)
 (defvar gdb-var-list nil
- "List of variables in watch window.
+  "List of variables in watch window.
 Each element has the form (VARNUM EXPRESSION NUMCHILD TYPE VALUE STATUS FP)
 where STATUS is nil (`unchanged'), `changed' or `out-of-scope', FP the frame
 address for root variables.")
@@ -176,14 +176,13 @@ gdba (gdb-ui.el) uses all five values, gdbmi (gdb-mi.el) only two
   "The most recent command item sent to gdb.")
 
 (defvar gdb-pending-triggers '()
-  "A list of trigger functions that have run later than their output
-handlers.")
+  "A list of trigger functions that have run later than their output handlers.")
 
 (defvar gdb-first-post-prompt nil)
 (defvar gdb-version nil)
 (defvar gdb-locals-font-lock-keywords nil)
 (defvar gdb-source-file-list nil
-  "List of source files for the current executable")
+  "List of source files for the current executable.")
 (defconst gdb-error-regexp "\\^error,msg=\"\\(.+\\)\"")
 
 (defvar gdb-locals-font-lock-keywords-1
@@ -291,7 +290,7 @@ session."
   (gud-def gud-break  "break %f:%l"  "\C-b" "Set breakpoint at current line.")
   (gud-def gud-tbreak "tbreak %f:%l" "\C-t"
            "Set temporary breakpoint at current line.")
-  (gud-def gud-remove "clear %f:%l" "\C-d" "Remove breakpoint at current line")
+  (gud-def gud-remove "clear %f:%l" "\C-d" "Remove breakpoint at current line.")
   (gud-def gud-step   "step %p"     "\C-s" "Step one source line with display.")
   (gud-def gud-stepi  "stepi %p"    "\C-i" "Step one instruction with display.")
   (gud-def gud-next   "next %p"     "\C-n" "Step one line (skip functions).")
@@ -338,10 +337,9 @@ session."
   :version "22.1")
 
 (defvar gdb-debug-log nil
-  "List of commands sent to and replies received from GDB.  Most
-recent commands are listed first.  This list stores only the last
-'gdb-debug-log-max' values.  This variable is used to debug
-GDB-UI.")
+  "List of commands sent to and replies received from GDB.
+Most recent commands are listed first.  This list stores only the last
+`gdb-debug-log-max' values.  This variable is used to debug GDB-UI.")
 
 ;;;###autoload
 (defcustom gdb-enable-debug nil
@@ -354,7 +352,7 @@ GDB-UI.")
   "Shell command for generating a list of defined macros in a source file.
 This list is used to display the #define directive associated
 with an identifier as a tooltip.  It works in a debug session with
-GDB, when gud-tooltip-mode is t.
+GDB, when `gud-tooltip-mode' is t.
 
 Set `gdb-cpp-define-alist-flags' for any include paths or
 predefined macros."
@@ -555,7 +553,7 @@ otherwise do not."
              "pp1 " (if (eq (buffer-local-value
                              'major-mode (window-buffer)) 'speedbar-mode)
                         (gdb-find-watch-expression) "%e")) arg)
-           nil   "Print the emacs s-expression.")
+           nil   "Print the Emacs s-expression.")
 
   (define-key gud-minor-mode-map [left-margin mouse-1]
     'gdb-mouse-set-clear-breakpoint)
@@ -689,7 +687,7 @@ with mouse-1 (default bindings)."
   "Set execution address/line.
 The destination source line can be selected either by clicking with C-mouse-3
 on the fringe/margin or dragging the arrow with C-mouse-1 (default bindings).
-Unlike gdb-mouse-until the destination address can be before the current
+Unlike `gdb-mouse-until' the destination address can be before the current
 line, and no execution takes place."
   (interactive "e")
   (let ((start (event-start event))
@@ -827,7 +825,7 @@ With arg, enter name of variable to be watched in the minibuffer."
          `(lambda () (gdb-var-list-children-handler ,varnum)))))
 
 (defconst gdb-var-list-children-regexp
- "child={.*?name=\"\\(.*?\\)\",.*?exp=\"\\(.*?\\)\",.*?\
+  "child={.*?name=\"\\(.*?\\)\",.*?exp=\"\\(.*?\\)\",.*?\
 numchild=\"\\(.*?\\)\"\\(}\\|,.*?\\(type=\"\\(.*?\\)\"\\)?.*?}\\)")
 
 (defun gdb-var-list-children-handler (varnum)
@@ -1035,7 +1033,7 @@ The key should be one of the cars in `gdb-buffer-rules-assoc'."
     (gdb-look-for-tagged-buffer key (buffer-list))))
 
 (defun gdb-get-buffer-create (key)
-  "Create a new gdb  buffer of the type specified by KEY.
+  "Create a new gdb buffer of the type specified by KEY.
 The key should be one of the cars in `gdb-buffer-rules-assoc'."
   (or (gdb-get-buffer key)
       (let* ((rules (assoc key gdb-buffer-rules-assoc))
@@ -1351,7 +1349,7 @@ happens to be in effect."
   "An annotation handler for `prompt'.
 This sends the next command (if any) to gdb."
   (when gdb-first-prompt
-    (gdb-force-mode-line-update 
+    (gdb-force-mode-line-update
      (propertize "initializing..." 'face font-lock-variable-name-face))
     (gdb-init-1)
     (setq gdb-first-prompt nil))
@@ -2283,7 +2281,7 @@ static char *magick[] = {
   (kill-all-local-variables)
   (setq major-mode 'gdb-frames-mode)
   (setq mode-name "Frames")
-  (setq gdb-stack-position nil) 
+  (setq gdb-stack-position nil)
   (add-to-list 'overlay-arrow-variable-list 'gdb-stack-position)
   (setq truncate-lines t)  ;; Make it easier to see overlay arrow.
   (setq buffer-read-only t)
@@ -2612,10 +2610,10 @@ another GDB command e.g pwd, to see new frames")
   (let ((map (make-sparse-keymap)))
     (define-key map [header-line down-mouse-3] 'gdb-memory-format-menu-1)
     map)
- "Keymap to select format in the header line.")
+  "Keymap to select format in the header line.")
 
 (defvar gdb-memory-format-menu (make-sparse-keymap "Format")
- "Menu of display formats in the header line.")
+  "Menu of display formats in the header line.")
 
 (define-key gdb-memory-format-menu [binary]
   '(menu-item "Binary" gdb-memory-format-binary
@@ -2674,10 +2672,10 @@ another GDB command e.g pwd, to see new frames")
   (let ((map (make-sparse-keymap)))
     (define-key map [header-line down-mouse-3] 'gdb-memory-unit-menu-1)
     map)
- "Keymap to select units in the header line.")
+  "Keymap to select units in the header line.")
 
 (defvar gdb-memory-unit-menu (make-sparse-keymap "Unit")
- "Menu of units in the header line.")
+  "Menu of units in the header line.")
 
 (define-key gdb-memory-unit-menu [giantwords]
   '(menu-item "Giant words" gdb-memory-unit-giant
@@ -2840,7 +2838,7 @@ corresponding to the mode line clicked."
                                 (beginning-of-line)
                                 (gud-watch)))
     map)
- "Keymap to create watch expression of a complex data type local variable.")
+  "Keymap to create watch expression of a complex data type local variable.")
 
 (defconst gdb-struct-string
   (concat (propertize "[struct/union]"
@@ -3489,7 +3487,7 @@ BUFFER nil or omitted means use the current buffer."
 
 (defun gdb-set-gud-minor-mode-existing-buffers-1 ()
   "Create list of source files for current GDB session.
-If buffers already exist for any of these files, gud-minor-mode
+If buffers already exist for any of these files, `gud-minor-mode'
 is set in them."
   (goto-char (point-min))
   (while (re-search-forward gdb-source-file-regexp-1 nil t)
@@ -3700,7 +3698,7 @@ in_scope=\"\\(.*?\\)\".*?}")
     (define-key map "\r" 'gud-watch)
     (define-key map [mouse-2] 'gud-watch)
     map)
- "Keymap to create watch expression of a complex data type local variable.")
+  "Keymap to create watch expression of a complex data type local variable.")
 
 (defvar gdb-edit-locals-map-1
   (let ((map (make-sparse-keymap)))
@@ -3708,7 +3706,7 @@ in_scope=\"\\(.*?\\)\".*?}")
     (define-key map "\r" 'gdb-edit-locals-value)
     (define-key map [mouse-2] 'gdb-edit-locals-value)
     map)
- "Keymap to edit value of a simple data type local variable.")
+  "Keymap to edit value of a simple data type local variable.")
 
 (defun gdb-edit-locals-value (&optional event)
   "Assign a value to a variable displayed in the locals buffer."
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 6fa26afa4f5..7f7a98e087a 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -855,7 +855,13 @@ can take care of filling.  JUSTIFY is used as in `fill-paragraph'."
         (goto-char comstart) (skip-chars-backward " \t")
         (setq has-code-and-comment (not (bolp)))))
 
-    (if (not comstart)
+    (if (not (and comstart
+                  ;; Make sure the comment-start mark we found is accepted by
+                  ;; comment-start-skip.  If not, all bets are off, and
+                  ;; we'd better not mess with it.
+                  (string-match comment-start-skip
+                                (buffer-substring comstart comin))))
+
         ;; Return nil, so the normal filling will take place.
         nil
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 7b85671a025..5e99294d879 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-01  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * m/intel386.h [MAC_OSX || DARWIN]: Define NO_ARG_ARRAY if _LP64.
+
 2008-02-29  Chong Yidong  <cyd@stupidchicken.com>
 
         * xdisp.c (next_overlay_string): Don't set
diff --git a/src/m/intel386.h b/src/m/intel386.h
index 680a2cc106d..810ec6239a8 100644
--- a/src/m/intel386.h
+++ b/src/m/intel386.h
@@ -179,5 +179,12 @@ NOTE-END */
 #define SEGMENT_MASK ((SEGMENT_SIZE)-1)
 #endif
 
+#if defined (MAC_OSX) || defined (DARWIN)
+#ifdef _LP64
+/* For Intel Mac, with CC='gcc -arch x86_64'.  */
+#define NO_ARG_ARRAY
+#endif
+#endif
+
 /* arch-tag: 746338f0-cb7b-4f49-a98c-cb50817cf2ec
    (do not change this comment) */