*** empty log message ***

Replace mentions of M-#M-# by C-cC-c to finish editing.

(calc-edit-mode): Mention C-cC-c as the way to finish, C-xk as the way
to cancel the edit.  Add cancel routine to kill-buffer-hook.

(calc-graph-show-dumb): Mention C-cC-c as the way to return to Calc.

*** empty log message ***

Remove obsolete MacEdit code.
(calc-macro-edit-algebraic, calc-macro-edit-variable)
(calc-macro-edit-variable-2, calc-macro-edit-quick-digit):
Remove functions.

(calc-same-interface, calc-quit): Remove obsolete MacEdit code.

(buffer-file-coding-system-explicit):
Renambed for explicit-buffer-file-coding-system.
(after-insert-file-set-coding): Adjusted for the above change.

(revert-buffer): Change
explicit-buffer-file-coding-system to
buffer-file-coding-system-explicit.
(basic-save-buffer-1): Likewise.

(artist-butlast-fn): Var deleted.
(artist-butlast, artist-last): Functions deleted.
(artist-ellipse-mirror-quadrant): Call last and butlast directly.
(artist-compute-key-compl-table): Call remq directly.
(artist-remove-nulls): Function deleted.
(artist-vaporize-lines, artist-flood-fill): Use push and pop directly.
(artist-push, artist-pop): Macro deleted.

(artist-version): 1.2.6
(artist-prev-next-op-alist): New variable.
(artist-select-next-op-in-list): New function.
(artist-select-prev-op-in-list): New function.
(artist-make-prev-next-op-alist): New function.
(artist-is-in-op-list-p): New function.
(artist-get-first-non-nil-op): New function.
(artist-get-last-non-nil-op): New function.
(artist-mode-init): Call artist-get-last-non-nil-op to initialize
   artist-prev-next-op-alist.
(artist-mode-map): Add binding for C-mouse-4 and C-mouse-5 to
   change drawing operation.

(auto-revert-tail-handler): Put in undo boundaries.

* server.el (server-process-filter): Suppress `error', too.

(calc-user-define-edit, calc-finish-macro-edit)
(calc-user-define-permanent, calc-execute-kbd-macro):  Replace
obsolete function MacEdit-parse-keys with edmacro-parse-keys.

*** empty log message ***

(x_produce_glyphs): Fix last change.

*** empty log message ***

(get_line_height_property): New function extracted from
original calc_line_height_property.
(calc_line_height_property): Rework.  Handle t and (nil . ratio).
(x_produce_glyphs): Use them to handle line-height and
line-spacing according to new height spec.
(Qtotal): Remove.
(syms_of_xdisp): Remove defsubr and intern for Qtotal.

(Line Height): Total line-height is now specified
in line-height property of form (HEIGHT TOTAL).  Swap (FACE . RATIO)
in cons cells.  (nil . RATIO) is relative to actual line height.
Use line-height `t' instead of `0' to get minimum height.

(calc-copy-variable): Fix mistyped variable name.  Display variable
name differently in message.

*** empty log message ***

(basic-save-buffer-1): Set
explicit-buffer-file-coding-system to last-coding-system-used.
(revert-buffer): Pay attention to
explicit-buffer-file-coding-system (not buffer-file-coding-system)
on bind coding-system-for-read.

(explicit-buffer-file-coding-system): New
buffer local variable.
(after-insert-file-set-coding): Set it to coding-system-for-read.

(Finsert_file_contents): Don't use
current_buffer->buffer_file_coding_system even if REPLACE is
non-nil.  Call Qafter_insert_file_set_coding with the second arg
VISIT.

(x_new_font): Set FRAME_COLUMN_WIDTH to
fontp->average_width, not FONT_WIDTH.  Set FRAME_SPACE_WIDTH to
fontp-?space_width..
(x_load_font): Calculate fontp->space_width and
fontp->average_width.
(x_term_init): Initialize dpyinfo->Xatom_AVERAGE_WIDTH.

(x_produce_glyphs): Calculate tab width by
FRAME_SPACE_WIDTH, not FRAME_COLUMN_WIDTH.

