Merge from emacs--rel--22

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

Merge from gnus--devo--0

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

*** empty log message ***

(gmm, gmm-verbose, gmm-lazy, gmm-customize-mode,
gmm-image-load-path-for-library): Fix typos in docstrings.
(gmm-message): Reflow docstring.

[HAVE_CARBON && HAVE_AVAILABILITYMACROS_H]:
Include AvailabilityMacros.h.
(USE_MAC_IMAGE_IO, LIBS_IMAGE) [HAVE_CARBON]: New defines.
(LIBS_CARBON) [HAVE_CARBON]: Use LIBS_IMAGE.

(ARGB_TO_ULONG, ALPHA_FROM_ULONG): New macros.
(RED_FROM_ULONG): Mask off higher bits.
(mac_cg_color_space_rgb) [USE_MAC_IMAGE_IO]: New extern.

(mac_cg_color_space_rgb) [USE_CG_DRAWING]:
Make variable non-static.
(XDrawLine, XCreatePixmap, XCreatePixmapFromBitmapData, XFreePixmap)
[USE_MAC_IMAGE_IO]: Add implementations for Image I/O support.

(Pixmap) [USE_MAC_IMAGE_IO]: New definition for Image I/O.

(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
New definitions for Image I/O support.
(XGetImage, XPutPixel, XGetPixel, XDestroyImage)
(mac_create_cg_image_from_image, x_create_x_image_and_pixmap)
[USE_MAC_IMAGE_IO]: Add implementations for Image I/O support.
(mac_data_provider_release_data, image_load_image_io)
[USE_MAC_IMAGE_IO]: New functions.
(CGImageCreateWithPNGDataProviderProcType) [MAC_OSX]: Remove typedef.
(MyCGImageCreateWithPNGDataProvider) [MAC_OSX]: Remove variable.
(init_image_func_pointer) [MAC_OSX]: Remove function.
(image_load_quartz2d) [MAC_OSX]: Check availability of
CGImageCreateWithPNGDataProvider at compile time.
Use lowercase `false' for boolean constant.
(png_load, jpeg_load, tiff_load, gif_load) [USE_MAC_IMAGE_IO]:
Use image_load_image_io.
(png_load) [!USE_MAC_IMAGE_IO && MAC_OSX]:
Don't check MyCGImageCreateWithPNGDataProvider.
(init_image) [MAC_OSX && TARGET_API_MAC_CARBON]:
Don't call init_image_func_pointer.

Regenerate.

Check availability of AvailabilityMacros.h
if HAVE_CARBON.

* configure: Regenerate.

(Moving subtrees): Fix typo.

*** empty log message ***

(vc-call, vc-state): Fix typos in docstrings.
(vc-default-state-heuristic): Doc fix.

(highlight-changes-mode): Removed references to hooks that no longer exist.
Because define-minor-mode is used the hook highlight-changes-mode-hook exists
and can do what both the old hooks used to do.  The documentation at the top
of the file was updated to demonstrate this.
(highlight-changes-mode): Remove commented out call to a hook function that
is no longer there.
(hilit-chg-set): Remove running of highlight-changes-enable-hook.

Add arch tagline

*** empty log message ***

More preparation for removing dired.

Fix some comments to remove references to vc-dired.

vc-toggle-read-only is no longer a good idea.

The day wehen vc-toggle-ready-only was a good idea is long gone.

Name change in preparation for ripping out vc-dired.

Better error message on missing files.

(vc-rcs-state): Fix typos.

(vc-register): Change argument order so that the prefix
argument is assigned correctly.
(vc-next-action, vc-dir-register): Update for the above change.

More informative message when a fileset is in a mixed state.

Don't commit right after deletion.

Remove unneeded TODO item in comment.

Add the argument DEFAULT of minibuffer input functions to Incompatible Lisp Changes.

(Text from Minibuffer): Document a list of default values for `read-from-minibuffer'.

(Fread_from_minibuffer, Fread_string, Fread_command)
(Fread_variable, Fread_buffer, Fcompleting_read): Document
the DEFAULT argument as a list of default values in docstrings.

(compilation-auto-jump): Set window point to `pos' explicitly.

(occur-read-primary-args): Set default to the car of
regexp-history and display it in the prompt, but don't add to the
list of minibuffer defaults.  Bind history-add-new-input to nil to
not add automatically `default'.  For empty input return `default'.
Otherwise, add `input' to regexp-history and return it.
(occur-1): Signal an error for the empty regexp.

(BASE_PURESIZE): Increase to 1210000.

* puresize.h (BASE_PURESIZE): Increase to 1210000.

Remove some XXX comments no longer needed.

Change 'needs-patch to 'needs-update.

(vc-delete-file): Check if the file has uncommitted changed.

Comment cleanup (no code change).

Add items to TODO list.

Revert incorrect fix for claimed bootstrap breakage.

(make_window): Initialize resize_proportionally.
(enlarge_window): Temporarily set resize_proportionally to make
sure that shrink_windows does scale the window proportionally.
(shrink_windows): When window has resize_proportionally set try
to shrink it proportionally by stealing from other windows.
(struct saved_window, Fset_window_configuration)
(compare_window_configurations): Handle resize_proportionally.
(WINDOW_TOTAL_SIZE): New macro.
(window_min_size, shrink_windows, size_window): Use it.
(check_min_window_sizes): Removed.  Invalid values of
window-min-height|width are handled by window_min_size_2 now.
(size_window, Fsplit_window, enlarge_window)
(adjust_window_trailing_edge, grow_mini_window): Don't call
check_min_window_sizes.
(window_min_size_2, window_min_size_1, window_min_size): New
argument safe_p for retrieving "safe" minimum sizes.
(Fdisplay_buffer, Fsplit_window, enlarge_window):
(adjust_window_trailing_edge, grow_mini_window): Adjust
arguments of window_min_size... functions.
(shrink_windows): Argument min_size removed.  New argument
safe_p allows shrinking windows to their safe minimum sizes.
Calculate minimum size and decide whether a window shall be
deleted for each window individually.
(size_window): When nodelete_p equals 2, tell shrink_windows to
delete windows only if their new minimum size is no more safe.
(shrink_window_lowest_first): Call window_min_size_1 to make
sure to preserve modeline of bottom-most window when resizing
the minibuffer.
(Fset_window_configuration, Fcurrent_window_configuration)
(compare_window_configurations): Do not handle
window-min-height|width any more.
(syms_of_window): Clarify window-min-height|width doc-strings.

(struct window): Replace field too_small_ok by field
resize_proportionally.

(change_frame_size_1): Preserve small windows when shrinking
frames by calling set_window_height|width with third arg 2.

(gdb-info-breakpoints-custom): Don't throw error if no file is found.

*** empty log message ***

* epa-file-hook.el: New file split from epa-file.el.
* epa-file.el: Require 'epa-file-hook.
(epa-file-handler): Add autoload cookie.
* loadup.el: Load epa-file-hook.
* startup.el (command-line): Eval the body of auto-encryption-mode.

(vc-hg-extra-fileinfo): New defstruct.
(vc-hg-status-printer): New function.
(vc-hg-after-dir-status): Deal with copied and renamed files.
(vc-hg-dir-status): Add flag to show copied files.

(vc-dir-mode-map): Don't bind "r".

*** empty log message ***

(define-ibuffer-sorter): Define the sorter to reverse sorting order if
last sorting mode was the sorter's.

(ibuffer-last-sorting-mode): New variable.
(ibuffer-do-sort-by-recency): Reverse sorting order if last sorting
mode was recency.

(w32-charset-info-alist): Map vietnamese to windows-1258.

(define-ibuffer-filter filename): When the major mode is `vc-dir-mode'
use the buffer's default directory as filename.

(define-ibuffer-column filename): When the major mode is `vc-dir-mode'
show the buffer's default directory.

(vc-dir-mode-map): Bind "r" to vc-dir-delete-file, like in PCL-CVS.

(vc-dir-mode-map): Bind "d" to vc-dir-delete-file.
(vc-dir-delete-file): Add.
(vc-delete-file): Do not barf when the file has been already deleted.

*** empty log message ***

(lisp-mode-map): Add menu.

* progmodes/octave-mod.el (octave-help): New function.
* progmodes/octave-hlp.el: Delete.
* info-look.el (octave-mode): Add operator index.

(vc-checkout): Typo.

(compilation-error-regexp-alist-alist) <gnu>:
Rule out trailing spaces in file and directory names as well.

(file_name_completion): Fix up the encoding/decoding issue
some more.  Copy some of the code from Ftry_completions.
Remove special case code that dates back to initial revision when the
slash was only added when necessary and that can't trigger nowadays.

Reorder, place things related to version control together.

(menu-bar-tools-menu): Reorder, place Games last.
Add "..." in the appropriate places.

(epa-key-list-mode-map): Add more menu entries.
Add ... in the appropriate places.

(dired-mode-map): Add :help.

(vc-deduce-fileset): Add new parameter.
(vc-dir-marked-only-files): New function.
(vc-next-action): Don't ignore directories, look at the files
inside them.
(vc-dir-mode): Document how the mark/unmark commands work.

(completion-pcm-try-completion): Typo.

(completion--do-completion): Move point even if the completion makes no change.
(completion-pcm-try-completion): Fix computation of new point.

Require 'cl.

*** empty log message ***

(gdb-frame-handler-1): Make overlay arrow
hollow if not in innermost frame.

*** empty log message ***

Make `checkout-model' apply to filesets.
* vc-hooks.el (vc-checkout-model): Rewrite.
(vc-before-save, vc-after-save): Adjust callers accordingly.
* vc.el (vc-editable-p, vc-next-action, vc-checkout, vc-update)
(vc-transfer-file): Adjust callers accordingly.
* vc-rcs.el (vc-rcs-checkout-model): Adjust arg.
(vc-rcs-state, vc-rcs-state-heuristic, vc-rcs-receive-file)
(vc-rcs-checkout, vc-rcs-fetch-master-state): Use vc-rcs-checkout-model
instead of vc-checkout-model.
* vc-mcvs.el (vc-mcvs-revert):
Use vc-mcvs-checkout-model i.s.o vc-checkout-model.
* vc-cvs.el (vc-cvs-checkout-model): Adjust arg.
(vc-cvs-revert): Use vc-cvs-checkout-model i.s.o vc-checkout-model.
* vc-svn.el (vc-svn-checkout-model):
* vc-hg.el (vc-hg-checkout-model):
* vc-git.el (vc-git-checkout-model):
* vc-bzr.el (vc-bzr-checkout-model): Adjust arg.

(dired-read-dir-and-switches): Replace last change with
a new approach that mixes read-file-name and read-directory-name.

(read-buffer-to-switch): Avoid making assumptions about `other-buffer'.

(vc-dir-mode-hook): Add normal hook.
(vc-dir-mode): Run it.

(gud-speedbar-buttons): Raise frame in gdb-speedbar-timer-fn.

(gdb-display-buffer): Don't pop up GUD buffer.
Always split windows.
(gdb-speedbar-timer-fn): Only raise frame after user input.
(gdb-same-frame): Reverse initial value.
(gdb-display-gdb-buffer): Check for GUD buffer in other frames.

*** empty log message ***

(flyspell-mode-on):  Remove redundant (flyspell-mode-hook) run.
(flyspell-mode): Fix docstring in definition.

(uniquify-rationalize-a-list): Beware of side-effects.

Daiki Ueno  <ueno at unixuser.org>

(epa-key-list-mode-map): Add menu.
(epa-delete-keys, epa-import-keys): Fix typo.

(top-level): Does not need cl when compiling.
Add arch-tag and footer.

Another new file, another license notice to update.

Fix typo in previous.

New file.

(completion-hilit-commonality): Remove leftover code.
(completion-pcm--pattern->regex): Let `group' be a list of symbols.
(completion-pcm--hilit-commonality): New function.
(completion-pcm-all-completions): Use it.

* minibuffer.el (completion-common-substring): Mark obsolete.
(completions-first-difference, completions-common-part): Move from simple.el.
(completion-hilit-commonality): New fun.
(display-completion-list, completion-emacs21-all-completions)
(completion-emacs22-all-completions): Use it.
* simple.el (completions-first-difference, completions-common-part):
Move to minibuffer.el.
(choose-completion-string): Use field functions and minibufferp.
(completion-setup-function): Don't set completions faces.

Fix comment typo.

(Sexp Diary Entries): Clarify diary-float.

(check-declare-errmsg): Fix counting in the `full' case.

(calendar-iso-from-absolute): Fix declaration.

(calendar-absolute-from-iso, calendar-iso-from-absolute): Fix declarations.

(holiday-float): Doc fix.

(diary-list-sexp-entries, diary-float): Doc fix.

(calendar-nth-named-absday, calendar-nth-named-day): Doc fix.

Add Windows battery support.