(calendar-dst-check-each-year-flag): Fix custom group.
(calendar-current-time-zone-cache): Autoload riskiness.

(Fdefvaralias): If the alias is bound and the target is not, set the
target's value to that of the alias.

(woman2-TH): Undo last change.  Use string-equal instead of
string-match.

* woman.el (woman2-TH): Use string-equal instead of string-match.

(woman2-TH): Quote search string argument to string-match.

* woman.el (woman2-TH): Quote search string argument to string-match.

(set_tty_color_mode): Left over typo.

(smerge-apply-resolution-patch): Fix typo.
(smerge-resolve): Merge the "2-way refinement" case with one half of
the "mere whitespace" resolution.

* fileio.c (Fmake_symbolic_link): Surround code by #ifdef S_IFLNK
only after check for file name handler functions. Signal, when
native functionality is not supported.
(syms_of_fileio): Declare it unconditionally.

(is_simple_dialog, simple_dialog_show): New functions.
(Fx_popup_dialog): Handle simple yes/no questions as dialogs.

*** empty log message ***

(vc-bzr-after-dir-status): Detect the conflict state.

Fix up comment convention on the arch-tag lines.

(logon_network_drive): Also logon to remote drives that
are mapped to drive letters.

(assoc-ignore-case, assoc-ignore-representation):
Add WHEN to obsolescence declaration.

(AUTOGENEL): Add calc-loaddefs.el.

New file.

Document make targets.

Revert changes included by mistake in previous commit.

(menu-bar-options-menu) <truncate-lines>:
Respect truncate-partial-width-windows in non-full windows, with regards to
:toggle and :enable state.

(truncate-partial-width-windows): Doc fix.

(toggle-truncate-lines): Doc fix.

(vc-hg-dir-status): Remove unneeded call.

* vc-hooks.el (vc-state): Add new state `conflict'.
(vc-after-save): Use when not if.
(vc-default-mode-line-string): Deal with the conflict state.
(vc-prefix-map):
(vc-menu-map): Bind vc-status instead of vc-directory.

* vc.el (vc-editable-p):
(vc-default-status-printer):
(vc-next-action): Deal with the conflict state.
(vc-mark-resolved): New function.
(vc-status-mode): Fix mode name.
(vc-default-comment-history): Use when not if.
(Todo): Add new entries, remove old ones.

* vc-cvs.el (vc-cvs-merge, vc-cvs-merge-news): Set conflict state.
(vc-cvs-parse-status):
(vc-cvs-after-dir-status):
* vc-svn.el (vc-svn-after-dir-status, vc-svn-parse-status):
Detect the conflict state.

(diary-mark-sexp-entries): Fix replacement of calendar-for-loop.

*** empty log message ***

(diary-hook, diary-display-hook): Move here from calendar.el.
(diary-hook): Doc fix.

(diary-display-hook): Declare for compiler.

Require diary-lib rather than calendar.
(appt): Add :prefix.

(calendar, diary): Add :prefix.
(holidays): Change :prefix.
(calendar-today, holiday, calendar-holiday-marker, european-calendar-style):
Change custom groups.

(diary-hook, diary-display-hook): Move to diary-lib.el.

(MH_E_DIR): New variable.
(MH_E_SRC): Restore variable removed 2008-03-13.
(mh-loaddefs.el): Depend on $MH_E_SRC.
(CAL_DIR, CAL_SRC): New variables.
(cal-loaddefs.el, diary-loaddefs.el, hol-loaddefs.el):
Depend on CAL_SRC.

* minibuffer.el (minibuffer--double-dollars, read-file-name-internal):
New functions.
* fileio.c (read_file_name_cleanup, Fread_file_name_internal):
Move functions to minibuffer.el.
(syms_of_fileio): Don't declare them.

(minibuffer--do-completion): Don't forget to propagate
the arg to recursive calls.

*** empty log message ***

(completion-auto-help): Fix typo.

(vc-cvs-diff-tree): Remove unused function.

(vc-default-mode-line-string): Use ? for missing.

* net/tramp.el (tramp-find-file-name-coding-system-alist): New
defun.
(tramp-handle-insert-file-contents, tramp-handle-write-region):
Use it.

* minibuffer.el (minibuffer): Move group from cus-edit.el.
(completion-auto-help): Move from C code.
(minibuffer--maybe-completion-help): Remove.
(minibuffer--bitset): New function.
(minibuffer--do-completion): Rename from minibuffer-do-completion.
Renumber a bit.  Really complete on string *before* point.
Add argument used for word-completion.
Join trailing / in completion with following text, as done in
minibuffer-complete-word.
Handle new value `lazy' for completion-auto-help.
(minibuffer-try-word-completion): New function extracted from
minibuffer-complete-word.
(minibuffer-complete-word): Use minibuffer--do-completion.
(minibuffer--insert-strings): Rename from
minibuffer-complete-insert-strings.
(exit-minibuffer): Fix typo.
* cus-edit.el (minibuffer): Move group to minibuffer.el.
* cus-start.el: Remove completion-auto-help.
* minibuf.c (Vcompletion_auto_help): Move to minibuffer.el.
(syms_of_minibuf): Remove its initialization.