(struct x_display_info): New member Xatom_AVERAGE_WIDTH.

(struct frame): New member space_width.
(FRAME_SPACE_WIDTH): New macro.

(struct font_info): New members space_width and
average_width.

(auto-revert-tail-mode): Doc fix for defvar.

* macterm.c (SelectionRange): Add Xcode position apple event struct.
(do_ae_open_documents): Handle Xcode-style file position open
events.
* term/mac-win.el (mac-drag-n-drop): Handle drag-n-drop events
that include line numbers.

(hack-local-variables): If there is no PREFIX, set it to "^".
Redundant variable PREFIXLEN removed.

(eshell-previous-matching-input):
Start the deletion from the end of the output.

(syms_of_buffer) <vertical-scroll-bar>: Correct typo.

*** empty log message ***

(File Variables): Clarify previous change.

(syms_of_buffer) <vertical-scroll-bar>: Doc fix.

(Timers): Discuss timers vs editing the buffer and undo.

* term/mac-win.el: Require x-dnd.
(mac-drag-n-drop): Sync with W32 version.  Use x-dnd.el functions.
* macfns.c (install_window_handler): Modify extern to return OSErr
value.
(mac_window): Handle return value of install_window_handler.
* macterm.c (reflect_byte): Remove function.
(mac_create_bitmap_from_bitmap_data): Don't call it.  Lookup table
instead.
(mac_do_font_lists): Simplify calculation of the longest
nonspecial string.
[TARGET_API_MAC_CARBON] (init_mac_drag_n_drop): Remove function
and declaration.
(mac_initialize) [TARGET_API_MAC_CARBON]: Don't call it.
[TARGET_API_MAC_CARBON] (mac_do_track_drag): New function and
declaration.
(install_window_handler): Return OSErr value.
(install_window_handler) [TARGET_API_MAC_CARBON]: Register
handlers for tracking/receiving drag-and-drop items.
(do_ae_open_documents): Generate unibyte strings for filenames.
[TARGET_API_MAC_CARBON] (mac_do_receive_drag): Likewise.  Reject
only non-filename items.  Set event modifiers.  Set return value.

Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-754

Merge from gnus--rel--5.10

Patches applied:

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-81
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-82
   Update from CVS

2004-12-27  Simon Josefsson  <jas@extundo.com>

   * lisp/gnus/mm-bodies.el (mm-body-encoding): Don't permit 7-bit to be used
   when mm-use-ultra-safe-encoding is enabled (e.g., for PGP/MIME)
   and we have trailing white space.  Reported by Werner Koch
   <wk@gnupg.org>.

(decode-coding-inserted-region): Don't
barf if `buffer-undo-list' is already set to `t'.

Removed unnecessary references to "calcFunc-".

*** empty log message ***

(calc-user-define-formula): Put default values for function names in
prompts.

(calc-user-define-permanent, calc-user-define-composition)
(calc-user-define-formula): Remove the need for "calcFunc-" in the
default input of algebraic functions.

