(tab-always-indent): Fix custom-type.

Redate and reposition log entry.

Fix bug#5395: typing '#' in an empty C buffer throws "args out of range".
* progmodes/cc-defs.el: (c-set-cpp-delimiters, c-clear-cpp-delimiters):
Check for EOB playing the role of delimiter.

Merge from trunk

Store settings in xft-settings for debug purposes.
(apply_xft_settings): Save settings in Vxft_settings
for debug purpose.
(syms_of_xsettings): Declare xft-settings.

Suppress spurious second invocation of before-change-functions

no message

* ada-mode.el: Really fix bug#5400 (comment in 2010-01-17T19:15:32Z!lekktu@gmail.com was erroneous).
  (ada-matching-decl-start-re): Move into ada-goto-decl-start.
  (ada-goto-decl-start): Rename from ada-goto-matching-decl-start; callers
  changed.  Delete RECURSIVE parameter; never used.  Improve doc string.
  Improve comments in "is" portion.  Handle null procedure declaration.
  (ada-move-to-end): Improve doc string.

Fix typos.

ido.el: Consider the possibility of buffer names changing after kill-buffer.

Doc fix for current-time-string and date-to-time (Bug#5408)

* src/editfns.c (Fcurrent_time_string): Doc fix.
* lisp/calendar/time-date.el (date-to-time): Doc fix.

Fix typos.

Fix typos in docstrings, error messages, etc.

Fix typos in comments.

Fix typo in texinfo file.

Add bug number.

* message.el (message-setup-1): Prefer to save message-reply-buffer as a buffer.

Fix handling of arbitrary YANK-ACTION functions from compose-mail.

* mail/sendmail.el (mail-yank-original): Set the mark if the
specified function for yanking does not do it.

* message.el (message-mail): Just pass yank-action on to message-setup.
(message-setup): Handle (FUN . ARGS) form of yank-action.
(message-with-reply-buffer, message-widen-reply)
(message-yank-original): Handle non-buffer values of
message-reply-buffer (Bug#4080).

* elisp.texi: Remove duplicate edition information (Bug#5407).

(with-vc-properties): Deal with directory arguments.  (Bug#5298)

(vc-dir-resynch-file): Update the vc-dir header when
resyncing a directory.

Minor Semantic and EIEIO manual fixes.

* semantic.texi: Add Richard Y. Kim credit.
* eieio.texi (Making New Objects): Fix typo (Bug#5406).

* progmodes/ada-mode.el: Fix bug#1920, bug#5400.
  (ada-ident-re): Delete ., allow multibyte characters.
  (ada-goto-label-re): New; matches goto labels.
  (ada-block-label-re): New; matches block labels.
  (ada-label-re): New; matches both.
  (ada-named-block-re): Deleted; callers changed to use
  `ada-block-label-re' instead.
  (ada-get-current-indent, ada-get-indent-noindent, ada-get-indent-loop):
  Use `ada-block-label-re'.
  (ada-indent-on-previous-lines): Improve handling of goto labels.
  (ada-get-indent-block-start): Special-case block label.
  (ada-get-indent-label): Split into `ada-indent-block-label' and
  `ada-indent-goto-label'.
  (ada-goto-stmt-start, ada-goto-next-non-ws): Optionally ignore goto labels.
  (ada-goto-next-word): Simplify.
  (ada-indent-newline-indent-conditional): Insert newline before
  trying to fix indentation; doc fix.

* tramp.texi (Frequently Asked Questions): Add GNU Emacs 23 and
SXEmacs 22 to the supported systems.  New item for hung ssh sessions.

Give `calc-command-flags' an initial value.

(Reporting Bugs): Don't mention format of repository.

(Bugs): Make "Emacs repository" less specific, and the URL for same
more specific.

(Latest version of Emacs): The repository is now Bazaar.

Edit some notes/ files to replace `cvs' with `bzr', or something general.

(semantic-idle-work-for-one-buffer): Doc fix.

Fix typos in docstrings.

Fix typos in comments.

Fix typos in info documentation.

Fix return value of nxml-extend-after-change-region.

* nxml/nxml-mode.el (nxml-extend-after-change-region): Never return t (Bug#3898).

* lisp/ChangeLog: Mark last change as tiny.

* vc-dispatcher.el (vc-do-command): Set LC_MESSAGES, so that we
can parse the output of the external commands (Bug#5279).

* emacs-lisp/advice.el (ad-add-advice): Doc fix (Bug#5274)

* pcmpl-unix.el (pcmpl-unix-read-passwd-file): Doc fix.

Update with Miles's advice on how to commit.

* xterm.c (event_handler_gdk): Block input (Bug#5037).

Rename from cvslogs to commits.

* emacs-lisp/cl-macs.el (defstruct): Doc fix (Bug#5267).

Command line arg processing fix (Bug#5392)

* src/emacs.c (standard_args): Adjust arg priorities to reflect how
they are processed in startup.el.

* lisp/startup.el (command-line): Remove unused --icon-type arg.
Handle --display arg, passing it to command-line-1 (Bug#5392).

Reformat copyright line.

Update $(lisp) and $(shortlisp) to match changes in loadup.el

* Makefile.in (lisp, shortlisp): Update.

(x_term_init): Instead of inhibiting GC while running Lisp
code, link the new kboard into all_kboard before running Lisp code,
and protect the new terminal with GCPRO (Bug#5365).
(x_term_init): Remove unused var `atom'.
(x_delete_display, x_delete_terminal): Remove unused var `i'.

Mario Lang <mlang@delysid.org>: Remove some duplicated words.

* cedet/ede/cpp-root.el (ede-cpp-root-project):
* cedet/ede/files.el (ede-expand-filename):
* cedet/ede/simple.el (ede-simple-project):
* cedet/semantic/complete.el (semantic-complete-read-tag-engine)
(semantic-complete-inline-tag-engine):
* cedet/semantic/db-el.el (semanticdb-equivalent-mode):
* cedet/semantic/db-global.el (semanticdb-equivalent-mode):
* cedet/semantic/db-javascript.el (semanticdb-equivalent-mode):
* cedet/semantic/db.el (semanticdb-equivalent-mode):
* cedet/semantic/decorate/include.el (semantic-decoration-unknown-include-describe):
* cedet/semantic/idle.el (semantic-idle-work-for-one-buffer):
* emacs-lisp/chart.el (chart-translate-namezone):
* textmodes/artist.el (artist-compute-popup-menu-table):
Remove duplicated words in doc-strings.

* srecode/doc-cpp.srt, srecode/doc-default.srt:
* srecode/doc-java.srt: Remove duplicated words.

* ede.texi (ede-target):
* org.texi (Refiling notes): Remove duplicated words.

Take desktop panels into account when sizing frames so they fit on the screen.

xfns.c (x_get_current_desktop, x_get_desktop_workarea): New functions.
(Fx_create_frame): Call x_get_current_desktop and x_get_desktop_workarea
to find out usable size of the desktop.  Don't make frames larger than
this. Bug #3643.

* net/mairix.el (mairix-widget-send-query): Send -1 instead of nil
to mairix-search to suppress threading (Bug#5342).

from trunk

international/mule-cmds.el (canonicalize-coding-system-name): Convert "msXXX", "ibmXXX", "windows-XXX" to "cpXXX".

from trunk

xdisp.c (CHAR_COMPOSED_P): New arg END_CHARPOS.  Callers changed.

Fix Bug#5311.

* log-view.el (top-level): Require 'wid-edit.  (Bug#5311)

* wid-edit.el (widget-keymap): Doc fix.

(vc-svn-print-log): Use --limit rather than -l since the
former seems to be more widely accepted by various svn versions.

Some more pointless updates.

Add log entry for new gdb icons.

Fix Qnone definition in NS files.

* nsterm.m (Qnone): Define here.
* nsfns.m (Qnone): Move definition to nsterm.m.

Add icons for reverse debugging. (3rd attempt).

Fix typos in docstrings.

Fix typo in error message.

Fix typos in template docstrings.

Fix typos in comments.

Fix typos in ChangeLogs and NEWS files.

Fix bug#5313: editing files in hexl-mode corrupts file

* hexl.el (hexl-printable-character): Fix check of `hexl-iso',
  which is always a string.

Simplify previous change.

Default ada_project_path to $ADA_PROJECT_PATH.

* progmodes/ada-mode.el: Override `narrow-to-defun' with `ada-narrow-to-defun'.

* progmodes/ada-mode.el: Deal with Ada 2005 "overriding" keyword.
  (ada-subprog-start-re, ada-imenu-subprogram-menu-re): Add keyword.
  (ada-get-current-indent, ada-imenu-generic-expression)
  (ada-which-function): Check for it.

* progmodes/ada-mode.el (ada-clean-buffer-before-saving): Make obsolete.
  (ada-mode): Don't obey `ada-clean-buffer-before-saving' anymore.

Fix handling of euc-xx coding systems.

(show-trailing-whitespace): Safe if boolean.  (Bug#5312)

Fix typo.

from trunk

Make auto-composition work on all buffers even if they are fundamental mode.

* lisp/bookmark.el (bookmark-bmenu-execute-deletions): Doc fix (Bug#5276).

Fix gc bug in terminal allocation.

* xterm.c (x_term_init): Avoid garbage-collecting the new terminal
during call to vendor-specific-keysyms (Bug#5365).

Fix comment for bug#5345.

Fix typos in comments and ChangeLogs.

Update autoload checksums.

Fix breakage to nt/emacsclient.rc in 2010-01-13T08:35:10Z!rgm@gnu.org

Add 2010 to copyright years.

Call SIGNAL_THREAD_CHECK from signal handlers.

* keyboard.c (input_available_signal) [SYNC_INPUT]:
Call SIGNAL_THREAD_CHECK (Bug#5333).

* atimer.c (alarm_signal_handler) [!SYNC_INPUT]:
Call SIGNAL_THREAD_CHECK.

Try to fix bug#5314.  This is probably not the final word, tho.
* buffer.c (Fset_buffer_modified_p): Try and be careful not to modify
recent-auto-save-p as a side-effect.
* buffer.h (BUF_AUTOSAVE_MODIFF): New macro.
* buffer.c (Fkill_buffer, reset_buffer):
* editfns.c (Fsubst_char_in_region):
* fileio.c (Finsert_file_contents, Fdo_auto_save)
(Fset_buffer_auto_saved, Frecent_auto_save_p): Use it.

merge trunk

Display buffer name, etc. in mode line by composing correctly.

* .bzrignore: Ignore all .exe, instead of individual files.

* files.el (copy-directory): Compute target for recursive
directories with identical names.  (Bug#5343)

Explicitly check for and link to -lXrender.
See http://lists.gnu.org/archive/html/emacs-devel/2010-01/msg00656.html

* configure.in: Explicitly check for and link to -lXrender.

* keyboard.c (read_char): Don't apply previous change when current
buffer is unchanged by command execution.

keyboard.c (read_char): Return after executing from special map.

Replace emacs-pretest-bug with bug-gnu-emacs mailing list.
See http://lists.gnu.org/archive/html/emacs-devel/2009-12/msg00758.html

* emacs.c (REPORT_EMACS_BUG_PRETEST_ADDRESS): Set it to
bug-gnu-emacs rather than emacs-pretest-bug.

* mail/emacsbug.el (report-emacs-bug-pretest-address): Set
it to bug-gnu-emacs rather than emacs-pretest-bug.

* CONTRIBUTE, NEWS: Use bug-gnu-emacs rather than emacs-pretest-bug
for bug reports for development versions.

* trouble.texi (Checklist): Use bug-gnu-emacs rather than
emacs-pretest-bug for bug reports for development versions.

* emacs-pretesters, make-announcement: Use bug-gnu-emacs rather
than emacs-pretest-bug for bug reports for development versions.

* INSTALL.BZR, README: Use bug-gnu-emacs rather than emacs-pretest-bug
for bug reports for development versions.

* cedet/data-debug.el (data-debug): Fix customization group reference.

Fix typos in CEDET docstrings.

* cedet/semantic/analyze.el (semantic-analyze-push-error)
  (semantic-analyze-context, semantic-analyze-context-assignment)
  (semantic-analyze-find-tag-sequence, semantic-analyze-find-tag):
* cedet/semantic/java.el (java-mode, semantic-tag-include-filename)
  (semantic-java-doc-keywords-map):
* cedet/semantic/bovine/c.el (c-mode, semantic-c-member-of-autocast)
  (semantic-lex-c-nested-namespace-ignore-second, semantic-parse-region)
  (semantic-c-parse-lexical-token, semantic-c-debug-mode-init-pch)
  (semantic-c-classname, semantic-format-tag-uml-prototype)
  (semantic-c-dereference-namespace, semantic-analyze-type-constants):
* cedet/semantic/bovine/el.el (semantic-elisp-form-to-doc-string)
  (semantic-emacs-lisp-obsoleted-doc, semantic-up-context)
  (semantic-get-local-variables, semantic-end-of-command)
  (semantic-beginning-of-command, semantic-ctxt-current-class-list)
  (lisp-mode):
* cedet/semantic/bovine/make.el (makefile-mode):
* cedet/semantic/wisent/python.el (wisent-python-string-re)
  (wisent-python-implicit-line-joining-p, wisent-python-forward-string)
  (wisent-python-lex-beginning-of-line, wisent-python-lex-end-of-line)
  (semantic-lex, semantic-get-local-variables, python-mode):
* cedet/semantic/wisent/python-wy.el (wisent-python-wy--keyword-table):
* cedet/srecode/extract.el (srecode-extract-state-set)
  (srecode-extract-method): Fix typos in docstrings.

(imenu-default-create-index-function): Detect infinite
loops caused by imenu-prev-index-position-function.

Fix typos and remove superfluous backslash-quoting in htmlfontify.el.

* htmlfontify.el (htmlfontify-load-rgb-file)
  (htmlfontify-unload-rgb-file, hfy-fallback-colour-values)
  (htmlfontify-manual, htmlfontify, hfy-page-header, hfy-page-footer)
  (hfy-src-doc-link-style, hfy-src-doc-link-unstyle, hfy-link-extn)
  (hfy-link-style-fun, hfy-index-file, hfy-instance-file)
  (hfy-html-quote-regex, hfy-init-kludge-hook, hfy-post-html-hooks)
  (hfy-default-face-def, hfy-etag-regex, hfy-html-quote-map)
  (hfy-etags-cmd-alist-default, hfy-etags-bin, hfy-ignored-properties)
  (hfy-which-etags, hfy-etags-cmd, hfy-istext-command, hfy-display-class)
  (hfy-optimisations, hfy-tags-cache, hfy-tags-sortl, hfy-tags-rmap)
  (hfy-style-assoc, hfy-sheet-assoc, hfy-facemap-assoc, hfy-interq)
  (hfy-colour-vals, hfy-default-header, hfy-link-style-string)
  (hfy-triplet, hfy-slant, hfy-weight, hfy-combined-face-spec)
  (hfy-face-attr-for-class, hfy-face-to-style-i, hfy-size-to-int)
  (hfy-flatten-style, hfy-face-to-style, hfy-face-or-def-to-name)
  (hfy-face-to-css, hfy-p-to-face, hfy-p-to-face-lennart, hfy-face-at)
  (hfy-fontified-p, hfy-merge-adjacent-spans, hfy-buffer)
  (hfy-html-enkludge-buffer, hfy-html-quote, hfy-html-dekludge-buffer)
  (hfy-force-fontification, htmlfontify-buffer, hfy-dirname)
  (hfy-make-directory, hfy-text-p, hfy-mark-tag-names, hfy-relstub)
  (hfy-href-stub, hfy-href, hfy-mark-tag-hrefs, hfy-prepare-index-i)
  (hfy-prepare-index, hfy-prepare-tag-map, hfy-subtract-maps)
  (htmlfontify-run-etags): Fix typos in docstrings and remove superfluous
  backslash-quoting from parentheses, etc.

* progmodes/js.el: Autoload javascript-mode alias.

Fix typos in ffap.el.

* ffap.el (ffap-shell-prompt-regexp, ffap-all-subdirs, ffap-url-p)
  (ffap-alist, ffap-tex-path, ffap-url-at-point, ffap-gopher-regexp)
  (ffap-gopher-at-point, ffap-file-at-point, ffap-read-file-or-url)
  (ffap-read-url-internal, ffap-menu, ffap-at-mouse):
  Fix typos in docstrings.
  (ffap-url-regexp): Doc fix.
  (ffap-at-mouse): Fix typo in message.

* nsterm.m: Use DEFSYM for last change.