*** empty log message ***

(vc-status-add-entries): New function.
(vc-status-add-entry): Removed.
(vc-update-vc-status-buffer, vc-status-mark-buffer-changed): Use
vc-status-add-entries.

(ewoc-collect): Return results in the correct order.

(temp_echo_area_glyphs): Remove unused function.

Regenerate.

(clean-other-dirs-nmake): Don't clean lisp dir.
(clean-other-dirs-gmake): Likewise. Clean doc dirs.
(top-distclean, distclean, distclean-other-dirs-nmake)
(distclean-other-dirs-gmake, maintainer-clean-other-dirs-nmake)
(maintainer-clean-other-dirs-gmake, maintainer-clean): New targets.

(LOADDEFS): Add mh-loaddefs.el.
($(lisp)/mh-e/mh-loaddefs.el): Simplify rule.
(pre-mh-loaddefs.el-CMD, pre-mh-loaddefs.el-SH): Remove.
(AUTOGENEL): New variable.
(distclean, maintainer-clean): New targets.

(distclean): Delete makefile too.
(maintainer-clean): New target.

(distclean, maintainer-clean): New targets.

(Ffield_string_no_properties): Fix typo in docstring.

(regexp-opt): Reduce max-lisp-eval-depth and max-specpdl-size to
10000.

* emacs-lisp/regexp-opt.el (regexp-opt): Reduce
max-lisp-eval-depth and max-specpdl-size to 10000.

*** empty log message ***

2008-04-09  Lennart Borgman  <lennart.borgman@gmail.com>

* nxml/nxml-mode.el (nxml-cleanup): New function.
(nxml-mode): Add it to change-major-mode-hook.

(redisplay_internal) [!WINDOWSNT]: Conditionalize last change.

(w32_compute_glyph_string_overhangs): Compute overhangs
for new font backend and composite cases.

(x-gtk-stock-map): Map info to gtk-info.

(vc-status-tool-bar-map): Add vc-print-log to tool bar.

New file.

(tooltip-mode): Set tooltip-show-help-non-mode as
show-help-function when turning tooltip off.
(tooltip-show): Call tooltip-show-help-non-mode if use-echo-area.
(tooltip-trunc-str, tooltip-show-help-non-mode): New.

(font-lock-extend-after-change-region-function): Make it buffer local.

*** empty log message ***

Fix typo in previous change.

(diary-file, european-calendar-style): Remove autoload cookies.

Improve previous change.

Fix typo.

(wait_reading_process_output): If SYNC_INPUT and pending_atimers, run atimers.

(emacs_write): If SYNC_INPUT and pending_atimers, run atimers.

(alarm_signal_handler): Call run_timers if not SYNC_INPUT.
Most of the code moved to run_timers.
(do_pending_atimers): Call run_timers.
(run_timers): New function.

* outline.el (outline-mode-menu-bar-map):
* log-view.el (log-view-mode-menu):
* log-edit.el (log-edit-menu): Add :help.

(regexp-opt-group): Use substring-no-properties for correct handling
of unibyte strings.

* emacs-lisp/regexp-opt.el (regexp-opt-group): Use
substring-no-properties for correct handling of unibyte strings.

(change-log-next-buffer): Handle the case where version< signals an error.