(vc-rcs-annotate-command):
Fix omission bug: Call `vc-setup-buffer'.

(mark-paragraph): New arg ALLOW-EXTEND
enables the feature to extend the existing region.

(mark-word): New arg ALLOW-EXTEND
enables the feature to extend the existing region.

(mark-sexp, mark-defun): New arg ALLOW-EXTEND
enables the feature to extend the existing region.

*** empty log message ***

(recode-region): New function.

*** empty log message ***

(decode_coding): Fix previous change.

(back_to_previous_visible_line_start):
Don't call handle_display_prop.

*** empty log message ***

(site-run-file): Don't allow setting it with Custom.

(decode_coding_XXX, decode_composition_emacs_mule)
(decode_coding_emacs_mule, encode_coding_emacs_mule)
(decode_coding_iso2022, encode_designation_at_bol)
(encode_coding_iso2022, decode_coding_sjis_big5, decode_eol)
(decode_coding): Constify arguments and local vars.

(Quitting): Clarify value of with-local-quit.

(Top): Fix previous change.

(Loading): Fix previous change.

(buffer-disable-undo): Fix previous change.

Fix doc in previous change.

Add the ChangeLog entry for lisp/hexl.el 2004-12-27T11:59:49Z!jet@gyve.org.

Fix last commit.

(undo): Fix previous change.

(popup_get_selection): Remove parameter down_on_keypress.
(create_and_show_popup_menu, create_and_show_dialog): Remove
parameter down_on_keypress to popup_get_selection.

* xmenu.c (popup_get_selection): Only pop down dialogs
on C-g and Escape.

* NEWS: C-g pops down menus and dialogs.

* frames.texi (Dialog Boxes): Mention Gtk+ 2.6 also, as that version is
out now.

*** empty log message ***

(MAKEINFO): Specify --force.

(Killing Buffers): Add buffer-save-without-query.

Fix typo.

* dispextern.h: Change HAVE_CARBON to MAC_OS.
(struct glyph_string): Likewise.
* emacs.c (main) [MAC_OS8]: Call mac_term_init instead of
mac_initialize.
* fileio.c (Fnext_read_file_uses_dialog_p, Fread_file_name):
Change TARGET_API_MAC_CARBON to HAVE_CARBON.
* fns.c (vector): Change MAC_OSX to MAC_OS.
* frame.c (x_set_frame_parameters, x_report_frame_params)
(x_set_fullscreen): Remove #ifndef HAVE_CARBON.
(x_set_border_width, Vdefault_frame_scroll_bars): Change
HAVE_CARBON to MAC_OS.
* image.c [MAC_OS]: Include sys/stat.h.
[MAC_OS && !MAC_OSX]: Include sys/param.h, ImageCompression.h, and
QuickTimeComponents.h.
* mac.c [!MAC_OSX] (mac_wait_next_event): Add extern.
[!MAC_OSX] (select): Use mac_wait_next_event.
[!MAC_OSX] (run_mac_command): Change EXEC_SUFFIXES to
Vexec_suffixes.
[!MAC_OSX] (select, run_mac_command): Change `#ifdef
TARGET_API_MAC_CARBON' to `#if TARGET_API_MAC_CARBON'.
(mac_clear_font_name_table): Add extern.
(Fmac_clear_font_name_table): New defun.
(syms_of_mac): Defsubr it.
[MAC_OSX] (SELECT_POLLING_PERIOD_USEC): New define.
[MAC_OSX] (select_and_poll_event): New function.
[MAC_OSX] (sys_select): Use it.
[MAC_OSX && SELECT_USE_CFSOCKET] (socket_callback): New function.
[MAC_OSX && SELECT_USE_CFSOCKET]
(SELECT_TIMEOUT_THRESHOLD_RUNLOOP, EVENT_CLASS_SOCK): New defines.
[MAC_OSX] (sys_select) [SELECT_USE_CFSOCKET]: Use CFSocket and
RunLoop for simultaneously monitoring two kinds of inputs, window
events and process outputs, without periodically polling.
* macfns.c (mac_initialized): Remove extern.
(stricmp): Put in #if 0.  All callers changed to use xstricmp in
xfaces.c.
(strnicmp): Decrement `n' at the end of each loop, not the
beginning.
(check_mac): Use the term "Mac native windows" instead of "Mac
OS".
(check_x_display_info, x_display_info_for_name): Sync with xfns.c.
(mac_get_rdb_resource): New function (from w32reg.c).
(x_get_string_resource): Use it.
(install_window_handler): Add extern.
(mac_window): New function.
(Fx_create_frame): Use it instead of make_mac_frame.  Set
parameter for Qfullscreen.  Call x_wm_set_size_hint.
(Fx_open_connection, Fx_close_connection): New defuns.
(syms_of_macfns): Defsubr them.
(x_create_tip_frame) [TARGET_API_MAC_CARBON]: Add
kWindowNoUpdatesAttribute to the window attribute.
(x_create_tip_frame) [!TARGET_API_MAC_CARBON]: Use NewCWindow.
(x_create_tip_frame): Don't call ShowWindow.
(Fx_show_tip): Call ShowWindow.
(Fx_file_dialog): Change `#ifdef TARGET_API_MAC_CARBON' to `#if
TARGET_API_MAC_CARBON'.
(mac_frame_parm_handlers): Set handlers for Qfullscreen.
(syms_of_macfns) [MAC_OSX]: Initialize mac_in_use to 0.
* macgui.h [!MAC_OSX]: Don't include Controls.h.  Include
Windows.h.
(Window): Typedef to WindowPtr and move outside `#if
TARGET_API_MAC_CARBON'.
(XSizeHints): New struct.
* macterm.c (x_update_begin, x_update_end)
[TARGET_API_MAC_CARBON]: Disable screen updates during update of a
frame.
(x_draw_glyph_string_background, x_draw_glyph_string_foreground)
[MAC_OS8]: Use XDrawImageString/XDrawImageString16.
(construct_mouse_click): Put in #if 0.
(x_check_fullscreen, x_check_fullscreen_move): Remove decls.
(x_scroll_bar_create, x_scroll_bar_handle_click): Change `#ifdef
TARGET_API_MAC_CARBON' to `#if TARGET_API_MAC_CARBON'.
(activate_scroll_bars, deactivate_scroll_bars)
[!TARGET_API_MAC_CARBON]: Use ActivateControl/DeactivateControl.
(x_make_frame_visible) [TARGET_API_MAC_CARBON]: Reposition window
if the position is neither user-specified nor program-specified.
(x_free_frame_resources): Free size_hints.
(x_wm_set_size_hint): Allocate size_hints if needed.  Set
size_hints.
(mac_clear_font_name_table): New function.
(mac_do_list_fonts): Initialize font_name_table if needed.
(x_list_fonts): Don't initialize font_name_table.  Add BLOCK_INPUT
around mac_do_list_fonts.
(mac_unload_font): New function.
(x_load_font): Add BLOCK_INPUT around XLoadQueryFont.
(init_mac_drag_n_drop, mac_do_receive_drag): Enclose declarations
and definitions with #if TARGET_API_MAC_CARBON.
[USE_CARBON_EVENTS] (mac_handle_window_event): Add decl.
(install_window_handler): Add decl.
(do_window_update): Add BeginUpdate/EndUpdate for the tooltip
window.  Use UpdateControls.  Get the rectangle that should be
updated and restrict the target of expose_frame to it.
(do_grow_window): Set minimum height/width according to
size_hints.
(do_grow_window) [TARGET_API_MAC_CARBON]: Use ResizeWindow.
(do_zoom_window): Don't use x_set_window_size.
[USE_CARBON_EVENTS] (mac_handle_window_event): New function.
(install_window_handler): New function.
[!USE_CARBON_EVENTS] (mouse_region): New variable.
[!USE_CARBON_EVENTS] (mac_wait_next_event): New function.
(XTread_socket) [USE_CARBON_EVENTS]: Move call to
GetEventDispatcherTarget inside BLOCK_INPUT.
(XTread_socket) [!USE_CARBON_EVENTS]: Use mac_wait_next_event.
Update mouse_region when mouse is moved.
(make_mac_frame): Remove.
(make_mac_terminal_frame): Put in #ifdef MAC_OS8.  Initialize
mouse pointer shapes.  Change values of f->left_pos and
f->top_pos.  Don't use make_mac_frame.  Use NewCWindow.  Don't
call ShowWindow.
(mac_initialize_display_info) [MAC_OSX]: Create mac_id_name from
Vinvocation_name and Vsystem_name.
(mac_make_rdb): New function (from w32term.c).
(mac_term_init): Use it.  Add BLOCK_INPUT.  Error if display has
already been opened.  Don't pass argument to
mac_initialize_display_info.  Don't set dpyinfo->height/width.
Add entries to x_display_list and x_display_name_list.
(x_delete_display): New function.
(mac_initialize): Don't call mac_initialize_display_info.
(syms_of_macterm) [!MAC_OSX]: Don't call Fprovide.
* macterm.h (check_mac): Add extern.
(struct mac_output): New member size_hints.
(FRAME_SIZE_HINTS): New macro.
(mac_unload_font): Add extern.
* xdisp.c (expose_window, expose_frame): Remove kludges for Mac.
* xfaces.c (clear_font_table) [MAC_OS]: call mac_unload_font.

