Merge from trunk.

* nsgui.h: Fix compiler warning about gnulib redefining verify.

Fix services menu empty on OSX 1.6+.

* nsfns.m (Fx_open_connection): Remove NSStringPboardType from
ns_return_types.
(Fns_list_services): Just return Qnil on 10.6, code not working there.

* nsmenu.m (ns_update_menubar): Remove useless setDelegate call
on svcsMenu.

* nsselect.m (ns_get_local_selection): Change to extern (Bug#8842).

* nsterm.h (MAC_OS_X_VERSION_10_6): Define here instead of nsterm.m.
(ns_get_local_selection): Declare.

* nsterm.m (QUTF8_STRING): Declare.
(initFrameFromEmacs): Call registerServicesMenuSendTypes.
(validRequestorForSendType): Return type is (id).
Change indexOfObjectIdenticalTo to indexOfObject.
Check if we have local selection before returning self (Bug#8842).
(writeSelectionToPasteboard): Put local selection into paste board
if we have a local selection (Bug#8842).
(syms_of_nsterm): DEFSYM QUTF8_STRING.

Allow sending mail in "emacs -Q" by not calling customize-save-variable

* mail/smtpmail.el (smtpmail-query-smtp-server): Ditto.

* mail/sendmail.el (sendmail-query-once): If we aren't allowed to
save customizations (with "emacs -Q"), just set the variable
instead of erroring out.

Revert the plstore editing feature.

* lisp/arc-mode.el (archive-zip-expunge, archive-zip-update)
(archive-zip-update-case): Use 7z if found by `executable-find'.
The order of searching the available programs is the same as in
`archive-zip-extract'.

Fixes: debbugs:8968

Merge changes made in Gnus trunk.

gnus-msg.el (gnus-bug): Don't insert user variables.  It usually isn't very interesting any more, and it leaks potentially secret data.
 (gnus-debug): Removed.
gnus-art.el (gnus-ignored-headers): Removed obsolete and non-working use of :custom-show.

Tweak last change to menu descriptions.

* lisp/menu-bar.el (menu-bar-line-wrapping-menu): Revert last change.
(menu-bar-options-menu): Tweak descriptions.

Make all the Options menu items into verb phrases

* menu-bar.el (menu-bar-line-wrapping-menu): Also refill to fit under
80 columns.

Fixes: debbugs:1421

2011-07-07  Tassilo Horn  <tassilo@member.fsf.org>

* themes/tsdh-light-theme.el:
* themes/tsdh-dark-theme.el: Make `gnus-button' face inherit from
`button', `gnus-header-name' boxed, and define `rcirc-my-nick'
face.

* text.texi (Special Properties): Clarify the format of `face'

Fixes: debbugs:1375

Document some Info functions (Bug#1084).

* lisp/info.el (info, Info-read-node-name-2, Info-read-node-name-1)
(Info-read-node-name): Doc fix.

Doc fixes for thingatpt.el.

* lisp/thingatpt.el (forward-thing, bounds-of-thing-at-point)
(thing-at-point, beginning-of-thing, end-of-thing, in-string-p)
(end-of-sexp, beginning-of-sexp)
(thing-at-point-bounds-of-list-at-point, forward-whitespace)
(forward-symbol, forward-same-syntax, word-at-point)
(sentence-at-point): Doc fix (Bug#1144).

(Info-mode-map): Remove S-TAB binding, since [backtab] should cover it

Fixes: debbugs:1281

(describe_map_tree): Don't insert a double newline at the end of the string

Return whether we inserted something.  This should allow the caller to
decide whether to insert more newlines or not.

Fixes: debbugs:1169

Clarify the `call-interactively' doc string, and add an example.

Remove mention of `require' in ediff.texi

That's not pertinent in the installed Emacs.

Fixes: debbugs:9016

Merge from emacs-23 branch

Note that :custom-show is obsolete.

Fixes: debbugs:75

Fix bug #9015 with a bogus crash with glyphless characters on a TTY.

 src/term.c (produce_glyphs) <xassert>: Allow IT_GLYPHLESS in it->what.

Work around gnutls failures

* net/network-stream.el (network-stream-open-starttls): If gnutls
negotiation fails, then possibly try again with a non-encrypted
connection.

Fixes: debbugs:9017

* configure.in (maintainer-mode): Reflect default in help string.

Update doc string of `smtpmail-stream-type'.

* mail/smtpmail.el (smtpmail-stream-type): Note that `plain' can
be used.

admin/unidata/makefile.w32-in: Duplicate change in Makefile.in (2011-07-06T22:43:48Z!handa@m17n.org).

Mention the `send-mail-function' default change.

* NEWS: Clarify `smtpmail-auth-credentials' non-existence.

Fix bugs finding grep hits in Rmail buffers.

Auto-commit of generated files.

Add a major mode to edit plstore files.

* plstore.el: Add documentation.
(plstore-mode): New mode to edit plstore file.
(plstore-mode-toggle-display, plstore-mode-original)
(plstore-mode-decoded): New command.
(plstore--encode, plstore--decode, plstore--write-contents-functions)
(plstore--insert-buffer, plstore--make): New function.
(plstore-open, plstore-save): Simplify by using them.

Ignore a static composition that starts before the current checking position in redisplay.

merge trunk

chartab.c (sub_char_table_set_range): Fix previous change.

Simplify Irix build, remove iris4d.h file.

* configure.in: Remove reference to iris4d.h.

* src/m/iris4d.h: Remove file, move contents ...
* src/s/irix6-5.h: ... here.

Tweak to `button' face in custom themes.

* etc/themes/dichromacy-theme.el:
* etc/themes/tango-theme.el:
* etc/themes/tango-dark-theme.el:
* etc/themes/wheatgrass-theme.el: Don't define button face separately;
it inherits from link now.

Error in next-buffer or previous-buffer if called from minibuffer.

* lisp/window.el (next-buffer, previous-buffer): Signal an error if
called from a minibuffer window.

* lisp/bindings.el: Revert 2011-07-04 change.

Add Bug#.

merge trunk

Add C interface for Unicode character property table.

Rmail mime: Use markers for positions in entities.

lisp/gnus/ChangeLog (2011-07-04): Add missing entry.

Remove more assumptions re struct layout (Bug#8884).

Merge: Remove unportable assumption about struct layout (Bug#8884).

* buffer.c (clone_per_buffer_values): Don't assume that
sizeof (struct buffer) is a multiple of sizeof (Lisp_Object).
This isn't true in general, and it's particularly not true
if Emacs is configured with --with-wide-int.
* buffer.h (FIRST_FIELD_PER_BUFFER, LAST_FIELD_PER_BUFFER):
New macros, used in the buffer.c change.

Remove unportable assumption about struct layout (Bug#8884).

* buffer.c (clone_per_buffer_values): Don't assume that
sizeof (struct buffer) is a multiple of sizeof (Lisp_Object).
This isn't true in general, and it's particularly not true
if Emacs is configured with --with-wide-int.
* buffer.h (FIRST_FIELD_PER_BUFFER, LAST_FIELD_PER_BUFFER):
New macros, used in the buffer.c change.

* mail/smtpmail.el (smtpmail-default-smtp-server): Made into a defcustom again for backwards compatibility.

* simple.el (shell-command-on-region): Fill.

* functions.texi (Calling Functions): Link to the "Interactive
Call" node.

Fixes: debbugs:1001

* dired-aux.el (dired-kill-line): Add a doc string.

Fixes: debbugs:957

Use pthread_sigmask, not sigprocmask.

* callproc.c (Fcall_process):
* sysdep.c (sys_sigblock, sys_sigunblock, sys_sigsetmask):
* process.c (create_process):
sigprocmask is portable only for single-threaded applications, and
Emacs can be multi-threaded when it uses GTK.

Add gnulib support for pthread_sigmask.

* Makefile.in (GNULIB_MODULES): Add pthread_sigmask.
(GNULIB_TOOL_FLAGS): Avoid sigprocmask.  Emacs does its own
implementation of 'sigprocmask' on Windows, and it assumes
'sigprocmask' on non-Windows hosts, so it doesn't need the
sigprocmask module.
* lib/signal.in.h, m4/pthread_sigmask.m4, m4/signal_h.m4:
New files, automatically imported from gnulib.
* lib/gnulib.mk, m4/gl-comp.m4: Automatically-imported update
due to the above changes.
* .bzrignore: Add lib/signal.h.

* dabbrev.el (dabbrev-abbrev-char-regexp): Note that nil defaults
to "\\sw\\|\\s_" (bug#358).

* dired.el (dired-mode): Clarify "unmark or unflag".
(dired-unmark-backward): Ditto.
(dired-flag-backup-files): Ditto.

* dired-x.el (dired-mark-sexp): Ditto.

Fixes: debbugs:8770

* NEWS: Clarify that `smtpmail-starttls-credentials' doesn't exist.

Fix rmail mime search bug when entity is a string.

* emacs-lisp/lisp-mode.el (eval-defun-1): Update the documentation
of faces when `M-C-x'-ing their definitions.  Also
clean up the code slightly.

Fixes: debbugs:8378

rmailmm.el: record truncated mime entities.

* m4/alloca.m4: Merge whitespace changes from gnulib.

* progmodes/grep.el (rgrep): Don't bind `process-connection-type', because that makes the colours go away.

(sendmail-query-once): Add an autoload cookie.

* mail/sendmail.el (send-mail-function): Change the default to `sendmail-query-once'.

* net/network-stream.el (network-stream-open-starttls): Try using
a plain connection even if the server offered STARTTLS, and we
kinda wanted to use it, if Emacs doesn't have any STARTTLS
capability.  This should make smtpmail.el work in slightly more
configurations.

* net/tramp-compat.el (tramp-compat-pop-to-buffer-same-window): New defun.
* net/tramp-cmds.el (tramp-append-tramp-buffers): Use it.

* url-cache.el (url-cache-extract): Set buffer multibyte flag to
nil (bug#8827).

* progmodes/sql.el: Version 3.0
(sql-product-alist): Added product :completion-object,
:completion-column, and :statement attributes.
(sql-mode-menu, sql-interactive-mode-map): Fixed List entries.
(sql-mode-syntax-table): Mark all punctuation.
(sql-font-lock-keywords-builder): Temporarily removed fallback on
ansi keywords.
(sql-regexp-abbrev, sql-regexp-abbrev-list): New functions.
(sql-mode-oracle-font-lock-keywords): Improved.
(sql-oracle-show-reserved-words): New function for development.
(sql-product-font-lock): Simplify for source code buffers.
(sql-product-syntax-table, sql-product-font-lock-syntax-alist):
New functions.
(sql-highlight-product): Set product specific syntax table.
(sql-mode-map): Added statement movement functions.
(sql-ansi-statement-starters, sql-oracle-statement-starters): New
variable.
(sql-statement-regexp, sql-beginning-of-statement)
(sql-end-of-statement, sql-signum): New functions.
(sql-buffer-live-p, sql=find-sqli-buffer): Added CONNECTION
parameter.
(sql-show-sqli-buffer): Bug fix.
(sql-interactive-mode): Store connection data as buffer local.
(sql-connect): Added NEW-NAME parameter.  Redesigned interaction
with sql-interactive-mode.
(sql-save-connection): Save buffer local settings.
(sql-connection-menu-filter): Changed menu entry name.
(sql-product-interactive): Bug fix.
(sql-preoutput-hold): New variable.
(sql-interactive-remove-continuation-prompt): Bug fixes.
(sql-debug-redirect): New variable.
(sql-str-literal): New function.
(sql-redirect, sql-redirect-one, sql-redirect-value, sql-execute):
Redesigned.
(sql-oracle-save-settings, sql-oracle-restore-settings)
(sql-oracle-list-all, sql-oracle-list-table): New functions.
(sql-completion-object, sql-completion-column)
(sql-completion-sqlbuf): New variables.
(sql-build-completions-1, sql-build-completions)
(sql-try-completion): New functions.
(sql-read-table-name): Use them.
(sql-contains-names): New buffer local variable.
(sql-list-all, sql-list-table): Use it.
(sql-oracle-completion-types): New variable.
(sql-oracle-completion-object, sql-sqlite-completion-object)
(sql-postgres-completion-object): New functions.

* lisp/window.el (pop-to-buffer): Doc fix.

* gnus-group.el (gnus-read-ephemeral-emacs-bug-group): Silence compiler.

Merge from emacs-23; up to 2010-06-16T23:27:20Z!jay.p.belanger@gmail.com.

ChangeLog fix.

gnus.el (gnus-summary-line-format): Link to "Marking Articles" instead of "Read Articles".

gnus.texi (Filtering New Groups): Clarify how simple the "options -n" format is.
 (Agent Expiry): Remove mention of `gnus-request-expire-articles', which is internal.

Merge changes made in Gnus trunk.

gnus.texi (Expiring Mail): Document gnus-auto-expirable-marks.
nnir.el (nnir-notmuch-program, nnir-notmuch-additional-switches, nnir-notmuch-remove-prefix, nnir-engines, nnir-run-notmuch): New nnir `notmuch' backend.
mm-decode.el (mm-text-html-renderer): Doc fix.
gnus-msg.el (gnus-bug): Fix the MML tag.
pop3.el (pop3-open-server): -ERR is a valid response to CAPA.
gnus-start.el (gnus-get-unread-articles): Don't connect to the secondary methods if started with `gnus-no-server'.
gnus-group.el (gnus-read-ephemeral-bug-group): Allow fetching several bug reports at once.

* gnus.el (gnus-refer-article-method): Remove mention of nnspool, which
no longer is much used.

* lisp/button.el (button): Inherit from link face.
Suggested by Dan Nicolaescu.

* lisp/progmodes/gdb-mi.el: Fit in 80 columns.
(gdb-setup-windows, gdb-restore-windows): Avoid other-window and
switch-to-buffer.

* lisp/progmodes/which-func.el (which-func-ff-hook): Don't output a message
if imenu is simply not configured.

Fixes: debbugs:8941

* allout.el (allout-post-undo-hook): New allout outline-change event hook
to signal undo activity.
(allout-post-command-business): Run allout-post-undo-hook if an undo just
occurred.
(allout-after-copy-or-kill-hook), (allout-mode): Minor docstring changes.

* allout-widgets.el (allout-widgets-after-undo-function): Ensure the
integrity of the current item's decoration after it has been in the
vicinity of an undo.
(allout-widgets-mode): Include allout-widgets-after-undo-function on the
new allout-post-undo-hook.

* lisp/emacs-lisp/lisp-mode.el (lisp-interaction-mode-abbrev-table):
Let define-derived-mode define it.
* lisp/emacs-lisp/derived.el (define-derived-mode): Try to avoid creating
cycles of abbrev-table inheritance.

Fixes: debbugs:8998

lisp/textmodes/bibtex.el: add support for biblatex

Fix some uses of switch-to-buffer.
* lisp/progmodes/compile.el (compilation-goto-locus):
* lisp/net/tramp-cmds.el (tramp-append-tramp-buffers):
* lisp/bs.el (bs-cycle-next, bs-cycle-previous):
* lisp/bookmark.el (bookmark-bmenu-list, bookmark-bmenu-2-window):
* lisp/bindings.el (mode-line-other-buffer):
* lisp/autoinsert.el (auto-insert):
* lisp/arc-mode.el (archive-extract):
* lisp/abbrev.el (edit-abbrevs): Fix some uses of switch-to-buffer.

Revert last change (2011-07-05T14:25:21Z!larsi@gnus.org).

* emacs-lock.el (emacs-lock-mode): Fix typo in variable name.
  Fix check of `emacs-lock-unlockable-modes'.
  Coerce true values of `emacs-lock--try-unlocking' to t.

* font-lock.el (font-lock-builtin-face): Change from Orchid to
MediumBlue on light-coloured backgrounds to avoid confusion with
the doc string.

Fixes: debbugs:6693

lisp/emacs-lock.el: Add back code accidentally replaced with garbage.

lisp/emacs-lock.el: New file.  Old one moved to lisp/obsolete/.

Auto-commit of loaddefs files.

Auto-commit of generated files.

* textmodes/rst.el (rst-define-level-faces): Use `facep' rather
than `boundp' to check if face is set.

Fix typos.

Use GConf and GSettings both, check GConf/GSettings toolbar style and font name.

* configure.in (HAVE_GCONF): Allow both HAVE_GCONF and HAVE_GSETTINGS.

* lisp/dynamic-setting.el (dynamic-setting-handle-config-changed-event):
Update doc string.

* src/xsettings.c: Use both GConf and GSettings if both are available.
(store_config_changed_event): Add comment.
(dpyinfo_valid, store_font_name_changed, map_tool_bar_style)
(store_tool_bar_style_changed): New functions.
(store_monospaced_changed): Add comment. Call dpyinfo_valid.
(struct xsettings): Move font inside HAVE_XFT.
(GSETTINGS_TOOL_BAR_STYLE, GSETTINGS_FONT_NAME): New defines.
(GSETTINGS_MONO_FONT): Renamed from SYSTEM_MONO_FONT.
Move inside HAVE_XFT.
(something_changed_gsettingsCB): Renamed from something_changedCB.
Check for changes in GSETTINGS_TOOL_BAR_STYLE and GSETTINGS_FONT_NAME
also.
(GCONF_TOOL_BAR_STYLE, GCONF_FONT_NAME): New defines.
(GCONF_MONO_FONT): Renamed from SYSTEM_MONO_FONT. Move inside HAVE_XFT.
(something_changed_gconfCB): Renamed from something_changedCB.
Check for changes in GCONF_TOOL_BAR_STYLE and GCONF_FONT_NAME also.
(parse_settings): Move check for font inside HAVE_XFT.
(read_settings, apply_xft_settings): Add comment.
(read_and_apply_settings): Add comment.  Call map_tool_bar_style and
store_tool_bar_style_changed.  Move check for font inside HAVE_XFT and
call store_font_name_changed.
(xft_settings_event): Add comment.
(init_gsettings): Add comment.  Get values for GSETTINGS_TOOL_BAR_STYLE
and GSETTINGS_FONT_NAME.  Move check for fonts within HAVE_XFT.
(init_gconf): Add comment.  Get values for GCONF_TOOL_BAR_STYLE
and GCONF_FONT_NAME.  Move check for fonts within HAVE_XFT.
(xsettings_initialize): Call init_gsettings last.
(xsettings_get_system_font, xsettings_get_system_normal_font): Add
comment.

* themes/manoj-dark-theme.el (manoj-dark): New file.

Random fixes.  E.g., (random) never returned negative values.

* fns.c (Frandom): Use GET_EMACS_TIME for random seed, and add the
subseconds part to the entropy, as that's a bit more random.
Prefer signed to unsigned, since the signedness doesn't matter and
in general we prefer signed.  When given a limit, use a
denominator equal to INTMASK + 1, not to VALMASK + 1, because the
latter isn't right if USE_2_TAGS_FOR_INTS.
* sysdep.c (get_random): Return a value in the range 0..INTMASK,
not 0..VALMASK.  Don't discard "excess" bits that random () returns.

lisp/server.el: Catch quit and close the connection (bug#8942).

* allout.el (allout-encrypt-unencrypted-on-saves): Do not provide insecure
exception for current topic.  Also note that auto-saves are handled
differently.

(allout-auto-save-temporarily-disabled), (allout-just-did-undo): State
variables for tracking auto-save inhibition situation.

(allout-write-contents-hook-handler): Rename from
'allout-write-file-hook-handler', and describe how it depends on
write-contents-functions sensitivity to non-nil value to prevent file
write.

(allout-auto-save-hook-handler): Remove.  auto-save does not check this in
individual buffers, only in the starting buffer, so this is not the right
way for us to inhibit auto-save in a buffer according to its condition.

(allout-mode): Use new allout-write-contents-hook-handler, and only with
write-contents-functions.  Remove auto-save provisions - they're
implemented elsewhere.

(allout-before-change-handler): If undo is in progress, note that for
attention of allout-post-command-business.

(allout-post-command-business): If the command we're following was an undo,
check for change in the status of encrypted items and adjust auto-save
inhibitions accordingly.

(allout-toggle-subtree-encryption): Adjust auto-save inhibition according
to whether there are or aren't any plain-text topics pending encryption.

(allout-inhibit-auto-save-info-for-decryption): Adjust buffer-saved-size
and some allout state to inhibit auto-saves if there are plain-text topics
pending encryption.

(allout-maybe-resume-auto-save-info-after-encryption): Adjust
buffer-saved-size and some allout state to not inhibit auto-saves if there
are no longer any plain-text topics pending encryption.

(allout-next-topic-pending-encryption), (allout-encrypt-decrypted): No
longer provide for exemption of the current topic.

Add 7z operations to delete and save changed members.
* lisp/arc-mode.el (archive-7z-expunge, archive-7z-update):
New defcustoms.
(archive-7z-write-file-member): New function.
(archive-7z-summarize): Fix the number of dashes in the
listing output.

Fixes: debbugs:8968

* bindings.el: Ignore next-buffer and previous-buffer in minibuffer-local-map.

* lisp/pcmpl-linux.el (pcomplete-pare-list): Re-add, from pcomplete.el.

Fixes: debbugs:8958

* font-lock.el (font-lock-builtin-face): Change light background color
to dark slate blue.

Fixes: debbugs:6693

* textprop.c (text_property_stickiness): Obey Vtext_property_default_nonsticky.
(syms_of_textprop): Add `display' to Vtext_property_default_nonsticky.
* w32fns.c (syms_of_w32fns):
* xfns.c (syms_of_xfns): Don't Add `display' since it's there by default.

* lisp/progmodes/gdb-mi.el (gdb): Use completion-at-point.

* fileio.c (barf_or_query_if_file_exists): Use S_ISDIR.

This is more efficient than Ffile_directory_p and avoids a minor race.

* lisp/files.el (find-file): Use pop-to-buffer-same-window.
* lisp/emacs-lisp/bytecomp.el (byte-compile-interactive-only-functions):
Add switch-to-buffer.

Fixes: debbugs:8911