* mouse.el (mouse-menu-major-mode-map): New fun extracted from
mouse-major-mode-menu.
(mouse-menu-bar-map): New fun extracted from mouse-popup-menubar.
(mouse-major-mode-menu, mouse-popup-menubar)
(mouse-popup-menubar-stuff): Use them.
(C-down-mouse-3): Bind to a dynamic map rather than to
mouse-popup-menubar-stuff.
* bindings.el (mode-line-major-mode-keymap): Bind down-mouse-1
to mouse-menu-major-mode-map rather than to mouse-major-mode-menu.

Preload minibuffer.el.

*** empty log message ***

(vc-svn-modify-change-comment): Add support for the
file:// access method.

* lisp/minibuffer.el: New file.
* src/minibuf.c (last_exact_completion): Remove variable.
(Fdelete_minibuffer_contents, do_completion, Fminibuffer_complete)
(complete_and_exit_1, complete_and_exit_2)
(Fminibuffer_complete_and_exit, Fminibuffer_complete_word)
(Fdisplay_completion_list, display_completion_list_1)
(Fminibuffer_completion_help, Fself_insert_and_exit)
(Fexit_minibuffer, Fminibuffer_message): Move functions to minibuffer.el.
(syms_of_minibuf): Remove corresponding initializations.

(Qdeactivate_mark): New var.
(command_loop_1): Use it to call `deactivate-mark'.
(syms_of_keyboard): Initialize it.

* xdisp.c (redisplay_internal): Reset tty's color_mode when switching
to another frame.
* frame.c (do_switch_frame): Refine the top_frame/async_visible code.
Don't call set_tty_color_mode.
(store_frame_param): Reset previous_frame rather than call
set_tty_color_mode.
* term.c (set_tty_color_mode): Rewrite.
* dispextern.h (set_tty_color_mode): New type.
* termchar.h (struct tty_display_info): Add `previous_color_mode'.

(access_keymap): Remove the value 2 for t_ok which was used
for generic chars, which do not exist any more in emacs-unicode.

($(lisp)/mh-e/mh-loaddefs.el): Make it depend on mh-e/*.el
rather than subdirs.el.  It introduces an ugly circular dependency, tho.

* calc/calc.el: Load "cal-loaddefs" rather than set up autoloads manually.
(calc-mode-map, calc-digit-map, calc-dispatch-map):
Move initialization into declaration.
* calc/calc-yank.el:
* calc/calc-misc.el:
* calc/calc-embed.el:
* calc/calc-aent.el: Add autoload cookies and set generated-autoload-file.

(Font Lock): Prefer add-hook to using a non-nil `mode' arg
in `font-lock-add-keywords'.

* coding.c (detect_coding_emacs_mule)
(Ffind_operation_coding_system): Fix typo.

Add zeroconf.el.

* net/zeroconf.el: New file.

* ps-samp.el (ps-add-printer, ps-remove-printer)
(ps-make-dynamic-printer-menu): New functions.

*** empty log message ***

Fix typos.

(calendar-hebrew-list-yahrzeits): Typo.

Mention deleting loaddefs, maintainer-clean.

*** empty log message ***

* vc-rcs.el (vc-rcs-modify-change-comment):
* vc-cvs.el (vc-cvs-modify-change-comment): Fix argument order.

* log-view.el (log-view-mode-menu): Bind log-view-modify-change-comment.

(set-locale-environment): Don't warn if coding system doesn't agree with system
locale (this reverts changes by Dave Love, dated 2002-10-27 and 2002-10-09).

(SNAME): Extract only symbol name.

*** empty log message ***

(struct w32_metric_cache): New struct.
(w32font_info): Use it.
(W32METRIC_NO_ATTEMPT, W32METRIC_SUCCESS, W32METRIC_FAIL)
(CACHE_BLOCKSIZE): New constants.

Regenerate.

*** empty log message ***

(Qja, Qko, Qzh): New symbols.
(syms_of_w32font): Initialise them.
(font_matches_spec): Use them to filter by language.
(recompute_cached_metrics): Remove function.
(compute_metrics, clear_cached_metrics): New functions.
(w32font_encode_char): Use them to manage metric cache.
(w32font_text_extents): Cache metrics for all glyphs on demand.
Delay converting glyph indices to WORD until needed.
(w32font_open_internal): Initialize metric cache to empty.
(registry_to_w32_charset): Charset should always be a symbol.
(fill_in_logfont, list_all_matching_fonts): Family should always be a symbol.