* makefile.MPW: Add dependencies for fringe.c.x, image.c.x, and
lastfile.c.x.
(PPCCOptions): Add -alloca.
(EmacsObjects): Remove alloca.c.x.  Add fringe.c.x, image.c.x, and
lastfile.c.x.
(Emacs MPW): Add QuickTimeLib.
(EmacsSource): Remove alloca.c.  Add fringe.c, image.c, and
lastfile.c.
(LispSource): Fix pathnames for byte-run.elc, float-sup.elc, and
map-ynp.elc.
* inc/config.h (USE_LSB_TAG) [__MRC__]: Define.
(UNEXEC_SRC): Close comment.
* inc/epaths.h (PATH_BITMAPS, PATH_GAME): New defines.
* inc/m-mac.h (HAVE_ALLOCA) [__MRC__]: Define.
(C_ALLOCA) [__MRC__]: Don't define.
* inc/s-mac.h (X_OK): New define.
(DECL_ALIGN) [USE_LSB_TAG && __MRC__]: New macro.
(GC_MARK_STACK): Define to GC_MAKE_GCPROS_NOOPS.

* term/mac-win.el: Sync with x-win.el.  Rearrange the contents.
Call mac-clear-font-name-table if invoked on Mac OS 8/9.  Call
x-open-connection on Mac OS X.

