Commit 67517972 authored by Paul Eggert's avatar Paul Eggert

Merge from trunk.

parents 2a84b02d 1b854618
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
* src/Makefile.in (LIB_PTHREAD_SIGMASK): New macro. * src/Makefile.in (LIB_PTHREAD_SIGMASK): New macro.
(LIBES): Use it. (LIBES): Use it.
* lib/getopt.c, lib/unistd.in.h, m4/getopt.m4: Merge from gnulib.
2011-07-07 Andreas Schwab <schwab@linux-m68k.org> 2011-07-07 Andreas Schwab <schwab@linux-m68k.org>
* configure.in (maintainer-mode): Reflect default in help string. * configure.in (maintainer-mode): Reflect default in help string.
......
...@@ -1932,8 +1932,8 @@ Optional Features: ...@@ -1932,8 +1932,8 @@ Optional Features:
--disable-ns-self-contained --disable-ns-self-contained
disable self contained build under NeXTstep disable self contained build under NeXTstep
--enable-asserts compile code with asserts enabled --enable-asserts compile code with asserts enabled
--enable-maintainer-mode --disable-maintainer-mode
enable make rules and dependencies not useful (and disable make rules and dependencies not useful (and
sometimes confusing) to the casual installer sometimes confusing) to the casual installer
--enable-locallisppath=PATH --enable-locallisppath=PATH
directories Emacs should search for lisp files directories Emacs should search for lisp files
...@@ -14918,7 +14918,7 @@ int *p = &optreset; return optreset; ...@@ -14918,7 +14918,7 @@ int *p = &optreset; return optreset;
return 0; return 0;
} }
_ACEOF _ACEOF
if ac_fn_c_try_compile "$LINENO"; then : if ac_fn_c_try_link "$LINENO"; then :
gl_optind_min=1 gl_optind_min=1
else else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
...@@ -14939,7 +14939,8 @@ else ...@@ -14939,7 +14939,8 @@ else
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
gl_save_CPPFLAGS=$CPPFLAGS gl_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS -DOPTIND_MIN=$gl_optind_min" CPPFLAGS="$CPPFLAGS -DOPTIND_MIN=$gl_optind_min"
...@@ -14962,22 +14963,20 @@ int ...@@ -14962,22 +14963,20 @@ int
main () main ()
{ {
{ {
int argc = 0; static char program[] = "program";
char *argv[10]; static char a[] = "-a";
static char foo[] = "foo";
static char bar[] = "bar";
char *argv[] = { program, a, foo, bar, NULL };
int c; int c;
argv[argc++] = "program";
argv[argc++] = "-a";
argv[argc++] = "foo";
argv[argc++] = "bar";
argv[argc] = NULL;
optind = OPTIND_MIN; optind = OPTIND_MIN;
opterr = 0; opterr = 0;
c = getopt (argc, argv, "ab"); c = getopt (4, argv, "ab");
if (!(c == 'a')) if (!(c == 'a'))
return 1; return 1;
c = getopt (argc, argv, "ab"); c = getopt (4, argv, "ab");
if (!(c == -1)) if (!(c == -1))
return 2; return 2;
if (!(optind == 2)) if (!(optind == 2))
...@@ -14985,22 +14984,20 @@ main () ...@@ -14985,22 +14984,20 @@ main ()
} }
/* Some internal state exists at this point. */ /* Some internal state exists at this point. */
{ {
int argc = 0; static char program[] = "program";
char *argv[10]; static char donald[] = "donald";
static char p[] = "-p";
static char billy[] = "billy";
static char duck[] = "duck";
static char a[] = "-a";
static char bar[] = "bar";
char *argv[] = { program, donald, p, billy, duck, a, bar, NULL };
int c; int c;
argv[argc++] = "program";
argv[argc++] = "donald";
argv[argc++] = "-p";
argv[argc++] = "billy";
argv[argc++] = "duck";
argv[argc++] = "-a";
argv[argc++] = "bar";
argv[argc] = NULL;
optind = OPTIND_MIN; optind = OPTIND_MIN;
opterr = 0; opterr = 0;
c = getopt (argc, argv, "+abp:q:"); c = getopt (7, argv, "+abp:q:");
if (!(c == -1)) if (!(c == -1))
return 4; return 4;
if (!(strcmp (argv[0], "program") == 0)) if (!(strcmp (argv[0], "program") == 0))
...@@ -15022,7 +15019,9 @@ main () ...@@ -15022,7 +15019,9 @@ main ()
} }
/* Detect MacOS 10.5, AIX 7.1 bug. */ /* Detect MacOS 10.5, AIX 7.1 bug. */
{ {
char *argv[3] = { "program", "-ab", NULL }; static char program[] = "program";
static char ab[] = "-ab";
char *argv[3] = { program, ab, NULL };
optind = OPTIND_MIN; optind = OPTIND_MIN;
opterr = 0; opterr = 0;
if (getopt (2, argv, "ab:") != 'a') if (getopt (2, argv, "ab:") != 'a')
...@@ -15101,19 +15100,22 @@ main () ...@@ -15101,19 +15100,22 @@ main ()
and fails on MacOS X 10.5, AIX 5.2, HP-UX 11, IRIX 6.5, and fails on MacOS X 10.5, AIX 5.2, HP-UX 11, IRIX 6.5,
OSF/1 5.1, Solaris 10. */ OSF/1 5.1, Solaris 10. */
{ {
char *myargv[3]; static char conftest[] = "conftest";
myargv[0] = "conftest"; static char plus[] = "-+";
myargv[1] = "-+"; char *argv[3] = { conftest, plus, NULL };
myargv[2] = 0;
opterr = 0; opterr = 0;
if (getopt (2, myargv, "+a") != '?') if (getopt (2, argv, "+a") != '?')
result |= 1; result |= 1;
} }
/* This code succeeds on glibc 2.8, mingw, /* This code succeeds on glibc 2.8, mingw,
and fails on MacOS X 10.5, OpenBSD 4.0, AIX 5.2, HP-UX 11, and fails on MacOS X 10.5, OpenBSD 4.0, AIX 5.2, HP-UX 11,
IRIX 6.5, OSF/1 5.1, Solaris 10, Cygwin 1.5.x. */ IRIX 6.5, OSF/1 5.1, Solaris 10, Cygwin 1.5.x. */
{ {
char *argv[] = { "program", "-p", "foo", "bar", NULL }; static char program[] = "program";
static char p[] = "-p";
static char foo[] = "foo";
static char bar[] = "bar";
char *argv[] = { program, p, foo, bar, NULL };
optind = 1; optind = 1;
if (getopt (4, argv, "p::") != 'p') if (getopt (4, argv, "p::") != 'p')
...@@ -15127,7 +15129,10 @@ main () ...@@ -15127,7 +15129,10 @@ main ()
} }
/* This code succeeds on glibc 2.8 and fails on Cygwin 1.7.0. */ /* This code succeeds on glibc 2.8 and fails on Cygwin 1.7.0. */
{ {
char *argv[] = { "program", "foo", "-p", NULL }; static char program[] = "program";
static char foo[] = "foo";
static char p[] = "-p";
char *argv[] = { program, foo, p, NULL };
optind = 0; optind = 0;
if (getopt (3, argv, "-p") != 1) if (getopt (3, argv, "-p") != 1)
result |= 16; result |= 16;
...@@ -15136,13 +15141,26 @@ main () ...@@ -15136,13 +15141,26 @@ main ()
} }
/* This code fails on glibc 2.11. */ /* This code fails on glibc 2.11. */
{ {
char *argv[] = { "program", "-b", "-a", NULL }; static char program[] = "program";
static char b[] = "-b";
static char a[] = "-a";
char *argv[] = { program, b, a, NULL };
optind = opterr = 0; optind = opterr = 0;
if (getopt (3, argv, "+:a:b") != 'b') if (getopt (3, argv, "+:a:b") != 'b')
result |= 64; result |= 64;
else if (getopt (3, argv, "+:a:b") != ':') else if (getopt (3, argv, "+:a:b") != ':')
result |= 64; result |= 64;
} }
/* This code dumps core on glibc 2.14. */
{
static char program[] = "program";
static char w[] = "-W";
static char dummy[] = "dummy";
char *argv[] = { program, w, dummy, NULL };
optind = opterr = 1;
if (getopt (3, argv, "W;") != 'W')
result |= 128;
}
return result; return result;
; ;
......
2011-07-08 Andreas Schwab <schwab@linux-m68k.org>
* mail/sendmail.el (send-mail-function): No longer delay custom
initialization.
* custom.el (custom-initialize-delay): Doc fix.
2011-07-08 Stefan Monnier <monnier@iro.umontreal.ca>
* abbrev.el (expand-abbrev): Try to preserve point (bug#5805).
2011-07-08 Michael Albinus <michael.albinus@gmx.de>
* net/tramp-sh.el (tramp-sh-handle-start-file-process): Use a
human-friendly prompt.
2011-07-08 Stefan Monnier <monnier@iro.umontreal.ca>
* vc/vc-bzr.el (vc-bzr-revision-keywords): Remove svn, it's only
provided by a particular plugin.
2011-07-08 Lars Magne Ingebrigtsen <larsi@gnus.org> 2011-07-08 Lars Magne Ingebrigtsen <larsi@gnus.org>
* mail/sendmail.el (sendmail-query-once): If we aren't allowed to * mail/sendmail.el (sendmail-query-once): If we aren't allowed to
...@@ -41,7 +61,7 @@ ...@@ -41,7 +61,7 @@
* info.el (Info-mode-map): Remove S-TAB binding, since [backtab] * info.el (Info-mode-map): Remove S-TAB binding, since [backtab]
should cover it (bug#1281). should cover it (bug#1281).
* cus-edit.el (custom-show): Marked as obsolete. * cus-edit.el (custom-show): Mark as obsolete.
* net/network-stream.el (network-stream-open-starttls): If gnutls * net/network-stream.el (network-stream-open-starttls): If gnutls
negotiation fails, then possibly try again with a non-encrypted negotiation fails, then possibly try again with a non-encrypted
...@@ -62,18 +82,17 @@ ...@@ -62,18 +82,17 @@
* international/characters.el (build-unicode-category-table): * international/characters.el (build-unicode-category-table):
Delete it. Delete it.
(unicode-category-table): Set it by (unicode-category-table): Set it by unicode-property-table-internal.
unicode-prroperty-table-internal.
* international/mule-cmds.el (char-code-property-alist): Moved to * international/mule-cmds.el (char-code-property-alist): Move to
to src/chartab.c. to src/chartab.c.
(get-char-code-property): Call unicode-property-table-internal to (get-char-code-property): Call unicode-property-table-internal to
load a file. Call get-unicode-property-internal where necessary. load a file. Call get-unicode-property-internal where necessary.
(put-char-code-property): Call unicode-property-table-internal to (put-char-code-property): Call unicode-property-table-internal to
load a file. Call put-unicode-property-internal where necessary. load a file. Call put-unicode-property-internal where necessary.
put-unicode-property-internal where necessary. put-unicode-property-internal where necessary.
(char-code-property-description): Call (char-code-property-description):
unicode-property-table-internal to load a file. Call unicode-property-table-internal to load a file.
* international/charprop.el: * international/charprop.el:
* international/uni-bidi.el: * international/uni-bidi.el:
...@@ -142,8 +161,8 @@ ...@@ -142,8 +161,8 @@
2011-07-06 Lars Magne Ingebrigtsen <larsi@gnus.org> 2011-07-06 Lars Magne Ingebrigtsen <larsi@gnus.org>
* emacs-lisp/lisp-mode.el (eval-defun-1): Update the documentation * emacs-lisp/lisp-mode.el (eval-defun-1): Update the documentation
of faces when `M-C-x'-ing their definitions (bug#8378). Also of faces when `M-C-x'-ing their definitions (bug#8378).
clean up the code slightly. Also clean up the code slightly.
* progmodes/grep.el (rgrep): Don't bind `process-connection-type', * progmodes/grep.el (rgrep): Don't bind `process-connection-type',
because that makes the colours go away. because that makes the colours go away.
...@@ -167,39 +186,38 @@ ...@@ -167,39 +186,38 @@
2011-07-06 Michael R. Mauger <mmaug@yahoo.com> 2011-07-06 Michael R. Mauger <mmaug@yahoo.com>
* progmodes/sql.el: Version 3.0 * progmodes/sql.el: Version 3.0
(sql-product-alist): Added product :completion-object, (sql-product-alist): Add product :completion-object,
:completion-column, and :statement attributes. :completion-column, and :statement attributes.
(sql-mode-menu, sql-interactive-mode-map): Fixed List entries. (sql-mode-menu, sql-interactive-mode-map): Fix List entries.
(sql-mode-syntax-table): Mark all punctuation. (sql-mode-syntax-table): Mark all punctuation.
(sql-font-lock-keywords-builder): Temporarily removed fallback on (sql-font-lock-keywords-builder): Temporarily remove fallback on
ansi keywords. ansi keywords.
(sql-regexp-abbrev, sql-regexp-abbrev-list): New functions. (sql-regexp-abbrev, sql-regexp-abbrev-list): New functions.
(sql-mode-oracle-font-lock-keywords): Improved. (sql-mode-oracle-font-lock-keywords): Improve.
(sql-oracle-show-reserved-words): New function for development. (sql-oracle-show-reserved-words): New function for development.
(sql-product-font-lock): Simplify for source code buffers. (sql-product-font-lock): Simplify for source code buffers.
(sql-product-syntax-table, sql-product-font-lock-syntax-alist): (sql-product-syntax-table, sql-product-font-lock-syntax-alist):
New functions. New functions.
(sql-highlight-product): Set product specific syntax table. (sql-highlight-product): Set product specific syntax table.
(sql-mode-map): Added statement movement functions. (sql-mode-map): Add statement movement functions.
(sql-ansi-statement-starters, sql-oracle-statement-starters): New (sql-ansi-statement-starters, sql-oracle-statement-starters):
variable. New variable.
(sql-statement-regexp, sql-beginning-of-statement) (sql-statement-regexp, sql-beginning-of-statement)
(sql-end-of-statement, sql-signum): New functions. (sql-end-of-statement, sql-signum): New functions.
(sql-buffer-live-p, sql=find-sqli-buffer): Added CONNECTION (sql-buffer-live-p, sql=find-sqli-buffer): Add CONNECTION parameter.
parameter.
(sql-show-sqli-buffer): Bug fix. (sql-show-sqli-buffer): Bug fix.
(sql-interactive-mode): Store connection data as buffer local. (sql-interactive-mode): Store connection data as buffer local.
(sql-connect): Added NEW-NAME parameter. Redesigned interaction (sql-connect): Add NEW-NAME parameter. Redesign interaction
with sql-interactive-mode. with sql-interactive-mode.
(sql-save-connection): Save buffer local settings. (sql-save-connection): Save buffer local settings.
(sql-connection-menu-filter): Changed menu entry name. (sql-connection-menu-filter): Change menu entry name.
(sql-product-interactive): Bug fix. (sql-product-interactive): Bug fix.
(sql-preoutput-hold): New variable. (sql-preoutput-hold): New variable.
(sql-interactive-remove-continuation-prompt): Bug fixes. (sql-interactive-remove-continuation-prompt): Bug fixes.
(sql-debug-redirect): New variable. (sql-debug-redirect): New variable.
(sql-str-literal): New function. (sql-str-literal): New function.
(sql-redirect, sql-redirect-one, sql-redirect-value, sql-execute): (sql-redirect, sql-redirect-one, sql-redirect-value, sql-execute):
Redesigned. Redesign.
(sql-oracle-save-settings, sql-oracle-restore-settings) (sql-oracle-save-settings, sql-oracle-restore-settings)
(sql-oracle-list-all, sql-oracle-list-table): New functions. (sql-oracle-list-all, sql-oracle-list-table): New functions.
(sql-completion-object, sql-completion-column) (sql-completion-object, sql-completion-column)
...@@ -372,9 +390,8 @@ ...@@ -372,9 +390,8 @@
buffer-saved-size and some allout state to not inhibit auto-saves buffer-saved-size and some allout state to not inhibit auto-saves
if there are no longer any plain-text topics pending encryption. if there are no longer any plain-text topics pending encryption.
(allout-next-topic-pending-encryption), (allout-next-topic-pending-encryption, allout-encrypt-decrypted):
(allout-encrypt-decrypted): No longer provide for exemption of the No longer provide for exemption of the current topic.
current topic.
2011-07-04 Juri Linkov <juri@jurta.org> 2011-07-04 Juri Linkov <juri@jurta.org>
......
...@@ -814,19 +814,28 @@ Returns the abbrev symbol, if expansion took place." ...@@ -814,19 +814,28 @@ Returns the abbrev symbol, if expansion took place."
(destructuring-bind (&optional sym name wordstart wordend) (destructuring-bind (&optional sym name wordstart wordend)
(abbrev--before-point) (abbrev--before-point)
(when sym (when sym
(unless (or ;; executing-kbd-macro (let ((startpos (copy-marker (point) t))
noninteractive (endmark (copy-marker wordend t)))
(window-minibuffer-p (selected-window))) (unless (or ;; executing-kbd-macro
;; Add an undo boundary, in case we are doing this for noninteractive
;; a self-inserting command which has avoided making one so far. (window-minibuffer-p (selected-window)))
(undo-boundary)) ;; Add an undo boundary, in case we are doing this for
;; Now sym is the abbrev symbol. ;; a self-inserting command which has avoided making one so far.
(setq last-abbrev-text name) (undo-boundary))
(setq last-abbrev sym) ;; Now sym is the abbrev symbol.
(setq last-abbrev-location wordstart) (setq last-abbrev-text name)
;; If this abbrev has an expansion, delete the abbrev (setq last-abbrev sym)
;; and insert the expansion. (setq last-abbrev-location wordstart)
(abbrev-insert sym name wordstart wordend))))) ;; If this abbrev has an expansion, delete the abbrev
;; and insert the expansion.
(prog1
(abbrev-insert sym name wordstart wordend)
;; Yuck!! If expand-abbrev is called with point slightly
;; further than the end of the abbrev, move point back to
;; where it started.
(if (and (> startpos endmark)
(= (point) endmark)) ;Obey skeletons that move point.
(goto-char startpos))))))))
(defun unexpand-abbrev () (defun unexpand-abbrev ()
"Undo the expansion of the last abbrev that expanded. "Undo the expansion of the last abbrev that expanded.
......
...@@ -120,8 +120,10 @@ the :set function. ...@@ -120,8 +120,10 @@ the :set function.
For variables in preloaded files, you can simply use this For variables in preloaded files, you can simply use this
function for the :initialize property. For autoloaded variables, function for the :initialize property. For autoloaded variables,
you will also need to add an autoload stanza calling this you will also need to add an autoload stanza calling this
function, and another one setting the standard-value property. function, and another one setting the standard-value property."
See `send-mail-function' in sendmail.el for an example." ;; No longer true:
;; "See `send-mail-function' in sendmail.el for an example."
;; Until the var is actually initialized, it is kept unbound. ;; Until the var is actually initialized, it is kept unbound.
;; This seemed to be at least as good as setting it to an arbitrary ;; This seemed to be at least as good as setting it to an arbitrary
;; value like nil (evaluating `value' is not an option because it ;; value like nil (evaluating `value' is not an option because it
......
...@@ -138,14 +138,6 @@ Otherwise, let mailer send back a message to report errors." ...@@ -138,14 +138,6 @@ Otherwise, let mailer send back a message to report errors."
:group 'sendmail :group 'sendmail
:version "23.1") :version "23.1")
;; Prevent problems with `window-system' not having the correct value
;; when loaddefs.el is loaded. `custom-reevaluate-setting' needs the
;; standard value.
;;;###autoload
(put 'send-mail-function 'standard-value
;; MS-Windows can access the clipboard even under -nw.
'('sendmail-query-once))
;; Useful to set in site-init.el ;; Useful to set in site-init.el
;;;###autoload ;;;###autoload
(defcustom send-mail-function 'sendmail-query-once (defcustom send-mail-function 'sendmail-query-once
...@@ -161,7 +153,6 @@ This is used by the default mail-sending commands. See also ...@@ -161,7 +153,6 @@ This is used by the default mail-sending commands. See also
(function-item feedmail-send-it :tag "Use Feedmail package") (function-item feedmail-send-it :tag "Use Feedmail package")
(function-item mailclient-send-it :tag "Use Mailclient package") (function-item mailclient-send-it :tag "Use Mailclient package")
function) function)
:initialize 'custom-initialize-delay
:version "24.1" :version "24.1"
:group 'sendmail) :group 'sendmail)
...@@ -212,8 +203,6 @@ function to use, and then save that choice." ...@@ -212,8 +203,6 @@ function to use, and then save that choice."
(setq sendmail-query-once-function function)))) (setq sendmail-query-once-function function))))
(funcall sendmail-query-once-function)) (funcall sendmail-query-once-function))
;;;###autoload(custom-initialize-delay 'send-mail-function nil)
;;;###autoload ;;;###autoload
(defcustom mail-header-separator (purecopy "--text follows this line--") (defcustom mail-header-separator (purecopy "--text follows this line--")
"Line used to separate headers from text in messages being composed." "Line used to separate headers from text in messages being composed."
......
...@@ -2690,8 +2690,13 @@ the result will be a local, non-Tramp, filename." ...@@ -2690,8 +2690,13 @@ the result will be a local, non-Tramp, filename."
;; When PROGRAM is nil, we just provide a tty. ;; When PROGRAM is nil, we just provide a tty.
(let ((command (let ((command
(when (stringp program) (when (stringp program)
(format "cd %s; exec %s" (format "cd %s; exec env PS1=%s %s"
(tramp-shell-quote-argument localname) (tramp-shell-quote-argument localname)
;; Use a human-friendly prompt, for example for `shell'.
(tramp-shell-quote-argument
(format "%s %s"
(file-remote-p default-directory)
tramp-initial-end-of-output))
(mapconcat 'tramp-shell-quote-argument (mapconcat 'tramp-shell-quote-argument
(cons program args) " ")))) (cons program args) " "))))
(tramp-process-connection-type (tramp-process-connection-type
......
...@@ -1174,7 +1174,7 @@ stream. Standard error output is discarded." ...@@ -1174,7 +1174,7 @@ stream. Standard error output is discarded."
(defconst vc-bzr-revision-keywords (defconst vc-bzr-revision-keywords
;; bzr help revisionspec | sed -ne 's/^\([a-z]*\):$/"\1"/p' | sort -u ;; bzr help revisionspec | sed -ne 's/^\([a-z]*\):$/"\1"/p' | sort -u
'("ancestor" "annotate" "before" "branch" "date" "last" "mainline" "revid" '("ancestor" "annotate" "before" "branch" "date" "last" "mainline" "revid"
"revno" "submit" "svn" "tag"))) "revno" "submit" "tag")))
(defun vc-bzr-revision-completion-table (files) (defun vc-bzr-revision-completion-table (files)
(lexical-let ((files files)) (lexical-let ((files files))
......
...@@ -9,6 +9,55 @@ ...@@ -9,6 +9,55 @@
2011-07-08 Jan Djärv <jan.h.d@swipnet.se> 2011-07-08 Jan Djärv <jan.h.d@swipnet.se>
* gtkutil.c (qttip_cb): Set line wrap to FALSE for tooltip widget.
(xg_prepare_tooltip): Revert text in x->ttip_lbl, margins was
wrong (Bug#8591).
2011-07-08 Jan Djärv <jan.h.d@swipnet.se>
* gtkutil.c (xg_prepare_tooltip): Fix indentation and comment.
Put text in x->ttip_lbl instead of gtk_tooltip_set_text (Bug#8591).
(xg_hide_tooltip): Fix comment.
* nsterm.m (initFrameFromEmacs): Don't use ns_return_types
in registerServicesMenuSendTypes.
(validRequestorForSendType): Don't check ns_return_types.
* nsfns.m (Fx_open_connection): Put NSStringPboardType into
ns_return_type.
2011-07-08 Jason Rumney <jasonr@gnu.org>
* w32fns.c (w32_wnd_proc) [WM_TIMER, WM_SET_CURSOR]: Avoid using
frame struct members of non-existent frames (Bug#6284).
2011-07-08 Jan Djärv <jan.h.d@swipnet.se>
* nsterm.m (keyDown): Call to wantsToDelayTextChangeNotifications and
variable firstTime not needed on OSX >= 10.6.
(setPosition): setFloatValue:knobProportion: is deprecated on OSX
>= 10.5. Use setKnobProportion, setDoubleValue.
* nsterm.h (MAC_OS_X_VERSION_10_3, MAC_OS_X_VERSION_10_4)
(MAC_OS_X_VERSION_10_5): Define if not defined.
(EmacsView, EmacsTooltip): Implements NSWindowDelegate on OSX >= 10.6.
(EmacsMenu): Implements NSMenuDelegate on OSX >= 10.6.
(EmacsToolbar): Implements NSToolbarDelegate on OSX >= 10.6.
* nsselect.m (ns_string_from_pasteboard): Don't use deprecated methods
cString and lossyCString on OSX >= 10.4
* nsmenu.m (fillWithWidgetValue): Don't use depercated method
sizeToFit on OSX >= 10.2.
* nsimage.m (allocInitFromFile): Don't use deprecated method
bestRepresentationForDevice on OSX >= 10.6.
* nsfns.m (check_ns_display_info): Cast to long and use %ld in error
to avoid warning.
* emacs.c: Declare unexec_init_emacs_zone.
* nsgui.h: Fix compiler warning about gnulib redefining verify. * nsgui.h: Fix compiler warning about gnulib redefining verify.
* nsselect.m (ns_get_local_selection): Change to extern (Bug#8842). * nsselect.m (ns_get_local_selection): Change to extern (Bug#8842).
......
...@@ -129,6 +129,10 @@ Lisp_Object empty_unibyte_string, empty_multibyte_string; ...@@ -129,6 +129,10 @@ Lisp_Object empty_unibyte_string, empty_multibyte_string;
on subsequent starts. */ on subsequent starts. */
int initialized; int initialized;
#ifdef DARWIN_OS
extern void unexec_init_emacs_zone (void);
#endif
#ifdef DOUG_LEA_MALLOC #ifdef DOUG_LEA_MALLOC
/* Preserves a pointer to the memory allocated that copies that /* Preserves a pointer to the memory allocated that copies that
static data inside glibc's malloc. */ static data inside glibc's malloc. */
......
...@@ -633,6 +633,9 @@ qttip_cb (GtkWidget *widget, ...@@ -633,6 +633,9 @@ qttip_cb (GtkWidget *widget,
struct x_output *x = f->output_data.x; struct x_output *x = f->output_data.x;
if (x->ttip_widget == NULL) if (x->ttip_widget == NULL)
{ {
GtkWidget *p;
GList *list, *iter;
g_object_set (G_OBJECT (widget), "has-tooltip", FALSE, NULL); g_object_set (G_OBJECT (widget), "has-tooltip", FALSE, NULL);
x->ttip_widget = tooltip;