make-docfile.c: Include stdlib.h even if WINDOWSNT is not
defined.

(buffer-save-without-query): New var (buffer-local).
(save-some-buffers): Save those buffers first, w/o asking.

(insert-directory-ls-version): New variable.
(insert-directory): When ls returns an error, test the version
number to decide what the return code means.
With --dired output format, detect and distinguish lines
that are really error messages.
(insert-directory-adj-pos): New function.

*** empty log message ***

(Moving Point): C-e now runs move-end-of-line.
(Undo): Doc undo-outer-limit.

Realign menu.

(Emulating Mode Line): Document format's BUFFER arg.

(Line Height): Further clarify.

(Top): Update Loading submenu.

*** empty log message ***

(Where Defined): New node.
(Unloading): load-history moved to Where Defined.

(bookmark-jump): Nice error if BOOKMARK is nil.

(battery-mode-line-format): Remove initial spaces.

(function): Use restricted-sexp as parent.

(uniquify-rationalize-file-buffer-names): Delete interactive spec.

(type-break-mode): Set buffer-save-without-query.
Remove code that tried to set save-some-buffers-always.
(type-break-file-keystroke-count): Bind deactivate-mark.

(mouse-drag-region): Bind mouse-autoselect-window.

(next-error-buffer-p): New arg AVOID-CURRENT.
Test that the buffer is live, and maybe reject current buffer too.
Rewrite for clarity.
(next-error-find-buffer): Rewrite for clarity.

(undo-list-saved): New variable (buffer-local).
(undo): Set and test it.

(next-matching-history-element): Use same
`interactive' form as previous-matching-history-element.

Don't use buffer-disable-undo; do it directly.

(describe-function-1): Call symbol-file with `defun'.
(describe-variable): Call symbol-file with `defvar'.

(messages-buffer-max-lines): Alias for message-log-max.
(symbol-file): Rewritten to handle new load-history format.
Now takes an arg TYPE to specify looking for a particular
type of definition only.

(debugger-make-xrefs): Call symbol-file with `defun'.

(find-function-noselect): Call symbol-file with `defun'.
(find-variable-noselect): Call symbol-file with `defvar'.

(eshell-find-alias-function): Call symbol-file with `defun'.

(eshell-test-goto-func): Call symbol-file with `defun'.